+++ /dev/null
-/* XPM */
-static char * math_panel_xpm[] = {
-"20 20 7 1",
-" c None",
-". c #777777",
-"+ c #C9C9C9",
-"@ c #919191",
-"# c #606060",
-"$ c #24238E",
-"% c #000000",
-".................+@ ",
-"..+++++++++++++++@@#",
-".+ $$ @@#",
-".+ $$$ $ $$ @@#",
-".+$$ $ $ $$$@@#",
-".+$ $$ $ $$ $@@#",
-".+$ $ $ $ $@@#",
-".+$$$$ $$$ @@#",
-".+ @@#",
-".+%%%%%%%%%%%%%%%@@#",
-".+ @@#",
-".+ $$$ @@#",
-".+ $$ $$ @@#",
-".+ $ @@#",
-".+ $$ @@#",
-".+ $$$ @@#",
-"+@@@@@@ @@@@@@@@#",
-"@@@@@@@@@@@@@@@@@@##",
-" ###################",
-" "};
/* XPM */
static char *show-dialog-new-inset_tabular[] = {
/* columns rows colors chars-per-pixel */
-"22 22 3 1",
+"20 20 4 1",
" c #000000",
". c #ffffff",
+"D c Red",
"X c None",
/* pixels */
-"XXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXX",
-"XXX XXX",
-"XXX .... .... .... XXX",
-"XXX .... .... .... XXX",
-"XXX XXX",
-"XXX .... .... .... XXX",
-"XXX .... .... .... XXX",
-"XXX XXX",
-"XXX .... .... .... XXX",
-"XXX .... .... .... XXX",
-"XXX XXX",
-"XXX .... .... .... XXX",
-"XXX .... .... .... XXX",
-"XXX XXX",
-"XXX .... .... .... XXX",
-"XXX .... .... .... XXX",
-"XXX XXX",
-"XXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXX"
+"XXXXXXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXXXXXX",
+"XX XXX",
+"XX .... .... ....XXX",
+"XX .... .... ....XXX",
+"XX XXX",
+"XX .... .... ....XXX",
+"XX .... .... ....XXX",
+"XX XXX",
+"XX .... .... ....XXX",
+"XX .... .... ....XXX",
+"XX XXX",
+"XX .... .... ....XXX",
+"XX .... .... ....XXX",
+"XXXXXXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXX X",
+"XXXXXXXXXXXXXXX XX",
+"XXXXXXXXXXXXXXXX XXX"
};
--- /dev/null
+/* XPM */\r
+static char * toolbar-toggle_math_xpm[] = {\r
+"20 20 7 1",\r
+" c None",\r
+". c #777777",\r
+"+ c #C9C9C9",\r
+"@ c #919191",\r
+"# c #606060",\r
+"$ c #24238E",\r
+"% c #000000",\r
+".................+@ ",\r
+"..+++++++++++++++@@#",\r
+".+ $$ @@#",\r
+".+ $$$ $ $$ @@#",\r
+".+$$ $ $ $$$@@#",\r
+".+$ $$ $ $$ $@@#",\r
+".+$ $ $ $ $@@#",\r
+".+$$$$ $$$ @@#",\r
+".+ @@#",\r
+".+%%%%%%%%%%%%%%%@@#",\r
+".+ @@#",\r
+".+ $$$ @@#",\r
+".+ $$ $$ @@#",\r
+".+ $ @@#",\r
+".+ $$ @@#",\r
+".+ $$$ @@#",\r
+"+@@@@@@ @@@@@@@@#",\r
+"@@@@@@@@@@@@@@@@@@##",\r
+" ###################",\r
+" "};\r
--- /dev/null
+/* XPM */\r
+static char * toolbar-toggle_math_panels_xpm[] = {\r
+"20 20 6 1",\r
+"X c None",\r
+". c #777777",\r
+"+ c #C9C9C9",\r
+"@ c #919191",\r
+"# c #606060",\r
+" c #24238E",\r
+".................+@X",\r
+"..+++++++++++++++@@#",\r
+".+XXXXXXXXXXXXXXX@@#",\r
+".+XXXXXXXXXXXXXXX@@#",\r
+".+XXXXXXXXXXXXXXX@@#",\r
+".+XXXXXXXXXXXXXXX@@#",\r
+".+XXXX XXXX@@#",\r
+".+XXX XX X XXXXXX@@#",\r
+".+XXXXXX X XXXXXX@@#",\r
+".+XXXXXX X XXXXXX@@#",\r
+".+XXXXX XX XXXXXX@@#",\r
+".+XXXXX XXX XXXXX@@#",\r
+".+XXXXX XXX XXXXX@@#",\r
+".+XXXXXXXXXXXXXXX@@#",\r
+".+XXXXXXXXXXXXXXX@@#",\r
+".+XXXXXXXXXXXXXXX@@#",\r
+"+@@@@@@@@@@@@@@@@@@#",\r
+"@@@@@@@@@@@@@@@@@@##",\r
+"X###################",\r
+"XXXXXXXXXXXXXXXXXXXX"};\r
--- /dev/null
+/* XPM */\r
+static char * toolbar-toggle_table_xpm[] = {\r
+"20 20 7 1",\r
+"X c None",\r
+". c #777777",\r
+"+ c #C9C9C9",\r
+"@ c #919191",\r
+"0 c #ffffff",\r
+"# c #606060",\r
+" c #000000",\r
+".................+@X",\r
+"..+++++++++++++++@@#",\r
+".+XXXXXXXXXXXXXXX@@#",\r
+".+XXXXXXXXXXXXXXX@@#",\r
+".+X X@@#",\r
+".+X 000 000 000 X@@#",\r
+".+X 000 000 000 X@@#",\r
+".+X X@@#",\r
+".+X 000 000 000 X@@#",\r
+".+X 000 000 000 X@@#",\r
+".+X X@@#",\r
+".+X 000 000 000 X@@#",\r
+".+X 000 000 000 X@@#",\r
+".+X X@@#",\r
+".+XXXXXXXXXXXXXXX@@#",\r
+".+XXXXXXXXXXXXXXX@@#",\r
+"+@@@@@@@@@@@@@@@@@@#",\r
+"@@@@@@@@@@@@@@@@@@##",\r
+"X###################",\r
+"XXXXXXXXXXXXXXXXXXXX"};\r
Separator
Item "Delimiters|r" "dialog-show mathdelimiter"
Item "Matrix|x" "dialog-show mathmatrix"
+ Separator
+ Item "Toggle Math Panels" "toolbar-toggle math_panels"
End
Menu "insert_float"
Item "Insert math" "math-mode"
Item "Insert graphics" "dialog-show-new-inset graphics"
TableInsert "Insert table"
+ Separator
+ Item "Toggle Table of Contents" "dialog-toggle toc"
+ Item "Toggle Math Toolbar" "toolbar-toggle math"
+ Item "Toggle Table Toolbar" "toolbar-toggle table"
End
Toolbar "extra" "Extra"
Separator
Item "Text style" "dialog-show character"
Item "Paragraph settings" "layout-paragraph"
- Item "Table of contents" "dialog-toggle toc"
Item "Thesaurus" "thesaurus-entry"
End
Item "Add column" "tabular-feature append-column"
Item "Delete row" "tabular-feature delete-row"
Item "Delete column" "tabular-feature delete-column"
+ Separator
+ Item "Toggle Math Panels" "toolbar-toggle math_panels"
End
Toolbar "minibuffer" "Command Buffer"
End
Toolbar "latex_varsz" "Big Operators"
- Item "sum" "math-insert \sum"
- Item "int" "math-insert \int"
Item "intop" "math-insert \intop"
- Item "iint" "math-insert \iint"
+ Item "int" "math-insert \int"
Item "iintop" "math-insert \iintop"
- Item "iiint" "math-insert \iiint"
+ Item "iint" "math-insert \iint"
Item "iiintop" "math-insert \iiintop"
- Item "iiiint" "math-insert \iiiint"
+ Item "iiint" "math-insert \iiint"
Item "iiiintop" "math-insert \iiiintop"
- Item "dotsint" "math-insert \dotsint"
+ Item "iiiint" "math-insert \iiiint"
Item "dotsintop" "math-insert \dotsintop"
- Item "oint" "math-insert \oint"
+ Item "dotsint" "math-insert \dotsint"
Item "ointop" "math-insert \ointop"
- Item "oiint" "math-insert \oiint"
+ Item "oint" "math-insert \oint"
Item "oiintop" "math-insert \oiintop"
- Item "ointctrclockwise" "math-insert \ointctrclockwise"
+ Item "oiint" "math-insert \oiint"
Item "ointctrclockwiseop" "math-insert \ointctrclockwiseop"
- Item "ointclockwise" "math-insert \ointclockwise"
+ Item "ointctrclockwise" "math-insert \ointctrclockwise"
Item "ointclockwiseop" "math-insert \ointclockwiseop"
- Item "sqint" "math-insert \sqint"
+ Item "ointclockwise" "math-insert \ointclockwise"
Item "sqintop" "math-insert \sqintop"
- Item "sqiint" "math-insert \sqiint"
+ Item "sqint" "math-insert \sqint"
Item "sqiintop" "math-insert \sqiintop"
+ Item "sqiint" "math-insert \sqiint"
+ Item "sum" "math-insert \sum"
Item "prod" "math-insert \prod"
Item "coprod" "math-insert \coprod"
Item "bigsqcup" "math-insert \bigsqcup"
{ LFUN_WINDOW_CLOSE, "window-close", NoBuffer },
{ LFUN_UNICODE_INSERT, "unicode-insert", Noop },
{ LFUN_TOOLBAR_TOGGLE_STATE, "", NoBuffer },
+ { LFUN_TOOLBAR_TOGGLE, "toolbar-toggle", NoBuffer },
{ LFUN_NOMENCL_INSERT, "nomencl-insert", Noop },
{ LFUN_NOMENCL_PRINT, "nomencl-print", Noop },
{ LFUN_CLEARPAGE_INSERT, "clearpage-insert", Noop },
break;
}
+ case LFUN_TOOLBAR_TOGGLE: {
+ bool const current = lyx_view_->getToolbars().visible(cmd.getArg(0));
+ flag.setOnOff(current);
+ break;
+ }
// this one is difficult to get right. As a half-baked
// solution, we consider only the first action of the sequence
case LFUN_COMMAND_SEQUENCE: {
lyx_view_->toggleToolbarState(argument);
break;
+ case LFUN_TOOLBAR_TOGGLE: {
+ BOOST_ASSERT(lyx_view_);
+ string const name = to_utf8(cmd.argument());
+ bool const current = lyx_view_->getToolbars().visible(name);
+ lyx_view_->getToolbars().display(name, !current);
+ break;
+ }
+
default: {
BOOST_ASSERT(lyx_view_);
view()->cursor().dispatch(cmd);
for (; cit != end; ++cit) {
if (cit->name == name) {
unsigned int flags = cit->flags;
+ TurnOffFlag(ON);
+ TurnOffFlag(OFF);
TurnOffFlag(AUTO);
- if (show) {
+ if (show)
TurnOnFlag(ON);
+ else
TurnOnFlag(OFF);
- } else {
- TurnOnFlag(OFF);
- TurnOnFlag(ON);
- }
cit->flags = static_cast<lyx::ToolbarInfo::Flags>(flags);
displayToolbar(*cit, show);
return;
}
+bool Toolbars::visible(string const & name) const
+{
+ std::map<string, ToolbarPtr>::const_iterator it =
+ toolbars_.find(name);
+ if (it == toolbars_.end())
+ return false;
+ return it->second.get()->isVisible();
+}
+
+
void Toolbars::saveToolbarInfo()
{
ToolbarSection & tb = LyX::ref().session().toolbars();
*/
virtual void saveInfo(ToolbarSection::ToolbarInfo & tbinfo) = 0;
+ /// whether toolbar is visible
+ virtual bool isVisible() const = 0;
/// Refresh the contents of the bar.
virtual void update() = 0;
/// Accessor to the layout combox, if any.
/// get toolbar state (on/off/auto)
ToolbarInfo::Flags getToolbarState(std::string const & name);
-
+
/// toggle the state of toolbars (on/off/auto)
void toggleToolbarState(std::string const & name);
/// Update the state of the toolbars.
void update(bool in_math, bool in_table, bool review);
+ /// Is the Toolbar currently visible?
+ bool visible(std::string const & name) const;
+
/// save toolbar information
void saveToolbarInfo();
}
+bool QLToolbar::isVisible() const
+{
+ return QToolBar::isVisible();
+}
+
+
void QLToolbar::saveInfo(ToolbarSection::ToolbarInfo & tbinfo)
{
// if tbinfo.state == auto *do not* set on/off
void add(ToolbarItem const & item);
void hide(bool);
void show(bool);
+ bool isVisible() const;
void saveInfo(ToolbarSection::ToolbarInfo & info);
void update();
LayoutBox * layout() const { return layout_.get(); }
LFUN_CLEARDOUBLEPAGE_INSERT, // Ugras 20061125
//290
LFUN_LISTING_INSERT, // Herbert 20011110, bpeng 20070502
+ LFUN_TOOLBAR_TOGGLE, // Edwin 20070521
LFUN_LASTACTION // end of the table
};