Changeset 3021

Timestamp:

09/20/07 19:09:14 (6 years ago)

Author:

thomas

Message:

• data/gtkrc:
• src/moko-draw.c: (moko_gradient), (moko_draw_box):
• src/moko-style.c: (moko_style_class_init):
• src/moko-style.h:

Add initial support for "border" and "gradient" boolean engine options

Location:

trunk/src/target/OM-2007.2/libraries/moko-gtk-engine

Files:

• ChangeLog (modified) (1 diff)
• data/gtkrc (modified) (1 diff)
• src/moko-draw.c (modified) (3 diffs)
• src/moko-style.c (modified) (3 diffs)
• src/moko-style.h (modified) (4 diffs)

trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog

@@ +1 @@
+2007-09-20  Thomas Wood  <thomas@openedhand.com>
+
+        * data/gtkrc:
+        * src/moko-draw.c: (moko_gradient), (moko_draw_box):
+        * src/moko-style.c: (moko_style_class_init):
+        * src/moko-style.h:
+
+        Add initial support for "border" and "gradient" boolean engine options
+
+2007-09-20  Thomas Wood  <thomas@openedhand.com>
+
+        * 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
+
+
+2007-09-18  Thomas Wood  <thomas@openedhand.com>
+
+        * Rename Sato to Moko
+        * Adjust gradients and remove rounded corners
+
 2007-07-30  Thomas Wood  <thomas@openedhand.com>
 

trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtkrc

@@ -85 +85 @@
 class "GtkWidget" style "default"
 
+style "button"
+{
+  engine "moko-engine" {
+    border = TRUE
+  }
+}
+class "GtkButton" style "button"
+
 style "combo-fix" {
+  bg[NORMAL] = "#ff7d00"
   text[NORMAL] = "white"
   text[PRELIGHT] = "white"
 }
-class "GtkComboBox" style "combo-fix"
+class "*Combo*" style "combo-fix"
 
 style "toolbar"

trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c

@@ -59 +59 @@
 
   /* get the start and end colours */
-  moko_shade_colour (&style->bg[state_type], &c1, 1.6);
+  moko_shade_colour (&style->bg[state_type], &c1, 1.8);
   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], &c3, 1.3);
   moko_shade_colour (&style->bg[state_type], &c4, 1.0);
 
@@ -157 +157 @@
   if (!DETAIL ("menu") && !DETAIL ("trough"))
    moko_gradient (style, window, state_type, x+1, y+1, width-2, height-2);
-
-
-
-   /*** treeview headers ***/
-  if (widget && GTK_IS_TREE_VIEW (widget->parent))
-  {
-    goto exit;
-  }
 
 
@@ -185 +177 @@
 
   /*** draw the border ***/
