diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-09-23 13:35:10 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-09-23 22:32:53 +0000 |
| commit | 31e86998fbaaa4e82e0c502249671025c587ef50 (patch) | |
| tree | 632b25070763766d51bbc2d291b3022f8ec47352 /ui/qt/main_window.ui | |
| parent | 3a85a5eb96aff95b1711961708b863a556d461f1 (diff) | |
Qt: Add zoom and column resize actions.
Plumb signals and slots for changing the text size in the main window.
Remove the bold font code from WiresharkApplication. It was only used in
ByteViewText. Adjust the icons a bit.
Bug: When we change the font preferences the packet list stops drawing
cached strings. I haven't been able to track down the cause.
Change-Id: I609d740c9f26265628fa4b7de1b75b0e56651387
Reviewed-on: https://code.wireshark.org/review/4269
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/main_window.ui')
| -rw-r--r-- | ui/qt/main_window.ui | 48 |
1 files changed, 45 insertions, 3 deletions
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index 41154df429..f091c98a48 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -239,6 +239,14 @@ <addaction name="actionViewToolbarMainToolbar"/> <addaction name="actionViewToolbarDisplayFilter"/> </widget> + <widget class="QMenu" name="menuZoom"> + <property name="title"> + <string>Zoom</string> + </property> + <addaction name="actionViewZoomIn"/> + <addaction name="actionViewZoomOut"/> + <addaction name="actionViewNormalSize"/> + </widget> <addaction name="separator"/> <addaction name="actionViewExpandSubtrees"/> <addaction name="actionViewExpandAll"/> @@ -246,7 +254,9 @@ <addaction name="separator"/> <addaction name="actionViewColorizePacketList"/> <addaction name="separator"/> - <addaction name="actionViewZoomIn"/> + <addaction name="menuZoom"/> + <addaction name="separator"/> + <addaction name="actionViewResizeColumns"/> <addaction name="separator"/> <addaction name="actionViewReload"/> <addaction name="menuToolbars"/> @@ -499,6 +509,11 @@ <addaction name="actionGoLastPacket"/> <addaction name="separator"/> <addaction name="actionViewColorizePacketList"/> + <addaction name="separator"/> + <addaction name="actionViewZoomIn"/> + <addaction name="actionViewZoomOut"/> + <addaction name="actionViewNormalSize"/> + <addaction name="actionViewResizeColumns"/> </widget> <widget class="MainStatusBar" name="statusBar"/> <widget class="QToolBar" name="displayFilterToolBar"> @@ -1743,7 +1758,7 @@ <string>Colorize Packet List</string> </property> <property name="toolTip"> - <string>Color packets according to the coloring rules</string> + <string>Draw packets using your coloring rules</string> </property> </action> <action name="actionViewZoomIn"> @@ -1754,7 +1769,34 @@ <string>Enlarge the main window text</string> </property> <property name="shortcut"> - <string>Meta++</string> + <string>Ctrl++</string> + </property> + </action> + <action name="actionViewZoomOut"> + <property name="text"> + <string>Zoom Out</string> + </property> + <property name="shortcut"> + <string>Ctrl+-</string> + </property> + </action> + <action name="actionViewNormalSize"> + <property name="text"> + <string>Normal Size</string> + </property> + <property name="shortcut"> + <string>Ctrl+0</string> + </property> + </action> + <action name="actionViewResizeColumns"> + <property name="text"> + <string>Resize Columns</string> + </property> + <property name="toolTip"> + <string>Resize packet list columns to fit contents</string> + </property> + <property name="shortcut"> + <string>Ctrl+Shift+R</string> </property> </action> </widget> |