Skip to content

Commit 949f516

Browse files
author
timlinux
committed
Use button box for cross platform consistency
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8550 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent c3f44c1 commit 949f516

File tree

2 files changed

+69
-75
lines changed

2 files changed

+69
-75
lines changed

‎src/app/qgsludialog.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ QgsLUDialog::QgsLUDialog(QWidget *parent, Qt::WFlags fl)
2323
: QDialog(parent, fl)
2424
{
2525
setupUi(this);
26-
connect(mOkButton, SIGNAL(clicked()), this, SLOT(accept()));
27-
connect(mCancelButton, SIGNAL(clicked()), this, SLOT(reject()));
2826
}
2927

3028
QgsLUDialog::~QgsLUDialog()

‎src/ui/qgsludialogbase.ui‎

Lines changed: 69 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<rect>
66
<x>0</x>
77
<y>0</y>
8-
<width>340</width>
9-
<height>159</height>
8+
<width>324</width>
9+
<height>133</height>
1010
</rect>
1111
</property>
1212
<property name="windowTitle" >
@@ -16,15 +16,24 @@
1616
<bool>true</bool>
1717
</property>
1818
<layout class="QGridLayout" >
19-
<property name="margin" >
20-
<number>10</number>
19+
<property name="leftMargin" >
20+
<number>4</number>
2121
</property>
22-
<property name="spacing" >
23-
<number>6</number>
22+
<property name="topMargin" >
23+
<number>4</number>
24+
</property>
25+
<property name="rightMargin" >
26+
<number>4</number>
27+
</property>
28+
<property name="bottomMargin" >
29+
<number>4</number>
30+
</property>
31+
<property name="horizontalSpacing" >
32+
<number>-1</number>
33+
</property>
34+
<property name="verticalSpacing" >
35+
<number>-1</number>
2436
</property>
25-
<item row="1" column="0" >
26-
<widget class="QLineEdit" name="mLowerEdit" />
27-
</item>
2837
<item row="0" column="0" >
2938
<widget class="QLabel" name="mLowerLabel" >
3039
<property name="text" >
@@ -46,11 +55,24 @@
4655
<property name="sizeHint" >
4756
<size>
4857
<width>16</width>
49-
<height>21</height>
58+
<height>49</height>
5059
</size>
5160
</property>
5261
</spacer>
5362
</item>
63+
<item row="0" column="2" >
64+
<widget class="QLabel" name="mUpperLabel" >
65+
<property name="text" >
66+
<string>Upper value</string>
67+
</property>
68+
<property name="buddy" >
69+
<cstring>mUpperEdit</cstring>
70+
</property>
71+
</widget>
72+
</item>
73+
<item row="1" column="0" >
74+
<widget class="QLineEdit" name="mLowerEdit" />
75+
</item>
5476
<item row="1" column="1" >
5577
<widget class="QLabel" name="mBetweenLabel" >
5678
<property name="text" >
@@ -65,74 +87,48 @@
6587
<widget class="QLineEdit" name="mUpperEdit" />
6688
</item>
6789
<item row="2" column="0" colspan="3" >
68-
<layout class="QHBoxLayout" >
69-
<property name="margin" >
70-
<number>0</number>
71-
</property>
72-
<property name="spacing" >
73-
<number>6</number>
74-
</property>
75-
<item>
76-
<spacer>
77-
<property name="orientation" >
78-
<enum>Qt::Horizontal</enum>
79-
</property>
80-
<property name="sizeType" >
81-
<enum>QSizePolicy::Expanding</enum>
82-
</property>
83-
<property name="sizeHint" >
84-
<size>
85-
<width>100</width>
86-
<height>20</height>
87-
</size>
88-
</property>
89-
</spacer>
90-
</item>
91-
<item>
92-
<widget class="QPushButton" name="mOkButton" >
93-
<property name="text" >
94-
<string>OK</string>
95-
</property>
96-
</widget>
97-
</item>
98-
<item>
99-
<widget class="QPushButton" name="mCancelButton" >
100-
<property name="text" >
101-
<string>Cancel</string>
102-
</property>
103-
</widget>
104-
</item>
105-
<item>
106-
<spacer>
107-
<property name="orientation" >
108-
<enum>Qt::Horizontal</enum>
109-
</property>
110-
<property name="sizeType" >
111-
<enum>QSizePolicy::Expanding</enum>
112-
</property>
113-
<property name="sizeHint" >
114-
<size>
115-
<width>31</width>
116-
<height>20</height>
117-
</size>
118-
</property>
119-
</spacer>
120-
</item>
121-
</layout>
122-
</item>
123-
<item row="0" column="2" >
124-
<widget class="QLabel" name="mUpperLabel" >
125-
<property name="text" >
126-
<string>Upper value</string>
127-
</property>
128-
<property name="buddy" >
129-
<cstring>mUpperEdit</cstring>
90+
<widget class="QDialogButtonBox" name="buttonBox" >
91+
<property name="standardButtons" >
92+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
13093
</property>
13194
</widget>
13295
</item>
13396
</layout>
13497
</widget>
13598
<layoutdefault spacing="6" margin="11" />
13699
<resources/>
137-
<connections/>
100+
<connections>
101+
<connection>
102+
<sender>buttonBox</sender>
103+
<signal>accepted()</signal>
104+
<receiver>QgsLUDialogBase</receiver>
105+
<slot>accept()</slot>
106+
<hints>
107+
<hint type="sourcelabel" >
108+
<x>285</x>
109+
<y>120</y>
110+
</hint>
111+
<hint type="destinationlabel" >
112+
<x>321</x>
113+
<y>35</y>
114+
</hint>
115+
</hints>
116+
</connection>
117+
<connection>
118+
<sender>buttonBox</sender>
119+
<signal>rejected()</signal>
120+
<receiver>QgsLUDialogBase</receiver>
121+
<slot>reject()</slot>
122+
<hints>
123+
<hint type="sourcelabel" >
124+
<x>209</x>
125+
<y>116</y>
126+
</hint>
127+
<hint type="destinationlabel" >
128+
<x>151</x>
129+
<y>7</y>
130+
</hint>
131+
</hints>
132+
</connection>
133+
</connections>
138134
</ui>

0 commit comments

Comments
 (0)