From fc5690599dd91956f258e909b3d2e09dcf3cd1fc Mon Sep 17 00:00:00 2001
From: Suter Andreas <andreas.suter@psi.ch>
Date: Thu, 18 Dec 2014 16:00:22 +0100
Subject: [PATCH] some clean-up on the dialog forms

---
 src/musredit/forms/PFindDialog.ui            | 277 +++++++--------
 src/musredit/forms/PGetFourierBlockDialog.ui |   5 +
 src/musredit/forms/PGetPlotBlockDialog.ui    | 346 +++++++++----------
 3 files changed, 284 insertions(+), 344 deletions(-)

diff --git a/src/musredit/forms/PFindDialog.ui b/src/musredit/forms/PFindDialog.ui
index 7df2bfca..b47be748 100644
--- a/src/musredit/forms/PFindDialog.ui
+++ b/src/musredit/forms/PFindDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>345</width>
-    <height>237</height>
+    <width>349</width>
+    <height>271</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,164 +17,133 @@
    <iconset resource="../musredit.qrc">
     <normaloff>:/images/musrfit.xpm</normaloff>:/images/musrfit.xpm</iconset>
   </property>
-  <widget class="QGroupBox" name="fFind_groupBox">
+  <widget class="QWidget" name="">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>341</width>
-     <height>81</height>
+     <width>342</width>
+     <height>264</height>
     </rect>
    </property>
-   <property name="title">
-    <string>Find</string>
-   </property>
-   <widget class="QLabel" name="fFind_label">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>20</y>
-      <width>91</width>
-      <height>16</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Text to find:</string>
-    </property>
-   </widget>
-   <widget class="QComboBox" name="fFind_comboBox">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>40</y>
-      <width>321</width>
-      <height>31</height>
-     </rect>
-    </property>
-    <property name="editable">
-     <bool>true</bool>
-    </property>
-   </widget>
-  </widget>
-  <widget class="QPushButton" name="fFind_pushButton">
-   <property name="geometry">
-    <rect>
-     <x>190</x>
-     <y>210</y>
-     <width>71</width>
-     <height>25</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>&amp;Find</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="fClose_pushButton">
-   <property name="geometry">
-    <rect>
-     <x>270</x>
-     <y>210</y>
-     <width>71</width>
-     <height>25</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>&amp;Close</string>
-   </property>
-  </widget>
-  <widget class="QGroupBox" name="fOptions_groupBox">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>80</y>
-     <width>341</width>
-     <height>121</height>
-    </rect>
-   </property>
-   <property name="title">
-    <string>Options</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-   </property>
-   <widget class="QCheckBox" name="fCaseSensitive_checkBox">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>30</y>
-      <width>141</width>
-      <height>23</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>C&amp;ase Sensitive</string>
-    </property>
-   </widget>
-   <widget class="QCheckBox" name="fWholeWordsOnly_checkBox">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>60</y>
-      <width>141</width>
-      <height>23</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>&amp;Whole words only</string>
-    </property>
-   </widget>
-   <widget class="QCheckBox" name="fFromCursor_checkBox">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>90</y>
-      <width>141</width>
-      <height>23</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>From c&amp;ursor</string>
-    </property>
-   </widget>
-   <widget class="QCheckBox" name="fFindBackwards_checkBox">
-    <property name="geometry">
-     <rect>
-      <x>180</x>
-      <y>30</y>
-      <width>141</width>
-      <height>23</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Find &amp;backwards</string>
-    </property>
-   </widget>
-   <widget class="QCheckBox" name="fSelectedText_checkBox">
-    <property name="geometry">
-     <rect>
-      <x>180</x>
-      <y>60</y>
-      <width>141</width>
-      <height>23</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>&amp;Selected text</string>
-    </property>
-   </widget>
-  </widget>
-  <widget class="Line" name="line">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>200</y>
-     <width>351</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
+   <layout class="QVBoxLayout" name="verticalLayout_2">
+    <item>
+     <widget class="QGroupBox" name="fFind_groupBox">
+      <property name="title">
+       <string>Find</string>
+      </property>
+      <layout class="QFormLayout" name="formLayout_2">
+       <item row="0" column="0" colspan="2">
+        <layout class="QVBoxLayout" name="verticalLayout">
+         <item>
+          <widget class="QLabel" name="fFind_label">
+           <property name="text">
+            <string>Text to find:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="fFind_comboBox">
+           <property name="editable">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+    </item>
+    <item>
+     <widget class="QGroupBox" name="fOptions_groupBox">
+      <property name="title">
+       <string>Options</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+      </property>
+      <layout class="QFormLayout" name="formLayout">
+       <item row="0" column="0" colspan="2">
+        <layout class="QGridLayout" name="gridLayout">
+         <item row="0" column="0">
+          <widget class="QCheckBox" name="fCaseSensitive_checkBox">
+           <property name="text">
+            <string>C&amp;ase Sensitive</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QCheckBox" name="fFindBackwards_checkBox">
+           <property name="text">
+            <string>Find &amp;backwards</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QCheckBox" name="fWholeWordsOnly_checkBox">
+           <property name="text">
+            <string>&amp;Whole words only</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QCheckBox" name="fSelectedText_checkBox">
+           <property name="text">
+            <string>&amp;Selected text</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QCheckBox" name="fFromCursor_checkBox">
+           <property name="text">
+            <string>From c&amp;ursor</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+    </item>
+    <item>
+     <widget class="Line" name="line">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>168</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="fFind_pushButton">
+        <property name="text">
+         <string>&amp;Find</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="fClose_pushButton">
+        <property name="text">
+         <string>&amp;Close</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+   </layout>
   </widget>
  </widget>
  <tabstops>
