summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2004-09-25 05:26:52 (UTC)
committer llornkcor <llornkcor>2004-09-25 05:26:52 (UTC)
commit43ade399621278b78d658f660bde7f0e39457f53 (patch) (unidiff)
tree271268029e4a128c93adaae54bfd47084881e90f
parent45a59fcd4a35c9c0ce35162c0ac7a5c914e24a52 (diff)
downloadopie-43ade399621278b78d658f660bde7f0e39457f53.zip
opie-43ade399621278b78d658f660bde7f0e39457f53.tar.gz
opie-43ade399621278b78d658f660bde7f0e39457f53.tar.bz2
change focus for edit
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp16
-rw-r--r--noncore/apps/advancedfm/advancedfmData.cpp4
-rw-r--r--noncore/apps/advancedfm/advancedfmMenu.cpp66
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
@@ -279,19 +279,19 @@ void AdvancedFm::refreshCurrentTab() {
279 // if ( TabWidget->currentWidget() == tab) { 279 // if ( TabWidget->currentWidget() == tab) {
280 280
281} 281}
282 282
283void AdvancedFm::switchToLocalTab() { 283void AdvancedFm::switchToLocalTab() {
284 TabWidget->setCurrentWidget(0); 284 TabWidget->setCurrentWidget(0);
285 Local_View->setFocus(); 285 // Local_View->setFocus();
286 whichTab = 1; 286 whichTab = 1;
287} 287}
288 288
289void AdvancedFm::switchToRemoteTab() { 289void AdvancedFm::switchToRemoteTab() {
290 TabWidget->setCurrentWidget(1); 290 TabWidget->setCurrentWidget(1);
291 Remote_View->setFocus(); 291 // Remote_View->setFocus();
292 whichTab = 2; 292 whichTab = 2;
293} 293}
294 294
295void AdvancedFm::currentPathComboChanged() { 295void AdvancedFm::currentPathComboChanged() {
296 if(QDir( currentPathCombo->lineEdit()->text()).exists()) { 296 if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
297 CurrentDir()->setPath( currentPathCombo->lineEdit()->text() ); 297 CurrentDir()->setPath( currentPathCombo->lineEdit()->text() );
@@ -378,15 +378,19 @@ void AdvancedFm::doAbout() {
378 378
379void AdvancedFm::keyPressEvent( QKeyEvent *e) { 379void AdvancedFm::keyPressEvent( QKeyEvent *e) {
380 Q_UNUSED(e); 380 Q_UNUSED(e);
381} 381}
382 382
383void AdvancedFm::keyReleaseEvent( QKeyEvent *e) { 383void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
384 if( CurrentView()->hasFocus() ) 384// if( CurrentView()->hasFocus() )
385 e->ignore(); 385// e->ignore();
386 if( e->key() == Key_Left ) 386 if( currentPathCombo->lineEdit()->hasFocus()) {
387 // qDebug("shout!");
388 }
389
390 else if( e->key() == Key_Left )
387 upDir(); 391 upDir();
388 else if( e->key() == Key_Return || e->key() == Key_Enter) 392 else if( e->key() == Key_Return || e->key() == Key_Enter)
389 navigateToSelected(); 393 navigateToSelected();
390 else if( e->key() == Key_Tab) 394 else if( e->key() == Key_Tab)
391 setOtherTabCurrent(); 395 setOtherTabCurrent();
392 else if( e->key() == Key_Delete ) 396 else if( e->key() == Key_Delete )
@@ -752,13 +756,13 @@ void AdvancedFm::setOtherTabCurrent() {
752 // qDebug("setOtherTabCurrent() %d",whichTab); 756 // qDebug("setOtherTabCurrent() %d",whichTab);
753 if ( whichTab == 1) { 757 if ( whichTab == 1) {
754 TabWidget->setCurrentWidget(1); 758 TabWidget->setCurrentWidget(1);
755 } else { 759 } else {
756 TabWidget->setCurrentWidget(0); 760 TabWidget->setCurrentWidget(0);
757 } 761 }
758 OtherView()->setFocus(); 762// OtherView()->setFocus();
759 OtherView()->setSelected( CurrentView()->firstChild(), true); 763 OtherView()->setSelected( CurrentView()->firstChild(), true);
760} 764}
761 765
762void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) { 766void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) {
763// odebug << "qcop message "+msg << oendl; 767// odebug << "qcop message "+msg << oendl;
764 QDataStream stream ( data, IO_ReadOnly ); 768 QDataStream stream ( data, IO_ReadOnly );
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
@@ -125,21 +125,21 @@ void AdvancedFm::init() {
125 125
126 menuButton->setUseLabel(false); 126 menuButton->setUseLabel(false);
127 menuButton->setMaximumWidth( 20 ); 127 menuButton->setMaximumWidth( 20 );
128 menuButton->insertItem( s_addBookmark); 128 menuButton->insertItem( s_addBookmark);
129 menuButton->insertItem( s_removeBookmark); 129 menuButton->insertItem( s_removeBookmark);
130 menuButton->insertSeparator(); 130 menuButton->insertSeparator();
131 menuButton->setFocusPolicy(NoFocus); 131// menuButton->setFocusPolicy(NoFocus);
132 CBHB->addWidget( menuButton ); 132 CBHB->addWidget( menuButton );
133 133
134 customDirsToMenu(); 134 customDirsToMenu();
135 135
136 currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" ); 136 currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
137 currentPathCombo->setEditable(TRUE); 137 currentPathCombo->setEditable(TRUE);
138 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); 138 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
139 currentPathCombo->setFocusPolicy(NoFocus); 139 // currentPathCombo->setFocusPolicy(NoFocus);
140 CBHB->addWidget( currentPathCombo ); 140 CBHB->addWidget( currentPathCombo );
141 141
142 layout->addLayout( CBHB ); 142 layout->addLayout( CBHB );
143 143
144 TabWidget = new OSplitter( Horizontal, this, "TabWidget" ); 144 TabWidget = new OSplitter( Horizontal, this, "TabWidget" );
145// TabWidget = new QTabWidget( this, "TabWidget" ); 145// TabWidget = new QTabWidget( this, "TabWidget" );
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
@@ -42,13 +42,13 @@ void AdvancedFm::doDirChange() {
42 if( pathItem == "../") { 42 if( pathItem == "../") {
43 ListClicked( CurrentView()->currentItem()); 43 ListClicked( CurrentView()->currentItem());
44 } else { 44 } else {
45 if( pathItem.find(" -> ",0,TRUE) != -1) 45 if( pathItem.find(" -> ",0,TRUE) != -1)
46 pathItem = dealWithSymName((const QString&)pathItem)+"/"; 46 pathItem = dealWithSymName((const QString&)pathItem)+"/";
47// owarn << pathItem << oendl; 47// owarn << pathItem << oendl;
48 gotoDirectory( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) ); 48 changeTo( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) );
49 } 49 }
50} 50}
51 51
52void AdvancedFm::showMenuHidden() { 52void AdvancedFm::showMenuHidden() {
53 if (b) { 53 if (b) {
54 CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); 54 CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
@@ -737,43 +737,44 @@ void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) {
737 737
738 QString lineStr = buffer; 738 QString lineStr = buffer;
739 QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") ); 739 QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") );
740} 740}
741 741
742bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) { 742bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
743 if ( o->inherits( "QLineEdit" ) ) { 743 if ( o->inherits( "QLineEdit" ) ) {
744 if ( e->type() == QEvent::KeyPress ) { 744 qDebug("QLineEdit event");
745 QKeyEvent *ke = (QKeyEvent*)e; 745 if ( e->type() == QEvent::KeyPress ) {
746 if ( ke->key() == Key_Return || 746 QKeyEvent *ke = (QKeyEvent*)e;
747 ke->key() == Key_Enter ) { 747 if ( ke->key() == Key_Return ||
748 okRename(); 748 ke->key() == Key_Enter ) {
749 return true; 749 okRename();
750 return true;
750 } 751 }
751 else if ( ke->key() == Key_Escape ) { 752 else if ( ke->key() == Key_Escape ) {
752 cancelRename(); 753 cancelRename();
753 return true; 754 return true;
754 } 755 }
755 } 756 }
756 else if ( e->type() == QEvent::FocusOut ) { 757 else if ( e->type() == QEvent::FocusOut ) {
757 cancelRename(); 758 cancelRename();
758 return true; 759 return true;
759 } 760 }
760 } 761 }
761 if ( o->inherits( "QListView" ) ) { 762/* if ( o->inherits( "QListView" ) ) {
762 if ( e->type() == QEvent::FocusIn ) { 763 if ( e->type() == QEvent::FocusIn ) {
763// if( o == Local_View) { //keep track of which view 764// if( o == Local_View) { //keep track of which view
764 // qDebug("local view"); 765 // qDebug("local view");
765// whichTab = 1; 766// whichTab = 1;
766// } else { 767// } else {
767// whichTab = 2; 768// whichTab = 2;
768 // qDebug("remote view"); 769 // qDebug("remote view");
769// } 770// }
770 } 771 }
771 OtherView()->setSelected( OtherView()->currentItem(), FALSE );//make sure there's correct selection 772 OtherView()->setSelected( OtherView()->currentItem(), FALSE );//make sure there's correct selection
772 } 773 }
773 774*/
774 return QWidget::eventFilter( o, e ); 775 return QWidget::eventFilter( o, e );
775} 776}
776 777
777 778
778void AdvancedFm::cancelRename() { 779void AdvancedFm::cancelRename() {
779// odebug << "cancel rename" << oendl; 780// odebug << "cancel rename" << oendl;
@@ -809,35 +810,36 @@ void AdvancedFm::doRename(QListView * view) {
809 renameBox->setFocus(); 810 renameBox->setFocus();
810 renameBox->show(); 811 renameBox->show();
811} 812}
812 813
813 814
814void AdvancedFm::renameIt() { 815void AdvancedFm::renameIt() {
815 if( !CurrentView()->currentItem()) return; 816 if( !CurrentView()->currentItem()) return;
816 817
817 QListView *thisView = CurrentView(); 818 QListView *thisView = CurrentView();
818 oldName = thisView->currentItem()->text(0); 819 oldName = thisView->currentItem()->text(0);
819 doRename( thisView ); 820 doRename( thisView );
820} 821}
821 822
822void AdvancedFm::okRename() { 823void AdvancedFm::okRename() {
823 if( !renameBox) return; 824 qDebug("okrename");
824 825 if( !renameBox) return;
825 QString newName = renameBox->text(); 826
826 cancelRename(); 827 QString newName = renameBox->text();
827 QListView * view = CurrentView(); 828 cancelRename();
828 QString path = CurrentDir()->canonicalPath() + "/"; 829 QListView * view = CurrentView();
829 oldName = path + oldName; 830 QString path = CurrentDir()->canonicalPath() + "/";
830 newName = path + newName; 831 oldName = path + oldName;
831 if( rename( oldName.latin1(), newName.latin1())== -1) 832 newName = path + newName;
832 QMessageBox::message(tr("Note"),tr("Could not rename")); 833 if( rename( oldName.latin1(), newName.latin1())== -1)
833 else 834 QMessageBox::message(tr("Note"),tr("Could not rename"));
834 oldName = ""; 835 else
835 QListViewItem *item = view->currentItem(); 836 oldName = "";
836 view->takeItem( item ); 837 QListViewItem *item = view->currentItem();
837 delete item; 838 view->takeItem( item );
838 rePopulate(); 839 delete item;
840 rePopulate();
839} 841}
840 842
841void AdvancedFm::openSearch() { 843void AdvancedFm::openSearch() {
842 QMessageBox::message(tr("Note"),tr("Not Yet Implemented")); 844 QMessageBox::message(tr("Note"),tr("Not Yet Implemented"));
843} 845}