Merge remote-tracking branch 'upstream/master'

VERSION.cmake

@@ -1,6 +1,6 @@
 set( MIRALL_VERSION_MAJOR 2 )
-set( MIRALL_VERSION_MINOR 5 )
-set( MIRALL_VERSION_PATCH 3 )
+set( MIRALL_VERSION_MINOR 7 )
+set( MIRALL_VERSION_PATCH 0 )
 set( MIRALL_VERSION_YEAR  2019 )
 set( MIRALL_SOVERSION 0 )
 

admin/linux/debian/debian.xenial/post-patches/qt5.5-compat.patch

@@ -1,43 +1,3 @@
---- nextcloud-client-2.4.0.orig/src/gui/wizard/owncloudoauthcredspage.cpp
-+++ nextcloud-client-2.4.0/src/gui/wizard/owncloudoauthcredspage.cpp
-@@ -53,10 +53,8 @@ OwncloudOAuthCredsPage::OwncloudOAuthCredsPage()
-     _ui.openLinkButton->setContextMenuPolicy(Qt::CustomContextMenu);
-     QObject::connect(_ui.openLinkButton, &QWidget::customContextMenuRequested, [this](const QPoint &pos) {
-         auto menu = new QMenu(_ui.openLinkButton);
--        menu->addAction(tr("Copy link to clipboard"), this, [this] {
--            if (_asyncAuth)
--                QApplication::clipboard()->setText(_asyncAuth->authorisationLink().toString(QUrl::FullyEncoded));
--        });
-+        auto action = menu->addAction(tr("Copy link to clipboard"));
-+        connect(action, &QAction::triggered, this, &OwncloudOAuthCredsPage::copyLinkToClipboard);
-         menu->setAttribute(Qt::WA_DeleteOnClose);
-         menu->popup(_ui.openLinkButton->mapToGlobal(pos));
-     });
-@@ -131,4 +129,11 @@ bool OwncloudOAuthCredsPage::isComplete() const
-     return false; /* We can never go forward manually */
- }
- 
-+void OwncloudOAuthCredsPage::copyLinkToClipboard()
-+{
-+    if (_asyncAuth)
-+      QApplication::clipboard()->setText(_asyncAuth->authorisationLink().toString(QUrl::FullyEncoded));
-+}
-+
-+
- } // namespace OCC
---- nextcloud-client-2.4.0.orig/src/gui/wizard/owncloudoauthcredspage.h
-+++ nextcloud-client-2.4.0/src/gui/wizard/owncloudoauthcredspage.h
-@@ -57,6 +57,10 @@ public:
-     QString _refreshToken;
-     QScopedPointer<OAuth> _asyncAuth;
-     Ui_OwncloudOAuthCredsPage _ui;
-+
-+protected slots:
-+    void copyLinkToClipboard();
-+
- };
- 
- } // namespace OCC
 --- nextcloud-client-2.5.3.orig/src/3rdparty/kmessagewidget/kmessagewidget.cpp	2019-07-26 18:40:34.949349387 +0000
 +++ nextcloud-client-2.5.3/src/3rdparty/kmessagewidget/kmessagewidget.cpp	2019-07-26 18:41:39.866478051 +0000
 @@ -105,6 +105,9 @@

src/gui/CMakeLists.txt

@@ -273,6 +273,9 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
         endforeach(_file)
         install(FILES ${client_I18N} DESTINATION ${SHAREDIR}/${APPLICATION_EXECUTABLE}/i18n)
     else()
+        file(GLOB_RECURSE VISUAL_ELEMENTS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-w10startmenu*")
+        install(FILES ${VISUAL_ELEMENTS} DESTINATION bin/visualelements)
+        install(FILES "${theme_dir}/${APPLICATION_EXECUTABLE}.VisualElementsManifest.xml" DESTINATION bin)
         install(FILES ${client_I18N} DESTINATION i18n)
     endif()
 

src/gui/wizard/flow2authcredspage.cpp

@@ -46,21 +46,8 @@ Flow2AuthCredsPage::Flow2AuthCredsPage()
     setTitle(WizardCommon::titleTemplate().arg(tr("Connect to %1").arg(Theme::instance()->appNameGUI())));
     setSubTitle(WizardCommon::subTitleTemplate().arg(tr("Login in your browser (Login Flow v2)")));
 
-    connect(_ui.openLinkButton, &QCommandLinkButton::clicked, [this] {
-        _ui.errorLabel->hide();
-        if (_asyncAuth)
-            _asyncAuth->openBrowser();
-    });
-    _ui.openLinkButton->setContextMenuPolicy(Qt::CustomContextMenu);
-    QObject::connect(_ui.openLinkButton, &QWidget::customContextMenuRequested, [this](const QPoint &pos) {
-        auto menu = new QMenu(_ui.openLinkButton);
-        menu->addAction(tr("Copy link to clipboard"), this, [this] {
-            if (_asyncAuth)
-                QApplication::clipboard()->setText(_asyncAuth->authorisationLink().toString(QUrl::FullyEncoded));
-        });
-        menu->setAttribute(Qt::WA_DeleteOnClose);
-        menu->popup(_ui.openLinkButton->mapToGlobal(pos));
-    });
+    connect(_ui.openLinkButton, &QCommandLinkButton::clicked, this, &Flow2AuthCredsPage::slotOpenBrowser);
+    connect(_ui.copyLinkButton, &QCommandLinkButton::clicked, this, &Flow2AuthCredsPage::slotCopyLinkToClipboard);
 }
 
 void Flow2AuthCredsPage::initializePage()
