4 files changed, 61 insertions, 48 deletions

diff --git a/noncore/settings/aqpkg/categoryfilterimpl.cpp b/noncore/settings/aqpkg/categoryfilterimpl.cpp
index 61e1f93..217d2c9 100644
--- a/noncore/settings/aqpkg/categoryfilterimpl.cpp
+++ b/noncore/settings/aqpkg/categoryfilterimpl.cpp
@@ -6,102 +6,108 @@
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
-#include <iostream>
-using namespace std;
+#include "categoryfilterimpl.h"
 
+/* OPIE */
+#include <qpe/qpeapplication.h>
+
+/* QT */
 #include <qgroupbox.h>
 #include <qlayout.h> 
 #include <qlistbox.h>
 #include <qstring.h>
 
-#include "categoryfilterimpl.h"
+/* STD */
+#include <iostream>
+using namespace std;
+
 
 CategoryFilterImpl :: CategoryFilterImpl(const QString &categories, const QString &selectedCategories, QWidget *parent, const char *name )
     : QDialog( parent, name, true )
 {
     setCaption( tr( "Category Filter" ) );
 
     QVBoxLayout *layout = new QVBoxLayout( this );
     layout->setMargin( 2 );
     layout->setSpacing( 4 );
 
     QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Select one or more groups" ), this );
     grpbox->layout()->setSpacing( 2 );
     grpbox->layout()->setMargin( 4 );
     layout->addWidget( grpbox );
 
     QVBoxLayout *grplayout = new QVBoxLayout( grpbox->layout() );
     
     lstCategories = new QListBox( grpbox );
     lstCategories->setSelectionMode( QListBox::Multi );
     grplayout->addWidget( lstCategories );
     
     // Split up categories and add them to the listbox
     int start = 1;
 
     QString item;
     int end;
     QString finditem;
     do
     {
         end = categories.find( "#", start );
         item = categories.mid( start, end - start );
         if ( item != "" )
         {
             lstCategories->insertItem( item );
             finditem = QString( "#%1#" ).arg( item );
             if ( selectedCategories.find( finditem ) != -1 )
                 lstCategories->setSelected( lstCategories->count()-1, true );
         }
 
         start = end + 1;
-    } while ( start < (int)categories.length() );
+    }
+    while ( start < (int)categories.length() );
 
     lstCategories->sort( true );
 
-    showMaximized();
+    QPEApplication::showDialog( this );
 }
 
 CategoryFilterImpl :: ~CategoryFilterImpl()
-{
-}
+{}
 
 QString CategoryFilterImpl :: getSelectedFilter()
 {
     // Grab cetegories from listbox
     QString ret = "#";
 
     for ( int i = 0 ; i < (int)lstCategories->count() ; ++i )
     {
         if ( lstCategories->isSelected( i ) )
         {
             ret.append( lstCategories->text( i ) );
             ret.append( "#" );
         }
     }
 
     if ( ret == "#" )
         ret = "";
     return ret;
 }
diff --git a/noncore/settings/aqpkg/instoptionsimpl.cpp b/noncore/settings/aqpkg/instoptionsimpl.cpp
index 9d52013..126e3b9 100644
--- a/noncore/settings/aqpkg/instoptionsimpl.cpp
+++ b/noncore/settings/aqpkg/instoptionsimpl.cpp
@@ -6,62 +6,65 @@
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
+#include "global.h"
+#include "instoptionsimpl.h"
+#include "ipkg.h"
+
+/* OPIE */
 #ifdef QWS
 #include <qpe/config.h>
 #endif
+#include <qpe/qpeapplication.h>
 
