From bf40e0aafcd8e5236bfbe84df6a9edc81b0d3d2a Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Mon, 28 Nov 2011 14:53:34 +0100 Subject: [PATCH] - added icon defaults for systems without icon theming bnc#730834 - fixed some bugs with ownCloud status check fails - bumped version to 0.1.2 --- mirall.qrc | 10 +++++++- resources/dialog-cancel.png | Bin 0 -> 3809 bytes resources/dialog-close.png | Bin 0 -> 3751 bytes resources/dialog-ok.png | Bin 0 -> 1948 bytes resources/folder-favorites.png | Bin 0 -> 1312 bytes resources/folder-grey.png | Bin 1331 -> 668 bytes resources/folder-important.png | Bin 0 -> 1279 bytes resources/folder-sync.png | Bin 0 -> 1058 bytes resources/view-refresh.png | Bin 0 -> 3743 bytes src/mirall/application.cpp | 10 ++++---- src/mirall/createanowncloudpage.ui | 2 +- src/mirall/folder.cpp | 9 +++---- src/mirall/folderwizard.cpp | 13 +++++++--- src/mirall/folderwizardtargetpage.ui | 6 ++--- src/mirall/owncloudinfo.cpp | 36 ++++++++++++++------------- src/mirall/owncloudinfo.h | 2 -- src/mirall/owncloudwizard.cpp | 1 - src/mirall/statusdialog.cpp | 2 +- src/mirall/statusdialog.ui | 2 +- src/mirall/version.h | 6 +++-- 20 files changed, 56 insertions(+), 43 deletions(-) create mode 100644 resources/dialog-cancel.png create mode 100644 resources/dialog-close.png create mode 100644 resources/dialog-ok.png create mode 100644 resources/folder-favorites.png create mode 100644 resources/folder-important.png create mode 100644 resources/folder-sync.png create mode 100644 resources/view-refresh.png diff --git a/mirall.qrc b/mirall.qrc index 05db6b7c1..fadefa41a 100644 --- a/mirall.qrc +++ b/mirall.qrc @@ -1,5 +1,5 @@ - + resources/mirall-32.png resources/mirall-64.png resources/mirall-128.png @@ -11,5 +11,13 @@ resources/mirall-48.png resources/folder-grey-48.png resources/folder-remote-48.png + resources/dialog-close.png + resources/dialog-ok.png + resources/dialog-cancel.png + resources/view-refresh.png + resources/folder-favorites.png + resources/folder-sync.png + resources/folder-important.png + resources/folder-grey.png diff --git a/resources/dialog-cancel.png b/resources/dialog-cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..fd285bc5c0b0342ebbac2dd5339e191d1ef18ef0 GIT binary patch literal 3809 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 Xf;YdHLVvB600000NkvXXu0mjf9PBv3 literal 0 HcmV?d00001 diff --git a/resources/dialog-close.png b/resources/dialog-close.png new file mode 100644 index 0000000000000000000000000000000000000000..8d7f19f2bfaeebc8e3b7d043f7cf9a4996a927e2 GIT binary patch literal 3751 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 RP}2Ya002ovPDHLkV1o2x>zM!m literal 0 HcmV?d00001 diff --git a/resources/dialog-ok.png b/resources/dialog-ok.png new file mode 100644 index 0000000000000000000000000000000000000000..391434035976f07550d1927dd79a8ee7bbc5e98c GIT binary patch literal 1948 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 literal 0 HcmV?d00001 diff --git a/resources/folder-sync.png b/resources/folder-sync.png new file mode 100644 index 0000000000000000000000000000000000000000..ea69c3bb45dd1a4820e7d12e2d72d19eadd71c08 GIT binary patch literal 1058 zcmV+-1l{|IP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L011Qu011Qvs^VjL00007bV*G`2ipY# z3pgb44Yqs$00W{)L_t(I%f*%5i&a$^#((eHYtNbEsN?uKjcFM{LZAdeQV2mwUUd`^-$21<{7J z7khoYpU?Ab_`jZ$XFmB?_w3~9kG~pKdNdelya-4lPL%BrP9LB7r$(PU^AUFZwRiQz zlTTw_5rF(MLQ(MPXY(q`XaEvK1DCKh6GHV~FmRwO%Z2w}e`!(q~GiC$HJ{5u6FOx?e-Y;ySN1gTCek9wa@L=@AOx? zBt*0vq1XGydS4{b-m!)2H(LC7Hm<}9E2o5)mKh%;K1Ctq~xRw zNo#A=4ja*^WcuamZ>{+7kt4kH{4qL%QSRG@$7Ni<(cy;+H}icndc6Uwqaia}r%4ix zi3x($HTFbOu=8JkF&(?T#5doy@Z@VXvjEAV47q;72*Bd)Hlx9S>6vW^nA<+Z8*jfy zQ3T2udEwb(1OESgkZ{sDmRdk^!HhAxQyjahvZ_@WD}H8VS*S7_V1nJ?743-0_M57ff|!2M}>>Z zg*-zokk^V>((Uyb42KLx74E`4@yz3oF}r&YTQ+ZH>2^C~+C}gh;FX+I56P+IRGvqY zGu7OL<6OLana}6v*|n|7pX~vieuamE%~MSXMy0iYGMjLagA1zqdpz91lXGC-y>xp$ zLI`+r3gsp*x7%!LG?{2Lsgoy$V1y!KHHPB`hK)5L8uW)l&R@DfRi%vKqQHwtZ>2-3 zM(o_Nn?_k;p}@?rgD<|N#?;IjhrA{Tw$7|-aJ~hFX9n-mi>#~KY6-!_e^A~<42o&;K49489ZM8UM6bL9nfm*A?`|jS!;Rhce zB~ehr$a2(agOjo*jmQ}HF{5pRZV0R>xMJ6cE4|U+X6w%65K$H|OfUtcP#-iHdNww8 zSPH7Ju5MMWN~M8YU~#FlVlZ<*dk>x>$PfWM)XWIA+H9CLrl^BChOm&bJM)^eV(I!j c|JlFtF9d=lEV`j0NdN!<07*qoM6N<$f{)z#lmGw# literal 0 HcmV?d00001 diff --git a/resources/view-refresh.png b/resources/view-refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..0b08b2388ea8a02dbbaed5126010b42b75797cdc GIT binary patch literal 3743 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 JPDHLkV1mXr+o%8l literal 0 HcmV?d00001 diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp index 019812277..e276594d2 100644 --- a/src/mirall/application.cpp +++ b/src/mirall/application.cpp @@ -118,7 +118,7 @@ void Application::setupActions() void Application::setupSystemTray() { _tray = new QSystemTrayIcon(this); - _tray->setIcon(QIcon::fromTheme(FOLDER_ICON_EMPTY)); + _tray->setIcon(QIcon::fromTheme(FOLDER_ICON_EMPTY, QIcon( QString( ":/mirall/resources/%1").arg(FOLDER_ICON_EMPTY)))); connect(_tray,SIGNAL(activated(QSystemTrayIcon::ActivationReason)), SLOT(slotTrayClicked(QSystemTrayIcon::ActivationReason))); @@ -306,7 +306,7 @@ void Application::setupKnownFolders() foreach (QString file, list) { setupFolderFromConfigFile(file); } - if( list.size() ) _tray->setIcon(QIcon::fromTheme(FOLDER_ICON)); + if( list.size() ) _tray->setIcon(QIcon::fromTheme(FOLDER_ICON, QIcon( QString( ":/mirall/resources/%1").arg(FOLDER_ICON)))); } // filename is the name of the file only, it does not include @@ -385,7 +385,7 @@ void Application::slotFolderSyncStarted() _folderSyncCount++; if (_folderSyncCount > 0) { - _tray->setIcon(QIcon::fromTheme(FOLDER_SYNC_ICON)); + _tray->setIcon(QIcon::fromTheme(FOLDER_SYNC_ICON, QIcon( QString( ":/mirall/resources/%1").arg(FOLDER_SYNC_ICON)))); } } @@ -397,13 +397,13 @@ void Application::slotFolderSyncFinished(const SyncResult &result) if (_folderSyncCount < 1) { if (result.result() == SyncResult::Success) { - _tray->setIcon(QIcon::fromTheme(FOLDER_ICON)); + _tray->setIcon(QIcon::fromTheme(FOLDER_ICON, QIcon( QString( ":/mirall/resources/%1").arg(FOLDER_ICON)))); //_tray->showMessage(tr("Folder %1").arg(folder->alias()), // tr("Synchronization successfull"), // QSystemTrayIcon::Information); } else { - _tray->setIcon(QIcon::fromTheme(FOLDER_SYNC_ERROR)); + _tray->setIcon(QIcon::fromTheme(FOLDER_SYNC_ERROR, QIcon( QString( ":/mirall/resources/%1").arg(FOLDER_SYNC_ERROR)))); _tray->showMessage(tr("Folder %1").arg(folder->alias()), result.errorString(), /* tr("Synchronization did not finish successfully"), */ diff --git a/src/mirall/createanowncloudpage.ui b/src/mirall/createanowncloudpage.ui index d56e963be..c65a28864 100644 --- a/src/mirall/createanowncloudpage.ui +++ b/src/mirall/createanowncloudpage.ui @@ -22,7 +22,7 @@ - :/new/mirall/resources/mirall-32.png + :/mirall/resources/mirall-32.png diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index 62b3051a2..c30ec4bf9 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -40,9 +40,9 @@ Folder::Folder(const QString &alias, const QString &path, QObject *parent) _online(false), _enabled(true) { - _openAction = new QAction(QIcon::fromTheme(FOLDER_ICON), path, this); + _openAction = new QAction(QIcon::fromTheme(FOLDER_ICON, QIcon( QString( ":/mirall/resources/%1").arg(FOLDER_ICON))), path, this); _openAction->setIconVisibleInMenu(true); - _openAction->setIcon(QIcon::fromTheme(FOLDER_ICON)); + _openAction->setIcon(QIcon::fromTheme(FOLDER_ICON, QIcon( QString( ":/mirall/resources/%1").arg(FOLDER_ICON)))); QObject::connect(_openAction, SIGNAL(triggered(bool)), SLOT(slotOpenFolder())); @@ -198,13 +198,12 @@ void Folder::slotSyncStarted() { // disable events until syncing is done _watcher->setEventsEnabled(false); - _openAction->setIcon(QIcon::fromTheme(FOLDER_SYNC_ICON)); + _openAction->setIcon(QIcon::fromTheme(FOLDER_SYNC_ICON, QIcon( QString( ":/mirall/resources/%1").arg(FOLDER_SYNC_ICON)))); } void Folder::slotSyncFinished(const SyncResult &result) { _lastSyncResult = result; - qDebug() << "XX got a sync result: " << _lastSyncResult.result()<< " for folder " << this ; bool enabled = ( result.result() == SyncResult::Success ); setSyncEnabled( enabled ); @@ -236,7 +235,7 @@ QIcon Folder::icon( int size ) const if( _backend == "unison" ) name = QString( "folder-%1.png" ).arg(size); if( _backend == "csync" ) name = QString("folder-remote-%1.png").arg(size); - return QIcon( QString( ":/new/mirall/resources/%1").arg(name) ); + return QIcon( QString( ":/mirall/resources/%1").arg(name) ); } QString Folder::backend() const diff --git a/src/mirall/folderwizard.cpp b/src/mirall/folderwizard.cpp index 02e48c686..13cb0ee99 100644 --- a/src/mirall/folderwizard.cpp +++ b/src/mirall/folderwizard.cpp @@ -217,6 +217,7 @@ void FolderWizardTargetPage::slotCreateRemoteFolder() OwncloudSetup ocSetup; QString url = ocSetup.ownCloudUrl(); + if( ! url.endsWith('/')) url.append('/'); url.append( "files/webdav.php/"); url.append( folder ); qDebug() << "creating folder on ownCloud: " << url; @@ -299,15 +300,19 @@ void FolderWizardTargetPage::initializePage() void FolderWizardTargetPage::slotOwnCloudFound( const QString& url, const QString& infoStr ) { - - _ui.OCLabel->setText( tr("to your ownCloud (version %2)").arg(url).arg(infoStr)); - - qDebug() << "ownCloud found on " << url << " with version: " << infoStr; + if( infoStr.isEmpty() ) { + } else { + _ui.OCLabel->setText( tr("to your ownCloud (version %2)").arg(url).arg(infoStr)); + _ui.OCFolderLineEdit->setEnabled( true ); + _ui.OCRadioBtn->setEnabled( true ); + qDebug() << "ownCloud found on " << url << " with version: " << infoStr; + } } void FolderWizardTargetPage::slotNoOwnCloudFound() { qDebug() << "No ownCloud configured!"; + _ui.OCLabel->setText( tr("no configured ownCloud found!") ); _ui.OCRadioBtn->setEnabled( false ); _ui.OCFolderLineEdit->setEnabled( false ); } diff --git a/src/mirall/folderwizardtargetpage.ui b/src/mirall/folderwizardtargetpage.ui index 2d4297d4f..44f140862 100644 --- a/src/mirall/folderwizardtargetpage.ui +++ b/src/mirall/folderwizardtargetpage.ui @@ -105,7 +105,7 @@ - :/new/mirall/resources/mirall-48.png + :/mirall/resources/mirall-48.png @@ -133,7 +133,7 @@ - :/new/mirall/resources/folder-grey-32.png + :/mirall/resources/folder-grey-32.png Qt::AlignCenter @@ -207,7 +207,7 @@ - :/new/mirall/resources/folder-remote-32.png + :/mirall/resources/folder-remote-32.png Qt::AlignCenter diff --git a/src/mirall/owncloudinfo.cpp b/src/mirall/owncloudinfo.cpp index 84d2e4106..2824bfcd4 100644 --- a/src/mirall/owncloudinfo.cpp +++ b/src/mirall/owncloudinfo.cpp @@ -88,33 +88,35 @@ void ownCloudInfo::slotAuthentication( QNetworkReply*, QAuthenticator *auth ) } } - void ownCloudInfo::slotReplyFinished( QNetworkReply *reply ) { const QString version( _readBuffer ); const QString url = reply->url().toString(); - emit ownCloudInfoReply( url, reply->error() ); - QString info( version ); - info.remove(0,1); // remove first char which is a "{" - info.remove(-1,1); // remove the last char which is a "}" - QStringList li = info.split( QChar(',') ); + if( info.contains("installed") && info.contains("version") && info.contains("versionstring") ) { + info.remove(0,1); // remove first char which is a "{" + info.remove(-1,1); // remove the last char which is a "}" + QStringList li = info.split( QChar(',') ); - QString infoString; - QString versionStr; - foreach ( infoString, li ) { - if( infoString.contains( "versionstring") ) { - // get the version string out. - versionStr = infoString.mid(17); - versionStr.remove(-1, 1); + QString infoString; + QString versionStr; + foreach ( infoString, li ) { + if( infoString.contains( "versionstring") ) { + // get the version string out. + versionStr = infoString.mid(17); + versionStr.remove(-1, 1); + } } - } - QString urlStr( url ); - urlStr.remove("/status.php"); // get the plain url. + QString urlStr( url ); + urlStr.remove("/status.php"); // get the plain url. - emit ownCloudInfoFound( urlStr, versionStr ); + emit ownCloudInfoFound( urlStr, versionStr ); + } else { + qDebug() << "No proper answer on status.php!"; + emit noOwncloudFound(); + } } void ownCloudInfo::slotReadyRead() diff --git a/src/mirall/owncloudinfo.h b/src/mirall/owncloudinfo.h index 95a4fdbf7..24cc6c014 100644 --- a/src/mirall/owncloudinfo.h +++ b/src/mirall/owncloudinfo.h @@ -40,8 +40,6 @@ signals: void ownCloudInfoFound( const QString&, const QString& ); void noOwncloudFound(); - void ownCloudInfoReply( const QString&, QNetworkReply::NetworkError ); - public slots: protected slots: diff --git a/src/mirall/owncloudwizard.cpp b/src/mirall/owncloudwizard.cpp index 5da0db00b..342af0799 100644 --- a/src/mirall/owncloudwizard.cpp +++ b/src/mirall/owncloudwizard.cpp @@ -302,7 +302,6 @@ void OwncloudWizard::slotCurrentPageChanged( int id ) // call in installation mode and install to ftp site. emit installOCServer(); } else { - qDebug() << "XX: " << field("connectMyOC").toBool(); } } } diff --git a/src/mirall/statusdialog.cpp b/src/mirall/statusdialog.cpp index 7fc185ffe..a38c6184b 100644 --- a/src/mirall/statusdialog.cpp +++ b/src/mirall/statusdialog.cpp @@ -166,7 +166,7 @@ void StatusDialog::setFolderList( Folder::Map folders ) resultStr = tr( "Setup Error" ); statusIcon = "dialog-cancel"; } - item->setData( QIcon::fromTheme( statusIcon ), FolderViewDelegate::FolderStatusIcon ); + item->setData( QIcon::fromTheme( statusIcon, QIcon( QString( ":/mirall/resources/%1").arg(statusIcon))), FolderViewDelegate::FolderStatusIcon ); item->setData( resultStr, FolderViewDelegate::FolderStatus ); item->setData( res.errorString(), FolderViewDelegate::FolderErrorMsg ); diff --git a/src/mirall/statusdialog.ui b/src/mirall/statusdialog.ui index fe25a1385..fc43daa3f 100644 --- a/src/mirall/statusdialog.ui +++ b/src/mirall/statusdialog.ui @@ -71,7 +71,7 @@ - :/new/mirall/resources/mirall-128.png:/new/mirall/resources/mirall-128.png + :/mirall/resources/mirall-128.png:/mirall/resources/mirall-128.png diff --git a/src/mirall/version.h b/src/mirall/version.h index b34876274..4463bf54c 100644 --- a/src/mirall/version.h +++ b/src/mirall/version.h @@ -10,9 +10,11 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. - */#ifndef VERSION_H + */ + +#ifndef VERSION_H #define VERSION_H -#define VERSION_STRING "0.1.1" +#define VERSION_STRING "0.1.2" #endif // VERSION_H