-rw-r--r-- | korganizer/koprefsdialog.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 1b24f56..580dff2 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -1083,192 +1083,198 @@ void KOPrefsDialog::setupFontsTab() | |||
1083 | 1083 | ||
1084 | KPrefsDialogWidFont *monthViewFont = | 1084 | KPrefsDialogWidFont *monthViewFont = |
1085 | addWidFont(KGlobal::locale()->formatTime(QTime(12,34)) + " " + i18n("Event"), | 1085 | addWidFont(KGlobal::locale()->formatTime(QTime(12,34)) + " " + i18n("Event"), |
1086 | i18n("Month view:"),&(KOPrefs::instance()->mMonthViewFont),topFrame); | 1086 | i18n("Month view:"),&(KOPrefs::instance()->mMonthViewFont),topFrame); |
1087 | topLayout->addWidget(monthViewFont->label(),i,0); | 1087 | topLayout->addWidget(monthViewFont->label(),i,0); |
1088 | topLayout->addWidget(monthViewFont->preview(),i,1); | 1088 | topLayout->addWidget(monthViewFont->preview(),i,1); |
1089 | topLayout->addWidget(monthViewFont->button(),i,2); | 1089 | topLayout->addWidget(monthViewFont->button(),i,2); |
1090 | ++i; | 1090 | ++i; |
1091 | 1091 | ||
1092 | 1092 | ||
1093 | KPrefsDialogWidFont *lVFont = | 1093 | KPrefsDialogWidFont *lVFont = |
1094 | addWidFont(i18n("Event"),i18n("List View:"), | 1094 | addWidFont(i18n("Event"),i18n("List View:"), |
1095 | &(KOPrefs::instance()->mListViewFont),topFrame); | 1095 | &(KOPrefs::instance()->mListViewFont),topFrame); |
1096 | topLayout->addWidget(lVFont->label(),i,0); | 1096 | topLayout->addWidget(lVFont->label(),i,0); |
1097 | topLayout->addWidget(lVFont->preview(),i,1); | 1097 | topLayout->addWidget(lVFont->preview(),i,1); |
1098 | topLayout->addWidget(lVFont->button(),i,2); | 1098 | topLayout->addWidget(lVFont->button(),i,2); |
1099 | ++i; | 1099 | ++i; |
1100 | 1100 | ||
1101 | 1101 | ||
1102 | tVFont = | 1102 | tVFont = |
1103 | addWidFont(i18n("ToDo"),i18n("ToDoView:"), | 1103 | addWidFont(i18n("ToDo"),i18n("ToDoView:"), |
1104 | &(KOPrefs::instance()->mTodoViewFont),topFrame); | 1104 | &(KOPrefs::instance()->mTodoViewFont),topFrame); |
1105 | topLayout->addWidget(tVFont->label(),i,0); | 1105 | topLayout->addWidget(tVFont->label(),i,0); |
1106 | topLayout->addWidget(tVFont->preview(),i,1); | 1106 | topLayout->addWidget(tVFont->preview(),i,1); |
1107 | topLayout->addWidget(tVFont->button(),i,2); | 1107 | topLayout->addWidget(tVFont->button(),i,2); |
1108 | ++i; | 1108 | ++i; |
1109 | 1109 | ||
1110 | 1110 | ||
1111 | tVFont = | 1111 | tVFont = |
1112 | addWidFont(i18n("Today"),i18n("JournalView:"), | 1112 | addWidFont(i18n("Today"),i18n("JournalView:"), |
1113 | &(KOPrefs::instance()->mJornalViewFont),topFrame); | 1113 | &(KOPrefs::instance()->mJornalViewFont),topFrame); |
1114 | topLayout->addWidget(tVFont->label(),i,0); | 1114 | topLayout->addWidget(tVFont->label(),i,0); |
1115 | topLayout->addWidget(tVFont->preview(),i,1); | 1115 | topLayout->addWidget(tVFont->preview(),i,1); |
1116 | topLayout->addWidget(tVFont->button(),i,2); | 1116 | topLayout->addWidget(tVFont->button(),i,2); |
1117 | ++i; | 1117 | ++i; |
1118 | 1118 | ||
1119 | 1119 | ||
1120 | 1120 | ||
1121 | 1121 | ||
1122 | topLayout->setColStretch(1,1); | 1122 | topLayout->setColStretch(1,1); |
1123 | topLayout->setRowStretch(4,1); | 1123 | topLayout->setRowStretch(4,1); |
1124 | 1124 | ||
1125 | 1125 | ||
1126 | 1126 | ||
1127 | 1127 | ||
1128 | } | 1128 | } |
1129 | 1129 | ||
1130 | void KOPrefsDialog::setupColorsTab() | 1130 | void KOPrefsDialog::setupColorsTab() |
1131 | { | 1131 | { |
1132 | QFrame *topFrame = addPage(i18n("Colors"),0,0); | 1132 | QFrame *topFrame = addPage(i18n("Colors"),0,0); |
1133 | // DesktopIcon("colorize",KIcon::SizeMedium)); | 1133 | // DesktopIcon("colorize",KIcon::SizeMedium)); |
1134 | 1134 | ||
1135 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); | 1135 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); |
1136 | // topLayout->setSpacing(spacingHint()); | 1136 | // topLayout->setSpacing(spacingHint()); |
1137 | // topLayout->setMargin(marginHint()); | 1137 | // topLayout->setMargin(marginHint()); |
1138 | 1138 | ||
1139 | topLayout->setSpacing(2); | 1139 | topLayout->setSpacing(2); |
1140 | topLayout->setMargin(3); | 1140 | topLayout->setMargin(3); |
1141 | 1141 | ||
1142 | int ii = 1; | 1142 | int ii = 1; |
1143 | QGroupBox *categoryGroup ; | 1143 | QGroupBox *categoryGroup ; |
1144 | 1144 | ||
1145 | categoryGroup = new QGroupBox(1,Vertical,i18n("Categories"), | 1145 | categoryGroup = new QGroupBox(1,Vertical,i18n("Categories"), |
1146 | topFrame); | 1146 | topFrame); |
1147 | topLayout->addMultiCellWidget(categoryGroup,0,0,0,1); | 1147 | topLayout->addMultiCellWidget(categoryGroup,0,0,0,1); |
1148 | 1148 | ||
1149 | mCategoryCombo = new QComboBox(categoryGroup); | 1149 | mCategoryCombo = new QComboBox(categoryGroup); |
1150 | mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories); | 1150 | mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories); |
1151 | connect(mCategoryCombo,SIGNAL(activated(int)),SLOT(updateCategoryColor())); | 1151 | connect(mCategoryCombo,SIGNAL(activated(int)),SLOT(updateCategoryColor())); |
1152 | 1152 | ||
1153 | mCategoryButton = new KColorButton(categoryGroup); | 1153 | mCategoryButton = new KColorButton(categoryGroup); |
1154 | connect(mCategoryButton,SIGNAL(changed(const QColor &)),SLOT(setCategoryColor())); | 1154 | connect(mCategoryButton,SIGNAL(changed(const QColor &)),SLOT(setCategoryColor())); |
1155 | updateCategoryColor(); | 1155 | updateCategoryColor(); |
1156 | 1156 | ||
1157 | 1157 | ||
1158 | // Holiday Color | 1158 | // Holiday Color |
1159 | 1159 | ||
1160 | KPrefsDialogWidColor *holidayColor = | 1160 | KPrefsDialogWidColor *holidayColor = |
1161 | addWidColor(i18n("Holiday color:"), | 1161 | addWidColor(i18n("Holiday color:"), |
1162 | &(KOPrefs::instance()->mHolidayColor),topFrame); | 1162 | &(KOPrefs::instance()->mHolidayColor),topFrame); |
1163 | topLayout->addWidget(holidayColor->label(),ii,0); | 1163 | topLayout->addWidget(holidayColor->label(),ii,0); |
1164 | topLayout->addWidget(holidayColor->button(),ii++,1); | 1164 | topLayout->addWidget(holidayColor->button(),ii++,1); |
1165 | 1165 | ||
1166 | // Highlight Color | 1166 | // Highlight Color |
1167 | KPrefsDialogWidColor *highlightColor = | 1167 | KPrefsDialogWidColor *highlightColor = |
1168 | addWidColor(i18n("Highlight color:"), | 1168 | addWidColor(i18n("Highlight color:"), |
1169 | &(KOPrefs::instance()->mHighlightColor),topFrame); | 1169 | &(KOPrefs::instance()->mHighlightColor),topFrame); |
1170 | topLayout->addWidget(highlightColor->label(),ii,0); | 1170 | topLayout->addWidget(highlightColor->label(),ii,0); |
1171 | topLayout->addWidget(highlightColor->button(),ii++,1); | 1171 | topLayout->addWidget(highlightColor->button(),ii++,1); |
1172 | 1172 | ||
1173 | // Event color | 1173 | // Event color |
1174 | KPrefsDialogWidColor *eventColor = | 1174 | KPrefsDialogWidColor *eventColor = |
1175 | addWidColor(i18n("Default event color:"), | 1175 | addWidColor(i18n("Default event color:"), |
1176 | &(KOPrefs::instance()->mEventColor),topFrame); | 1176 | &(KOPrefs::instance()->mEventColor),topFrame); |
1177 | topLayout->addWidget(eventColor->label(),ii,0); | 1177 | topLayout->addWidget(eventColor->label(),ii,0); |
1178 | topLayout->addWidget(eventColor->button(),ii++,1); | 1178 | topLayout->addWidget(eventColor->button(),ii++,1); |
1179 | eventColor = | ||
1180 | addWidColor(i18n("Default todo done color:"), | ||
1181 | &(KOPrefs::instance()->mTodoDoneColor),topFrame); | ||
1182 | topLayout->addWidget(eventColor->label(),ii,0); | ||
1183 | topLayout->addWidget(eventColor->button(),ii++,1); | ||
1184 | |||
1179 | 1185 | ||
1180 | // agenda view background color | 1186 | // agenda view background color |
1181 | KPrefsDialogWidColor *agendaBgColor = | 1187 | KPrefsDialogWidColor *agendaBgColor = |
1182 | addWidColor(i18n("Agenda view background color:"), | 1188 | addWidColor(i18n("Agenda view background color:"), |
1183 | &(KOPrefs::instance()->mAgendaBgColor),topFrame); | 1189 | &(KOPrefs::instance()->mAgendaBgColor),topFrame); |
1184 | topLayout->addWidget(agendaBgColor->label(),ii,0); | 1190 | topLayout->addWidget(agendaBgColor->label(),ii,0); |
1185 | topLayout->addWidget(agendaBgColor->button(),ii++,1); | 1191 | topLayout->addWidget(agendaBgColor->button(),ii++,1); |
1186 | 1192 | ||
1187 | // working hours color | 1193 | // working hours color |
1188 | KPrefsDialogWidColor *workingHoursColor = | 1194 | KPrefsDialogWidColor *workingHoursColor = |
1189 | addWidColor(i18n("Working hours color:"), | 1195 | addWidColor(i18n("Working hours color:"), |
1190 | &(KOPrefs::instance()->mWorkingHoursColor),topFrame); | 1196 | &(KOPrefs::instance()->mWorkingHoursColor),topFrame); |
1191 | topLayout->addWidget(workingHoursColor->label(),ii,0); | 1197 | topLayout->addWidget(workingHoursColor->label(),ii,0); |
1192 | topLayout->addWidget(workingHoursColor->button(),ii++,1); | 1198 | topLayout->addWidget(workingHoursColor->button(),ii++,1); |
1193 | 1199 | ||
1194 | KPrefsDialogWidBool *sb = | 1200 | KPrefsDialogWidBool *sb = |
1195 | addWidBool(i18n("Use colors for application:"), | 1201 | addWidBool(i18n("Use colors for application:"), |
1196 | &(KOPrefs::instance()->mUseAppColors),topFrame); | 1202 | &(KOPrefs::instance()->mUseAppColors),topFrame); |
1197 | topLayout->addMultiCellWidget(sb->checkBox(), ii, ii, 0,1 ); | 1203 | topLayout->addMultiCellWidget(sb->checkBox(), ii, ii, 0,1 ); |
1198 | 1204 | ||
1199 | ii++; | 1205 | ii++; |
1200 | KPrefsDialogWidColor * workingHoursColor1 = | 1206 | KPrefsDialogWidColor * workingHoursColor1 = |
1201 | addWidColor(i18n("Buttons, menus, etc.:"), | 1207 | addWidColor(i18n("Buttons, menus, etc.:"), |
1202 | &(KOPrefs::instance()->mAppColor1),topFrame); | 1208 | &(KOPrefs::instance()->mAppColor1),topFrame); |
1203 | topLayout->addWidget(workingHoursColor1->label(),ii,0); | 1209 | topLayout->addWidget(workingHoursColor1->label(),ii,0); |
1204 | topLayout->addWidget(workingHoursColor1->button(),ii++,1); | 1210 | topLayout->addWidget(workingHoursColor1->button(),ii++,1); |
1205 | 1211 | ||
1206 | KPrefsDialogWidColor * workingHoursColor2 = | 1212 | KPrefsDialogWidColor * workingHoursColor2 = |
1207 | addWidColor(i18n("Frames, labels, etc.:"), | 1213 | addWidColor(i18n("Frames, labels, etc.:"), |
1208 | &(KOPrefs::instance()->mAppColor2),topFrame); | 1214 | &(KOPrefs::instance()->mAppColor2),topFrame); |
1209 | topLayout->addWidget(workingHoursColor2->label(),ii,0); | 1215 | topLayout->addWidget(workingHoursColor2->label(),ii,0); |
1210 | topLayout->addWidget(workingHoursColor2->button(),ii++,1); | 1216 | topLayout->addWidget(workingHoursColor2->button(),ii++,1); |
1211 | 1217 | ||
1212 | 1218 | ||
1213 | 1219 | ||
1214 | } | 1220 | } |
1215 | 1221 | ||
1216 | void KOPrefsDialog::setCategoryColor() | 1222 | void KOPrefsDialog::setCategoryColor() |
1217 | { | 1223 | { |
1218 | mCategoryDict.replace(mCategoryCombo->currentText(), new QColor(mCategoryButton->color())); | 1224 | mCategoryDict.replace(mCategoryCombo->currentText(), new QColor(mCategoryButton->color())); |
1219 | } | 1225 | } |
1220 | 1226 | ||
1221 | void KOPrefsDialog::updateCategoryColor() | 1227 | void KOPrefsDialog::updateCategoryColor() |
1222 | { | 1228 | { |
1223 | QString cat = mCategoryCombo->currentText(); | 1229 | QString cat = mCategoryCombo->currentText(); |
1224 | QColor *color = mCategoryDict.find(cat); | 1230 | QColor *color = mCategoryDict.find(cat); |
1225 | if (!color) { | 1231 | if (!color) { |
1226 | color = KOPrefs::instance()->categoryColor(cat); | 1232 | color = KOPrefs::instance()->categoryColor(cat); |
1227 | } | 1233 | } |
1228 | if (color) { | 1234 | if (color) { |
1229 | mCategoryButton->setColor(*color); | 1235 | mCategoryButton->setColor(*color); |
1230 | } | 1236 | } |
1231 | } | 1237 | } |
1232 | 1238 | ||
1233 | void KOPrefsDialog::setupPrinterTab() | 1239 | void KOPrefsDialog::setupPrinterTab() |
1234 | { | 1240 | { |
1235 | mPrinterTab = addPage(i18n("Printing"),0, | 1241 | mPrinterTab = addPage(i18n("Printing"),0, |
1236 | DesktopIcon("fileprint",KIcon::SizeMedium)); | 1242 | DesktopIcon("fileprint",KIcon::SizeMedium)); |
1237 | 1243 | ||
1238 | QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2); | 1244 | QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2); |
1239 | topLayout->setSpacing(spacingHint()); | 1245 | topLayout->setSpacing(spacingHint()); |
1240 | topLayout->setMargin(marginHint()); | 1246 | topLayout->setMargin(marginHint()); |
1241 | 1247 | ||
1242 | topLayout->setRowStretch(4,1); | 1248 | topLayout->setRowStretch(4,1); |
1243 | } | 1249 | } |
1244 | 1250 | ||
1245 | void KOPrefsDialog::setupGroupSchedulingTab() | 1251 | void KOPrefsDialog::setupGroupSchedulingTab() |
1246 | { | 1252 | { |
1247 | #if 0 | 1253 | #if 0 |
1248 | QFrame *topFrame = addPage(i18n("Group Scheduling"),0, | 1254 | QFrame *topFrame = addPage(i18n("Group Scheduling"),0, |
1249 | DesktopIcon("personal",KIcon::SizeMedium)); | 1255 | DesktopIcon("personal",KIcon::SizeMedium)); |
1250 | 1256 | ||
1251 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); | 1257 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); |
1252 | topLayout->setSpacing(spacingHint()); | 1258 | topLayout->setSpacing(spacingHint()); |
1253 | topLayout->setMargin(marginHint()); | 1259 | topLayout->setMargin(marginHint()); |
1254 | 1260 | ||
1255 | #if 0 | 1261 | #if 0 |
1256 | KPrefsDialogWidRadios *schedulerGroup = | 1262 | KPrefsDialogWidRadios *schedulerGroup = |
1257 | addWidRadios(i18n("Scheduler Mail Client"),&(KOPrefs::instance()->mIMIPScheduler), | 1263 | addWidRadios(i18n("Scheduler Mail Client"),&(KOPrefs::instance()->mIMIPScheduler), |
1258 | topFrame); | 1264 | topFrame); |
1259 | schedulerGroup->addRadio("Dummy"); // Only for debugging | 1265 | schedulerGroup->addRadio("Dummy"); // Only for debugging |
1260 | schedulerGroup->addRadio(i18n("Mail client")); | 1266 | schedulerGroup->addRadio(i18n("Mail client")); |
1261 | 1267 | ||
1262 | topLayout->addMultiCellWidget(schedulerGroup->groupBox(),0,0,0,1); | 1268 | topLayout->addMultiCellWidget(schedulerGroup->groupBox(),0,0,0,1); |
1263 | #endif | 1269 | #endif |
1264 | 1270 | ||
1265 | KPrefsDialogWidRadios *sendGroup = | 1271 | KPrefsDialogWidRadios *sendGroup = |
1266 | addWidRadios(i18n("Scheduler Mails Should Be"),&(KOPrefs::instance()->mIMIPSend), | 1272 | addWidRadios(i18n("Scheduler Mails Should Be"),&(KOPrefs::instance()->mIMIPSend), |
1267 | topFrame); | 1273 | topFrame); |
1268 | sendGroup->addRadio(i18n("Send to outbox")); | 1274 | sendGroup->addRadio(i18n("Send to outbox")); |
1269 | sendGroup->addRadio(i18n("Send directly")); | 1275 | sendGroup->addRadio(i18n("Send directly")); |
1270 | 1276 | ||
1271 | topLayout->addMultiCellWidget(sendGroup->groupBox(),1,1,0,1); | 1277 | topLayout->addMultiCellWidget(sendGroup->groupBox(),1,1,0,1); |
1272 | 1278 | ||
1273 | topLayout->addMultiCellWidget(new QLabel(i18n("Additional email addresses:"),topFrame),2,2,0,1); | 1279 | topLayout->addMultiCellWidget(new QLabel(i18n("Additional email addresses:"),topFrame),2,2,0,1); |
1274 | mAMails = new QListView(topFrame); | 1280 | mAMails = new QListView(topFrame); |