LFUN_FONT_FREE_* -> LFUN_TEXSTYLE_*

http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg141274.html

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25225 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index d9a74d2bef4f66265b690403ba9ff7f135b0353d..8e2c3380dac35437fcf74c20d963a15fdde23b52 100644 (file)
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -254,7 +254,7 @@ Menuset
                OptItem "Move Section down|d" "outline-down"
                OptItem "Move Section up|u" "outline-up"
                Separator
-               Item "Apply Last Text Style|A" "font-free-apply"
+               Item "Apply Last Text Style|A" "textstyle-apply"
                Submenu "Text Style|S" "edit_textstyles"
                Item "Paragraph Settings...|P" "layout-paragraph"
                Separator

diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc
index 272c62d0bbf12b251fc2c9e460e866a0e9c1306b..2bf0ede5dbc80a7bbda115886c6747006aa1d48c 100644 (file)
--- a/lib/ui/stdtoolbars.inc
+++ b/lib/ui/stdtoolbars.inc
@@ -70,7 +70,7 @@ ToolbarSet
                Separator
                Item "Toggle emphasis" "font-emph"
                Item "Toggle noun" "font-noun"
-               Item "Apply last" "font-free-apply"
+               Item "Apply last" "textstyle-apply"
                Separator
                Item "Insert math" "math-mode"
                Item "Insert graphics" "dialog-show-new-inset graphics"

diff --git a/src/FuncCode.h b/src/FuncCode.h
index 4504e5956225dde5d4c6f49416df14f10258b340..8540fb3d691dcbf4201412982b2a7f36f2714ed0 100644 (file)
--- a/src/FuncCode.h
+++ b/src/FuncCode.h
@@ -55,8 +55,8 @@ enum FuncCode
        LFUN_INSET_TOGGLE,
        // 20
        LFUN_HFILL_INSERT,
-       LFUN_FONT_FREE_APPLY,
-       LFUN_FONT_FREE_UPDATE,
+       LFUN_TEXTSTYLE_APPLY,
+       LFUN_TEXTSTYLE_UPDATE,
        LFUN_FONT_EMPH,
        LFUN_FONT_BOLD,
        // 25

diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 5272713f518ee7ef5f393620364558c5bba84702..17310c307158c946755f9365de1ebd624425d198 100644 (file)
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -1145,17 +1145,19 @@ void LyXAction::init()
  */
                { LFUN_FONT_SIZE, "font-size", Noop, Layout },
 /*!
- * \var lyx::FuncCode lyx::LFUN_FONT_FREE_APPLY
- * \li Action: Toggle user-defined text style.
- * \li Syntax: font-free-apply
+ * \var lyx::FuncCode lyx::LFUN_TEXTSTYLE_APPLY
+ * \li Action: Toggle user-defined (=last-time used) text style.
+ * \li Notion: This style is set via #LFUN_TEXTSTYLE_UPDATE, which is
+               automatically trigerred when using Text Style dialog.
+ * \li Syntax: textstyle-apply
  * \li Origin: leeming, 12 Mar 2003
  * \endvar
  */
-               { LFUN_FONT_FREE_APPLY, "font-free-apply", Noop, Layout },
+               { LFUN_TEXTSTYLE_APPLY, "textstyle-apply", Noop, Layout },
 /*!
- * \var lyx::FuncCode lyx::LFUN_FONT_FREE_UPDATE
- * \li Action: Update and apply user-defined text style.
- * \li Syntax: font-free-update <FONT_INFO>
+ * \var lyx::FuncCode lyx::LFUN_TEXTSTYLE_UPDATE
+ * \li Action: Apply text style and update the settings to be used by #LFUN_TEXTSTYLE_APPLY.
+ * \li Syntax: textstyle-update <FONT_INFO>
  * \li Params: <FONT_INFO>: specifies font atributes, e.g. family, series, shape,
                             size, emph, noun, underbar, number, color, language,
                            toggleall.\n
@@ -1164,7 +1166,7 @@ void LyXAction::init()
  * \li Origin: leeming, 12 Mar 2003
  * \endvar
  */
