summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp57
-rw-r--r--noncore/apps/advancedfm/advancedfm.h1
2 files changed, 45 insertions, 13 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 0f2555d..c054465 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -138,6 +138,7 @@ AdvancedFm::AdvancedFm( )
138 fileMenu->insertItem( tr( "Run Command" ), this, SLOT( runCommandStd() )); 138 fileMenu->insertItem( tr( "Run Command" ), this, SLOT( runCommandStd() ));
139 fileMenu->insertItem( tr( "Run Command with Output" ), this, SLOT( runCommand() )); 139 fileMenu->insertItem( tr( "Run Command with Output" ), this, SLOT( runCommand() ));
140 fileMenu->insertSeparator(); 140 fileMenu->insertSeparator();
141 fileMenu->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
141 fileMenu->insertItem( tr( "Delete" ), this, SLOT( del() )); 142 fileMenu->insertItem( tr( "Delete" ), this, SLOT( del() ));
142 fileMenu->setCheckable(TRUE); 143 fileMenu->setCheckable(TRUE);
143 144
@@ -294,7 +295,7 @@ void AdvancedFm::cleanUp()
294 file.remove(); 295 file.remove();
295} 296}
296 297
297void AdvancedFm::tabChanged(QWidget *w) 298void AdvancedFm::tabChanged(QWidget *)
298{ 299{
299 if (TabWidget->currentPageIndex() == 0) { 300 if (TabWidget->currentPageIndex() == 0) {
300 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); 301 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
@@ -332,11 +333,11 @@ void AdvancedFm::populateLocalView()
332 if (fi->isSymLink() ) { 333 if (fi->isSymLink() ) {
333 QString symLink=fi->readLink(); 334 QString symLink=fi->readLink();
334 QFileInfo sym( symLink); 335 QFileInfo sym( symLink);
335 fileS.sprintf( "%10li", sym.size() ); 336 fileS.sprintf( "%10i", sym.size() );
336 fileL.sprintf( "%s -> %s", fi->fileName().data(),sym.absFilePath().data() ); 337 fileL.sprintf( "%s -> %s", fi->fileName().data(),sym.absFilePath().data() );
337 fileDate = sym.lastModified().toString(); 338 fileDate = sym.lastModified().toString();
338 } else { 339 } else {
339 fileS.sprintf( "%10li", fi->size() ); 340 fileS.sprintf( "%10i", fi->size() );
340 fileL.sprintf( "%s",fi->fileName().data() ); 341 fileL.sprintf( "%s",fi->fileName().data() );
341 fileDate= fi->lastModified().toString(); 342 fileDate= fi->lastModified().toString();
342 if( QDir(QDir::cleanDirPath( currentDir.canonicalPath()+"/"+fileL)).exists() ) { 343 if( QDir(QDir::cleanDirPath( currentDir.canonicalPath()+"/"+fileL)).exists() ) {
@@ -431,12 +432,12 @@ void AdvancedFm::populateRemoteView()
431 QString symLink=fi->readLink(); 432 QString symLink=fi->readLink();
432 // qDebug("Symlink detected "+symLink); 433 // qDebug("Symlink detected "+symLink);
433 QFileInfo sym( symLink); 434 QFileInfo sym( symLink);
434 fileS.sprintf( "%10li", sym.size() ); 435 fileS.sprintf( "%10i", sym.size() );
435 fileL.sprintf( "%s -> %s", fi->fileName().data(),sym.absFilePath().data() ); 436 fileL.sprintf( "%s -> %s", fi->fileName().data(),sym.absFilePath().data() );
436 fileDate = sym.lastModified().toString(); 437 fileDate = sym.lastModified().toString();
437 } else { 438 } else {
438 // qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); 439 // qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
439 fileS.sprintf( "%10li", fi->size() ); 440 fileS.sprintf( "%10i", fi->size() );
440 fileL.sprintf( "%s",fi->fileName().data() ); 441 fileL.sprintf( "%s",fi->fileName().data() );
441 fileDate= fi->lastModified().toString(); 442 fileDate= fi->lastModified().toString();
442 if( QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+fileL)).exists() ) { 443 if( QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+fileL)).exists() ) {
@@ -629,7 +630,7 @@ void AdvancedFm::showRemoteHidden()
629 populateRemoteView(); 630 populateRemoteView();
630} 631}
631 632
632void AdvancedFm::localListPressed( int mouse, QListViewItem *item, const QPoint &point, int i) 633void AdvancedFm::localListPressed( int mouse, QListViewItem *, const QPoint& , int )
633{ 634{
634 qDebug("list pressed"); 635 qDebug("list pressed");
635 switch (mouse) { 636 switch (mouse) {
@@ -642,7 +643,7 @@ void AdvancedFm::localListPressed( int mouse, QListViewItem *item, const QPoint
642 }; 643 };
643} 644}
644 645
645void AdvancedFm::remoteListPressed( int mouse, QListViewItem *item, const QPoint &point, int i) 646void AdvancedFm::remoteListPressed( int mouse, QListViewItem*, const QPoint&, int )
646{ 647{
647 648
648 switch (mouse) { 649 switch (mouse) {
@@ -1299,7 +1300,7 @@ void AdvancedFm::copySameDir() {
1299 destFile+tr(" already exists\nDo you really want to delete it?"), 1300 destFile+tr(" already exists\nDo you really want to delete it?"),
1300 tr("Yes"),tr("No"),0,0,1) ) { 1301 tr("Yes"),tr("No"),0,0,1) ) {
1301 case 0: 1302 case 0:
1302 qDebug(""); 1303
1303 f.remove(); 1304 f.remove();
1304 break; 1305 break;
1305 case 1: 1306 case 1:
@@ -1800,7 +1801,7 @@ void AdvancedFm::doBeam() {
1800 1801
1801} 1802}
1802 1803
1803void AdvancedFm::fileBeamFinished( Ir *ir) { 1804void AdvancedFm::fileBeamFinished( Ir *) {
1804 QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") ); 1805 QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") );
1805 1806
1806} 1807}
@@ -1856,11 +1857,12 @@ void AdvancedFm::showFileMenu() {
1856 m->insertItem( tr( "Copy Same Dir" ), this, SLOT( copySameDir() )); 1857 m->insertItem( tr( "Copy Same Dir" ), this, SLOT( copySameDir() ));
1857 m->insertItem( tr( "Move" ), this, SLOT( move() )); 1858 m->insertItem( tr( "Move" ), this, SLOT( move() ));
1858 m->insertSeparator(); 1859 m->insertSeparator();
1860 m->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
1859 1861
1860 if(isLocalView) 1862// if(isLocalView)
1861 m->insertItem( tr( "Rescan" ), this, SLOT( populateLocalView() )); 1863// m->insertItem( tr( "Rescan" ), this, SLOT( populateLocalView() ));
1862 else 1864// else
1863 m->insertItem( tr( "Rescan" ), this, SLOT( populateRemoteView() )); 1865// m->insertItem( tr( "Rescan" ), this, SLOT( populateRemoteView() ));
1864 1866
1865 m->insertItem( tr( "Run Command" ), this, SLOT( runCommand() )); 1867 m->insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
1866 m->insertItem( tr( "File Info" ), this, SLOT( fileStatus() )); 1868 m->insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
@@ -1881,6 +1883,7 @@ void AdvancedFm::showFileMenu() {
1881 m->setItemChecked(m->idAt(0),TRUE); 1883 m->setItemChecked(m->idAt(0),TRUE);
1882 else 1884 else
1883 m->setItemChecked(m->idAt(0),FALSE); 1885 m->setItemChecked(m->idAt(0),FALSE);
1886
1884 if(Ir::supported()) 1887 if(Ir::supported())
1885 m->insertItem( tr( "Beam File" ), this, SLOT( doBeam() )); 1888 m->insertItem( tr( "Beam File" ), this, SLOT( doBeam() ));
1886 m->setFocus(); 1889 m->setFocus();
@@ -1915,3 +1918,31 @@ QString AdvancedFm::checkDiskSpace(const QString &path) {
1915 return ""; 1918 return "";
1916} 1919}
1917 1920
1921void AdvancedFm::addToDocs() {
1922 QStringList strListPaths = getPath();
1923 if( strListPaths.count() > 0) {
1924 QString curFile;
1925 if (TabWidget->currentPageIndex() == 0) {
1926 for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
1927 curFile = currentDir.canonicalPath()+"/"+(*it);
1928 qDebug(curFile);
1929 DocLnk f;
1930// curFile.replace(QRegExp("\\..*"),"");
1931 f.setName((*it));
1932 f.setFile( curFile);
1933 f.writeLink();
1934 }
1935 } else {
1936 for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
1937 curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
1938 qDebug(curFile);
1939
1940 DocLnk f;
1941// curFile.replace(QRegExp("\\..*"),"");
1942 f.setName((*it));
1943 f.setFile( curFile);
1944 f.writeLink();
1945 }
1946 }
1947 }
1948}
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 5b714ae..53dad50 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -67,6 +67,7 @@ public:
67 QStringList fileSystemTypeList, fsList; 67 QStringList fileSystemTypeList, fsList;
68 int currentServerConfig; 68 int currentServerConfig;
69protected slots: 69protected slots:
70 void addToDocs();
70 void doLocalCd(); 71 void doLocalCd();
71 void doRemoteCd(); 72 void doRemoteCd();
72// void copy(); 73// void copy();