Wireshark-commits: [Wireshark-commits] master 9c28594: Add a preferences editor frame.
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: Thu, 18 Jun 2015 00:46:56 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9c28594529b79619643948128dc2bbbaa3dcbb0e
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

9c28594 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Add a preferences editor frame.
    
    This replaces the single preference editor dialog in the GTK+ UI.
    
    Change-Id: I10e030981e9f7d1ec121811593586b65cf0797c5
    Reviewed-on: https://code.wireshark.org/review/8966
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  2dd030d   Update the release notes.
    adds  9c28594   Add a preferences editor frame.


Summary of changes:
 epan/dissectors/packet-http.c                      |    4 +-
 epan/prefs-int.h                                   |    2 +-
 ui/qt/CMakeLists.txt                               |    3 +
 ui/qt/Makefile.am                                  |    2 +
 ui/qt/Makefile.common                              |    4 +
 ui/qt/Wireshark.pro                                |    3 +
 ui/qt/main_window.cpp                              |    8 +
 ui/qt/main_window.h                                |    3 +
 ui/qt/main_window.ui                               |    9 +
 ui/qt/main_window_slots.cpp                        |   43 ++--
 ui/qt/packet_list.cpp                              |    2 +
 ui/qt/packet_list.h                                |    1 +
 ui/qt/preference_editor_frame.cpp                  |  241 ++++++++++++++++++++
 ...references_menu.h => preference_editor_frame.h} |   47 ++--
 ui/qt/preference_editor_frame.ui                   |  104 +++++++++
 ui/qt/proto_tree.cpp                               |    2 +
 ui/qt/proto_tree.h                                 |    1 +
 ui/qt/protocol_preferences_menu.cpp                |  104 +++++----
 ui/qt/protocol_preferences_menu.h                  |    4 +-
 19 files changed, 513 insertions(+), 74 deletions(-)
 create mode 100644 ui/qt/preference_editor_frame.cpp
 copy ui/qt/{protocol_preferences_menu.h => preference_editor_frame.h} (55%)
 create mode 100644 ui/qt/preference_editor_frame.ui