Git commit 4820cb669c03a99b939300229af8a3c9f1167c4c by Allen Winter. Committed on 06/05/2026 at 15:44. Pushed by winterz into branch 'master'.
Add default access classification setting when creating new incidences BUG: 474036,55539 M +2 -2 CMakeLists.txt M +8 -0 doc/index.docbook M +13 -0 src/prefs/koprefsdialogmain.cpp M +2 -0 src/whatsnew/whatsnewtranslations.cpp https://invent.kde.org/pim/korganizer/-/commit/4820cb669c03a99b939300229af8a3c9f1167c4c diff --git a/CMakeLists.txt b/CMakeLists.txt index 17ca15358..f6feea9f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,8 +147,8 @@ find_package( set(PIMCOMMON_LIB_VERSION "6.7.40") set(LIBKDEPIM_LIB_VERSION "6.7.40") -set(LIBINCIDENCEEDITOR_LIB_VERSION "6.7.40") -set(CALENDARSUPPORT_LIB_VERSION "6.7.41") +set(LIBINCIDENCEEDITOR_LIB_VERSION "6.7.41") +set(CALENDARSUPPORT_LIB_VERSION "6.7.42") set(EVENTVIEW_LIB_VERSION "6.7.45") # Find KF6 package diff --git a/doc/index.docbook b/doc/index.docbook index 6e19d3a3c..d6558c85b 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -2001,6 +2001,14 @@ the email excluding attachments or only a link to the email.</para> <para>Note that attaching an email without attachments might invalidate its signature. </para></listitem> </varlistentry> + +<varlistentry> +<term><guilabel>Default Access Classification</guilabel></term> +<listitem><para>This option allows you to select the default access classification (Public, Confidential, Private) +to use when creating an event, to-do or journal. Please see RFC 5545 3.8.1.3. Classification to learn about +the iCalendar access classification property.</para> +</listitem> +</varlistentry> </variablelist> </sect3> diff --git a/src/prefs/koprefsdialogmain.cpp b/src/prefs/koprefsdialogmain.cpp index d74ed6cd6..f0a910e05 100644 --- a/src/prefs/koprefsdialogmain.cpp +++ b/src/prefs/koprefsdialogmain.cpp @@ -22,6 +22,7 @@ #include <IncidenceEditor/IncidenceEditorSettings> #include <akonadi/calendarsettings.h> +#include <KComboBox> #include <KLocalizedString> #include <QCheckBox> #include <QLabel> @@ -60,11 +61,22 @@ KOPrefsDialogMain::KOPrefsDialogMain(QObject *parent, const KPluginMetaData &dat addWidRadios(IncidenceEditorNG::IncidenceEditorSettings::self()->defaultEmailAttachMethodItem(), personalFrame); personalLayout->addWidget(defaultEmailAttachMethod->groupBox()); + auto defaultsGroup = new QGroupBox(i18nc("@title:group", "Default Access Classification"), personalFrame); + auto defaultsLayout = new QFormLayout(defaultsGroup); + Korganizer::KPrefsWidCombo *eventDefaultSecrecy = addWidCombo(CalendarSupport::KCalPrefs::instance()->eventSecrecyPolicyItem(), defaultsGroup); + defaultsLayout->addRow(eventDefaultSecrecy->label(), eventDefaultSecrecy->comboBox()); + Korganizer::KPrefsWidCombo *todoDefaultSecrecy = addWidCombo(CalendarSupport::KCalPrefs::instance()->todoSecrecyPolicyItem(), defaultsGroup); + defaultsLayout->addRow(todoDefaultSecrecy->label(), todoDefaultSecrecy->comboBox()); + Korganizer::KPrefsWidCombo *journalDefaultSecrecy = addWidCombo(CalendarSupport::KCalPrefs::instance()->journalSecrecyPolicyItem(), defaultsGroup); + defaultsLayout->addRow(journalDefaultSecrecy->label(), journalDefaultSecrecy->comboBox()); + personalLayout->addWidget(defaultsGroup); + auto remindersGroup = new QGroupBox(i18nc("@title:group", "Reminders"), personalFrame); auto remindersLayout = new QFormLayout(remindersGroup); Korganizer::KPrefsWidBool *onlyMyReminders = addWidBool(Akonadi::CalendarSettings::self()->onlyShowRemindersForMyEventsItem(), remindersGroup); remindersLayout->addWidget(onlyMyReminders->checkBox()); personalLayout->addWidget(remindersGroup); + personalLayout->addStretch(1); // Save Settings @@ -115,6 +127,7 @@ void KOPrefsDialogMain::usrWriteConfig() #if HAVE_ACTIVITY_SUPPORT KOPrefs::instance()->setEnabledActivities(mActivities->isChecked()); #endif + CalendarSupport::KCalPrefs::instance()->save(); setNeedsSave(false); } diff --git a/src/whatsnew/whatsnewtranslations.cpp b/src/whatsnew/whatsnewtranslations.cpp index 4b211b87a..1343cdb65 100644 --- a/src/whatsnew/whatsnewtranslations.cpp +++ b/src/whatsnew/whatsnewtranslations.cpp @@ -30,6 +30,8 @@ QList<KLazyLocalizedString> WhatsNewTranslations::lastNewFeatures() const kli18n("Agenda view: underline today's column header date"), kli18n("Agenda view: optionally show the incidence locations inside the agenda items. To enable this behavior, check the \"Show incidence " "locations in agenda view items\" option in the View->Agenda View tab"), + kli18n("Options for setting default access classifications (Public, Confidential or Private) when creating new Events, To-dos and " + "Journals have been added. Select your preferences in the \"General->Personal Default Access Classification\" comboboxes."), }; return info;
