Refactor icon handling and move most of the code to the resources lib

Author: TheOneRing

src/gui/activitywidget.cpp

@@ -469,10 +469,10 @@ ActivitySettings::ActivitySettings(QWidget *parent)
     connect(_activityWidget, &ActivityWidget::newNotification, this, &ActivitySettings::slotShowActivityTab);
 
     _protocolWidget = new ProtocolWidget(this);
-    _protocolTabId = _tab->addTab(_protocolWidget, Theme::instance()->syncStateIcon(SyncResult::Success), tr("Sync Protocol"));
+    _protocolTabId = _tab->addTab(_protocolWidget, Resources::getCoreIcon(QStringLiteral("states/ok")), tr("Sync Protocol"));
 
     _issuesWidget = new IssuesWidget(this);
-    _syncIssueTabId = _tab->addTab(_issuesWidget, Theme::instance()->syncStateIcon(SyncResult::Problem), QString());
+    _syncIssueTabId = _tab->addTab(_issuesWidget, Resources::getCoreIcon(QStringLiteral("states/error")), QString());
     slotShowIssueItemCount(0); // to display the label.
     connect(_issuesWidget, &IssuesWidget::issueCountUpdated,
         this, &ActivitySettings::slotShowIssueItemCount);

src/gui/folderstatusdelegate.cpp

@@ -142,7 +142,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
         const auto iconVisualRect = QStyle::visualRect(option.direction, option.rect, iconRect.toRect());
         spaceImage.paint(painter, iconVisualRect, Qt::AlignCenter, iconState);
         // paint the overlay in NormalState, on mac os disabled icons have an alpha channel, drawing semi transparent icons on top of each other...
-        Theme::instance()->themeIcon(QStringLiteral("states/%1").arg(statusIconName)).paint(painter, iconVisualRect, Qt::AlignCenter, QIcon::Normal);
+        Resources::getCoreIcon(QStringLiteral("states/%1").arg(statusIconName)).paint(painter, iconVisualRect, Qt::AlignCenter, QIcon::Normal);
     }
 
     // only show the warning icon if the sync is running. Otherwise its

src/gui/generalsettings.cpp

@@ -86,7 +86,7 @@ GeneralSettings::GeneralSettings(QWidget *parent)
 
     // OEM themes are not obliged to ship mono icons, so there
     // is no point in offering an option
-    _ui->monoIconsCheckBox->setVisible(Theme::instance()->monoIconsAvailable());
+    _ui->monoIconsCheckBox->setVisible(Resources::hasMonoTheme());
 
     connect(_ui->ignoredFilesButton, &QAbstractButton::clicked, this, &GeneralSettings::slotIgnoreFilesEditor);
     connect(_ui->logSettingsButton, &QPushButton::clicked, this, [] {

src/gui/models/protocolitemmodel.cpp

@@ -84,11 +84,11 @@ QVariant ProtocolItemModel::data(const QModelIndex &index, int role) const
                 || status == SyncFileItem::FatalError
                 || status == SyncFileItem::DetailError
                 || status == SyncFileItem::BlacklistedError) {
-                return Theme::instance()->syncStateIcon(SyncResult::Error);
+                return Resources::themeIcon(Theme::instance()->syncStateIconName(SyncResult{SyncResult::Error}));
             } else if (Progress::isWarningKind(status) || status == SyncFileItem::Excluded) {
-                return Theme::instance()->syncStateIcon(SyncResult::Problem);
+                return Resources::themeIcon(Theme::instance()->syncStateIconName(SyncResult{SyncResult::Problem}));
             } else {
-                return Theme::instance()->syncStateIcon(SyncResult::Success);
+                return Resources::themeIcon(Theme::instance()->syncStateIconName(SyncResult{SyncResult::Success}));
             }
         }
         break;

src/gui/owncloudgui.cpp

