Diffstat (limited to 'noncore/apps/advancedfm/advancedfm.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 10 |
1 files changed, 4 insertions, 6 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 | |||
@@ -34,25 +34,25 @@ | |||
34 | #include <time.h> | 34 | #include <time.h> |
35 | #include <dirent.h> | 35 | #include <dirent.h> |
36 | #include <fcntl.h> | 36 | #include <fcntl.h> |
37 | #include <sys/vfs.h> | 37 | #include <sys/vfs.h> |
38 | #include <mntent.h> | 38 | #include <mntent.h> |
39 | 39 | ||
40 | using namespace Opie::Ui; | 40 | using namespace Opie::Ui; |
41 | 41 | ||
42 | AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags ) | 42 | 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(); |
50 | rePopulate(); | 50 | rePopulate(); |
51 | channel = new QCopChannel( "QPE/Application/advancedfm", this ); | 51 | channel = new QCopChannel( "QPE/Application/advancedfm", this ); |
52 | connect(channel,SIGNAL(received(const QCString&,const QByteArray&)),this,SLOT(qcopReceive(const QCString&,const QByteArray&))); | 52 | connect(channel,SIGNAL(received(const QCString&,const QByteArray&)),this,SLOT(qcopReceive(const QCString&,const QByteArray&))); |
53 | switchToLocalTab(); | 53 | switchToLocalTab(); |
54 | } | 54 | } |
55 | 55 | ||
56 | AdvancedFm::~AdvancedFm() { | 56 | AdvancedFm::~AdvancedFm() { |
57 | } | 57 | } |
58 | 58 | ||
@@ -80,49 +80,47 @@ void AdvancedFm::tabChanged(QWidget *wd) { | |||
80 | } | 80 | } |
81 | qApp->processEvents(); | 81 | qApp->processEvents(); |
82 | QString path = CurrentDir()->canonicalPath(); | 82 | QString path = CurrentDir()->canonicalPath(); |
83 | // qDebug(path); | 83 | // qDebug(path); |
84 | if ( TabWidget->currentWidget() == tab) { | 84 | if ( TabWidget->currentWidget() == tab) { |
85 | viewMenu->setItemChecked(viewMenu->idAt(0), true); | 85 | viewMenu->setItemChecked(viewMenu->idAt(0), true); |
86 | viewMenu->setItemChecked(viewMenu->idAt(1), false); | 86 | viewMenu->setItemChecked(viewMenu->idAt(1), false); |
87 | } else { | 87 | } else { |
88 | viewMenu->setItemChecked(viewMenu->idAt(0), false); | 88 | viewMenu->setItemChecked(viewMenu->idAt(0), false); |
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 | } |
99 | 95 | ||
100 | 96 | ||
101 | void AdvancedFm::populateView() { | 97 | void AdvancedFm::populateView() { |
102 | 98 | ||
103 | QPixmap pm; | 99 | QPixmap pm; |
104 | QListView *thisView = CurrentView(); | 100 | QListView *thisView = CurrentView(); |
105 | QDir *thisDir = CurrentDir(); | 101 | QDir *thisDir = CurrentDir(); |
106 | QString path = thisDir->canonicalPath(); | 102 | QString path = thisDir->canonicalPath(); |
107 | 103 | ||
108 | thisView->clear(); | 104 | thisView->clear(); |
109 | thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | 105 | thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); |
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; |
120 | while ( (fi=it.current()) ) { | 118 | while ( (fi=it.current()) ) { |
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); |
124 | fileS.sprintf( "%10i", sym.size() ); | 122 | fileS.sprintf( "%10i", sym.size() ); |
125 | fileL = fi->fileName() +" -> " + sym.filePath().data(); | 123 | fileL = fi->fileName() +" -> " + sym.filePath().data(); |
126 | fileDate = sym.lastModified().toString(); | 124 | fileDate = sym.lastModified().toString(); |
127 | } else { | 125 | } else { |
128 | fileS.sprintf( "%10i", fi->size() ); | 126 | fileS.sprintf( "%10i", fi->size() ); |
@@ -314,25 +312,25 @@ QStringList AdvancedFm::getPath() { | |||
314 | QListView *thisView=CurrentView(); | 312 | QListView *thisView=CurrentView(); |
315 | QList<QListViewItem> * getSelectedItems( QListView * thisView ); | 313 | QList<QListViewItem> * getSelectedItems( QListView * thisView ); |
316 | QListViewItemIterator it( thisView ); | 314 | QListViewItemIterator it( thisView ); |
317 | for ( ; it.current(); ++it ) { | 315 | for ( ; it.current(); ++it ) { |
318 | if ( it.current()->isSelected() ) { | 316 | if ( it.current()->isSelected() ) { |
319 | strList << it.current()->text(0); | 317 | strList << it.current()->text(0); |
320 | // odebug << it.current()->text(0) << oendl; | 318 | // odebug << it.current()->text(0) << oendl; |
321 | } | 319 | } |
322 | } | 320 | } |
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(); |
330 | update(); | 328 | update(); |
331 | } | 329 | } |
332 | 330 | ||
333 | void AdvancedFm::homeButtonPushed() { | 331 | void AdvancedFm::homeButtonPushed() { |
334 | changeTo(QDir::homeDirPath()); | 332 | changeTo(QDir::homeDirPath()); |
335 | } | 333 | } |
336 | 334 | ||
337 | void AdvancedFm::docButtonPushed() { | 335 | void AdvancedFm::docButtonPushed() { |
338 | changeTo(QPEApplication::documentDir()); | 336 | changeTo(QPEApplication::documentDir()); |