From 28ddb97415d894ee01d358d39289c8bd7528a9f2 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Thu, 3 Sep 2020 00:26:40 +0200 Subject: Whitespace fix --- ...rg.ayatana.indicator.datetime.gschema.xml.in.in | 338 ++++++++++----------- 1 file changed, 169 insertions(+), 169 deletions(-) diff --git a/data/org.ayatana.indicator.datetime.gschema.xml.in.in b/data/org.ayatana.indicator.datetime.gschema.xml.in.in index 2d82785..353ec3e 100644 --- a/data/org.ayatana.indicator.datetime.gschema.xml.in.in +++ b/data/org.ayatana.indicator.datetime.gschema.xml.in.in @@ -1,173 +1,173 @@ - - - - - - - - - true - Show the clock in the panel - - Controls whether the clock indicator appears in the panel or not. - - - - 'locale-default' - What the time format should be? - - Controls the time format that is displayed in the indicator. For almost - all users this should be the default for their locale. If you think the - setting is wrong for your locale please join or talk to the translation - team for your language. If you just want something different you can - adjust this to be either 12 or 24 time. Or, you can use a custom format - string and set the custom-time-format setting. - - - - "%l:%M %p" - The format string passed to strftime - - The format of the time and/or date that is visible on the panel when using - the indicator. For most users this will be a set of predefined values as - determined by the configuration utility, but advanced users can change it - to anything strftime can accept. Look at the man page on strftime for - more information. - - - - false - Show the number of seconds in the indicator - - Makes the datetime indicator show the number of seconds in the indicator. - It's important to note that this will cause additional battery drain as - the time will update 60 times as often, so it is not recommended. Also, - this setting will be ignored if the time-format value is set to custom. - - - - false - Show the day of the week in the indicator - - Puts the day of the week on the panel along with the time and/or date - depending on settings. This setting will be ignored if the time-format - value is set to custom. - - - - false - Show the month and date in the indicator - - Puts the month and the date in the panel along with the time and/or day - of the week depending on settings. This setting will be ignored if the - time-format value is set to custom. - - - - false - Show the year in the indicator - - Puts the year in the panel along with the month and the date. - This setting will be ignored if either the time-format value is set to custom - or if show-date is set to false. - - - - true - Show the monthly calendar in the indicator - - Puts the monthly calendar in indicator-datetime's menu. - - - - false - Show week numbers in calendar - - Shows the week numbers in the monthly calendar in indicator-datetime's menu. - - - - true - Show events in the indicator - - Shows events from Evolution in indicator-datetime's menu. - - - - false - Show the auto-detected location in the indicator - - Shows your current location (determined from geoclue and /etc/timezone) in indicator-datetime's menu. - - - - false - Show locations in the indicator - - Shows custom defined locations in indicator-datetime's menu. - - - - ['UTC'] - A List of locations - - Adds the list of locations the user has configured to display in the - indicator-datetime menu. - - - - '' - The name of the current timezone - - Some timezones can be known by many different cities or names. This setting describes how the current zone prefers to be named. Format is "TIMEZONE NAME" (e.g. "America/New_York Boston" to name the New_York zone Boston). - - - - 'pulse' - What kind of haptic feedback, if any, to trigger with an alarm. - + + + + + + + + + true + Show the clock in the panel + + Controls whether the clock indicator appears in the panel or not. + + + + 'locale-default' + What the time format should be? + + Controls the time format that is displayed in the indicator. For almost + all users this should be the default for their locale. If you think the + setting is wrong for your locale please join or talk to the translation + team for your language. If you just want something different you can + adjust this to be either 12 or 24 time. Or, you can use a custom format + string and set the custom-time-format setting. + + + + "%l:%M %p" + The format string passed to strftime + + The format of the time and/or date that is visible on the panel when using + the indicator. For most users this will be a set of predefined values as + determined by the configuration utility, but advanced users can change it + to anything strftime can accept. Look at the man page on strftime for + more information. + + + + false + Show the number of seconds in the indicator + + Makes the datetime indicator show the number of seconds in the indicator. + It's important to note that this will cause additional battery drain as + the time will update 60 times as often, so it is not recommended. Also, + this setting will be ignored if the time-format value is set to custom. + + + + false + Show the day of the week in the indicator + + Puts the day of the week on the panel along with the time and/or date + depending on settings. This setting will be ignored if the time-format + value is set to custom. + + + + false + Show the month and date in the indicator + + Puts the month and the date in the panel along with the time and/or day + of the week depending on settings. This setting will be ignored if the + time-format value is set to custom. + + + + false + Show the year in the indicator + + Puts the year in the panel along with the month and the date. + This setting will be ignored if either the time-format value is set to custom + or if show-date is set to false. + + + + true + Show the monthly calendar in the indicator + + Puts the monthly calendar in indicator-datetime's menu. + + + + false + Show week numbers in calendar + + Shows the week numbers in the monthly calendar in indicator-datetime's menu. + + + + true + Show events in the indicator + + Shows events from Evolution in indicator-datetime's menu. + + + + false + Show the auto-detected location in the indicator + + Shows your current location (determined from geoclue and /etc/timezone) in indicator-datetime's menu. + + + + false + Show locations in the indicator + + Shows custom defined locations in indicator-datetime's menu. + + + + ['UTC'] + A List of locations + + Adds the list of locations the user has configured to display in the + indicator-datetime menu. + + + + '' + The name of the current timezone + + Some timezones can be known by many different cities or names. This setting describes how the current zone prefers to be named. Format is "TIMEZONE NAME" (e.g. "America/New_York Boston" to name the New_York zone Boston). + + + + 'pulse' + What kind of haptic feedback, if any, to trigger with an alarm. + What kind of haptic feedback, if any, to trigger with an alarm. Two modes are currently supported: 'pulse', 'none'. - - - - '@CALENDAR_DEFAULT_SOUND@' - <_summary>The calendar's default sound file. - <_description> - If a calendar or reminder event doesn't specify its own sound file, this file will be used as the fallback sound. - - - - '@ALARM_DEFAULT_SOUND@' - The alarm's default sound file. - - If an alarm doesn't specify its own sound file, this file will be used as the fallback sound. - - - - - 50 - The alarm's default volume level. - - The volume at which alarms will be played. - - - - - 10 - The alarm's duration. - - How long the alarm's sound will be looped if its snap decision is not dismissed by the user. - - - - - 5 - The snooze duration. - - How long to wait when the user hits the Snooze button. - - - + + + + '@CALENDAR_DEFAULT_SOUND@' + <_summary>The calendar's default sound file. + <_description> + If a calendar or reminder event doesn't specify its own sound file, this file will be used as the fallback sound. + + + + '@ALARM_DEFAULT_SOUND@' + The alarm's default sound file. + + If an alarm doesn't specify its own sound file, this file will be used as the fallback sound. + + + + + 50 + The alarm's default volume level. + + The volume at which alarms will be played. + + + + + 10 + The alarm's duration. + + How long the alarm's sound will be looped if its snap decision is not dismissed by the user. + + + + + 5 + The snooze duration. + + How long to wait when the user hits the Snooze button. + + + -- cgit v1.2.3 From 24d102c12a1470726c1d5321a918825cd3d18527 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Thu, 3 Sep 2020 00:41:17 +0200 Subject: gsettings: Drop the 'show-clock' setting. Always show the clock. The 'show-clock' gsetting option made it possible to "hide" the time from the indicator. Fixes AyatanaIndicator/ayatana-indicator-datetime#16. --- data/org.ayatana.indicator.datetime.gschema.xml.in.in | 7 ------- include/datetime/settings-live.h | 1 - include/datetime/settings-shared.h | 1 - include/datetime/settings.h | 1 - src/menu.cpp | 7 +------ src/settings-live.cpp | 14 +------------- tests/test-settings.cpp | 1 - 7 files changed, 2 insertions(+), 30 deletions(-) diff --git a/data/org.ayatana.indicator.datetime.gschema.xml.in.in b/data/org.ayatana.indicator.datetime.gschema.xml.in.in index 353ec3e..e03db4b 100644 --- a/data/org.ayatana.indicator.datetime.gschema.xml.in.in +++ b/data/org.ayatana.indicator.datetime.gschema.xml.in.in @@ -6,13 +6,6 @@ - - true - Show the clock in the panel - - Controls whether the clock indicator appears in the panel or not. - - 'locale-default' What the time format should be? diff --git a/include/datetime/settings-live.h b/include/datetime/settings-live.h index ead1dc2..ccf7122 100644 --- a/include/datetime/settings-live.h +++ b/include/datetime/settings-live.h @@ -44,7 +44,6 @@ private: void update_custom_time_format(); void update_locations(); void update_show_calendar(); - void update_show_clock(); void update_show_date(); void update_show_day(); void update_show_detected_locations(); diff --git a/include/datetime/settings-shared.h b/include/datetime/settings-shared.h index 2ce556a..bd84a2d 100644 --- a/include/datetime/settings-shared.h +++ b/include/datetime/settings-shared.h @@ -31,7 +31,6 @@ typedef enum TimeFormatMode; #define SETTINGS_INTERFACE "org.ayatana.indicator.datetime" -#define SETTINGS_SHOW_CLOCK_S "show-clock" #define SETTINGS_TIME_FORMAT_S "time-format" #define SETTINGS_SHOW_SECONDS_S "show-seconds" #define SETTINGS_SHOW_DAY_S "show-day" diff --git a/include/datetime/settings.h b/include/datetime/settings.h index fa64724..253a00a 100644 --- a/include/datetime/settings.h +++ b/include/datetime/settings.h @@ -45,7 +45,6 @@ public: core::Property custom_time_format; core::Property> locations; core::Property show_calendar; - core::Property show_clock; core::Property show_date; core::Property show_day; core::Property show_detected_location; diff --git a/src/menu.cpp b/src/menu.cpp index 5469dd1..416d02c 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -94,10 +94,6 @@ protected: update_section(Appointments); // uses formatter.relative_format() update_section(Locations); // uses formatter.relative_format() }); - m_state->settings->show_clock.changed().connect([this](bool){ - update_header(); // update header's label - update_section(Locations); // locations' relative time may have changed - }); m_state->settings->show_calendar.changed().connect([this](bool){ update_section(Calendar); }); @@ -465,7 +461,6 @@ protected: GVariant* create_header_state() { - const auto visible = m_state->settings->show_clock.get(); const auto title = _("Date and Time"); auto label = g_variant_new_string(m_formatter->header.get().c_str()); @@ -474,7 +469,7 @@ protected: g_variant_builder_add(&b, "{sv}", "accessible-desc", label); g_variant_builder_add(&b, "{sv}", "label", label); g_variant_builder_add(&b, "{sv}", "title", g_variant_new_string(title)); - g_variant_builder_add(&b, "{sv}", "visible", g_variant_new_boolean(visible)); + g_variant_builder_add(&b, "{sv}", "visible", g_variant_new_boolean(TRUE)); return g_variant_builder_end(&b); } }; diff --git a/src/settings-live.cpp b/src/settings-live.cpp index 206b762..5c2addb 100644 --- a/src/settings-live.cpp +++ b/src/settings-live.cpp @@ -41,7 +41,6 @@ LiveSettings::LiveSettings(): update_custom_time_format(); update_locations(); update_show_calendar(); - update_show_clock(); update_show_date(); update_show_day(); update_show_detected_locations(); @@ -78,10 +77,6 @@ LiveSettings::LiveSettings(): g_settings_set_boolean(m_settings, SETTINGS_SHOW_CALENDAR_S, value); }); - show_clock.changed().connect([this](bool value){ - g_settings_set_boolean(m_settings, SETTINGS_SHOW_CLOCK_S, value); - }); - show_date.changed().connect([this](bool value){ g_settings_set_boolean(m_settings, SETTINGS_SHOW_DATE_S, value); }); @@ -174,11 +169,6 @@ void LiveSettings::update_show_calendar() show_calendar.set(val); } -void LiveSettings::update_show_clock() -{ - show_clock.set(g_settings_get_boolean(m_settings, SETTINGS_SHOW_CLOCK_S)); -} - void LiveSettings::update_show_date() { show_date.set(g_settings_get_boolean(m_settings, SETTINGS_SHOW_DATE_S)); @@ -284,9 +274,7 @@ void LiveSettings::on_changed(GSettings* /*settings*/, void LiveSettings::update_key(const std::string& key) { - if (key == SETTINGS_SHOW_CLOCK_S) - update_show_clock(); - else if (key == SETTINGS_LOCATIONS_S) + if (key == SETTINGS_LOCATIONS_S) update_locations(); else if (key == SETTINGS_TIME_FORMAT_S) update_time_format_mode(); diff --git a/tests/test-settings.cpp b/tests/test-settings.cpp index dff9487..3af9eab 100644 --- a/tests/test-settings.cpp +++ b/tests/test-settings.cpp @@ -138,7 +138,6 @@ TEST_F(SettingsFixture, BoolProperties) { TestBoolProperty(m_settings->show_seconds, SETTINGS_SHOW_SECONDS_S); TestBoolProperty(m_settings->show_calendar, SETTINGS_SHOW_CALENDAR_S); - TestBoolProperty(m_settings->show_clock, SETTINGS_SHOW_CLOCK_S); TestBoolProperty(m_settings->show_date, SETTINGS_SHOW_DATE_S); TestBoolProperty(m_settings->show_day, SETTINGS_SHOW_DAY_S); TestBoolProperty(m_settings->show_detected_location, SETTINGS_SHOW_DETECTED_S); -- cgit v1.2.3