some clean-up on the dialog forms

This commit is contained in:
2014-12-18 16:00:22 +01:00
parent 11ea9f5457
commit fc5690599d
3 changed files with 284 additions and 344 deletions

View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>345</width> <width>349</width>
<height>237</height> <height>271</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -17,164 +17,133 @@
<iconset resource="../musredit.qrc"> <iconset resource="../musredit.qrc">
<normaloff>:/images/musrfit.xpm</normaloff>:/images/musrfit.xpm</iconset> <normaloff>:/images/musrfit.xpm</normaloff>:/images/musrfit.xpm</iconset>
</property> </property>
<widget class="QGroupBox" name="fFind_groupBox"> <widget class="QWidget" name="">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>341</width> <width>342</width>
<height>81</height> <height>264</height>
</rect> </rect>
</property> </property>
<property name="title"> <layout class="QVBoxLayout" name="verticalLayout_2">
<string>Find</string> <item>
</property> <widget class="QGroupBox" name="fFind_groupBox">
<widget class="QLabel" name="fFind_label"> <property name="title">
<property name="geometry"> <string>Find</string>
<rect> </property>
<x>10</x> <layout class="QFormLayout" name="formLayout_2">
<y>20</y> <item row="0" column="0" colspan="2">
<width>91</width> <layout class="QVBoxLayout" name="verticalLayout">
<height>16</height> <item>
</rect> <widget class="QLabel" name="fFind_label">
</property> <property name="text">
<property name="text"> <string>Text to find:</string>
<string>Text to find:</string> </property>
</property> </widget>
</widget> </item>
<widget class="QComboBox" name="fFind_comboBox"> <item>
<property name="geometry"> <widget class="QComboBox" name="fFind_comboBox">
<rect> <property name="editable">
<x>10</x> <bool>true</bool>
<y>40</y> </property>
<width>321</width> </widget>
<height>31</height> </item>
</rect> </layout>
</property> </item>
<property name="editable"> </layout>
<bool>true</bool> </widget>
</property> </item>
</widget> <item>
</widget> <widget class="QGroupBox" name="fOptions_groupBox">
<widget class="QPushButton" name="fFind_pushButton"> <property name="title">
<property name="geometry"> <string>Options</string>
<rect> </property>
<x>190</x> <property name="alignment">
<y>210</y> <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
<width>71</width> </property>
<height>25</height> <layout class="QFormLayout" name="formLayout">
</rect> <item row="0" column="0" colspan="2">
</property> <layout class="QGridLayout" name="gridLayout">
<property name="text"> <item row="0" column="0">
<string>&amp;Find</string> <widget class="QCheckBox" name="fCaseSensitive_checkBox">
</property> <property name="text">
</widget> <string>C&amp;ase Sensitive</string>
<widget class="QPushButton" name="fClose_pushButton"> </property>
<property name="geometry"> </widget>
<rect> </item>
<x>270</x> <item row="0" column="1">
<y>210</y> <widget class="QCheckBox" name="fFindBackwards_checkBox">
<width>71</width> <property name="text">
<height>25</height> <string>Find &amp;backwards</string>
</rect> </property>
</property> </widget>
<property name="text"> </item>
<string>&amp;Close</string> <item row="1" column="0">
</property> <widget class="QCheckBox" name="fWholeWordsOnly_checkBox">
</widget> <property name="text">
<widget class="QGroupBox" name="fOptions_groupBox"> <string>&amp;Whole words only</string>
<property name="geometry"> </property>
<rect> </widget>
<x>0</x> </item>
<y>80</y> <item row="1" column="1">
<width>341</width> <widget class="QCheckBox" name="fSelectedText_checkBox">
<height>121</height> <property name="text">
</rect> <string>&amp;Selected text</string>
</property> </property>
<property name="title"> </widget>
<string>Options</string> </item>
</property> <item row="2" column="0">
<property name="alignment"> <widget class="QCheckBox" name="fFromCursor_checkBox">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> <property name="text">
</property> <string>From c&amp;ursor</string>
<widget class="QCheckBox" name="fCaseSensitive_checkBox"> </property>
<property name="geometry"> </widget>
<rect> </item>
<x>10</x> </layout>
<y>30</y> </item>
<width>141</width> </layout>
<height>23</height> </widget>
</rect> </item>
</property> <item>
<property name="text"> <widget class="Line" name="line">
<string>C&amp;ase Sensitive</string> <property name="orientation">
</property> <enum>Qt::Horizontal</enum>
</widget> </property>
<widget class="QCheckBox" name="fWholeWordsOnly_checkBox"> </widget>
<property name="geometry"> </item>
<rect> <item>
<x>10</x> <layout class="QHBoxLayout" name="horizontalLayout">
<y>60</y> <item>
<width>141</width> <spacer name="horizontalSpacer">
<height>23</height> <property name="orientation">
</rect> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="text"> <property name="sizeHint" stdset="0">
<string>&amp;Whole words only</string> <size>
</property> <width>168</width>
</widget> <height>20</height>
<widget class="QCheckBox" name="fFromCursor_checkBox"> </size>
<property name="geometry"> </property>
<rect> </spacer>
<x>10</x> </item>
<y>90</y> <item>
<width>141</width> <widget class="QPushButton" name="fFind_pushButton">
<height>23</height> <property name="text">
</rect> <string>&amp;Find</string>
</property> </property>
<property name="text"> </widget>
<string>From c&amp;ursor</string> </item>
</property> <item>
</widget> <widget class="QPushButton" name="fClose_pushButton">
<widget class="QCheckBox" name="fFindBackwards_checkBox"> <property name="text">
<property name="geometry"> <string>&amp;Close</string>
<rect> </property>
<x>180</x> </widget>
<y>30</y> </item>
<width>141</width> </layout>
<height>23</height> </item>
</rect> </layout>
</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>
</widget> </widget>
</widget> </widget>
<tabstops> <tabstops>

