Show Biblatex files in the TeXInfo dialog

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

diff --git a/src/frontends/qt4/PanelStack.cpp b/src/frontends/qt4/PanelStack.cpp
index 1863040bd19d107b3dda132e1a2e353dc1ec0a89..70ab4e0776395b98f7c4b1c416e249a7e1cc7b71 100644 (file)
--- a/src/frontends/qt4/PanelStack.cpp
+++ b/src/frontends/qt4/PanelStack.cpp
@@ -16,12 +16,10 @@
 #include "qt_helpers.h"
 
 #include "support/debug.h"
-#include "support/foreach.h"
 #include "support/lassert.h"
 
 #include <QAbstractButton>
 #include <QApplication>
-#include <QColorGroup>
 #include <QComboBox>
 #include <QFontMetrics>
 #include <QGroupBox>
@@ -49,9 +47,9 @@ PanelStack::PanelStack(QWidget * parent)
        : QWidget(parent)
 {
        delay_search_ = new QTimer(this);
+       search_ = new FancyLineEdit(this);
        list_ = new QTreeWidget(this);
        stack_ = new QStackedWidget(this);
-       search_ = new FancyLineEdit(this);
 
        // Configure the timer
        delay_search_->setSingleShot(true);
@@ -61,7 +59,7 @@ PanelStack::PanelStack(QWidget * parent)
        list_->setRootIsDecorated(false);
        list_->setColumnCount(1);
        list_->header()->hide();
-       list_->header()->setResizeMode(QHeaderView::ResizeToContents);
+       setSectionResizeMode(list_->header(), QHeaderView::ResizeToContents);
        list_->header()->setStretchLastSection(false);
        list_->setMinimumSize(list_->viewport()->size());
 
@@ -75,16 +73,18 @@ PanelStack::PanelStack(QWidget * parent)
        search_->setPlaceholderText(qt_("Search"));
 #endif
 
-       search_->setButtonPixmap(FancyLineEdit::Right, getPixmap("images/", "editclear", "png"));
+#if QT_VERSION >= 0x040600
+       search_->setButtonPixmap(FancyLineEdit::Right, getPixmap("images/", "editclear", "svgz,png"));
        search_->setButtonVisible(FancyLineEdit::Right, true);
        search_->setButtonToolTip(FancyLineEdit::Right, qt_("Clear text"));
        search_->setAutoHideButton(FancyLineEdit::Right, true);
+#endif
        connect(search_, SIGNAL(rightButtonClicked()), this, SLOT(resetSearch()));
        connect(search_, SIGNAL(textEdited(QString)), this, SLOT(filterChanged(QString)));
 
        // Create the output layout, horizontal plus a VBox on the left with the search
        // box and the tree
-       QVBoxLayout * left_layout = new QVBoxLayout();
+       QVBoxLayout * left_layout = new QVBoxLayout;
        left_layout->addWidget(search_, 0);
        left_layout->addWidget(list_, 1);
 
@@ -104,13 +104,13 @@ void PanelStack::addCategory(QString const & name, QString const & parent)
 
        if (parent.isEmpty()) {
                item = new QTreeWidgetItem(list_);
-               item->setText(0, name);
+               item->setText(0, qt_(name));
        }
        else {
                if (!panel_map_.contains(parent))
                        addCategory(parent);
                item = new QTreeWidgetItem(panel_map_.value(parent));
-               item->setText(0, name);
+               item->setText(0, qt_(name));
                depth = 2;
                list_->setRootIsDecorated(true);
        }
@@ -243,11 +243,11 @@ void PanelStack::search()
        // If the search string is empty we enable all the items
        // otherwise we disable everything and then selectively
        // re-enable matching items
-       foreach (QTreeWidgetItem * tree_item, panel_map_) {
+       for (QTreeWidgetItem * tree_item : panel_map_) {
                setTreeItemStatus(tree_item, enable_all);
        }
 
-       foreach (QTreeWidgetItem * tree_item, panel_map_) {
+       for (QTreeWidgetItem * tree_item : panel_map_) {
                // Current widget
                QWidget * pane_widget = widget_map_[tree_item];
 
@@ -258,7 +258,7 @@ void PanelStack::search()
                if (pane_widget) {
                        // Loops on the list of children widgets (recursive)
                        QWidgetList children = pane_widget->findChildren<QWidget *>();
-                       foreach (QWidget * child_widget, children) {
+                       for (QWidget * child_widget : children) {
                                bool widget_matches = false;
 
                                // Try to cast to the most common widgets and looks in it's content