summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt10
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt2
-rw-r--r--bin/kdepim/korganizer/icons16/workweek2.pngbin579 -> 609 bytes
-rw-r--r--bin/kdepim/korganizer/workweek2.pngbin907 -> 929 bytes
-rw-r--r--korganizer/koprefs.cpp1
-rw-r--r--korganizer/koprefs.h1
-rw-r--r--korganizer/mainwindow.cpp26
-rw-r--r--korganizer/searchdialog.cpp72
-rw-r--r--korganizer/searchdialog.h7
9 files changed, 69 insertions, 50 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 7c81b3a..d3a8bc1 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,8 +1,18 @@
1Info about the changes in new versions of KDE-Pim/Pi 1Info about the changes in new versions of KDE-Pim/Pi
2 2
3********** VERSION 2.0.10 ************
4
5KO/Pi:
6In the desktop versions the context menu in the search dialog was broken after introducing the What'sThis info for the list view.
7This is fixed.
8Changed the search dialog a bit to make it more user friendly.
9(E.g.: Removed message box about "no items found" and set key focus to search line edit after search).
10
11Added config option to hide the week number in KO/Pi toolbar.
12
3********** VERSION 2.0.9 ************ 13********** VERSION 2.0.9 ************
4 14
5Made month view icons for multiday events a bit nicer. 15Made month view icons for multiday events a bit nicer.
6Some minor fixes in KO/Pi 16Some minor fixes in KO/Pi
7(e.g. go to today did not work for new week view properly). 17(e.g. go to today did not work for new week view properly).
8 18
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 1073fe7..b526df9 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1289,13 +1289,13 @@
1289{ "(%1) ","%1-" }, 1289{ "(%1) ","%1-" },
1290{ "<p><b>K</b>: Week view in Month view syle</p>\n","<p><b>K</b>: Wochenansicht in Art der Monatsansicht</p>\n" }, 1290{ "<p><b>K</b>: Week view in Month view syle</p>\n","<p><b>K</b>: Wochenansicht in Art der Monatsansicht</p>\n" },
1291{ "Enable tooltips displaying summary of ev.","Titel-Tooltips anzeigen" }, 1291{ "Enable tooltips displaying summary of ev.","Titel-Tooltips anzeigen" },
1292{ "Enable scrollbars in month view cells","Scrollbar in Zellen anzeigen" }, 1292{ "Enable scrollbars in month view cells","Scrollbar in Zellen anzeigen" },
1293{ "Summary/Loc.","Titel/Ort" }, 1293{ "Summary/Loc.","Titel/Ort" },
1294{ "No items found. Use '*' and '?' where needed.","Nichts gefunden. Benutze '*' and '?' wo benötigt." }, 1294{ "No items found. Use '*' and '?' where needed.","Nichts gefunden. Benutze '*' and '?' wo benötigt." },
1295{ "","" }, 1295{ "Week Number","Wochennummer" },
1296{ "","" }, 1296{ "","" },
1297{ "","" }, 1297{ "","" },
1298{ "","" }, 1298{ "","" },
1299{ "","" }, 1299{ "","" },
1300{ "","" }, 1300{ "","" },
1301{ "","" }, 1301{ "","" },
diff --git a/bin/kdepim/korganizer/icons16/workweek2.png b/bin/kdepim/korganizer/icons16/workweek2.png
index e0e1fde..d3033d4 100644
--- a/bin/kdepim/korganizer/icons16/workweek2.png
+++ b/bin/kdepim/korganizer/icons16/workweek2.png
Binary files differ
diff --git a/bin/kdepim/korganizer/workweek2.png b/bin/kdepim/korganizer/workweek2.png
index 76cb86c..9538d53 100644
--- a/bin/kdepim/korganizer/workweek2.png
+++ b/bin/kdepim/korganizer/workweek2.png
Binary files differ
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index a91074f..7e3deff 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -82,12 +82,13 @@ KOPrefs::KOPrefs() :
82 addItemBool("ShowIconBackFast",&mShowIconBackFast,true); 82 addItemBool("ShowIconBackFast",&mShowIconBackFast,true);
83 addItemBool("ShowIconBack",&mShowIconBack,true); 83 addItemBool("ShowIconBack",&mShowIconBack,true);
84 addItemBool("ShowIconToday",&mShowIconToday,true); 84 addItemBool("ShowIconToday",&mShowIconToday,true);
85 addItemBool("ShowIconForward",&mShowIconForward,true); 85 addItemBool("ShowIconForward",&mShowIconForward,true);
86 addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true); 86 addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true);
87 addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,true); 87 addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,true);
88 addItemBool("ShowIconWeekNum",&mShowIconWeekNum,true);
88 addItemBool("ShowIconNextDays",&mShowIconNextDays,true); 89 addItemBool("ShowIconNextDays",&mShowIconNextDays,true);
89 addItemBool("ShowIconNext",&mShowIconNext,true); 90 addItemBool("ShowIconNext",&mShowIconNext,true);
90 addItemBool("ShowIconJournal",&mShowIconJournal,true); 91 addItemBool("ShowIconJournal",&mShowIconJournal,true);
91 addItemBool("ShowIconStretch",&mShowIconStretch,true); 92 addItemBool("ShowIconStretch",&mShowIconStretch,true);
92 addItemInt("LastLoadedLanguage",&mOldLanguage,0); 93 addItemInt("LastLoadedLanguage",&mOldLanguage,0);
93 94
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index e4e3dd7..09a0dce 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -178,12 +178,13 @@ class KOPrefs : public KPimPrefs
178 bool mShowIconBackFast; 178 bool mShowIconBackFast;
179 bool mShowIconBack; 179 bool mShowIconBack;
180 bool mShowIconToday; 180 bool mShowIconToday;
181 bool mShowIconForward; 181 bool mShowIconForward;
182 bool mShowIconForwardFast; 182 bool mShowIconForwardFast;
183 bool mShowIconWhatsThis; 183 bool mShowIconWhatsThis;
184 bool mShowIconWeekNum;
184 bool mShowIconNextDays; 185 bool mShowIconNextDays;
185 bool mShowIconNext; 186 bool mShowIconNext;
186 bool mShowIconJournal; 187 bool mShowIconJournal;
187 188
188 bool mShowIconStretch; 189 bool mShowIconStretch;
189 190
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a164fa4..4f2cccf 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -568,13 +568,14 @@ void MainWindow::initActions()
568 } 568 }
569 mWeekBgColor = iconToolBar->backgroundColor(); 569 mWeekBgColor = iconToolBar->backgroundColor();
570 mWeekPixmap.resize( pixWid , pixHei ); 570 mWeekPixmap.resize( pixWid , pixHei );
571 mWeekPixmap.fill( mWeekBgColor ); 571 mWeekPixmap.fill( mWeekBgColor );
572 icon = mWeekPixmap; 572 icon = mWeekPixmap;
573 mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this ); 573 mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
574 mWeekAction->addTo( iconToolBar ); 574 if ( p-> mShowIconWeekNum )
575 mWeekAction->addTo( iconToolBar );
575 mWeekFont = font(); 576 mWeekFont = font();
576 577
577 int fontPoint = mWeekFont.pointSize(); 578 int fontPoint = mWeekFont.pointSize();
578 QFontMetrics f( mWeekFont ); 579 QFontMetrics f( mWeekFont );
579 int fontWid = f.width( "30" ); 580 int fontWid = f.width( "30" );
580 while ( fontWid > pixWid ) { 581 while ( fontWid > pixWid ) {
@@ -620,12 +621,13 @@ void MainWindow::initActions()
620 mView, SLOT( undo_delete() ) ); 621 mView, SLOT( undo_delete() ) );
621 actionMenu->insertSeparator(); 622 actionMenu->insertSeparator();
622 623
623 icon = loadPixmap( pathString + "newevent" ); 624 icon = loadPixmap( pathString + "newevent" );
624 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); 625 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
625 configureToolBarMenu->insertSeparator(); 626 configureToolBarMenu->insertSeparator();
627 configureToolBarMenu->insertItem(i18n("Week Number"), 400);
626 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); 628 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
627 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); 629 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
628 ne_action->addTo( actionMenu ); 630 ne_action->addTo( actionMenu );
629 connect( ne_action, SIGNAL( activated() ), 631 connect( ne_action, SIGNAL( activated() ),
630 mView, SLOT( newEvent() ) ); 632 mView, SLOT( newEvent() ) );
631 icon = loadPixmap( pathString + "newtodo" ); 633 icon = loadPixmap( pathString + "newtodo" );
@@ -703,27 +705,27 @@ void MainWindow::initActions()
703 icon = loadPixmap( pathString + "week" ); 705 icon = loadPixmap( pathString + "week" );
704 configureToolBarMenu->insertItem(icon, i18n("Week"), 60 ); 706 configureToolBarMenu->insertItem(icon, i18n("Week"), 60 );
705 QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this ); 707 QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this );
706 day7_action->addTo( viewMenu ); 708 day7_action->addTo( viewMenu );
707 connect( day7_action, SIGNAL( activated() ), 709 connect( day7_action, SIGNAL( activated() ),
708 mView->viewManager(), SLOT( showWeekView() ) ); 710 mView->viewManager(), SLOT( showWeekView() ) );
711
712 icon = loadPixmap( pathString + "workweek2" );
713 configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 );
714 QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this );
715 day6_action->addTo( viewMenu );
716 connect( day6_action, SIGNAL( activated() ),
717 mView->viewManager(), SLOT( showMonthViewWeek() ) );
709 718
710 icon = loadPixmap( pathString + "month" ); 719 icon = loadPixmap( pathString + "month" );
711 configureToolBarMenu->insertItem(icon, i18n("Month"), 70 ); 720 configureToolBarMenu->insertItem(icon, i18n("Month"), 70 );
712 QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this ); 721 QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this );
713 month_action->addTo( viewMenu ); 722 month_action->addTo( viewMenu );
714 connect( month_action, SIGNAL( activated() ), 723 connect( month_action, SIGNAL( activated() ),
715 mView->viewManager(), SLOT( showMonthView() ) ); 724 mView->viewManager(), SLOT( showMonthView() ) );
716 725
717 icon = loadPixmap( pathString + "workweek2" );
718 configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 );
719 QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this );
720 day6_action->addTo( viewMenu );
721 connect( day6_action, SIGNAL( activated() ),
722 mView->viewManager(), SLOT( showMonthViewWeek() ) );
723
724 icon = loadPixmap( pathString + "todo" ); 726 icon = loadPixmap( pathString + "todo" );
725 configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); 727 configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 );
726 QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); 728 QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
727 todoview_action->addTo( viewMenu ); 729 todoview_action->addTo( viewMenu );
728 connect( todoview_action, SIGNAL( activated() ), 730 connect( todoview_action, SIGNAL( activated() ),
729 mView->viewManager(), SLOT( showTodoView() ) ); 731 mView->viewManager(), SLOT( showTodoView() ) );
@@ -998,16 +1000,16 @@ void MainWindow::initActions()
998 if (p-> mShowIconDay1) 1000 if (p-> mShowIconDay1)
999 day1_action->addTo( iconToolBar ); 1001 day1_action->addTo( iconToolBar );
1000 if (p-> mShowIconDay5) 1002 if (p-> mShowIconDay5)
1001 day5_action->addTo( iconToolBar ); 1003 day5_action->addTo( iconToolBar );
1002 if (p-> mShowIconDay7) 1004 if (p-> mShowIconDay7)
1003 day7_action->addTo( iconToolBar ); 1005 day7_action->addTo( iconToolBar );
1004 if (p-> mShowIconMonth)
1005 month_action->addTo( iconToolBar );
1006 if (p-> mShowIconDay6) 1006 if (p-> mShowIconDay6)
1007 day6_action->addTo( iconToolBar ); 1007 day6_action->addTo( iconToolBar );
1008 if (p-> mShowIconMonth)
1009 month_action->addTo( iconToolBar );
1008 if (p-> mShowIconTodoview) 1010 if (p-> mShowIconTodoview)
1009 todoview_action->addTo( iconToolBar ); 1011 todoview_action->addTo( iconToolBar );
1010 if (p-> mShowIconJournal) 1012 if (p-> mShowIconJournal)
1011 viewjournal_action->addTo( iconToolBar ); 1013 viewjournal_action->addTo( iconToolBar );
1012 icon = loadPixmap( pathString + "2leftarrowB" ); 1014 icon = loadPixmap( pathString + "2leftarrowB" );
1013 configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14); 1015 configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14);
@@ -1084,13 +1086,14 @@ void MainWindow::initActions()
1084 if (p-> mShowIconNext) 1086 if (p-> mShowIconNext)
1085 configureToolBarMenu->setItemChecked( 110, true ); 1087 configureToolBarMenu->setItemChecked( 110, true );
1086 if (p-> mShowIconJournal) 1088 if (p-> mShowIconJournal)
1087 configureToolBarMenu->setItemChecked( 90, true ); 1089 configureToolBarMenu->setItemChecked( 90, true );
1088 if (p-> mShowIconWhatsThis) 1090 if (p-> mShowIconWhatsThis)
1089 configureToolBarMenu->setItemChecked( 300, true ); 1091 configureToolBarMenu->setItemChecked( 300, true );
1090 1092 if (p-> mShowIconWeekNum)
1093 configureToolBarMenu->setItemChecked( 400, true );
1091 QLabel* dummy = new QLabel( iconToolBar ); 1094 QLabel* dummy = new QLabel( iconToolBar );
1092 dummy->setBackgroundColor( iconToolBar->backgroundColor() ); 1095 dummy->setBackgroundColor( iconToolBar->backgroundColor() );
1093 if (!p-> mShowIconStretch) 1096 if (!p-> mShowIconStretch)
1094 iconToolBar->setStretchableWidget ( dummy ) ; 1097 iconToolBar->setStretchableWidget ( dummy ) ;
1095 else 1098 else
1096 configureToolBarMenu->setItemChecked( 5, true ); 1099 configureToolBarMenu->setItemChecked( 5, true );
@@ -1825,12 +1828,13 @@ void MainWindow::configureToolBar( int item )
1825 p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); 1828 p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 );
1826 p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 ); 1829 p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 );
1827 p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 ); 1830 p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 );
1828 p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); 1831 p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 );
1829 p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); 1832 p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 );
1830 p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); 1833 p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 );
1834 p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 );
1831 // initActions(); 1835 // initActions();
1832} 1836}
1833 1837
1834void MainWindow::setCaptionToDates() 1838void MainWindow::setCaptionToDates()
1835{ 1839{
1836 QString selDates; 1840 QString selDates;
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 3fd9740..aa1b244 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -23,12 +23,13 @@
23*/ 23*/
24 24
25#include <qlayout.h> 25#include <qlayout.h>
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
32#include <klocale.h> 33#include <klocale.h>
33#include <kmessagebox.h> 34#include <kmessagebox.h>
34 35
@@ -39,39 +40,40 @@
39 40
40#include "calendarview.h" 41#include "calendarview.h"
41#include "koviewmanager.h" 42#include "koviewmanager.h"
42#include "searchdialog.h" 43#include "searchdialog.h"
43 44
44SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) 45SearchDialog::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 & )));
65 connect(searchEdit, SIGNAL( returnPressed () ),this,SLOT(doSearch())); 69 connect(searchEdit, SIGNAL( returnPressed () ),this,SLOT(doSearch()));
66 // Subjects to search 70 // Subjects to search
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
75 mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup); 77 mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup);
76 mSearchEvent->setChecked(true); 78 mSearchEvent->setChecked(true);
77 mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup); 79 mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup);
@@ -93,48 +95,33 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
93 // Date range 95 // Date range
94 // QGroupBox *rangeGroup = new QGroupBox(1,Horizontal,i18n("Date Range"), 96 // QGroupBox *rangeGroup = new QGroupBox(1,Horizontal,i18n("Date Range"),
95 // topFrame); 97 // topFrame);
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);
104 rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget)); 105 rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget));
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
138SearchDialog::~SearchDialog() 125SearchDialog::~SearchDialog()
139{ 126{
140 127
@@ -155,13 +142,15 @@ void SearchDialog::updateList()
155 //qDebug("SearchDialog::cleared "); 142 //qDebug("SearchDialog::cleared ");
156 143
157 } 144 }
158} 145}
159void SearchDialog::searchTextChanged( const QString &_text ) 146void 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
164void SearchDialog::doSearch() 153void SearchDialog::doSearch()
165{ 154{
166 QRegExp re; 155 QRegExp re;
167 156
@@ -387,15 +376,30 @@ void SearchDialog::search(const QRegExp &re)
387 } 376 }
388 } 377 }
389 } 378 }
390 } 379 }
391 380
392} 381}
393/* 382
394void SearchDialog::keyPressEvent ( QKeyEvent *e) 383void 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;
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index ebcff7a..f4aad9e 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -24,26 +24,26 @@
24#ifndef SEARCHDIALOG_H 24#ifndef SEARCHDIALOG_H
25#define SEARCHDIALOG_H 25#define SEARCHDIALOG_H
26 26
27#include <qregexp.h> 27#include <qregexp.h>
28 28
29#include <kdialogbase.h> 29#include <kdialogbase.h>
30#include <qvbox.h>
30 31
31#include <libkcal/calendar.h> 32#include <libkcal/calendar.h>
32 33
33#include "kolistview.h" 34#include "kolistview.h"
34 35
35class KDateEdit; 36class KDateEdit;
36class QCheckBox; 37class QCheckBox;
37class QLineEdit; 38class QLineEdit;
38class QLabel; 39class QLabel;
39class CalendarView; 40class CalendarView;
40 41
41using namespace KCal; 42using namespace KCal;
42 43class SearchDialog : public QVBox
43class SearchDialog : public KDialogBase
44{ 44{
45 Q_OBJECT 45 Q_OBJECT
46 public: 46 public:
47 SearchDialog(Calendar *calendar,CalendarView *parent=0); 47 SearchDialog(Calendar *calendar,CalendarView *parent=0);
48 virtual ~SearchDialog(); 48 virtual ~SearchDialog();
49 KOListView *listview(){ return listView;} 49 KOListView *listview(){ return listView;}
@@ -75,19 +75,18 @@ class SearchDialog : public KDialogBase
75 QLabel *searchLabel; 75 QLabel *searchLabel;
76 QLineEdit *searchEdit; 76 QLineEdit *searchEdit;
77 KOListView *listView; 77 KOListView *listView;
78 78
79 KDateEdit *mStartDate; 79 KDateEdit *mStartDate;
80 KDateEdit *mEndDate; 80 KDateEdit *mEndDate;
81 // QCheckBox *mInclusiveCheck;
82 QCheckBox *mSummaryCheck; 81 QCheckBox *mSummaryCheck;
83 QCheckBox *mDescriptionCheck; 82 QCheckBox *mDescriptionCheck;
84 QCheckBox *mCategoryCheck; 83 QCheckBox *mCategoryCheck;
85 QCheckBox *mSearchEvent; 84 QCheckBox *mSearchEvent;
86 QCheckBox *mSearchTodo; 85 QCheckBox *mSearchTodo;
87 QCheckBox *mSearchJournal; 86 QCheckBox *mSearchJournal;
88 QCheckBox *mSearchAName; 87 QCheckBox *mSearchAName;
89 QCheckBox *mSearchAEmail; 88 QCheckBox *mSearchAEmail;
90 //void keyPressEvent ( QKeyEvent *e) ; 89 void keyPressEvent ( QKeyEvent *e) ;
91}; 90};
92 91
93#endif 92#endif