diff -r fac2248e2afa -r 832e96c9abb6 findwidget.cpp --- a/findwidget.cpp Mon Mar 08 12:22:15 2010 +0000 +++ b/findwidget.cpp Mon Mar 08 12:24:26 2010 +0000 @@ -1,3 +1,5 @@ +#include +#include #include #include #include @@ -9,9 +11,11 @@ #include "findwidget.h" +#include "mainwindow.h" extern QString iconPath; +extern Main *mainWindow; FindWidget::FindWidget(QWidget *) { @@ -44,13 +48,18 @@ nextbutton->setText (tr("Next","Find widget")); nextbutton->setDefault (true); nextbutton->setShortcut (Qt::Key_Return); - //nextbutton->setShortcutContext (Qt::WidgetShortcut); connect ( nextbutton, SIGNAL( clicked() ), this, SLOT( nextPressed() ) ); + showAllButton = new QPushButton; + showAllButton->setText (tr("Show all","Find widget")); + //connect ( showAllButton, SIGNAL( clicked() ), this, SLOT( showAllPressed() ) ); + connect ( showAllButton, SIGNAL( clicked() ), mainWindow, SLOT( editOpenFindWidget() ) ); + row2Layout->addWidget (cancelbutton); row2Layout->addWidget (label); row2Layout->addWidget(findcombo); row2Layout->addWidget(nextbutton); + row2Layout->addWidget(showAllButton); mainLayout->addLayout (row2Layout); @@ -69,7 +78,7 @@ void FindWidget::cancelPressed() { hide(); - emit (hideFindWidget() ); + emit (hideFindWidget() );//Restore focus } void FindWidget::nextPressed() @@ -82,6 +91,11 @@ setStatus (Undefined); } +void FindWidget::setFocus() +{ + findcombo->setFocus(); +} + void FindWidget::setStatus (Status st) { if (st==status) return;