[tx-robot] updated from transifex

(cherry picked from commit 5da6103fb5)

doc/troubleshooting.rst

@@ -90,7 +90,16 @@ create a huge amount of data, as the log window has a limited buffer.
 To write logs to disk, start the client with ``--logfile <file>``, where
 ``<file`` is the file you want to log to, or ``--logdir <dir>``, where ``<dir>``
 is an existing directory. In case of ``--logdir``, each sync run will create a
-new file.
+new file. To limit the amount of data that accumulates over time, there is another
+useful parameter: ``--logexpire <hours>```. If that is combined with ```--logdir```
+the client automatically erases log data in that directory that is older than the
+given expiry period.
+
+For example, for a long running test where you intend to keep the log data of the
+last two days, this would be the command line:
+```
+owncloud --logdir /tmp/owncloud_logs --logexpire 48
+```
 
 :ownCloud server Logfile:
 The ownCloud server maintains an ownCloud specific logfile as well. It can and

src/CMakeLists.txt

@@ -17,7 +17,6 @@ mirall/folderwizardtargetpage.ui
 mirall/statusdialog.ui
 mirall/owncloudsetuppage_ng.ui
 mirall/owncloudwizardresultpage.ui
-mirall/owncloudcredentialspage.ui
 mirall/sslerrordialog.ui
 mirall/proxydialog.ui
 mirall/fileitemdialog.ui

src/main.cpp

@@ -13,6 +13,9 @@
  */
 
 #include "mirall/application.h"
+#include "mirall/theme.h"
+
+#include <QMessageBox>
 
 int main(int argc, char **argv)
 {
@@ -30,6 +33,15 @@ int main(int argc, char **argv)
                 return -1;
         }
         return 0;
+    } else {
+        if (!QSystemTrayIcon::isSystemTrayAvailable()) {
+            QMessageBox::critical(0, qApp->translate("main.cpp", "System Tray not available"),
+                                  qApp->translate("main.cpp", "%1 requires on a working system tray. "
+                                  "If you are running XFCE, please follow "
+                                  "<a href=\"http://docs.xfce.org/xfce/xfce4-panel/systray\">these instructions</a>. "
+                                  "Otherwise, please install a system tray application such as 'trayer' and try again.")
+                    .arg(Mirall::Theme::instance()->appNameGUI()));
+        }
     }
     // if help requested, show on command line and exit.
     if( ! app.giveHelp() ) {

src/mirall/application.cpp

@@ -100,15 +100,12 @@ Application::Application(int &argc, char **argv) :
     _sslErrorDialog(0),
     _contextMenu(0),
     _theme(Theme::instance()),
-    _updateDetector(0),
     _logBrowser(0),
     _logExpire(0),
     _showLogWindow(false),
     _logFlush(false),
     _helpOnly(false),
-    _fileItemDialog(0),
-    _statusDialog(0),
-    _folderWizard(0)
+    _fileItemDialog(0)
 {
     setApplicationName( _theme->appNameGUI() );
     setWindowIcon( _theme->applicationIcon() );
@@ -159,7 +156,7 @@ Application::Application(int &argc, char **argv) :
 #endif
     setupActions();
     setupSystemTray();
-    setupProxy();
+    slotSetupProxy();
 
 
     int cnt = _folderMan->setupFolders();
@@ -191,8 +188,8 @@ Application::~Application()
 
 void Application::slotStartUpdateDetector()
 {
-    _updateDetector = new UpdateDetector(this);
-    _updateDetector->versionCheck(_theme);
+    UpdateDetector *updateDetector = new UpdateDetector(this);
+    updateDetector->versionCheck(_theme);
 
 }
 
@@ -604,7 +601,7 @@ QNetworkProxy proxyFromConfig(const MirallConfigFile& cfg)
     return proxy;
 }
 
-void Application::setupProxy()
+void Application::slotSetupProxy()
 {
     Mirall::MirallConfigFile cfg;
     int proxyType = cfg.proxyType();
@@ -698,7 +695,7 @@ void Application::slotAddFolder()
         Application *_app;
     };
 
-    if (_folderWizard) {
+    if (!_folderWizard.isNull()) {
         raiseDialog(_folderWizard);
         return;
     }
@@ -732,7 +729,6 @@ void Application::slotAddFolder()
         qDebug() << "* Folder wizard cancelled";
     }
     _folderWizard->deleteLater();
-    _folderWizard = 0;
 }
 
 void Application::slotOpenStatus()
@@ -742,7 +738,8 @@ void Application::slotOpenStatus()
   QWidget *raiseWidget = 0;
 
   // check if there is a mirall.cfg already.
-  if( _owncloudSetupWizard && _owncloudSetupWizard->wizard()->isVisible() ) {
+  if( !_owncloudSetupWizard.isNull() &&
+       _owncloudSetupWizard->wizard()->isVisible() ) {
     raiseWidget = _owncloudSetupWizard->wizard();
   }
 
@@ -875,7 +872,8 @@ void Application::slotEnableFolder(const QString& alias, const bool enable)
 
 void Application::slotConfigure()
 {
-    if (_owncloudSetupWizard && !_owncloudSetupWizard->wizard()->isVisible()) {
+    if (!_owncloudSetupWizard.isNull() &&
+        !_owncloudSetupWizard->wizard()->isVisible()) {
         raiseDialog(_owncloudSetupWizard->wizard());
         return;
     }
@@ -890,10 +888,12 @@ void Application::slotConfigure()
 
 void Application::slotConfigureProxy()
 {
-    ProxyDialog dlg;
-    if (dlg.exec() == QDialog::Accepted)
-    {
-        setupProxy();
+    if (_proxyDialog.isNull()) {
+        _proxyDialog = new ProxyDialog;
+        _proxyDialog->open();
+        connect(_proxyDialog, SIGNAL(accept()), SLOT(slotSetupProxy()));
+    } else {
+        raiseDialog(_proxyDialog);
     }
 }
 

src/mirall/application.h

@@ -18,6 +18,7 @@
 #include <QApplication>
 #include <QNetworkReply>
 #include <QSslError>
+#include <QPointer>
 
 #include "qtsingleapplication.h"
 
@@ -43,7 +44,7 @@ class StatusDialog;
 class OwncloudSetupWizard;
 class ownCloudInfo;
 class SslErrorDialog;
-class UpdateDetector;
+class ProxyDialog;
 
 class Application : public SharedTools::QtSingleApplication
 {
@@ -79,7 +80,6 @@ protected:
     void setupSystemTray();
     void setupContextMenu();
     void setupLogBrowser();
-    void setupProxy();
     void enterNextLogFile();
 
     //folders have to be disabled while making config changes
@@ -105,6 +105,7 @@ protected slots:
     void slotFetchCredentials();
     void slotCredentialsFetched( bool );
     void slotStartUpdateDetector();
+    void slotSetupProxy();
 
 private:
     void setHelp();
@@ -124,7 +125,7 @@ private:
     QNetworkConfigurationManager *_networkMgr;
 #endif
 
-    FolderWizard  *_folderWizard;
+    QPointer<FolderWizard> _folderWizard;
     QScopedPointer<OwncloudSetupWizard> _owncloudSetupWizard;
     SslErrorDialog *_sslErrorDialog;
 
@@ -136,8 +137,8 @@ private:
     FolderMan *_folderMan;
     Theme *_theme;
     QSignalMapper *_folderOpenActionMapper;
-    UpdateDetector *_updateDetector;
     LogBrowser *_logBrowser;
+    QPointer<ProxyDialog> _proxyDialog;
     QString _logFile;
     QString _logDirectory;
     int _logExpire;

src/mirall/folderwizard.cpp

@@ -72,8 +72,14 @@ bool FolderWizardSourcePage::isComplete() const
 
   bool isOk = selFile.isDir();
   if( !isOk ) {
-    warnString = tr("No local directory selected!");
+    warnString = tr("No local folder selected!");
   }
+
+  if (isOk && !selFile.isWritable()) {
+      isOk = false;
+      warnString += tr("You have no permission to write to the selected folder!");
+  }
+
   // check if the local directory isn't used yet in another ownCloud sync
   Folder::Map *map = _folderMap;
   if( ! map ) return false;

src/mirall/owncloudcredentialspage.ui

@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>OwncloudCredentialsPage</class>
- <widget class="QWidget" name="OwncloudCredentialsPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>576</width>
-    <height>302</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout_12">
-     <item>
-      <widget class="QLabel" name="label_3">
-       <property name="font">
-        <font>
-         <pointsize>14</pointsize>
-         <weight>50</weight>
-         <bold>false</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>ownCloud Credentials</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_17">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item row="1" column="0">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Provide ownCloud Credentials</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; color:#585858;&quot;&gt;Please enter the username and password for your ownCloud Instance. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; color:#585858;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; color:#585858;&quot;&gt;If you do not wish to store the credentials on your local machine, check the box. ownCloud will prompt you for your password every time the client starts.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="textFormat">
-         <enum>Qt::AutoText</enum>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-        <property name="openExternalLinks">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <layout class="QFormLayout" name="formLayout">
-     <item row="0" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>ownCloud-User:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QLineEdit" name="OCUserEdit">
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_5">
-       <property name="text">
-        <string>Password:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QLineEdit" name="OCPasswdEdit">
-       <property name="text">
-        <string/>
-       </property>
-       <property name="echoMode">
-        <enum>QLineEdit::Password</enum>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QCheckBox" name="cbPwdNoLocalStore">
-       <property name="text">
-        <string>Do not store password on local machine.</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="3" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>568</width>
-       <height>158</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

src/mirall/owncloudtheme.cpp

@@ -119,5 +119,10 @@ QColor ownCloudTheme::wizardHeaderTitleColor() const
     return QColor("#ffffff");
 }
 
+QPixmap ownCloudTheme::wizardHeaderLogo() const
+{
+    return QPixmap(":/mirall/theme/colored/wizard_logo.png");
+}
+
 }
 

src/mirall/owncloudtheme.h

@@ -38,7 +38,7 @@ public:
 
     QColor  wizardHeaderBackgroundColor() const;
     QColor  wizardHeaderTitleColor() const;
-
+    QPixmap wizardHeaderLogo() const;
 private:
 
 

src/mirall/theme.cpp

@@ -237,7 +237,7 @@ QColor Theme::wizardHeaderBackgroundColor() const
 
 QPixmap Theme::wizardHeaderLogo() const
 {
-    return QPixmap(":/mirall/theme/colored/wizard_logo.png");
+    return applicationIcon().pixmap(64);
 }
 
 QPixmap Theme::wizardHeaderBanner() const