From 60f4150cd1e775fb2ef172ebebfe2e114245f65c Mon Sep 17 00:00:00 2001
From: craig <craig.p.drummond@gmail.com>
Date: Thu, 2 Feb 2012 21:17:59 +0000
Subject: [PATCH] Make combo part of form layout

---
 gui/tageditor.cpp |  12 +--
 gui/tageditor.ui  | 239 +++++++++++++++++++++++-----------------------
 2 files changed, 123 insertions(+), 128 deletions(-)

diff --git a/gui/tageditor.cpp b/gui/tageditor.cpp
index 0089d731d..de281d914 100644
--- a/gui/tageditor.cpp
+++ b/gui/tageditor.cpp
@@ -157,9 +157,9 @@ TagEditor::TagEditor(QWidget *parent, const QList<Song> &songs,
     foreach (const Song &s, original) {
         if (first) {
             #ifdef ENABLE_KDE_SUPPORT
-            trackName->insertItem(trackName->count(), i18n("Tags for all tracks"));
+            trackName->insertItem(trackName->count(), i18n("All tracks"));
             #else
-            trackName->insertItem(trackName->count(), tr("Tags for all tracks"));
+            trackName->insertItem(trackName->count(), tr("All tracks"));
             #endif
             first=false;
         } else {
@@ -218,9 +218,9 @@ void TagEditor::updateTrackName(int index, bool edited)
     if (edited) {
         if (isAll) {
             #ifdef ENABLE_KDE_SUPPORT
-            trackName->setItemText(index, i18n("Tags for all tracks [modified]"));
+            trackName->setItemText(index, i18n("All tracks [modified]"));
             #else
-            trackName->setItemText(index, tr("Tags for all tracks [modified]"));
+            trackName->setItemText(index, tr("All tracks [modified]"));
             #endif
         } else {
             #ifdef ENABLE_KDE_SUPPORT
@@ -232,9 +232,9 @@ void TagEditor::updateTrackName(int index, bool edited)
     } else {
         if (isAll) {
             #ifdef ENABLE_KDE_SUPPORT
-            trackName->setItemText(index, i18n("Tags for all tracks"));
+            trackName->setItemText(index, i18n("All tracks"));
             #else
-            trackName->setItemText(index, tr("Tags for all tracks"));
+            trackName->setItemText(index, tr("All tracks"));
             #endif
         } else {
             trackName->setItemText(index, original.at(index).file);
diff --git a/gui/tageditor.ui b/gui/tageditor.ui
index 20162b0d2..660de12fc 100644
--- a/gui/tageditor.ui
+++ b/gui/tageditor.ui
@@ -6,124 +6,127 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>449</width>
-    <height>246</height>
+    <width>327</width>
+    <height>252</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <item>
+  <layout class="QFormLayout" name="formLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>Track:</string>
+     </property>
+     <property name="buddy">
+      <cstring>trackName</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
     <widget class="QComboBox" name="trackName"/>
    </item>
-   <item>
-    <layout class="QFormLayout" name="formLayout">
-     <item row="0" column="0">
-      <widget class="QLabel" name="titleLabel">
-       <property name="text">
-        <string>Title:</string>
-       </property>
-       <property name="buddy">
-        <cstring>title</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="LineEdit" name="title"/>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Artist:</string>
-       </property>
-       <property name="buddy">
-        <cstring>artist</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="CompletionCombo" name="artist"/>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Album artist:</string>
-       </property>
-       <property name="buddy">
-        <cstring>albumArtist</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="CompletionCombo" name="albumArtist"/>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Album:</string>
-       </property>
-       <property name="buddy">
-        <cstring>album</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1">
-      <widget class="CompletionCombo" name="album"/>
-     </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="trackLabel">
-       <property name="text">
-        <string>Track number:</string>
-       </property>
-       <property name="buddy">
-        <cstring>track</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1">
-      <widget class="ClearSpinBox" name="track"/>
-     </item>
-     <item row="5" column="0">
-      <widget class="QLabel" name="label_6">
-       <property name="text">
-        <string>Disc number:</string>
-       </property>
-       <property name="buddy">
-        <cstring>disc</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="1">
-      <widget class="ClearSpinBox" name="disc"/>
-     </item>
-     <item row="6" column="1">
-      <widget class="CompletionCombo" name="genre"/>
-     </item>
-     <item row="6" column="0">
-      <widget class="QLabel" name="label_7">
-       <property name="text">
-        <string>Genre:</string>
-       </property>
-       <property name="buddy">
-        <cstring>genre</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="0">
-      <widget class="QLabel" name="label_8">
-       <property name="text">
-        <string>Year:</string>
-       </property>
-       <property name="buddy">
-        <cstring>year</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="1">
-      <widget class="ClearSpinBox" name="year"/>
-     </item>
-    </layout>
+   <item row="1" column="0">
+    <widget class="QLabel" name="titleLabel">
+     <property name="text">
+      <string>Title:</string>
+     </property>
+     <property name="buddy">
+      <cstring>title</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="LineEdit" name="title"/>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Artist:</string>
+     </property>
+     <property name="buddy">
+      <cstring>artist</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="CompletionCombo" name="artist"/>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Album artist:</string>
+     </property>
+     <property name="buddy">
+      <cstring>albumArtist</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="CompletionCombo" name="albumArtist"/>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Album:</string>
+     </property>
+     <property name="buddy">
+      <cstring>album</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="CompletionCombo" name="album"/>
+   </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="trackLabel">
+     <property name="text">
+      <string>Track number:</string>
+     </property>
+     <property name="buddy">
+      <cstring>track</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <widget class="ClearSpinBox" name="track"/>
+   </item>
+   <item row="6" column="0">
+    <widget class="QLabel" name="label_6">
+     <property name="text">
+      <string>Disc number:</string>
+     </property>
+     <property name="buddy">
+      <cstring>disc</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="1">
+    <widget class="ClearSpinBox" name="disc"/>
+   </item>
+   <item row="7" column="0">
+    <widget class="QLabel" name="label_7">
+     <property name="text">
+      <string>Genre:</string>
+     </property>
+     <property name="buddy">
+      <cstring>genre</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="1">
+    <widget class="CompletionCombo" name="genre"/>
+   </item>
+   <item row="8" column="0">
+    <widget class="QLabel" name="label_8">
+     <property name="text">
+      <string>Year:</string>
+     </property>
+     <property name="buddy">
+      <cstring>year</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="1">
+    <widget class="ClearSpinBox" name="year"/>
    </item>
   </layout>
  </widget>
@@ -146,14 +149,6 @@
  </customwidgets>
  <tabstops>
   <tabstop>trackName</tabstop>
-  <tabstop>title</tabstop>
-  <tabstop>artist</tabstop>
-  <tabstop>albumArtist</tabstop>
-  <tabstop>album</tabstop>
-  <tabstop>track</tabstop>
-  <tabstop>disc</tabstop>
-  <tabstop>genre</tabstop>
-  <tabstop>year</tabstop>
  </tabstops>
  <resources/>
  <connections/>