+/* QT */
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 
-#include "global.h"
-#include "instoptionsimpl.h"
-#include "ipkg.h"
-
 InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, int verb, QWidget * parent, const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl )
 {
     setCaption( tr( "Options" ) );
     
     QVBoxLayout *layout = new QVBoxLayout( this );
     layout->setMargin( 2 );
     layout->setSpacing( 4 );
 
     QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Options" ), this );
     grpbox->layout()->setSpacing( 2 );
     grpbox->layout()->setMargin( 4 );
     layout->addWidget( grpbox );
 
     QVBoxLayout *grplayout = new QVBoxLayout( grpbox->layout() );
     
     forceDepends = new QCheckBox( tr( "Force Depends" ), grpbox );
     grplayout->addWidget( forceDepends );
 
     forceReinstall = new QCheckBox( tr( "Force Reinstall" ), grpbox );
     grplayout->addWidget( forceReinstall );
 
     forceRemove = new QCheckBox( tr( "Force Remove" ), grpbox );
     grplayout->addWidget( forceRemove );
@@ -74,55 +77,54 @@ InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, int verb, QWidget * par
     
     verboseIpkg = new QComboBox( grpbox );
     verboseIpkg->insertItem( tr( "Errors only" ) );
     verboseIpkg->insertItem( tr( "Normal messages" ) );
     verboseIpkg->insertItem( tr( "Informative messages" ) );
     verboseIpkg->insertItem( tr( "Troubleshooting output" ) );
     verboseIpkg->setCurrentItem( verb );
     grplayout->addWidget( verboseIpkg );
     
     grplayout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
     
     if ( flags & FORCE_DEPENDS )
             forceDepends->setChecked( true );
     if ( flags & FORCE_REINSTALL )
             forceReinstall->setChecked( true );
     if ( flags & FORCE_REMOVE )
             forceRemove->setChecked( true );
     if ( flags & FORCE_OVERWRITE )
             forceOverwrite->setChecked( true );
 //    if ( flags & VERBOSE_WGET )
         //    verboseWget->setChecked( true );
 //    if ( flags & MAKE_LINKS )
         //    makeLinks->setChecked( true );
 
-          showMaximized();
+    QPEApplication::showDialog( this );
 
 }
 
 InstallOptionsDlgImpl::~InstallOptionsDlgImpl()
-{
-}
+{}
 
 
 int InstallOptionsDlgImpl :: getFlags()
 {
     int flags = 0;
 
     if ( forceDepends->isChecked() )
         flags |= FORCE_DEPENDS;
     if ( forceReinstall->isChecked() )
         flags |= FORCE_REINSTALL;
     if ( forceRemove->isChecked() )
         flags |= FORCE_REMOVE;
     if ( forceOverwrite->isChecked() )
         flags |= FORCE_OVERWRITE;
     if ( verboseWget->isChecked() )
         flags |= VERBOSE_WGET;
 
     return flags;
 }
 
 int InstallOptionsDlgImpl :: getInfoLevel()
 {
     return verboseIpkg->currentItem();
 }
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index dbe694e..6f5c712 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -6,84 +6,87 @@
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
-#include <linux/limits.h>
-#include <unistd.h>
+#include "categoryfilterimpl.h"
+#include "datamgr.h"
+#include "global.h"
+#include "inputdlg.h"
+#include "ipkg.h"
+#include "installdlgimpl.h"
+#include "letterpushbutton.h"
+#include "mainwin.h"
+#include "packagewin.h"
+#include "settingsimpl.h"
+#include "utils.h"
 
+/* OPIE */
 #include <qpe/qcopenvelope_qws.h>
-#include <qmenubar.h>
 #include <qpe/qpeapplication.h>
-#include <qtoolbar.h>
 #include <qpe/config.h>
 #include <qpe/resource.h>
 
+/* QT */
+#include <qmenubar.h>
+#include <qtoolbar.h>
 #include <qaction.h>
 #include <qcombobox.h>
 #include <qfile.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qprogressbar.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 #include <qwidgetstack.h>
 
