summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieftp/opieftp.cpp37
-rw-r--r--noncore/net/opieftp/opieftp.h6
2 files changed, 32 insertions, 11 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 523a36c..ed7f4bb 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -424,5 +424,5 @@ void OpieFtp::populateLocalView()
bool OpieFtp::populateRemoteView()
{
- Remote_View->clear();
+ Remote_View->clear();
QFile tmp("./._temp");
QString s, File_Name;
@@ -445,5 +445,6 @@ bool OpieFtp::populateRemoteView()
}
tmp.close();
- }
+ } else
+ qDebug("temp file not opened successfullly");
return true;
}
@@ -505,5 +506,5 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
}
- void OpieFtp::localListClicked(QListViewItem *selectedItem)
+void OpieFtp::localListClicked(QListViewItem *selectedItem)
{
QString strItem=selectedItem->text(0);
@@ -541,4 +542,15 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
}
+void OpieFtp::doLocalCd()
+{
+ localListClicked( Local_View->currentItem());
+}
+
+void OpieFtp:: doRemoteCd()
+{
+ remoteListClicked( Remote_View->currentItem());
+
+}
+
void OpieFtp::showHidden()
{
@@ -561,6 +573,6 @@ void OpieFtp::ListPressed( int mouse, QListViewItem *item, const QPoint &point,
case 1:
break;
- case 2:
- showLocalMenu();
+ case 2:
+ showLocalMenu(item);
break;
};
@@ -572,13 +584,16 @@ void OpieFtp::RemoteListPressed( int mouse, QListViewItem *item, const QPoint &p
case 1:
break;
- case 2:
- showRemoteMenu();
+ case 2:
+ showRemoteMenu(item);
break;
};
}
-void OpieFtp::showRemoteMenu()
+void OpieFtp::showRemoteMenu(QListViewItem * item)
{
QPopupMenu m;// = new QPopupMenu( Local_View );
+ if(item->text(0).right(1) == "/")
+ m.insertItem( tr( "Change Directory" ), this, SLOT( doRemoteCd() ));
+ else
m.insertItem( tr( "Download" ), this, SLOT( remoteDownload() ));
m.insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
@@ -589,8 +604,12 @@ void OpieFtp::showRemoteMenu()
}
-void OpieFtp::showLocalMenu()
+void OpieFtp::showLocalMenu(QListViewItem * item)
{
QPopupMenu m;
m.insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() ));
+ m.insertSeparator();
+ if(item->text(0).right(1) == "/")
+ m.insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() ));
+ else
m.insertItem( tr( "Upload" ), this, SLOT( localUpload() ));
m.insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h
index e00a398..5d1c63d 100644
--- a/noncore/net/opieftp/opieftp.h
+++ b/noncore/net/opieftp/opieftp.h
@@ -62,6 +62,8 @@ public:
protected slots:
- void showLocalMenu( );
- void showRemoteMenu( );
+ void showLocalMenu( QListViewItem *);
+ void showRemoteMenu( QListViewItem *);
+ void doLocalCd();
+ void doRemoteCd();
void localUpload();
void remoteDownload();