From a2b817f0c0ec00ce7755092a2d562e5535940fbf Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 8 Dec 2014 18:00:29 +0100 Subject: [PATCH] mirall.qrc -> client.qrc --- mirall.qrc => client.qrc | 2 +- src/gui/folderstatusmodel.cpp | 2 +- src/gui/generalsettings.cpp | 2 +- src/gui/main.cpp | 2 +- src/gui/owncloudgui.cpp | 2 +- src/gui/settingsdialog.cpp | 8 ++++---- src/gui/settingsdialogmac.cpp | 4 ++-- src/gui/wizard/owncloudadvancedsetuppage.cpp | 2 +- src/gui/wizard/owncloudsetuppage.cpp | 4 ++-- src/gui/wizard/owncloudwizardresultpage.cpp | 2 +- src/libsync/owncloudtheme.cpp | 2 +- src/libsync/theme.cpp | 6 +++--- src/libsync/theme.h | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) rename mirall.qrc => client.qrc (95%) diff --git a/mirall.qrc b/client.qrc similarity index 95% rename from mirall.qrc rename to client.qrc index e4787ad2d..c1a156684 100644 --- a/mirall.qrc +++ b/client.qrc @@ -1,5 +1,5 @@ - + resources/dialog-close.png resources/dialog-ok.png resources/dialog-cancel.png diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp index 32c7c803d..08fa1b4f8 100644 --- a/src/gui/folderstatusmodel.cpp +++ b/src/gui/folderstatusmodel.cpp @@ -181,7 +181,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem & warnRect.setWidth(16); warnRect.setHeight(16); - QIcon warnIcon(":/mirall/resources/warning-16"); + QIcon warnIcon(":/client/resources/warning-16"); QPixmap pm = warnIcon.pixmap(16,16, syncEnabled ? QIcon::Normal : QIcon::Disabled ); painter->drawPixmap(QPoint(warnRect.left(), warnRect.top()),pm ); } diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp index 38a566d82..2c63770d8 100644 --- a/src/gui/generalsettings.cpp +++ b/src/gui/generalsettings.cpp @@ -65,7 +65,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(":/mirall/theme/%1/") + QString themeDir = QString::fromLatin1(":/client/theme/%1/") .arg(Theme::instance()->systrayIconFlavor(true)); _ui->monoIconsCheckBox->setVisible(QDir(themeDir).exists()); } diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 4db7bcf64..546e91113 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -52,7 +52,7 @@ void warnSystray() int main(int argc, char **argv) { - Q_INIT_RESOURCE(mirall); + Q_INIT_RESOURCE(client); #ifdef Q_OS_MAC Mac::CocoaInitializer cocoaInit; // RIIA diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index cd6527caa..7e3fd8778 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -497,7 +497,7 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const Progress::Info if (Progress::isWarningKind(progress._lastCompletedItem._status)) { // display a warn icon if warnings happend. - QIcon warnIcon(":/mirall/resources/warning-16"); + QIcon warnIcon(":/client/resources/warning-16"); _actionRecent->setIcon(warnIcon); } diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp index 99f3614d3..550faa067 100644 --- a/src/gui/settingsdialog.cpp +++ b/src/gui/settingsdialog.cpp @@ -68,24 +68,24 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) : setWindowTitle(Theme::instance()->appNameGUI()); - QIcon accountIcon(QLatin1String(":/mirall/resources/accounts.png")); + QIcon accountIcon(QLatin1String(":/client/resources/accounts.png")); QAction *accountAction = toolBar->addAction(accountIcon, tr("Account")); accountAction->setCheckable(true); _ui->stack->addWidget(_accountSettings); - QIcon protocolIcon(QLatin1String(":/mirall/resources/activity.png")); + QIcon protocolIcon(QLatin1String(":/client/resources/activity.png")); _protocolAction = toolBar->addAction(protocolIcon, tr("Activity")); _protocolAction->setCheckable(true); ProtocolWidget *protocolWidget = new ProtocolWidget; _ui->stack->addWidget(protocolWidget); - QIcon generalIcon(QLatin1String(":/mirall/resources/settings.png")); + QIcon generalIcon(QLatin1String(":/client/resources/settings.png")); QAction *generalAction = toolBar->addAction(generalIcon, tr("General")); generalAction->setCheckable(true); GeneralSettings *generalSettings = new GeneralSettings; _ui->stack->addWidget(generalSettings); - QIcon networkIcon(QLatin1String(":/mirall/resources/network.png")); + QIcon networkIcon(QLatin1String(":/client/resources/network.png")); QAction *networkAction = toolBar->addAction(networkIcon, tr("Network")); networkAction->setCheckable(true); NetworkSettings *networkSettings = new NetworkSettings; diff --git a/src/gui/settingsdialogmac.cpp b/src/gui/settingsdialogmac.cpp index e7030cd85..4fb0a149b 100644 --- a/src/gui/settingsdialogmac.cpp +++ b/src/gui/settingsdialogmac.cpp @@ -63,10 +63,10 @@ SettingsDialogMac::SettingsDialogMac(ownCloudGui *gui, QWidget *parent) setWindowTitle(tr("%1").arg(Theme::instance()->appNameGUI())); _accountSettings = new AccountSettings; - QIcon accountIcon(QLatin1String(":/mirall/resources/accounts.png")); + QIcon accountIcon(QLatin1String(":/client/resources/accounts.png")); addPreferencesPanel(accountIcon, tr("Account"), _accountSettings); - QIcon protocolIcon(QLatin1String(":/mirall/resources/activity.png")); + QIcon protocolIcon(QLatin1String(":/client/resources/activity.png")); _protocolWidget = new ProtocolWidget; _protocolIdx = addPreferencesPanel(protocolIcon, tr("Activity"), _protocolWidget); diff --git a/src/gui/wizard/owncloudadvancedsetuppage.cpp b/src/gui/wizard/owncloudadvancedsetuppage.cpp index 89ae0b814..6b097d355 100644 --- a/src/gui/wizard/owncloudadvancedsetuppage.cpp +++ b/src/gui/wizard/owncloudadvancedsetuppage.cpp @@ -66,7 +66,7 @@ OwncloudAdvancedSetupPage::OwncloudAdvancedSetupPage() _ui.lServerIcon->setText(QString()); _ui.lServerIcon->setPixmap(appIcon.pixmap(48)); _ui.lLocalIcon->setText(QString()); - _ui.lLocalIcon->setPixmap(QPixmap(":/mirall/resources/folder-sync.png")); + _ui.lLocalIcon->setPixmap(QPixmap(":/client/resources/folder-sync.png")); } diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp index 5eddacf7d..1b3d00cb5 100644 --- a/src/gui/wizard/owncloudsetuppage.cpp +++ b/src/gui/wizard/owncloudsetuppage.cpp @@ -102,11 +102,11 @@ void OwncloudSetupPage::slotUrlChanged(const QString& url) } if (url.startsWith(QLatin1String("http://"))) { - _ui.urlLabel->setPixmap( QPixmap(":/mirall/resources/lock-http.png")); + _ui.urlLabel->setPixmap( QPixmap(":/client/resources/lock-http.png")); _ui.urlLabel->setToolTip(tr("This url is NOT secure as it is not encrypted.\n" "It is not advisable to use it.")); } else { - _ui.urlLabel->setPixmap( QPixmap(":/mirall/resources/lock-https.png")); + _ui.urlLabel->setPixmap( QPixmap(":/client/resources/lock-https.png")); _ui.urlLabel->setToolTip(tr("This url is secure. You can use it.")); } } diff --git a/src/gui/wizard/owncloudwizardresultpage.cpp b/src/gui/wizard/owncloudwizardresultpage.cpp index 30d0f9fed..7c319925d 100644 --- a/src/gui/wizard/owncloudwizardresultpage.cpp +++ b/src/gui/wizard/owncloudwizardresultpage.cpp @@ -40,7 +40,7 @@ OwncloudWizardResultPage::OwncloudWizardResultPage() setSubTitle( QLatin1String(" ") ); _ui.pbOpenLocal->setText(tr("Open Local Folder")); - _ui.pbOpenLocal->setIcon(QIcon(":/mirall/resources/folder-sync.png")); + _ui.pbOpenLocal->setIcon(QIcon(":/client/resources/folder-sync.png")); _ui.pbOpenLocal->setIconSize(QSize(48, 48)); _ui.pbOpenLocal->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); connect(_ui.pbOpenLocal, SIGNAL(clicked()), SLOT(slotOpenLocal())); diff --git a/src/libsync/owncloudtheme.cpp b/src/libsync/owncloudtheme.cpp index d2711cb17..bdedd0975 100644 --- a/src/libsync/owncloudtheme.cpp +++ b/src/libsync/owncloudtheme.cpp @@ -108,7 +108,7 @@ QColor ownCloudTheme::wizardHeaderTitleColor() const QPixmap ownCloudTheme::wizardHeaderLogo() const { - return QPixmap(":/mirall/theme/colored/wizard_logo.png"); + return QPixmap(":/client/theme/colored/wizard_logo.png"); } #endif diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp index 6b33986c3..ea335b5cf 100644 --- a/src/libsync/theme.cpp +++ b/src/libsync/theme.cpp @@ -126,7 +126,7 @@ QIcon Theme::themeIcon( const QString& name, bool sysTray ) const QList sizes; sizes <<16 << 22 << 32 << 48 << 64 << 128; foreach (int size, sizes) { - QString pixmapName = QString::fromLatin1(":/mirall/theme/%1/%2-%3.png").arg(flavor).arg(name).arg(size); + QString pixmapName = QString::fromLatin1(":/client/theme/%1/%2-%3.png").arg(flavor).arg(name).arg(size); if (QFile::exists(pixmapName)) { QPixmap px(pixmapName); // HACK, get rid of it by supporting FDO icon themes, this is really just emulating ubuntu-mono @@ -141,7 +141,7 @@ QIcon Theme::themeIcon( const QString& name, bool sysTray ) const } if (icon.isNull()) { foreach (int size, sizes) { - QString pixmapName = QString::fromLatin1(":/mirall/resources/%1-%2.png").arg(name).arg(size); + QString pixmapName = QString::fromLatin1(":/client/resources/%1-%2.png").arg(name).arg(size); if (QFile::exists(pixmapName)) { icon.addFile(pixmapName); } @@ -259,7 +259,7 @@ QVariant Theme::customMedia( CustomMediaType type ) break; } - QString imgPath = QString::fromLatin1(":/mirall/theme/colored/%1.png").arg(key); + QString imgPath = QString::fromLatin1(":/client/theme/colored/%1.png").arg(key); if ( QFile::exists( imgPath ) ) { QPixmap pix( imgPath ); if( pix.isNull() ) { diff --git a/src/libsync/theme.h b/src/libsync/theme.h index d1ead5fd8..982ac86c6 100644 --- a/src/libsync/theme.h +++ b/src/libsync/theme.h @@ -137,7 +137,7 @@ public: /** * Override to use a string or a custom image name. * The default implementation will try to look up - * :/mirall/theme/.png + * :/client/theme/.png */ virtual QVariant customMedia( CustomMediaType type );