aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2014-01-02 16:52:56 +0000
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2014-01-02 16:52:56 +0000
commit5490a6636d17ab525b61bf51168b3392260c5c4d (patch)
treed5c831e86d6105d935dc80f06365ca787013b0ce /ui/qt
parent8ef3e2fad3aa3ccd93c2392b51dd0f3839702de8 (diff)
Fix icon in top of Wireshark Qt main window
svn path=/trunk/; revision=54556
Diffstat (limited to 'ui/qt')
-rw-r--r--ui/qt/main_window.ui19
1 files changed, 5 insertions, 14 deletions
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui
index 8dd0a6648c..b9b6e4e49d 100644
--- a/ui/qt/main_window.ui
+++ b/ui/qt/main_window.ui
@@ -14,8 +14,8 @@
<string>Wireshark</string>
</property>
<property name="windowIcon">
- <iconset>
- <normaloff>:/toolbar/main/hi48-app-wireshark.png</normaloff>:/toolbar/main/hi48-app-wireshark.png</iconset>
+ <iconset resource="../../image/toolbar.qrc">
+ <normaloff>:/menu/help/wsicon16.png</normaloff>:/menu/help/wsicon16.png</iconset>
</property>
<property name="unifiedTitleAndToolBarOnMac">
<bool>true</bool>
@@ -28,16 +28,7 @@
</sizepolicy>
</property>
<layout class="QGridLayout" name="gridLayout">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
+ <property name="margin">
<number>0</number>
</property>
<property name="spacing">
@@ -68,7 +59,7 @@
<item>
<widget class="QLineEdit" name="goToLineEdit">
<property name="inputMask">
- <string>900000000</string>
+ <string>900000000; </string>
</property>
</widget>
</item>
@@ -106,7 +97,7 @@
<x>0</x>
<y>0</y>
<width>960</width>
- <height>22</height>
+ <height>27</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">