r3952 - in trunk/src/target/OM-2007.2/applications/openmoko-today2: . src
chris at sita.openmoko.org
chris at sita.openmoko.org
Fri Jan 25 15:54:19 CET 2008
Author: chris
Date: 2008-01-25 15:54:18 +0100 (Fri, 25 Jan 2008)
New Revision: 3952
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h
Log:
* src/today-main.c: (bg_child_expose_cb), (reduced_notify), (main):
* src/today-pim-journal.c: (today_pim_journal_box_new):
* src/today.h:
Add a 'reduced' mode (controlled by /desktop/poky/interface/reduced)
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog 2008-01-25 05:22:06 UTC (rev 3951)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog 2008-01-25 14:54:18 UTC (rev 3952)
@@ -1,3 +1,10 @@
+2008-01-25 Chris Lord <chris at openedhand.com>
+
+ * src/today-main.c: (bg_child_expose_cb), (reduced_notify), (main):
+ * src/today-pim-journal.c: (today_pim_journal_box_new):
+ * src/today.h:
+ Add a 'reduced' mode (controlled by /desktop/poky/interface/reduced)
+
2008-01-24 Chris Lord <chris at openedhand.com>
* src/today-utils.c:
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c 2008-01-25 05:22:06 UTC (rev 3951)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c 2008-01-25 14:54:18 UTC (rev 3952)
@@ -7,6 +7,7 @@
#include <gconf/gconf-client.h>
#include <moko-finger-scroll.h>
#include <moko-stock.h>
+#include <moko-search-bar.h>
#include <libtaku/launcher-util.h>
#include <libtaku/xutil.h>
#include <unistd.h>
@@ -79,25 +80,12 @@
bg_child_expose_cb (GtkWidget *widget, GdkEventExpose *event, TodayData *data)
{
cairo_t *cr;
-/* GtkWidget *parent;
- gint x = 0, y = 0;
- if (!data->wallpaper) return FALSE;
+ if ((!GTK_WIDGET_VISIBLE (data->missed_calls_box)) &&
+ (!GTK_WIDGET_VISIBLE (data->unread_messages_box)) &&
+ (!GTK_WIDGET_VISIBLE (data->dates_box)) &&
+ (!GTK_WIDGET_VISIBLE (data->tasks_box))) return FALSE;
- parent = widget;
- do {
- if (!GTK_WIDGET_NO_WINDOW (parent)) {
- x += parent->allocation.x;
- y += parent->allocation.y;
- }
- parent = gtk_widget_get_parent (parent);
- } while (parent && (parent != data->bg_ebox));
- if (!parent) return FALSE;
-
- gdk_draw_drawable (widget->window, widget->style->black_gc,
- data->wallpaper, x, y,
- 0, 0, -1, -1);*/
-
/* Draw a semi-transparent rounded rectangle */
cr = gdk_cairo_create (widget->window);
cairo_translate (cr, widget->allocation.x, widget->allocation.y);
@@ -378,6 +366,38 @@
}
}
+static void
+reduced_notify (GConfClient *client, guint cnxn_id,
+ GConfEntry *entry, TodayData *data)
+{
+ GConfValue *value;
+ gboolean hide;
+
+ value = gconf_entry_get_value (entry);
+ hide = (value && gconf_value_get_bool (value)) ? TRUE : FALSE;
+ g_object_set (G_OBJECT (data->clock), "visible", !hide, NULL);
+ g_object_set (G_OBJECT (data->search_bar), "visible", !hide, NULL);
+ g_object_set (G_OBJECT (data->date_button), "visible", !hide, NULL);
+ g_object_set (G_OBJECT (data->home_toolbar), "visible", !hide, NULL);
+
+ /* Unset application filter */
+ if (hide) {
+ gint rows;
+ GtkTreeModel *model;
+ GtkComboBox *combo = moko_search_bar_get_combo_box (
+ MOKO_SEARCH_BAR (data->search_bar));
+ GtkEntry *entry = moko_search_bar_get_entry (
+ MOKO_SEARCH_BAR (data->search_bar));
+
+ gtk_entry_set_text (entry, "");
+
+ /* FIXME: Assuming last row is 'All' category... */
+ model = gtk_combo_box_get_model (combo);
+ rows = gtk_tree_model_iter_n_children (model, NULL);
+ gtk_combo_box_set_active (combo, rows - 1);
+ }
+}
+
static gboolean active = TRUE;
static void
@@ -549,6 +569,10 @@
GCONF_POKY_INTERFACE_PREFIX GCONF_POKY_SMALLCLOCK,
(GConfClientNotifyFunc)small_clock_notify,
&data, NULL, NULL);
+ gconf_client_notify_add (gconf_client_get_default (),
+ GCONF_POKY_INTERFACE_PREFIX GCONF_POKY_REDUCED,
+ (GConfClientNotifyFunc)reduced_notify,
+ &data, NULL, NULL);
/* Fire off signals */
gconf_client_notify (gconf_client_get_default (),
@@ -557,6 +581,8 @@
GCONF_POKY_INTERFACE_PREFIX GCONF_POKY_DIGITAL);
gconf_client_notify (gconf_client_get_default (),
GCONF_POKY_INTERFACE_PREFIX GCONF_POKY_SMALLCLOCK);
+ gconf_client_notify (gconf_client_get_default (),
+ GCONF_POKY_INTERFACE_PREFIX GCONF_POKY_REDUCED);
gtk_main ();
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c 2008-01-25 05:22:06 UTC (rev 3951)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c 2008-01-25 14:54:18 UTC (rev 3952)
@@ -310,10 +310,10 @@
{
JanaStore *store;
MokoJournal *journal;
- GtkWidget *vbox, *hbox, *image, *button, *align;
+ GtkWidget *vbox, *hbox, *image, *align;
hbox = gtk_hbox_new (FALSE, 6);
- button = gtk_button_new ();
+ data->date_button = gtk_button_new ();
data->date_label = gtk_label_new (NULL);
data->date_aspect = gtk_aspect_frame_new (NULL, 0.5, 0.5, 1.0, FALSE);
align = gtk_alignment_new (1.0, 0.5, 1.0, 1.0);
@@ -322,9 +322,9 @@
gtk_container_add (GTK_CONTAINER (align), data->date_aspect);
gtk_box_pack_start (GTK_BOX (hbox), data->date_label, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox), align, TRUE, TRUE, 0);
- gtk_container_add (GTK_CONTAINER (button), hbox);
+ gtk_container_add (GTK_CONTAINER (data->date_button), hbox);
gtk_widget_show_all (hbox);
- g_signal_connect (button, "clicked",
+ g_signal_connect (data->date_button, "clicked",
G_CALLBACK (header_clicked_cb), data);
/* Missed calls box */
@@ -400,7 +400,7 @@
/* Pack widgets */
vbox = gtk_vbox_new (FALSE, 6);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), data->date_button, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox),
data->missed_calls_box, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox),
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h 2008-01-25 05:22:06 UTC (rev 3951)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h 2008-01-25 14:54:18 UTC (rev 3952)
@@ -13,6 +13,7 @@
#define GCONF_POKY_WALLPAPER "/wallpaper"
#define GCONF_POKY_DIGITAL "/digital_clock"
#define GCONF_POKY_SMALLCLOCK "/small_clock"
+#define GCONF_POKY_REDUCED "/reduced"
typedef struct {
/* Home */
More information about the commitlog
mailing list
