r220 - in trunk/src/target/OM-2007: artwork/themes/openmoko-standard/gtk-2.0 examples/openmoko-finger-demo openmoko-libs/libmokoui
mickey at gta01.hmw-consulting.de
mickey at gta01.hmw-consulting.de
Mon Nov 13 19:03:47 CET 2006
Author: mickey
Date: 2006-11-13 18:03:45 +0000 (Mon, 13 Nov 2006)
New Revision: 220
Added:
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type01.png
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type01_p.png
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type03.png
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type03_p.png
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokofingerbutton
Modified:
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkbutton
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkrc
trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/Makefile.am
trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro
Log:
mokoui: add preliminary styling for mokofingerbutton
TODO: make it a seperate widget class
Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type01.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type01.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type01_p.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type01_p.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type03.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type03.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type03_p.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_type03_p.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Modified: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkbutton
===================================================================
--- trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkbutton 2006-11-13 16:46:17 UTC (rev 219)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkbutton 2006-11-13 18:03:45 UTC (rev 220)
@@ -12,7 +12,7 @@
function = BOX
recolorable = TRUE
state = PRELIGHT
- file = "gtkbutton_p.png"
+ file = "gtkbutton.png"
border = { 22, 33, 18, 25 }
stretch = TRUE
}
@@ -27,6 +27,7 @@
}
xthickness = 22
ythickness = 10
+ GtkButton::focus-line-width = 0
}
class "GtkButton" style "gtkbutton"
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-13 16:46:17 UTC (rev 219)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkrc 2006-11-13 18:03:45 UTC (rev 220)
@@ -95,6 +95,7 @@
include "gtktreeview"
include "gtkbutton"
+include "mokofingerbutton"
include "mokomenubox"
include "mokopanedwindow"
include "mokotoolbox"
Added: 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-13 16:46:17 UTC (rev 219)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokofingerbutton 2006-11-13 18:03:45 UTC (rev 220)
@@ -0,0 +1,39 @@
+style "mokofingerbutton-orange" {
+ engine "pixmap" {
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = NORMAL
+ file = "btn_type01.png"
+ border = { 17, 17, 17, 17 }
+ stretch = TRUE
+ }
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = PRELIGHT
+ file = "btn_type01.png"
+ border = { 17, 17, 17, 17 }
+ stretch = TRUE
+ }
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = ACTIVE
+ file = "btn_type01_p.png"
+ border = { 17, 17, 17, 17 }
+ stretch = TRUE
+ }
+ }
+ xthickness = 10
+ ythickness = 10
+ GtkButton::focus-line-width = 0
+}
+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"
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-13 16:46:17 UTC (rev 219)
+++ trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.c 2006-11-13 18:03:45 UTC (rev 220)
@@ -21,7 +21,7 @@
#include <libmokoui/moko-finger-window.h>
#include <libmokoui/moko-pixmap-container.h>
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtkalignment.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkcheckmenuitem.h>
#include <gtk/gtkfixed.h>
@@ -37,6 +37,11 @@
#include <stdlib.h>
+void cb_orange_button_clicked( GtkButton* button, MokoFingerWindow* window )
+{
+ g_debug( "openmoko-finger-demo: orange button clicked" );
+}
+
int main( int argc, char** argv )
{
g_debug( "openmoko-finger-demo starting up" );
@@ -61,11 +66,21 @@
g_signal_connect( G_OBJECT(window), "delete_event", G_CALLBACK( gtk_main_quit ), NULL );
/* contents */
- GtkVBox* vbox = gtk_vbox_new( TRUE, 10 );
- GtkEntry* entry = gtk_entry_new();
- gtk_entry_set_text( entry, "This is a line of text" );
- gtk_box_pack_start( vbox, GTK_WIDGET(entry), TRUE, TRUE, 10 );
+ 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" );
+ GtkAlignment* align = gtk_alignment_new( 0.5, 0.5, 0.5, 0.5 );
+
+ 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) );
+
+ 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(label2), TRUE, TRUE, 0 );
+
moko_finger_window_set_contents( window, GTK_WIDGET(vbox) );
/* show everything and run main loop */
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/Makefile.am 2006-11-13 16:46:17 UTC (rev 219)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/Makefile.am 2006-11-13 18:03:45 UTC (rev 220)
@@ -1,6 +1,7 @@
source_h = \
moko-alignment.h \
moko-application.h \
+ moko-finger-wheel.h \
moko-finger-window.h \
moko-menu-box.h \
moko-pixmap-container.h \
@@ -14,6 +15,7 @@
source_c = \
moko-alignment.c \
moko-application.c \
+ moko-finger-wheel.c \
moko-finger-window.c \
moko-menu-box.c \
moko-pixmap-container.c \
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro 2006-11-13 16:46:17 UTC (rev 219)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro 2006-11-13 18:03:45 UTC (rev 220)
@@ -5,6 +5,7 @@
HEADERS = \
moko-alignment.h \
moko-application.h \
+ moko-finger-wheel.h \
moko-finger-window.h \
moko-menu-box.h \
moko-pixmap-container.h \
@@ -18,6 +19,7 @@
SOURCES = \
moko-alignment.c \
moko-application.c \
+ moko-finger-wheel.c \
moko-finger-window.c \
moko-menu-box.c \
moko-pixmap-container.c \
More information about the commitlog
mailing list