diff options
| author | Roland Knall <roland.knall@br-automation.com> | 2015-12-01 15:41:44 +0100 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-12-01 23:33:57 +0000 |
| commit | b932ee8f136ffeb3e78ce0f03e08df81fd18d9d4 (patch) | |
| tree | 2826b2e104b2894ae3a47c840cc1f3efce2d5420 /ui/qt/preference_editor_frame.ui | |
| parent | 96bf82ced0b58c7a4c2a6c300efeebe4f05c0ff4 (diff) | |
| download | wireshark-b932ee8f136ffeb3e78ce0f03e08df81fd18d9d4.tar.gz | |
Qt Frames: Use ButtonBox instead of buttons
In these frames the Ok and Close buttons are implemented
as standalone buttons. This leads to the scenario, that
they break plattform-ui preferences on the one hand, as
well as not being the same order throughout.
This patch replaces all Ok/Close buttons with the Qt
button box, which handles the plattform-ui internally, and
additionally allways enforces the same order.
Change-Id: If62b90016b222322f60c0962da04c8277589a57f
Reviewed-on: https://code.wireshark.org/review/12335
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/preference_editor_frame.ui')
| -rw-r--r-- | ui/qt/preference_editor_frame.ui | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/ui/qt/preference_editor_frame.ui b/ui/qt/preference_editor_frame.ui index dc740984f5..0b7ac881cd 100644 --- a/ui/qt/preference_editor_frame.ui +++ b/ui/qt/preference_editor_frame.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>458</width> - <height>22</height> + <height>29</height> </rect> </property> <property name="windowTitle"> @@ -19,7 +19,7 @@ <property name="frameShadow"> <enum>QFrame::Plain</enum> </property> - <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1,0,0,0,0,0"> + <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1,0,0,0,0"> <property name="topMargin"> <number>0</number> </property> @@ -77,16 +77,15 @@ </spacer> </item> <item> - <widget class="QToolButton" name="okButton"> - <property name="text"> - <string>OK</string> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>27</height> + </size> </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="cancelButton"> - <property name="text"> - <string>Cancel</string> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> |