Skip to content

Commit b99feff

Browse files
wwmayerwwmayer
committed
Gui: Switch back to a single Reset button
The reset button opens a menu that offers all options to reset the user settings.
1 parent 74c236f commit b99feff

File tree

3 files changed

+200
-268
lines changed

3 files changed

+200
-268
lines changed

‎src/Gui/DlgPreferences.ui‎

Lines changed: 62 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -6,163 +6,95 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>800</width>
10-
<height>600</height>
9+
<width>570</width>
10+
<height>454</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Preferences</string>
1515
</property>
16-
<property name="locale">
17-
<locale language="English" country="UnitedStates"/>
18-
</property>
1916
<property name="sizeGripEnabled">
2017
<bool>true</bool>
2118
</property>
2219
<property name="modal">
2320
<bool>true</bool>
2421
</property>
25-
<layout class="QGridLayout" name="gridLayout">
26-
<item row="1" column="0" alignment="Qt::AlignHCenter">
27-
<widget class="QToolButton" name="buttonResetAll">
28-
<property name="sizePolicy">
29-
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
30-
<horstretch>0</horstretch>
31-
<verstretch>0</verstretch>
32-
</sizepolicy>
33-
</property>
34-
<property name="minimumSize">
35-
<size>
36-
<width>120</width>
37-
<height>0</height>
38-
</size>
39-
</property>
40-
<property name="maximumSize">
41-
<size>
42-
<width>128</width>
43-
<height>16777215</height>
44-
</size>
45-
</property>
46-
<property name="text">
47-
<string>Reset All</string>
48-
</property>
49-
</widget>
50-
</item>
51-
<item row="1" column="1">
52-
<widget class="QDialogButtonBox" name="buttonBox_2">
53-
<property name="standardButtons">
54-
<set>QDialogButtonBox::Help</set>
55-
</property>
56-
</widget>
57-
</item>
58-
<item row="1" column="8" alignment="Qt::AlignRight">
59-
<widget class="QDialogButtonBox" name="buttonBox">
60-
<property name="standardButtons">
61-
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
62-
</property>
63-
</widget>
64-
</item>
65-
<item row="1" column="7">
66-
<widget class="QToolButton" name="buttonResetTab">
67-
<property name="text">
68-
<string>Reset Tab</string>
69-
</property>
70-
</widget>
71-
</item>
72-
<item row="0" column="0" colspan="9">
22+
<layout class="QGridLayout">
23+
<property name="margin">
24+
<number>9</number>
25+
</property>
26+
<property name="spacing">
27+
<number>6</number>
28+
</property>
29+
<item row="0" column="0">
7330
<layout class="QHBoxLayout">
7431
<property name="spacing">
7532
<number>6</number>
7633
</property>
77-
<property name="leftMargin">
78-
<number>0</number>
79-
</property>
80-
<property name="topMargin">
81-
<number>0</number>
82-
</property>
83-
<property name="rightMargin">
84-
<number>0</number>
85-
</property>
86-
<property name="bottomMargin">
34+
<property name="margin">
8735
<number>0</number>
8836
</property>
8937
<item>
90-
<layout class="QVBoxLayout" name="listBoxVL">
91-
<item alignment="Qt::AlignHCenter">
92-
<widget class="QListWidget" name="listBox">
93-
<property name="sizePolicy">
94-
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
95-
<horstretch>0</horstretch>
96-
<verstretch>0</verstretch>
97-
</sizepolicy>
98-
</property>
99-
<property name="minimumSize">
100-
<size>
101-
<width>120</width>
102-
<height>0</height>
103-
</size>
104-
</property>
105-
<property name="maximumSize">
106-
<size>
107-
<width>128</width>
108-
<height>16777215</height>
109-
</size>
110-
</property>
111-
<property name="frameShape">
112-
<enum>QFrame::StyledPanel</enum>
113-
</property>
114-
<property name="frameShadow">
115-
<enum>QFrame::Sunken</enum>
116-
</property>
117-
<property name="horizontalScrollBarPolicy">
118-
<enum>Qt::ScrollBarAlwaysOff</enum>
119-
</property>
120-
<property name="iconSize">
121-
<size>
122-
<width>96</width>
123-
<height>96</height>
124-
</size>
125-
</property>
126-
<property name="spacing">
127-
<number>12</number>
128-
</property>
129-
<property name="viewMode">
130-
<enum>QListView::IconMode</enum>
131-
</property>
132-
<property name="itemAlignment">
133-
<set>Qt::AlignVCenter</set>
134-
</property>
135-
</widget>
136-
</item>
137-
<item alignment="Qt::AlignHCenter">
138-
<widget class="QToolButton" name="buttonResetGroup">
139-
<property name="sizePolicy">
140-
<sizepolicy hsizetype="Fixed" vsizetype="Minimum">
141-
<horstretch>0</horstretch>
142-
<verstretch>0</verstretch>
143-
</sizepolicy>
144-
</property>
145-
<property name="minimumSize">
146-
<size>
147-
<width>120</width>
148-
<height>40</height>
149-
</size>
150-
</property>
151-
<property name="text">
152-
<string notr="true"/>
153-
</property>
154-
</widget>
155-
</item>
156-
</layout>
38+
<widget class="QListWidget" name="listBox">
39+
<property name="sizePolicy">
40+
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
41+
<horstretch>0</horstretch>
42+
<verstretch>0</verstretch>
43+
</sizepolicy>
44+
</property>
45+
<property name="minimumSize">
46+
<size>
47+
<width>120</width>
48+
<height>0</height>
49+
</size>
50+
</property>
51+
<property name="maximumSize">
52+
<size>
53+
<width>128</width>
54+
<height>16777215</height>
55+
</size>
56+
</property>
57+
<property name="frameShape">
58+
<enum>QFrame::StyledPanel</enum>
59+
</property>
60+
<property name="frameShadow">
61+
<enum>QFrame::Sunken</enum>
62+
</property>
63+
<property name="horizontalScrollBarPolicy">
64+
<enum>Qt::ScrollBarAlwaysOff</enum>
65+
</property>
66+
<property name="iconSize">
67+
<size>
68+
<width>96</width>
69+
<height>96</height>
70+
</size>
71+
</property>
72+
<property name="spacing">
73+
<number>12</number>
74+
</property>
75+
<property name="viewMode">
76+
<enum>QListView::IconMode</enum>
77+
</property>
78+
</widget>
15779
</item>
15880
<item>
15981
<widget class="QStackedWidget" name="tabWidgetStack"/>
16082
</item>
16183
</layout>
16284
</item>
85+
<item row="1" column="0">
86+
<widget class="QDialogButtonBox" name="buttonBox">
87+
<property name="standardButtons">
88+
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
89+
</property>
90+
</widget>
91+
</item>
16392
</layout>
16493
</widget>
16594
<layoutdefault spacing="6" margin="11"/>
95+
<tabstops>
96+
<tabstop>listBox</tabstop>
97+
</tabstops>
16698
<resources/>
16799
<connections>
168100
<connection>

0 commit comments

Comments
 (0)