From 452008a3cc78a3e5434513fa30e1ef8f508be37c Mon Sep 17 00:00:00 2001
From: Toni Gundogdu <legatvs.git@gmail.com>
Date: Sun, 13 Dec 2009 01:28:28 +0200
Subject: [PATCH] mainwnd: misc. ui tweaks.

---
 rc/mainwnd.ui | 287 ++++++++++++++++++++++++++--------------------------------
 1 file changed, 129 insertions(+), 158 deletions(-)

diff --git a/rc/mainwnd.ui b/rc/mainwnd.ui
index 3b71134..50b19ea 100644
--- a/rc/mainwnd.ui
+++ b/rc/mainwnd.ui
@@ -8,7 +8,7 @@
     <x>0</x>
     <y>0</y>
     <width>545</width>
-    <height>423</height>
+    <height>389</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -63,19 +63,19 @@
                </widget>
               </item>
               <item>
-               <widget class="QPushButton" name="pasteButton">
+               <widget class="QPushButton" name="removeButton">
                 <property name="toolTip">
                  <string/>
                 </property>
                 <property name="statusTip">
-                 <string>Paste from clipboard</string>
+                 <string>Remove from list</string>
                 </property>
                 <property name="text">
                  <string/>
                 </property>
                 <property name="icon">
                  <iconset resource="abby.qrc">
-                  <normaloff>:/edit-paste.png</normaloff>:/edit-paste.png</iconset>
+                  <normaloff>:/list-remove.png</normaloff>:/list-remove.png</iconset>
                 </property>
                 <property name="iconSize">
                  <size>
@@ -86,19 +86,19 @@
                </widget>
               </item>
               <item>
-               <widget class="QPushButton" name="removeButton">
+               <widget class="QPushButton" name="pasteButton">
                 <property name="toolTip">
                  <string/>
                 </property>
                 <property name="statusTip">
-                 <string>Remove from list</string>
+                 <string>Paste from clipboard</string>
                 </property>
                 <property name="text">
                  <string/>
                 </property>
                 <property name="icon">
                  <iconset resource="abby.qrc">
-                  <normaloff>:/list-remove.png</normaloff>:/list-remove.png</iconset>
+                  <normaloff>:/edit-paste.png</normaloff>:/edit-paste.png</iconset>
                 </property>
                 <property name="iconSize">
                  <size>
@@ -109,6 +109,19 @@
                </widget>
               </item>
               <item>
+               <spacer name="verticalSpacer_3">
+                <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>
                <widget class="QPushButton" name="clearButton">
                 <property name="statusTip">
                  <string>Clear list</string>
@@ -452,6 +465,19 @@
                </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>20</width>
+                 <height>40</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
             </layout>
            </widget>
            <widget class="QWidget" name="tab_4">
@@ -492,127 +518,102 @@
        <attribute name="title">
         <string>&amp;Options</string>
        </attribute>
-       <layout class="QGridLayout" name="gridLayout_6">
+       <layout class="QGridLayout" name="gridLayout_8">
         <item row="0" column="0">
-         <widget class="QGroupBox" name="groupBox">
-          <property name="title">
-           <string/>
-          </property>
-          <property name="flat">
-           <bool>false</bool>
-          </property>
-          <layout class="QGridLayout" name="gridLayout_4">
-           <item row="0" column="0">
-            <layout class="QHBoxLayout" name="horizontalLayout_5">
-             <item>
-              <widget class="QPushButton" name="formatsButton">
-               <property name="toolTip">
-                <string/>
-               </property>
-               <property name="text">
-                <string>V&amp;ideo formats...</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="horizontalSpacer_5">
-               <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">
-            <layout class="QHBoxLayout" name="horizontalLayout_6">
-             <item>
-              <widget class="QLabel" name="regexpLabel">
-               <property name="text">
-                <string>Title cleanup re&amp;gular expression:</string>
-               </property>
-               <property name="buddy">
-                <cstring>regexpEdit</cstring>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLineEdit" name="regexpEdit">
-               <property name="toolTip">
-                <string>Regular expression used to clean up video titles before they are used for
+         <layout class="QGridLayout" name="gridLayout_7">
+          <item row="0" column="0">
+           <layout class="QGridLayout" name="gridLayout_4">
+            <item row="1" column="0">
+             <widget class="QLabel" name="regexpLabel">
+              <property name="text">
+               <string>Title cleanup re&amp;gular expression:</string>
+              </property>
+              <property name="buddy">
+               <cstring>regexpEdit</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_6">
+              <property name="text">
+               <string>Substitute in filename regexp.:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="0">
+             <widget class="QLabel" name="cclassLabel">
+              <property name="text">
+               <string>Title &amp;character-class</string>
+              </property>
+              <property name="buddy">
+               <cstring>cclassEdit</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="0">
+             <widget class="QLabel" name="label">
+              <property name="text">
+               <string>Filena&amp;me format:</string>
+              </property>
+              <property name="buddy">
+               <cstring>fnamefmtEdit</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_7">
+              <property name="text">
+               <string>Video formats:</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="0" column="1">
+           <layout class="QGridLayout" name="gridLayout_6">
+            <item row="0" column="0">
+             <widget class="QPushButton" name="formatsButton">
+              <property name="toolTip">
+               <string/>
+              </property>
+              <property name="text">
+               <string>Ch&amp;ange...</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLineEdit" name="regexpEdit">
+              <property name="toolTip">
+               <string>Regular expression used to clean up video titles before they are used for
 output filenames. Supports (and mimics) Perl's /g (global, find all) and /i
 (case-insensitive).
 
 Example: /(\w|\pL)/g</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item row="2" column="0">
