X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint2conf%2Fproperties.c;h=769a634279a5a90bec47e05a4b2496f9fa0e994f;hb=902b0ebf7cda5afb5e59bc7e9f412567825fea1c;hp=a70a730f46d0ee706a3de5c174b07e0167a752cc;hpb=1c1cfea95e549170ede1eaf05240b935aa2186a9;p=chaz%2Ftint2 diff --git a/src/tint2conf/properties.c b/src/tint2conf/properties.c index a70a730..769a634 100644 --- a/src/tint2conf/properties.c +++ b/src/tint2conf/properties.c @@ -27,6 +27,8 @@ void change_paragraph(GtkWidget *widget); void create_general(GtkWidget *parent); void create_panel(GtkWidget *parent); +void create_panel_items(GtkWidget *parent); +void create_launcher(GtkWidget *parent); void create_taskbar(GtkWidget *parent); void create_task(GtkWidget *parent); void create_clock(GtkWidget *parent); @@ -40,7 +42,7 @@ GtkWidget *create_properties() { GtkWidget *view, *dialog_vbox3, *button, *notebook; GtkTooltips *tooltips; - GtkWidget *page_panel, *page_launcher, *page_taskbar, *page_battery, *page_clock, *page_tooltip, *page_systemtray, *page_task, *page_background; + GtkWidget *page_panel, *page_panel_items, *page_launcher, *page_taskbar, *page_battery, *page_clock, *page_tooltip, *page_systemtray, *page_task, *page_background; GtkWidget *label; tooltips = gtk_tooltips_new (); @@ -85,6 +87,14 @@ GtkWidget *create_properties() gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page_panel, label); create_panel(page_panel); + label = gtk_label_new (_("Panel items")); + gtk_widget_show (label); + page_panel_items = gtk_vbox_new (FALSE, DEFAULT_HOR_SPACING); + gtk_container_set_border_width(GTK_CONTAINER(page_panel_items), 10); + gtk_widget_show (page_panel_items); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page_panel_items, label); + create_panel_items(page_panel_items); + label = gtk_label_new (_("Launcher")); gtk_widget_show (label); page_launcher = gtk_vbox_new (FALSE, DEFAULT_HOR_SPACING); @@ -168,10 +178,9 @@ void create_panel(GtkWidget *parent) int i; GtkWidget *screen_position[12]; GtkWidget *table, *hbox, *frame; - GtkWidget *margin_x, *margin_y, *combo_strut_policy, *combo_layer, *combo_width_type, *combo_height_type, *combo_monitor, *combo_background, *items_order; GtkWidget *label; - label = gtk_label_new (_("Position, size and items order")); + label = gtk_label_new (_("Position and size")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_widget_show (label); @@ -187,34 +196,6 @@ void create_panel(GtkWidget *parent) gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); - table = gtk_table_new (5, 5, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0); - for (i = 0; i < 12; ++i) { - screen_position[i] = gtk_toggle_button_new (); - gtk_widget_show (screen_position[i]); - - if (i <= 2 || i >= 9) - gtk_widget_set_size_request (screen_position[i], 30, 15); - else - gtk_widget_set_size_request (screen_position[i], 15, 25); - -// g_signal_connect (G_OBJECT (screen_position[i]), "button-press-event", G_CALLBACK (screen_position_pressed)); -// g_signal_connect (G_OBJECT (screen_position[i]), "key-press-event", G_CALLBACK (screen_position_pressed)); - } - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[0], 1, 2, 0, 1); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[1], 2, 3, 0, 1); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[2], 3, 4, 0, 1); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[3], 0, 1, 1, 2); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[4], 0, 1, 2, 3); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[5], 0, 1, 3, 4); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[6], 4, 5, 1, 2); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[7], 4, 5, 2, 3); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[8], 4, 5, 3, 4); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[9], 1, 2, 4, 5); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[10], 2, 3, 4, 5); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[11], 3, 4, 4, 5); - table = gtk_table_new (3, 8, FALSE); gtk_widget_show (table); gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0); @@ -226,68 +207,86 @@ void create_panel(GtkWidget *parent) gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_FILL, 0, 0, 0); - margin_x = gtk_spin_button_new_with_range (0, 9000, 1); - gtk_widget_show (margin_x); - gtk_table_attach (GTK_TABLE (table), margin_x, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); + panel_width = gtk_spin_button_new_with_range (0, 9000, 1); + gtk_widget_show (panel_width); + gtk_table_attach (GTK_TABLE (table), panel_width, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); - combo_width_type = gtk_combo_box_new_text (); - gtk_widget_show (combo_width_type); - gtk_table_attach (GTK_TABLE (table), combo_width_type, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_width_type), _("Percent")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_width_type), _("Pixels")); + panel_combo_width_type = gtk_combo_box_new_text (); + gtk_widget_show (panel_combo_width_type); + gtk_table_attach (GTK_TABLE (table), panel_combo_width_type, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (panel_combo_width_type), _("Percent")); + gtk_combo_box_append_text (GTK_COMBO_BOX (panel_combo_width_type), _("Pixels")); label = gtk_label_new (_("Marging x")); 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); - 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, 0, 1, GTK_FILL, 0, 0, 0); + panel_margin_x = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (panel_margin_x); + gtk_entry_set_max_length (GTK_ENTRY (panel_margin_x), 3); + gtk_table_attach (GTK_TABLE (table), panel_margin_x, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Height")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 1, 2, 1, 2, GTK_FILL, 0, 0, 0); - margin_y = gtk_spin_button_new_with_range (0, 9000, 1); - gtk_widget_show (margin_y); - gtk_table_attach (GTK_TABLE (table), margin_y, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); - - label = gtk_label_new (_("Items order")); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0); - gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, 1, 2, 2, 3, GTK_FILL, 0, 0, 0); - - items_order = gtk_entry_new (); - gtk_widget_show (items_order); - gtk_entry_set_width_chars (GTK_ENTRY (items_order), 15); - gtk_table_attach (GTK_TABLE (table), items_order, 2, 4, 2, 3, GTK_FILL, 0, 0, 0); + panel_height = gtk_spin_button_new_with_range (0, 9000, 1); + gtk_widget_show (panel_height); + gtk_table_attach (GTK_TABLE (table), panel_height, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); change_paragraph(parent); - combo_height_type = gtk_combo_box_new_text (); - gtk_widget_show (combo_height_type); - gtk_table_attach (GTK_TABLE (table), combo_height_type, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_height_type), _("Percent")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_height_type), _("Pixels")); + panel_combo_height_type = gtk_combo_box_new_text (); + gtk_widget_show (panel_combo_height_type); + gtk_table_attach (GTK_TABLE (table), panel_combo_height_type, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (panel_combo_height_type), _("Percent")); + gtk_combo_box_append_text (GTK_COMBO_BOX (panel_combo_height_type), _("Pixels")); label = gtk_label_new (_("Marging y")); 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_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, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); + panel_margin_y = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (panel_margin_y); + gtk_entry_set_max_length (GTK_ENTRY (panel_margin_y), 3); + gtk_table_attach (GTK_TABLE (table), panel_margin_y, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); frame = gtk_frame_new (NULL); gtk_widget_show (frame); gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); + table = gtk_table_new (5, 5, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0); + for (i = 0; i < 12; ++i) { + screen_position[i] = gtk_toggle_button_new (); + gtk_widget_show (screen_position[i]); + + if (i <= 2 || i >= 9) + gtk_widget_set_size_request (screen_position[i], 30, 15); + else + gtk_widget_set_size_request (screen_position[i], 15, 25); + +// g_signal_connect (G_OBJECT (screen_position[i]), "button-press-event", G_CALLBACK (screen_position_pressed)); +// g_signal_connect (G_OBJECT (screen_position[i]), "key-press-event", G_CALLBACK (screen_position_pressed)); + } + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[0], 1, 2, 0, 1); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[1], 2, 3, 0, 1); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[2], 3, 4, 0, 1); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[3], 0, 1, 1, 2); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[4], 0, 1, 2, 3); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[5], 0, 1, 3, 4); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[6], 4, 5, 1, 2); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[7], 4, 5, 2, 3); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[8], 4, 5, 3, 4); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[9], 1, 2, 4, 5); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[10], 2, 3, 4, 5); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[11], 3, 4, 4, 5); + label = gtk_label_new (_("Autohide")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); @@ -305,18 +304,18 @@ void create_panel(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_table_attach (GTK_TABLE (table), margin_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); + panel_autohide = gtk_check_button_new (); + gtk_widget_show (panel_autohide); + gtk_table_attach (GTK_TABLE (table), panel_autohide, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Show panel after")); 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); - 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, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); + panel_autohide_show_time = gtk_spin_button_new_with_range (0, 10000, 0.1); + gtk_widget_show (panel_autohide_show_time); + gtk_table_attach (GTK_TABLE (table), panel_autohide_show_time, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("seconds")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); @@ -328,19 +327,19 @@ void create_panel(GtkWidget *parent) gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 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, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); + panel_autohide_size = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (panel_autohide_size); + gtk_entry_set_max_length (GTK_ENTRY (panel_autohide_size), 3); + gtk_table_attach (GTK_TABLE (table), panel_autohide_size, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Hide panel after")); 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_y = gtk_spin_button_new_with_range (0, 10000, 0.1); - gtk_widget_show (margin_y); - gtk_table_attach (GTK_TABLE (table), margin_y, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); + panel_autohide_hide_time = gtk_spin_button_new_with_range (0, 10000, 0.1); + gtk_widget_show (panel_autohide_hide_time); + gtk_table_attach (GTK_TABLE (table), panel_autohide_hide_time, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("seconds")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); @@ -366,10 +365,10 @@ void create_panel(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); + panel_padding_x = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (panel_padding_x); + gtk_entry_set_max_length (GTK_ENTRY (panel_padding_x), 3); + gtk_table_attach (GTK_TABLE (table), panel_padding_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Background")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); @@ -379,29 +378,29 @@ void create_panel(GtkWidget *parent) 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), _("Back 1")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 2")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 3")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 1")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 2")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 3")); 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); + panel_padding_y = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (panel_padding_y); + gtk_entry_set_max_length (GTK_ENTRY (panel_padding_y), 3); + gtk_table_attach (GTK_TABLE (table), panel_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, 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); + panel_spacing = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (panel_spacing); + gtk_entry_set_max_length (GTK_ENTRY (panel_spacing), 3); + gtk_table_attach (GTK_TABLE (table), panel_spacing, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); change_paragraph(parent); @@ -417,61 +416,91 @@ void create_panel(GtkWidget *parent) gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); - label = gtk_label_new (_("WM menu")); + label = gtk_label_new (_("Show WM menu")); 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); - 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); + panel_wm_menu = gtk_check_button_new (); + gtk_widget_show (panel_wm_menu); + gtk_entry_set_max_length (GTK_ENTRY (panel_wm_menu), 3); + gtk_table_attach (GTK_TABLE (table), panel_wm_menu, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Place in dock")); 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); + panel_dock = gtk_check_button_new (); + gtk_widget_show (panel_dock); + gtk_entry_set_max_length (GTK_ENTRY (panel_dock), 3); + gtk_table_attach (GTK_TABLE (table), panel_dock, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); - label = gtk_label_new (_("Layer")); + label = gtk_label_new (_("Panel's layer")); 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_layer = gtk_combo_box_new_text (); - gtk_widget_show (combo_layer); - gtk_entry_set_max_length (GTK_ENTRY (combo_layer), 3); - gtk_table_attach (GTK_TABLE (table), combo_layer, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_layer), _("top")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_layer), _("normal")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_layer), _("bottom")); + panel_combo_layer = gtk_combo_box_new_text (); + gtk_widget_show (panel_combo_layer); + gtk_entry_set_max_length (GTK_ENTRY (panel_combo_layer), 3); + gtk_table_attach (GTK_TABLE (table), panel_combo_layer, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (panel_combo_layer), _("Top")); + gtk_combo_box_append_text (GTK_COMBO_BOX (panel_combo_layer), _("Normal")); + gtk_combo_box_append_text (GTK_COMBO_BOX (panel_combo_layer), _("Bottom")); - label = gtk_label_new (_("Strut policy")); + label = gtk_label_new (_("Maximized window")); 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_strut_policy = gtk_combo_box_new_text (); - gtk_widget_show (combo_strut_policy); - gtk_entry_set_max_length (GTK_ENTRY (combo_strut_policy), 3); - gtk_table_attach (GTK_TABLE (table), combo_strut_policy, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_strut_policy), _("follow_size")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_strut_policy), _("minimum")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_strut_policy), _("none")); + panel_combo_strut_policy = gtk_combo_box_new_text (); + gtk_widget_show (panel_combo_strut_policy); + gtk_entry_set_max_length (GTK_ENTRY (panel_combo_strut_policy), 3); + gtk_table_attach (GTK_TABLE (table), panel_combo_strut_policy, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (panel_combo_strut_policy), _("Follow panel size")); + gtk_combo_box_append_text (GTK_COMBO_BOX (panel_combo_strut_policy), _("Follow hidden size")); + gtk_combo_box_append_text (GTK_COMBO_BOX (panel_combo_strut_policy), _("Full screen")); label = gtk_label_new (_("Monitor")); 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); - combo_monitor = gtk_combo_box_new_text (); - gtk_widget_show (combo_monitor); - gtk_table_attach (GTK_TABLE (table), combo_monitor, 11, 12, 0, 1, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_monitor), _("All")); + panel_combo_monitor = gtk_combo_box_new_text (); + gtk_widget_show (panel_combo_monitor); + gtk_table_attach (GTK_TABLE (table), panel_combo_monitor, 11, 12, 0, 1, GTK_FILL, 0, 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (panel_combo_monitor), _("All")); + gtk_combo_box_append_text (GTK_COMBO_BOX (panel_combo_monitor), _("1")); + gtk_combo_box_append_text (GTK_COMBO_BOX (panel_combo_monitor), _("2")); + gtk_combo_box_append_text (GTK_COMBO_BOX (panel_combo_monitor), _("3")); + gtk_combo_box_append_text (GTK_COMBO_BOX (panel_combo_monitor), _("4")); + gtk_combo_box_append_text (GTK_COMBO_BOX (panel_combo_monitor), _("5")); + gtk_combo_box_append_text (GTK_COMBO_BOX (panel_combo_monitor), _("6")); + + change_paragraph(parent); +} + + +void create_panel_items(GtkWidget *parent) +{ + GtkWidget *table, *label; + + table = gtk_table_new (2, 2, 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 (_("Items order")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); + + items_order = gtk_entry_new (); + gtk_widget_show (items_order); + gtk_entry_set_width_chars (GTK_ENTRY (items_order), 15); + gtk_table_attach (GTK_TABLE (table), items_order, 1, 2, 0, 1, GTK_FILL, 0, 0, 0); change_paragraph(parent); } @@ -480,7 +509,6 @@ void create_panel(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); @@ -507,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); @@ -540,31 +568,31 @@ void create_launcher(GtkWidget *parent) 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), _("Back 1")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 2")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 3")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 1")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 2")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 3")); label = gtk_label_new (_("Icon size")); 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_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); } @@ -573,7 +601,6 @@ void create_launcher(GtkWidget *parent) void create_taskbar(GtkWidget *parent) { GtkWidget *table, *label; - GtkWidget *margin_x, *margin_y, *combo_background; table = gtk_table_new (2, 2, FALSE); gtk_widget_show (table); @@ -586,24 +613,24 @@ void create_taskbar(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_entry_set_max_length (GTK_ENTRY (margin_x), 3); - gtk_table_attach (GTK_TABLE (table), margin_x, 1, 2, 0, 1, GTK_FILL, 0, 0, 0); + taskbar_show_desktop = gtk_check_button_new (); + gtk_widget_show (taskbar_show_desktop); + gtk_entry_set_max_length (GTK_ENTRY (taskbar_show_desktop), 3); + gtk_table_attach (GTK_TABLE (table), taskbar_show_desktop, 1, 2, 0, 1, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Show taskbar name")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 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, 1, 2, 1, 2, GTK_FILL, 0, 0, 0); + taskbar_show_name = gtk_check_button_new (); + gtk_widget_show (taskbar_show_name); + gtk_entry_set_max_length (GTK_ENTRY (taskbar_show_name), 3); + gtk_table_attach (GTK_TABLE (table), taskbar_show_name, 1, 2, 1, 2, GTK_FILL, 0, 0, 0); change_paragraph(parent); - label = gtk_label_new (_("Appearance")); + label = gtk_label_new (_("Taskbar Appearance")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_widget_show (label); @@ -620,32 +647,32 @@ void create_taskbar(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); + taskbar_padding_x = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (taskbar_padding_x); + gtk_entry_set_max_length (GTK_ENTRY (taskbar_padding_x), 3); + gtk_table_attach (GTK_TABLE (table), taskbar_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); + taskbar_padding_y = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (taskbar_padding_y); + gtk_entry_set_max_length (GTK_ENTRY (taskbar_padding_y), 3); + gtk_table_attach (GTK_TABLE (table), taskbar_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); + taskbar_spacing = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (taskbar_spacing); + gtk_entry_set_max_length (GTK_ENTRY (taskbar_spacing), 3); + gtk_table_attach (GTK_TABLE (table), taskbar_spacing, 3, 4, 2, 3, GTK_FILL, 0, 0, 0); - label = gtk_label_new (_("Normal background")); + label = gtk_label_new (_("Inactive background")); 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); @@ -653,9 +680,9 @@ void create_taskbar(GtkWidget *parent) 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), _("Back 1")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 2")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 3")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 1")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 2")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 3")); label = gtk_label_new (_("Active background")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); @@ -665,9 +692,9 @@ void create_taskbar(GtkWidget *parent) 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), _("Back 1")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 2")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 3")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 1")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 2")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 3")); change_paragraph(parent); @@ -677,7 +704,7 @@ void create_taskbar(GtkWidget *parent) gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - table = gtk_table_new (2, 12, FALSE); + table = gtk_table_new (6, 22, 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); @@ -688,44 +715,64 @@ void create_taskbar(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); + taskbar_name_padding_x = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (taskbar_name_padding_x); + gtk_entry_set_max_length (GTK_ENTRY (taskbar_name_padding_x), 3); + gtk_table_attach (GTK_TABLE (table), taskbar_name_padding_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); - label = gtk_label_new (_("Vertical padding")); + label = gtk_label_new (_("Inactive font color")); 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); + taskbar_name_inactive_color = gtk_color_button_new(); + gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(taskbar_name_inactive_color), TRUE); + gtk_widget_show (taskbar_name_inactive_color); + gtk_table_attach (GTK_TABLE (table), taskbar_name_inactive_color, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); + + label = gtk_label_new (_("Active font color")); + 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); + + taskbar_name_active_color = gtk_color_button_new(); + gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(taskbar_name_active_color), TRUE); + gtk_widget_show (taskbar_name_active_color); + gtk_table_attach (GTK_TABLE (table), taskbar_name_active_color, 3, 4, 2, 3, GTK_FILL, 0, 0, 0); - label = gtk_label_new (_("Normal background")); + 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, 6, 7, 0, 1, GTK_FILL, 0, 0, 0); + taskbar_name_font = gtk_font_button_new (); + gtk_widget_show (taskbar_name_font); + gtk_table_attach (GTK_TABLE (table), taskbar_name_font, 7, 22, 0, 1, GTK_FILL, 0, 0, 0); + //gtk_font_button_set_show_style (GTK_FONT_BUTTON (taskbar_name_font), FALSE); + + label = gtk_label_new (_("Inactive background")); + 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, 0, 1, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 1")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 2")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 3")); + 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), _("Id 1")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 2")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 3")); label = gtk_label_new (_("Active background")); 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); + 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, 1, 2, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 1")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 2")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 3")); + 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), _("Id 1")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 2")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 3")); change_paragraph(parent); } @@ -922,7 +969,6 @@ void create_task(GtkWidget *parent) void create_clock(GtkWidget *parent) { GtkWidget *table; - GtkWidget *margin_x, *margin_y, *combo_background; GtkWidget *label; table = gtk_table_new (1, 2, FALSE); @@ -944,65 +990,45 @@ void create_clock(GtkWidget *parent) gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); - label = gtk_label_new (_("First line")); + label = gtk_label_new (_("First line 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); - margin_x = gtk_entry_new (); - gtk_widget_show (margin_x); - gtk_entry_set_width_chars (GTK_ENTRY (margin_x), 15); - gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); + clock_format_line1 = gtk_entry_new (); + gtk_widget_show (clock_format_line1); + gtk_entry_set_width_chars (GTK_ENTRY (clock_format_line1), 16); + gtk_table_attach (GTK_TABLE (table), clock_format_line1, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); - label = gtk_label_new (_("Second line")); + label = gtk_label_new (_("Second line format")); 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_entry_new (); - gtk_widget_show (margin_x); - gtk_entry_set_width_chars (GTK_ENTRY (margin_x), 15); - gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); + clock_format_line2 = gtk_entry_new (); + gtk_widget_show (clock_format_line2); + 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")); - 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_entry_new (); - gtk_widget_show (margin_x); - gtk_entry_set_width_chars (GTK_ENTRY (margin_x), 15); - gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 2, 3, GTK_FILL, 0, 0, 0); - - label = gtk_label_new (_("First line")); + label = gtk_label_new (_("First line timezone")); 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); - margin_x = gtk_entry_new (); - gtk_widget_show (margin_x); - gtk_entry_set_width_chars (GTK_ENTRY (margin_x), 20); - gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); + clock_tmz_line1 = gtk_entry_new (); + gtk_widget_show (clock_tmz_line1); + gtk_entry_set_width_chars (GTK_ENTRY (clock_tmz_line1), 16); + gtk_table_attach (GTK_TABLE (table), clock_tmz_line1, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); - label = gtk_label_new (_("Second line")); + label = gtk_label_new (_("Second line timezone")); 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_entry_new (); - gtk_widget_show (margin_x); - gtk_entry_set_width_chars (GTK_ENTRY (margin_x), 20); - gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); - - label = gtk_label_new (_("Tooltip")); - 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); - - margin_x = gtk_entry_new (); - gtk_widget_show (margin_x); - gtk_entry_set_width_chars (GTK_ENTRY (margin_x), 20); - gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 2, 3, GTK_FILL, 0, 0, 0); + clock_tmz_line2 = gtk_entry_new (); + gtk_widget_show (clock_tmz_line2); + 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); change_paragraph(parent); @@ -1023,20 +1049,20 @@ void create_clock(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_entry_new (); - gtk_widget_show (margin_x); - gtk_entry_set_width_chars (GTK_ENTRY (margin_x), 12); - gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); + clock_left_command = gtk_entry_new (); + gtk_widget_show (clock_left_command); + gtk_entry_set_width_chars (GTK_ENTRY (clock_left_command), 16); + gtk_table_attach (GTK_TABLE (table), clock_left_command, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Right click command")); 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); - margin_x = gtk_entry_new (); - gtk_widget_show (margin_x); - gtk_entry_set_width_chars (GTK_ENTRY (margin_x), 12); - gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); + clock_right_command = gtk_entry_new (); + gtk_widget_show (clock_right_command); + gtk_entry_set_width_chars (GTK_ENTRY (clock_right_command), 16); + gtk_table_attach (GTK_TABLE (table), clock_right_command, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); change_paragraph(parent); @@ -1046,7 +1072,7 @@ void create_clock(GtkWidget *parent) gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - table = gtk_table_new (3, 10, FALSE); + table = gtk_table_new (3, 22, 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); @@ -1057,20 +1083,20 @@ void create_clock(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); + clock_padding_x = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (clock_padding_x); + gtk_entry_set_max_length (GTK_ENTRY (clock_padding_x), 3); + gtk_table_attach (GTK_TABLE (table), clock_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); + clock_padding_y = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (clock_padding_y); + gtk_entry_set_max_length (GTK_ENTRY (clock_padding_y), 3); + gtk_table_attach (GTK_TABLE (table), clock_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); @@ -1080,39 +1106,39 @@ void create_clock(GtkWidget *parent) combo_background = gtk_combo_box_new_text (); gtk_widget_show (combo_background); gtk_table_attach (GTK_TABLE (table), combo_background, 3, 4, 2, 3, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 1")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 2")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 3")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 1")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 2")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 3")); label = gtk_label_new (_("Font first line")); 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); - margin_x = gtk_font_button_new (); - gtk_widget_show (margin_x); - gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); -// gtk_font_button_set_show_style (GTK_FONT_BUTTON (margin_x), FALSE); + clock_font_line1 = gtk_font_button_new (); + gtk_widget_show (clock_font_line1); + gtk_table_attach (GTK_TABLE (table), clock_font_line1, 7, 22, 0, 1, GTK_FILL, 0, 0, 0); +// gtk_font_button_set_show_style (GTK_FONT_BUTTON (clock_font_line1), FALSE); label = gtk_label_new (_("Font second line")); 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_font_button_new (); - gtk_widget_show (margin_x); - gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); -// gtk_font_button_set_show_style (GTK_FONT_BUTTON (margin_x), FALSE); + clock_font_line2 = gtk_font_button_new (); + gtk_widget_show (clock_font_line2); + gtk_table_attach (GTK_TABLE (table), clock_font_line2, 7, 22, 1, 2, GTK_FILL, 0, 0, 0); +// gtk_font_button_set_show_style (GTK_FONT_BUTTON (clock_font_line2), 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, 2, 3, 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, 2, 3, GTK_FILL, 0, 0, 0); + clock_font_color = gtk_color_button_new(); + gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(clock_font_color), TRUE); + gtk_widget_show (clock_font_color); + gtk_table_attach (GTK_TABLE (table), clock_font_color, 7, 8, 2, 3, GTK_FILL, 0, 0, 0); change_paragraph(parent); } @@ -1121,7 +1147,6 @@ void create_clock(GtkWidget *parent) void create_systemtray(GtkWidget *parent) { GtkWidget *table; - GtkWidget *margin_x, *margin_y, *combo_background; GtkWidget *label; table = gtk_table_new (2, 2, FALSE); @@ -1135,13 +1160,13 @@ void create_systemtray(GtkWidget *parent) gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 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, 1, 2, 1, 2, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("ascending")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("descending")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("left2right")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("right2left")); + systray_icon_order = gtk_combo_box_new_text (); + gtk_widget_show (systray_icon_order); + gtk_table_attach (GTK_TABLE (table), systray_icon_order, 1, 2, 1, 2, GTK_FILL, 0, 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (systray_icon_order), _("Ascending")); + gtk_combo_box_append_text (GTK_COMBO_BOX (systray_icon_order), _("Descending")); + gtk_combo_box_append_text (GTK_COMBO_BOX (systray_icon_order), _("Left to right")); + gtk_combo_box_append_text (GTK_COMBO_BOX (systray_icon_order), _("Right to left")); change_paragraph(parent); @@ -1162,30 +1187,30 @@ void create_systemtray(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); + systray_padding_x = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (systray_padding_x); + gtk_entry_set_max_length (GTK_ENTRY (systray_padding_x), 3); + gtk_table_attach (GTK_TABLE (table), systray_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); + systray_padding_y = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (systray_padding_y); + gtk_entry_set_max_length (GTK_ENTRY (systray_padding_y), 3); + gtk_table_attach (GTK_TABLE (table), systray_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); + systray_spacing = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (systray_spacing); + gtk_entry_set_max_length (GTK_ENTRY (systray_spacing), 3); + gtk_table_attach (GTK_TABLE (table), systray_spacing, 3, 4, 2, 3, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Background")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); @@ -1195,58 +1220,56 @@ void create_systemtray(GtkWidget *parent) combo_background = gtk_combo_box_new_text (); gtk_widget_show (combo_background); gtk_table_attach (GTK_TABLE (table), combo_background, 3, 4, 3, 4, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 1")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 2")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 3")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 1")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 2")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 3")); label = gtk_label_new (_("Icon size")); 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); - 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, 0, 1, GTK_FILL, 0, 0, 0); + systray_icon_size = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (systray_icon_size); + gtk_entry_set_max_length (GTK_ENTRY (systray_icon_size), 3); + gtk_table_attach (GTK_TABLE (table), systray_icon_size, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Icon opacity")); 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_spin_button_new_with_range (0, 100, 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); + systray_icon_opacity = gtk_spin_button_new_with_range (0, 100, 1); + gtk_widget_show (systray_icon_opacity); + gtk_entry_set_max_length (GTK_ENTRY (systray_icon_opacity), 3); + gtk_table_attach (GTK_TABLE (table), systray_icon_opacity, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Icon saturation")); 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); - margin_x = gtk_spin_button_new_with_range (-100, 100, 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, 2, 3, GTK_FILL, 0, 0, 0); + systray_icon_saturation = gtk_spin_button_new_with_range (-100, 100, 1); + gtk_widget_show (systray_icon_saturation); + gtk_entry_set_max_length (GTK_ENTRY (systray_icon_saturation), 4); + gtk_table_attach (GTK_TABLE (table), systray_icon_saturation, 7, 8, 2, 3, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Icon brightness")); 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); - margin_x = gtk_spin_button_new_with_range (-100, 100, 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, 3, 4, GTK_FILL, 0, 0, 0); + systray_icon_brightness = gtk_spin_button_new_with_range (-100, 100, 1); + gtk_widget_show (systray_icon_brightness); + gtk_entry_set_max_length (GTK_ENTRY (systray_icon_brightness), 4); + gtk_table_attach (GTK_TABLE (table), systray_icon_brightness, 7, 8, 3, 4, GTK_FILL, 0, 0, 0); } void create_battery(GtkWidget *parent) { - GtkWidget *table; - GtkWidget *margin_x, *margin_y, *combo_background; - GtkWidget *label; + GtkWidget *table, *label; table = gtk_table_new (1, 2, FALSE); gtk_widget_show (table); @@ -1271,10 +1294,10 @@ void create_battery(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, 100, 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); + battery_hide_if_higher = gtk_spin_button_new_with_range (0, 101, 1); + gtk_widget_show (battery_hide_if_higher); + gtk_entry_set_max_length (GTK_ENTRY (battery_hide_if_higher), 3); + gtk_table_attach (GTK_TABLE (table), battery_hide_if_higher, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("%")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); @@ -1286,16 +1309,27 @@ void create_battery(GtkWidget *parent) gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); - margin_x = gtk_spin_button_new_with_range (0, 100, 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, 1, 2, GTK_FILL, 0, 0, 0); + battery_alert_if_lower = gtk_spin_button_new_with_range (0, 100, 1); + gtk_widget_show (battery_alert_if_lower); + gtk_entry_set_max_length (GTK_ENTRY (battery_alert_if_lower), 3); + gtk_table_attach (GTK_TABLE (table), battery_alert_if_lower, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("%")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 4, 5, 1, 2, GTK_FILL, 0, 0, 0); + label = gtk_label_new (_("Alert command")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); + + battery_alert_cmd = gtk_entry_new (); + gtk_widget_show (battery_alert_cmd); + gtk_entry_set_width_chars (GTK_ENTRY (battery_alert_cmd), 28); + gtk_table_attach (GTK_TABLE (table), battery_alert_cmd, 8, 9, 1, 2, GTK_FILL, 0, 0, 0); + + change_paragraph(parent); label = gtk_label_new (_("Appearance")); @@ -1304,7 +1338,7 @@ void create_battery(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, 22, 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); @@ -1315,20 +1349,20 @@ void create_battery(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); + battery_padding_x = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (battery_padding_x); + gtk_entry_set_max_length (GTK_ENTRY (battery_padding_x), 3); + gtk_table_attach (GTK_TABLE (table), battery_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); + battery_padding_y = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (battery_padding_y); + gtk_entry_set_max_length (GTK_ENTRY (battery_padding_y), 3); + gtk_table_attach (GTK_TABLE (table), battery_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); @@ -1338,39 +1372,39 @@ void create_battery(GtkWidget *parent) combo_background = gtk_combo_box_new_text (); gtk_widget_show (combo_background); gtk_table_attach (GTK_TABLE (table), combo_background, 3, 4, 2, 3, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 1")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 2")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 3")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 1")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 2")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 3")); label = gtk_label_new (_("Font first line")); 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); - margin_x = gtk_font_button_new (); - gtk_widget_show (margin_x); - gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); -// gtk_font_button_set_show_style (GTK_FONT_BUTTON (margin_x), FALSE); + battery_font_line1 = gtk_font_button_new (); + gtk_widget_show (battery_font_line1); + gtk_table_attach (GTK_TABLE (table), battery_font_line1, 7, 22, 0, 1, GTK_FILL, 0, 0, 0); +// gtk_font_button_set_show_style (GTK_FONT_BUTTON (battery_font_line1), FALSE); label = gtk_label_new (_("Font second line")); 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_font_button_new (); - gtk_widget_show (margin_x); - gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); -// gtk_font_button_set_show_style (GTK_FONT_BUTTON (margin_x), FALSE); + battery_font_line2 = gtk_font_button_new (); + gtk_widget_show (battery_font_line2); + gtk_table_attach (GTK_TABLE (table), battery_font_line2, 7, 22, 1, 2, GTK_FILL, 0, 0, 0); +// gtk_font_button_set_show_style (GTK_FONT_BUTTON (battery_font_line2), 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, 2, 3, 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, 2, 3, GTK_FILL, 0, 0, 0); + battery_font_color = gtk_color_button_new(); + gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(battery_font_color), TRUE); + gtk_widget_show (battery_font_color); + gtk_table_attach (GTK_TABLE (table), battery_font_color, 7, 8, 2, 3, GTK_FILL, 0, 0, 0); change_paragraph(parent); } @@ -1379,7 +1413,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); @@ -1393,9 +1426,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); @@ -1405,7 +1438,7 @@ void create_tooltip(GtkWidget *parent) gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - table = gtk_table_new (2, 10, FALSE); + table = gtk_table_new (2, 22, 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); @@ -1416,9 +1449,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); @@ -1430,9 +1463,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); @@ -1458,20 +1491,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); @@ -1481,29 +1514,63 @@ void create_tooltip(GtkWidget *parent) combo_background = gtk_combo_box_new_text (); gtk_widget_show (combo_background); gtk_table_attach (GTK_TABLE (table), combo_background, 3, 4, 2, 3, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 1")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 2")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 3")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 1")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 2")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Id 3")); 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, 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, 8, 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); }