aboutsummaryrefslogtreecommitdiff
path: root/include/datetime
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-03-24 16:18:12 +0000
committerCI bot <ps-jenkins@lists.canonical.com>2014-03-24 16:18:12 +0000
commit45abbf3db686fd87ed5eb3eef38618ffe0eedb8a (patch)
treee23159158aaa9d0879c3571aac61ec230638186a /include/datetime
parent7a6e36e548f574ba1e6ea49af63b2ce0397a848f (diff)
parentf88a1cf792c1b8786db5f447fed148fcd2166d07 (diff)
downloadayatana-indicator-datetime-45abbf3db686fd87ed5eb3eef38618ffe0eedb8a.tar.gz
ayatana-indicator-datetime-45abbf3db686fd87ed5eb3eef38618ffe0eedb8a.tar.bz2
ayatana-indicator-datetime-45abbf3db686fd87ed5eb3eef38618ffe0eedb8a.zip
Change the desktop menu's settings menuitem's label to match the spec. Fixes: 1296585
Diffstat (limited to 'include/datetime')
-rw-r--r--include/datetime/actions-live.h19
-rw-r--r--include/datetime/actions.h20
2 files changed, 24 insertions, 15 deletions
diff --git a/include/datetime/actions-live.h b/include/datetime/actions-live.h
index a24b844..0bf48a8 100644
--- a/include/datetime/actions-live.h
+++ b/include/datetime/actions-live.h
@@ -39,15 +39,18 @@ public:
LiveActions(const std::shared_ptr<State>& state_in);
~LiveActions() =default;
- void open_desktop_settings();
- void open_phone_settings();
- void open_phone_clock_app();
- bool can_open_planner() const;
- void open_planner();
- void open_planner_at(const DateTime&);
- void open_appointment(const std::string& uid);
+ bool desktop_has_calendar_app() const;
+ void desktop_open_alarm_app();
+ void desktop_open_appointment(const Appointment&);
+ void desktop_open_calendar_app(const DateTime&);
+ void desktop_open_settings_app();
+
+ void phone_open_alarm_app();
+ void phone_open_appointment(const Appointment&);
+ void phone_open_calendar_app(const DateTime&);
+ void phone_open_settings_app();
+
void set_location(const std::string& zone, const std::string& name);
- void set_calendar_date(const DateTime&);
protected:
virtual void execute_command(const std::string& command);
diff --git a/include/datetime/actions.h b/include/datetime/actions.h
index 2c4217c..f59ef67 100644
--- a/include/datetime/actions.h
+++ b/include/datetime/actions.h
@@ -42,14 +42,20 @@ namespace datetime {
class Actions
{
public:
- virtual void open_desktop_settings() =0;
- virtual void open_phone_settings() =0;
- virtual void open_phone_clock_app() =0;
- virtual bool can_open_planner() const = 0;
- virtual void open_planner() =0;
- virtual void open_planner_at(const DateTime&) =0;
- virtual void open_appointment(const std::string& uid) =0;
+
+ virtual bool desktop_has_calendar_app() const =0;
+ virtual void desktop_open_alarm_app() =0;
+ virtual void desktop_open_appointment(const Appointment&) =0;
+ virtual void desktop_open_calendar_app(const DateTime&) =0;
+ virtual void desktop_open_settings_app() =0;
+
+ virtual void phone_open_alarm_app() =0;
+ virtual void phone_open_appointment(const Appointment&) =0;
+ virtual void phone_open_calendar_app(const DateTime&) =0;
+ virtual void phone_open_settings_app() =0;
+
virtual void set_location(const std::string& zone, const std::string& name)=0;
+
void set_calendar_date(const DateTime&);
GActionGroup* action_group();
const std::shared_ptr<State> state() const;