anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

No need for an extra icon

Browse Source
This commit is contained in:
Juergen Spitzmueller 2018-12-27 11:18:13 +01:00
parent 0f4fcb80ee
commit c57d04908f
7 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Makefile.am
View File

@ -473,7 +473,6 @@ dist_images_DATA1X = \
images/down.svgz \ images/down.svgz \
images/dynamic-char-styles.svgz \ images/dynamic-char-styles.svgz \
images/dynamic-custom-insets.svgz \ images/dynamic-custom-insets.svgz \
images/dynamic-freefonts.svgz \
images/editclear.svgz \ images/editclear.svgz \
images/emblem-readonly.svgz \ images/emblem-readonly.svgz \
images/emblem-shellescape.svgz \ images/emblem-shellescape.svgz \
@ -1760,7 +1759,6 @@ dist_imagesoxygen_DATA1X = \
images/oxygen/dialog-toggle_toc.svgz \ images/oxygen/dialog-toggle_toc.svgz \
images/oxygen/dynamic-char-styles.svgz \ images/oxygen/dynamic-char-styles.svgz \
images/oxygen/dynamic-custom-insets.svgz \ images/oxygen/dynamic-custom-insets.svgz \
images/oxygen/dynamic-freefonts.svgz \
images/oxygen/down.svgz \ images/oxygen/down.svgz \
images/oxygen/editclear.svgz \ images/oxygen/editclear.svgz \
images/oxygen/ert-insert.svgz \ images/oxygen/ert-insert.svgz \
@ -1967,7 +1965,6 @@ dist_imagesclassic_DATA = \
images/classic/dialog-show_vclog.png \ images/classic/dialog-show_vclog.png \
images/classic/dialog-toggle_findreplaceadv.png \ images/classic/dialog-toggle_findreplaceadv.png \
images/classic/dialog-toggle_toc.png \ images/classic/dialog-toggle_toc.png \
images/classic/dynamic-freefonts.png \
images/classic/down.png \ images/classic/down.png \
images/classic/ert-insert.png \ images/classic/ert-insert.png \
images/classic/file-open.png \ images/classic/file-open.png \

BIN
lib/images/classic/dynamic-freefonts.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 247 B

BIN
lib/images/dynamic-freefonts.svgz
View File

Binary file not shown.

BIN
lib/images/oxygen/dynamic-freefonts.svgz
View File

Binary file not shown.

2
lib/ui/stdtoolbars.inc
View File

@ -138,7 +138,7 @@ ToolbarSet
Item "Include file" "dialog-show-new-inset include" Item "Include file" "dialog-show-new-inset include"
Separator Separator
Item "Text properties" "dialog-show character" Item "Text properties" "dialog-show character"
DynamicMenu "dynamic-freefonts" "Apply recent text properties" DynamicMenu "textstyle-apply" "Apply recent text properties"
Item "Paragraph settings" "layout-paragraph" Item "Paragraph settings" "layout-paragraph"
Item "Thesaurus" "thesaurus-entry" Item "Thesaurus" "thesaurus-entry"
End End

4
src/frontends/qt4/GuiToolbar.cpp
View File

@ -323,7 +323,7 @@ bool DynamicMenuButton::isMenuType(string const & s)
{ {
return s == "dynamic-custom-insets" return s == "dynamic-custom-insets"
|| s == "dynamic-char-styles" || s == "dynamic-char-styles"
|| s == "dynamic-freefonts" || s == "textstyle-apply"
|| s == "paste"; || s == "paste";
} }
@ -365,7 +365,7 @@ void DynamicMenuButton::updateTriggered()
setEnabled(!bv->buffer().isReadonly() setEnabled(!bv->buffer().isReadonly()
&& !m->isEmpty() && !m->isEmpty()
&& inset->insetAllowed(FLEX_CODE)); && inset->insetAllowed(FLEX_CODE));
} else if (menutype == "dynamic-freefonts") { } else if (menutype == "textstyle-apply") {
m->clear(); m->clear();
vector<docstring> ffList = bv->cursor().innerText()->getFreeFonts(); vector<docstring> ffList = bv->cursor().innerText()->getFreeFonts();
unsigned int i = 0; unsigned int i = 0;

2
src/frontends/qt4/GuiToolbar.h
View File

@ -86,7 +86,7 @@ protected Q_SLOTS:
/// (stdtoolbars.inc, usually) and must be one of: /// (stdtoolbars.inc, usually) and must be one of:
/// dynamic-custom-insets /// dynamic-custom-insets
/// dynamic-char-styles /// dynamic-char-styles
/// dynamic-freefonts /// textstyle-apply
/// paste /// paste
/// To add a new one of these, you must add a routine, like /// To add a new one of these, you must add a routine, like
/// loadFlexInsets, that will populate the menu, and call it from /// loadFlexInsets, that will populate the menu, and call it from