-rw-r--r-- | korganizer/datenavigator.cpp | 8 | ||||
-rw-r--r-- | korganizer/datenavigator.h | 1 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 4 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 4 | ||||
-rw-r--r-- | korganizer/navigatorbar.h | 1 |
5 files changed, 12 insertions, 6 deletions
diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp index d2824de..8b7c993 100644 --- a/korganizer/datenavigator.cpp +++ b/korganizer/datenavigator.cpp | |||
@@ -94,128 +94,136 @@ int DateNavigator::datesCount() const | |||
94 | return mSelectedDates.count(); | 94 | return mSelectedDates.count(); |
95 | } | 95 | } |
96 | 96 | ||
97 | void DateNavigator::selectDates( const DateList& dateList ) | 97 | void DateNavigator::selectDates( const DateList& dateList ) |
98 | { | 98 | { |
99 | if (dateList.count() > 0) { | 99 | if (dateList.count() > 0) { |
100 | mSelectedDates = dateList; | 100 | mSelectedDates = dateList; |
101 | emitSelected(); | 101 | emitSelected(); |
102 | } | 102 | } |
103 | } | 103 | } |
104 | 104 | ||
105 | void DateNavigator::selectDate( const QDate &date ) | 105 | void DateNavigator::selectDate( const QDate &date ) |
106 | { | 106 | { |
107 | QDate d = date; | 107 | QDate d = date; |
108 | 108 | ||
109 | if ( !d.isValid() ) { | 109 | if ( !d.isValid() ) { |
110 | d = QDate::currentDate(); | 110 | d = QDate::currentDate(); |
111 | } | 111 | } |
112 | 112 | ||
113 | mSelectedDates.clear(); | 113 | mSelectedDates.clear(); |
114 | mSelectedDates.append( d ); | 114 | mSelectedDates.append( d ); |
115 | 115 | ||
116 | emitSelected(); | 116 | emitSelected(); |
117 | } | 117 | } |
118 | 118 | ||
119 | void DateNavigator::selectDates( int count ) | 119 | void DateNavigator::selectDates( int count ) |
120 | { | 120 | { |
121 | 121 | ||
122 | QDate d = mSelectedDates.first(); | 122 | QDate d = mSelectedDates.first(); |
123 | selectDates( d, count ); | 123 | selectDates( d, count ); |
124 | } | 124 | } |
125 | 125 | ||
126 | void DateNavigator::selectDates( const QDate &d, int count ) | 126 | void DateNavigator::selectDates( const QDate &d, int count ) |
127 | { | 127 | { |
128 | DateList dates; | 128 | DateList dates; |
129 | 129 | ||
130 | int i; | 130 | int i; |
131 | for( i = 0; i < count; ++i ) { | 131 | for( i = 0; i < count; ++i ) { |
132 | dates.append( d.addDays( i ) ); | 132 | dates.append( d.addDays( i ) ); |
133 | } | 133 | } |
134 | 134 | ||
135 | mSelectedDates = dates; | 135 | mSelectedDates = dates; |
136 | 136 | ||
137 | emitSelected(); | 137 | emitSelected(); |
138 | } | 138 | } |
139 | 139 | ||
140 | void DateNavigator::selectWeekByDay( int weekDay, const QDate &d ) | 140 | void DateNavigator::selectWeekByDay( int weekDay, const QDate &d ) |
141 | { | 141 | { |
142 | // qDebug("selectWeekByDay( %d %s ", weekDay, d.toString().latin1()); | 142 | // qDebug("selectWeekByDay( %d %s ", weekDay, d.toString().latin1()); |
143 | int dateCount = mSelectedDates.count(); | 143 | int dateCount = mSelectedDates.count(); |
144 | bool weekStart = ( weekDay == KGlobal::locale()->weekStartDay() ); | 144 | bool weekStart = ( weekDay == KGlobal::locale()->weekStartDay() ); |
145 | if ( weekDay == 1 && dateCount == 5 ) selectWorkWeek( d ); | 145 | if ( weekDay == 1 && dateCount == 5 ) selectWorkWeek( d ); |
146 | else if ( weekStart && dateCount == 7 ) selectWeek( d ); | 146 | else if ( weekStart && dateCount == 7 ) selectWeek( d ); |
147 | else selectDates( d, dateCount ); | 147 | else selectDates( d, dateCount ); |
148 | } | 148 | } |
149 | 149 | ||
150 | void DateNavigator::selectWeek() | 150 | void DateNavigator::selectWeek() |
151 | { | 151 | { |
152 | QDate d = mSelectedDates.first(); | 152 | QDate d = mSelectedDates.first(); |
153 | selectWeek( d ); | 153 | selectWeek( d ); |
154 | } | 154 | } |
155 | void DateNavigator::selectWeek( int num ) | 155 | void DateNavigator::selectWeek( int num ) |
156 | { | 156 | { |
157 | int year = mSelectedDates.first().year(); | 157 | int year = mSelectedDates.first().year(); |
158 | QDate d = QDate ( year, 1,1); | ||
159 | while ( d.dayOfWeek() != 4 ) | ||
160 | d = d.addDays( 1 ); | ||
161 | selectWeek( d.addDays ( (num-1) *7 ) ); | ||
162 | } | ||
163 | void DateNavigator::selectWeekFromMonthView( int num ) | ||
164 | { | ||
165 | int year = mSelectedDates.first().year(); | ||
158 | if ( mSelectedDates.first().dayOfYear() > 300 && num < 10 ) | 166 | if ( mSelectedDates.first().dayOfYear() > 300 && num < 10 ) |
159 | ++year; | 167 | ++year; |
160 | if ( mSelectedDates.first().dayOfYear() < 70 && num > 40 ) | 168 | if ( mSelectedDates.first().dayOfYear() < 70 && num > 40 ) |
161 | --year; | 169 | --year; |
162 | QDate d = QDate ( year, 1,1); | 170 | QDate d = QDate ( year, 1,1); |
163 | while ( d.dayOfWeek() != 4 ) | 171 | while ( d.dayOfWeek() != 4 ) |
164 | d = d.addDays( 1 ); | 172 | d = d.addDays( 1 ); |
165 | selectWeek( d.addDays ( (num-1) *7 ) ); | 173 | selectWeek( d.addDays ( (num-1) *7 ) ); |
166 | } | 174 | } |
167 | void DateNavigator::selectWeek( const QDate &d ) | 175 | void DateNavigator::selectWeek( const QDate &d ) |
168 | { | 176 | { |
169 | int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d ); | 177 | int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d ); |
170 | 178 | ||
171 | int weekStart = KGlobal::locale()->weekStartDay(); | 179 | int weekStart = KGlobal::locale()->weekStartDay(); |
172 | QDate firstDate = d.addDays( weekStart - dayOfWeek ); | 180 | QDate firstDate = d.addDays( weekStart - dayOfWeek ); |
173 | 181 | ||
174 | if ( weekStart != 1 && dayOfWeek < weekStart ) { | 182 | if ( weekStart != 1 && dayOfWeek < weekStart ) { |
175 | firstDate = firstDate.addDays(-7 ); | 183 | firstDate = firstDate.addDays(-7 ); |
176 | } | 184 | } |
177 | 185 | ||
178 | 186 | ||
179 | selectDates( firstDate, 7 ); | 187 | selectDates( firstDate, 7 ); |
180 | } | 188 | } |
181 | 189 | ||
182 | void DateNavigator::selectWorkWeek() | 190 | void DateNavigator::selectWorkWeek() |
183 | { | 191 | { |
184 | QDate d = mSelectedDates.first(); | 192 | QDate d = mSelectedDates.first(); |
185 | selectWorkWeek( d ); | 193 | selectWorkWeek( d ); |
186 | } | 194 | } |
187 | 195 | ||
188 | void DateNavigator::selectWorkWeek( const QDate &d ) | 196 | void DateNavigator::selectWorkWeek( const QDate &d ) |
189 | { | 197 | { |
190 | int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d ); | 198 | int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d ); |
191 | 199 | ||
192 | QDate firstDate = d.addDays( 1 - dayOfWeek ); | 200 | QDate firstDate = d.addDays( 1 - dayOfWeek ); |
193 | 201 | ||
194 | int weekStart = KGlobal::locale()->weekStartDay(); | 202 | int weekStart = KGlobal::locale()->weekStartDay(); |
195 | if ( weekStart != 1 && dayOfWeek >= weekStart ) { | 203 | if ( weekStart != 1 && dayOfWeek >= weekStart ) { |
196 | firstDate = firstDate.addDays( 7 ); | 204 | firstDate = firstDate.addDays( 7 ); |
197 | } | 205 | } |
198 | 206 | ||
199 | selectDates( firstDate, 5 ); | 207 | selectDates( firstDate, 5 ); |
200 | } | 208 | } |
201 | 209 | ||
202 | void DateNavigator::selectTodayMonth() | 210 | void DateNavigator::selectTodayMonth() |
203 | { | 211 | { |
204 | QDate date = QDate::currentDate().addDays( 1-QDate::currentDate().day() ); | 212 | QDate date = QDate::currentDate().addDays( 1-QDate::currentDate().day() ); |
205 | selectDates( date , date.daysInMonth ()); | 213 | selectDates( date , date.daysInMonth ()); |
206 | 214 | ||
207 | } | 215 | } |
208 | void DateNavigator::selectToday() | 216 | void DateNavigator::selectToday() |
209 | { | 217 | { |
210 | QDate d = QDate::currentDate(); | 218 | QDate d = QDate::currentDate(); |
211 | 219 | ||
212 | int dateCount = mSelectedDates.count(); | 220 | int dateCount = mSelectedDates.count(); |
213 | if ( dateCount == 5 && d.dayOfWeek() < 6 ) selectWorkWeek( d ); | 221 | if ( dateCount == 5 && d.dayOfWeek() < 6 ) selectWorkWeek( d ); |
214 | else if ( dateCount == 7 ) selectWeek( d ); | 222 | else if ( dateCount == 7 ) selectWeek( d ); |
215 | else selectDates( d, dateCount ); | 223 | else selectDates( d, dateCount ); |
216 | } | 224 | } |
217 | 225 | ||
218 | void DateNavigator::selectPreviousYear() | 226 | void DateNavigator::selectPreviousYear() |
219 | { | 227 | { |
220 | QDate firstSelected = mSelectedDates.first(); | 228 | QDate firstSelected = mSelectedDates.first(); |
221 | int weekDay = firstSelected.dayOfWeek(); | 229 | int weekDay = firstSelected.dayOfWeek(); |
diff --git a/korganizer/datenavigator.h b/korganizer/datenavigator.h index 4a19e17..4265e84 100644 --- a/korganizer/datenavigator.h +++ b/korganizer/datenavigator.h | |||
@@ -1,90 +1,91 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | #ifndef DATENAVIGATOR_H | 23 | #ifndef DATENAVIGATOR_H |
24 | #define DATENAVIGATOR_H | 24 | #define DATENAVIGATOR_H |
25 | 25 | ||
26 | #include <libkcal/incidencebase.h> | 26 | #include <libkcal/incidencebase.h> |
27 | 27 | ||
28 | #include <qobject.h> | 28 | #include <qobject.h> |
29 | #include "koviewmanager.h" | 29 | #include "koviewmanager.h" |
30 | 30 | ||
31 | /** | 31 | /** |
32 | This class controls date navigation. All requests to move the views to another | 32 | This class controls date navigation. All requests to move the views to another |
33 | date are sent to the DateNavigator. The DateNavigator processes the new | 33 | date are sent to the DateNavigator. The DateNavigator processes the new |
34 | selection of dates and emits the required signals for the views. | 34 | selection of dates and emits the required signals for the views. |
35 | */ | 35 | */ |
36 | class DateNavigator : public QObject | 36 | class DateNavigator : public QObject |
37 | { | 37 | { |
38 | Q_OBJECT | 38 | Q_OBJECT |
39 | public: | 39 | public: |
40 | DateNavigator( QObject *parent = 0, const char *name = 0 , KOViewManager * v = 0); | 40 | DateNavigator( QObject *parent = 0, const char *name = 0 , KOViewManager * v = 0); |
41 | ~DateNavigator(); | 41 | ~DateNavigator(); |
42 | 42 | ||
43 | KCal::DateList selectedDates(); | 43 | KCal::DateList selectedDates(); |
44 | 44 | ||
45 | int datesCount() const; | 45 | int datesCount() const; |
46 | 46 | ||
47 | public slots: | 47 | public slots: |
48 | void selectDates( const KCal::DateList & ); | 48 | void selectDates( const KCal::DateList & ); |
49 | void selectDate( const QDate & ); | 49 | void selectDate( const QDate & ); |
50 | 50 | ||
51 | void selectDates( int count ); | 51 | void selectDates( int count ); |
52 | void selectDates( const QDate &, int count ); | 52 | void selectDates( const QDate &, int count ); |
53 | 53 | ||
54 | void selectWeek(); | 54 | void selectWeek(); |
55 | void selectWeek( int weeknum ); | 55 | void selectWeek( int weeknum ); |
56 | void selectWeekFromMonthView( int weeknum ); | ||
56 | void selectWeek( const QDate & ); | 57 | void selectWeek( const QDate & ); |
57 | 58 | ||
58 | void selectWorkWeek(); | 59 | void selectWorkWeek(); |
59 | void selectWorkWeek( const QDate & ); | 60 | void selectWorkWeek( const QDate & ); |
60 | 61 | ||
61 | void selectWeekByDay( int weekDay, const QDate & ); | 62 | void selectWeekByDay( int weekDay, const QDate & ); |
62 | 63 | ||
63 | void selectToday(); | 64 | void selectToday(); |
64 | void selectTodayMonth(); | 65 | void selectTodayMonth(); |
65 | 66 | ||
66 | void selectPreviousYear(); | 67 | void selectPreviousYear(); |
67 | void selectPreviousMonth(); | 68 | void selectPreviousMonth(); |
68 | void selectNextMonth(); | 69 | void selectNextMonth(); |
69 | void selectNextYear(); | 70 | void selectNextYear(); |
70 | 71 | ||
71 | void selectMonth(); | 72 | void selectMonth(); |
72 | void selectMonthByDate( const QDate & ); | 73 | void selectMonthByDate( const QDate & ); |
73 | 74 | ||
74 | void selectPrevious(); | 75 | void selectPrevious(); |
75 | void selectNext(); | 76 | void selectNext(); |
76 | void slotMonthSelect( int ); | 77 | void slotMonthSelect( int ); |
77 | void slotDaySelect( QDate d ); | 78 | void slotDaySelect( QDate d ); |
78 | 79 | ||
79 | signals: | 80 | signals: |
80 | void datesSelected( const KCal::DateList & ); | 81 | void datesSelected( const KCal::DateList & ); |
81 | 82 | ||
82 | protected: | 83 | protected: |
83 | void emitSelected(); | 84 | void emitSelected(); |
84 | 85 | ||
85 | private: | 86 | private: |
86 | KOViewManager * mViewManager; | 87 | KOViewManager * mViewManager; |
87 | KCal::DateList mSelectedDates; | 88 | KCal::DateList mSelectedDates; |
88 | }; | 89 | }; |
89 | 90 | ||
90 | #endif | 91 | #endif |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index b551e2a..90be237 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -446,146 +446,144 @@ void KOViewManager::showWeekView() | |||
446 | showAgendaView(); | 446 | showAgendaView(); |
447 | */ | 447 | */ |
448 | 448 | ||
449 | 449 | ||
450 | mFlagShowNextxDays = false; | 450 | mFlagShowNextxDays = false; |
451 | globalFlagBlockAgenda = 1; | 451 | globalFlagBlockAgenda = 1; |
452 | globalFlagBlockLabel = 1; | 452 | globalFlagBlockLabel = 1; |
453 | if ( mCurrentAgendaView != 7 ) | 453 | if ( mCurrentAgendaView != 7 ) |
454 | mCurrentAgendaView = -1; | 454 | mCurrentAgendaView = -1; |
455 | showAgendaView(); | 455 | showAgendaView(); |
456 | qApp->processEvents(); | 456 | qApp->processEvents(); |
457 | globalFlagBlockAgenda = 2; | 457 | globalFlagBlockAgenda = 2; |
458 | globalFlagBlockLabel = 0; | 458 | globalFlagBlockLabel = 0; |
459 | mMainView->dateNavigator()->selectWeek(); | 459 | mMainView->dateNavigator()->selectWeek(); |
460 | mCurrentAgendaView = 7 ; | 460 | mCurrentAgendaView = 7 ; |
461 | } | 461 | } |
462 | 462 | ||
463 | void KOViewManager::showNextXView() | 463 | void KOViewManager::showNextXView() |
464 | { | 464 | { |
465 | 465 | ||
466 | globalFlagBlockAgenda = 1; | 466 | globalFlagBlockAgenda = 1; |
467 | if ( mCurrentAgendaView != 3 ) | 467 | if ( mCurrentAgendaView != 3 ) |
468 | mCurrentAgendaView = -1; | 468 | mCurrentAgendaView = -1; |
469 | showAgendaView(KOPrefs::instance()->mFullViewMonth); | 469 | showAgendaView(KOPrefs::instance()->mFullViewMonth); |
470 | globalFlagBlockAgenda = 2; | 470 | globalFlagBlockAgenda = 2; |
471 | mMainView->dateNavigator()->selectDates( QDate::currentDate(), | 471 | mMainView->dateNavigator()->selectDates( QDate::currentDate(), |
472 | KOPrefs::instance()->mNextXDays ); | 472 | KOPrefs::instance()->mNextXDays ); |
473 | mFlagShowNextxDays = true; | 473 | mFlagShowNextxDays = true; |
474 | mCurrentAgendaView = 3 ; | 474 | mCurrentAgendaView = 3 ; |
475 | } | 475 | } |
476 | bool KOViewManager::showsNextDays() | 476 | bool KOViewManager::showsNextDays() |
477 | { | 477 | { |
478 | return mFlagShowNextxDays; | 478 | return mFlagShowNextxDays; |
479 | } | 479 | } |
480 | void KOViewManager::showMonthView() | 480 | void KOViewManager::showMonthView() |
481 | { | 481 | { |
482 | if (!mMonthView) { | 482 | if (!mMonthView) { |
483 | mMonthView = new KOMonthView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::MonthView"); | 483 | mMonthView = new KOMonthView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::MonthView"); |
484 | 484 | ||
485 | addView(mMonthView); | 485 | addView(mMonthView); |
486 | // mMonthView->show(); | 486 | // mMonthView->show(); |
487 | // SIGNALS/SLOTS FOR MONTH VIEW | 487 | // SIGNALS/SLOTS FOR MONTH VIEW |
488 | connect(mMonthView, SIGNAL(newEventSignal(QDateTime)), | 488 | connect(mMonthView, SIGNAL(newEventSignal(QDateTime)), |
489 | mMainView, SLOT(newEvent(QDateTime))); | 489 | mMainView, SLOT(newEvent(QDateTime))); |
490 | 490 | ||
491 | connect(mMonthView, SIGNAL(showIncidenceSignal(Incidence *)), | 491 | connect(mMonthView, SIGNAL(showIncidenceSignal(Incidence *)), |
492 | mMainView, SLOT(showIncidence(Incidence *))); | 492 | mMainView, SLOT(showIncidence(Incidence *))); |
493 | connect(mMonthView, SIGNAL(editIncidenceSignal(Incidence *)), | 493 | connect(mMonthView, SIGNAL(editIncidenceSignal(Incidence *)), |
494 | mMainView, SLOT(editIncidence(Incidence *))); | 494 | mMainView, SLOT(editIncidence(Incidence *))); |
495 | connect(mMonthView, SIGNAL(deleteIncidenceSignal(Incidence *)), | 495 | connect(mMonthView, SIGNAL(deleteIncidenceSignal(Incidence *)), |
496 | mMainView, SLOT(deleteIncidence(Incidence *))); | 496 | mMainView, SLOT(deleteIncidence(Incidence *))); |
497 | 497 | ||
498 | connect( mMonthView, SIGNAL( incidenceSelected( Incidence * ) ), | 498 | connect( mMonthView, SIGNAL( incidenceSelected( Incidence * ) ), |
499 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 499 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
500 | connect( mMonthView, SIGNAL( cloneIncidenceSignal( Incidence * ) ), | 500 | connect( mMonthView, SIGNAL( cloneIncidenceSignal( Incidence * ) ), |
501 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); | 501 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); |
502 | connect( mMonthView, SIGNAL( cancelIncidenceSignal( Incidence * ) ), | 502 | connect( mMonthView, SIGNAL( cancelIncidenceSignal( Incidence * ) ), |
503 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); | 503 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); |
504 | 504 | ||
505 | connect( mMonthView, SIGNAL( moveIncidenceSignal( Incidence * ) ), | 505 | connect( mMonthView, SIGNAL( moveIncidenceSignal( Incidence * ) ), |
506 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); | 506 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); |
507 | connect( mMonthView, SIGNAL( beamIncidenceSignal( Incidence * ) ), | 507 | connect( mMonthView, SIGNAL( beamIncidenceSignal( Incidence * ) ), |
508 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); | 508 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); |
509 | connect( mMonthView, SIGNAL( selectWeekNum( int ) ), | 509 | connect( mMonthView, SIGNAL( selectWeekNum( int ) ), |
510 | mMainView->dateNavigator(), SLOT ( selectWeek( int ) ) ); | 510 | mMainView->dateNavigator(), SLOT ( selectWeekFromMonthView( int ) ) ); |
511 | connect( mMonthView, SIGNAL( showDaySignal( QDate ) ), | 511 | connect( mMonthView, SIGNAL( showDaySignal( QDate ) ), |
512 | mMainView, SLOT ( showDay( QDate ) ) ); | 512 | mMainView, SLOT ( showDay( QDate ) ) ); |
513 | connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig())); | 513 | connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig())); |
514 | connect( mMonthView, SIGNAL(nextMonth() ), | 514 | connect( mMonthView, SIGNAL(nextMonth() ), |
515 | mMonthView->navigatorBar(), SIGNAL(goNextMonth() ) ); | 515 | mMonthView->navigatorBar(), SIGNAL(goNextMonth() ) ); |
516 | connect( mMonthView, SIGNAL(prevMonth() ), | 516 | connect( mMonthView, SIGNAL(prevMonth() ), |
517 | mMonthView->navigatorBar(), SIGNAL(goPrevMonth() ) ); | 517 | mMonthView->navigatorBar(), SIGNAL(goPrevMonth() ) ); |
518 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevYear() ), | 518 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevYear() ), |
519 | mMainView->dateNavigator(), SLOT( selectPreviousYear() ) ); | 519 | mMainView->dateNavigator(), SLOT( selectPreviousYear() ) ); |
520 | connect( mMonthView->navigatorBar(), SIGNAL( goNextYear() ), | 520 | connect( mMonthView->navigatorBar(), SIGNAL( goNextYear() ), |
521 | mMainView->dateNavigator(), SLOT( selectNextYear() ) ); | 521 | mMainView->dateNavigator(), SLOT( selectNextYear() ) ); |
522 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevMonth() ), | 522 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevMonth() ), |
523 | mMainView->dateNavigator(), SLOT( selectPreviousMonth() ) ); | 523 | mMainView->dateNavigator(), SLOT( selectPreviousMonth() ) ); |
524 | connect( mMonthView->navigatorBar(), SIGNAL( goNextMonth() ), | 524 | connect( mMonthView->navigatorBar(), SIGNAL( goNextMonth() ), |
525 | mMainView->dateNavigator(), SLOT( selectNextMonth() ) ); | 525 | mMainView->dateNavigator(), SLOT( selectNextMonth() ) ); |
526 | connect( mMonthView->navigatorBar(), SIGNAL( selectWeek( int ) ), | ||
527 | mMainView->dateNavigator(), SLOT( selectWeek( int ) ) ); | ||
528 | 526 | ||
529 | connect( mMainView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), | 527 | connect( mMainView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), |
530 | mMonthView->navigatorBar(), SLOT( selectDates( const KCal::DateList & ) ) ); | 528 | mMonthView->navigatorBar(), SLOT( selectDates( const KCal::DateList & ) ) ); |
531 | 529 | ||
532 | 530 | ||
533 | connect( mMonthView->navigatorBar(), SIGNAL( monthSelected ( int ) ), | 531 | connect( mMonthView->navigatorBar(), SIGNAL( monthSelected ( int ) ), |
534 | mMainView->dateNavigator(), SLOT( slotMonthSelect( int ) ) ); | 532 | mMainView->dateNavigator(), SLOT( slotMonthSelect( int ) ) ); |
535 | 533 | ||
536 | } | 534 | } |
537 | 535 | ||
538 | globalFlagBlockAgenda = 1; | 536 | globalFlagBlockAgenda = 1; |
539 | //mFlagShowNextxDays = false; | 537 | //mFlagShowNextxDays = false; |
540 | // if(mMonthView == mCurrentView) return; | 538 | // if(mMonthView == mCurrentView) return; |
541 | if ( KOPrefs::instance()->mMonthViewWeek ) | 539 | if ( KOPrefs::instance()->mMonthViewWeek ) |
542 | mMainView->dateNavigator()->selectWeek(); | 540 | mMainView->dateNavigator()->selectWeek(); |
543 | else | 541 | else |
544 | mMainView->dateNavigator()->selectMonth(); | 542 | mMainView->dateNavigator()->selectMonth(); |
545 | 543 | ||
546 | showView(mMonthView, true ); | 544 | showView(mMonthView, true ); |
547 | 545 | ||
548 | } | 546 | } |
549 | 547 | ||
550 | void KOViewManager::showTodoView() | 548 | void KOViewManager::showTodoView() |
551 | { | 549 | { |
552 | //mFlagShowNextxDays = false; | 550 | //mFlagShowNextxDays = false; |
553 | if ( !mTodoView ) { | 551 | if ( !mTodoView ) { |
554 | mTodoView = new KOTodoView( mMainView->calendar(), mMainView->viewStack(), | 552 | mTodoView = new KOTodoView( mMainView->calendar(), mMainView->viewStack(), |
555 | "KOViewManager::TodoView" ); | 553 | "KOViewManager::TodoView" ); |
556 | 554 | ||
557 | addView( mTodoView ); | 555 | addView( mTodoView ); |
558 | // QPEApplication::setStylusOperation( mTodoView, QPEApplication::RightOnHold ); | 556 | // QPEApplication::setStylusOperation( mTodoView, QPEApplication::RightOnHold ); |
559 | 557 | ||
560 | // SIGNALS/SLOTS FOR TODO VIEW | 558 | // SIGNALS/SLOTS FOR TODO VIEW |
561 | connect( mTodoView, SIGNAL( newTodoSignal() ), | 559 | connect( mTodoView, SIGNAL( newTodoSignal() ), |
562 | mMainView, SLOT( newTodo() ) ); | 560 | mMainView, SLOT( newTodo() ) ); |
563 | connect( mTodoView, SIGNAL( newSubTodoSignal( Todo * ) ), | 561 | connect( mTodoView, SIGNAL( newSubTodoSignal( Todo * ) ), |
564 | mMainView, SLOT( newSubTodo( Todo *) ) ); | 562 | mMainView, SLOT( newSubTodo( Todo *) ) ); |
565 | connect( mTodoView, SIGNAL( showTodoSignal( Todo *) ), | 563 | connect( mTodoView, SIGNAL( showTodoSignal( Todo *) ), |
566 | mMainView, SLOT( showTodo( Todo * ) ) ); | 564 | mMainView, SLOT( showTodo( Todo * ) ) ); |
567 | connect( mTodoView, SIGNAL( editTodoSignal( Todo * ) ), | 565 | connect( mTodoView, SIGNAL( editTodoSignal( Todo * ) ), |
568 | mMainView, SLOT( editTodo( Todo * ) ) ); | 566 | mMainView, SLOT( editTodo( Todo * ) ) ); |
569 | connect( mTodoView, SIGNAL( deleteTodoSignal( Todo * ) ), | 567 | connect( mTodoView, SIGNAL( deleteTodoSignal( Todo * ) ), |
570 | mMainView, SLOT( deleteTodo( Todo * ) ) ); | 568 | mMainView, SLOT( deleteTodo( Todo * ) ) ); |
571 | connect( mTodoView, SIGNAL( purgeCompletedSignal() ), | 569 | connect( mTodoView, SIGNAL( purgeCompletedSignal() ), |
572 | mMainView, SLOT( purgeCompleted() ) ); | 570 | mMainView, SLOT( purgeCompleted() ) ); |
573 | 571 | ||
574 | connect( mTodoView, SIGNAL( incidenceSelected( Incidence * ) ), | 572 | connect( mTodoView, SIGNAL( incidenceSelected( Incidence * ) ), |
575 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 573 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
576 | 574 | ||
577 | connect( mMainView, SIGNAL( configChanged() ), mTodoView, | 575 | connect( mMainView, SIGNAL( configChanged() ), mTodoView, |
578 | SLOT( updateConfig() ) ); | 576 | SLOT( updateConfig() ) ); |
579 | connect( mMainView, SIGNAL( todoModified( Todo *, int )), mTodoView, | 577 | connect( mMainView, SIGNAL( todoModified( Todo *, int )), mTodoView, |
580 | SLOT( updateTodo( Todo *, int ) ) ); | 578 | SLOT( updateTodo( Todo *, int ) ) ); |
581 | connect( mTodoView, SIGNAL( todoModifiedSignal( Todo *, int ) ), | 579 | connect( mTodoView, SIGNAL( todoModifiedSignal( Todo *, int ) ), |
582 | mMainView, SIGNAL ( todoModified( Todo *, int ) ) ); | 580 | mMainView, SIGNAL ( todoModified( Todo *, int ) ) ); |
583 | connect( mTodoView, SIGNAL( cloneTodoSignal( Incidence * ) ), | 581 | connect( mTodoView, SIGNAL( cloneTodoSignal( Incidence * ) ), |
584 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); | 582 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); |
585 | connect( mTodoView, SIGNAL( cancelTodoSignal( Incidence * ) ), | 583 | connect( mTodoView, SIGNAL( cancelTodoSignal( Incidence * ) ), |
586 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); | 584 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); |
587 | connect( mTodoView, SIGNAL( unparentTodoSignal( Todo * ) ), | 585 | connect( mTodoView, SIGNAL( unparentTodoSignal( Todo * ) ), |
588 | mMainView, SLOT ( todo_unsub( Todo * ) ) ); | 586 | mMainView, SLOT ( todo_unsub( Todo * ) ) ); |
589 | connect( mTodoView, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ), | 587 | connect( mTodoView, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ), |
590 | mMainView, SLOT ( todo_resub( Todo *, Todo *) ) ); | 588 | mMainView, SLOT ( todo_resub( Todo *, Todo *) ) ); |
591 | connect( mTodoView, SIGNAL( moveTodoSignal( Incidence * ) ), | 589 | connect( mTodoView, SIGNAL( moveTodoSignal( Incidence * ) ), |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 119e28a..7810bf9 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1192,131 +1192,131 @@ void MainWindow::displayText( QString text ,QString cap ) | |||
1192 | QVBoxLayout* lay = new QVBoxLayout( &dia ); | 1192 | QVBoxLayout* lay = new QVBoxLayout( &dia ); |
1193 | lay->setSpacing( 3 ); | 1193 | lay->setSpacing( 3 ); |
1194 | lay->setMargin( 3 ); | 1194 | lay->setMargin( 3 ); |
1195 | QTextBrowser tb ( &dia ); | 1195 | QTextBrowser tb ( &dia ); |
1196 | lay->addWidget( &tb ); | 1196 | lay->addWidget( &tb ); |
1197 | tb.setText( text ); | 1197 | tb.setText( text ); |
1198 | #ifdef DESKTOP_VERSION | 1198 | #ifdef DESKTOP_VERSION |
1199 | dia.resize( 640, 480); | 1199 | dia.resize( 640, 480); |
1200 | #else | 1200 | #else |
1201 | dia.showMaximized(); | 1201 | dia.showMaximized(); |
1202 | #endif | 1202 | #endif |
1203 | dia.exec(); | 1203 | dia.exec(); |
1204 | } | 1204 | } |
1205 | 1205 | ||
1206 | void MainWindow::features() | 1206 | void MainWindow::features() |
1207 | { | 1207 | { |
1208 | 1208 | ||
1209 | KApplication::showFile( i18n("KO/Pi Features and hints"), "kdepim/korganizer/featuresKOPI.txt" ); | 1209 | KApplication::showFile( i18n("KO/Pi Features and hints"), "kdepim/korganizer/featuresKOPI.txt" ); |
1210 | } | 1210 | } |
1211 | 1211 | ||
1212 | void MainWindow::usertrans() | 1212 | void MainWindow::usertrans() |
1213 | { | 1213 | { |
1214 | 1214 | ||
1215 | KApplication::showFile( i18n("KO/Pi User translation HowTo"), "kdepim/korganizer/usertranslationHOWTO.txt" ); | 1215 | KApplication::showFile( i18n("KO/Pi User translation HowTo"), "kdepim/korganizer/usertranslationHOWTO.txt" ); |
1216 | } | 1216 | } |
1217 | 1217 | ||
1218 | void MainWindow::kdesynchowto() | 1218 | void MainWindow::kdesynchowto() |
1219 | { | 1219 | { |
1220 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" ); | 1220 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" ); |
1221 | } | 1221 | } |
1222 | void MainWindow::multisynchowto() | 1222 | void MainWindow::multisynchowto() |
1223 | { | 1223 | { |
1224 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" ); | 1224 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" ); |
1225 | } | 1225 | } |
1226 | void MainWindow::synchowto() | 1226 | void MainWindow::synchowto() |
1227 | { | 1227 | { |
1228 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); | 1228 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); |
1229 | } | 1229 | } |
1230 | void MainWindow::faq() | 1230 | void MainWindow::faq() |
1231 | { | 1231 | { |
1232 | KApplication::showFile( i18n("KO/Pi FAQ"), "kdepim/korganizer/kopiFAQ.txt" ); | 1232 | KApplication::showFile( i18n("KO/Pi FAQ"), "kdepim/korganizer/kopiFAQ.txt" ); |
1233 | 1233 | ||
1234 | } | 1234 | } |
1235 | void MainWindow::whatsNew() | 1235 | void MainWindow::whatsNew() |
1236 | { | 1236 | { |
1237 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); | 1237 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); |
1238 | 1238 | ||
1239 | } | 1239 | } |
1240 | void MainWindow::licence() | 1240 | void MainWindow::licence() |
1241 | { | 1241 | { |
1242 | KApplication::showLicence(); | 1242 | KApplication::showLicence(); |
1243 | 1243 | ||
1244 | } | 1244 | } |
1245 | void MainWindow::about() | 1245 | void MainWindow::about() |
1246 | { | 1246 | { |
1247 | QString version; | 1247 | QString version; |
1248 | #include <../version> | 1248 | #include <../version> |
1249 | QMessageBox::about( this, i18n("About KOrganizer/Pi"), | 1249 | QMessageBox::about( this, i18n("About KOrganizer/Pi"), |
1250 | i18n("KOrganizer/Platform-independent\n") + | 1250 | i18n("KOrganizer/Platform-independent\n") + |
1251 | "(KO/Pi) " + version + " - " + | 1251 | "(KO/Pi) " + version + " - " + |
1252 | 1252 | ||
1253 | #ifdef DESKTOP_VERSION | 1253 | #ifdef DESKTOP_VERSION |
1254 | i18n("Desktop Edition\n") + | 1254 | i18n("Desktop Edition\n") + |
1255 | #else | 1255 | #else |
1256 | i18n("PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n") + | 1256 | i18n("PDA-Edition\nfor: Zaurus 5x00/7x0/860/3000/6000\n") + |
1257 | #endif | 1257 | #endif |
1258 | i18n("(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi is based on KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi is licensed\nunder the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.korganizer.org\nwww.pi-sync.net\n") ); | 1258 | i18n("(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi is based on KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) and the KDE team.\nKOrganizer/Pi is licensed under the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.pi-sync.net --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!") ); |
1259 | } | 1259 | } |
1260 | void MainWindow::keyBindings() | 1260 | void MainWindow::keyBindings() |
1261 | { | 1261 | { |
1262 | QString cap = i18n("KO/Pi Keys + Colors"); | 1262 | QString cap = i18n("KO/Pi Keys + Colors"); |
1263 | QString text = i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") + | 1263 | QString text = i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") + |
1264 | i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+ | 1264 | i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+ |
1265 | i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") + | 1265 | i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") + |
1266 | i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+ | 1266 | i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+ |
1267 | i18n("<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n")+ | 1267 | i18n("<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n")+ |
1268 | i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+ | 1268 | i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+ |
1269 | i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+ | 1269 | i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+ |
1270 | i18n("<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ")+ | 1270 | i18n("<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ")+ |
1271 | i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+ | 1271 | i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+ |
1272 | i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+ | 1272 | i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+ |
1273 | i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+ | 1273 | i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+ |
1274 | i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+ | 1274 | i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+ |
1275 | i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+ | 1275 | i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+ |
1276 | i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n")+ | 1276 | i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n")+ |
1277 | i18n("<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n")+ | 1277 | i18n("<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n")+ |
1278 | i18n("<p><b>C</b>: Show current time in agenda view</p>\n")+ | 1278 | i18n("<p><b>C</b>: Show current time in agenda view</p>\n")+ |
1279 | i18n("<p><b>B</b>: Edit description (details) of selected item</p>\n")+ | 1279 | i18n("<p><b>B</b>: Edit description (details) of selected item</p>\n")+ |
1280 | i18n("<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n")+ | 1280 | i18n("<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n")+ |
1281 | i18n("<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n")+ | 1281 | i18n("<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n")+ |
1282 | i18n("<p><b>del,backspace</b>: Delete selected item</p>\n")+ | 1282 | i18n("<p><b>del,backspace</b>: Delete selected item</p>\n")+ |
1283 | i18n("<p><h3>In agenda view:</h3></p>\n") + | 1283 | i18n("<p><h3>In agenda view:</h3></p>\n") + |
1284 | i18n("<p><b>up/down</b>: Scroll agenda view</p>\n")+ | 1284 | i18n("<p><b>up/down</b>: Scroll agenda view</p>\n")+ |
1285 | i18n("<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n")+ | 1285 | i18n("<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n")+ |
1286 | i18n("<p><h3>In todo view:</h3></p>\n") + | 1286 | i18n("<p><h3>In todo view:</h3></p>\n") + |
1287 | i18n("<p><b>shift+U</b>: <b>U</b>nparent todo (make root todo)</p>\n")+ | 1287 | i18n("<p><b>shift+U</b>: <b>U</b>nparent todo (make root todo)</p>\n")+ |
1288 | i18n("<p><b>shift+S</b>: Make <b>S</b>ubtodo (reparent todo)</p>\n")+ | 1288 | i18n("<p><b>shift+S</b>: Make <b>S</b>ubtodo (reparent todo)</p>\n")+ |
1289 | i18n("<p><b>shift+P</b>: Make new <b>P</b>arent for todo selected with shift+S</p>\n")+ | 1289 | i18n("<p><b>shift+P</b>: Make new <b>P</b>arent for todo selected with shift+S</p>\n")+ |
1290 | i18n("<p><b>Q</b>: Toggle quick todo line edit.</p>\n")+ | 1290 | i18n("<p><b>Q</b>: Toggle quick todo line edit.</p>\n")+ |
1291 | i18n("<p><b>I</b>: Show info of current item+one step down.</p>\n")+ | 1291 | i18n("<p><b>I</b>: Show info of current item+one step down.</p>\n")+ |
1292 | i18n("<p><b>return</b>: Mark item as completed+one step down.</p>\n")+ | 1292 | i18n("<p><b>return</b>: Mark item as completed+one step down.</p>\n")+ |
1293 | i18n("<p><b>return+shift</b>: Mark item as not completed+one step down</p>\n")+ | 1293 | i18n("<p><b>return+shift</b>: Mark item as not completed+one step down</p>\n")+ |
1294 | i18n("<p><h3>In list view:</h3></p>\n") + | 1294 | i18n("<p><h3>In list view:</h3></p>\n") + |
1295 | i18n("<p><b>I</b>: Show info of current item+one step down.</p>\n")+ | 1295 | i18n("<p><b>I</b>: Show info of current item+one step down.</p>\n")+ |
1296 | i18n("<p><b>return</b>: Select item+one step down</p>\n")+ | 1296 | i18n("<p><b>return</b>: Select item+one step down</p>\n")+ |
1297 | i18n("<p><b>return+shift</b>: Deselect item+one step down</p>\n")+ | 1297 | i18n("<p><b>return+shift</b>: Deselect item+one step down</p>\n")+ |
1298 | i18n("<p><b>up/down</b>: Next/prev item</p>\n")+ | 1298 | i18n("<p><b>up/down</b>: Next/prev item</p>\n")+ |
1299 | i18n("<p><b>ctrl+up/down</b>: Goto up/down by 20% of items</p>\n")+ | 1299 | i18n("<p><b>ctrl+up/down</b>: Goto up/down by 20% of items</p>\n")+ |
1300 | i18n("<p><b>shift+up/down</b>: Goto first/last item</p>\n")+ | 1300 | i18n("<p><b>shift+up/down</b>: Goto first/last item</p>\n")+ |
1301 | i18n("<p><h3>In event/todo viewer:</h3></p>\n") + | 1301 | i18n("<p><h3>In event/todo viewer:</h3></p>\n") + |
1302 | i18n("<p><b>I,C</b>: Close dialog.</p>\n")+ | 1302 | i18n("<p><b>I,C</b>: Close dialog.</p>\n")+ |
1303 | i18n("<p><b>A</b>: Show agenda view.</p>\n")+ | 1303 | i18n("<p><b>A</b>: Show agenda view.</p>\n")+ |
1304 | i18n("<p><b>E</b>: Edit item</p>\n") + | 1304 | i18n("<p><b>E</b>: Edit item</p>\n") + |
1305 | i18n("<p><h2>KO/Pi icon colors:</h2></p>\n") + | 1305 | i18n("<p><h2>KO/Pi icon colors:</h2></p>\n") + |
1306 | i18n("<p><b>(for square icons in agenda and month view)</b></p>\n") + | 1306 | i18n("<p><b>(for square icons in agenda and month view)</b></p>\n") + |
1307 | i18n("<p><b>Cross</b>: Item cancelled.([c] in Whats'Next view)</p>\n")+ | 1307 | i18n("<p><b>Cross</b>: Item cancelled.([c] in Whats'Next view)</p>\n")+ |
1308 | i18n("<p><b>Red</b>: Alarm set.([a] in Whats'Next view)</p>\n")+ | 1308 | i18n("<p><b>Red</b>: Alarm set.([a] in Whats'Next view)</p>\n")+ |
1309 | i18n("<p><b>Blue</b>: Recurrent event.([r] in Whats'Next view)</p>\n")+ | 1309 | i18n("<p><b>Blue</b>: Recurrent event.([r] in Whats'Next view)</p>\n")+ |
1310 | i18n("<p><b>Dark green</b>: Information(description) available.([i] in WN view)</p>\n")+ | 1310 | i18n("<p><b>Dark green</b>: Information(description) available.([i] in WN view)</p>\n")+ |
1311 | i18n("<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n")+ | 1311 | i18n("<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n")+ |
1312 | i18n("<p><b>Dark yellow</b>: Event/todo with attendees.</p>\n") + | 1312 | i18n("<p><b>Dark yellow</b>: Event/todo with attendees.</p>\n") + |
1313 | i18n("<p><b>White</b>: Item readonly</p>\n"); | 1313 | i18n("<p><b>White</b>: Item readonly</p>\n"); |
1314 | displayText( text, cap); | 1314 | displayText( text, cap); |
1315 | } | 1315 | } |
1316 | void MainWindow::aboutAutoSaving() | 1316 | void MainWindow::aboutAutoSaving() |
1317 | { | 1317 | { |
1318 | QString text = i18n("After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configurable) three minutes.\nFor safety reasons there is one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n"); | 1318 | QString text = i18n("After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configurable) three minutes.\nFor safety reasons there is one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n"); |
1319 | 1319 | ||
1320 | KApplication::showText( i18n("Auto Saving in KOrganizer/Pi"), text); | 1320 | KApplication::showText( i18n("Auto Saving in KOrganizer/Pi"), text); |
1321 | 1321 | ||
1322 | } | 1322 | } |
diff --git a/korganizer/navigatorbar.h b/korganizer/navigatorbar.h index ee4c06d..93240a6 100644 --- a/korganizer/navigatorbar.h +++ b/korganizer/navigatorbar.h | |||
@@ -1,66 +1,65 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | 3 | ||
4 | Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org> | 4 | Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org> |
5 | 5 | ||
6 | This program is free software; you can redistribute it and/or modify | 6 | This program is free software; you can redistribute it and/or modify |
7 | it under the terms of the GNU General Public License as published by | 7 | it under the terms of the GNU General Public License as published by |
8 | the Free Software Foundation; either version 2 of the License, or | 8 | the Free Software Foundation; either version 2 of the License, or |
9 | (at your option) any later version. | 9 | (at your option) any later version. |
10 | 10 | ||
11 | This program is distributed in the hope that it will be useful, | 11 | This program is distributed in the hope that it will be useful, |
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | GNU General Public License for more details. | 14 | GNU General Public License for more details. |
15 | 15 | ||
16 | You should have received a copy of the GNU General Public License | 16 | You should have received a copy of the GNU General Public License |
17 | along with this program; if not, write to the Free Software | 17 | along with this program; if not, write to the Free Software |
18 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 18 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
19 | 19 | ||
20 | As a special exception, permission is given to link this program | 20 | As a special exception, permission is given to link this program |
21 | with any edition of Qt, and distribute the resulting executable, | 21 | with any edition of Qt, and distribute the resulting executable, |
22 | without including the source code for Qt in the source distribution. | 22 | without including the source code for Qt in the source distribution. |
23 | */ | 23 | */ |
24 | #ifndef NAVIGATORBAR_H | 24 | #ifndef NAVIGATORBAR_H |
25 | #define NAVIGATORBAR_H | 25 | #define NAVIGATORBAR_H |
26 | 26 | ||
27 | #include <libkcal/incidencebase.h> | 27 | #include <libkcal/incidencebase.h> |
28 | 28 | ||
29 | #include <qwidget.h> | 29 | #include <qwidget.h> |
30 | 30 | ||
31 | class QPushButton; | 31 | class QPushButton; |
32 | class QFrame; | 32 | class QFrame; |
33 | class QLabel; | 33 | class QLabel; |
34 | 34 | ||
35 | class NavigatorBar: public QWidget | 35 | class NavigatorBar: public QWidget |
36 | { | 36 | { |
37 | Q_OBJECT | 37 | Q_OBJECT |
38 | public: | 38 | public: |
39 | NavigatorBar( const QDate & date, QWidget *parent = 0, const char *name = 0 ); | 39 | NavigatorBar( const QDate & date, QWidget *parent = 0, const char *name = 0 ); |
40 | ~NavigatorBar(); | 40 | ~NavigatorBar(); |
41 | 41 | ||
42 | public slots: | 42 | public slots: |
43 | void selectDates( const KCal::DateList & ); | 43 | void selectDates( const KCal::DateList & ); |
44 | void selectMonth(); | 44 | void selectMonth(); |
45 | 45 | ||
46 | signals: | 46 | signals: |
47 | void goNextMonth(); | 47 | void goNextMonth(); |
48 | void goPrevMonth(); | 48 | void goPrevMonth(); |
49 | void goNextYear(); | 49 | void goNextYear(); |
50 | void goPrevYear(); | 50 | void goPrevYear(); |
51 | void monthSelected( int ); | 51 | void monthSelected( int ); |
52 | void selectWeek( int ); | ||
53 | 52 | ||
54 | private: | 53 | private: |
55 | QFrame *mCtrlFrame; | 54 | QFrame *mCtrlFrame; |
56 | 55 | ||
57 | QPushButton *mPrevYear; | 56 | QPushButton *mPrevYear; |
58 | QPushButton *mPrevMonth; | 57 | QPushButton *mPrevMonth; |
59 | QPushButton *mNextMonth; | 58 | QPushButton *mNextMonth; |
60 | QPushButton *mNextYear; | 59 | QPushButton *mNextYear; |
61 | QPushButton *mSelectMonth; | 60 | QPushButton *mSelectMonth; |
62 | 61 | ||
63 | //QLabel *mDateLabel; | 62 | //QLabel *mDateLabel; |
64 | }; | 63 | }; |
65 | 64 | ||
66 | #endif | 65 | #endif |