r3608 - in trunk/src/target/OM-2007.2/applications/openmoko-today2: . src

chris at sita.openmoko.org chris at sita.openmoko.org
Thu Dec 6 17:59:43 CET 2007


Author: chris
Date: 2007-12-06 17:59:42 +0100 (Thu, 06 Dec 2007)
New Revision: 3608

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-task-manager.c
   trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h
Log:
        * src/today-main.c: (set_time_idle), (clock_clicked_cb),
        (today_create_home_page), (digital_clock_notify),
        (small_clock_notify), (main):
        * src/today-pim-journal.c: (today_pim_journal_box_new):
        * src/today-task-manager.c: (today_task_manager_populate_tasks):
        * src/today.h:
        Allow the clock to be placed next to the date inside the date button,
        fixes bug #965 - This is controlled by gconf key
        /desktop/poky/interface/small_clock


Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog	2007-12-06 14:40:32 UTC (rev 3607)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog	2007-12-06 16:59:42 UTC (rev 3608)
@@ -1,5 +1,17 @@
 2007-12-06  Chris Lord  <chris at openedhand.com>
 
+	* src/today-main.c: (set_time_idle), (clock_clicked_cb),
+	(today_create_home_page), (digital_clock_notify),
+	(small_clock_notify), (main):
+	* src/today-pim-journal.c: (today_pim_journal_box_new):
+	* src/today-task-manager.c: (today_task_manager_populate_tasks):
+	* src/today.h:
+        Allow the clock to be placed next to the date inside the date button,
+        fixes bug #965 - This is controlled by gconf key
+        /desktop/poky/interface/small_clock
+
+2007-12-06  Chris Lord  <chris at openedhand.com>
+
 	* src/today-task-manager.c: (window_get_icon),
 	(today_task_manager_populate_tasks), (set_focus_cb),
 	(today_task_manager_page_create):

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	2007-12-06 14:40:32 UTC (rev 3607)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c	2007-12-06 16:59:42 UTC (rev 3608)
@@ -143,7 +143,7 @@
 	time = jana_ecal_utils_time_now (data->location);
 	jana_gtk_clock_set_time (JANA_GTK_CLOCK (data->clock), time);
 	date_str = jana_utils_strftime (time, "%A, %d. %B %Y");
-	gtk_button_set_label (GTK_BUTTON (data->date_button), date_str);
+	gtk_label_set_text (GTK_LABEL (data->date_label), date_str);
 	g_free (date_str);
 	
 	/* Update query every half-hour */
@@ -171,14 +171,14 @@
 static void
 clock_clicked_cb (JanaGtkClock *clock, GdkEventButton *event, TodayData *data)
 {
-	if (data->clock_item) launcher_start (data->window, data->clock_item,
-		(gchar *[]){ "openmoko-worldclock", NULL }, TRUE, TRUE);
+	/*if (data->clock_item) launcher_start (data->window, data->clock_item,
+		(gchar *[]){ "openmoko-worldclock", NULL }, TRUE, TRUE);*/
 }
 
 static GtkWidget *
 today_create_home_page (TodayData *data)
 {
-	GtkWidget *main_vbox, *vbox, *align;
+	GtkWidget *main_vbox, *align;
 	
 	/* Add home page */
 	main_vbox = gtk_vbox_new (FALSE, 0);
@@ -239,6 +239,7 @@
 	gtk_widget_show (data->clock);
 	g_signal_connect (data->clock, "clicked",
 		G_CALLBACK (clock_clicked_cb), data);
+	g_object_ref_sink (data->clock);
 
 	/* Pack widgets */
 	align = gtk_alignment_new (0.5, 0, 1, 0);
@@ -250,12 +251,11 @@
 	gtk_widget_show (data->message_box);
 	gtk_widget_show (align);
 	
-	vbox = gtk_vbox_new (FALSE, 6);
+	data->home_vbox = gtk_vbox_new (FALSE, 6);
 	gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 6, 6, 6);
-	gtk_box_pack_start (GTK_BOX (vbox), data->clock, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, TRUE, 0);
-	gtk_container_add (GTK_CONTAINER (data->bg_ebox), vbox);
-	gtk_widget_show (vbox);
+	gtk_box_pack_end (GTK_BOX (data->home_vbox), align, FALSE, TRUE, 0);
+	gtk_container_add (GTK_CONTAINER (data->bg_ebox), data->home_vbox);
+	gtk_widget_show (data->home_vbox);
 	
 	/* Set the time on the clock */
 	set_time_idle (data);
@@ -329,11 +329,40 @@
 	GConfValue *value;
 
 	value = gconf_entry_get_value (entry);
-	if (value) jana_gtk_clock_set_digital (JANA_GTK_CLOCK (data->clock),
-		gconf_value_get_bool (value));
+	if (value && (!gconf_value_get_bool (value))) {
+		gtk_aspect_frame_set (GTK_ASPECT_FRAME (data->date_aspect),
+			1.0, 0.5, 1.0, FALSE);
+		jana_gtk_clock_set_digital (JANA_GTK_CLOCK (data->clock),
+			FALSE);
+	} else {
+		gtk_aspect_frame_set (GTK_ASPECT_FRAME (data->date_aspect),
+			1.0, 0.5, 2.0, FALSE);
+		jana_gtk_clock_set_digital (JANA_GTK_CLOCK (data->clock),
+			TRUE);
+	}
 }
 
 static void
