-rw-r--r-- | korganizer/searchdialog.cpp | 72 |
1 files changed, 38 insertions, 34 deletions
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 3fd9740..aa1b244 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <qcheckbox.h> | 26 | #include <qcheckbox.h> |
27 | #include <qgroupbox.h> | 27 | #include <qgroupbox.h> |
28 | #include <qlabel.h> | 28 | #include <qlabel.h> |
29 | #include <qwhatsthis.h> | ||
29 | #include <qlineedit.h> | 30 | #include <qlineedit.h> |
30 | #include <qpushbutton.h> | 31 | #include <qpushbutton.h> |
31 | 32 | ||
@@ -42,23 +43,26 @@ | |||
42 | #include "searchdialog.h" | 43 | #include "searchdialog.h" |
43 | 44 | ||
44 | SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | 45 | SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) |
45 | : KDialogBase(Plain,i18n("KO/Pi Find "),User1|Close,User1,parent,0,false,false, | 46 | : QVBox( 0 ) |
46 | i18n("&Find")) | 47 | |
47 | { | 48 | { |
48 | mCalendar = calendar; | 49 | mCalendar = calendar; |
49 | QFrame *topFrame = plainPage(); | 50 | QFrame *topFrame = new QFrame( this ) ;//plainPage(); |
50 | QVBoxLayout *layout = new QVBoxLayout(topFrame,0,spacingHint()); | 51 | QVBoxLayout *layout = new QVBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint()); |
51 | 52 | ||
52 | // Search expression | 53 | // Search expression |
53 | QHBoxLayout *subLayout = new QHBoxLayout(); | 54 | QHBoxLayout *subLayout = new QHBoxLayout(); |
54 | layout->addLayout(subLayout); | 55 | layout->addLayout(subLayout); |
55 | |||
56 | searchLabel = new QLabel(topFrame); | 56 | searchLabel = new QLabel(topFrame); |
57 | searchLabel->setText(i18n("Search for:")); | 57 | searchLabel->setText(i18n("Search for:")); |
58 | subLayout->addWidget(searchLabel); | 58 | subLayout->addWidget(searchLabel); |
59 | 59 | ||
60 | searchEdit = new QLineEdit(topFrame); | 60 | searchEdit = new QLineEdit(topFrame); |
61 | subLayout->addWidget(searchEdit); | 61 | subLayout->addWidget(searchEdit); |
62 | QPushButton *OkButton = new QPushButton( i18n("&Find"), topFrame ); | ||
63 | //OkButton->setDefault( true ); | ||
64 | connect(OkButton,SIGNAL(clicked()),SLOT(doSearch())); | ||
65 | subLayout->addWidget(OkButton); | ||
62 | searchEdit->setText("*"); // Find all events by default | 66 | searchEdit->setText("*"); // Find all events by default |
63 | searchEdit->setFocus(); | 67 | searchEdit->setFocus(); |
64 | connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & ))); | 68 | connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & ))); |
@@ -67,8 +71,6 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
67 | // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"), | 71 | // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"), |
68 | // topFrame); | 72 | // topFrame); |
69 | 73 | ||
70 | |||
71 | |||
72 | QHBox *incidenceGroup = new QHBox( topFrame ); | 74 | QHBox *incidenceGroup = new QHBox( topFrame ); |
73 | layout->addWidget(incidenceGroup); | 75 | layout->addWidget(incidenceGroup); |
74 | 76 | ||
@@ -96,8 +98,7 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
96 | // layout->addWidget(rangeGroup); | 98 | // layout->addWidget(rangeGroup); |
97 | 99 | ||
98 | QWidget *rangeWidget = new QWidget(topFrame); | 100 | QWidget *rangeWidget = new QWidget(topFrame); |
99 | QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,spacingHint()); | 101 | QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint()); |
100 | |||
101 | rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget)); | 102 | rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget)); |
102 | mStartDate = new KDateEdit(rangeWidget); | 103 | mStartDate = new KDateEdit(rangeWidget); |
103 | rangeLayout->addWidget(mStartDate); | 104 | rangeLayout->addWidget(mStartDate); |
@@ -105,33 +106,19 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
105 | mEndDate = new KDateEdit(rangeWidget); | 106 | mEndDate = new KDateEdit(rangeWidget); |
106 | mEndDate->setDate(QDate::currentDate().addDays(365)); | 107 | mEndDate->setDate(QDate::currentDate().addDays(365)); |
107 | rangeLayout->addWidget(mEndDate); | 108 | rangeLayout->addWidget(mEndDate); |
108 | 109 | QToolButton *wt = QWhatsThis::whatsThisButton ( rangeWidget ); | |
109 | // mInclusiveCheck = new QCheckBox(i18n("Events have to be completely included"), topFrame); | 110 | rangeLayout->addWidget( (QWidget*)wt ); |
110 | //mInclusiveCheck->setChecked(false); | ||
111 | layout->addWidget(rangeWidget); | 111 | layout->addWidget(rangeWidget); |
112 | //layout->addWidget(mInclusiveCheck); | ||
113 | // Subjects to search | ||
114 | |||
115 | |||
116 | // Results list view | 112 | // Results list view |
117 | listView = new KOListView(mCalendar,topFrame); | 113 | listView = new KOListView(mCalendar,topFrame); |
118 | //listView->showDates(); | ||
119 | |||
120 | |||
121 | layout->addWidget(listView); | 114 | layout->addWidget(listView); |
122 | 115 | ||
123 | // if ( KOPrefs::instance()->mCompactDialogs ) { | ||
124 | // KOGlobals::fitDialogToScreen( this, true ); | ||
125 | // } | ||
126 | |||
127 | listView->readSettings(KOGlobals::config(),"SearchListView Layout"); | 116 | listView->readSettings(KOGlobals::config(),"SearchListView Layout"); |
128 | connect(this,SIGNAL(user1Clicked()),SLOT(doSearch())); | ||
129 | QPushButton *CloseButton = findButton( Close ); | ||
130 | //connect(CloseButton,SIGNAL(clicked()),listView, SLOT(clear())); | ||
131 | 117 | ||
132 | #ifndef DESKTOP_VERSION | 118 | setCaption( i18n("KO/Pi Find: ")); |
133 | setCaption(i18n("Click OK to search ->")); | 119 | #ifdef DESKTOP_VERSION |
134 | hideButtons(); | 120 | OkButton = new QPushButton( i18n("Close"), this ); |
121 | connect(OkButton,SIGNAL(clicked()),SLOT(hide())); | ||
135 | #endif | 122 | #endif |
136 | } | 123 | } |
137 | 124 | ||
@@ -158,7 +145,9 @@ void SearchDialog::updateList() | |||
158 | } | 145 | } |
159 | void SearchDialog::searchTextChanged( const QString &_text ) | 146 | void SearchDialog::searchTextChanged( const QString &_text ) |
160 | { | 147 | { |
148 | #if 0 | ||
161 | enableButton( KDialogBase::User1, !_text.isEmpty() ); | 149 | enableButton( KDialogBase::User1, !_text.isEmpty() ); |
150 | #endif | ||
162 | } | 151 | } |
163 | 152 | ||
164 | void SearchDialog::doSearch() | 153 | void SearchDialog::doSearch() |
@@ -390,12 +379,27 @@ void SearchDialog::search(const QRegExp &re) | |||
390 | } | 379 | } |
391 | 380 | ||
392 | } | 381 | } |
393 | /* | 382 | |
394 | void SearchDialog::keyPressEvent ( QKeyEvent *e) | 383 | void SearchDialog::keyPressEvent ( QKeyEvent *e) |
395 | { | 384 | { |
396 | 385 | switch ( e->key() ) { | |
397 | e->ignore(); | 386 | case Qt::Key_Escape: |
398 | 387 | hide(); | |
388 | break; | ||
389 | case Qt::Key_F: | ||
390 | if ( e->state() == Qt::ControlButton ) { | ||
391 | qDebug("full "); | ||
392 | |||
393 | } | ||
394 | break; | ||
395 | case Qt::Key_Return: | ||
396 | case Qt::Key_Enter: | ||
397 | doSearch(); | ||
398 | break; | ||
399 | |||
400 | default: | ||
401 | e->ignore(); | ||
402 | } | ||
399 | } | 403 | } |
400 | */ | 404 | |
401 | //mMatchedJournals; | 405 | //mMatchedJournals; |