Make string-widget combination more l7n friendly

[lyx.git] / src / frontends / qt / GuiLyXFiles.cpp

diff --git a/src/frontends/qt/GuiLyXFiles.cpp b/src/frontends/qt/GuiLyXFiles.cpp
index c9ab003dad2e485bb11b0df3cdbf233300529a44..1bfbdbb5ce2b5dd620fd922db2cfa33b2e7b5fc6 100644 (file)
--- a/src/frontends/qt/GuiLyXFiles.cpp
+++ b/src/frontends/qt/GuiLyXFiles.cpp
@@ -189,13 +189,8 @@ GuiLyXFiles::GuiLyXFiles(GuiView & lv)
        filter_->setClearButton(true);
        filter_->setPlaceholderText(qt_("All available files"));
        filter_->setToolTip(qt_("Enter string to filter the list of available files"));
-#if (QT_VERSION < 0x050000)
-       connect(filter_, SIGNAL(downPressed()),
-               filesLW, SLOT(setFocus()));
-#else
        connect(filter_, &FancyLineEdit::downPressed,
                filesLW, [this](){ focusAndHighlight(filesLW); });
-#endif
 
        filterBarL->addWidget(filter_, 0);
        findKeysLA->setBuddy(filter_);
@@ -417,7 +412,8 @@ void GuiLyXFiles::updateContents()
        filesLW->clear();
        QIcon user_icon(getPixmap("images/", "lyxfiles-user", "svgz,png"));
        QIcon system_icon(getPixmap("images/", "lyxfiles-system", "svgz,png"));
-       QIcon folder_icon(getPixmap("images/", "lyxfiles-folder", "svgz,png"));
+       QIcon user_folder_icon(getPixmap("images/", "lyxfiles-user-folder", "svgz,png"));
+       QIcon system_folder_icon(getPixmap("images/", "lyxfiles-system-folder", "svgz,png"));
        QStringList cats;
        QMap<QString, QString>::const_iterator it = files.constBegin();
        QFont capfont;
@@ -453,8 +449,8 @@ void GuiLyXFiles::updateContents()
                        guiname = qt_("Default Template");
                else if (translateName())
                        guiname = toqstr(translateIfPossible(qstring_to_ucs4(guiString(guiname))));
-               QIcon file_icon = (realpath.startsWith(toqstr(package().user_support().absFileName()))) ?
-                               user_icon : system_icon;
+               bool const user = realpath.startsWith(toqstr(package().user_support().absFileName()));
+               QIcon file_icon = user ? user_icon : system_icon;
                item->setIcon(0, file_icon);
                item->setData(0, Qt::UserRole, it.key());
                item->setData(0, Qt::DisplayRole, guiname);
@@ -477,7 +473,8 @@ void GuiLyXFiles::updateContents()
                        if (!subcatItem) {
                                subcatItem = new QTreeWidgetItem();
                                subcatItem->setText(0, subcat);
-                               subcatItem->setIcon(0, folder_icon);
+                               file_icon = user ? user_folder_icon : system_folder_icon;
+                               subcatItem->setIcon(0, file_icon);
                                cats << catsave;
                        }
                        subcatItem->addChild(item);