summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-08-06 14:42:54 (UTC)
committer llornkcor <llornkcor>2002-08-06 14:42:54 (UTC)
commite6a512dc2e0602298f8a745036d25eb171ced977 (patch) (side-by-side diff)
tree38a1df282028ac69fba494dba2ca41d04e565a54
parent64888e9cd2f4c8f40f08a6712e2fd27220ff14ad (diff)
downloadopie-e6a512dc2e0602298f8a745036d25eb171ced977.zip
opie-e6a512dc2e0602298f8a745036d25eb171ced977.tar.gz
opie-e6a512dc2e0602298f8a745036d25eb171ced977.tar.bz2
fixed proper path for familiar cf, and hide sd for non zaurus
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp39
-rw-r--r--noncore/apps/advancedfm/advancedfm.h1
2 files changed, 29 insertions, 11 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 7ee78c0..0f2555d 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -72,6 +72,7 @@
#include <errno.h>
#include <sys/vfs.h>
#include <mntent.h>
+#include <sys/utsname.h>
AdvancedFm::AdvancedFm( )
: QMainWindow( )
@@ -247,7 +248,18 @@ AdvancedFm::AdvancedFm( )
*/
///////////////
-
+
+ struct utsname name; /* check for embedix kernel running on the zaurus*/
+ if (uname(&name) != -1) {
+ QString release=name.release;
+ if(release.find("embedix",0,TRUE) !=-1) {
+ zaurusDevice=TRUE;
+ } else {
+ zaurusDevice=FALSE;
+ sdButton->hide();
+ }
+ }
+
currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
currentDir.setPath( QDir::currentDirPath());
@@ -1062,16 +1074,21 @@ void AdvancedFm::SDButtonPushed() {
}
void AdvancedFm::CFButtonPushed() {
- QString current = "/mnt/cf";
- chdir( current.latin1() );
- if (TabWidget->currentPageIndex() == 0) {
- currentDir.cd( current, TRUE);
- populateLocalView();
- } else {
- currentRemoteDir.cd( current, TRUE);
- populateRemoteView();
- }
- update();
+ QString current;
+ if(zaurusDevice)
+ current= "/mnt/cf";
+ else
+ current = "/mnt/hda";
+
+ chdir( current.latin1() );
+ if (TabWidget->currentPageIndex() == 0) {
+ currentDir.cd( current, TRUE);
+ populateLocalView();
+ } else {
+ currentRemoteDir.cd( current, TRUE);
+ populateRemoteView();
+ }
+ update();
}
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 78f0bad..5b714ae 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -105,6 +105,7 @@ protected slots:
void switchToRemoteTab();
protected:
+ bool zaurusDevice;
QGridLayout *tabLayout, *tabLayout_2, *tabLayout_3;
QStringList remoteDirPathStringList, localDirPathStringList;