3 files changed, 83 insertions, 18 deletions

diff --git a/noncore/settings/aqpkg/install.ui b/noncore/settings/aqpkg/install.ui
index daa0ff6..c5a3596 100644
--- a/noncore/settings/aqpkg/install.ui
+++ b/noncore/settings/aqpkg/install.ui
@@ -9,13 +9,13 @@
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
             <width>196</width>
-            <height>271</height>
+            <height>278</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Install</string>
     </property>
@@ -25,31 +25,42 @@
             <number>11</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget row="0"  column="0" >
-            <class>QLabel</class>
+        <widget row="0"  column="1" >
+            <class>QComboBox</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>TextLabel1</cstring>
+                <cstring>destination</cstring>
+            </property>
+        </widget>
+        <widget row="3"  column="0" >
+            <class>QPushButton</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>btnInstall</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Destination</string>
+                <string>Start</string>
             </property>
         </widget>
-        <widget row="0"  column="1" >
-            <class>QComboBox</class>
+        <widget row="3"  column="1" >
+            <class>QPushButton</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>destination</cstring>
+                <cstring>btnOptions</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Options</string>
             </property>
         </widget>
-        <widget row="1"  column="0"  rowspan="1"  colspan="2" >
+        <widget row="2"  column="0"  rowspan="1"  colspan="2" >
             <class>QGroupBox</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>GroupBox2</cstring>
             </property>
             <property stdset="1">
@@ -71,32 +82,43 @@
                         <name>name</name>
                         <cstring>output</cstring>
                     </property>
                 </widget>
             </grid>
         </widget>
-        <widget row="2"  column="0" >
-            <class>QPushButton</class>
+        <widget row="0"  column="0" >
+            <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>btnInstall</cstring>
+                <cstring>TextLabel1</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Start</string>
+                <string>Destination</string>
             </property>
         </widget>
-        <widget row="2"  column="1" >
-            <class>QPushButton</class>
+        <widget row="1"  column="0" >
+            <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>btnOptions</cstring>
+                <cstring>TextLabel3</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Options</string>
+                <string>Space Avail</string>
+            </property>
+        </widget>
+        <widget row="1"  column="1" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>txtAvailableSpace</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>100000000</string>
             </property>
         </widget>
     </grid>
 </widget>
 <connections>
     <connection>
@@ -108,11 +130,17 @@
     <connection>
         <sender>btnInstall</sender>
         <signal>clicked()</signal>
         <receiver>InstallDlg</receiver>
         <slot>installSelected()</slot>
     </connection>
+    <connection>
+        <sender>destination</sender>
+        <signal>highlighted(const QString&amp;)</signal>
+        <receiver>InstallDlg</receiver>
+        <slot>displayAvailableSpace( const QString&amp; )</slot>
+    </connection>
+    <slot access="public">displayAvailableSpace( const QString&amp; )</slot>
     <slot access="public">installSelected()</slot>
-    <slot access="public">displayText(const QString &amp;)</slot>
     <slot access="public">optionsSelected()</slot>
 </connections>
 </UI>
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index 485fe3d..bfb4f62 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -15,25 +15,28 @@
  *                                                                         *
  ***************************************************************************/
 
 #ifdef QWS
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
+#include <qpe/storage.h>
 #endif
 
 #include <qmultilineedit.h>
 #include <qdialog.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
+#include <qlabel.h>
 
 
 #include "datamgr.h"
 #include "instoptionsimpl.h"
 #include "destination.h"
 #include "installdlgimpl.h"
+#include "utils.h"
 #include "global.h"
 
 InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl )
     : InstallDlg( parent, name, modal, fl )
 {
     pIpkg = 0;
@@ -98,12 +101,14 @@ InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *d
                 type = " (ReInstall)";
             upgrade += "   " + item.packageName + type + "\n";
     }
     }
 
     output->setText( remove + install + upgrade );
+
+    displayAvailableSpace( destination->currentText() );
 }
 
 InstallDlgImpl::InstallDlgImpl( Ipkg *ipkg, QString initialText, QWidget *parent, const char *name, bool modal, WFlags fl )
     : InstallDlg( parent, name, modal, fl )
 {
     pIpkg = ipkg;
@@ -234,6 +239,36 @@ void InstallDlgImpl :: installSelected()
 void InstallDlgImpl :: displayText(const QString &text )
 {
     QString t = output->text() + "\n" + text;
     output->setText( t );
     output->setCursorPosition( output->numLines(), 0 );
 }
+
+
+void InstallDlgImpl :: displayAvailableSpace( const QString &text )
+{
+    vector<Destination>::iterator d = dataMgr->getDestination( text );
+    QString destDir = d->getDestinationPath();
+
+    long blockSize = 0;
+    long totalBlocks = 0;
+    long availBlocks = 0;
+    QString space;
+    if ( Utils::getStorageSpace( (const char *)destDir, &blockSize, &totalBlocks, &availBlocks ) )
+    {
+        long mult = blockSize / 1024;
+        long div = 1024 / blockSize;
+
+        if ( !mult ) mult = 1;
+        if ( !div ) div = 1;
+//        long total = totalBlocks * mult / div;
+        long avail = availBlocks * mult / div;
+//        long used = total - avail;
+
+        space.sprintf( "%ld Kb", avail );
+    }
+    else
+        space = "Unknown";
+        
+    txtAvailableSpace->setText( space );
+}
+
diff --git a/noncore/settings/aqpkg/installdlgimpl.h b/noncore/settings/aqpkg/installdlgimpl.h
index 9819b2e..2f80f08 100644
--- a/noncore/settings/aqpkg/installdlgimpl.h
+++ b/noncore/settings/aqpkg/installdlgimpl.h
@@ -41,12 +41,13 @@ public:
     InstallDlgImpl( Ipkg *ipkg, QString initialText, QWidget * parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
     ~InstallDlgImpl();
 
         bool showDlg();
         bool upgradeServer( QString &server );
 
+
 protected:
 
 private:
     DataManager *dataMgr;
         vector<InstallData> installList;
         vector<InstallData> removeList;
@@ -57,9 +58,10 @@ private:
 
         bool runIpkg( QString &option, const QString& package, const QString& dest, int flags );
 
         void optionsSelected();
         void installSelected();
     void displayText(const QString &text );
+    void displayAvailableSpace( const QString &text);
 };
 
 #endif