summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-03-16 20:37:12 (UTC)
committer llornkcor <llornkcor>2002-03-16 20:37:12 (UTC)
commitd7203a29593bd5cd21339c67fa094d67283a8525 (patch) (unidiff)
tree50c2112d7b9127fb0a5754d09a7f089fb3b63522
parent1d20ca78752b9da597950087438daa9ff8cb7951 (diff)
downloadopie-d7203a29593bd5cd21339c67fa094d67283a8525.zip
opie-d7203a29593bd5cd21339c67fa094d67283a8525.tar.gz
opie-d7203a29593bd5cd21339c67fa094d67283a8525.tar.bz2
made opieftp resizable
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieftp/opieftp.cpp135
-rw-r--r--noncore/net/opieftp/opieftp.h12
2 files changed, 105 insertions, 42 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
@@ -64,9 +64,11 @@ OpieFtp::OpieFtp( )
64{ 64{
65 resize( 236, 290 );
66 setMaximumSize( QSize( 240, 320 ) );
67 setCaption( tr( "OpieFtp" ) ); 65 setCaption( tr( "OpieFtp" ) );
68 66
67 QGridLayout *layout = new QGridLayout( this );
68 layout->setSpacing( 2);
69 layout->setMargin( 2);
70
69 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); 71 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
70 72
71 QPEMenuBar *menuBar = new QPEMenuBar( this ); 73 QPEMenuBar *menuBar = new QPEMenuBar(this);
72 connectionMenu = new QPopupMenu( this ); 74 connectionMenu = new QPopupMenu( this );
@@ -74,2 +76,6 @@ OpieFtp::OpieFtp( )
74 remoteMenu = new QPopupMenu( this ); 76 remoteMenu = new QPopupMenu( this );
77 tabMenu = new QPopupMenu( this );
78
79 layout->addMultiCellWidget( menuBar, 0, 0, 0, 3 );
80
75 menuBar->insertItem( tr( "Connection" ), connectionMenu); 81 menuBar->insertItem( tr( "Connection" ), connectionMenu);
@@ -77,4 +83,5 @@ OpieFtp::OpieFtp( )
77 menuBar->insertItem( tr( "Remote" ), remoteMenu); 83 menuBar->insertItem( tr( "Remote" ), remoteMenu);
84 menuBar->insertItem( tr( "View" ), tabMenu);
78 85
79 connectionMenu->insertItem( tr( "New" ), this, SLOT( newConnection() )); 86 connectionMenu->insertItem( tr( "New" ), this, SLOT( newConnection() ));
80 connectionMenu->insertItem( tr( "Connect" ), this, SLOT( connector() )); 87 connectionMenu->insertItem( tr( "Connect" ), this, SLOT( connector() ));
@@ -83,2 +90,3 @@ OpieFtp::OpieFtp( )
83 localMenu->insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() )); 90 localMenu->insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() ));
91 localMenu->insertSeparator();
84 localMenu->insertItem( tr( "Upload" ), this, SLOT( localUpload() )); 92 localMenu->insertItem( tr( "Upload" ), this, SLOT( localUpload() ));
@@ -95,7 +103,9 @@ OpieFtp::OpieFtp( )
95 103
96 ProgressBar = new QProgressBar( this, "ProgressBar" ); 104 tabMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() ));
97 ProgressBar->setGeometry( QRect( 5, 268, 231, 15 ) ); 105 tabMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() ));
106 tabMenu->insertItem( tr( "Switch to Config" ), this, SLOT( switchToConfigTab() ));
107
108 TabWidget = new QTabWidget( this, "TabWidget" );
109 layout->addMultiCellWidget( TabWidget, 1, 1, 0, 3 );
98 110
99 TabWidget = new QTabWidget( this, "TabWidget2" );
100 TabWidget->setGeometry( QRect( 3, 25, 240, 220 ) );
101 TabWidget->setTabShape(QTabWidget::Triangular); 111 TabWidget->setTabShape(QTabWidget::Triangular);
@@ -103,5 +113,8 @@ OpieFtp::OpieFtp( )
103 tab = new QWidget( TabWidget, "tab" ); 113 tab = new QWidget( TabWidget, "tab" );
114 tabLayout = new QGridLayout( tab );
115 tabLayout->setSpacing( 2);
116 tabLayout->setMargin( 2);
104 117
105 Local_View = new QListView( tab, "Local_View" ); 118 Local_View = new QListView( tab, "Local_View" );
106 Local_View->setGeometry( QRect( 3, 2, 225, 195 ) ); 119// Local_View->setResizePolicy( QListView::AutoOneFit );
107 Local_View->addColumn( "File",120); 120 Local_View->addColumn( "File",120);
@@ -114,2 +127,4 @@ OpieFtp::OpieFtp( )
114 127
128 tabLayout->addWidget( Local_View, 0, 0 );
129
115 connect( Local_View, SIGNAL( doubleClicked( QListViewItem*)), 130 connect( Local_View, SIGNAL( doubleClicked( QListViewItem*)),
@@ -122,5 +137,7 @@ OpieFtp::OpieFtp( )
122 tab_2 = new QWidget( TabWidget, "tab_2" ); 137 tab_2 = new QWidget( TabWidget, "tab_2" );
138 tabLayout_2 = new QGridLayout( tab_2 );
139 tabLayout_2->setSpacing( 2);
140 tabLayout_2->setMargin( 2);
123 141
124 Remote_View = new QListView( tab_2, "Remote_View" ); 142 Remote_View = new QListView( tab_2, "Remote_View" );
125 Remote_View->setGeometry( QRect( 3, 2, 225, 195 ) );
126 Remote_View->addColumn( "File",120); 143 Remote_View->addColumn( "File",120);
@@ -133,3 +150,3 @@ OpieFtp::OpieFtp( )
133 150
134 connect( Remote_View, SIGNAL( doubleClicked( QListViewItem*)), 151 connect( Remote_View, SIGNAL( doubleClicked( QListViewItem*)),
135 this,SLOT( remoteListClicked(QListViewItem *)) ); 152 this,SLOT( remoteListClicked(QListViewItem *)) );
@@ -138,50 +155,67 @@ OpieFtp::OpieFtp( )
138 155
139 TabWidget->insertTab( tab_2, tr( "Remote" ) ); 156 tabLayout_2->addWidget( Remote_View, 0, 0 );
157
158 TabWidget->insertTab( tab_2, tr( "Remote" ) );
140 159
141 tab_3 = new QWidget( TabWidget, "tab_3" ); 160 tab_3 = new QWidget( TabWidget, "tab_3" );
161 tabLayout_3 = new QGridLayout( tab_3 );
162 tabLayout_3->setSpacing( 2);
163 tabLayout_3->setMargin( 2);
142 164
143 TextLabel1 = new QLabel( tab_3, "TextLabel1" ); 165 TextLabel1 = new QLabel( tab_3, "TextLabel1" );
144 TextLabel1->setGeometry( QRect( 10, 10, 60, 16 ) );
145 TextLabel1->setText( tr( "Username" ) ); 166 TextLabel1->setText( tr( "Username" ) );
167 tabLayout_3->addMultiCellWidget( TextLabel1, 0, 0, 0, 1 );
168
146 UsernameComboBox = new QComboBox( FALSE, tab_3, "UsernameComboBox" ); 169 UsernameComboBox = new QComboBox( FALSE, tab_3, "UsernameComboBox" );
147 UsernameComboBox->setGeometry( QRect( 10, 25, 196, 21 ) );
148 UsernameComboBox->setEditable(TRUE); 170 UsernameComboBox->setEditable(TRUE);
149 UsernameComboBox->lineEdit()->setText("anonymous"); 171// UsernameComboBox->lineEdit()->setText("anonymous");
172 UsernameComboBox->lineEdit()->setText("root");
150// UsernameComboBox->lineEdit()->setText("llornkcor"); 173// UsernameComboBox->lineEdit()->setText("llornkcor");
174 tabLayout_3->addMultiCellWidget( UsernameComboBox, 1, 1, 0, 1 );
151 175
152 TextLabel2 = new QLabel( tab_3, "TextLabel2" ); 176 TextLabel2 = new QLabel( tab_3, "TextLabel2" );
153 TextLabel2->setGeometry( QRect( 10, 50, 65, 16 ) );
154 TextLabel2->setText( tr( "Password" ) ); 177 TextLabel2->setText( tr( "Password" ) );
178 tabLayout_3->addMultiCellWidget( TextLabel2, 0, 0, 2, 3 );
179
155 PasswordEdit = new QLineEdit( "", tab_3, "PasswordComboBox" ); 180 PasswordEdit = new QLineEdit( "", tab_3, "PasswordComboBox" );
156 PasswordEdit->setGeometry( QRect( 10, 65, 195, 16 ) );
157 PasswordEdit->setEchoMode(QLineEdit::Password); 181 PasswordEdit->setEchoMode(QLineEdit::Password);
158 PasswordEdit->setText( tr( "me@opieftp.org" ) ); 182// PasswordEdit->setText( tr( "me@opieftp.org" ) );
183// PasswordEdit->setText( tr( "" ) );
184 tabLayout_3->addMultiCellWidget( PasswordEdit, 1, 1, 2, 3 );
159 185
160 TextLabel3 = new QLabel( tab_3, "TextLabel3" ); 186 TextLabel3 = new QLabel( tab_3, "TextLabel3" );
161 TextLabel3->setGeometry( QRect( 10, 90, 95, 16 ) );
162 TextLabel3->setText( tr( "Remote server" ) ); 187 TextLabel3->setText( tr( "Remote server" ) );
188 tabLayout_3->addMultiCellWidget( TextLabel3, 2, 2, 0, 1 );
189
163 ServerComboBox = new QComboBox( FALSE, tab_3, "ServerComboBox" ); 190 ServerComboBox = new QComboBox( FALSE, tab_3, "ServerComboBox" );
164 ServerComboBox->setGeometry( QRect( 10, 105, 195, 21 ) );
165 ServerComboBox->setEditable(TRUE); 191 ServerComboBox->setEditable(TRUE);
166 ServerComboBox->lineEdit()->setText( tr( "" ) ); 192 ServerComboBox->lineEdit()->setText( tr( "" ) );
193 tabLayout_3->addMultiCellWidget( ServerComboBox, 3, 3, 0, 1 );
167// ServerComboBox->lineEdit()->setText( tr( "llornkcor.com" ) ); 194// ServerComboBox->lineEdit()->setText( tr( "llornkcor.com" ) );
195 ServerComboBox->lineEdit()->setText( tr( "192.168.129.201" ) );
168 196
169 QLabel *TextLabel5 = new QLabel( tab_3, "TextLabel5" ); 197 QLabel *TextLabel5 = new QLabel( tab_3, "TextLabel5" );
170 TextLabel5->setGeometry( QRect( 10, 130, 95, 16 ) );
171 TextLabel5->setText( tr( "Remote path" ) ); 198 TextLabel5->setText( tr( "Remote path" ) );
199 tabLayout_3->addMultiCellWidget( TextLabel5, 2, 2, 2, 3 );
200
172 remotePath = new QLineEdit( "/", tab_3, "remotePath" ); 201 remotePath = new QLineEdit( "/", tab_3, "remotePath" );
173 remotePath->setGeometry( QRect( 10, 145, 195, 16 ) );
174 remotePath->setText( currentRemoteDir = "/"); 202 remotePath->setText( currentRemoteDir = "/");
203 tabLayout_3->addMultiCellWidget( remotePath, 3, 3, 2, 3 );
175// remotePath->setText( currentRemoteDir = "/home/llornkcor/"); 204// remotePath->setText( currentRemoteDir = "/home/llornkcor/");
176 205
177 TextLabel4 = new QLabel( tab_3, "TextLabel4" ); 206 TextLabel4 = new QLabel( tab_3, "TextLabel4" );
178 TextLabel4->setGeometry( QRect( 10, 170, 30, 21 ) );
179 TextLabel4->setText( tr( "Port" ) ); 207 TextLabel4->setText( tr( "Port" ) );
180 PortSpinBox = new QSpinBox( tab_3, "PortSpinBox" ); 208 tabLayout_3->addMultiCellWidget( TextLabel4, 4, 4, 0, 1 );
181 PortSpinBox->setGeometry( QRect( 40, 175, 75, 20 ) ); 209
210 PortSpinBox = new QSpinBox( tab_3, "PortSpinBox" );
182 PortSpinBox->setButtonSymbols( QSpinBox::UpDownArrows ); 211 PortSpinBox->setButtonSymbols( QSpinBox::UpDownArrows );
183 PortSpinBox->setMaxValue(32786); 212 PortSpinBox->setMaxValue(32786);
184 PortSpinBox->setValue( 21); 213 PortSpinBox->setValue( 4242);
214// PortSpinBox->setValue( 21);
215 tabLayout_3->addMultiCellWidget( PortSpinBox, 4, 4, 1, 1);
185 216
186 TabWidget->insertTab( tab_3, tr( "Config" ) ); 217 QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
218 tabLayout_3->addItem( spacer, 5, 0 );
219
220 TabWidget->insertTab( tab_3, tr( "Config" ) );
187 221
@@ -194,6 +228,10 @@ OpieFtp::OpieFtp( )
194 currentPathEdit = new QLineEdit( "/", this, "currentPathEdit" ); 228 currentPathEdit = new QLineEdit( "/", this, "currentPathEdit" );
195 currentPathEdit->setGeometry( QRect( 5, 248, 220, 18 ) ); 229 layout->addMultiCellWidget( currentPathEdit, 3, 3, 0, 3 );
196 currentPathEdit->setText( currentDir.canonicalPath()); 230
231 currentPathEdit->setText( currentDir.canonicalPath());
197 connect( currentPathEdit,SIGNAL(returnPressed()),this,SLOT(currentPathEditChanged())); 232 connect( currentPathEdit,SIGNAL(returnPressed()),this,SLOT(currentPathEditChanged()));
198 233
234 ProgressBar = new QProgressBar( this, "ProgressBar" );
235 layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 3 );
236
199 filterStr="*"; 237 filterStr="*";
@@ -219,5 +257,8 @@ void OpieFtp::tabChanged(QWidget *w)
219 currentPathEdit->setText( currentDir.canonicalPath()); 257 currentPathEdit->setText( currentDir.canonicalPath());
220 } else if (TabWidget->currentPageIndex() == 1) { 258 }
259 if (TabWidget->currentPageIndex() == 1) {
221 currentPathEdit->setText( currentRemoteDir ); 260 currentPathEdit->setText( currentRemoteDir );
222 } 261 }
262 if (TabWidget->currentPageIndex() == 2) {
263 }
223} 264}
@@ -260,3 +301,4 @@ void OpieFtp::localUpload()
260 301
261void OpieFtp::nullifyCallBack() { 302void OpieFtp::nullifyCallBack()
303{
262 FtpOptions(FTPLIB_CALLBACK, NULL, conn); 304 FtpOptions(FTPLIB_CALLBACK, NULL, conn);
@@ -279,4 +321,4 @@ void OpieFtp::remoteDownload()
279 QString temp; 321 QString temp;
280 temp.sprintf( remoteFile+" "+" %dkb", fsz); 322 temp.sprintf( remoteFile+" "+" %dkb", fsz);
281 323
282 ProgressBar->setTotalSteps(fsz); 324 ProgressBar->setTotalSteps(fsz);
@@ -405,3 +447,3 @@ void OpieFtp::populateLocalView()
405 fileL.sprintf( "%s -> %s", sym.fileName().data(),sym.absFilePath().data() ); 447 fileL.sprintf( "%s -> %s", sym.fileName().data(),sym.absFilePath().data() );
406 fileDate = sym.lastModified().toString(); 448 fileDate = sym.lastModified().toString();
407 } else { 449 } else {
@@ -410,3 +452,3 @@ void OpieFtp::populateLocalView()
410 fileL.sprintf( "%s",fi->fileName().data() ); 452 fileL.sprintf( "%s",fi->fileName().data() );
411 fileDate= fi->lastModified().toString(); 453 fileDate= fi->lastModified().toString();
412 if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) { 454 if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) {
@@ -491,3 +533,3 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
491 qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); 533 qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir);
492 534
493 populateRemoteView(); 535 populateRemoteView();
@@ -785,3 +827,3 @@ void OpieFtp::currentPathEditChanged()
785 } 827 }
786 828
787 remoteDirList( (const QString &)currentRemoteDir); 829 remoteDirList( (const QString &)currentRemoteDir);
@@ -789 +831,16 @@ void OpieFtp::currentPathEditChanged()
789} 831}
832
833void OpieFtp::switchToLocalTab()
834{
835TabWidget->setCurrentPage(0);
836}
837
838void OpieFtp::switchToRemoteTab()
839{
840TabWidget->setCurrentPage(1);
841}
842
843void OpieFtp::switchToConfigTab()
844{
845TabWidget->setCurrentPage(2);
846}
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
@@ -48,3 +48,3 @@ public:
48 QTabWidget *TabWidget; 48 QTabWidget *TabWidget;
49 QWidget *tab, *tab_2, *tab_3;; 49 QWidget *tab, *tab_2, *tab_3;
50 QListView *Local_View, *Remote_View; 50 QListView *Local_View, *Remote_View;
@@ -52,6 +52,6 @@ public:
52 QComboBox *UsernameComboBox, *ServerComboBox; 52 QComboBox *UsernameComboBox, *ServerComboBox;
53 QLineEdit *PasswordEdit, *remotePath, *currentPathEdit; 53 QLineEdit *PasswordEdit, *remotePath, *currentPathEdit;
54 QLabel *TextLabel2, *TextLabel1, *TextLabel3, *TextLabel4;; 54 QLabel *TextLabel2, *TextLabel1, *TextLabel3, *TextLabel4;;
55 QSpinBox* PortSpinBox; 55 QSpinBox* PortSpinBox;
56 QPopupMenu *connectionMenu, *localMenu, *remoteMenu; 56 QPopupMenu *connectionMenu, *localMenu, *remoteMenu, *tabMenu;
57 QDir currentDir; 57 QDir currentDir;
@@ -91,4 +91,10 @@ protected slots:
91 void currentPathEditChanged(); 91 void currentPathEditChanged();
92 void switchToLocalTab();
93 void switchToRemoteTab();
94 void switchToConfigTab();
92protected: 95protected:
93 void nullifyCallBack(); 96 void nullifyCallBack();
97 QGridLayout* tabLayout;
98 QGridLayout* tabLayout_2;
99 QGridLayout* tabLayout_3;
94 100