]> Dogcows Code - chaz/tint2/blobdiff - src/tint2conf/properties_rw.c
add missing battery config CPP guard
[chaz/tint2] / src / tint2conf / properties_rw.c
index 78df71f31e965f926bfa5fa7ac78a3c13b818ece..a82a9fabcc8e09544cdddf81cc87b38e2955d0e5 100644 (file)
@@ -11,6 +11,7 @@
 
 void add_entry (char *key, char *value);
 void hex2gdk(char *hex, GdkColor *color);
+void get_action(char *event, GtkWidget *combo);
 
 
 
@@ -152,12 +153,6 @@ void add_entry (char *key, char *value)
        else if (strcmp (key, "panel_monitor") == 0) {
                //panel_config.monitor = config_get_monitor(value);
        }
-       else if (strcmp (key, "font_shadow") == 0) {
-               //panel_config.g_task.font_shadow = atoi (value);
-       }
-       else if (strcmp (key, "urgent_nb_of_blink") == 0) {
-               //max_tick_urgent = atoi (value);
-       }
        
        /* autohide options */
        else if (strcmp(key, "autohide") == 0) {
@@ -188,95 +183,78 @@ void add_entry (char *key, char *value)
 
        /* Battery */
        else if (strcmp (key, "battery_low_status") == 0) {
-#ifdef ENABLE_BATTERY
-               //battery_low_status = atoi(value);
-               //if(battery_low_status < 0 || battery_low_status > 100)
-                       //battery_low_status = 0;
-#endif
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(battery_alert_if_lower), atof(value));
        }
        else if (strcmp (key, "battery_low_cmd") == 0) {
-#ifdef ENABLE_BATTERY
-               //if (strlen(value) > 0)
-                       //battery_low_cmd = strdup (value);
-#endif
+               gtk_entry_set_text(GTK_ENTRY(battery_alert_cmd), value);
        }
        else if (strcmp (key, "bat1_font") == 0) {
-#ifdef ENABLE_BATTERY
-               //bat1_font_desc = pango_font_description_from_string (value);
-#endif
+               gtk_font_button_set_font_name(GTK_FONT_BUTTON(battery_font_line1), value);
        }
        else if (strcmp (key, "bat2_font") == 0) {
-#ifdef ENABLE_BATTERY
-               //bat2_font_desc = pango_font_description_from_string (value);
-#endif
+               gtk_font_button_set_font_name(GTK_FONT_BUTTON(battery_font_line2), value);
        }
        else if (strcmp (key, "battery_font_color") == 0) {
-#ifdef ENABLE_BATTERY
                extract_values(value, &value1, &value2, &value3);
-               //get_color (value1, panel_config.battery.font.color);
-               //if (value2) panel_config.battery.font.alpha = (atoi (value2) / 100.0);
-               //else panel_config.battery.font.alpha = 0.5;
-#endif
+               GdkColor col;
+               hex2gdk(value1, &col);
+               gtk_color_button_set_color(GTK_COLOR_BUTTON(battery_font_color), &col);
+               if (value2) {
+                       int alpha = atoi(value2);
+                       gtk_color_button_set_alpha(GTK_COLOR_BUTTON(battery_font_color), (alpha*65535)/100);
+               }
        }
        else if (strcmp (key, "battery_padding") == 0) {
-#ifdef ENABLE_BATTERY
                extract_values(value, &value1, &value2, &value3);
-               //panel_config.battery.area.paddingxlr = panel_config.battery.area.paddingx = atoi (value1);
-               //if (value2) panel_config.battery.area.paddingy = atoi (value2);
-               //if (value3) panel_config.battery.area.paddingx = atoi (value3);
-#endif
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(battery_padding_x), atof(value1));
+               if (value2) gtk_spin_button_set_value(GTK_SPIN_BUTTON(battery_padding_y), atof(value2));
        }
        else if (strcmp (key, "battery_background_id") == 0) {
-#ifdef ENABLE_BATTERY
                //int id = atoi (value);
                //id = (id < backgrounds->len && id >= 0) ? id : 0;
                //panel_config.battery.area.bg = &g_array_index(backgrounds, Background, id);
-#endif
        }
        else if (strcmp (key, "battery_hide") == 0) {
-#ifdef ENABLE_BATTERY
-               //percentage_hide = atoi (value);
-               //if (percentage_hide == 0)
-               //      percentage_hide = 101;
-#endif
+               int percentage_hide = atoi (value);
+               if (percentage_hide == 0)
+                       gtk_spin_button_set_value(GTK_SPIN_BUTTON(battery_hide_if_higher), 101.0);
+               else
+                       gtk_spin_button_set_value(GTK_SPIN_BUTTON(battery_hide_if_higher), atof(value));
        }
 
        /* Clock */
        else if (strcmp (key, "time1_format") == 0) {
-               //if (strlen(value) > 0) {
-                       //time1_format = strdup (value);
-                       //clock_enabled = 1;
-               //}
+               gtk_entry_set_text(GTK_ENTRY(clock_format_line1), value);
        }
        else if (strcmp (key, "time2_format") == 0) {
-               //if (strlen(value) > 0)
-                       //time2_format = strdup (value);
+               gtk_entry_set_text(GTK_ENTRY(clock_format_line2), value);
        }
        else if (strcmp (key, "time1_font") == 0) {
-               //time1_font_desc = pango_font_description_from_string (value);
+               gtk_font_button_set_font_name(GTK_FONT_BUTTON(clock_font_line1), value);
        }
        else if (strcmp(key, "time1_timezone") == 0) {
-               //if (strlen(value) > 0)
-                       //time1_timezone = strdup(value);
+               gtk_entry_set_text(GTK_ENTRY(clock_tmz_line1), value);
        }
        else if (strcmp(key, "time2_timezone") == 0) {
-               //if (strlen(value) > 0)
-                       //time2_timezone = strdup(value);
+               gtk_entry_set_text(GTK_ENTRY(clock_tmz_line2), value);
        }
        else if (strcmp (key, "time2_font") == 0) {
-               //time2_font_desc = pango_font_description_from_string (value);
+               gtk_font_button_set_font_name(GTK_FONT_BUTTON(clock_font_line2), value);
        }
        else if (strcmp (key, "clock_font_color") == 0) {
                extract_values(value, &value1, &value2, &value3);
-               //get_color (value1, panel_config.clock.font.color);
-               //if (value2) panel_config.clock.font.alpha = (atoi (value2) / 100.0);
-               //else panel_config.clock.font.alpha = 0.5;
+               GdkColor col;
+               hex2gdk(value1, &col);
+               gtk_color_button_set_color(GTK_COLOR_BUTTON(clock_font_color), &col);
+               if (value2) {
+                       int alpha = atoi(value2);
+                       gtk_color_button_set_alpha(GTK_COLOR_BUTTON(clock_font_color), (alpha*65535)/100);
+               }
        }
        else if (strcmp (key, "clock_padding") == 0) {
                extract_values(value, &value1, &value2, &value3);
-               //panel_config.clock.area.paddingxlr = panel_config.clock.area.paddingx = atoi (value1);
-               //if (value2) panel_config.clock.area.paddingy = atoi (value2);
-               //if (value3) panel_config.clock.area.paddingx = atoi (value3);
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(clock_padding_x), atof(value1));
+               if (value2) gtk_spin_button_set_value(GTK_SPIN_BUTTON(clock_padding_y), atof(value2));
        }
        else if (strcmp (key, "clock_background_id") == 0) {
                //int id = atoi (value);
@@ -284,20 +262,16 @@ void add_entry (char *key, char *value)
                //panel_config.clock.area.bg = &g_array_index(backgrounds, Background, id);
        }
        else if (strcmp(key, "clock_tooltip") == 0) {
-               //if (strlen(value) > 0)
-                       //time_tooltip_format = strdup (value);
+               gtk_entry_set_text(GTK_ENTRY(clock_format_tooltip), value);
        }
        else if (strcmp(key, "clock_tooltip_timezone") == 0) {
-               //if (strlen(value) > 0)
-                       //time_tooltip_timezone = strdup(value);
+               gtk_entry_set_text(GTK_ENTRY(clock_tmz_tooltip), value);
        }
        else if (strcmp(key, "clock_lclick_command") == 0) {
-               //if (strlen(value) > 0)
-                       //clock_lclick_command = strdup(value);
+               gtk_entry_set_text(GTK_ENTRY(clock_left_command), value);
        }
        else if (strcmp(key, "clock_rclick_command") == 0) {
-               //if (strlen(value) > 0)
-                       //clock_rclick_command = strdup(value);
+               gtk_entry_set_text(GTK_ENTRY(clock_right_command), value);
        }
 
        /* Taskbar */
