GNOME.org
 

murrine r102 - in trunk: . schema src

Author: acimitan
Date: Sun Dec 28 02:34:13 2008
New Revision: 102
URL: http://svn.gnome.org/viewvc/murrine?rev=102&view=rev

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

	* schema/murrine.xml.in.in:
	* src/murrine_draw.c (murrine_draw_progressbar_fill):
	* src/murrine_draw_rgba.c (murrine_rgba_draw_progressbar_fill):
	* src/murrine_rc_style.c (murrine_rc_style_init),
	(murrine_rc_style_parse), (murrine_rc_style_merge):
	* src/murrine_rc_style.h:
	* src/murrine_style.c (murrine_style_draw_box),
	(murrine_style_init_from_rc), (murrine_style_copy):
	* src/murrine_style.h:
	* src/murrine_types.h:
	Added progressbarstyle, progressbarstyle = 1 is striped,
	progressbarstyle = 0 (ugly) is without anything.


Modified:
   trunk/ChangeLog
   trunk/schema/murrine.xml.in.in
   trunk/src/murrine_draw.c
   trunk/src/murrine_draw_rgba.c
   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	Sun Dec 28 02:34:13 2008
@@ -220,6 +220,17 @@
 		</enumeration>
 	</option>
 
+	<option type="enumeration" name="progressbarstyle" default="1">
+		<_long_name>Progressbar style</_long_name>
+		<section>General</section>
+		<enumeration value="0">
+			<label>Don't draw any special effect</label>
+		</enumeration>
+		<enumeration value="1">
+			<label>Draw stripes</label>
+		</enumeration>
+	</option>
+
 	<option type="enumeration" name="reliefstyle" default="2">
 		<_long_name>Relief style of widget</_long_name>
 		<section>General</section>

Modified: trunk/src/murrine_draw.c
==============================================================================
--- trunk/src/murrine_draw.c	(original)
+++ trunk/src/murrine_draw.c	Sun Dec 28 02:34:13 2008
@@ -479,7 +479,7 @@
                                const WidgetParameters      *widget,
                                const ProgressBarParameters *progressbar,
                                int x, int y, int width, int height,
-                               gint offset)
+                               gint offset, int progressbarstyle)
 {
 	boolean    is_horizontal = progressbar->orientation < 2;
 	double     tile_pos = 0;
@@ -522,20 +522,31 @@
 	                    widget->mrn_gradient, widget, 2, 1, width-4, height-2,
 	                    widget->roundness, widget->corners, TRUE);
 
-	/* Draw strokes */
-	while (tile_pos <= width+x_step-2)
+	switch (progressbarstyle)
 	{
-		cairo_move_to (cr, stroke_width/2-x_step, 0);
-		cairo_line_to (cr, stroke_width-x_step, 0);
-		cairo_line_to (cr, stroke_width/2-x_step, height);
-		cairo_line_to (cr, -x_step, height);
+		case 0:
+			break;
+		default:
+		case 1:
+		{
+			/* Draw strokes */
+			while (tile_pos <= width+x_step-2)
+			{
+				cairo_move_to (cr, stroke_width/2-x_step, 0);
+				cairo_line_to (cr, stroke_width-x_step, 0);
+				cairo_line_to (cr, stroke_width/2-x_step, height);
+				cairo_line_to (cr, -x_step, height);
+
+				cairo_translate (cr, stroke_width, 0);
+				tile_pos += stroke_width;
+			}
 
-		cairo_translate (cr, stroke_width, 0);
-		tile_pos += stroke_width;
+			murrine_set_color_rgba (cr, &colors->spot[2], 0.15);
+			cairo_fill (cr);
+			break;
+		}
 	}
 
-	murrine_set_color_rgba (cr, &colors->spot[2], 0.15);
-	cairo_fill (cr);
 	cairo_restore (cr);
 
 	/* Draw the border */

Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c	(original)
+++ trunk/src/murrine_draw_rgba.c	Sun Dec 28 02:34:13 2008
@@ -433,7 +433,7 @@
                                     const WidgetParameters      *widget,
                                     const ProgressBarParameters *progressbar,
                                     int x, int y, int width, int height,
