osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Add TFTP export for Qt too 

Change-Id: I056829d48aa49eb106c76c8f572c0f8b6e1a4245
Reviewed-on: https://code.wireshark.org/review/1916
Reviewed-by: Evan Huus <eapache@gmail.com>
This commit is contained in:
Alexis La Goutte 2014-06-02 11:24:58 +02:00 committed by Evan Huus
parent ad7b5381ac
commit 60ce7bce5f
5 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/qt/export_object_dialog.cpp
View File

@ -99,6 +99,11 @@ ExportObjectDialog::ExportObjectDialog(QWidget *parent, capture_file *cf, Object
tap_packet_ = eo_smb_packet; tap_packet_ = eo_smb_packet;
eo_protocoldata_resetfn_ = eo_smb_cleanup; eo_protocoldata_resetfn_ = eo_smb_cleanup;
break; break;
case Tftp:
tap_name_ = "tftp_eo";
name_ = "TFTP";
tap_packet_ = eo_tftp_packet;
break;
} }
save_bt_ = eo_ui_->buttonBox->button(QDialogButtonBox::Save); save_bt_ = eo_ui_->buttonBox->button(QDialogButtonBox::Save);

2
ui/qt/export_object_dialog.h
View File

@ -55,7 +55,7 @@ class ExportObjectDialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
enum ObjectType { Dicom, Http, Smb }; enum ObjectType { Dicom, Http, Smb, Tftp };
explicit ExportObjectDialog(QWidget *parent, capture_file *cf, ObjectType object_type); explicit ExportObjectDialog(QWidget *parent, capture_file *cf, ObjectType object_type);
~ExportObjectDialog(); ~ExportObjectDialog();

1
ui/qt/main_window.h
View File

@ -232,6 +232,7 @@ private slots:
void on_actionFileExportObjectsDICOM_triggered(); void on_actionFileExportObjectsDICOM_triggered();
void on_actionFileExportObjectsHTTP_triggered(); void on_actionFileExportObjectsHTTP_triggered();
void on_actionFileExportObjectsSMB_triggered(); void on_actionFileExportObjectsSMB_triggered();
void on_actionFileExportObjectsTFTP_triggered();
void on_actionFilePrint_triggered(); void on_actionFilePrint_triggered();
void on_actionFileExportPDU_triggered(); void on_actionFileExportPDU_triggered();

23
ui/qt/main_window.ui
View File

@ -28,16 +28,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
@ -68,7 +59,7 @@
<item> <item>
<widget class="QLineEdit" name="goToLineEdit"> <widget class="QLineEdit" name="goToLineEdit">
<property name="inputMask"> <property name="inputMask">
<string>900000000</string> <string>900000000; </string>
</property> </property>
</widget> </widget>
</item> </item>
@ -106,7 +97,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>960</width> <width>960</width>
<height>22</height> <height>27</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">
@ -145,6 +136,7 @@
<addaction name="actionFileExportObjectsDICOM"/> <addaction name="actionFileExportObjectsDICOM"/>
<addaction name="actionFileExportObjectsHTTP"/> <addaction name="actionFileExportObjectsHTTP"/>
<addaction name="actionFileExportObjectsSMB"/> <addaction name="actionFileExportObjectsSMB"/>
<addaction name="actionFileExportObjectsTFTP"/>
</widget> </widget>
<addaction name="actionFileOpen"/> <addaction name="actionFileOpen"/>
<addaction name="menuOpenRecentCaptureFile"/> <addaction name="menuOpenRecentCaptureFile"/>
@ -362,7 +354,7 @@
<addaction name="menu29WestQueues"/> <addaction name="menu29WestQueues"/>
<addaction name="menu29WestUIM"/> <addaction name="menu29WestUIM"/>
<addaction name="actionStatistics29WestLBTRM"/> <addaction name="actionStatistics29WestLBTRM"/>
<addaction name="actionStatistics29WestLBTRU"/> <addaction name="actionStatistics29WestLBTRU"/>
</widget> </widget>
<addaction name="actionSummary"/> <addaction name="actionSummary"/>
<addaction name="actionProtocol_Hierarchy"/> <addaction name="actionProtocol_Hierarchy"/>
@ -1707,6 +1699,11 @@
<string>Show/hide the display filter toolbar</string> <string>Show/hide the display filter toolbar</string>
</property> </property>
</action> </action>
<action name="actionFileExportObjectsTFTP">
<property name="text">
<string>&amp;TFTP</string>
</property>
</action>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<customwidgets> <customwidgets>

5
ui/qt/main_window_slots.cpp
View File

@ -1393,6 +1393,11 @@ void MainWindow::on_actionFileExportObjectsSMB_triggered()
new ExportObjectDialog(this, cap_file_, ExportObjectDialog::Smb); new ExportObjectDialog(this, cap_file_, ExportObjectDialog::Smb);
} }
void MainWindow::on_actionFileExportObjectsTFTP_triggered()
{
new ExportObjectDialog(this, cap_file_, ExportObjectDialog::Tftp);
}
void MainWindow::on_actionFilePrint_triggered() void MainWindow::on_actionFilePrint_triggered()
{ {
PrintDialog pdlg(this, cap_file_); PrintDialog pdlg(this, cap_file_);