-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" { | |||
40 | #include <qlistbox.h> | 40 | #include <qlistbox.h> |
41 | #include <qvbox.h> | ||
41 | 42 | ||
@@ -62,8 +63,14 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
62 | { | 63 | { |
64 | qDebug("OpieFtp constructor"); | ||
63 | setCaption( tr( "OpieFtp" ) ); | 65 | setCaption( tr( "OpieFtp" ) ); |
64 | fuckeduphack=FALSE; | 66 | fuckeduphack=FALSE; |
65 | QGridLayout *layout = new QGridLayout( this ); | 67 | |
68 | QVBox* wrapperBox = new QVBox( this ); | ||
69 | setCentralWidget( wrapperBox ); | ||
70 | |||
71 | QWidget *view = new QWidget( wrapperBox ); | ||
72 | |||
73 | QGridLayout *layout = new QGridLayout( view ); | ||
66 | layout->setSpacing( 2); | 74 | layout->setSpacing( 2); |
67 | layout->setMargin( 2); | 75 | layout->setMargin( 2); |
68 | |||
69 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 76 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
@@ -84,3 +91,5 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
84 | 91 | ||
92 | #if 0 | ||
85 | layout->addMultiCellWidget( menuBar, 0, 0, 0, 2 ); | 93 | layout->addMultiCellWidget( menuBar, 0, 0, 0, 2 ); |
94 | #endif | ||
86 | 95 | ||
@@ -122,4 +131,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
122 | 131 | ||
123 | 132 | cdUpButton = new QToolButton( view,"cdUpButton"); | |
124 | cdUpButton = new QToolButton( this,"cdUpButton"); | ||
125 | cdUpButton->setPixmap(Resource::loadPixmap("up")); | 133 | cdUpButton->setPixmap(Resource::loadPixmap("up")); |
@@ -130,3 +138,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
130 | 138 | ||
131 | // docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton"); | 139 | // docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",view,"docsButton"); |
132 | // docButton->setFixedSize( QSize( 20, 20 ) ); | 140 | // docButton->setFixedSize( QSize( 20, 20 ) ); |
@@ -136,3 +144,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
136 | 144 | ||
137 | homeButton = new QToolButton(this,"homeButton"); | 145 | homeButton = new QToolButton(view,"homeButton"); |
138 | homeButton->setPixmap( Resource::loadPixmap("home")); | 146 | homeButton->setPixmap( Resource::loadPixmap("home")); |
@@ -143,3 +151,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
143 | 151 | ||
144 | TabWidget = new QTabWidget( this, "TabWidget" ); | 152 | TabWidget = new QTabWidget( view, "TabWidget" ); |
145 | layout->addMultiCellWidget( TabWidget, 1, 1, 0, 4 ); | 153 | layout->addMultiCellWidget( TabWidget, 1, 1, 0, 4 ); |
@@ -293,4 +301,6 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
293 | 301 | ||
302 | #if 0 | ||
294 | connect(TabWidget,SIGNAL(currentChanged(QWidget *)), | 303 | connect(TabWidget,SIGNAL(currentChanged(QWidget *)), |
295 | this,SLOT(tabChanged(QWidget*))); | 304 | this,SLOT(tabChanged(QWidget*))); |
305 | #endif | ||
296 | 306 | ||
@@ -300,3 +310,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
300 | 310 | ||
301 | currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" ); | 311 | currentPathCombo = new QComboBox( FALSE, view, "currentPathCombo" ); |
302 | layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 4); | 312 | layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 4); |
@@ -306,2 +316,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
306 | 316 | ||
317 | #if 0 | ||
307 | connect( currentPathCombo, SIGNAL( activated( const QString & ) ), | 318 | connect( currentPathCombo, SIGNAL( activated( const QString & ) ), |
@@ -311,4 +322,4 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
311 | this,SLOT(currentPathComboChanged())); | 322 | this,SLOT(currentPathComboChanged())); |
312 | 323 | #endif | |
313 | ProgressBar = new QProgressBar( this, "ProgressBar" ); | 324 | ProgressBar = new QProgressBar( view, "ProgressBar" ); |
314 | layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 4); | 325 | layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 4); |
@@ -317,3 +328,5 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
317 | b=FALSE; | 328 | b=FALSE; |
329 | #if 0 | ||
318 | populateLocalView(); | 330 | populateLocalView(); |
331 | #endif | ||
319 | readConfig(); | 332 | readConfig(); |
@@ -323,2 +336,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
323 | TabWidget->setCurrentPage(2); | 336 | TabWidget->setCurrentPage(2); |
337 | qDebug("Constructor done"); | ||
324 | } | 338 | } |
@@ -652,3 +666,3 @@ void OpieFtp::populateLocalView() | |||
652 | QString symLink=fi->readLink(); | 666 | QString symLink=fi->readLink(); |
653 | // qDebug("Symlink detected "+symLink); | 667 | qDebug("Symlink detected "+symLink); |
654 | QFileInfo sym( symLink); | 668 | QFileInfo sym( symLink); |
@@ -658,3 +672,3 @@ void OpieFtp::populateLocalView() | |||
658 | } else { | 672 | } else { |
659 | // qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); | 673 | qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); |
660 | fileS.sprintf( "%10i", fi->size() ); | 674 | fileS.sprintf( "%10i", fi->size() ); |
@@ -665,3 +679,3 @@ void OpieFtp::populateLocalView() | |||
665 | isDir=TRUE; | 679 | isDir=TRUE; |
666 | // qDebug( fileL); | 680 | qDebug( fileL); |
667 | } | 681 | } |