summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-09-21 19:52:42 (UTC)
committer ulf69 <ulf69>2004-09-21 19:52:42 (UTC)
commit186ee062d9169860fbab1613ca21b956c69296a6 (patch) (side-by-side diff)
tree62df959e22100e6fc6d3129a19aaa22f7a7beefa
parent93313aa8d66c01aa0e4562449020af20b5cef0a7 (diff)
downloadkdepimpi-186ee062d9169860fbab1613ca21b956c69296a6.zip
kdepimpi-186ee062d9169860fbab1613ca21b956c69296a6.tar.gz
kdepimpi-186ee062d9169860fbab1613ca21b956c69296a6.tar.bz2
changed name of prefs edit widgets to distinguish between krefsdialog and the same implementation in kprefswidget
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koprefs.h25
-rw-r--r--korganizer/koprefsdialog.cpp114
-rw-r--r--korganizer/koprefsdialog.h4
3 files changed, 74 insertions, 69 deletions
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index a9ac52f..33eda60 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -97,10 +97,6 @@ class KOPrefs : public KPimPrefs
QString mTimeZone;
- QString mTimeZoneId;
//QString mTimeZoneName; // e.g. +00:04:00 Indian/Mauritius
//int mTimeZoneOffset; // e.g. -240 min
- bool mUseDaylightsaving;
- int mDaylightsavingStart;
- int mDaylightsavingEnd;
int mStartTime;
int mDefaultDuration;
@@ -271,12 +267,6 @@ class KOPrefs : public KPimPrefs
bool mHightlightDateTimeEdit;
- int mPreferredLanguage;
bool mUseQuicksave;
- int mPreferredTime;
- int mPreferredDate;
- bool mWeekStartsOnSunday;
bool mShortDateInViewer;
- QString mUserDateFormatLong;
- QString mUserDateFormatShort;
QStringList mLocationDefaults;
@@ -290,4 +280,19 @@ class KOPrefs : public KPimPrefs
int mAlarmBeepInterval;
+
+ //US I copied the following settings into KPimGlobalPrefs
+ // that allows us later to easily remove the settings from here.
+ int mPreferredDate;
+ QString mUserDateFormatLong;
+ QString mUserDateFormatShort;
+ int mPreferredLanguage;
+ int mPreferredTime;
+ bool mWeekStartsOnSunday;
+ QString mTimeZoneId;
+ bool mUseDaylightsaving;
+ int mDaylightsavingStart;
+ int mDaylightsavingEnd;
+
+
private:
QDict<QColor> mCategoryColors;
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 5ba4817..1c30faa 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -108,5 +108,5 @@ QFrame *topFrame = addPage(i18n("Date Format"),0,0);
- KPrefsWidRadios *syncPrefsGroup =
+ KPrefsDialogWidRadios *syncPrefsGroup =
addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame);
QString format;
@@ -160,5 +160,5 @@ void KOPrefsDialog::setupLocaleTab()
topLayout->setMargin(marginHint());
int iii = 0;
- KPrefsWidRadios *syncPrefsGroup =
+ KPrefsDialogWidRadios *syncPrefsGroup =
addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame);
syncPrefsGroup->addRadio(i18n("English"));
@@ -180,5 +180,5 @@ void KOPrefsDialog::setupLocaleTab()
topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
++iii;
- KPrefsWidBool *sb;
+ KPrefsDialogWidBool *sb;
if ( QApplication::desktop()->width() < 300 ) {
sb =
@@ -206,5 +206,5 @@ void KOPrefsDialog::setupLocaleTab()
}
- //#ifndef DESKTOP_VERSION
+ // KPrefsDialogWidBool *sb; //#ifndef DESKTOP_VERSION
#if 0
++iii;
@@ -231,5 +231,5 @@ void KOPrefsDialog::setupSyncAlgTab()
int iii = 0;
- KPrefsWidBool *sb =
+ KPrefsDialogWidBool *sb =
addWidBool(i18n("Ask for preferences before syncing"),
&(KOPrefs::instance()->mAskForPreferences),topFrame);
@@ -238,5 +238,5 @@ void KOPrefsDialog::setupSyncAlgTab()
++iii;
- KPrefsWidRadios *syncPrefsGroup =
+ KPrefsDialogWidRadios *syncPrefsGroup =
addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs),
topFrame);
@@ -298,5 +298,5 @@ void KOPrefsDialog::setupSyncTab()
++iii;
- KPrefsWidBool *wb =
+ KPrefsDialogWidBool *wb =
addWidBool(i18n("Write back synced file"),
&(KOPrefs::instance()->mWriteBackFile),topFrame);
@@ -321,5 +321,5 @@ void KOPrefsDialog::setupMainTab()
topLayout->setMargin(marginHint());
- // KPrefsWidBool *emailControlCenter =
+ // KPrefsDialogWidBool *emailControlCenter =
// addWidBool(i18n("&Use email settings from Control Center"),
// &(KOPrefs::instance()->mEmailControlCenter),topFrame);
@@ -337,5 +337,5 @@ void KOPrefsDialog::setupMainTab()
topLayout->addWidget(mEmailLabel,1,0);
topLayout->addWidget(mEmailEdit,1,1);
- KPrefsWidBool *wb;
+ KPrefsDialogWidBool *wb;
QHBox *dummy;
if ( QApplication::desktop()->width() > 480 ) {
@@ -380,5 +380,5 @@ void KOPrefsDialog::setupMainTab()
mPrioSpin->setFixedWidth( 40 );
- // KPrefsWidBool *bcc =
+ // KPrefsDialogWidBool *bcc =
// addWidBool(i18n("Send copy to owner when mailing events"),
// &(KOPrefs::instance()->mBcc),topFrame);
@@ -407,5 +407,5 @@ void KOPrefsDialog::setupMainTab()
topLayout->addMultiCellWidget(agendasize,7,7,0,1);
*/
- KPrefsWidBool *verticalScreen =
+ KPrefsDialogWidBool *verticalScreen =
addWidBool(i18n("Show vertical screen (Needs restart)"),
&(KOPrefs::instance()->mVerticalScreen),topFrame);
@@ -413,5 +413,5 @@ void KOPrefsDialog::setupMainTab()
topLayout->addMultiCellWidget(verticalScreen->checkBox(),7,7,0,1);
- KPrefsWidBool *ask =
+ KPrefsDialogWidBool *ask =
addWidBool(i18n("Ask for quit when closing KO/Pi"),
&(KOPrefs::instance()->mAskForQuit),topFrame);
@@ -420,5 +420,5 @@ void KOPrefsDialog::setupMainTab()
/*
- KPrefsWidBool *confirmCheck =
+ KPrefsDialogWidBool *confirmCheck =
addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm),
topFrame);
@@ -446,5 +446,5 @@ void KOPrefsDialog::setupMainTab()
mEnableProjectView->checkBox()->hide();
- KPrefsWidRadios *defaultFormatGroup =
+ KPrefsDialogWidRadios *defaultFormatGroup =
addWidRadios(i18n("Default Calendar Format"),
&(KOPrefs::instance()->mDefaultFormat),topFrame);
@@ -457,5 +457,5 @@ void KOPrefsDialog::setupMainTab()
defaultFormatGroup->groupBox()->hide();
- KPrefsWidRadios *mailClientGroup =
+ KPrefsDialogWidRadios *mailClientGroup =
addWidRadios(i18n("Mail Client"),&(KOPrefs::instance()->mMailClient),
topFrame);
@@ -464,10 +464,10 @@ void KOPrefsDialog::setupMainTab()
topLayout->addMultiCellWidget(mailClientGroup->groupBox(),11,11,0,1);
- KPrefsWidBool *htmlsave =
+ KPrefsDialogWidBool *htmlsave =
addWidBool(i18n("Export to HTML with every save"),&(KOPrefs::instance()->mHtmlWithSave),
topFrame);
topLayout->addMultiCellWidget(htmlsave->checkBox(),12,12,0,1);
- KPrefsWidRadios *destinationGroup =
+ KPrefsDialogWidRadios *destinationGroup =
addWidRadios(i18n("New Events/Todos should"),&(KOPrefs::instance()->mDestination),
topFrame);
@@ -491,5 +491,5 @@ void KOPrefsDialog::setupTimeTab()
QHBox *dummy = new QHBox(topFrame);
- KPrefsWidTime *dayBegins =
+ KPrefsDialogWidTime *dayBegins =
addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
dummy);
@@ -544,5 +544,5 @@ void KOPrefsDialog::setupTimeTab()
&(KOPrefs::instance()->mExcludeSaturdays),excludeBox);
-// KPrefsWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"),
+// KPrefsDialogWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"),
// &(KOPrefs::instance()->mMarcusBainsShowSeconds),
// topFrame);
@@ -566,5 +566,5 @@ void KOPrefsDialog::setupViewsTab()
// topLayout->addLayout(dayBeginsLayout,0,0);
-// KPrefsWidTime *dayBegins =
+// KPrefsDialogWidTime *dayBegins =
// addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
// topFrame);
@@ -582,5 +582,5 @@ void KOPrefsDialog::setupViewsTab()
int ii = 0;
- KPrefsWidBool *dummy =
+ KPrefsDialogWidBool *dummy =
addWidBool(i18n("Edit item on doubleclick (if not, show)"),
&(KOPrefs::instance()->mEditOnDoubleClick),topFrame);
@@ -597,10 +597,10 @@ void KOPrefsDialog::setupViewsTab()
topLayout->addWidget(dummy->checkBox(),ii++,0);
- KPrefsWidBool *dailyRecur =
+ KPrefsDialogWidBool *dailyRecur =
addWidBool(i18n("Show events that recur daily in date nav."),
&(KOPrefs::instance()->mDailyRecur),topFrame);
topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
- KPrefsWidBool *weeklyRecur =
+ KPrefsDialogWidBool *weeklyRecur =
addWidBool(i18n("Show ev. that recur weekly in date nav."),
&(KOPrefs::instance()->mWeeklyRecur),topFrame);
@@ -608,5 +608,5 @@ void KOPrefsDialog::setupViewsTab()
if ( QApplication::desktop()->width() > 640 ) {
- KPrefsWidBool *enableToolTips =
+ KPrefsDialogWidBool *enableToolTips =
addWidBool(i18n("Enable tooltips displaying summary of ev."),
&(KOPrefs::instance()->mEnableToolTips),topFrame);
@@ -614,5 +614,5 @@ void KOPrefsDialog::setupViewsTab()
}
- KPrefsWidBool *passwdk =
+ KPrefsDialogWidBool *passwdk =
addWidBool(i18n("Show parent To-Do's in What's Next view"),
&(KOPrefs::instance()->mWNViewShowsParents),topFrame);
@@ -630,5 +630,5 @@ void KOPrefsDialog::setupViewsTab()
- KPrefsWidBool *marcusBainsEnabled =
+ KPrefsDialogWidBool *marcusBainsEnabled =
addWidBool(i18n("Show Marcus Bains line"),
&(KOPrefs::instance()->mMarcusBainsEnabled),topFrame);
@@ -665,10 +665,10 @@ void KOPrefsDialog::setupViewsTab()
- KPrefsWidBool *fullViewTodo =
+ KPrefsDialogWidBool *fullViewTodo =
addWidBool(i18n("Event list view uses full window"),
&(KOPrefs::instance()->mFullViewTodo),topFrame);
topLayout->addWidget(fullViewTodo->checkBox(),ii++,0);
- KPrefsWidBool *fullViewMonth =
+ KPrefsDialogWidBool *fullViewMonth =
addWidBool(i18n("Next days view uses full window"),
&(KOPrefs::instance()->mFullViewMonth),topFrame);
@@ -747,5 +747,5 @@ void KOPrefsDialog::setupViewsTab()
ii++;
#ifdef DESKTOP_VERSION
- KPrefsWidBool *enableMonthScroll =
+ KPrefsDialogWidBool *enableMonthScroll =
addWidBool(i18n("Enable scrollbars in month view cells"),
&(KOPrefs::instance()->mEnableMonthScroll),topFrame);
@@ -758,5 +758,5 @@ void KOPrefsDialog::setupViewsTab()
topLayout->addWidget(dummy->checkBox(),ii++,0);
- KPrefsWidBool *coloredCategoriesInMonthView =
+ KPrefsDialogWidBool *coloredCategoriesInMonthView =
addWidBool(i18n("Month view uses category colors"),
&(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame);
@@ -772,5 +772,5 @@ void KOPrefsDialog::setupViewsTab()
topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
- KPrefsWidColor *holidayColor =
+ KPrefsDialogWidColor *holidayColor =
addWidColor(i18n("Day color odd months"),
&(KOPrefs::instance()->mMonthViewOddColor),topFrame);
@@ -801,5 +801,5 @@ void KOPrefsDialog::setupViewsTab()
ii = 0;
- KPrefsWidBool *showCompletedTodo =
+ KPrefsDialogWidBool *showCompletedTodo =
addWidBool(i18n("To-do view shows completed Todos"),
&(KOPrefs::instance()->mShowCompletedTodo),topFrame);
@@ -825,5 +825,5 @@ void KOPrefsDialog::setupViewsTab()
QWidget* wid = new QWidget( topFrame );
// Todo due today color
- KPrefsWidColor *todoDueTodayColor =
+ KPrefsDialogWidColor *todoDueTodayColor =
addWidColor(i18n("Todo due today color:"),
&(KOPrefs::instance()->mTodoDueTodayColor),wid);
@@ -837,5 +837,5 @@ void KOPrefsDialog::setupViewsTab()
wid = new QWidget( topFrame );
widLayout = new QHBoxLayout(wid);
- KPrefsWidColor *todoOverdueColor =
+ KPrefsDialogWidColor *todoOverdueColor =
addWidColor(i18n("Todo overdue color:"),
&(KOPrefs::instance()->mTodoOverdueColor),wid);
@@ -951,7 +951,7 @@ void KOPrefsDialog::setupFontsTab()
topLayout->setSpacing(1);
topLayout->setMargin(3);
- KPrefsWidFont * tVFont;
+ KPrefsDialogWidFont * tVFont;
int i = 0;
- KPrefsWidFont *timeLabelsFont =
+ KPrefsDialogWidFont *timeLabelsFont =
addWidFont(i18n("23"),i18n("DateNavigator:(nr)"),
&(KOPrefs::instance()->mDateNavigatorFont),topFrame);
@@ -970,5 +970,5 @@ void KOPrefsDialog::setupFontsTab()
++i;
- KPrefsWidFont *timeBarFont =
+ KPrefsDialogWidFont *timeBarFont =
addWidFont(KGlobal::locale()->formatTime(QTime(12,34)),i18n("Time bar:"),
&(KOPrefs::instance()->mTimeBarFont),topFrame);
@@ -979,5 +979,5 @@ void KOPrefsDialog::setupFontsTab()
- KPrefsWidFont *marcusBainsFont =
+ KPrefsDialogWidFont *marcusBainsFont =
addWidFont(KGlobal::locale()->formatTime(QTime(12,34,23)),i18n("M. Bains line:"),
&(KOPrefs::instance()->mMarcusBainsFont),topFrame);
@@ -1026,5 +1026,5 @@ void KOPrefsDialog::setupFontsTab()
topLayout->addWidget(tVFont->button(),i,2);
++i;
- KPrefsWidFont *agendaViewFont =
+ KPrefsDialogWidFont *agendaViewFont =
addWidFont(i18n("Event text"),i18n("Agenda view:"),
&(KOPrefs::instance()->mAgendaViewFont),topFrame);
@@ -1035,5 +1035,5 @@ void KOPrefsDialog::setupFontsTab()
- KPrefsWidFont *monthViewFont =
+ KPrefsDialogWidFont *monthViewFont =
addWidFont(KGlobal::locale()->formatTime(QTime(12,34)) + " " + i18n("Event"),
i18n("Month view:"),&(KOPrefs::instance()->mMonthViewFont),topFrame);
@@ -1044,5 +1044,5 @@ void KOPrefsDialog::setupFontsTab()
- KPrefsWidFont *lVFont =
+ KPrefsDialogWidFont *lVFont =
addWidFont(i18n("Event"),i18n("List View:"),
&(KOPrefs::instance()->mListViewFont),topFrame);
@@ -1111,5 +1111,5 @@ void KOPrefsDialog::setupColorsTab()
// Holiday Color
- KPrefsWidColor *holidayColor =
+ KPrefsDialogWidColor *holidayColor =
addWidColor(i18n("Holiday color:"),
&(KOPrefs::instance()->mHolidayColor),topFrame);
@@ -1118,5 +1118,5 @@ void KOPrefsDialog::setupColorsTab()
// Highlight Color
- KPrefsWidColor *highlightColor =
+ KPrefsDialogWidColor *highlightColor =
addWidColor(i18n("Highlight color:"),
&(KOPrefs::instance()->mHighlightColor),topFrame);
@@ -1125,5 +1125,5 @@ void KOPrefsDialog::setupColorsTab()
// Event color
- KPrefsWidColor *eventColor =
+ KPrefsDialogWidColor *eventColor =
addWidColor(i18n("Default event color:"),
&(KOPrefs::instance()->mEventColor),topFrame);
@@ -1132,5 +1132,5 @@ void KOPrefsDialog::setupColorsTab()
// agenda view background color
- KPrefsWidColor *agendaBgColor =
+ KPrefsDialogWidColor *agendaBgColor =
addWidColor(i18n("Agenda view background color:"),
&(KOPrefs::instance()->mAgendaBgColor),topFrame);
@@ -1139,5 +1139,5 @@ void KOPrefsDialog::setupColorsTab()
// working hours color
- KPrefsWidColor *workingHoursColor =
+ KPrefsDialogWidColor *workingHoursColor =
addWidColor(i18n("Working hours color:"),
&(KOPrefs::instance()->mWorkingHoursColor),topFrame);
@@ -1145,5 +1145,5 @@ void KOPrefsDialog::setupColorsTab()
topLayout->addWidget(workingHoursColor->button(),ii++,1);
- KPrefsWidBool *sb =
+ KPrefsDialogWidBool *sb =
addWidBool(i18n("Use colors for application:"),
&(KOPrefs::instance()->mUseAppColors),topFrame);
@@ -1151,5 +1151,5 @@ void KOPrefsDialog::setupColorsTab()
ii++;
- KPrefsWidColor * workingHoursColor1 =
+ KPrefsDialogWidColor * workingHoursColor1 =
addWidColor(i18n("Buttons, menus, etc.:"),
&(KOPrefs::instance()->mAppColor1),topFrame);
@@ -1157,5 +1157,5 @@ void KOPrefsDialog::setupColorsTab()
topLayout->addWidget(workingHoursColor1->button(),ii++,1);
- KPrefsWidColor * workingHoursColor2 =
+ KPrefsDialogWidColor * workingHoursColor2 =
addWidColor(i18n("Frames, labels, etc.:"),
&(KOPrefs::instance()->mAppColor2),topFrame);
@@ -1207,5 +1207,5 @@ void KOPrefsDialog::setupGroupSchedulingTab()
#if 0
- KPrefsWidRadios *schedulerGroup =
+ KPrefsDialogWidRadios *schedulerGroup =
addWidRadios(i18n("Scheduler Mail Client"),&(KOPrefs::instance()->mIMIPScheduler),
topFrame);
@@ -1216,5 +1216,5 @@ void KOPrefsDialog::setupGroupSchedulingTab()
#endif
- KPrefsWidRadios *sendGroup =
+ KPrefsDialogWidRadios *sendGroup =
addWidRadios(i18n("Scheduler Mails Should Be"),&(KOPrefs::instance()->mIMIPSend),
topFrame);
@@ -1257,5 +1257,5 @@ void KOPrefsDialog::setupGroupAutomationTab()
topLayout->setMargin(marginHint());
- KPrefsWidRadios *autoRefreshGroup =
+ KPrefsDialogWidRadios *autoRefreshGroup =
addWidRadios(i18n("Auto Send Refresh"),
&(KOPrefs::instance()->mIMIPAutoRefresh),topFrame);
@@ -1265,5 +1265,5 @@ void KOPrefsDialog::setupGroupAutomationTab()
topLayout->addMultiCellWidget(autoRefreshGroup->groupBox(),0,0,0,0);
- KPrefsWidRadios *autoInsertGroup =
+ KPrefsDialogWidRadios *autoInsertGroup =
addWidRadios(i18n("Auto Insert IMIP Replies"),
&(KOPrefs::instance()->mIMIPAutoInsertReply),topFrame);
@@ -1273,5 +1273,5 @@ void KOPrefsDialog::setupGroupAutomationTab()
topLayout->addMultiCellWidget(autoInsertGroup->groupBox(),1,1,0,0);
- KPrefsWidRadios *autoRequestGroup =
+ KPrefsDialogWidRadios *autoRequestGroup =
addWidRadios(i18n("Auto Insert IMIP Requests"),
&(KOPrefs::instance()->mIMIPAutoInsertRequest),topFrame);
@@ -1281,5 +1281,5 @@ void KOPrefsDialog::setupGroupAutomationTab()
topLayout->addMultiCellWidget(autoRequestGroup->groupBox(),2,2,0,0);
- KPrefsWidRadios *autoFreeBusyGroup =
+ KPrefsDialogWidRadios *autoFreeBusyGroup =
addWidRadios(i18n("Auto Send FreeBusy Information"),
&(KOPrefs::instance()->mIMIPAutoFreeBusy),topFrame);
@@ -1289,5 +1289,5 @@ void KOPrefsDialog::setupGroupAutomationTab()
topLayout->addMultiCellWidget(autoFreeBusyGroup->groupBox(),3,3,0,0);
- KPrefsWidRadios *autoFreeBusyReplyGroup =
+ KPrefsDialogWidRadios *autoFreeBusyReplyGroup =
addWidRadios(i18n("Auto Save FreeBusy Replies"),
&(KOPrefs::instance()->mIMIPAutoFreeBusyReply),topFrame);
@@ -1579,5 +1579,5 @@ void KOPrefsDialog::setupTimeZoneTab()
mTimeZoneCombo->setCurrentItem(nCurrentlySet);
int iii = 1;
- KPrefsWidBool *sb =
+ KPrefsDialogWidBool *sb =
addWidBool(i18n("Timezone has daylight saving"),
&(KOPrefs::instance()->mUseDaylightsaving),topFrame);
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index fd651d0..83dc1eb 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -100,6 +100,6 @@ class KOPrefsDialog : public KPrefsDialog
private:
- KPrefsWidBool *mEnableGroupScheduling;
- KPrefsWidBool *mEnableProjectView;
+ KPrefsDialogWidBool *mEnableGroupScheduling;
+ KPrefsDialogWidBool *mEnableProjectView;
QFrame *mPrinterTab;