author | llornkcor <llornkcor> | 2002-03-16 20:37:12 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-03-16 20:37:12 (UTC) |
commit | d7203a29593bd5cd21339c67fa094d67283a8525 (patch) (side-by-side diff) | |
tree | 50c2112d7b9127fb0a5754d09a7f089fb3b63522 /noncore | |
parent | 1d20ca78752b9da597950087438daa9ff8cb7951 (diff) | |
download | opie-d7203a29593bd5cd21339c67fa094d67283a8525.zip opie-d7203a29593bd5cd21339c67fa094d67283a8525.tar.gz opie-d7203a29593bd5cd21339c67fa094d67283a8525.tar.bz2 |
made opieftp resizable
-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 105 | ||||
-rw-r--r-- | noncore/net/opieftp/opieftp.h | 10 |
2 files changed, 89 insertions, 26 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index ed7f4bb..042ed59 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp @@ -59,73 +59,90 @@ static int log_progress(netbuf *ctl, int xfered, void *arg) return 1; } OpieFtp::OpieFtp( ) : QMainWindow( ) { - resize( 236, 290 ); - setMaximumSize( QSize( 240, 320 ) ); setCaption( tr( "OpieFtp" ) ); + QGridLayout *layout = new QGridLayout( this ); + layout->setSpacing( 2); + layout->setMargin( 2); + connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); QPEMenuBar *menuBar = new QPEMenuBar( this ); connectionMenu = new QPopupMenu( this ); localMenu = new QPopupMenu( this ); remoteMenu = new QPopupMenu( this ); + tabMenu = new QPopupMenu( this ); + + layout->addMultiCellWidget( menuBar, 0, 0, 0, 3 ); + menuBar->insertItem( tr( "Connection" ), connectionMenu); menuBar->insertItem( tr( "Local" ), localMenu); menuBar->insertItem( tr( "Remote" ), remoteMenu); + menuBar->insertItem( tr( "View" ), tabMenu); connectionMenu->insertItem( tr( "New" ), this, SLOT( newConnection() )); connectionMenu->insertItem( tr( "Connect" ), this, SLOT( connector() )); connectionMenu->insertItem( tr( "Disconnect" ), this, SLOT( disConnector() )); localMenu->insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() )); + localMenu->insertSeparator(); localMenu->insertItem( tr( "Upload" ), this, SLOT( localUpload() )); localMenu->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() )); localMenu->insertItem( tr( "Rename" ), this, SLOT( localRename() )); localMenu->insertSeparator(); localMenu->insertItem( tr( "Delete" ), this, SLOT( localDelete() )); remoteMenu->insertItem( tr( "Download" ), this, SLOT( remoteDownload() )); remoteMenu->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() )); remoteMenu->insertItem( tr( "Rename" ), this, SLOT( remoteRename() )); remoteMenu->insertSeparator(); remoteMenu->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() )); - ProgressBar = new QProgressBar( this, "ProgressBar" ); - ProgressBar->setGeometry( QRect( 5, 268, 231, 15 ) ); + tabMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() )); + tabMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() )); + tabMenu->insertItem( tr( "Switch to Config" ), this, SLOT( switchToConfigTab() )); + + TabWidget = new QTabWidget( this, "TabWidget" ); + layout->addMultiCellWidget( TabWidget, 1, 1, 0, 3 ); - TabWidget = new QTabWidget( this, "TabWidget2" ); - TabWidget->setGeometry( QRect( 3, 25, 240, 220 ) ); TabWidget->setTabShape(QTabWidget::Triangular); tab = new QWidget( TabWidget, "tab" ); + tabLayout = new QGridLayout( tab ); + tabLayout->setSpacing( 2); + tabLayout->setMargin( 2); Local_View = new QListView( tab, "Local_View" ); - Local_View->setGeometry( QRect( 3, 2, 225, 195 ) ); +// Local_View->setResizePolicy( QListView::AutoOneFit ); Local_View->addColumn( "File",120); Local_View->addColumn( "Size",-1); Local_View->setColumnAlignment(1,QListView::AlignRight); Local_View->addColumn( "Date",-1); Local_View->setColumnAlignment(2,QListView::AlignRight); Local_View->setAllColumnsShowFocus(TRUE); QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); + tabLayout->addWidget( Local_View, 0, 0 ); + connect( Local_View, SIGNAL( doubleClicked( QListViewItem*)), this,SLOT( localListClicked(QListViewItem *)) ); connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) ); TabWidget->insertTab( tab, tr( "Local" ) ); tab_2 = new QWidget( TabWidget, "tab_2" ); + tabLayout_2 = new QGridLayout( tab_2 ); + tabLayout_2->setSpacing( 2); + tabLayout_2->setMargin( 2); Remote_View = new QListView( tab_2, "Remote_View" ); - Remote_View->setGeometry( QRect( 3, 2, 225, 195 ) ); Remote_View->addColumn( "File",120); Remote_View->addColumn( "Size",-1); Remote_View->setColumnAlignment(1,QListView::AlignRight); Remote_View->addColumn( "Date",-1); Remote_View->setColumnAlignment(2,QListView::AlignRight); Remote_View->setAllColumnsShowFocus(TRUE); @@ -133,72 +150,93 @@ OpieFtp::OpieFtp( ) connect( Remote_View, SIGNAL( doubleClicked( QListViewItem*)), this,SLOT( remoteListClicked(QListViewItem *)) ); connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), this,SLOT( RemoteListPressed(int, QListViewItem *, const QPoint&, int)) ); + tabLayout_2->addWidget( Remote_View, 0, 0 ); + TabWidget->insertTab( tab_2, tr( "Remote" ) ); tab_3 = new QWidget( TabWidget, "tab_3" ); + tabLayout_3 = new QGridLayout( tab_3 ); + tabLayout_3->setSpacing( 2); + tabLayout_3->setMargin( 2); TextLabel1 = new QLabel( tab_3, "TextLabel1" ); - TextLabel1->setGeometry( QRect( 10, 10, 60, 16 ) ); TextLabel1->setText( tr( "Username" ) ); + tabLayout_3->addMultiCellWidget( TextLabel1, 0, 0, 0, 1 ); + UsernameComboBox = new QComboBox( FALSE, tab_3, "UsernameComboBox" ); - UsernameComboBox->setGeometry( QRect( 10, 25, 196, 21 ) ); UsernameComboBox->setEditable(TRUE); - UsernameComboBox->lineEdit()->setText("anonymous"); +// UsernameComboBox->lineEdit()->setText("anonymous"); + UsernameComboBox->lineEdit()->setText("root"); // UsernameComboBox->lineEdit()->setText("llornkcor"); + tabLayout_3->addMultiCellWidget( UsernameComboBox, 1, 1, 0, 1 ); TextLabel2 = new QLabel( tab_3, "TextLabel2" ); - TextLabel2->setGeometry( QRect( 10, 50, 65, 16 ) ); TextLabel2->setText( tr( "Password" ) ); + tabLayout_3->addMultiCellWidget( TextLabel2, 0, 0, 2, 3 ); + PasswordEdit = new QLineEdit( "", tab_3, "PasswordComboBox" ); - PasswordEdit->setGeometry( QRect( 10, 65, 195, 16 ) ); PasswordEdit->setEchoMode(QLineEdit::Password); - PasswordEdit->setText( tr( "me@opieftp.org" ) ); +// PasswordEdit->setText( tr( "me@opieftp.org" ) ); +// PasswordEdit->setText( tr( "" ) ); + tabLayout_3->addMultiCellWidget( PasswordEdit, 1, 1, 2, 3 ); TextLabel3 = new QLabel( tab_3, "TextLabel3" ); - TextLabel3->setGeometry( QRect( 10, 90, 95, 16 ) ); TextLabel3->setText( tr( "Remote server" ) ); + tabLayout_3->addMultiCellWidget( TextLabel3, 2, 2, 0, 1 ); + ServerComboBox = new QComboBox( FALSE, tab_3, "ServerComboBox" ); - ServerComboBox->setGeometry( QRect( 10, 105, 195, 21 ) ); ServerComboBox->setEditable(TRUE); ServerComboBox->lineEdit()->setText( tr( "" ) ); + tabLayout_3->addMultiCellWidget( ServerComboBox, 3, 3, 0, 1 ); // ServerComboBox->lineEdit()->setText( tr( "llornkcor.com" ) ); + ServerComboBox->lineEdit()->setText( tr( "192.168.129.201" ) ); QLabel *TextLabel5 = new QLabel( tab_3, "TextLabel5" ); - TextLabel5->setGeometry( QRect( 10, 130, 95, 16 ) ); TextLabel5->setText( tr( "Remote path" ) ); + tabLayout_3->addMultiCellWidget( TextLabel5, 2, 2, 2, 3 ); + remotePath = new QLineEdit( "/", tab_3, "remotePath" ); - remotePath->setGeometry( QRect( 10, 145, 195, 16 ) ); remotePath->setText( currentRemoteDir = "/"); + tabLayout_3->addMultiCellWidget( remotePath, 3, 3, 2, 3 ); // remotePath->setText( currentRemoteDir = "/home/llornkcor/"); TextLabel4 = new QLabel( tab_3, "TextLabel4" ); - TextLabel4->setGeometry( QRect( 10, 170, 30, 21 ) ); TextLabel4->setText( tr( "Port" ) ); + tabLayout_3->addMultiCellWidget( TextLabel4, 4, 4, 0, 1 ); + PortSpinBox = new QSpinBox( tab_3, "PortSpinBox" ); - PortSpinBox->setGeometry( QRect( 40, 175, 75, 20 ) ); PortSpinBox->setButtonSymbols( QSpinBox::UpDownArrows ); PortSpinBox->setMaxValue(32786); - PortSpinBox->setValue( 21); + PortSpinBox->setValue( 4242); +// PortSpinBox->setValue( 21); + tabLayout_3->addMultiCellWidget( PortSpinBox, 4, 4, 1, 1); + + QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + tabLayout_3->addItem( spacer, 5, 0 ); TabWidget->insertTab( tab_3, tr( "Config" ) ); connect(TabWidget,SIGNAL(currentChanged(QWidget *)), this,SLOT(tabChanged(QWidget*))); currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); currentDir.setPath( QDir::currentDirPath()); // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); currentPathEdit = new QLineEdit( "/", this, "currentPathEdit" ); - currentPathEdit->setGeometry( QRect( 5, 248, 220, 18 ) ); + layout->addMultiCellWidget( currentPathEdit, 3, 3, 0, 3 ); + currentPathEdit->setText( currentDir.canonicalPath()); connect( currentPathEdit,SIGNAL(returnPressed()),this,SLOT(currentPathEditChanged())); + ProgressBar = new QProgressBar( this, "ProgressBar" ); + layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 3 ); + filterStr="*"; populateLocalView(); } OpieFtp::~OpieFtp() { @@ -214,15 +252,18 @@ void OpieFtp::cleanUp() } void OpieFtp::tabChanged(QWidget *w) { if (TabWidget->currentPageIndex() == 0) { currentPathEdit->setText( currentDir.canonicalPath()); - } else if (TabWidget->currentPageIndex() == 1) { + } + if (TabWidget->currentPageIndex() == 1) { currentPathEdit->setText( currentRemoteDir ); } + if (TabWidget->currentPageIndex() == 2) { + } } void OpieFtp::localUpload() { int fsz; QCopEnvelope ( "QPE/System", "busy()" ); @@ -255,13 +296,14 @@ void OpieFtp::localUpload() } TabWidget->setCurrentPage(1); populateRemoteView(); QCopEnvelope ( "QPE/System", "notBusy()" ); } -void OpieFtp::nullifyCallBack() { +void OpieFtp::nullifyCallBack() +{ FtpOptions(FTPLIB_CALLBACK, NULL, conn); FtpOptions(FTPLIB_IDLETIME, NULL, conn); FtpOptions(FTPLIB_CALLBACKARG, NULL, conn); FtpOptions(FTPLIB_CALLBACKBYTES, NULL, conn); } @@ -784,6 +826,21 @@ void OpieFtp::currentPathEditChanged() currentPathEdit->setText( currentRemoteDir ); } remoteDirList( (const QString &)currentRemoteDir); } } + +void OpieFtp::switchToLocalTab() +{ +TabWidget->setCurrentPage(0); +} + +void OpieFtp::switchToRemoteTab() +{ +TabWidget->setCurrentPage(1); +} + +void OpieFtp::switchToConfigTab() +{ +TabWidget->setCurrentPage(2); +} diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h index 5d1c63d..e3ff334 100644 --- a/noncore/net/opieftp/opieftp.h +++ b/noncore/net/opieftp/opieftp.h @@ -43,20 +43,20 @@ class OpieFtp : public QMainWindow public: OpieFtp( ); ~OpieFtp(); QTabWidget *TabWidget; - QWidget *tab, *tab_2, *tab_3;; + QWidget *tab, *tab_2, *tab_3; QListView *Local_View, *Remote_View; QComboBox *UsernameComboBox, *ServerComboBox; QLineEdit *PasswordEdit, *remotePath, *currentPathEdit; QLabel *TextLabel2, *TextLabel1, *TextLabel3, *TextLabel4;; QSpinBox* PortSpinBox; - QPopupMenu *connectionMenu, *localMenu, *remoteMenu; + QPopupMenu *connectionMenu, *localMenu, *remoteMenu, *tabMenu; QDir currentDir; QString currentRemoteDir; QString filterStr; QListViewItem * item; bool b; @@ -86,12 +86,18 @@ protected slots: bool remoteChDir(const QString &); void tabChanged(QWidget*); void cleanUp(); void remoteRename(); void localRename(); void currentPathEditChanged(); + void switchToLocalTab(); + void switchToRemoteTab(); + void switchToConfigTab(); protected: void nullifyCallBack(); + QGridLayout* tabLayout; + QGridLayout* tabLayout_2; + QGridLayout* tabLayout_3; }; #endif // OPIEFTP_H |