From 59072a81f14efc3f33b0e70f30c40e23cd7ec545 Mon Sep 17 00:00:00 2001
From: Klaas Freitag <freitag@owncloud.com>
Date: Tue, 26 Nov 2013 14:27:32 +0100
Subject: Put detailed sync status widget into ButtonGroup for common style.

---
 src/mirall/protocolwidget.cpp |   2 -
 src/mirall/protocolwidget.ui  | 110 ++++++++++++++++++------------------------
 2 files changed, 48 insertions(+), 64 deletions(-)

(limited to 'src/mirall')

diff --git a/src/mirall/protocolwidget.cpp b/src/mirall/protocolwidget.cpp
index 2bb11157d..aab8887c7 100644
--- a/src/mirall/protocolwidget.cpp
+++ b/src/mirall/protocolwidget.cpp
@@ -35,8 +35,6 @@ ProtocolWidget::ProtocolWidget(QWidget *parent) :
 {
     _ui->setupUi(this);
 
-    _ui->_errorLabel->setVisible(false);
-
     connect(ProgressDispatcher::instance(), SIGNAL(progressInfo(QString,Progress::Info)),
             this, SLOT(slotProgressInfo(QString,Progress::Info)));
     connect(ProgressDispatcher::instance(), SIGNAL(progressSyncProblem(const QString&,const Progress::SyncProblem&)),
diff --git a/src/mirall/protocolwidget.ui b/src/mirall/protocolwidget.ui
index 76fd3296c..331bcb70d 100644
--- a/src/mirall/protocolwidget.ui
+++ b/src/mirall/protocolwidget.ui
@@ -7,78 +7,64 @@
     <x>0</x>
     <y>0</y>
     <width>612</width>
-    <height>543</height>
+    <height>515</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
+  <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="font">
-        <font>
-         <pointsize>14</pointsize>
-        </font>
-       </property>
-       <property name="text">
-        <string>Detailed Sync Status</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QTreeWidget" name="_treeWidget">
-       <property name="alternatingRowColors">
-        <bool>true</bool>
-       </property>
-       <property name="rootIsDecorated">
-        <bool>true</bool>
-       </property>
-       <property name="uniformRowHeights">
-        <bool>true</bool>
-       </property>
-       <property name="columnCount">
-        <number>4</number>
-       </property>
-       <column>
-        <property name="text">
-         <string notr="true">1</string>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Detailed Sync Status</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QTreeWidget" name="_treeWidget">
+        <property name="alternatingRowColors">
+         <bool>true</bool>
         </property>
-       </column>
-       <column>
-        <property name="text">
-         <string notr="true">2</string>
+        <property name="rootIsDecorated">
+         <bool>true</bool>
         </property>
-       </column>
-       <column>
-        <property name="text">
-         <string>3</string>
+        <property name="uniformRowHeights">
+         <bool>true</bool>
         </property>
-       </column>
-       <column>
-        <property name="text">
-         <string>4</string>
+        <property name="columnCount">
+         <number>4</number>
         </property>
-       </column>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="_errorLabel">
-       <property name="text">
-        <string>TextLabel</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QDialogButtonBox" name="_dialogButtonBox">
-       <property name="standardButtons">
-        <set>QDialogButtonBox::NoButton</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
+        <column>
+         <property name="text">
+          <string notr="true">1</string>
+         </property>
+        </column>
+        <column>
+         <property name="text">
+          <string notr="true">2</string>
+         </property>
+        </column>
+        <column>
+         <property name="text">
+          <string>3</string>
+         </property>
+        </column>
+        <column>
+         <property name="text">
+          <string>4</string>
+         </property>
+        </column>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QDialogButtonBox" name="_dialogButtonBox">
+        <property name="standardButtons">
+         <set>QDialogButtonBox::NoButton</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
   </layout>
  </widget>
-- 
cgit v1.2.3