summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/mainwindow.cpp14
-rw-r--r--noncore/unsupported/oipkg/mainwindow.h2
-rw-r--r--noncore/unsupported/oipkg/pksettings.cpp0
-rw-r--r--noncore/unsupported/oipkg/pmipkg.cpp24
-rw-r--r--noncore/unsupported/oipkg/pmipkg.h1
5 files changed, 30 insertions, 11 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
@@ -19,13 +19,15 @@
#include <qtextview.h>
#include <qlineedit.h>
#include <qtabwidget.h>
#include <qcombobox.h>
+#include <qmessagebox.h>
#include <qlayout.h>
#include "pksettingsbase.h"
#include "packagelistitem.h"
+
MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
QMainWindow( parent, name, f )
{
settings = new PackageManagerSettings(this,0,TRUE);
@@ -34,8 +36,12 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
setCentralWidget( listViewPackages );
setCaption( tr("Package Manager") );
+// 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 );
connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
this, SLOT(receive(const QCString&, const QByteArray&)) );
@@ -193,32 +199,40 @@ void MainWindow::runIpkg()
}
void MainWindow::updateList()
{
+ wait->show();
QTimer *t = new QTimer( this );
connect( t, SIGNAL(timeout()), SLOT( rotateUpdateIcon() ) );
t->start( 0, false );
packageList.clear();
ipkg->update();
getList();
t->stop();
+ wait->hide();
+
}
void MainWindow::getList()
{
+ wait->show();
packageList.update();
displayList();
+ wait->hide();
}
void MainWindow::filterList()
{
+ wait->show();
QString f = "";
if ( findAction->isOn() ) f = findEdit->text();
packageList.filterPackages( f );
+ wait->hide();
}
void MainWindow::displayList()
{
+ wait->hide();
filterList();
listViewPackages->clear();
Package *pack = packageList.first();
while( pack )
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
@@ -15,8 +15,9 @@ class QComboBox;
class QPEToolBar;
class QLineEdit;
class PackageListItem;
class QCopChannel;
+class QMessageBox;
class MainWindow : public QMainWindow
{
Q_OBJECT
@@ -68,8 +69,9 @@ private:
QLineEdit *findEdit;
QPEToolBar *sectionBar;
QComboBox *section;
QComboBox *subsection;
+ QMessageBox *wait;
private slots:
void rotateUpdateIcon();
};
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
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
@@ -201,18 +201,18 @@ void PmIpkg::commit( PackageList pl )
}
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 );
RunWindowLayout->setMargin( 2 );
QHBoxLayout *buttons = new QHBoxLayout;
buttons->setSpacing( 6 );
buttons->setMargin( 0 );
- PackageListView *plv = new PackageListView(d, "install",settings);
+ PackageListView *plv = new PackageListView(installDialog, "install",settings);
RunWindowLayout->addWidget( plv, 1, 0 );
for (Package *it=to_remove.first(); it != 0; it=to_remove.next() )
{
plv->insertItem( new PackageListItem(plv, it,settings) );
@@ -220,34 +220,34 @@ void PmIpkg::startDialog()
for (Package *it=to_install.first(); it != 0; it=to_install.next() )
{
plv->insertItem( new PackageListItem(plv, it,settings) );
}
- QPushButton *doItButton = new QPushButton( d, "doItButton" );
+ QPushButton *doItButton = new QPushButton( installDialog, "doItButton" );
doItButton->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, doItButton->sizePolicy().hasHeightForWidth() ) );
QFont doItButton_font( doItButton->font() );
doItButton_font.setPointSize( 8 );
doItButton->setFont( doItButton_font );
doItButton->setText( tr( "Do all " ) );
doItButton->setAutoResize( FALSE );
buttons->addWidget( doItButton );
- QPushButton *installButton = new QPushButton( d, "installButton" );
+ QPushButton *installButton = new QPushButton( installDialog, "installButton" );
QFont installButton_font( installButton->font() );
installButton_font.setPointSize( 8 );
installButton->setFont( installButton_font );
installButton->setText( tr( "Install" ) );
installButton->setAutoResize( TRUE );
buttons->addWidget( installButton );
- QPushButton *removeButton = new QPushButton( d, "removeButton" );
+ QPushButton *removeButton = new QPushButton( installDialog, "removeButton" );
QFont removeButton_font( removeButton->font() );
removeButton_font.setPointSize( 7 );
removeButton->setFont( removeButton_font );
removeButton->setText( tr( "Remove" ) );
removeButton->setAutoResize( TRUE );
buttons->addWidget( removeButton );
- QPushButton *cancelButton = new QPushButton( d, "cancelButton" );
+ QPushButton *cancelButton = new QPushButton( installDialog, "cancelButton" );
QFont cancelButton_font( cancelButton->font() );
cancelButton_font.setPointSize( 8 );
cancelButton->setFont( cancelButton_font );
cancelButton->setText( tr( "Cancel" ) );
@@ -262,12 +262,12 @@ void PmIpkg::startDialog()
this, SLOT( install() ) );
connect( removeButton, SIGNAL( clicked() ),
this, SLOT( remove() ) );
connect( cancelButton, SIGNAL( clicked() ),
- d, SLOT( close() ) );
- d->showMaximized();
- d->exec();
- // d->close();
+ installDialog, SLOT( close() ) );
+ installDialog->showMaximized();
+ if ( installDialog->exec() ) doIt();
+ installDialog->close();
}
void PmIpkg::doIt()
{
@@ -278,8 +278,9 @@ void PmIpkg::doIt()
void PmIpkg::remove()
{
if ( to_remove.count() == 0 ) return;
+ installDialog->close();
show( true );
out("<hr><hr><b>"+tr("Removing")+"<br>"+tr("please wait")+"</b><br>");
@@ -299,8 +300,9 @@ void PmIpkg::remove()
void PmIpkg::install()
{
if ( to_install.count() == 0 ) return;
+ installDialog->close();
show( true );
out("<hr><hr><b>"+tr("Installing")+"<br>"+tr("please wait")+"</b><br>");
for (Package *it=to_install.first(); it != 0; it=to_install.next() )
{
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
@@ -27,8 +27,9 @@ public:
private:
PackageManagerSettings* settings;
RunWindow *runwindow;
+ QDialog *installDialog;
QList<Package> to_remove;
QList<Package> to_install;
bool runwindowopen;
QString fileNameToInstall;