r159 - in trunk/src/target/OM-2007: applications/openmoko-chordmaster artwork/themes/openmoko-standard/gtk-2.0

mickey at gta01.hmw-consulting.de mickey at gta01.hmw-consulting.de
Tue Oct 31 01:38:17 CET 2006


Author: mickey
Date: 2006-10-31 00:38:17 +0000 (Tue, 31 Oct 2006)
New Revision: 159

Added:
   trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/list_bg_row_sel_stretch.png
Modified:
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.c
   trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/TODO
   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
Log:
theming: treeview complete (for now)


Modified: trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.c	2006-10-30 23:18:32 UTC (rev 158)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.c	2006-10-31 00:38:17 UTC (rev 159)
@@ -31,6 +31,7 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkmenu.h>
+#include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtktreeview.h>
 
 enum {
@@ -152,21 +153,43 @@
         gtk_list_store_set( list, &iter, COLUMN_NAME, chord->name, COLUMN_FRETS, chord->frets, -1 );
     }
 
+    //FIXME get color from style
+    GdkColor color;
+    color.red = 0x7f << 8;
+    color.green = 0x7f << 8;
+    color.blue = 0x7f << 8;
+
+    GValue v = { 0, };
+    g_value_init (&v, GDK_TYPE_COLOR);
+    g_value_set_boxed( &v, &color);
+
     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 of the Chord" );
+    gtk_tree_view_column_set_alignment( col, 0.5 );
+    gtk_tree_view_column_set_spacing( col, 4 );
     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 );
+    g_object_set_property( G_OBJECT(ren), "foreground-gdk", &v );
 
     col = gtk_tree_view_column_new();
-    gtk_tree_view_column_set_title( col, "   Frets   " );
+    gtk_tree_view_column_set_title( col, "Fingers on Fretboard" );
+    gtk_tree_view_column_set_alignment( col, 0.5 );
+    gtk_tree_view_column_set_spacing( col, 4 );
     gtk_tree_view_append_column( view, col );
     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 );
+    g_object_set_property( G_OBJECT(ren), "foreground-gdk", &v );
 
-    moko_paned_window_set_upper_pane( d->window, GTK_WIDGET(view) );
+    GtkScrolledWindow* scrollwin = gtk_scrolled_window_new( NULL, NULL );
+    //FIXME get from style or (even better) set as initial size hint in MokoPanedWindow (also via style sheet of course)
+    gtk_widget_set_size_request( GTK_WIDGET(scrollwin), 0, 170 );
+    gtk_scrolled_window_set_policy( scrollwin, GTK_POLICY_NEVER, GTK_POLICY_ALWAYS );
+
+    gtk_scrolled_window_add_with_viewport( scrollwin, GTK_WIDGET(view) );
+    moko_paned_window_set_upper_pane( d->window, GTK_WIDGET(scrollwin) );
 }

Modified: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/TODO
===================================================================
--- trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/TODO	2006-10-30 23:18:32 UTC (rev 158)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/TODO	2006-10-31 00:38:17 UTC (rev 159)
@@ -10,3 +10,4 @@
 2.) grep for FIXME through the individual gtkrc files
 
 3.) for the final version, concatenate style files? (for optimization)
+

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-10-30 23:18:32 UTC (rev 158)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkrc	2006-10-31 00:38:17 UTC (rev 159)
@@ -62,7 +62,6 @@
             stretch         = TRUE
         }
     }
-
     font_name = "Vera Sans 16"
 }
 

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 23:18:32 UTC (rev 158)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtktreeview	2006-10-31 00:38:17 UTC (rev 159)
@@ -1,8 +1,29 @@
 style "gtktreeview" {
+    engine "pixmap" {
+
+      image {
+            function        = FLAT_BOX
+            recolorable     = TRUE
+            state           = SELECTED
+            file            = "list_bg_row_sel_stretch.png"
+            border          = { 0, 0, 0, 0 }
+            stretch         = TRUE
+        }
+        /*
+        image {
+            function        = FOCUS
+            recolorable     = FALSE
+            file            = "list_bg_row_sel_stretch.png"
+            border          = { 0, 0, 0, 0 }
+            stretch         = TRUE
+        }
+        */
+    }
     GtkTreeView::allow_rules = 1
     GtkTreeView::vertical_separator = 6
     GtkTreeView::even_row_color = "#f7f7f7"
     GtkTreeView::odd_row_color = "#e7e7e7"
+    GtkButton::focus-line-width = 0
 }
 class "GtkTreeView" style "gtktreeview"
 
@@ -22,7 +43,8 @@
 
 style "gtktreeview-button-label"
 {
-    font_name = "Vera Sans Bold 14"
+    font_name = "Vera Sans Bold 13"
     fg[NORMAL] = "#999999"
 }
 widget "*.GtkTreeView.*.GtkLabel" style "gtktreeview-button-label"
+

Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/list_bg_row_sel_stretch.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/list_bg_row_sel_stretch.png
___________________________________________________________________
Name: svn:mime-type
   + image/png





More information about the commitlog mailing list