-rw-r--r-- | core/apps/textedit/fileBrowser.cpp | 14 | ||||
-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 109 | ||||
-rw-r--r-- | noncore/net/opieftp/opieftp.h | 12 |
3 files changed, 109 insertions, 26 deletions
diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp index 41e800c..acd50c2 100644 --- a/core/apps/textedit/fileBrowser.cpp +++ b/core/apps/textedit/fileBrowser.cpp | |||
@@ -199,6 +199,14 @@ void fileBrowser::populateList() | |||
199 | pm= Resource::loadPixmap( "folder" ); | 199 | pm= Resource::loadPixmap( "folder" ); |
200 | if(isDir || fileL.find("/",0,TRUE) != -1) | 200 | |
201 | if(isDir || fileL.find("/",0,TRUE) != -1) { | ||
202 | if( !QDir( fi->filePath() ).isReadable()) | ||
203 | pm = Resource::loadPixmap( "lockedfolder" ); | ||
201 | item->setPixmap( 0,pm ); | 204 | item->setPixmap( 0,pm ); |
202 | else | 205 | } else { |
203 | item->setPixmap( 0, Resource::loadPixmap( "fileopen" )); | 206 | if( !fi->isReadable() ) |
207 | pm = Resource::loadPixmap( "locked" ); | ||
208 | else | ||
209 | pm = Resource::loadPixmap( "fileopen" ); | ||
210 | item->setPixmap( 0,pm); | ||
211 | } | ||
204 | if( fileL.find("->",0,TRUE) != -1) { | 212 | if( fileL.find("->",0,TRUE) != -1) { |
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index e97a9bf..37e2134 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp | |||
@@ -24,2 +24,3 @@ | |||
24 | 24 | ||
25 | #include <qstringlist.h> | ||
25 | #include <qtextstream.h> | 26 | #include <qtextstream.h> |
@@ -238,7 +239,13 @@ OpieFtp::OpieFtp( ) | |||
238 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | 239 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); |
239 | currentPathEdit = new QLineEdit( "/", this, "currentPathEdit" ); | ||
240 | layout->addMultiCellWidget( currentPathEdit, 3, 3, 0, 3 ); | ||
241 | 240 | ||
242 | currentPathEdit->setText( currentDir.canonicalPath()); | 241 | currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" ); |
243 | connect( currentPathEdit,SIGNAL(returnPressed()),this,SLOT(currentPathEditChanged())); | 242 | layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 3 ); |
243 | |||
244 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); | ||
245 | |||
246 | connect( currentPathCombo, SIGNAL( activated( const QString & ) ), | ||
247 | this, SLOT( currentPathComboChanged()currentPathCombo( const QString & ) ) ); | ||
248 | |||
249 | connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()), | ||
250 | this,SLOT(currentPathComboChanged())); | ||
244 | 251 | ||
@@ -289,3 +296,3 @@ void OpieFtp::tabChanged(QWidget *w) | |||
289 | if (TabWidget->currentPageIndex() == 0) { | 296 | if (TabWidget->currentPageIndex() == 0) { |
290 | currentPathEdit->setText( currentDir.canonicalPath()); | 297 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); |
291 | tabMenu->setItemChecked(tabMenu->idAt(0),TRUE); | 298 | tabMenu->setItemChecked(tabMenu->idAt(0),TRUE); |
@@ -295,3 +302,3 @@ void OpieFtp::tabChanged(QWidget *w) | |||
295 | if (TabWidget->currentPageIndex() == 1) { | 302 | if (TabWidget->currentPageIndex() == 1) { |
296 | currentPathEdit->setText( currentRemoteDir ); | 303 | currentPathCombo->lineEdit()->setText( currentRemoteDir ); |
297 | tabMenu->setItemChecked(tabMenu->idAt(1),TRUE); | 304 | tabMenu->setItemChecked(tabMenu->idAt(1),TRUE); |
@@ -546,7 +553,25 @@ void OpieFtp::populateLocalView() | |||
546 | if(fileL !="./") { | 553 | if(fileL !="./") { |
547 | item = new QListViewItem( Local_View,fileL,fileS, fileDate); | 554 | item= new QListViewItem( ListView,fileL,fileS , fileDate); |
548 | if(isDir || fileL.find("/",0,TRUE) != -1) | 555 | QPixmap pm; |
549 | item->setPixmap( 0, Resource::loadPixmap( "folder" )); | 556 | pm= Resource::loadPixmap( "folder" ); |
550 | else | 557 | |
551 | item->setPixmap( 0, Resource::loadPixmap( "fileopen" )); | 558 | if(isDir || fileL.find("/",0,TRUE) != -1) { |
559 | if( !QDir( fi->filePath() ).isReadable()) | ||
560 | pm = Resource::loadPixmap( "lockedfolder" ); | ||
561 | item->setPixmap( 0,pm ); | ||
562 | } else { | ||
563 | if( !fi->isReadable() ) | ||
564 | pm = Resource::loadPixmap( "locked" ); | ||
565 | else | ||
566 | pm = Resource::loadPixmap( "fileopen" ); | ||
567 | item->setPixmap( 0,pm); | ||
568 | } | ||
569 | if( fileL.find("->",0,TRUE) != -1) { | ||
570 | // overlay link image | ||
571 | QPixmap lnk = Resource::loadPixmap( "symlink" ); | ||
572 | QPainter painter( &pm ); | ||
573 | painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); | ||
574 | pm.setMask( pm.createHeuristicMask( FALSE ) ); | ||
575 | item->setPixmap( 0, pm); | ||
576 | } | ||
552 | } | 577 | } |
@@ -554,5 +579,7 @@ void OpieFtp::populateLocalView() | |||
554 | ++it; | 579 | ++it; |
555 | } | 580 | } |
556 | Local_View->setSorting( 3,FALSE); | 581 | Local_View->setSorting( 3,FALSE); |
557 | currentPathEdit->setText( currentDir.canonicalPath() ); | 582 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath() ); |
583 | fillCombo( (const QString &)currentDir); | ||
584 | |||
558 | } | 585 | } |
@@ -663,3 +690,4 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) | |||
663 | currentRemoteDir +="/"; | 690 | currentRemoteDir +="/"; |
664 | currentPathEdit->setText( currentRemoteDir ); | 691 | currentPathCombo->lineEdit()->setText( currentRemoteDir ); |
692 | fillRemoteCombo( (const QString &)currentDir); | ||
665 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 693 | QCopEnvelope ( "QPE/System", "notBusy()" ); |
@@ -934,3 +962,44 @@ void OpieFtp::localRename() | |||
934 | 962 | ||
935 | void OpieFtp::currentPathEditChanged() | 963 | void OpieFtp::currentPathComboActivated(const QString & currentPath) { |
964 | if (TabWidget->currentPageIndex() == 0) { | ||
965 | chdir( currentPath.latin1() ); | ||
966 | currentDir.cd( currentPath, TRUE); | ||
967 | populateLocalList(); | ||
968 | update(); | ||
969 | } else { | ||
970 | // chdir( currentPath.latin1() ); | ||
971 | // currentDir.cd( currentPath, TRUE); | ||
972 | // populateList(); | ||
973 | // update(); | ||
974 | |||
975 | } | ||
976 | } | ||
977 | |||
978 | void OpieFtp::fillCombo(const QString ¤tPath) { | ||
979 | |||
980 | currentPathComboBox->lineEdit()->setText(currentPath); | ||
981 | if( localDirPathStringList.grep(currentPath,TRUE).isEmpty() ) { | ||
982 | currentPathComboBox->clear(); | ||
983 | localDirPathStringList.prepend(currentPath ); | ||
984 | currentPathComboBox->insertStringList( localDirPathStringList,-1); | ||
985 | } | ||
986 | currentPathComboBox->lineEdit()->setText(currentPath); | ||
987 | if( remoteDirPathStringList.grep(currentPath,TRUE).isEmpty() ) { | ||
988 | currentPathComboBox->clear(); | ||
989 | remoteDirPathStringList.prepend(currentPath ); | ||
990 | currentPathComboBox->insertStringList( remoteDirPathStringList,-1); | ||
991 | } | ||
992 | } | ||
993 | |||
994 | void OpieFtp::fillRemoteCombo(const QString ¤tPath) { | ||
995 | |||
996 | dirPathCombo->lineEdit()->setText(currentPath); | ||
997 | if( remoteDirPathStringList.grep(currentPath,TRUE).isEmpty() ) { | ||
998 | dirPathCombo->clear(); | ||
999 | remoteDirPathStringList.prepend(currentPath ); | ||
1000 | dirPathCombo->insertStringList( remoteDirPathStringList,-1); | ||
1001 | } | ||
1002 | } | ||
1003 | |||
1004 | void OpieFtp::currentPathComboChanged() | ||
936 | { | 1005 | { |
@@ -939,4 +1008,4 @@ void OpieFtp::currentPathEditChanged() | |||
939 | if (TabWidget->currentPageIndex() == 0) { | 1008 | if (TabWidget->currentPageIndex() == 0) { |
940 | if(QDir( currentPathEdit->text()).exists()) { | 1009 | if(QDir( currentPathCombo->lineEdit()->text()).exists()) { |
941 | currentDir.setPath( currentPathEdit->text() ); | 1010 | currentDir.setPath( currentPathCombo->lineEdit()->text() ); |
942 | populateLocalView(); | 1011 | populateLocalView(); |
@@ -947,6 +1016,6 @@ void OpieFtp::currentPathEditChanged() | |||
947 | if (TabWidget->currentPageIndex() == 1) { | 1016 | if (TabWidget->currentPageIndex() == 1) { |
948 | currentRemoteDir = currentPathEdit->text(); | 1017 | currentRemoteDir = currentPathCombo->lineEdit()->text(); |
949 | if(currentRemoteDir.right(1) !="/") { | 1018 | if(currentRemoteDir.right(1) !="/") { |
950 | currentRemoteDir = currentRemoteDir +"/"; | 1019 | currentRemoteDir = currentRemoteDir +"/"; |
951 | currentPathEdit->setText( currentRemoteDir ); | 1020 | currentPathCombo->lineEdit()->setText( currentRemoteDir ); |
952 | } | 1021 | } |
@@ -954,3 +1023,3 @@ void OpieFtp::currentPathEditChanged() | |||
954 | currentRemoteDir = oldRemoteCurrentDir; | 1023 | currentRemoteDir = oldRemoteCurrentDir; |
955 | currentPathEdit->setText( currentRemoteDir ); | 1024 | currentPathCombo->lineEdit()->setText( currentRemoteDir ); |
956 | } | 1025 | } |
diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h index 52ed885..57599b7 100644 --- a/noncore/net/opieftp/opieftp.h +++ b/noncore/net/opieftp/opieftp.h | |||
@@ -39,2 +39,3 @@ class QLineEdit; | |||
39 | class QPushButton; | 39 | class QPushButton; |
40 | class QStringList; | ||
40 | 41 | ||
@@ -52,3 +53,3 @@ public: | |||
52 | 53 | ||
53 | QComboBox *UsernameComboBox, *ServerComboBox; | 54 | QComboBox *UsernameComboBox, *ServerComboBox, *currentPathCombo; |
54 | QLineEdit *PasswordEdit, *remotePath, *currentPathEdit; | 55 | QLineEdit *PasswordEdit, *remotePath, *currentPathEdit; |
@@ -94,3 +95,6 @@ protected slots: | |||
94 | void localRename(); | 95 | void localRename(); |
95 | void currentPathEditChanged(); | 96 | void currentPathComboChanged(); |
97 | void fillCombos(); | ||
98 | void fillCombo(const QString &); | ||
99 | void currentPathComboActivated(const QString &); | ||
96 | void switchToLocalTab(); | 100 | void switchToLocalTab(); |
@@ -98,3 +102,4 @@ protected slots: | |||
98 | void switchToConfigTab(); | 102 | void switchToConfigTab(); |
99 | void fillCombos(); | 103 | void fillCombo(); |
104 | void fillRemoteCombo(); | ||
100 | void serverComboSelected(int); | 105 | void serverComboSelected(int); |
@@ -103,2 +108,3 @@ protected slots: | |||
103 | protected: | 108 | protected: |
109 | QStringList remoteDirPathStringList, localDirPathStringList; | ||
104 | void nullifyCallBack(); | 110 | void nullifyCallBack(); |