diff --git a/src/musredit/forms/PGetFourierBlockDialog.ui b/src/musredit/forms/PGetFourierBlockDialog.ui
index 447bf439..fb742e99 100644
--- a/src/musredit/forms/PGetFourierBlockDialog.ui
+++ b/src/musredit/forms/PGetFourierBlockDialog.ui
@@ -176,6 +176,11 @@ p, li { white-space: pre-wrap; }
      <string>Gauss</string>
     </property>
    </item>
+   <item>
+    <property name="text">
+     <string>Tesla</string>
+    </property>
+   </item>
    <item>
     <property name="text">
      <string>MHz</string>
diff --git a/src/musredit/forms/PGetPlotBlockDialog.ui b/src/musredit/forms/PGetPlotBlockDialog.ui
index 6da647ec..575b3f35 100644
--- a/src/musredit/forms/PGetPlotBlockDialog.ui
+++ b/src/musredit/forms/PGetPlotBlockDialog.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>594</width>
-    <height>349</height>
+    <width>719</width>
+    <height>312</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,207 +20,173 @@
    <iconset>
     <normaloff>:/musredit/musrfit.xpm</normaloff>:/musredit/musrfit.xpm</iconset>
   </property>
-  <widget class="QWidget" name="layoutWidget">
+  <widget class="QWidget" name="">
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>310</y>
-     <width>571</width>
-     <height>29</height>
+     <y>10</y>
+     <width>702</width>
+     <height>292</height>
     </rect>
    </property>
-   <layout class="QHBoxLayout" name="horizontalLayout">
+   <layout class="QVBoxLayout" name="verticalLayout">
     <item>
-     <widget class="QPushButton" name="fHelp_pushButton">
-      <property name="text">
-       <string>&amp;Help</string>
-      </property>
-     </widget>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="0" column="0">
+         <widget class="QLabel" name="fType_label">
+          <property name="font">
+           <font>
+            <pointsize>9</pointsize>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Type</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QComboBox" name="fType_comboBox">
+          <item>
+           <property name="text">
+            <string>Single Histo</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Asymmetry</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>MuMinus</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>NonMusr</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="fRunList_label">
+          <property name="font">
+           <font>
+            <pointsize>9</pointsize>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Run List</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="fRunList_lineEdit"/>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="0" column="0">
+         <widget class="QLabel" name="fXRange_label">
+          <property name="font">
+           <font>
+            <pointsize>9</pointsize>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Time-/x-Range</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="fXRangeLow_lineEdit"/>
+        </item>
+        <item row="0" column="2">
+         <widget class="QLineEdit" name="fXRangeUp_lineEdit"/>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="fYRange_label">
+          <property name="font">
+           <font>
+            <pointsize>9</pointsize>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>y-Range</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="fYRangeLow_lineEdit"/>
+        </item>
+        <item row="1" column="2">
+         <widget class="QLineEdit" name="fYRangeUp_lineEdit"/>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QPushButton" name="fAdd_pushButton">
+        <property name="text">
+         <string>&amp;Add</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </item>
     <item>
