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

1 files changed, 17 insertions, 2 deletions

diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp
index babe9ac01b..ae335e2652 100644
--- a/ui/qt/main_status_bar.cpp
+++ b/ui/qt/main_status_bar.cpp
@@ -36,6 +36,7 @@
 #include "ui/main_statusbar.h"
 
 #include <QSplitter>
+#include <QHBoxLayout>
 
 #ifdef HAVE_LIBPCAP
 #define DEF_READY_MESSAGE QObject::tr(" Ready to load or capture")
@@ -128,11 +129,25 @@ MainStatusBar::MainStatusBar(QWidget *parent) :
 {
     QSplitter *splitter = new QSplitter(this);
     QString readyMsg(DEF_READY_MESSAGE);
-
+    QWidget *infoProgress = new QWidget(this);
+    QHBoxLayout *infoProgressHB = new QHBoxLayout(infoProgress);
+    int pbMargin = infoProgressHB->contentsMargins().left();
+
+    infoProgressHB->setMargin(0);
+    infoProgressHB->setContentsMargins(0, 0, 0, 0);
+    m_progressBar.setStyleSheet(QString(
+                                "ProgressBar {"
+//                                "  margin-left: %1px;"
+                                "  max-width: 8em;"
+                                "}")
+                                .arg(pbMargin)
+                                );
     // XXX - Add the expert level icon
 
     m_infoStatus.setTemporaryContext(STATUS_CTX_TEMPORARY);
-    splitter->addWidget(&m_infoStatus);
+    infoProgressHB->addWidget(&m_infoStatus);
+    infoProgressHB->addWidget(&m_progressBar);
+    splitter->addWidget(infoProgress);
     splitter->addWidget(&m_packetStatus);
     splitter->addWidget(&m_profileStatus);