summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show 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
@@ -133,16 +133,17 @@ AdvancedFm::AdvancedFm( )
fileMenu->insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() ));
fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
fileMenu->insertSeparator();
fileMenu->insertItem( tr( "Make Directory" ), this, SLOT( mkDir() ));
fileMenu->insertItem( tr( "Rename" ), this, SLOT( rn() ));
fileMenu->insertItem( tr( "Run Command" ), this, SLOT( runCommandStd() ));
fileMenu->insertItem( tr( "Run Command with Output" ), this, SLOT( runCommand() ));
fileMenu->insertSeparator();
+ fileMenu->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
fileMenu->insertItem( tr( "Delete" ), this, SLOT( del() ));
fileMenu->setCheckable(TRUE);
viewMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() ));
viewMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() ));
viewMenu->insertSeparator();
viewMenu->insertItem( tr( "About" ), this, SLOT( doAbout() ));
viewMenu->setCheckable(TRUE);
@@ -289,17 +290,17 @@ void AdvancedFm::cleanUp()
sfile+="/._temp";
else
sfile+="._temp";
QFile file( sfile);
if(file.exists())
file.remove();
}
-void AdvancedFm::tabChanged(QWidget *w)
+void AdvancedFm::tabChanged(QWidget *)
{
if (TabWidget->currentPageIndex() == 0) {
currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
viewMenu->setItemChecked(viewMenu->idAt(0),TRUE);
viewMenu->setItemChecked(viewMenu->idAt(1),FALSE);
QString fs= getFileSystemType((const QString &) currentDir.canonicalPath());
setCaption("AdvancedFm :: "+fs+" :: "+checkDiskSpace((const QString &) currentDir.canonicalPath())+" kB free" );
@@ -327,21 +328,21 @@ void AdvancedFm::populateLocalView()
bool isDir=FALSE;
const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
QFileInfoListIterator it(*list);
QFileInfo *fi;
while ( (fi=it.current()) ) {
if (fi->isSymLink() ) {
QString symLink=fi->readLink();
QFileInfo sym( symLink);
- fileS.sprintf( "%10li", sym.size() );
+ fileS.sprintf( "%10i", sym.size() );
fileL.sprintf( "%s -> %s", fi->fileName().data(),sym.absFilePath().data() );
fileDate = sym.lastModified().toString();
} else {
- fileS.sprintf( "%10li", fi->size() );
+ fileS.sprintf( "%10i", fi->size() );
fileL.sprintf( "%s",fi->fileName().data() );
fileDate= fi->lastModified().toString();
if( QDir(QDir::cleanDirPath( currentDir.canonicalPath()+"/"+fileL)).exists() ) {
fileL+="/";
isDir=TRUE;
}
}
QFileInfo fileInfo( currentDir.canonicalPath()+"/"+fileL);
@@ -426,22 +427,22 @@ void AdvancedFm::populateRemoteView()
const QFileInfoList *list = currentRemoteDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
QFileInfoListIterator it(*list);
QFileInfo *fi;
while ( (fi=it.current()) ) {
if (fi->isSymLink() ){
QString symLink=fi->readLink();
// qDebug("Symlink detected "+symLink);
QFileInfo sym( symLink);
- fileS.sprintf( "%10li", sym.size() );
+ fileS.sprintf( "%10i", sym.size() );
fileL.sprintf( "%s -> %s", fi->fileName().data(),sym.absFilePath().data() );
fileDate = sym.lastModified().toString();
} else {
// qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
- fileS.sprintf( "%10li", fi->size() );
+ fileS.sprintf( "%10i", fi->size() );
fileL.sprintf( "%s",fi->fileName().data() );
fileDate= fi->lastModified().toString();
if( QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+fileL)).exists() ) {
fileL+="/";
isDir=TRUE;
// qDebug( fileL);
}
}
@@ -624,30 +625,30 @@ void AdvancedFm::showRemoteHidden()
} else {
currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
b=FALSE;
}
populateRemoteView();
}
-void AdvancedFm::localListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
+void AdvancedFm::localListPressed( int mouse, QListViewItem *, const QPoint& , int )
{
qDebug("list pressed");
switch (mouse) {
case 1:
break;
case 2:
menuTimer.start( 750, TRUE );
qDebug("Start menu timer\n");
break;
};
}
-void AdvancedFm::remoteListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
+void AdvancedFm::remoteListPressed( int mouse, QListViewItem*, const QPoint&, int )
{
switch (mouse) {
case 1:
break;
case 2:
menuTimer.start( 750, TRUE );
qDebug("Start menu timer");
@@ -1294,17 +1295,17 @@ void AdvancedFm::copySameDir() {
destFile = currentDir.canonicalPath()+"/"+filename;
QFile f(destFile);
if( f.exists()) {
switch (QMessageBox::warning(this,tr("Delete"),
destFile+tr(" already exists\nDo you really want to delete it?"),
tr("Yes"),tr("No"),0,0,1) ) {
case 0:
- qDebug("");
+
f.remove();
break;
case 1:
return;
break;
};
}
if(!copyFile(destFile, curFile) ) {
@@ -1795,17 +1796,17 @@ void AdvancedFm::doBeam() {
}
}
}
}
}
-void AdvancedFm::fileBeamFinished( Ir *ir) {
+void AdvancedFm::fileBeamFinished( Ir *) {
QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") );
}
void AdvancedFm::showFileMenu() {
QString curApp;
bool isLocalView = false;
@@ -1851,21 +1852,22 @@ void AdvancedFm::showFileMenu() {
else
m->insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
m->insertItem( tr( "Copy" ), this, SLOT( copy() ));
m->insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
m->insertItem( tr( "Copy Same Dir" ), this, SLOT( copySameDir() ));
m->insertItem( tr( "Move" ), this, SLOT( move() ));
m->insertSeparator();
+ m->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
- if(isLocalView)
- m->insertItem( tr( "Rescan" ), this, SLOT( populateLocalView() ));
- else
- m->insertItem( tr( "Rescan" ), this, SLOT( populateRemoteView() ));
+// if(isLocalView)
+// m->insertItem( tr( "Rescan" ), this, SLOT( populateLocalView() ));
+// else
+// m->insertItem( tr( "Rescan" ), this, SLOT( populateRemoteView() ));
m->insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
m->insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
m->insertSeparator();
if(isLocalView)
m->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
else
@@ -1876,16 +1878,17 @@ void AdvancedFm::showFileMenu() {
if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() ) //bad hack for Sharp zaurus failings
m->insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
m->setCheckable(TRUE);
if (!b)
m->setItemChecked(m->idAt(0),TRUE);
else
m->setItemChecked(m->idAt(0),FALSE);
+
if(Ir::supported())
m->insertItem( tr( "Beam File" ), this, SLOT( doBeam() ));
m->setFocus();
m->exec( QCursor::pos() );
sleep(1);
if(m) delete m;
}
@@ -1910,8 +1913,36 @@ QString AdvancedFm::checkDiskSpace(const QString &path) {
if ( !div ) div = 1;
return QString::number(availBlks * mult / div);
}
return "";
}
+void AdvancedFm::addToDocs() {
+ QStringList strListPaths = getPath();
+ if( strListPaths.count() > 0) {
+ QString curFile;
+ if (TabWidget->currentPageIndex() == 0) {
+ for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
+ curFile = currentDir.canonicalPath()+"/"+(*it);
+ qDebug(curFile);
+ DocLnk f;
+// curFile.replace(QRegExp("\\..*"),"");
+ f.setName((*it));
+ f.setFile( curFile);
+ f.writeLink();
+ }
+ } else {
+ for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
+ curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
+ qDebug(curFile);
+
+ DocLnk f;
+// curFile.replace(QRegExp("\\..*"),"");
+ f.setName((*it));
+ f.setFile( curFile);
+ f.writeLink();
+ }
+ }
+ }
+}
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
@@ -62,16 +62,17 @@ public:
QDir currentDir, currentRemoteDir;
QComboBox *currentPathCombo;
QString filterStr;
QListViewItem * item;
bool b;
QStringList fileSystemTypeList, fsList;
int currentServerConfig;
protected slots:
+ void addToDocs();
void doLocalCd();
void doRemoteCd();
// void copy();
void mkDir();
void del();
void rn();
void populateLocalView();
void populateRemoteView();