Select MapEditor after closing FindWidget
authorinsilmaril
Fri Nov 27 15:00:51 2009 +0000 (2009-11-27)
changeset 81262d4137bfb90
parent 811 c79486b7cb4b
child 813 82ebfc46233b
Select MapEditor after closing FindWidget
findwidget.cpp
findwidget.h
vymview.cpp
vymview.h
     1.1 --- a/findwidget.cpp	Fri Nov 27 13:31:21 2009 +0000
     1.2 +++ b/findwidget.cpp	Fri Nov 27 15:00:51 2009 +0000
     1.3 @@ -64,6 +64,7 @@
     1.4  void FindWidget::cancelPressed()
     1.5  {
     1.6  	hide();
     1.7 +	emit (hideFindWidget() );
     1.8  }
     1.9  
    1.10  void FindWidget::nextPressed()
     2.1 --- a/findwidget.h	Fri Nov 27 13:31:21 2009 +0000
     2.2 +++ b/findwidget.h	Fri Nov 27 15:00:51 2009 +0000
     2.3 @@ -28,6 +28,7 @@
     2.4  	Status status;
     2.5  
     2.6  signals:
     2.7 +	void hideFindWidget();
     2.8  	void nextButton(QString);
     2.9  	void somethingChanged();
    2.10  
     3.1 --- a/vymview.cpp	Fri Nov 27 13:31:21 2009 +0000
     3.2 +++ b/vymview.cpp	Fri Nov 27 15:00:51 2009 +0000
     3.3 @@ -112,6 +112,10 @@
     3.4  		this, SLOT (showFindWidget() ) );
     3.5  		
     3.6  	connect (
     3.7 +		findWidget , SIGNAL (hideFindWidget() ),
     3.8 +		this, SLOT (hideFindWidget() ) );
     3.9 +		
    3.10 +	connect (
    3.11  		findWidget, SIGNAL (nextButton (QString) ),
    3.12  		this, SLOT (findNext(QString) ) );
    3.13  		
    3.14 @@ -292,6 +296,12 @@
    3.15  	findWidget->popup();
    3.16  }
    3.17  
    3.18 +void VymView::hideFindWidget()
    3.19 +{
    3.20 +	// findWidget hides itself, but we want to have focus back at mapEditor usually
    3.21 +	if (mapEditor) mapEditor->setFocus();
    3.22 +}
    3.23 +
    3.24  void VymView::findNext (QString s)
    3.25  {
    3.26  	bool cs=false;
     4.1 --- a/vymview.h	Fri Nov 27 13:31:21 2009 +0000
     4.2 +++ b/vymview.h	Fri Nov 27 15:00:51 2009 +0000
     4.3 @@ -29,6 +29,7 @@
     4.4  	void collapseOneLevel ();
     4.5  	void showSelection ();
     4.6  	void showFindWidget();
     4.7 +	void hideFindWidget();
     4.8  	void findNext (QString s);
     4.9  	void findReset();
    4.10