@@ -371,34 +345,39 @@ void add_entry (char *key, char *value)
 
        /* Task */
        else if (strcmp (key, "task_text") == 0) {
-               //panel_config.g_task.text = atoi (value);
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(task_show_text), atoi(value));
        }
        else if (strcmp (key, "task_icon") == 0) {
-               //panel_config.g_task.icon = atoi (value);
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(task_show_icon), atoi(value));
        }
        else if (strcmp (key, "task_centered") == 0) {
-               //panel_config.g_task.centered = atoi (value);
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(task_align_center), atoi(value));
+       }
+       else if (strcmp (key, "font_shadow") == 0) {
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(task_font_shadow), atoi(value));
+       }
+       else if (strcmp (key, "urgent_nb_of_blink") == 0) {
+               //max_tick_urgent = atoi (value);
        }
        else if (strcmp (key, "task_width") == 0) {
                // old parameter : just for backward compatibility
-               //panel_config.g_task.maximum_width = atoi (value);
-               //panel_config.g_task.maximum_height = 30;
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(task_maximum_width), atof(value));
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(task_maximum_height), 30.0);
        }
        else if (strcmp (key, "task_maximum_size") == 0) {
                extract_values(value, &value1, &value2, &value3);
-               //panel_config.g_task.maximum_width = atoi (value1);
-               //panel_config.g_task.maximum_height = 30;
-               //if (value2)
-                       //panel_config.g_task.maximum_height = atoi (value2);
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(task_maximum_width), atof(value1));
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(task_maximum_height), 30.0);
+               if (value2)
+                       gtk_spin_button_set_value(GTK_SPIN_BUTTON(task_maximum_height), atof(value2));
        }
        else if (strcmp (key, "task_padding") == 0) {
                extract_values(value, &value1, &value2, &value3);
-               //panel_config.g_task.area.paddingxlr = panel_config.g_task.area.paddingx = atoi (value1);
-               //if (value2) panel_config.g_task.area.paddingy = atoi (value2);
-               //if (value3) panel_config.g_task.area.paddingx = atoi (value3);
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(task_padding_x), atof(value1));
+               if (value2) gtk_spin_button_set_value(GTK_SPIN_BUTTON(task_padding_y), atof(value2));
        }
        else if (strcmp (key, "task_font") == 0) {
-               //panel_config.g_task.font_desc = pango_font_description_from_string (value);
+               gtk_font_button_set_font_name(GTK_FONT_BUTTON(task_font), value);
        }
        else if (g_regex_match_simple("task.*_font_color", key, 0, 0)) {
                /*gchar** split = g_regex_split_simple("_", key, 0, 0);
@@ -436,15 +415,16 @@ void add_entry (char *key, char *value)
        }
        // "tooltip" is deprecated but here for backwards compatibility
        else if (strcmp (key, "task_tooltip") == 0 || strcmp(key, "tooltip") == 0) {
-               //panel_config.g_task.tooltip_enabled = atoi(value);
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tooltip_task_show), atoi(value));
        }
 
        /* Systray */
        else if (strcmp (key, "systray_padding") == 0) {
                extract_values(value, &value1, &value2, &value3);
-               //systray.area.paddingxlr = systray.area.paddingx = atoi (value1);
-               //if (value2) systray.area.paddingy = atoi (value2);
-               //if (value3) systray.area.paddingx = atoi (value3);
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(systray_padding_x), atof(value1));
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(systray_spacing), atof(value1));
+               if (value2) gtk_spin_button_set_value(GTK_SPIN_BUTTON(systray_padding_y), atof(value2));
+               if (value3) gtk_spin_button_set_value(GTK_SPIN_BUTTON(systray_spacing), atof(value3));
        }
        else if (strcmp (key, "systray_background_id") == 0) {
                //int id = atoi (value);
@@ -462,21 +442,22 @@ void add_entry (char *key, char *value)
                        gtk_combo_box_set_active(GTK_COMBO_BOX(systray_icon_order), 2);
        }
        else if (strcmp(key, "systray_icon_size") == 0) {
-               //systray_max_icon_size = atoi(value);
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(systray_icon_size), atof(value));
        }
        else if (strcmp(key, "systray_icon_asb") == 0) {
                extract_values(value, &value1, &value2, &value3);
-               //systray.alpha = atoi(value1);
-               //systray.saturation = atoi(value2);
-               //systray.brightness = atoi(value3);
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(systray_icon_opacity), atof(value1));
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(systray_icon_saturation), atof(value2));
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(systray_icon_brightness), atof(value3));
        }
 
        /* Launcher */
        else if (strcmp (key, "launcher_padding") == 0) {
                extract_values(value, &value1, &value2, &value3);
-               //panel_config.launcher.area.paddingxlr = panel_config.launcher.area.paddingx = atoi (value1);
-               //if (value2) panel_config.launcher.area.paddingy = atoi (value2);
-               //if (value3) panel_config.launcher.area.paddingx = atoi (value3);
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(launcher_padding_x), atof(value1));
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(launcher_spacing), atof(value1));
+               if (value2) gtk_spin_button_set_value(GTK_SPIN_BUTTON(launcher_padding_y), atof(value2));
+               if (value3) gtk_spin_button_set_value(GTK_SPIN_BUTTON(launcher_spacing), atof(value3));
        }
        else if (strcmp (key, "launcher_background_id") == 0) {
                //int id = atoi (value);
@@ -484,7 +465,7 @@ void add_entry (char *key, char *value)
                //panel_config.launcher.area.bg = &g_array_index(backgrounds, Background, id);
        }
        else if (strcmp(key, "launcher_icon_size") == 0) {
-               //launcher_max_icon_size = atoi(value);
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(launcher_icon_size), atof(value));
        }
        else if (strcmp(key, "launcher_item_app") == 0) {
                //char *app = strdup(value);
@@ -497,15 +478,15 @@ void add_entry (char *key, char *value)
 
        /* Tooltip */
        else if (strcmp (key, "tooltip_show_timeout") == 0) {
-               //int timeout_msec = 1000*atof(value);
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(tooltip_show_after), atof(value));
        }
        else if (strcmp (key, "tooltip_hide_timeout") == 0) {
-               //int timeout_msec = 1000*atof(value);
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(tooltip_hide_after), atof(value));
        }
        else if (strcmp (key, "tooltip_padding") == 0) {
                extract_values(value, &value1, &value2, &value3);
-               //if (value1) g_tooltip.paddingx = atoi(value1);
-               //if (value2) g_tooltip.paddingy = atoi(value2);
+               gtk_spin_button_set_value(GTK_SPIN_BUTTON(tooltip_padding_x), atof(value1));
+               if (value2) gtk_spin_button_set_value(GTK_SPIN_BUTTON(tooltip_padding_y), atof(value2));
        }
        else if (strcmp (key, "tooltip_background_id") == 0) {
                //int id = atoi (value);
@@ -514,23 +495,30 @@ void add_entry (char *key, char *value)
        }
        else if (strcmp (key, "tooltip_font_color") == 0) {
                extract_values(value, &value1, &value2, &value3);
-               //get_color(value1, g_tooltip.font_color.color);
-               //if (value2) g_tooltip.font_color.alpha = (atoi (value2) / 100.0);
-               //else g_tooltip.font_color.alpha = 0.1;
+               GdkColor col;
+               hex2gdk(value1, &col);
+               gtk_color_button_set_color(GTK_COLOR_BUTTON(tooltip_font_color), &col);
+               if (value2) {
+                       int alpha = atoi(value2);
+                       gtk_color_button_set_alpha(GTK_COLOR_BUTTON(tooltip_font_color), (alpha*65535)/100);
+               }
        }
        else if (strcmp (key, "tooltip_font") == 0) {
-               //g_tooltip.font_desc = pango_font_description_from_string(value);
+               gtk_font_button_set_font_name(GTK_FONT_BUTTON(tooltip_font), value);
        }
 
        /* Mouse actions */
        else if (strcmp (key, "mouse_middle") == 0) {
-               //get_action (value, &mouse_middle);
+               get_action(value, task_mouse_middle);
        }
        else if (strcmp (key, "mouse_right") == 0) {
+               get_action(value, task_mouse_right);
        }
        else if (strcmp (key, "mouse_scroll_up") == 0) {
+               get_action(value, task_mouse_scroll_up);
        }
        else if (strcmp (key, "mouse_scroll_down") == 0) {
+               get_action(value, task_mouse_scroll_down);
        }
 
        if (value1) free (value1);
@@ -549,3 +537,29 @@ void hex2gdk(char *hex, GdkColor *color)
 }
 
 
+void get_action(char *event, GtkWidget *combo)
+{
+       if (strcmp (event, "none") == 0)
+               gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
+       else if (strcmp (event, "close") == 0)
+               gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 1);
+       else if (strcmp (event, "toggle") == 0)
+               gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 2);
+       else if (strcmp (event, "iconify") == 0)
+               gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 3);
+       else if (strcmp (event, "shade") == 0)
+               gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 4);
+       else if (strcmp (event, "toggle_iconify") == 0)
+               gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 5);
+       else if (strcmp (event, "maximize_restore") == 0)
+               gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 6);
+       else if (strcmp (event, "desktop_left") == 0)
+               gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 7);
+       else if (strcmp (event, "desktop_right") == 0)
+               gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 8);
+       else if (strcmp (event, "next_task") == 0)
+               gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 9);
+       else if (strcmp (event, "prev_task") == 0)
+               gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 10);
+}
+
This page took 0.032876 seconds and 4 git commands to generate.