@@ -146,4 +133,19 @@ bool Flow2AuthCredsPage::isComplete() const
     return false; /* We can never go forward manually */
 }
 
+void Flow2AuthCredsPage::slotOpenBrowser()
+{
+    if (_ui.errorLabel)
+        _ui.errorLabel->hide();
+
+    if (_asyncAuth)
+        _asyncAuth->openBrowser();
+}
+
+void Flow2AuthCredsPage::slotCopyLinkToClipboard()
+{
+    if (_asyncAuth)
+        QApplication::clipboard()->setText(_asyncAuth->authorisationLink().toString(QUrl::FullyEncoded));
+}
+
 } // namespace OCC

src/gui/wizard/flow2authcredspage.h

@@ -56,6 +56,10 @@ public:
     QString _appPassword;
     QScopedPointer<Flow2Auth> _asyncAuth;
     Ui_Flow2AuthCredsPage _ui;
+
+protected slots:
+    void slotOpenBrowser();
+    void slotCopyLinkToClipboard();
 };
 
 } // namespace OCC

src/gui/wizard/flow2authcredspage.ui

@@ -53,7 +53,20 @@
    <item>
     <widget class="QCommandLinkButton" name="openLinkButton">
      <property name="text">
-      <string>Re-open Browser (or right-click to copy link)</string>
+      <string>Re-open Browser</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCommandLinkButton" name="copyLinkButton">
+     <property name="font">
+      <font>
+       <weight>50</weight>
+       <bold>false</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Copy link</string>
      </property>
     </widget>
    </item>

src/gui/wizard/flow2authwidget.cpp

@@ -50,21 +50,8 @@ Flow2AuthWidget::Flow2AuthWidget(Account *account, QWidget *parent)
 
     WizardCommon::initErrorLabel(_ui.errorLabel);
 
-    connect(_ui.openLinkButton, &QCommandLinkButton::clicked, [this] {
-        _ui.errorLabel->hide();
-        if (_asyncAuth)
-            _asyncAuth->openBrowser();
-    });
-    _ui.openLinkButton->setContextMenuPolicy(Qt::CustomContextMenu);
-    QObject::connect(_ui.openLinkButton, &QWidget::customContextMenuRequested, [this](const QPoint &pos) {
-        auto menu = new QMenu(_ui.openLinkButton);
-        menu->addAction(tr("Copy link to clipboard"), this, [this] {
-            if (_asyncAuth)
-                QApplication::clipboard()->setText(_asyncAuth->authorisationLink().toString(QUrl::FullyEncoded));
-        });
-        menu->setAttribute(Qt::WA_DeleteOnClose);
-        menu->popup(_ui.openLinkButton->mapToGlobal(pos));
-    });
+    connect(_ui.openLinkButton, &QCommandLinkButton::clicked, this, &Flow2AuthWidget::slotOpenBrowser);
+    connect(_ui.copyLinkButton, &QCommandLinkButton::clicked, this, &Flow2AuthWidget::slotCopyLinkToClipboard);
 
     _asyncAuth.reset(new Flow2Auth(_account, this));
     connect(_asyncAuth.data(), &Flow2Auth::result, this, &Flow2AuthWidget::asyncAuthResult, Qt::QueuedConnection);
@@ -110,4 +97,19 @@ Flow2AuthWidget::~Flow2AuthWidget() {
     _user.clear();
 }
 
+void Flow2AuthWidget::slotOpenBrowser()
+{
+    if (_ui.errorLabel)
+        _ui.errorLabel->hide();
+
+    if (_asyncAuth)
+        _asyncAuth->openBrowser();
 }
