-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index 2b29d83..24da195 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp @@ -40,2 +40,3 @@ extern "C" { #include <qlistbox.h> +#include <qvbox.h> @@ -62,8 +63,14 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) { + qDebug("OpieFtp constructor"); setCaption( tr( "OpieFtp" ) ); fuckeduphack=FALSE; - QGridLayout *layout = new QGridLayout( this ); + + QVBox* wrapperBox = new QVBox( this ); + setCentralWidget( wrapperBox ); + + QWidget *view = new QWidget( wrapperBox ); + + QGridLayout *layout = new QGridLayout( view ); layout->setSpacing( 2); layout->setMargin( 2); - connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); @@ -84,3 +91,5 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) +#if 0 layout->addMultiCellWidget( menuBar, 0, 0, 0, 2 ); +#endif @@ -122,4 +131,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) - - cdUpButton = new QToolButton( this,"cdUpButton"); + cdUpButton = new QToolButton( view,"cdUpButton"); cdUpButton->setPixmap(Resource::loadPixmap("up")); @@ -130,3 +138,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) -// docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton"); +// docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",view,"docsButton"); // docButton->setFixedSize( QSize( 20, 20 ) ); @@ -136,3 +144,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) - homeButton = new QToolButton(this,"homeButton"); + homeButton = new QToolButton(view,"homeButton"); homeButton->setPixmap( Resource::loadPixmap("home")); @@ -143,3 +151,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) - TabWidget = new QTabWidget( this, "TabWidget" ); + TabWidget = new QTabWidget( view, "TabWidget" ); layout->addMultiCellWidget( TabWidget, 1, 1, 0, 4 ); @@ -293,4 +301,6 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) +#if 0 connect(TabWidget,SIGNAL(currentChanged(QWidget *)), this,SLOT(tabChanged(QWidget*))); +#endif @@ -300,3 +310,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) - currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" ); + currentPathCombo = new QComboBox( FALSE, view, "currentPathCombo" ); layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 4); @@ -306,2 +316,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) +#if 0 connect( currentPathCombo, SIGNAL( activated( const QString & ) ), @@ -311,4 +322,4 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) this,SLOT(currentPathComboChanged())); - - ProgressBar = new QProgressBar( this, "ProgressBar" ); +#endif + ProgressBar = new QProgressBar( view, "ProgressBar" ); layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 4); @@ -317,3 +328,5 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) b=FALSE; +#if 0 populateLocalView(); +#endif readConfig(); @@ -323,2 +336,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) TabWidget->setCurrentPage(2); + qDebug("Constructor done"); } @@ -652,3 +666,3 @@ void OpieFtp::populateLocalView() QString symLink=fi->readLink(); -// qDebug("Symlink detected "+symLink); + qDebug("Symlink detected "+symLink); QFileInfo sym( symLink); @@ -658,3 +672,3 @@ void OpieFtp::populateLocalView() } else { -// qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); + qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); fileS.sprintf( "%10i", fi->size() ); @@ -665,3 +679,3 @@ void OpieFtp::populateLocalView() isDir=TRUE; -// qDebug( fileL); + qDebug( fileL); } |