diff options
author | Gerald Combs <gerald@wireshark.org> | 2013-02-08 01:16:46 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2013-02-08 01:16:46 +0000 |
commit | 24d67b60ab2f21aea2e4cf8be734d374a9db66ab (patch) | |
tree | 4b6b924ec2f3f255d4311130b0490e6cb279a55f /ui/qt/preferences_dialog.ui | |
parent | 4bbe78cbdf46c027504095305bb952c9e9315659 (diff) | |
download | wireshark-24d67b60ab2f21aea2e4cf8be734d374a9db66ab.tar.gz |
Add a ModulePreferencesScrollArea widget which builds a scrollable frame
for a preferences module. Use it to fill in the remaining preferences.
Don't show the printing preferences since they're not used here.
Change the titles and tooltips for some of the name resolution
preferences.
Disable the capture preferences if we can't capture. This is different
from the GTK+ version which hides it completely.
Thus concludes the preferences dialog (for the time being).
svn path=/trunk/; revision=47545
Diffstat (limited to 'ui/qt/preferences_dialog.ui')
-rw-r--r-- | ui/qt/preferences_dialog.ui | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/ui/qt/preferences_dialog.ui b/ui/qt/preferences_dialog.ui index 32b359a95f..cc9b0c7d92 100644 --- a/ui/qt/preferences_dialog.ui +++ b/ui/qt/preferences_dialog.ui @@ -69,30 +69,6 @@ </item> <item> <property name="text"> - <string>Name Resolution</string> - </property> - <property name="flags"> - <set>ItemIsDragEnabled|ItemIsUserCheckable</set> - </property> - </item> - <item> - <property name="text"> - <string>Protocols</string> - </property> - <property name="flags"> - <set>ItemIsDragEnabled|ItemIsUserCheckable</set> - </property> - </item> - <item> - <property name="text"> - <string>Statistics</string> - </property> - <property name="flags"> - <set>ItemIsDragEnabled|ItemIsUserCheckable</set> - </property> - </item> - <item> - <property name="text"> <string>Advanced</string> </property> </item> @@ -104,15 +80,15 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="currentIndex"> + <number>0</number> + </property> <widget class="MainWindowPreferencesFrame" name="appearanceFrame"/> <widget class="LayoutPreferencesFrame" name="layoutFrame"/> <widget class="ColumnPreferencesFrame" name="columnFrame"/> <widget class="FontColorPreferencesFrame" name="fontandcolorFrame"/> <widget class="CapturePreferencesFrame" name="captureFrame"/> <widget class="FilterExpressionsPreferencesFrame" name="filterExpressonsFrame"/> - <widget class="QFrame" name="nameresolutionFrame"/> - <widget class="QFrame" name="protocolsFrame"/> - <widget class="QFrame" name="statisticsFrame"/> <widget class="QFrame" name="advancedFrame"> <layout class="QVBoxLayout" name="verticalLayout_2"> <item> |