From 35b9c195b3b584699a51e184bc909ac58391174c Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Fri, 28 Nov 2008 20:29:59 +0000
Subject: [PATCH] fixed layout and names.

bzr-revno: 138
---
 resources/forms/bibleimport.ui | 164 ++++++++++++++++-----------------
 1 file changed, 77 insertions(+), 87 deletions(-)

diff --git a/resources/forms/bibleimport.ui b/resources/forms/bibleimport.ui
index ead307557..cbabdd25c 100644
--- a/resources/forms/bibleimport.ui
+++ b/resources/forms/bibleimport.ui
@@ -39,15 +39,15 @@
     </rect>
    </property>
    <property name="currentIndex">
-    <number>1</number>
+    <number>0</number>
    </property>
    <widget class="QWidget" name="CSVImportPage">
     <property name="geometry">
      <rect>
       <x>0</x>
       <y>0</y>
-      <width>96</width>
-      <height>26</height>
+      <width>481</width>
+      <height>308</height>
      </rect>
     </property>
     <property name="accessibleName">
@@ -233,8 +233,8 @@
      <rect>
       <x>0</x>
       <y>0</y>
-      <width>246</width>
-      <height>265</height>
+      <width>481</width>
+      <height>308</height>
      </rect>
     </property>
     <attribute name="label">
@@ -397,113 +397,103 @@
     </layout>
    </widget>
   </widget>
-  <widget class="QGroupBox" name="groupBox">
+  <widget class="QGroupBox" name="LicenceDetailsGroupBox">
    <property name="geometry">
     <rect>
      <x>20</x>
      <y>430</y>
      <width>461</width>
-     <height>111</height>
+     <height>123</height>
     </rect>
    </property>
+   <property name="minimumSize">
+    <size>
+     <width>0</width>
+     <height>123</height>
+    </size>
+   </property>
    <property name="title">
     <string>Licence Details</string>
    </property>
-   <widget class="QLabel" name="label">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>20</y>
-      <width>54</width>
-      <height>17</height>
-     </rect>
+   <layout class="QFormLayout" name="formLayout">
+    <property name="horizontalSpacing">
+     <number>8</number>
     </property>
-    <property name="text">
-     <string>TextLabel</string>
+    <property name="verticalSpacing">
+     <number>8</number>
     </property>
-   </widget>
-   <widget class="QLabel" name="label_2">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>50</y>
-      <width>54</width>
-      <height>17</height>
-     </rect>
+    <property name="margin">
+     <number>8</number>
     </property>
-    <property name="text">
-     <string>TextLabel</string>
-    </property>
-   </widget>
-   <widget class="QLabel" name="label_3">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>80</y>
-      <width>54</width>
-      <height>17</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>TextLabel</string>
-    </property>
-   </widget>
-   <widget class="QLineEdit" name="lineEdit_4">
-    <property name="geometry">
-     <rect>
-      <x>80</x>
-      <y>20</y>
-      <width>361</width>
-      <height>23</height>
-     </rect>
-    </property>
-   </widget>
-   <widget class="QLineEdit" name="lineEdit_5">
-    <property name="geometry">
-     <rect>
-      <x>80</x>
-      <y>50</y>
-      <width>361</width>
-      <height>23</height>
-     </rect>
-    </property>
-   </widget>
-   <widget class="QLineEdit" name="lineEdit_6">
-    <property name="geometry">
-     <rect>
-      <x>80</x>
-      <y>80</y>
-      <width>361</width>
-      <height>23</height>
-     </rect>
-    </property>
-   </widget>
+    <item row="0" column="0">
+     <widget class="QLabel" name="VersionNameLabel">
+      <property name="text">
+       <string>Version Name:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="1">
+     <widget class="QLineEdit" name="VersionNameEdit"/>
+    </item>
+    <item row="1" column="0">
+     <widget class="QLabel" name="CopyrightLabel">
+      <property name="text">
+       <string>Copyright:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="1">
+     <widget class="QLineEdit" name="CopyrightEdit"/>
+    </item>
+    <item row="2" column="0">
+     <widget class="QLabel" name="PermisionLabel">
+      <property name="text">
+       <string>Permission:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="1">
+     <widget class="QLineEdit" name="PermisionEdit"/>
+    </item>
+   </layout>
   </widget>
-  <widget class="QGroupBox" name="groupBox_2">
+  <widget class="QGroupBox" name="ProgressGroupBox">
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>560</y>
+     <y>570</y>
      <width>461</width>
-     <height>71</height>
+     <height>87</height>
     </rect>
    </property>
    <property name="title">
     <string>Progress</string>
    </property>
-   <widget class="QProgressBar" name="progressBar">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>30</y>
-      <width>441</width>
-      <height>23</height>
-     </rect>
+   <layout class="QFormLayout" name="formLayout_2">
+    <property name="horizontalSpacing">
+     <number>8</number>
     </property>
-    <property name="value">
-     <number>24</number>
+    <property name="verticalSpacing">
+     <number>8</number>
     </property>
-   </widget>
+    <property name="margin">
+     <number>8</number>
+    </property>
+    <item row="0" column="0">
+     <widget class="QLabel" name="ProgressStatusLabel">
+      <property name="text">
+       <string>TextLabel</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="0" colspan="2">
+     <widget class="QProgressBar" name="progressBar">
+      <property name="value">
+       <number>24</number>
+      </property>
+     </widget>
+    </item>
+   </layout>
   </widget>
  </widget>
  <resources/>