r226 - in trunk/src/target/OM-2007: artwork/themes/openmoko-standard/gtk-2.0 examples/openmoko-finger-demo
mickey at gta01.hmw-consulting.de
mickey at gta01.hmw-consulting.de
Wed Nov 15 15:25:10 CET 2006
Author: mickey
Date: 2006-11-15 14:25:09 +0000 (Wed, 15 Nov 2006)
New Revision: 226
Added:
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type04.png
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type04_p.png
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type05.png
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type05_p.png
Modified:
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokofingerbutton
trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.c
Log:
finger demo: demonstrate the three types of finger buttons
Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type04.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type04.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type04_p.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type04_p.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type05.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type05.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type05_p.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type05_p.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Modified: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokofingerbutton
===================================================================
--- trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokofingerbutton 2006-11-15 13:40:25 UTC (rev 225)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokofingerbutton 2006-11-15 14:25:09 UTC (rev 226)
@@ -31,9 +31,69 @@
}
widget "*.mokofingerbutton-orange" style "mokofingerbutton-orange"
-#style "gtkbutton-label" {
-# font_name = "Vera Sans 10"
-# fg[NORMAL] = "#e5e5e5"
-# fg[PRELIGHT] = "#ffffff"
-#}
-#widget "*.GtkButton.*" style "gtkbutton-label"
+style "mokofingerbutton-black" {
+ engine "pixmap" {
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = NORMAL
+ file = "btn_type04.png"
+ border = { 27, 27, 29, 29 }
+ stretch = TRUE
+ }
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = PRELIGHT
+ file = "btn_type04.png"
+ border = { 27, 27, 29, 29 }
+ stretch = TRUE
+ }
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = ACTIVE
+ file = "btn_type04_p.png"
+ border = { 27, 27, 29, 29 }
+ stretch = TRUE
+ }
+ }
+ xthickness = 10
+ ythickness = 10
+ GtkButton::focus-line-width = 0
+}
+widget "*.mokofingerbutton-black" style "mokofingerbutton-black"
+
+style "mokofingerbutton-dialer" {
+ engine "pixmap" {
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = NORMAL
+ file = "btn_type05.png"
+ border = { 40, 20, 8, 7 }
+ stretch = TRUE
+ }
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = PRELIGHT
+ file = "btn_type05.png"
+ border = { 40, 20, 8, 7 }
+ stretch = TRUE
+ }
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = ACTIVE
+ file = "btn_type05_p.png"
+ border = { 40, 20, 8, 7 }
+ stretch = TRUE
+ }
+ }
+ xthickness = 10
+ ythickness = 10
+ GtkButton::focus-line-width = 0
+}
+widget "*.mokofingerbutton-dialer" style "mokofingerbutton-dialer"
+
Modified: trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.c
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.c 2006-11-15 13:40:25 UTC (rev 225)
+++ trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.c 2006-11-15 14:25:09 UTC (rev 226)
@@ -23,15 +23,11 @@
#include <gtk/gtkalignment.h>
#include <gtk/gtkbutton.h>
-#include <gtk/gtkcheckmenuitem.h>
#include <gtk/gtkfixed.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenutoolbutton.h>
#include <gtk/gtkstock.h>
-#include <gtk/gtktoolbutton.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtkhbox.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtkentry.h>
@@ -76,18 +72,29 @@
/* contents */
GtkVBox* vbox = gtk_vbox_new( TRUE, 0 );
- GtkEntry* label1 = gtk_label_new( "Populate this area with finger widgets\nas you like..." );
- GtkEntry* label2 = gtk_label_new( "Click the finger button to enable or disable\nthe finger scrolling wheel\n\n\n" );
+ GtkEntry* label1 = gtk_label_new( "Populate this area with finger widgets\n \nThere are three types of finger buttons:" );
- GtkAlignment* align = gtk_alignment_new( 0.5, 0.5, 0.5, 0.5 );
+ GtkEntry* label2 = gtk_label_new( "Orange button toggles finger scrolling wheel" );
- GtkButton* button = gtk_button_new();
- g_signal_connect( G_OBJECT(button), "clicked", G_CALLBACK(cb_orange_button_clicked), window );
- gtk_widget_set_name( GTK_WIDGET(button), "mokofingerbutton-orange" );
- gtk_container_add( GTK_CONTAINER(align), GTK_WIDGET(button) );
+ GtkHBox* hbox = gtk_hbox_new( TRUE, 10 );
+ GtkButton* button1 = gtk_button_new();
+ g_signal_connect( G_OBJECT(button1), "clicked", G_CALLBACK(cb_orange_button_clicked), window );
+ gtk_widget_set_name( GTK_WIDGET(button1), "mokofingerbutton-orange" );
+ gtk_box_pack_start( GTK_BOX(hbox), GTK_WIDGET(button1), TRUE, TRUE, 5 );
+
+ GtkButton* button2 = gtk_button_new();
+ g_signal_connect( G_OBJECT(button2), "clicked", G_CALLBACK(cb_orange_button_clicked), window );
+ gtk_widget_set_name( GTK_WIDGET(button2), "mokofingerbutton-dialer" );
+ gtk_box_pack_start( GTK_BOX(hbox), GTK_WIDGET(button2), TRUE, TRUE, 5 );
+
+ GtkButton* button3 = gtk_button_new();
+ g_signal_connect( G_OBJECT(button3), "clicked", G_CALLBACK(cb_orange_button_clicked), window );
+ gtk_widget_set_name( GTK_WIDGET(button3), "mokofingerbutton-black" );
+ gtk_box_pack_start( GTK_BOX(hbox), GTK_WIDGET(button3), TRUE, TRUE, 5 );
+
gtk_box_pack_start( vbox, GTK_WIDGET(label1), TRUE, TRUE, 0 );
- gtk_box_pack_start( vbox, GTK_WIDGET(align), TRUE, TRUE, 0 );
+ gtk_box_pack_start( vbox, GTK_WIDGET(hbox), TRUE, TRUE, 0 );
gtk_box_pack_start( vbox, GTK_WIDGET(label2), TRUE, TRUE, 0 );
moko_finger_window_set_contents( window, GTK_WIDGET(vbox) );
More information about the commitlog
mailing list
