0.2 fixes

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@490 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 66 insertions, 109 deletions

diff --git a/src/ui/forms/configdialog.ui b/src/ui/forms/configdialog.ui
index bec9f87d0..fd5e3f32b 100644
--- a/src/ui/forms/configdialog.ui
+++ b/src/ui/forms/configdialog.ui
@@ -16,33 +16,15 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <property name="leftMargin" >
-    <number>9</number>
-   </property>
-   <property name="topMargin" >
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
-    <number>9</number>
-   </property>
-   <property name="bottomMargin" >
+   <property name="margin" >
     <number>9</number>
    </property>
    <item>
     <layout class="QHBoxLayout" >
      <property name="spacing" >
-      <number>6</number>
-     </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
       <number>0</number>
      </property>
-     <property name="bottomMargin" >
+     <property name="margin" >
       <number>0</number>
      </property>
      <item>
@@ -100,7 +82,8 @@
          <string>Appearance</string>
         </property>
         <property name="icon" >
-         <iconset resource="../images/images.qrc" >:/interface.png</iconset>
+         <iconset resource="../images/images.qrc" >
+          <normaloff>:/interface.png</normaloff>:/interface.png</iconset>
         </property>
        </item>
        <item>
@@ -108,7 +91,8 @@
          <string>Playlist</string>
         </property>
         <property name="icon" >
-         <iconset resource="../images/images.qrc" >:/playlist.png</iconset>
+         <iconset resource="../images/images.qrc" >
+          <normaloff>:/playlist.png</normaloff>:/playlist.png</iconset>
         </property>
        </item>
        <item>
@@ -116,7 +100,8 @@
          <string>Plugins</string>
         </property>
         <property name="icon" >
-         <iconset resource="../images/images.qrc" >:/plugins.png</iconset>
+         <iconset resource="../images/images.qrc" >
+          <normaloff>:/plugins.png</normaloff>:/plugins.png</iconset>
         </property>
        </item>
        <item>
@@ -124,7 +109,8 @@
          <string>Advanced</string>
         </property>
         <property name="icon" >
-         <iconset resource="../images/images.qrc" >:/advanced.png</iconset>
+         <iconset resource="../images/images.qrc" >
+          <normaloff>:/advanced.png</normaloff>:/advanced.png</iconset>
         </property>
        </item>
        <item>
@@ -132,7 +118,8 @@
          <string>Connectivity</string>
         </property>
         <property name="icon" >
-         <iconset resource="../images/images.qrc" >:/network.png</iconset>
+         <iconset resource="../images/images.qrc" >
+          <normaloff>:/network.png</normaloff>:/network.png</iconset>
         </property>
        </item>
       </widget>
@@ -160,13 +147,13 @@
           <number>9</number>
          </property>
          <property name="topMargin" >
-          <number>9</number>
+          <number>5</number>
          </property>
          <property name="rightMargin" >
-          <number>9</number>
+          <number>0</number>
          </property>
          <property name="bottomMargin" >
-          <number>9</number>
+          <number>0</number>
          </property>
          <item>
           <widget class="QGroupBox" name="groupBox" >
@@ -177,16 +164,7 @@
             <property name="spacing" >
              <number>6</number>
             </property>
-            <property name="leftMargin" >
-             <number>9</number>
-            </property>
-            <property name="topMargin" >
-             <number>9</number>
-            </property>
-            <property name="rightMargin" >
-             <number>9</number>
-            </property>
-            <property name="bottomMargin" >
+            <property name="margin" >
              <number>9</number>
             </property>
             <item>
@@ -217,22 +195,10 @@
             <string>Fonts</string>
            </property>
            <layout class="QGridLayout" >
-            <property name="leftMargin" >
-             <number>9</number>
-            </property>
-            <property name="topMargin" >
-             <number>9</number>
-            </property>
-            <property name="rightMargin" >
+            <property name="margin" >
              <number>9</number>
             </property>
-            <property name="bottomMargin" >
-             <number>9</number>
-            </property>
-            <property name="horizontalSpacing" >
-             <number>6</number>
-            </property>
-            <property name="verticalSpacing" >
+            <property name="spacing" >
              <number>6</number>
             </property>
             <item row="0" column="0" >
@@ -314,28 +280,25 @@
        </widget>
        <widget class="QWidget" name="page" >
         <layout class="QVBoxLayout" >
+         <property name="topMargin" >
+          <number>5</number>
+         </property>
+         <property name="rightMargin" >
+          <number>0</number>
+         </property>
+         <property name="bottomMargin" >
+          <number>0</number>
+         </property>
          <item>
           <widget class="QGroupBox" name="groupBox_3" >
            <property name="title" >
             <string>Metadata</string>
            </property>
            <layout class="QGridLayout" >
