X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint2conf%2Fproperties.c;h=5b2cf0b83a0bab7f61c531e2ee833e86749872e6;hb=460902abc1d5b34c6ea4c9492369533d3ec216d9;hp=d84af6f5d2cd9854fafe74f7fb25916d27bf0e4b;hpb=28fea9690c8f71dbe1ab4da63e915cf292f54094;p=chaz%2Ftint2 diff --git a/src/tint2conf/properties.c b/src/tint2conf/properties.c index d84af6f..5b2cf0b 100644 --- a/src/tint2conf/properties.c +++ b/src/tint2conf/properties.c @@ -509,7 +509,6 @@ void create_panel_items(GtkWidget *parent) void create_launcher(GtkWidget *parent) { GtkWidget *table, *label; - GtkWidget *margin_x, *margin_y, *combo_background; label = gtk_label_new (_("Applications")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); @@ -536,30 +535,30 @@ void create_launcher(GtkWidget *parent) gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); - margin_x = gtk_spin_button_new_with_range (0, 500, 1); - gtk_widget_show (margin_x); - gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); - gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); + launcher_padding_x = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (launcher_padding_x); + gtk_entry_set_max_length (GTK_ENTRY (launcher_padding_x), 3); + gtk_table_attach (GTK_TABLE (table), launcher_padding_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Vertical padding")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); - margin_y = gtk_spin_button_new_with_range (0, 500, 1); - gtk_widget_show (margin_y); - gtk_entry_set_max_length (GTK_ENTRY (margin_y), 3); - gtk_table_attach (GTK_TABLE (table), margin_y, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); + launcher_padding_y = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (launcher_padding_y); + gtk_entry_set_max_length (GTK_ENTRY (launcher_padding_y), 3); + gtk_table_attach (GTK_TABLE (table), launcher_padding_y, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Spacing")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 2, 3, GTK_FILL, 0, 0, 0); - margin_x = gtk_spin_button_new_with_range (0, 500, 1); - gtk_widget_show (margin_x); - gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); - gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 2, 3, GTK_FILL, 0, 0, 0); + launcher_spacing = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (launcher_spacing); + gtk_entry_set_max_length (GTK_ENTRY (launcher_spacing), 3); + gtk_table_attach (GTK_TABLE (table), launcher_spacing, 3, 4, 2, 3, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Background")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); @@ -578,22 +577,22 @@ void create_launcher(GtkWidget *parent) gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 6, 7, 1, 2, GTK_FILL, 0, 0, 0); - margin_x = gtk_spin_button_new_with_range (0, 500, 1); - gtk_widget_show (margin_x); - gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); - gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); + launcher_icon_size = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (launcher_icon_size); + gtk_entry_set_max_length (GTK_ENTRY (launcher_icon_size), 3); + gtk_table_attach (GTK_TABLE (table), launcher_icon_size, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Icon theme")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 6, 7, 2, 3, GTK_FILL, 0, 0, 0); - combo_background = gtk_combo_box_new_text (); - gtk_widget_show (combo_background); - gtk_table_attach (GTK_TABLE (table), combo_background, 7, 8, 2, 3, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Theme 1")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Theme 2")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Theme 3")); + launcher_icon_theme = gtk_combo_box_new_text (); + gtk_widget_show (launcher_icon_theme); + gtk_table_attach (GTK_TABLE (table), launcher_icon_theme, 7, 8, 2, 3, GTK_FILL, 0, 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (launcher_icon_theme), _("Theme 1")); + gtk_combo_box_append_text (GTK_COMBO_BOX (launcher_icon_theme), _("Theme 2")); + gtk_combo_box_append_text (GTK_COMBO_BOX (launcher_icon_theme), _("Theme 3")); change_paragraph(parent); } @@ -782,7 +781,6 @@ void create_taskbar(GtkWidget *parent) void create_task(GtkWidget *parent) { GtkWidget *table, *label, *notebook, *page_task; - GtkWidget *margin_x, *combo_background; label = gtk_label_new (_("Mouse action")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); @@ -801,80 +799,80 @@ void create_task(GtkWidget *parent) gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); - combo_background = gtk_combo_box_new_text (); - gtk_widget_show (combo_background); - gtk_table_attach (GTK_TABLE (table), combo_background, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("none")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("close")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("toggle")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("iconify")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("shade")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("toggle_iconify")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("maximize_restore")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("desktop_left")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("desktop_right")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("next_task")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("previous_task")); + task_mouse_middle = gtk_combo_box_new_text (); + gtk_widget_show (task_mouse_middle); + gtk_table_attach (GTK_TABLE (table), task_mouse_middle, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_middle), _("None")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_middle), _("Close")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_middle), _("Toggle")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_middle), _("Iconify")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_middle), _("sShade")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_middle), _("Toggle or iconify")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_middle), _("Maximize or restore")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_middle), _("Desktop left")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_middle), _("Desktop right")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_middle), _("Next task")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_middle), _("Previous task")); label = gtk_label_new (_("Wheel scroll up")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 6, 7, 0, 1, GTK_FILL, 0, 0, 0); - combo_background = gtk_combo_box_new_text (); - gtk_widget_show (combo_background); - gtk_table_attach (GTK_TABLE (table), combo_background, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("none")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("close")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("toggle")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("iconify")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("shade")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("toggle_iconify")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("maximize_restore")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("desktop_left")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("desktop_right")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("next_task")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("previous_task")); + task_mouse_scroll_up = gtk_combo_box_new_text (); + gtk_widget_show (task_mouse_scroll_up); + gtk_table_attach (GTK_TABLE (table), task_mouse_scroll_up, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_up), _("None")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_up), _("Close")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_up), _("Toggle")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_up), _("Iconify")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_up), _("Shade")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_up), _("Toggle or iconify")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_up), _("Maximize or restore")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_up), _("Desktop left")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_up), _("Desktop right")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_up), _("Next task")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_up), _("Previous task")); label = gtk_label_new (_("Right click")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); - combo_background = gtk_combo_box_new_text (); - gtk_widget_show (combo_background); - gtk_table_attach (GTK_TABLE (table), combo_background, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("none")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("close")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("toggle")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("iconify")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("shade")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("toggle_iconify")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("maximize_restore")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("desktop_left")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("desktop_right")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("next_task")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("previous_task")); + task_mouse_right = gtk_combo_box_new_text (); + gtk_widget_show (task_mouse_right); + gtk_table_attach (GTK_TABLE (table), task_mouse_right, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_right), _("None")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_right), _("Close")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_right), _("Toggle")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_right), _("Iconify")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_right), _("Shade")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_right), _("Toggle or iconify")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_right), _("Maximize or restore")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_right), _("Desktop left")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_right), _("Desktop right")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_right), _("Next task")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_right), _("Previous task")); label = gtk_label_new (_("Wheel scroll down")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 6, 7, 1, 2, GTK_FILL, 0, 0, 0); - combo_background = gtk_combo_box_new_text (); - gtk_widget_show (combo_background); - gtk_table_attach (GTK_TABLE (table), combo_background, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("none")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("close")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("toggle")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("iconify")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("shade")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("toggle_iconify")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("maximize_restore")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("desktop_left")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("desktop_right")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("next_task")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("previous_task")); + task_mouse_scroll_down = gtk_combo_box_new_text (); + gtk_widget_show (task_mouse_scroll_down); + gtk_table_attach (GTK_TABLE (table), task_mouse_scroll_down, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_down), _("None")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_down), _("Close")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_down), _("Toggle")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_down), _("Iconify")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_down), _("Shade")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_down), _("Toggle or iconify")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_down), _("Maximize or restore")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_down), _("Desktop left")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_down), _("Desktop right")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_down), _("Next task")); + gtk_combo_box_append_text (GTK_COMBO_BOX (task_mouse_scroll_down), _("Previous task")); change_paragraph(parent); @@ -884,7 +882,7 @@ void create_task(GtkWidget *parent) gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - table = gtk_table_new (4, 10, FALSE); + table = gtk_table_new (4, 13, FALSE); gtk_widget_show (table); gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); @@ -895,40 +893,86 @@ void create_task(GtkWidget *parent) gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); - margin_x = gtk_check_button_new (); - gtk_widget_show (margin_x); - gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); - gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); + task_show_icon = gtk_check_button_new (); + gtk_widget_show (task_show_icon); + gtk_entry_set_max_length (GTK_ENTRY (task_show_icon), 3); + gtk_table_attach (GTK_TABLE (table), task_show_icon, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Show text")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); - margin_x = gtk_check_button_new (); - gtk_widget_show (margin_x); - gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); - gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); + task_show_text = gtk_check_button_new (); + gtk_widget_show (task_show_text); + gtk_entry_set_max_length (GTK_ENTRY (task_show_text), 3); + gtk_table_attach (GTK_TABLE (table), task_show_text, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Align center")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 2, 3, GTK_FILL, 0, 0, 0); - margin_x = gtk_check_button_new (); - gtk_widget_show (margin_x); - gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); - gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 2, 3, GTK_FILL, 0, 0, 0); + task_align_center = gtk_check_button_new (); + gtk_widget_show (task_align_center); + gtk_entry_set_max_length (GTK_ENTRY (task_align_center), 3); + gtk_table_attach (GTK_TABLE (table), task_align_center, 3, 4, 2, 3, GTK_FILL, 0, 0, 0); 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, 2, 3, 3, 4, GTK_FILL, 0, 0, 0); - margin_x = gtk_check_button_new (); - gtk_widget_show (margin_x); - gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); - gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 3, 4, GTK_FILL, 0, 0, 0); + task_font_shadow = gtk_check_button_new (); + gtk_widget_show (task_font_shadow); + gtk_entry_set_max_length (GTK_ENTRY (task_font_shadow), 3); + gtk_table_attach (GTK_TABLE (table), task_font_shadow, 3, 4, 3, 4, GTK_FILL, 0, 0, 0); + + label = gtk_label_new (_("Maximum width")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 6, 7, 0, 1, GTK_FILL, 0, 0, 0); + + task_maximum_width = gtk_spin_button_new_with_range (0, 9000, 1); + gtk_widget_show (task_maximum_width); + gtk_table_attach (GTK_TABLE (table), task_maximum_width, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); + + label = gtk_label_new (_("Maximum height")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 6, 7, 1, 2, GTK_FILL, 0, 0, 0); + + task_maximum_height = gtk_spin_button_new_with_range (0, 9000, 1); + gtk_widget_show (task_maximum_height); + gtk_table_attach (GTK_TABLE (table), task_maximum_height, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); + + label = gtk_label_new (_("Horizontal padding")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 6, 7, 2, 3, GTK_FILL, 0, 0, 0); + + task_padding_x = gtk_spin_button_new_with_range (0, 9000, 1); + gtk_widget_show (task_padding_x); + gtk_table_attach (GTK_TABLE (table), task_padding_x, 7, 8, 2, 3, GTK_FILL, 0, 0, 0); + + label = gtk_label_new (_("Vertical padding")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 6, 7, 3, 4, GTK_FILL, 0, 0, 0); + + task_padding_y = gtk_spin_button_new_with_range (0, 9000, 1); + gtk_widget_show (task_padding_y); + gtk_table_attach (GTK_TABLE (table), task_padding_y, 7, 8, 3, 4, GTK_FILL, 0, 0, 0); + + label = gtk_label_new (_("Font")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 10, 11, 0, 1, GTK_FILL, 0, 0, 0); + + task_font = gtk_font_button_new (); + gtk_widget_show (task_font); + gtk_table_attach (GTK_TABLE (table), task_font, 11, 12, 0, 1, GTK_FILL, 0, 0, 0); +// gtk_font_button_set_show_style (GTK_FONT_BUTTON (task_font), FALSE); // tasks notebook = gtk_notebook_new (); @@ -1011,16 +1055,6 @@ void create_clock(GtkWidget *parent) gtk_entry_set_width_chars (GTK_ENTRY (clock_format_line2), 16); gtk_table_attach (GTK_TABLE (table), clock_format_line2, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); - label = gtk_label_new (_("Tooltip format")); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0); - gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, 2, 3, 2, 3, GTK_FILL, 0, 0, 0); - - clock_format_tooltip = gtk_entry_new (); - gtk_widget_show (clock_format_tooltip); - gtk_entry_set_width_chars (GTK_ENTRY (clock_format_tooltip), 16); - gtk_table_attach (GTK_TABLE (table), clock_format_tooltip, 3, 4, 2, 3, GTK_FILL, 0, 0, 0); - label = gtk_label_new (_("First line timezone")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); @@ -1041,16 +1075,6 @@ void create_clock(GtkWidget *parent) gtk_entry_set_width_chars (GTK_ENTRY (clock_tmz_line2), 16); gtk_table_attach (GTK_TABLE (table), clock_tmz_line2, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); - label = gtk_label_new (_("Tooltip timezone")); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0); - gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, 6, 7, 2, 3, GTK_FILL, 0, 0, 0); - - clock_tmz_tooltip = gtk_entry_new (); - gtk_widget_show (clock_tmz_tooltip); - gtk_entry_set_width_chars (GTK_ENTRY (clock_tmz_tooltip), 16); - gtk_table_attach (GTK_TABLE (table), clock_tmz_tooltip, 7, 8, 2, 3, GTK_FILL, 0, 0, 0); - change_paragraph(parent); label = gtk_label_new (_("Mouse action")); @@ -1434,7 +1458,6 @@ void create_battery(GtkWidget *parent) void create_tooltip(GtkWidget *parent) { GtkWidget *table; - GtkWidget *margin_x, *margin_y, *combo_background; GtkWidget *label; table = gtk_table_new (1, 2, FALSE); @@ -1448,9 +1471,9 @@ void create_tooltip(GtkWidget *parent) gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); - margin_x = gtk_check_button_new (); - gtk_widget_show (margin_x); - gtk_table_attach (GTK_TABLE (table), margin_x, 1, 2, 0, 1, GTK_FILL, 0, 0, 0); + tooltip_task_show = gtk_check_button_new (); + gtk_widget_show (tooltip_task_show); + gtk_table_attach (GTK_TABLE (table), tooltip_task_show, 1, 2, 0, 1, GTK_FILL, 0, 0, 0); change_paragraph(parent); @@ -1471,9 +1494,9 @@ void create_tooltip(GtkWidget *parent) gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); - margin_x = gtk_spin_button_new_with_range (0, 10000, 0.1); - gtk_widget_show (margin_x); - gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); + tooltip_show_after = gtk_spin_button_new_with_range (0, 10000, 0.1); + gtk_widget_show (tooltip_show_after); + gtk_table_attach (GTK_TABLE (table), tooltip_show_after, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("seconds")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); @@ -1485,9 +1508,9 @@ void create_tooltip(GtkWidget *parent) gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); - margin_y = gtk_spin_button_new_with_range (0, 10000, 0.1); - gtk_widget_show (margin_y); - gtk_table_attach (GTK_TABLE (table), margin_y, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); + tooltip_hide_after = gtk_spin_button_new_with_range (0, 10000, 0.1); + gtk_widget_show (tooltip_hide_after); + gtk_table_attach (GTK_TABLE (table), tooltip_hide_after, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("seconds")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); @@ -1513,20 +1536,20 @@ void create_tooltip(GtkWidget *parent) gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); - margin_x = gtk_spin_button_new_with_range (0, 500, 1); - gtk_widget_show (margin_x); - gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); - gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); + tooltip_padding_x = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (tooltip_padding_x); + gtk_entry_set_max_length (GTK_ENTRY (tooltip_padding_x), 3); + gtk_table_attach (GTK_TABLE (table), tooltip_padding_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Vertical padding")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); - margin_y = gtk_spin_button_new_with_range (0, 500, 1); - gtk_widget_show (margin_y); - gtk_entry_set_max_length (GTK_ENTRY (margin_y), 3); - gtk_table_attach (GTK_TABLE (table), margin_y, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); + tooltip_padding_y = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (tooltip_padding_y); + gtk_entry_set_max_length (GTK_ENTRY (tooltip_padding_y), 3); + gtk_table_attach (GTK_TABLE (table), tooltip_padding_y, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Background")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); @@ -1545,20 +1568,54 @@ void create_tooltip(GtkWidget *parent) gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 6, 7, 0, 1, GTK_FILL, 0, 0, 0); - margin_x = gtk_font_button_new (); - gtk_widget_show (margin_x); - gtk_table_attach (GTK_TABLE (table), margin_x, 7, 22, 0, 1, GTK_FILL, 0, 0, 0); -// gtk_font_button_set_show_style (GTK_FONT_BUTTON (margin_x), FALSE); + tooltip_font = gtk_font_button_new (); + gtk_widget_show (tooltip_font); + gtk_table_attach (GTK_TABLE (table), tooltip_font, 7, 22, 0, 1, GTK_FILL, 0, 0, 0); +// gtk_font_button_set_show_style (GTK_FONT_BUTTON (tooltip_font), FALSE); label = gtk_label_new (_("Font color")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 6, 7, 1, 2, GTK_FILL, 0, 0, 0); - margin_x = gtk_color_button_new(); - gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(margin_x), TRUE); - gtk_widget_show (margin_x); - gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); + tooltip_font_color = gtk_color_button_new(); + gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(tooltip_font_color), TRUE); + gtk_widget_show (tooltip_font_color); + gtk_table_attach (GTK_TABLE (table), tooltip_font_color, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); + + change_paragraph(parent); + + label = gtk_label_new (_("Clock tooltip")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + gtk_widget_show (label); + gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); + + table = gtk_table_new (3, 10, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); + gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); + + label = gtk_label_new (_("Clock tooltip format")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); + + clock_format_tooltip = gtk_entry_new (); + gtk_widget_show (clock_format_tooltip); + gtk_entry_set_width_chars (GTK_ENTRY (clock_format_tooltip), 16); + gtk_table_attach (GTK_TABLE (table), clock_format_tooltip, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); + + label = gtk_label_new (_("Clock tooltip timezone")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); + + clock_tmz_tooltip = gtk_entry_new (); + gtk_widget_show (clock_tmz_tooltip); + gtk_entry_set_width_chars (GTK_ENTRY (clock_tmz_tooltip), 16); + gtk_table_attach (GTK_TABLE (table), clock_tmz_tooltip, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); change_paragraph(parent); }