cairo-dock-team team mailing list archive

[Matthieu Baerts <matttbe@xxxxxxxxx>]

Matthieu Baerts has proposed merging lp:~meuarrr/cairo-dock-plug-ins/gauge-effect-new into lp:cairo-dock-plug-ins.

Requested reviews:
  Cairo-Dock Team (cairo-dock-team)

For more details, see:
https://code.launchpad.net/~meuarrr/cairo-dock-plug-ins/gauge-effect-new/+merge/68422

If it's ok to merge the other branch, I can merge this one too.
-- 
https://code.launchpad.net/~meuarrr/cairo-dock-plug-ins/gauge-effect-new/+merge/68422
Your team Cairo-Dock Team is requested to review the proposed merge of lp:~meuarrr/cairo-dock-plug-ins/gauge-effect-new into lp:cairo-dock-plug-ins.

=== modified file 'System-Monitor/data/System-Monitor.conf.in'
--- System-Monitor/data/System-Monitor.conf.in	2011-06-13 00:46:35 +0000
+++ System-Monitor/data/System-Monitor.conf.in	2011-07-19 16:29:49 +0000
@@ -114,6 +114,8 @@
 #h+[@gaugesdir@;gauges;gauges2] Choose one of the available themes:/
 theme = Turbo-night-fuel
 
+#l+[No;With dock orientation;Yes] Rotate applet theme :
+rotate theme = No
 
 #X[Graph;gtk-dialog-info]
 frame_graph=

=== modified file 'System-Monitor/src/applet-config.c'
--- System-Monitor/src/applet-config.c	2011-04-07 00:04:36 +0000
+++ System-Monitor/src/applet-config.c	2011-07-19 16:29:49 +0000
@@ -45,6 +45,7 @@
 	myConfig.iDisplayType = CD_CONFIG_GET_INTEGER ("Configuration", "renderer");
 	
 	myConfig.cGThemePath = CD_CONFIG_GET_GAUGE_THEME ("Configuration", "theme");
+	myConfig.iRotateTheme = CD_CONFIG_GET_INTEGER ("Configuration", "rotate theme");
 	
 	myConfig.iGraphType = CD_CONFIG_GET_INTEGER ("Configuration", "graphic type");
 	myConfig.bMixGraph = CD_CONFIG_GET_BOOLEAN ("Configuration", "mix graph");

=== modified file 'System-Monitor/src/applet-init.c'
--- System-Monitor/src/applet-init.c	2011-04-07 00:04:36 +0000
+++ System-Monitor/src/applet-init.c	2011-07-19 16:29:49 +0000
@@ -66,7 +66,8 @@
 		memset (&attr, 0, sizeof (CairoGaugeAttribute));
 		pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
 		pRenderAttr->cModelName = "gauge";
-		attr.cThemePath = myConfig.cGThemePath;
+		pRenderAttr->iRotateTheme = myConfig.iRotateTheme;
+		attr.cThemePath = myConfig.cGThemePath;  
 	}
 	else if (myConfig.iDisplayType == CD_SYSMONITOR_GRAPH)
 	{
@@ -74,7 +75,7 @@
 		memset (&attr, 0, sizeof (CairoGraphAttribute));
 		pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
 		pRenderAttr->cModelName = "graph";
-		pRenderAttr->iMemorySize = (myIcon->fWidth > 1 ? myIcon->fWidth : 32);  // fWidht peut etre <= 1 en mode desklet au chargement.
+		pRenderAttr->iMemorySize = (myIcon->fWidth > 1 ? myIcon->fWidth : 32);  // fWidth peut etre <= 1 en mode desklet au chargement.
 		//g_print ("pRenderAttr->iMemorySize : %d\n", pRenderAttr->iMemorySize);
 		attr.iType = myConfig.iGraphType;
 		attr.iRadius = 10;

=== modified file 'System-Monitor/src/applet-struct.h'
--- System-Monitor/src/applet-struct.h	2011-04-07 00:04:36 +0000
+++ System-Monitor/src/applet-struct.h	2011-07-19 16:29:49 +0000
@@ -80,6 +80,7 @@
 	gint iAlertLimit;
 	gboolean bAlert;
 	gboolean bAlertSound;
+	RendererRotateTheme iRotateTheme;
 } ;
 
 typedef struct {

=== modified file 'netspeed/data/netspeed.conf.in'
--- netspeed/data/netspeed.conf.in	2011-06-13 00:46:35 +0000
+++ netspeed/data/netspeed.conf.in	2011-07-19 16:29:49 +0000
@@ -110,6 +110,9 @@
 #h+[@gaugesdir@;gauges;gauges2] Choose one of the available themes:/
 theme = Turbo-night-fuel
 
+#l+[No;With dock orientation;Yes] Rotate applet theme :
+rotate theme = No
+
 
 #X[Graph;gtk-dialog-info]
 frame_graph=

=== modified file 'netspeed/src/applet-config.c'
--- netspeed/src/applet-config.c	2010-10-27 10:39:56 +0000
+++ netspeed/src/applet-config.c	2011-07-19 16:29:49 +0000
@@ -40,6 +40,7 @@
 	myConfig.iInfoDisplay = CD_CONFIG_GET_INTEGER ("Configuration", "info display");
 
 	myConfig.cGThemePath = CD_CONFIG_GET_GAUGE_THEME ("Configuration", "theme");
+	myConfig.iRotateTheme = CD_CONFIG_GET_INTEGER ("Configuration", "rotate theme");
 	/*myConfig.fAlpha = CD_CONFIG_GET_DOUBLE ("Configuration", "watermark alpha");
 	if (myConfig.fAlpha != 0)
 	{

=== modified file 'netspeed/src/applet-init.c'
--- netspeed/src/applet-init.c	2010-10-27 10:39:56 +0000
+++ netspeed/src/applet-init.c	2011-07-19 16:29:49 +0000
@@ -43,6 +43,7 @@
 		memset (&attr, 0, sizeof (CairoGaugeAttribute));
 		pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
 		pRenderAttr->cModelName = "gauge";
+		pRenderAttr->iRotateTheme = myConfig.iRotateTheme;
 		attr.cThemePath = myConfig.cGThemePath;
 	}
 	else if (myConfig.iDisplayType == CD_NETSPEED_GRAPH)
@@ -51,7 +52,7 @@
 		memset (&attr, 0, sizeof (CairoGraphAttribute));
 		pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
 		pRenderAttr->cModelName = "graph";
-		pRenderAttr->iMemorySize = (myIcon->fWidth > 1 ? myIcon->fWidth : 32);  // fWidht peut etre <= 1 en mode desklet au chargement.
+		pRenderAttr->iMemorySize = (myIcon->fWidth > 1 ? myIcon->fWidth : 32);  // fWidth peut etre <= 1 en mode desklet au chargement.
 		attr.iType = myConfig.iGraphType;
 		attr.iRadius = 10;
 		attr.bMixGraphs = myConfig.bMixGraph;

=== modified file 'netspeed/src/applet-struct.h'
--- netspeed/src/applet-struct.h	2010-10-27 10:39:56 +0000
+++ netspeed/src/applet-struct.h	2011-07-19 16:29:49 +0000
@@ -55,6 +55,7 @@
 	
 	gchar *cSystemMonitorCommand;
 	gdouble fSmoothFactor;
+	RendererRotateTheme iRotateTheme;
 } ;
 
 struct _AppletData {