-#include "categoryfilterimpl.h"
-#include "datamgr.h"
-#include "global.h"
-#include "inputdlg.h"
-#include "ipkg.h"
-#include "installdlgimpl.h"
-#include "letterpushbutton.h"
-#include "mainwin.h"
-#include "packagewin.h"
-#include "settingsimpl.h"
-#include "utils.h"
+/* STD */
+#include <linux/limits.h>
+#include <unistd.h>
 
 extern int compareVersions( const char *v1, const char *v2 );
 
 MainWindow :: MainWindow( QWidget* parent, const char* name, WFlags fl )
                 :QMainWindow( parent, name, fl || WStyle_ContextHelp )
 {
     // Disable suspend mode
     QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend;
 
     LOCAL_SERVER = QObject::tr( "Installed packages" );
     LOCAL_IPKGS = QObject::tr( "Local packages" );
 
     setCaption( tr( "AQPkg - Package Manager" ) );
 
     // Create UI widgets
     initMainWidget();
     initProgressWidget();
 
     // Build menu and tool bars
     setToolBarsMovable( FALSE );
 
     QToolBar *bar = new QToolBar( this );
     bar->setHorizontalStretchable( TRUE );
     QMenuBar *mb = new QMenuBar( bar );
@@ -1160,56 +1163,57 @@ void MainWindow :: letterPushed( QString t )
 
     QCheckListItem *item;
     if ( start == 0 )
     {
         item = (QCheckListItem *)packagesList->firstChild();
         start = top;
     }
     else
         item = (QCheckListItem *)start->nextSibling();
 
     if ( item == 0 )
         item = (QCheckListItem *)packagesList->firstChild();
     do
     {
         if ( item->text().lower().startsWith( t.lower() ) )
         {
             packagesList->setSelected( item, true );
             packagesList->ensureItemVisible( item );
             break;
         }
 
         item = (QCheckListItem *)item->nextSibling();
         if ( !item )
             item = (QCheckListItem *)packagesList->firstChild();
-    } while ( item != start);
+    }
+    while ( item != start);
 }
 
 void MainWindow :: slotDisplayPackage( QListViewItem *item )
 {
     QString itemstr( ((QCheckListItem*)item)->text() );
     PackageWindow *p = new PackageWindow( mgr->getServer( serversList->currentText() )->getPackage( itemstr ) );
-    p->showMaximized();
+    QPEApplication::showWidget( p );
 }
 
 QuestionDlg::QuestionDlg( const QString &caption, const QString &text, const QString &secondbtn )
     : QWidget( 0x0, 0x0, WType_Modal | WType_TopLevel | WStyle_Dialog )
 {
     setCaption( caption );
     resize( 175, 100 );
 
     QGridLayout *layout = new QGridLayout( this );
 
     QLabel *l = new QLabel( text, this );
     l->setAlignment( AlignCenter | WordBreak );
     layout->addMultiCellWidget( l, 0, 0, 0, 1 );
 
     btn1 = new QPushButton( tr( "Remove" ), this );
     connect( btn1, SIGNAL(clicked()), this, SLOT(slotButtonPressed()) );
     layout->addWidget( btn1, 1, 0 );
 
     btn2 = new QPushButton( secondbtn, this );
     connect( btn2, SIGNAL(clicked()), this, SLOT(slotButtonPressed()) );
     layout->addWidget( btn2, 1, 1 );
 
     executing = FALSE;
 }
diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp
index 4887ceb..9fdf31e 100644
--- a/noncore/settings/aqpkg/settingsimpl.cpp
+++ b/noncore/settings/aqpkg/settingsimpl.cpp
@@ -6,107 +6,106 @@
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
-#include <fstream>
-#include <algorithm>
-using namespace std;
+#include "settingsimpl.h"
+#include "global.h"
+
+/* OPIE */
+#include <opie/otabwidget.h>
+#ifdef QWS
+#include <qpe/config.h>
+#include <qpe/resource.h>
+#endif
+#include <qpe/qpeapplication.h>
 
+/* QT */
 #include <qcheckbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
 
