| -rw-r--r-- | korganizer/searchdialog.cpp | 68 |
1 files changed, 36 insertions, 32 deletions
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 3fd9740..aa1b244 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -27,4 +27,5 @@ #include <qgroupbox.h> #include <qlabel.h> +#include <qwhatsthis.h> #include <qlineedit.h> #include <qpushbutton.h> @@ -43,15 +44,14 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) - : KDialogBase(Plain,i18n("KO/Pi Find "),User1|Close,User1,parent,0,false,false, - i18n("&Find")) + : QVBox( 0 ) + { mCalendar = calendar; - QFrame *topFrame = plainPage(); - QVBoxLayout *layout = new QVBoxLayout(topFrame,0,spacingHint()); + QFrame *topFrame = new QFrame( this ) ;//plainPage(); + QVBoxLayout *layout = new QVBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint()); // Search expression QHBoxLayout *subLayout = new QHBoxLayout(); layout->addLayout(subLayout); - searchLabel = new QLabel(topFrame); searchLabel->setText(i18n("Search for:")); @@ -60,4 +60,8 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) searchEdit = new QLineEdit(topFrame); subLayout->addWidget(searchEdit); + QPushButton *OkButton = new QPushButton( i18n("&Find"), topFrame ); + //OkButton->setDefault( true ); + connect(OkButton,SIGNAL(clicked()),SLOT(doSearch())); + subLayout->addWidget(OkButton); searchEdit->setText("*"); // Find all events by default searchEdit->setFocus(); @@ -68,6 +72,4 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) // topFrame); - - QHBox *incidenceGroup = new QHBox( topFrame ); layout->addWidget(incidenceGroup); @@ -97,6 +99,5 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) QWidget *rangeWidget = new QWidget(topFrame); - QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,spacingHint()); - + QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint()); rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget)); mStartDate = new KDateEdit(rangeWidget); @@ -106,31 +107,17 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) mEndDate->setDate(QDate::currentDate().addDays(365)); rangeLayout->addWidget(mEndDate); - - // mInclusiveCheck = new QCheckBox(i18n("Events have to be completely included"), topFrame); - //mInclusiveCheck->setChecked(false); + QToolButton *wt = QWhatsThis::whatsThisButton ( rangeWidget ); + rangeLayout->addWidget( (QWidget*)wt ); layout->addWidget(rangeWidget); - //layout->addWidget(mInclusiveCheck); - // Subjects to search - - // Results list view listView = new KOListView(mCalendar,topFrame); - //listView->showDates(); - - layout->addWidget(listView); - // if ( KOPrefs::instance()->mCompactDialogs ) { - // KOGlobals::fitDialogToScreen( this, true ); - // } - listView->readSettings(KOGlobals::config(),"SearchListView Layout"); - connect(this,SIGNAL(user1Clicked()),SLOT(doSearch())); - QPushButton *CloseButton = findButton( Close ); - //connect(CloseButton,SIGNAL(clicked()),listView, SLOT(clear())); -#ifndef DESKTOP_VERSION - setCaption(i18n("Click OK to search ->")); - hideButtons(); + setCaption( i18n("KO/Pi Find: ")); +#ifdef DESKTOP_VERSION + OkButton = new QPushButton( i18n("Close"), this ); + connect(OkButton,SIGNAL(clicked()),SLOT(hide())); #endif } @@ -159,5 +146,7 @@ void SearchDialog::updateList() void SearchDialog::searchTextChanged( const QString &_text ) { +#if 0 enableButton( KDialogBase::User1, !_text.isEmpty() ); +#endif } @@ -391,11 +380,26 @@ void SearchDialog::search(const QRegExp &re) } -/* + void SearchDialog::keyPressEvent ( QKeyEvent *e) { + switch ( e->key() ) { + case Qt::Key_Escape: + hide(); + break; + case Qt::Key_F: + if ( e->state() == Qt::ControlButton ) { + qDebug("full "); - e->ignore(); + } + break; + case Qt::Key_Return: + case Qt::Key_Enter: + doSearch(); + break; + default: + e->ignore(); } -*/ +} + //mMatchedJournals; |