ソースを参照

Fixed a boo-boo in the way a few of the radio buttons were placed. All radio buttons are now in button groups so that they will be mutually exclusive.
Also set buttonClose to send accept(), even though it doesn't really matter what ProgramOptions sends when it closes. (unless for some reason we decided to make a menu item in the MainForm for this dialog).


git-svn-id: file:///var/svn/tigccpp/trunk@504 9552661e-59e3-4036-b4f2-dbe53926924f

joeyadams 18 年 前
コミット
85805fec83
1 ファイル変更181 行追加153 行削除
  1. 181 153
      ktigcc/programoptions.ui

+ 181 - 153
ktigcc/programoptions.ui

@@ -391,7 +391,7 @@
                     </widget>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>layout63</cstring>
+                            <cstring>layout18</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -414,9 +414,18 @@
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QLayoutWidget">
+                            <widget class="QButtonGroup">
                                 <property name="name">
-                                    <cstring>layout62</cstring>
+                                    <cstring>buttonGroup5</cstring>
+                                </property>
+                                <property name="frameShape">
+                                    <enum>NoFrame</enum>
+                                </property>
+                                <property name="frameShadow">
+                                    <enum>Plain</enum>
+                                </property>
+                                <property name="title">
+                                    <string></string>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -543,7 +552,7 @@
                         <property name="sizeHint">
                             <size>
                                 <width>20</width>
-                                <height>30</height>
+                                <height>267</height>
                             </size>
                         </property>
                     </spacer>
@@ -1095,183 +1104,202 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel">
+                    <widget class="QButtonGroup">
                         <property name="name">
-                            <cstring>textLabel5</cstring>
+                            <cstring>buttonGroup6</cstring>
                         </property>
-                        <property name="text">
-                            <string>&lt;p&gt;The following options affect the program when it is run from the Home Screen.&lt;/p&gt;
-&lt;p&gt;Return Value:&lt;/p&gt;</string>
+                        <property name="frameShape">
+                            <enum>NoFrame</enum>
                         </property>
-                        <property name="textFormat">
-                            <enum>RichText</enum>
+                        <property name="frameShadow">
+                            <enum>Plain</enum>
                         </property>
-                    </widget>
-                    <widget class="QLayoutWidget">
-                        <property name="name">
-                            <cstring>layout16</cstring>
+                        <property name="title">
+                            <string></string>
                         </property>
-                        <hbox>
+                        <vbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <spacer>
+                            <widget class="QLabel">
                                 <property name="name">
-                                    <cstring>spacer23</cstring>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property name="sizeType">
-                                    <enum>Fixed</enum>
-                                </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <widget class="QRadioButton">
-                                <property name="name">
-                                    <cstring>HomeDone</cstring>
+                                    <cstring>textLabel5</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>"&amp;Done"</string>
+                                    <string>&lt;p&gt;The following options affect the program when it is run from the Home Screen.&lt;/p&gt;
+&lt;p&gt;Return Value:&lt;/p&gt;</string>
                                 </property>
-                                <property name="accel">
-                                    <string>Alt+D</string>
+                                <property name="textFormat">
+                                    <enum>RichText</enum>
                                 </property>
                             </widget>
-                        </hbox>
-                    </widget>
-                    <widget class="QLayoutWidget">
-                        <property name="name">
-                            <cstring>layout17</cstring>
-                        </property>
-                        <hbox>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <spacer>
-                                <property name="name">
-                                    <cstring>spacer23_2</cstring>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property name="sizeType">
-                                    <enum>Fixed</enum>
-                                </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <widget class="QRadioButton">
+                            <widget class="QLayoutWidget">
                                 <property name="name">
-                                    <cstring>HomeCustomValue</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Custom &amp;value</string>
-                                </property>
-                                <property name="accel">
-                                    <string>Alt+V</string>
+                                    <cstring>layout16</cstring>
                                 </property>
+                                <hbox>
+                                    <property name="name">
+                                        <cstring>unnamed</cstring>
+                                    </property>
+                                    <spacer>
+                                        <property name="name">
+                                            <cstring>spacer23</cstring>
+                                        </property>
+                                        <property name="orientation">
+                                            <enum>Horizontal</enum>
+                                        </property>
+                                        <property name="sizeType">
+                                            <enum>Fixed</enum>
+                                        </property>
+                                        <property name="sizeHint">
+                                            <size>
+                                                <width>20</width>
+                                                <height>20</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                    <widget class="QRadioButton">
+                                        <property name="name">
+                                            <cstring>HomeDone</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>"&amp;Done"</string>
+                                        </property>
+                                        <property name="accel">
+                                            <string>Alt+D</string>
+                                        </property>
+                                    </widget>
+                                </hbox>
                             </widget>
-                        </hbox>
-                    </widget>
-                    <widget class="QLabel">
-                        <property name="name">
-                            <cstring>textLabel6</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Note that you have to push a value to the expression stack if you use a custom return value, unless you throw an error.</string>
-                        </property>
-                        <property name="textFormat">
-                            <enum>PlainText</enum>
-                        </property>
-                        <property name="alignment">
-                            <set>WordBreak|AlignVCenter</set>
-                        </property>
-                    </widget>
-                    <widget class="QLayoutWidget">
-                        <property name="name">
-                            <cstring>layout18</cstring>
-                        </property>
-                        <hbox>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <spacer>
+                            <widget class="QLayoutWidget">
                                 <property name="name">
