anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 22:06:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Introduce "samerow" toolbar tag and let View/Update toolbar to be in the

Browse Source 
beginning of the first row.

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



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33234 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2010-01-27 17:19:14 +00:00
parent 19806d62f7
commit ae752e13a5
5 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ui/default.ui
View File

@ -39,10 +39,13 @@ Include "stdtoolbars.inc"
# left: the toolbar should be at the left of the window # left: the toolbar should be at the left of the window
# right: the toolbar should be at the right of the window # right: the toolbar should be at the right of the window
# #
# samerow: do not create new line for this toolbar
# (note that order of toolbars is defined in stdtoolbars.inc)
#
Toolbars Toolbars
"standard" "on,top" "standard" "on,top"
"view/update" "on,top" "view/update" "on,top"
"extra" "on,top" "extra" "on,top,samerow"
"review" "auto,review,top" "review" "auto,review,top"
"vcs" "off,top" "vcs" "off,top"
"table" "auto,table,bottom" "table" "auto,table,bottom"

20
lib/ui/stdtoolbars.inc
View File

@ -95,6 +95,16 @@ ToolbarSet
Item "Toggle table toolbar" "toolbar-toggle table" Item "Toggle table toolbar" "toolbar-toggle table"
End End
Toolbar "view/update" "View/Update"
Item "View" "buffer-view"
Item "Update" "buffer-update"
Item "View master document" "master-buffer-view"
Item "Update master document" "master-buffer-update"
Separator
StickyPopupMenu "view-others" "View other formats"
StickyPopupMenu "update-others" "Update other formats"
End
Toolbar "extra" "Extra" Toolbar "extra" "Extra"
Item "Default" "layout" Item "Default" "layout"
Item "Numbered list" "layout Enumerate" Item "Numbered list" "layout Enumerate"
@ -215,16 +225,6 @@ ToolbarSet
Item "Next note" "note-next" Item "Next note" "note-next"
End End
Toolbar "view/update" "View/Update"
Item "View" "buffer-view"
Item "Update" "buffer-update"
Item "View master document" "master-buffer-view"
Item "Update master document" "master-buffer-update"
Separator
StickyPopupMenu "view-others" "View other formats"
StickyPopupMenu "update-others" "Update other formats"
End
Toolbar "view-others" "View Other Formats" Toolbar "view-others" "View Other Formats"
ViewFormats ViewFormats
End End

2
src/frontends/qt4/GuiView.cpp
View File

@ -536,7 +536,7 @@ void GuiView::initToolbars()
if (!tb) if (!tb)
continue; continue;
int const visibility = guiApp->toolbars().defaultVisibility(cit->name); int const visibility = guiApp->toolbars().defaultVisibility(cit->name);
bool newline = true; bool newline = !(visibility & Toolbars::SAMEROW);
tb->setVisible(false); tb->setVisible(false);
tb->setVisibility(visibility); tb->setVisibility(visibility);

2
src/frontends/qt4/Toolbars.cpp
View File

@ -358,6 +358,8 @@ void Toolbars::readToolbarSettings(Lexer & lex)
flag = RIGHT; flag = RIGHT;
else if (!compare_ascii_no_case(*cit, "auto")) else if (!compare_ascii_no_case(*cit, "auto"))
flag = AUTO; flag = AUTO;
else if (!compare_ascii_no_case(*cit, "samerow"))
flag = SAMEROW;
else { else {
LYXERR(Debug::ANY, LYXERR(Debug::ANY,
"Toolbars::readToolbarSettings: unrecognised token:`" "Toolbars::readToolbarSettings: unrecognised token:`"

3
src/frontends/qt4/Toolbars.h
View File

@ -107,7 +107,8 @@ public:
MATH = 128, //< show when in math MATH = 128, //< show when in math
TABLE = 256, //< show when in table TABLE = 256, //< show when in table
REVIEW = 512, //< show when change tracking is enabled REVIEW = 512, //< show when change tracking is enabled
MATHMACROTEMPLATE = 1024 //< show in math macro template MATHMACROTEMPLATE = 1024, //< show in math macro template
SAMEROW = 2048 //place to the current row, no new line
}; };
typedef std::vector<ToolbarInfo> Infos; typedef std::vector<ToolbarInfo> Infos;