-rw-r--r-- | korganizer/calendarview.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index bc8625d..3635cfa 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -60,12 +60,13 @@ | |||
60 | 60 | ||
61 | #include <libkdepim/ksyncprefsdialog.h> | 61 | #include <libkdepim/ksyncprefsdialog.h> |
62 | #include <krun.h> | 62 | #include <krun.h> |
63 | #include <kdirwatch.h> | 63 | #include <kdirwatch.h> |
64 | #include <libkdepim/kdatepicker.h> | 64 | #include <libkdepim/kdatepicker.h> |
65 | #include <libkdepim/ksyncprofile.h> | 65 | #include <libkdepim/ksyncprofile.h> |
66 | #include <libkdepim/kpimglobalprefs.h> | ||
66 | 67 | ||
67 | #include <libkcal/vcaldrag.h> | 68 | #include <libkcal/vcaldrag.h> |
68 | #include <libkcal/icaldrag.h> | 69 | #include <libkcal/icaldrag.h> |
69 | #include <libkcal/icalformat.h> | 70 | #include <libkcal/icalformat.h> |
70 | #include <libkcal/vcalformat.h> | 71 | #include <libkcal/vcalformat.h> |
71 | #include <libkcal/scheduler.h> | 72 | #include <libkcal/scheduler.h> |
@@ -1883,24 +1884,27 @@ void CalendarView::goNextMonth() | |||
1883 | void CalendarView::goPreviousMonth() | 1884 | void CalendarView::goPreviousMonth() |
1884 | { | 1885 | { |
1885 | mNavigator->selectPreviousMonth(); | 1886 | mNavigator->selectPreviousMonth(); |
1886 | } | 1887 | } |
1887 | void CalendarView::writeLocale() | 1888 | void CalendarView::writeLocale() |
1888 | { | 1889 | { |
1890 | //KPimGlobalPrefs::instance()->setGlobalConfig(); | ||
1891 | #if 0 | ||
1889 | KGlobal::locale()->setHore24Format( !KOPrefs::instance()->mPreferredTime ); | 1892 | KGlobal::locale()->setHore24Format( !KOPrefs::instance()->mPreferredTime ); |
1890 | KGlobal::locale()->setWeekStartMonday( !KOPrefs::instance()->mWeekStartsOnSunday ); | 1893 | KGlobal::locale()->setWeekStartMonday( !KOPrefs::instance()->mWeekStartsOnSunday ); |
1891 | KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)KOPrefs::instance()->mPreferredDate ); | 1894 | KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)KOPrefs::instance()->mPreferredDate ); |
1892 | KGlobal::locale()->setLanguage( KOPrefs::instance()->mPreferredLanguage ); | 1895 | KGlobal::locale()->setLanguage( KOPrefs::instance()->mPreferredLanguage ); |
1893 | QString dummy = KOPrefs::instance()->mUserDateFormatLong; | 1896 | QString dummy = KOPrefs::instance()->mUserDateFormatLong; |
1894 | KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); | 1897 | KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); |
1895 | dummy = KOPrefs::instance()->mUserDateFormatShort; | 1898 | dummy = KOPrefs::instance()->mUserDateFormatShort; |
1896 | KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); | 1899 | KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); |
1897 | KGlobal::locale()->setDaylightSaving( KOPrefs::instance()->mUseDaylightsaving, | 1900 | KGlobal::locale()->setDaylightSaving( KOPrefs::instance()->mUseDaylightsaving, |
1898 | KOPrefs::instance()->mDaylightsavingStart, | 1901 | KOPrefs::instance()->mDaylightsavingStart, |
1899 | KOPrefs::instance()->mDaylightsavingEnd ); | 1902 | KOPrefs::instance()->mDaylightsavingEnd ); |
1900 | KGlobal::locale()->setTimezone( KOPrefs::instance()->mTimeZoneId ); | 1903 | KGlobal::locale()->setTimezone( KOPrefs::instance()->mTimeZoneId ); |
1904 | #endif | ||
1901 | } | 1905 | } |
1902 | void CalendarView::updateConfig() | 1906 | void CalendarView::updateConfig() |
1903 | { | 1907 | { |
1904 | writeLocale(); | 1908 | writeLocale(); |
1905 | if ( KOPrefs::instance()->mUseAppColors ) | 1909 | if ( KOPrefs::instance()->mUseAppColors ) |
1906 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); | 1910 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); |