author | llornkcor <llornkcor> | 2004-09-25 08:22:22 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-09-25 08:22:22 (UTC) |
commit | ff6c55833c0cba33469f668ca158e96b409b4967 (patch) (unidiff) | |
tree | 63299a67e6f9bf1a06c8668775f95f96366efce0 | |
parent | 946445e87ce74b8b28817ea63854054dbf165003 (diff) | |
download | opie-ff6c55833c0cba33469f668ca158e96b409b4967.zip opie-ff6c55833c0cba33469f668ca158e96b409b4967.tar.gz opie-ff6c55833c0cba33469f668ca158e96b409b4967.tar.bz2 |
fix
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 20 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.h | 2 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.pro | 2 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 5 |
4 files changed, 13 insertions, 16 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index f1be471..0dc822d 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
@@ -45,3 +45,3 @@ AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags ) | |||
45 | renameBox = 0; | 45 | renameBox = 0; |
46 | 46 | whichTab = 1; | |
47 | unknownXpm = Resource::loadImage("UnknownDocument").smoothScale(AppLnk::smallIconSize(),AppLnk::smallIconSize() ); | 47 | unknownXpm = Resource::loadImage("UnknownDocument").smoothScale(AppLnk::smallIconSize(),AppLnk::smallIconSize() ); |
@@ -91,6 +91,2 @@ void AdvancedFm::tabChanged(QWidget *wd) { | |||
91 | 91 | ||
92 | QString fs= getFileSystemType( (const QString &) path); | ||
93 | |||
94 | setCaption(tr("AdvancedFm :: ")+fs+" :: " | ||
95 | +checkDiskSpace( (const QString &) path )+ tr(" kB free") ); | ||
96 | chdir( path.latin1()); | 92 | chdir( path.latin1()); |
@@ -112,6 +108,8 @@ void AdvancedFm::populateView() { | |||
112 | QString fileL, fileS, fileDate; | 108 | QString fileL, fileS, fileDate; |
113 | QString fs= getFileSystemType((const QString &) path); | 109 | |
110 | QString fs = getFileSystemType((const QString &) path); | ||
114 | setCaption(tr("AdvancedFm :: ")+fs+" :: " | 111 | setCaption(tr("AdvancedFm :: ")+fs+" :: " |
115 | +checkDiskSpace((const QString &) path)+ tr(" kB free") ); | 112 | +checkDiskSpace((const QString &) path)+ tr(" kB free") ); |
116 | bool isDir=FALSE; | 113 | bool isDir = FALSE; |
114 | |||
117 | const QFileInfoList *list = thisDir->entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); | 115 | const QFileInfoList *list = thisDir->entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); |
@@ -121,3 +119,3 @@ void AdvancedFm::populateView() { | |||
121 | if (fi->isSymLink() ) { | 119 | if (fi->isSymLink() ) { |
122 | QString symLink=fi->readLink(); | 120 | QString symLink = fi->readLink(); |
123 | QFileInfo sym( symLink); | 121 | QFileInfo sym( symLink); |
@@ -325,3 +323,3 @@ QStringList AdvancedFm::getPath() { | |||
325 | 323 | ||
326 | void AdvancedFm::changeTo(const QString dir) { | 324 | void AdvancedFm::changeTo(const QString &dir) { |
327 | chdir( dir.latin1()); | 325 | chdir( dir.latin1()); |
@@ -342,3 +340,3 @@ void AdvancedFm::SDButtonPushed() { | |||
342 | Opie::Core::OStorageInfo info; | 340 | Opie::Core::OStorageInfo info; |
343 | changeTo(info.sdPath()); | 341 | changeTo(info.sdPath()); |
344 | } | 342 | } |
@@ -347,3 +345,3 @@ void AdvancedFm::CFButtonPushed() { | |||
347 | Opie::Core::OStorageInfo info; | 345 | Opie::Core::OStorageInfo info; |
348 | changeTo(info.cfPath()); | 346 | changeTo(info.cfPath()); |
349 | } | 347 | } |
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h index c25bce2..a4f2510 100644 --- a/noncore/apps/advancedfm/advancedfm.h +++ b/noncore/apps/advancedfm/advancedfm.h | |||
@@ -98,3 +98,2 @@ protected: | |||
98 | void setOtherTabCurrent(); | 98 | void setOtherTabCurrent(); |
99 | void changeTo(const QString dir); | ||
100 | 99 | ||
@@ -104,2 +103,3 @@ protected: | |||
104 | protected slots: | 103 | protected slots: |
104 | void changeTo(const QString &); | ||
105 | void slotSwitchMenu(int); | 105 | void slotSwitchMenu(int); |
diff --git a/noncore/apps/advancedfm/advancedfm.pro b/noncore/apps/advancedfm/advancedfm.pro index 713f61c..01ea8f4 100644 --- a/noncore/apps/advancedfm/advancedfm.pro +++ b/noncore/apps/advancedfm/advancedfm.pro | |||
@@ -1,3 +1,3 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | CONFIG += qte warn_on quick-app | 2 | CONFIG += qte warn_on quick-app debug |
3 | HEADERS = advancedfm.h filePermissions.h output.h | 3 | HEADERS = advancedfm.h filePermissions.h output.h |
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index 7b3dcf6..171e7c4 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp | |||
@@ -718,5 +718,4 @@ void AdvancedFm::startProcess(const QString & cmd) { | |||
718 | process = new OProcess(); | 718 | process = new OProcess(); |
719 | connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), this, SLOT( processEnded(Opie::Core::OProcess*))); | 719 | connect(process,SIGNAL(processExited(Opie::Core::OProcess*)),this,SLOT(processEnded(Opie::Core::OProcess*))); |
720 | 720 | connect(process,SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),this,SLOT(oprocessStderr(Opie::Core::OProcess*,char*,int))); | |
721 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int))); | ||
722 | 721 | ||