diff options
| author | Gerald Combs <gerald@zing.org> | 2015-01-01 11:41:03 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-01-06 15:22:04 +0000 |
| commit | 5fb2f274280c9a9bd9c89c9b1904a12d877e155c (patch) | |
| tree | 428650756971ee3f5355a82d6b3723c15002ae09 /ui/qt/main_window.ui | |
| parent | cbca7eeb712c7365bf46ed3de8ed5c633a662bc2 (diff) | |
Qt: Add a context menu to the packet list header.
Don't carry over the sort items from the GTK+ UI (for now, at least).
Update some names. Add a column editor frame similar to the "Go to
Packet" and "Search" frames.
Change-Id: I1bd3834a26994de96894d2b7512bce2c19915c77
Reviewed-on: https://code.wireshark.org/review/6277
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/main_window.ui')
| -rw-r--r-- | ui/qt/main_window.ui | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index d9e8b78b55..572b562f28 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -27,7 +27,10 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <layout class="QGridLayout" name="gridLayout"> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> + <number>0</number> + </property> <property name="leftMargin"> <number>0</number> </property> @@ -40,10 +43,7 @@ <property name="bottomMargin"> <number>0</number> </property> - <property name="spacing"> - <number>0</number> - </property> - <item row="0" column="0"> + <item> <widget class="AccordionFrame" name="goToFrame"> <layout class="QHBoxLayout" name="goToHB"> <property name="topMargin"> @@ -65,6 +65,7 @@ </property> </spacer> </item> + <item> <widget class="QLineEdit" name="goToLineEdit"> <property name="inputMask"> @@ -89,10 +90,15 @@ </layout> </widget> </item> - <item row="1" column="0"> + + <item> <widget class="SearchFrame" name="searchFrame" native="true"/> </item> - <item row="2" column="0"> + <item> + <widget class="ColumnEditorFrame" native="true"/> + </item> + + <item> <widget class="QStackedWidget" name="mainStack"> <property name="enabled"> <bool>true</bool> @@ -101,6 +107,7 @@ <widget class="QWidget" name="packetPage"/> </widget> </item> + </layout> </widget> <widget class="QMenuBar" name="menuBar"> @@ -2236,6 +2243,12 @@ <header>accordion_frame.h</header> <container>1</container> </customwidget> + <customwidget> + <class>ColumnEditorFrame</class> + <extends>QFrame</extends> + <header>column_editor_frame.h</header> + <container>1</container> + </customwidget> </customwidgets> <resources> <include location="../../image/toolbar.qrc"/> |