re-add missing diskspace function

2 files changed, 31 insertions, 19 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index b169a79..7ee78c0 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -14,14 +14,14 @@
 
 #include "advancedfm.h"
 #include "inputDialog.h"
 #include "filePermissions.h"
 #include "output.h"
 
-#include <opie/ofileselector.h>
-#include <opie/ofiledialog.h>
+//  #include <opie/ofileselector.h>
+//  #include <opie/ofiledialog.h>
 
 
 #include <qpe/lnkproperties.h>
 #include <qpe/filemanager.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpemenubar.h>
@@ -1729,14 +1729,27 @@ QString  AdvancedFm::getFileSystemType(const QString &currentText) {
       return temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
     }
   }
   return baseFs;
 }
 
-QString  AdvancedFm::getDiskSpace( const QString &) {
-
+QString  AdvancedFm::getDiskSpace( const QString &path) {
+   struct statfs fss;
+   if ( !statfs( path.latin1(), &fss ) ) {
+     int blkSize = fss.f_bsize;
+ //    int totalBlks = fs.f_blocks;
+     int availBlks = fss.f_bavail;
+ 
+     long mult = blkSize / 1024;
+     long div = 1024 / blkSize;
+     if ( !mult ) mult = 1;
+     if ( !div ) div = 1;
+ 
+     return QString::number(availBlks * mult / div);
+   }
+   return "";
 }
 
 void AdvancedFm::doBeam() {
   Ir ir;
   if(!ir.supported()){
   } else {
@@ -1865,13 +1878,12 @@ void AdvancedFm::cancelMenuTimer() {
   qDebug("selectionChanged: cancel menu timer");
   if( menuTimer.isActive() )
     menuTimer.stop();
 }
 
 QString AdvancedFm::checkDiskSpace(const QString &path) {
-
   struct statfs fss;
   if ( !statfs( path.latin1(), &fss ) ) {
     int blkSize = fss.f_bsize;
 //    int totalBlks = fs.f_blocks;
     int availBlks = fss.f_bavail;
 
diff --git a/noncore/apps/advancedfm/advancedfm.pro b/noncore/apps/advancedfm/advancedfm.pro
index e99ab12..0f0f770 100644
--- a/noncore/apps/advancedfm/advancedfm.pro
+++ b/noncore/apps/advancedfm/advancedfm.pro
@@ -4,22 +4,22 @@ HEADERS   = advancedfm.h inputDialog.h filePermissions.h output.h
 SOURCES   = advancedfm.cpp inputDialog.cpp filePermissions.cpp output.cpp main.cpp
 TARGET    = advancedfm
 REQUIRES=medium-config
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 DESTDIR = $(OPIEDIR)/bin
-LIBS            += -lqpe -lopie
+LIBS            += -lqpe
 
 TRANSLATIONS = ../../../i18n/de/advancedfm.ts \
-         ../../../i18n/en/advancedfm.ts \
-         ../../../i18n/es/advancedfm.ts \
-         ../../../i18n/fr/advancedfm.ts \
-         ../../../i18n/hu/advancedfm.ts \
-         ../../../i18n/ja/advancedfm.ts \
-         ../../../i18n/ko/advancedfm.ts \
-         ../../../i18n/no/advancedfm.ts \
-         ../../../i18n/pl/advancedfm.ts \
-         ../../../i18n/pt/advancedfm.ts \
-         ../../../i18n/pt_BR/advancedfm.ts \
-         ../../../i18n/sl/advancedfm.ts \
-         ../../../i18n/zh_CN/advancedfm.ts \
-         ../../../i18n/zh_TW/advancedfm.ts
+   ../../../i18n/en/advancedfm.ts \
+   ../../../i18n/es/advancedfm.ts \
+   ../../../i18n/fr/advancedfm.ts \
+   ../../../i18n/hu/advancedfm.ts \
+   ../../../i18n/ja/advancedfm.ts \
+   ../../../i18n/ko/advancedfm.ts \
+   ../../../i18n/no/advancedfm.ts \
+   ../../../i18n/pl/advancedfm.ts \
+   ../../../i18n/pt/advancedfm.ts \
+   ../../../i18n/pt_BR/advancedfm.ts \
+   ../../../i18n/sl/advancedfm.ts \
+   ../../../i18n/zh_CN/advancedfm.ts \
+   ../../../i18n/zh_TW/advancedfm.ts