summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2012-08-31 12:11:44 +0000
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2012-08-31 12:11:44 +0000
commit94cbe0ce2c0a7de0a36755e94ca285606b2644ed (patch)
treefc193d51b576bbe01162d88c9f6f4d289f7e56e1
parentf332f4b78d4eb5928481da1cb8842f98bf570892 (diff)
downloadwireshark-94cbe0ce2c0a7de0a36755e94ca285606b2644ed.tar.gz
Add Q&A icon for qtshark
svn path=/trunk/; revision=44713
-rw-r--r--image/toolbar.qrc1
-rw-r--r--ui/qt/main_window.ui9
2 files changed, 9 insertions, 1 deletions
diff --git a/image/toolbar.qrc b/image/toolbar.qrc
index 26b8590f24..c8658997a8 100644
--- a/image/toolbar.qrc
+++ b/image/toolbar.qrc
@@ -7,5 +7,6 @@
<qresource prefix="/menu/help">
<file alias="wsicon16.xpm">wsicon16.xpm</file>
<file alias="wiki_24.xpm">toolbar/wiki_24.xpm</file>
+ <file alias="wsicon-ask.png">wsicon-ask.png</file>
</qresource>
</RCC>
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui
index 83b90ae378..91aa28ca6e 100644
--- a/ui/qt/main_window.ui
+++ b/ui/qt/main_window.ui
@@ -90,7 +90,7 @@
<x>0</x>
<y>0</y>
<width>960</width>
- <height>21</height>
+ <height>23</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@@ -401,9 +401,16 @@
</property>
</action>
<action name="actionHelpAsk">
+ <property name="icon">
+ <iconset resource="../../image/toolbar.qrc">
+ <normaloff>:/menu/help/wsicon-ask.png</normaloff>:/menu/help/wsicon-ask.png</iconset>
+ </property>
<property name="text">
<string>Ask (Q&amp;&amp;A)</string>
</property>
+ <property name="iconVisibleInMenu">
+ <bool>true</bool>
+ </property>
</action>
<action name="actionGoNextPacket">
<property name="text">