diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-12-09 16:54:17 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-12-10 01:51:09 +0000 |
| commit | e4b0141769a9a30b4d5c8da86a27eac5c612585c (patch) | |
| tree | ed4dad2f5cfb6e9f994ff61ae85433459e66f6e2 /ui/qt/main_window_preferences_frame.ui | |
| parent | c1d4a087778ccf68f991a7262e36734ac81a5fec (diff) | |
Qt: Obey main toolbar icon preferences.
Remove the preferences for the filter toolbar and mark them GTK+-only.
Change-Id: Ie48b19aee29a1cfcea4c41ca6c08ddbba3102377
Reviewed-on: https://code.wireshark.org/review/5693
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/main_window_preferences_frame.ui')
| -rw-r--r-- | ui/qt/main_window_preferences_frame.ui | 57 |
1 files changed, 3 insertions, 54 deletions
diff --git a/ui/qt/main_window_preferences_frame.ui b/ui/qt/main_window_preferences_frame.ui index 7d4e901979..e4d817e1f7 100644 --- a/ui/qt/main_window_preferences_frame.ui +++ b/ui/qt/main_window_preferences_frame.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>425</width> - <height>421</height> + <width>405</width> + <height>416</height> </rect> </property> <property name="sizePolicy"> @@ -242,55 +242,6 @@ </layout> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_5"> - <item> - <widget class="QLabel" name="label_6"> - <property name="text"> - <string>Filter toolbar style:</string> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="filterToolbarComboBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <item> - <property name="text"> - <string>Icons only</string> - </property> - </item> - <item> - <property name="text"> - <string>Text only</string> - </property> - </item> - <item> - <property name="text"> - <string>Icons & Text</string> - </property> - </item> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_5"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - <item> <layout class="QHBoxLayout" name="horizontalLayout_6"> <item> <widget class="QLabel" name="label_7"> @@ -347,9 +298,7 @@ </item> </layout> </widget> - <resources> - <include location="../../image/languages/languages.qrc"/> - </resources> + <resources/> <connections/> <buttongroups> <buttongroup name="openInButtonGroup"/> |