Changeset 3543

Timestamp:

11/30/07 18:17:53 (5 years ago)

Author:

chris

Message:

• src/today-task-manager.c: (today_task_manager_populate_tasks), (set_focus_cb), (page_shown), (page_hidden), (today_task_manager_notify_visible_cb), (today_task_manager_visibility_notify_event_cb), (today_task_manager_unmap_cb), (today_task_manager_page_create):
• src/today.h: Grey out kill/jump-to/killall buttons where appropriate, fix spurious warnings on app exit

Location:

trunk/src/target/OM-2007.2/applications/openmoko-today2

Files:

• ChangeLog (modified) (1 diff)
• src/today-task-manager.c (modified) (8 diffs)
• src/today.h (modified) (1 diff)

trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog

@@ +1 @@
+2007-11-30  Chris Lord  <chris@openedhand.com>
+
+        * src/today-task-manager.c: (today_task_manager_populate_tasks),
+        (set_focus_cb), (page_shown), (page_hidden),
+        (today_task_manager_notify_visible_cb),
+        (today_task_manager_visibility_notify_event_cb),
+        (today_task_manager_unmap_cb), (today_task_manager_page_create):
+        * src/today.h:
+        Grey out kill/jump-to/killall buttons where appropriate, fix spurious
+        warnings on app exit
+
 2007-11-30  Chris Lord  <chris@openedhand.com>
 

trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c

@@ -344 +344 @@
         today_task_manager_free_tasks (data);
         
+        /* Return if our main window has gone (e.g. on quit) */
+        if ((!data->window) || (!data->window->window)) return;
+        
         /* Retrieve list of app windows from root window */
         display = gtk_widget_get_display (data->tasks_table);
@@ -381 +384 @@
                 GdkWindow *window;
 
-                if (GDK_WINDOW_XID (current) == windows[i]) continue;
+                if (current && GDK_WINDOW_XID (current) == windows[i]) continue;
                 if (GDK_WINDOW_XID (data->window->window) == windows[i])
                         continue;
@@ -428 +431 @@
                 gtk_widget_show (task_tile);
         }
-        g_object_unref (current);
-
-        /* If no windows were found, insert an insensitive "No tasks" item */
-        if (nitems == 0) {
-                GtkWidget *task_tile;
-                
-                task_tile = taku_icon_tile_new ();
+        if (current) g_object_unref (current);
+
+        /* If no windows were found, insert an insensitive "No tasks" item */
+        if (nitems == 0) {
+                GtkWidget *task_tile;
+                
+                task_tile = taku_icon_tile_new ();
                 taku_icon_tile_set_primary (TAKU_ICON_TILE (task_tile),
                         _("No active tasks"));
                 
-                gtk_widget_set_sensitive (task_tile, FALSE);
+                gtk_widget_set_sensitive (task_tile, FALSE);
 
                 gtk_container_add (GTK_CONTAINER (data->tasks_table),
                         task_tile);
                 gtk_widget_show (task_tile);
-        }
-
-        /* Cleanup */
-        XFree (windows);
+                
+                gtk_widget_set_sensitive (
+                        GTK_WIDGET (data->killall_button), FALSE);
+        } else {
+                gtk_widget_set_sensitive (
+                        GTK_WIDGET (data->killall_button), TRUE);
+        }
+
+        /* Cleanup */
+        XFree (windows);
+}
+
+static void
+set_focus_cb (GtkWindow *window, GtkWidget *widget, TodayData *data)
+{
+        gtk_widget_set_sensitive (data->kill_button, TAKU_IS_TILE (widget));
+        gtk_widget_set_sensitive (data->switch_button, TAKU_IS_TILE (widget));
+}
+
+static void
+page_shown (TodayData *data)
+{
+        today_task_manager_populate_tasks (data);
+        g_signal_connect (data->window, "set-focus",
+                G_CALLBACK (set_focus_cb), data);
+}
+
+static void
+page_hidden (TodayData *data)
+{
+        today_task_manager_free_tasks (data);
+        g_signal_handlers_disconnect_by_func (data->window, set_focus_cb, data);
 }
 
@@ -456 +487 @@
         if ((!hidden) && (!GTK_WIDGET_VISIBLE (gobject))) {
                 hidden = TRUE;
-                today_task_manager_free_tasks (data);
+                page_hidden (data);
         }
 }
@@ -468 +499 @@
              (event->state == GDK_VISIBILITY_UNOBSCURED)) && (hidden)) {
                 hidden = FALSE;
-                today_task_manager_populate_tasks (data);
+                page_shown (data);
         } else if ((event->state == GDK_VISIBILITY_FULLY_OBSCURED) &&
                    (!hidden)) {
                 hidden = TRUE;
-                today_task_manager_free_tasks (data);
+                page_hidden (data);
         }
         
@@ -483 +514 @@
         if (!hidden) {
                 hidden = TRUE;
-                today_task_manager_free_tasks (data);
+                page_hidden (data);
         }
 }
@@ -716 +747 @@
 {
         GtkWidget *vbox, *toolbar, *viewport, *scroll;
-        GtkToolItem *button;
         
         vbox = gtk_vbox_new (FALSE, 0);
@@ -725 +755 @@
 
         /* Kill all apps button */
-        button = gtk_tool_button_new_from_stock (MOKO_STOCK_FOLDER_DELETE);
-        gtk_tool_item_set_expand (button, TRUE);
-        gtk_toolbar_insert (GTK_TOOLBAR (toolbar), button, 0);
+        data->kill_button = gtk_tool_button_new_from_stock (
+                MOKO_STOCK_FOLDER_DELETE);
+        gtk_tool_item_set_expand (data->kill_button, TRUE);
+        gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data->kill_button, 0);
         gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
                 gtk_separator_tool_item_new (), 0);
-        g_signal_connect (G_OBJECT (button), "clicked",
+        g_signal_connect (data->kill_button, "clicked",
                 G_CALLBACK (today_task_manager_killall_clicked_cb), data);
 
         /* Switch to app button */
-        button = gtk_tool_button_new_from_stock (GTK_STOCK_JUMP_TO);
-        gtk_tool_item_set_expand (button, TRUE);
-        gtk_toolbar_insert (GTK_TOOLBAR (toolbar), button, 0);
+        data->switch_button = gtk_tool_button_new_from_stock (GTK_STOCK_JUMP_TO);
+        gtk_tool_item_set_expand (data->switch_button, TRUE);
+        gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data->switch_button, 0);
         gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
                 gtk_separator_tool_item_new (), 0);
-        g_signal_connect (G_OBJECT (button), "clicked",
+        g_signal_connect (data->switch_button, "clicked",
                 G_CALLBACK (today_task_manager_raise_clicked_cb), data);
 
         /* Kill app button */
-        button = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE);
-        gtk_tool_item_set_expand (button, TRUE);
-        gtk_toolbar_insert (GTK_TOOLBAR (toolbar), button, 0);
-        g_signal_connect (G_OBJECT (button), "clicked",
+        data->killall_button = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE);
+        gtk_tool_item_set_expand (data->killall_button, TRUE);
+        gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data->killall_button, 0);
+        g_signal_connect (data->killall_button, "clicked",
                 G_CALLBACK (today_task_manager_kill_clicked_cb), data);
 

trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h

@@ -61 +61 @@
         GdkWindow *root_window;
         GtkWidget *tasks_table;
+        GtkToolItem *kill_button;
+        GtkToolItem *killall_button;
+        GtkToolItem *switch_button;
 } TodayData;
 #endif