+
+void Flow2AuthWidget::slotCopyLinkToClipboard()
+{
+    if (_asyncAuth)
+        QApplication::clipboard()->setText(_asyncAuth->authorisationLink().toString(QUrl::FullyEncoded));
+}
+
+} // namespace OCC

src/gui/wizard/flow2authwidget.h

@@ -45,6 +45,10 @@ private:
     QString _appPassword;
     QScopedPointer<Flow2Auth> _asyncAuth;
     Ui_Flow2AuthWidget _ui;
+
+protected slots:
+    void slotOpenBrowser();
+    void slotCopyLinkToClipboard();
 };
 
 }

src/gui/wizard/flow2authwidget.ui

@@ -65,7 +65,20 @@
    <item>
     <widget class="QCommandLinkButton" name="openLinkButton">
      <property name="text">
-      <string>Re-open Browser (or right-click to copy link)</string>
+      <string>Re-open Browser</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCommandLinkButton" name="copyLinkButton">
+     <property name="font">
+      <font>
+       <weight>50</weight>
+       <bold>false</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Copy link</string>
      </property>
     </widget>
    </item>

src/gui/wizard/owncloudoauthcredspage.cpp

@@ -45,21 +45,8 @@ OwncloudOAuthCredsPage::OwncloudOAuthCredsPage()
     setTitle(WizardCommon::titleTemplate().arg(tr("Connect to %1").arg(Theme::instance()->appNameGUI())));
     setSubTitle(WizardCommon::subTitleTemplate().arg(tr("Login in your browser")));
 
-    connect(_ui.openLinkButton, &QCommandLinkButton::clicked, [this] {
-        _ui.errorLabel->hide();
-        if (_asyncAuth)
-            _asyncAuth->openBrowser();
-    });
-    _ui.openLinkButton->setContextMenuPolicy(Qt::CustomContextMenu);
-    QObject::connect(_ui.openLinkButton, &QWidget::customContextMenuRequested, [this](const QPoint &pos) {
-        auto menu = new QMenu(_ui.openLinkButton);
-        menu->addAction(tr("Copy link to clipboard"), this, [this] {
-            if (_asyncAuth)
-                QApplication::clipboard()->setText(_asyncAuth->authorisationLink().toString(QUrl::FullyEncoded));
-        });
-        menu->setAttribute(Qt::WA_DeleteOnClose);
-        menu->popup(_ui.openLinkButton->mapToGlobal(pos));
-    });
+    connect(_ui.openLinkButton, &QCommandLinkButton::clicked, this, &OwncloudOAuthCredsPage::slotOpenBrowser);
+    connect(_ui.copyLinkButton, &QCommandLinkButton::clicked, this, &OwncloudOAuthCredsPage::slotCopyLinkToClipboard);
 }
 
 void OwncloudOAuthCredsPage::initializePage()
@@ -133,4 +120,19 @@ bool OwncloudOAuthCredsPage::isComplete() const
     return false; /* We can never go forward manually */
 }
 
+void OwncloudOAuthCredsPage::slotOpenBrowser()
+{
+    if (_ui.errorLabel)
+        _ui.errorLabel->hide();
+
+    if (_asyncAuth)
+        _asyncAuth->openBrowser();
+}
+
+void OwncloudOAuthCredsPage::slotCopyLinkToClipboard()
+{
+    if (_asyncAuth)
+        QApplication::clipboard()->setText(_asyncAuth->authorisationLink().toString(QUrl::FullyEncoded));
+}
+
 } // namespace OCC

src/gui/wizard/owncloudoauthcredspage.h

@@ -57,6 +57,10 @@ public:
     QString _refreshToken;
     QScopedPointer<OAuth> _asyncAuth;
     Ui_OwncloudOAuthCredsPage _ui;
+
+protected slots:
+    void slotOpenBrowser();
+    void slotCopyLinkToClipboard();
 };
 
 } // namespace OCC

src/gui/wizard/owncloudoauthcredspage.ui

@@ -57,6 +57,19 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QCommandLinkButton" name="copyLinkButton">
+     <property name="font">
+      <font>
+       <weight>50</weight>
+       <bold>false</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Copy link</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">

theme/nextcloud.VisualElementsManifest.xml

@@ -0,0 +1,8 @@
+<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+  <VisualElements
+	BackgroundColor="#151e3d"
+	ForegroundText="light"
+    ShowNameOnSquare150x150Logo="on"
+    Square150x150Logo="visualelements\150-Nextcloud-w10startmenu.png"
+	Square70x70Logo="visualelements\70-Nextcloud-w10startmenu.png"/>
+</Application>