-                                    gint offset)
+                                    gint offset, int progressbarstyle)
 {
 	boolean    is_horizontal = progressbar->orientation < 2;
 	double     tile_pos = 0;
@@ -478,20 +478,31 @@
 	                    widget->mrn_gradient, widget, 2, 1, width-4, height-2,
 	                    widget->roundness, widget->corners, TRUE);
 
-	/* Draw strokes */
-	while (tile_pos <= width+x_step-2)
+	switch (progressbarstyle)
 	{
-		cairo_move_to (cr, stroke_width/2-x_step, 0);
-		cairo_line_to (cr, stroke_width-x_step, 0);
-		cairo_line_to (cr, stroke_width/2-x_step, height);
-		cairo_line_to (cr, -x_step, height);
+		case 0:
+			break;
+		default:
+		case 1:
+		{
+			/* Draw strokes */
+			while (tile_pos <= width+x_step-2)
+			{
+				cairo_move_to (cr, stroke_width/2-x_step, 0);
+				cairo_line_to (cr, stroke_width-x_step, 0);
+				cairo_line_to (cr, stroke_width/2-x_step, height);
+				cairo_line_to (cr, -x_step, height);
 
-		cairo_translate (cr, stroke_width, 0);
-		tile_pos += stroke_width;
+				cairo_translate (cr, stroke_width, 0);
+				tile_pos += stroke_width;
+			}
+
+			murrine_set_color_rgba (cr, &colors->spot[2], 0.15);
+			cairo_fill (cr);
+			break;
+		}
 	}
 
-	murrine_set_color_rgba (cr, &colors->spot[2], 0.15);
-	cairo_fill (cr);
 	cairo_restore (cr);
 
 	/* Draw the border */

Modified: trunk/src/murrine_rc_style.c
==============================================================================
--- trunk/src/murrine_rc_style.c	(original)
+++ trunk/src/murrine_rc_style.c	Sun Dec 28 02:34:13 2008
@@ -51,6 +51,7 @@
 	TOKEN_MENUITEMSTYLE,
 	TOKEN_MENUSTYLE,
 	TOKEN_PROFILE,
+	TOKEN_PROGRESSBARSTYLE,
 	TOKEN_RELIEFSTYLE,
 	TOKEN_RGBA,
 	TOKEN_ROUNDNESS,
@@ -97,6 +98,7 @@
 	{ "menuitemstyle",       TOKEN_MENUITEMSTYLE },
 	{ "menustyle",           TOKEN_MENUSTYLE },
 	{ "profile",             TOKEN_PROFILE },
+	{ "progressbarstyle",    TOKEN_PROGRESSBARSTYLE },
 	{ "reliefstyle",         TOKEN_RELIEFSTYLE },
 	{ "rgba",                TOKEN_RGBA },
 	{ "roundness",           TOKEN_ROUNDNESS },
@@ -152,6 +154,7 @@
 	murrine_rc->menubarstyle = 0;
 	murrine_rc->menuitemstyle = 1;
 	murrine_rc->menustyle = 1;
+	murrine_rc->progressbarstyle = 1;
 	murrine_rc->reliefstyle = 2;
 	murrine_rc->rgba = FALSE;
 	murrine_rc->roundness = 1;
@@ -512,6 +515,10 @@
 				token = theme_parse_profile (settings, scanner, &murrine_style->profile);
 				murrine_style->flags |= MRN_FLAG_PROFILE;
 				break;
+			case TOKEN_PROGRESSBARSTYLE:
+				token = theme_parse_int (settings, scanner, &murrine_style->progressbarstyle);
+				murrine_style->flags |= MRN_FLAG_PROGRESSBARSTYLE;
+				break;
 			case TOKEN_RELIEFSTYLE:
 				token = theme_parse_int (settings, scanner, &murrine_style->reliefstyle);
 				murrine_style->flags |= MRN_FLAG_RELIEFSTYLE;
@@ -631,6 +638,8 @@
 		dest_w->menustyle = src_w->menustyle;
 	if (flags & MRN_FLAG_PROFILE)
 		dest_w->profile = src_w->profile;
