author | alwin <alwin> | 2004-03-01 14:05:40 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-03-01 14:05:40 (UTC) |
commit | 0f3d8aba2d2de77b1366ece1685cb720ea9b841f (patch) (unidiff) | |
tree | 31a105cc9dca06e4a3339e1c684be773e497b3f5 | |
parent | aa4539e4ccc23c47f720819e23c9a6faf53a4df8 (diff) | |
download | opie-0f3d8aba2d2de77b1366ece1685cb720ea9b841f.zip opie-0f3d8aba2d2de77b1366ece1685cb720ea9b841f.tar.gz opie-0f3d8aba2d2de77b1366ece1685cb720ea9b841f.tar.bz2 |
just modified this way, that it not longer crashes when just startet.
but completly unusable. Who will maintain this stuff? If no one will
do it, we should remove this app in next opie release 'cause this
moment it makes no sense.
-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 | |||
@@ -38,6 +38,7 @@ extern "C" { | |||
38 | #include <qmessagebox.h> | 38 | #include <qmessagebox.h> |
39 | #include <qlineedit.h> | 39 | #include <qlineedit.h> |
40 | #include <qlistbox.h> | 40 | #include <qlistbox.h> |
41 | #include <qvbox.h> | ||
41 | 42 | ||
42 | #include <unistd.h> | 43 | #include <unistd.h> |
43 | #include <stdlib.h> | 44 | #include <stdlib.h> |
@@ -60,12 +61,18 @@ static int log_progress(netbuf *, int xfered, void *) | |||
60 | OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | 61 | OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) |
61 | : QMainWindow( parent, name, fl ) | 62 | : QMainWindow( parent, name, 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()) ); |
70 | 77 | ||
71 | QMenuBar *menuBar = new QMenuBar(this); | 78 | QMenuBar *menuBar = new QMenuBar(this); |
@@ -82,7 +89,9 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
82 | remoteMenu = new QPopupMenu( this ); | 89 | remoteMenu = new QPopupMenu( this ); |
83 | tabMenu = new QPopupMenu( this ); | 90 | tabMenu = new QPopupMenu( this ); |
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 | ||
87 | menuBar->insertItem( tr( "Connection" ), connectionMenu); | 96 | menuBar->insertItem( tr( "Connection" ), connectionMenu); |
88 | // menuBar->insertItem( tr( "Local" ), localMenu); | 97 | // menuBar->insertItem( tr( "Local" ), localMenu); |
@@ -120,28 +129,27 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
120 | tabMenu->setCheckable(TRUE); | 129 | tabMenu->setCheckable(TRUE); |
121 | 130 | ||
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")); |
126 | cdUpButton ->setFixedSize( QSize( 20, 20 ) ); | 134 | cdUpButton ->setFixedSize( QSize( 20, 20 ) ); |
127 | connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) ); | 135 | connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) ); |
128 | layout->addMultiCellWidget( cdUpButton, 0, 0, 3, 3 ); | 136 | layout->addMultiCellWidget( cdUpButton, 0, 0, 3, 3 ); |
129 | cdUpButton->hide(); | 137 | cdUpButton->hide(); |
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 ) ); |
133 | // connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) ); | 141 | // connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) ); |
134 | // docButton->setFlat(TRUE); | 142 | // docButton->setFlat(TRUE); |
135 | // layout->addMultiCellWidget( docButton, 0, 0, 6, 6 ); | 143 | // layout->addMultiCellWidget( docButton, 0, 0, 6, 6 ); |
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")); |
139 | homeButton->setFixedSize( QSize( 20, 20 ) ); | 147 | homeButton->setFixedSize( QSize( 20, 20 ) ); |
140 | connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) ); | 148 | connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) ); |
141 | layout->addMultiCellWidget( homeButton, 0, 0, 4, 4); | 149 | layout->addMultiCellWidget( homeButton, 0, 0, 4, 4); |
142 | homeButton->hide(); | 150 | homeButton->hide(); |
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 ); |
146 | 154 | ||
147 | // TabWidget->setTabShape(QTabWidget::Triangular); | 155 | // TabWidget->setTabShape(QTabWidget::Triangular); |
@@ -291,36 +299,42 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
291 | 299 | ||
292 | TabWidget->insertTab( tab_3, tr( "Config" ) ); | 300 | TabWidget->insertTab( tab_3, tr( "Config" ) ); |
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 | ||
297 | currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 307 | currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
298 | currentDir.setPath( QDir::currentDirPath()); | 308 | currentDir.setPath( QDir::currentDirPath()); |
299 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | 309 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); |
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); |
303 | currentPathCombo ->setFixedWidth(220); | 313 | currentPathCombo ->setFixedWidth(220); |
304 | currentPathCombo->setEditable(TRUE); | 314 | currentPathCombo->setEditable(TRUE); |
305 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); | 315 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); |
306 | 316 | ||
317 | #if 0 | ||
307 | connect( currentPathCombo, SIGNAL( activated( const QString & ) ), | 318 | connect( currentPathCombo, SIGNAL( activated( const QString & ) ), |
308 | this, SLOT( currentPathComboActivated( const QString & ) ) ); | 319 | this, SLOT( currentPathComboActivated( const QString & ) ) ); |
309 | 320 | ||
310 | connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()), | 321 | connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()), |
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); |
315 | ProgressBar->setMaximumHeight(10); | 326 | ProgressBar->setMaximumHeight(10); |
316 | filterStr="*"; | 327 | filterStr="*"; |
317 | b=FALSE; | 328 | b=FALSE; |
329 | #if 0 | ||
318 | populateLocalView(); | 330 | populateLocalView(); |
331 | #endif | ||
319 | readConfig(); | 332 | readConfig(); |
320 | 333 | ||
321 | // ServerComboBox->setCurrentItem(currentServerConfig); | 334 | // ServerComboBox->setCurrentItem(currentServerConfig); |
322 | 335 | ||
323 | TabWidget->setCurrentPage(2); | 336 | TabWidget->setCurrentPage(2); |
337 | qDebug("Constructor done"); | ||
324 | } | 338 | } |
325 | 339 | ||
326 | OpieFtp::~OpieFtp() | 340 | OpieFtp::~OpieFtp() |
@@ -650,20 +664,20 @@ void OpieFtp::populateLocalView() | |||
650 | while ( (fi=it.current()) ) { | 664 | while ( (fi=it.current()) ) { |
651 | if (fi->isSymLink() ){ | 665 | if (fi->isSymLink() ){ |
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); |
655 | fileS.sprintf( "%10i", sym.size() ); | 669 | fileS.sprintf( "%10i", sym.size() ); |
656 | fileL.sprintf( "%s -> %s", fi->fileName().data(),sym.absFilePath().data() ); | 670 | fileL.sprintf( "%s -> %s", fi->fileName().data(),sym.absFilePath().data() ); |
657 | fileDate = sym.lastModified().toString(); | 671 | fileDate = sym.lastModified().toString(); |
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() ); |
661 | fileL.sprintf( "%s",fi->fileName().data() ); | 675 | fileL.sprintf( "%s",fi->fileName().data() ); |
662 | fileDate= fi->lastModified().toString(); | 676 | fileDate= fi->lastModified().toString(); |
663 | if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) { | 677 | if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) { |
664 | fileL+="/"; | 678 | fileL+="/"; |
665 | isDir=TRUE; | 679 | isDir=TRUE; |
666 | // qDebug( fileL); | 680 | qDebug( fileL); |
667 | } | 681 | } |
668 | } | 682 | } |
669 | if(fileL !="./" && fi->exists()) { | 683 | if(fileL !="./" && fi->exists()) { |