diff options
| -rw-r--r-- | include/datetime/state-live.h | 49 | ||||
| -rw-r--r-- | src/main.cpp | 46 | ||||
| -rw-r--r-- | src/state-live.cpp | 58 |
3 files changed, 119 insertions, 34 deletions
diff --git a/include/datetime/state-live.h b/include/datetime/state-live.h new file mode 100644 index 0000000..2b93722 --- /dev/null +++ b/include/datetime/state-live.h @@ -0,0 +1,49 @@ +/* + * Copyright 2013 Canonical Ltd. + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 3, as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranties of + * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: + * Charles Kerr <charles.kerr@canonical.com> + */ + +#ifndef INDICATOR_DATETIME_STATE_LIVE_H +#define INDICATOR_DATETIME_STATE_LIVE_H + +#include <datetime/state.h> + +namespace unity { +namespace indicator { +namespace datetime { + +/*** +**** +***/ + +class LiveState: public State +{ +public: + LiveState(); + virtual ~LiveState() =default; +}; + +/*** +**** +***/ + + +} // namespace datetime +} // namespace indicator +} // namespace unity + +#endif // INDICATOR_DATETIME_SETTINGS_LIVE_H diff --git a/src/main.cpp b/src/main.cpp index 7bd6f9d..6a56163 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -18,24 +18,16 @@ */ #include <datetime/actions-live.h> -#include <datetime/clock.h> -#include <datetime/formatter.h> -#include <datetime/locations-settings.h> +#include <datetime/exporter.h> #include <datetime/menu.h> -#include <datetime/planner-eds.h> -#include <datetime/service.h> -#include <datetime/settings-live.h> -#include <datetime/state.h> -#include <datetime/timezones-live.h> +#include <datetime/state-live.h> -#include <glib/gi18n.h> +#include <glib/gi18n.h> // bindtextdomain() #include <gio/gio.h> #include <libnotify/notify.h> -#include <iostream> - #include <locale.h> -#include <stdlib.h> /* exit() */ +#include <stdlib.h> // exit() using namespace unity::indicator::datetime; @@ -46,7 +38,7 @@ main(int /*argc*/, char** /*argv*/) // It can be removed when https://bugzilla.gnome.org/show_bug.cgi?id=674885 is fixed. g_type_ensure(G_TYPE_DBUS_CONNECTION); - // boilerplate i18n + // init i18n setlocale(LC_ALL, ""); bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR); textdomain(GETTEXT_PACKAGE); @@ -55,22 +47,8 @@ main(int /*argc*/, char** /*argv*/) if(!notify_init("indicator-datetime-service")) g_critical("libnotify initialization failed"); - // build the state - std::shared_ptr<Settings> settings(new LiveSettings); - std::shared_ptr<Timezones> timezones(new LiveTimezones(settings, TIMEZONE_FILE)); - std::shared_ptr<Clock> clock(new LiveClock(timezones)); - std::shared_ptr<Planner> planner(new PlannerEds); - planner->time = clock->localtime(); - std::shared_ptr<Locations> locations(new SettingsLocations(settings, timezones)); - std::shared_ptr<State> state(new State); - state->settings = settings; - state->timezones = timezones; - state->clock = clock; - state->locations = locations; - state->planner = planner; - state->calendar_day = clock->localtime(); - - // build the menu factory + // build the state and menu factory + std::shared_ptr<State> state(new LiveState); std::shared_ptr<Actions> actions(new LiveActions(state)); MenuFactory factory(actions, state); @@ -80,12 +58,12 @@ main(int /*argc*/, char** /*argv*/) // export them auto loop = g_main_loop_new(nullptr, false); - Service service; - service.name_lost.connect([loop](){ - g_message("exiting: service couldn't acquire or lost ownership of busname"); - g_main_loop_quit(loop); + Exporter exporter; + exporter.name_lost.connect([loop](){ + g_message("%s exiting; failed/lost bus ownership", GETTEXT_PACKAGE); + g_main_loop_quit(loop); }); - //service.publish(actions, menus); + exporter.publish(actions, menus); g_main_loop_run(loop); g_main_loop_unref(loop); return 0; diff --git a/src/state-live.cpp b/src/state-live.cpp new file mode 100644 index 0000000..f4690b3 --- /dev/null +++ b/src/state-live.cpp @@ -0,0 +1,58 @@ +/* + * Copyright 2013 Canonical Ltd. + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 3, as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranties of + * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: + * Charles Kerr <charles.kerr@canonical.com> + */ + +#include <datetime/state-live.h> + +#include <datetime/clock.h> +#include <datetime/locations-settings.h> +#include <datetime/planner-eds.h> +#include <datetime/settings-live.h> +#include <datetime/state.h> +#include <datetime/timezones-live.h> + +namespace unity { +namespace indicator { +namespace datetime { + +/*** +**** +***/ + +LiveState::LiveState() +{ + std::shared_ptr<Settings> live_settings(new LiveSettings); + std::shared_ptr<Timezones> live_timezones(new LiveTimezones(live_settings, TIMEZONE_FILE)); + std::shared_ptr<Clock> live_clock(new LiveClock(live_timezones)); + + settings = live_settings; + timezones = live_timezones; + clock = live_clock; + locations.reset(new SettingsLocations(live_settings, live_timezones)); + planner.reset(new PlannerEds); + planner->time = clock->localtime(); + calendar_day = clock->localtime(); +} + +/*** +**** +***/ + +} // namespace datetime +} // namespace indicator +} // namespace unity |