GNOME.org
 

murrine r64 - in trunk: . schema src

Author: acimitan
Date: Fri Sep 12 17:25:30 2008
New Revision: 64
URL: http://svn.gnome.org/viewvc/murrine?rev=64&view=rev

Log:
2008-09-12  Andrea Cimitan  <andrea cimitan gmail com>

	* schema/murrine.xml.in.in:
	* src/murrine_rc_style.c (murrine_rc_style_init),
	(theme_parse_profile), (murrine_rc_style_parse),
	(murrine_rc_style_merge):
	* src/murrine_rc_style.h:
	* src/murrine_style.c (murrine_set_widget_parameters),
	(murrine_style_draw_vline), (murrine_style_draw_hline),
	(murrine_style_init_from_rc), (murrine_style_copy),
	(murrine_style_class_init):
	* src/murrine_style.h:
	* src/murrine_types.h:
	Renamed "style" to "profile", since it reflects what this option
	does: loading a profile for the style.


Modified:
   trunk/ChangeLog
   trunk/schema/murrine.xml.in.in
   trunk/src/murrine_rc_style.c
   trunk/src/murrine_rc_style.h
   trunk/src/murrine_style.c
   trunk/src/murrine_style.h
   trunk/src/murrine_types.h

Modified: trunk/schema/murrine.xml.in.in
==============================================================================
--- trunk/schema/murrine.xml.in.in	(original)
+++ trunk/schema/murrine.xml.in.in	Fri Sep 12 17:25:30 2008
@@ -200,6 +200,26 @@
 		</enumeration>
 	</option>
 
+	<option name="profile" type="enumeration" default="MURRINE">
+		<_long_name>Style</_long_name>
+		<section>General</section>
+		<enumeration value="MURRINE">
+			<label>Murrine</label>
+		</enumeration>
+		<enumeration value="NODOKA">
+			<label>Nodoka</label>
+		</enumeration>
+		<enumeration value="MIST">
+			<label>Mist</label>
+		</enumeration>
+		<enumeration value="CANDIDO">
+			<label>Candido</label>
+		</enumeration>
+		<enumeration value="CLEARLOOKS">
+			<label>Clearlooks</label>
+		</enumeration>
+	</option>
+
 	<option type="enumeration" name="reliefstyle" default="2">
 		<_long_name>Relief style of widget</_long_name>
 		<section>General</section>
@@ -286,26 +306,6 @@
 		</enumeration>
 	</option>
 
-	<option name="style" type="enumeration" default="MURRINE">
-		<_long_name>Style</_long_name>
-		<section>General</section>
-		<enumeration value="MURRINE">
-			<label>Murrine</label>
-		</enumeration>
-		<enumeration value="NODOKA">
-			<label>Nodoka</label>
-		</enumeration>
-		<enumeration value="MIST">
-			<label>Mist</label>
-		</enumeration>
-		<enumeration value="CANDIDO">
-			<label>Candido</label>
-		</enumeration>
-		<enumeration value="CLEARLOOKS">
-			<label>Clearlooks</label>
-		</enumeration>
-	</option>
-
 	<option type="enumeration" name="toolbarstyle" default="0">
 		<_long_name>Toolbar style</_long_name>
 		<section>Menus and Toolbars</section>

Modified: trunk/src/murrine_rc_style.c
==============================================================================
--- trunk/src/murrine_rc_style.c	(original)
+++ trunk/src/murrine_rc_style.c	Fri Sep 12 17:25:30 2008
@@ -50,6 +50,7 @@
 	TOKEN_MENUBARSTYLE,
 	TOKEN_MENUITEMSTYLE,
 	TOKEN_MENUSTYLE,
+	TOKEN_PROFILE,
 	TOKEN_RELIEFSTYLE,
 	TOKEN_RGBA,
 	TOKEN_ROUNDNESS,
@@ -57,7 +58,6 @@
 	TOKEN_SCROLLBARSTYLE,
 	TOKEN_SLIDERSTYLE,
 	TOKEN_STEPPERSTYLE,
-	TOKEN_STYLE,
 	TOKEN_TOOLBARSTYLE,
 
 	TOKEN_CANDIDO,