-            <layout class="QHBoxLayout" name="horizontalLayout_10">
-             <item>
-              <widget class="QLabel" name="label_6">
-               <property name="text">
-                <string>Substitute in filename regexp.:</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLineEdit" name="substEdit">
-               <property name="toolTip">
-                <string>Mimics Perl's s/old/new/(gi) substitution. This option can be used to
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLineEdit" name="substEdit">
+              <property name="toolTip">
+               <string>Mimics Perl's s/old/new/(gi) substitution. This option can be used to
 replace occurences in output filenames. Supports /g (global, find all
 occurences) and /i (case-insensitive).
 
 Example: s/[-:]/_/g</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item row="3" column="0">
-            <layout class="QHBoxLayout" name="horizontalLayout_7">
-             <item>
-              <widget class="QLabel" name="cclassLabel">
-               <property name="text">
-                <string>Title &amp;character-class</string>
-               </property>
-               <property name="buddy">
-                <cstring>cclassEdit</cstring>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLineEdit" name="cclassEdit">
-               <property name="toolTip">
-                <string>Character class to filter video title, e.g. &quot;[A-Za-z0-9]&quot;.</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item row="4" column="0">
-            <layout class="QHBoxLayout" name="horizontalLayout_8">
-             <item>
-              <widget class="QLabel" name="label">
-               <property name="text">
-                <string>Filena&amp;me format:</string>
-               </property>
-               <property name="buddy">
-                <cstring>fnamefmtEdit</cstring>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLineEdit" name="fnamefmtEdit">
-               <property name="toolTip">
-                <string>Use the specified format string to format the output filenames.
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="0">
+             <widget class="QLineEdit" name="cclassEdit">
+              <property name="toolTip">
+               <string>Character class to filter video title, e.g. &quot;[A-Za-z0-9]&quot;.</string>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="0">
+             <widget class="QLineEdit" name="fnamefmtEdit">
+              <property name="toolTip">
+               <string>Use the specified format string to format the output filenames.
 cclive defaults to &quot;%h_%i.%s&quot;, whereas clive defaults to &quot;%t.%s.&quot;.
 
 Any of the following specifiers appearing in the format string will
@@ -623,13 +624,12 @@ be replaced accordingly:
   %h = website id
   %s = file suffix
 </string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-          </layout>
-         </widget>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
         </item>
         <item row="1" column="0">
          <widget class="QGroupBox" name="groupBox_2">
@@ -700,19 +700,6 @@ the download reches the specified percent complete</string>
           </layout>
          </widget>
         </item>
-        <item row="2" column="0">
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>502</width>
-            <height>46</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
        </layout>
       </widget>
      </widget>
@@ -934,15 +921,16 @@ the download reches the specified percent complete</string>
  </widget>
  <tabstops>
   <tabstop>addButton</tabstop>
-  <tabstop>pasteButton</tabstop>
   <tabstop>removeButton</tabstop>
+  <tabstop>pasteButton</tabstop>
   <tabstop>clearButton</tabstop>
   <tabstop>linksList</tabstop>
   <tabstop>rssButton</tabstop>
   <tabstop>scanButton</tabstop>
   <tabstop>startButton</tabstop>
-  <tabstop>tabWidget_2</tabstop>
+  <tabstop>logEdit</tabstop>
   <tabstop>cancelButton</tabstop>
+  <tabstop>tabWidget_2</tabstop>
   <tabstop>tabWidget</tabstop>
   <tabstop>formatsButton</tabstop>
   <tabstop>regexpEdit</tabstop>
@@ -952,7 +940,6 @@ the download reches the specified percent complete</string>
   <tabstop>commandBox</tabstop>
   <tabstop>streamBox</tabstop>
   <tabstop>streamSpin</tabstop>
-  <tabstop>logEdit</tabstop>
  </tabstops>
  <resources>
   <include location="abby.qrc"/>
@@ -1199,22 +1186,6 @@ the download reches the specified percent complete</string>
    </hints>
   </connection>
   <connection>
-   <sender>formatsButton</sender>
-   <signal>clicked()</signal>
-   <receiver>MainWindow</receiver>
-   <slot>onFormats()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>451</x>
-     <y>110</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>272</x>
-     <y>168</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
    <sender>action_Download</sender>
    <signal>activated()</signal>
    <receiver>MainWindow</receiver>
-- 
2.11.4.GIT