summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/packagemanager/ChangeLog3
-rw-r--r--noncore/settings/packagemanager/entrydlg.cpp5
-rw-r--r--noncore/settings/packagemanager/filterdlg.cpp2
-rw-r--r--noncore/settings/packagemanager/mainwindow.cpp2
-rw-r--r--noncore/settings/packagemanager/oipkgconfigdlg.cpp2
-rw-r--r--noncore/settings/packagemanager/opackagemanager.cpp2
-rw-r--r--noncore/settings/packagemanager/promptdlg.cpp4
-rw-r--r--noncore/settings/packagemanager/promptdlg.h2
8 files changed, 13 insertions, 9 deletions
diff --git a/noncore/settings/packagemanager/ChangeLog b/noncore/settings/packagemanager/ChangeLog
index 72e6169..744122f 100644
--- a/noncore/settings/packagemanager/ChangeLog
+++ b/noncore/settings/packagemanager/ChangeLog
@@ -1,12 +1,13 @@
-2004-mm-dd Dan Williams <drw@handhelds.org>
+2004-02-12 Dan Williams <drw@handhelds.org>
* Package information dialog implemented
* What's This app icon enabled
+ * Changed all QDialog::exec() occurences to QPEApplication::execDialog()
2004-01-23 Dan Williams <drw@handhelds.org>
* Added package download functionality
* Have Opie update links after install/removal so that apps
will display properly in Launcher
2004-01-20 Dan Williams <drw@handhelds.org>
diff --git a/noncore/settings/packagemanager/entrydlg.cpp b/noncore/settings/packagemanager/entrydlg.cpp
index 8deaa37..663abd2 100644
--- a/noncore/settings/packagemanager/entrydlg.cpp
+++ b/noncore/settings/packagemanager/entrydlg.cpp
@@ -29,16 +29,18 @@
#include "entrydlg.h"
#include <qlabel.h>
#include <qlayout.h>
#include <qlineedit.h>
#include <qpushbutton.h>
+#include <qpe/qpeapplication.h>
+
EntryDlg::EntryDlg( const QString &label, QWidget* parent, const char* name, bool modal )
: QDialog( parent, name, modal )
{
QVBoxLayout *vbox = new QVBoxLayout( this, 6, 6 );
QLabel *l = new QLabel( label, this );
l->setAlignment( AlignLeft | AlignTop | WordBreak );
vbox->addWidget( l );
@@ -63,17 +65,18 @@ QString EntryDlg::getText()
QString EntryDlg::getText( const QString &caption, const QString &label, const QString &text, bool *ok,
QWidget *parent, const char *name )
{
EntryDlg *dlg = new EntryDlg( label, parent, name, true );
dlg->setCaption( caption );
dlg->setText( text );
QString result;
- *ok = ( dlg->exec() == QDialog::Accepted );
+
+ *ok = ( QPEApplication::execDialog( dlg ) == QDialog::Accepted );
if ( *ok )
result = dlg->getText();
delete dlg;
return result;
}
void EntryDlg::tryAccept()
{
diff --git a/noncore/settings/packagemanager/filterdlg.cpp b/noncore/settings/packagemanager/filterdlg.cpp
index 2e48d5b..0da9d19 100644
--- a/noncore/settings/packagemanager/filterdlg.cpp
+++ b/noncore/settings/packagemanager/filterdlg.cpp
@@ -103,17 +103,17 @@ FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name,
m_destCB = new QCheckBox( tr( "Installed on device at:" ), container );
connect( m_destCB, SIGNAL(toggled(bool)), this, SLOT(slotDestSelected(bool)) );
m_destination = new QComboBox( container );
m_destination->insertStringList( *(pm->destinations()) );
initItem( m_destination, m_destCB, destination );
layout->addWidget( m_destCB );
layout->addWidget( m_destination );
- showMaximized();
+ //showMaximized();
}
void FilterDlg::initItem( QComboBox *comboBox, QCheckBox *checkBox, const QString &selection )
{
if ( !selection.isNull() )
{
checkBox->setChecked( true );
diff --git a/noncore/settings/packagemanager/mainwindow.cpp b/noncore/settings/packagemanager/mainwindow.cpp
index 8b374ab..2cb11ba 100644
--- a/noncore/settings/packagemanager/mainwindow.cpp
+++ b/noncore/settings/packagemanager/mainwindow.cpp
@@ -606,17 +606,17 @@ void MainWindow::slotShowUpdated()
delete packageList;
}
}
void MainWindow::slotFilterChange()
{
FilterDlg dlg( this, &m_packman, m_filterName, m_filterServer, m_filterDest, m_filterStatus,
m_filterCategory );
- if ( dlg.exec() == QDialog::Accepted )
+ if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted )
{
m_filterName = dlg.name();
m_filterServer = dlg.server();
m_filterDest = dlg.destination();
m_filterStatus = dlg.status();
m_filterCategory = dlg.category();
m_actionFilter->setOn( true );
slotFilter( true );
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
index e335f8f..84c6de4 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
@@ -78,17 +78,17 @@ OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *paren
m_tabWidget.addTab( m_optionsWidget, "exec", tr( "Options" ) );
m_tabWidget.setCurrentTab( tr( "Servers" ) );
}
else
{
m_tabWidget.addTab( m_optionsWidget, "exec", tr( "Options" ) );
}
- showMaximized();
+ //showMaximized();
}
void OIpkgConfigDlg::accept()
{
// Save server, destination and proxy configuration
if ( !m_installOptions )
m_ipkg->setConfigItems( m_configs );
diff --git a/noncore/settings/packagemanager/opackagemanager.cpp b/noncore/settings/packagemanager/opackagemanager.cpp
index e1c8a21..ad2fe02 100644
--- a/noncore/settings/packagemanager/opackagemanager.cpp
+++ b/noncore/settings/packagemanager/opackagemanager.cpp
@@ -302,17 +302,17 @@ int OPackageManager::compareVersions( const QString &version1, const QString &ve
return 1;
return 0;
}
bool OPackageManager::configureDlg( bool installOptions )
{
OIpkgConfigDlg dlg( &m_ipkg, installOptions, static_cast<QWidget *>(parent()) );
- return ( dlg.exec() == QDialog::Accepted );
+ return ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted );
}
void OPackageManager::saveSettings()
{
m_ipkg.saveSettings();
}
bool OPackageManager::executeCommand( OPackage::Command command, QStringList *packages,
diff --git a/noncore/settings/packagemanager/promptdlg.cpp b/noncore/settings/packagemanager/promptdlg.cpp
index bb27190..128e88e 100644
--- a/noncore/settings/packagemanager/promptdlg.cpp
+++ b/noncore/settings/packagemanager/promptdlg.cpp
@@ -52,17 +52,17 @@ PromptDlg::PromptDlg( const QString &caption, const QString &text, const QString
layout->addWidget( btn, 1, 0 );
connect( btn, SIGNAL(clicked()), this, SLOT(slotBtn1Clicked()) );
btn = new QPushButton( btn2, this );
layout->addWidget( btn, 1, 1 );
connect( btn, SIGNAL(clicked()), this, SLOT(slotBtn2Clicked()) );
}
-int PromptDlg::exec()
+int PromptDlg::display()
{
// Determine position of dialog. Derived from QT's QDialog::show() method.
QWidget *w = parentWidget();
QPoint p( 0, 0 );
int extraw = 0, extrah = 0;
QWidget * desk = QApplication::desktop();
if ( w )
w = w->topLevelWidget();
@@ -117,17 +117,17 @@ int PromptDlg::exec()
return m_btnClicked;
}
int PromptDlg::ask( const QString &caption, const QString &text, const QString &btn1, const QString &btn2,
QWidget *parent )
{
PromptDlg *dlg = new PromptDlg( caption, text, btn1, btn2, parent );
- int rc = dlg->exec();
+ int rc = dlg->display();
delete dlg;
return rc;
}
void PromptDlg::slotBtn1Clicked()
{
m_btnClicked = 1;
qApp->exit_loop();
diff --git a/noncore/settings/packagemanager/promptdlg.h b/noncore/settings/packagemanager/promptdlg.h
index e0e9f41..790ff4d 100644
--- a/noncore/settings/packagemanager/promptdlg.h
+++ b/noncore/settings/packagemanager/promptdlg.h
@@ -35,17 +35,17 @@
class PromptDlg : public QWidget
{
Q_OBJECT
public:
PromptDlg( const QString &caption = 0x0, const QString &text = 0x0, const QString &btn1 = 0x0,
const QString &btn2 = 0x0, QWidget *parent = 0x0 );
- int exec();
+ int display();
int btnPressed() { return m_btnClicked; }
static int ask( const QString &caption = 0x0, const QString &text = 0x0, const QString &btn1 = 0x0,
const QString &btn2 = 0x0, QWidget *parent = 0x0 );
private:
int m_btnClicked; // Indicator for which button was pressed