Cleaned up Badge widget

2 files changed, 124 insertions, 113 deletions

diff --git a/sigmodr/BadgeUI.cpp b/sigmodr/BadgeUI.cpp
index 4d1e9eb5..8ea16c4a 100644
--- a/sigmodr/BadgeUI.cpp
+++ b/sigmodr/BadgeUI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +27,8 @@
 // Qt includes
 #include <QListWidgetItem>
 
+// TODO: Use QTableView with delegates for stat editing
+
 Sigmodr::BadgeUI::BadgeUI(Sigmod::Badge* badge, QWidget* parent) :
         ObjectUI(parent)
 {
diff --git a/sigmodr/gui/badge.ui b/sigmodr/gui/badge.ui
index 573cf81d..564be478 100644
--- a/sigmodr/gui/badge.ui
+++ b/sigmodr/gui/badge.ui
@@ -1,12 +1,22 @@
 <ui version="4.0" >
  <class>formBadge</class>
  <widget class="QWidget" name="formBadge" >
-  <layout class="QVBoxLayout" >
-   <item>
-    <widget class="QGroupBox" name="boxName" >
-     <property name="title" >
-      <string comment="Label for the name of the badge" >Name</string>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="labelName" >
+     <property name="text" >
+      <string comment="Label for the name of the badge" >Name:</string>
      </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varName</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="KLineEdit" name="varName" >
      <property name="toolTip" >
       <string>The name of the badge</string>
      </property>
@@ -16,22 +26,26 @@
      <property name="whatsThis" >
       <string>The name of the badge</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KLineEdit" name="varName" >
-        <property name="showClearButton" stdset="0" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
+     <property name="showClearButton" stdset="0" >
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxObey" >
-     <property name="title" >
-      <string>Obey Level</string>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="labelObey" >
+     <property name="text" >
+      <string>Obey Level:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
      </property>
+     <property name="buddy" >
+      <cstring>varObey</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="KIntNumInput" name="varObey" >
      <property name="toolTip" >
       <string>The maximum level team members can be and always obey the player</string>
      </property>
@@ -41,118 +55,106 @@
      <property name="whatsThis" >
       <string>The maximum level team members can be and always obey the player</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KIntNumInput" name="varObey" >
-        <property name="minimum" >
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
+     <property name="minimum" >
+      <number>0</number>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="labelFace" >
+     <property name="text" >
+      <string>Face sprite:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varFace</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="KComboBox" name="varFace" >
+     <property name="toolTip" >
+      <string>The sprite used before the badge is obtained</string>
+     </property>
+     <property name="statusTip" >
+      <string>The sprite used before the badge is obtained</string>
+     </property>
+     <property name="whatsThis" >
+      <string>The sprite used before the badge is obtained</string>
+     </property>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxImages" >
-     <property name="title" >
-      <string>Images</string>
+   <item row="3" column="0" >
+    <widget class="QLabel" name="labelBadge" >
+     <property name="text" >
+      <string>Badge sprite:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
      </property>
+     <property name="buddy" >
+      <cstring>varBadge</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" >
+    <widget class="KComboBox" name="varBadge" >
      <property name="toolTip" >
-      <string>Sprites that represent the badges</string>
+      <string>The sprite used after the badge is obtained</string>
      </property>
      <property name="statusTip" >
-      <string>Sprites that represent the badges</string>
+      <string>The sprite used after the badge is obtained</string>
      </property>
      <property name="whatsThis" >
-      <string>Sprites that represent the badges</string>
-     </property>
-     <layout class="QVBoxLayout" >
-      <item>
-       <widget class="KComboBox" name="varFace" >
-        <property name="toolTip" >
-         <string>The sprite used before the badge is obtained</string>
-        </property>
-        <property name="statusTip" >
-         <string>The sprite used before the badge is obtained</string>
-        </property>
-        <property name="whatsThis" >
-         <string>The sprite used before the badge is obtained</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KComboBox" name="varBadge" >
-        <property name="toolTip" >
-         <string>The sprite used after the badge is obtained</string>
-        </property>
-        <property name="statusTip" >
-         <string>The sprite used after the badge is obtained</string>
-        </property>
-        <property name="whatsThis" >
-         <string>The sprite used after the badge is obtained</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
+      <string>The sprite used after the badge is obtained</string>
+     </property>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxStat" >
-     <property name="title" >
-      <string>Stat</string>
+   <item row="4" column="0" >
+    <widget class="QLabel" name="labelStat" >
+     <property name="text" >
+      <string>Stat:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varStat</cstring>
      </property>
+    </widget>
+   </item>
+   <item row="4" column="1" >
+    <widget class="KComboBox" name="varStat" >
      <property name="toolTip" >
-      <string>Stat modifiers for local battles when the badge is obtained</string>
+      <string>Stat multiplier for local battles when the badge is obtained</string>
      </property>
      <property name="statusTip" >
-      <string>Stat modifiers for local battles when the badge is obtained</string>
+      <string>Stat multiplier for local battles when the badge is obtained</string>
      </property>
      <property name="whatsThis" >
-      <string>Stat modifiers for local battles when the badge is obtained</string>
-     </property>
-     <layout class="QVBoxLayout" >
-      <item>
-       <widget class="KComboBox" name="varStat" >
-        <property name="toolTip" >
-         <string>Stat multiplier shown</string>
-        </property>
-        <property name="statusTip" >
-         <string>Stat multiplier shown</string>
-        </property>
-        <property name="whatsThis" >
-         <string>Stat multiplier shown</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QGroupBox" name="boxMultiplier" >
-        <property name="title" >
-         <string>Multiplier</string>
-        </property>
-        <property name="toolTip" >
-         <string>The multiplier for the stat</string>
-        </property>
-        <property name="statusTip" >
-         <string>The multiplier for the stat</string>
-        </property>
-        <property name="whatsThis" >
-         <string>The multiplier for the stat</string>
-        </property>
-        <layout class="QHBoxLayout" >
-         <item>
-          <widget class="Sigmodr::FractionWidget" name="varStatMultiplier" >
-           <property name="behavior" >
-            <enum>Sigmodr::FractionWidget::Improper</enum>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
+      <string>Stat multiplier for local battles when the badge is obtained</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1" >
+    <widget class="Sigmodr::FractionWidget" name="varStatMultiplier" >
+     <property name="toolTip" >
+      <string>The multiplier for the stat</string>
+     </property>
+     <property name="statusTip" >
+      <string>The multiplier for the stat</string>
+     </property>
+     <property name="whatsThis" >
+      <string>The multiplier for the stat</string>
+     </property>
+     <property name="behavior" >
+      <enum>Sigmodr::FractionWidget::Improper</enum>
+     </property>
     </widget>
    </item>
-   <item>
+   <item row="6" column="0" colspan="2" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -194,6 +196,13 @@
    <header>FractionWidget.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>varName</tabstop>
+  <tabstop>varObey</tabstop>
+  <tabstop>varFace</tabstop>
+  <tabstop>varBadge</tabstop>
+  <tabstop>varStat</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>