-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 10 | ||||
-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 | 1 |
4 files changed, 6 insertions, 9 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 | |||
@@ -43,7 +43,7 @@ AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags ) | |||
43 | : QMainWindow( ) { | 43 | : QMainWindow( ) { |
44 | init(); | 44 | init(); |
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() ); |
48 | 48 | ||
49 | initConnections(); | 49 | initConnections(); |
@@ -89,10 +89,6 @@ void AdvancedFm::tabChanged(QWidget *wd) { | |||
89 | viewMenu->setItemChecked(viewMenu->idAt(1), true); | 89 | viewMenu->setItemChecked(viewMenu->idAt(1), true); |
90 | } | 90 | } |
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()); |
97 | currentPathCombo->lineEdit()->setText(path); | 93 | currentPathCombo->lineEdit()->setText(path); |
98 | } | 94 | } |
@@ -110,10 +106,12 @@ void AdvancedFm::populateView() { | |||
110 | thisDir->setMatchAllDirs(TRUE); | 106 | thisDir->setMatchAllDirs(TRUE); |
111 | thisDir->setNameFilter(filterStr); | 107 | thisDir->setNameFilter(filterStr); |
112 | QString fileL, fileS, fileDate; | 108 | QString fileL, fileS, fileDate; |
109 | |||
113 | QString fs= getFileSystemType((const QString &) path); | 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*/); |
118 | QFileInfoListIterator it(*list); | 116 | QFileInfoListIterator it(*list); |
119 | QFileInfo *fi; | 117 | QFileInfo *fi; |
@@ -323,7 +321,7 @@ QStringList AdvancedFm::getPath() { | |||
323 | return strList; | 321 | return strList; |
324 | } | 322 | } |
325 | 323 | ||
326 | void AdvancedFm::changeTo(const QString dir) { | 324 | void AdvancedFm::changeTo(const QString &dir) { |
327 | chdir( dir.latin1()); | 325 | chdir( dir.latin1()); |
328 | CurrentDir()->cd(dir, TRUE); | 326 | CurrentDir()->cd(dir, TRUE); |
329 | populateView(); | 327 | populateView(); |
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 | |||
@@ -96,12 +96,12 @@ protected: | |||
96 | QListView *CurrentView(); | 96 | QListView *CurrentView(); |
97 | QListView *OtherView(); | 97 | QListView *OtherView(); |
98 | void setOtherTabCurrent(); | 98 | void setOtherTabCurrent(); |
99 | void changeTo(const QString dir); | ||
100 | 99 | ||
101 | //protected signals: | 100 | //protected signals: |
102 | // void newPath(QString); | 101 | // void newPath(QString); |
103 | 102 | ||
104 | protected slots: | 103 | protected slots: |
104 | void changeTo(const QString &); | ||
105 | void slotSwitchMenu(int); | 105 | void slotSwitchMenu(int); |
106 | void selectAll(); | 106 | void selectAll(); |
107 | void addToDocs(); | 107 | void addToDocs(); |
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,5 +1,5 @@ | |||
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 |
4 | SOURCES = advancedfm.cpp advancedfmData.cpp advancedfmMenu.cpp filePermissions.cpp output.cpp main.cpp | 4 | SOURCES = advancedfm.cpp advancedfmData.cpp advancedfmMenu.cpp filePermissions.cpp output.cpp main.cpp |
5 | TARGET = advancedfm | 5 | TARGET = advancedfm |
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 | |||
@@ -717,7 +717,6 @@ void AdvancedFm::startProcess(const QString & cmd) { | |||
717 | OProcess *process; | 717 | OProcess *process; |
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 | |||
721 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int))); | 720 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int))); |
722 | 721 | ||
723 | command << "/bin/sh"; | 722 | command << "/bin/sh"; |