Index: frontends/qt4/TocWidget.cpp
===================================================================
--- frontends/qt4/TocWidget.cpp (Revision 18074)
+++ frontends/qt4/TocWidget.cpp (Arbeitskopie)
@@ -15,6 +15,8 @@
#include "QToc.h"
#include "qt_helpers.h"
+#include "support/filetools.h"
+#include "support/lstrings.h"
#include "debug.h"
@@ -34,9 +36,12 @@
namespace lyx {
+
+using support::FileName;
+using support::libFileSearch;
+
namespace frontend {
-
TocWidget::TocWidget(QToc * form, QWidget * parent)
: QWidget(parent), form_(form), depth_(0)
{
@@ -44,7 +49,18 @@
connect(form, SIGNAL(modelReset()),
SLOT(updateGui()));
-
+
+ FileName icon_path = libFileSearch("images", "promote.xpm");
+ moveOutTB->setIcon(QIcon(toqstr(icon_path.absFilename())));
+ icon_path = libFileSearch("images", "demote.xpm");
+ moveInTB->setIcon(QIcon(toqstr(icon_path.absFilename())));
+ icon_path = libFileSearch("images", "up.xpm");
+ moveUpTB->setIcon(QIcon(toqstr(icon_path.absFilename())));
+ icon_path = libFileSearch("images", "down.xpm");
+ moveDownTB->setIcon(QIcon(toqstr(icon_path.absFilename())));
+ icon_path = libFileSearch("images", "reload.xpm");
+ updateTB->setIcon(QIcon(toqstr(icon_path.absFilename())));
+
// avoid flickering
tocTV->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
@@ -70,7 +86,7 @@
}
-void TocWidget::on_updatePB_clicked()
+void TocWidget::on_updateTB_clicked()
{
form_->updateBackend();
form_->update();
@@ -127,7 +143,7 @@
}
-void TocWidget::on_moveUpPB_clicked()
+void TocWidget::on_moveUpTB_clicked()
{
enableControls(false);
QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
@@ -140,7 +156,7 @@
}
-void TocWidget::on_moveDownPB_clicked()
+void TocWidget::on_moveDownTB_clicked()
{
enableControls(false);
QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
@@ -153,7 +169,7 @@
}
-void TocWidget::on_moveInPB_clicked()
+void TocWidget::on_moveInTB_clicked()
{
enableControls(false);
QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
@@ -166,7 +182,7 @@
}
-void TocWidget::on_moveOutPB_clicked()
+void TocWidget::on_moveOutTB_clicked()
{
QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
if (!list.isEmpty()) {
@@ -196,15 +212,15 @@
void TocWidget::enableControls(bool enable)
{
- updatePB->setEnabled(enable);
+ updateTB->setEnabled(enable);
if (!form_->canOutline(typeCO->currentIndex()))
enable = false;
- moveUpPB->setEnabled(enable);
- moveDownPB->setEnabled(enable);
- moveInPB->setEnabled(enable);
- moveOutPB->setEnabled(enable);
+ moveUpTB->setEnabled(enable);
+ moveDownTB->setEnabled(enable);
+ moveInTB->setEnabled(enable);
+ moveOutTB->setEnabled(enable);
depthSL->setEnabled(enable);
}
Index: frontends/qt4/ui/TocUi.ui
===================================================================
--- frontends/qt4/ui/TocUi.ui (Revision 18074)
+++ frontends/qt4/ui/TocUi.ui (Arbeitskopie)
@@ -8,8 +8,8 @@
0
0
- 257
- 404
+ 251
+ 378
@@ -22,94 +22,125 @@
6
- -
-
+
-
+
0
6
-
-
-
+
-
+
- Decrease nesting depth of selected item
+ Update navigation tree
- <- P&romote
+ ...
+
+ ../../../../lib/images/reload.xpm
+
+
+
+ 20
+ 20
+
+
- -
-
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 16
+ 20
+
+
+
+
+ -
+
- Move selected item down by one
+ Decrease nesting depth of selected item
- D&own
+ ...
+
+ ../../../../lib/images/promote.xpm
+
+
+
+ 20
+ 20
+
+
- -
-
+
-
+
Increase nesting depth of selected item
- De&mote ->
+ ...
+
+ ../../../../lib/images/demote.xpm
+
+
+
+ 20
+ 20
+
+
- -
-
+
-
+
- Update navigation tree
+ Move selected item down by one
- Upd&ate
+ ...
+
+ ../../../../lib/images/down.xpm
+
+
+
+ 20
+ 20
+
+
- -
-
+
-
+
Move selected item up by one
- &Up
+ ...
+
+ ../../../../lib/images/up.xpm
+
+
+
+ 20
+ 20
+
+
- -
-
-
-
- 7
- 0
- 0
- 0
-
-
-
- Switch between table of contents, list of figures or list of tables, if available
-
-
-
- -
-
-
-
- 7
- 7
- 0
- 0
-
-
-
-
- -
+
-
Adjust the depth of the navigation tree
@@ -131,7 +162,19 @@
- -
+
-
+
+
+
+ 7
+ 7
+ 0
+ 0
+
+
+
+
+ -
&Type:
@@ -141,16 +184,27 @@
+ -
+
+
+
+ 7
+ 0
+ 0
+ 0
+
+
+
+ Switch between table of contents, list of figures or list of tables, if available
+
+
+
typeCO
tocTV
depthSL
- moveUpPB
- moveDownPB
- moveInPB
- moveOutPB
qt_helpers.h
Index: frontends/qt4/TocWidget.h
===================================================================
--- frontends/qt4/TocWidget.h (Revision 18074)
+++ frontends/qt4/TocWidget.h (Arbeitskopie)
@@ -41,13 +41,13 @@
void selectionChanged(const QModelIndex & current,
const QModelIndex & previous);
- void on_updatePB_clicked();
+ void on_updateTB_clicked();
void on_depthSL_valueChanged(int depth);
void on_typeCO_activated(int value);
- void on_moveUpPB_clicked();
- void on_moveDownPB_clicked();
- void on_moveInPB_clicked();
- void on_moveOutPB_clicked();
+ void on_moveUpTB_clicked();
+ void on_moveDownTB_clicked();
+ void on_moveInTB_clicked();
+ void on_moveOutTB_clicked();
protected:
///