r3341 - in trunk/src/target/OM-2007.2/applications/openmoko-appmanager2: . src
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Fri Nov 2 17:47:14 CET 2007
Author: thomas
Date: 2007-11-02 17:47:12 +0100 (Fri, 02 Nov 2007)
New Revision: 3341
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/application-menu.c
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/Makefile.am:
* src/application-menu.c: (on_install_single_application_activate):
* src/tool-box.c: (on_apply_clicked):
Fix build after removal of filter-menu.
* src/appmanager-window.c: (main): Move toolbar and searchbar onto
navigation page rather than always being available.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog 2007-11-02 16:45:30 UTC (rev 3340)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog 2007-11-02 16:47:12 UTC (rev 3341)
@@ -1,6 +1,17 @@
2007-11-02 Thomas Wood <thomas at openedhand.com>
* src/Makefile.am:
+ * src/application-menu.c: (on_install_single_application_activate):
+ * src/tool-box.c: (on_apply_clicked):
+
+ Fix build after removal of filter-menu.
+
+ * src/appmanager-window.c: (main): Move toolbar and searchbar onto
+ navigation page rather than always being available.
+
+2007-11-02 Thomas Wood <thomas at openedhand.com>
+
+ * src/Makefile.am:
* src/appmanager-data.c: (application_manager_data_init),
(application_manager_data_set_main_window):
* src/appmanager-data.h:
Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/Makefile.am 2007-11-02 16:45:30 UTC (rev 3340)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/Makefile.am 2007-11-02 16:47:12 UTC (rev 3341)
@@ -4,7 +4,6 @@
openmoko_appmanager_SOURCES = appmanager-window.c\
application-menu.c\
- filter-menu.c\
ipkgapi.c\
navigation-area.c\
tool-box.c\
Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/application-menu.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/application-menu.c 2007-11-02 16:45:30 UTC (rev 3340)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/application-menu.c 2007-11-02 16:47:12 UTC (rev 3341)
@@ -19,7 +19,6 @@
*/
#include "application-menu.h"
-#include "filter-menu.h"
#include "appmanager-window.h"
#include "package-list.h"
#include "ipkgapi.h"
@@ -163,7 +162,6 @@
get_error_msg ());
break;
case INSTALL_SUCCESS:
- filter_menu_show_install_list (appdata);
infodialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_INFO,
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-11-02 16:45:30 UTC (rev 3340)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-window.c 2007-11-02 16:47:12 UTC (rev 3341)
@@ -48,7 +48,7 @@
GtkWidget *detail;
GtkWidget *notebook;
GtkWidget *searchbar;
- GtkWidget *vbox;
+ GtkWidget *vbox, *nav_vbox;
gint ret;
@@ -101,21 +101,26 @@
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), selectmenu);
gtk_menu_shell_append (GTK_MENU_SHELL (menubox), menuitem);
- toolbox = tool_box_new (appdata);
- gtk_box_pack_start (GTK_BOX (vbox), toolbox, FALSE, FALSE, 0);
-
- searchbar = search_bar_new (appdata);
- gtk_box_pack_start (GTK_BOX (vbox), searchbar, FALSE, FALSE, 0);
-
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_notebook_append_page (GTK_NOTEBOOK (notebook), navigation,
+ /* navigation page */
+ nav_vbox = gtk_vbox_new (FALSE, 0);
+ gtk_notebook_append_page (GTK_NOTEBOOK (notebook), nav_vbox,
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);
+ gtk_container_child_set (GTK_CONTAINER (notebook), nav_vbox, "tab-expand", TRUE, NULL);
+ toolbox = tool_box_new (appdata);
+ gtk_box_pack_start (GTK_BOX (nav_vbox), toolbox, FALSE, FALSE, 0);
+
+ searchbar = search_bar_new (appdata);
+ gtk_box_pack_start (GTK_BOX (nav_vbox), searchbar, FALSE, FALSE, 0);
+
+ navigation = navigation_area_new (appdata);
+ gtk_box_pack_start (GTK_BOX (nav_vbox), navigation, TRUE, TRUE, 0);
+
+
detail = detail_area_new (appdata);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), detail,
gtk_image_new_from_stock (GTK_STOCK_FILE, GTK_ICON_SIZE_LARGE_TOOLBAR));
@@ -137,7 +142,7 @@
/* Add section list to the filter menu */
package_list_add_section_to_filter_menu (appdata);
- search_bar_set_active_filter (searchbar, FILTER_INSTALLED);
+ search_bar_set_active_filter (MOKO_SEARCH_BAR (searchbar), FILTER_INSTALLED);
gtk_widget_show_all (GTK_WIDGET (window));
g_debug ("application manager enter main loop");
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-11-02 16:45:30 UTC (rev 3340)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/tool-box.c 2007-11-02 16:47:12 UTC (rev 3341)
@@ -27,7 +27,6 @@
#include "appmanager-window.h"
#include "apply-dialog.h"
#include "install-dialog.h"
-#include "filter-menu.h"
/*
* @brief The callback function of the button "upgrade"
@@ -100,8 +99,6 @@
g_thread_create (package_list_execute_change, data, TRUE, NULL);
gtk_dialog_run (GTK_DIALOG (installdialog));
gtk_widget_destroy (GTK_WIDGET (installdialog));
-
- filter_menu_show_install_list (MOKO_APPLICATION_MANAGER_DATA (data));
}
gtk_widget_destroy (dialog);
More information about the commitlog
mailing list
