Move check for mono icons into separate function

diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
index dd8037d0e20032b2f5e2e1d97af855250b90c61b..9f285f9bf2aa0b778b55680147e6221a80b8fda4 100644 (file)
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -83,9 +83,7 @@ GeneralSettings::GeneralSettings(QWidget *parent) :
 
     // OEM themes are not obliged to ship mono icons, so there
     // is no point in offering an option
-    QString themeDir = QString::fromLatin1(":/client/theme/%1/")
-            .arg(Theme::instance()->systrayIconFlavor(true));
-    _ui->monoIconsCheckBox->setVisible(QDir(themeDir).exists());
+    _ui->monoIconsCheckBox->setVisible(Theme::instance()->monoIconsAvailable());
 
     connect(_ui->ignoredFilesButton, SIGNAL(clicked()), SLOT(slotIgnoreFilesEditor()));
 

diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index 0681ebbed015f062a5b9413c5d4fa4e64b6e6d13..2f7b288a745ac0538497c8fb5d47945ff27e7786 100644 (file)
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -265,6 +265,12 @@ bool Theme::systrayUseMonoIcons() const
     return _mono;
 }
 
+bool Theme::monoIconsAvailable() const
+{
+    QString themeDir = QString::fromLatin1(":/client/theme/%1/").arg(Theme::instance()->systrayIconFlavor(true));
+    return QDir(themeDir).exists();
+}
+
 QString Theme::updateCheckUrl() const
 {
     return QLatin1String("https://updates.owncloud.com/client/");

diff --git a/src/libsync/theme.h b/src/libsync/theme.h
index a3632fb7096730c2771c34308e029df1e676e82d..a3fd81c70890038debb1d93afa7a006b8b4108e3 100644 (file)
--- a/src/libsync/theme.h
+++ b/src/libsync/theme.h
@@ -201,6 +201,11 @@ public:
      */
     bool systrayUseMonoIcons() const;
 
+    /**
+     * Check if mono icons are available
+     */
+    bool monoIconsAvailable() const;
+
     /**
      * @brief Where to check for new Updates.
      */