-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index 3e13466..956409f 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp | |||
@@ -111,77 +111,78 @@ OpieFtp::OpieFtp( ) | |||
111 | tabMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() )); | 111 | tabMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() )); |
112 | tabMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() )); | 112 | tabMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() )); |
113 | tabMenu->insertItem( tr( "Switch to Config" ), this, SLOT( switchToConfigTab() )); | 113 | tabMenu->insertItem( tr( "Switch to Config" ), this, SLOT( switchToConfigTab() )); |
114 | tabMenu->setCheckable(TRUE); | 114 | tabMenu->setCheckable(TRUE); |
115 | 115 | ||
116 | TabWidget = new QTabWidget( this, "TabWidget" ); | 116 | TabWidget = new QTabWidget( this, "TabWidget" ); |
117 | layout->addMultiCellWidget( TabWidget, 1, 1, 0, 3 ); | 117 | layout->addMultiCellWidget( TabWidget, 1, 1, 0, 3 ); |
118 | 118 | ||
119 | TabWidget->setTabShape(QTabWidget::Triangular); | 119 | TabWidget->setTabShape(QTabWidget::Triangular); |
120 | 120 | ||
121 | tab = new QWidget( TabWidget, "tab" ); | 121 | tab = new QWidget( TabWidget, "tab" ); |
122 | tabLayout = new QGridLayout( tab ); | 122 | tabLayout = new QGridLayout( tab ); |
123 | tabLayout->setSpacing( 2); | 123 | tabLayout->setSpacing( 2); |
124 | tabLayout->setMargin( 2); | 124 | tabLayout->setMargin( 2); |
125 | 125 | ||
126 | Local_View = new QListView( tab, "Local_View" ); | 126 | Local_View = new QListView( tab, "Local_View" ); |
127 | // Local_View->setResizePolicy( QListView::AutoOneFit ); | 127 | // Local_View->setResizePolicy( QListView::AutoOneFit ); |
128 | Local_View->addColumn( tr("File"),150); | 128 | Local_View->addColumn( tr("File"),150); |
129 | Local_View->addColumn( tr("Size"),-1); | 129 | Local_View->addColumn( tr("Size"),-1); |
130 | Local_View->setColumnAlignment(1,QListView::AlignRight); | 130 | Local_View->setColumnAlignment(1,QListView::AlignRight); |
131 | Local_View->addColumn( tr("Date"),-1); | 131 | Local_View->addColumn( tr("Date"),-1); |
132 | Local_View->setColumnAlignment(2,QListView::AlignRight); | 132 | Local_View->setColumnAlignment(2,QListView::AlignRight); |
133 | Local_View->setAllColumnsShowFocus(TRUE); | 133 | Local_View->setAllColumnsShowFocus(TRUE); |
134 | Local_View->setMultiSelection( TRUE ); | 134 | Local_View->setMultiSelection( TRUE ); |
135 | 135 | Local_View->setSelectionMode(QlistView::Extended); | |
136 | QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); | 136 | QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); |
137 | 137 | ||
138 | tabLayout->addWidget( Local_View, 0, 0 ); | 138 | tabLayout->addWidget( Local_View, 0, 0 ); |
139 | 139 | ||
140 | connect( Local_View, SIGNAL( clicked( QListViewItem*)), | 140 | connect( Local_View, SIGNAL( clicked( QListViewItem*)), |
141 | this,SLOT( localListClicked(QListViewItem *)) ); | 141 | this,SLOT( localListClicked(QListViewItem *)) ); |
142 | // connect( Local_View, SIGNAL( doubleClicked( QListViewItem*)), | 142 | // connect( Local_View, SIGNAL( doubleClicked( QListViewItem*)), |
143 | // this,SLOT( localListClicked(QListViewItem *)) ); | 143 | // this,SLOT( localListClicked(QListViewItem *)) ); |
144 | connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | 144 | connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), |
145 | this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) ); | 145 | this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) ); |
146 | 146 | ||
147 | TabWidget->insertTab( tab, tr( "Local" ) ); | 147 | TabWidget->insertTab( tab, tr( "Local" ) ); |
148 | 148 | ||
149 | tab_2 = new QWidget( TabWidget, "tab_2" ); | 149 | tab_2 = new QWidget( TabWidget, "tab_2" ); |
150 | tabLayout_2 = new QGridLayout( tab_2 ); | 150 | tabLayout_2 = new QGridLayout( tab_2 ); |
151 | tabLayout_2->setSpacing( 2); | 151 | tabLayout_2->setSpacing( 2); |
152 | tabLayout_2->setMargin( 2); | 152 | tabLayout_2->setMargin( 2); |
153 | 153 | ||
154 | Remote_View = new QListView( tab_2, "Remote_View" ); | 154 | Remote_View = new QListView( tab_2, "Remote_View" ); |
155 | Remote_View->addColumn( tr("File"),150); | 155 | Remote_View->addColumn( tr("File"),150); |
156 | Remote_View->addColumn( tr("Size"),-1); | 156 | Remote_View->addColumn( tr("Size"),-1); |
157 | Remote_View->setColumnAlignment(1,QListView::AlignRight); | 157 | Remote_View->setColumnAlignment(1,QListView::AlignRight); |
158 | Remote_View->addColumn( tr("Date"),-1); | 158 | Remote_View->addColumn( tr("Date"),-1); |
159 | Remote_View->setColumnAlignment(2,QListView::AlignRight); | 159 | Remote_View->setColumnAlignment(2,QListView::AlignRight); |
160 | Remote_View->addColumn( tr("Dir"),-1); | 160 | Remote_View->addColumn( tr("Dir"),-1); |
161 | Remote_View->setColumnAlignment(4,QListView::AlignRight); | 161 | Remote_View->setColumnAlignment(4,QListView::AlignRight); |
162 | Remote_View->setAllColumnsShowFocus(TRUE); | 162 | Remote_View->setAllColumnsShowFocus(TRUE); |
163 | Remote_View->setMultiSelection( TRUE ); | 163 | Remote_View->setMultiSelection( TRUE ); |
164 | Remote_View->setSelectionMode(QlistView::Extended); | ||
164 | 165 | ||
165 | QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); | 166 | QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); |
166 | 167 | ||
167 | connect( Remote_View, SIGNAL( clicked( QListViewItem*)), | 168 | connect( Remote_View, SIGNAL( clicked( QListViewItem*)), |
168 | this,SLOT( remoteListClicked(QListViewItem *)) ); | 169 | this,SLOT( remoteListClicked(QListViewItem *)) ); |
169 | connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | 170 | connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), |
170 | this,SLOT( RemoteListPressed(int, QListViewItem *, const QPoint&, int)) ); | 171 | this,SLOT( RemoteListPressed(int, QListViewItem *, const QPoint&, int)) ); |
171 | 172 | ||
172 | tabLayout_2->addWidget( Remote_View, 0, 0 ); | 173 | tabLayout_2->addWidget( Remote_View, 0, 0 ); |
173 | 174 | ||
174 | TabWidget->insertTab( tab_2, tr( "Remote" ) ); | 175 | TabWidget->insertTab( tab_2, tr( "Remote" ) ); |
175 | 176 | ||
176 | tab_3 = new QWidget( TabWidget, "tab_3" ); | 177 | tab_3 = new QWidget( TabWidget, "tab_3" ); |
177 | tabLayout_3 = new QGridLayout( tab_3 ); | 178 | tabLayout_3 = new QGridLayout( tab_3 ); |
178 | tabLayout_3->setSpacing( 2); | 179 | tabLayout_3->setSpacing( 2); |
179 | tabLayout_3->setMargin( 2); | 180 | tabLayout_3->setMargin( 2); |
180 | 181 | ||
181 | TextLabel1 = new QLabel( tab_3, "TextLabel1" ); | 182 | TextLabel1 = new QLabel( tab_3, "TextLabel1" ); |
182 | TextLabel1->setText( tr( "Username" ) ); | 183 | TextLabel1->setText( tr( "Username" ) ); |
183 | tabLayout_3->addMultiCellWidget( TextLabel1, 0, 0, 0, 1 ); | 184 | tabLayout_3->addMultiCellWidget( TextLabel1, 0, 0, 0, 1 ); |
184 | 185 | ||
185 | UsernameComboBox = new QComboBox( FALSE, tab_3, "UsernameComboBox" ); | 186 | UsernameComboBox = new QComboBox( FALSE, tab_3, "UsernameComboBox" ); |
186 | UsernameComboBox->setEditable(TRUE); | 187 | UsernameComboBox->setEditable(TRUE); |
187 | tabLayout_3->addMultiCellWidget( UsernameComboBox, 1, 1, 0, 1 ); | 188 | tabLayout_3->addMultiCellWidget( UsernameComboBox, 1, 1, 0, 1 ); |
@@ -264,48 +265,49 @@ OpieFtp::OpieFtp( ) | |||
264 | filterStr="*"; | 265 | filterStr="*"; |
265 | b=FALSE; | 266 | b=FALSE; |
266 | populateLocalView(); | 267 | populateLocalView(); |
267 | readConfig(); | 268 | readConfig(); |
268 | ServerComboBox->setCurrentItem(currentServerConfig); | 269 | ServerComboBox->setCurrentItem(currentServerConfig); |
269 | TabWidget->setCurrentPage(2); | 270 | TabWidget->setCurrentPage(2); |
270 | } | 271 | } |
271 | 272 | ||
272 | OpieFtp::~OpieFtp() | 273 | OpieFtp::~OpieFtp() |
273 | { | 274 | { |
274 | } | 275 | } |
275 | 276 | ||
276 | void OpieFtp::cleanUp() | 277 | void OpieFtp::cleanUp() |
277 | { | 278 | { |
278 | if(conn) | 279 | if(conn) |
279 | FtpQuit(conn); | 280 | FtpQuit(conn); |
280 | QString sfile=QDir::homeDirPath(); | 281 | QString sfile=QDir::homeDirPath(); |
281 | if(sfile.right(1) != "/") | 282 | if(sfile.right(1) != "/") |
282 | sfile+="/._temp"; | 283 | sfile+="/._temp"; |
283 | else | 284 | else |
284 | sfile+="._temp"; | 285 | sfile+="._temp"; |
285 | QFile file( sfile); | 286 | QFile file( sfile); |
286 | if(file.exists()) | 287 | if(file.exists()) |
287 | file.remove(); | 288 | file.remove(); |
289 | exit(0); | ||
288 | } | 290 | } |
289 | 291 | ||
290 | void OpieFtp::tabChanged(QWidget *w) | 292 | void OpieFtp::tabChanged(QWidget *w) |
291 | { | 293 | { |
292 | if (TabWidget->currentPageIndex() == 0) { | 294 | if (TabWidget->currentPageIndex() == 0) { |
293 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); | 295 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); |
294 | tabMenu->setItemChecked(tabMenu->idAt(0),TRUE); | 296 | tabMenu->setItemChecked(tabMenu->idAt(0),TRUE); |
295 | tabMenu->setItemChecked(tabMenu->idAt(1),FALSE); | 297 | tabMenu->setItemChecked(tabMenu->idAt(1),FALSE); |
296 | tabMenu->setItemChecked(tabMenu->idAt(2),FALSE); | 298 | tabMenu->setItemChecked(tabMenu->idAt(2),FALSE); |
297 | } | 299 | } |
298 | if (TabWidget->currentPageIndex() == 1) { | 300 | if (TabWidget->currentPageIndex() == 1) { |
299 | currentPathCombo->lineEdit()->setText( currentRemoteDir ); | 301 | currentPathCombo->lineEdit()->setText( currentRemoteDir ); |
300 | tabMenu->setItemChecked(tabMenu->idAt(1),TRUE); | 302 | tabMenu->setItemChecked(tabMenu->idAt(1),TRUE); |
301 | tabMenu->setItemChecked(tabMenu->idAt(0),FALSE); | 303 | tabMenu->setItemChecked(tabMenu->idAt(0),FALSE); |
302 | tabMenu->setItemChecked(tabMenu->idAt(2),FALSE); | 304 | tabMenu->setItemChecked(tabMenu->idAt(2),FALSE); |
303 | } | 305 | } |
304 | if (TabWidget->currentPageIndex() == 2) { | 306 | if (TabWidget->currentPageIndex() == 2) { |
305 | tabMenu->setItemChecked(tabMenu->idAt(2),TRUE); | 307 | tabMenu->setItemChecked(tabMenu->idAt(2),TRUE); |
306 | tabMenu->setItemChecked(tabMenu->idAt(0),FALSE); | 308 | tabMenu->setItemChecked(tabMenu->idAt(0),FALSE); |
307 | tabMenu->setItemChecked(tabMenu->idAt(1),FALSE); | 309 | tabMenu->setItemChecked(tabMenu->idAt(1),FALSE); |
308 | } | 310 | } |
309 | } | 311 | } |
310 | 312 | ||
311 | void OpieFtp::newConnection() | 313 | void OpieFtp::newConnection() |
@@ -373,49 +375,48 @@ void OpieFtp::connector() | |||
373 | msg.replace(QRegExp(":"),"\n"); | 375 | msg.replace(QRegExp(":"),"\n"); |
374 | QMessageBox::message(tr("Note"),msg); | 376 | QMessageBox::message(tr("Note"),msg); |
375 | if(conn) | 377 | if(conn) |
376 | FtpQuit(conn); | 378 | FtpQuit(conn); |
377 | connectServerBtn->setOn(FALSE); | 379 | connectServerBtn->setOn(FALSE); |
378 | connectServerBtn->setText( tr("Connect")); | 380 | connectServerBtn->setText( tr("Connect")); |
379 | return ; | 381 | return ; |
380 | } | 382 | } |
381 | remoteDirList("/") ; | 383 | remoteDirList("/") ; |
382 | setCaption(ftp_host); | 384 | setCaption(ftp_host); |
383 | writeConfig(); | 385 | writeConfig(); |
384 | connectServerBtn->setText( tr("Disconnect")); | 386 | connectServerBtn->setText( tr("Disconnect")); |
385 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 387 | QCopEnvelope ( "QPE/System", "notBusy()" ); |
386 | } | 388 | } |
387 | 389 | ||
388 | void OpieFtp::disConnector() | 390 | void OpieFtp::disConnector() |
389 | { | 391 | { |
390 | if(conn) | 392 | if(conn) |
391 | FtpQuit(conn); | 393 | FtpQuit(conn); |
392 | setCaption("OpieFtp"); | 394 | setCaption("OpieFtp"); |
393 | currentRemoteDir="/"; | 395 | currentRemoteDir="/"; |
394 | Remote_View->clear(); | 396 | Remote_View->clear(); |
395 | connectServerBtn->setText( tr("Connect")); | 397 | connectServerBtn->setText( tr("Connect")); |
396 | connectServerBtn->setOn(FALSE); | 398 | connectServerBtn->setOn(FALSE); |
397 | |||
398 | } | 399 | } |
399 | 400 | ||
400 | void OpieFtp::localUpload() | 401 | void OpieFtp::localUpload() |
401 | { | 402 | { |
402 | int fsz; | 403 | int fsz; |
403 | QCopEnvelope ( "QPE/System", "busy()" ); | 404 | QCopEnvelope ( "QPE/System", "busy()" ); |
404 | // qApp->processEvents(); | 405 | // qApp->processEvents(); |
405 | QList<QListViewItem> * getSelectedItems( QListView * Local_View ); | 406 | QList<QListViewItem> * getSelectedItems( QListView * Local_View ); |
406 | QListViewItemIterator it( Local_View ); | 407 | QListViewItemIterator it( Local_View ); |
407 | for ( ; it.current(); ++it ) { | 408 | for ( ; it.current(); ++it ) { |
408 | if ( it.current()->isSelected() ) { | 409 | if ( it.current()->isSelected() ) { |
409 | QString strItem = it.current()->text(0); | 410 | QString strItem = it.current()->text(0); |
410 | QString localFile = currentDir.canonicalPath()+"/"+strItem; | 411 | QString localFile = currentDir.canonicalPath()+"/"+strItem; |
411 | QString remoteFile= currentRemoteDir+strItem; | 412 | QString remoteFile= currentRemoteDir+strItem; |
412 | QFileInfo fi(localFile); | 413 | QFileInfo fi(localFile); |
413 | if( !fi.isDir()) { | 414 | if( !fi.isDir()) { |
414 | fsz=fi.size(); | 415 | fsz=fi.size(); |
415 | ProgressBar->setTotalSteps(fsz); | 416 | ProgressBar->setTotalSteps(fsz); |
416 | 417 | ||
417 | FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn); | 418 | FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn); |
418 | FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn); | 419 | FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn); |
419 | FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn); | 420 | FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn); |
420 | FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); | 421 | FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); |
421 | qDebug("Put: %s, %s",localFile.latin1(),remoteFile.latin1()); | 422 | qDebug("Put: %s, %s",localFile.latin1(),remoteFile.latin1()); |
@@ -766,55 +767,51 @@ void OpieFtp::showHidden() | |||
766 | currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | 767 | currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); |
767 | localMenu->setItemChecked(localMenu->idAt(0),TRUE); | 768 | localMenu->setItemChecked(localMenu->idAt(0),TRUE); |
768 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | 769 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); |
769 | b=TRUE; | 770 | b=TRUE; |
770 | 771 | ||
771 | } else { | 772 | } else { |
772 | currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 773 | currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
773 | localMenu->setItemChecked(localMenu->idAt(0),FALSE); | 774 | localMenu->setItemChecked(localMenu->idAt(0),FALSE); |
774 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | 775 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); |
775 | b=FALSE; | 776 | b=FALSE; |
776 | } | 777 | } |
777 | populateLocalView(); | 778 | populateLocalView(); |
778 | } | 779 | } |
779 | 780 | ||
780 | void OpieFtp::ListPressed( int mouse, QListViewItem *item, const QPoint &point, int i) | 781 | void OpieFtp::ListPressed( int mouse, QListViewItem *item, const QPoint &point, int i) |
781 | { | 782 | { |
782 | // if(item) | 783 | // if(item) |
783 | if (mouse == 2) { | 784 | if (mouse == 2) { |
784 | showLocalMenu(item); | 785 | showLocalMenu(item); |
785 | } | 786 | } |
786 | } | 787 | } |
787 | 788 | ||
788 | void OpieFtp::RemoteListPressed( int mouse, QListViewItem *item, const QPoint &point, int i) | 789 | void OpieFtp::RemoteListPressed( int mouse, QListViewItem *item, const QPoint &point, int i) |
789 | { | 790 | { |
790 | switch (mouse) { | 791 | if(mouse == 2) { |
791 | case 1: | ||
792 | break; | ||
793 | case 2: | ||
794 | showRemoteMenu(item); | 792 | showRemoteMenu(item); |
795 | break; | 793 | } |
796 | }; | ||
797 | } | 794 | } |
798 | 795 | ||
799 | void OpieFtp::showRemoteMenu(QListViewItem * item) | 796 | void OpieFtp::showRemoteMenu(QListViewItem * item) |
800 | { | 797 | { |
801 | QPopupMenu m;// = new QPopupMenu( Local_View ); | 798 | QPopupMenu m;// = new QPopupMenu( Local_View ); |
802 | if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE) != -1) | 799 | if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE) != -1) |
803 | m.insertItem( tr( "Change Directory" ), this, SLOT( doRemoteCd() )); | 800 | m.insertItem( tr( "Change Directory" ), this, SLOT( doRemoteCd() )); |
804 | else | 801 | else |
805 | m.insertItem( tr( "Download" ), this, SLOT( remoteDownload() )); | 802 | m.insertItem( tr( "Download" ), this, SLOT( remoteDownload() )); |
806 | m.insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() )); | 803 | m.insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() )); |
807 | m.insertItem( tr( "Rename" ), this, SLOT( remoteRename() )); | 804 | m.insertItem( tr( "Rename" ), this, SLOT( remoteRename() )); |
808 | m.insertSeparator(); | 805 | m.insertSeparator(); |
809 | m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() )); | 806 | m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() )); |
810 | m.exec( QCursor::pos() ); | 807 | m.exec( QCursor::pos() ); |
811 | } | 808 | } |
812 | 809 | ||
813 | void OpieFtp::showLocalMenu(QListViewItem * item) | 810 | void OpieFtp::showLocalMenu(QListViewItem * item) |
814 | { | 811 | { |
815 | 812 | ||
816 | QPopupMenu m; | 813 | QPopupMenu m; |
817 | m.insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() )); | 814 | m.insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() )); |
818 | m.insertSeparator(); | 815 | m.insertSeparator(); |
819 | if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE) !=-1) | 816 | if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE) !=-1) |
820 | m.insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() )); | 817 | m.insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() )); |