diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-06-11 15:05:44 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-06-16 03:45:54 +0000 |
| commit | ece4b01f218ab4e71233580e199e830b83958c99 (patch) | |
| tree | f7503d8f097b6e3f6406dd3f6b0c69bb46b97909 /ui/qt/main_window.ui | |
| parent | 2a3fa1418544469e7dc6f0e0fddb6eaab507b71a (diff) | |
Add the wireless toolbar.
Add the wireless toolbar to the Qt UI.
Start adding AirPcap support to ui/80211_utils. Add FCS validation
routines to ws80211_utils.
Move a bunch of AirPcap routines that require epan from caputils to
ui/gtk. They were required for driver key management, which we'll
leave to the AirPcap Control Panel in the Qt UI.
Move frequency-utils to wsutil.
Change-Id: I44446758046621d183f5c2ba9f6526bf01e084f1
Reviewed-on: https://code.wireshark.org/review/8910
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/main_window.ui')
| -rw-r--r-- | ui/qt/main_window.ui | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index de8489c108..3f06b2894b 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -110,7 +110,7 @@ <x>0</x> <y>0</y> <width>960</width> - <height>22</height> + <height>21</height> </rect> </property> <widget class="QMenu" name="menuFile"> @@ -609,6 +609,17 @@ </attribute> <addaction name="actionDisplayFilterExpression"/> </widget> + <widget class="QToolBar" name="wirelessToolBar"> + <property name="movable"> + <bool>false</bool> + </property> + <attribute name="toolBarArea"> + <enum>TopToolBarArea</enum> + </attribute> + <attribute name="toolBarBreak"> + <bool>true</bool> + </attribute> + </widget> <action name="actionFileOpen"> <property name="text"> <string>Open</string> @@ -2153,18 +2164,12 @@ <property name="checkable"> <bool>true</bool> </property> - <property name="checked"> - <bool>true</bool> - </property> <property name="text"> <string>Wire&less Toolbar</string> </property> <property name="toolTip"> <string>Show or hide the wireless toolbar</string> </property> - <property name="visible"> - <bool>false</bool> - </property> </action> <action name="actionViewStatusBar"> <property name="checkable"> |