@@ -120,15 +120,14 @@ ownCloudGui::ownCloudGui(Application *parent)
     , _recentActionsMenu(nullptr)
     , _app(parent)
 {
-    // for the beginning, set the offline icon until the account was verified
-    _tray->setIcon(Theme::instance()->syncStateIcon(SyncResult::Status::Offline, true, false));
-
     connect(_tray, &QSystemTrayIcon::activated,
         this, &ownCloudGui::slotTrayClicked);
 
     setupActions();
     setupContextMenu();
 
+    // init systry
+    slotComputeOverallSyncStatus();
     _tray->show();
 
     ProgressDispatcher *pd = ProgressDispatcher::instance();
@@ -238,6 +237,8 @@ void ownCloudGui::slotTrayMessageIfServerUnsupported(Account *account)
 
 void ownCloudGui::slotComputeOverallSyncStatus()
 {
+    auto getIcon = [this](const SyncResult &result) { return Theme::instance()->themeTrayIcon(result, contextMenuVisible()); };
+    auto getIconFromStatus = [getIcon, this](const SyncResult::Status &status) { return getIcon(SyncResult{status}); };
     bool allSignedOut = true;
     bool allPaused = true;
     bool allDisconnected = true;
@@ -268,7 +269,7 @@ void ownCloudGui::slotComputeOverallSyncStatus()
     }
 
     if (!problemAccounts.empty()) {
-        _tray->setIcon(Theme::instance()->syncStateIcon(SyncResult::Status::Offline, true, contextMenuVisible()));
+        _tray->setIcon(getIconFromStatus(SyncResult::Status::Offline));
         if (allDisconnected) {
             setStatusText(tr("Disconnected"));
         } else {
@@ -297,12 +298,12 @@ void ownCloudGui::slotComputeOverallSyncStatus()
     }
 
     if (allSignedOut) {
-        _tray->setIcon(Theme::instance()->syncStateIcon(SyncResult::Status::Offline, true, contextMenuVisible()));
+        _tray->setIcon(getIconFromStatus(SyncResult::Status::Offline));
         _tray->setToolTip(tr("Please sign in"));
         setStatusText(tr("Signed out"));
         return;
     } else if (allPaused) {
-        _tray->setIcon(Theme::instance()->syncStateIcon(SyncResult::Paused, true, contextMenuVisible()));
+        _tray->setIcon(getIconFromStatus(SyncResult::Paused));
         _tray->setToolTip(tr("Account synchronization is disabled"));
         setStatusText(tr("Synchronization is paused"));
         return;
@@ -313,7 +314,7 @@ void ownCloudGui::slotComputeOverallSyncStatus()
 
     auto trayOverallStatusResult = FolderMan::trayOverallStatus(map);
 
-    const QIcon statusIcon = Theme::instance()->syncStateIcon(trayOverallStatusResult.overallStatus(), true, contextMenuVisible());
+    const QIcon statusIcon = getIcon(trayOverallStatusResult.overallStatus());
     _tray->setIcon(statusIcon);
 
     // create the tray blob message, check if we have an defined state
@@ -694,7 +695,7 @@ void ownCloudGui::updateContextMenuNeeded()
 void ownCloudGui::slotShowTrayMessage(const QString &title, const QString &msg, const QIcon &icon)
 {
     // SyncResult::Problem is returns the info icon
-    _tray->showMessage(title, msg, icon.isNull() ? Theme::instance()->syncStateIcon(SyncResult::Problem) : icon);
+    _tray->showMessage(title, msg, icon.isNull() ? Resources::getCoreIcon(QStringLiteral("states/error")) : icon);
 }
 
 void ownCloudGui::slotShowOptionalTrayMessage(const QString &title, const QString &msg, const QIcon &icon)

src/gui/settingsdialog.cpp

@@ -230,7 +230,7 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
     const auto appNameGui = Theme::instance()->appNameGUI();
 
     for (const auto &[iconName, name, url] : Theme::instance()->urlButtons()) {
-        auto urlAction = new ToolButtonAction(Theme::instance()->themeUniversalIcon(QStringLiteral("urlIcons/%1").arg(iconName)), name, this);
+        auto urlAction = new ToolButtonAction(Resources::themeUniversalIcon(QStringLiteral("urlIcons/%1").arg(iconName)), name, this);
         urlAction->setCheckable(false);
         connect(urlAction, &QAction::triggered, this, [url = url] {
             if (!QDesktopServices::openUrl(url)) {

src/libsync/CMakeLists.txt

@@ -83,11 +83,12 @@ set_target_properties(libsync PROPERTIES EXPORT_NAME SyncCore)
 target_link_libraries(libsync
     PUBLIC
         csync
+        owncloudResources
         Qt::Core
         Qt::Network
         Qt::Widgets
+
     PRIVATE
-        owncloudResources
         Qt::Concurrent
         ZLIB::ZLIB
         Qt6Keychain::Qt6Keychain

src/libsync/owncloudtheme.cpp

@@ -41,11 +41,11 @@ QColor ownCloudTheme::wizardHeaderTitleColor() const
 
 QIcon ownCloudTheme::wizardHeaderLogo() const
 {
-    return themeUniversalIcon(QStringLiteral("wizard_logo"));
+    return Resources::themeUniversalIcon(QStringLiteral("wizard_logo"));
 }
 
 QIcon ownCloudTheme::aboutIcon() const
 {
-    return themeUniversalIcon(QStringLiteral("oc-image-about"));
+    return Resources::themeUniversalIcon(QStringLiteral("oc-image-about"));
 }
 }

src/libsync/theme.cpp

@@ -35,14 +35,14 @@
 #endif
 
 namespace {
-QString vanillaThemePath()
+QString whiteTheme()
 {
-    return QStringLiteral(":/client/ownCloud/theme");
+    return QStringLiteral("white");
 }
 
-QString brandThemePath()
+QString blackTheme()
 {
-    return QStringLiteral(":/client/" APPLICATION_SHORTNAME "/theme");
+    return QStringLiteral("black");
 }
 
 QString darkTheme()
@@ -55,16 +55,6 @@ QString coloredTheme()
     return QStringLiteral("colored");
 }
 
-QString whiteTheme()
-{
-    return QStringLiteral("white");
-}
-
-QString blackTheme()
-{
-    return QStringLiteral("black");
-}
-
 constexpr bool isVanilla()
 {
     return std::string_view(APPLICATION_SHORTNAME) == "ownCloud";
@@ -118,7 +108,7 @@ QString Theme::configFileName() const
 
 QIcon Theme::applicationIcon() const
 {
-    return themeUniversalIcon(applicationIconName() + QStringLiteral("-icon"));
+    return Resources::themeUniversalIcon(applicationIconName() + QStringLiteral("-icon"));
 }
 
 QString Theme::applicationIconName() const
@@ -131,20 +121,25 @@ QIcon Theme::aboutIcon() const
     return applicationIcon();
 }
 
-bool Theme::allowDarkTheme() const
+QIcon Theme::themeTrayIcon(const SyncResult &result, bool sysTrayMenuVisible, Resources::IconType iconType) const
 {
-    return _hasBrandedColored == _hasBrandedDark;
-}
+    auto systrayIconFlavor = [&]() {
+        QString flavor;
+        if (_mono) {
+            flavor = Utility::hasDarkSystray() ? whiteTheme() : blackTheme();
 
-
-QIcon Theme::themeUniversalIcon(const QString &name, Theme::IconType iconType) const
-{
-    return loadIcon(QStringLiteral("universal"), name, iconType);
-}
-
-QIcon Theme::themeTrayIcon(const QString &name, bool sysTrayMenuVisible, IconType iconType) const
-{
-    auto icon = loadIcon(systrayIconFlavor(_mono, sysTrayMenuVisible), name, iconType);
+#ifdef Q_OS_MAC
+            if (sysTrayMenuVisible) {
+                flavor = QLatin1String("white");
+            }
+#endif
+        } else {
+            // we have a dark sys tray and the theme has support for that
+            flavor = (Utility::hasDarkSystray() && Resources::hasDarkTheme()) ? darkTheme() : coloredTheme();
+        }
+        return flavor;
+    };
+    auto icon = Resources::loadIcon(systrayIconFlavor(), QStringLiteral("state-%1").arg(syncStateIconName(result)), iconType);
 #ifdef Q_OS_MAC
     // This defines the icon as a template and enables automatic macOS color handling
     // See https://bugreports.qt.io/browse/QTBUG-42109
@@ -153,89 +148,6 @@ QIcon Theme::themeTrayIcon(const QString &name, bool sysTrayMenuVisible, IconTyp
     return icon;
 }
 
-QIcon Theme::themeIcon(const QString &name, Theme::IconType iconType) const
-{
-    return loadIcon((Resources::isUsingDarkTheme() && allowDarkTheme()) ? darkTheme() : coloredTheme(), name, iconType);
-}
-/*
- * helper to load a icon from either the icon theme the desktop provides or from
- * the apps Qt resources.
- */
-QIcon Theme::loadIcon(const QString &flavor, const QString &name, IconType iconType) const
-{
-    // prevent recusion
-    const bool useCoreIcon = (iconType == IconType::VanillaIcon) || isVanilla();
-    const QString path = useCoreIcon ? vanillaThemePath() : brandThemePath();
-    const QString key = name + QLatin1Char(',') + flavor;
-    QIcon &cached = _iconCache[key]; // Take reference, this will also "set" the cache entry
-    if (cached.isNull()) {
-        if (isVanilla() && QIcon::hasThemeIcon(name)) {
-            // use from theme
-            return cached = QIcon::fromTheme(name);
-        }
-        const QString svg = QStringLiteral("%1/%2/%3.svg").arg(path, flavor, name);
-        if (QFile::exists(svg)) {
-            return cached = QIcon(svg);
-        }
-
-        const QString png = QStringLiteral("%1/%2/%3.png").arg(path, flavor, name);
-        if (QFile::exists(png)) {
-            return cached = QIcon(png);
-        }
-
-        const QList<int> sizes {16, 22, 32, 48, 64, 128, 256, 512, 1024};
-        QString previousIcon;
-        for (int size : sizes) {
-            QString pixmapName = QStringLiteral("%1/%2/%3-%4.png").arg(path, flavor, name, QString::number(size));
-            if (QFile::exists(pixmapName)) {
-                previousIcon = pixmapName;
-                cached.addFile(pixmapName, { size, size });
-            } else if (size >= 128) {
-                if (!previousIcon.isEmpty()) {
-                    qWarning() << "Upscaling:" << previousIcon << "to" << size;
-                    cached.addPixmap(QPixmap(previousIcon).scaled({ size, size }, Qt::KeepAspectRatio, Qt::SmoothTransformation));
-                }
-            }
-        }
-    }
-    if (cached.isNull()) {
-        if (!useCoreIcon && iconType == IconType::BrandedIconWithFallbackToVanillaIcon) {
-            return loadIcon(flavor, name, IconType::VanillaIcon);
-        }
-        qWarning() << "Failed to locate the icon" << name;
-    }
-    return cached;
-}
-
-bool Theme::hasTheme(IconType type, const QString &theme) const
-{
-    const auto key = qMakePair(type != IconType::VanillaIcon, theme);
-    auto it = _themeCache.constFind(key);
-    if (it == _themeCache.cend()) {
-        return _themeCache[key] = QFileInfo(QStringLiteral("%1/%2/").arg(type == IconType::VanillaIcon ? vanillaThemePath() : brandThemePath(), theme)).isDir();
-    }
-    return it.value();
-}
-
-QString Theme::systrayIconFlavor(bool mono, bool sysTrayMenuVisible) const
-{
-    Q_UNUSED(sysTrayMenuVisible)
-    QString flavor;
-    if (mono) {
-        flavor = Utility::hasDarkSystray() ? whiteTheme() : blackTheme();
-
-#ifdef Q_OS_MAC
-        if (sysTrayMenuVisible) {
-            flavor = QLatin1String("white");
-        }
-#endif
-    } else {
-        // we have a dark sys tray and the theme has support for that
-        flavor = (Utility::hasDarkSystray() && allowDarkTheme()) ? darkTheme() : coloredTheme();
-    }
-    return flavor;
-}
-
 Theme::Theme()
     : QObject(nullptr)
 {
@@ -305,13 +217,6 @@ bool Theme::systrayUseMonoIcons() const
     return _mono;
 }
 
-bool Theme::monoIconsAvailable() const
-{
-    // mono icons are only supported in vanilla and if a customer provides them
-    // no fallback to vanilla
-    return hasTheme(IconType::BrandedIcon, systrayIconFlavor(true));
-}
-
 QUrl Theme::updateCheckUrl() const
 {
     return QUrl(QStringLiteral(APPLICATION_UPDATE_URL));
@@ -445,25 +350,6 @@ QString Theme::syncStateIconName(const SyncResult &result) const
     Q_UNREACHABLE();
 }
 
-QIcon Theme::syncStateIcon(SyncResult::Status status, bool sysTray, bool sysTrayMenuVisible) const
-{
-    return syncStateIcon(SyncResult{status}, sysTray, sysTrayMenuVisible);
-}
-
-QIcon Theme::syncStateIcon(const SyncResult &result, bool sysTray, bool sysTrayMenuVisible) const
-{
-    return syncStateIcon(QStringLiteral("state-%1").arg(syncStateIconName(result)), sysTray, sysTrayMenuVisible);
-}
-
-QIcon Theme::syncStateIcon(const QString &iconName, bool sysTray, bool sysTrayMenuVisible) const
-{
-    if (sysTray) {
-        return themeTrayIcon(iconName, sysTrayMenuVisible);
-    } else {
-        return themeIcon(iconName);
-    }
-}
-
 QColor Theme::wizardHeaderTitleColor() const
 {
     return qApp->palette().text().color();