diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-12-04 17:16:09 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-12-04 17:16:09 +0000 |
| commit | b2239669e251c853406a357007fc31ddedbd6cb0 (patch) | |
| tree | a1bfe373ec0860274c8c9ae91eeb2d0cb0d0bf01 /ui/qt/main_window.ui | |
| parent | cbd60621090e15487e4cc4ceaea753fa2470ba0a (diff) | |
Rename utilityToolBar to displayFilterToolbar and move the display
filter widget there. Add a few more items to the main toolbar. Note that
Qt 4.8 doesn't support a unified title+toolbar with multiple toolbar
rows on OS X (at least not easily) but Qt 5 might.
Disable icons-in-menus on OS X.
svn path=/trunk/; revision=46371
Diffstat (limited to 'ui/qt/main_window.ui')
| -rw-r--r-- | ui/qt/main_window.ui | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index c4a01e3dfb..3ce0fb5b4f 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -13,12 +13,6 @@ <property name="windowTitle"> <string>Wireshark</string> </property> - <property name="iconSize"> - <size> - <width>24</width> - <height>24</height> - </size> - </property> <property name="unifiedTitleAndToolBarOnMac"> <bool>true</bool> </property> @@ -254,7 +248,7 @@ </size> </property> <property name="toolButtonStyle"> - <enum>Qt::ToolButtonTextUnderIcon</enum> + <enum>Qt::ToolButtonIconOnly</enum> </property> <attribute name="toolBarArea"> <enum>TopToolBarArea</enum> @@ -265,12 +259,18 @@ <addaction name="actionStartCapture"/> <addaction name="actionStopCapture"/> <addaction name="separator"/> + <addaction name="actionFileOpen"/> + <addaction name="actionFileSave"/> + <addaction name="actionFileClose"/> </widget> <widget class="MainStatusBar" name="statusBar"/> - <widget class="QToolBar" name="utilityToolBar"> + <widget class="QToolBar" name="displayFilterToolBar"> <property name="windowTitle"> <string>toolBar</string> </property> + <property name="movable"> + <bool>false</bool> + </property> <attribute name="toolBarArea"> <enum>TopToolBarArea</enum> </attribute> |