4 files changed, 73 insertions, 42 deletions

diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index db9a259..485fe3d 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -14,12 +14,13 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifdef QWS
 #include <qpe/config.h>
+#include <qpe/qpeapplication.h>
 #endif
 
 #include <qmultilineedit.h>
 #include <qdialog.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
@@ -125,37 +126,32 @@ bool InstallDlgImpl :: showDlg()
 void InstallDlgImpl :: optionsSelected()
 {
         InstallOptionsDlgImpl opt( flags, this, "Option", true );
         opt.exec();
 
         // set options selected from dialog
-    flags = 0;
-    if ( opt.forceDepends->isChecked() )
-        flags |= FORCE_DEPENDS;
-    if ( opt.forceReinstall->isChecked() )
-        flags |= FORCE_REINSTALL;
-    if ( opt.forceRemove->isChecked() )
-        flags |= FORCE_REMOVE;
-    if ( opt.forceOverwrite->isChecked() )
-        flags |= FORCE_OVERWRITE;
+    flags = opt.getFlags();
 
 #ifdef QWS
     Config cfg( "aqpkg" );
     cfg.setGroup( "settings" );
     cfg.writeEntry( "installFlags", flags );
 #endif
 }
 
 void InstallDlgImpl :: installSelected()
 {
+    
         if ( btnInstall->text() == "Close" )
         {
                 done( 1 );
                 return;
         }
 
+    // Disable buttons
+    btnOptions->setEnabled( false );
         btnInstall->setEnabled( false );
 
     if ( pIpkg )
     {
         output->setText( "" );
         
@@ -227,12 +223,13 @@ void InstallDlgImpl :: installSelected()
             pIpkg->runIpkg();
         }
 
         delete pIpkg;
     }
 
+    btnOptions->setEnabled( true );
         btnInstall->setEnabled( true );
     btnInstall->setText( tr( "Close" ) );
 }
 
 void InstallDlgImpl :: displayText(const QString &text )
 {
diff --git a/noncore/settings/aqpkg/instoptions.ui b/noncore/settings/aqpkg/instoptions.ui
index 52897dd..00eab1e 100644
--- a/noncore/settings/aqpkg/instoptions.ui
+++ b/noncore/settings/aqpkg/instoptions.ui
@@ -8,55 +8,55 @@
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>154</width>
-            <height>205</height>
+            <width>283</width>
+            <height>274</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Options</string>
     </property>
     <property stdset="1">
         <name>sizeGripEnabled</name>
         <bool>false</bool>
     </property>
+    <vbox>
+        <property stdset="1">
+            <name>margin</name>
+            <number>11</number>
+        </property>
+        <property stdset="1">
+            <name>spacing</name>
+            <number>6</number>
+        </property>
     <widget>
         <class>QGroupBox</class>
         <property stdset="1">
             <name>name</name>
             <cstring>GroupBox1</cstring>
         </property>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>11</x>
-                <y>11</y>
-                <width>136</width>
-                <height>120</height>
-            </rect>
-        </property>
-        <property stdset="1">
             <name>title</name>
             <string>Options</string>
         </property>
         <widget>
             <class>QCheckBox</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>forceDepends</cstring>
             </property>
             <property stdset="1">
                 <name>geometry</name>
                 <rect>
-                    <x>11</x>
-                    <y>19</y>
-                    <width>114</width>
+                        <x>12</x>
+                        <y>20</y>
+                        <width>110</width>
                     <height>19</height>
                 </rect>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>Force Depends</string>
@@ -68,84 +68,96 @@
                 <name>name</name>
                 <cstring>forceReinstall</cstring>
             </property>
             <property stdset="1">
                 <name>geometry</name>
                 <rect>
-                    <x>11</x>
-                    <y>44</y>
-                    <width>114</width>
+                        <x>12</x>
+                        <y>45</y>
+                        <width>107</width>
                     <height>19</height>
                 </rect>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>Force Reinstall</string>
             </property>
         </widget>
         <widget>
             <class>QCheckBox</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>forceOverwrite</cstring>
+                    <cstring>forceRemove</cstring>
             </property>
             <property stdset="1">
                 <name>geometry</name>
                 <rect>
-                    <x>11</x>
-                    <y>94</y>
-                    <width>114</width>
+                        <x>12</x>
+                        <y>70</y>
+                        <width>105</width>
                     <height>19</height>
                 </rect>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Force Overwrite</string>
+                    <string>Force Remove</string>
             </property>
         </widget>
         <widget>
             <class>QCheckBox</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>forceRemove</cstring>
+                    <cstring>forceOverwrite</cstring>
             </property>
             <property stdset="1">
                 <name>geometry</name>
                 <rect>
-                    <x>11</x>
-                    <y>69</y>
+                        <x>12</x>
+                        <y>95</y>
                     <width>114</width>
                     <height>19</height>
                 </rect>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Force Remove</string>
+                    <string>Force Overwrite</string>
             </property>
         </widget>
-    </widget>
     <widget>
-        <class>QPushButton</class>
+                <class>QCheckBox</class>
         <property stdset="1">
             <name>name</name>
-            <cstring>btnOK</cstring>
+                    <cstring>verboseWget</cstring>
         </property>
         <property stdset="1">
             <name>geometry</name>
             <rect>
-                <x>11</x>
-                <y>166</y>
-                <width>136</width>
-                <height>28</height>
+                        <x>12</x>
+                        <y>120</y>
+                        <width>104</width>
+                        <height>19</height>
             </rect>
         </property>
         <property stdset="1">
             <name>text</name>
+                    <string>Verbose WGet</string>
+                </property>
+            </widget>
+        </widget>
+        <widget>
+            <class>QPushButton</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>btnOK</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
             <string>OK</string>
         </property>
     </widget>
+    </vbox>
 </widget>
 <connections>
     <connection>
         <sender>btnOK</sender>
         <signal>clicked()</signal>
         <receiver>InstallOptionsDlg</receiver>
diff --git a/noncore/settings/aqpkg/instoptionsimpl.cpp b/noncore/settings/aqpkg/instoptionsimpl.cpp
index dd996e0..3a37eec 100644
--- a/noncore/settings/aqpkg/instoptionsimpl.cpp
+++ b/noncore/settings/aqpkg/instoptionsimpl.cpp
@@ -34,16 +34,37 @@ InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, QWidget * parent, const
     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();
 
 }
 
 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;
+}
\ No newline at end of file
diff --git a/noncore/settings/aqpkg/instoptionsimpl.h b/noncore/settings/aqpkg/instoptionsimpl.h
index 08ec616..893f9bb 100644
--- a/noncore/settings/aqpkg/instoptionsimpl.h
+++ b/noncore/settings/aqpkg/instoptionsimpl.h
@@ -21,12 +21,13 @@
 
 class InstallOptionsDlgImpl : public InstallOptionsDlg
 {
 public:
     InstallOptionsDlgImpl( int flags, QWidget * parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
     ~InstallOptionsDlgImpl();
+    int getFlags();
 
 protected:
 
 private:
 };