diff options
| -rw-r--r-- | cmake/modules/OCGenerateTheme.cmake | 2 | ||||
| -rw-r--r-- | core_theme.qrc | 2 | ||||
| -rw-r--r-- | src/gui/aboutdialog.ui | 2 | ||||
| -rw-r--r-- | src/gui/wizard/owncloudadvancedsetuppage.ui | 2 | ||||
| -rw-r--r-- | src/libsync/owncloudtheme.cpp | 4 | ||||
| -rw-r--r-- | src/libsync/theme.cpp | 9 |
6 files changed, 9 insertions, 12 deletions
diff --git a/cmake/modules/OCGenerateTheme.cmake b/cmake/modules/OCGenerateTheme.cmake index 158454edb..91010e6ad 100644 --- a/cmake/modules/OCGenerateTheme.cmake +++ b/cmake/modules/OCGenerateTheme.cmake @@ -16,7 +16,7 @@ endfunction() function(generate_theme TARGET) if(NOT "${OEM_THEME_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}") set(QRC ${CMAKE_BINARY_DIR}/theme.qrc) - file(WRITE "${QRC}" "<RCC>\n<qresource prefix=\"/client\">\n") + file(WRITE "${QRC}" "<RCC>\n<qresource prefix=\"/client/${APPLICATION_SHORTNAME}\">\n") __addIcon("colored" "${APPLICATION_SHORTNAME}-icon") set(STATES "ok;error;information;offline;pause;sync") diff --git a/core_theme.qrc b/core_theme.qrc index a62eebb20..a266f6735 100644 --- a/core_theme.qrc +++ b/core_theme.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/client/core"> + <qresource prefix="/client/ownCloud"> <file alias="theme/black/state-ok.svg">theme/black/ui-light-plain-monochrom-state-checkmark.svg</file> <file alias="theme/black/state-error.svg">theme/black/ui-light-plain-monochrom-state-error.svg</file> <file alias="theme/black/state-information.svg">theme/black/ui-light-plain-monochrom-state-info.svg</file> diff --git a/src/gui/aboutdialog.ui b/src/gui/aboutdialog.ui index e2cc10e17..833f1ffe0 100644 --- a/src/gui/aboutdialog.ui +++ b/src/gui/aboutdialog.ui @@ -57,7 +57,7 @@ <string notr="true"/> </property> <property name="pixmap"> - <pixmap resource="../../core_theme.qrc">:/client/core/theme/colored/owncloud-icon.svg</pixmap> + <pixmap resource="../../core_theme.qrc">:/client/ownCloud/theme/colored/owncloud-icon.svg</pixmap> </property> </widget> </item> diff --git a/src/gui/wizard/owncloudadvancedsetuppage.ui b/src/gui/wizard/owncloudadvancedsetuppage.ui index 09dbb80b9..32fbc0e9e 100644 --- a/src/gui/wizard/owncloudadvancedsetuppage.ui +++ b/src/gui/wizard/owncloudadvancedsetuppage.ui @@ -70,7 +70,7 @@ <string/> </property> <property name="pixmap"> - <pixmap>:/client/core/theme/colored/owncloud-icon.svg</pixmap> + <pixmap>:/client/ownCloud/theme/colored/owncloud-icon.svg</pixmap> </property> <property name="scaledContents"> <bool>true</bool> diff --git a/src/libsync/owncloudtheme.cpp b/src/libsync/owncloudtheme.cpp index 9e3061944..3650bb6ee 100644 --- a/src/libsync/owncloudtheme.cpp +++ b/src/libsync/owncloudtheme.cpp @@ -58,12 +58,12 @@ QColor ownCloudTheme::wizardHeaderSubTitleColor() const QIcon ownCloudTheme::wizardHeaderLogo() const { - return QIcon(QStringLiteral(":/client/core/theme/colored/wizard_logo.svg")); + return QIcon(QStringLiteral(":/client/ownCloud/theme/colored/wizard_logo.svg")); } QIcon ownCloudTheme::aboutIcon() const { - return QIcon(QStringLiteral(":/client/core/theme/colored/oc-image-about.svg")); + return QIcon(QStringLiteral(":/client/ownCloud/theme/colored/oc-image-about.svg")); } #endif diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp index be7993cb5..9605ee168 100644 --- a/src/libsync/theme.cpp +++ b/src/libsync/theme.cpp @@ -161,7 +161,7 @@ QIcon Theme::themeIcon(const QString &name, bool sysTray, bool sysTrayMenuVisibl flavor = QStringLiteral("colored"); } } - const QString path = useCoreIcon ? QStringLiteral(":/client/core/theme") : QStringLiteral(":/client/theme"); + const QString path = useCoreIcon ? QStringLiteral(":/client/ownCloud/theme") : QStringLiteral(":/client/%1/theme").arg(appName()); const QString key = name + QLatin1Char(',') + flavor; QIcon &cached = _iconCache[key]; // Take reference, this will also "set" the cache entry if (cached.isNull()) { @@ -207,10 +207,7 @@ QIcon Theme::themeIcon(const QString &name, bool sysTray, bool sysTrayMenuVisibl bool Theme::hasTheme(const QString &theme) { - if (isVanilla()) { - return QFileInfo(QStringLiteral(":/client/core/theme/%1/").arg(theme)).isDir(); - } - return QFileInfo(QStringLiteral(":/client/theme/%1/").arg(theme)).isDir(); + return QFileInfo(QStringLiteral(":/client/" APPLICATION_SHORTNAME "/theme/%1/").arg(theme)).isDir(); } QString Theme::systrayIconFlavor(bool mono, bool sysTrayMenuVisible) const @@ -425,7 +422,7 @@ QVariant Theme::customMedia(CustomMediaType type) break; } - QString imgPath = QStringLiteral(":/client/theme/colored/%1.png").arg(key); + QString imgPath = QStringLiteral(":/client/%1/theme/colored/%2.png").arg(appName(), key); if (QFile::exists(imgPath)) { QPixmap pix(imgPath); if (pix.isNull()) { |