-            <property name="leftMargin" >
+            <property name="margin" >
              <number>9</number>
             </property>
-            <property name="topMargin" >
-             <number>9</number>
-            </property>
-            <property name="rightMargin" >
-             <number>9</number>
-            </property>
-            <property name="bottomMargin" >
-             <number>9</number>
-            </property>
-            <property name="horizontalSpacing" >
-             <number>6</number>
-            </property>
-            <property name="verticalSpacing" >
+            <property name="spacing" >
              <number>6</number>
             </property>
             <item row="0" column="0" >
@@ -403,7 +366,7 @@
            <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" >
+           <property name="sizeHint" stdset="0" >
             <size>
              <width>387</width>
              <height>101</height>
@@ -419,18 +382,15 @@
           <number>9</number>
          </property>
          <property name="topMargin" >
-          <number>9</number>
+          <number>5</number>
          </property>
          <property name="rightMargin" >
-          <number>9</number>
+          <number>0</number>
          </property>
          <property name="bottomMargin" >
-          <number>9</number>
-         </property>
-         <property name="horizontalSpacing" >
-          <number>6</number>
+          <number>0</number>
          </property>
-         <property name="verticalSpacing" >
+         <property name="spacing" >
           <number>6</number>
          </property>
          <item row="1" column="0" >
@@ -452,7 +412,7 @@
            <property name="orientation" >
             <enum>Qt::Horizontal</enum>
            </property>
-           <property name="sizeHint" >
+           <property name="sizeHint" stdset="0" >
             <size>
              <width>101</width>
              <height>20</height>
@@ -479,16 +439,7 @@
              <property name="spacing" >
               <number>6</number>
              </property>
-             <property name="leftMargin" >
-              <number>9</number>
-             </property>
-             <property name="topMargin" >
-              <number>9</number>
-             </property>
-             <property name="rightMargin" >
-              <number>9</number>
-             </property>
-             <property name="bottomMargin" >
+             <property name="margin" >
               <number>9</number>
              </property>
              <item>
@@ -517,16 +468,7 @@
              <property name="spacing" >
               <number>6</number>
              </property>
-             <property name="leftMargin" >
-              <number>9</number>
-             </property>
-             <property name="topMargin" >
-              <number>9</number>
-             </property>
-             <property name="rightMargin" >
-              <number>9</number>
-             </property>
-             <property name="bottomMargin" >
+             <property name="margin" >
               <number>9</number>
              </property>
              <item>
@@ -592,6 +534,18 @@
        </widget>
        <widget class="QWidget" name="page_2" >
         <layout class="QVBoxLayout" >
+         <property name="leftMargin" >
+          <number>9</number>
+         </property>
+         <property name="topMargin" >
+          <number>5</number>
+         </property>
+         <property name="rightMargin" >
+          <number>0</number>
+         </property>
+         <property name="bottomMargin" >
+          <number>0</number>
+         </property>
          <item>
           <widget class="QGroupBox" name="groupBox_6" >
            <property name="title" >
@@ -652,7 +606,7 @@
               <property name="orientation" >
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" >
+              <property name="sizeHint" stdset="0" >
                <size>
                 <width>40</width>
                 <height>20</height>
@@ -668,7 +622,7 @@
            <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" >
+           <property name="sizeHint" stdset="0" >
             <size>
              <width>387</width>
              <height>91</height>
@@ -680,6 +634,18 @@
        </widget>
        <widget class="QWidget" name="network" >
         <layout class="QVBoxLayout" >
+         <property name="leftMargin" >
+          <number>9</number>
+         </property>
+         <property name="topMargin" >
+          <number>5</number>
+         </property>
+         <property name="rightMargin" >
+          <number>0</number>
+         </property>
+         <property name="bottomMargin" >
+          <number>0</number>
+         </property>
          <item>
           <widget class="QGroupBox" name="groupBox_5" >
            <property name="title" >
@@ -770,7 +736,7 @@
            <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" >
+           <property name="sizeHint" stdset="0" >
             <size>
              <width>20</width>
              <height>40</height>
@@ -796,16 +762,7 @@
      <property name="spacing" >
       <number>6</number>
      </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
+     <property name="margin" >
       <number>0</number>
      </property>
      <item>
@@ -813,7 +770,7 @@
        <property name="orientation" >
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0" >
         <size>
          <width>341</width>
          <height>20</height>