r157 - in trunk/src/target/OM-2007: applications/openmoko-chordmaster artwork/themes/openmoko-standard/gtk-2.0 libraries/mokoui
mickey at gta01.hmw-consulting.de
mickey at gta01.hmw-consulting.de
Mon Oct 30 22:18:44 CET 2006
Author: mickey
Date: 2006-10-30 21:18:43 +0000 (Mon, 30 Oct 2006)
New Revision: 157
Added:
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokopanedwindow-lower-enclosing.png
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokopanedwindow-upper-enclosing.png
Removed:
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-box-background.png
Modified:
trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.c
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/mokopanedwindow
trunk/src/target/OM-2007/libraries/mokoui/moko-paned-window.c
Log:
mokoui/theming: add lower enclosing
Modified: trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.c 2006-10-30 21:04:57 UTC (rev 156)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.c 2006-10-30 21:18:43 UTC (rev 157)
@@ -153,15 +153,16 @@
}
GtkTreeView* view = gtk_tree_view_new_with_model( list );
+ gtk_tree_view_set_rules_hint( view, TRUE );
GtkTreeViewColumn* col = gtk_tree_view_column_new();
- gtk_tree_view_column_set_title( col, "Name" );
+ gtk_tree_view_column_set_title( col, " Name " );
gtk_tree_view_append_column( view, col );
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 );
col = gtk_tree_view_column_new();
- gtk_tree_view_column_set_title( col, "Frets" );
+ gtk_tree_view_column_set_title( col, " Frets " );
gtk_tree_view_append_column( view, col );
ren = gtk_cell_renderer_text_new();
gtk_tree_view_column_pack_start( col, ren, TRUE );
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-10-30 21:04:57 UTC (rev 156)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtktreeview 2006-10-30 21:18:43 UTC (rev 157)
@@ -1,6 +1,6 @@
style "gtktreeview" {
GtkTreeView::allow_rules = 1
- GtkTreeView::vertical_separator = 5
+ GtkTreeView::vertical_separator = 6
GtkTreeView::even_row_color = "#f7f7f7"
GtkTreeView::odd_row_color = "#e7e7e7"
}
@@ -25,4 +25,4 @@
font_name = "Vera Sans Bold 14"
fg[NORMAL] = "#999999"
}
-widget "*.GtkTreeView.*.GtkLabel" style "gtktreeview-button-label"
\ No newline at end of file
+widget "*.GtkTreeView.*.GtkLabel" style "gtktreeview-button-label"
Modified: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokopanedwindow
===================================================================
--- trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokopanedwindow 2006-10-30 21:04:57 UTC (rev 156)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokopanedwindow 2006-10-30 21:18:43 UTC (rev 157)
@@ -1,6 +1,14 @@
style "mokopanedwindow-upper-enclosing" {
#FIXME find out why this doesn't work with a pixmap engine
- bg_pixmap[NORMAL] = "openmoko-box-background.png"
- MokoAlignment::padding = { 15, 15, 15, 15 }
+ bg_pixmap[NORMAL] = "mokopanedwindow-upper-enclosing.png"
+ MokoAlignment::padding = { 11, 11, 7, 7 }
}
widget "*.mokopanedwindow-upper-enclosing" style "mokopanedwindow-upper-enclosing"
+
+style "mokopanedwindow-lower-enclosing" {
+ #FIXME find out why this doesn't work with a pixmap engine
+ bg_pixmap[NORMAL] = "mokopanedwindow-lower-enclosing.png"
+ MokoAlignment::padding = { 3, 3, 4, 4 }
+}
+widget "*.mokopanedwindow-lower-enclosing" style "mokopanedwindow-lower-enclosing"
+
Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokopanedwindow-lower-enclosing.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokopanedwindow-lower-enclosing.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Copied: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokopanedwindow-upper-enclosing.png (from rev 147, trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-box-background.png)
Deleted: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-box-background.png
===================================================================
(Binary files differ)
Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-paned-window.c
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-paned-window.c 2006-10-30 21:04:57 UTC (rev 156)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-paned-window.c 2006-10-30 21:18:43 UTC (rev 157)
@@ -33,6 +33,7 @@
GtkVPaned* outerframe;
GtkVBox* upper;
MokoAlignment* upperenclosing;
+ MokoAlignment* lowerenclosing;
GtkVBox* lower;
MokoMenuBox* menubox;
MokoToolBox* toolbox;
@@ -156,7 +157,7 @@
priv->upperenclosing = moko_alignment_new();
gtk_widget_set_name( GTK_WIDGET(priv->upperenclosing), "mokopanedwindow-upper-enclosing" );
//FIXME put into MokoAlignment class
- gtk_alignment_set_padding( GTK_ALIGNMENT(priv->upperenclosing), 17, 17, 17, 17 ); //FIXME get from style (MokoAlignment::padding)
+ gtk_alignment_set_padding( GTK_ALIGNMENT(priv->upperenclosing), 7, 7, 11, 11 ); //FIXME get from style (MokoAlignment::padding)
gtk_box_pack_end( GTK_BOX(priv->upper), GTK_WIDGET(priv->upperenclosing), TRUE, TRUE, 0 );
gtk_container_add( GTK_CONTAINER(priv->upperenclosing), child );
}
@@ -165,7 +166,17 @@
{
g_debug( "moko_paned_window_set_lower_pane" );
MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
+
+#if 0
gtk_box_pack_start( GTK_BOX(priv->lower), child, TRUE, TRUE, 0 );
+#else
+ priv->lowerenclosing = moko_alignment_new();
+ gtk_widget_set_name( GTK_WIDGET(priv->lowerenclosing), "mokopanedwindow-lower-enclosing" );
+ //FIXME put into MokoAlignment class
+ gtk_alignment_set_padding( GTK_ALIGNMENT(priv->upperenclosing), 7, 7, 11, 11 ); //FIXME get from style (MokoAlignment::padding)
+ gtk_box_pack_end( GTK_BOX(priv->lower), GTK_WIDGET(priv->lowerenclosing), TRUE, TRUE, 0 );
+ gtk_container_add( GTK_CONTAINER(priv->lowerenclosing), child );
+#endif
}
void moko_paned_window_add_toolbox(MokoPanedWindow* self, MokoToolBox* toolbox)
More information about the commitlog
mailing list