-rw-r--r-- | bin/kdepim/WhatsNew.txt | 5 | ||||
-rw-r--r-- | bin/kdepim/kopiemail/germantranslation.txt | 6 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 10 | ||||
-rw-r--r-- | korganizer/koprefs.cpp | 1 | ||||
-rw-r--r-- | korganizer/koprefs.h | 2 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 12 |
6 files changed, 25 insertions, 11 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index c0078be..23ff53c 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,26 +1,31 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 1.9.19 ************ | ||
4 | |||
5 | Added a lot of missing translations to KA/Pi, | ||
6 | added some missing translations to KO/Pi and OM/Pi. | ||
7 | |||
3 | ********** VERSION 1.9.18 ************ | 8 | ********** VERSION 1.9.18 ************ |
4 | 9 | ||
5 | FYI: The VERSION 1.9.17 was a testing release only. | 10 | FYI: The VERSION 1.9.17 was a testing release only. |
6 | Please read the changelog of VERSION 1.9.17 as well. | 11 | Please read the changelog of VERSION 1.9.17 as well. |
7 | 12 | ||
8 | Cleaned up the syncing config dialog. | 13 | Cleaned up the syncing config dialog. |
9 | Added sync config options for date range for events. | 14 | Added sync config options for date range for events. |
10 | Added sync config options for filters on incoming data. | 15 | Added sync config options for filters on incoming data. |
11 | Added sync config options for filters on outgoing data. | 16 | Added sync config options for filters on outgoing data. |
12 | Please read the updated SyncHowTo about the new filter settings. | 17 | Please read the updated SyncHowTo about the new filter settings. |
13 | These filter settings make it now possible to sync with shared | 18 | These filter settings make it now possible to sync with shared |
14 | calendars without writing back private or confidential data | 19 | calendars without writing back private or confidential data |
15 | (via the outgoing filters). | 20 | (via the outgoing filters). |
16 | To sync only with particular parts of a shared calendar, | 21 | To sync only with particular parts of a shared calendar, |
17 | the incoming filter settings can be used. | 22 | the incoming filter settings can be used. |
18 | An example can be found in the SyncHowTo. | 23 | An example can be found in the SyncHowTo. |
19 | Same for shared addressbooks. | 24 | Same for shared addressbooks. |
20 | 25 | ||
21 | Added a setting for the global kdepim data storage. | 26 | Added a setting for the global kdepim data storage. |
22 | Usually the data is stored in (yourhomedir/kdepim). | 27 | Usually the data is stored in (yourhomedir/kdepim). |
23 | Now you can set in the Global config dialog TAB, subTAB "Data storage path" | 28 | Now you can set in the Global config dialog TAB, subTAB "Data storage path" |
24 | a directory where all the kdepim data is stored. | 29 | a directory where all the kdepim data is stored. |
25 | That makes it easy to save all kdepim data on a SD card on the Z, for example. | 30 | That makes it easy to save all kdepim data on a SD card on the Z, for example. |
26 | 31 | ||
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt index 5037f5f..6ebaafe 100644 --- a/bin/kdepim/kopiemail/germantranslation.txt +++ b/bin/kdepim/kopiemail/germantranslation.txt | |||
@@ -164,51 +164,51 @@ | |||
164 | { "Fetching header list","Hole Titel Liste" }, | 164 | { "Fetching header list","Hole Titel Liste" }, |
165 | { "Mailbox has %1 mails","Mailbox hat %1 Mails" }, | 165 | { "Mailbox has %1 mails","Mailbox hat %1 Mails" }, |
166 | { "Read this mail","Lies diese Mail" }, | 166 | { "Read this mail","Lies diese Mail" }, |
167 | { "Move/Copy this mail","Verschiebe/kopiere diese Mail" }, | 167 | { "Move/Copy this mail","Verschiebe/kopiere diese Mail" }, |
168 | { "Delete this mail","Lösche diese Mail" }, | 168 | { "Delete this mail","Lösche diese Mail" }, |
169 | { "Move/Copy all selected mail","Verschiebe/kopiere selektierte Mails" }, | 169 | { "Move/Copy all selected mail","Verschiebe/kopiere selektierte Mails" }, |
170 | { "Delete all selected mails","Lösche alle selektierten Mails" }, | 170 | { "Delete all selected mails","Lösche alle selektierten Mails" }, |
171 | { "Clear selection","Selektion aufheben" }, | 171 | { "Clear selection","Selektion aufheben" }, |
172 | { "Reply","Antworten" }, | 172 | { "Reply","Antworten" }, |
173 | { "Forward","Weiterleiten" }, | 173 | { "Forward","Weiterleiten" }, |
174 | { "Attachments","Anhang" }, | 174 | { "Attachments","Anhang" }, |
175 | { "Show Html","Zeige in html" }, | 175 | { "Show Html","Zeige in html" }, |
176 | { "Description","Beschreibung" }, | 176 | { "Description","Beschreibung" }, |
177 | { "Filename","Dateiname" }, | 177 | { "Filename","Dateiname" }, |
178 | { "E-Mail by %1","E-Mail von %1" }, | 178 | { "E-Mail by %1","E-Mail von %1" }, |
179 | { "Cc","Kopie" }, | 179 | { "Cc","Kopie" }, |
180 | { "To","An" }, | 180 | { "To","An" }, |
181 | { "From","Von" }, | 181 | { "From","Von" }, |
182 | { "<p>Do you really want to delete this mail? <br><br>","<p>Wollen Sie diese Mail wirklich löschen? <br><br>" }, | 182 | { "<p>Do you really want to delete this mail? <br><br>","<p>Wollen Sie diese Mail wirklich löschen? <br><br>" }, |
183 | { "Mailbox has %1 mail(s)","Mailbox hat %1 Mail(s)" }, | 183 | { "Mailbox has %1 mail(s)","Mailbox hat %1 Mail(s)" }, |
184 | { "Move/Copie all mails","Verschiebe/kopiere alle Mails" }, | 184 | { "Move/Copie all mails","Verschiebe/kopiere alle Mails" }, |
185 | { "Delete all mails","Lösche alle Mails" }, | 185 | { "Delete all mails","Lösche alle Mails" }, |
186 | { "Create new subfolder","Neues Unterverzeichnis" }, | 186 | { "Create new subfolder","Neues Unterverzeichnis" }, |
187 | { "Delete folder","Lösche Verzeichnis" }, | 187 | { "Delete folder","Lösche Verzeichnis" }, |
188 | { "Refresh folder list","Aktualisiere Verzeichnis Liste" }, | 188 | { "Refresh folder list","Aktualisiere Liste" }, |
189 | { "Create new folder","Neues Verzeichnis" }, | 189 | { "Create new folder","Neues Verzeichnis" }, |
190 | { "Disconnect","Disconnect" }, | 190 | { "Disconnect","Diskonnect" }, |
191 | { "Set offline","Gehe offline" }, | 191 | { "Set offline","Gehe offline" }, |
192 | { "Select target box","Wähle Ziel Box" }, | 192 | { "Select target box","Wähle Ziel Box" }, |
193 | { "<b>Store mail(s) to</b>","<b>Speichere Mail(s) nach</b>" }, | 193 | { "<b>Store mail(s) to</b>","<b>Speichere Mail(s) nach</b>" }, |
194 | { "Folder:","Verzeichnis:" }, | 194 | { "Folder:","Verzeichnis:" }, |
195 | { "Account:","Zugang:" }, | 195 | { "Account:","Zugang:" }, |
196 | { "Prefix will prepend, do not enter","Pfad-Prefix wird vorangestellt" }, | 196 | { "Prefix will prepend, do not enter","Pfad-Prefix wird vorangestellt" }, |
197 | { "Move mail(s)","Verschiebe Mail(s)" }, | 197 | { "Move mail(s)","Verschiebe Mail(s)" }, |
198 | { "only mails smaller","nur Mails kleiner" }, | 198 | { "only mails smaller","nur Mails kleiner" }, |
199 | { " kB"," kB" }, | 199 | { " kB"," kB" }, |
200 | { " message %1 of %2"," Nachricht %1 von %2" }, | 200 | { " message %1 of %2"," Nachricht %1 von %2" }, |
201 | { "Copying...","Am Kopieren..." }, | 201 | { "Copying...","Am Kopieren..." }, |
202 | { "Copy message %1 of %2","Kopiere Nachricht %1 von %2" }, | 202 | { "Copy message %1 of %2","Kopiere Nachricht %1 von %2" }, |
203 | { "Do you really want to delete\nall selected mails?","Wollen Sie wirklich alle\nselektierten Mails Löschen?" }, | 203 | { "Do you really want to delete\nall selected mails?","Wollen Sie wirklich alle\nselektierten Mails Löschen?" }, |
204 | { "Delete All Mails","Lösche alle Mails" }, | 204 | { "Delete All Mails","Lösche alle Mails" }, |
205 | { "Deleting ...","Am Löschen..." }, | 205 | { "Deleting ...","Am Löschen..." }, |
206 | { "Delete message %1 of %2","Lösche Nachricht %1 von %2" }, | 206 | { "Delete message %1 of %2","Lösche Nachricht %1 von %2" }, |
207 | { "Compose Message","Verfasse Nachricht" }, | 207 | { "Compose Message","Verfasse Nachricht" }, |
208 | { "Reply-To","Antwort-An" }, | 208 | { "Reply-To","Antwort-An" }, |
209 | { "BCC","BCC" }, | 209 | { "BCC","BCC" }, |
210 | { "Signature","Signatur" }, | 210 | { "Signature","Signatur" }, |
211 | { "CC","Kopie" }, | 211 | { "CC","Kopie" }, |
212 | { "Options","Optionen" }, | 212 | { "Options","Optionen" }, |
213 | { "Delete File","Lösche Datei" }, | 213 | { "Delete File","Lösche Datei" }, |
214 | { "Add File","Füge Datei hinzu" }, | 214 | { "Add File","Füge Datei hinzu" }, |
@@ -231,30 +231,30 @@ | |||
231 | { "<p>Do you really want to delete the selected Account?</p>","<p>Möchten Sie wirklich den ausgewählten Account löschen?</p>" }, | 231 | { "<p>Do you really want to delete the selected Account?</p>","<p>Möchten Sie wirklich den ausgewählten Account löschen?</p>" }, |
232 | { "Question","Eine Frage..." }, | 232 | { "Question","Eine Frage..." }, |
233 | { "Send this message?","Nachricht wirklich senden?" }, | 233 | { "Send this message?","Nachricht wirklich senden?" }, |
234 | { "Stop editing message","Stop editing message" }, | 234 | { "Stop editing message","Stop editing message" }, |
235 | { "Sending mail %1 of %2","Sende Mail %1 von %2" }, | 235 | { "Sending mail %1 of %2","Sende Mail %1 von %2" }, |
236 | { "%1 of %2 bytes send","%1 von %2 Bytes gesendet" }, | 236 | { "%1 of %2 bytes send","%1 von %2 Bytes gesendet" }, |
237 | { "Refresh header list","Aktualisiere Titel Liste" }, | 237 | { "Refresh header list","Aktualisiere Titel Liste" }, |
238 | { "Define a smtp\n account first!\n","Bitte zuerst einen\nSMTP Account anlegen!\n" }, | 238 | { "Define a smtp\n account first!\n","Bitte zuerst einen\nSMTP Account anlegen!\n" }, |
239 | { "Mail queue flushed","Gespeicherte Mails gesendet!" }, | 239 | { "Mail queue flushed","Gespeicherte Mails gesendet!" }, |
240 | { "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n","Bitte legen Sie einen\nSMTP Account an.\nDer SMTP Account wird\nfür das Versenden von\nMails benötigt!" }, | 240 | { "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n","Bitte legen Sie einen\nSMTP Account an.\nDer SMTP Account wird\nfür das Versenden von\nMails benötigt!" }, |
241 | { "Show next mail","Zeige nächste Mail" }, | 241 | { "Show next mail","Zeige nächste Mail" }, |
242 | { "End of List","Ende der Liste" }, | 242 | { "End of List","Ende der Liste" }, |
243 | { "Language","Sprache" }, | 243 | { "Language","Sprache" }, |
244 | { "Time Format","Zeit Format" }, | 244 | { "Time Format","Zeit Format" }, |
245 | { "%1 groups subscribed","%1 Guppen abboniert" }, | 245 | { "%1 groups subscribed","%1 Guppen abboniert" }, |
246 | { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Ihr gerade genutztes Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverzeichnis)/apps/kopiemail/localmail" }, | 246 | { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Ihr gerade genutztes Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverzeichnis)/apps/kopiemail/localmail" }, |
247 | { "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" }, | 247 | { "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" }, |
248 | { "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" }, | 248 | { "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" }, |
249 | { "Save settings","Speichere Einstellungen" }, | 249 | { "Save settings","Speichere Einstellungen" }, |
250 | { "Save standard","Speichere Standard" }, | 250 | { "Save standard","Speichere Standard" }, |
251 | { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, | 251 | { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, |
252 | { "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" }, | 252 | { "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" }, |
253 | { "Data storage path","Daten Speicherpfad" }, | 253 | { "Data storage path","Daten Speicherpfad" }, |
254 | { "userdefined","benutzerdefiniert" }, | 254 | { "userdefined","benutzerdefiniert" }, |
255 | { "","" }, | 255 | { "Reply to this mail","Beantworte diese Mail" }, |
256 | { "","" }, | 256 | { "","" }, |
257 | { "","" }, | 257 | { "","" }, |
258 | { "","" }, | 258 | { "","" }, |
259 | { "","" }, | 259 | { "","" }, |
260 | { "","" }, | 260 | { "","" }, |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 9c10ba6..12af655 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -318,49 +318,50 @@ void CalendarView::init() | |||
318 | leftFrameLayout->addWidget(mFilterView); | 318 | leftFrameLayout->addWidget(mFilterView); |
319 | leftFrameLayout->addWidget(mTodoList, 2 ); | 319 | leftFrameLayout->addWidget(mTodoList, 2 ); |
320 | 320 | ||
321 | } else { | 321 | } else { |
322 | leftFrameLayout->addWidget(mTodoList,2 ); | 322 | leftFrameLayout->addWidget(mTodoList,2 ); |
323 | leftFrameLayout->addWidget(mFilterView ); | 323 | leftFrameLayout->addWidget(mFilterView ); |
324 | } | 324 | } |
325 | mFilterView->hide(); | 325 | mFilterView->hide(); |
326 | QWidget *rightBox = new QWidget( mainBox ); | 326 | QWidget *rightBox = new QWidget( mainBox ); |
327 | mainBoxLayout->addWidget ( rightBox, 10 ); | 327 | mainBoxLayout->addWidget ( rightBox, 10 ); |
328 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); | 328 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); |
329 | mNavigatorBar = new NavigatorBar( QDate::currentDate(), rightBox, "useBigPixmaps" ); | 329 | mNavigatorBar = new NavigatorBar( QDate::currentDate(), rightBox, "useBigPixmaps" ); |
330 | mRightFrame = new QWidgetStack( rightBox ); | 330 | mRightFrame = new QWidgetStack( rightBox ); |
331 | rightLayout->addWidget( mNavigatorBar ); | 331 | rightLayout->addWidget( mNavigatorBar ); |
332 | rightLayout->addWidget( mRightFrame, 10 ); | 332 | rightLayout->addWidget( mRightFrame, 10 ); |
333 | 333 | ||
334 | mLeftFrame = leftFrame; | 334 | mLeftFrame = leftFrame; |
335 | if ( KOPrefs::instance()->mVerticalScreen ) { | 335 | if ( KOPrefs::instance()->mVerticalScreen ) { |
336 | mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() ); | 336 | mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() ); |
337 | leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() ); | 337 | leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() ); |
338 | } else { | 338 | } else { |
339 | mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() ); | 339 | mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() ); |
340 | leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() ); | 340 | leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() ); |
341 | } | 341 | } |
342 | 342 | if ( !KOPrefs::instance()->mShowDateNavigator) | |
343 | mDateNavigator->hide(); | ||
343 | //qDebug("Calendarview Size %d %d ", width(), height()); | 344 | //qDebug("Calendarview Size %d %d ", width(), height()); |
344 | #endif | 345 | #endif |
345 | 346 | ||
346 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), | 347 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), |
347 | SLOT( showDates( const KCal::DateList & ) ) ); | 348 | SLOT( showDates( const KCal::DateList & ) ) ); |
348 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), | 349 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), |
349 | mDateNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); | 350 | mDateNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); |
350 | 351 | ||
351 | connect( mNavigatorBar, SIGNAL( goPrevYear() ), | 352 | connect( mNavigatorBar, SIGNAL( goPrevYear() ), |
352 | mNavigator, SLOT( selectPreviousYear() ) ); | 353 | mNavigator, SLOT( selectPreviousYear() ) ); |
353 | connect( mNavigatorBar, SIGNAL( goNextYear() ), | 354 | connect( mNavigatorBar, SIGNAL( goNextYear() ), |
354 | mNavigator, SLOT( selectNextYear() ) ); | 355 | mNavigator, SLOT( selectNextYear() ) ); |
355 | connect( mNavigatorBar, SIGNAL( goPrevMonth() ), | 356 | connect( mNavigatorBar, SIGNAL( goPrevMonth() ), |
356 | mNavigator, SLOT( selectPreviousMonth() ) ); | 357 | mNavigator, SLOT( selectPreviousMonth() ) ); |
357 | connect( mNavigatorBar, SIGNAL( goNextMonth() ), | 358 | connect( mNavigatorBar, SIGNAL( goNextMonth() ), |
358 | mNavigator, SLOT( selectNextMonth() ) ); | 359 | mNavigator, SLOT( selectNextMonth() ) ); |
359 | 360 | ||
360 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), | 361 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), |
361 | mNavigatorBar, SLOT( selectDates( const KCal::DateList & ) ) ); | 362 | mNavigatorBar, SLOT( selectDates( const KCal::DateList & ) ) ); |
362 | 363 | ||
363 | connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ), | 364 | connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ), |
364 | mNavigator, SLOT( selectWeek( const QDate & ) ) ); | 365 | mNavigator, SLOT( selectWeek( const QDate & ) ) ); |
365 | 366 | ||
366 | connect( mDateNavigator, SIGNAL( goPrevYear() ), | 367 | connect( mDateNavigator, SIGNAL( goPrevYear() ), |
@@ -2147,52 +2148,52 @@ void CalendarView::changeEventDisplay(Event *which, int action) | |||
2147 | } | 2148 | } |
2148 | } | 2149 | } |
2149 | 2150 | ||
2150 | 2151 | ||
2151 | void CalendarView::updateTodoViews() | 2152 | void CalendarView::updateTodoViews() |
2152 | { | 2153 | { |
2153 | 2154 | ||
2154 | mTodoList->updateView(); | 2155 | mTodoList->updateView(); |
2155 | mViewManager->currentView()->updateView(); | 2156 | mViewManager->currentView()->updateView(); |
2156 | 2157 | ||
2157 | } | 2158 | } |
2158 | 2159 | ||
2159 | 2160 | ||
2160 | void CalendarView::updateView(const QDate &start, const QDate &end) | 2161 | void CalendarView::updateView(const QDate &start, const QDate &end) |
2161 | { | 2162 | { |
2162 | mTodoList->updateView(); | 2163 | mTodoList->updateView(); |
2163 | mViewManager->updateView(start, end); | 2164 | mViewManager->updateView(start, end); |
2164 | //mDateNavigator->updateView(); | 2165 | //mDateNavigator->updateView(); |
2165 | } | 2166 | } |
2166 | 2167 | ||
2167 | void CalendarView::updateView() | 2168 | void CalendarView::updateView() |
2168 | { | 2169 | { |
2169 | DateList tmpList = mNavigator->selectedDates(); | 2170 | DateList tmpList = mNavigator->selectedDates(); |
2170 | 2171 | ||
2171 | // We assume that the navigator only selects consecutive days. | ||
2172 | updateView( tmpList.first(), tmpList.last() ); | ||
2173 | if ( KOPrefs::instance()->mHideNonStartedTodos ) | 2172 | if ( KOPrefs::instance()->mHideNonStartedTodos ) |
2174 | mTodoList->updateView(); | 2173 | mTodoList->updateView(); |
2174 | // We assume that the navigator only selects consecutive days. | ||
2175 | updateView( tmpList.first(), tmpList.last() ); | ||
2175 | } | 2176 | } |
2176 | 2177 | ||
2177 | void CalendarView::updateUnmanagedViews() | 2178 | void CalendarView::updateUnmanagedViews() |
2178 | { | 2179 | { |
2179 | mDateNavigator->updateDayMatrix(); | 2180 | mDateNavigator->updateDayMatrix(); |
2180 | } | 2181 | } |
2181 | 2182 | ||
2182 | int CalendarView::msgItemDelete() | 2183 | int CalendarView::msgItemDelete() |
2183 | { | 2184 | { |
2184 | return KMessageBox::warningContinueCancel(this, | 2185 | return KMessageBox::warningContinueCancel(this, |
2185 | i18n("This item will be\npermanently deleted."), | 2186 | i18n("This item will be\npermanently deleted."), |
2186 | i18n("KO/Pi Confirmation"),i18n("Delete")); | 2187 | i18n("KO/Pi Confirmation"),i18n("Delete")); |
2187 | } | 2188 | } |
2188 | 2189 | ||
2189 | 2190 | ||
2190 | void CalendarView::edit_cut() | 2191 | void CalendarView::edit_cut() |
2191 | { | 2192 | { |
2192 | Event *anEvent=0; | 2193 | Event *anEvent=0; |
2193 | 2194 | ||
2194 | Incidence *incidence = mViewManager->currentView()->selectedIncidences().first(); | 2195 | Incidence *incidence = mViewManager->currentView()->selectedIncidences().first(); |
2195 | 2196 | ||
2196 | if (mViewManager->currentView()->isEventView()) { | 2197 | if (mViewManager->currentView()->isEventView()) { |
2197 | if ( incidence && incidence->type() == "Event" ) { | 2198 | if ( incidence && incidence->type() == "Event" ) { |
2198 | anEvent = static_cast<Event *>(incidence); | 2199 | anEvent = static_cast<Event *>(incidence); |
@@ -3588,49 +3589,50 @@ void CalendarView::showIntro() | |||
3588 | kdDebug() << "To be implemented." << endl; | 3589 | kdDebug() << "To be implemented." << endl; |
3589 | } | 3590 | } |
3590 | 3591 | ||
3591 | QWidgetStack *CalendarView::viewStack() | 3592 | QWidgetStack *CalendarView::viewStack() |
3592 | { | 3593 | { |
3593 | return mRightFrame; | 3594 | return mRightFrame; |
3594 | } | 3595 | } |
3595 | 3596 | ||
3596 | QWidget *CalendarView::leftFrame() | 3597 | QWidget *CalendarView::leftFrame() |
3597 | { | 3598 | { |
3598 | return mLeftFrame; | 3599 | return mLeftFrame; |
3599 | } | 3600 | } |
3600 | 3601 | ||
3601 | DateNavigator *CalendarView::dateNavigator() | 3602 | DateNavigator *CalendarView::dateNavigator() |
3602 | { | 3603 | { |
3603 | return mNavigator; | 3604 | return mNavigator; |
3604 | } | 3605 | } |
3605 | 3606 | ||
3606 | KDateNavigator* CalendarView::dateNavigatorWidget() | 3607 | KDateNavigator* CalendarView::dateNavigatorWidget() |
3607 | { | 3608 | { |
3608 | return mDateNavigator; | 3609 | return mDateNavigator; |
3609 | } | 3610 | } |
3610 | void CalendarView::toggleDateNavigatorWidget() | 3611 | void CalendarView::toggleDateNavigatorWidget() |
3611 | { | 3612 | { |
3612 | if (mDateNavigator->isVisible()) | 3613 | KOPrefs::instance()->mShowDateNavigator = !KOPrefs::instance()->mShowDateNavigator ; |
3614 | if (!KOPrefs::instance()->mShowDateNavigator ) | ||
3613 | mDateNavigator->hide(); | 3615 | mDateNavigator->hide(); |
3614 | else | 3616 | else |
3615 | mDateNavigator->show(); | 3617 | mDateNavigator->show(); |
3616 | } | 3618 | } |
3617 | void CalendarView::addView(KOrg::BaseView *view) | 3619 | void CalendarView::addView(KOrg::BaseView *view) |
3618 | { | 3620 | { |
3619 | mViewManager->addView(view); | 3621 | mViewManager->addView(view); |
3620 | } | 3622 | } |
3621 | 3623 | ||
3622 | void CalendarView::showView(KOrg::BaseView *view) | 3624 | void CalendarView::showView(KOrg::BaseView *view) |
3623 | { | 3625 | { |
3624 | mViewManager->showView(view, mLeftFrame->isVisible()); | 3626 | mViewManager->showView(view, mLeftFrame->isVisible()); |
3625 | } | 3627 | } |
3626 | 3628 | ||
3627 | Incidence *CalendarView::currentSelection() | 3629 | Incidence *CalendarView::currentSelection() |
3628 | { | 3630 | { |
3629 | return mViewManager->currentSelection(); | 3631 | return mViewManager->currentSelection(); |
3630 | } | 3632 | } |
3631 | void CalendarView::toggleAllDaySize() | 3633 | void CalendarView::toggleAllDaySize() |
3632 | { | 3634 | { |
3633 | /* | 3635 | /* |
3634 | if ( KOPrefs::instance()->mAllDaySize > 47 ) | 3636 | if ( KOPrefs::instance()->mAllDaySize > 47 ) |
3635 | KOPrefs::instance()->mAllDaySize = KOPrefs::instance()->mAllDaySize /2; | 3637 | KOPrefs::instance()->mAllDaySize = KOPrefs::instance()->mAllDaySize /2; |
3636 | else | 3638 | else |
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 0a767b6..4b26058 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -193,48 +193,49 @@ KOPrefs::KOPrefs() : | |||
193 | addItemBool("ShortDateInViewer",&mShortDateInViewer,false); | 193 | addItemBool("ShortDateInViewer",&mShortDateInViewer,false); |
194 | 194 | ||
195 | 195 | ||
196 | KPrefs::setCurrentGroup("Colors"); | 196 | KPrefs::setCurrentGroup("Colors"); |
197 | addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor); | 197 | addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor); |
198 | addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor); | 198 | addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor); |
199 | addItemColor("Event Color",&mEventColor,mDefaultCategoryColor); | 199 | addItemColor("Event Color",&mEventColor,mDefaultCategoryColor); |
200 | addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor); | 200 | addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor); |
201 | addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor); | 201 | addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor); |
202 | addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor); | 202 | addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor); |
203 | addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor); | 203 | addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor); |
204 | addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 )); | 204 | addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 )); |
205 | addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 )); | 205 | addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 )); |
206 | addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 )); | 206 | addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 )); |
207 | addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); | 207 | addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); |
208 | addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true); | 208 | addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true); |
209 | addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); | 209 | addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); |
210 | addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 )); | 210 | addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 )); |
211 | addItemColor("AppColor2",&mAppColor2,QColor( 174,216,255 )); | 211 | addItemColor("AppColor2",&mAppColor2,QColor( 174,216,255 )); |
212 | addItemBool("UseAppColors",&mUseAppColors,false); | 212 | addItemBool("UseAppColors",&mUseAppColors,false); |
213 | 213 | ||
214 | 214 | ||
215 | 215 | ||
216 | KPrefs::setCurrentGroup("Views"); | 216 | KPrefs::setCurrentGroup("Views"); |
217 | addItemBool("Show Date Navigator",&mShowDateNavigator,true); | ||
217 | addItemInt("Hour Size",&mHourSize,8); | 218 | addItemInt("Hour Size",&mHourSize,8); |
218 | addItemBool("Show Daily Recurrences",&mDailyRecur,true); | 219 | addItemBool("Show Daily Recurrences",&mDailyRecur,true); |
219 | addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true); | 220 | addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true); |
220 | addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true); | 221 | addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true); |
221 | addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true); | 222 | addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true); |
222 | addItemBool("ShowShortMonthName",&mMonthShowShort,false); | 223 | addItemBool("ShowShortMonthName",&mMonthShowShort,false); |
223 | addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true); | 224 | addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true); |
224 | addItemBool("Enable ToolTips",&mEnableToolTips,false); | 225 | addItemBool("Enable ToolTips",&mEnableToolTips,false); |
225 | addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false); | 226 | addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false); |
226 | addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false); | 227 | addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false); |
227 | addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true); | 228 | addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true); |
228 | addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true); | 229 | addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true); |
229 | addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,false); | 230 | addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,false); |
230 | addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false); | 231 | addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false); |
231 | addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false); | 232 | addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false); |
232 | addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true); | 233 | addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true); |
233 | addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true); | 234 | addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true); |
234 | addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);; | 235 | addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);; |
235 | addItemBool("WNViewShowsPast",&mWNViewShowsPast,true); | 236 | addItemBool("WNViewShowsPast",&mWNViewShowsPast,true); |
236 | addItemBool("WNViewShowLocation",&mWNViewShowLocation,false); | 237 | addItemBool("WNViewShowLocation",&mWNViewShowLocation,false); |
237 | addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false); | 238 | addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false); |
238 | addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true); | 239 | addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true); |
239 | addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false); | 240 | addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false); |
240 | addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false); | 241 | addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false); |
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 69722a1..b3acda7 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h | |||
@@ -224,48 +224,50 @@ class KOPrefs : public KPimPrefs | |||
224 | 224 | ||
225 | int mDestination; | 225 | int mDestination; |
226 | 226 | ||
227 | 227 | ||
228 | bool mEditOnDoubleClick; | 228 | bool mEditOnDoubleClick; |
229 | bool mViewChangeHoldFullscreen; | 229 | bool mViewChangeHoldFullscreen; |
230 | bool mViewChangeHoldNonFullscreen; | 230 | bool mViewChangeHoldNonFullscreen; |
231 | bool mCenterOnCurrentTime; | 231 | bool mCenterOnCurrentTime; |
232 | bool mSetTimeToDayStartAt; | 232 | bool mSetTimeToDayStartAt; |
233 | bool mHighlightCurrentDay; | 233 | bool mHighlightCurrentDay; |
234 | bool mUseHighlightLightColor; | 234 | bool mUseHighlightLightColor; |
235 | bool mListViewMonthTimespan; | 235 | bool mListViewMonthTimespan; |
236 | bool mWNViewShowsParents; | 236 | bool mWNViewShowsParents; |
237 | bool mWNViewShowsPast; | 237 | bool mWNViewShowsPast; |
238 | bool mWNViewShowLocation; | 238 | bool mWNViewShowLocation; |
239 | bool mTodoViewShowsPercentage; | 239 | bool mTodoViewShowsPercentage; |
240 | bool mTodoViewUsesCatColors; | 240 | bool mTodoViewUsesCatColors; |
241 | bool mTodoViewUsesSmallFont; | 241 | bool mTodoViewUsesSmallFont; |
242 | bool mTodoViewUsesForegroundColor; | 242 | bool mTodoViewUsesForegroundColor; |
243 | bool mMonthViewUsesForegroundColor; | 243 | bool mMonthViewUsesForegroundColor; |
244 | 244 | ||
245 | bool mHightlightDateTimeEdit; | 245 | bool mHightlightDateTimeEdit; |
246 | bool mShortDateInViewer; | 246 | bool mShortDateInViewer; |
247 | 247 | ||
248 | bool mShowDateNavigator; | ||
249 | |||
248 | QStringList mLocationDefaults; | 250 | QStringList mLocationDefaults; |
249 | QStringList mEventSummaryUser; | 251 | QStringList mEventSummaryUser; |
250 | QStringList mTodoSummaryUser; | 252 | QStringList mTodoSummaryUser; |
251 | 253 | ||
252 | bool mUseInternalAlarmNotification; | 254 | bool mUseInternalAlarmNotification; |
253 | int mAlarmPlayBeeps; | 255 | int mAlarmPlayBeeps; |
254 | int mAlarmSuspendTime; | 256 | int mAlarmSuspendTime; |
255 | int mAlarmSuspendCount; | 257 | int mAlarmSuspendCount; |
256 | int mAlarmBeepInterval; | 258 | int mAlarmBeepInterval; |
257 | int mOldLanguage; | 259 | int mOldLanguage; |
258 | int mOldLoadedLanguage; | 260 | int mOldLoadedLanguage; |
259 | 261 | ||
260 | 262 | ||
261 | QString mActiveSyncPort; | 263 | QString mActiveSyncPort; |
262 | QString mActiveSyncIP; | 264 | QString mActiveSyncIP; |
263 | 265 | ||
264 | private: | 266 | private: |
265 | QDict<QColor> mCategoryColors; | 267 | QDict<QColor> mCategoryColors; |
266 | QColor mDefaultCategoryColor; | 268 | QColor mDefaultCategoryColor; |
267 | 269 | ||
268 | QFont mDefaultTimeBarFont; | 270 | QFont mDefaultTimeBarFont; |
269 | QFont mDefaultViewFont; | 271 | QFont mDefaultViewFont; |
270 | QFont mDefaultMonthViewFont; | 272 | QFont mDefaultMonthViewFont; |
271 | 273 | ||
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 5ec7ddd..151b55b 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1617,76 +1617,80 @@ void MainWindow::keyPressEvent ( QKeyEvent * e ) | |||
1617 | break; | 1617 | break; |
1618 | case Qt::Key_Minus: | 1618 | case Qt::Key_Minus: |
1619 | size = p->mHourSize - 2; | 1619 | size = p->mHourSize - 2; |
1620 | if ( size >= 4 ) | 1620 | if ( size >= 4 ) |
1621 | configureAgenda( size ); | 1621 | configureAgenda( size ); |
1622 | break; | 1622 | break; |
1623 | 1623 | ||
1624 | 1624 | ||
1625 | default: | 1625 | default: |
1626 | e->ignore(); | 1626 | e->ignore(); |
1627 | } | 1627 | } |
1628 | if ( pro > 0 ) { | 1628 | if ( pro > 0 ) { |
1629 | mView->selectFilter( pro-1 ); | 1629 | mView->selectFilter( pro-1 ); |
1630 | } | 1630 | } |
1631 | if ( showSelectedDates ) { | 1631 | if ( showSelectedDates ) { |
1632 | ;// setCaptionToDates(); | 1632 | ;// setCaptionToDates(); |
1633 | } | 1633 | } |
1634 | 1634 | ||
1635 | } | 1635 | } |
1636 | 1636 | ||
1637 | void MainWindow::fillFilterMenu() | 1637 | void MainWindow::fillFilterMenu() |
1638 | { | 1638 | { |
1639 | selectFilterMenu->clear(); | 1639 | selectFilterMenu->clear(); |
1640 | bool disable = false; | 1640 | bool disable = false; |
1641 | selectFilterMenu->insertItem(i18n ( "Edit Filters" ), 0 ); | ||
1642 | selectFilterMenu->insertSeparator(); | ||
1641 | if ( mView->filterView()->filtersEnabled() ) { | 1643 | if ( mView->filterView()->filtersEnabled() ) { |
1642 | selectFilterMenu->insertItem(i18n ( "Turn filter off" ), 0 ); | 1644 | selectFilterMenu->insertItem(i18n ( "Turn filter off" ), 1 ); |
1643 | } | 1645 | } |
1644 | else { | 1646 | else { |
1645 | selectFilterMenu->insertItem(i18n ( "Turn filter on" ), 0 ); | 1647 | selectFilterMenu->insertItem(i18n ( "Turn filter on" ), 1 ); |
1646 | disable = true; | 1648 | disable = true; |
1647 | } | 1649 | } |
1648 | selectFilterMenu->insertSeparator(); | 1650 | selectFilterMenu->insertSeparator(); |
1649 | QPtrList<CalFilter> fili = mView->filters(); | 1651 | QPtrList<CalFilter> fili = mView->filters(); |
1650 | CalFilter *curfilter = mView->filterView()->selectedFilter(); | 1652 | CalFilter *curfilter = mView->filterView()->selectedFilter(); |
1651 | CalFilter *filter = fili.first(); | 1653 | CalFilter *filter = fili.first(); |
1652 | int iii = 1; | 1654 | int iii = 2; |
1653 | while(filter) { | 1655 | while(filter) { |
1654 | selectFilterMenu->insertItem( filter->name(), iii ); | 1656 | selectFilterMenu->insertItem( filter->name(), iii ); |
1655 | if ( filter == curfilter) | 1657 | if ( filter == curfilter) |
1656 | selectFilterMenu->setItemChecked( iii, true ); | 1658 | selectFilterMenu->setItemChecked( iii, true ); |
1657 | if ( disable ) | 1659 | if ( disable ) |
1658 | selectFilterMenu->setItemEnabled( iii, false ); | 1660 | selectFilterMenu->setItemEnabled( iii, false ); |
1659 | filter = fili.next(); | 1661 | filter = fili.next(); |
1660 | ++iii; | 1662 | ++iii; |
1661 | } | 1663 | } |
1662 | } | 1664 | } |
1663 | void MainWindow::selectFilter( int fil ) | 1665 | void MainWindow::selectFilter( int fil ) |
1664 | { | 1666 | { |
1665 | if ( fil == 0 ) { | 1667 | if ( fil == 0 ) { |
1668 | mView->editFilters( ); | ||
1669 | } else if ( fil == 1 ){ | ||
1666 | mView->toggleFilerEnabled( ); | 1670 | mView->toggleFilerEnabled( ); |
1667 | } else { | 1671 | } else { |
1668 | mView->selectFilter( fil-1 ); | 1672 | mView->selectFilter( fil-2 ); |
1669 | } | 1673 | } |
1670 | } | 1674 | } |
1671 | void MainWindow::configureToolBar( int item ) | 1675 | void MainWindow::configureToolBar( int item ) |
1672 | { | 1676 | { |
1673 | 1677 | ||
1674 | configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) ); | 1678 | configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) ); |
1675 | KOPrefs *p = KOPrefs::instance(); | 1679 | KOPrefs *p = KOPrefs::instance(); |
1676 | p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 ); | 1680 | p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 ); |
1677 | p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 ); | 1681 | p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 ); |
1678 | p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); | 1682 | p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); |
1679 | p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 ); | 1683 | p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 ); |
1680 | p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 ); | 1684 | p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 ); |
1681 | p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 ); | 1685 | p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 ); |
1682 | p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 ); | 1686 | p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 ); |
1683 | p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 ); | 1687 | p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 ); |
1684 | p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 ); | 1688 | p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 ); |
1685 | p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 ); | 1689 | p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 ); |
1686 | p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 ); | 1690 | p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 ); |
1687 | p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 ); | 1691 | p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 ); |
1688 | p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 ); | 1692 | p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 ); |
1689 | p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); | 1693 | p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); |
1690 | p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 ); | 1694 | p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 ); |
1691 | p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 ); | 1695 | p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 ); |
1692 | p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); | 1696 | p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); |