Git commit e39eeff2d37038f01206ed9000a04959b8e47809 by Allen Winter. Committed on 20/07/2026 at 14:44. Pushed by winterz into branch 'master'.
Re-arrange the "color busy days ..." configuration checkbox Move the configuration options for "Color busy days with a different background color" to the Display options, and not the color options. M +17 -14 doc/index.docbook M +2 -4 src/prefs/koprefsdialogviews.cpp M +12 -10 src/settings/korganizer.kcfg https://invent.kde.org/pim/korganizer/-/commit/e39eeff2d37038f01206ed9000a04959b8e47809 diff --git a/doc/index.docbook b/doc/index.docbook index ddda69c77..6f0498a2a 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -2258,6 +2258,14 @@ in Agenda view items</para></listitem> <listitem><para>Check this box to display the incidence locations in agenda view items.</para></listitem> </varlistentry> +<varlistentry> + <term><guilabel>Color busy days with a different background color</guilabel></term> + <listitem><para>Check this box if you want Agenda view's background to be filled with a + different color on days which have at least one all day event marked as busy.</para> + <para>Please look in the Colors configuration area to select the Agenda view background + busy color of your choosing.</para></listitem> +</varlistentry> + <varlistentry> <term><guilabel>Show to-dos</guilabel></term> <listitem><para>This check box toggles the display of to-dos in the Day, Week @@ -2310,14 +2318,6 @@ configuration page for setting these colors.</para> </listitem> </varlistentry> -<varlistentry> -<term><guilabel>Color busy days with a different background color</guilabel></term> -<listitem><para>Check this box if you want Agenda view's background to be filled with a -different color on days which have at least one all day event marked as busy.</para> -<para>Please look in the Colors configuration area to select the Agenda view background -busy color of your choosing.</para></listitem> -</varlistentry> - <varlistentry> <term><guilabel>Multiple Calendar Display</guilabel></term> <listitem><para> @@ -2342,19 +2342,22 @@ from the context menu. <term><guilabel>Display Options</guilabel></term> <listitem> <para>The first two check boxes allow displaying the start-time only, or both the start-time and end-time.</para> + <para>Set the option <guilabel>Color busy days with a different background color</guilabel> if you want Month view's background to be filled with a different color on days which have at least one all day event marked as busy.</para> <para>Use the next four check boxes to optionally display icons, to-dos, journals or holidays in the month view.</para> </listitem> </varlistentry> -<!--FIXME Icons to use dropdown box missing--> <varlistentry> -<term><guilabel>Color busy days with a different background color</guilabel></term> -<listitem><para>Check this box if you want Month view's background to be filled with a -different color on days which have at least one all day event marked as busy.</para> -<para>Please look in the Colors configuration area to select the Agenda/Month view background -busy color of your choosing.</para></listitem> + <term><guilabel>Color busy days with a different background color</guilabel></term> + <listitem><para>Check this box if you want Month view's background to be filled with a + different color on days which have at least one all day event marked as busy.</para> + <para>Please look in the Colors configuration area to select the Agenda/Month view background + busy color of your choosing.</para></listitem> </varlistentry> +<!--FIXME Icons to use dropdown box missing--> + + <varlistentry> <term><guilabel>Color Usage</guilabel></term> <listitem> diff --git a/src/prefs/koprefsdialogviews.cpp b/src/prefs/koprefsdialogviews.cpp index c873d7e90..890c34cd5 100644 --- a/src/prefs/koprefsdialogviews.cpp +++ b/src/prefs/koprefsdialogviews.cpp @@ -101,6 +101,7 @@ KOPrefsDialogViews::KOPrefsDialogViews(QObject *parent, const KPluginMetaData &d adisplayLayout->addWidget(addWidBool(KOPrefs::instance()->enableAgendaBoldEvenHoursItem())->checkBox()); adisplayLayout->addWidget(addWidBool(KOPrefs::instance()->enableAgendaItemDescItem())->checkBox()); adisplayLayout->addWidget(addWidBool(KOPrefs::instance()->enableAgendaItemLocationItem())->checkBox()); + adisplayLayout->addWidget(addWidBool(KOPrefs::instance()->colorBusyDaysEnabledItem())->checkBox()); adisplayLayout->addWidget(addWidBool(KOPrefs::instance()->showTodosAgendaViewItem())->checkBox()); Korganizer::KPrefsWidBool *marcusBainsEnabled = addWidBool(KOPrefs::instance()->marcusBainsEnabledItem()); adisplayLayout->addWidget(marcusBainsEnabled->checkBox()); @@ -117,8 +118,6 @@ KOPrefsDialogViews::KOPrefsDialogViews(QObject *parent, const KPluginMetaData &d // GroupBox: Views->Agenda View->Color Usage agendaLayout->addWidget(addWidRadios(KOPrefs::instance()->agendaViewColorsItem())->groupBox()); - agendaLayout->addWidget(addWidBool(KOPrefs::instance()->colorBusyDaysEnabledItem())->checkBox()); - // GroupBox: Views->Agenda View->Multiple Calendars agendaLayout->addWidget(addWidRadios(KOPrefs::instance()->agendaViewCalendarDisplayItem())->groupBox()); @@ -138,6 +137,7 @@ KOPrefsDialogViews::KOPrefsDialogViews(QObject *parent, const KPluginMetaData &d mdisplayLayout->addWidget(addWidBool(KOPrefs::instance()->showTimeInMonthViewItem())->checkBox()); mdisplayLayout->addWidget(addWidBool(KOPrefs::instance()->showEndTimeInMonthViewItem())->checkBox()); mdisplayLayout->addWidget(addWidBool(KOPrefs::instance()->enableMonthItemIconsItem())->checkBox()); + mdisplayLayout->addWidget(addWidBool(KOPrefs::instance()->colorMonthBusyDaysEnabledItem())->checkBox()); mdisplayLayout->addWidget(addWidBool(KOPrefs::instance()->showTodosMonthViewItem())->checkBox()); mdisplayLayout->addWidget(addWidBool(KOPrefs::instance()->showJournalsMonthViewItem())->checkBox()); mdisplayLayout->addWidget(addWidBool(KOPrefs::instance()->showHolidaysMonthViewItem())->checkBox()); @@ -149,8 +149,6 @@ KOPrefsDialogViews::KOPrefsDialogViews(QObject *parent, const KPluginMetaData &d monthLayout->addWidget(mdisplayBox); - monthLayout->addWidget(addWidBool(KOPrefs::instance()->colorMonthBusyDaysEnabledItem())->checkBox()); - // GroupBox: Views->Month View->Color Usage monthLayout->addWidget(addWidRadios(KOPrefs::instance()->monthViewColorsItem())->groupBox()); monthLayout->addStretch(1); diff --git a/src/settings/korganizer.kcfg b/src/settings/korganizer.kcfg index 5c9cd0294..eaed7d5c8 100644 --- a/src/settings/korganizer.kcfg +++ b/src/settings/korganizer.kcfg @@ -49,11 +49,6 @@ <whatsthis>Enter the ending time for your daily schedule here. Your daily schedule hours will be marked with a separate color.</whatsthis> <default>QDateTime(QDate(1752,1,1), QTime(17,0))</default> </entry> - <entry type="Bool" key="ColorMonthBusyDaysEnabled" name="ColorMonthBusyDaysEnabled"> - <label>Color busy days with a different background color</label> - <whatsthis>Check this box if you want month view's background to be filled with a different color on days which have at least one all day event marked as busy. Also, you can change the background color used for this option on the Colors configuration page. Look for the "Busy days background color" setting.</whatsthis> - <default>false</default> - </entry> </group> <!-- Views Page: General Tab --> <group name="General View"> @@ -138,6 +133,12 @@ <tooltip>Display incidence locations agenda view items</tooltip> <default>false</default> </entry> + <entry type="Bool" key="ColorBusyDaysEnabled" name="ColorBusyDaysEnabled"> + <label>Color busy days with a different background color</label> + <tooltip>Use the busy days background color setting for busy days</tooltip> + <whatsthis>Check this box if you want agenda's background to be filled with a different color on days which have at least one all day event marked as busy. Also, you can change the background color used for this option on the Colors configuration page. Look for the "Busy days background color" setting.</whatsthis> + <default>false</default> + </entry> <entry type="Bool" name="ShowTodosAgendaView"> <label>Show to-dos</label> <whatsthis>Check this box to display to-dos in the agenda view.</whatsthis> @@ -188,11 +189,6 @@ </choices> <default>CategoryInsideResourceOutside</default> </entry> - <entry type="Bool" key="ColorBusyDaysEnabled" name="ColorBusyDaysEnabled"> - <label>Color busy days with a different background color</label> - <whatsthis>Check this box if you want agenda's background to be filled with a different color on days which have at least one all day event marked as busy. Also, you can change the background color used for this option on the Colors configuration page. Look for the "Busy days background color" setting.</whatsthis> - <default>false</default> - </entry> <entry type="Enum" name="AgendaViewCalendarDisplay"> <label>Multiple Calendar Display</label> <choices> @@ -235,6 +231,12 @@ <tooltip>Display the start and end times in month view items</tooltip> <default>false</default> </entry> + <entry type="Bool" key="ColorMonthBusyDaysEnabled" name="ColorMonthBusyDaysEnabled"> + <label>Color busy days with a different background color</label> + <tooltip>Use the busy days background color setting for busy days</tooltip> + <whatsthis>Check this box if you want month view's background to be filled with a different color on days which have at least one all day event marked as busy. Also, you can change the background color used for this option on the Colors configuration page. Look for the "Busy days background color" setting.</whatsthis> + <default>false</default> + </entry> <entry type="Bool" name="ShowTodosMonthView"> <label>Show to-dos</label> <whatsthis>Check this box to display to-dos in the month view.</whatsthis>
