r134 - in trunk/src/target/OM-2007: artwork/themes/openmoko-standard/gtk-2.0 libraries/mokoui
mickey at gta01.hmw-consulting.de
mickey at gta01.hmw-consulting.de
Sat Oct 28 01:31:45 CEST 2006
Author: mickey
Date: 2006-10-27 23:31:43 +0000 (Fri, 27 Oct 2006)
New Revision: 134
Added:
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/openmoko-mokotoolbox-action-button-background.png
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/transparency100.png
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/openmoko-box-background.png
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-filter-menu-bg.png
trunk/src/target/OM-2007/libraries/mokoui/moko-alignment.c
trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.c
trunk/src/target/OM-2007/libraries/mokoui/moko-paned-window.c
Log:
mokoui: minor theming fixes.
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-27 22:32:46 UTC (rev 133)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkrc 2006-10-27 23:31:43 UTC (rev 134)
@@ -1,5 +1,7 @@
gtk-font-name = "Vera Sans 16"
+include "mokomenubox"
+include "mokopanedwindow"
include "mokotoolbox"
# pixmap_path "/local/pkg/openmoko/OM-2007/artwork/themes/openmoko-standard/gtk-2.0"
@@ -38,41 +40,8 @@
# common default
# class "GtkWidget" style "default"
-#----------------------------------------------------------------------------
-style "app-menu" {
-#----------------------------------------------------------------------------
- engine "pixmap" {
- image {
- function = BOX
- recolorable = TRUE
- # shadow = IN
- file = "openmoko-application-menu-bg.png"
- border = { 40, 20, 0, 0 }
- stretch = TRUE
- }
- }
- xthickness = 30
-}
-widget "*moko_application_menu_bar" style "app-menu"
#----------------------------------------------------------------------------
-style "filter-menu" {
-#----------------------------------------------------------------------------
- engine "pixmap" {
- image {
- function = BOX
- recolorable = TRUE
- # shadow = IN
- file = "openmoko-filter-menu-bg.png"
- border = { 30, 30, 0, 0 }
- stretch = TRUE
- }
- }
- xthickness = 30
-}
-widget "*moko_filter_menu_bar" style "filter-menu"
-
-#----------------------------------------------------------------------------
style "popup-menus" {
#----------------------------------------------------------------------------
engine "pixmap" {
Added: 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-27 22:32:46 UTC (rev 133)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokopanedwindow 2006-10-27 23:31:43 UTC (rev 134)
@@ -0,0 +1,6 @@
+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 }
+}
+widget "*.mokopanedwindow-upper-enclosing" style "mokopanedwindow-upper-enclosing"
Modified: 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/artwork/themes/openmoko-standard/gtk-2.0/openmoko-filter-menu-bg.png
===================================================================
(Binary files differ)
Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-mokotoolbox-action-button-background.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-mokotoolbox-action-button-background.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/transparency100.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/transparency100.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-alignment.c
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-alignment.c 2006-10-27 22:32:46 UTC (rev 133)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-alignment.c 2006-10-27 23:31:43 UTC (rev 134)
@@ -143,6 +143,7 @@
gdk_window_set_user_data (widget->window, widget);
widget->style = gtk_style_attach (widget->style, widget->window);
+ //FIXME find out why a pixmap engine doesn't want to draw on an Alignment even though it has a GdkWindow
gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
}
Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.c
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.c 2006-10-27 22:32:46 UTC (rev 133)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.c 2006-10-27 23:31:43 UTC (rev 134)
@@ -103,6 +103,7 @@
static gboolean cb_button_release(GtkWidget *widget, GdkEventButton *event, GtkMenuShell* menu)
{
+ //FIXME don't open menu when it is already opened
g_debug( "menu open forwarder..." );
gtk_menu_shell_select_first( GTK_MENU_SHELL(widget), TRUE );
}
@@ -135,7 +136,7 @@
if (!priv->menubar_l )
{
priv->menubar_l = gtk_menu_bar_new();
- gtk_widget_set_name( GTK_WIDGET(priv->menubar_l), "moko_application_menu_bar" );
+ gtk_widget_set_name( GTK_WIDGET(priv->menubar_l), "mokomenubox-application-menubar" );
gtk_box_pack_start( GTK_BOX(self), GTK_WIDGET(priv->menubar_l), TRUE, TRUE, 0 );
}
GtkMenuItem* appitem = gtk_menu_item_new_with_label( g_get_application_name() );
@@ -154,7 +155,7 @@
if (!priv->menubar_r )
{
priv->menubar_r = gtk_menu_bar_new();
- gtk_widget_set_name( GTK_WIDGET(priv->menubar_r), "moko_filter_menu_bar" );
+ gtk_widget_set_name( GTK_WIDGET(priv->menubar_r), "mokomenubox-filter-menubar" );
gtk_box_pack_end( GTK_BOX(self), GTK_WIDGET(priv->menubar_r), TRUE, TRUE, 0 );
}
GtkMenuItem* filtitem = gtk_menu_item_new_with_label( "Filter Menu" );
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-27 22:32:46 UTC (rev 133)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-paned-window.c 2006-10-27 23:31:43 UTC (rev 134)
@@ -131,7 +131,6 @@
void moko_paned_window_set_filter_menu(MokoPanedWindow* self, GtkMenu* menu)
{
g_debug( "moko_paned_window_set_filter_menu" );
-
MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
if (!priv->menubox )
{
@@ -144,20 +143,19 @@
void moko_paned_window_set_upper_pane(MokoPanedWindow* self, GtkWidget* child)
{
g_debug( "moko_paned_window_set_upper_pane" );
-
MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
priv->upperenclosing = moko_alignment_new();
- gtk_alignment_set_padding( GTK_ALIGNMENT(priv->upperenclosing), 10, 10, 10, 10 ); //FIXME get from style
+ 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_box_pack_end( GTK_BOX(priv->upper), GTK_WIDGET(priv->upperenclosing), TRUE, TRUE, 0 );
gtk_container_add( GTK_CONTAINER(priv->upperenclosing), child );
- //gtk_box_pack_end( GTK_BOX(priv->upper), child, TRUE, TRUE, 0 );
}
void moko_paned_window_set_lower_pane(MokoPanedWindow* self, GtkWidget* child)
{
g_debug( "moko_paned_window_set_lower_pane" );
-
MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
gtk_box_pack_start( GTK_BOX(priv->lower), child, TRUE, TRUE, 0 );
}
More information about the commitlog
mailing list