@@ -96,6 +96,7 @@
 	{ "menubarstyle",        TOKEN_MENUBARSTYLE },
 	{ "menuitemstyle",       TOKEN_MENUITEMSTYLE },
 	{ "menustyle",           TOKEN_MENUSTYLE },
+	{ "profile",             TOKEN_PROFILE },
 	{ "reliefstyle",         TOKEN_RELIEFSTYLE },
 	{ "rgba",                TOKEN_RGBA },
 	{ "roundness",           TOKEN_ROUNDNESS },
@@ -103,7 +104,6 @@
 	{ "scrollbarstyle",      TOKEN_SCROLLBARSTYLE },
 	{ "sliderstyle",         TOKEN_SLIDERSTYLE },
 	{ "stepperstyle",        TOKEN_STEPPERSTYLE },
-	{ "style",               TOKEN_STYLE },
 	{ "toolbarstyle",        TOKEN_TOOLBARSTYLE },
 
 	{ "CANDIDO",             TOKEN_CANDIDO },
@@ -158,7 +158,7 @@
 	murrine_rc->scrollbarstyle = 0;
 	murrine_rc->sliderstyle = 0;
 	murrine_rc->stepperstyle = 0;
-	murrine_rc->style = MRN_STYLE_MURRINE;
+	murrine_rc->profile = MRN_PROFILE_MURRINE;
 	murrine_rc->toolbarstyle = 0;
 }
 
@@ -286,15 +286,15 @@
 }
 
 static guint
