author | zautrix <zautrix> | 2005-02-22 01:14:35 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-22 01:14:35 (UTC) |
commit | df40d77f7407326221ba2848163c4f61b7bb1d2f (patch) (side-by-side diff) | |
tree | 1b46bf666f7371189ba421080f4dcd66dc9037f2 /korganizer | |
parent | ce261d6197d319d67f7b275813449f36ce42a730 (diff) | |
download | kdepimpi-df40d77f7407326221ba2848163c4f61b7bb1d2f.zip kdepimpi-df40d77f7407326221ba2848163c4f61b7bb1d2f.tar.gz kdepimpi-df40d77f7407326221ba2848163c4f61b7bb1d2f.tar.bz2 |
next
-rw-r--r-- | korganizer/koprefs.cpp | 1 | ||||
-rw-r--r-- | korganizer/koprefs.h | 1 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 24 | ||||
-rw-r--r-- | korganizer/searchdialog.cpp | 68 | ||||
-rw-r--r-- | korganizer/searchdialog.h | 7 |
5 files changed, 55 insertions, 46 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index a91074f..7e3deff 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -85,6 +85,7 @@ KOPrefs::KOPrefs() : addItemBool("ShowIconForward",&mShowIconForward,true); addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true); addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,true); + addItemBool("ShowIconWeekNum",&mShowIconWeekNum,true); addItemBool("ShowIconNextDays",&mShowIconNextDays,true); addItemBool("ShowIconNext",&mShowIconNext,true); addItemBool("ShowIconJournal",&mShowIconJournal,true); diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index e4e3dd7..09a0dce 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -181,6 +181,7 @@ class KOPrefs : public KPimPrefs bool mShowIconForward; bool mShowIconForwardFast; bool mShowIconWhatsThis; + bool mShowIconWeekNum; bool mShowIconNextDays; bool mShowIconNext; bool mShowIconJournal; diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index a164fa4..4f2cccf 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -571,6 +571,7 @@ void MainWindow::initActions() mWeekPixmap.fill( mWeekBgColor ); icon = mWeekPixmap; mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this ); + if ( p-> mShowIconWeekNum ) mWeekAction->addTo( iconToolBar ); mWeekFont = font(); @@ -623,6 +624,7 @@ void MainWindow::initActions() icon = loadPixmap( pathString + "newevent" ); configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); configureToolBarMenu->insertSeparator(); + configureToolBarMenu->insertItem(i18n("Week Number"), 400); configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); ne_action->addTo( actionMenu ); @@ -707,13 +709,6 @@ void MainWindow::initActions() connect( day7_action, SIGNAL( activated() ), mView->viewManager(), SLOT( showWeekView() ) ); - icon = loadPixmap( pathString + "month" ); - configureToolBarMenu->insertItem(icon, i18n("Month"), 70 ); - QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this ); - month_action->addTo( viewMenu ); - connect( month_action, SIGNAL( activated() ), - mView->viewManager(), SLOT( showMonthView() ) ); - 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 ); @@ -721,6 +716,13 @@ void MainWindow::initActions() connect( day6_action, SIGNAL( activated() ), mView->viewManager(), SLOT( showMonthViewWeek() ) ); + icon = loadPixmap( pathString + "month" ); + configureToolBarMenu->insertItem(icon, i18n("Month"), 70 ); + QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this ); + month_action->addTo( viewMenu ); + connect( month_action, SIGNAL( activated() ), + mView->viewManager(), SLOT( showMonthView() ) ); + icon = loadPixmap( pathString + "todo" ); configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); @@ -1001,10 +1003,10 @@ void MainWindow::initActions() day5_action->addTo( iconToolBar ); if (p-> mShowIconDay7) 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) todoview_action->addTo( iconToolBar ); if (p-> mShowIconJournal) @@ -1087,7 +1089,8 @@ void MainWindow::initActions() configureToolBarMenu->setItemChecked( 90, true ); if (p-> mShowIconWhatsThis) configureToolBarMenu->setItemChecked( 300, true ); - + if (p-> mShowIconWeekNum) + configureToolBarMenu->setItemChecked( 400, true ); QLabel* dummy = new QLabel( iconToolBar ); dummy->setBackgroundColor( iconToolBar->backgroundColor() ); if (!p-> mShowIconStretch) @@ -1828,6 +1831,7 @@ void MainWindow::configureToolBar( int item ) p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); 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 @@ -26,6 +26,7 @@ #include <qcheckbox.h> #include <qgroupbox.h> #include <qlabel.h> +#include <qwhatsthis.h> #include <qlineedit.h> #include <qpushbutton.h> @@ -42,23 +43,26 @@ #include "searchdialog.h" 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:")); subLayout->addWidget(searchLabel); 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(); connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & ))); @@ -67,8 +71,6 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"), // topFrame); - - QHBox *incidenceGroup = new QHBox( topFrame ); layout->addWidget(incidenceGroup); @@ -96,8 +98,7 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) // layout->addWidget(rangeGroup); 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); rangeLayout->addWidget(mStartDate); @@ -105,33 +106,19 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) mEndDate = new KDateEdit(rangeWidget); 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 } @@ -158,7 +145,9 @@ void SearchDialog::updateList() } void SearchDialog::searchTextChanged( const QString &_text ) { +#if 0 enableButton( KDialogBase::User1, !_text.isEmpty() ); +#endif } void SearchDialog::doSearch() @@ -390,12 +379,27 @@ 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; diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h index ebcff7a..f4aad9e 100644 --- a/korganizer/searchdialog.h +++ b/korganizer/searchdialog.h @@ -27,6 +27,7 @@ #include <qregexp.h> #include <kdialogbase.h> +#include <qvbox.h> #include <libkcal/calendar.h> @@ -39,8 +40,7 @@ class QLabel; class CalendarView; using namespace KCal; - -class SearchDialog : public KDialogBase +class SearchDialog : public QVBox { Q_OBJECT public: @@ -78,7 +78,6 @@ class SearchDialog : public KDialogBase KDateEdit *mStartDate; KDateEdit *mEndDate; - // QCheckBox *mInclusiveCheck; QCheckBox *mSummaryCheck; QCheckBox *mDescriptionCheck; QCheckBox *mCategoryCheck; @@ -87,7 +86,7 @@ class SearchDialog : public KDialogBase QCheckBox *mSearchJournal; QCheckBox *mSearchAName; QCheckBox *mSearchAEmail; - //void keyPressEvent ( QKeyEvent *e) ; + void keyPressEvent ( QKeyEvent *e) ; }; #endif |