# HG changeset patch # User insilmaril # Date 1259334051 0 # Node ID 62d4137bfb904ca64296727bb6ca23a1dc629fd1 # Parent c79486b7cb4b3c5752298260b6bd977ba2176615 Select MapEditor after closing FindWidget diff -r c79486b7cb4b -r 62d4137bfb90 findwidget.cpp --- a/findwidget.cpp Fri Nov 27 13:31:21 2009 +0000 +++ b/findwidget.cpp Fri Nov 27 15:00:51 2009 +0000 @@ -64,6 +64,7 @@ void FindWidget::cancelPressed() { hide(); + emit (hideFindWidget() ); } void FindWidget::nextPressed() diff -r c79486b7cb4b -r 62d4137bfb90 findwidget.h --- a/findwidget.h Fri Nov 27 13:31:21 2009 +0000 +++ b/findwidget.h Fri Nov 27 15:00:51 2009 +0000 @@ -28,6 +28,7 @@ Status status; signals: + void hideFindWidget(); void nextButton(QString); void somethingChanged(); diff -r c79486b7cb4b -r 62d4137bfb90 vymview.cpp --- a/vymview.cpp Fri Nov 27 13:31:21 2009 +0000 +++ b/vymview.cpp Fri Nov 27 15:00:51 2009 +0000 @@ -112,6 +112,10 @@ this, SLOT (showFindWidget() ) ); connect ( + findWidget , SIGNAL (hideFindWidget() ), + this, SLOT (hideFindWidget() ) ); + + connect ( findWidget, SIGNAL (nextButton (QString) ), this, SLOT (findNext(QString) ) ); @@ -292,6 +296,12 @@ findWidget->popup(); } +void VymView::hideFindWidget() +{ + // findWidget hides itself, but we want to have focus back at mapEditor usually + if (mapEditor) mapEditor->setFocus(); +} + void VymView::findNext (QString s) { bool cs=false; diff -r c79486b7cb4b -r 62d4137bfb90 vymview.h --- a/vymview.h Fri Nov 27 13:31:21 2009 +0000 +++ b/vymview.h Fri Nov 27 15:00:51 2009 +0000 @@ -29,6 +29,7 @@ void collapseOneLevel (); void showSelection (); void showFindWidget(); + void hideFindWidget(); void findNext (QString s); void findReset();