aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--image/toolbar.qrc28
-rw-r--r--image/toolbar/16x16/go-next.svg.pngbin492 -> 0 bytes
-rw-r--r--ui/qt/capture_interfaces_dialog.ui6
-rw-r--r--ui/qt/main_window.cpp11
-rw-r--r--ui/qt/main_window.ui34
-rw-r--r--ui/qt/wireshark_application.cpp2
6 files changed, 25 insertions, 56 deletions
diff --git a/image/toolbar.qrc b/image/toolbar.qrc
index 2dfff428d9..631b6cb63c 100644
--- a/image/toolbar.qrc
+++ b/image/toolbar.qrc
@@ -1,31 +1,7 @@
<RCC>
<qresource prefix="/menu/help">
- <file alias="wsicon16.png">wsicon16.png</file>
- <file alias="gnome_emblem_web_16.png">toolbar/gnome_emblem_web_16.png</file>
- <file alias="wsicon-ask.png">wsicon-ask.png</file>
- <file>toolbar/16x16/go-first.png</file>
- <file>toolbar/16x16/go-jump.png</file>
- <file>toolbar/16x16/go-last.png</file>
- <file>toolbar/16x16/go-next.png</file>
- <file>toolbar/16x16/go-next.svg.png</file>
- <file>toolbar/16x16/go-previous.svg</file>
- <file>toolbar/16x16/x-colorize-packets.png</file>
- <file>toolbar/16x16/x-resize-columns.png</file>
- <file>toolbar/16x16/x-stay-last.png</file>
- <file>toolbar/16x16/zoom-in.png</file>
- <file>toolbar/16x16/zoom-original.png</file>
- <file>toolbar/16x16/zoom-out.png</file>
- <file>toolbar/24x24/go-first.png</file>
- <file>toolbar/24x24/go-jump.png</file>
- <file>toolbar/24x24/go-last.png</file>
- <file>toolbar/24x24/go-next.png</file>
- <file>toolbar/24x24/go-previous.png</file>
- <file>toolbar/24x24/x-colorize-packets.png</file>
- <file>toolbar/24x24/x-resize-columns.png</file>
- <file>toolbar/24x24/x-stay-last.png</file>
- <file>toolbar/24x24/zoom-in.png</file>
- <file>toolbar/24x24/zoom-original.png</file>
- <file>toolbar/24x24/zoom-out.png</file>
+ <file>wsicon16.png</file>
+ <file>wsicon-ask.png</file>
</qresource>
<qresource prefix="/stock">
<file>minus-8.png</file>
diff --git a/image/toolbar/16x16/go-next.svg.png b/image/toolbar/16x16/go-next.svg.png
deleted file mode 100644
index 4085344e5d..0000000000
--- a/image/toolbar/16x16/go-next.svg.png
+++ /dev/null
Binary files differ
diff --git a/ui/qt/capture_interfaces_dialog.ui b/ui/qt/capture_interfaces_dialog.ui
index 84e33d3ea7..395e987d54 100644
--- a/ui/qt/capture_interfaces_dialog.ui
+++ b/ui/qt/capture_interfaces_dialog.ui
@@ -474,7 +474,7 @@ PLEASE NOTE: One option MUST be selected.</string>
</widget>
</item>
<item>
- <spacer name="horizontalSpacer_4">
+ <spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -504,10 +504,6 @@ PLEASE NOTE: One option MUST be selected.</string>
</layout>
<zorder>gbNewFileAuto</zorder>
<zorder>gbCaptureToFile</zorder>
- <zorder>verticalSpacer_2</zorder>
- <zorder>verticalSpacer_4</zorder>
- <zorder>verticalSpacer_5</zorder>
- <zorder>verticalSpacer_6</zorder>
</widget>
<widget class="QWidget" name="optionsTab">
<attribute name="title">
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index cc7027299e..f30650f07c 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -145,15 +145,19 @@ MainWindow::MainWindow(QWidget *parent) :
main_ui_->mainToolBar->setIconSize(QSize(24, 24));
#endif
+ // Toolbar actions. The GNOME HIG says that we should have a menu icon for each
+ // toolbar item but that clutters up our menu. Set menu icons sparingly.
+
main_ui_->actionCaptureStart->setIcon(StockIcon("x-capture-start"));
main_ui_->actionCaptureStop->setIcon(StockIcon("x-capture-stop"));
main_ui_->actionCaptureRestart->setIcon(StockIcon("x-capture-restart"));
main_ui_->actionCaptureOptions->setIcon(StockIcon("x-capture-options"));
+ // Menu icons are disabled in main_window.ui for these items.
main_ui_->actionFileOpen->setIcon(StockIcon("document-open"));
main_ui_->actionFileSave->setIcon(StockIcon("x-capture-file-save"));
main_ui_->actionFileClose->setIcon(StockIcon("x-capture-file-close"));
- main_ui_->actionViewReload->setIcon(StockIcon("x-capture-file-reload"));
+// main_ui_->actionViewReload->setIcon(StockIcon("x-capture-file-reload"));
main_ui_->actionEditFindPacket->setIcon(StockIcon("edit-find"));
main_ui_->actionGoPreviousPacket->setIcon(StockIcon("go-previous"));
@@ -193,11 +197,6 @@ MainWindow::MainWindow(QWidget *parent) :
ntb->setIconSize(QSize(24, 24));
#endif // QT_MACEXTRAS_LIB
- foreach (QMenu *menu, main_ui_->menuBar->findChildren<QMenu*>()) {
- foreach (QAction *act, menu->actions()) {
- act->setIconVisibleInMenu(false);
- }
- }
main_ui_->goToLineEdit->setAttribute(Qt::WA_MacSmallSize, true);
main_ui_->goToGo->setAttribute(Qt::WA_MacSmallSize, true);
main_ui_->goToCancel->setAttribute(Qt::WA_MacSmallSize, true);
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>&amp;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>&amp;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 &amp;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">
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index fb0991fbb6..89a70dec3f 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -593,8 +593,6 @@ WiresharkApplication::WiresharkApplication(int &argc, char **argv) :
}
#endif // Q_OS_WIN
- setAttribute(Qt::AA_DontShowIconsInMenus, true);
-
QList<int> icon_sizes = QList<int>() << 16 << 24 << 32 << 48 << 64 << 128 << 256 << 512 << 1024;
foreach (int icon_size, icon_sizes) {
QString icon_path = QString(":/wsicon/wsicon%1.png").arg(icon_size);
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-28 00:06:39 +0000