mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-21 20:45:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

mirall.qrc -> client.qrc

Browse source
This commit is contained in:
Daniel Molkentin 2014-12-08 18:00:29 +01:00
parent bce6d44e06
commit a2b817f0c0
13 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mirall.qrc → client.qrc
View file

@ -1,5 +1,5 @@
<RCC>
<qresource prefix="/mirall">
<qresource prefix="/client">
<file>resources/dialog-close.png</file>
<file>resources/dialog-ok.png</file>
<file>resources/dialog-cancel.png</file>

2
src/gui/folderstatusmodel.cpp
View file

@ -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 );
}

2
src/gui/generalsettings.cpp
View file

@ -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());
}

2
src/gui/main.cpp
View file

@ -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

2
src/gui/owncloudgui.cpp
View file

@ -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);
}

8
src/gui/settingsdialog.cpp
View file

@ -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;

4
src/gui/settingsdialogmac.cpp
View file

@ -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);

2
src/gui/wizard/owncloudadvancedsetuppage.cpp
View file

@ -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"));
}

4
src/gui/wizard/owncloudsetuppage.cpp
View file

@ -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."));
}
}

2
src/gui/wizard/owncloudwizardresultpage.cpp
View file

@ -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()));

2
src/libsync/owncloudtheme.cpp
View file

@ -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

6
src/libsync/theme.cpp
View file

@ -126,7 +126,7 @@ QIcon Theme::themeIcon( const QString& name, bool sysTray ) const
QList<int> 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() ) {

2
src/libsync/theme.h
View file

@ -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/<type>.png
* :/client/theme/<type>.png
*/
virtual QVariant customMedia( CustomMediaType type );