-theme_parse_style (GtkSettings   *settings,
-                   GScanner      *scanner,
-                   MurrineStyles *style)
+theme_parse_profile (GtkSettings     *settings,
+                     GScanner        *scanner,
+                     MurrineProfiles *profile)
 {
 	guint token;
 
-	g_assert (MRN_NUM_STYLES == MRN_STYLE_CLEARLOOKS + 1); /* so that people don't forget ;-) */
+	g_assert (MRN_NUM_PROFILES == MRN_PROFILE_CLEARLOOKS + 1); /* so that people don't forget ;-) */
 
-	/* Skip 'style' */
+	/* Skip 'profile' */
 	token = g_scanner_get_next_token (scanner);
 
 	token = g_scanner_get_next_token (scanner);
@@ -306,19 +306,19 @@
 	switch (token)
 	{
 		case TOKEN_MURRINE:
-		   *style = MRN_STYLE_MURRINE;
+		   *profile = MRN_PROFILE_MURRINE;
 		   break;
 		case TOKEN_NODOKA:
-		   *style = MRN_STYLE_NODOKA;
+		   *profile = MRN_PROFILE_NODOKA;
 		   break;
 		case TOKEN_MIST:
-		   *style = MRN_STYLE_MIST;
+		   *profile = MRN_PROFILE_MIST;
 		   break;
 		case TOKEN_CANDIDO:
-		   *style = MRN_STYLE_CANDIDO;
+		   *profile = MRN_PROFILE_CANDIDO;
 		   break;
 		case TOKEN_CLEARLOOKS:
-		   *style = MRN_STYLE_CLEARLOOKS;
+		   *profile = MRN_PROFILE_CLEARLOOKS;
 		   break;
 		default:
 		   return TOKEN_MURRINE;
@@ -508,6 +508,10 @@
 				token = theme_parse_int (settings, scanner, &murrine_style->menustyle);
 				murrine_style->flags |= MRN_FLAG_MENUSTYLE;
 				break;
+			case TOKEN_PROFILE:
+				token = theme_parse_profile (settings, scanner, &murrine_style->profile);
+				murrine_style->flags |= MRN_FLAG_PROFILE;
+				break;
 			case TOKEN_RELIEFSTYLE:
 				token = theme_parse_int (settings, scanner, &murrine_style->reliefstyle);
 				murrine_style->flags |= MRN_FLAG_RELIEFSTYLE;
@@ -537,10 +541,6 @@
 				token = theme_parse_int (settings, scanner, &murrine_style->stepperstyle);
 				murrine_style->flags |= MRN_FLAG_STEPPERSTYLE;
 				break;
-			case TOKEN_STYLE:
-				token = theme_parse_style (settings, scanner, &murrine_style->style);
-				murrine_style->flags |= MRN_FLAG_STYLE;
-				break;
 			case TOKEN_TOOLBARSTYLE:
 				token = theme_parse_int (settings, scanner, &murrine_style->toolbarstyle);
 				murrine_style->flags |= MRN_FLAG_TOOLBARSTYLE;
@@ -629,6 +629,8 @@
 		dest_w->menuitemstyle = src_w->menuitemstyle;
 	if (flags & MRN_FLAG_MENUSTYLE)
 		dest_w->menustyle = src_w->menustyle;
+	if (flags & MRN_FLAG_PROFILE)
+		dest_w->profile = src_w->profile;
 	if (flags & MRN_FLAG_RELIEFSTYLE)
 		dest_w->reliefstyle = src_w->reliefstyle;
 	if (flags & MRN_FLAG_RGBA)
@@ -646,8 +648,6 @@
 		dest_w->sliderstyle = src_w->sliderstyle;
 	if (flags & MRN_FLAG_STEPPERSTYLE)
 		dest_w->stepperstyle = src_w->stepperstyle;
-	if (flags & MRN_FLAG_STYLE)
-		dest_w->style = src_w->style;
 	if (flags & MRN_FLAG_TOOLBARSTYLE)
 		dest_w->toolbarstyle = src_w->toolbarstyle;
 

Modified: trunk/src/murrine_rc_style.h
==============================================================================
--- trunk/src/murrine_rc_style.h	(original)
+++ trunk/src/murrine_rc_style.h	Fri Sep 12 17:25:30 2008
@@ -50,14 +50,14 @@
 	MRN_FLAG_MENUBARSTYLE = 1 << 12,
 	MRN_FLAG_MENUITEMSTYLE = 1 << 13,
 	MRN_FLAG_MENUSTYLE = 1 << 14,
-	MRN_FLAG_RELIEFSTYLE = 1 << 15,
-	MRN_FLAG_RGBA = 1 << 16,
-	MRN_FLAG_ROUNDNESS = 1 << 17,
-	MRN_FLAG_SCROLLBAR_COLOR = 1 << 18,
-	MRN_FLAG_SCROLLBARSTYLE = 1 << 19,
-	MRN_FLAG_SLIDERSTYLE = 1 << 20,
-	MRN_FLAG_STEPPERSTYLE = 1 << 21,
-	MRN_FLAG_STYLE = 1 << 22,
+	MRN_FLAG_PROFILE = 1 << 15,
+	MRN_FLAG_RELIEFSTYLE = 1 << 16,
+	MRN_FLAG_RGBA = 1 << 17,
+	MRN_FLAG_ROUNDNESS = 1 << 18,
+	MRN_FLAG_SCROLLBAR_COLOR = 1 << 19,
+	MRN_FLAG_SCROLLBARSTYLE = 1 << 20,
+	MRN_FLAG_SLIDERSTYLE = 1 << 21,
+	MRN_FLAG_STEPPERSTYLE = 1 << 22,
 	MRN_FLAG_TOOLBARSTYLE = 1 << 23
 } MurrineRcFlags;
 
@@ -95,7 +95,7 @@
 
 	GdkColor scrollbar_color;
 
-	MurrineStyles style;
+	MurrineProfiles profile;
 };
 
 struct _MurrineRcStyleClass

Modified: trunk/src/murrine_style.c
==============================================================================
--- trunk/src/murrine_style.c	(original)
+++ trunk/src/murrine_style.c	Fri Sep 12 17:25:30 2008
@@ -68,7 +68,7 @@
 #include "animation.h"
 #endif
 
-#define STYLE_FUNCTION(function) (MURRINE_STYLE_GET_CLASS (style)->style_functions[params.drawstyle].function)
+#define STYLE_FUNCTION(function) (MURRINE_STYLE_GET_CLASS (style)->style_functions[params.style].function)
 
 G_DEFINE_DYNAMIC_TYPE (MurrineStyle, murrine_style, GTK_TYPE_STYLE)
 
@@ -163,14 +163,14 @@
 	                         murrine_style->rgba);
 	mrn_gradient.rgba_opacity = GRADIENT_OPACITY;
 
