summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opieftp/opieftp.cpp13
-rw-r--r--noncore/net/opieftp/opieftp.h4
2 files changed, 9 insertions, 8 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 8f2b9c9..9d6356d 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -125,10 +125,10 @@ OpieFtp::OpieFtp( )
125 125
126 126
127 127
128 cdUpButton = new QPushButton(Resource::loadIconSet("up"),"",this,"cdUpButton"); 128 cdUpButton = new QToolButton( this,"cdUpButton");
129 cdUpButton->setPixmap(Resource::loadPixmap("up"));
129 cdUpButton ->setFixedSize( QSize( 20, 20 ) ); 130 cdUpButton ->setFixedSize( QSize( 20, 20 ) );
130 connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) ); 131 connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) );
131 cdUpButton ->setFlat(TRUE);
132 layout->addMultiCellWidget( cdUpButton, 0, 0, 3, 3 ); 132 layout->addMultiCellWidget( cdUpButton, 0, 0, 3, 3 );
133 cdUpButton->hide(); 133 cdUpButton->hide();
134 134
@@ -138,10 +138,10 @@ OpieFtp::OpieFtp( )
138// docButton->setFlat(TRUE); 138// docButton->setFlat(TRUE);
139// layout->addMultiCellWidget( docButton, 0, 0, 6, 6 ); 139// layout->addMultiCellWidget( docButton, 0, 0, 6, 6 );
140 140
141 homeButton = new QPushButton( Resource::loadIconSet("home"),"",this,"homeButton"); 141 homeButton = new QToolButton(this,"homeButton");
142 homeButton->setPixmap( Resource::loadPixmap("home"));
142 homeButton->setFixedSize( QSize( 20, 20 ) ); 143 homeButton->setFixedSize( QSize( 20, 20 ) );
143 connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) ); 144 connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
144 homeButton->setFlat(TRUE);
145 layout->addMultiCellWidget( homeButton, 0, 0, 4, 4); 145 layout->addMultiCellWidget( homeButton, 0, 0, 4, 4);
146 homeButton->hide(); 146 homeButton->hide();
147 147
@@ -231,7 +231,7 @@ OpieFtp::OpieFtp( )
231 PasswordEdit = new QLineEdit( "", tab_3, "PasswordComboBox" ); 231 PasswordEdit = new QLineEdit( "", tab_3, "PasswordComboBox" );
232 PasswordEdit->setEchoMode(QLineEdit::Password); 232 PasswordEdit->setEchoMode(QLineEdit::Password);
233 tabLayout_3->addMultiCellWidget( PasswordEdit, 1, 1, 2, 3 ); 233 tabLayout_3->addMultiCellWidget( PasswordEdit, 1, 1, 2, 3 );
234 234//PasswordEdit->setFixedWidth(85);
235 TextLabel3 = new QLabel( tab_3, "TextLabel3" ); 235 TextLabel3 = new QLabel( tab_3, "TextLabel3" );
236 TextLabel3->setText( tr( "Remote server" ) ); 236 TextLabel3->setText( tr( "Remote server" ) );
237 tabLayout_3->addMultiCellWidget( TextLabel3, 2, 2, 0, 1 ); 237 tabLayout_3->addMultiCellWidget( TextLabel3, 2, 2, 0, 1 );
@@ -250,7 +250,6 @@ OpieFtp::OpieFtp( )
250 250
251 remotePath = new QLineEdit( "/", tab_3, "remotePath" ); 251 remotePath = new QLineEdit( "/", tab_3, "remotePath" );
252 tabLayout_3->addMultiCellWidget( remotePath, 3, 3, 2, 3 ); 252 tabLayout_3->addMultiCellWidget( remotePath, 3, 3, 2, 3 );
253
254 TextLabel4 = new QLabel( tab_3, "TextLabel4" ); 253 TextLabel4 = new QLabel( tab_3, "TextLabel4" );
255 TextLabel4->setText( tr( "Port" ) ); 254 TextLabel4->setText( tr( "Port" ) );
256 tabLayout_3->addMultiCellWidget( TextLabel4, 4, 4, 0, 1 ); 255 tabLayout_3->addMultiCellWidget( TextLabel4, 4, 4, 0, 1 );
@@ -285,7 +284,7 @@ OpieFtp::OpieFtp( )
285 284
286 currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" ); 285 currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
287 layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 4); 286 layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 4);
288 287 currentPathCombo ->setFixedWidth(220);
289 currentPathCombo->setEditable(TRUE); 288 currentPathCombo->setEditable(TRUE);
290 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); 289 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
291 290
diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h
index 218a958..ad36b1d 100644
--- a/noncore/net/opieftp/opieftp.h
+++ b/noncore/net/opieftp/opieftp.h
@@ -37,6 +37,7 @@ class QFile;
37class QListViewItem; 37class QListViewItem;
38class QLineEdit; 38class QLineEdit;
39class QPushButton; 39class QPushButton;
40class QToolButton;
40class QStringList; 41class QStringList;
41 42
42class OpieFtp : public QMainWindow 43class OpieFtp : public QMainWindow
@@ -60,7 +61,8 @@ public:
60 QString currentRemoteDir; 61 QString currentRemoteDir;
61 QString filterStr; 62 QString filterStr;
62 QListViewItem * item; 63 QListViewItem * item;
63 QPushButton *connectServerBtn, *cdUpButton, *homeButton, *docButton; 64 QPushButton *connectServerBtn;//
65 QToolButton *cdUpButton, *homeButton, *docButton;
64 bool b; 66 bool b;
65 int currentServerConfig; 67 int currentServerConfig;
66protected slots: 68protected slots: