diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-09-22 09:59:02 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-09-23 02:42:14 +0000 |
| commit | d3cd4c4b28d66d5d41a6c6a10bdf6f96187108a7 (patch) | |
| tree | 9b54cf528685ec05b927ff9cd6a9028afcd39220 /ui/qt/main_window.ui | |
| parent | be3246060e465d118afa8cc80a3015bdec8ffde6 (diff) | |
Qt: Re-enable menu icons.
The GNOME HIG says "Where a corresponding toolbar icon exists, a menu
icon should mirror its design." The Windows and OS X HIGs say that you
should use them for common or familiar actions but otherwise avoid
clutter. I think icons in the "File" menu look like crap. Try to strike
a balance.
Use the 16x16 application icon for both the main web site and the wiki
since that's the favicon used on both sites.
Assume that "Reload" isn't used very often and remove it from the
toolbar.
Don't use a menu icon for the about box.
Other minor fixups.
Change-Id: I855211c218d266c2e9ed5acbe05a08750ab6d157
Reviewed-on: https://code.wireshark.org/review/4246
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.ui')
| -rw-r--r-- | ui/qt/main_window.ui | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index d24b2b0503..b667997267 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -487,7 +487,6 @@ <addaction name="actionFileOpen"/> <addaction name="actionFileSave"/> <addaction name="actionFileClose"/> - <addaction name="actionViewReload"/> <addaction name="separator"/> <addaction name="actionEditFindPacket"/> <addaction name="actionGoPreviousPacket"/> @@ -522,6 +521,9 @@ <property name="shortcut"> <string>Ctrl+O</string> </property> + <property name="iconVisibleInMenu"> + <bool>false</bool> + </property> </action> <action name="actionFileQuit"> <property name="text"> @@ -572,6 +574,9 @@ <property name="shortcut"> <string>Ctrl+W</string> </property> + <property name="iconVisibleInMenu"> + <bool>false</bool> + </property> </action> <action name="actionDummyNoFilesFound"> <property name="enabled"> @@ -582,10 +587,6 @@ </property> </action> <action name="actionHelpContents"> - <property name="icon"> - <iconset> - <normaloff>:/trolltech/styles/commonstyle/images/standardbutton-help-32.png</normaloff>:/trolltech/styles/commonstyle/images/standardbutton-help-32.png</iconset> - </property> <property name="text"> <string>&Contents</string> </property> @@ -637,6 +638,10 @@ </property> </action> <action name="actionHelpWebsite"> + <property name="icon"> + <iconset resource="../../image/toolbar.qrc"> + <normaloff>:/menu/help/wsicon16.png</normaloff>:/menu/help/wsicon16.png</iconset> + </property> <property name="text"> <string>Website</string> </property> @@ -654,7 +659,7 @@ <action name="actionHelpWiki"> <property name="icon"> <iconset resource="../../image/toolbar.qrc"> - <normaloff>:/menu/help/gnome_emblem_web_16.png</normaloff>:/menu/help/gnome_emblem_web_16.png</iconset> + <normaloff>:/menu/help/wsicon16.png</normaloff>:/menu/help/wsicon16.png</iconset> </property> <property name="text"> <string>Wiki</string> @@ -669,19 +674,12 @@ </property> </action> <action name="actionHelpAbout"> - <property name="icon"> - <iconset resource="../../image/toolbar.qrc"> - <normaloff>:/menu/help/wsicon16.png</normaloff>:/menu/help/wsicon16.png</iconset> - </property> <property name="text"> <string>&About Wireshark</string> </property> <property name="menuRole"> <enum>QAction::AboutRole</enum> </property> - <property name="iconVisibleInMenu"> - <bool>true</bool> - </property> </action> <action name="actionHelpAsk"> <property name="icon"> @@ -812,12 +810,11 @@ <property name="shortcut"> <string>Ctrl+S</string> </property> + <property name="iconVisibleInMenu"> + <bool>false</bool> + </property> </action> <action name="actionFileSaveAs"> - <property name="icon"> - <iconset> - <normaloff>:/toolbar/main/toolbar/toolbar_wireshark_file_24.png</normaloff>:/toolbar/main/toolbar/toolbar_wireshark_file_24.png</iconset> - </property> <property name="text"> <string>Save &As...</string> </property> @@ -882,6 +879,9 @@ <property name="shortcut"> <string>Ctrl+R</string> </property> + <property name="iconVisibleInMenu"> + <bool>false</bool> + </property> </action> <action name="actionCaptureOptions"> <property name="text"> |