summaryrefslogtreecommitdiffabout
Side-by-side diff
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
@@ -2,2 +2,12 @@ Info about the changes in new versions of KDE-Pim/Pi
+********** VERSION 2.0.10 ************
+
+KO/Pi:
+In the desktop versions the context menu in the search dialog was broken after introducing the What'sThis info for the list view.
+This is fixed.
+Changed the search dialog a bit to make it more user friendly.
+(E.g.: Removed message box about "no items found" and set key focus to search line edit after search).
+
+Added config option to hide the week number in KO/Pi toolbar.
+
********** VERSION 2.0.9 ************
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
@@ -1294,3 +1294,3 @@
{ "No items found. Use '*' and '?' where needed.","Nichts gefunden. Benutze '*' and '?' wo benötigt." },
-{ "","" },
+{ "Week Number","Wochennummer" },
{ "","" },
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
@@ -87,2 +87,3 @@ KOPrefs::KOPrefs() :
addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,true);
+ addItemBool("ShowIconWeekNum",&mShowIconWeekNum,true);
addItemBool("ShowIconNextDays",&mShowIconNextDays,true);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index e4e3dd7..09a0dce 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -183,2 +183,3 @@ class KOPrefs : public KPimPrefs
bool mShowIconWhatsThis;
+ bool mShowIconWeekNum;
bool mShowIconNextDays;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a164fa4..4f2cccf 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -573,3 +573,4 @@ void MainWindow::initActions()
mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
- mWeekAction->addTo( iconToolBar );
+ if ( p-> mShowIconWeekNum )
+ mWeekAction->addTo( iconToolBar );
mWeekFont = font();
@@ -625,2 +626,3 @@ void MainWindow::initActions()
configureToolBarMenu->insertSeparator();
+ configureToolBarMenu->insertItem(i18n("Week Number"), 400);
configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
@@ -708,2 +710,9 @@ void MainWindow::initActions()
mView->viewManager(), SLOT( showWeekView() ) );
+
+ icon = loadPixmap( pathString + "workweek2" );
+ configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 );
+ QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this );
+ day6_action->addTo( viewMenu );
+ connect( day6_action, SIGNAL( activated() ),
+ mView->viewManager(), SLOT( showMonthViewWeek() ) );
@@ -716,9 +725,2 @@ void MainWindow::initActions()
- icon = loadPixmap( pathString + "workweek2" );
- configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 );
- QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this );
- day6_action->addTo( viewMenu );
- connect( day6_action, SIGNAL( activated() ),
- mView->viewManager(), SLOT( showMonthViewWeek() ) );
-
icon = loadPixmap( pathString + "todo" );
@@ -1003,6 +1005,6 @@ void MainWindow::initActions()
day7_action->addTo( iconToolBar );
- if (p-> mShowIconMonth)
- month_action->addTo( iconToolBar );
if (p-> mShowIconDay6)
day6_action->addTo( iconToolBar );
+ if (p-> mShowIconMonth)
+ month_action->addTo( iconToolBar );
if (p-> mShowIconTodoview)
@@ -1089,3 +1091,4 @@ void MainWindow::initActions()
configureToolBarMenu->setItemChecked( 300, true );
-
+ if (p-> mShowIconWeekNum)
+ configureToolBarMenu->setItemChecked( 400, true );
QLabel* dummy = new QLabel( iconToolBar );
@@ -1830,2 +1833,3 @@ void MainWindow::configureToolBar( int item )
p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 );
+ p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 );
// initActions();
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 3fd9740..aa1b244 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -28,2 +28,3 @@
#include <qlabel.h>
+#include <qwhatsthis.h>
#include <qlineedit.h>
@@ -44,8 +45,8 @@
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());
@@ -54,3 +55,2 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
layout->addLayout(subLayout);
-
searchLabel = new QLabel(topFrame);
@@ -61,2 +61,6 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
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
@@ -69,4 +73,2 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
-
-
QHBox *incidenceGroup = new QHBox( topFrame );
@@ -98,4 +100,3 @@ 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));
@@ -107,29 +108,15 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
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
@@ -160,3 +147,5 @@ void SearchDialog::searchTextChanged( const QString &_text )
{
+#if 0
enableButton( KDialogBase::User1, !_text.isEmpty() );
+#endif
}
@@ -392,10 +381,25 @@ void SearchDialog::search(const QRegExp &re)
}
-/*
+
void SearchDialog::keyPressEvent ( QKeyEvent *e)
{
-
- e->ignore();
-
+ switch ( e->key() ) {
+ case Qt::Key_Escape:
+ hide();
+ break;
+ case Qt::Key_F:
+ if ( e->state() == Qt::ControlButton ) {
+ qDebug("full ");
+
+ }
+ break;
+ case Qt::Key_Return:
+ case Qt::Key_Enter:
+ doSearch();
+ break;
+
+ default:
+ e->ignore();
+ }
}
-*/
+
//mMatchedJournals;
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index ebcff7a..f4aad9e 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -29,2 +29,3 @@
#include <kdialogbase.h>
+#include <qvbox.h>
@@ -41,4 +42,3 @@ class CalendarView;
using namespace KCal;
-
-class SearchDialog : public KDialogBase
+class SearchDialog : public QVBox
{
@@ -80,3 +80,2 @@ class SearchDialog : public KDialogBase
KDateEdit *mEndDate;
- // QCheckBox *mInclusiveCheck;
QCheckBox *mSummaryCheck;
@@ -89,3 +88,3 @@ class SearchDialog : public KDialogBase
QCheckBox *mSearchAEmail;
- //void keyPressEvent ( QKeyEvent *e) ;
+ void keyPressEvent ( QKeyEvent *e) ;
};