+	if (flags & MRN_FLAG_PROGRESSBARSTYLE)
+		dest_w->progressbarstyle = src_w->progressbarstyle;
 	if (flags & MRN_FLAG_RELIEFSTYLE)
 		dest_w->reliefstyle = src_w->reliefstyle;
 	if (flags & MRN_FLAG_RGBA)

Modified: trunk/src/murrine_rc_style.h
==============================================================================
--- trunk/src/murrine_rc_style.h	(original)
+++ trunk/src/murrine_rc_style.h	Sun Dec 28 02:34:13 2008
@@ -51,14 +51,15 @@
 	MRN_FLAG_MENUITEMSTYLE = 1 << 13,
 	MRN_FLAG_MENUSTYLE = 1 << 14,
 	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
+	MRN_FLAG_PROGRESSBARSTYLE = 1 << 16,
+	MRN_FLAG_RELIEFSTYLE = 1 << 17,
+	MRN_FLAG_RGBA = 1 << 18,
+	MRN_FLAG_ROUNDNESS = 1 << 19,
+	MRN_FLAG_SCROLLBAR_COLOR = 1 << 20,
+	MRN_FLAG_SCROLLBARSTYLE = 1 << 21,
+	MRN_FLAG_SLIDERSTYLE = 1 << 22,
+	MRN_FLAG_STEPPERSTYLE = 1 << 23,
+	MRN_FLAG_TOOLBARSTYLE = 1 << 24
 } MurrineRcFlags;
 
 struct _MurrineRcStyle
@@ -80,6 +81,7 @@
 	guint8   menubarstyle;
 	guint8   menuitemstyle;
 	guint8   menustyle;
+	guint8   progressbarstyle;
 	guint8   reliefstyle;
 	guint8   roundness;
 	guint8   scrollbarstyle;

Modified: trunk/src/murrine_style.c
==============================================================================
--- trunk/src/murrine_style.c	(original)
+++ trunk/src/murrine_style.c	Sun Dec 28 02:34:13 2008
@@ -983,9 +983,9 @@
 	else if (DETAIL ("bar"))
 	{
 		WidgetParameters      params;
-
 		ProgressBarParameters progressbar;
 		gdouble               elapsed = 0.0;
+		int progressbarstyle = murrine_style->progressbarstyle;
 
 		murrine_set_widget_parameters (widget, style, state_type, &params);
 		params.corners = MRN_CORNER_NONE;
@@ -1023,11 +1023,11 @@
 #ifndef HAVE_ANIMATIONRTL
 		STYLE_FUNCTION(draw_progressbar_fill) (cr, colors, &params, &progressbar,
 		                                       x-1, y, width+2, height,
-		                                       10-(int)(elapsed*10.0) % 10);
+		                                       10-(int)(elapsed*10.0) % 10, progressbarstyle);
 #else
 		STYLE_FUNCTION(draw_progressbar_fill) (cr, colors, &params, &progressbar,
 		                                       x-1, y, width+2, height,
-		                                       10+(int)(elapsed*10.0) % 10);
+		                                       10+(int)(elapsed*10.0) % 10, progressbarstyle);
 #endif
 	}
 	else if (DETAIL ("hscale") || DETAIL ("vscale"))
@@ -1705,23 +1705,24 @@
 	}
 	else
 		murrine_style->roundness       = MURRINE_RC_STYLE (rc_style)->roundness;
-	murrine_style->menubarstyle        = MURRINE_RC_STYLE (rc_style)->menubarstyle;
-	murrine_style->menubaritemstyle    = MURRINE_RC_STYLE (rc_style)->menubaritemstyle;
-	murrine_style->menustyle           = MURRINE_RC_STYLE (rc_style)->menustyle;
-	murrine_style->menuitemstyle       = MURRINE_RC_STYLE (rc_style)->menuitemstyle;
+	murrine_style->animation           = MURRINE_RC_STYLE (rc_style)->animation;
+	murrine_style->colorize_scrollbar  = MURRINE_RC_STYLE (rc_style)->colorize_scrollbar;
+	murrine_style->gradients           = MURRINE_RC_STYLE (rc_style)->gradients;
+	murrine_style->has_scrollbar_color = MURRINE_RC_STYLE (rc_style)->has_scrollbar_color;
 	murrine_style->lightborderstyle    = MURRINE_RC_STYLE (rc_style)->lightborderstyle;
 	murrine_style->listviewheaderstyle = MURRINE_RC_STYLE (rc_style)->listviewheaderstyle;
 	murrine_style->listviewstyle       = MURRINE_RC_STYLE (rc_style)->listviewstyle;