-	MurrineDrawStyles drawstyle = MRN_DRAW_STYLE_MURRINE;
+	MurrineStyles mrn_style = MRN_STYLE_MURRINE;
 	if (mrn_gradient.use_rgba)
 	{
-		drawstyle = MRN_DRAW_STYLE_RGBA;
+		mrn_style = MRN_STYLE_RGBA;
 	}
 	params->mrn_gradient = mrn_gradient;
-	params->drawstyle = drawstyle;
-	params->style_functions = &(MURRINE_STYLE_GET_CLASS (style)->style_functions[drawstyle]);
+	params->style = mrn_style;
+	params->style_functions = &(MURRINE_STYLE_GET_CLASS (style)->style_functions[mrn_style]);
 
 	/* I want to avoid to have to do this. I need it for GtkEntry, unless I
 	   find out why it doesn't behave the way I expect it to. */
@@ -1379,10 +1379,10 @@
 
 	WidgetParameters params;
 
-	params.drawstyle = MRN_DRAW_STYLE_MURRINE;
+	params.style = MRN_STYLE_MURRINE;
 	if (murrine_widget_is_rgba (toplevel))
 	{
-		params.drawstyle = MRN_DRAW_STYLE_RGBA;
+		params.style = MRN_STYLE_RGBA;
 	}
 
 	if (!(widget &&
@@ -1425,10 +1425,10 @@
 
 	WidgetParameters params;
 
-	params.drawstyle = MRN_DRAW_STYLE_MURRINE;
+	params.style = MRN_STYLE_MURRINE;
 	if (murrine_widget_is_rgba (toplevel))
 	{
-		params.drawstyle = MRN_DRAW_STYLE_RGBA;
+		params.style = MRN_STYLE_RGBA;
 	}
 
 	STYLE_FUNCTION(draw_separator) (cr, colors, NULL, &separator, x1, y, x2-x1, 2);
@@ -1694,13 +1694,13 @@
 	if (murrine_style->has_scrollbar_color)
 		murrine_style->scrollbar_color = MURRINE_RC_STYLE (rc_style)->scrollbar_color;
 
-	g_assert ((MURRINE_RC_STYLE (rc_style)->style >= 0) &&
-	          (MURRINE_RC_STYLE (rc_style)->style < MRN_NUM_STYLES));
-	murrine_style->style               = MURRINE_RC_STYLE (rc_style)->style;
+	g_assert ((MURRINE_RC_STYLE (rc_style)->profile >= 0) &&
+	          (MURRINE_RC_STYLE (rc_style)->profile < MRN_NUM_PROFILES));
+	murrine_style->profile             = MURRINE_RC_STYLE (rc_style)->profile;
 
-	switch (murrine_style->style)
+	switch (murrine_style->profile)
 	{
-		case (MRN_STYLE_NODOKA):
+		case (MRN_PROFILE_NODOKA):
 			murrine_style->highlight_ratio = 1.0;
 			murrine_style->gradients = TRUE;
 			murrine_style->gradient_shades[0] = 1.1;
@@ -1713,7 +1713,7 @@
 			murrine_style->colorize_scrollbar = FALSE;
 			murrine_style->has_scrollbar_color = FALSE;
 			break;
-		case (MRN_STYLE_MIST):
+		case (MRN_PROFILE_MIST):
 			murrine_style->highlight_ratio = 1.0;
 			murrine_style->glazestyle = 0;
 			murrine_style->gradients = FALSE;
@@ -1730,7 +1730,7 @@
 			murrine_style->reliefstyle = 0;
 			murrine_style->roundness = 0;
 			break;
-		case (MRN_STYLE_CANDIDO):
+		case (MRN_PROFILE_CANDIDO):
 			murrine_style->highlight_ratio = 1.0;
 			murrine_style->lightborder_ratio = 1.06;
 			murrine_style->glazestyle = 0;
@@ -1741,7 +1741,7 @@
 			murrine_style->gradient_shades[3] = 0.97;
 			murrine_style->reliefstyle = 0;
 			break;
-		case (MRN_STYLE_CLEARLOOKS):
+		case (MRN_PROFILE_CLEARLOOKS):
 			murrine_style->glazestyle = 0;
 			murrine_style->gradient_shades[0] = 1.08;
 			murrine_style->gradient_shades[1] = 1.02;
@@ -1939,6 +1939,7 @@
 	mrn_style->menubarstyle        = mrn_src->menubarstyle;
 	mrn_style->menuitemstyle       = mrn_src->menuitemstyle;
 	mrn_style->menustyle           = mrn_src->menustyle;
+	mrn_style->profile             = mrn_src->profile;
 	mrn_style->reliefstyle         = mrn_src->reliefstyle;
 	mrn_style->rgba                = mrn_src->rgba;
 	mrn_style->roundness           = mrn_src->roundness;
@@ -1946,7 +1947,6 @@
 	mrn_style->scrollbarstyle      = mrn_src->scrollbarstyle;
 	mrn_style->sliderstyle 	       = mrn_src->sliderstyle;
 	mrn_style->stepperstyle        = mrn_src->stepperstyle;
-	mrn_style->style               = mrn_src->style;
 	mrn_style->toolbarstyle        = mrn_src->toolbarstyle;
 
 	GTK_STYLE_CLASS (murrine_style_parent_class)->copy (style, src);
@@ -2146,9 +2146,9 @@
 	style_class->draw_layout      = murrine_style_draw_layout;
 	style_class->render_icon      = murrine_style_draw_render_icon;
 
-	murrine_register_style_murrine (&klass->style_functions[MRN_DRAW_STYLE_MURRINE]);
-	klass->style_functions[MRN_DRAW_STYLE_RGBA] = klass->style_functions[MRN_DRAW_STYLE_MURRINE];
-	murrine_register_style_rgba (&klass->style_functions[MRN_DRAW_STYLE_RGBA]);
+	murrine_register_style_murrine (&klass->style_functions[MRN_STYLE_MURRINE]);
+	klass->style_functions[MRN_STYLE_RGBA] = klass->style_functions[MRN_STYLE_MURRINE];
+	murrine_register_style_rgba (&klass->style_functions[MRN_STYLE_RGBA]);
 }
 
 static void

Modified: trunk/src/murrine_style.h
==============================================================================
--- trunk/src/murrine_style.h	(original)
+++ trunk/src/murrine_style.h	Fri Sep 12 17:25:30 2008
@@ -42,7 +42,7 @@
 
 	MurrineColors colors;
 
-	MurrineStyles style;
+	MurrineProfiles profile;
 
 	double   contrast;
 	double   gradient_shades[4];

Modified: trunk/src/murrine_types.h
==============================================================================
--- trunk/src/murrine_types.h	(original)
+++ trunk/src/murrine_types.h	Fri Sep 12 17:25:30 2008
@@ -27,20 +27,20 @@
 
 typedef enum
 {
-	MRN_STYLE_MURRINE = 0,
-	MRN_STYLE_NODOKA = 1,
-	MRN_STYLE_MIST = 2,
-	MRN_STYLE_CANDIDO = 3,
-	MRN_STYLE_CLEARLOOKS = 4,
-	MRN_NUM_STYLES = 5
-} MurrineStyles;
+	MRN_PROFILE_MURRINE = 0,
+	MRN_PROFILE_NODOKA = 1,
+	MRN_PROFILE_MIST = 2,
+	MRN_PROFILE_CANDIDO = 3,
+	MRN_PROFILE_CLEARLOOKS = 4,
+	MRN_NUM_PROFILES = 5
+} MurrineProfiles;
 
 typedef enum
 {
-	MRN_DRAW_STYLE_MURRINE = 0,
-	MRN_DRAW_STYLE_RGBA = 1,
+	MRN_STYLE_MURRINE = 0,
+	MRN_STYLE_RGBA = 1,
 	MRN_NUM_DRAW_STYLES = 2
-} MurrineDrawStyles;
+} MurrineStyles;
 
 typedef enum
 {
@@ -205,7 +205,7 @@
 	double lightborder_ratio;
 	MurrineGradients mrn_gradient;
 
-	MurrineDrawStyles drawstyle;
+	MurrineStyles style;
 	MurrineStyleFunctions *style_functions;
 } WidgetParameters;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]