1.1 --- a/findwidget.cpp	Mon Mar 08 12:22:15 2010 +0000
     1.2 +++ b/findwidget.cpp	Mon Mar 08 12:24:26 2010 +0000
     1.3 @@ -1,3 +1,5 @@
     1.4 +#include <QAction>
     1.5 +#include <QDebug>
     1.6  #include <QLineEdit>
     1.7  #include <QVBoxLayout>
     1.8  #include <QLabel>
     1.9 @@ -9,9 +11,11 @@
    1.10  
    1.11  
    1.12  #include "findwidget.h"
    1.13 +#include "mainwindow.h"
    1.14  
    1.15  
    1.16  extern QString iconPath;
    1.17 +extern Main *mainWindow;
    1.18  
    1.19  FindWidget::FindWidget(QWidget *)
    1.20  {
    1.21 @@ -44,13 +48,18 @@
    1.22  	nextbutton->setText (tr("Next","Find widget"));
    1.23  	nextbutton->setDefault (true);
    1.24  	nextbutton->setShortcut (Qt::Key_Return);
    1.25 -	//nextbutton->setShortcutContext (Qt::WidgetShortcut);
    1.26  	connect ( nextbutton, SIGNAL( clicked() ), this, SLOT( nextPressed() ) );
    1.27  
    1.28 +	showAllButton = new QPushButton;
    1.29 +	showAllButton->setText (tr("Show all","Find widget"));
    1.30 +	//connect ( showAllButton, SIGNAL( clicked() ), this, SLOT( showAllPressed() ) );
    1.31 +	connect ( showAllButton, SIGNAL( clicked() ), mainWindow, SLOT( editOpenFindWidget() ) );
    1.32 +
    1.33  	row2Layout->addWidget (cancelbutton);
    1.34  	row2Layout->addWidget (label);
    1.35  	row2Layout->addWidget(findcombo);
    1.36  	row2Layout->addWidget(nextbutton);
    1.37 +	row2Layout->addWidget(showAllButton);
    1.38  
    1.39  	mainLayout->addLayout (row2Layout);
    1.40  
    1.41 @@ -69,7 +78,7 @@
    1.42  void FindWidget::cancelPressed()
    1.43  {
    1.44  	hide();
    1.45 -	emit (hideFindWidget() );
    1.46 +	emit (hideFindWidget() );//Restore focus
    1.47  }
    1.48  
    1.49  void FindWidget::nextPressed()
    1.50 @@ -82,6 +91,11 @@
    1.51  	setStatus (Undefined);
    1.52  }
    1.53  
    1.54 +void FindWidget::setFocus()
    1.55 +{
    1.56 +	findcombo->setFocus();
    1.57 +}
    1.58 +
    1.59  void FindWidget::setStatus (Status st)
    1.60  {
    1.61  	if (st==status) return;