r1818 - in trunk/src/target/OM-2007: applications/openmoko-appmanager/src applications/openmoko-chordmaster/src applications/openmoko-contacts/src applications/openmoko-messages/src applications/openmoko-rssreader/src examples/openmoko-stylus-demo/src examples/openmoko-stylus-demo-simple/src openmoko-libs/libmokoui
mickey at sita.openmoko.org
mickey at sita.openmoko.org
Tue Apr 24 12:44:39 CEST 2007
Author: mickey
Date: 2007-04-24 12:44:37 +0200 (Tue, 24 Apr 2007)
New Revision: 1818
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c
trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.c
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c
trunk/src/target/OM-2007/applications/openmoko-rssreader/src/main.c
trunk/src/target/OM-2007/examples/openmoko-stylus-demo-simple/src/demo-main.c
trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src/demo-main.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.h
Log:
openmoko-libs/applications: API Change:
- rename moko_paned_window_set_upper_pane to moko_paned_window_set_navigation_pane
- rename moko_paned_window_set_lower_pane to moko_paned_window_set_details_pane
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c 2007-04-23 23:47:01 UTC (rev 1817)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c 2007-04-24 10:44:37 UTC (rev 1818)
@@ -93,13 +93,13 @@
application_manager_data_set_menubox (appdata, menubox);
navigation = navigation_area_new (appdata);
- moko_paned_window_set_upper_pane (window, navigation);
+ moko_paned_window_set_navigation_pane (window, navigation);
toolbox = tool_box_new (appdata);
moko_paned_window_add_toolbox (window, toolbox);
detail = detail_area_new (appdata);
- moko_paned_window_set_lower_pane (window, detail);
+ moko_paned_window_set_details_pane (window, detail);
/* Load the list of all package in the memory */
ret = init_package_list (appdata);
Modified: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.c 2007-04-23 23:47:01 UTC (rev 1817)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.c 2007-04-24 10:44:37 UTC (rev 1818)
@@ -145,7 +145,7 @@
column = gtk_tree_view_column_new_with_attributes( "Fretboard", ren, "text", COLUMN_FRETS, NULL );
moko_tree_view_append_column( d->view, column );
- moko_paned_window_set_upper_pane( d->window, GTK_WIDGET(moko_tree_view_put_into_scrolled_window(d->view)) );
+ moko_paned_window_set_navigation_pane( d->window, GTK_WIDGET(moko_tree_view_put_into_scrolled_window(d->view)) );
GtkTreeSelection* selection = gtk_tree_view_get_selection( d->view );
g_signal_connect( G_OBJECT(selection), "changed", G_CALLBACK(cb_cursor_changed), d );
@@ -162,5 +162,5 @@
void populate_details_area( ChordMasterData* d )
{
d->fretboard = fretboard_widget_new();
- moko_paned_window_set_lower_pane( d->window, GTK_WIDGET(d->fretboard) );
+ moko_paned_window_set_details_pane( d->window, GTK_WIDGET(d->fretboard) );
}
Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c 2007-04-23 23:47:01 UTC (rev 1817)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c 2007-04-24 10:44:37 UTC (rev 1818)
@@ -182,7 +182,7 @@
widget = create_contacts_list (contacts_data);
g_object_unref (contacts_data->contacts_liststore);
- moko_paned_window_set_upper_pane (MOKO_PANED_WINDOW (ui->main_window),
+ moko_paned_window_set_navigation_pane (MOKO_PANED_WINDOW (ui->main_window),
moko_tree_view_put_into_scrolled_window (MOKO_TREE_VIEW (widget)));
ui->contacts_treeview = widget;
@@ -237,7 +237,7 @@
ui->main_notebook = gtk_notebook_new ();
scrolledwindow3 = (GtkWidget*) moko_details_window_new();
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow3), GTK_WIDGET (ui->main_notebook));
- moko_paned_window_set_lower_pane (MOKO_PANED_WINDOW (ui->main_window), GTK_WIDGET(moko_details_window_put_in_box (MOKO_DETAILS_WINDOW (scrolledwindow3))));
+ moko_paned_window_set_details_pane (MOKO_PANED_WINDOW (ui->main_window), GTK_WIDGET(moko_details_window_put_in_box (MOKO_DETAILS_WINDOW (scrolledwindow3))));
GTK_WIDGET_UNSET_FLAGS (ui->main_notebook, GTK_CAN_FOCUS);
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (ui->main_notebook), FALSE);
gtk_notebook_set_show_border (GTK_NOTEBOOK (ui->main_notebook), FALSE);
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c 2007-04-23 23:47:01 UTC (rev 1817)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c 2007-04-24 10:44:37 UTC (rev 1818)
@@ -397,7 +397,7 @@
GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(d->view) );
g_signal_connect( G_OBJECT(selection), "changed", G_CALLBACK(cb_cursor_changed), d );
- moko_paned_window_set_upper_pane( d->window, GTK_WIDGET(moko_tree_view_put_into_scrolled_window(MOKO_TREE_VIEW(d->view))) );
+ moko_paned_window_set_navigation_pane( d->window, GTK_WIDGET(moko_tree_view_put_into_scrolled_window(MOKO_TREE_VIEW(d->view))) );
}
void populate_detail_area( MessengerData* d )
@@ -405,7 +405,7 @@
d->details = detail_area_new();
gtk_widget_show (d->details);
gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(d->details), detail_area_get_notebook(DETAIL_AREA(d->details)));
- moko_paned_window_set_lower_pane( MOKO_PANED_WINDOW(d->window),
+ moko_paned_window_set_details_pane( MOKO_PANED_WINDOW(d->window),
GTK_WIDGET(moko_details_window_put_in_box(MOKO_DETAILS_WINDOW(d->details))));
}
Modified: trunk/src/target/OM-2007/applications/openmoko-rssreader/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/src/main.c 2007-04-23 23:47:01 UTC (rev 1817)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/src/main.c 2007-04-24 10:44:37 UTC (rev 1818)
@@ -182,7 +182,7 @@
gtk_tree_sortable_set_sort_func ( GTK_TREE_SORTABLE(data->sort_model), RSS_READER_COLUMN_DATE, rss_sort_dates, NULL, NULL);
data->treeView = MOKO_TREE_VIEW(moko_tree_view_new_with_model(GTK_TREE_MODEL(data->sort_model)));
- moko_paned_window_set_upper_pane( MOKO_PANED_WINDOW(data->window), GTK_WIDGET(moko_tree_view_put_into_scrolled_window(data->treeView)) );
+ moko_paned_window_set_navigation_pane( MOKO_PANED_WINDOW(data->window), GTK_WIDGET(moko_tree_view_put_into_scrolled_window(data->treeView)) );
/*
* Only show the SUBJECT and DATE header
@@ -230,7 +230,7 @@
GtkWidget *scrollWindow = GTK_WIDGET(moko_details_window_new());
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollWindow), GTK_WIDGET (data->textView));
- moko_paned_window_set_lower_pane( MOKO_PANED_WINDOW(data->window), GTK_WIDGET(moko_details_window_put_in_box(MOKO_DETAILS_WINDOW(scrollWindow))) );
+ moko_paned_window_set_details_pane( MOKO_PANED_WINDOW(data->window), GTK_WIDGET(moko_details_window_put_in_box(MOKO_DETAILS_WINDOW(scrollWindow))) );
}
/*
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:47:01 UTC (rev 1817)
+++ trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src/demo-main.c 2007-04-24 10:44:37 UTC (rev 1818)
@@ -301,12 +301,12 @@
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_navigation_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) );
+ moko_paned_window_set_navigation_pane( window, GTK_WIDGET(navigationwindow) );
GtkButton* button1;
GtkButton* button2;
@@ -364,7 +364,7 @@
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_details_pane( window, GTK_WIDGET(detailswindow) );
moko_paned_window_set_ratio( window, 50 );
Modified: trunk/src/target/OM-2007/examples/openmoko-stylus-demo-simple/src/demo-main.c
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-stylus-demo-simple/src/demo-main.c 2007-04-23 23:47:01 UTC (rev 1817)
+++ trunk/src/target/OM-2007/examples/openmoko-stylus-demo-simple/src/demo-main.c 2007-04-24 10:44:37 UTC (rev 1818)
@@ -125,7 +125,7 @@
/* navigation area */
GtkLabel* navigation = gtk_label_new( "Add your widget for navigating\n \nthrough appplication specific\n \ndata here" );
- moko_paned_window_set_upper_pane( window, GTK_WIDGET(navigation) );
+ moko_paned_window_set_navigation_pane( window, GTK_WIDGET(navigation) );
GtkButton* button1;
GtkButton* button2;
@@ -177,7 +177,7 @@
MokoDetailsWindow* detailswindow = moko_details_window_new();
gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(detailswindow), GTK_WIDGET(details) );
- moko_paned_window_set_lower_pane( window, GTK_WIDGET(moko_details_window_put_in_box(detailswindow) ) );
+ moko_paned_window_set_details_pane( window, GTK_WIDGET(moko_details_window_put_in_box(detailswindow) ) );
/* show everything and run main loop */
gtk_widget_show_all( GTK_WIDGET(window) );
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c 2007-04-23 23:47:01 UTC (rev 1817)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c 2007-04-24 10:44:37 UTC (rev 1818)
@@ -141,9 +141,9 @@
gtk_paned_set_position( GTK_PANED(priv->outerframe), ratio*(gdk_screen_height()-120)/100 );
}
-void moko_paned_window_set_upper_pane(MokoPanedWindow* self, GtkWidget* child)
+void moko_paned_window_set_navigation_pane(MokoPanedWindow* self, GtkWidget* child)
{
- moko_debug( "moko_paned_window_set_upper_pane" );
+ moko_debug( "moko_paned_window_set_navigation_pane" );
MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
priv->upperenclosing = moko_alignment_new();
@@ -158,9 +158,9 @@
}
-void moko_paned_window_set_lower_pane(MokoPanedWindow* self, GtkWidget* child)
+void moko_paned_window_set_details_pane(MokoPanedWindow* self, GtkWidget* child)
{
- moko_debug( "moko_paned_window_set_lower_pane" );
+ moko_debug( "moko_paned_window_set_details_pane" );
MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
#if 0
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.h 2007-04-23 23:47:01 UTC (rev 1817)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.h 2007-04-24 10:44:37 UTC (rev 1818)
@@ -66,8 +66,8 @@
/* panes */
void moko_paned_window_set_ratio(MokoPanedWindow* self, guint ratio);
-void moko_paned_window_set_upper_pane(MokoPanedWindow* self, GtkWidget* child);
-void moko_paned_window_set_lower_pane(MokoPanedWindow* self, GtkWidget* child);
+void moko_paned_window_set_navigation_pane(MokoPanedWindow* self, GtkWidget* child);
+void moko_paned_window_set_details_pane(MokoPanedWindow* self, GtkWidget* child);
/* fullscreen */
void moko_paned_window_set_fullscreen(MokoPanedWindow* self, gboolean b);
More information about the commitlog
mailing list