-     <spacer name="horizontalSpacer">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>118</width>
-        <height>20</height>
-       </size>
-      </property>
-     </spacer>
+     <widget class="QPlainTextEdit" name="fPlot_plainTextEdit"/>
     </item>
     <item>
-     <widget class="QPushButton" name="fOk_pushButton">
-      <property name="text">
-       <string>&amp;OK</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QPushButton" name="fCancel_pushButton">
-      <property name="text">
-       <string>&amp;Cancel</string>
-      </property>
-     </widget>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QPushButton" name="fHelp_pushButton">
+        <property name="text">
+         <string>&amp;Help</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>118</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="fOk_pushButton">
+        <property name="text">
+         <string>&amp;OK</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="fCancel_pushButton">
+        <property name="text">
+         <string>&amp;Cancel</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </item>
    </layout>
   </widget>
-  <widget class="QPlainTextEdit" name="fPlot_plainTextEdit">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>70</y>
-     <width>571</width>
-     <height>231</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QLabel" name="fType_label">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>15</y>
-     <width>46</width>
-     <height>13</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Type</string>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="fType_comboBox">
-   <property name="geometry">
-    <rect>
-     <x>60</x>
-     <y>10</y>
-     <width>141</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <item>
-    <property name="text">
-     <string>Single Histo</string>
-    </property>
-   </item>
-   <item>
-    <property name="text">
-     <string>Asymmetry</string>
-    </property>
-   </item>
-   <item>
-    <property name="text">
-     <string>MuMinus</string>
-    </property>
-   </item>
-   <item>
-    <property name="text">
-     <string>NonMusr</string>
-    </property>
-   </item>
-  </widget>
-  <widget class="QLabel" name="fRunList_label">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>45</y>
-     <width>46</width>
-     <height>13</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Run List</string>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="fRunList_lineEdit">
-   <property name="geometry">
-    <rect>
-     <x>60</x>
-     <y>40</y>
-     <width>141</width>
-     <height>20</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QLabel" name="fXRange_label">
-   <property name="geometry">
-    <rect>
-     <x>220</x>
-     <y>15</y>
-     <width>91</width>
-     <height>13</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Time-/x-Range</string>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="fXRangeLow_lineEdit">
-   <property name="geometry">
-    <rect>
-     <x>320</x>
-     <y>10</y>
-     <width>81</width>
-     <height>20</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="fXRangeUp_lineEdit">
-   <property name="geometry">
-    <rect>
-     <x>410</x>
-     <y>10</y>
-     <width>81</width>
-     <height>20</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QLabel" name="fYRange_label">
-   <property name="geometry">
-    <rect>
-     <x>220</x>
-     <y>45</y>
-     <width>61</width>
-     <height>13</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>y-Range</string>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="fYRangeLow_lineEdit">
-   <property name="geometry">
-    <rect>
-     <x>320</x>
-     <y>40</y>
-     <width>81</width>
-     <height>20</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="fYRangeUp_lineEdit">
-   <property name="geometry">
-    <rect>
-     <x>410</x>
-     <y>40</y>
-     <width>81</width>
-     <height>20</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="fAdd_pushButton">
-   <property name="geometry">
-    <rect>
-     <x>500</x>
-     <y>25</y>
-     <width>75</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>&amp;Add</string>
-   </property>
-  </widget>
  </widget>
  <tabstops>
   <tabstop>fOk_pushButton</tabstop>