#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-auth.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)
+
+static GtkWidget *default_window = NULL;
struct _MilkMainWindowPrivate
{
+ MilkAuth *auth;
+
+ GtkWidget *app_menu;
+
GtkWidget *main_vbox;
GtkWidget *new_task_entry;
GtkWidget *task_view;
- GtkWidget *action_bar;
+ GtkWidget *task_selector;
};
+enum {
+ TASK_VIEW_COLUMN_TITLE,
+ 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 void
complete_clicked_cb (GtkButton *button,
MilkMainWindow *window)
{
else
gtk_widget_hide (w);
}
-}
-
-static GtkWidget*
-create_menu (gpointer user_data)
-{
- HildonAppMenu *menu;
- MenuItem *menu_array;
- gint i, length;
- GtkWidget *w;
-
- menu = HILDON_APP_MENU (hildon_app_menu_new ());
-
- 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);
- }
-
- 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);
- }
-
- gtk_widget_show (GTK_WIDGET (menu));
-
- return GTK_WIDGET (menu);
-}
-
-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,
- MilkMainWindow *window)
-{
- MilkMainWindowPrivate *priv;
- GList *rows;
- gboolean show = FALSE;
- gint i;
-
- 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);
- }
+ g_list_free (rows);
}
static GtkWidget*
GtkTreeIter *iter,
gpointer user_data)
{
- MilkTask *task;
- char *title;
+ RtmTask *task;
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_get (task, "title", &title, NULL);
- g_object_set (renderer, "text", title, NULL);
-
- g_free (title);
g_object_unref (task);
}
+static gboolean
+begin_auth_idle (MilkMainWindow *window)
+{
+ MilkMainWindowPrivate *priv;
+
+ priv = MILK_MAIN_WINDOW_PRIVATE (window);
+
+ /* FIXME: cut this */
+ g_debug ("trying to run the milk auth demo");
+ milk_auth_log_in (priv->auth);
+
+ return FALSE;
+}
+
static void
milk_main_window_constructed (GObject* object)
{
MilkMainWindow *self = MILK_MAIN_WINDOW (object);
MilkMainWindowPrivate *priv = MILK_MAIN_WINDOW_PRIVATE (object);
GtkWidget *w;
- GtkWidget *pannable;
+ GtkTreeModel *model;
+ GtkCellRenderer *renderer;
+ HildonTouchSelectorColumn *col;
w = gtk_vbox_new (FALSE, HILDON_MARGIN_DEFAULT);
gtk_container_add (GTK_CONTAINER (self), w);
/*
* Task List
*/
- w = hildon_pannable_area_new ();
- gtk_box_pack_start (GTK_BOX (priv->main_vbox), w, TRUE, TRUE, 0);
- pannable = w;
+ priv->auth = milk_auth_get_default ();
+ model = GTK_TREE_MODEL (milk_task_model_new (priv->auth));
+ w = hildon_touch_selector_new ();
+
+
+ renderer = gtk_cell_renderer_text_new ();
+ g_object_set (renderer,
+ "ellipsize", PANGO_ELLIPSIZE_END,
+ NULL);
+
+ col = hildon_touch_selector_append_column (
+ HILDON_TOUCH_SELECTOR (w), model, NULL, 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) contact_column_render_func,
+ self, NULL);
+ g_object_unref (model);
+
+ hildon_touch_selector_set_column_selection_mode (
+ HILDON_TOUCH_SELECTOR (w),
+ HILDON_TOUCH_SELECTOR_SELECTION_MODE_MULTIPLE);
+ hildon_touch_selector_set_hildon_ui_mode (
+ HILDON_TOUCH_SELECTOR (w), HILDON_UI_MODE_EDIT);
+ hildon_touch_selector_unselect_all (
+ HILDON_TOUCH_SELECTOR (w), TASK_VIEW_COLUMN_TITLE);
- /* FIXME: attach the model (create a new MilkTaskModel class that syncs
- * with the cached tasks) */
- w = gtk_tree_view_new ();
- hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable),
- w);
+ 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;
- /*
- * Action Bar
- */
- w = gtk_hbox_new (TRUE, HILDON_MARGIN_DEFAULT);
- gtk_box_pack_start (GTK_BOX (priv->main_vbox), w, FALSE, FALSE, 0);
- priv->action_bar = w;
+ priv->app_menu = create_menu (self);
+ hildon_window_set_app_menu (
+ HILDON_WINDOW (self), HILDON_APP_MENU (priv->app_menu));
- /* FIXME: these are probably better off being icons, for width reasons
- */
- w = hildon_button_new_with_text (
- HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
- HILDON_BUTTON_ARRANGEMENT_VERTICAL,
- _("Complete"), "");
- gtk_container_add (GTK_CONTAINER (priv->action_bar), w);
- g_signal_connect (w, "clicked", G_CALLBACK (complete_clicked_cb), self);
-
- w = hildon_button_new_with_text (
- HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
- HILDON_BUTTON_ARRANGEMENT_VERTICAL,
- _("Delete"), "");
- gtk_container_add (GTK_CONTAINER (priv->action_bar), w);
- g_signal_connect (w, "clicked", G_CALLBACK (delete_clicked_cb), self);
-
- w = hildon_button_new_with_text (
- HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
- HILDON_BUTTON_ARRANGEMENT_VERTICAL,
- _("Priority +"), "");
- gtk_container_add (GTK_CONTAINER (priv->action_bar), w);
- g_signal_connect (w, "clicked", G_CALLBACK (priority_plus_clicked_cb),
- self);
-
- w = hildon_button_new_with_text (
- HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
- HILDON_BUTTON_ARRANGEMENT_VERTICAL,
- _("Priority -"), "");
- gtk_container_add (GTK_CONTAINER (priv->action_bar), w);
- g_signal_connect (w, "clicked", G_CALLBACK (priority_minus_clicked_cb),
- self);
-
- w = hildon_button_new_with_text (
- HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
- HILDON_BUTTON_ARRANGEMENT_VERTICAL,
- _("Edit"), "");
- gtk_container_add (GTK_CONTAINER (priv->action_bar), w);
- g_signal_connect (w, "clicked", G_CALLBACK (edit_clicked_cb),
- self);
-
- w = hildon_button_new_with_text (
- HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
- HILDON_BUTTON_ARRANGEMENT_VERTICAL,
- _("Edit Tags"), "");
- gtk_container_add (GTK_CONTAINER (priv->action_bar), w);
- g_signal_connect (w, "clicked", G_CALLBACK (edit_tags_clicked_cb),
- self);
+ /* break a cyclical dependency by doing this after the window is
+ * constructed */
+ g_idle_add ((GSourceFunc) begin_auth_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