View File

@ -176,6 +176,11 @@ p, li { white-space: pre-wrap; }
<string>Gauss</string> <string>Gauss</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Tesla</string>
</property>
</item>
<item> <item>
<property name="text"> <property name="text">
<string>MHz</string> <string>MHz</string>

View File

@ -9,8 +9,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>594</width> <width>719</width>
<height>349</height> <height>312</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -20,207 +20,173 @@
<iconset> <iconset>
<normaloff>:/musredit/musrfit.xpm</normaloff>:/musredit/musrfit.xpm</iconset> <normaloff>:/musredit/musrfit.xpm</normaloff>:/musredit/musrfit.xpm</iconset>
</property> </property>
<widget class="QWidget" name="layoutWidget"> <widget class="QWidget" name="">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
<y>310</y> <y>10</y>
<width>571</width> <width>702</width>
<height>29</height> <height>292</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QPushButton" name="fHelp_pushButton"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="text"> <item>
<string>&amp;Help</string> <layout class="QGridLayout" name="gridLayout_2">
</property> <item row="0" column="0">
</widget> <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>
<item> <item>
<spacer name="horizontalSpacer"> <widget class="QPlainTextEdit" name="fPlot_plainTextEdit"/>
<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>
<item> <item>
<widget class="QPushButton" name="fOk_pushButton"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="text"> <item>
<string>&amp;OK</string> <widget class="QPushButton" name="fHelp_pushButton">
</property> <property name="text">
</widget> <string>&amp;Help</string>
</item> </property>
<item> </widget>
<widget class="QPushButton" name="fCancel_pushButton"> </item>
<property name="text"> <item>
<string>&amp;Cancel</string> <spacer name="horizontalSpacer">
</property> <property name="orientation">
</widget> <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> </item>
</layout> </layout>
</widget> </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> </widget>
<tabstops> <tabstops>
<tabstop>fOk_pushButton</tabstop> <tabstop>fOk_pushButton</tabstop>