Wireshark-commits: [Wireshark-commits] master 21dfda6: Qt: Remove windowIcon property from our .ui
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 23 Jan 2015 19:15:33 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=21dfda65d7aca254637ede42a37d604ba8c21b16
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

21dfda6 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    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@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  d8d2d8e   jpeg: Add handling for comment marker
    adds  21dfda6   Qt: Remove windowIcon property from our .ui files.


Summary of changes:
 ui/qt/about_dialog.ui                   |    4 ----
 ui/qt/capture_file_properties_dialog.ui |    4 ----
 ui/qt/main_window.cpp                   |    5 +----
 ui/qt/main_window.ui                    |   18 +++++-------------
 ui/qt/sctp_assoc_analyse_dialog.ui      |    4 ----
 5 files changed, 6 insertions(+), 29 deletions(-)