OK to go in?
Jürgen
Index: lib/ui/stdtoolbars.inc
===================================================================
--- lib/ui/stdtoolbars.inc (Revision 18203)
+++ lib/ui/stdtoolbars.inc (Arbeitskopie)
@@ -30,7 +30,7 @@
#
# Minibuffer adds the command buffer (Qt only, only one may exist)
#
-# TableInsert adds a special widget for quick insertion of tables
+# TableInsert "The tooltip" adds a special widget for quick insertion of tables
#
# PopupMenu "name" "GUI Name"
#
@@ -74,7 +74,7 @@
Separator
Item "Insert math" "math-mode"
Item "Insert graphics" "dialog-show-new-inset graphics"
- TableInsert
+ TableInsert "Insert table"
End
Toolbar "extra" "Extra"
Index: src/frontends/qt4/QLToolbar.cpp
===================================================================
--- src/frontends/qt4/QLToolbar.cpp (Revision 18203)
+++ src/frontends/qt4/QLToolbar.cpp (Arbeitskopie)
@@ -197,6 +197,7 @@
tb->setIcon(QPixmap(toqstr(getIcon(FuncRequest(LFUN_TABULAR_INSERT)))));
tb->setToolTip(qt_(to_ascii(item.label_)));
tb->setStatusTip(qt_(to_ascii(item.label_)));
+ tb->setText(qt_(to_ascii(item.label_)));
InsertTableWidget * iv = new InsertTableWidget(owner_, tb);
connect(tb, SIGNAL(clicked(bool)), iv, SLOT(show(bool)));
connect(iv, SIGNAL(visible(bool)), tb, SLOT(setChecked(bool)));
Index: src/ToolbarBackend.cpp
===================================================================
--- src/ToolbarBackend.cpp (Revision 18203)
+++ src/ToolbarBackend.cpp (Arbeitskopie)
@@ -181,8 +181,11 @@
break;
case TO_TABLEINSERT:
- add(ToolbarItem(ToolbarItem::TABLEINSERT,
- FuncRequest(kb_action(ToolbarItem::TABLEINSERT))));
+ if (lex.next(true)) {
+ docstring const tooltip = lex.getDocString();
+ add(ToolbarItem(ToolbarItem::TABLEINSERT,
+ FuncRequest(kb_action(ToolbarItem::TABLEINSERT)), tooltip));
+ }
break;
case TO_ENDTOOLBAR:
