author | llornkcor <llornkcor> | 2004-09-25 05:26:52 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-09-25 05:26:52 (UTC) |
commit | 43ade399621278b78d658f660bde7f0e39457f53 (patch) (side-by-side diff) | |
tree | 271268029e4a128c93adaae54bfd47084881e90f /noncore/apps | |
parent | 45a59fcd4a35c9c0ce35162c0ac7a5c914e24a52 (diff) | |
download | opie-43ade399621278b78d658f660bde7f0e39457f53.zip opie-43ade399621278b78d658f660bde7f0e39457f53.tar.gz opie-43ade399621278b78d658f660bde7f0e39457f53.tar.bz2 |
change focus for edit
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 16 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmData.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 66 |
3 files changed, 46 insertions, 40 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index 3cd2067..8d07f69 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp @@ -283,5 +283,5 @@ void AdvancedFm::refreshCurrentTab() { void AdvancedFm::switchToLocalTab() { TabWidget->setCurrentWidget(0); - Local_View->setFocus(); +// Local_View->setFocus(); whichTab = 1; } @@ -289,5 +289,5 @@ void AdvancedFm::switchToLocalTab() { void AdvancedFm::switchToRemoteTab() { TabWidget->setCurrentWidget(1); - Remote_View->setFocus(); +// Remote_View->setFocus(); whichTab = 2; } @@ -382,7 +382,11 @@ void AdvancedFm::keyPressEvent( QKeyEvent *e) { void AdvancedFm::keyReleaseEvent( QKeyEvent *e) { - if( CurrentView()->hasFocus() ) - e->ignore(); - if( e->key() == Key_Left ) +// if( CurrentView()->hasFocus() ) +// e->ignore(); + if( currentPathCombo->lineEdit()->hasFocus()) { +// qDebug("shout!"); + } + + else if( e->key() == Key_Left ) upDir(); else if( e->key() == Key_Return || e->key() == Key_Enter) @@ -756,5 +760,5 @@ void AdvancedFm::setOtherTabCurrent() { TabWidget->setCurrentWidget(0); } - OtherView()->setFocus(); +// OtherView()->setFocus(); OtherView()->setSelected( CurrentView()->firstChild(), true); } diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp index d2e1d8e..fe565a0 100644 --- a/noncore/apps/advancedfm/advancedfmData.cpp +++ b/noncore/apps/advancedfm/advancedfmData.cpp @@ -129,5 +129,5 @@ void AdvancedFm::init() { menuButton->insertItem( s_removeBookmark); menuButton->insertSeparator(); - menuButton->setFocusPolicy(NoFocus); +// menuButton->setFocusPolicy(NoFocus); CBHB->addWidget( menuButton ); @@ -137,5 +137,5 @@ void AdvancedFm::init() { currentPathCombo->setEditable(TRUE); currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); - currentPathCombo->setFocusPolicy(NoFocus); +// currentPathCombo->setFocusPolicy(NoFocus); CBHB->addWidget( currentPathCombo ); diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index 5a46579..2e6b0da 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp @@ -46,5 +46,5 @@ void AdvancedFm::doDirChange() { pathItem = dealWithSymName((const QString&)pathItem)+"/"; // owarn << pathItem << oendl; - gotoDirectory( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) ); + changeTo( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) ); } } @@ -741,23 +741,24 @@ void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) { bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) { - if ( o->inherits( "QLineEdit" ) ) { - if ( e->type() == QEvent::KeyPress ) { - QKeyEvent *ke = (QKeyEvent*)e; - if ( ke->key() == Key_Return || - ke->key() == Key_Enter ) { - okRename(); - return true; + if ( o->inherits( "QLineEdit" ) ) { + qDebug("QLineEdit event"); + if ( e->type() == QEvent::KeyPress ) { + QKeyEvent *ke = (QKeyEvent*)e; + if ( ke->key() == Key_Return || + ke->key() == Key_Enter ) { + okRename(); + return true; } - else if ( ke->key() == Key_Escape ) { + else if ( ke->key() == Key_Escape ) { cancelRename(); return true; - } + } } - else if ( e->type() == QEvent::FocusOut ) { + else if ( e->type() == QEvent::FocusOut ) { cancelRename(); return true; - } + } } - if ( o->inherits( "QListView" ) ) { +/* if ( o->inherits( "QListView" ) ) { if ( e->type() == QEvent::FocusIn ) { // if( o == Local_View) { //keep track of which view @@ -771,5 +772,5 @@ bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) { OtherView()->setSelected( OtherView()->currentItem(), FALSE );//make sure there's correct selection } - +*/ return QWidget::eventFilter( o, e ); } @@ -813,7 +814,7 @@ void AdvancedFm::doRename(QListView * view) { void AdvancedFm::renameIt() { - if( !CurrentView()->currentItem()) return; + if( !CurrentView()->currentItem()) return; - QListView *thisView = CurrentView(); + QListView *thisView = CurrentView(); oldName = thisView->currentItem()->text(0); doRename( thisView ); @@ -821,20 +822,21 @@ void AdvancedFm::renameIt() { void AdvancedFm::okRename() { - if( !renameBox) return; - - QString newName = renameBox->text(); - cancelRename(); - QListView * view = CurrentView(); - QString path = CurrentDir()->canonicalPath() + "/"; - oldName = path + oldName; - newName = path + newName; - if( rename( oldName.latin1(), newName.latin1())== -1) - QMessageBox::message(tr("Note"),tr("Could not rename")); - else - oldName = ""; - QListViewItem *item = view->currentItem(); - view->takeItem( item ); - delete item; - rePopulate(); + qDebug("okrename"); + if( !renameBox) return; + + QString newName = renameBox->text(); + cancelRename(); + QListView * view = CurrentView(); + QString path = CurrentDir()->canonicalPath() + "/"; + oldName = path + oldName; + newName = path + newName; + if( rename( oldName.latin1(), newName.latin1())== -1) + QMessageBox::message(tr("Note"),tr("Could not rename")); + else + oldName = ""; + QListViewItem *item = view->currentItem(); + view->takeItem( item ); + delete item; + rePopulate(); } |