aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/org.ayatana.indicator.datetime.gschema.xml.in.in7
-rw-r--r--include/datetime/settings-live.h1
-rw-r--r--include/datetime/settings-shared.h1
-rw-r--r--include/datetime/settings.h1
-rw-r--r--src/menu.cpp7
-rw-r--r--src/settings-live.cpp14
-rw-r--r--tests/test-settings.cpp1
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 @@
<value nick="custom" value="3" />
</enum>
<schema id="org.ayatana.indicator.datetime" path="/org/ayatana/indicator/datetime/" gettext-domain="ayatana-indicator-datetime">
- <key name="show-clock" type="b">
- <default>true</default>
- <summary>Show the clock in the panel</summary>
- <description>
- Controls whether the clock indicator appears in the panel or not.
- </description>
- </key>
<key name="time-format" enum="time-enum">
<default>'locale-default'</default>
<summary>What the time format should be?</summary>
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<std::string> custom_time_format;
core::Property<std::vector<std::string>> locations;
core::Property<bool> show_calendar;
- core::Property<bool> show_clock;
core::Property<bool> show_date;
core::Property<bool> show_day;
core::Property<bool> 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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 07:22:04 +0000