Cairo-Dock Plug-ins

Merge lp:~sqp/cairo-dock-plug-ins/gauge-effect-new into lp:~cairo-dock-team/cairo-dock-plug-ins/plug-ins

  1. gauge-effect-new
  2. Merge into plug-ins
Proposed by Matthieu Baerts
Status: Merged
Merged at revision: 2071
Proposed branch: lp:~sqp/cairo-dock-plug-ins/gauge-effect-new
Merge into: lp:~cairo-dock-team/cairo-dock-plug-ins/plug-ins
Diff against target: 118 lines (+14/-3)
8 files modified
System-Monitor/data/System-Monitor.conf.in (+2/-0)
System-Monitor/src/applet-config.c (+1/-0)
System-Monitor/src/applet-init.c (+3/-2)
System-Monitor/src/applet-struct.h (+1/-0)
netspeed/data/netspeed.conf.in (+3/-0)
netspeed/src/applet-config.c (+1/-0)
netspeed/src/applet-init.c (+2/-1)
netspeed/src/applet-struct.h (+1/-0)
To merge this branch: bzr merge lp:~sqp/cairo-dock-plug-ins/gauge-effect-new
Reviewer Review Type Date Requested Status
Cairo-Dock Devs Pending
Review via email: mp+68422@code.launchpad.net

Description of the change