-	murrine_style->sliderstyle         = MURRINE_RC_STYLE (rc_style)->sliderstyle;
+	murrine_style->menubarstyle        = MURRINE_RC_STYLE (rc_style)->menubarstyle;
+	murrine_style->menubaritemstyle    = MURRINE_RC_STYLE (rc_style)->menubaritemstyle;
+	murrine_style->menuitemstyle       = MURRINE_RC_STYLE (rc_style)->menuitemstyle;
+	murrine_style->menustyle           = MURRINE_RC_STYLE (rc_style)->menustyle;
+	murrine_style->progressbarstyle    = MURRINE_RC_STYLE (rc_style)->progressbarstyle;
+	murrine_style->reliefstyle         = MURRINE_RC_STYLE (rc_style)->reliefstyle;
+	murrine_style->rgba                = MURRINE_RC_STYLE (rc_style)->rgba;
 	murrine_style->scrollbarstyle      = MURRINE_RC_STYLE (rc_style)->scrollbarstyle;
-	murrine_style->has_scrollbar_color = MURRINE_RC_STYLE (rc_style)->has_scrollbar_color;
+	murrine_style->sliderstyle         = MURRINE_RC_STYLE (rc_style)->sliderstyle;
 	murrine_style->stepperstyle        = MURRINE_RC_STYLE (rc_style)->stepperstyle;
 	murrine_style->toolbarstyle        = MURRINE_RC_STYLE (rc_style)->toolbarstyle;
-	murrine_style->animation           = MURRINE_RC_STYLE (rc_style)->animation;
-	murrine_style->gradients           = MURRINE_RC_STYLE (rc_style)->gradients;
-	murrine_style->colorize_scrollbar  = MURRINE_RC_STYLE (rc_style)->colorize_scrollbar;
-	murrine_style->rgba                = MURRINE_RC_STYLE (rc_style)->rgba;
-	murrine_style->reliefstyle         = MURRINE_RC_STYLE (rc_style)->reliefstyle;
 
 	if (murrine_style->has_scrollbar_color)
 		murrine_style->scrollbar_color = MURRINE_RC_STYLE (rc_style)->scrollbar_color;
@@ -1972,6 +1973,7 @@
 	mrn_style->menuitemstyle       = mrn_src->menuitemstyle;
 	mrn_style->menustyle           = mrn_src->menustyle;
 	mrn_style->profile             = mrn_src->profile;
+	mrn_style->progressbarstyle    = mrn_src->progressbarstyle;
 	mrn_style->reliefstyle         = mrn_src->reliefstyle;
 	mrn_style->rgba                = mrn_src->rgba;
 	mrn_style->roundness           = mrn_src->roundness;

Modified: trunk/src/murrine_style.h
==============================================================================
--- trunk/src/murrine_style.h	(original)
+++ trunk/src/murrine_style.h	Sun Dec 28 02:34:13 2008
@@ -57,6 +57,7 @@
 	guint8   menubarstyle;
 	guint8   menuitemstyle;
 	guint8   menustyle;
+	guint8   progressbarstyle;
 	guint8   reliefstyle;
 	guint8   roundness;
 	guint8   scrollbarstyle;

Modified: trunk/src/murrine_types.h
==============================================================================
--- trunk/src/murrine_types.h	(original)
+++ trunk/src/murrine_types.h	Sun Dec 28 02:34:13 2008
@@ -335,7 +335,7 @@
 	                               const WidgetParameters      *widget,
 	                               const ProgressBarParameters *progressbar,
 	                               int x, int y, int width, int height,
-	                               gint offset);
+	                               gint offset, int progressbarstyle);
 
 	void (*draw_entry) (cairo_t *cr,
 	                    const MurrineColors    *colors,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]