diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-10-18 21:14:43 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-10-18 21:14:43 +0000 |
| commit | 576b24c96ee4ac4ca7fb9fc116b6e8ce3704227d (patch) | |
| tree | f8e0abf64215eb0083a475acfdcea3806e4c0ba5 /ui/qt/main_window.ui | |
| parent | 05c1e47f68b609702ec13a09e5ebc1a572841e12 (diff) | |
Move ui-independent object export routines to the common ui directory.
Implement DICOM, HTTP, and SMB object exports. Rename the GTK+ export
files. C++-ize epan/tap.h. Fix an apparent memory leak in
eo_save_all_clicked_cb.
The Qt dialog has an indeterminate progress bar. I tried adding
something similar to the GTK+ dialog but event processing led down a
rabbit hole.
svn path=/trunk/; revision=45647
Diffstat (limited to 'ui/qt/main_window.ui')
| -rw-r--r-- | ui/qt/main_window.ui | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index 105e15f635..c4a01e3dfb 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -39,6 +39,12 @@ <item row="0" column="0"> <widget class="QFrame" name="goToFrame"> <layout class="QHBoxLayout" name="goToHB"> + <property name="topMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> <spacer name="horizontalSpacer"> <property name="orientation"> @@ -122,6 +128,14 @@ <addaction name="actionFileExportAsPSML"/> <addaction name="actionFileExportAsPDML"/> </widget> + <widget class="QMenu" name="menuFileExportObjects"> + <property name="title"> + <string>Export Objects</string> + </property> + <addaction name="actionFileExportObjectsDICOM"/> + <addaction name="actionFileExportObjectsHTTP"/> + <addaction name="actionFileExportObjectsSMB"/> + </widget> <addaction name="actionFileOpen"/> <addaction name="menuOpenRecentCaptureFile"/> <addaction name="actionFileMerge"/> @@ -137,7 +151,7 @@ <addaction name="menuFileExportPacketDissections"/> <addaction name="actionFileExportPacketBytes"/> <addaction name="actionFileExportSSLSessionKeys"/> - <addaction name="actionFileExportObjects"/> + <addaction name="menuFileExportObjects"/> <addaction name="separator"/> <addaction name="actionFilePrint"/> <addaction name="separator"/> @@ -611,11 +625,6 @@ <string>Export SSL Session Keys...</string> </property> </action> - <action name="actionFileExportObjects"> - <property name="text"> - <string>Export Objects...</string> - </property> - </action> <action name="actionFilePrint"> <property name="text"> <string>&Print...</string> @@ -713,6 +722,21 @@ <string>As PDML XML...</string> </property> </action> + <action name="actionFileExportObjectsHTTP"> + <property name="text"> + <string>&HTTP...</string> + </property> + </action> + <action name="actionFileExportObjectsDICOM"> + <property name="text"> + <string>&DICOM...</string> + </property> + </action> + <action name="actionFileExportObjectsSMB"> + <property name="text"> + <string>&SMB...</string> + </property> + </action> </widget> <layoutdefault spacing="6" margin="11"/> <customwidgets> |