Many updates to install dialog

1 files changed, 25 insertions, 7 deletions

diff --git a/noncore/settings/aqpkg/installdlgimpl.h b/noncore/settings/aqpkg/installdlgimpl.h
index 2f80f08..4c9f087 100644
--- a/noncore/settings/aqpkg/installdlgimpl.h
+++ b/noncore/settings/aqpkg/installdlgimpl.h
@@ -22,6 +22,13 @@ using namespace std;
 
+#include <qwidget.h>
 #include <qstring.h>
 
-#include "ipkg.h"
-#include "install.h"
+class QComboBox;
+class QLabel;
+class QMultiLineEdit;
+class QPushButton;
+
+class DataManager;
+class Destination;
+class Ipkg;
 
@@ -36,13 +43,12 @@ public:
 
-class InstallDlgImpl : public InstallDlg
+class InstallDlgImpl : public QWidget
 {
+    Q_OBJECT
 public:
-    InstallDlgImpl( vector<InstallData> &packageList, DataManager *dataManager, QWidget * parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
-    InstallDlgImpl( Ipkg *ipkg, QString initialText, QWidget * parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
+    InstallDlgImpl( vector<InstallData> &packageList, DataManager *dataManager, const char *title = 0 );
+    InstallDlgImpl( Ipkg *ipkg, QString initialText, const char *title = 0 );
     ~InstallDlgImpl();
 
-        bool showDlg();
         bool upgradeServer( QString &server );
 
-
 protected:
@@ -58,4 +64,16 @@ private:
 
+    QComboBox      *destination;
+    QPushButton    *btnInstall;
+    QPushButton    *btnOptions;
+    QMultiLineEdit *output;
+    QLabel         *txtAvailableSpace;
+
+    void init( bool );
+    
         bool runIpkg( QString &option, const QString& package, const QString& dest, int flags );
 
+signals:
+    void reloadData( InstallDlgImpl * );
+        
+public slots:
         void optionsSelected();