-#include <opie/otabwidget.h>
-
-#ifdef QWS
-#include <qpe/config.h>
-#include <qpe/resource.h>
-#endif
-
-#include "settingsimpl.h"
-
-#include "global.h"
+/* STD */
+#include <fstream>
+#include <algorithm>
+using namespace std;
 
 SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl )
 {
     setCaption( tr( "Configuration" ) );
     
     // Setup layout to make everything pretty
     QVBoxLayout *layout = new QVBoxLayout( this );
     layout->setMargin( 2 );
     layout->setSpacing( 4 );
 
     // Setup tabs for all info
     OTabWidget *tabwidget = new OTabWidget( this );
     layout->addWidget( tabwidget );
 
     tabwidget->addTab( initServerTab(), "aqpkg/servertab", tr( "Servers" ) );
     tabwidget->addTab( initDestinationTab(), "aqpkg/desttab", tr( "Destinations" ) );
     tabwidget->addTab( initProxyTab(), "aqpkg/proxytab", tr( "Proxies" ) );
     tabwidget->setCurrentTab( tr( "Servers" ) );
     
     dataMgr = dataManager;
     setupData();
     changed = false;
     newserver = false;
     newdestination = false;
 }
 
 SettingsImpl :: ~SettingsImpl()
 {
-
 }
 
 bool SettingsImpl :: showDlg()
 {
-        showMaximized();
-        exec();
-
+    QPEApplication::execDialog( this );
         if ( changed )
                 dataMgr->writeOutIpkgConf();
 
         return changed;
 }
 
 QWidget *SettingsImpl :: initServerTab()
 {
     QWidget *control = new QWidget( this );
 
     QVBoxLayout *vb = new QVBoxLayout( control );
 
     QScrollView *sv = new QScrollView( control );
     vb->addWidget( sv, 0, 0 );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     sv->setFrameStyle( QFrame::NoFrame );
 
     QWidget *container = new QWidget( sv->viewport() );
     sv->addChild( container );
 
     QGridLayout *layout = new QGridLayout( container );
     layout->setSpacing( 2 );
     layout->setMargin( 4 );
 
@@ -441,53 +440,55 @@ void SettingsImpl :: changeDestinationDetails()
         {
                 Destination *d = dataMgr->getDestination( destinations->currentText() );
                 if ( d )
                 {
                         // Update url
                         d->setDestinationPath( destinationurl->text() );
                 d->linkToRoot( linkToRoot->isChecked() );
 
                         // Check if server name has changed, if it has then we need to replace the key in the map
                         if ( destinationName != newName )
                         {
                                 // Update server name
                                 d->setDestinationName( newName );
 
                                 // Update list box
                                 destinations->changeItem( newName, currentSelectedDestination );
                         }
 
 #ifdef QWS
                         QString key = newName;
                         key += "_linkToRoot";
                         int val = d->linkToRoot();
                         cfg.writeEntry( key, val );
 #endif      
+
                 }  
         }
         else
         {
                 dataMgr->getDestinationList().append( new Destination( newName, destinationurl->text() ) );
                 destinations->insertItem( newName );
                 destinations->setCurrentItem( destinations->count() );
                 newdestination = false;
 
 #ifdef QWS
         QString key = newName;
         key += "_linkToRoot";
         cfg.writeEntry( key, true );
 #endif
+
         }
 }
 
 //------------------ Proxy tab ----------------------
 void SettingsImpl :: proxyApplyChanges()
 {
     changed = true;
     dataMgr->setHttpProxy( txtHttpProxy->text() );
     dataMgr->setFtpProxy( txtFtpProxy->text() );
     dataMgr->setProxyUsername( txtUsername->text() );
     dataMgr->setProxyPassword( txtPassword->text() );
 
     dataMgr->setHttpProxyEnabled( chkHttpProxyEnabled->isChecked() );
     dataMgr->setFtpProxyEnabled( chkFtpProxyEnabled->isChecked() );
 }