-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 49 |
1 files changed, 31 insertions, 18 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index b703217..64146cb 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp | |||
@@ -30,24 +30,26 @@ using namespace Opie::Core; | |||
30 | #include <qtextstream.h> | 30 | #include <qtextstream.h> |
31 | #include <qpushbutton.h> | 31 | #include <qpushbutton.h> |
32 | #include <qtoolbutton.h> | 32 | #include <qtoolbutton.h> |
33 | #include <qcombobox.h> | 33 | #include <qcombobox.h> |
34 | #include <qlistview.h> | 34 | #include <qlistview.h> |
35 | #include <qlabel.h> | 35 | #include <qlabel.h> |
36 | #include <qprogressbar.h> | 36 | #include <qprogressbar.h> |
37 | #include <qspinbox.h> | 37 | #include <qspinbox.h> |
38 | #include <qtabwidget.h> | 38 | #include <qtabwidget.h> |
39 | #include <qlayout.h> | 39 | #include <qlayout.h> |
40 | #include <qmessagebox.h> | 40 | #include <qmessagebox.h> |
41 | #include <qmenubar.h> | 41 | #include <qmenubar.h> |
42 | #include <qpe/qpemenubar.h> | ||
43 | |||
42 | #include <qlineedit.h> | 44 | #include <qlineedit.h> |
43 | #include <qlistbox.h> | 45 | #include <qlistbox.h> |
44 | #include <qvbox.h> | 46 | #include <qvbox.h> |
45 | /* STD */ | 47 | /* STD */ |
46 | #include <unistd.h> | 48 | #include <unistd.h> |
47 | #include <stdlib.h> | 49 | #include <stdlib.h> |
48 | 50 | ||
49 | QProgressBar *ProgressBar; | 51 | QProgressBar *ProgressBar; |
50 | static netbuf *conn=NULL; | 52 | static netbuf *conn=NULL; |
51 | 53 | ||
52 | static int log_progress(netbuf *, int xfered, void *) | 54 | static int log_progress(netbuf *, int xfered, void *) |
53 | { | 55 | { |
@@ -64,30 +66,31 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
64 | : QMainWindow( parent, name, fl ) | 66 | : QMainWindow( parent, name, fl ) |
65 | { | 67 | { |
66 | odebug << "OpieFtp constructor" << oendl; | 68 | odebug << "OpieFtp constructor" << oendl; |
67 | setCaption( tr( "OpieFtp" ) ); | 69 | setCaption( tr( "OpieFtp" ) ); |
68 | fuckeduphack=FALSE; | 70 | fuckeduphack=FALSE; |
69 | 71 | ||
70 | QVBox* wrapperBox = new QVBox( this ); | 72 | QVBox* wrapperBox = new QVBox( this ); |
71 | setCentralWidget( wrapperBox ); | 73 | setCentralWidget( wrapperBox ); |
72 | 74 | ||
73 | QWidget *view = new QWidget( wrapperBox ); | 75 | QWidget *view = new QWidget( wrapperBox ); |
74 | 76 | ||
75 | QGridLayout *layout = new QGridLayout( view ); | 77 | QGridLayout *layout = new QGridLayout( view ); |
76 | layout->setSpacing( 2); | 78 | layout->setSpacing( 1); |
77 | layout->setMargin( 2); | 79 | layout->setMargin( 1); |
78 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 80 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
79 | 81 | ||
80 | QMenuBar *menuBar = new QMenuBar(this); | 82 | QPEMenuBar *menuBar = new QPEMenuBar(view); |
81 | // QToolBar *menuBar = new QToolBar(this); | 83 | // QMenuBar *menuBar = new QMenuBar(this); |
84 | // QPEToolBar *menuBar = new QPEToolBar(this); | ||
82 | // menuBar->setHorizontalStretchable( TRUE ); | 85 | // menuBar->setHorizontalStretchable( TRUE ); |
83 | 86 | ||
84 | QWMatrix matrix; | 87 | QWMatrix matrix; |
85 | QPixmap pix(Resource::loadPixmap( "UnknownDocument" )); | 88 | QPixmap pix(Resource::loadPixmap( "UnknownDocument" )); |
86 | matrix.scale( .4, .4); | 89 | matrix.scale( .4, .4); |
87 | unknownXpm = pix.xForm(matrix); | 90 | unknownXpm = pix.xForm(matrix); |
88 | 91 | ||
89 | connectionMenu = new QPopupMenu( this ); | 92 | connectionMenu = new QPopupMenu( this ); |
90 | localMenu = new QPopupMenu( this ); | 93 | localMenu = new QPopupMenu( this ); |
91 | remoteMenu = new QPopupMenu( this ); | 94 | remoteMenu = new QPopupMenu( this ); |
92 | tabMenu = new QPopupMenu( this ); | 95 | tabMenu = new QPopupMenu( this ); |
93 | 96 | ||
@@ -126,39 +129,39 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
126 | tabMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() )); | 129 | tabMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() )); |
127 | tabMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() )); | 130 | tabMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() )); |
128 | tabMenu->insertItem( tr( "Switch to Config" ), this, SLOT( switchToConfigTab() )); | 131 | tabMenu->insertItem( tr( "Switch to Config" ), this, SLOT( switchToConfigTab() )); |
129 | tabMenu->insertSeparator(); | 132 | tabMenu->insertSeparator(); |
130 | // tabMenu->insertItem( tr( "About" ), this, SLOT( doAbout() )); | 133 | // tabMenu->insertItem( tr( "About" ), this, SLOT( doAbout() )); |
131 | tabMenu->setCheckable(TRUE); | 134 | tabMenu->setCheckable(TRUE); |
132 | 135 | ||
133 | 136 | ||
134 | cdUpButton = new QToolButton( view,"cdUpButton"); | 137 | cdUpButton = new QToolButton( view,"cdUpButton"); |
135 | cdUpButton->setPixmap(Resource::loadPixmap("up")); | 138 | cdUpButton->setPixmap(Resource::loadPixmap("up")); |
136 | cdUpButton ->setFixedSize( QSize( 20, 20 ) ); | 139 | cdUpButton ->setFixedSize( QSize( 20, 20 ) ); |
137 | connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) ); | 140 | connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) ); |
138 | layout->addMultiCellWidget( cdUpButton, 0, 0, 3, 3 ); | 141 | layout->addMultiCellWidget( cdUpButton, 0, 0, 4, 4 ); |
139 | cdUpButton->hide(); | 142 | cdUpButton->hide(); |
140 | 143 | ||
141 | // docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",view,"docsButton"); | 144 | // docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",view,"docsButton"); |
142 | // docButton->setFixedSize( QSize( 20, 20 ) ); | 145 | // docButton->setFixedSize( QSize( 20, 20 ) ); |
143 | // connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) ); | 146 | // connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) ); |
144 | // docButton->setFlat(TRUE); | 147 | // docButton->setFlat(TRUE); |
145 | // layout->addMultiCellWidget( docButton, 0, 0, 6, 6 ); | 148 | // layout->addMultiCellWidget( docButton, 0, 0, 6, 6 ); |
146 | 149 | ||
147 | homeButton = new QToolButton(view,"homeButton"); | 150 | homeButton = new QToolButton( view,"homeButton"); |
148 | homeButton->setPixmap( Resource::loadPixmap("home")); | 151 | homeButton->setPixmap( Resource::loadPixmap("home")); |
149 | homeButton->setFixedSize( QSize( 20, 20 ) ); | 152 | homeButton->setFixedSize( QSize( 20, 20 ) ); |
150 | connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) ); | 153 | connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) ); |
151 | layout->addMultiCellWidget( homeButton, 0, 0, 4, 4); | 154 | layout->addMultiCellWidget( homeButton, 0, 0, 3, 3); |
152 | homeButton->hide(); | 155 | homeButton->hide(); |
153 | 156 | ||
154 | TabWidget = new QTabWidget( view, "TabWidget" ); | 157 | TabWidget = new QTabWidget( view, "TabWidget" ); |
155 | layout->addMultiCellWidget( TabWidget, 1, 1, 0, 4 ); | 158 | layout->addMultiCellWidget( TabWidget, 1, 1, 0, 4 ); |
156 | 159 | ||
157 | // TabWidget->setTabShape(QTabWidget::Triangular); | 160 | // TabWidget->setTabShape(QTabWidget::Triangular); |
158 | 161 | ||
159 | tab = new QWidget( TabWidget, "tab" ); | 162 | tab = new QWidget( TabWidget, "tab" ); |
160 | tabLayout = new QGridLayout( tab ); | 163 | tabLayout = new QGridLayout( tab ); |
161 | tabLayout->setSpacing( 2); | 164 | tabLayout->setSpacing( 2); |
162 | tabLayout->setMargin( 2); | 165 | tabLayout->setMargin( 2); |
163 | 166 | ||
164 | Local_View = new QListView( tab, "Local_View" ); | 167 | Local_View = new QListView( tab, "Local_View" ); |
@@ -243,24 +246,27 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
243 | tabLayout_3->addMultiCellWidget( PasswordEdit, 1, 1, 2, 3 ); | 246 | tabLayout_3->addMultiCellWidget( PasswordEdit, 1, 1, 2, 3 ); |
244 | 247 | ||
245 | connect( PasswordEdit,SIGNAL(textChanged(const QString&)),this, | 248 | connect( PasswordEdit,SIGNAL(textChanged(const QString&)),this, |
246 | SLOT( PasswordEditEdited(const QString&) )); | 249 | SLOT( PasswordEditEdited(const QString&) )); |
247 | 250 | ||
248 | //PasswordEdit->setFixedWidth(85); | 251 | //PasswordEdit->setFixedWidth(85); |
249 | TextLabel3 = new QLabel( tab_3, "TextLabel3" ); | 252 | TextLabel3 = new QLabel( tab_3, "TextLabel3" ); |
250 | TextLabel3->setText( tr( "Remote server" ) ); | 253 | TextLabel3->setText( tr( "Remote server" ) ); |
251 | tabLayout_3->addMultiCellWidget( TextLabel3, 2, 2, 0, 1 ); | 254 | tabLayout_3->addMultiCellWidget( TextLabel3, 2, 2, 0, 1 ); |
252 | 255 | ||
253 | ServerComboBox = new QComboBox( FALSE, tab_3, "ServerComboBox" ); | 256 | ServerComboBox = new QComboBox( FALSE, tab_3, "ServerComboBox" ); |
254 | ServerComboBox->setEditable(TRUE); | 257 | ServerComboBox->setEditable(TRUE); |
258 | ServerComboBox->setAutoCompletion(true); | ||
259 | // ServerComboBox->blockSignals(true); | ||
260 | |||
255 | tabLayout_3->addMultiCellWidget( ServerComboBox, 3, 3, 0, 1 ); | 261 | tabLayout_3->addMultiCellWidget( ServerComboBox, 3, 3, 0, 1 ); |
256 | 262 | ||
257 | connect(ServerComboBox,SIGNAL(activated(int)),this,SLOT(serverComboSelected(int) )); | 263 | connect(ServerComboBox,SIGNAL(activated(int)),this,SLOT(serverComboSelected(int) )); |
258 | connect(ServerComboBox,SIGNAL(textChanged(const QString&)),this, | 264 | connect(ServerComboBox,SIGNAL(textChanged(const QString&)),this, |
259 | SLOT(serverComboEdited(const QString&) )); | 265 | SLOT(serverComboEdited(const QString&) )); |
260 | 266 | ||
261 | QLabel *TextLabel5 = new QLabel( tab_3, "TextLabel5" ); | 267 | QLabel *TextLabel5 = new QLabel( tab_3, "TextLabel5" ); |
262 | TextLabel5->setText( tr( "Remote path" ) ); | 268 | TextLabel5->setText( tr( "Remote path" ) ); |
263 | tabLayout_3->addMultiCellWidget( TextLabel5, 2, 2, 2, 3 ); | 269 | tabLayout_3->addMultiCellWidget( TextLabel5, 2, 2, 2, 3 ); |
264 | 270 | ||
265 | 271 | ||
266 | remotePath = new QLineEdit( "/", tab_3, "remotePath" ); | 272 | remotePath = new QLineEdit( "/", tab_3, "remotePath" ); |
@@ -1317,67 +1323,74 @@ void OpieFtp::fillCombos() | |||
1317 | username = cfg.readEntry(temp); | 1323 | username = cfg.readEntry(temp); |
1318 | UsernameComboBox->insertItem(username); | 1324 | UsernameComboBox->insertItem(username); |
1319 | password = cfg.readEntryCrypt(username,""); | 1325 | password = cfg.readEntryCrypt(username,""); |
1320 | PasswordEdit->setText(password); | 1326 | PasswordEdit->setText(password); |
1321 | 1327 | ||
1322 | serverListView->insertItem( cfg.readEntry("ServerName")); | 1328 | serverListView->insertItem( cfg.readEntry("ServerName")); |
1323 | } | 1329 | } |
1324 | } | 1330 | } |
1325 | 1331 | ||
1326 | 1332 | ||
1327 | void OpieFtp::serverComboSelected(int index) | 1333 | void OpieFtp::serverComboSelected(int index) |
1328 | { | 1334 | { |
1335 | QString servername; | ||
1329 | currentServerConfig = index+1; | 1336 | currentServerConfig = index+1; |
1330 | odebug << "server combo selected " << index+1 << "" << oendl; | 1337 | odebug << "server combo selected " << index + 1 << "" << oendl; |
1331 | QString username, remoteServerStr, remotePathStr, password, port, temp; | 1338 | QString username, remoteServerStr, remotePathStr, password, port, temp; |
1332 | // remoteServerStr = ServerComboBox->text(index); | 1339 | servername = remoteServerStr = ServerComboBox->text(index); |
1340 | qDebug("server text " + remoteServerStr); | ||
1333 | 1341 | ||
1334 | Config cfg("opieftp"); | 1342 | Config cfg("opieftp"); |
1335 | cfg.setGroup("Server"); | 1343 | cfg.setGroup("Server"); |
1336 | // int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); | 1344 | // int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); |
1337 | 1345 | ||
1338 | temp.setNum(index+1); | 1346 | // for (int i = 1; i <= numberOfEntries; i++) { |
1347 | // int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); | ||
1348 | |||
1349 | temp.setNum(index + 1); | ||
1339 | remoteServerStr = cfg.readEntry( temp,""); | 1350 | remoteServerStr = cfg.readEntry( temp,""); |
1340 | 1351 | ||
1341 | odebug << "Group" +temp << oendl; | 1352 | odebug << "Group " +temp << oendl; |
1342 | cfg.setGroup(temp); | 1353 | cfg.setGroup(temp); |
1343 | // odebug << temp << oendl; | 1354 | |
1344 | int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE); | 1355 | int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE); |
1345 | port = remoteServerStr.right( divider - 1); | 1356 | port = remoteServerStr.right( divider - 1); |
1346 | bool ok; | 1357 | bool ok; |
1347 | int portInt = port.toInt(&ok,10); | 1358 | int portInt = port.toInt(&ok,10); |
1348 | if( portInt == 0) portInt = 21; | 1359 | if( portInt == 0) portInt = 21; |
1349 | |||
1350 | ServerComboBox->lineEdit()->setText(remoteServerStr.left( remoteServerStr.find(":",0,TRUE))); | 1360 | ServerComboBox->lineEdit()->setText(remoteServerStr.left( remoteServerStr.find(":",0,TRUE))); |
1351 | 1361 | ||
1352 | PortSpinBox->setValue( portInt); | 1362 | PortSpinBox->setValue( portInt); |
1353 | 1363 | ||
1354 | remotePath->setText(cfg.readEntry("RemotePath", "/")); | 1364 | remotePath->setText(cfg.readEntry("RemotePath", "/")); |
1355 | 1365 | ||
1356 | username = cfg.readEntry("Username", "anonymous"); | 1366 | username = cfg.readEntry("Username", "anonymous"); |
1357 | UsernameComboBox->lineEdit()->setText(username); | 1367 | UsernameComboBox->lineEdit()->setText(username); |
1358 | odebug << username << oendl; | 1368 | odebug << username << oendl; |
1359 | // odebug << "Password is "+cfg.readEntryCrypt(username << oendl; | 1369 | // odebug << "Password is "+cfg.readEntryCrypt(username << oendl; |
1360 | PasswordEdit->setText(cfg.readEntryCrypt(username, "me@opieftp.org")); | 1370 | PasswordEdit->setText(cfg.readEntryCrypt(username, "me@opieftp.org")); |
1361 | // UsernameComboBox | 1371 | // UsernameComboBox |
1362 | // PasswordEdit | 1372 | // PasswordEdit |
1363 | 1373 | ||
1364 | cfg.setGroup("Server"); | 1374 | cfg.setGroup("Server"); |
1365 | temp.sprintf("%d",currentServerConfig); | 1375 | temp.sprintf("%d", currentServerConfig); |
1366 | cfg.writeEntry("currentServer", temp); | 1376 | cfg.writeEntry("currentServer", temp); |
1377 | cfg.writeEntry(temp,servername); | ||
1367 | 1378 | ||
1379 | |||
1368 | fuckeduphack = TRUE; | 1380 | fuckeduphack = TRUE; |
1369 | serverListView->setCurrentItem( index); | 1381 | serverListView->setCurrentItem( index); |
1370 | fuckeduphack=FALSE; | 1382 | fuckeduphack = FALSE; |
1371 | odebug << "server list set selected " << index << "" << oendl; | 1383 | qDebug( "server list set selected %d "+temp, index); |
1384 | ServerComboBox->lineEdit()->setText(servername); | ||
1372 | update(); | 1385 | update(); |
1373 | } | 1386 | } |
1374 | 1387 | ||
1375 | void OpieFtp::deleteServer() | 1388 | void OpieFtp::deleteServer() |
1376 | { | 1389 | { |
1377 | QString username, remoteServerStr, remotePathStr, password, port, temp, servername; | 1390 | QString username, remoteServerStr, remotePathStr, password, port, temp, servername; |
1378 | remoteServerStr = ServerComboBox->currentText( ); | 1391 | remoteServerStr = ServerComboBox->currentText( ); |
1379 | username = UsernameComboBox->currentText(); | 1392 | username = UsernameComboBox->currentText(); |
1380 | servername=serverListView->currentText(); | 1393 | servername=serverListView->currentText(); |
1381 | 1394 | ||
1382 | Config cfg("opieftp"); | 1395 | Config cfg("opieftp"); |
1383 | cfg.setGroup("Server"); | 1396 | cfg.setGroup("Server"); |