r3012 - in trunk/src/target/OM-2007.2/libraries/moko-gtk-engine: . data src
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Wed Sep 19 12:49:18 CEST 2007
Author: thomas
Date: 2007-09-19 12:49:16 +0200 (Wed, 19 Sep 2007)
New Revision: 3012
Added:
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/matchboxpanel
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-calculator
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-contacts
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-dialer
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-panel-plugins
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-utils.h
Modified:
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/Makefile.am
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtkrc
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c
Log:
* moko-gtk-engine/src/moko-draw.c:
- Adjust gradient stops to give glossed appearance.
- Add gradient to "inactive" tabs
* moko-gtk-engine/src/moko-utils.h: rename from sato-utils.h
* moko-gtk-engine/data/openmoko-contacts
* moko-gtk-engine/data/openmoko-panel-plugins
* moko-gtk-engine/data/matchboxpanel
* moko-gtk-engine/data/openmoko-dialer
* moko-gtk-engine/data/gtkrc
* moko-gtk-engine/data/openmoko-calculator
* moko-gtk-engine/Makefile.am
- Add application specific rc files
- Tweak colours
Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/Makefile.am 2007-09-19 10:14:36 UTC (rev 3011)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/Makefile.am 2007-09-19 10:49:16 UTC (rev 3012)
@@ -17,4 +17,10 @@
libmoko_engine_la_LIBADD = $(GTK_LIBS)
gtkthemedir = $(datadir)/themes/Moko/gtk-2.0
-dist_gtktheme_DATA = data/gtkrc
+dist_gtktheme_DATA = \
+ data/gtkrc \
+ data/matchboxpanel \
+ data/openmoko-calculator \
+ data/openmoko-contacts \
+ data/openmoko-dialer \
+ data/openmoko-panel-plugins
Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtkrc
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtkrc 2007-09-19 10:14:36 UTC (rev 3011)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtkrc 2007-09-19 10:49:16 UTC (rev 3012)
@@ -3,14 +3,18 @@
# Copyright 2007 OpenedHand Ltd <info at openedhand.com>
# Taken from OpenedHand's Sato GTK+ Theme
+
+# black: #333333
+# orange: #ff7d00
+
gtk_button_images = 0
gtk_menu_images = 0
style "default"
{
- xthickness = 2
- ythickness = 2
+ xthickness = 2
+ ythickness = 2
GtkWidget::focus_line_width = 2
GtkWidget::focus_padding = 0
@@ -54,9 +58,9 @@
- fg [NORMAL] = "black"
- fg [PRELIGHT] = "black"
- fg [ACTIVE] = "black"
+ fg [NORMAL] = "#333333"
+ fg [PRELIGHT] = "#333333"
+ fg [ACTIVE] = "#333333"
fg [INSENSITIVE] = "#eeeeec"
fg [SELECTED] = "white"
@@ -66,10 +70,10 @@
bg [INSENSITIVE] = "#eeeeec"
bg [SELECTED] = "#ff7d00"
- text [NORMAL] = "black"
- text [PRELIGHT] = "black"
- text [SELECTED] = "black"
- text [ACTIVE] = "black"
+ text [NORMAL] = "#333333"
+ text [PRELIGHT] = "#333333"
+ text [SELECTED] = "#333333"
+ text [ACTIVE] = "#333333"
base [NORMAL] = "white"
base [SELECTED] = "#ff7d00"
@@ -92,7 +96,7 @@
xthickness = 0
ythickness = 0
- bg[NORMAL] = "black"
+ bg[NORMAL] = "#333333"
}
class "GtkToolbar" style "toolbar"
@@ -102,7 +106,7 @@
ythickness = 12
bg[NORMAL] = "#ff7d00"
- bg[PRELIGHT] = "black"
+ bg[PRELIGHT] = "#333333"
}
widget_class "*Tool*GtkToggleButton" style "toolitem"
widget_class "*Tool*GtkButton" style "toolitem"
@@ -112,13 +116,14 @@
xthickness = 0
ythickness = 0
bg[NORMAL] = "#ff7d00"
- bg[ACTIVE] = "black"
+ bg[ACTIVE] = "#333333"
}
class "GtkNotebook" style "notebook"
-style "separator"
-{
- fg[NORMAL] = "white"
-}
-class "GtkSeparatorToolItem" style "separator"
+include "matchboxpanel"
+include "openmoko-calculator"
+include "openmoko-contacts"
+include "openmoko-dialer"
+include "openmoko-panel-plugins"
+
Added: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/matchboxpanel
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/matchboxpanel 2007-09-19 10:14:36 UTC (rev 3011)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/matchboxpanel 2007-09-19 10:49:16 UTC (rev 3012)
@@ -0,0 +1,5 @@
+style "matchboxpanel" {
+ bg[NORMAL] = "#000000"
+}
+widget "MatchboxPanel" style "matchboxpanel"
+
Added: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-calculator
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-calculator 2007-09-19 10:14:36 UTC (rev 3011)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-calculator 2007-09-19 10:49:16 UTC (rev 3012)
@@ -0,0 +1,21 @@
+style "calc-window"
+{
+ xthickness = 10
+ ythickness = 10
+}
+widget "*calculator-frame" style "calc-window"
+
+style "calc-display-bg"
+{
+ bg[NORMAL] = "black"
+ fg[NORMAL] = "orange"
+ font_name = "Sans 20"
+ xthickness = 10
+ ythickness = 10
+}
+widget "*calculator-display-background*" style "calc-display-bg"
+
+style "calculator-button-label" {
+ font_name = "Sans 12"
+}
+widget "*calculator-table.GtkButton.*" style "calculator-button-label"
Added: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-contacts
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-contacts 2007-09-19 10:14:36 UTC (rev 3011)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-contacts 2007-09-19 10:49:16 UTC (rev 3012)
@@ -0,0 +1,55 @@
+style "mokocontactsadddetail" {
+ xthickness = 0
+ ythickness = 5
+ GtkButton::focus-line-width = 0
+}
+
+
+widget "*moko-contacts-add-detail-button" style "mokocontactsadddetail"
+
+# History view
+style "mokohistorylabel" {
+ fg[PRELIGHT] = "#666"
+}
+widget "*.mokohistorylabel" style "mokohistorylabel"
+
+style "mokohistorycall-in" {
+ text[PRELIGHT] = "#666"
+ base[PRELIGHT] = "#000"
+ bg[PRELIGHT] = "#E7FFE6"
+ fg[PRELIGHT] = "#00FF00"
+}
+widget "*.mokohistorycall-in" style "mokohistorycall-in"
+
+style "mokohistorycall-out" {
+ text[PRELIGHT] = "#666"
+ base[PRELIGHT] = "#000"
+ bg[PRELIGHT] = "#FFF7E6"
+ fg[PRELIGHT] = "#00FF00"
+}
+widget "*.mokohistorycall-out" style "mokohistorycall-out"
+
+style "mokohistorycall-missed" {
+ text[PRELIGHT] = "#666"
+ base[PRELIGHT] = "#000"
+ bg[PRELIGHT] = "#FAD7D2"
+ fg[PRELIGHT] = "#00FF00"
+}
+widget "*.mokohistorycall-missed" style "mokohistorycall-missed"
+
+style "mokohistoryemail" {
+ text[PRELIGHT] = "#666"
+ base[PRELIGHT] = "#000"
+ bg[PRELIGHT] = "#FFF"
+ fg[PRELIGHT] = "#00FF00"
+}
+widget "*.mokohistoryemail" style "mokohistoryemail"
+
+style "mokohistorysms" {
+ text[PRELIGHT] = "#666"
+ base[PRELIGHT] = "#000"
+ bg[PRELIGHT] = "#E6F9FF"
+ fg[PRELIGHT] = "#00FF00"
+}
+widget "*.mokohistorysms" style "mokohistorysms"
+
Added: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-dialer
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-dialer 2007-09-19 10:14:36 UTC (rev 3011)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-dialer 2007-09-19 10:49:16 UTC (rev 3012)
@@ -0,0 +1,22 @@
+style "mokodialertextview" {
+ fg[NORMAL] = "#ff7800"
+ text[NORMAL] = "#ff7800"
+ bg[NORMAL] = "#000000"
+ base[NORMAL] = "#000000"
+
+ MokoDialerTextview::small_font = 10
+ MokoDialerTextview::medium_font = 15
+ MokoDialerTextview::large_font = 20
+}
+widget "*.MokoDialerTextview" style "mokodialertextview"
+
+style "mokotips" {
+ fg[NORMAL] = "#ff7800"
+ text[NORMAL] = "#ff7800"
+ bg[NORMAL] = "#000000"
+ base[NORMAL] = "#000000"
+
+ MokoDialerTextview::medium_font = 15
+}
+widget "*.MokoTips*" style "mokotips"
+
Added: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-panel-plugins
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-panel-plugins 2007-09-19 10:14:36 UTC (rev 3011)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-panel-plugins 2007-09-19 10:49:16 UTC (rev 3012)
@@ -0,0 +1,10 @@
+style "openmoko-panel-clock" {
+ fg[NORMAL] = "#e2e2e2"
+ fg[PRELIGHT] = "#e2e2e2"
+ fg[ACTIVE] = "#e2e2e2"
+}
+widget "*.MatchboxPanelClock" style "openmoko-panel-clock"
+
+# add styling for other panel plugins here...
+
+
Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c 2007-09-19 10:14:36 UTC (rev 3011)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c 2007-09-19 10:49:16 UTC (rev 3012)
@@ -58,10 +58,10 @@
gc = gdk_gc_new (window);
/* get the start and end colours */
- moko_shade_colour (&style->bg[state_type], &c1, 1.2);
- moko_shade_colour (&style->bg[state_type], &c2, 1.0);
- moko_shade_colour (&style->bg[state_type], &c3, 1.0);
- moko_shade_colour (&style->bg[state_type], &c4, 0.9);
+ moko_shade_colour (&style->bg[state_type], &c1, 1.6);
+ moko_shade_colour (&style->bg[state_type], &c2, 1.4);
+ moko_shade_colour (&style->bg[state_type], &c3, 1.2);
+ moko_shade_colour (&style->bg[state_type], &c4, 1.0);
/* set line for 1px */
gdk_gc_set_line_attributes (gc, 1, GDK_LINE_SOLID, GDK_CAP_BUTT,
@@ -377,10 +377,7 @@
GdkGC *gc;
gc = moko_gc_new (style->fg_gc[state_type], window);
- if (state_type == GTK_STATE_NORMAL)
- moko_gradient (style, window, state_type, x, y, width, height);
- else
- gtk_paint_flat_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+ moko_gradient (style, window, state_type, x, y, width, height);
gdk_draw_rectangle (window, gc, FALSE, x, y, width - 1, height - 1);
g_object_unref (gc);
Copied: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-utils.h (from rev 3008, trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/sato-utils.h)
More information about the commitlog
mailing list
