r319 - in trunk/src/target/OM-2007/examples: . openmoko-paned-demo-simple openmoko-paned-demo-simple/src
mickey at gta01.hmw-consulting.de
mickey at gta01.hmw-consulting.de
Wed Dec 6 11:28:26 CET 2006
Author: mickey
Date: 2006-12-06 10:28:25 +0000 (Wed, 06 Dec 2006)
New Revision: 319
Added:
trunk/src/target/OM-2007/examples/openmoko-paned-demo-simple/openmoko-paned-demo-simple.pro
Removed:
trunk/src/target/OM-2007/examples/openmoko-paned-demo-simple/openmoko-paned-demo.pro
Modified:
trunk/src/target/OM-2007/examples/examples.pro
trunk/src/target/OM-2007/examples/openmoko-paned-demo-simple/configure.ac
trunk/src/target/OM-2007/examples/openmoko-paned-demo-simple/src/demo-main.c
Log:
openmoko-paned-demo-simple: make it work
Modified: trunk/src/target/OM-2007/examples/examples.pro
===================================================================
--- trunk/src/target/OM-2007/examples/examples.pro 2006-12-06 10:26:14 UTC (rev 318)
+++ trunk/src/target/OM-2007/examples/examples.pro 2006-12-06 10:28:25 UTC (rev 319)
@@ -1,3 +1,3 @@
TEMPLATE = subdirs
-SUBDIRS = openmoko-paned-demo openmoko-finger-demo
+SUBDIRS = openmoko-paned-demo-simple openmoko-paned-demo openmoko-finger-demo
Modified: trunk/src/target/OM-2007/examples/openmoko-paned-demo-simple/configure.ac
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-paned-demo-simple/configure.ac 2006-12-06 10:26:14 UTC (rev 318)
+++ trunk/src/target/OM-2007/examples/openmoko-paned-demo-simple/configure.ac 2006-12-06 10:28:25 UTC (rev 319)
@@ -1,5 +1,5 @@
AC_PREREQ(2.53)
-AC_INIT(openmoko-paned-demo, 1.0.0, http://www.openmoko.org/)
+AC_INIT(openmoko-paned-demo-simple, 1.0.0, http://www.openmoko.org/)
AM_INIT_AUTOMAKE()
AC_CONFIG_SRCDIR(src/demo-main.c)
AM_CONFIG_HEADER(config.h)
Copied: trunk/src/target/OM-2007/examples/openmoko-paned-demo-simple/openmoko-paned-demo-simple.pro (from rev 318, trunk/src/target/OM-2007/examples/openmoko-paned-demo-simple/openmoko-paned-demo.pro)
Deleted: trunk/src/target/OM-2007/examples/openmoko-paned-demo-simple/openmoko-paned-demo.pro
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-paned-demo-simple/openmoko-paned-demo.pro 2006-12-06 10:26:14 UTC (rev 318)
+++ trunk/src/target/OM-2007/examples/openmoko-paned-demo-simple/openmoko-paned-demo.pro 2006-12-06 10:28:25 UTC (rev 319)
@@ -1,6 +0,0 @@
-MOKOCONFIG = mokoui
-
-HEADERS = src/demo-main.h
-SOURCES = src/demo-main.c
-
-include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified: trunk/src/target/OM-2007/examples/openmoko-paned-demo-simple/src/demo-main.c
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-paned-demo-simple/src/demo-main.c 2006-12-06 10:26:14 UTC (rev 318)
+++ trunk/src/target/OM-2007/examples/openmoko-paned-demo-simple/src/demo-main.c 2006-12-06 10:28:25 UTC (rev 319)
@@ -30,88 +30,6 @@
#include <gtk/gtkmenu.h>
#include <gtk/gtktreeview.h>
-
-static GtkTreeModel *
-create_model (void)
-{
-
- GtkListStore *store;
- GtkTreeIter iter;
- gint i;
- gchar *stuff[19][2] = { { "Sean", "1111111111" },
- { "Tom", "22222222222" },
- { "Steven", "02134567890" },
- { "Tony", "02178789999" },
- { "Gordon", "02122222222" },
- { "Gordon", "02122222222" },
- { "Gordon", "02122222222" },
- { "Gordon", "02122222222" },
- { "Gordon", "02122222222" },
- { "Gordon", "02122222222" },
- { "Gordon", "02122222222" },
- { "Gordon", "02122222222" },
- { "Gordon", "02122222222" },
- { "Gordon", "02122222222" },
- { "Gordon", "02122222222" },
- { "Gordon", "02122222222" },
- { "Gordon", "02122222222" },
- { "Gordon", "02122222222" },
- { "jeff", "02133333333" } };
-
- /* create list store */
-
- store = gtk_list_store_new (2,
- G_TYPE_STRING,
- G_TYPE_STRING);
- /* add data to the list store */
- for (i = 0; i < 19; i++)
- {
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter,
- 0, stuff[i][0],
- 1, stuff[i][1],
- -1);
- }
-
- return GTK_TREE_MODEL (store);
-}
-
-
-void clist_insert(MokoTreeView *clist)
-{
- GtkCellRenderer *renderer;
- GtkTreeViewColumn *column;
-
- renderer = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes("Name",
- renderer,
- "text",
- 0,
- NULL);
-
-
- gtk_tree_view_column_set_sort_column_id(column, 0);
- gtk_tree_view_append_column(clist, column);
- gtk_tree_view_column_set_min_width(column, 142);
-
- renderer = gtk_cell_renderer_text_new();
-
- column = gtk_tree_view_column_new_with_attributes("Cell Phone",
- renderer,
- "text",
- 1,
- NULL);
-
- gtk_tree_view_column_set_sort_column_id(column, 1);
- gtk_tree_view_append_column(clist, column);
- gtk_tree_view_column_set_min_width(column, 156);
-
-
- return;
-}
-
-
-
void cb_searchbox_visible(MokoToolBox* toolbox, gpointer user_data)
{
g_debug( "openmoko-paned-demo: searchbox now visible" );
@@ -205,22 +123,9 @@
g_signal_connect( G_OBJECT(window), "delete_event", G_CALLBACK(gtk_main_quit), NULL );
/* navigation area */
- //GtkLabel* navigation = gtk_label_new( "Add your widget for navigating\nthrough appplication specific\ndata here" );
+ GtkLabel* navigation = gtk_label_new( "Add your widget for navigating\nthrough appplication specific\ndata here" );
+ moko_paned_window_set_upper_pane( window, GTK_WIDGET(navigation) );
- MokoTreeView *moko_treeview;
- GtkTreeModel *model = create_model ();
- MokoNavigationList *moko_navigation_list;
-
- moko_navigation_list = moko_navigation_list_new ();
- moko_treeview = moko_navigation_list_get_tree_view (moko_navigation_list);
- gtk_tree_view_set_model (moko_treeview, GTK_TREE_MODEL (model) );
- clist_insert(moko_treeview);
-
- //moko_paned_window_set_upper_pane( window, GTK_WIDGET(navigation) );
- moko_paned_window_set_upper_pane( window, GTK_WIDGET(moko_navigation_list) );
-
-
-
GtkButton* button1;
GtkButton* button2;
GtkButton* button3;
@@ -239,9 +144,7 @@
g_signal_connect( G_OBJECT(toolbox), "searchbox_invisible", G_CALLBACK(cb_searchbox_invisible), NULL );
button1 = moko_tool_box_add_action_button( toolbox );
- //gtk_button_set_label( button1, "Action 1" );
- moko_pixmap_button_set_action_btn_upper_stock (button1, "icon_message");
- moko_pixmap_button_set_action_btn_lower_label (button1, "Edit");
+ gtk_button_set_label( button1, "Action 1" );
button2 = moko_tool_box_add_action_button( toolbox );
gtk_button_set_label( button2, "Action 2" );
button3 = moko_tool_box_add_action_button( toolbox );
More information about the commitlog
mailing list
