r3270 - in trunk/src/target/OM-2007.2/applications/openmoko-appmanager2: . src

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-10-25 16:40:15 +0200 (Thu, 25 Oct 2007)
New Revision: 3270

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-window.c
   trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/tool-box.c
Log:
* src/appmanager-window.c: (main): Add notebook for list/details
seperation as per OpenMoko 2007.2 style
* src/tool-box.c: (tool_box_new): Fix toolbar


Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog	2007-10-25 13:41:39 UTC (rev 3269)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog	2007-10-25 14:40:15 UTC (rev 3270)
@@ -1,5 +1,11 @@
 2007-10-25  Thomas Wood  <thomas at openedhand.com>
 
+	* src/appmanager-window.c: (main): Add notebook for list/details
+	seperation as per OpenMoko 2007.2 style
+	* src/tool-box.c: (tool_box_new): Fix toolbar
+
+2007-10-25  Thomas Wood  <thomas at openedhand.com>
+
 	* src/detail-area.c: (detail_area_update_info): Check for NULL before
 	  unreferencing the pixbuf
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-window.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-window.c	2007-10-25 13:41:39 UTC (rev 3269)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-window.c	2007-10-25 14:40:15 UTC (rev 3270)
@@ -47,6 +47,7 @@
   GtkWidget       *navigation;
   GtkWidget       *toolbox;
   GtkWidget       *detail;
+  GtkWidget       *notebook;
 
   //GtkWidget       *menubox;
   GtkWidget *vbox;
@@ -79,6 +80,7 @@
 
   /* main vbox */
   vbox = gtk_vbox_new (FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (appdata->mwindow), vbox);
 
   appmenu = application_menu_new (appdata);
 
@@ -110,16 +112,20 @@
 
   toolbox = tool_box_new (appdata);
   gtk_box_pack_start (GTK_BOX (vbox), toolbox, FALSE, FALSE, 0);
-  //moko_paned_window_add_toolbox (window, toolbox);
 
+  notebook = gtk_notebook_new ();
+  gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_BOTTOM);
+  gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
+
   navigation = navigation_area_new (appdata);
-  gtk_box_pack_start (GTK_BOX (vbox), navigation, TRUE, TRUE, 0);
-  //moko_paned_window_set_navigation_pane (window, navigation);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), navigation,
+     gtk_image_new_from_stock (GTK_STOCK_INDEX, GTK_ICON_SIZE_LARGE_TOOLBAR));
+  gtk_container_child_set (GTK_CONTAINER (notebook), navigation, "tab-expand", TRUE, NULL);
 
   detail = detail_area_new (appdata);
-  gtk_box_pack_start (GTK_BOX (vbox), detail, TRUE, TRUE, 0);
-  //moko_paned_window_set_details_pane (window, detail);
-  gtk_container_add (GTK_CONTAINER (appdata->mwindow), vbox);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), detail,
+     gtk_image_new_from_stock (GTK_STOCK_FILE, GTK_ICON_SIZE_LARGE_TOOLBAR));
+  gtk_container_child_set (GTK_CONTAINER (notebook), detail, "tab-expand", TRUE, NULL);
 
   /* Load the list of all package in the memory */
   ret = init_package_list (appdata);

Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/tool-box.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/tool-box.c	2007-10-25 13:41:39 UTC (rev 3269)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/tool-box.c	2007-10-25 14:40:15 UTC (rev 3270)
@@ -180,12 +180,16 @@
   g_signal_connect ((gpointer)bupgrade, "clicked",
                     G_CALLBACK (on_upgrade_clicked), 
                     appdata);
+  gtk_toolbar_insert (GTK_TOOLBAR (toolbox), bupgrade, -1);
+  gtk_container_child_set (GTK_CONTAINER (toolbox), bupgrade, "expand", TRUE, NULL);
 
   anImage = gtk_image_new_from_file (PKGDATADIR "/Apply.png");
   bapply = gtk_tool_button_new (anImage, "Apply");
   g_signal_connect ((gpointer)bapply, "clicked",
                     G_CALLBACK (on_apply_clicked), 
                     appdata);
+  gtk_toolbar_insert (GTK_TOOLBAR (toolbox), bapply, -1);
+  gtk_container_child_set (GTK_CONTAINER (toolbox), bapply, "expand", TRUE, NULL);
 #if 0
   searchentry = moko_tool_box_get_entry (toolbox);
   application_manager_data_set_search_entry (appdata, GTK_ENTRY (searchentry));