#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <hildon/hildon.h>
+#include <rtm-glib/rtm-glib.h>
#include "milk-main-window.h"
+#include "milk-cache.h"
#include "milk-task-model.h"
G_DEFINE_TYPE (MilkMainWindow, milk_main_window, HILDON_TYPE_WINDOW)
-#define MILK_MAIN_WINDOW_PRIVATE(o) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((o), MILK_TYPE_MAIN_WINDOW, MilkMainWindowPrivate))
+/* less expensive than G_TYPE_INSTANCE_GET_PRIVATE */
+#define MILK_MAIN_WINDOW_PRIVATE(o) ((MILK_MAIN_WINDOW ((o)))->priv)
+
+#define NEW_TASK_PLACEHOLDER_TEXT "Enter a new task..."
+
+static GtkWidget *default_window = NULL;
struct _MilkMainWindowPrivate
{
+ MilkCache *cache;
+
+ GtkWidget *app_menu;
+
GtkWidget *main_vbox;
GtkWidget *new_task_entry;
GtkWidget *task_view;
+ GtkWidget *task_selector;
};
enum {
N_VIEW_COLUMNS
};
+typedef struct {
+ const char *display_name;
+ const char *id;
+ gpointer callback;
+} MenuItem;
+
static void
milk_main_window_get_property (GObject *object,
guint property_id,
}
static void
+new_task_clicked_cb (GtkButton *button,
+ MilkMainWindow *window)
+{
+ g_debug ("FIXME: implement 'new task' action");
+}
+
+static GList*
+get_selected_tasks (MilkMainWindow *window)
+{
+ MilkMainWindowPrivate *priv;
+ GList *rows;
+ GtkTreeModel *model;
+ GList *tasks = NULL;
+
+ priv = MILK_MAIN_WINDOW_PRIVATE (window);
+
+ rows = hildon_touch_selector_get_selected_rows (
+ HILDON_TOUCH_SELECTOR (priv->task_view),
+ TASK_VIEW_COLUMN_TITLE);
+ model = hildon_touch_selector_get_model (
+ HILDON_TOUCH_SELECTOR (priv->task_view),
+ TASK_VIEW_COLUMN_TITLE);
+
+ while (rows) {
+ GtkTreeIter iter;
+ RtmTask *task;
+
+ gtk_tree_model_get_iter (model, &iter, rows->data);
+ gtk_tree_model_get (model, &iter,
+ MILK_TASK_MODEL_COLUMN_TASK, &task,
+ -1);
+
+ tasks = g_list_prepend (tasks, task);
+ rows = g_list_delete_link (rows, rows);
+ }
+
+ return tasks;
+}
+
+static void
complete_clicked_cb (GtkButton *button,
MilkMainWindow *window)
{
- g_debug ("FIXME: implement 'complete' action");
+ MilkMainWindowPrivate *priv;
+ GList *tasks;
+ char *timeline;
+ GError *error = NULL;
+
+ priv = MILK_MAIN_WINDOW_PRIVATE (window);
+
+ tasks = get_selected_tasks (window);
+ timeline = milk_cache_timeline_create (priv->cache, &error);
+
+ if (error) {
+ g_warning (G_STRLOC ": failed to create a timeline: %s",
+ error->message);
+ g_clear_error (&error);
+ } else {
+ while (tasks) {
+ milk_cache_task_complete (priv->cache, timeline,
+ tasks->data, &error);
+ tasks = g_list_delete_link (tasks, tasks);
+ }
+ }
}
static void
delete_clicked_cb (GtkButton *button,
MilkMainWindow *window)
{
- g_debug ("FIXME: implement 'delete' action");
+ MilkMainWindowPrivate *priv;
+ GList *tasks;
+ char *timeline;
+ GError *error = NULL;
+
+ priv = MILK_MAIN_WINDOW_PRIVATE (window);
+
+ tasks = get_selected_tasks (window);
+ timeline = milk_cache_timeline_create (priv->cache, &error);
+
+ if (error) {
+ g_warning (G_STRLOC ": failed to create a timeline: %s",
+ error->message);
+ g_clear_error (&error);
+ } else {
+ while (tasks) {
+ milk_cache_task_delete (priv->cache, timeline,
+ tasks->data, &error);
+ tasks = g_list_delete_link (tasks, tasks);
+ }
+ }
}
static void
};
static void
-task_view_selection_changed_cb (HildonTouchSelector *view,
- gint column,
- MilkMainWindow *window)
+new_task_entry_activated_cb (GtkEntry *entry,
+ MilkMainWindow *window)
{
MilkMainWindowPrivate *priv;
- GList *rows;
- gboolean show = FALSE;
- gint i;
+ char *name;
priv = MILK_MAIN_WINDOW_PRIVATE (window);
- rows = hildon_touch_selector_get_selected_rows (view, column);
- show = (g_list_length (rows) > 0);
-
- for (i = 0; i < G_N_ELEMENTS (menu_items_selection_required); i++) {
- GtkWidget *w;
-
- w = g_object_get_data (
- G_OBJECT (priv->app_menu),
- menu_items_selection_required[i].id);
-
- if (show)
- gtk_widget_show (w);
- else
- gtk_widget_hide (w);
+ name = g_strdup (gtk_entry_get_text (entry));
+
+ /* Strip the contents of leading and trailing whitespace, and add as a
+ * new task if the result is non-empty */
+ if (g_strcmp0 (g_strstrip (name), "")) {
+ char *timeline;
+ GError *error = NULL;
+
+ timeline = milk_cache_timeline_create (priv->cache, &error);
+
+ if (error) {
+ g_warning (G_STRLOC ": failed to create a timeline: %s",
+ error->message);
+ g_clear_error (&error);
+ } else {
+ RtmTask *task;
+
+ task = milk_cache_task_add (priv->cache, timeline, name,
+ &error);
+ if (task) {
+ /* empty out the entry and show its placeholder
+ * text */
+ gtk_entry_set_text (entry, "");
+ gtk_widget_grab_focus (priv->task_view);
+
+ /* FIXME: we should probably scroll to this new
+ * task in the model view, if it's not currently
+ * visible (and highlight only it in any case */
+ } else {
+ g_warning (G_STRLOC ": failed to add task: %s",
+ error->message);
+ g_clear_error (&error);
+ }
+ }
}
+
+ g_free (name);
}
-static GtkWidget*
-create_menu (gpointer user_data)
+static gboolean
+new_task_entry_key_press_event_cb (GtkEntry *entry,
+ GdkEventKey *event,
+ MilkMainWindow *window)
{
- HildonAppMenu *menu;
- MenuItem *menu_array;
- gint i, length;
- GtkWidget *w;
+ MilkMainWindowPrivate *priv;
- menu = HILDON_APP_MENU (hildon_app_menu_new ());
+ priv = MILK_MAIN_WINDOW_PRIVATE (window);
- menu_array = menu_items_always_shown;
- length = G_N_ELEMENTS (menu_items_always_shown);
- for (i = 0; i < length; i++) {
- w = hildon_button_new_with_text (
- HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
- HILDON_BUTTON_ARRANGEMENT_VERTICAL,
- _(menu_array[i].display_name), "");
- g_signal_connect (w, "clicked",
- G_CALLBACK (menu_array[i].callback), user_data);
- g_object_set_data (G_OBJECT (menu), menu_array[i].id, w);
- hildon_app_menu_append (menu, GTK_BUTTON (w));
- gtk_widget_show (w);
+ if (!event || event->type != GDK_KEY_PRESS) {
+ return FALSE;
}
- menu_array = menu_items_selection_required;
- length = G_N_ELEMENTS (menu_items_selection_required);
- for (i = 0; i < length; i++) {
- w = hildon_button_new_with_text (
- HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
- HILDON_BUTTON_ARRANGEMENT_VERTICAL,
- menu_array[i].display_name, "");
- g_signal_connect (w, "clicked",
- G_CALLBACK (menu_array[i].callback), user_data);
- g_object_set_data (G_OBJECT (menu), menu_array[i].id, w);
- hildon_app_menu_append (menu, GTK_BUTTON (w));
- gtk_widget_hide (w);
+ switch (event->keyval) {
+ case GDK_KP_Enter:
+ case GDK_Return:
+ new_task_entry_activated_cb (entry, window);
+ return TRUE;
}
- gtk_widget_show (GTK_WIDGET (menu));
-
- return GTK_WIDGET (menu);
+ return FALSE;
}
-static MenuItem menu_items_always_shown[] = {
- {"New Task", "menu-item-new-task", new_task_clicked_cb},
-};
-
-static MenuItem menu_items_selection_required[] = {
- {"Edit", "menu-item-edit", edit_clicked_cb},
- {"Priority +", "menu-item-priority_plus", priority_plus_clicked_cb},
- {"Priority -", "menu-item-priority_minus", priority_minus_clicked_cb},
- {"Complete", "menu-item-complete", complete_clicked_cb},
- {"Delete", "menu-item-delete", delete_clicked_cb},
-};
-
static void
task_view_selection_changed_cb (HildonTouchSelector *view,
gint column,
else
gtk_widget_hide (w);
}
+
+ g_list_free (rows);
}
static GtkWidget*
}
static void
-contact_column_render_func (GtkCellLayout *cell_layout,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer user_data)
+priority_column_render_func (GtkCellLayout *cell_layout,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer user_data)
{
- MilkTask *task;
- char *title;
+ RtmTask *task;
+ const char *priority;
+ GdkColor color = {};
+ gboolean color_set = TRUE;
gtk_tree_model_get (
model, iter, MILK_TASK_MODEL_COLUMN_TASK, &task, -1);
- g_object_get (task, "title", &title, NULL);
- g_object_set (renderer, "text", title, NULL);
+ priority = rtm_task_get_priority (task);
+
+ if (FALSE) {
+ } else if (!g_strcmp0 (priority, "1")) {
+ gdk_color_parse ("#ea5200", &color);
+ } else if (!g_strcmp0 (priority, "2")) {
+ gdk_color_parse ("#0060bf", &color);
+ } else if (!g_strcmp0 (priority, "3")) {
+ gdk_color_parse ("#359aff", &color);
+ } else {
+ color_set = FALSE;
+ }
+
+ g_object_set (renderer,
+ "cell-background-gdk", color_set ? &color : NULL,
+ "cell-background-set", color_set,
+ NULL);
- g_free (title);
g_object_unref (task);
}
-static HildonAppMenu*
-create_menu (gpointer user_data)
+static void
+name_column_render_func (GtkCellLayout *cell_layout,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer user_data)
{
- HildonAppMenu *menu;
- GtkWidget *w;
+ RtmTask *task;
- menu = HILDON_APP_MENU (hildon_app_menu_new ());
+ gtk_tree_model_get (
+ model, iter, MILK_TASK_MODEL_COLUMN_TASK, &task, -1);
+ g_object_set (renderer, "text", rtm_task_get_name (task), NULL);
+
+ g_object_unref (task);
+}
+
+static gboolean
+begin_cache_idle (MilkMainWindow *window)
+{
+ MilkMainWindowPrivate *priv;
+
+ priv = MILK_MAIN_WINDOW_PRIVATE (window);
+
+ milk_cache_authenticate (priv->cache);
- w = hildon_button_new_with_text (
- HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
- HILDON_BUTTON_ARRANGEMENT_VERTICAL,
- _("Complete"), "");
- g_signal_connect (w, "clicked", G_CALLBACK (complete_clicked_cb),
- user_data);
- hildon_app_menu_append (menu, GTK_BUTTON (w));
-
- w = hildon_button_new_with_text (
- HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
- HILDON_BUTTON_ARRANGEMENT_VERTICAL,
- _("Edit"), "");
- g_signal_connect (w, "clicked", G_CALLBACK (edit_clicked_cb),
- user_data);
- hildon_app_menu_append (menu, GTK_BUTTON (w));
-
- w = hildon_button_new_with_text (
- HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
- HILDON_BUTTON_ARRANGEMENT_VERTICAL,
- _("Priority +"), "");
- g_signal_connect (w, "clicked", G_CALLBACK (priority_plus_clicked_cb),
- user_data);
- hildon_app_menu_append (menu, GTK_BUTTON (w));
-
- w = hildon_button_new_with_text (
- HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
- HILDON_BUTTON_ARRANGEMENT_VERTICAL,
- _("Priority -"), "");
- g_signal_connect (w, "clicked", G_CALLBACK (priority_minus_clicked_cb),
- user_data);
- hildon_app_menu_append (menu, GTK_BUTTON (w));
-
- w = hildon_button_new_with_text (
- HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
- HILDON_BUTTON_ARRANGEMENT_VERTICAL,
- _("Delete"), "");
- g_signal_connect (w, "clicked", G_CALLBACK (delete_clicked_cb),
- user_data);
- hildon_app_menu_append (menu, GTK_BUTTON (w));
-
- gtk_widget_show_all (GTK_WIDGET (menu));
-
- return menu;
+ return FALSE;
}
static void
/* FIXME: change this to hildon_gtk_entry_set_placeholder_text() is
* fixed, since this is deprecated */
hildon_entry_set_placeholder (HILDON_ENTRY (w),
- _("Enter a new task..."));
+ _(NEW_TASK_PLACEHOLDER_TEXT));
priv->new_task_entry = w;
+ g_signal_connect (G_OBJECT (w), "activate",
+ G_CALLBACK (new_task_entry_activated_cb), self);
+ g_signal_connect (G_OBJECT (w), "key-press-event",
+ G_CALLBACK (new_task_entry_key_press_event_cb), self);
/*
* Task List
model = GTK_TREE_MODEL (milk_task_model_new ());
w = hildon_touch_selector_new ();
+ col = hildon_touch_selector_append_column (
+ HILDON_TOUCH_SELECTOR (w), model, NULL, NULL);
+
renderer = gtk_cell_renderer_text_new ();
g_object_set (renderer,
- "ellipsize", PANGO_ELLIPSIZE_END,
+ "width", HILDON_ICON_PIXEL_SIZE_XSMALL,
+ "width-chars", 1,
NULL);
- col = hildon_touch_selector_append_column (HILDON_TOUCH_SELECTOR (w),
- model, renderer,
- "text", MILK_TASK_MODEL_COLUMN_TITLE,
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (col), renderer, FALSE);
+ gtk_cell_layout_set_cell_data_func (
+ GTK_CELL_LAYOUT (col), renderer,
+ (GtkCellLayoutDataFunc) priority_column_render_func,
+ self, NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ g_object_set (renderer,
+ "ellipsize", PANGO_ELLIPSIZE_END,
+ "alignment", PANGO_ALIGN_LEFT,
+ "xpad", HILDON_MARGIN_DEFAULT,
NULL);
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (col), renderer, TRUE);
+ gtk_cell_layout_set_cell_data_func (
+ GTK_CELL_LAYOUT (col), renderer,
+ (GtkCellLayoutDataFunc) name_column_render_func,
+ self, NULL);
+
g_object_unref (model);
- hildon_touch_selector_column_set_text_column (
- col, MILK_TASK_MODEL_COLUMN_TITLE);
hildon_touch_selector_set_column_selection_mode (
HILDON_TOUCH_SELECTOR (w),
HILDON_TOUCH_SELECTOR_SELECTION_MODE_MULTIPLE);
gtk_box_pack_start (GTK_BOX (priv->main_vbox), w, TRUE, TRUE, 0);
g_object_set (w, "can-focus", TRUE, NULL);
gtk_widget_grab_focus (w);
+
+ g_signal_connect (
+ G_OBJECT (w), "changed",
+ G_CALLBACK (task_view_selection_changed_cb), self);
priv->task_view = w;
- hildon_window_set_app_menu (HILDON_WINDOW (self), create_menu (self));
+ priv->app_menu = create_menu (self);
+ hildon_window_set_app_menu (
+ HILDON_WINDOW (self), HILDON_APP_MENU (priv->app_menu));
+
+ /* set up the cache */
+ priv->cache = milk_cache_get_default ();
+
+ /* break a cyclical dependency by doing this after the window is
+ * constructed */
+ g_idle_add ((GSourceFunc) begin_cache_idle, self);
}
static void
static void
milk_main_window_init (MilkMainWindow *self)
{
- self->priv = MILK_MAIN_WINDOW_PRIVATE (self);
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ self, MILK_TYPE_MAIN_WINDOW, MilkMainWindowPrivate);
}
GtkWidget*
-milk_main_window_new ()
+milk_main_window_get_default ()
{
- return g_object_new (MILK_TYPE_MAIN_WINDOW,
- NULL);
+ if (!default_window) {
+ default_window = g_object_new (MILK_TYPE_MAIN_WINDOW, NULL);
+ }
+
+ return default_window;
}
projects / milk / blobdiff