diff options
author | Gerald Combs <gerald@wireshark.org> | 2012-07-19 21:49:52 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2012-07-19 21:49:52 +0000 |
commit | 0da59a005829eb5daf49c6477219a35ac4e73ab3 (patch) | |
tree | 0890e6704f36a03fa1d444d4ad8e25411ec36f34 /ui/qt/main_status_bar.h | |
parent | bdb0898ff8fccc3a7fba48bd36c8a13899745177 (diff) | |
download | wireshark-0da59a005829eb5daf49c6477219a35ac4e73ab3.tar.gz |
Pass {delayed_}create_progress_dlg a pointer the top level window
so that we can properly associate a widget with create, update, and
destroy events. Only used by Qt so far but it should be easy enough to
add to GTK+.
Rename ui/qt/progress_dialog.{h,cpp} to progress_bar.{h,cpp}. Show a
progress bar in the status bar of the main window instead of creating
a separate dialog. Note that we still need to add a "cancel" mechanism
and display the task and item titles somewhere.
Thus began the War Against Gratuitous Dialogs.
svn path=/trunk/; revision=43833
Diffstat (limited to 'ui/qt/main_status_bar.h')
-rw-r--r-- | ui/qt/main_status_bar.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ui/qt/main_status_bar.h b/ui/qt/main_status_bar.h index 505078257d..0545f659fe 100644 --- a/ui/qt/main_status_bar.h +++ b/ui/qt/main_status_bar.h @@ -1,4 +1,4 @@ -/* mainStatus_bar.h +/* main_status_bar.h * * $Id$ * @@ -21,10 +21,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MAINStatus_BAR_H -#define MAINStatus_BAR_H +#ifndef MAIN_STATUS_BAR_H +#define MAIN_STATUS_BAR_H #include "label_stack.h" +#include "progress_bar.h" #include <QStatusBar> @@ -36,6 +37,7 @@ public: private: LabelStack m_infoStatus; + ProgressBar m_progressBar; LabelStack m_packetStatus; LabelStack m_profileStatus; @@ -56,4 +58,4 @@ public slots: void popProfileStatus(); }; -#endif // MAINStatus_BAR_H +#endif // MAIN_STATUS_BAR_H |