From 60b56599cb98dec437647c12c97461dba2076d4e Mon Sep 17 00:00:00 2001 From: o9000 Date: Sat, 18 Apr 2015 13:30:30 +0000 Subject: [PATCH] tint2conf: GUI changes git-svn-id: http://tint2.googlecode.com/svn/trunk@767 121b4492-b84c-0410-8b4c-0d4edfb3f3cc --- src/tint2conf/properties.c | 26 +++++++++++++------------- src/tint2conf/properties.h | 2 +- src/tint2conf/properties_rw.c | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/tint2conf/properties.c b/src/tint2conf/properties.c index b29766a..1621d18 100644 --- a/src/tint2conf/properties.c +++ b/src/tint2conf/properties.c @@ -51,7 +51,7 @@ GtkWidget *taskbar_distribute_size, *taskbar_sort_order; // task GtkWidget *task_mouse_left, *task_mouse_middle, *task_mouse_right, *task_mouse_scroll_up, *task_mouse_scroll_down; -GtkWidget *task_show_icon, *task_show_text, *task_align_center, *task_font_shadow; +GtkWidget *task_show_icon, *task_show_text, *task_align_center, *font_shadow; GtkWidget *task_maximum_width, *task_maximum_height, *task_padding_x, *task_padding_y, *task_font; GtkWidget *task_default_color, *task_default_color_set, *task_default_icon_opacity, *task_default_icon_osb_set, @@ -972,6 +972,18 @@ void create_panel(GtkWidget *parent) gtk_table_attach(GTK_TABLE(table), disable_transparency, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); col++; + row++, col = 2; + label = gtk_label_new(_("Font shadows")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_widget_show(label); + gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + font_shadow = gtk_check_button_new(); + gtk_widget_show(font_shadow); + gtk_table_attach(GTK_TABLE(table), font_shadow, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + change_paragraph(parent); label = gtk_label_new(_("Autohide")); @@ -2507,18 +2519,6 @@ void create_task(GtkWidget *parent) gtk_table_attach(GTK_TABLE(table), tooltip_task_show, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); col++; - row++, col = 2; - label = gtk_label_new(_("Font shadow")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); - col++; - - task_font_shadow = gtk_check_button_new(); - gtk_widget_show(task_font_shadow); - gtk_table_attach(GTK_TABLE(table), task_font_shadow, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); - col++; - row++, col = 2; label = gtk_label_new(_("Maximum width")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0); diff --git a/src/tint2conf/properties.h b/src/tint2conf/properties.h index 803642b..bb035c8 100644 --- a/src/tint2conf/properties.h +++ b/src/tint2conf/properties.h @@ -55,7 +55,7 @@ extern GtkWidget *taskbar_distribute_size, *taskbar_sort_order; // task extern GtkWidget *task_mouse_left, *task_mouse_middle, *task_mouse_right, *task_mouse_scroll_up, *task_mouse_scroll_down; -extern GtkWidget *task_show_icon, *task_show_text, *task_align_center, *task_font_shadow; +extern GtkWidget *task_show_icon, *task_show_text, *task_align_center, *font_shadow; extern GtkWidget *task_maximum_width, *task_maximum_height, *task_padding_x, *task_padding_y, *task_font; extern GtkWidget *task_default_color, *task_default_color_set, *task_default_icon_opacity, *task_default_icon_osb_set, diff --git a/src/tint2conf/properties_rw.c b/src/tint2conf/properties_rw.c index ac140d7..bcab58a 100644 --- a/src/tint2conf/properties_rw.c +++ b/src/tint2conf/properties_rw.c @@ -172,6 +172,7 @@ void config_write_panel(FILE *fp) fprintf(fp, "panel_window_name = %s\n", gtk_entry_get_text(GTK_ENTRY(panel_window_name))); fprintf(fp, "disable_transparency = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(disable_transparency)) ? 1 : 0); + fprintf(fp, "font_shadow = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(font_shadow)) ? 1 : 0); fprintf(fp, "\n"); } @@ -274,7 +275,6 @@ void config_write_task(FILE *fp) fprintf(fp, "task_text = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(task_show_text)) ? 1 : 0); fprintf(fp, "task_icon = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(task_show_icon)) ? 1 : 0); fprintf(fp, "task_centered = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(task_align_center)) ? 1 : 0); - fprintf(fp, "font_shadow = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(task_font_shadow)) ? 1 : 0); fprintf(fp, "urgent_nb_of_blink = %d\n", (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(task_urgent_blinks))); fprintf(fp, "task_maximum_size = %d %d\n", @@ -721,6 +721,9 @@ void add_entry(char *key, char *value) else if (strcmp(key, "disable_transparency") == 0) { gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(disable_transparency), atoi(value)); } + else if (strcmp(key, "font_shadow") == 0) { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(font_shadow), atoi(value)); + } else if (strcmp(key, "wm_menu") == 0) { gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(panel_wm_menu), atoi(value)); } @@ -966,9 +969,6 @@ void add_entry(char *key, char *value) else if (strcmp(key, "task_centered") == 0) { 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) { gtk_spin_button_set_value(GTK_SPIN_BUTTON(task_urgent_blinks), atoi(value)); }