use "real" resources

[lyx.git] / src / frontends / qt4 / TocWidget.cpp

diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp
index 4363d09109a1d0494a84e83d16c074108ee2869a..7fef1afd3596a4eba4e7a1e0235e0b9106b8fd54 100644 (file)
--- a/src/frontends/qt4/TocWidget.cpp
+++ b/src/frontends/qt4/TocWidget.cpp
@@ -13,10 +13,8 @@
 
 #include "TocWidget.h"
 
-#include "QToc.h"
+#include "GuiToc.h"
 #include "qt_helpers.h"
-#include "support/filetools.h"
-#include "support/lstrings.h"
 
 #include "debug.h"
 
@@ -25,41 +23,27 @@
 #include <QTreeWidgetItem>
 
 #include <vector>
-#include <string>
-#include <stack>
 
 using std::endl;
-using std::pair;
-using std::stack;
 using std::vector;
-using std::string;
 
 
 namespace lyx {
-
-using support::FileName;
-using support::libFileSearch;
-
 namespace frontend {
 
-TocWidget::TocWidget(QToc * form, QWidget * parent)
-       : QWidget(parent), form_(form), depth_(0)
+TocWidget::TocWidget(GuiToc & form, QWidget * parent)
+       : QWidget(parent), depth_(0), form_(form)
 {
        setupUi(this);
+       setWindowTitle(qt_("Outline"));
 
-       connect(form, SIGNAL(modelReset()),
-               SLOT(updateGui()));
+       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())));
+       moveOutTB->setIcon(QIcon(":/images/promote.png"));
+       moveInTB->setIcon(QIcon(":/images/demote.png"));
+       moveUpTB->setIcon(QIcon(":/images/up.png"));
+       moveDownTB->setIcon(QIcon(":/images/down.png"));
+       updateTB->setIcon(QIcon(":/images/reload.png"));
 
        // avoid flickering
        tocTV->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
@@ -85,7 +69,7 @@ void TocWidget::selectionChanged(const QModelIndex & current,
                << ", " << current.column()
                << endl;
 
-       form_->goTo(typeCO->currentIndex(), current);
+       form_.goTo(typeCO->currentIndex(), current);
 }
 
 
@@ -94,7 +78,7 @@ void TocWidget::on_updateTB_clicked()
        // The backend update can take some time so we disable
        // the controls while waiting.
        enableControls(false);
