[Pkg-owncloud-commits] [owncloud-client] 60/164: Sharedialog: Add a Share button.

Sandro Knauß hefee-guest at moszumanska.debian.org
Sun Mar 22 11:56:53 UTC 2015


This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 201075827fa365cbec76cd61bba164543f02fd72
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Wed Feb 25 13:41:44 2015 +0100

    Sharedialog: Add a Share button.
---
 src/gui/sharedialog.cpp |  5 +++++
 src/gui/sharedialog.ui  | 29 ++++++++++++++++++-----------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/gui/sharedialog.cpp b/src/gui/sharedialog.cpp
index 16bba8f..b64a73b 100644
--- a/src/gui/sharedialog.cpp
+++ b/src/gui/sharedialog.cpp
@@ -33,6 +33,11 @@ ShareDialog::ShareDialog(AccountPtr account, const QString &sharePath, const QSt
     _ui->pushButton_copy->setText(tr("Copy Link"));
     connect(_ui->pushButton_copy, SIGNAL(clicked(bool)), SLOT(slotPushButtonCopyLinkPressed()));
 
+    QPushButton *closeButton = _ui->buttonBox->button(QDialogButtonBox::Close);
+    if( closeButton ) {
+        connect( closeButton, SIGNAL(clicked()), this, SLOT(close()) );
+    }
+
     // the following progress indicator widgets are added to layouts which makes them
     // automatically deleted once the dialog dies.
     _pi_link     = new QProgressIndicator();
diff --git a/src/gui/sharedialog.ui b/src/gui/sharedialog.ui
index 2eba46a..d0c5f82 100644
--- a/src/gui/sharedialog.ui
+++ b/src/gui/sharedialog.ui
@@ -164,6 +164,19 @@
      </layout>
     </widget>
    </item>
+   <item row="3" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item row="1" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout_shareLink">
      <item>
@@ -182,18 +195,12 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
+   <item row="5" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
      </property>
-    </spacer>
+    </widget>
    </item>
   </layout>
  </widget>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list