summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieftp/opieftp.cpp15
-rw-r--r--noncore/net/opieftp/opieftp.h4
2 files changed, 10 insertions, 9 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
@@ -126,10 +126,10 @@ OpieFtp::OpieFtp( )
- cdUpButton = new QPushButton(Resource::loadIconSet("up"),"",this,"cdUpButton");
+ cdUpButton = new QToolButton( this,"cdUpButton");
+ cdUpButton->setPixmap(Resource::loadPixmap("up"));
cdUpButton ->setFixedSize( QSize( 20, 20 ) );
connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) );
- cdUpButton ->setFlat(TRUE);
layout->addMultiCellWidget( cdUpButton, 0, 0, 3, 3 );
- cdUpButton->hide();
+ cdUpButton->hide();
// docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton");
@@ -139,8 +139,8 @@ OpieFtp::OpieFtp( )
// layout->addMultiCellWidget( docButton, 0, 0, 6, 6 );
- homeButton = new QPushButton( Resource::loadIconSet("home"),"",this,"homeButton");
+ homeButton = new QToolButton(this,"homeButton");
+ homeButton->setPixmap( Resource::loadPixmap("home"));
homeButton->setFixedSize( QSize( 20, 20 ) );
connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
- homeButton->setFlat(TRUE);
layout->addMultiCellWidget( homeButton, 0, 0, 4, 4);
homeButton->hide();
@@ -232,5 +232,5 @@ OpieFtp::OpieFtp( )
PasswordEdit->setEchoMode(QLineEdit::Password);
tabLayout_3->addMultiCellWidget( PasswordEdit, 1, 1, 2, 3 );
-
+//PasswordEdit->setFixedWidth(85);
TextLabel3 = new QLabel( tab_3, "TextLabel3" );
TextLabel3->setText( tr( "Remote server" ) );
@@ -251,5 +251,4 @@ OpieFtp::OpieFtp( )
remotePath = new QLineEdit( "/", tab_3, "remotePath" );
tabLayout_3->addMultiCellWidget( remotePath, 3, 3, 2, 3 );
-
TextLabel4 = new QLabel( tab_3, "TextLabel4" );
TextLabel4->setText( tr( "Port" ) );
@@ -286,5 +285,5 @@ OpieFtp::OpieFtp( )
currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 4);
-
+ currentPathCombo ->setFixedWidth(220);
currentPathCombo->setEditable(TRUE);
currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
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
@@ -38,4 +38,5 @@ class QListViewItem;
class QLineEdit;
class QPushButton;
+class QToolButton;
class QStringList;
@@ -61,5 +62,6 @@ public:
QString filterStr;
QListViewItem * item;
- QPushButton *connectServerBtn, *cdUpButton, *homeButton, *docButton;
+ QPushButton *connectServerBtn;//
+ QToolButton *cdUpButton, *homeButton, *docButton;
bool b;
int currentServerConfig;