Diffstat (limited to 'core/pim/datebook/datebook.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/datebook.cpp | 122 |
1 files changed, 106 insertions, 16 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index e8d808f..9880e2d 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp | |||
@@ -28,2 +28,3 @@ | |||
28 | #include "datebookweek.h" | 28 | #include "datebookweek.h" |
29 | #include "datebookweeklst.h" | ||
29 | #include "dateentryimpl.h" | 30 | #include "dateentryimpl.h" |
@@ -71,2 +72,3 @@ | |||
71 | #define WEEK 2 | 72 | #define WEEK 2 |
73 | #define WEEKLST 4 | ||
72 | #define MONTH 3 | 74 | #define MONTH 3 |
@@ -92,2 +94,10 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
92 | 94 | ||
95 | views = new QWidgetStack( this ); | ||
96 | setCentralWidget( views ); | ||
97 | |||
98 | dayView = 0; | ||
99 | weekView = 0; | ||
100 | weekLstView = 0; | ||
101 | monthView = 0; | ||
102 | |||
93 | QPEToolBar *bar = new QPEToolBar( this ); | 103 | QPEToolBar *bar = new QPEToolBar( this ); |
@@ -126,2 +136,3 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
126 | dayAction = a; | 136 | dayAction = a; |
137 | |||
127 | a = new QAction( tr( "Week" ), Resource::loadPixmap( "week" ), QString::null, 0, g, 0 ); | 138 | a = new QAction( tr( "Week" ), Resource::loadPixmap( "week" ), QString::null, 0, g, 0 ); |
@@ -132,2 +143,10 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
132 | weekAction = a; | 143 | weekAction = a; |
144 | |||
145 | a = new QAction( tr( "WeekLst" ), Resource::loadPixmap( "weeklst" ), QString::null, 0, g, 0 ); | ||
146 | connect( a, SIGNAL( activated() ), this, SLOT( viewWeekLst() ) ); | ||
147 | a->addTo( sub_bar ); | ||
148 | a->addTo( view ); | ||
149 | a->setToggleAction( TRUE ); | ||
150 | weekLstAction = a; | ||
151 | |||
133 | a = new QAction( tr( "Month" ), Resource::loadPixmap( "month" ), QString::null, 0, g, 0 ); | 152 | a = new QAction( tr( "Month" ), Resource::loadPixmap( "month" ), QString::null, 0, g, 0 ); |
@@ -147,10 +166,30 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
147 | 166 | ||
148 | views = new QWidgetStack( this ); | 167 | QPopupMenu *default_view = new QPopupMenu(this); |
149 | setCentralWidget( views ); | 168 | settings->insertItem( tr( "Default View" ),default_view ); |
150 | 169 | default_view->setCheckable(TRUE); | |
151 | dayView = 0; | ||
152 | weekView = 0; | ||
153 | monthView = 0; | ||
154 | 170 | ||
155 | viewDay(); | 171 | |
172 | Config config("DateBook"); | ||
173 | config.setGroup("Main"); | ||
174 | int current=config.readNumEntry("defaultview", DAY); | ||
175 | |||
176 | QActionGroup *ag = new QActionGroup(this); | ||
177 | a = new QAction( tr( "Day" ), QString::null, 0, 0, 0, true ); | ||
178 | if (current==DAY) a->setOn(true), viewDay(); | ||
179 | ag->insert(a); | ||
180 | a = new QAction( tr( "Week" ), QString::null, 0, 0, 0, true ); | ||
181 | if (current==WEEK) a->setOn(true), viewWeek(); | ||
182 | ag->insert(a); | ||
183 | a = new QAction( tr( "WeekLst" ), QString::null, 0, 0, 0, true ); | ||
184 | if (current==WEEKLST) a->setOn(true), viewWeekLst(); | ||
185 | ag->insert(a); | ||
186 | a = new QAction( tr( "Month" ), QString::null, 0, 0, 0, true ); | ||
187 | if (current==MONTH) a->setOn(true), viewMonth(); | ||
188 | ag->insert(a); | ||
189 | |||
190 | ag->addTo(default_view); | ||
191 | connect(ag, SIGNAL( selected ( QAction * ) ), | ||
192 | this, SLOT( newDefaultView(QAction *) ) | ||
193 | ); | ||
194 | |||
156 | connect( qApp, SIGNAL(clockChanged(bool)), | 195 | connect( qApp, SIGNAL(clockChanged(bool)), |
@@ -159,3 +198,3 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
159 | this, SLOT(changeWeek(bool)) ); | 198 | this, SLOT(changeWeek(bool)) ); |
160 | 199 | ||
161 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 200 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
@@ -164,3 +203,3 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
164 | #endif | 203 | #endif |
165 | 204 | ||
166 | // listen on QPE/System | 205 | // listen on QPE/System |
@@ -170,6 +209,6 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
170 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), | 209 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), |
171 | this, SLOT(receive(const QCString&, const QByteArray&)) ); | 210 | this, SLOT(receive(const QCString&, const QByteArray&)) ); |
172 | #endif | 211 | #endif |
173 | #endif | 212 | #endif |
174 | 213 | ||
175 | qDebug("done t=%d", t.elapsed() ); | 214 | qDebug("done t=%d", t.elapsed() ); |
@@ -266,2 +305,4 @@ QDate DateBook::currentDate() | |||
266 | d = weekView->date(); | 305 | d = weekView->date(); |
306 | } else if ( weekLstView && views->visibleWidget() == weekLstView ) { | ||
307 | d = weekLstView->date(); | ||
267 | } else if ( monthView && views->visibleWidget() == monthView ) { | 308 | } else if ( monthView && views->visibleWidget() == monthView ) { |
@@ -293,2 +334,11 @@ void DateBook::viewWeek() | |||
293 | 334 | ||
335 | void DateBook::viewWeekLst() { | ||
336 | initWeekLst(); | ||
337 | weekLstAction->setOn( TRUE ); | ||
338 | QDate d=currentDate(); | ||
339 | weekLstView->setDate(d); | ||
340 | views->raiseWidget( weekLstView ); | ||
341 | weekLstView->redraw(); | ||
342 | } | ||
343 | |||
294 | void DateBook::viewMonth() | 344 | void DateBook::viewMonth() |
@@ -333,3 +383,4 @@ void DateBook::editEvent( const Event &e ) | |||
333 | if (QMessageBox::warning(this, "error box", | 383 | if (QMessageBox::warning(this, "error box", |
334 | error, "Fix it", "Continue", 0, 0, 1) == 0) | 384 | error, "Fix it", "Continue", |
385 | 0, 0, 1) == 0) | ||
335 | continue; | 386 | continue; |
@@ -403,3 +454,3 @@ void DateBook::initWeek() | |||
403 | connect( weekView, SIGNAL( showDate( int, int, int ) ), | 454 | connect( weekView, SIGNAL( showDate( int, int, int ) ), |
404 | this, SLOT( showDay( int, int, int ) ) ); | 455 | this, SLOT( showDay( int, int, int ) ) ); |
405 | connect( this, SIGNAL( newEvent() ), | 456 | connect( this, SIGNAL( newEvent() ), |
@@ -416,3 +467,3 @@ void DateBook::initWeek() | |||
416 | calcWeek( d, totWeeks, yearNumber, onMonday ); | 467 | calcWeek( d, totWeeks, yearNumber, onMonday ); |
417 | 468 | ||
418 | while ( totWeeks == 1 ) { | 469 | while ( totWeeks == 1 ) { |
@@ -424,2 +475,24 @@ void DateBook::initWeek() | |||
424 | } | 475 | } |
476 | void DateBook::initWeekLst() { | ||
477 | if ( !weekLstView ) { | ||
478 | weekLstView = new DateBookWeekLst( ampm, onMonday, db, | ||
479 | views, "weeklst view" ); | ||
480 | views->addWidget( weekLstView, WEEKLST ); | ||
481 | |||
482 | //weekLstView->setStartViewTime( startTime ); | ||
483 | connect( weekLstView, SIGNAL( showDate( int, int, int ) ), | ||
484 | this, SLOT( showDay( int, int, int ) ) ); | ||
485 | connect( weekLstView, SIGNAL( addEvent( const QDateTime &, | ||
486 | const QDateTime &, | ||
487 | const QString & ) ), | ||
488 | this, SLOT( slotNewEntry( const QDateTime &, | ||
489 | const QDateTime &, | ||
490 | const QString & ) ) ); | ||
491 | connect( this, SIGNAL( newEvent() ), | ||
492 | weekLstView, SLOT( redraw() ) ); | ||
493 | connect( weekLstView, SIGNAL( editEvent( const Event & ) ), | ||
494 | this, SLOT( editEvent( const Event & ) ) ); | ||
495 | } | ||
496 | } | ||
497 | |||
425 | 498 | ||
@@ -446,3 +519,3 @@ void DateBook::loadSettings() | |||
446 | } | 519 | } |
447 | 520 | ||
448 | { | 521 | { |
@@ -466,2 +539,14 @@ void DateBook::saveSettings() | |||
466 | 539 | ||
540 | void DateBook::newDefaultView(QAction *a) { | ||
541 | int val=DAY; | ||
542 | if (a->text() == "Day") val=DAY; | ||
543 | if (a->text() == "Week") val=WEEK; | ||
544 | if (a->text() == "WeekLst") val=WEEKLST; | ||
545 | if (a->text() == "Month") val=MONTH; | ||
546 | |||
547 | Config configDB( "DateBook" ); | ||
548 | configDB.setGroup( "Main" ); | ||
549 | configDB.writeEntry("defaultview",val); | ||
550 | } | ||
551 | |||
467 | void DateBook::appMessage(const QCString& msg, const QByteArray& data) | 552 | void DateBook::appMessage(const QCString& msg, const QByteArray& data) |
@@ -538,2 +623,4 @@ void DateBook::appMessage(const QCString& msg, const QByteArray& data) | |||
538 | else if ( cur == weekView ) | 623 | else if ( cur == weekView ) |
624 | viewWeekLst(); | ||
625 | else if ( cur == weekLstView ) | ||
539 | viewMonth(); | 626 | viewMonth(); |
@@ -592,2 +679,3 @@ void DateBook::changeClock( bool newClock ) | |||
592 | if (weekView) weekView->redraw(); | 679 | if (weekView) weekView->redraw(); |
680 | if (weekLstView) weekLstView->redraw(); | ||
593 | } | 681 | } |
@@ -662,3 +750,5 @@ void DateBook::slotNewEventFromKey( const QString &str ) | |||
662 | } | 750 | } |
663 | 751 | slotNewEntry(start, end, str); | |
752 | } | ||
753 | void DateBook::slotNewEntry(const QDateTime &start, const QDateTime &end, const QString &str) { | ||
664 | // argh! This really needs to be encapsulated in a class | 754 | // argh! This really needs to be encapsulated in a class |