r234 - in trunk/src/target/OM-2007: applications/openmoko-chordmaster/src artwork/themes/openmoko-standard/gtk-2.0 openmoko-libs/libmokoui
mickey at gta01.hmw-consulting.de
mickey at gta01.hmw-consulting.de
Sun Nov 19 01:00:42 CET 2006
Author: mickey
Date: 2006-11-19 00:00:41 +0000 (Sun, 19 Nov 2006)
New Revision: 234
Modified:
trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.c
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkrc
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtktreeview
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokotreeview
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.h
Log:
mokoui: API-change for MokoTreeView. Please use moko_tree_view_append_column now and create columns as in standard Gtk+
Modified: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.c 2006-11-18 22:59:02 UTC (rev 233)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.c 2006-11-19 00:00:41 UTC (rev 234)
@@ -137,15 +137,13 @@
d->liststore = gtk_list_store_new( NUM_COLS, G_TYPE_STRING, G_TYPE_STRING );
d->view = moko_tree_view_new_with_model( d->liststore );
- GtkTreeViewColumn* col = moko_tree_view_append_column_new_with_name( d->view, "Chordname" );
GtkCellRenderer* ren = gtk_cell_renderer_text_new();
- gtk_tree_view_column_pack_start( col, ren, TRUE );
- gtk_tree_view_column_add_attribute( col, ren, "text", COLUMN_NAME );
+ GtkTreeViewColumn* column = gtk_tree_view_column_new_with_attributes( "Chordname", ren, "text", COLUMN_NAME, NULL );
+ moko_tree_view_append_column( d->view, column );
- col = moko_tree_view_append_column_new_with_name( d->view, "Fretboard" );
ren = gtk_cell_renderer_text_new();
- gtk_tree_view_column_pack_start( col, ren, TRUE );
- gtk_tree_view_column_add_attribute( col, ren, "text", COLUMN_FRETS );
+ 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)) );
Modified: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkrc
===================================================================
--- trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkrc 2006-11-18 22:59:02 UTC (rev 233)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkrc 2006-11-19 00:00:41 UTC (rev 234)
@@ -82,12 +82,6 @@
# enable for final version
class "GtkWidget" style "moko-window-default"
-#widget "*" style "moko-window-default"
-
-# enable for debugging on host
-# widget "MokoPanedWindow.*" style "moko-window-default"
-# class "GtkMenuItem" style "moko-window-default"
-
include "transparent"
include "gtkmenu"
Modified: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtktreeview
===================================================================
--- trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtktreeview 2006-11-18 22:59:02 UTC (rev 233)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtktreeview 2006-11-19 00:00:41 UTC (rev 234)
@@ -31,6 +31,11 @@
GtkButton::focus-line-width = 0
+ text[NORMAL] = "#666666" # mid grey
+ text[PRELIGHT] = "#ffffff" # white
+ text[ACTIVE] = "#e5e5e5" # light grey
+ text[SELECTED] = "#ffffff" # white
+ text[INSENSITIVE] = "#223344" # dark grey
}
widget "*.GtkTreeView" style "gtktreeview"
@@ -49,6 +54,7 @@
}
widget_class "*.GtkTreeView.GtkButton" style "gtktreeview-button"
+#FIXME why does this not work with GtkTreeView, but does with MokoTreeView?
style "gtktreeview-button-label"
{
font_name = "Vera Sans Bold 13"
Modified: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokotreeview
===================================================================
--- trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokotreeview 2006-11-18 22:59:02 UTC (rev 233)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokotreeview 2006-11-19 00:00:41 UTC (rev 234)
@@ -22,8 +22,15 @@
GtkTreeView::odd_row_color = "#e7e7e7"
GtkButton::focus-line-width = 0
+
+ text[NORMAL] = "#666666" # mid grey
+ text[PRELIGHT] = "#ffffff" # white
+ text[ACTIVE] = "#e5e5e5" # light grey
+ text[SELECTED] = "#ffffff" # white
+ text[INSENSITIVE] = "#223344" # dark grey
}
-class "MokoTreeView" style "mokotreeview"
+#FIXME Why does class "MokoTreeView" doesn't work here... does class "foo" only work with built-in Gtk+ types?
+widget "*.MokoTreeView" style "mokotreeview"
style "mokotreeview-button" {
engine "pixmap" {
@@ -51,6 +58,13 @@
style "mokotreeview-cellrenderer"
{
font_name = "Vera Sans 30"
+ text[NORMAL] = "#ff0000"
+ fg[NORMAL] = "#ff0000"
}
widget "*.MokoTreeView.GtkCellRenderer" style "mokotreeview-cellrenderer"
+widget "*.MokoTreeView.GtkCellRendererText" style "mokotreeview-cellrenderer"
+
+
+#widget_class "*.MokoTreeView.GtkCellRenderer" style "mokotreeview-cellrenderer"
+
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c 2006-11-18 22:59:02 UTC (rev 233)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c 2006-11-19 00:00:41 UTC (rev 234)
@@ -79,10 +79,8 @@
return GTK_WIDGET(g_object_new(moko_tree_view_get_type(), "model", model, NULL));
}
-GtkTreeViewColumn* moko_tree_view_append_column_new_with_name(MokoTreeView* self, gchar* name)
+void moko_tree_view_append_column(MokoTreeView* self, GtkTreeViewColumn* column)
{
- GtkTreeViewColumn* column = gtk_tree_view_column_new();
- gtk_tree_view_column_set_title( column, name );
gtk_tree_view_column_set_alignment( column, 0.5 );
gtk_tree_view_column_set_spacing( column, 4 );
gtk_tree_view_append_column( GTK_TREE_VIEW(self), column );
@@ -92,7 +90,6 @@
"reorderable", TRUE,
"sort-indicator", TRUE,
NULL );
- return column;
}
GtkScrolledWindow* moko_tree_view_put_into_scrolled_window(MokoTreeView* self)
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.h 2006-11-18 22:59:02 UTC (rev 233)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.h 2006-11-19 00:00:41 UTC (rev 234)
@@ -20,6 +20,7 @@
#define _MOKO_TREE_VIEW_H_
#include <gtk/gtktreeview.h>
+#include <gtk/gtktreeviewcolumn.h>
#include <gtk/gtkscrolledwindow.h>
#include <glib-object.h>
@@ -45,7 +46,7 @@
GtkWidget* moko_tree_view_new (void);
GtkWidget* moko_tree_view_new_with_model(GtkTreeModel* model);
-GtkTreeViewColumn* moko_tree_view_append_column_new_with_name(MokoTreeView* self, gchar* name);
+void moko_tree_view_append_column(MokoTreeView* self, GtkTreeViewColumn* column);
GtkScrolledWindow* moko_tree_view_put_into_scrolled_window(MokoTreeView* self);
G_END_DECLS
More information about the commitlog
mailing list
