author | llornkcor <llornkcor> | 2004-09-18 11:09:44 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-09-18 11:09:44 (UTC) |
commit | 35d96e2215c765da2270589c059c717a858333ca (patch) (unidiff) | |
tree | 3c961279d7f859e235aa2b46f6fd67b5a9710629 | |
parent | 4222b8c08a965d45f94bc5a6888f90b2cc9a446c (diff) | |
download | opie-35d96e2215c765da2270589c059c717a858333ca.zip opie-35d96e2215c765da2270589c059c717a858333ca.tar.gz opie-35d96e2215c765da2270589c059c717a858333ca.tar.bz2 |
fix layout issue
-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 33 |
1 files changed, 23 insertions, 10 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 | |||
@@ -41,2 +41,4 @@ using namespace Opie::Core; | |||
41 | #include <qmenubar.h> | 41 | #include <qmenubar.h> |
42 | #include <qpe/qpemenubar.h> | ||
43 | |||
42 | #include <qlineedit.h> | 44 | #include <qlineedit.h> |
@@ -75,8 +77,9 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
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 ); |
@@ -137,3 +140,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
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(); |
@@ -150,3 +153,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
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(); |
@@ -254,2 +257,5 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
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 ); |
@@ -1328,2 +1334,3 @@ void OpieFtp::serverComboSelected(int index) | |||
1328 | { | 1334 | { |
1335 | QString servername; | ||
1329 | currentServerConfig = index+1; | 1336 | currentServerConfig = index+1; |
@@ -1331,3 +1338,4 @@ void OpieFtp::serverComboSelected(int index) | |||
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 | ||
@@ -1337,2 +1345,5 @@ void OpieFtp::serverComboSelected(int index) | |||
1337 | 1345 | ||
1346 | // for (int i = 1; i <= numberOfEntries; i++) { | ||
1347 | // int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); | ||
1348 | |||
1338 | temp.setNum(index+1); | 1349 | temp.setNum(index+1); |
@@ -1342,3 +1353,3 @@ void OpieFtp::serverComboSelected(int index) | |||
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); |
@@ -1348,3 +1359,2 @@ void OpieFtp::serverComboSelected(int index) | |||
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))); |
@@ -1366,2 +1376,4 @@ void OpieFtp::serverComboSelected(int index) | |||
1366 | cfg.writeEntry("currentServer", temp); | 1376 | cfg.writeEntry("currentServer", temp); |
1377 | cfg.writeEntry(temp,servername); | ||
1378 | |||
1367 | 1379 | ||
@@ -1370,3 +1382,4 @@ void OpieFtp::serverComboSelected(int 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(); |