-rw-r--r-- | korganizer/kodialogmanager.cpp | 5 | ||||
-rw-r--r-- | korganizer/koprefs.cpp | 88 | ||||
-rw-r--r-- | korganizer/koprefs.h | 16 | ||||
-rw-r--r-- | korganizer/ktimeedit.cpp | 5 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 3 |
5 files changed, 14 insertions, 103 deletions
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index 58198a2..db7c3f2 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp | |||
@@ -60,85 +60,84 @@ KODialogManager::~KODialogManager() | |||
60 | { | 60 | { |
61 | delete mOutgoingDialog; | 61 | delete mOutgoingDialog; |
62 | delete mIncomingDialog; | 62 | delete mIncomingDialog; |
63 | delete mOptionsDialog; | 63 | delete mOptionsDialog; |
64 | delete mSearchDialog; | 64 | delete mSearchDialog; |
65 | #ifndef KORG_NOARCHIVE | 65 | #ifndef KORG_NOARCHIVE |
66 | delete mArchiveDialog; | 66 | delete mArchiveDialog; |
67 | #endif | 67 | #endif |
68 | delete mFilterEditDialog; | 68 | delete mFilterEditDialog; |
69 | #ifndef KORG_NOPLUGINS | 69 | #ifndef KORG_NOPLUGINS |
70 | delete mPluginDialog; | 70 | delete mPluginDialog; |
71 | #endif | 71 | #endif |
72 | } | 72 | } |
73 | 73 | ||
74 | OutgoingDialog *KODialogManager::outgoingDialog() | 74 | OutgoingDialog *KODialogManager::outgoingDialog() |
75 | { | 75 | { |
76 | createOutgoingDialog(); | 76 | createOutgoingDialog(); |
77 | return mOutgoingDialog; | 77 | return mOutgoingDialog; |
78 | } | 78 | } |
79 | 79 | ||
80 | void KODialogManager::createOutgoingDialog() | 80 | void KODialogManager::createOutgoingDialog() |
81 | { | 81 | { |
82 | if (!mOutgoingDialog) { | 82 | if (!mOutgoingDialog) { |
83 | mOutgoingDialog = new OutgoingDialog(mMainView->calendar(),mMainView); | 83 | mOutgoingDialog = new OutgoingDialog(mMainView->calendar(),mMainView); |
84 | if (mIncomingDialog) mIncomingDialog->setOutgoingDialog(mOutgoingDialog); | 84 | if (mIncomingDialog) mIncomingDialog->setOutgoingDialog(mOutgoingDialog); |
85 | connect(mOutgoingDialog,SIGNAL(numMessagesChanged(int)), | 85 | connect(mOutgoingDialog,SIGNAL(numMessagesChanged(int)), |
86 | mMainView,SIGNAL(numOutgoingChanged(int))); | 86 | mMainView,SIGNAL(numOutgoingChanged(int))); |
87 | } | 87 | } |
88 | } | 88 | } |
89 | 89 | ||
90 | void KODialogManager::showOptionsDialog( bool showSync ) | 90 | void KODialogManager::showOptionsDialog( bool showSync ) |
91 | { | 91 | { |
92 | int curLanguage = KOPrefs::instance()->mPreferredLanguage; | 92 | |
93 | if (!mOptionsDialog) { | 93 | if (!mOptionsDialog) { |
94 | mOptionsDialog = new KOPrefsDialog(mMainView); | 94 | mOptionsDialog = new KOPrefsDialog(mMainView); |
95 | //mOptionsDialog->readConfig(); | 95 | //mOptionsDialog->readConfig(); |
96 | connect(mOptionsDialog,SIGNAL(configChanged()), | 96 | connect(mOptionsDialog,SIGNAL(configChanged()), |
97 | mMainView,SLOT(updateConfig())); | 97 | mMainView,SLOT(updateConfig())); |
98 | //connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()), | 98 | //connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()), |
99 | // mOptionsDialog,SLOT(updateCategories())); | 99 | // mOptionsDialog,SLOT(updateCategories())); |
100 | 100 | ||
101 | } | 101 | } |
102 | mOptionsDialog->readConfig(); | 102 | mOptionsDialog->readConfig(); |
103 | #ifndef DESKTOP_VERSION | 103 | #ifndef DESKTOP_VERSION |
104 | mOptionsDialog->showMaximized(); | 104 | mOptionsDialog->showMaximized(); |
105 | #else | 105 | #else |
106 | mOptionsDialog->show(); | 106 | mOptionsDialog->show(); |
107 | #endif | 107 | #endif |
108 | if ( showSync ) | 108 | if ( showSync ) |
109 | mOptionsDialog->showSyncPage(); | 109 | mOptionsDialog->showSyncPage(); |
110 | mOptionsDialog->exec(); | 110 | mOptionsDialog->exec(); |
111 | if ( curLanguage != KOPrefs::instance()->mPreferredLanguage ) | 111 | |
112 | KOPrefs::instance()->mLanguageChanged = true; | ||
113 | } | 112 | } |
114 | void KODialogManager::showSyncOptions() | 113 | void KODialogManager::showSyncOptions() |
115 | { | 114 | { |
116 | showOptionsDialog( true ); | 115 | showOptionsDialog( true ); |
117 | 116 | ||
118 | } | 117 | } |
119 | void KODialogManager::showOutgoingDialog() | 118 | void KODialogManager::showOutgoingDialog() |
120 | { | 119 | { |
121 | createOutgoingDialog(); | 120 | createOutgoingDialog(); |
122 | mOutgoingDialog->show(); | 121 | mOutgoingDialog->show(); |
123 | mOutgoingDialog->raise(); | 122 | mOutgoingDialog->raise(); |
124 | } | 123 | } |
125 | 124 | ||
126 | IncomingDialog *KODialogManager::incomingDialog() | 125 | IncomingDialog *KODialogManager::incomingDialog() |
127 | { | 126 | { |
128 | createOutgoingDialog(); | 127 | createOutgoingDialog(); |
129 | if (!mIncomingDialog) { | 128 | if (!mIncomingDialog) { |
130 | mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView); | 129 | mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView); |
131 | connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)), | 130 | connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)), |
132 | mMainView,SIGNAL(numIncomingChanged(int))); | 131 | mMainView,SIGNAL(numIncomingChanged(int))); |
133 | connect(mIncomingDialog,SIGNAL(calendarUpdated()), | 132 | connect(mIncomingDialog,SIGNAL(calendarUpdated()), |
134 | mMainView,SLOT(updateView())); | 133 | mMainView,SLOT(updateView())); |
135 | } | 134 | } |
136 | return mIncomingDialog; | 135 | return mIncomingDialog; |
137 | } | 136 | } |
138 | 137 | ||
139 | void KODialogManager::createIncomingDialog() | 138 | void KODialogManager::createIncomingDialog() |
140 | { | 139 | { |
141 | createOutgoingDialog(); | 140 | createOutgoingDialog(); |
142 | if (!mIncomingDialog) { | 141 | if (!mIncomingDialog) { |
143 | mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView); | 142 | mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView); |
144 | connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)), | 143 | connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)), |
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index ba1c6d1..f44debc 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -17,119 +17,113 @@ | |||
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 | 23 | ||
24 | #include <time.h> | 24 | #include <time.h> |
25 | #ifndef _WIN32_ | 25 | #ifndef _WIN32_ |
26 | #include <unistd.h> | 26 | #include <unistd.h> |
27 | #endif | 27 | #endif |
28 | #include <qdir.h> | 28 | #include <qdir.h> |
29 | #include <qtextstream.h> | 29 | #include <qtextstream.h> |
30 | #include <qtextcodec.h> | 30 | #include <qtextcodec.h> |
31 | #include <qstring.h> | 31 | #include <qstring.h> |
32 | #include <qregexp.h> | 32 | #include <qregexp.h> |
33 | #include <qfont.h> | 33 | #include <qfont.h> |
34 | #include <qcolor.h> | 34 | #include <qcolor.h> |
35 | #include <qstringlist.h> | 35 | #include <qstringlist.h> |
36 | #include <stdlib.h> | 36 | #include <stdlib.h> |
37 | 37 | ||
38 | #include <kglobal.h> | 38 | #include <kglobal.h> |
39 | #include <kconfig.h> | 39 | #include <kconfig.h> |
40 | #include <klocale.h> | 40 | #include <klocale.h> |
41 | #include <kdebug.h> | 41 | #include <kdebug.h> |
42 | #include <kemailsettings.h> | 42 | #include <kemailsettings.h> |
43 | #include <kstaticdeleter.h> | 43 | #include <kstaticdeleter.h> |
44 | #include <libkdepim/kpimglobalprefs.h> | 44 | #include <libkdepim/kpimglobalprefs.h> |
45 | 45 | ||
46 | #include "koprefs.h" | 46 | #include "koprefs.h" |
47 | #include "mainwindow.h" | 47 | #include "mainwindow.h" |
48 | 48 | ||
49 | const char *germanwords[][2] = { | ||
50 | #include "wordsgerman.h" | ||
51 | "", "" | ||
52 | }; | ||
53 | |||
54 | KOPrefs *KOPrefs::mInstance = 0; | 49 | KOPrefs *KOPrefs::mInstance = 0; |
55 | static KStaticDeleter<KOPrefs> insd; | 50 | static KStaticDeleter<KOPrefs> insd; |
56 | 51 | ||
57 | KOPrefs::KOPrefs() : | 52 | KOPrefs::KOPrefs() : |
58 | KPimPrefs("korganizerrc") | 53 | KPimPrefs("korganizerrc") |
59 | { | 54 | { |
60 | mCategoryColors.setAutoDelete(true); | 55 | mCategoryColors.setAutoDelete(true); |
61 | mLocaleDict = 0; | ||
62 | fillMailDefaults(); | 56 | fillMailDefaults(); |
63 | mDefaultCategoryColor = QColor(175,210,255);//196,196,196); | 57 | mDefaultCategoryColor = QColor(175,210,255);//196,196,196); |
64 | QColor defaultHolidayColor = QColor(255,0,0); | 58 | QColor defaultHolidayColor = QColor(255,0,0); |
65 | QColor defaultHighlightColor = QColor(129,112,255);//64,64,255); | 59 | QColor defaultHighlightColor = QColor(129,112,255);//64,64,255); |
66 | QColor defaultAgendaBgColor = QColor(239,241,169);//128,128,128); | 60 | QColor defaultAgendaBgColor = QColor(239,241,169);//128,128,128); |
67 | QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160); | 61 | QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160); |
68 | QColor defaultTodoDueTodayColor = QColor(255,220,100); | 62 | QColor defaultTodoDueTodayColor = QColor(255,220,100); |
69 | QColor defaultTodoOverdueColor = QColor(255,153,125); | 63 | QColor defaultTodoOverdueColor = QColor(255,153,125); |
70 | 64 | ||
71 | mTimeBarFont = QFont("helvetica",10);//,QFont::Bold); | 65 | mTimeBarFont = QFont("helvetica",10);//,QFont::Bold); |
72 | mDefaultViewFont = QFont("helvetica",10); | 66 | mDefaultViewFont = QFont("helvetica",10); |
73 | mDefaultMonthViewFont = QFont("helvetica",8); | 67 | mDefaultMonthViewFont = QFont("helvetica",8); |
74 | mMarcusBainsFont= QFont("helvetica",10); | 68 | mMarcusBainsFont= QFont("helvetica",10); |
75 | mDateNavigatorFont= QFont("helvetica",10, QFont::Bold); | 69 | mDateNavigatorFont= QFont("helvetica",10, QFont::Bold); |
76 | mEditBoxFont = QFont("helvetica",12); | 70 | mEditBoxFont = QFont("helvetica",12); |
77 | mJornalViewFont = QFont("helvetica",12); | 71 | mJornalViewFont = QFont("helvetica",12); |
78 | 72 | ||
79 | KPrefs::setCurrentGroup("General"); | 73 | KPrefs::setCurrentGroup("General"); |
80 | 74 | ||
81 | 75 | ||
82 | addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); | 76 | addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); |
83 | 77 | ||
84 | addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true); | 78 | addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true); |
85 | addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true); | 79 | addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true); |
86 | addItemBool("ShowIconSearch",&mShowIconSearch,true); | 80 | addItemBool("ShowIconSearch",&mShowIconSearch,true); |
87 | addItemBool("ShowIconList",&mShowIconList,true); | 81 | addItemBool("ShowIconList",&mShowIconList,true); |
88 | addItemBool("ShowIconDay1",&mShowIconDay1,true); | 82 | addItemBool("ShowIconDay1",&mShowIconDay1,true); |
89 | addItemBool("ShowIconDay5",&mShowIconDay5,true); | 83 | addItemBool("ShowIconDay5",&mShowIconDay5,true); |
90 | addItemBool("ShowIconDay7",&mShowIconDay7,true); | 84 | addItemBool("ShowIconDay7",&mShowIconDay7,true); |
91 | addItemBool("ShowIconMonth",&mShowIconMonth,true); | 85 | addItemBool("ShowIconMonth",&mShowIconMonth,true); |
92 | addItemBool("ShowIconTodoview",&mShowIconTodoview,true); | 86 | addItemBool("ShowIconTodoview",&mShowIconTodoview,true); |
93 | addItemBool("ShowIconBackFast",&mShowIconBackFast,true); | 87 | addItemBool("ShowIconBackFast",&mShowIconBackFast,true); |
94 | addItemBool("ShowIconBack",&mShowIconBack,true); | 88 | addItemBool("ShowIconBack",&mShowIconBack,true); |
95 | addItemBool("ShowIconToday",&mShowIconToday,true); | 89 | addItemBool("ShowIconToday",&mShowIconToday,true); |
96 | addItemBool("ShowIconForward",&mShowIconForward,true); | 90 | addItemBool("ShowIconForward",&mShowIconForward,true); |
97 | addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true); | 91 | addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true); |
98 | addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,false); | 92 | addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,false); |
99 | addItemBool("ShowIconNextDays",&mShowIconNextDays,true); | 93 | addItemBool("ShowIconNextDays",&mShowIconNextDays,true); |
100 | addItemBool("ShowIconNext",&mShowIconNext,true); | 94 | addItemBool("ShowIconNext",&mShowIconNext,true); |
101 | addItemBool("ShowIconJournal",&mShowIconJournal,true); | 95 | addItemBool("ShowIconJournal",&mShowIconJournal,true); |
102 | addItemBool("ShowIconStretch",&mShowIconStretch,true); | 96 | addItemBool("ShowIconStretch",&mShowIconStretch,true); |
103 | addItemBool("LanguageChanged",&mLanguageChanged,false); | 97 | addItemInt("LastLoadedLanguage",&mOldLanguage,0); |
104 | 98 | ||
105 | addItemBool("AskForQuit",&mAskForQuit,false); | 99 | addItemBool("AskForQuit",&mAskForQuit,false); |
106 | 100 | ||
107 | #ifndef DESKTOP_VERSION | 101 | #ifndef DESKTOP_VERSION |
108 | addItemBool("ShowFullMenu",&mShowFullMenu,false); | 102 | addItemBool("ShowFullMenu",&mShowFullMenu,false); |
109 | #else | 103 | #else |
110 | addItemBool("ShowFullMenu",&mShowFullMenu,true); | 104 | addItemBool("ShowFullMenu",&mShowFullMenu,true); |
111 | #endif | 105 | #endif |
112 | addItemBool("ToolBarHor",&mToolBarHor, true ); | 106 | addItemBool("ToolBarHor",&mToolBarHor, true ); |
113 | addItemBool("ToolBarUp",&mToolBarUp, false ); | 107 | addItemBool("ToolBarUp",&mToolBarUp, false ); |
114 | addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false ); | 108 | addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false ); |
115 | addItemInt("Whats Next Days",&mWhatsNextDays,3); | 109 | addItemInt("Whats Next Days",&mWhatsNextDays,3); |
116 | addItemInt("Whats Next Prios",&mWhatsNextPrios,1); | 110 | addItemInt("Whats Next Prios",&mWhatsNextPrios,1); |
117 | 111 | ||
118 | addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true); | 112 | addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true); |
119 | addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true); | 113 | addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true); |
120 | addItemInt("AllDay Size",&mAllDaySize,28); | 114 | addItemInt("AllDay Size",&mAllDaySize,28); |
121 | QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav"; | 115 | QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav"; |
122 | addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm ); | 116 | addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm ); |
123 | 117 | ||
124 | addItemStringList("LocationDefaults",&mLocationDefaults ); | 118 | addItemStringList("LocationDefaults",&mLocationDefaults ); |
125 | addItemStringList("EventSummary User",&mEventSummaryUser); | 119 | addItemStringList("EventSummary User",&mEventSummaryUser); |
126 | addItemStringList("TodoSummary User",&mTodoSummaryUser); | 120 | addItemStringList("TodoSummary User",&mTodoSummaryUser); |
127 | 121 | ||
128 | addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); | 122 | addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); |
129 | addItemBool("Enable Project View",&mEnableProjectView,false); | 123 | addItemBool("Enable Project View",&mEnableProjectView,false); |
130 | addItemBool("Auto Save",&mAutoSave,false); | 124 | addItemBool("Auto Save",&mAutoSave,false); |
131 | addItemInt("Auto Save Interval",&mAutoSaveInterval,3); | 125 | addItemInt("Auto Save Interval",&mAutoSaveInterval,3); |
132 | addItemBool("Confirm Deletes",&mConfirm,true); | 126 | addItemBool("Confirm Deletes",&mConfirm,true); |
133 | addItemString("Archive File",&mArchiveFile); | 127 | addItemString("Archive File",&mArchiveFile); |
134 | addItemString("Html Export File",&mHtmlExportFile, | 128 | addItemString("Html Export File",&mHtmlExportFile, |
135 | QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html")); | 129 | QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html")); |
@@ -175,71 +169,65 @@ KOPrefs::KOPrefs() : | |||
175 | 169 | ||
176 | // KPrefs::setCurrentGroup("SyncProfiles"); | 170 | // KPrefs::setCurrentGroup("SyncProfiles"); |
177 | // addItemString("LocalMachineName",&mLocalMachineName, "undefined"); | 171 | // addItemString("LocalMachineName",&mLocalMachineName, "undefined"); |
178 | // addItemStringList("SyncProfileNames",&mSyncProfileNames); | 172 | // addItemStringList("SyncProfileNames",&mSyncProfileNames); |
179 | // addItemStringList("ExternSyncProfiles",&mExternSyncProfileNames); | 173 | // addItemStringList("ExternSyncProfiles",&mExternSyncProfileNames); |
180 | 174 | ||
181 | KPrefs::setCurrentGroup("RemoteSyncing"); | 175 | KPrefs::setCurrentGroup("RemoteSyncing"); |
182 | // addItemBool("UsePasswd",&mUsePassWd,false); | 176 | // addItemBool("UsePasswd",&mUsePassWd,false); |
183 | // addItemBool("WriteBackFile",&mWriteBackFile,true); | 177 | // addItemBool("WriteBackFile",&mWriteBackFile,true); |
184 | // addItemBool("WriteBackExistingOnly",&mWriteBackExistingOnly,false); | 178 | // addItemBool("WriteBackExistingOnly",&mWriteBackExistingOnly,false); |
185 | // addItemBool("AskForPreferences",&mAskForPreferences,true); | 179 | // addItemBool("AskForPreferences",&mAskForPreferences,true); |
186 | // addItemBool("ShowSyncSummary",&mShowSyncSummary,true); | 180 | // addItemBool("ShowSyncSummary",&mShowSyncSummary,true); |
187 | addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" ); | 181 | addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" ); |
188 | addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); | 182 | addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); |
189 | addItemBool("ShowSyncEvents",&mShowSyncEvents,false); | 183 | addItemBool("ShowSyncEvents",&mShowSyncEvents,false); |
190 | addItemInt("LastSyncTime",&mLastSyncTime,0); | 184 | addItemInt("LastSyncTime",&mLastSyncTime,0); |
191 | 185 | ||
192 | #ifdef _WIN32_ | 186 | #ifdef _WIN32_ |
193 | QString hdp= locateLocal("data","korganizer")+"\\\\"; | 187 | QString hdp= locateLocal("data","korganizer")+"\\\\"; |
194 | #else | 188 | #else |
195 | QString hdp= locateLocal("data","korganizer")+"/"; | 189 | QString hdp= locateLocal("data","korganizer")+"/"; |
196 | #endif | 190 | #endif |
197 | 191 | ||
198 | KPrefs::setCurrentGroup("LoadSaveFileNames"); | 192 | KPrefs::setCurrentGroup("LoadSaveFileNames"); |
199 | 193 | ||
200 | addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" ); | 194 | addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" ); |
201 | addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" ); | 195 | addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" ); |
202 | addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" ); | 196 | addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" ); |
203 | addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" ); | 197 | addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" ); |
204 | 198 | ||
205 | 199 | ||
206 | KPrefs::setCurrentGroup("Locale"); | 200 | KPrefs::setCurrentGroup("Locale"); |
207 | addItemInt("PreferredLanguage",&mPreferredLanguage,0); | ||
208 | addItemInt("PreferredTime",&mPreferredTime,0); | ||
209 | addItemInt("PreferredDate",&mPreferredDate,0); | ||
210 | addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); | ||
211 | addItemBool("ShortDateInViewer",&mShortDateInViewer,false); | 201 | addItemBool("ShortDateInViewer",&mShortDateInViewer,false); |
212 | addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y"); | ||
213 | addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); | ||
214 | 202 | ||
215 | 203 | ||
216 | KPrefs::setCurrentGroup("Colors"); | 204 | KPrefs::setCurrentGroup("Colors"); |
217 | addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor); | 205 | addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor); |
218 | addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor); | 206 | addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor); |
219 | addItemColor("Event Color",&mEventColor,mDefaultCategoryColor); | 207 | addItemColor("Event Color",&mEventColor,mDefaultCategoryColor); |
220 | addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor); | 208 | addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor); |
221 | addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor); | 209 | addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor); |
222 | addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor); | 210 | addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor); |
223 | addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor); | 211 | addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor); |
224 | addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 )); | 212 | addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 )); |
225 | addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 )); | 213 | addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 )); |
226 | addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 )); | 214 | addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 )); |
227 | addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); | 215 | addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); |
228 | addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true); | 216 | addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true); |
229 | addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); | 217 | addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); |
230 | addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 )); | 218 | addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 )); |
231 | addItemColor("AppColor2",&mAppColor2,QColor( 174,216,255 )); | 219 | addItemColor("AppColor2",&mAppColor2,QColor( 174,216,255 )); |
232 | addItemBool("UseAppColors",&mUseAppColors,false); | 220 | addItemBool("UseAppColors",&mUseAppColors,false); |
233 | 221 | ||
234 | 222 | ||
235 | 223 | ||
236 | KPrefs::setCurrentGroup("Views"); | 224 | KPrefs::setCurrentGroup("Views"); |
237 | addItemInt("Hour Size",&mHourSize,8); | 225 | addItemInt("Hour Size",&mHourSize,8); |
238 | addItemBool("Show Daily Recurrences",&mDailyRecur,true); | 226 | addItemBool("Show Daily Recurrences",&mDailyRecur,true); |
239 | addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true); | 227 | addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true); |
240 | addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true); | 228 | addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true); |
241 | addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true); | 229 | addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true); |
242 | addItemBool("ShowShortMonthName",&mMonthShowShort,false); | 230 | addItemBool("ShowShortMonthName",&mMonthShowShort,false); |
243 | addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true); | 231 | addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true); |
244 | addItemBool("Enable ToolTips",&mEnableToolTips,false); | 232 | addItemBool("Enable ToolTips",&mEnableToolTips,false); |
245 | addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false); | 233 | addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false); |
@@ -287,199 +275,133 @@ KOPrefs::KOPrefs() : | |||
287 | 275 | ||
288 | KPrefs::setCurrentGroup("KOrganizer Plugins"); | 276 | KPrefs::setCurrentGroup("KOrganizer Plugins"); |
289 | 277 | ||
290 | addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays"); | 278 | addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays"); |
291 | 279 | ||
292 | KPrefs::setCurrentGroup("Group Scheduling"); | 280 | KPrefs::setCurrentGroup("Group Scheduling"); |
293 | 281 | ||
294 | addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail); | 282 | addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail); |
295 | addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend); | 283 | addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend); |
296 | addItemStringList("AdditionalMails",&mAdditionalMails,""); | 284 | addItemStringList("AdditionalMails",&mAdditionalMails,""); |
297 | addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto); | 285 | addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto); |
298 | addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto); | 286 | addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto); |
299 | addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto); | 287 | addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto); |
300 | addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto); | 288 | addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto); |
301 | addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto); | 289 | addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto); |
302 | 290 | ||
303 | KPrefs::setCurrentGroup( "Editors" ); | 291 | KPrefs::setCurrentGroup( "Editors" ); |
304 | 292 | ||
305 | addItemStringList( "EventTemplates", &mEventTemplates ); | 293 | addItemStringList( "EventTemplates", &mEventTemplates ); |
306 | addItemStringList( "TodoTemplates", &mTodoTemplates ); | 294 | addItemStringList( "TodoTemplates", &mTodoTemplates ); |
307 | 295 | ||
308 | addItemInt("DestinationPolicy",&mDestination,standardDestination); | 296 | addItemInt("DestinationPolicy",&mDestination,standardDestination); |
309 | 297 | ||
310 | 298 | ||
311 | 299 | ||
312 | } | 300 | } |
313 | 301 | ||
314 | 302 | ||
315 | KOPrefs::~KOPrefs() | 303 | KOPrefs::~KOPrefs() |
316 | { | 304 | { |
317 | if (mInstance == this) | 305 | if (mInstance == this) |
318 | mInstance = insd.setObject(0); | 306 | mInstance = insd.setObject(0); |
319 | setLocaleDict( 0 ); | 307 | |
320 | if ( mLocaleDict ) | ||
321 | delete mLocaleDict; | ||
322 | //qDebug("KOPrefs::~KOPrefs() "); | 308 | //qDebug("KOPrefs::~KOPrefs() "); |
323 | } | 309 | } |
324 | 310 | ||
325 | 311 | ||
326 | KOPrefs *KOPrefs::instance() | 312 | KOPrefs *KOPrefs::instance() |
327 | { | 313 | { |
328 | if (!mInstance) { | 314 | if (!mInstance) { |
329 | mInstance = insd.setObject(new KOPrefs()); | 315 | mInstance = insd.setObject(new KOPrefs()); |
330 | mInstance->readConfig(); | 316 | mInstance->readConfig(); |
331 | } | 317 | } |
332 | 318 | ||
333 | return mInstance; | 319 | return mInstance; |
334 | } | 320 | } |
335 | 321 | ||
336 | void KOPrefs::usrSetDefaults() | 322 | void KOPrefs::usrSetDefaults() |
337 | { | 323 | { |
338 | 324 | ||
339 | } | 325 | } |
340 | 326 | ||
341 | void KOPrefs::fillMailDefaults() | 327 | void KOPrefs::fillMailDefaults() |
342 | { | 328 | { |
343 | if (mName.isEmpty()) mName = i18n("Anonymous"); | 329 | if (mName.isEmpty()) mName = i18n("Anonymous"); |
344 | if (mEmail.isEmpty()) mEmail = i18n("nobody@nowhere"); | 330 | if (mEmail.isEmpty()) mEmail = i18n("nobody@nowhere"); |
345 | } | 331 | } |
346 | 332 | ||
347 | void KOPrefs::setTimeZoneIdDefault() | 333 | void KOPrefs::setTimeZoneIdDefault() |
348 | { | 334 | { |
349 | ; | 335 | ; |
350 | } | 336 | } |
351 | 337 | ||
352 | void KOPrefs::setCategoryDefaults() | 338 | void KOPrefs::setCategoryDefaults() |
353 | { | 339 | { |
354 | mCustomCategories.clear(); | 340 | mCustomCategories.clear(); |
355 | mCustomCategories = getDefaultList(); | 341 | mCustomCategories = getDefaultList(); |
356 | 342 | ||
357 | QStringList::Iterator it; | 343 | QStringList::Iterator it; |
358 | for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) { | 344 | for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) { |
359 | setCategoryColor(*it,mDefaultCategoryColor); | 345 | setCategoryColor(*it,mDefaultCategoryColor); |
360 | } | 346 | } |
361 | } | 347 | } |
362 | 348 | ||
363 | QStringList KOPrefs::getDefaultList() | 349 | QStringList KOPrefs::getDefaultList() |
364 | { | 350 | { |
365 | QStringList retval ; | 351 | QStringList retval ; |
366 | retval << i18n("Anniversary") << i18n("Appointment") << i18n("Birthday") << i18n("Business") << i18n("Business Travel") << i18n("Cinema") << i18n("Customer") | 352 | retval << i18n("Anniversary") << i18n("Appointment") << i18n("Birthday") << i18n("Business") << i18n("Business Travel") << i18n("Cinema") << i18n("Customer") |
367 | << i18n("Break")<< i18n("Breakfast")<< i18n("Competition")<< i18n("Dinner") | 353 | << i18n("Break")<< i18n("Breakfast")<< i18n("Competition")<< i18n("Dinner") |
368 | << i18n("Education")<< i18n("Family") << i18n("Favorites") << i18n("Festival")<< i18n("Fishing")<< i18n("Flight") << i18n("Gifts") | 354 | << i18n("Education")<< i18n("Family") << i18n("Favorites") << i18n("Festival")<< i18n("Fishing")<< i18n("Flight") << i18n("Gifts") |
369 | << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts") << i18n("Hiking") << i18n("Hunting") << i18n("Key Customer") << i18n("Kids") | 355 | << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts") << i18n("Hiking") << i18n("Hunting") << i18n("Key Customer") << i18n("Kids") |
370 | << i18n("Lunch") << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner")<< i18n("Party") << i18n("Personal") << i18n("Personal Travel") | 356 | << i18n("Lunch") << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner")<< i18n("Party") << i18n("Personal") << i18n("Personal Travel") |
371 | << i18n("PHB") << i18n("Phone Calls") << i18n("Projects") << i18n("Recurring") << i18n("School") << i18n("Shopping") | 357 | << i18n("PHB") << i18n("Phone Calls") << i18n("Projects") << i18n("Recurring") << i18n("School") << i18n("Shopping") |
372 | << i18n("Speach") << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University") | 358 | << i18n("Speach") << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University") |
373 | << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent") ; | 359 | << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent") ; |
374 | retval.sort(); | 360 | retval.sort(); |
375 | return retval; | 361 | return retval; |
376 | } | 362 | } |
377 | 363 | ||
378 | void KOPrefs::usrReadConfig() | 364 | void KOPrefs::usrReadConfig() |
379 | { | 365 | { |
380 | mPreferredLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage; | ||
381 | mLocaleDict = 0; | ||
382 | // pending LR fix translation | ||
383 | // qDebug("KOPrefs::usrReadConfig() fix translation "); | ||
384 | if ( mPreferredLanguage > 0 && mPreferredLanguage < 5 ) { | ||
385 | if ( mPreferredLanguage == 1 ) { | ||
386 | mLocaleDict = new QDict<QString>; | ||
387 | int i = 0; | ||
388 | QString fw ( germanwords[i] [0]); | ||
389 | while ( !fw.isEmpty() ) { | ||
390 | mLocaleDict->insert( fw, new QString (germanwords[i] [1] )); | ||
391 | ++i; | ||
392 | fw = germanwords[i] [0]; | ||
393 | } | ||
394 | |||
395 | setLocaleDict( mLocaleDict ); | ||
396 | } else { | ||
397 | QString fileName ; | ||
398 | if ( mPreferredLanguage == 4 ) | ||
399 | fileName = MainWindow::resourcePath()+"usertranslation.txt"; | ||
400 | else if ( mPreferredLanguage == 2 ) | ||
401 | fileName = MainWindow::resourcePath()+"frenchtranslation.txt"; | ||
402 | else if ( mPreferredLanguage == 3 ) | ||
403 | fileName = MainWindow::resourcePath()+"italiantranslation.txt"; | ||
404 | QFile file( fileName ); | ||
405 | if (file.open( IO_ReadOnly ) ) { | ||
406 | QTextStream ts( &file ); | ||
407 | ts.setEncoding( QTextStream::Latin1 ); | ||
408 | //ts.setCodec( QTextCodec::latin1 ); | ||
409 | QString text = ts.read(); | ||
410 | file.close(); | ||
411 | text.replace( QRegExp("\\\\n"), "\n" ); | ||
412 | QString line; | ||
413 | QString we; | ||
414 | QString wt; | ||
415 | int br = 0; | ||
416 | int nbr; | ||
417 | nbr = text.find ( "},", br ); | ||
418 | line = text.mid( br, nbr - br ); | ||
419 | br = nbr+1; | ||
420 | int se, ee, st, et; | ||
421 | mLocaleDict = new QDict<QString>; | ||
422 | QString end = "{ \"\",\"\" }"; | ||
423 | while ( (line != end) && (br > 1) ) { | ||
424 | //qDebug("%d *%s* ", br, line.latin1()); | ||
425 | se = line.find("\"")+1; | ||
426 | et = line.findRev("\"",-1); | ||
427 | ee = line.find("\",\""); | ||
428 | st = ee+3; | ||
429 | we = line.mid( se, ee-se ); | ||
430 | wt = line.mid( st, et-st ); | ||
431 | //qDebug("*%s* *%s* ", we.latin1(), wt.latin1()); | ||
432 | mLocaleDict->insert( we, new QString (wt) ); | ||
433 | nbr = text.find ( "}", br ); | ||
434 | line = text.mid( br, nbr - br ); | ||
435 | br = nbr+1; | ||
436 | } | ||
437 | //qDebug("end *%s* ", end.latin1()); | ||
438 | |||
439 | setLocaleDict( mLocaleDict ); | ||
440 | } else { | ||
441 | qDebug("KO: Cannot find translation file %s",fileName.latin1() ); | ||
442 | } | ||
443 | |||
444 | } | ||
445 | } | ||
446 | config()->setGroup("General"); | 366 | config()->setGroup("General"); |
447 | 367 | ||
448 | mCustomCategories = config()->readListEntry("Custom Categories"); | 368 | mCustomCategories = config()->readListEntry("Custom Categories"); |
449 | if ( KOPrefs::instance()->mLanguageChanged ) { | 369 | if ( KPimGlobalPrefs::instance()->mPreferredLanguage != mOldLanguage ) { |
450 | mLocationDefaults.clear(); | 370 | mLocationDefaults.clear(); |
451 | mEventSummaryUser.clear(); | 371 | mEventSummaryUser.clear(); |
452 | mTodoSummaryUser.clear(); | 372 | mTodoSummaryUser.clear(); |
453 | } | 373 | } |
374 | mOldLoadedLanguage = mOldLanguage ; | ||
375 | mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage; | ||
454 | if (mLocationDefaults.isEmpty()) { | 376 | if (mLocationDefaults.isEmpty()) { |
455 | mLocationDefaults << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach") | 377 | mLocationDefaults << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach") |
456 | << i18n("University") << i18n("Restaurant") << i18n("Bar") << i18n("Conference room") << i18n("Cinema") << i18n("Lake") << i18n("Kindergarten") | 378 | << i18n("University") << i18n("Restaurant") << i18n("Bar") << i18n("Conference room") << i18n("Cinema") << i18n("Lake") << i18n("Kindergarten") |
457 | << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ; | 379 | << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ; |
458 | // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") | 380 | // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") |
459 | mLocationDefaults.sort(); | 381 | mLocationDefaults.sort(); |
460 | } | 382 | } |
461 | 383 | ||
462 | if (mEventSummaryUser.isEmpty()) { | 384 | if (mEventSummaryUser.isEmpty()) { |
463 | mEventSummaryUser = getDefaultList() ; | 385 | mEventSummaryUser = getDefaultList() ; |
464 | } | 386 | } |
465 | if (mTodoSummaryUser.isEmpty()) { | 387 | if (mTodoSummaryUser.isEmpty()) { |
466 | mTodoSummaryUser = getDefaultList() ; | 388 | mTodoSummaryUser = getDefaultList() ; |
467 | } | 389 | } |
468 | 390 | ||
469 | if (mCustomCategories.isEmpty()) setCategoryDefaults(); | 391 | if (mCustomCategories.isEmpty()) setCategoryDefaults(); |
470 | 392 | ||
471 | config()->setGroup("Personal Settings"); | 393 | config()->setGroup("Personal Settings"); |
472 | mName = config()->readEntry("user_name",""); | 394 | mName = config()->readEntry("user_name",""); |
473 | mEmail = config()->readEntry("user_email",""); | 395 | mEmail = config()->readEntry("user_email",""); |
474 | fillMailDefaults(); | 396 | fillMailDefaults(); |
475 | 397 | ||
476 | config()->setGroup("Category Colors"); | 398 | config()->setGroup("Category Colors"); |
477 | QStringList::Iterator it; | 399 | QStringList::Iterator it; |
478 | for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) { | 400 | for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) { |
479 | setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor)); | 401 | setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor)); |
480 | 402 | ||
481 | } | 403 | } |
482 | 404 | ||
483 | KPimPrefs::usrReadConfig(); | 405 | KPimPrefs::usrReadConfig(); |
484 | } | 406 | } |
485 | 407 | ||
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index c74b0ef..0656644 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h | |||
@@ -1,105 +1,104 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2000,2001 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 KOPREFS_H | 23 | #ifndef KOPREFS_H |
24 | #define KOPREFS_H | 24 | #define KOPREFS_H |
25 | 25 | ||
26 | #include <qdict.h> | ||
27 | 26 | ||
28 | #include <libkdepim/kpimprefs.h> | 27 | #include <libkdepim/kpimprefs.h> |
28 | #include <qdict.h> | ||
29 | 29 | ||
30 | class KConfig; | 30 | class KConfig; |
31 | class QFont; | 31 | class QFont; |
32 | class QColor; | 32 | class QColor; |
33 | class QStringList; | 33 | class QStringList; |
34 | 34 | ||
35 | class KOPrefs : public KPimPrefs | 35 | class KOPrefs : public KPimPrefs |
36 | { | 36 | { |
37 | public: | 37 | public: |
38 | enum { FormatVCalendar, FormatICalendar }; | 38 | enum { FormatVCalendar, FormatICalendar }; |
39 | enum { MailClientKMail, MailClientSendmail }; | 39 | enum { MailClientKMail, MailClientSendmail }; |
40 | enum { IMIPDummy, IMIPKMail }; | 40 | enum { IMIPDummy, IMIPKMail }; |
41 | enum { IMIPOutbox, IMIPdirectsend }; | 41 | enum { IMIPOutbox, IMIPdirectsend }; |
42 | enum { neverAuto, addressbookAuto, selectedAuto }; | 42 | enum { neverAuto, addressbookAuto, selectedAuto }; |
43 | enum { standardDestination, askDestination }; | 43 | enum { standardDestination, askDestination }; |
44 | 44 | ||
45 | virtual ~KOPrefs(); | 45 | virtual ~KOPrefs(); |
46 | 46 | ||
47 | /** Get instance of KOPrefs. It is made sure that there is only one | 47 | /** Get instance of KOPrefs. It is made sure that there is only one |
48 | instance. */ | 48 | instance. */ |
49 | static KOPrefs *instance(); | 49 | static KOPrefs *instance(); |
50 | 50 | ||
51 | /** Set preferences to default values */ | 51 | /** Set preferences to default values */ |
52 | void usrSetDefaults(); | 52 | void usrSetDefaults(); |
53 | 53 | ||
54 | /** Read preferences from config file */ | 54 | /** Read preferences from config file */ |
55 | void usrReadConfig(); | 55 | void usrReadConfig(); |
56 | 56 | ||
57 | /** Write preferences to config file */ | 57 | /** Write preferences to config file */ |
58 | void usrWriteConfig(); | 58 | void usrWriteConfig(); |
59 | void setCategoryDefaults(); | 59 | void setCategoryDefaults(); |
60 | 60 | ||
61 | protected: | 61 | protected: |
62 | void setTimeZoneIdDefault(); | 62 | void setTimeZoneIdDefault(); |
63 | 63 | ||
64 | /** Fill empty mail fields with default values. */ | 64 | /** Fill empty mail fields with default values. */ |
65 | void fillMailDefaults(); | 65 | void fillMailDefaults(); |
66 | 66 | ||
67 | private: | 67 | private: |
68 | /** Constructor disabled for public. Use instance() to create a KOPrefs | 68 | /** Constructor disabled for public. Use instance() to create a KOPrefs |
69 | object. */ | 69 | object. */ |
70 | KOPrefs(); | 70 | KOPrefs(); |
71 | 71 | ||
72 | static KOPrefs *mInstance; | 72 | static KOPrefs *mInstance; |
73 | QDict<QString> *mLocaleDict; | ||
74 | QStringList getDefaultList(); | 73 | QStringList getDefaultList(); |
75 | public: | 74 | public: |
76 | // preferences data | 75 | // preferences data |
77 | KConfig* getConfig(); | 76 | KConfig* getConfig(); |
78 | void setFullName(const QString &); | 77 | void setFullName(const QString &); |
79 | QString fullName(); | 78 | QString fullName(); |
80 | void setEmail(const QString &); | 79 | void setEmail(const QString &); |
81 | QString email(); | 80 | QString email(); |
82 | 81 | ||
83 | QString mAdditional; | 82 | QString mAdditional; |
84 | 83 | ||
85 | bool mEmailControlCenter; | 84 | bool mEmailControlCenter; |
86 | 85 | ||
87 | bool mBcc; | 86 | bool mBcc; |
88 | bool mAutoSave; | 87 | bool mAutoSave; |
89 | int mAutoSaveInterval; | 88 | int mAutoSaveInterval; |
90 | bool mConfirm; | 89 | bool mConfirm; |
91 | 90 | ||
92 | bool mEnableGroupScheduling; | 91 | bool mEnableGroupScheduling; |
93 | bool mEnableProjectView; | 92 | bool mEnableProjectView; |
94 | 93 | ||
95 | int mDefaultFormat; | 94 | int mDefaultFormat; |
96 | int mMailClient; | 95 | int mMailClient; |
97 | 96 | ||
98 | int mStartTime; | 97 | int mStartTime; |
99 | int mDefaultDuration; | 98 | int mDefaultDuration; |
100 | int mAlarmTime; | 99 | int mAlarmTime; |
101 | 100 | ||
102 | int mWorkingHoursStart; | 101 | int mWorkingHoursStart; |
103 | int mWorkingHoursEnd; | 102 | int mWorkingHoursEnd; |
104 | bool mExcludeHolidays; | 103 | bool mExcludeHolidays; |
105 | bool mExcludeSaturdays; | 104 | bool mExcludeSaturdays; |
@@ -129,65 +128,64 @@ class KOPrefs : public KPimPrefs | |||
129 | QColor mTodoDueTodayColor; | 128 | QColor mTodoDueTodayColor; |
130 | QColor mTodoOverdueColor; | 129 | QColor mTodoOverdueColor; |
131 | QColor mMonthViewEvenColor; | 130 | QColor mMonthViewEvenColor; |
132 | QColor mMonthViewOddColor; | 131 | QColor mMonthViewOddColor; |
133 | QColor mMonthViewHolidayColor; | 132 | QColor mMonthViewHolidayColor; |
134 | bool mMonthViewUsesDayColors; | 133 | bool mMonthViewUsesDayColors; |
135 | bool mMonthViewSatSunTog; | 134 | bool mMonthViewSatSunTog; |
136 | QColor mAppColor1; | 135 | QColor mAppColor1; |
137 | QColor mAppColor2; | 136 | QColor mAppColor2; |
138 | bool mUseAppColors; | 137 | bool mUseAppColors; |
139 | 138 | ||
140 | int mDayBegins; | 139 | int mDayBegins; |
141 | int mHourSize; | 140 | int mHourSize; |
142 | int mAllDaySize; | 141 | int mAllDaySize; |
143 | bool mShowFullMenu; | 142 | bool mShowFullMenu; |
144 | bool mDailyRecur; | 143 | bool mDailyRecur; |
145 | bool mWeeklyRecur; | 144 | bool mWeeklyRecur; |
146 | bool mMonthDailyRecur; | 145 | bool mMonthDailyRecur; |
147 | bool mMonthWeeklyRecur; | 146 | bool mMonthWeeklyRecur; |
148 | bool mMonthShowIcons; | 147 | bool mMonthShowIcons; |
149 | bool mMonthShowShort; | 148 | bool mMonthShowShort; |
150 | bool mEnableToolTips; | 149 | bool mEnableToolTips; |
151 | bool mEnableMonthScroll; | 150 | bool mEnableMonthScroll; |
152 | bool mFullViewMonth; | 151 | bool mFullViewMonth; |
153 | bool mMonthViewUsesCategoryColor; | 152 | bool mMonthViewUsesCategoryColor; |
154 | bool mFullViewTodo; | 153 | bool mFullViewTodo; |
155 | bool mShowCompletedTodo; | 154 | bool mShowCompletedTodo; |
156 | bool mMarcusBainsEnabled; | 155 | bool mMarcusBainsEnabled; |
157 | int mNextXDays; | 156 | int mNextXDays; |
158 | int mWhatsNextDays; | 157 | int mWhatsNextDays; |
159 | int mWhatsNextPrios; | 158 | int mWhatsNextPrios; |
160 | bool mEnableQuickTodo; | 159 | bool mEnableQuickTodo; |
161 | bool mLanguageChanged; | ||
162 | 160 | ||
163 | bool mCompactDialogs; | 161 | bool mCompactDialogs; |
164 | bool mVerticalScreen; | 162 | bool mVerticalScreen; |
165 | 163 | ||
166 | bool mShowIconNewTodo; | 164 | bool mShowIconNewTodo; |
167 | bool mShowIconNewEvent; | 165 | bool mShowIconNewEvent; |
168 | bool mShowIconSearch; | 166 | bool mShowIconSearch; |
169 | bool mShowIconList; | 167 | bool mShowIconList; |
170 | bool mShowIconDay1; | 168 | bool mShowIconDay1; |
171 | bool mShowIconDay5; | 169 | bool mShowIconDay5; |
172 | bool mShowIconDay7; | 170 | bool mShowIconDay7; |
173 | bool mShowIconMonth; | 171 | bool mShowIconMonth; |
174 | bool mShowIconTodoview; | 172 | bool mShowIconTodoview; |
175 | bool mShowIconBackFast; | 173 | bool mShowIconBackFast; |
176 | bool mShowIconBack; | 174 | bool mShowIconBack; |
177 | bool mShowIconToday; | 175 | bool mShowIconToday; |
178 | bool mShowIconForward; | 176 | bool mShowIconForward; |
179 | bool mShowIconForwardFast; | 177 | bool mShowIconForwardFast; |
180 | bool mShowIconWhatsThis; | 178 | bool mShowIconWhatsThis; |
181 | bool mShowIconNextDays; | 179 | bool mShowIconNextDays; |
182 | bool mShowIconNext; | 180 | bool mShowIconNext; |
183 | bool mShowIconJournal; | 181 | bool mShowIconJournal; |
184 | 182 | ||
185 | bool mShowIconStretch; | 183 | bool mShowIconStretch; |
186 | 184 | ||
187 | bool mToolBarHor; | 185 | bool mToolBarHor; |
188 | bool mToolBarUp; | 186 | bool mToolBarUp; |
189 | bool mToolBarMiniIcons; | 187 | bool mToolBarMiniIcons; |
190 | 188 | ||
191 | bool mAskForQuit; | 189 | bool mAskForQuit; |
192 | bool mUsePassWd; | 190 | bool mUsePassWd; |
193 | bool mShowSyncEvents; | 191 | bool mShowSyncEvents; |
@@ -224,60 +222,52 @@ class KOPrefs : public KPimPrefs | |||
224 | 222 | ||
225 | int mDestination; | 223 | int mDestination; |
226 | 224 | ||
227 | 225 | ||
228 | bool mEditOnDoubleClick; | 226 | bool mEditOnDoubleClick; |
229 | bool mViewChangeHoldFullscreen; | 227 | bool mViewChangeHoldFullscreen; |
230 | bool mViewChangeHoldNonFullscreen; | 228 | bool mViewChangeHoldNonFullscreen; |
231 | bool mCenterOnCurrentTime; | 229 | bool mCenterOnCurrentTime; |
232 | bool mSetTimeToDayStartAt; | 230 | bool mSetTimeToDayStartAt; |
233 | bool mHighlightCurrentDay; | 231 | bool mHighlightCurrentDay; |
234 | bool mUseHighlightLightColor; | 232 | bool mUseHighlightLightColor; |
235 | bool mListViewMonthTimespan; | 233 | bool mListViewMonthTimespan; |
236 | bool mWNViewShowsParents; | 234 | bool mWNViewShowsParents; |
237 | bool mWNViewShowLocation; | 235 | bool mWNViewShowLocation; |
238 | bool mTodoViewShowsPercentage; | 236 | bool mTodoViewShowsPercentage; |
239 | bool mTodoViewUsesCatColors; | 237 | bool mTodoViewUsesCatColors; |
240 | bool mTodoViewUsesSmallFont; | 238 | bool mTodoViewUsesSmallFont; |
241 | bool mTodoViewUsesForegroundColor; | 239 | bool mTodoViewUsesForegroundColor; |
242 | bool mMonthViewUsesForegroundColor; | 240 | bool mMonthViewUsesForegroundColor; |
243 | 241 | ||
244 | bool mHightlightDateTimeEdit; | 242 | bool mHightlightDateTimeEdit; |
245 | bool mShortDateInViewer; | 243 | bool mShortDateInViewer; |
246 | 244 | ||
247 | QStringList mLocationDefaults; | 245 | QStringList mLocationDefaults; |
248 | QStringList mEventSummaryUser; | 246 | QStringList mEventSummaryUser; |
249 | QStringList mTodoSummaryUser; | 247 | QStringList mTodoSummaryUser; |
250 | 248 | ||
251 | bool mUseInternalAlarmNotification; | 249 | bool mUseInternalAlarmNotification; |
252 | int mAlarmPlayBeeps; | 250 | int mAlarmPlayBeeps; |
253 | int mAlarmSuspendTime; | 251 | int mAlarmSuspendTime; |
254 | int mAlarmSuspendCount; | 252 | int mAlarmSuspendCount; |
255 | int mAlarmBeepInterval; | 253 | int mAlarmBeepInterval; |
254 | int mOldLanguage; | ||
255 | int mOldLoadedLanguage; | ||
256 | 256 | ||
257 | 257 | ||
258 | QString mActiveSyncPort; | 258 | QString mActiveSyncPort; |
259 | QString mActiveSyncIP; | 259 | QString mActiveSyncIP; |
260 | 260 | ||
261 | |||
262 | //US I copied the following settings into KPimGlobalPrefs | ||
263 | // that allows us later to easily remove the settings from here. | ||
264 | int mPreferredDate; | ||
265 | QString mUserDateFormatLong; | ||
266 | QString mUserDateFormatShort; | ||
267 | int mPreferredLanguage; | ||
268 | int mPreferredTime; | ||
269 | bool mWeekStartsOnSunday; | ||
270 | |||
271 | private: | 261 | private: |
272 | QDict<QColor> mCategoryColors; | 262 | QDict<QColor> mCategoryColors; |
273 | QColor mDefaultCategoryColor; | 263 | QColor mDefaultCategoryColor; |
274 | 264 | ||
275 | QFont mDefaultTimeBarFont; | 265 | QFont mDefaultTimeBarFont; |
276 | QFont mDefaultViewFont; | 266 | QFont mDefaultViewFont; |
277 | QFont mDefaultMonthViewFont; | 267 | QFont mDefaultMonthViewFont; |
278 | 268 | ||
279 | QString mName; | 269 | QString mName; |
280 | QString mEmail; | 270 | QString mEmail; |
281 | }; | 271 | }; |
282 | 272 | ||
283 | #endif | 273 | #endif |
diff --git a/korganizer/ktimeedit.cpp b/korganizer/ktimeedit.cpp index cf07a1a..f5a1c50 100644 --- a/korganizer/ktimeedit.cpp +++ b/korganizer/ktimeedit.cpp | |||
@@ -2,64 +2,65 @@ | |||
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | Copyright (c) 1999 Preston Brown, Ian Dawes | 3 | Copyright (c) 1999 Preston Brown, Ian Dawes |
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 | 23 | ||
24 | #include <qkeycode.h> | 24 | #include <qkeycode.h> |
25 | #include <qcombobox.h> | 25 | #include <qcombobox.h> |
26 | #include <qdatetime.h> | 26 | #include <qdatetime.h> |
27 | #include <qlineedit.h> | 27 | #include <qlineedit.h> |
28 | #include <qapplication.h> | 28 | #include <qapplication.h> |
29 | 29 | ||
30 | #include <kmessagebox.h> | 30 | #include <kmessagebox.h> |
31 | #include <kglobal.h> | 31 | #include <kglobal.h> |
32 | #include <kdebug.h> | 32 | #include <kdebug.h> |
33 | #include <klocale.h> | 33 | #include <klocale.h> |
34 | #include <kpimglobalprefs.h> | ||
34 | 35 | ||
35 | #include "ktimeedit.h" | 36 | #include "ktimeedit.h" |
36 | #include "koprefs.h" | 37 | #include "koprefs.h" |
37 | #include <qvalidator.h> | 38 | #include <qvalidator.h> |
38 | 39 | ||
39 | // Validator for a time value with only hours and minutes (no seconds) | 40 | // Validator for a time value with only hours and minutes (no seconds) |
40 | // Mostly locale aware. Author: David Faure <faure@kde.org> | 41 | // Mostly locale aware. Author: David Faure <faure@kde.org> |
41 | class KOTimeValidator : public QValidator | 42 | class KOTimeValidator : public QValidator |
42 | { | 43 | { |
43 | public: | 44 | public: |
44 | KOTimeValidator(QWidget* parent, const char* name=0) : QValidator(parent, name) {} | 45 | KOTimeValidator(QWidget* parent, const char* name=0) : QValidator(parent, name) {} |
45 | 46 | ||
46 | virtual State validate(QString& str, int& /*cursorPos*/) const | 47 | virtual State validate(QString& str, int& /*cursorPos*/) const |
47 | { | 48 | { |
48 | return Acceptable; | 49 | return Acceptable; |
49 | bool ok = false; | 50 | bool ok = false; |
50 | // TODO use KLocale::WithoutSeconds in HEAD | 51 | // TODO use KLocale::WithoutSeconds in HEAD |
51 | /*QTime time =*/ KGlobal::locale()->readTime(str, &ok); | 52 | /*QTime time =*/ KGlobal::locale()->readTime(str, &ok); |
52 | if ( ok ) | 53 | if ( ok ) |
53 | return Acceptable; | 54 | return Acceptable; |
54 | // readTime doesn't help knowing when the string is "Intermediate". | 55 | // readTime doesn't help knowing when the string is "Intermediate". |
55 | int length = str.length(); | 56 | int length = str.length(); |
56 | if ( !str ) // empty string? | 57 | if ( !str ) // empty string? |
57 | return Invalid; // there should always be a ':' in it, right? | 58 | return Invalid; // there should always be a ':' in it, right? |
58 | // HACK. Not fully locale aware etc. (esp. the separator is '.' in sv_SE...) | 59 | // HACK. Not fully locale aware etc. (esp. the separator is '.' in sv_SE...) |
59 | QChar sep = ':'; | 60 | QChar sep = ':'; |
60 | // I want to allow "HH:", ":MM" and ":" to make editing easier | 61 | // I want to allow "HH:", ":MM" and ":" to make editing easier |
61 | if ( str[0] == sep ) | 62 | if ( str[0] == sep ) |
62 | { | 63 | { |
63 | if ( length == 1 ) // just ":" | 64 | if ( length == 1 ) // just ":" |
64 | return Intermediate; | 65 | return Intermediate; |
65 | QString minutes = str.mid(1); | 66 | QString minutes = str.mid(1); |
@@ -82,65 +83,65 @@ public: | |||
82 | // But Qt-3.2 will offer QLineEdit::setMask, so a "99:99" mask would help. | 83 | // But Qt-3.2 will offer QLineEdit::setMask, so a "99:99" mask would help. |
83 | KOTimeEdit::KOTimeEdit(QWidget *parent, QTime qt, const char *name) | 84 | KOTimeEdit::KOTimeEdit(QWidget *parent, QTime qt, const char *name) |
84 | : QComboBox(TRUE, parent, name) | 85 | : QComboBox(TRUE, parent, name) |
85 | { | 86 | { |
86 | setInsertionPolicy(NoInsertion); | 87 | setInsertionPolicy(NoInsertion); |
87 | setValidator( new KOTimeValidator( this ) ); | 88 | setValidator( new KOTimeValidator( this ) ); |
88 | mFlagKeyPressed = false; | 89 | mFlagKeyPressed = false; |
89 | 90 | ||
90 | if ( QApplication::desktop()->width() < 650 ) | 91 | if ( QApplication::desktop()->width() < 650 ) |
91 | setSizeLimit ( 6 ); | 92 | setSizeLimit ( 6 ); |
92 | mTime = qt; | 93 | mTime = qt; |
93 | 94 | ||
94 | // mNoTimeString = i18n("No Time"); | 95 | // mNoTimeString = i18n("No Time"); |
95 | // insertItem( mNoTimeString ); | 96 | // insertItem( mNoTimeString ); |
96 | 97 | ||
97 | // Fill combo box with selection of times in localized format. | 98 | // Fill combo box with selection of times in localized format. |
98 | QTime timeEntry(0,0,0); | 99 | QTime timeEntry(0,0,0); |
99 | do { | 100 | do { |
100 | insertItem(KGlobal::locale()->formatTime(timeEntry)); | 101 | insertItem(KGlobal::locale()->formatTime(timeEntry)); |
101 | timeEntry = timeEntry.addSecs(60*15); | 102 | timeEntry = timeEntry.addSecs(60*15); |
102 | } while (!timeEntry.isNull()); | 103 | } while (!timeEntry.isNull()); |
103 | // Add end of day. | 104 | // Add end of day. |
104 | insertItem( KGlobal::locale()->formatTime( QTime( 23, 59, 59 ) ) ); | 105 | insertItem( KGlobal::locale()->formatTime( QTime( 23, 59, 59 ) ) ); |
105 | 106 | ||
106 | updateText(); | 107 | updateText(); |
107 | setFocusPolicy(QWidget::StrongFocus); | 108 | setFocusPolicy(QWidget::StrongFocus); |
108 | 109 | ||
109 | connect(this, SIGNAL(activated(int)), this, SLOT(activ(int))); | 110 | connect(this, SIGNAL(activated(int)), this, SLOT(activ(int))); |
110 | connect(this, SIGNAL(highlighted(int)), this, SLOT(hilit(int))); | 111 | connect(this, SIGNAL(highlighted(int)), this, SLOT(hilit(int))); |
111 | connect(this,SIGNAL(textChanged(const QString&)),this,SLOT(changedText())); | 112 | connect(this,SIGNAL(textChanged(const QString&)),this,SLOT(changedText())); |
112 | QFontMetrics fm ( font() ); | 113 | QFontMetrics fm ( font() ); |
113 | QString timeString = "24:00"; | 114 | QString timeString = "24:00"; |
114 | if ( KOPrefs::instance()->mPreferredTime == 1 ) | 115 | if ( KPimGlobalPrefs::instance()->mPreferredTime == 1 ) |
115 | timeString = "02:00pm"; | 116 | timeString = "02:00pm"; |
116 | int addSpace = 32; | 117 | int addSpace = 32; |
117 | if ( QApplication::desktop()->width() > 320 ) | 118 | if ( QApplication::desktop()->width() > 320 ) |
118 | timeString += ":00"; | 119 | timeString += ":00"; |
119 | setFixedWidth(fm.width( timeString ) + 32 ); | 120 | setFixedWidth(fm.width( timeString ) + 32 ); |
120 | 121 | ||
121 | // Highlight Background and Textcolor change from default | 122 | // Highlight Background and Textcolor change from default |
122 | QPalette palette = QWidget::palette(); | 123 | QPalette palette = QWidget::palette(); |
123 | unsigned char red, green, blue; | 124 | unsigned char red, green, blue; |
124 | red = palette.color( QPalette::Normal , QColorGroup::Background ).red() - 10; | 125 | red = palette.color( QPalette::Normal , QColorGroup::Background ).red() - 10; |
125 | green = palette.color( QPalette::Normal , QColorGroup::Background ).green() - 10; | 126 | green = palette.color( QPalette::Normal , QColorGroup::Background ).green() - 10; |
126 | blue = palette.color( QPalette::Normal , QColorGroup::Background ).blue() - 10; | 127 | blue = palette.color( QPalette::Normal , QColorGroup::Background ).blue() - 10; |
127 | palette.setColor( QColorGroup::Highlight, QColor(red,green,blue) ); | 128 | palette.setColor( QColorGroup::Highlight, QColor(red,green,blue) ); |
128 | palette.setColor( QColorGroup::HighlightedText, palette.color( QPalette::Normal , QColorGroup::Foreground ) ); | 129 | palette.setColor( QColorGroup::HighlightedText, palette.color( QPalette::Normal , QColorGroup::Foreground ) ); |
129 | setPalette( palette ); | 130 | setPalette( palette ); |
130 | } | 131 | } |
131 | 132 | ||
132 | KOTimeEdit::~KOTimeEdit() | 133 | KOTimeEdit::~KOTimeEdit() |
133 | { | 134 | { |
134 | } | 135 | } |
135 | 136 | ||
136 | bool KOTimeEdit::hasTime() const | 137 | bool KOTimeEdit::hasTime() const |
137 | { | 138 | { |
138 | // Can't happen | 139 | // Can't happen |
139 | if ( currentText().isEmpty() ) return false; | 140 | if ( currentText().isEmpty() ) return false; |
140 | //if ( currentText() == mNoTimeString ) return false; | 141 | //if ( currentText() == mNoTimeString ) return false; |
141 | 142 | ||
142 | return true; // always | 143 | return true; // always |
143 | } | 144 | } |
144 | 145 | ||
145 | QTime KOTimeEdit::getTime() const | 146 | QTime KOTimeEdit::getTime() const |
146 | { | 147 | { |
@@ -209,65 +210,65 @@ void KOTimeEdit::subTime(QTime qt, bool update) | |||
209 | updateText(); | 210 | updateText(); |
210 | emit timeChanged(mTime); | 211 | emit timeChanged(mTime); |
211 | } | 212 | } |
212 | 213 | ||
213 | // void KOTimeEdit::mouseReleaseEvent ( QMouseEvent * ) | 214 | // void KOTimeEdit::mouseReleaseEvent ( QMouseEvent * ) |
214 | // { | 215 | // { |
215 | // qDebug("mouseReleaseEvent ( QMouseEvent * ) "); | 216 | // qDebug("mouseReleaseEvent ( QMouseEvent * ) "); |
216 | // } | 217 | // } |
217 | 218 | ||
218 | // void KOTimeEdit::focusInEvent ( QFocusEvent * ) | 219 | // void KOTimeEdit::focusInEvent ( QFocusEvent * ) |
219 | // { | 220 | // { |
220 | // qDebug("focusInEvent ( QFocusEvent * ) "); | 221 | // qDebug("focusInEvent ( QFocusEvent * ) "); |
221 | // } | 222 | // } |
222 | 223 | ||
223 | void KOTimeEdit::keyReleaseEvent(QKeyEvent *e) | 224 | void KOTimeEdit::keyReleaseEvent(QKeyEvent *e) |
224 | { | 225 | { |
225 | if ( !e->isAutoRepeat() ) { | 226 | if ( !e->isAutoRepeat() ) { |
226 | mFlagKeyPressed = false; | 227 | mFlagKeyPressed = false; |
227 | } | 228 | } |
228 | 229 | ||
229 | } | 230 | } |
230 | void KOTimeEdit::setSelect( int from, int to ) | 231 | void KOTimeEdit::setSelect( int from, int to ) |
231 | { | 232 | { |
232 | if ( KOPrefs::instance()->mHightlightDateTimeEdit) | 233 | if ( KOPrefs::instance()->mHightlightDateTimeEdit) |
233 | lineEdit()->setSelection( from , to ); | 234 | lineEdit()->setSelection( from , to ); |
234 | } | 235 | } |
235 | 236 | ||
236 | 237 | ||
237 | void KOTimeEdit::keyPressEvent(QKeyEvent *e) | 238 | void KOTimeEdit::keyPressEvent(QKeyEvent *e) |
238 | { | 239 | { |
239 | 240 | ||
240 | qApp->processEvents(); | 241 | qApp->processEvents(); |
241 | bool hour12Format = ( KOPrefs::instance()->mPreferredTime == 1 ); | 242 | bool hour12Format = ( KPimGlobalPrefs::instance()->mPreferredTime == 1 ); |
242 | int maxpos = hour12Format?7:5; | 243 | int maxpos = hour12Format?7:5; |
243 | if ( e->isAutoRepeat() && !mFlagKeyPressed ) { | 244 | if ( e->isAutoRepeat() && !mFlagKeyPressed ) { |
244 | e->ignore(); | 245 | e->ignore(); |
245 | // qDebug(" ignore %d",e->isAutoRepeat() ); | 246 | // qDebug(" ignore %d",e->isAutoRepeat() ); |
246 | return; | 247 | return; |
247 | } | 248 | } |
248 | if (! e->isAutoRepeat() ) { | 249 | if (! e->isAutoRepeat() ) { |
249 | mFlagKeyPressed = true; | 250 | mFlagKeyPressed = true; |
250 | } | 251 | } |
251 | // Tap -> Focus Next Widget | 252 | // Tap -> Focus Next Widget |
252 | if ( e->key() == Key_Tab ) { | 253 | if ( e->key() == Key_Tab ) { |
253 | QComboBox::keyPressEvent(e); | 254 | QComboBox::keyPressEvent(e); |
254 | return; | 255 | return; |
255 | } | 256 | } |
256 | 257 | ||
257 | // save Text from QLineEdit and CursorPosition | 258 | // save Text from QLineEdit and CursorPosition |
258 | QString text = lineEdit()->text(); | 259 | QString text = lineEdit()->text(); |
259 | int cpos = lineEdit()->cursorPosition(); | 260 | int cpos = lineEdit()->cursorPosition(); |
260 | // qDebug("cpos %d ", cpos); | 261 | // qDebug("cpos %d ", cpos); |
261 | 262 | ||
262 | // Switch for arrows, backspace and escape | 263 | // Switch for arrows, backspace and escape |
263 | switch(e->key()) { | 264 | switch(e->key()) { |
264 | case Key_Escape: | 265 | case Key_Escape: |
265 | lineEdit()->deselect(); | 266 | lineEdit()->deselect(); |
266 | case Key_Tab: | 267 | case Key_Tab: |
267 | QComboBox::keyPressEvent(e); | 268 | QComboBox::keyPressEvent(e); |
268 | break; | 269 | break; |
269 | case Key_Up: | 270 | case Key_Up: |
270 | if ( e->state () == Qt::ControlButton ) { | 271 | if ( e->state () == Qt::ControlButton ) { |
271 | addTime(QTime(0,15,0), false ); | 272 | addTime(QTime(0,15,0), false ); |
272 | lineEdit()->setCursorPosition(3); | 273 | lineEdit()->setCursorPosition(3); |
273 | setSelect( 3 , 2 ); | 274 | setSelect( 3 , 2 ); |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index fbfcd20..dc2026b 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -196,68 +196,67 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
196 | //mView->resize( splash->size() ); | 196 | //mView->resize( splash->size() ); |
197 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); | 197 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); |
198 | mView->readSettings(); | 198 | mView->readSettings(); |
199 | bool newFile = false; | 199 | bool newFile = false; |
200 | if( !QFile::exists( defaultFileName() ) ) { | 200 | if( !QFile::exists( defaultFileName() ) ) { |
201 | QFileInfo finfo ( defaultFileName() ); | 201 | QFileInfo finfo ( defaultFileName() ); |
202 | QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); | 202 | QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); |
203 | qDebug("oldfile %s ", oldFile.latin1()); | 203 | qDebug("oldfile %s ", oldFile.latin1()); |
204 | QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n"; | 204 | QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n"; |
205 | finfo.setFile( oldFile ); | 205 | finfo.setFile( oldFile ); |
206 | if (finfo.exists() ) { | 206 | if (finfo.exists() ) { |
207 | KMessageBox::information( this, message); | 207 | KMessageBox::information( this, message); |
208 | mView->openCalendar( oldFile ); | 208 | mView->openCalendar( oldFile ); |
209 | qApp->processEvents(); | 209 | qApp->processEvents(); |
210 | } else { | 210 | } else { |
211 | oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/korganizer/mycalendar.ics"); | 211 | oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/korganizer/mycalendar.ics"); |
212 | finfo.setFile( oldFile ); | 212 | finfo.setFile( oldFile ); |
213 | if (finfo.exists() ) { | 213 | if (finfo.exists() ) { |
214 | KMessageBox::information( this, message); | 214 | KMessageBox::information( this, message); |
215 | mView->openCalendar( oldFile ); | 215 | mView->openCalendar( oldFile ); |
216 | qApp->processEvents(); | 216 | qApp->processEvents(); |
217 | } | 217 | } |
218 | } | 218 | } |
219 | mView->saveCalendar( defaultFileName() ); | 219 | mView->saveCalendar( defaultFileName() ); |
220 | newFile = true; | 220 | newFile = true; |
221 | } | 221 | } |
222 | 222 | ||
223 | QTime neededSaveTime = QDateTime::currentDateTime().time(); | 223 | QTime neededSaveTime = QDateTime::currentDateTime().time(); |
224 | mView->openCalendar( defaultFileName() ); | 224 | mView->openCalendar( defaultFileName() ); |
225 | int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); | 225 | int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); |
226 | qDebug("KO: Calendar loading time: %d ms",msNeeded ); | 226 | qDebug("KO: Calendar loading time: %d ms",msNeeded ); |
227 | 227 | ||
228 | if ( KOPrefs::instance()->mLanguageChanged ) { | 228 | if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) { |
229 | KOPrefs::instance()->setCategoryDefaults(); | 229 | KOPrefs::instance()->setCategoryDefaults(); |
230 | int count = mView->addCategories(); | 230 | int count = mView->addCategories(); |
231 | KOPrefs::instance()->mLanguageChanged = false; | ||
232 | } | 231 | } |
233 | processIncidenceSelection( 0 ); | 232 | processIncidenceSelection( 0 ); |
234 | connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), | 233 | connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), |
235 | SLOT( processIncidenceSelection( Incidence * ) ) ); | 234 | SLOT( processIncidenceSelection( Incidence * ) ) ); |
236 | connect( mView, SIGNAL( modifiedChanged( bool ) ), | 235 | connect( mView, SIGNAL( modifiedChanged( bool ) ), |
237 | SLOT( slotModifiedChanged( bool ) ) ); | 236 | SLOT( slotModifiedChanged( bool ) ) ); |
238 | 237 | ||
239 | 238 | ||
240 | connect( mView, SIGNAL( tempDisableBR(bool) ), | 239 | connect( mView, SIGNAL( tempDisableBR(bool) ), |
241 | SLOT( disableBR(bool) ) ); | 240 | SLOT( disableBR(bool) ) ); |
242 | connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) ); | 241 | connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) ); |
243 | mView->setModified( false ); | 242 | mView->setModified( false ); |
244 | mBlockAtStartup = false; | 243 | mBlockAtStartup = false; |
245 | mView->setModified( false ); | 244 | mView->setModified( false ); |
246 | setCentralWidget( mView ); | 245 | setCentralWidget( mView ); |
247 | globalFlagBlockStartup = 0; | 246 | globalFlagBlockStartup = 0; |
248 | mView->show(); | 247 | mView->show(); |
249 | delete splash; | 248 | delete splash; |
250 | if ( newFile ) | 249 | if ( newFile ) |
251 | mView->updateConfig(); | 250 | mView->updateConfig(); |
252 | // qApp->processEvents(); | 251 | // qApp->processEvents(); |
253 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); | 252 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); |
254 | //fillSyncMenu(); | 253 | //fillSyncMenu(); |
255 | 254 | ||
256 | 255 | ||
257 | connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) ); | 256 | connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) ); |
258 | connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); | 257 | connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); |
259 | connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); | 258 | connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); |
260 | mSyncManager->setDefaultFileName( defaultFileName()); | 259 | mSyncManager->setDefaultFileName( defaultFileName()); |
261 | connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); | 260 | connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); |
262 | mSyncManager->fillSyncMenu(); | 261 | mSyncManager->fillSyncMenu(); |
263 | 262 | ||