diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-12-23 03:45:35 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-12-23 03:45:35 +0000 |
| commit | aa347d504f65d3c8650c02a3b2cd839d11d0936b (patch) | |
| tree | 13cfbb860fbd51c277362c85e49d9a7ed2009312 /ui | |
| parent | 594b0bb11f0be09cf9cd7913badf5d9788a73756 (diff) | |
| download | wireshark-aa347d504f65d3c8650c02a3b2cd839d11d0936b.tar.gz wireshark-aa347d504f65d3c8650c02a3b2cd839d11d0936b.tar.bz2 wireshark-aa347d504f65d3c8650c02a3b2cd839d11d0936b.zip | |
Add the time shift dialog.
svn path=/trunk/; revision=46708
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | ui/qt/Makefile.am | 6 | ||||
| -rw-r--r-- | ui/qt/Makefile.common | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt index 11e2f45d02..922f745ac8 100644 --- a/ui/qt/CMakeLists.txt +++ b/ui/qt/CMakeLists.txt @@ -57,6 +57,7 @@ set(QTSHARK_H_SRC sparkline_delegate.h splash_overlay.h syntax_line_edit.h + time_shift_dialog.h wireshark_application.h # No Q_OBJECT: @@ -102,6 +103,7 @@ set(QTSHARK_CPP_SRC search_frame.cpp splash_overlay.cpp syntax_line_edit.cpp + time_shift_dialog.cpp wireshark_application.cpp ) @@ -120,6 +122,7 @@ set(QTSHARK_UI print_dialog.ui search_frame.ui splash_overlay.ui + time_shift_dialog.ui ) set(QTSHARK_QRC diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index b7c1e28a18..13d6a982e8 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -126,6 +126,11 @@ splash_overlay.h: ui_splash_overlay.h ui_splash_overlay.h: splash_overlay.ui uic $< -o $@ +time_shift_dialog.h: ui_time_shift_dialog.h + +ui_time_shift_dialog.h: time_shift_dialog.ui + uic $< -o $@ + doxygen: if HAVE_DOXYGEN $(DOXYGEN) doxygen.cfg @@ -190,5 +195,6 @@ EXTRA_DIST = \ QtShark.pro \ search_frame.ui \ splash_overlay.ui \ + time_shift_dialog.ui \ display_filter_16.svg \ gpl-template.txt diff --git a/ui/qt/Makefile.common b/ui/qt/Makefile.common index 07f46597ec..fe012df155 100644 --- a/ui/qt/Makefile.common +++ b/ui/qt/Makefile.common @@ -108,6 +108,7 @@ MOC_HDRS = \ search_frame.h \ splash_overlay.h \ syntax_line_edit.h \ + time_shift_dialog.h \ wireshark_application.h # @@ -189,6 +190,7 @@ WIRESHARK_QT_SRC = \ search_frame.cpp \ splash_overlay.cpp \ syntax_line_edit.cpp \ + time_shift_dialog.cpp \ wireshark_application.cpp noinst_HEADERS = \ |