author | llornkcor <llornkcor> | 2003-02-24 02:38:01 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-02-24 02:38:01 (UTC) |
commit | e144592570ddacf26d27f3e2759dbe7f2370d0a0 (patch) (unidiff) | |
tree | 054221a40b03bd91945161570a8996a5427e6456 /noncore/apps | |
parent | 56b89312a374b62ee20f6ad2b62b6426183d4d26 (diff) | |
download | opie-e144592570ddacf26d27f3e2759dbe7f2370d0a0.zip opie-e144592570ddacf26d27f3e2759dbe7f2370d0a0.tar.gz opie-e144592570ddacf26d27f3e2759dbe7f2370d0a0.tar.bz2 |
cleanup
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 200 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.h | 6 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 76 |
3 files changed, 74 insertions, 208 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index 74654fc..fc6c3bf 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
@@ -71,14 +71,16 @@ | |||
71 | AdvancedFm::AdvancedFm( ) | 71 | AdvancedFm::AdvancedFm( ) |
72 | : QMainWindow( ) { | 72 | : QMainWindow( ) { |
73 | init(); | 73 | init(); |
74 | renameBox = 0; | 74 | renameBox = 0; |
75 | 75 | ||
76 | initConnections(); | 76 | initConnections(); |
77 | populateLocalView(); | 77 | TabWidget->setCurrentTab(1); |
78 | populateRemoteView(); | 78 | populateView(); |
79 | TabWidget->setCurrentTab(0); | ||
80 | populateView(); | ||
79 | currentPathCombo->setFocus(); | 81 | currentPathCombo->setFocus(); |
80 | } | 82 | } |
81 | 83 | ||
82 | AdvancedFm::~AdvancedFm() { | 84 | AdvancedFm::~AdvancedFm() { |
83 | } | 85 | } |
84 | 86 | ||
@@ -112,28 +114,33 @@ void AdvancedFm::tabChanged(QWidget *w) | |||
112 | 114 | ||
113 | QString fs= getFileSystemType( (const QString &) path); | 115 | QString fs= getFileSystemType( (const QString &) path); |
114 | 116 | ||
115 | setCaption("AdvancedFm :: "+fs+" :: " | 117 | setCaption("AdvancedFm :: "+fs+" :: " |
116 | +checkDiskSpace( (const QString &) path )+ " kB free" ); | 118 | +checkDiskSpace( (const QString &) path )+ " kB free" ); |
117 | chdir( path.latin1()); | 119 | chdir( path.latin1()); |
120 | //2populateView(); | ||
118 | } | 121 | } |
119 | 122 | ||
120 | 123 | ||
121 | void AdvancedFm::populateLocalView() | 124 | void AdvancedFm::populateView() |
122 | { | 125 | { |
123 | QPixmap pm; | 126 | QPixmap pm; |
124 | Local_View->clear(); | 127 | QListView *thisView = CurrentView(); |
125 | currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | 128 | QDir *thisDir = CurrentDir(); |
126 | currentDir.setMatchAllDirs(TRUE); | 129 | QString path = thisDir->canonicalPath(); |
127 | currentDir.setNameFilter(filterStr); | 130 | |
131 | thisView->clear(); | ||
132 | thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | ||
133 | thisDir->setMatchAllDirs(TRUE); | ||
134 | thisDir->setNameFilter(filterStr); | ||
128 | QString fileL, fileS, fileDate; | 135 | QString fileL, fileS, fileDate; |
129 | QString fs= getFileSystemType((const QString &) currentDir.canonicalPath()); | 136 | QString fs= getFileSystemType((const QString &) path); |
130 | setCaption("AdvancedFm :: "+fs+" :: " | 137 | setCaption("AdvancedFm :: "+fs+" :: " |
131 | +checkDiskSpace((const QString &) currentDir.canonicalPath())+" kB free" ); | 138 | +checkDiskSpace((const QString &) path)+" kB free" ); |
132 | bool isDir=FALSE; | 139 | bool isDir=FALSE; |
133 | const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); | 140 | const QFileInfoList *list = thisDir->entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); |
134 | QFileInfoListIterator it(*list); | 141 | QFileInfoListIterator it(*list); |
135 | QFileInfo *fi; | 142 | QFileInfo *fi; |
136 | while ( (fi=it.current()) ) | 143 | while ( (fi=it.current()) ) |
137 | { | 144 | { |
138 | if (fi->isSymLink() ) | 145 | if (fi->isSymLink() ) |
139 | { | 146 | { |
@@ -145,22 +152,24 @@ void AdvancedFm::populateLocalView() | |||
145 | } | 152 | } |
146 | else | 153 | else |
147 | { | 154 | { |
148 | fileS.sprintf( "%10i", fi->size() ); | 155 | fileS.sprintf( "%10i", fi->size() ); |
149 | fileL.sprintf( "%s",fi->fileName().data() ); | 156 | fileL.sprintf( "%s",fi->fileName().data() ); |
150 | fileDate= fi->lastModified().toString(); | 157 | fileDate= fi->lastModified().toString(); |
151 | if( QDir(QDir::cleanDirPath( currentDir.canonicalPath()+"/"+fileL)).exists() ) | 158 | if( QDir(QDir::cleanDirPath( path +"/"+fileL)).exists() ) |
152 | { | 159 | { |
153 | fileL+="/"; | 160 | fileL+="/"; |
154 | isDir=TRUE; | 161 | isDir=TRUE; |
155 | } | 162 | } |
156 | } | 163 | } |
157 | QFileInfo fileInfo( currentDir.canonicalPath()+"/"+fileL); | 164 | |
165 | QFileInfo fileInfo( path + "/" + fileL); | ||
166 | |||
158 | if(fileL !="./" && fi->exists()) | 167 | if(fileL !="./" && fi->exists()) |
159 | { | 168 | { |
160 | item= new QListViewItem( Local_View, fileL, fileS , fileDate); | 169 | item= new QListViewItem( thisView, fileL, fileS , fileDate); |
161 | 170 | ||
162 | if(isDir || fileL.find("/",0,TRUE) != -1) | 171 | if(isDir || fileL.find("/",0,TRUE) != -1) |
163 | { | 172 | { |
164 | 173 | ||
165 | if( !QDir( fi->filePath() ).isReadable()) //is directory | 174 | if( !QDir( fi->filePath() ).isReadable()) //is directory |
166 | pm = Resource::loadPixmap( "lockedfolder" ); | 175 | pm = Resource::loadPixmap( "lockedfolder" ); |
@@ -200,165 +209,44 @@ void AdvancedFm::populateLocalView() | |||
200 | } | 209 | } |
201 | } | 210 | } |
202 | isDir=FALSE; | 211 | isDir=FALSE; |
203 | ++it; | 212 | ++it; |
204 | } | 213 | } |
205 | 214 | ||
206 | if(currentDir.canonicalPath().find("dev",0,TRUE) != -1) | 215 | if( path.find("dev",0,TRUE) != -1) |
207 | { | 216 | { |
208 | struct stat buf; | 217 | struct stat buf; |
209 | dev_t devT; | 218 | dev_t devT; |
210 | DIR *dir; | 219 | DIR *dir; |
211 | struct dirent *mydirent; | 220 | struct dirent *mydirent; |
212 | 221 | ||
213 | if((dir = opendir( currentDir.canonicalPath().latin1())) != NULL) | 222 | if((dir = opendir( path.latin1())) != NULL) |
214 | while ((mydirent = readdir(dir)) != NULL) | 223 | while ((mydirent = readdir(dir)) != NULL) |
215 | { | 224 | { |
216 | lstat( mydirent->d_name, &buf); | 225 | lstat( mydirent->d_name, &buf); |
217 | // qDebug(mydirent->d_name); | 226 | // qDebug(mydirent->d_name); |
218 | fileL.sprintf("%s", mydirent->d_name); | 227 | fileL.sprintf("%s", mydirent->d_name); |
219 | devT = buf.st_dev; | 228 | devT = buf.st_dev; |
220 | fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF); | 229 | fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF); |
221 | fileDate.sprintf("%s", ctime( &buf.st_mtime)); | 230 | fileDate.sprintf("%s", ctime( &buf.st_mtime)); |
222 | if( fileL.find(".") == -1 ) | 231 | if( fileL.find(".") == -1 ) |
223 | { | 232 | { |
224 | item= new QListViewItem( Local_View, fileL, fileS, fileDate); | 233 | item= new QListViewItem( thisView, fileL, fileS, fileDate); |
225 | pm = Resource::loadPixmap( "UnknownDocument-14" ); | 234 | pm = Resource::loadPixmap( "UnknownDocument-14" ); |
226 | item->setPixmap( 0,pm); | 235 | item->setPixmap( 0,pm); |
227 | } | 236 | } |
228 | } | 237 | } |
229 | 238 | ||
230 | closedir(dir); | 239 | closedir(dir); |
231 | } | 240 | } |
232 | 241 | ||
233 | Local_View->setSorting( 3,FALSE); | 242 | thisView->setSorting( 3,FALSE); |
234 | fillCombo( (const QString &) currentDir.canonicalPath()); | 243 | fillCombo( (const QString &) path ); |
235 | } | 244 | } |
236 | 245 | ||
237 | 246 | ||
238 | void AdvancedFm::populateRemoteView() | ||
239 | { | ||
240 | QPixmap pm; | ||
241 | Remote_View->clear(); | ||
242 | currentRemoteDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | ||
243 | currentRemoteDir.setMatchAllDirs(TRUE); | ||
244 | currentRemoteDir.setNameFilter(filterStr); | ||
245 | QString fileL, fileS, fileDate; | ||
246 | |||
247 | QString fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath()); | ||
248 | setCaption("AdvancedFm :: "+fs+" :: " | ||
249 | +checkDiskSpace((const QString &) currentRemoteDir.canonicalPath())+" kB free" ); | ||
250 | bool isDir=FALSE; | ||
251 | const QFileInfoList *list = currentRemoteDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); | ||
252 | QFileInfoListIterator it(*list); | ||
253 | QFileInfo *fi; | ||
254 | while ( (fi=it.current()) ) | ||
255 | { | ||
256 | if (fi->isSymLink() ) | ||
257 | { | ||
258 | QString symLink=fi->readLink(); | ||
259 | // qDebug("Symlink detected "+symLink); | ||
260 | QFileInfo sym( symLink); | ||
261 | fileS.sprintf( "%10i", sym.size() ); | ||
262 | fileL.sprintf( "%s -> %s", fi->fileName().data(),sym.filePath().data() ); | ||
263 | fileDate = sym.lastModified().toString(); | ||
264 | } | ||
265 | else | ||
266 | { | ||
267 | // qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); | ||
268 | fileS.sprintf( "%10i", fi->size() ); | ||
269 | fileL.sprintf( "%s",fi->fileName().data() ); | ||
270 | fileDate= fi->lastModified().toString(); | ||
271 | |||
272 | if( QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+fileL)).exists() ) | ||
273 | { | ||
274 | fileL+="/"; | ||
275 | isDir=TRUE; | ||
276 | // qDebug( fileL); | ||
277 | } | ||
278 | } | ||
279 | |||
280 | QFileInfo fileInfo( currentRemoteDir.canonicalPath()+"/"+fileL); | ||
281 | if(fileL !="./" && fi->exists()) | ||
282 | { | ||
283 | item= new QListViewItem( Remote_View, fileL, fileS, fileDate); | ||
284 | QPixmap pm; | ||
285 | |||
286 | if(isDir || fileL.find("/",0,TRUE) != -1) | ||
287 | { | ||
288 | if( !QDir( fi->filePath() ).isReadable()) | ||
289 | pm = Resource::loadPixmap( "lockedfolder" ); | ||
290 | else | ||
291 | pm= Resource::loadPixmap( "folder" ); | ||
292 | } | ||
293 | else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) | ||
294 | { | ||
295 | pm = Resource::loadPixmap( "exec"); | ||
296 | } | ||
297 | else if( (fileInfo.permission( QFileInfo::ExeUser) | ||
298 | | fileInfo.permission( QFileInfo::ExeGroup) | ||
299 | | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) | ||
300 | { | ||
301 | pm = Resource::loadPixmap( "exec"); | ||
302 | } | ||
303 | else if( !fi->isReadable() ) | ||
304 | { | ||
305 | pm = Resource::loadPixmap( "locked" ); | ||
306 | } | ||
307 | else | ||
308 | { | ||
309 | MimeType mt(fi->filePath()); | ||
310 | pm=mt.pixmap(); //sets the correct pixmap for mimetype | ||
311 | if(pm.isNull()) | ||
312 | pm = Resource::loadPixmap( "UnknownDocument-14" ); | ||
313 | } | ||
314 | if( fi->isSymLink() && fileL.find("->",0,TRUE) != -1) | ||
315 | { | ||
316 | // overlay link image | ||
317 | pm= Resource::loadPixmap( "folder" ); | ||
318 | QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); | ||
319 | QPainter painter( &pm ); | ||
320 | painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); | ||
321 | pm.setMask( pm.createHeuristicMask( FALSE ) ); | ||
322 | } | ||
323 | item->setPixmap( 0, pm); | ||
324 | } | ||
325 | isDir=FALSE; | ||
326 | ++it; | ||
327 | } | ||
328 | |||
329 | if(currentRemoteDir.canonicalPath().find("dev",0,TRUE) != -1) | ||
330 | { | ||
331 | struct stat buf; | ||
332 | DIR *dir; | ||
333 | struct dirent *mydirent; | ||
334 | if((dir = opendir( currentRemoteDir.canonicalPath().latin1())) != NULL) | ||
335 | |||
336 | while ((mydirent = readdir(dir)) != NULL) | ||
337 | { | ||
338 | lstat( mydirent->d_name, &buf); | ||
339 | // qDebug(mydirent->d_name); | ||
340 | fileL.sprintf("%s", mydirent->d_name); | ||
341 | fileS.sprintf("%d,%d", (int) (buf.st_dev>>8)&0xFF, (int) buf.st_dev &0xFF); | ||
342 | fileDate.sprintf("%s", ctime( &buf.st_mtime)); | ||
343 | |||
344 | if( fileL.find(".") == -1 ) | ||
345 | { | ||
346 | item= new QListViewItem( Remote_View, fileL, fileS, fileDate); | ||
347 | pm = Resource::loadPixmap( "UnknownDocument-14" ); | ||
348 | item->setPixmap( 0,pm); | ||
349 | } | ||
350 | } | ||
351 | |||
352 | closedir(dir); | ||
353 | } | ||
354 | |||
355 | Remote_View->setSorting( 3,FALSE); | ||
356 | fillCombo( (const QString &) currentRemoteDir.canonicalPath() ); | ||
357 | } | ||
358 | |||
359 | void AdvancedFm::ListClicked(QListViewItem *selectedItem) | 247 | void AdvancedFm::ListClicked(QListViewItem *selectedItem) |
360 | { | 248 | { |
361 | if(selectedItem) | 249 | if(selectedItem) |
362 | { | 250 | { |
363 | QString strItem=selectedItem->text(0); | 251 | QString strItem=selectedItem->text(0); |
364 | QString strSize=selectedItem->text(1); | 252 | QString strSize=selectedItem->text(1); |
@@ -380,13 +268,13 @@ void AdvancedFm::ListClicked(QListViewItem *selectedItem) | |||
380 | isDirectory = true; | 268 | isDirectory = true; |
381 | } | 269 | } |
382 | 270 | ||
383 | if( isDirectory ) | 271 | if( isDirectory ) |
384 | { | 272 | { |
385 | CurrentDir()->cd( strItem, TRUE); | 273 | CurrentDir()->cd( strItem, TRUE); |
386 | PopulateView(); | 274 | populateView(); |
387 | CurrentView()->ensureItemVisible( CurrentView()->firstChild()); | 275 | CurrentView()->ensureItemVisible( CurrentView()->firstChild()); |
388 | } | 276 | } |
389 | chdir( strItem.latin1()); | 277 | chdir( strItem.latin1()); |
390 | } | 278 | } |
391 | } | 279 | } |
392 | 280 | ||
@@ -431,13 +319,13 @@ void AdvancedFm::writeConfig() | |||
431 | 319 | ||
432 | void AdvancedFm::currentPathComboChanged() | 320 | void AdvancedFm::currentPathComboChanged() |
433 | { | 321 | { |
434 | if(QDir( currentPathCombo->lineEdit()->text()).exists()) | 322 | if(QDir( currentPathCombo->lineEdit()->text()).exists()) |
435 | { | 323 | { |
436 | CurrentDir()->setPath( currentPathCombo->lineEdit()->text() ); | 324 | CurrentDir()->setPath( currentPathCombo->lineEdit()->text() ); |
437 | PopulateView(); | 325 | populateView(); |
438 | } | 326 | } |
439 | else | 327 | else |
440 | { | 328 | { |
441 | QMessageBox::message(tr("Note"),tr("That directory does not exist")); | 329 | QMessageBox::message(tr("Note"),tr("That directory does not exist")); |
442 | } | 330 | } |
443 | } | 331 | } |
@@ -468,13 +356,13 @@ void AdvancedFm::fillCombo(const QString ¤tPath) | |||
468 | } | 356 | } |
469 | 357 | ||
470 | void AdvancedFm::currentPathComboActivated(const QString & currentPath) | 358 | void AdvancedFm::currentPathComboActivated(const QString & currentPath) |
471 | { | 359 | { |
472 | chdir( currentPath.latin1() ); | 360 | chdir( currentPath.latin1() ); |
473 | CurrentDir()->cd( currentPath, TRUE); | 361 | CurrentDir()->cd( currentPath, TRUE); |
474 | PopulateView(); | 362 | populateView(); |
475 | update(); | 363 | update(); |
476 | } | 364 | } |
477 | 365 | ||
478 | QStringList AdvancedFm::getPath() | 366 | QStringList AdvancedFm::getPath() |
479 | { | 367 | { |
480 | QStringList strList; | 368 | QStringList strList; |
@@ -494,32 +382,32 @@ QStringList AdvancedFm::getPath() | |||
494 | 382 | ||
495 | void AdvancedFm::homeButtonPushed() | 383 | void AdvancedFm::homeButtonPushed() |
496 | { | 384 | { |
497 | QString current = QDir::homeDirPath(); | 385 | QString current = QDir::homeDirPath(); |
498 | chdir( current.latin1() ); | 386 | chdir( current.latin1() ); |
499 | CurrentDir()->cd( current, TRUE); | 387 | CurrentDir()->cd( current, TRUE); |
500 | PopulateView(); | 388 | populateView(); |
501 | update(); | 389 | update(); |
502 | } | 390 | } |
503 | 391 | ||
504 | void AdvancedFm::docButtonPushed() | 392 | void AdvancedFm::docButtonPushed() |
505 | { | 393 | { |
506 | QString current = QPEApplication::documentDir(); | 394 | QString current = QPEApplication::documentDir(); |
507 | chdir( current.latin1() ); | 395 | chdir( current.latin1() ); |
508 | 396 | ||
509 | CurrentDir()->cd( current, TRUE); | 397 | CurrentDir()->cd( current, TRUE); |
510 | PopulateView(); | 398 | populateView(); |
511 | update(); | 399 | update(); |
512 | } | 400 | } |
513 | 401 | ||
514 | void AdvancedFm::SDButtonPushed() | 402 | void AdvancedFm::SDButtonPushed() |
515 | { | 403 | { |
516 | QString current = "/mnt/card";// this can change so fix | 404 | QString current = "/mnt/card";// this can change so fix |
517 | chdir( current.latin1() ); | 405 | chdir( current.latin1() ); |
518 | CurrentDir()->cd( current, TRUE); | 406 | CurrentDir()->cd( current, TRUE); |
519 | PopulateView(); | 407 | populateView(); |
520 | update(); | 408 | update(); |
521 | } | 409 | } |
522 | 410 | ||
523 | void AdvancedFm::CFButtonPushed() | 411 | void AdvancedFm::CFButtonPushed() |
524 | { | 412 | { |
525 | QString current; | 413 | QString current; |
@@ -527,13 +415,13 @@ void AdvancedFm::CFButtonPushed() | |||
527 | current= "/mnt/cf"; //zaurus | 415 | current= "/mnt/cf"; //zaurus |
528 | else | 416 | else |
529 | current = "/mnt/hda"; //ipaq | 417 | current = "/mnt/hda"; //ipaq |
530 | 418 | ||
531 | chdir( current.latin1() ); | 419 | chdir( current.latin1() ); |
532 | CurrentDir()->cd( current, TRUE); | 420 | CurrentDir()->cd( current, TRUE); |
533 | PopulateView(); | 421 | populateView(); |
534 | update(); | 422 | update(); |
535 | } | 423 | } |
536 | 424 | ||
537 | 425 | ||
538 | void AdvancedFm::doAbout() | 426 | void AdvancedFm::doAbout() |
539 | { | 427 | { |
@@ -628,13 +516,13 @@ void AdvancedFm::keyReleaseEvent( QKeyEvent *e) | |||
628 | 516 | ||
629 | void AdvancedFm::QPEButtonPushed() | 517 | void AdvancedFm::QPEButtonPushed() |
630 | { | 518 | { |
631 | QString current = QPEApplication::qpeDir(); | 519 | QString current = QPEApplication::qpeDir(); |
632 | chdir( current.latin1() ); | 520 | chdir( current.latin1() ); |
633 | CurrentDir()->cd( current, TRUE); | 521 | CurrentDir()->cd( current, TRUE); |
634 | PopulateView(); | 522 | populateView(); |
635 | update(); | 523 | update(); |
636 | } | 524 | } |
637 | 525 | ||
638 | void AdvancedFm::parsetab(const QString &fileName) | 526 | void AdvancedFm::parsetab(const QString &fileName) |
639 | { | 527 | { |
640 | 528 | ||
@@ -945,13 +833,13 @@ void AdvancedFm::gotoCustomDir(const QString &dir) | |||
945 | { | 833 | { |
946 | if(QDir( curDir).exists() ) | 834 | if(QDir( curDir).exists() ) |
947 | { | 835 | { |
948 | thisDir->setPath( curDir ); | 836 | thisDir->setPath( curDir ); |
949 | chdir( curDir.latin1() ); | 837 | chdir( curDir.latin1() ); |
950 | thisDir->cd( curDir, TRUE); | 838 | thisDir->cd( curDir, TRUE); |
951 | PopulateView(); | 839 | populateView(); |
952 | } | 840 | } |
953 | } | 841 | } |
954 | } | 842 | } |
955 | 843 | ||
956 | QDir *AdvancedFm::CurrentDir() | 844 | QDir *AdvancedFm::CurrentDir() |
957 | { | 845 | { |
@@ -974,20 +862,12 @@ QDir *AdvancedFm::OtherDir() | |||
974 | else | 862 | else |
975 | { | 863 | { |
976 | return ¤tDir; | 864 | return ¤tDir; |
977 | } | 865 | } |
978 | } | 866 | } |
979 | 867 | ||
980 | void AdvancedFm::PopulateView() | ||
981 | { | ||
982 | if ( whichTab == 1) | ||
983 | populateLocalView(); | ||
984 | else | ||
985 | populateRemoteView(); | ||
986 | } | ||
987 | |||
988 | QListView * AdvancedFm::CurrentView() | 868 | QListView * AdvancedFm::CurrentView() |
989 | { | 869 | { |
990 | if ( whichTab == 1) | 870 | if ( whichTab == 1) |
991 | return Local_View; | 871 | return Local_View; |
992 | else | 872 | else |
993 | return Remote_View; | 873 | return Remote_View; |
@@ -997,6 +877,14 @@ QListView * AdvancedFm::OtherView() | |||
997 | { | 877 | { |
998 | if ( whichTab == 1) | 878 | if ( whichTab == 1) |
999 | return Remote_View; | 879 | return Remote_View; |
1000 | else | 880 | else |
1001 | return Local_View; | 881 | return Local_View; |
1002 | } | 882 | } |
883 | |||
884 | void AdvancedFm::setOtherTabCurrent() | ||
885 | { | ||
886 | if ( whichTab == 1) | ||
887 | TabWidget->setCurrentTab(1); | ||
888 | else | ||
889 | TabWidget->setCurrentTab(0); | ||
890 | } | ||
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h index 8eec6ba..024ab29 100644 --- a/noncore/apps/advancedfm/advancedfm.h +++ b/noncore/apps/advancedfm/advancedfm.h | |||
@@ -60,17 +60,15 @@ protected slots: | |||
60 | void selectAll(); | 60 | void selectAll(); |
61 | void addToDocs(); | 61 | void addToDocs(); |
62 | void doDirChange(); | 62 | void doDirChange(); |
63 | void mkDir(); | 63 | void mkDir(); |
64 | void del(); | 64 | void del(); |
65 | void rn(); | 65 | void rn(); |
66 | void populateLocalView(); | 66 | void populateView(); |
67 | void populateRemoteView(); | ||
68 | void showHidden(); | 67 | void showHidden(); |
69 | void showMenuHidden(); | 68 | void showMenuHidden(); |
70 | // void showRemoteHidden(); | ||
71 | void writeConfig(); | 69 | void writeConfig(); |
72 | void readConfig(); | 70 | void readConfig(); |
73 | void ListClicked(QListViewItem *); | 71 | void ListClicked(QListViewItem *); |
74 | void ListPressed( int, QListViewItem *, const QPoint&, int); | 72 | void ListPressed( int, QListViewItem *, const QPoint&, int); |
75 | void makeDir(); | 73 | void makeDir(); |
76 | void doDelete(); | 74 | void doDelete(); |
@@ -122,13 +120,13 @@ protected: | |||
122 | QString checkDiskSpace(const QString &); | 120 | QString checkDiskSpace(const QString &); |
123 | QString dealWithSymName(const QString &); | 121 | QString dealWithSymName(const QString &); |
124 | QDir *CurrentDir(); | 122 | QDir *CurrentDir(); |
125 | QDir *OtherDir(); | 123 | QDir *OtherDir(); |
126 | QListView *CurrentView(); | 124 | QListView *CurrentView(); |
127 | QListView *OtherView(); | 125 | QListView *OtherView(); |
128 | void PopulateView(); | 126 | void setOtherTabCurrent(); |
129 | 127 | ||
130 | protected slots: | 128 | protected slots: |
131 | void dirMenuSelected(int); | 129 | void dirMenuSelected(int); |
132 | void showFileMenu(); | 130 | void showFileMenu(); |
133 | void cancelMenuTimer(); | 131 | void cancelMenuTimer(); |
134 | void homeButtonPushed(); | 132 | void homeButtonPushed(); |
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index 13dad33..c553017 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp | |||
@@ -65,14 +65,14 @@ void AdvancedFm::showMenuHidden() | |||
65 | { | 65 | { |
66 | currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 66 | currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
67 | currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 67 | currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
68 | fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); | 68 | fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); |
69 | // b=TRUE; | 69 | // b=TRUE; |
70 | } | 70 | } |
71 | populateLocalView(); | 71 | populateView(); |
72 | populateRemoteView(); | 72 | // populateRemoteView(); |
73 | // if(b) qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<< true"); | 73 | // if(b) qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<< true"); |
74 | if(b) b = false; else b = true; | 74 | if(b) b = false; else b = true; |
75 | } | 75 | } |
76 | 76 | ||
77 | void AdvancedFm::showHidden() | 77 | void AdvancedFm::showHidden() |
78 | { | 78 | { |
@@ -86,13 +86,13 @@ void AdvancedFm::showHidden() | |||
86 | else | 86 | else |
87 | { | 87 | { |
88 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 88 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
89 | // fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); | 89 | // fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); |
90 | // b=TRUE; | 90 | // b=TRUE; |
91 | } | 91 | } |
92 | PopulateView(); | 92 | populateView(); |
93 | } | 93 | } |
94 | 94 | ||
95 | QString AdvancedFm::dealWithSymName(const QString &fileName) | 95 | QString AdvancedFm::dealWithSymName(const QString &fileName) |
96 | { | 96 | { |
97 | QString strItem = fileName; | 97 | QString strItem = fileName; |
98 | return strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4); | 98 | return strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4); |
@@ -162,13 +162,13 @@ void AdvancedFm::makeDir() | |||
162 | if( fileDlg->result() == 1 ) | 162 | if( fileDlg->result() == 1 ) |
163 | { | 163 | { |
164 | QDir *thisDir = CurrentDir(); | 164 | QDir *thisDir = CurrentDir(); |
165 | QString filename = fileDlg->LineEdit1->text(); | 165 | QString filename = fileDlg->LineEdit1->text(); |
166 | thisDir->mkdir( thisDir->canonicalPath()+"/"+filename); | 166 | thisDir->mkdir( thisDir->canonicalPath()+"/"+filename); |
167 | } | 167 | } |
168 | PopulateView(); | 168 | populateView(); |
169 | } | 169 | } |
170 | 170 | ||
171 | void AdvancedFm::doDelete() | 171 | void AdvancedFm::doDelete() |
172 | { | 172 | { |
173 | 173 | ||
174 | QStringList curFileList = getPath(); | 174 | QStringList curFileList = getPath(); |
@@ -211,13 +211,13 @@ void AdvancedFm::doDelete() | |||
211 | { | 211 | { |
212 | case 0: | 212 | case 0: |
213 | { | 213 | { |
214 | f=f.left(f.length()-1); | 214 | f=f.left(f.length()-1); |
215 | QString cmd="rm -rf "+f; | 215 | QString cmd="rm -rf "+f; |
216 | startProcess( (const QString)cmd.latin1() ); | 216 | startProcess( (const QString)cmd.latin1() ); |
217 | PopulateView(); | 217 | populateView(); |
218 | } | 218 | } |
219 | break; | 219 | break; |
220 | case 1: | 220 | case 1: |
221 | // exit | 221 | // exit |
222 | break; | 222 | break; |
223 | }; | 223 | }; |
@@ -235,13 +235,13 @@ void AdvancedFm::doDelete() | |||
235 | QFile file(f); | 235 | QFile file(f); |
236 | if(QFileInfo(myFile).fileName().find("../",0,TRUE)==-1) | 236 | if(QFileInfo(myFile).fileName().find("../",0,TRUE)==-1) |
237 | file.remove(); | 237 | file.remove(); |
238 | } | 238 | } |
239 | } | 239 | } |
240 | } | 240 | } |
241 | PopulateView(); | 241 | populateView(); |
242 | } | 242 | } |
243 | 243 | ||
244 | void AdvancedFm::filePerms() | 244 | void AdvancedFm::filePerms() |
245 | { | 245 | { |
246 | QStringList curFileList = getPath(); | 246 | QStringList curFileList = getPath(); |
247 | QString filePath; | 247 | QString filePath; |
@@ -254,13 +254,13 @@ void AdvancedFm::filePerms() | |||
254 | filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it)); | 254 | filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it)); |
255 | filePerm->showMaximized(); | 255 | filePerm->showMaximized(); |
256 | filePerm->exec(); | 256 | filePerm->exec(); |
257 | if( filePerm) | 257 | if( filePerm) |
258 | delete filePerm; | 258 | delete filePerm; |
259 | } | 259 | } |
260 | PopulateView(); | 260 | populateView(); |
261 | } | 261 | } |
262 | 262 | ||
263 | void AdvancedFm::doProperties() | 263 | void AdvancedFm::doProperties() |
264 | { | 264 | { |
265 | #if defined(QT_QWS_OPIE) | 265 | #if defined(QT_QWS_OPIE) |
266 | 266 | ||
@@ -290,13 +290,13 @@ void AdvancedFm::upDir() | |||
290 | QDir dir(current); | 290 | QDir dir(current); |
291 | dir.cdUp(); | 291 | dir.cdUp(); |
292 | current = dir.canonicalPath(); | 292 | current = dir.canonicalPath(); |
293 | chdir( current.latin1() ); | 293 | chdir( current.latin1() ); |
294 | thisDir->cd( current, TRUE); | 294 | thisDir->cd( current, TRUE); |
295 | 295 | ||
296 | PopulateView(); | 296 | populateView(); |
297 | update(); | 297 | update(); |
298 | } | 298 | } |
299 | 299 | ||
300 | void AdvancedFm::copy() | 300 | void AdvancedFm::copy() |
301 | { | 301 | { |
302 | qApp->processEvents(); | 302 | qApp->processEvents(); |
@@ -357,15 +357,14 @@ void AdvancedFm::copy() | |||
357 | { | 357 | { |
358 | QMessageBox::message("AdvancedFm", | 358 | QMessageBox::message("AdvancedFm", |
359 | tr( "Could not copy %1 to %2").arg( curFile ).arg( destFile ) ); | 359 | tr( "Could not copy %1 to %2").arg( curFile ).arg( destFile ) ); |
360 | return; | 360 | return; |
361 | } | 361 | } |
362 | } | 362 | } |
363 | 363 | setOtherTabCurrent(); | |
364 | PopulateView(); | 364 | populateView(); |
365 | // TabWidget->setCurrentTab(1); | ||
366 | } | 365 | } |
367 | } | 366 | } |
368 | 367 | ||
369 | void AdvancedFm::copyAs() | 368 | void AdvancedFm::copyAs() |
370 | { | 369 | { |
371 | qApp->processEvents(); | 370 | qApp->processEvents(); |
@@ -414,13 +413,14 @@ void AdvancedFm::copyAs() | |||
414 | return; | 413 | return; |
415 | } | 414 | } |
416 | } | 415 | } |
417 | delete fileDlg; | 416 | delete fileDlg; |
418 | 417 | ||
419 | } | 418 | } |
420 | PopulateView(); | 419 | setOtherTabCurrent(); |
420 | populateView(); | ||
421 | } | 421 | } |
422 | 422 | ||
423 | void AdvancedFm::copySameDir() | 423 | void AdvancedFm::copySameDir() |
424 | { | 424 | { |
425 | qApp->processEvents(); | 425 | qApp->processEvents(); |
426 | QStringList curFileList = getPath(); | 426 | QStringList curFileList = getPath(); |
@@ -467,13 +467,13 @@ void AdvancedFm::copySameDir() | |||
467 | } | 467 | } |
468 | 468 | ||
469 | qDebug("copy "+curFile+" as "+destFile); | 469 | qDebug("copy "+curFile+" as "+destFile); |
470 | } | 470 | } |
471 | delete fileDlg; | 471 | delete fileDlg; |
472 | } | 472 | } |
473 | PopulateView(); | 473 | populateView(); |
474 | } | 474 | } |
475 | 475 | ||
476 | void AdvancedFm::move() | 476 | void AdvancedFm::move() |
477 | { | 477 | { |
478 | qApp->processEvents(); | 478 | qApp->processEvents(); |
479 | 479 | ||
@@ -509,14 +509,15 @@ void AdvancedFm::move() | |||
509 | } else | 509 | } else |
510 | QFile::remove(curFile); | 510 | QFile::remove(curFile); |
511 | } | 511 | } |
512 | } | 512 | } |
513 | 513 | ||
514 | } | 514 | } |
515 | populateRemoteView(); | 515 | setOtherTabCurrent(); |
516 | populateLocalView(); | 516 | populateView(); |
517 | // populateLocalView(); | ||
517 | } | 518 | } |
518 | 519 | ||
519 | bool AdvancedFm::copyFile( const QString & src, const QString & dest ) | 520 | bool AdvancedFm::copyFile( const QString & src, const QString & dest ) |
520 | { | 521 | { |
521 | char bf[ 50000 ]; | 522 | char bf[ 50000 ]; |
522 | int bytesRead; | 523 | int bytesRead; |
@@ -640,69 +641,48 @@ void AdvancedFm::del() | |||
640 | void AdvancedFm::mkSym() | 641 | void AdvancedFm::mkSym() |
641 | { | 642 | { |
642 | QString cmd; | 643 | QString cmd; |
643 | QStringList curFileList = getPath(); | 644 | QStringList curFileList = getPath(); |
644 | if( curFileList.count() > 0) | 645 | if( curFileList.count() > 0) |
645 | { | 646 | { |
646 | if ( whichTab == 1) | 647 | QDir *thisDir = CurrentDir(); |
647 | { | 648 | QDir * thatDir = OtherDir(); |
648 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) | ||
649 | { | ||
650 | 649 | ||
651 | QString destName = currentRemoteDir.canonicalPath()+"/"+(*it); | ||
652 | if(destName.right(1) == "/") | ||
653 | { | ||
654 | destName = destName.left( destName.length() -1); | ||
655 | } | ||
656 | QString curFile = currentDir.canonicalPath()+"/"+(*it); | ||
657 | if( curFile.right(1) == "/") | ||
658 | { | ||
659 | curFile = curFile.left( curFile.length() -1); | ||
660 | } | ||
661 | cmd = "ln -s "+curFile+" "+destName; | ||
662 | qDebug(cmd); | ||
663 | startProcess( (const QString)cmd ); | ||
664 | } | ||
665 | populateRemoteView(); | ||
666 | TabWidget->setCurrentTab(1); | ||
667 | } | ||
668 | else | ||
669 | { | ||
670 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) | 650 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) |
671 | { | 651 | { |
672 | 652 | ||
673 | QString destName = currentDir.canonicalPath()+"/"+(*it); | 653 | QString destName = thatDir->canonicalPath()+"/"+(*it); |
674 | if(destName.right(1) == "/") | 654 | if(destName.right(1) == "/") |
675 | { | 655 | { |
676 | destName = destName.left( destName.length() -1); | 656 | destName = destName.left( destName.length() -1); |
677 | } | 657 | } |
678 | QString curFile = currentRemoteDir.canonicalPath()+"/"+(*it); | 658 | |
659 | QString curFile = thisDir->canonicalPath()+"/"+(*it); | ||
660 | |||
679 | if( curFile.right(1) == "/") | 661 | if( curFile.right(1) == "/") |
680 | { | 662 | { |
681 | curFile = curFile.left( curFile.length() -1); | 663 | curFile = curFile.left( curFile.length() -1); |
682 | } | 664 | } |
683 | 665 | ||
684 | cmd = "ln -s "+curFile+" "+destName; | 666 | cmd = "ln -s "+curFile+" "+destName; |
685 | qDebug(cmd); | 667 | qDebug(cmd); |
686 | startProcess( (const QString)cmd ); | 668 | startProcess( (const QString)cmd ); |
687 | } | 669 | } |
688 | populateLocalView(); | 670 | setOtherTabCurrent(); |
689 | TabWidget->setCurrentTab(0); | 671 | populateView(); |
690 | } | ||
691 | } | 672 | } |
692 | } | 673 | } |
693 | 674 | ||
694 | void AdvancedFm::doBeam() | 675 | void AdvancedFm::doBeam() |
695 | { | 676 | { |
696 | Ir ir; | 677 | Ir ir; |
697 | if(!ir.supported()) | 678 | if(!ir.supported()) |
698 | { | 679 | { |
699 | } | 680 | } |
700 | else | 681 | else |
701 | { | 682 | { |
702 | |||
703 | QStringList curFileList = getPath(); | 683 | QStringList curFileList = getPath(); |
704 | if( curFileList.count() > 0) | 684 | if( curFileList.count() > 0) |
705 | { | 685 | { |
706 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) | 686 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) |
707 | { | 687 | { |
708 | 688 | ||
@@ -752,14 +732,14 @@ void AdvancedFm::startProcess(const QString & cmd) | |||
752 | if(!process->start(OProcess::NotifyOnExit) ) | 732 | if(!process->start(OProcess::NotifyOnExit) ) |
753 | qDebug("could not start process"); | 733 | qDebug("could not start process"); |
754 | } | 734 | } |
755 | 735 | ||
756 | void AdvancedFm::processEnded() | 736 | void AdvancedFm::processEnded() |
757 | { | 737 | { |
758 | populateLocalView(); | 738 | // populateLocalView(); |
759 | populateRemoteView(); | 739 | populateView(); |
760 | } | 740 | } |
761 | 741 | ||
762 | bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) | 742 | bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) |
763 | { | 743 | { |
764 | if ( o->inherits( "QLineEdit" ) ) | 744 | if ( o->inherits( "QLineEdit" ) ) |
765 | { | 745 | { |
@@ -840,13 +820,13 @@ void AdvancedFm::doRename(QListView * view) | |||
840 | 820 | ||
841 | void AdvancedFm::renameIt() | 821 | void AdvancedFm::renameIt() |
842 | { | 822 | { |
843 | QListView *thisView = CurrentView(); | 823 | QListView *thisView = CurrentView(); |
844 | oldName = thisView->currentItem()->text(0); | 824 | oldName = thisView->currentItem()->text(0); |
845 | doRename( thisView ); | 825 | doRename( thisView ); |
846 | PopulateView(); | 826 | populateView(); |
847 | } | 827 | } |
848 | 828 | ||
849 | void AdvancedFm::okRename() | 829 | void AdvancedFm::okRename() |
850 | { | 830 | { |
851 | QString newName = renameBox->text(); | 831 | QString newName = renameBox->text(); |
852 | cancelRename(); | 832 | cancelRename(); |
@@ -862,8 +842,8 @@ void AdvancedFm::okRename() | |||
862 | QMessageBox::message(tr("Note"),tr("Could not rename")); | 842 | QMessageBox::message(tr("Note"),tr("Could not rename")); |
863 | else | 843 | else |
864 | oldName = ""; | 844 | oldName = ""; |
865 | 845 | ||
866 | view->takeItem( view->currentItem() ); | 846 | view->takeItem( view->currentItem() ); |
867 | delete view->currentItem(); | 847 | delete view->currentItem(); |
868 | PopulateView(); | 848 | populateView(); |
869 | } | 849 | } |