diff options
| author | Roland Knall <rknall@gmail.com> | 2017-12-28 11:22:06 +0100 |
|---|---|---|
| committer | Roland Knall <rknall@gmail.com> | 2017-12-28 11:26:25 +0000 |
| commit | e3329cdc313e2a4c1e35a0f9d4f8777e3f9a77e1 (patch) | |
| tree | 26c867db8cca1f923bf3cc029cb5c9827de70922 /ui/qt/main_window.ui | |
| parent | fbeca26f035fe6a2a9632dee6d691629a6003d28 (diff) | |
Qt: Remove duplicate copy actions
Remove the final copy actions from MainWindow and use DataPrinter instead.
This way, MainWindow no longer is involved in copying data, and the actions
purely are defined by DataPrinter
Change-Id: Ib70ad6394dee501bb2c8d58c9d174a0eb04b47de
Reviewed-on: https://code.wireshark.org/review/25031
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'ui/qt/main_window.ui')
| -rw-r--r-- | ui/qt/main_window.ui | 54 |
1 files changed, 3 insertions, 51 deletions
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index 181d12ae96..cf1481b550 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -126,7 +126,7 @@ <widget class="FilterExpressionFrame" name="filterExpressionFrame"/> </item> <item> - <widget class="WirelessTimeline" name="wirelessTimelineWidget"/> + <widget class="WirelessTimeline" name="wirelessTimelineWidget" native="true"/> </item> <item> <widget class="QStackedWidget" name="mainStack"> @@ -144,7 +144,7 @@ <x>0</x> <y>0</y> <width>960</width> - <height>23</height> + <height>22</height> </rect> </property> <widget class="QMenu" name="menuFile"> @@ -354,7 +354,7 @@ <addaction name="actionViewFilterToolbar"/> <addaction name="actionViewWirelessToolbar"/> <addaction name="menuInterfaceToolbars"/> - <addaction name="menuAdditionalToolbars" /> + <addaction name="menuAdditionalToolbars"/> <addaction name="actionViewStatusBar"/> <addaction name="separator"/> <addaction name="actionViewFullScreen"/> @@ -2550,46 +2550,6 @@ <string>Show the currently supported protocols and display filter fields</string> </property> </action> - <action name="actionContextCopyBytesHexTextDump"> - <property name="text"> - <string>Bytes as Hex + ASCII Dump</string> - </property> - <property name="toolTip"> - <string>Copy packet bytes as a hex and ASCII dump.</string> - </property> - </action> - <action name="actionContextCopyBytesHexDump"> - <property name="text"> - <string>…as Hex Dump</string> - </property> - <property name="toolTip"> - <string>Copy packet bytes as a hex dump.</string> - </property> - </action> - <action name="actionContextCopyBytesPrintableText"> - <property name="text"> - <string>…as Printable Text</string> - </property> - <property name="toolTip"> - <string>Copy only the printable text in the packet.</string> - </property> - </action> - <action name="actionContextCopyBytesHexStream"> - <property name="text"> - <string>…as a Hex Stream</string> - </property> - <property name="toolTip"> - <string>Copy packet bytes as a stream of hex.</string> - </property> - </action> - <action name="actionContextCopyBytesBinary"> - <property name="text"> - <string>…as Raw Binary</string> - </property> - <property name="toolTip"> - <string>Copy packet bytes as application/octet-stream MIME data.</string> - </property> - </action> <action name="actionTelephonyGsmMapSummary"> <property name="text"> <string>MAP Summary</string> @@ -3006,14 +2966,6 @@ <string>Create firewall ACL rules</string> </property> </action> - <action name="actionContextCopyBytesEscapedString"> - <property name="text"> - <string>…as Escaped String</string> - </property> - <property name="toolTip"> - <string>Copy packet bytes as a Escaped string</string> - </property> - </action> <action name="actionViewFullScreen"> <property name="checkable"> <bool>true</bool> |