author | tille <tille> | 2002-04-28 01:35:36 (UTC) |
---|---|---|
committer | tille <tille> | 2002-04-28 01:35:36 (UTC) |
commit | 61cc74e0e4602d0df07b250f2786f0f0e96da28f (patch) (side-by-side diff) | |
tree | 7fab7d278163082856f0561ec9e451922f6066e3 /noncore/unsupported/oipkg | |
parent | a64cc0ad0574ae1e15c4965d2557c3e06cc3fd65 (diff) | |
download | opie-61cc74e0e4602d0df07b250f2786f0f0e96da28f.zip opie-61cc74e0e4602d0df07b250f2786f0f0e96da28f.tar.gz opie-61cc74e0e4602d0df07b250f2786f0f0e96da28f.tar.bz2 |
gui fixes
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.cpp | 14 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.h | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pksettings.cpp | 0 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 24 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.h | 1 |
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 @@ -20,11 +20,13 @@ #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 ) { @@ -35,6 +37,10 @@ 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&)) ); @@ -194,6 +200,7 @@ void MainWindow::runIpkg() void MainWindow::updateList() { + wait->show(); QTimer *t = new QTimer( this ); connect( t, SIGNAL(timeout()), SLOT( rotateUpdateIcon() ) ); t->start( 0, false ); @@ -201,23 +208,30 @@ void MainWindow::updateList() 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(); 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 @@ -16,6 +16,7 @@ class QPEToolBar; class QLineEdit; class PackageListItem; class QCopChannel; +class QMessageBox; class MainWindow : public QMainWindow { @@ -69,6 +70,7 @@ private: 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 @@ -202,8 +202,8 @@ 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 ); @@ -211,7 +211,7 @@ void PmIpkg::startDialog() 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() ) { @@ -221,7 +221,7 @@ void PmIpkg::startDialog() { 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 ); @@ -230,7 +230,7 @@ void PmIpkg::startDialog() 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 ); @@ -238,7 +238,7 @@ void PmIpkg::startDialog() 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 ); @@ -246,7 +246,7 @@ void PmIpkg::startDialog() 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 ); @@ -263,10 +263,10 @@ void PmIpkg::startDialog() 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() @@ -279,6 +279,7 @@ 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>"); @@ -300,6 +301,7 @@ 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 @@ -28,6 +28,7 @@ public: private: PackageManagerSettings* settings; RunWindow *runwindow; + QDialog *installDialog; QList<Package> to_remove; QList<Package> to_install; bool runwindowopen; |