[Xfce4-commits] [panel-plugins/xfce4-sensors-plugin] 02/04: Renamed improperly named variable and adapter strings
noreply at xfce.org
noreply at xfce.org
Sun Oct 21 01:08:51 CEST 2018
This is an automated email from the git hooks/post-receive script.
t i m y s t e r y p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository panel-plugins/xfce4-sensors-plugin.
commit 181a6c8fb5d4cd295d829dfa755232fbb22378ce
Author: Fabian <timystery at arcor.de>
Date: Sun Oct 21 01:00:42 2018 +0200
Renamed improperly named variable and adapter strings
---
configure.ac.in | 2 +-
include/sensors-interface-common.h | 4 ++--
include/sensors-interface-plugin.h | 4 ++--
include/tacho.h | 2 +-
lib/configuration.c | 8 ++++----
lib/sensors-interface-common.c | 2 +-
lib/tacho.c | 14 +++++++-------
panel-plugin/sensors-plugin.c | 36 ++++++++++++++++++------------------
8 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 7a4bb8f..741566b 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -6,7 +6,7 @@ dnl 2003,2004, 2007 Benedikt Meurer <benny at xfce.org>
dnl 2007-2011,2014-2018 Fabian Nowak <timystery at arcor.de>
dnl
-m4_define([libxfce4sensors_verinfo], [4:1:0])
+m4_define([libxfce4sensors_verinfo], [5:1:0])
m4_define([xfce4_sensors_version_major], [1])
m4_define([xfce4_sensors_version_minor], [3])
diff --git a/include/sensors-interface-common.h b/include/sensors-interface-common.h
index bcd3735..62a27eb 100644
--- a/include/sensors-interface-common.h
+++ b/include/sensors-interface-common.h
@@ -121,8 +121,8 @@ typedef struct {
/** used to enable 'show labels' option when using graphical view */
GtkWidget *labels_Box;
- /** used to customize hue value when using graphical view */
- GtkWidget *hue_slider_box;
+ /** used to customize colorvalue value when using graphical view */
+ GtkWidget *colorvalue_slider_box;
/** used to customize alpha value when using graphical view */
GtkWidget *alpha_slider_box;
diff --git a/include/sensors-interface-plugin.h b/include/sensors-interface-plugin.h
index c2bfbbc..133f16a 100644
--- a/include/sensors-interface-plugin.h
+++ b/include/sensors-interface-plugin.h
@@ -163,8 +163,8 @@ typedef struct {
/** preferred dialog height */
gint preferred_height;
- /** hue value for the tachometers, useful for dark themes where lower brightness is required */
- gfloat val_tachos_hue;
+ /** color value for the tachometers, useful for dark themes where lower brightness is required */
+ gfloat val_tachos_color;
/** desired alpha value for the tachometers */
gfloat val_tachos_alpha;
diff --git a/include/tacho.h b/include/tacho.h
index 05f405b..a4d917e 100644
--- a/include/tacho.h
+++ b/include/tacho.h
@@ -117,7 +117,7 @@ extern gchar *font;
* tacho elements.
* TODO: Introduce getter/setter functions
*/
-extern gfloat val_hue;
+extern gfloat val_colorvalue;
/**
* directly exhibited internal value describing the desired alpha value for the
diff --git a/lib/configuration.c b/lib/configuration.c
index 54d9a27..ccdeccf 100644
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -143,8 +143,8 @@ sensors_write_config (XfcePanelPlugin *plugin,t_sensors *ptr_sensors)
xfce_rc_write_int_entry (ptr_xfcerc, "Preferred_Width", ptr_sensors->preferred_width);
xfce_rc_write_int_entry (ptr_xfcerc, "Preferred_Height", ptr_sensors->preferred_height);
- str_tmp = g_strdup_printf("%.2f", ptr_sensors->val_tachos_hue);
- xfce_rc_write_entry (ptr_xfcerc, "Tachos_Hue", str_tmp);
+ str_tmp = g_strdup_printf("%.2f", ptr_sensors->val_tachos_color);
+ xfce_rc_write_entry (ptr_xfcerc, "Tachos_ColorValue", str_tmp);
g_free (str_tmp);
str_tmp = g_strdup_printf("%.2f", ptr_sensors->val_tachos_alpha);
@@ -278,9 +278,9 @@ sensors_read_general_config (XfceRc *ptr_xfceresources, t_sensors *ptr_sensors)
ptr_sensors->preferred_width = xfce_rc_read_int_entry (ptr_xfceresources, "Preferred_Width", 400);
ptr_sensors->preferred_height = xfce_rc_read_int_entry (ptr_xfceresources, "Preferred_Height", 400);
- if ((str_value = xfce_rc_read_entry (ptr_xfceresources, "Tachos_Hue", NULL))
+ if ((str_value = xfce_rc_read_entry (ptr_xfceresources, "Tachos_ColorValue", NULL))
&& *str_value)
- ptr_sensors->val_tachos_hue = atof (str_value);
+ ptr_sensors->val_tachos_color = atof (str_value);
if ((str_value = xfce_rc_read_entry (ptr_xfceresources, "Tachos_Alpha", NULL))
&& *str_value)
diff --git a/lib/sensors-interface-common.c b/lib/sensors-interface-common.c
index 137182a..aff9fa2 100644
--- a/lib/sensors-interface-common.c
+++ b/lib/sensors-interface-common.c
@@ -127,7 +127,7 @@ sensors_init_default_values (t_sensors *ptr_sensors, XfcePanelPlugin *ptr_xfcep
ptr_sensors->show_smallspacings = FALSE;
- ptr_sensors->val_tachos_hue = MAX_HUE;
+ ptr_sensors->val_tachos_color = MAX_HUE;
ptr_sensors->val_tachos_alpha = ALPHA_CHANNEL_VALUE;
font = g_strdup("Sans 11");
diff --git a/lib/tacho.c b/lib/tacho.c
index 3ec978f..70745cb 100644
--- a/lib/tacho.c
+++ b/lib/tacho.c
@@ -64,7 +64,7 @@ void gtk_sensorstacho_destroy(GtkWidget *widget);
gchar *font = NULL; // declared as extern in tacho.h
-gfloat val_hue = MAX_HUE; // declared as extern in tacho.h
+gfloat val_colorvalue = MAX_HUE; // declared as extern in tacho.h
gfloat val_alpha = ALPHA_CHANNEL_VALUE; // declared as extern in tacho.h
G_DEFINE_TYPE( GtkSensorsTacho, gtk_sensorstacho, GTK_TYPE_DRAWING_AREA )
@@ -308,16 +308,16 @@ gtk_sensorstacho_paint (GtkWidget *widget,
pos_ycenter = height / 2;
/* initialize color values appropriately */
- color.red = val_hue;
- color.green = val_hue;
+ color.red = val_colorvalue;
+ color.green = val_colorvalue;
color.blue = 0.0;
color.alpha = val_alpha;
if (percent < 0.5)
- color.red = 2*val_hue * percent;
+ color.red = 2*val_colorvalue * percent;
if (percent > 0.5)
- color.green = 2*val_hue * (1 - percent);
+ color.green = 2*val_colorvalue * (1 - percent);
/* draw circular gradient */
for (i=(1-percent)*THREE_QUARTER_CIRCLE; i<THREE_QUARTER_CIRCLE; i++)
@@ -340,10 +340,10 @@ gtk_sensorstacho_paint (GtkWidget *widget,
cairo_fill (ptr_cairo);
if (i>(0.5*THREE_QUARTER_CIRCLE - 1))
- color.red -= 2*val_hue * COLOR_STEP;
+ color.red -= 2*val_colorvalue * COLOR_STEP;
if (i<(0.5*THREE_QUARTER_CIRCLE - 1))
- color.green += 2*val_hue * COLOR_STEP;
+ color.green += 2*val_colorvalue * COLOR_STEP;
}
/* white right part */
diff --git a/panel-plugin/sensors-plugin.c b/panel-plugin/sensors-plugin.c
index a4d573d..b9c7886 100644
--- a/panel-plugin/sensors-plugin.c
+++ b/panel-plugin/sensors-plugin.c
@@ -663,7 +663,7 @@ sensors_show_tacho_display (t_sensors *ptr_sensors)
g_return_val_if_fail(ptr_sensors != NULL, FALSE);
if (ptr_sensors->tachos_created == FALSE) {
- val_hue = ptr_sensors->val_tachos_hue;
+ val_colorvalue = ptr_sensors->val_tachos_color;
val_alpha = ptr_sensors->val_tachos_alpha;
sensors_add_tacho_display (ptr_sensors);
@@ -1026,8 +1026,7 @@ sensors_create_tooltip (gpointer ptr_argument)
&(ptr_sensors->suppressmessage));
if (result != 0) {
- /* FIXME: either print nothing, or undertake appropriate action,
- * or pop up a message box. */
+ /* output to stdout on command line, not very useful for user, except for tracing problems */
g_printf ( _("Sensors Plugin:\n"
"Seems like there was a problem reading a sensor feature "
"value.\nProper proceeding cannot be guaranteed.\n") );
@@ -1363,7 +1362,7 @@ display_style_changed_text (GtkWidget *widget, t_sensors_dialog *sd)
gtk_widget_show(sd->Lines_Box);
gtk_widget_show(sd->unit_checkbox);
gtk_widget_show(sd->smallspacing_checkbox);
- gtk_widget_hide(sd->hue_slider_box);
+ gtk_widget_hide(sd->colorvalue_slider_box);
gtk_widget_hide(sd->alpha_slider_box);
sd->sensors->display_values_type = DISPLAY_TEXT;
@@ -1393,7 +1392,7 @@ display_style_changed_bars (GtkWidget *widget, t_sensors_dialog *sd)
gtk_widget_hide(sd->Lines_Box);
gtk_widget_hide(sd->unit_checkbox);
gtk_widget_hide(sd->smallspacing_checkbox);
- gtk_widget_hide(sd->hue_slider_box);
+ gtk_widget_hide(sd->colorvalue_slider_box);
gtk_widget_hide(sd->alpha_slider_box);
sd->sensors->display_values_type = DISPLAY_BARS;
@@ -1441,7 +1440,7 @@ display_style_changed_tacho (GtkWidget *widget, t_sensors_dialog *sd)
gtk_widget_hide(sd->Lines_Box);
gtk_widget_hide(sd->unit_checkbox);
gtk_widget_hide(sd->smallspacing_checkbox);
- gtk_widget_show(sd->hue_slider_box);
+ gtk_widget_show(sd->colorvalue_slider_box);
gtk_widget_show(sd->alpha_slider_box);
sd->sensors->display_values_type = DISPLAY_TACHO;
@@ -1945,14 +1944,14 @@ on_font_set (GtkWidget *widget, gpointer data)
/* -------------------------------------------------------------------------- */
static void
-tachos_hue_changed_ (GtkWidget *ptr_widget, GtkScrollType type, gdouble value, t_sensors_dialog *ptr_sensorsdialog)
+tachos_colorvalue_changed_ (GtkWidget *ptr_widget, GtkScrollType type, gdouble value, t_sensors_dialog *ptr_sensorsdialog)
{
t_sensors *sensors;
sensors = ptr_sensorsdialog->sensors;
g_assert (sensors!=NULL);
- sensors->val_tachos_hue = val_hue = value; //gtk_scale_button_get_value(GTK_SCALE_BUTTON(ptr_widget));
- DBG("new hue value is %f.", val_hue);
+ sensors->val_tachos_color = val_colorvalue = value; //gtk_scale_button_get_value(GTK_SCALE_BUTTON(ptr_widget));
+ DBG("new color value is %f.", val_colorvalue);
if (sensors->display_values_type==DISPLAY_TACHO)
{
@@ -2332,25 +2331,26 @@ add_tachos_appearance_boxes(GtkWidget * vbox, t_sensors_dialog * sd)
gtk_widget_show (sd->alpha_slider_box);
- sd->hue_slider_box = gtk_hbox_new(FALSE, INNER_BORDER);
- widget_label = gtk_label_new(_("Tacho color hue value:"));
+ sd->colorvalue_slider_box = gtk_hbox_new(FALSE, INNER_BORDER);
+ // The value from HSV color model
+ widget_label = gtk_label_new(_("Tacho color value:"));
gtk_widget_show (widget_label);
- gtk_box_pack_start (GTK_BOX (sd->hue_slider_box), widget_label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (sd->colorvalue_slider_box), widget_label, FALSE, TRUE, 0);
widget_hscale = gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL, 0.0, 1.0, 0.01);
- gtk_range_set_value(GTK_RANGE(widget_hscale), sd->sensors->val_tachos_hue);
+ gtk_range_set_value(GTK_RANGE(widget_hscale), sd->sensors->val_tachos_color);
gtk_widget_show (widget_hscale);
g_signal_connect (G_OBJECT (widget_hscale), "change-value",
- G_CALLBACK (tachos_hue_changed_), sd );
- gtk_box_pack_start (GTK_BOX (sd->hue_slider_box), widget_hscale, TRUE, TRUE, 0);
- gtk_widget_show (sd->hue_slider_box);
+ G_CALLBACK (tachos_colorvalue_changed_), sd );
+ gtk_box_pack_start (GTK_BOX (sd->colorvalue_slider_box), widget_hscale, TRUE, TRUE, 0);
+ gtk_widget_show (sd->colorvalue_slider_box);
gtk_box_pack_start (GTK_BOX (vbox), sd->alpha_slider_box, FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), sd->hue_slider_box, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), sd->colorvalue_slider_box, FALSE, TRUE, 0);
if (sd->sensors->display_values_type!=DISPLAY_TACHO)
{
gtk_widget_hide(sd->alpha_slider_box);
- gtk_widget_hide(sd->hue_slider_box);
+ gtk_widget_hide(sd->colorvalue_slider_box);
}
TRACE ("leaves add_tachos_appearance_boxes");
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list