gui fixes

5 files changed, 33 insertions, 14 deletions

diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 6bf9a7a..c95f482 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -22,2 +22,3 @@
 #include <qcombobox.h>
+#include <qmessagebox.h>
 #include <qlayout.h>
@@ -27,2 +28,3 @@
 
+
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
@@ -37,2 +39,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
 
+        //wait = new QMessageBox(tr("oipkg"),tr("Please wait")//,QMessageBox::Information,QMessageBox::NoButton,QMessageBox::NoButton,QMessageBox::NoButton);
+        wait = new QMessageBox(this);
+         wait->setText(tr("Please wait"));
+
         channel = new QCopChannel( "QPE/Application/oipkg", this );
@@ -196,2 +202,3 @@ void MainWindow::updateList()
 {
+        wait->show();
         QTimer *t = new QTimer( this );
@@ -202,3 +209,5 @@ void MainWindow::updateList()
   getList();
-          t->stop(); 
+  t->stop();
+        wait->hide();
+          
 }
@@ -207,4 +216,6 @@ void MainWindow::getList()
 {
+        wait->show();
   packageList.update();
   displayList();
+        wait->hide();
 }
@@ -213,2 +224,3 @@ void MainWindow::filterList()
 {
+        wait->show();
          QString f = "";
@@ -216,2 +228,3 @@ void MainWindow::filterList()
   packageList.filterPackages( f );
+        wait->hide();
 }
@@ -220,2 +233,3 @@ void MainWindow::displayList()
 {
+        wait->hide();
         filterList();
diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h
index bcb0cc9..a713d00 100644
--- a/noncore/unsupported/oipkg/mainwindow.h
+++ b/noncore/unsupported/oipkg/mainwindow.h
@@ -18,2 +18,3 @@ class PackageListItem;
 class QCopChannel;
+class QMessageBox;
 
@@ -71,2 +72,3 @@ private:
   QComboBox *subsection;
+  QMessageBox *wait;
 private slots:
diff --git a/noncore/unsupported/oipkg/pksettings.cpp b/noncore/unsupported/oipkg/pksettings.cpp
index f84a9c4..be01837 100644
--- a/noncore/unsupported/oipkg/pksettings.cpp
+++ b/noncore/unsupported/oipkg/pksettings.cpp
@@ -296,5 +296,5 @@ void PackageManagerSettings::readInstallationSetting(int setting)
       if ( activeDestination->text( i ) == dest )
-        activeDestination->setCurrentItem( i );
+                                activeDestination->setCurrentItem( i );
       if ( activeLinkDestination->text( i ) == linkdest )
-        activeLinkDestination->setCurrentItem( i );
+                                activeLinkDestination->setCurrentItem( i );
     }
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index f0992f5..ecc97b2 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -204,4 +204,4 @@ void PmIpkg::startDialog()
 {
-  QDialog *d = new QDialog();
-  QGridLayout *RunWindowLayout = new QGridLayout( d );
+  installDialog = new QDialog(0,0,true);
+  QGridLayout *RunWindowLayout = new QGridLayout( installDialog );
   RunWindowLayout->setSpacing( 2 );
@@ -213,3 +213,3 @@ void PmIpkg::startDialog()
 
-    PackageListView *plv = new PackageListView(d, "install",settings);
+    PackageListView *plv = new PackageListView(installDialog, "install",settings);
     RunWindowLayout->addWidget( plv, 1, 0 );
@@ -223,3 +223,3 @@ void PmIpkg::startDialog()
     }
-    QPushButton *doItButton = new QPushButton( d, "doItButton" );
+    QPushButton *doItButton = new QPushButton( installDialog, "doItButton" );
     doItButton->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, doItButton->sizePolicy().hasHeightForWidth() ) );
@@ -232,3 +232,3 @@ void PmIpkg::startDialog()
 
-    QPushButton *installButton = new QPushButton( d, "installButton" );
+    QPushButton *installButton = new QPushButton( installDialog, "installButton" );
     QFont installButton_font(  installButton->font() );
@@ -240,3 +240,3 @@ void PmIpkg::startDialog()
 
-    QPushButton *removeButton = new QPushButton( d, "removeButton" );
+    QPushButton *removeButton = new QPushButton( installDialog, "removeButton" );
     QFont removeButton_font(  removeButton->font() );
@@ -248,3 +248,3 @@ void PmIpkg::startDialog()
 
-    QPushButton *cancelButton = new QPushButton( d, "cancelButton" );
+    QPushButton *cancelButton = new QPushButton( installDialog, "cancelButton" );
     QFont cancelButton_font(  cancelButton->font() );
@@ -265,6 +265,6 @@ void PmIpkg::startDialog()
   connect( cancelButton, SIGNAL( clicked() ),
-                                        d, SLOT( close() ) );
-  d->showMaximized();
-  d->exec();
- // d->close();
+                                        installDialog, SLOT( close() ) );
+  installDialog->showMaximized();
+  if ( installDialog->exec() ) doIt();
+         installDialog->close();
 }
@@ -281,2 +281,3 @@ void PmIpkg::remove()
          if ( to_remove.count() == 0 ) return;
+        installDialog->close();
         show( true );
@@ -302,2 +303,3 @@ void PmIpkg::install()
          if ( to_install.count() == 0 ) return;
+        installDialog->close();
         show( true );
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h
index f70283e..c5e6255 100644
--- a/noncore/unsupported/oipkg/pmipkg.h
+++ b/noncore/unsupported/oipkg/pmipkg.h
@@ -30,2 +30,3 @@ private:
   RunWindow *runwindow;
+  QDialog *installDialog;
   QList<Package> to_remove;