author | llornkcor <llornkcor> | 2002-03-30 02:00:10 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-03-30 02:00:10 (UTC) |
commit | 4fc58d156db9197bc8299f040d4337ea85b9f0d2 (patch) (unidiff) | |
tree | 7baa553895a5ccdb35c8309b8a5c43a8f05a24ec /noncore/net | |
parent | e49717bf2fa15791c2437a3ac69058ac909f0c6b (diff) | |
download | opie-4fc58d156db9197bc8299f040d4337ea85b9f0d2.zip opie-4fc58d156db9197bc8299f040d4337ea85b9f0d2.tar.gz opie-4fc58d156db9197bc8299f040d4337ea85b9f0d2.tar.bz2 |
fixed a workaround for an apparent bug in libqte when the listview is multi, and you try to select one item and popup the menu.., it needs extended mode selection to work
-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index 3e13466..956409f 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp | |||
@@ -87,125 +87,126 @@ OpieFtp::OpieFtp( ) | |||
87 | menuBar->insertItem( tr( "Connection" ), connectionMenu); | 87 | menuBar->insertItem( tr( "Connection" ), connectionMenu); |
88 | menuBar->insertItem( tr( "Local" ), localMenu); | 88 | menuBar->insertItem( tr( "Local" ), localMenu); |
89 | menuBar->insertItem( tr( "Remote" ), remoteMenu); | 89 | menuBar->insertItem( tr( "Remote" ), remoteMenu); |
90 | menuBar->insertItem( tr( "View" ), tabMenu); | 90 | menuBar->insertItem( tr( "View" ), tabMenu); |
91 | 91 | ||
92 | connectionMenu->insertItem( tr( "New" ), this, SLOT( newConnection() )); | 92 | connectionMenu->insertItem( tr( "New" ), this, SLOT( newConnection() )); |
93 | connectionMenu->insertItem( tr( "Connect" ), this, SLOT( connector() )); | 93 | connectionMenu->insertItem( tr( "Connect" ), this, SLOT( connector() )); |
94 | connectionMenu->insertItem( tr( "Disconnect" ), this, SLOT( disConnector() )); | 94 | connectionMenu->insertItem( tr( "Disconnect" ), this, SLOT( disConnector() )); |
95 | 95 | ||
96 | localMenu->insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() )); | 96 | localMenu->insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() )); |
97 | localMenu->insertSeparator(); | 97 | localMenu->insertSeparator(); |
98 | localMenu->insertItem( tr( "Upload" ), this, SLOT( localUpload() )); | 98 | localMenu->insertItem( tr( "Upload" ), this, SLOT( localUpload() )); |
99 | localMenu->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() )); | 99 | localMenu->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() )); |
100 | localMenu->insertItem( tr( "Rename" ), this, SLOT( localRename() )); | 100 | localMenu->insertItem( tr( "Rename" ), this, SLOT( localRename() )); |
101 | localMenu->insertSeparator(); | 101 | localMenu->insertSeparator(); |
102 | localMenu->insertItem( tr( "Delete" ), this, SLOT( localDelete() )); | 102 | localMenu->insertItem( tr( "Delete" ), this, SLOT( localDelete() )); |
103 | localMenu->setCheckable(TRUE); | 103 | localMenu->setCheckable(TRUE); |
104 | 104 | ||
105 | remoteMenu->insertItem( tr( "Download" ), this, SLOT( remoteDownload() )); | 105 | remoteMenu->insertItem( tr( "Download" ), this, SLOT( remoteDownload() )); |
106 | remoteMenu->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() )); | 106 | remoteMenu->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() )); |
107 | remoteMenu->insertItem( tr( "Rename" ), this, SLOT( remoteRename() )); | 107 | remoteMenu->insertItem( tr( "Rename" ), this, SLOT( remoteRename() )); |
108 | remoteMenu->insertSeparator(); | 108 | remoteMenu->insertSeparator(); |
109 | remoteMenu->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() )); | 109 | remoteMenu->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() )); |
110 | 110 | ||
111 | tabMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() )); | 111 | tabMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() )); |
112 | tabMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() )); | 112 | tabMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() )); |
113 | tabMenu->insertItem( tr( "Switch to Config" ), this, SLOT( switchToConfigTab() )); | 113 | tabMenu->insertItem( tr( "Switch to Config" ), this, SLOT( switchToConfigTab() )); |
114 | tabMenu->setCheckable(TRUE); | 114 | tabMenu->setCheckable(TRUE); |
115 | 115 | ||
116 | TabWidget = new QTabWidget( this, "TabWidget" ); | 116 | TabWidget = new QTabWidget( this, "TabWidget" ); |
117 | layout->addMultiCellWidget( TabWidget, 1, 1, 0, 3 ); | 117 | layout->addMultiCellWidget( TabWidget, 1, 1, 0, 3 ); |
118 | 118 | ||
119 | TabWidget->setTabShape(QTabWidget::Triangular); | 119 | TabWidget->setTabShape(QTabWidget::Triangular); |
120 | 120 | ||
121 | tab = new QWidget( TabWidget, "tab" ); | 121 | tab = new QWidget( TabWidget, "tab" ); |
122 | tabLayout = new QGridLayout( tab ); | 122 | tabLayout = new QGridLayout( tab ); |
123 | tabLayout->setSpacing( 2); | 123 | tabLayout->setSpacing( 2); |
124 | tabLayout->setMargin( 2); | 124 | tabLayout->setMargin( 2); |
125 | 125 | ||
126 | Local_View = new QListView( tab, "Local_View" ); | 126 | Local_View = new QListView( tab, "Local_View" ); |
127 | // Local_View->setResizePolicy( QListView::AutoOneFit ); | 127 | // Local_View->setResizePolicy( QListView::AutoOneFit ); |
128 | Local_View->addColumn( tr("File"),150); | 128 | Local_View->addColumn( tr("File"),150); |
129 | Local_View->addColumn( tr("Size"),-1); | 129 | Local_View->addColumn( tr("Size"),-1); |
130 | Local_View->setColumnAlignment(1,QListView::AlignRight); | 130 | Local_View->setColumnAlignment(1,QListView::AlignRight); |
131 | Local_View->addColumn( tr("Date"),-1); | 131 | Local_View->addColumn( tr("Date"),-1); |
132 | Local_View->setColumnAlignment(2,QListView::AlignRight); | 132 | Local_View->setColumnAlignment(2,QListView::AlignRight); |
133 | Local_View->setAllColumnsShowFocus(TRUE); | 133 | Local_View->setAllColumnsShowFocus(TRUE); |
134 | Local_View->setMultiSelection( TRUE ); | 134 | Local_View->setMultiSelection( TRUE ); |
135 | 135 | Local_View->setSelectionMode(QlistView::Extended); | |
136 | QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); | 136 | QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); |
137 | 137 | ||
138 | tabLayout->addWidget( Local_View, 0, 0 ); | 138 | tabLayout->addWidget( Local_View, 0, 0 ); |
139 | 139 | ||
140 | connect( Local_View, SIGNAL( clicked( QListViewItem*)), | 140 | connect( Local_View, SIGNAL( clicked( QListViewItem*)), |
141 | this,SLOT( localListClicked(QListViewItem *)) ); | 141 | this,SLOT( localListClicked(QListViewItem *)) ); |
142 | // connect( Local_View, SIGNAL( doubleClicked( QListViewItem*)), | 142 | // connect( Local_View, SIGNAL( doubleClicked( QListViewItem*)), |
143 | // this,SLOT( localListClicked(QListViewItem *)) ); | 143 | // this,SLOT( localListClicked(QListViewItem *)) ); |
144 | connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | 144 | connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), |
145 | this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) ); | 145 | this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) ); |
146 | 146 | ||
147 | TabWidget->insertTab( tab, tr( "Local" ) ); | 147 | TabWidget->insertTab( tab, tr( "Local" ) ); |
148 | 148 | ||
149 | tab_2 = new QWidget( TabWidget, "tab_2" ); | 149 | tab_2 = new QWidget( TabWidget, "tab_2" ); |
150 | tabLayout_2 = new QGridLayout( tab_2 ); | 150 | tabLayout_2 = new QGridLayout( tab_2 ); |
151 | tabLayout_2->setSpacing( 2); | 151 | tabLayout_2->setSpacing( 2); |
152 | tabLayout_2->setMargin( 2); | 152 | tabLayout_2->setMargin( 2); |
153 | 153 | ||
154 | Remote_View = new QListView( tab_2, "Remote_View" ); | 154 | Remote_View = new QListView( tab_2, "Remote_View" ); |
155 | Remote_View->addColumn( tr("File"),150); | 155 | Remote_View->addColumn( tr("File"),150); |
156 | Remote_View->addColumn( tr("Size"),-1); | 156 | Remote_View->addColumn( tr("Size"),-1); |
157 | Remote_View->setColumnAlignment(1,QListView::AlignRight); | 157 | Remote_View->setColumnAlignment(1,QListView::AlignRight); |
158 | Remote_View->addColumn( tr("Date"),-1); | 158 | Remote_View->addColumn( tr("Date"),-1); |
159 | Remote_View->setColumnAlignment(2,QListView::AlignRight); | 159 | Remote_View->setColumnAlignment(2,QListView::AlignRight); |
160 | Remote_View->addColumn( tr("Dir"),-1); | 160 | Remote_View->addColumn( tr("Dir"),-1); |
161 | Remote_View->setColumnAlignment(4,QListView::AlignRight); | 161 | Remote_View->setColumnAlignment(4,QListView::AlignRight); |
162 | Remote_View->setAllColumnsShowFocus(TRUE); | 162 | Remote_View->setAllColumnsShowFocus(TRUE); |
163 | Remote_View->setMultiSelection( TRUE ); | 163 | Remote_View->setMultiSelection( TRUE ); |
164 | Remote_View->setSelectionMode(QlistView::Extended); | ||
164 | 165 | ||
165 | QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); | 166 | QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); |
166 | 167 | ||
167 | connect( Remote_View, SIGNAL( clicked( QListViewItem*)), | 168 | connect( Remote_View, SIGNAL( clicked( QListViewItem*)), |
168 | this,SLOT( remoteListClicked(QListViewItem *)) ); | 169 | this,SLOT( remoteListClicked(QListViewItem *)) ); |
169 | connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | 170 | connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), |
170 | this,SLOT( RemoteListPressed(int, QListViewItem *, const QPoint&, int)) ); | 171 | this,SLOT( RemoteListPressed(int, QListViewItem *, const QPoint&, int)) ); |
171 | 172 | ||
172 | tabLayout_2->addWidget( Remote_View, 0, 0 ); | 173 | tabLayout_2->addWidget( Remote_View, 0, 0 ); |
173 | 174 | ||
174 | TabWidget->insertTab( tab_2, tr( "Remote" ) ); | 175 | TabWidget->insertTab( tab_2, tr( "Remote" ) ); |
175 | 176 | ||
176 | tab_3 = new QWidget( TabWidget, "tab_3" ); | 177 | tab_3 = new QWidget( TabWidget, "tab_3" ); |
177 | tabLayout_3 = new QGridLayout( tab_3 ); | 178 | tabLayout_3 = new QGridLayout( tab_3 ); |
178 | tabLayout_3->setSpacing( 2); | 179 | tabLayout_3->setSpacing( 2); |
179 | tabLayout_3->setMargin( 2); | 180 | tabLayout_3->setMargin( 2); |
180 | 181 | ||
181 | TextLabel1 = new QLabel( tab_3, "TextLabel1" ); | 182 | TextLabel1 = new QLabel( tab_3, "TextLabel1" ); |
182 | TextLabel1->setText( tr( "Username" ) ); | 183 | TextLabel1->setText( tr( "Username" ) ); |
183 | tabLayout_3->addMultiCellWidget( TextLabel1, 0, 0, 0, 1 ); | 184 | tabLayout_3->addMultiCellWidget( TextLabel1, 0, 0, 0, 1 ); |
184 | 185 | ||
185 | UsernameComboBox = new QComboBox( FALSE, tab_3, "UsernameComboBox" ); | 186 | UsernameComboBox = new QComboBox( FALSE, tab_3, "UsernameComboBox" ); |
186 | UsernameComboBox->setEditable(TRUE); | 187 | UsernameComboBox->setEditable(TRUE); |
187 | tabLayout_3->addMultiCellWidget( UsernameComboBox, 1, 1, 0, 1 ); | 188 | tabLayout_3->addMultiCellWidget( UsernameComboBox, 1, 1, 0, 1 ); |
188 | 189 | ||
189 | TextLabel2 = new QLabel( tab_3, "TextLabel2" ); | 190 | TextLabel2 = new QLabel( tab_3, "TextLabel2" ); |
190 | TextLabel2->setText( tr( "Password" ) ); | 191 | TextLabel2->setText( tr( "Password" ) ); |
191 | tabLayout_3->addMultiCellWidget( TextLabel2, 0, 0, 2, 3 ); | 192 | tabLayout_3->addMultiCellWidget( TextLabel2, 0, 0, 2, 3 ); |
192 | 193 | ||
193 | PasswordEdit = new QLineEdit( "", tab_3, "PasswordComboBox" ); | 194 | PasswordEdit = new QLineEdit( "", tab_3, "PasswordComboBox" ); |
194 | PasswordEdit->setEchoMode(QLineEdit::Password); | 195 | PasswordEdit->setEchoMode(QLineEdit::Password); |
195 | tabLayout_3->addMultiCellWidget( PasswordEdit, 1, 1, 2, 3 ); | 196 | tabLayout_3->addMultiCellWidget( PasswordEdit, 1, 1, 2, 3 ); |
196 | 197 | ||
197 | TextLabel3 = new QLabel( tab_3, "TextLabel3" ); | 198 | TextLabel3 = new QLabel( tab_3, "TextLabel3" ); |
198 | TextLabel3->setText( tr( "Remote server" ) ); | 199 | TextLabel3->setText( tr( "Remote server" ) ); |
199 | tabLayout_3->addMultiCellWidget( TextLabel3, 2, 2, 0, 1 ); | 200 | tabLayout_3->addMultiCellWidget( TextLabel3, 2, 2, 0, 1 ); |
200 | 201 | ||
201 | ServerComboBox = new QComboBox( FALSE, tab_3, "ServerComboBox" ); | 202 | ServerComboBox = new QComboBox( FALSE, tab_3, "ServerComboBox" ); |
202 | ServerComboBox->setEditable(TRUE); | 203 | ServerComboBox->setEditable(TRUE); |
203 | tabLayout_3->addMultiCellWidget( ServerComboBox, 3, 3, 0, 1 ); | 204 | tabLayout_3->addMultiCellWidget( ServerComboBox, 3, 3, 0, 1 ); |
204 | 205 | ||
205 | connect(ServerComboBox,SIGNAL(activated(int)),this,SLOT(serverComboSelected(int ) )); | 206 | connect(ServerComboBox,SIGNAL(activated(int)),this,SLOT(serverComboSelected(int ) )); |
206 | connect(ServerComboBox,SIGNAL(textChanged(const QString &)),this,SLOT(serverComboEdited(const QString & ) )); | 207 | connect(ServerComboBox,SIGNAL(textChanged(const QString &)),this,SLOT(serverComboEdited(const QString & ) )); |
207 | 208 | ||
208 | QLabel *TextLabel5 = new QLabel( tab_3, "TextLabel5" ); | 209 | QLabel *TextLabel5 = new QLabel( tab_3, "TextLabel5" ); |
209 | TextLabel5->setText( tr( "Remote path" ) ); | 210 | TextLabel5->setText( tr( "Remote path" ) ); |
210 | tabLayout_3->addMultiCellWidget( TextLabel5, 2, 2, 2, 3 ); | 211 | tabLayout_3->addMultiCellWidget( TextLabel5, 2, 2, 2, 3 ); |
211 | 212 | ||
@@ -240,96 +241,97 @@ OpieFtp::OpieFtp( ) | |||
240 | 241 | ||
241 | connect(TabWidget,SIGNAL(currentChanged(QWidget *)), | 242 | connect(TabWidget,SIGNAL(currentChanged(QWidget *)), |
242 | this,SLOT(tabChanged(QWidget*))); | 243 | this,SLOT(tabChanged(QWidget*))); |
243 | 244 | ||
244 | currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 245 | currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
245 | currentDir.setPath( QDir::currentDirPath()); | 246 | currentDir.setPath( QDir::currentDirPath()); |
246 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | 247 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); |
247 | 248 | ||
248 | currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" ); | 249 | currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" ); |
249 | layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 3 ); | 250 | layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 3 ); |
250 | currentPathCombo->setEditable(TRUE); | 251 | currentPathCombo->setEditable(TRUE); |
251 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); | 252 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); |
252 | 253 | ||
253 | connect( currentPathCombo, SIGNAL( activated( const QString & ) ), | 254 | connect( currentPathCombo, SIGNAL( activated( const QString & ) ), |
254 | this, SLOT( currentPathComboActivated( const QString & ) ) ); | 255 | this, SLOT( currentPathComboActivated( const QString & ) ) ); |
255 | 256 | ||
256 | connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()), | 257 | connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()), |
257 | this,SLOT(currentPathComboChanged())); | 258 | this,SLOT(currentPathComboChanged())); |
258 | 259 | ||
259 | ProgressBar = new QProgressBar( this, "ProgressBar" ); | 260 | ProgressBar = new QProgressBar( this, "ProgressBar" ); |
260 | layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 3 ); | 261 | layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 3 ); |
261 | 262 | ||
262 | // fillCombos(); | 263 | // fillCombos(); |
263 | 264 | ||
264 | filterStr="*"; | 265 | filterStr="*"; |
265 | b=FALSE; | 266 | b=FALSE; |
266 | populateLocalView(); | 267 | populateLocalView(); |
267 | readConfig(); | 268 | readConfig(); |
268 | ServerComboBox->setCurrentItem(currentServerConfig); | 269 | ServerComboBox->setCurrentItem(currentServerConfig); |
269 | TabWidget->setCurrentPage(2); | 270 | TabWidget->setCurrentPage(2); |
270 | } | 271 | } |
271 | 272 | ||
272 | OpieFtp::~OpieFtp() | 273 | OpieFtp::~OpieFtp() |
273 | { | 274 | { |
274 | } | 275 | } |
275 | 276 | ||
276 | void OpieFtp::cleanUp() | 277 | void OpieFtp::cleanUp() |
277 | { | 278 | { |
278 | if(conn) | 279 | if(conn) |
279 | FtpQuit(conn); | 280 | FtpQuit(conn); |
280 | QString sfile=QDir::homeDirPath(); | 281 | QString sfile=QDir::homeDirPath(); |
281 | if(sfile.right(1) != "/") | 282 | if(sfile.right(1) != "/") |
282 | sfile+="/._temp"; | 283 | sfile+="/._temp"; |
283 | else | 284 | else |
284 | sfile+="._temp"; | 285 | sfile+="._temp"; |
285 | QFile file( sfile); | 286 | QFile file( sfile); |
286 | if(file.exists()) | 287 | if(file.exists()) |
287 | file.remove(); | 288 | file.remove(); |
289 | exit(0); | ||
288 | } | 290 | } |
289 | 291 | ||
290 | void OpieFtp::tabChanged(QWidget *w) | 292 | void OpieFtp::tabChanged(QWidget *w) |
291 | { | 293 | { |
292 | if (TabWidget->currentPageIndex() == 0) { | 294 | if (TabWidget->currentPageIndex() == 0) { |
293 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); | 295 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); |
294 | tabMenu->setItemChecked(tabMenu->idAt(0),TRUE); | 296 | tabMenu->setItemChecked(tabMenu->idAt(0),TRUE); |
295 | tabMenu->setItemChecked(tabMenu->idAt(1),FALSE); | 297 | tabMenu->setItemChecked(tabMenu->idAt(1),FALSE); |
296 | tabMenu->setItemChecked(tabMenu->idAt(2),FALSE); | 298 | tabMenu->setItemChecked(tabMenu->idAt(2),FALSE); |
297 | } | 299 | } |
298 | if (TabWidget->currentPageIndex() == 1) { | 300 | if (TabWidget->currentPageIndex() == 1) { |
299 | currentPathCombo->lineEdit()->setText( currentRemoteDir ); | 301 | currentPathCombo->lineEdit()->setText( currentRemoteDir ); |
300 | tabMenu->setItemChecked(tabMenu->idAt(1),TRUE); | 302 | tabMenu->setItemChecked(tabMenu->idAt(1),TRUE); |
301 | tabMenu->setItemChecked(tabMenu->idAt(0),FALSE); | 303 | tabMenu->setItemChecked(tabMenu->idAt(0),FALSE); |
302 | tabMenu->setItemChecked(tabMenu->idAt(2),FALSE); | 304 | tabMenu->setItemChecked(tabMenu->idAt(2),FALSE); |
303 | } | 305 | } |
304 | if (TabWidget->currentPageIndex() == 2) { | 306 | if (TabWidget->currentPageIndex() == 2) { |
305 | tabMenu->setItemChecked(tabMenu->idAt(2),TRUE); | 307 | tabMenu->setItemChecked(tabMenu->idAt(2),TRUE); |
306 | tabMenu->setItemChecked(tabMenu->idAt(0),FALSE); | 308 | tabMenu->setItemChecked(tabMenu->idAt(0),FALSE); |
307 | tabMenu->setItemChecked(tabMenu->idAt(1),FALSE); | 309 | tabMenu->setItemChecked(tabMenu->idAt(1),FALSE); |
308 | } | 310 | } |
309 | } | 311 | } |
310 | 312 | ||
311 | void OpieFtp::newConnection() | 313 | void OpieFtp::newConnection() |
312 | { | 314 | { |
313 | UsernameComboBox->lineEdit()->setText(""); | 315 | UsernameComboBox->lineEdit()->setText(""); |
314 | PasswordEdit->setText( "" ); | 316 | PasswordEdit->setText( "" ); |
315 | ServerComboBox->lineEdit()->setText( ""); | 317 | ServerComboBox->lineEdit()->setText( ""); |
316 | remotePath->setText( currentRemoteDir = "/"); | 318 | remotePath->setText( currentRemoteDir = "/"); |
317 | PortSpinBox->setValue( 21); | 319 | PortSpinBox->setValue( 21); |
318 | TabWidget->setCurrentPage(2); | 320 | TabWidget->setCurrentPage(2); |
319 | currentServerConfig = -1; | 321 | currentServerConfig = -1; |
320 | } | 322 | } |
321 | 323 | ||
322 | void OpieFtp::serverComboEdited(const QString & edit) | 324 | void OpieFtp::serverComboEdited(const QString & edit) |
323 | { | 325 | { |
324 | if( !edit.isEmpty() ) { | 326 | if( !edit.isEmpty() ) { |
325 | currentServerConfig = -1; | 327 | currentServerConfig = -1; |
326 | // qDebug("comboedited"); | 328 | // qDebug("comboedited"); |
327 | } | 329 | } |
328 | } | 330 | } |
329 | 331 | ||
330 | void OpieFtp::connectorBtnToggled(bool On) | 332 | void OpieFtp::connectorBtnToggled(bool On) |
331 | { | 333 | { |
332 | if(On) { | 334 | if(On) { |
333 | connector(); | 335 | connector(); |
334 | } else { | 336 | } else { |
335 | disConnector(); | 337 | disConnector(); |
@@ -349,97 +351,96 @@ void OpieFtp::connector() | |||
349 | connectServerBtn->setOn(FALSE); | 351 | connectServerBtn->setOn(FALSE); |
350 | connectServerBtn->setText( tr("Connect")); | 352 | connectServerBtn->setText( tr("Connect")); |
351 | return; | 353 | return; |
352 | } | 354 | } |
353 | FtpInit(); | 355 | FtpInit(); |
354 | TabWidget->setCurrentPage(1); | 356 | TabWidget->setCurrentPage(1); |
355 | QString ftp_host = ServerComboBox->currentText(); | 357 | QString ftp_host = ServerComboBox->currentText(); |
356 | QString ftp_user = UsernameComboBox->currentText(); | 358 | QString ftp_user = UsernameComboBox->currentText(); |
357 | QString ftp_pass = PasswordEdit->text(); | 359 | QString ftp_pass = PasswordEdit->text(); |
358 | QString port=PortSpinBox->cleanText(); | 360 | QString port=PortSpinBox->cleanText(); |
359 | port.stripWhiteSpace(); | 361 | port.stripWhiteSpace(); |
360 | 362 | ||
361 | if(ftp_host.find("ftp://",0, TRUE) != -1 ) | 363 | if(ftp_host.find("ftp://",0, TRUE) != -1 ) |
362 | ftp_host=ftp_host.right(ftp_host.length()-6); | 364 | ftp_host=ftp_host.right(ftp_host.length()-6); |
363 | ftp_host+=":"+port; | 365 | ftp_host+=":"+port; |
364 | if (!FtpConnect( ftp_host.latin1(), &conn)) { | 366 | if (!FtpConnect( ftp_host.latin1(), &conn)) { |
365 | QMessageBox::message(tr("Note"),tr("Unable to connect to\n")+ftp_host); | 367 | QMessageBox::message(tr("Note"),tr("Unable to connect to\n")+ftp_host); |
366 | connectServerBtn->setOn(FALSE); | 368 | connectServerBtn->setOn(FALSE); |
367 | connectServerBtn->setText( tr("Connect")); | 369 | connectServerBtn->setText( tr("Connect")); |
368 | return ; | 370 | return ; |
369 | } | 371 | } |
370 | if (!FtpLogin( ftp_user.latin1(), ftp_pass.latin1(),conn )) { | 372 | if (!FtpLogin( ftp_user.latin1(), ftp_pass.latin1(),conn )) { |
371 | QString msg; | 373 | QString msg; |
372 | msg.sprintf(tr("Unable to log in\n")+"%s",FtpLastResponse(conn)); | 374 | msg.sprintf(tr("Unable to log in\n")+"%s",FtpLastResponse(conn)); |
373 | msg.replace(QRegExp(":"),"\n"); | 375 | msg.replace(QRegExp(":"),"\n"); |
374 | QMessageBox::message(tr("Note"),msg); | 376 | QMessageBox::message(tr("Note"),msg); |
375 | if(conn) | 377 | if(conn) |
376 | FtpQuit(conn); | 378 | FtpQuit(conn); |
377 | connectServerBtn->setOn(FALSE); | 379 | connectServerBtn->setOn(FALSE); |
378 | connectServerBtn->setText( tr("Connect")); | 380 | connectServerBtn->setText( tr("Connect")); |
379 | return ; | 381 | return ; |
380 | } | 382 | } |
381 | remoteDirList("/") ; | 383 | remoteDirList("/") ; |
382 | setCaption(ftp_host); | 384 | setCaption(ftp_host); |
383 | writeConfig(); | 385 | writeConfig(); |
384 | connectServerBtn->setText( tr("Disconnect")); | 386 | connectServerBtn->setText( tr("Disconnect")); |
385 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 387 | QCopEnvelope ( "QPE/System", "notBusy()" ); |
386 | } | 388 | } |
387 | 389 | ||
388 | void OpieFtp::disConnector() | 390 | void OpieFtp::disConnector() |
389 | { | 391 | { |
390 | if(conn) | 392 | if(conn) |
391 | FtpQuit(conn); | 393 | FtpQuit(conn); |
392 | setCaption("OpieFtp"); | 394 | setCaption("OpieFtp"); |
393 | currentRemoteDir="/"; | 395 | currentRemoteDir="/"; |
394 | Remote_View->clear(); | 396 | Remote_View->clear(); |
395 | connectServerBtn->setText( tr("Connect")); | 397 | connectServerBtn->setText( tr("Connect")); |
396 | connectServerBtn->setOn(FALSE); | 398 | connectServerBtn->setOn(FALSE); |
397 | |||
398 | } | 399 | } |
399 | 400 | ||
400 | void OpieFtp::localUpload() | 401 | void OpieFtp::localUpload() |
401 | { | 402 | { |
402 | int fsz; | 403 | int fsz; |
403 | QCopEnvelope ( "QPE/System", "busy()" ); | 404 | QCopEnvelope ( "QPE/System", "busy()" ); |
404 | // qApp->processEvents(); | 405 | // qApp->processEvents(); |
405 | QList<QListViewItem> * getSelectedItems( QListView * Local_View ); | 406 | QList<QListViewItem> * getSelectedItems( QListView * Local_View ); |
406 | QListViewItemIterator it( Local_View ); | 407 | QListViewItemIterator it( Local_View ); |
407 | for ( ; it.current(); ++it ) { | 408 | for ( ; it.current(); ++it ) { |
408 | if ( it.current()->isSelected() ) { | 409 | if ( it.current()->isSelected() ) { |
409 | QString strItem = it.current()->text(0); | 410 | QString strItem = it.current()->text(0); |
410 | QString localFile = currentDir.canonicalPath()+"/"+strItem; | 411 | QString localFile = currentDir.canonicalPath()+"/"+strItem; |
411 | QString remoteFile= currentRemoteDir+strItem; | 412 | QString remoteFile= currentRemoteDir+strItem; |
412 | QFileInfo fi(localFile); | 413 | QFileInfo fi(localFile); |
413 | if( !fi.isDir()) { | 414 | if( !fi.isDir()) { |
414 | fsz=fi.size(); | 415 | fsz=fi.size(); |
415 | ProgressBar->setTotalSteps(fsz); | 416 | ProgressBar->setTotalSteps(fsz); |
416 | 417 | ||
417 | FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn); | 418 | FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn); |
418 | FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn); | 419 | FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn); |
419 | FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn); | 420 | FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn); |
420 | FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); | 421 | FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); |
421 | qDebug("Put: %s, %s",localFile.latin1(),remoteFile.latin1()); | 422 | qDebug("Put: %s, %s",localFile.latin1(),remoteFile.latin1()); |
422 | 423 | ||
423 | if( !FtpPut( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) { | 424 | if( !FtpPut( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) { |
424 | QString msg; | 425 | QString msg; |
425 | msg.sprintf(tr("Unable to upload\n")+"%s",FtpLastResponse(conn)); | 426 | msg.sprintf(tr("Unable to upload\n")+"%s",FtpLastResponse(conn)); |
426 | msg.replace(QRegExp(":"),"\n"); | 427 | msg.replace(QRegExp(":"),"\n"); |
427 | QMessageBox::message(tr("Note"),msg); | 428 | QMessageBox::message(tr("Note"),msg); |
428 | } | 429 | } |
429 | } else { | 430 | } else { |
430 | QMessageBox::message(tr("Note"),tr("Cannot upload directories")); | 431 | QMessageBox::message(tr("Note"),tr("Cannot upload directories")); |
431 | } | 432 | } |
432 | ProgressBar->reset(); | 433 | ProgressBar->reset(); |
433 | nullifyCallBack(); | 434 | nullifyCallBack(); |
434 | it.current()->setSelected(FALSE); | 435 | it.current()->setSelected(FALSE); |
435 | } //end currentSelected | 436 | } //end currentSelected |
436 | } | 437 | } |
437 | TabWidget->setCurrentPage(1); | 438 | TabWidget->setCurrentPage(1); |
438 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate | 439 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate |
439 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 440 | QCopEnvelope ( "QPE/System", "notBusy()" ); |
440 | } | 441 | } |
441 | 442 | ||
442 | void OpieFtp::nullifyCallBack() | 443 | void OpieFtp::nullifyCallBack() |
443 | { | 444 | { |
444 | FtpOptions(FTPLIB_CALLBACK, NULL, conn); | 445 | FtpOptions(FTPLIB_CALLBACK, NULL, conn); |
445 | FtpOptions(FTPLIB_IDLETIME, NULL, conn); | 446 | FtpOptions(FTPLIB_IDLETIME, NULL, conn); |
@@ -742,103 +743,99 @@ void OpieFtp::localListClicked(QListViewItem *selectedItem) | |||
742 | strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem); | 743 | strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem); |
743 | if( QFile::exists(strItem ) ) { | 744 | if( QFile::exists(strItem ) ) { |
744 | // qDebug("upload "+strItem); | 745 | // qDebug("upload "+strItem); |
745 | } | 746 | } |
746 | } //end not symlink | 747 | } //end not symlink |
747 | chdir(strItem.latin1()); | 748 | chdir(strItem.latin1()); |
748 | } | 749 | } |
749 | } | 750 | } |
750 | } | 751 | } |
751 | 752 | ||
752 | void OpieFtp::doLocalCd() | 753 | void OpieFtp::doLocalCd() |
753 | { | 754 | { |
754 | localListClicked( Local_View->currentItem()); | 755 | localListClicked( Local_View->currentItem()); |
755 | } | 756 | } |
756 | 757 | ||
757 | void OpieFtp:: doRemoteCd() | 758 | void OpieFtp:: doRemoteCd() |
758 | { | 759 | { |
759 | remoteListClicked( Remote_View->currentItem()); | 760 | remoteListClicked( Remote_View->currentItem()); |
760 | 761 | ||
761 | } | 762 | } |
762 | 763 | ||
763 | void OpieFtp::showHidden() | 764 | void OpieFtp::showHidden() |
764 | { | 765 | { |
765 | if (!b) { | 766 | if (!b) { |
766 | currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | 767 | currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); |
767 | localMenu->setItemChecked(localMenu->idAt(0),TRUE); | 768 | localMenu->setItemChecked(localMenu->idAt(0),TRUE); |
768 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | 769 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); |
769 | b=TRUE; | 770 | b=TRUE; |
770 | 771 | ||
771 | } else { | 772 | } else { |
772 | currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 773 | currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
773 | localMenu->setItemChecked(localMenu->idAt(0),FALSE); | 774 | localMenu->setItemChecked(localMenu->idAt(0),FALSE); |
774 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | 775 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); |
775 | b=FALSE; | 776 | b=FALSE; |
776 | } | 777 | } |
777 | populateLocalView(); | 778 | populateLocalView(); |
778 | } | 779 | } |
779 | 780 | ||
780 | void OpieFtp::ListPressed( int mouse, QListViewItem *item, const QPoint &point, int i) | 781 | void OpieFtp::ListPressed( int mouse, QListViewItem *item, const QPoint &point, int i) |
781 | { | 782 | { |
782 | // if(item) | 783 | // if(item) |
783 | if (mouse == 2) { | 784 | if (mouse == 2) { |
784 | showLocalMenu(item); | 785 | showLocalMenu(item); |
785 | } | 786 | } |
786 | } | 787 | } |
787 | 788 | ||
788 | void OpieFtp::RemoteListPressed( int mouse, QListViewItem *item, const QPoint &point, int i) | 789 | void OpieFtp::RemoteListPressed( int mouse, QListViewItem *item, const QPoint &point, int i) |
789 | { | 790 | { |
790 | switch (mouse) { | 791 | if(mouse == 2) { |
791 | case 1: | ||
792 | break; | ||
793 | case 2: | ||
794 | showRemoteMenu(item); | 792 | showRemoteMenu(item); |
795 | break; | 793 | } |
796 | }; | ||
797 | } | 794 | } |
798 | 795 | ||
799 | void OpieFtp::showRemoteMenu(QListViewItem * item) | 796 | void OpieFtp::showRemoteMenu(QListViewItem * item) |
800 | { | 797 | { |
801 | QPopupMenu m;// = new QPopupMenu( Local_View ); | 798 | QPopupMenu m;// = new QPopupMenu( Local_View ); |
802 | if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE) != -1) | 799 | if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE) != -1) |
803 | m.insertItem( tr( "Change Directory" ), this, SLOT( doRemoteCd() )); | 800 | m.insertItem( tr( "Change Directory" ), this, SLOT( doRemoteCd() )); |
804 | else | 801 | else |
805 | m.insertItem( tr( "Download" ), this, SLOT( remoteDownload() )); | 802 | m.insertItem( tr( "Download" ), this, SLOT( remoteDownload() )); |
806 | m.insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() )); | 803 | m.insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() )); |
807 | m.insertItem( tr( "Rename" ), this, SLOT( remoteRename() )); | 804 | m.insertItem( tr( "Rename" ), this, SLOT( remoteRename() )); |
808 | m.insertSeparator(); | 805 | m.insertSeparator(); |
809 | m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() )); | 806 | m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() )); |
810 | m.exec( QCursor::pos() ); | 807 | m.exec( QCursor::pos() ); |
811 | } | 808 | } |
812 | 809 | ||
813 | void OpieFtp::showLocalMenu(QListViewItem * item) | 810 | void OpieFtp::showLocalMenu(QListViewItem * item) |
814 | { | 811 | { |
815 | 812 | ||
816 | QPopupMenu m; | 813 | QPopupMenu m; |
817 | m.insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() )); | 814 | m.insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() )); |
818 | m.insertSeparator(); | 815 | m.insertSeparator(); |
819 | if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE) !=-1) | 816 | if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE) !=-1) |
820 | m.insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() )); | 817 | m.insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() )); |
821 | else | 818 | else |
822 | m.insertItem( tr( "Upload" ), this, SLOT( localUpload() )); | 819 | m.insertItem( tr( "Upload" ), this, SLOT( localUpload() )); |
823 | m.insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() )); | 820 | m.insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() )); |
824 | m.insertItem( tr( "Rename" ), this, SLOT( localRename() )); | 821 | m.insertItem( tr( "Rename" ), this, SLOT( localRename() )); |
825 | m.insertSeparator(); | 822 | m.insertSeparator(); |
826 | m.insertItem( tr( "Delete" ), this, SLOT( localDelete() )); | 823 | m.insertItem( tr( "Delete" ), this, SLOT( localDelete() )); |
827 | m.setCheckable(TRUE); | 824 | m.setCheckable(TRUE); |
828 | if (b) | 825 | if (b) |
829 | m.setItemChecked(m.idAt(0),TRUE); | 826 | m.setItemChecked(m.idAt(0),TRUE); |
830 | else | 827 | else |
831 | m.setItemChecked(m.idAt(0),FALSE); | 828 | m.setItemChecked(m.idAt(0),FALSE); |
832 | 829 | ||
833 | m.exec( QCursor::pos() ); | 830 | m.exec( QCursor::pos() ); |
834 | } | 831 | } |
835 | 832 | ||
836 | void OpieFtp::localMakDir() | 833 | void OpieFtp::localMakDir() |
837 | { | 834 | { |
838 | InputDialog *fileDlg; | 835 | InputDialog *fileDlg; |
839 | fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0); | 836 | fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0); |
840 | fileDlg->exec(); | 837 | fileDlg->exec(); |
841 | if( fileDlg->result() == 1 ) { | 838 | if( fileDlg->result() == 1 ) { |
842 | QString filename = fileDlg->LineEdit1->text(); | 839 | QString filename = fileDlg->LineEdit1->text(); |
843 | currentDir.mkdir( currentDir.canonicalPath()+"/"+filename); | 840 | currentDir.mkdir( currentDir.canonicalPath()+"/"+filename); |
844 | } | 841 | } |