Hello community, here is the log from the commit of package mirall for openSUSE:Factory checked in at 2011-12-01 12:24:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mirall (Old) and /work/SRC/openSUSE:Factory/.mirall.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mirall", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/mirall/mirall.changes 2011-11-24 11:36:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mirall.new/mirall.changes 2011-12-01 12:24:41.000000000 +0100 @@ -1,0 +2,25 @@ +Tue Nov 29 10:57:27 UTC 2011 - [email protected] + +- removed .git files from tarball + +------------------------------------------------------------------- +Mon Nov 28 16:11:04 UTC 2011 - [email protected] + +- fixed changes file to correct bug fixed format bnc... as this + confuses scripts + +------------------------------------------------------------------- +Mon Nov 28 15:20:03 UTC 2011 - [email protected] + +- update to version 0.1.2 +- added icon defaults for systems without icon theming bnc#730834 +- fixed some bugs with ownCloud status check fails + +------------------------------------------------------------------- +Thu Nov 24 16:00:52 UTC 2011 - [email protected] + +- update to verion 0.1.1 with fix for bnc#730842, enable download + of owncloud tarball again +- fixed progress output in setup window + +------------------------------------------------------------------- Old: ---- mirall-0.1.0.tar.bz2 New: ---- mirall-0.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mirall.spec ++++++ --- /var/tmp/diff_new_pack.LPMBdD/_old 2011-12-01 12:24:42.000000000 +0100 +++ /var/tmp/diff_new_pack.LPMBdD/_new 2011-12-01 12:24:42.000000000 +0100 @@ -18,7 +18,7 @@ Name: mirall -Version: 0.1.0 +Version: 0.1.2 Release: 0 License: GPL-2.0+ Summary: Opensource Dropbox-like program ++++++ mirall-0.1.0.tar.bz2 -> mirall-0.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mirall-0.1.0/mirall.qrc new/mirall-0.1.2/mirall.qrc --- old/mirall-0.1.0/mirall.qrc 2011-11-22 21:45:28.000000000 +0100 +++ new/mirall-0.1.2/mirall.qrc 2011-11-28 16:15:48.000000000 +0100 @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/new/mirall"> + <qresource prefix="/mirall"> <file>resources/mirall-32.png</file> <file>resources/mirall-64.png</file> <file>resources/mirall-128.png</file> @@ -11,5 +11,13 @@ <file>resources/mirall-48.png</file> <file>resources/folder-grey-48.png</file> <file>resources/folder-remote-48.png</file> + <file>resources/dialog-close.png</file> + <file>resources/dialog-ok.png</file> + <file>resources/dialog-cancel.png</file> + <file>resources/view-refresh.png</file> + <file>resources/folder-favorites.png</file> + <file>resources/folder-sync.png</file> + <file>resources/folder-important.png</file> + <file>resources/folder-grey.png</file> </qresource> </RCC> Files old/mirall-0.1.0/resources/dialog-cancel.png and new/mirall-0.1.2/resources/dialog-cancel.png differ Files old/mirall-0.1.0/resources/dialog-close.png and new/mirall-0.1.2/resources/dialog-close.png differ Files old/mirall-0.1.0/resources/dialog-ok.png and new/mirall-0.1.2/resources/dialog-ok.png differ Files old/mirall-0.1.0/resources/folder-favorites.png and new/mirall-0.1.2/resources/folder-favorites.png differ Files old/mirall-0.1.0/resources/folder-grey.png and new/mirall-0.1.2/resources/folder-grey.png differ Files old/mirall-0.1.0/resources/folder-important.png and new/mirall-0.1.2/resources/folder-important.png differ Files old/mirall-0.1.0/resources/folder-sync.png and new/mirall-0.1.2/resources/folder-sync.png differ Files old/mirall-0.1.0/resources/view-refresh.png and new/mirall-0.1.2/resources/view-refresh.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mirall-0.1.0/src/libqtwebdav/qwebdav.h new/mirall-0.1.2/src/libqtwebdav/qwebdav.h --- old/mirall-0.1.0/src/libqtwebdav/qwebdav.h 2011-11-22 21:45:28.000000000 +0100 +++ new/mirall-0.1.2/src/libqtwebdav/qwebdav.h 2011-11-28 16:15:48.000000000 +0100 @@ -36,7 +36,7 @@ /** * @brief Main class used to handle the webdav protocol */ -class QWEBDAV_EXPORT QWebdav : virtual public QNetworkAccessManager +class QWEBDAV_EXPORT QWebdav : public QNetworkAccessManager { Q_OBJECT public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mirall-0.1.0/src/mirall/application.cpp new/mirall-0.1.2/src/mirall/application.cpp --- old/mirall-0.1.0/src/mirall/application.cpp 2011-11-22 21:45:28.000000000 +0100 +++ new/mirall-0.1.2/src/mirall/application.cpp 2011-11-28 16:15:48.000000000 +0100 @@ -118,7 +118,7 @@ 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 @@ 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 @@ _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 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mirall-0.1.0/src/mirall/createanowncloudpage.ui new/mirall-0.1.2/src/mirall/createanowncloudpage.ui --- old/mirall-0.1.0/src/mirall/createanowncloudpage.ui 2011-11-22 21:45:28.000000000 +0100 +++ new/mirall-0.1.2/src/mirall/createanowncloudpage.ui 2011-11-28 16:15:48.000000000 +0100 @@ -22,7 +22,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../mirall.qrc">:/new/mirall/resources/mirall-32.png</pixmap> + <pixmap resource="../../mirall.qrc">:/mirall/resources/mirall-32.png</pixmap> </property> </widget> </item> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mirall-0.1.0/src/mirall/folder.cpp new/mirall-0.1.2/src/mirall/folder.cpp --- old/mirall-0.1.0/src/mirall/folder.cpp 2011-11-22 21:45:28.000000000 +0100 +++ new/mirall-0.1.2/src/mirall/folder.cpp 2011-11-28 16:15:48.000000000 +0100 @@ -40,9 +40,9 @@ _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 @@ { // 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 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mirall-0.1.0/src/mirall/folderwizard.cpp new/mirall-0.1.2/src/mirall/folderwizard.cpp --- old/mirall-0.1.0/src/mirall/folderwizard.cpp 2011-11-22 21:45:28.000000000 +0100 +++ new/mirall-0.1.2/src/mirall/folderwizard.cpp 2011-11-28 16:15:48.000000000 +0100 @@ -217,6 +217,7 @@ 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::slotOwnCloudFound( const QString& url, const QString& infoStr ) { - - _ui.OCLabel->setText( tr("to your <a href=\"%1\">ownCloud</a> (version %2)").arg(url).arg(infoStr)); - - qDebug() << "ownCloud found on " << url << " with version: " << infoStr; + if( infoStr.isEmpty() ) { + } else { + _ui.OCLabel->setText( tr("to your <a href=\"%1\">ownCloud</a> (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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mirall-0.1.0/src/mirall/folderwizardtargetpage.ui new/mirall-0.1.2/src/mirall/folderwizardtargetpage.ui --- old/mirall-0.1.0/src/mirall/folderwizardtargetpage.ui 2011-11-22 21:45:28.000000000 +0100 +++ new/mirall-0.1.2/src/mirall/folderwizardtargetpage.ui 2011-11-28 16:15:48.000000000 +0100 @@ -105,7 +105,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../mirall.qrc">:/new/mirall/resources/mirall-48.png</pixmap> + <pixmap resource="../../mirall.qrc">:/mirall/resources/mirall-48.png</pixmap> </property> </widget> </item> @@ -133,7 +133,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../mirall.qrc">:/new/mirall/resources/folder-grey-32.png</pixmap> + <pixmap resource="../../mirall.qrc">:/mirall/resources/folder-grey-32.png</pixmap> </property> <property name="alignment"> <set>Qt::AlignCenter</set> @@ -207,7 +207,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../mirall.qrc">:/new/mirall/resources/folder-remote-32.png</pixmap> + <pixmap resource="../../mirall.qrc">:/mirall/resources/folder-remote-32.png</pixmap> </property> <property name="alignment"> <set>Qt::AlignCenter</set> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mirall-0.1.0/src/mirall/owncloudinfo.cpp new/mirall-0.1.2/src/mirall/owncloudinfo.cpp --- old/mirall-0.1.0/src/mirall/owncloudinfo.cpp 2011-11-22 21:45:28.000000000 +0100 +++ new/mirall-0.1.2/src/mirall/owncloudinfo.cpp 2011-11-28 16:15:48.000000000 +0100 @@ -88,33 +88,35 @@ } } - 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(',') ); - - QString infoString; - QString versionStr; - foreach ( infoString, li ) { - if( infoString.contains( "versionstring") ) { - // get the version string out. - versionStr = infoString.mid(17); - versionStr.remove(-1, 1); + 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 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mirall-0.1.0/src/mirall/owncloudinfo.h new/mirall-0.1.2/src/mirall/owncloudinfo.h --- old/mirall-0.1.0/src/mirall/owncloudinfo.h 2011-11-22 21:45:28.000000000 +0100 +++ new/mirall-0.1.2/src/mirall/owncloudinfo.h 2011-11-28 16:15:48.000000000 +0100 @@ -40,8 +40,6 @@ void ownCloudInfoFound( const QString&, const QString& ); void noOwncloudFound(); - void ownCloudInfoReply( const QString&, QNetworkReply::NetworkError ); - public slots: protected slots: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mirall-0.1.0/src/mirall/owncloudsetup.cpp new/mirall-0.1.2/src/mirall/owncloudsetup.cpp --- old/mirall-0.1.0/src/mirall/owncloudsetup.cpp 2011-11-22 21:45:28.000000000 +0100 +++ new/mirall-0.1.2/src/mirall/owncloudsetup.cpp 2011-11-28 16:15:48.000000000 +0100 @@ -134,7 +134,6 @@ } args << "--admin-user" << adminUser; args << "--admin-password" << adminPwd; - args << "--skip-download"; runOwncloudAdmin( args ); _ocWizard->setField( "OCUrl", QString( "%1/owncloud/").arg(_ocWizard->field("myOCDomain").toString() )); @@ -163,7 +162,7 @@ QTextCodec *codec = QTextCodec::codecForName("UTF-8"); // render the output to status line QString string = codec->toUnicode( arr ); - _ocWizard->appendToResultWidget( string ); + _ocWizard->appendToResultWidget( string, OwncloudWizard::LogPlain ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mirall-0.1.0/src/mirall/owncloudwizard.cpp new/mirall-0.1.2/src/mirall/owncloudwizard.cpp --- old/mirall-0.1.0/src/mirall/owncloudwizard.cpp 2011-11-22 21:45:28.000000000 +0100 +++ new/mirall-0.1.2/src/mirall/owncloudwizard.cpp 2011-11-28 16:15:48.000000000 +0100 @@ -21,6 +21,8 @@ #include <QValidator> #include <QWizardPage> #include <QDir> +#include <QScrollBar> + #include <stdlib.h> #include "mirall/owncloudwizard.h" @@ -218,12 +220,18 @@ } -void OwncloudWizardResultPage::appendResultText( const QString& msg ) +void OwncloudWizardResultPage::appendResultText( const QString& msg, OwncloudWizard::LogType type ) { if( msg.isEmpty() ) { _ui.resultTextEdit->clear(); } else { - _ui.resultTextEdit->append( msg ); + if( type == OwncloudWizard::LogParagraph ) { + _ui.resultTextEdit->append( msg ); + } else { + // _ui.resultTextEdit->append( msg ); + _ui.resultTextEdit->insertPlainText(msg ); + } + _ui.resultTextEdit->verticalScrollBar()->setValue( _ui.resultTextEdit->verticalScrollBar()->maximum() ); } } @@ -294,7 +302,6 @@ // call in installation mode and install to ftp site. emit installOCServer(); } else { - qDebug() << "XX: " << field("connectMyOC").toBool(); } } } @@ -305,10 +312,10 @@ p->showOCUrlLabel( _oCUrl, show ); } -void OwncloudWizard::appendToResultWidget( const QString& msg ) +void OwncloudWizard::appendToResultWidget( const QString& msg, LogType type ) { OwncloudWizardResultPage *p = static_cast<OwncloudWizardResultPage*> (page( Page_Install )); - p->appendResultText( msg ); + p->appendResultText( msg, type ); } void OwncloudWizard::setOCUrl( const QString& url ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mirall-0.1.0/src/mirall/owncloudwizard.h new/mirall-0.1.2/src/mirall/owncloudwizard.h --- old/mirall-0.1.0/src/mirall/owncloudwizard.h 2011-11-22 21:45:28.000000000 +0100 +++ new/mirall-0.1.2/src/mirall/owncloudwizard.h 2011-11-28 16:15:48.000000000 +0100 @@ -26,6 +26,44 @@ namespace Mirall { +class OwncloudWizard: public QWizard +{ + Q_OBJECT +public: + + enum { + Page_SelectType, + Page_Create_OC, + Page_OC_Credentials, + Page_FTP, + Page_Install + }; + + enum LogType { + LogPlain, + LogParagraph + }; + + OwncloudWizard(QWidget *parent = 0L); + + void setOCUrl( const QString& ); + +public slots: + void appendToResultWidget( const QString& msg, LogType type = LogParagraph ); + void slotCurrentPageChanged( int ); + void showOCUrlLabel( bool ); + + +signals: + void connectToOCUrl( const QString& ); + void installOCServer(); + void installOCLocalhost(); + +private: + QString _configFile; + QString _oCUrl; +}; + /** * page to ask for the type of Owncloud to connect to */ @@ -116,7 +154,7 @@ virtual void initializePage(); public slots: - void appendResultText( const QString& ); + void appendResultText( const QString&, OwncloudWizard::LogType type = OwncloudWizard::LogParagraph ); void showOCUrlLabel( const QString&, bool ); private: @@ -124,45 +162,6 @@ }; - -/** - * Available fields registered: - * - */ -class OwncloudWizard: public QWizard -{ - Q_OBJECT -public: - - enum { - Page_SelectType, - Page_Create_OC, - Page_OC_Credentials, - Page_FTP, - Page_Install - }; - - OwncloudWizard(QWidget *parent = 0L); - - void setOCUrl( const QString& ); - -public slots: - void appendToResultWidget( const QString& ); - void slotCurrentPageChanged( int ); - void showOCUrlLabel( bool ); - - -signals: - void connectToOCUrl( const QString& ); - void installOCServer(); - void installOCLocalhost(); - -private: - QString _configFile; - QString _oCUrl; -}; - - } // ns Mirall #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mirall-0.1.0/src/mirall/statusdialog.cpp new/mirall-0.1.2/src/mirall/statusdialog.cpp --- old/mirall-0.1.0/src/mirall/statusdialog.cpp 2011-11-22 21:45:28.000000000 +0100 +++ new/mirall-0.1.2/src/mirall/statusdialog.cpp 2011-11-28 16:15:48.000000000 +0100 @@ -17,7 +17,7 @@ #include "statusdialog.h" #include "folder.h" - +#include "version.h" namespace Mirall { FolderViewDelegate::FolderViewDelegate() @@ -107,7 +107,7 @@ QDialog(parent) { setupUi( this ); - setWindowTitle( tr("Mirall Status") ); + setWindowTitle( tr("Mirall %1").arg( VERSION_STRING ) ); _model = new QStandardItemModel(); FolderViewDelegate *delegate = new FolderViewDelegate(); @@ -166,7 +166,7 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mirall-0.1.0/src/mirall/statusdialog.ui new/mirall-0.1.2/src/mirall/statusdialog.ui --- old/mirall-0.1.0/src/mirall/statusdialog.ui 2011-11-22 21:45:28.000000000 +0100 +++ new/mirall-0.1.2/src/mirall/statusdialog.ui 2011-11-28 16:15:48.000000000 +0100 @@ -71,7 +71,7 @@ </property> <property name="icon"> <iconset resource="../../mirall.qrc"> - <normaloff>:/new/mirall/resources/mirall-128.png</normaloff>:/new/mirall/resources/mirall-128.png</iconset> + <normaloff>:/mirall/resources/mirall-128.png</normaloff>:/mirall/resources/mirall-128.png</iconset> </property> <property name="iconSize"> <size> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mirall-0.1.0/src/mirall/version.h new/mirall-0.1.2/src/mirall/version.h --- old/mirall-0.1.0/src/mirall/version.h 1970-01-01 01:00:00.000000000 +0100 +++ new/mirall-0.1.2/src/mirall/version.h 2011-11-28 16:15:48.000000000 +0100 @@ -0,0 +1,20 @@ +/* + * Copyright (C) by Klaas Freitag <[email protected]> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * 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 +#define VERSION_H + +#define VERSION_STRING "0.1.2" + +#endif // VERSION_H -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
