Fix readability

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

diff --git a/src/frontends/qt/GuiLyXFiles.cpp b/src/frontends/qt/GuiLyXFiles.cpp
index 2c97f2baa243b60adf0b289a7b41373dfcd6225f..a93000c3c6710cdf3d2d8676fd34d368ade3896d 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_);
@@ -216,11 +211,10 @@ GuiLyXFiles::GuiLyXFiles(GuiView & lv)
        bc().setOK(buttonBox->button(QDialogButtonBox::Open));
        bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
 
-       //filesLW->setViewMode(QListView::ListMode);
-       filesLW->setIconSize(QSize(22, 22));
-
-       QIcon user_icon(getPixmap("images/", "lyxfiles-user", "svgz,png"));
-       QIcon system_icon(getPixmap("images/", "lyxfiles-system", "svgz,png"));
+       QIcon user_icon(guiApp ? guiApp->getScaledPixmap("images/", "lyxfiles-user")
+                              : getPixmap("images/", "lyxfiles-user", "svgz,png"));
+       QIcon system_icon(guiApp ? guiApp->getScaledPixmap("images/", "lyxfiles-system")
+                                : getPixmap("images/", "lyxfiles-system", "svgz,png"));
        fileTypeCO->addItem(qt_("User and System Files"), toqstr("all"));
        fileTypeCO->addItem(user_icon, qt_("User Files Only"), toqstr("user"));
        fileTypeCO->addItem(system_icon, qt_("System Files Only"), toqstr("system"));
@@ -313,8 +307,10 @@ void GuiLyXFiles::on_filesLW_itemClicked(QTreeWidgetItem * item, int)
        setLanguage();
        QString const realpath = getRealPath();
        filesLW->currentItem()->setData(0, Qt::ToolTipRole, realpath);
-       QIcon user_icon(getPixmap("images/", "lyxfiles-user", "svgz,png"));
-       QIcon system_icon(getPixmap("images/", "lyxfiles-system", "svgz,png"));
+       QIcon user_icon(guiApp ? guiApp->getScaledPixmap("images/", "lyxfiles-user")
+                              : getPixmap("images/", "lyxfiles-user", "svgz,png"));
+       QIcon system_icon(guiApp ? guiApp->getScaledPixmap("images/", "lyxfiles-system")
+                                : getPixmap("images/", "lyxfiles-system", "svgz,png"));
        QIcon file_icon = (realpath.startsWith(toqstr(package().user_support().absFileName()))) ?
                        user_icon : system_icon;
        item->setIcon(0, file_icon);
@@ -415,10 +411,16 @@ void GuiLyXFiles::updateContents()
        languageCO->model()->sort(0);
 
        filesLW->clear();
-       QIcon user_icon(getPixmap("images/", "lyxfiles-user", "svgz,png"));
-       QIcon system_icon(getPixmap("images/", "lyxfiles-system", "svgz,png"));
-       QIcon user_folder_icon(getPixmap("images/", "lyxfiles-user-folder", "svgz,png"));
-       QIcon system_folder_icon(getPixmap("images/", "lyxfiles-system-folder", "svgz,png"));
+
+       QIcon user_icon(guiApp ? guiApp->getScaledPixmap("images/", "lyxfiles-user")
+                              : getPixmap("images/", "lyxfiles-user", "svgz,png"));
+       QIcon system_icon(guiApp ? guiApp->getScaledPixmap("images/", "lyxfiles-system")
+                                : getPixmap("images/", "lyxfiles-system", "svgz,png"));
+       QIcon user_folder_icon(guiApp ? guiApp->getScaledPixmap("images/", "lyxfiles-user-folder")
+                                     : getPixmap("images/", "lyxfiles-user-folder", "svgz,png"));
+       QIcon system_folder_icon(guiApp ? guiApp->getScaledPixmap("images/", "lyxfiles-system-folder")
+                                       : getPixmap("images/", "lyxfiles-system-folder", "svgz,png"));
+
        QStringList cats;
        QMap<QString, QString>::const_iterator it = files.constBegin();
        QFont capfont;
@@ -490,6 +492,11 @@ void GuiLyXFiles::updateContents()
        filesLW->sortItems(0, Qt::AscendingOrder);
        // redo filter
        filterLabels();
+       if (!isClosing()) {
+               // handle buttons
+               bc().setValid(isValid());
+               setLanguage();
+       }
 }
 
 
@@ -625,8 +632,6 @@ void GuiLyXFiles::paramsToDialog()
                setTitle(qt_("New File From Template"));
        else
                setTitle(qt_("Open File"));
-
-       bc().setValid(isValid());
 }