-               { LFUN_FONT_FREE_UPDATE, "font-free-update", Noop, Layout },
+               { LFUN_TEXTSTYLE_UPDATE, "textstyle-update", Noop, Layout },
 /*!
  * \var lyx::FuncCode lyx::LFUN_SCREEN_FONT_UPDATE
  * \li Action: Update fonts and its metrics.

diff --git a/src/Text3.cpp b/src/Text3.cpp
index db6613378aa8c20ccdbe0565159a5cd56a20522e..6bd82c1b5540bd42a062c2aca78f01f170082942 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1583,14 +1583,14 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                break;
        }
 
-       case LFUN_FONT_FREE_APPLY:
+       case LFUN_TEXTSTYLE_APPLY:
                toggleAndShow(cur, this, freefont, toggleall);
                cur.message(_("Character set"));
                break;
 
        // Set the freefont using the contents of \param data dispatched from
        // the frontends and apply it at the current cursor location.
-       case LFUN_FONT_FREE_UPDATE: {
+       case LFUN_TEXTSTYLE_UPDATE: {
                Font font;
                bool toggle;
                if (font.fromString(to_utf8(cmd.argument()), toggle)) {
@@ -2207,8 +2207,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_FONT_UNDERLINE:
        case LFUN_FONT_SIZE:
        case LFUN_LANGUAGE:
-       case LFUN_FONT_FREE_APPLY:
-       case LFUN_FONT_FREE_UPDATE:
+       case LFUN_TEXTSTYLE_APPLY:
+       case LFUN_TEXTSTYLE_UPDATE:
        case LFUN_LAYOUT_PARAGRAPH:
        case LFUN_PARAGRAPH_UPDATE:
        case LFUN_ACCENT_UMLAUT:

diff --git a/src/frontends/qt4/GuiCharacter.h b/src/frontends/qt4/GuiCharacter.h
index e590521a3ece30602b87d1440b32faec1822d78c..16cdc239473ae031b61051aa2fa6999f20d31b72 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.h
+++ b/src/frontends/qt4/GuiCharacter.h
@@ -68,7 +68,7 @@ private:
        void clearParams() {}
        void dispatchParams();
        bool isBufferDependent() const { return true; }
-       FuncCode getLfun() const { return LFUN_FONT_FREE_UPDATE; }
+       FuncCode getLfun() const { return LFUN_TEXTSTYLE_UPDATE; }
        void saveSession() const;
        void restoreSession();
        //@}

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index dcd710514dcb2c3bc2115adf780f93c97c221d50..30c79101caad09607aa78a969808b811fa0764c8 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -665,8 +665,8 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_FONT_TYPEWRITER:
        case LFUN_FONT_DEFAULT:
        case LFUN_FONT_EMPH:
-       case LFUN_FONT_FREE_APPLY:
-       case LFUN_FONT_FREE_UPDATE:
+       case LFUN_TEXTSTYLE_APPLY:
+       case LFUN_TEXTSTYLE_UPDATE:
        case LFUN_FONT_NOUN:
        case LFUN_FONT_ROMAN:
        case LFUN_FONT_SANS:

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 516e8b97fef08e7c0fc91f7c936b82ef2d7583df..ac91fab19f855eb198fc031be0b8f107cc7cd38b 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3456,8 +3456,8 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_FONT_FRAK:
        case LFUN_FONT_TYPEWRITER:
        case LFUN_FONT_SANS:
-       case LFUN_FONT_FREE_APPLY:
-       case LFUN_FONT_FREE_UPDATE:
+       case LFUN_TEXTSTYLE_APPLY:
+       case LFUN_TEXTSTYLE_UPDATE:
        case LFUN_FONT_SIZE:
        case LFUN_FONT_UNDERLINE:
        case LFUN_LANGUAGE:

diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index 4dbdd2a03015d693c7e767e0324d47466ab59103..a2da9d0d14e541398b787e6adfcadad5da09dfa6 100644 (file)
--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@@ -880,8 +880,8 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
 
        //  Math fonts
-       case LFUN_FONT_FREE_APPLY:
-       case LFUN_FONT_FREE_UPDATE:
+       case LFUN_TEXTSTYLE_APPLY:
+       case LFUN_TEXTSTYLE_UPDATE:
                handleFont2(cur, cmd.argument());
                break;