Provide volume setting for Calendar reminder alert

data/org.ayatana.indicator.datetime.gschema.xml.in

@@ -138,6 +138,14 @@
               If a calendar or reminder event doesn't specify its own sound file, this file will be used as the fallback sound.
             </description>
         </key>
+        <key name="calendar-default-volume" type="u">
+            <range min="1" max="100"/>
+            <default>50</default>
+            <summary>The calendar's reminder alert default volume level.</summary>
+            <description>
+              The volume at which calendar reminder alert will be played.
+            </description>
+        </key>
         <key name="alarm-default-sound" type="s">
             <default>'@ALARM_DEFAULT_SOUND@'</default>
             <summary>The alarm's default sound file.</summary>

include/datetime/settings-live.h

@@ -60,6 +60,7 @@ class LiveSettings: public Settings
     void update_time_format_mode();
     void update_timezone_name();
     void update_calendar_sound();
+    void update_calendar_volume();
     void update_alarm_sound();
     void update_alarm_volume();
     void update_alarm_duration();

include/datetime/settings-shared.h

@@ -46,6 +46,7 @@ TimeFormatMode;
 #define SETTINGS_LOCATIONS_S            "locations"
 #define SETTINGS_TIMEZONE_NAME_S        "timezone-name"
 #define SETTINGS_CALENDAR_SOUND_S       "calendar-default-sound"
+#define SETTINGS_CALENDAR_VOLUME_S      "calendar-default-volume"
 #define SETTINGS_ALARM_SOUND_S          "alarm-default-sound"
 #define SETTINGS_ALARM_VOLUME_S         "alarm-default-volume"
 #define SETTINGS_ALARM_DURATION_S       "alarm-duration-minutes"

include/datetime/settings.h

@@ -57,6 +57,7 @@ class Settings
     core::Property<TimeFormatMode> time_format_mode;
     core::Property<std::string> timezone_name;
     core::Property<std::string> calendar_sound;
+    core::Property<unsigned int> calendar_volume;
     core::Property<std::string> alarm_sound;
     core::Property<std::string> alarm_haptic;
     core::Property<unsigned int> alarm_volume;

src/settings-live.cpp

@@ -55,6 +55,7 @@ LiveSettings::LiveSettings():
     update_time_format_mode();
     update_timezone_name();
     update_calendar_sound();
+    update_calendar_volume();
     update_alarm_sound();
     update_alarm_volume();
     update_alarm_duration();
@@ -150,6 +151,10 @@ LiveSettings::LiveSettings():
         g_settings_set_string(m_settings, SETTINGS_CALENDAR_SOUND_S, value.c_str());
     });
 
+    calendar_volume.changed().connect([this](unsigned int value){
+        g_settings_set_uint(m_settings, SETTINGS_CALENDAR_VOLUME_S, value);
+    });
+
     alarm_sound.changed().connect([this](const std::string& value){
         g_settings_set_string(m_settings, SETTINGS_ALARM_SOUND_S, value.c_str());
     });
@@ -291,6 +296,11 @@ void LiveSettings::update_calendar_sound()
     g_free(val);
 }
 
+void LiveSettings::update_calendar_volume()
+{
+    calendar_volume.set(g_settings_get_uint(m_settings, SETTINGS_CALENDAR_VOLUME_S));
+}
+
 void LiveSettings::update_alarm_sound()
 {
     auto val = g_settings_get_string(m_settings, SETTINGS_ALARM_SOUND_S);
@@ -436,6 +446,8 @@ void LiveSettings::update_key_ccid(const std::string& key)
         update_timezone_name();
     else if (key == SETTINGS_CALENDAR_SOUND_S)
         update_calendar_sound();
+    else if (key == SETTINGS_CALENDAR_VOLUME_S)
+        update_calendar_volume();
     else if (key == SETTINGS_ALARM_SOUND_S)
         update_alarm_sound();
     else if (key == SETTINGS_ALARM_VOLUME_S)

src/snap.cpp

@@ -121,7 +121,7 @@ class Snap::Impl
             // create the sound.
             const auto role = appointment.is_alarm() ? "alarm" : "alert";
             const auto uri = get_alarm_uri(appointment, alarm, m_settings);
-            const auto volume = m_settings->alarm_volume.get();
+            const auto volume = appointment.is_alarm() ? m_settings->alarm_volume.get() : m_settings->calendar_volume.get();
             const bool loop = interactive;
             sound = m_sound_builder->create(role, uri, volume, loop);
         }

tests/test-settings.cpp

@@ -180,6 +180,7 @@ TEST_F(SettingsFixture, StringProperties)
     TestStringProperty(m_gsettings, m_settings->timezone_name, SETTINGS_TIMEZONE_NAME_S);
     TestStringProperty(m_gsettings, m_settings->alarm_sound, SETTINGS_ALARM_SOUND_S);
     TestStringProperty(m_gsettings, m_settings->calendar_sound, SETTINGS_CALENDAR_SOUND_S);
+    TestStringProperty(m_gsettings, m_settings->calendar_volume, SETTINGS_CALENDAR_VOLUME_S);
     TestStringProperty(m_gsettings, m_settings->alarm_haptic, SETTINGS_ALARM_HAPTIC_S);
 }