sisyphus-gui : split'n'redo the layout

1 files changed, 95 insertions, 85 deletions

diff --git a/src/frontend/gui/ui/sisyphus-gui.ui b/src/frontend/gui/ui/sisyphus-gui.ui
index c117b07..0d4f1a5 100644
--- a/src/frontend/gui/ui/sisyphus-gui.ui
+++ b/src/frontend/gui/ui/sisyphus-gui.ui
@@ -35,16 +35,19 @@
   <widget class="QWidget" name="layoutWidget">
    <property name="geometry">
     <rect>
-     <x>25</x>
-     <y>25</y>
-     <width>906</width>
-     <height>326</height>
+     <x>30</x>
+     <y>51</y>
+     <width>601</width>
+     <height>391</height>
     </rect>
    </property>
-   <layout class="QGridLayout" name="externalgrid">
+   <layout class="QGridLayout" name="SisyphusGrid">
     <property name="leftMargin">
      <number>25</number>
     </property>
+    <property name="topMargin">
+     <number>25</number>
+    </property>
     <property name="rightMargin">
      <number>25</number>
     </property>
@@ -54,65 +57,88 @@
     <property name="spacing">
      <number>25</number>
     </property>
-    <item row="0" column="0">
-     <layout class="QGridLayout" name="internalgrid">
-      <property name="leftMargin">
-       <number>0</number>
+    <item row="1" column="0">
+     <widget class="QTableView" name="database">
+      <property name="frameShape">
+       <enum>QFrame::Panel</enum>
       </property>
-      <property name="topMargin">
-       <number>25</number>
+      <property name="frameShadow">
+       <enum>QFrame::Raised</enum>
       </property>
-      <property name="rightMargin">
-       <number>0</number>
+      <property name="sizeAdjustPolicy">
+       <enum>QAbstractScrollArea::AdjustToContents</enum>
+      </property>
+      <property name="editTriggers">
+       <set>QAbstractItemView::NoEditTriggers</set>
+      </property>
+      <property name="dragDropOverwriteMode">
+       <bool>false</bool>
       </property>
-      <property name="bottomMargin">
-       <number>0</number>
+      <property name="selectionMode">
+       <enum>QAbstractItemView::MultiSelection</enum>
       </property>
+      <property name="selectionBehavior">
+       <enum>QAbstractItemView::SelectRows</enum>
+      </property>
+      <attribute name="horizontalHeaderCascadingSectionResizes">
+       <bool>true</bool>
+      </attribute>
+      <attribute name="horizontalHeaderDefaultSectionSize">
+       <number>125</number>
+      </attribute>
+      <attribute name="horizontalHeaderStretchLastSection">
+       <bool>true</bool>
+      </attribute>
+      <attribute name="verticalHeaderVisible">
+       <bool>false</bool>
+      </attribute>
+      <attribute name="verticalHeaderHighlightSections">
+       <bool>false</bool>
+      </attribute>
+     </widget>
+    </item>
+    <item row="0" column="0">
+     <layout class="QHBoxLayout" name="Filters">
       <property name="spacing">
        <number>25</number>
       </property>
-      <item row="3" column="0" colspan="5">
-       <widget class="QTableView" name="database">
-        <property name="frameShape">
-         <enum>QFrame::Panel</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-        <property name="sizeAdjustPolicy">
-         <enum>QAbstractScrollArea::AdjustToContents</enum>
-        </property>
-        <property name="editTriggers">
-         <set>QAbstractItemView::NoEditTriggers</set>
-        </property>
-        <property name="dragDropOverwriteMode">
-         <bool>false</bool>
-        </property>
-        <property name="selectionMode">
-         <enum>QAbstractItemView::MultiSelection</enum>
-        </property>
-        <property name="selectionBehavior">
-         <enum>QAbstractItemView::SelectRows</enum>
+      <property name="leftMargin">
+       <number>25</number>
+      </property>
+      <property name="rightMargin">
+       <number>25</number>
+      </property>
+      <item>
+       <widget class="QComboBox" name="selectfield"/>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="input">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Write package name and press Enter&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
-        <attribute name="horizontalHeaderCascadingSectionResizes">
-         <bool>true</bool>
-        </attribute>
-        <attribute name="horizontalHeaderDefaultSectionSize">
-         <number>125</number>
-        </attribute>
-        <attribute name="horizontalHeaderStretchLastSection">
+        <property name="clearButtonEnabled">
          <bool>true</bool>
-        </attribute>
-        <attribute name="verticalHeaderVisible">
-         <bool>false</bool>
-        </attribute>
-        <attribute name="verticalHeaderHighlightSections">
-         <bool>false</bool>
-        </attribute>
+        </property>
        </widget>
       </item>
-      <item row="5" column="2">
-       <widget class="QPushButton" name="upgrade">
+      <item>
+       <widget class="QComboBox" name="selectfilter"/>
+      </item>
+     </layout>
+    </item>
+    <item row="2" column="0">
+     <layout class="QHBoxLayout" name="Buttons">
+      <property name="spacing">
+       <number>25</number>
+      </property>
+      <property name="leftMargin">
+       <number>25</number>
+      </property>
+      <property name="rightMargin">
+       <number>25</number>
+      </property>
+      <item>
+       <widget class="QPushButton" name="install">
         <property name="maximumSize">
          <size>
           <width>16777215</width>
@@ -120,11 +146,14 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Upgrade system&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Install package&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="text">
+         <string/>
         </property>
         <property name="icon">
          <iconset>
-          <normaloff>../icon/upgrade.png</normaloff>../icon/upgrade.png</iconset>
+          <normaloff>../icon/install.png</normaloff>../icon/install.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -134,8 +163,8 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="0">
-       <widget class="QPushButton" name="install">
+      <item>
+       <widget class="QPushButton" name="uninstall">
         <property name="maximumSize">
          <size>
           <width>16777215</width>
@@ -143,14 +172,14 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Install package&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Uninstall package&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string/>
         </property>
         <property name="icon">
          <iconset>
-          <normaloff>../icon/install.png</normaloff>../icon/install.png</iconset>
+          <normaloff>../icon/uninstall.png</normaloff>../icon/uninstall.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -160,8 +189,8 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="1">
-       <widget class="QPushButton" name="uninstall">
+      <item>
+       <widget class="QPushButton" name="upgrade">
         <property name="maximumSize">
          <size>
           <width>16777215</width>
@@ -169,14 +198,11 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Uninstall package&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="text">
-         <string/>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Upgrade system&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="icon">
          <iconset>
-          <normaloff>../icon/uninstall.png</normaloff>../icon/uninstall.png</iconset>
+          <normaloff>../icon/upgrade.png</normaloff>../icon/upgrade.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -186,7 +212,7 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="3">
+      <item>
        <widget class="QPushButton" name="orphans">
         <property name="maximumSize">
          <size>
@@ -212,7 +238,7 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="4">
+      <item>
        <widget class="QPushButton" name="abort">
         <property name="maximumSize">
          <size>
@@ -235,25 +261,9 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1" colspan="3">
-       <widget class="QLineEdit" name="input">
-        <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Write package name and press Enter&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="clearButtonEnabled">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QComboBox" name="selectfield"/>
-      </item>
-      <item row="1" column="4">
-       <widget class="QComboBox" name="selectfilter"/>
-      </item>
      </layout>
     </item>
-    <item row="1" column="0">
+    <item row="3" column="0">
      <widget class="QProgressBar" name="progress">
       <property name="maximumSize">
        <size>