+small_clock_notify (GConfClient *client, guint cnxn_id,
+		    GConfEntry *entry, TodayData *data)
+{
+	GConfValue *value;
+	GtkWidget *parent;
+
+	if ((parent = gtk_widget_get_parent (data->clock)))
+		gtk_container_remove (GTK_CONTAINER (parent), data->clock);
+	
+	value = gconf_entry_get_value (entry);
+	if (value && (gconf_value_get_bool (value))) {
+		gtk_container_add (GTK_CONTAINER (
+			data->date_aspect), data->clock);
+	} else {
+		gtk_box_pack_start (GTK_BOX (data->home_vbox),
+			data->clock, TRUE, TRUE, 0);
+	}
+}
+
+static void
 location_notify (GConfClient *client, guint cnxn_id,
 		 GConfEntry *entry, TodayData *data)
 {
@@ -378,6 +407,7 @@
 	if (active) set_window_title (data);
 }
 
+#ifndef STANDALONE
 static GtkWidget *window;
 
 static void
@@ -386,6 +416,7 @@
 	gtk_window_resize (GTK_WINDOW (window), w, h);
 	gtk_window_move (GTK_WINDOW (window), x, y);
 }
+#endif
 
 int
 main (int argc, char **argv)
@@ -496,13 +527,14 @@
 		G_CALLBACK (is_active_notify), &data);
 	gtk_widget_show (data.window);
 
-	/* Listen to wallpaper setting */
+	/* Listen to settings */
 	gconf_client_add_dir (gconf_client_get_default (),
 		JANA_ECAL_LOCATION_KEY_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
 	gconf_client_notify_add (gconf_client_get_default (),
 		JANA_ECAL_LOCATION_KEY,
 		(GConfClientNotifyFunc)location_notify,
 		&data, NULL, NULL);
+	
 	gconf_client_add_dir (gconf_client_get_default (),
 		GCONF_POKY_INTERFACE_PREFIX, GCONF_CLIENT_PRELOAD_NONE, NULL);
 	gconf_client_notify_add (gconf_client_get_default (),
@@ -513,10 +545,18 @@
 		GCONF_POKY_INTERFACE_PREFIX GCONF_POKY_DIGITAL,
 		(GConfClientNotifyFunc)digital_clock_notify,
 		&data, NULL, NULL);
+	gconf_client_notify_add (gconf_client_get_default (),
+		GCONF_POKY_INTERFACE_PREFIX GCONF_POKY_SMALLCLOCK,
+		(GConfClientNotifyFunc)small_clock_notify,
+		&data, NULL, NULL);
+	
+	/* Fire off signals */
 	gconf_client_notify (gconf_client_get_default (),
 		GCONF_POKY_INTERFACE_PREFIX GCONF_POKY_WALLPAPER);
 	gconf_client_notify (gconf_client_get_default (),
 		GCONF_POKY_INTERFACE_PREFIX GCONF_POKY_DIGITAL);
+	gconf_client_notify (gconf_client_get_default (),
+		GCONF_POKY_INTERFACE_PREFIX GCONF_POKY_SMALLCLOCK);
 
 	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	2007-12-06 14:40:32 UTC (rev 3607)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c	2007-12-06 16:59:42 UTC (rev 3608)
@@ -219,10 +219,23 @@
 {
 	JanaStore *store;
 	MokoJournal *journal;
-	GtkWidget *vbox, *hbox, *image;
+	GtkWidget *vbox, *hbox, *image, *button, *align;
 	
-	data->date_button = gtk_button_new_with_label ("");
-
+	hbox = gtk_hbox_new (FALSE, 6);
+	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);
+	gtk_frame_set_shadow_type (GTK_FRAME (data->date_aspect),
+		GTK_SHADOW_NONE);
+	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_widget_show_all (hbox);
+	g_signal_connect (button, "clicked",
+		G_CALLBACK (header_clicked_cb), data);
+	
 	/* Missed calls box */
 	data->missed_calls_box = gtk_event_box_new ();
 	gtk_event_box_set_visible_window (GTK_EVENT_BOX (
@@ -294,12 +307,9 @@
 	g_signal_connect (data->tasks_box, "button-press-event",
 		G_CALLBACK (tasks_button_press_cb), data);
 	
-	g_signal_connect (data->date_button, "clicked",
-		G_CALLBACK (header_clicked_cb), data);
-	
 	/* Pack widgets */
 	vbox = gtk_vbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (vbox), data->date_button, FALSE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), 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-task-manager.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c	2007-12-06 14:40:32 UTC (rev 3607)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c	2007-12-06 16:59:42 UTC (rev 3608)
@@ -379,7 +379,7 @@
         /* Load into menu */
 	current = gdk_screen_get_active_window (screen);
         for (i = 0; i < nitems; i++) {
-                char *name, *bname;
+                char *name;
 		GtkWidget *task_tile;
 		GdkPixbuf *icon;
 		GdkWindow *window;

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	2007-12-06 14:40:32 UTC (rev 3607)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h	2007-12-06 16:59:42 UTC (rev 3608)
@@ -12,12 +12,14 @@
 #define GCONF_POKY_INTERFACE_PREFIX "/desktop/poky/interface"
 #define GCONF_POKY_WALLPAPER "/wallpaper"
 #define GCONF_POKY_DIGITAL "/digital_clock"
+#define GCONF_POKY_SMALLCLOCK "/small_clock"
 
 typedef struct {
 	/* Home */
 	GtkWidget *window;
 	GtkWidget *notebook;
 	GtkWidget *home_toolbar;
+	GtkWidget *home_vbox;
 	GtkWidget *clock;
 	GtkWidget *message_box;
 	GtkWidget *summary_box;
@@ -32,6 +34,8 @@
 	gchar *network_name;
 	
 	GtkWidget *date_button;
+	GtkWidget *date_aspect;
+	GtkWidget *date_label;
 	GtkWidget *missed_calls_box;
 	GtkWidget *missed_calls_label;
 	gint n_missed_calls;





More information about the commitlog mailing list