If it's ok to merge the other branch, I can merge this one too.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
114#h+[@gaugesdir@;gauges;gauges2] Choose one of the available themes:/114#h+[@gaugesdir@;gauges;gauges2] Choose one of the available themes:/
115theme = Turbo-night-fuel115theme = Turbo-night-fuel
116116
117#l+[No;With dock orientation;Yes] Rotate applet theme :
118rotate theme = No
117119
118#X[Graph;gtk-dialog-info]120#X[Graph;gtk-dialog-info]
119frame_graph=121frame_graph=
120122
=== 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 @@
45 myConfig.iDisplayType = CD_CONFIG_GET_INTEGER ("Configuration", "renderer");45 myConfig.iDisplayType = CD_CONFIG_GET_INTEGER ("Configuration", "renderer");
46 46
47 myConfig.cGThemePath = CD_CONFIG_GET_GAUGE_THEME ("Configuration", "theme");47 myConfig.cGThemePath = CD_CONFIG_GET_GAUGE_THEME ("Configuration", "theme");
48 myConfig.iRotateTheme = CD_CONFIG_GET_INTEGER ("Configuration", "rotate theme");
48 49
49 myConfig.iGraphType = CD_CONFIG_GET_INTEGER ("Configuration", "graphic type");50 myConfig.iGraphType = CD_CONFIG_GET_INTEGER ("Configuration", "graphic type");
50 myConfig.bMixGraph = CD_CONFIG_GET_BOOLEAN ("Configuration", "mix graph");51 myConfig.bMixGraph = CD_CONFIG_GET_BOOLEAN ("Configuration", "mix graph");
5152
=== 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 @@
66 memset (&attr, 0, sizeof (CairoGaugeAttribute));66 memset (&attr, 0, sizeof (CairoGaugeAttribute));
67 pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);67 pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
68 pRenderAttr->cModelName = "gauge";68 pRenderAttr->cModelName = "gauge";
69 attr.cThemePath = myConfig.cGThemePath;69 pRenderAttr->iRotateTheme = myConfig.iRotateTheme;
70 attr.cThemePath = myConfig.cGThemePath;
70 }71 }
71 else if (myConfig.iDisplayType == CD_SYSMONITOR_GRAPH)72 else if (myConfig.iDisplayType == CD_SYSMONITOR_GRAPH)
72 {73 {
@@ -74,7 +75,7 @@
74 memset (&attr, 0, sizeof (CairoGraphAttribute));75 memset (&attr, 0, sizeof (CairoGraphAttribute));
75 pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);76 pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
76 pRenderAttr->cModelName = "graph";77 pRenderAttr->cModelName = "graph";
77 pRenderAttr->iMemorySize = (myIcon->fWidth > 1 ? myIcon->fWidth : 32); // fWidht peut etre <= 1 en mode desklet au chargement.78 pRenderAttr->iMemorySize = (myIcon->fWidth > 1 ? myIcon->fWidth : 32); // fWidth peut etre <= 1 en mode desklet au chargement.
78 //g_print ("pRenderAttr->iMemorySize : %d\n", pRenderAttr->iMemorySize);79 //g_print ("pRenderAttr->iMemorySize : %d\n", pRenderAttr->iMemorySize);
79 attr.iType = myConfig.iGraphType;80 attr.iType = myConfig.iGraphType;
80 attr.iRadius = 10;81 attr.iRadius = 10;
8182
=== 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 @@
80 gint iAlertLimit;80 gint iAlertLimit;
81 gboolean bAlert;81 gboolean bAlert;
82 gboolean bAlertSound;82 gboolean bAlertSound;
83 RendererRotateTheme iRotateTheme;
83} ;84} ;
8485
85typedef struct {86typedef struct {
8687
=== 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 @@
110#h+[@gaugesdir@;gauges;gauges2] Choose one of the available themes:/110#h+[@gaugesdir@;gauges;gauges2] Choose one of the available themes:/
111theme = Turbo-night-fuel111theme = Turbo-night-fuel
112112
113#l+[No;With dock orientation;Yes] Rotate applet theme :
114rotate theme = No
115
113116
114#X[Graph;gtk-dialog-info]117#X[Graph;gtk-dialog-info]
115frame_graph=118frame_graph=
116119
=== 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 @@
40 myConfig.iInfoDisplay = CD_CONFIG_GET_INTEGER ("Configuration", "info display");40 myConfig.iInfoDisplay = CD_CONFIG_GET_INTEGER ("Configuration", "info display");
4141
42 myConfig.cGThemePath = CD_CONFIG_GET_GAUGE_THEME ("Configuration", "theme");42 myConfig.cGThemePath = CD_CONFIG_GET_GAUGE_THEME ("Configuration", "theme");
43 myConfig.iRotateTheme = CD_CONFIG_GET_INTEGER ("Configuration", "rotate theme");
43 /*myConfig.fAlpha = CD_CONFIG_GET_DOUBLE ("Configuration", "watermark alpha");44 /*myConfig.fAlpha = CD_CONFIG_GET_DOUBLE ("Configuration", "watermark alpha");
44 if (myConfig.fAlpha != 0)45 if (myConfig.fAlpha != 0)
45 {46 {
4647
=== 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 @@
43 memset (&attr, 0, sizeof (CairoGaugeAttribute));43 memset (&attr, 0, sizeof (CairoGaugeAttribute));
44 pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);44 pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
45 pRenderAttr->cModelName = "gauge";45 pRenderAttr->cModelName = "gauge";
46 pRenderAttr->iRotateTheme = myConfig.iRotateTheme;
46 attr.cThemePath = myConfig.cGThemePath;47 attr.cThemePath = myConfig.cGThemePath;
47 }48 }
48 else if (myConfig.iDisplayType == CD_NETSPEED_GRAPH)49 else if (myConfig.iDisplayType == CD_NETSPEED_GRAPH)
@@ -51,7 +52,7 @@
51 memset (&attr, 0, sizeof (CairoGraphAttribute));52 memset (&attr, 0, sizeof (CairoGraphAttribute));
52 pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);53 pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
53 pRenderAttr->cModelName = "graph";54 pRenderAttr->cModelName = "graph";
54 pRenderAttr->iMemorySize = (myIcon->fWidth > 1 ? myIcon->fWidth : 32); // fWidht peut etre <= 1 en mode desklet au chargement.55 pRenderAttr->iMemorySize = (myIcon->fWidth > 1 ? myIcon->fWidth : 32); // fWidth peut etre <= 1 en mode desklet au chargement.
55 attr.iType = myConfig.iGraphType;56 attr.iType = myConfig.iGraphType;
56 attr.iRadius = 10;57 attr.iRadius = 10;
57 attr.bMixGraphs = myConfig.bMixGraph;58 attr.bMixGraphs = myConfig.bMixGraph;
5859
=== 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 @@
55 55
56 gchar *cSystemMonitorCommand;56 gchar *cSystemMonitorCommand;
57 gdouble fSmoothFactor;57 gdouble fSmoothFactor;
58 RendererRotateTheme iRotateTheme;
58} ;59} ;
5960
60struct _AppletData {61struct _AppletData {

Subscribers

People subscribed via source and target branches