diff options
author | Gerald Combs <gerald@wireshark.org> | 2015-01-23 09:18:29 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2015-01-23 19:15:29 +0000 |
commit | 21dfda65d7aca254637ede42a37d604ba8c21b16 (patch) | |
tree | bb78a0f7a23000254828b8296ba9c7702e4d4e32 | |
parent | d8d2d8e09cdbc6c258ef212cd439c9a4ecf55239 (diff) |
Qt: Remove windowIcon property from our .ui files.
Setting the windowIcon property in foo.ui means we end up with a
setWindowIcon call in ui_foo.h. Along with setting the window title
bar icon, it also sets the taskbar icon on Windows. A 16x16 PNG gives
us a jaggy taskbar icon. (Windows ICO format is supported via a plugin
which might not be available everywhere, otherwise we could try using
a .ico resource.)
Move the setWindowIcon call from ge990d1b to the top of the MainWindow
constructor and enable it everywhere.
Change-Id: I4e9765200bb3676c4faa8e0ab1505ce02fb64870
Reviewed-on: https://code.wireshark.org/review/6762
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r-- | ui/qt/about_dialog.ui | 4 | ||||
-rw-r--r-- | ui/qt/capture_file_properties_dialog.ui | 4 | ||||
-rw-r--r-- | ui/qt/main_window.cpp | 5 | ||||
-rw-r--r-- | ui/qt/main_window.ui | 18 | ||||
-rw-r--r-- | ui/qt/sctp_assoc_analyse_dialog.ui | 4 |
5 files changed, 6 insertions, 29 deletions
diff --git a/ui/qt/about_dialog.ui b/ui/qt/about_dialog.ui index b64ea88ac9..10747b8043 100644 --- a/ui/qt/about_dialog.ui +++ b/ui/qt/about_dialog.ui @@ -13,10 +13,6 @@ <property name="windowTitle"> <string>About Wireshark</string> </property> - <property name="windowIcon"> - <iconset resource="../../image/toolbar.qrc"> - <normaloff>:/menu/help/wsicon16.png</normaloff>:/menu/help/wsicon16.png</iconset> - </property> <layout class="QVBoxLayout" name="verticalLayout_6"> <item> <widget class="QTabWidget" name="tabWidget"> diff --git a/ui/qt/capture_file_properties_dialog.ui b/ui/qt/capture_file_properties_dialog.ui index 5f41e22122..0e92c6b518 100644 --- a/ui/qt/capture_file_properties_dialog.ui +++ b/ui/qt/capture_file_properties_dialog.ui @@ -16,10 +16,6 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="windowIcon"> - <iconset resource="../../image/toolbar.qrc"> - <normaloff>:/menu/help/wsicon16.png</normaloff>:/menu/help/wsicon16.png</iconset> - </property> <property name="locale"> <locale language="English" country="UnitedStates"/> </property> diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index aec87f01d5..3defe4b8d0 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -181,6 +181,7 @@ MainWindow::MainWindow(QWidget *parent) : capture_session_init(&cap_session_, CaptureFile::globalCapFile()); #endif main_ui_->setupUi(this); + setWindowIcon(wsApp->normalIcon()); setTitlebarForCaptureFile(); setMenusForCaptureFile(); setForCapturedPackets(false); @@ -419,10 +420,6 @@ MainWindow::MainWindow(QWidget *parent) : #endif main_ui_->mainStack->setCurrentWidget(main_welcome_); -#if defined(Q_OS_WIN) - // For some reason "wireshark.ico" in image/wireshark.rc is jaggy. - setWindowIcon(wsApp->normalIcon()); -#endif } MainWindow::~MainWindow() diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index 572b562f28..a83e9a0aff 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -13,10 +13,6 @@ <property name="windowTitle"> <string>Wireshark</string> </property> - <property name="windowIcon"> - <iconset resource="../../image/toolbar.qrc"> - <normaloff>:/menu/help/wsicon16.png</normaloff>:/menu/help/wsicon16.png</iconset> - </property> <property name="unifiedTitleAndToolBarOnMac"> <bool>true</bool> </property> @@ -65,7 +61,6 @@ </property> </spacer> </item> - <item> <widget class="QLineEdit" name="goToLineEdit"> <property name="inputMask"> @@ -90,14 +85,12 @@ </layout> </widget> </item> - <item> <widget class="SearchFrame" name="searchFrame" native="true"/> </item> - <item> - <widget class="ColumnEditorFrame" native="true"/> - </item> - + <item> + <widget class="ColumnEditorFrame" name="columnEditorFrame"/> + </item> <item> <widget class="QStackedWidget" name="mainStack"> <property name="enabled"> @@ -107,7 +100,6 @@ <widget class="QWidget" name="packetPage"/> </widget> </item> - </layout> </widget> <widget class="QMenuBar" name="menuBar"> @@ -116,7 +108,7 @@ <x>0</x> <y>0</y> <width>960</width> - <height>22</height> + <height>21</height> </rect> </property> <widget class="QMenu" name="menuFile"> @@ -1622,7 +1614,7 @@ <property name="toolTip"> <string>Sametime statistics</string> </property> - </action> + </action> <action name="actionTelephonyISUPMessages"> <property name="text"> <string>&ISUP Messages</string> diff --git a/ui/qt/sctp_assoc_analyse_dialog.ui b/ui/qt/sctp_assoc_analyse_dialog.ui index 9725b3e77a..e16ee1df1c 100644 --- a/ui/qt/sctp_assoc_analyse_dialog.ui +++ b/ui/qt/sctp_assoc_analyse_dialog.ui @@ -19,10 +19,6 @@ <property name="windowTitle"> <string>Wireshark - Analyse Association</string> </property> - <property name="windowIcon"> - <iconset resource="../../image/toolbar.qrc"> - <normaloff>:/menu/help/wsicon16.png</normaloff>:/menu/help/wsicon16.png</iconset> - </property> <property name="locale"> <locale language="English" country="UnitedStates"/> </property> |