-  if (!DETAIL ("bar"))
+  if (MOKO_RC_STYLE (style->rc_style)->has_border)
   {
     gdk_draw_rectangle (window, gc, FALSE, x + 1, y + 1, width - 2, height - 2);

trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-style.c

@@ -61 +61 @@
 {
   GtkStyleClass *style_class = GTK_STYLE_CLASS (klass);
+
   moko_draw_style_class_init (style_class);
 }
@@ -68 +69 @@
 /*** Gtk Style RC Class *******************************************************/
 
+static struct
+{
+  gchar *name;
+  guint token;
+}
+moko_rc_symbols[] = 
+{
+  { "border", TOKEN_HAS_BORDER },
+  { "gradient", TOKEN_HAS_GRADIENT },
+
+  { "TRUE", TOKEN_TRUE },
+  { "FALSE", TOKEN_FALSE }
+};
+
 GType moko_type_rc_style = 0;
+static GtkRcStyleClass *moko_parent_rc_style_class;
 
 static GtkStyle *moko_rc_style_create_style (GtkRcStyle *rc_style);
+static void moko_rc_style_merge (GtkRcStyle *dest, GtkRcStyle *src);
+static guint moko_rc_style_parse (GtkRcStyle *rc_style, GtkSettings *settings, GScanner *scanner);
 
 static void
@@ -76 +94 @@
 {
         GtkRcStyleClass *rc_style_class = GTK_RC_STYLE_CLASS (klass);
+
+  moko_parent_rc_style_class = g_type_class_peek_parent (klass);
+
         rc_style_class->create_style = moko_rc_style_create_style;
+  rc_style_class->parse = moko_rc_style_parse;
+  rc_style_class->merge = moko_rc_style_merge;
+}
+
+
+static void
+moko_rc_style_merge (GtkRcStyle *dest, GtkRcStyle *src)
+{
+  if (MOKO_IS_RC_STYLE (src))
+  {
+    MokoRcStyle *src_data = MOKO_RC_STYLE (src);
+    MokoRcStyle *dest_data = MOKO_RC_STYLE (dest);
+
+    dest_data->has_border = src_data->has_border;
+    dest_data->has_gradient = src_data->has_gradient;
+  }
+
+  moko_parent_rc_style_class->merge (dest, src);
+}
+
+static guint
+moko_rc_parse_boolean(GScanner *scanner, GTokenType wanted_token, guint *retval)
+{
+  guint token;
+  
+  token = g_scanner_get_next_token(scanner);
+  if (token != wanted_token)
+    return wanted_token;
+  
+  token = g_scanner_get_next_token(scanner);
+  if (token != G_TOKEN_EQUAL_SIGN)
+    return G_TOKEN_EQUAL_SIGN;
+  
+  token = g_scanner_get_next_token(scanner);
+  if (token == TOKEN_TRUE)
+    *retval = TRUE;
+  else if (token == TOKEN_FALSE)
+    *retval = FALSE;
+  else
+    return TOKEN_TRUE;
+
+  return G_TOKEN_NONE;
+}
+
+static guint 
+moko_rc_style_parse (GtkRcStyle *rc_style, GtkSettings *settings, GScanner *scanner)
+{
+  static GQuark scope_id = 0;
+  MokoRcStyle *theme_data = MOKO_RC_STYLE (rc_style);
+  guint old_scope;
+  guint token;
+
+  /* Set up a our own scope for this scanner */
+
+  if (!scope_id)
+    scope_id = g_quark_from_string ("moko_gtk_engine");
+
+  old_scope = g_scanner_set_scope (scanner, scope_id);
+
+  /* check we haven't already added the moko symbols to this scanner */
+
+  if (!g_scanner_lookup_symbol (scanner, moko_rc_symbols[0].name))
+  {
+    gint i;
+    for (i = 0; i < G_N_ELEMENTS (moko_rc_symbols); i++)
+    {
+      g_scanner_scope_add_symbol (scanner, scope_id, moko_rc_symbols[i].name,
+          GINT_TO_POINTER (moko_rc_symbols[i].token));
+    }
+  }
+
+
+  token = g_scanner_peek_next_token (scanner);
+
+  while (token != G_TOKEN_RIGHT_CURLY)
+  {
+    guint i;
+
+    switch (token)
+    {
+      case TOKEN_HAS_BORDER:
+        token = moko_rc_parse_boolean (scanner, TOKEN_HAS_BORDER, &i);
+        if (token != G_TOKEN_NONE)
+          break;
+        theme_data->has_border = i;
+        break;
+      case TOKEN_HAS_GRADIENT:
+        token = moko_rc_parse_boolean (scanner, TOKEN_HAS_GRADIENT, &i);
+        if (token != G_TOKEN_NONE)
+          break;
+        theme_data->has_gradient = i;
+        break;
+
+      default:
+        g_scanner_get_next_token (scanner);
+        token = G_TOKEN_RIGHT_CURLY;
+        break;
+
+    }
+
+    if (token != G_TOKEN_NONE)
+    {
+      return token;
+    }
+    token = g_scanner_peek_next_token (scanner);
+  }
+
+  g_scanner_get_next_token (scanner);
+  g_scanner_set_scope (scanner, old_scope);
+
+  return G_TOKEN_NONE;
 }
 

trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-style.h

@@ -39 +39 @@
 
 #define MOKO_TYPE_STYLE              moko_type_style
-#define MOKO_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), POKY_TYPE_STYLE, MokoStyle))
-#define MOKO_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), POKY_TYPE_STYLE, MokoStyleClass))
-#define MOKO_IS_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), POKY_TYPE_STYLE))
-#define MOKO_IS_STYLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), POKY_TYPE_STYLE))
-#define MOKO_STYLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), POKY_TYPE_STYLE, MokoStyleClass))
+#define MOKO_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), MOKO_TYPE_STYLE, MokoStyle))
+#define MOKO_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_STYLE, MokoStyleClass))
+#define MOKO_IS_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), MOKO_TYPE_STYLE))
+#define MOKO_IS_STYLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_STYLE))
+#define MOKO_STYLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), MOKO_TYPE_STYLE, MokoStyleClass))
 
 typedef struct _MokoStyle MokoStyle;
@@ -67 +67 @@
 
 #define MOKO_TYPE_RC_STYLE              moko_type_rc_style
-#define MOKO_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), POKY_TYPE_RC_STYLE, MokoRcStyle))
-#define MOKO_RC_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), POKY_TYPE_RC_STYLE, MokoRcStyleClass))
-#define MOKO_IS_RC_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), POKY_TYPE_RC_STYLE))
-#define MOKO_IS_RC_STYLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), POKY_TYPE_RC_STYLE))
-#define MOKO_RC_STYLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), POKY_TYPE_RC_STYLE, MokoRcStyleClass))
+#define MOKO_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), MOKO_TYPE_RC_STYLE, MokoRcStyle))
+#define MOKO_RC_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_RC_STYLE, MokoRcStyleClass))
+#define MOKO_IS_RC_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), MOKO_TYPE_RC_STYLE))
+#define MOKO_IS_RC_STYLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_RC_STYLE))
+#define MOKO_RC_STYLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), MOKO_TYPE_RC_STYLE, MokoRcStyleClass))
 
 typedef struct _MokoRcStyle MokoRcStyle;
@@ -79 +79 @@
 {
   GtkRcStyle parent_instance;
+
+  gboolean has_border;
+  gboolean has_gradient;
 };
 
@@ -84 +87 @@
 {
   GtkRcStyleClass parent_class;
+
 };
 
 void moko_rc_style_register_type (GTypeModule *engine);
+
+enum
+{
+  TOKEN_HAS_BORDER = G_TOKEN_LAST + 1,
+  TOKEN_HAS_GRADIENT,
+
+  TOKEN_TRUE,
+  TOKEN_FALSE
+};
 
 /******************************************************************************/