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
1=== modified file 'System-Monitor/data/System-Monitor.conf.in'
2--- System-Monitor/data/System-Monitor.conf.in 2011-06-13 00:46:35 +0000
3+++ System-Monitor/data/System-Monitor.conf.in 2011-07-19 16:29:49 +0000
4@@ -114,6 +114,8 @@
5 #h+[@gaugesdir@;gauges;gauges2] Choose one of the available themes:/
6 theme = Turbo-night-fuel
7
8+#l+[No;With dock orientation;Yes] Rotate applet theme :
9+rotate theme = No
10
11 #X[Graph;gtk-dialog-info]
12 frame_graph=
13
14=== modified file 'System-Monitor/src/applet-config.c'
15--- System-Monitor/src/applet-config.c 2011-04-07 00:04:36 +0000
16+++ System-Monitor/src/applet-config.c 2011-07-19 16:29:49 +0000
17@@ -45,6 +45,7 @@
18 myConfig.iDisplayType = CD_CONFIG_GET_INTEGER ("Configuration", "renderer");
19
20 myConfig.cGThemePath = CD_CONFIG_GET_GAUGE_THEME ("Configuration", "theme");
21+ myConfig.iRotateTheme = CD_CONFIG_GET_INTEGER ("Configuration", "rotate theme");
22
23 myConfig.iGraphType = CD_CONFIG_GET_INTEGER ("Configuration", "graphic type");
24 myConfig.bMixGraph = CD_CONFIG_GET_BOOLEAN ("Configuration", "mix graph");
25
26=== modified file 'System-Monitor/src/applet-init.c'
27--- System-Monitor/src/applet-init.c 2011-04-07 00:04:36 +0000
28+++ System-Monitor/src/applet-init.c 2011-07-19 16:29:49 +0000
29@@ -66,7 +66,8 @@
30 memset (&attr, 0, sizeof (CairoGaugeAttribute));
31 pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
32 pRenderAttr->cModelName = "gauge";
33- attr.cThemePath = myConfig.cGThemePath;
34+ pRenderAttr->iRotateTheme = myConfig.iRotateTheme;
35+ attr.cThemePath = myConfig.cGThemePath;
36 }
37 else if (myConfig.iDisplayType == CD_SYSMONITOR_GRAPH)
38 {
39@@ -74,7 +75,7 @@
40 memset (&attr, 0, sizeof (CairoGraphAttribute));
41 pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
42 pRenderAttr->cModelName = "graph";
43- pRenderAttr->iMemorySize = (myIcon->fWidth > 1 ? myIcon->fWidth : 32); // fWidht peut etre <= 1 en mode desklet au chargement.
44+ pRenderAttr->iMemorySize = (myIcon->fWidth > 1 ? myIcon->fWidth : 32); // fWidth peut etre <= 1 en mode desklet au chargement.
45 //g_print ("pRenderAttr->iMemorySize : %d\n", pRenderAttr->iMemorySize);
46 attr.iType = myConfig.iGraphType;
47 attr.iRadius = 10;
48
49=== modified file 'System-Monitor/src/applet-struct.h'
50--- System-Monitor/src/applet-struct.h 2011-04-07 00:04:36 +0000
51+++ System-Monitor/src/applet-struct.h 2011-07-19 16:29:49 +0000
52@@ -80,6 +80,7 @@
53 gint iAlertLimit;
54 gboolean bAlert;
55 gboolean bAlertSound;
56+ RendererRotateTheme iRotateTheme;
57 } ;
58
59 typedef struct {
60
61=== modified file 'netspeed/data/netspeed.conf.in'
62--- netspeed/data/netspeed.conf.in 2011-06-13 00:46:35 +0000
63+++ netspeed/data/netspeed.conf.in 2011-07-19 16:29:49 +0000
64@@ -110,6 +110,9 @@
65 #h+[@gaugesdir@;gauges;gauges2] Choose one of the available themes:/
66 theme = Turbo-night-fuel
67
68+#l+[No;With dock orientation;Yes] Rotate applet theme :
69+rotate theme = No
70+
71
72 #X[Graph;gtk-dialog-info]
73 frame_graph=
74
75=== modified file 'netspeed/src/applet-config.c'
76--- netspeed/src/applet-config.c 2010-10-27 10:39:56 +0000
77+++ netspeed/src/applet-config.c 2011-07-19 16:29:49 +0000
78@@ -40,6 +40,7 @@
79 myConfig.iInfoDisplay = CD_CONFIG_GET_INTEGER ("Configuration", "info display");
80
81 myConfig.cGThemePath = CD_CONFIG_GET_GAUGE_THEME ("Configuration", "theme");
82+ myConfig.iRotateTheme = CD_CONFIG_GET_INTEGER ("Configuration", "rotate theme");
83 /*myConfig.fAlpha = CD_CONFIG_GET_DOUBLE ("Configuration", "watermark alpha");
84 if (myConfig.fAlpha != 0)
85 {
86
87=== modified file 'netspeed/src/applet-init.c'
88--- netspeed/src/applet-init.c 2010-10-27 10:39:56 +0000
89+++ netspeed/src/applet-init.c 2011-07-19 16:29:49 +0000
90@@ -43,6 +43,7 @@
91 memset (&attr, 0, sizeof (CairoGaugeAttribute));
92 pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
93 pRenderAttr->cModelName = "gauge";
94+ pRenderAttr->iRotateTheme = myConfig.iRotateTheme;
95 attr.cThemePath = myConfig.cGThemePath;
96 }
97 else if (myConfig.iDisplayType == CD_NETSPEED_GRAPH)
98@@ -51,7 +52,7 @@
99 memset (&attr, 0, sizeof (CairoGraphAttribute));
100 pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
101 pRenderAttr->cModelName = "graph";
102- pRenderAttr->iMemorySize = (myIcon->fWidth > 1 ? myIcon->fWidth : 32); // fWidht peut etre <= 1 en mode desklet au chargement.
103+ pRenderAttr->iMemorySize = (myIcon->fWidth > 1 ? myIcon->fWidth : 32); // fWidth peut etre <= 1 en mode desklet au chargement.
104 attr.iType = myConfig.iGraphType;
105 attr.iRadius = 10;
106 attr.bMixGraphs = myConfig.bMixGraph;
107
108=== modified file 'netspeed/src/applet-struct.h'
109--- netspeed/src/applet-struct.h 2010-10-27 10:39:56 +0000
110+++ netspeed/src/applet-struct.h 2011-07-19 16:29:49 +0000
111@@ -55,6 +55,7 @@
112
113 gchar *cSystemMonitorCommand;
114 gdouble fSmoothFactor;
115+ RendererRotateTheme iRotateTheme;
116 } ;
117
118 struct _AppletData {

Subscribers

People subscribed via source and target branches