Add ESettingsWeekdayChooser.

Configures the "week-start-day" property of EWeekdayChooser.

5 files changed, 166 insertions, 3 deletions

diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 39e2372229..4b2fce1d16 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -1030,7 +1030,6 @@ make_weekly_special (RecurrencePage *rpage)
 	GtkWidget *hbox;
 	GtkWidget *label;
 	EWeekdayChooser *chooser;
-	gint week_start_day;
 
 	priv = rpage->priv;
 
@@ -1056,8 +1055,6 @@ make_weekly_special (RecurrencePage *rpage)
 
 	/* Set the weekdays */
 
-	week_start_day = e_meeting_store_get_week_start_day (priv->meeting_store);
-	e_weekday_chooser_set_week_start_day (chooser, week_start_day);
 	e_weekday_chooser_set_days (chooser, priv->weekday_day_mask);
 
 	g_signal_connect_swapped (
diff --git a/modules/settings/Makefile.am b/modules/settings/Makefile.am
index ca70841f4d..42a7115cd6 100644
--- a/modules/settings/Makefile.am
+++ b/modules/settings/Makefile.am
@@ -41,6 +41,8 @@ module_settings_la_SOURCES = \
 	e-settings-web-view.h \
 	e-settings-web-view-gtkhtml.c \
 	e-settings-web-view-gtkhtml.h \
+	e-settings-weekday-chooser.c \
+	e-settings-weekday-chooser.h \
 	$(NULL)
 
 module_settings_la_LIBADD = \
diff --git a/modules/settings/e-settings-weekday-chooser.c b/modules/settings/e-settings-weekday-chooser.c
new file mode 100644
index 0000000000..e4b92d73c5
--- /dev/null
+++ b/modules/settings/e-settings-weekday-chooser.c
@@ -0,0 +1,96 @@
+/*
+ * e-settings-weekday-chooser.c
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#include "e-settings-weekday-chooser.h"
+
+#include <shell/e-shell.h>
+#include <calendar/gui/e-weekday-chooser.h>
+
+#define E_SETTINGS_WEEKDAY_CHOOSER_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_SETTINGS_WEEKDAY_CHOOSER, ESettingsWeekdayChooserPrivate))
+
+struct _ESettingsWeekdayChooserPrivate {
+	gint placeholder;
+};
+
+G_DEFINE_DYNAMIC_TYPE (
+	ESettingsWeekdayChooser,
+	e_settings_weekday_chooser,
+	E_TYPE_EXTENSION)
+
+static void
+settings_weekday_chooser_constructed (GObject *object)
+{
+	EExtension *extension;
+	EExtensible *extensible;
+	EShellSettings *shell_settings;
+	EShell *shell;
+
+	extension = E_EXTENSION (object);
+	extensible = e_extension_get_extensible (extension);
+
+	shell = e_shell_get_default ();
+	shell_settings = e_shell_get_shell_settings (shell);
+
+	g_object_bind_property (
+		shell_settings, "cal-week-start-day",
+		extensible, "week-start-day",
+		G_BINDING_SYNC_CREATE);
+
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_settings_weekday_chooser_parent_class)->
+		constructed (object);
+}
+
+static void
+e_settings_weekday_chooser_class_init (ESettingsWeekdayChooserClass *class)
+{
+	GObjectClass *object_class;
+	EExtensionClass *extension_class;
+
+	g_type_class_add_private (
+		class, sizeof (ESettingsWeekdayChooserPrivate));
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->constructed = settings_weekday_chooser_constructed;
+
+	extension_class = E_EXTENSION_CLASS (class);
+	extension_class->extensible_type = E_TYPE_WEEKDAY_CHOOSER;
+}
+
+static void
+e_settings_weekday_chooser_class_finalize (ESettingsWeekdayChooserClass *class)
+{
+}
+
+static void
+e_settings_weekday_chooser_init (ESettingsWeekdayChooser *extension)
+{
+	extension->priv = E_SETTINGS_WEEKDAY_CHOOSER_GET_PRIVATE (extension);
+}
+
+void
+e_settings_weekday_chooser_type_register (GTypeModule *type_module)
+{
+	/* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration
+	 *     function, so we have to wrap it with a public function in
+	 *     order to register types from a separate compilation unit. */
+	e_settings_weekday_chooser_register_type (type_module);
+}
+
diff --git a/modules/settings/e-settings-weekday-chooser.h b/modules/settings/e-settings-weekday-chooser.h
new file mode 100644
index 0000000000..e4c868183b
--- /dev/null
+++ b/modules/settings/e-settings-weekday-chooser.h
@@ -0,0 +1,66 @@
+/*
+ * e-settings-weekday-chooser.h
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#ifndef E_SETTINGS_WEEKDAY_CHOOSER_H
+#define E_SETTINGS_WEEKDAY_CHOOSER_H
+
+#include <libebackend/libebackend.h>
+
+/* Standard GObject macros */
+#define E_TYPE_SETTINGS_WEEKDAY_CHOOSER \
+	(e_settings_weekday_chooser_get_type ())
+#define E_SETTINGS_WEEKDAY_CHOOSER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_SETTINGS_WEEKDAY_CHOOSER, ESettingsWeekdayChooser))
+#define E_SETTINGS_WEEKDAY_CHOOSER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_SETTINGS_WEEKDAY_CHOOSER, ESettingsWeekdayChooserClass))
+#define E_IS_SETTINGS_WEEKDAY_CHOOSER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_SETTINGS_WEEKDAY_CHOOSER))
+#define E_IS_SETTINGS_WEEKDAY_CHOOSER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_SETTINGS_WEEKDAY_CHOOSER))
+#define E_SETTINGS_WEEKDAY_CHOOSER_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_SETTINGS_WEEKDAY_CHOOSER, ESettingsWeekdayChooserClass))
+
+G_BEGIN_DECLS
+
+typedef struct _ESettingsWeekdayChooser ESettingsWeekdayChooser;
+typedef struct _ESettingsWeekdayChooserClass ESettingsWeekdayChooserClass;
+typedef struct _ESettingsWeekdayChooserPrivate ESettingsWeekdayChooserPrivate;
+
+struct _ESettingsWeekdayChooser {
+	EExtension parent;
+	ESettingsWeekdayChooserPrivate *priv;
+};
+
+struct _ESettingsWeekdayChooserClass {
+	EExtensionClass parent_class;
+};
+
+GType		e_settings_weekday_chooser_get_type
+						(void) G_GNUC_CONST;
+void		e_settings_weekday_chooser_type_register
+						(GTypeModule *type_module);
+
+G_END_DECLS
+
+#endif /* E_SETTINGS_WEEKDAY_CHOOSER_H */
+
diff --git a/modules/settings/evolution-module-settings.c b/modules/settings/evolution-module-settings.c
index 79ffed45ee..34fd5997c8 100644
--- a/modules/settings/evolution-module-settings.c
+++ b/modules/settings/evolution-module-settings.c
@@ -30,6 +30,7 @@
 #include "e-settings-photo-cache.h"
 #include "e-settings-web-view.h"
 #include "e-settings-web-view-gtkhtml.h"
+#include "e-settings-weekday-chooser.h"
 
 /* Module Entry Points */
 void e_module_load (GTypeModule *type_module);
@@ -52,6 +53,7 @@ e_module_load (GTypeModule *type_module)
 	e_settings_photo_cache_type_register (type_module);
 	e_settings_web_view_type_register (type_module);
 	e_settings_web_view_gtkhtml_type_register (type_module);
+	e_settings_weekday_chooser_type_register (type_module);
 }
 
 G_MODULE_EXPORT void