X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=4b84e9412256220af65386c3a29fd3d589238f48;hb=a7a7c18504d5fdf7559a47ea649151a281cbd21d;hp=d2b341481e6ca9a6c1fa90772dc9c3f3b82a7bbf;hpb=275fa7c8678c39a1c1f7437de12aac0144f61a85;p=chaz%2Ftint2

diff --git a/src/config.c b/src/config.c
index d2b3414..4b84e94 100644
--- a/src/config.c
+++ b/src/config.c
@@ -3,7 +3,7 @@
 * Tint2 : read/write config file
 *
 * Copyright (C) 2007 PÃ¥l Staurland (staura@gmail.com)
-* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
+* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2
@@ -457,7 +457,6 @@ void add_entry (char *key, char *value)
 		panel_config.g_taskbar.background[TASKBAR_NORMAL] = &g_array_index(backgrounds, Background, id);
 		if (panel_config.g_taskbar.background[TASKBAR_ACTIVE] == 0)
 			panel_config.g_taskbar.background[TASKBAR_ACTIVE] = panel_config.g_taskbar.background[TASKBAR_NORMAL];
-		//panel_config.g_taskbar.area.bg = panel_config.g_taskbar.bg;
 	}
 	else if (strcmp (key, "taskbar_active_background_id") == 0) {
 		int id = atoi (value);
@@ -467,15 +466,36 @@ void add_entry (char *key, char *value)
 	else if (strcmp (key, "taskbar_name") == 0) {
 		taskbarname_enabled = atoi (value);
 	}
+	else if (strcmp (key, "taskbar_name_padding") == 0) {
+		extract_values(value, &value1, &value2, &value3);
+		panel_config.g_taskbar.area_name.paddingxlr = panel_config.g_taskbar.area_name.paddingx = atoi (value1);
+	}
 	else if (strcmp (key, "taskbar_name_background_id") == 0) {
+		int id = atoi (value);
+		id = (id < backgrounds->len && id >= 0) ? id : 0;
+		panel_config.g_taskbar.background_name[TASKBAR_NORMAL] = &g_array_index(backgrounds, Background, id);
+		if (panel_config.g_taskbar.background_name[TASKBAR_ACTIVE] == 0)
+			panel_config.g_taskbar.background_name[TASKBAR_ACTIVE] = panel_config.g_taskbar.background_name[TASKBAR_NORMAL];
 	}
 	else if (strcmp (key, "taskbar_name_active_background_id") == 0) {
+		int id = atoi (value);
+		id = (id < backgrounds->len && id >= 0) ? id : 0;
+		panel_config.g_taskbar.background_name[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, id);
 	}
 	else if (strcmp (key, "taskbar_name_font") == 0) {
+		taskbarname_font_desc = pango_font_description_from_string (value);
 	}
 	else if (strcmp (key, "taskbar_name_font_color") == 0) {
+		extract_values(value, &value1, &value2, &value3);
+		get_color (value1, taskbarname_font.color);
+		if (value2) taskbarname_font.alpha = (atoi (value2) / 100.0);
+		else taskbarname_font.alpha = 0.5;
 	}
 	else if (strcmp (key, "taskbar_name_active_font_color") == 0) {
+		extract_values(value, &value1, &value2, &value3);
+		get_color (value1, taskbarname_active_font.color);
+		if (value2) taskbarname_active_font.alpha = (atoi (value2) / 100.0);
+		else taskbarname_active_font.alpha = 0.5;
 	}
 
 	/* Task */
@@ -540,6 +560,16 @@ void add_entry (char *key, char *value)
 
 	/* Systray */
 	else if (strcmp (key, "systray_padding") == 0) {
+		if (new_config_file == 0 && systray_enabled == 0) {
+			systray_enabled = 1;
+			if (panel_items_order) {
+				char* tmp = g_strconcat(panel_items_order, "S", NULL);
+				g_free( panel_items_order );
+				panel_items_order = tmp;
+			}
+			else
+				panel_items_order = g_strdup("S");
+		}
 		extract_values(value, &value1, &value2, &value3);
 		systray.area.paddingxlr = systray.area.paddingx = atoi (value1);
 		if (value2) systray.area.paddingy = atoi (value2);
@@ -590,8 +620,9 @@ void add_entry (char *key, char *value)
 		panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, app);
 	}
 	else if (strcmp(key, "launcher_icon_theme") == 0) {
-		char *app = strdup(value);
-		panel_config.launcher.icon_theme_names = g_slist_append(panel_config.launcher.icon_theme_names, app);
+		// if XSETTINGS manager running, tint2 use it.
+		if (!icon_theme_name)
+			icon_theme_name = strdup(value);
 	}
 
 	/* Tooltip */