summaryrefslogtreecommitdiff
path: root/noncore/apps/advancedfm/advancedfm.cpp
Unidiff
Diffstat (limited to 'noncore/apps/advancedfm/advancedfm.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp41
1 files changed, 24 insertions, 17 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index a4ec714..8a1eeec 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -126,12 +126,14 @@ AdvancedFm::AdvancedFm( )
126 fileMenu->insertSeparator(); 126 fileMenu->insertSeparator();
127 fileMenu->insertItem( tr( "Delete" ), this, SLOT( localDelete() )); 127 fileMenu->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
128 fileMenu->setCheckable(TRUE); 128 fileMenu->setCheckable(TRUE);
129 129
130 viewMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() )); 130 viewMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() ));
131 viewMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() )); 131 viewMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() ));
132 viewMenu->insertSeparator();
133 viewMenu->insertItem( tr( "About" ), this, SLOT( doAbout() ));
132 viewMenu->setCheckable(TRUE); 134 viewMenu->setCheckable(TRUE);
133 135
134 TabWidget = new QTabWidget( this, "TabWidget" ); 136 TabWidget = new QTabWidget( this, "TabWidget" );
135 layout->addMultiCellWidget( TabWidget, 1, 1, 0, 6); 137 layout->addMultiCellWidget( TabWidget, 1, 1, 0, 6);
136 138
137 tab = new QWidget( TabWidget, "tab" ); 139 tab = new QWidget( TabWidget, "tab" );
@@ -139,15 +141,15 @@ AdvancedFm::AdvancedFm( )
139 tabLayout->setSpacing( 2); 141 tabLayout->setSpacing( 2);
140 tabLayout->setMargin( 2); 142 tabLayout->setMargin( 2);
141 143
142 Local_View = new QListView( tab, "Local_View" ); 144 Local_View = new QListView( tab, "Local_View" );
143// Local_View->setResizePolicy( QListView::AutoOneFit ); 145// Local_View->setResizePolicy( QListView::AutoOneFit );
144 Local_View->addColumn( tr("File"),140); 146 Local_View->addColumn( tr("File"),140);
145 Local_View->addColumn( tr("Size"),-1);
146 Local_View->setColumnAlignment(1,QListView::AlignRight);
147 Local_View->addColumn( tr("Date"),-1); 147 Local_View->addColumn( tr("Date"),-1);
148 Local_View->setColumnAlignment(1,QListView::AlignRight);
149 Local_View->addColumn( tr("Size"),-1);
148 Local_View->setColumnAlignment(2,QListView::AlignRight); 150 Local_View->setColumnAlignment(2,QListView::AlignRight);
149 Local_View->setAllColumnsShowFocus(TRUE); 151 Local_View->setAllColumnsShowFocus(TRUE);
150// Local_View->setMultiSelection( TRUE ); 152// Local_View->setMultiSelection( TRUE );
151// Local_View->setSelectionMode(QListView::Extended); 153// Local_View->setSelectionMode(QListView::Extended);
152 QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); 154 QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
153 155
@@ -164,15 +166,15 @@ AdvancedFm::AdvancedFm( )
164 tabLayout_2 = new QGridLayout( tab_2 ); 166 tabLayout_2 = new QGridLayout( tab_2 );
165 tabLayout_2->setSpacing( 2); 167 tabLayout_2->setSpacing( 2);
166 tabLayout_2->setMargin( 2); 168 tabLayout_2->setMargin( 2);
167 169
168 Remote_View = new QListView( tab_2, "Remote_View" ); 170 Remote_View = new QListView( tab_2, "Remote_View" );
169 Remote_View->addColumn( tr("File"),140); 171 Remote_View->addColumn( tr("File"),140);
170 Remote_View->addColumn( tr("Size"),-1);
171 Remote_View->setColumnAlignment(1,QListView::AlignRight);
172 Remote_View->addColumn( tr("Date"),-1); 172 Remote_View->addColumn( tr("Date"),-1);
173 Remote_View->setColumnAlignment(1,QListView::AlignRight);
174 Remote_View->addColumn( tr("Size"),-1);
173 Remote_View->setColumnAlignment(2,QListView::AlignRight); 175 Remote_View->setColumnAlignment(2,QListView::AlignRight);
174 Remote_View->setAllColumnsShowFocus(TRUE); 176 Remote_View->setAllColumnsShowFocus(TRUE);
175// Remote_View->setMultiSelection( TRUE ); 177// Remote_View->setMultiSelection( TRUE );
176// Remote_View->setSelectionMode(QListView::Extended); 178// Remote_View->setSelectionMode(QListView::Extended);
177 QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); 179 QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
178 180
@@ -296,13 +298,13 @@ void AdvancedFm::populateLocalView()
296 fileL+="/"; 298 fileL+="/";
297 isDir=TRUE; 299 isDir=TRUE;
298// qDebug( fileL); 300// qDebug( fileL);
299 } 301 }
300 } 302 }
301 if(fileL !="./" && fi->exists()) { 303 if(fileL !="./" && fi->exists()) {
302 item= new QListViewItem( Local_View, fileL, fileS , fileDate); 304 item= new QListViewItem( Local_View, fileL , fileDate, fileS);
303 305
304 if(isDir || fileL.find("/",0,TRUE) != -1) { 306 if(isDir || fileL.find("/",0,TRUE) != -1) {
305 if( !QDir( fi->filePath() ).isReadable()) 307 if( !QDir( fi->filePath() ).isReadable())
306 pm = Resource::loadPixmap( "lockedfolder" ); 308 pm = Resource::loadPixmap( "lockedfolder" );
307 else 309 else
308 pm= Resource::loadPixmap( "folder" ); 310 pm= Resource::loadPixmap( "folder" );
@@ -349,13 +351,13 @@ void AdvancedFm::populateLocalView()
349// fileS.sprintf("%d, %d", ); //this isn't correct 351// fileS.sprintf("%d, %d", ); //this isn't correct
350 devT = buf.st_dev; 352 devT = buf.st_dev;
351 fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF); 353 fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
352// fileS.sprintf("%d,%d", devT, devT); 354// fileS.sprintf("%d,%d", devT, devT);
353 fileDate.sprintf("%s", ctime( &buf.st_mtime)); 355 fileDate.sprintf("%s", ctime( &buf.st_mtime));
354 if( fileL.find(".") == -1 ){ 356 if( fileL.find(".") == -1 ){
355 item= new QListViewItem( Local_View, fileL, fileS, fileDate); 357 item= new QListViewItem( Local_View, fileL, fileDate, fileS);
356 pm = Resource::loadPixmap( "UnknownDocument-14" ); 358 pm = Resource::loadPixmap( "UnknownDocument-14" );
357 item->setPixmap( 0,pm); 359 item->setPixmap( 0,pm);
358 } 360 }
359 } 361 }
360 362
361 closedir(dir); 363 closedir(dir);
@@ -403,13 +405,13 @@ void AdvancedFm::populateRemoteView()
403 fileL+="/"; 405 fileL+="/";
404 isDir=TRUE; 406 isDir=TRUE;
405// qDebug( fileL); 407// qDebug( fileL);
406 } 408 }
407 } 409 }
408 if(fileL !="./" && fi->exists()) { 410 if(fileL !="./" && fi->exists()) {
409 item= new QListViewItem( Remote_View,fileL,fileS , fileDate); 411 item= new QListViewItem( Remote_View, fileL, fileDate, fileS);
410 QPixmap pm; 412 QPixmap pm;
411 413
412 if(isDir || fileL.find("/",0,TRUE) != -1) { 414 if(isDir || fileL.find("/",0,TRUE) != -1) {
413 if( !QDir( fi->filePath() ).isReadable()) 415 if( !QDir( fi->filePath() ).isReadable())
414 pm = Resource::loadPixmap( "lockedfolder" ); 416 pm = Resource::loadPixmap( "lockedfolder" );
415 else 417 else
@@ -454,13 +456,13 @@ void AdvancedFm::populateRemoteView()
454// mode = buf.st_mode; 456// mode = buf.st_mode;
455 fileL.sprintf("%s", mydirent->d_name); 457 fileL.sprintf("%s", mydirent->d_name);
456// fileS.sprintf("%d, %d", ); //this isn't correct 458// fileS.sprintf("%d, %d", ); //this isn't correct
457 fileS.sprintf("%d,%d", (int) (buf.st_dev>>8)&0xFF, (int) buf.st_dev &0xFF); 459 fileS.sprintf("%d,%d", (int) (buf.st_dev>>8)&0xFF, (int) buf.st_dev &0xFF);
458 fileDate.sprintf("%s", ctime( &buf.st_mtime)); 460 fileDate.sprintf("%s", ctime( &buf.st_mtime));
459 if( fileL.find(".") == -1 ){ 461 if( fileL.find(".") == -1 ){
460 item= new QListViewItem( Remote_View, fileL, fileS, fileDate); 462 item= new QListViewItem( Remote_View, fileL, fileDate, fileS);
461 pm = Resource::loadPixmap( "UnknownDocument-14" ); 463 pm = Resource::loadPixmap( "UnknownDocument-14" );
462 item->setPixmap( 0,pm); 464 item->setPixmap( 0,pm);
463 } 465 }
464 } 466 }
465 467
466 closedir(dir); 468 closedir(dir);
@@ -1094,27 +1096,27 @@ void AdvancedFm::copyAs()
1094 1096
1095void AdvancedFm::move() { 1097void AdvancedFm::move() {
1096 QString curFile = getPath(); 1098 QString curFile = getPath();
1097// qDebug(curFile); 1099// qDebug(curFile);
1098 QString destFile; 1100 QString destFile;
1099 if (TabWidget->currentPageIndex() == 0) { 1101 if (TabWidget->currentPageIndex() == 0) {
1100 QString destFile = currentRemoteDir.canonicalPath()+Local_View->currentItem()->text(0); 1102 QString destFile = currentRemoteDir.canonicalPath() + "/" + Local_View->currentItem()->text(0);
1101// qDebug(destFile); 1103 qDebug("Destination file is "+destFile);
1102 1104
1103 QFile f(destFile); 1105 QFile f(destFile);
1104 if( f.exists()) 1106 if( f.exists())
1105 f.remove(); 1107 f.remove();
1106 if(!copyFile( destFile, curFile) ) { 1108 if(!copyFile( destFile, curFile) ) {
1107 QMessageBox::message(tr("Note"),tr("Could not move\n"+curFile)); 1109 QMessageBox::message(tr("Note"),tr("Could not move\n"+curFile));
1108 return; 1110 return;
1109 } 1111 }
1110 QFile::remove(curFile); 1112 QFile::remove(curFile);
1111 TabWidget->setCurrentPage(1); 1113 TabWidget->setCurrentPage(1);
1112 } else { 1114 } else {
1113 QString destFile = currentDir.canonicalPath()+destFile + Remote_View->currentItem()->text(0); 1115 QString destFile = currentDir.canonicalPath() + "/" + Remote_View->currentItem()->text(0);
1114// qDebug(destFile); 1116 qDebug("Destination file is "+destFile);
1115 1117
1116 QFile f(destFile); 1118 QFile f(destFile);
1117 if( f.exists()) 1119 if( f.exists())
1118 f.remove(); 1120 f.remove();
1119 if(!copyFile(destFile, curFile) ) { 1121 if(!copyFile(destFile, curFile) ) {
1120 QMessageBox::message(tr("Note"),tr("Could not move\n"+curFile)); 1122 QMessageBox::message(tr("Note"),tr("Could not move\n"+curFile));
@@ -1193,21 +1195,19 @@ void AdvancedFm::runCommand() {
1193 qDebug("Could not execute '" + command + "'! err=%d", fp); 1195 qDebug("Could not execute '" + command + "'! err=%d", fp);
1194 QMessageBox::warning( this, tr("AdvancedFm"), tr("command failed!"), tr("&OK") ); 1196 QMessageBox::warning( this, tr("AdvancedFm"), tr("command failed!"), tr("&OK") );
1195 pclose(fp); 1197 pclose(fp);
1196 return; 1198 return;
1197 } else { 1199 } else {
1198 while ( fgets( line, sizeof line, fp)) { 1200 while ( fgets( line, sizeof line, fp)) {
1199 outDlg->OutputEdit->append(line); 1201 QString lineStr = line;
1202 lineStr=lineStr.left(lineStr.length()-1);
1203 outDlg->OutputEdit->append(lineStr);
1200 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); 1204 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
1201
1202 } 1205 }
1203
1204 } 1206 }
1205
1206 } 1207 }
1207
1208} 1208}
1209 1209
1210void AdvancedFm::runCommandStd() { 1210void AdvancedFm::runCommandStd() {
1211 QString curFile; 1211 QString curFile;
1212 if (TabWidget->currentPageIndex() == 0) { 1212 if (TabWidget->currentPageIndex() == 0) {
1213 if( Local_View->currentItem()) 1213 if( Local_View->currentItem())
@@ -1258,6 +1258,13 @@ void AdvancedFm::fileStatus() {
1258 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); 1258 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
1259 1259
1260 } 1260 }
1261 1261
1262 } 1262 }
1263} 1263}
1264
1265void AdvancedFm::doAbout() {
1266 QMessageBox::message("AdvancedFm","Advanced FileManager\n"
1267 "is copyright 2002 by\n"
1268 "L.J.Potter<llornkcor@handhelds.org>\n"
1269 "and is licensed by the GPL");
1270}