r1817 - in trunk/src/target/OM-2007/examples: . openmoko-stylus-demo/src

[mickey at sita.openmoko.org]

Author: mickey
Date: 2007-04-24 01:47:01 +0200 (Tue, 24 Apr 2007)
New Revision: 1817

Modified:
   trunk/src/target/OM-2007/examples/examples.pro
   trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src/demo-main.c
Log:
examples: use MokoScrolledPane for both panes


Modified: trunk/src/target/OM-2007/examples/examples.pro
===================================================================
--- trunk/src/target/OM-2007/examples/examples.pro	2007-04-23 23:46:33 UTC (rev 1816)
+++ trunk/src/target/OM-2007/examples/examples.pro	2007-04-23 23:47:01 UTC (rev 1817)
@@ -5,7 +5,6 @@
   openmoko-finger-demo \
   openmoko-panel-demo-simple \
   openmoko-panel-demo \
-  openmoko-dialog-demo \
   openmoko-gsmd-demo
 
 

Modified: trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src/demo-main.c
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src/demo-main.c	2007-04-23 23:46:33 UTC (rev 1816)
+++ trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src/demo-main.c	2007-04-23 23:47:01 UTC (rev 1817)
@@ -18,7 +18,7 @@
  */
 
 #include <libmokoui/moko-application.h>
-#include <libmokoui/moko-details-window.h>
+#include <libmokoui/moko-scrolled-pane.h>
 #include <libmokoui/moko-dialog-window.h>
 #include <libmokoui/moko-paned-window.h>
 #include <libmokoui/moko-tool-box.h>
@@ -301,8 +301,13 @@
     gtk_tree_view_set_model (moko_treeview, GTK_TREE_MODEL (model) );
     clist_insert(moko_treeview);
 
-    moko_paned_window_set_upper_pane( window, GTK_WIDGET(moko_tree_view_put_into_scrolled_window(moko_treeview)) );
+    /*moko_paned_window_set_upper_pane( window, GTK_WIDGET(moko_tree_view_put_into_scrolled_window(moko_treeview)) );*/
 
+    MokoScrolledPane* navigationwindow = moko_scrolled_pane_new();
+    GtkScrolledWindow* scrolledwindow1 = moko_scrolled_pane_get_scrolled_window( navigationwindow );
+    gtk_container_add( scrolledwindow1, GTK_WIDGET(moko_treeview) );
+    moko_paned_window_set_upper_pane( window, GTK_WIDGET(navigationwindow) );
+
     GtkButton* button1;
     GtkButton* button2;
     GtkButton* button3;
@@ -356,10 +361,12 @@
             "\ndata entry here\n \n \n \n \n \n \n \nThis particular label\n \nis very long\n"
             "\nto make the fullscreen\n \ntrigger more interesting\n \n \n" );
 
-    MokoDetailsWindow* detailswindow = moko_details_window_new();
-    gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(detailswindow), GTK_WIDGET(details) );
+    MokoScrolledPane* detailswindow = moko_scrolled_pane_new();
+    GtkScrolledWindow* scrolledwindow2 = moko_scrolled_pane_get_scrolled_window( detailswindow );
+    gtk_scrolled_window_add_with_viewport( scrolledwindow2, GTK_WIDGET(details) );
+    moko_paned_window_set_lower_pane( window, GTK_WIDGET(detailswindow) );
 
-    moko_paned_window_set_lower_pane( window, GTK_WIDGET(moko_details_window_put_in_box(detailswindow) ) );
+    moko_paned_window_set_ratio( window, 50 );
 
     /* show everything and run main loop */
     gtk_widget_show_all( GTK_WIDGET(window) );