From: Juergen Spitzmueller Date: Wed, 20 Mar 2019 17:38:07 +0000 (+0100) Subject: GuiLyXFiles: add icons that indicate whether a file is from user or system X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c113cb95a7c902df99c958409ab98a54845843fa;p=features.git GuiLyXFiles: add icons that indicate whether a file is from user or system --- diff --git a/lib/Makefile.am b/lib/Makefile.am index 819a61ec81..2b37cc015e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -618,6 +618,8 @@ dist_images_DATA1X = \ images/layout-toggle_LyX-Code.svgz \ images/layout-toggle_Chunk.svgz \ images/layout-toggle_Section.svgz \ + images/lyxfiles-system.svgz \ + images/lyxfiles-user.svgz \ images/lyx-quit.svgz \ images/marginalnote-insert.svgz \ images/master-buffer-update.svgz \ diff --git a/lib/images/lyxfiles-system.svgz b/lib/images/lyxfiles-system.svgz new file mode 100644 index 0000000000..24d9941875 Binary files /dev/null and b/lib/images/lyxfiles-system.svgz differ diff --git a/lib/images/lyxfiles-user.svgz b/lib/images/lyxfiles-user.svgz new file mode 100644 index 0000000000..6e21ca72bb Binary files /dev/null and b/lib/images/lyxfiles-user.svgz differ diff --git a/src/frontends/qt4/GuiLyXFiles.cpp b/src/frontends/qt4/GuiLyXFiles.cpp index 95b5ef2171..c442b4e023 100644 --- a/src/frontends/qt4/GuiLyXFiles.cpp +++ b/src/frontends/qt4/GuiLyXFiles.cpp @@ -30,7 +30,6 @@ #include "support/Package.h" #include -#include #include using namespace std; @@ -274,7 +273,8 @@ void GuiLyXFiles::updateContents() getFiles(files, type); filesLW->clear(); - QFileIconProvider iconprovider; + QIcon user_icon(getPixmap("images/", "lyxfiles-user", "svgz,png")); + QIcon system_icon(getPixmap("images/", "lyxfiles-system", "svgz,png")); QStringList cats; QMap::const_iterator it = files.constBegin(); QFont capfont; @@ -306,7 +306,9 @@ void GuiLyXFiles::updateContents() QString guiname = filename.left(filename.lastIndexOf(getSuffix())).replace('_', ' '); if (translateName()) guiname = toqstr(translateIfPossible(qstring_to_ucs4(guiname))); - item->setIcon(0, iconprovider.icon(info)); + QIcon file_icon = (info.filePath().startsWith(toqstr(package().user_support().absFileName()))) ? + user_icon : system_icon; + item->setIcon(0, file_icon); item->setData(0, Qt::UserRole, info.filePath()); item->setData(0, Qt::DisplayRole, guiname); item->setData(0, Qt::ToolTipRole, info.filePath()); @@ -326,6 +328,7 @@ void GuiLyXFiles::updateContents() } } else { subcatItem->setText(0, subcat); + subcatItem->setIcon(0, file_icon); cats << catsave; } subcatItem->addChild(item);