Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'multi-battery-support' into 'master'

Browse Source 
Multi battery support

Hi ,

I have a couple of patches for the battery widget
making it actually useful on my ThinkPad X250.

-- Sebastian

See merge request !6
This commit is contained in:
o9000
2015-08-06 20:38:29 +00:00
parent 76b69b86dc 57c38c462c
commit aa47642161
8 changed files with 429 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tint2conf/properties_rw.c
View File

@@ -560,6 +560,7 @@ void config_write_battery(FILE *fp)
fprintf(fp, "#-------------------------------------\n");
fprintf(fp, "# Battery\n");
fprintf(fp, "battery_tooltip = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(battery_tooltip)) ? 1 : 0);
fprintf(fp, "battery_low_status = %g\n", gtk_spin_button_get_value(GTK_SPIN_BUTTON(battery_alert_if_lower)));
fprintf(fp, "battery_low_cmd = %s\n", gtk_entry_get_text(GTK_ENTRY(battery_alert_cmd)));
fprintf(fp, "bat1_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(battery_font_line1)));
@@ -898,12 +899,13 @@ void add_entry(char *key, char *value)
}
/* Battery */
else if (strcmp(key, "systray") == 0) {
else if (strcmp(key, "battery") == 0) {
// Obsolete option
config_has_battery = 1;
config_battery_enabled = atoi(value);
}
else if (strcmp(key, "battery_low_status") == 0) {
} else if (strcmp(key, "battery_tooltip") == 0) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(battery_tooltip), atoi(value));
} else if (strcmp(key, "battery_low_status") == 0) {
gtk_spin_button_set_value(GTK_SPIN_BUTTON(battery_alert_if_lower), atof(value));
}
else if (strcmp(key, "battery_low_cmd") == 0) {
@@ -1464,4 +1466,4 @@ char *get_action(GtkWidget *combo)
if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == 10)
return "prev_task";
return "none";
}
}