-       form_->updateBackend();
+       form_.updateBackend();
 }
 
 /* FIXME (Ugras 17/11/06):
@@ -106,8 +90,8 @@ depth calculation.
 int TocWidget::getIndexDepth(QModelIndex const & index, int depth)
 {
        ++depth;
-       return (index.parent() ==
-               QModelIndex())? depth : getIndexDepth(index.parent(),depth);
+       return (index.parent() == QModelIndex())
+               ? depth : getIndexDepth(index.parent(),depth);
 }
 
 
@@ -129,7 +113,7 @@ void TocWidget::setTreeDepth(int depth)
        QModelIndexList indices = tocTV->model()->match(
                tocTV->model()->index(0,0),
                Qt::DisplayRole, "*", -1,
-               Qt::MatchWildcard|Qt::MatchRecursive);
+               Qt::MatchFlags(Qt::MatchWildcard|Qt::MatchRecursive));
 
        int size = indices.size();
        for (int i = 0; i < size; i++) {
@@ -153,8 +137,8 @@ void TocWidget::on_moveUpTB_clicked()
        QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
        if (!list.isEmpty()) {
                enableControls(false);
-               form_->goTo(typeCO->currentIndex(), list[0]);
-               form_->outlineUp();
+               form_.goTo(typeCO->currentIndex(), list[0]);
+               form_.outlineUp();
                enableControls(true);
        }
 }
@@ -166,8 +150,8 @@ void TocWidget::on_moveDownTB_clicked()
        QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
        if (!list.isEmpty()) {
                enableControls(false);
-               form_->goTo(typeCO->currentIndex(), list[0]);
-               form_->outlineDown();
+               form_.goTo(typeCO->currentIndex(), list[0]);
+               form_.outlineDown();
                enableControls(true);
        }
 }
@@ -179,8 +163,8 @@ void TocWidget::on_moveInTB_clicked()
        QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
        if (!list.isEmpty()) {
                enableControls(false);
-               form_->goTo(typeCO->currentIndex(), list[0]);
-               form_->outlineIn();
+               form_.goTo(typeCO->currentIndex(), list[0]);
+               form_.outlineIn();
                enableControls(true);
        }
 }
@@ -191,8 +175,8 @@ void TocWidget::on_moveOutTB_clicked()
        QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
        if (!list.isEmpty()) {
                enableControls(false);
-               form_->goTo(typeCO->currentIndex(), list[0]);
-               form_->outlineOut();
+               form_.goTo(typeCO->currentIndex(), list[0]);
+               form_.outlineOut();
                enableControls(true);
        }
 }
@@ -217,7 +201,7 @@ void TocWidget::enableControls(bool enable)
 {
        updateTB->setEnabled(enable);
 
-       if (!form_->canOutline(typeCO->currentIndex()))
+       if (!form_.canOutline(typeCO->currentIndex()))
                enable = false;
 
        moveUpTB->setEnabled(enable);
@@ -229,17 +213,16 @@ void TocWidget::enableControls(bool enable)
 }
 
 
-void TocWidget::update()
+void TocWidget::updateView()
 {
-       LYXERR(Debug::GUI) << "In TocWidget::update()" << endl;
-       select(form_->getCurrentIndex(typeCO->currentIndex()));
-       QWidget::update();
+       LYXERR(Debug::GUI) << "In TocWidget::updateView()" << endl;
+       select(form_.currentIndex(typeCO->currentIndex()));
 }
 
 
 void TocWidget::updateGui()
 {
-       vector<docstring> const & type_names = form_->typeNames();
+       vector<docstring> const & type_names = form_.typeNames();
        if (type_names.empty()) {
                enableControls(false);
                typeCO->clear();
@@ -262,7 +245,7 @@ void TocWidget::updateGui()
        if (current_type != -1)
                typeCO->setCurrentIndex(current_type);
        else
-               typeCO->setCurrentIndex(form_->selectedType());
+               typeCO->setCurrentIndex(form_.selectedType());
        typeCO->blockSignals(false);
 
        setTocModel(typeCO->currentIndex());
@@ -272,7 +255,7 @@ void TocWidget::updateGui()
 void TocWidget::setTocModel(size_t type)
 {
        bool controls_enabled = false;
-       QStandardItemModel * toc_model = form_->tocModel(type);
+       QStandardItemModel * toc_model = form_.tocModel(type);
        if (toc_model) {
                controls_enabled = toc_model->rowCount() > 0;
                tocTV->setModel(toc_model);
@@ -284,17 +267,17 @@ void TocWidget::setTocModel(size_t type)
        reconnectSelectionModel();
 
        if (controls_enabled) {
-               depthSL->setMaximum(form_->getTocDepth(type));
+               depthSL->setMaximum(form_.getTocDepth(type));
                depthSL->setValue(depth_);
        }
 
        LYXERR(Debug::GUI) << "In TocWidget::updateGui()" << endl;
 
-       select(form_->getCurrentIndex(typeCO->currentIndex()));
+       select(form_.currentIndex(typeCO->currentIndex()));
 
        if (toc_model) {
                LYXERR(Debug::GUI)
-               << "form_->tocModel()->rowCount "
+               << "tocModel()->rowCount "
                        << toc_model->rowCount()
                        << "\nform_->tocModel()->columnCount "
                        << toc_model->columnCount()
@@ -316,11 +299,8 @@ void TocWidget::reconnectSelectionModel()
 void TocWidget::disconnectSelectionModel()
 {
        disconnect(tocTV->selectionModel(),
-                  SIGNAL(currentChanged(const QModelIndex &,
-                         const QModelIndex &)),
-                  this,
-                  SLOT(selectionChanged(const QModelIndex &,
-                       const QModelIndex &)));
+               SIGNAL(currentChanged(QModelIndex, QModelIndex)),
+               this, SLOT(selectionChanged(QModelIndex, QModelIndex)));
 }
 
 } // namespace frontend