From b2239669e251c853406a357007fc31ddedbd6cb0 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Tue, 4 Dec 2012 17:16:09 +0000
Subject: 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
---
 ui/qt/main_window.ui | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'ui/qt/main_window.ui')

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>
-- 
cgit v1.2.3