-                                    <cstring>spacer23_3</cstring>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property name="sizeType">
-                                    <enum>Fixed</enum>
-                                </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
+                                    <cstring>layout17</cstring>
                                 </property>
-                            </spacer>
-                            <widget class="QCheckBox">
+                                <hbox>
+                                    <property name="name">
+                                        <cstring>unnamed</cstring>
+                                    </property>
+                                    <spacer>
+                                        <property name="name">
+                                            <cstring>spacer23_2</cstring>
+                                        </property>
+                                        <property name="orientation">
+                                            <enum>Horizontal</enum>
+                                        </property>
+                                        <property name="sizeType">
+                                            <enum>Fixed</enum>
+                                        </property>
+                                        <property name="sizeHint">
+                                            <size>
+                                                <width>20</width>
+                                                <height>20</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                    <widget class="QRadioButton">
+                                        <property name="name">
+                                            <cstring>HomeCustomValue</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Custom &amp;value</string>
+                                        </property>
+                                        <property name="accel">
+                                            <string>Alt+V</string>
+                                        </property>
+                                    </widget>
+                                </hbox>
+                            </widget>
+                            <widget class="QLabel">
                                 <property name="name">
-                                    <cstring>EnableReturningErrors</cstring>
+                                    <cstring>textLabel6</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Enable returning &amp;errors to AMS</string>
+                                    <string>Note that you have to push a value to the expression stack if you use a custom return value, unless you throw an error.</string>
                                 </property>
-                                <property name="accel">
-                                    <string>Alt+E</string>
+                                <property name="textFormat">
+                                    <enum>PlainText</enum>
+                                </property>
+                                <property name="alignment">
+                                    <set>WordBreak|AlignVCenter</set>
                                 </property>
                             </widget>
-                        </hbox>
-                    </widget>
-                    <widget class="QLayoutWidget">
-                        <property name="name">
-                            <cstring>layout19</cstring>
-                        </property>
-                        <hbox>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <spacer>
+                            <widget class="QLayoutWidget">
                                 <property name="name">
-                                    <cstring>spacer23_4</cstring>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property name="sizeType">
-                                    <enum>Fixed</enum>
+                                    <cstring>layout18</cstring>
                                 </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <widget class="QCheckBox">
+                                <hbox>
+                                    <property name="name">
+                                        <cstring>unnamed</cstring>
+                                    </property>
+                                    <spacer>
+                                        <property name="name">
+                                            <cstring>spacer23_3</cstring>
+                                        </property>
+                                        <property name="orientation">
+                                            <enum>Horizontal</enum>
+                                        </property>
+                                        <property name="sizeType">
+                                            <enum>Fixed</enum>
+                                        </property>
+                                        <property name="sizeHint">
+                                            <size>
+                                                <width>20</width>
+                                                <height>20</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                    <widget class="QCheckBox">
+                                        <property name="name">
+                                            <cstring>EnableReturningErrors</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Enable returning &amp;errors to AMS</string>
+                                        </property>
+                                        <property name="accel">
+                                            <string>Alt+E</string>
+                                        </property>
+                                    </widget>
+                                </hbox>
+                            </widget>
+                            <widget class="QLayoutWidget">
                                 <property name="name">
-                                    <cstring>SaveScreen</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Save/restore &amp;LCD contents</string>
-                                </property>
-                                <property name="accel">
-                                    <string>Alt+L</string>
+                                    <cstring>layout19</cstring>
                                 </property>
+                                <hbox>
+                                    <property name="name">
+                                        <cstring>unnamed</cstring>
+                                    </property>
+                                    <spacer>
+                                        <property name="name">
+                                            <cstring>spacer23_4</cstring>
+                                        </property>
+                                        <property name="orientation">
+                                            <enum>Horizontal</enum>
+                                        </property>
+                                        <property name="sizeType">
+                                            <enum>Fixed</enum>
+                                        </property>
+                                        <property name="sizeHint">
+                                            <size>
+                                                <width>20</width>
+                                                <height>20</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                    <widget class="QCheckBox">
+                                        <property name="name">
+                                            <cstring>SaveScreen</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Save/restore &amp;LCD contents</string>
+                                        </property>
+                                        <property name="accel">
+                                            <string>Alt+L</string>
+                                        </property>
+                                    </widget>
+                                </hbox>
                             </widget>
-                        </hbox>
+                        </vbox>
                     </widget>
                     <spacer>
                         <property name="name">
@@ -1309,7 +1337,7 @@
                         <string></string>
                     </property>
                     <property name="iconSet">
-                        <iconset>whatsthis.png</iconset>
+                        <iconset></iconset>
                     </property>
                 </widget>
                 <spacer>
@@ -1358,7 +1386,7 @@
         <sender>buttonClose</sender>
         <signal>clicked()</signal>
         <receiver>ProgramOptions</receiver>
-        <slot>reject()</slot>
+        <slot>accept()</slot>
     </connection>
 </connections>
 <includes>