author | zautrix <zautrix> | 2004-09-22 03:08:05 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-22 03:08:05 (UTC) |
commit | d63eac7a612a9724705bc58ad98c65c6ac052d07 (patch) (unidiff) | |
tree | dc584a0ddcbd5f828ea36b86b6af640e46e137f2 /korganizer/calendarview.cpp | |
parent | 633522024e48efc423155a04b71083a03696211d (diff) | |
download | kdepimpi-d63eac7a612a9724705bc58ad98c65c6ac052d07.zip kdepimpi-d63eac7a612a9724705bc58ad98c65c6ac052d07.tar.gz kdepimpi-d63eac7a612a9724705bc58ad98c65c6ac052d07.tar.bz2 |
connected global config
-rw-r--r-- | korganizer/calendarview.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index bc8625d..3635cfa 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -54,24 +54,25 @@ | |||
54 | #include <kdebug.h> | 54 | #include <kdebug.h> |
55 | #include <kstandarddirs.h> | 55 | #include <kstandarddirs.h> |
56 | #include <kfiledialog.h> | 56 | #include <kfiledialog.h> |
57 | #include <kmessagebox.h> | 57 | #include <kmessagebox.h> |
58 | #include <knotifyclient.h> | 58 | #include <knotifyclient.h> |
59 | #include <kconfig.h> | 59 | #include <kconfig.h> |
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> |
72 | #include <libkcal/calendarlocal.h> | 73 | #include <libkcal/calendarlocal.h> |
73 | #include <libkcal/journal.h> | 74 | #include <libkcal/journal.h> |
74 | #include <libkcal/calfilter.h> | 75 | #include <libkcal/calfilter.h> |
75 | #include <libkcal/attendee.h> | 76 | #include <libkcal/attendee.h> |
76 | #include <libkcal/dndfactory.h> | 77 | #include <libkcal/dndfactory.h> |
77 | #include <libkcal/freebusy.h> | 78 | #include <libkcal/freebusy.h> |
@@ -1875,38 +1876,41 @@ void CalendarView::goPrevious() | |||
1875 | { | 1876 | { |
1876 | mNavigator->selectPrevious(); | 1877 | mNavigator->selectPrevious(); |
1877 | } | 1878 | } |
1878 | void CalendarView::goNextMonth() | 1879 | void CalendarView::goNextMonth() |
1879 | { | 1880 | { |
1880 | mNavigator->selectNextMonth(); | 1881 | mNavigator->selectNextMonth(); |
1881 | } | 1882 | } |
1882 | 1883 | ||
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 ); |
1907 | emit configChanged(); | 1911 | emit configChanged(); |
1908 | mTodoList->updateConfig(); | 1912 | mTodoList->updateConfig(); |
1909 | // mDateNavigator->setFont ( KOPrefs::instance()->mDateNavigatorFont); | 1913 | // mDateNavigator->setFont ( KOPrefs::instance()->mDateNavigatorFont); |
1910 | mCalendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); | 1914 | mCalendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); |
1911 | // To make the "fill window" configurations work | 1915 | // To make the "fill window" configurations work |
1912 | //mViewManager->raiseCurrentView(); | 1916 | //mViewManager->raiseCurrentView(); |