all repos — tint2 @ 8c3017634f7ec9f59ed61d33bbb7fdf3d9ebb68b

fork of the tint2 desktop panel for my custom setup - only minimized windows across all desktops for the taskbar

Executor: tint2conf support for one instance
o9000 mrovi9000@gmail.com
commit

8c3017634f7ec9f59ed61d33bbb7fdf3d9ebb68b

parent

7582b9f9600be5195908351e28258b222f4c698c

3 files changed, 496 insertions(+), 2 deletions(-)

jump to
M src/tint2conf/properties.csrc/tint2conf/properties.c

@@ -111,6 +111,14 @@ GtkWidget *tooltip_task_show, *tooltip_show_after, *tooltip_hide_after;

GtkWidget *clock_format_tooltip, *clock_tmz_tooltip; GtkWidget *tooltip_background; +// Executor +GtkWidget *execp_command, *execp_has_icon, *execp_cache_icon, *execp_interval, *execp_show_tooltip; +GtkWidget *execp_continuous, *execp_markup, *execp_tooltip; +GtkWidget *execp_left_command, *execp_right_command; +GtkWidget *execp_mclick_command, *execp_rclick_command, *execp_uwheel_command, *execp_dwheel_command; +GtkWidget *execp_font, *execp_font_color, *execp_padding_x, *execp_padding_y, *execp_centered, *execp_background; +GtkWidget *execp_icon_w, *execp_icon_h; + // launcher GtkListStore *launcher_apps, *all_apps;

@@ -169,6 +177,7 @@ GtkWidget **task_status_icon_saturation,

GtkWidget **task_status_icon_brightness, GtkWidget **task_status_background, GtkWidget **task_status_background_set); +void create_execp(GtkWidget *parent); void create_clock(GtkWidget *parent); void create_systemtray(GtkWidget *parent); void create_battery(GtkWidget *parent);

@@ -217,7 +226,7 @@ GtkWidget *create_properties()

{ GtkWidget *view, *dialog_vbox3, *button, *notebook; GtkTooltips *tooltips; - GtkWidget *page_panel, *page_panel_items, *page_launcher, *page_taskbar, *page_battery, *page_clock, + GtkWidget *page_panel, *page_panel_items, *page_launcher, *page_taskbar, *page_battery, *page_clock, *page_execp, *page_tooltip, *page_systemtray, *page_task, *page_background; GtkWidget *label;

@@ -284,7 +293,6 @@ gtk_widget_show(page_panel_items);

gtk_notebook_append_page(GTK_NOTEBOOK(notebook), addScrollBarToWidget(page_panel_items), label); create_panel_items(page_panel_items); - label = gtk_label_new(_("Taskbar")); gtk_widget_show(label); page_taskbar = gtk_vbox_new(FALSE, DEFAULT_HOR_SPACING);

@@ -332,6 +340,14 @@ gtk_container_set_border_width(GTK_CONTAINER(page_battery), 10);

gtk_widget_show(page_battery); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), addScrollBarToWidget(page_battery), label); create_battery(page_battery); + + label = gtk_label_new(_("Executors")); + gtk_widget_show(label); + page_execp = gtk_vbox_new(FALSE, DEFAULT_HOR_SPACING); + gtk_container_set_border_width(GTK_CONTAINER(page_execp), 10); + gtk_widget_show(page_execp); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), addScrollBarToWidget(page_execp), label); + create_execp(page_execp); label = gtk_label_new(_("Tooltip")); gtk_widget_show(label);

@@ -1847,6 +1863,9 @@ name = _("Launcher");

} else if (v == 'F') { value = "F"; name = _("Free space"); + } else if (v == 'E') { + value = "E"; + name = _("Executor"); } else { continue; }

@@ -3958,6 +3977,360 @@ gtk_table_attach(GTK_TABLE(table), clock_tmz_tooltip, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);

col++; gtk_tooltips_set_tip(tooltips, clock_tmz_tooltip, _("Specifies the timezone used to display the clock tooltip. If empty, the current timezone is used. " "Otherwise, it must be set to a valid value of the TZ environment variable."), NULL); + + change_paragraph(parent); +} + +void create_execp(GtkWidget *parent) +{ + GtkWidget *table; + GtkWidget *label; + int row, col; + GtkTooltips *tooltips = gtk_tooltips_new(); + + table = gtk_table_new(1, 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); + row = 0, col = 2; + + label = gtk_label_new(_("<b>Format</b>")); + 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); + row = 0, col = 2; + + label = gtk_label_new(_("Command")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_widget_show(label); + gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_command = gtk_entry_new(); + gtk_widget_show(execp_command); + gtk_entry_set_width_chars(GTK_ENTRY(execp_command), 50); + gtk_table_attach(GTK_TABLE(table), execp_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + gtk_tooltips_set_tip(tooltips, execp_command, + _("Specifies the command to execute."), NULL); + + row++, col = 2; + label = gtk_label_new(_("Interval")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_widget_show(label); + gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_interval = gtk_spin_button_new_with_range(0, 1000000, 1); + gtk_widget_show(execp_interval); + gtk_table_attach(GTK_TABLE(table), execp_interval, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + gtk_tooltips_set_tip(tooltips, execp_interval, _("Specifies the interval at which the command is executed, in seconds. " + "If zero, the command is executed only once."), NULL); + + row++, col = 2; + label = gtk_label_new(_("Show icon")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_widget_show(label); + gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_has_icon = gtk_check_button_new(); + gtk_widget_show(execp_has_icon); + gtk_table_attach(GTK_TABLE(table), execp_has_icon, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + gtk_tooltips_set_tip(tooltips, execp_has_icon, _("If enabled, the first line printed by the command is interpreted " + "as a path to an image file."), NULL); + + row++, col = 2; + label = gtk_label_new(_("Cache icon")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_widget_show(label); + gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_cache_icon = gtk_check_button_new(); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(execp_cache_icon), 1); + gtk_widget_show(execp_cache_icon); + gtk_table_attach(GTK_TABLE(table), execp_cache_icon, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + gtk_tooltips_set_tip(tooltips, execp_cache_icon, _("If enabled, the image is not reloaded from disk every time the command is executed if the path remains unchanged. Enabling this is recommended."), NULL); + + row++, col = 2; + label = gtk_label_new(_("Continuous output")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_widget_show(label); + gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_continuous = gtk_spin_button_new_with_range(0, 1000000, 1); + gtk_widget_show(execp_continuous); + gtk_table_attach(GTK_TABLE(table), execp_continuous, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + gtk_tooltips_set_tip(tooltips, execp_continuous, _("If non-zero, the last execp_continuous lines from the output of " + "the command are displayed, every execp_continuous lines; this is " + "useful for showing the output of commands that run indefinitely, " + "such as 'ping 127.0.0.1'. If zero, the output of the command is " + "displayed after it finishes executing."), NULL); + row++, col = 2; + label = gtk_label_new(_("Display markup")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_widget_show(label); + gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_markup = gtk_check_button_new(); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(execp_markup), 1); + gtk_widget_show(execp_markup); + gtk_table_attach(GTK_TABLE(table), execp_markup, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + gtk_tooltips_set_tip(tooltips, execp_markup, _("If enabled, the output of the command is treated as Pango markup, " + "which allows rich text formatting. Note that using this with commands " + "that print data downloaded from the Internet is a potential security risk."), NULL); + + change_paragraph(parent); + + label = gtk_label_new(_("<b>Mouse events</b>")); + 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(5, 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); + row = 0, col = 2; + + label = gtk_label_new(_("Left click command")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_widget_show(label); + gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_left_command = gtk_entry_new(); + gtk_widget_show(execp_left_command); + gtk_entry_set_width_chars(GTK_ENTRY(execp_left_command), 50); + gtk_table_attach(GTK_TABLE(table), execp_left_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + gtk_tooltips_set_tip(tooltips, execp_left_command, + _("Specifies a command that will be executed when the executor receives a left click."), NULL); + + row++, col = 2; + 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, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_right_command = gtk_entry_new(); + gtk_widget_show(execp_right_command); + gtk_entry_set_width_chars(GTK_ENTRY(execp_right_command), 50); + gtk_table_attach(GTK_TABLE(table), execp_right_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + gtk_tooltips_set_tip(tooltips, execp_right_command, + _("Specifies a command that will be executed when the executor receives a right click."), NULL); + + row++, col = 2; + label = gtk_label_new(_("Middle click command")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_widget_show(label); + gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_mclick_command = gtk_entry_new(); + gtk_widget_show(execp_mclick_command); + gtk_entry_set_width_chars(GTK_ENTRY(execp_mclick_command), 50); + gtk_table_attach(GTK_TABLE(table), execp_mclick_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + gtk_tooltips_set_tip(tooltips, execp_mclick_command, + _("Specifies a command that will be executed when the executor receives a middle click."), NULL); + + row++, col = 2; + label = gtk_label_new(_("Wheel scroll up command")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_widget_show(label); + gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_uwheel_command = gtk_entry_new(); + gtk_widget_show(execp_uwheel_command); + gtk_entry_set_width_chars(GTK_ENTRY(execp_uwheel_command), 50); + gtk_table_attach(GTK_TABLE(table), execp_uwheel_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + gtk_tooltips_set_tip(tooltips, execp_uwheel_command, + _("Specifies a command that will be executed when the executor receives a mouse scroll up."), NULL); + + row++, col = 2; + label = gtk_label_new(_("Wheel scroll down command")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_widget_show(label); + gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_dwheel_command = gtk_entry_new(); + gtk_widget_show(execp_dwheel_command); + gtk_entry_set_width_chars(GTK_ENTRY(execp_dwheel_command), 50); + gtk_table_attach(GTK_TABLE(table), execp_dwheel_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + gtk_tooltips_set_tip(tooltips, execp_dwheel_command, + _("Specifies a command that will be executed when the executor receives a mouse scroll down."), NULL); + + change_paragraph(parent); + + label = gtk_label_new(_("<b>Appearance</b>")); + 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, 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); + gtk_table_set_col_spacings(GTK_TABLE(table), COL_SPACING); + row = 0, col = 2; + + label = gtk_label_new(_("Background")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_widget_show(label); + gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_background = create_background_combo(_("execp")); + gtk_widget_show(execp_background); + gtk_table_attach(GTK_TABLE(table), execp_background, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + gtk_tooltips_set_tip(tooltips, execp_background, _("Selects the background used to display the executor. " + "Backgrounds can be edited in the Backgrounds tab."), NULL); + + row++, col = 2; + 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, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_padding_x = gtk_spin_button_new_with_range(0, 500, 1); + gtk_widget_show(execp_padding_x); + gtk_table_attach(GTK_TABLE(table), execp_padding_x, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + gtk_tooltips_set_tip(tooltips, execp_padding_x, _("Specifies the horizontal padding of the executor. " + "This is the space between the border and the content inside."), NULL); + + row++, col = 2; + 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, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_padding_y = gtk_spin_button_new_with_range(0, 500, 1); + gtk_widget_show(execp_padding_y); + gtk_table_attach(GTK_TABLE(table), execp_padding_y, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + gtk_tooltips_set_tip(tooltips, execp_padding_y, _("Specifies the vertical padding of the executor. " + "This is the space between the border and the content inside."), NULL); + + row++, col = 2; + 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, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_font = gtk_font_button_new(); + gtk_widget_show(execp_font); + gtk_table_attach(GTK_TABLE(table), execp_font, col, col+3, row, row+1, GTK_FILL, 0, 0, 0); + col++; + gtk_font_button_set_show_style(GTK_FONT_BUTTON(execp_font), TRUE); + + row++, col = 2; + 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, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_font_color = gtk_color_button_new(); + gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(execp_font_color), TRUE); + gtk_widget_show(execp_font_color); + gtk_table_attach(GTK_TABLE(table), execp_font_color, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + row++, col = 2; + label = gtk_label_new(_("Centered")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_widget_show(label); + gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_centered = gtk_check_button_new(); + gtk_widget_show(execp_centered); + gtk_table_attach(GTK_TABLE(table), execp_centered, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + row++, col = 2; + label = gtk_label_new(_("Icon width")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_widget_show(label); + gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_icon_w = gtk_spin_button_new_with_range(0, 1000000, 1); + gtk_widget_show(execp_icon_w); + gtk_table_attach(GTK_TABLE(table), execp_icon_w, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + gtk_tooltips_set_tip(tooltips, execp_icon_w, _("If non-zero, the image is resized to this width."), NULL); + + row++, col = 2; + label = gtk_label_new(_("Icon height")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_widget_show(label); + gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_icon_h = gtk_spin_button_new_with_range(0, 1000000, 1); + gtk_widget_show(execp_icon_h); + gtk_table_attach(GTK_TABLE(table), execp_icon_h, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + gtk_tooltips_set_tip(tooltips, execp_icon_h, _("If non-zero, the image is resized to this height."), NULL); + + row++, col = 2; + 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, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_show_tooltip = gtk_check_button_new(); + gtk_widget_show(execp_show_tooltip); + gtk_table_attach(GTK_TABLE(table), execp_show_tooltip, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(execp_show_tooltip), 1); + col++; + + row++, col = 2; + label = gtk_label_new(_("Tooltip text")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_widget_show(label); + gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + + execp_tooltip = gtk_entry_new(); + gtk_widget_show(execp_tooltip); + gtk_entry_set_width_chars(GTK_ENTRY(execp_tooltip), 50); + gtk_table_attach(GTK_TABLE(table), execp_tooltip, col, col+1, row, row+1, GTK_FILL, 0, 0, 0); + col++; + gtk_tooltips_set_tip(tooltips, execp_tooltip, + _("The tooltip text to display. Leave this empty to display an automatically generated tooltip with information about when the command was last executed."), NULL); change_paragraph(parent); }
M src/tint2conf/properties.hsrc/tint2conf/properties.h

@@ -114,6 +114,14 @@ extern GtkWidget *tooltip_task_show, *tooltip_show_after, *tooltip_hide_after;

extern GtkWidget *clock_format_tooltip, *clock_tmz_tooltip; extern GtkWidget *tooltip_background; +// Executor +extern GtkWidget *execp_command, *execp_interval, *execp_has_icon, *execp_cache_icon, *execp_show_tooltip; +extern GtkWidget *execp_continuous, *execp_markup, *execp_tooltip; +extern GtkWidget *execp_left_command, *execp_right_command; +extern GtkWidget *execp_mclick_command, *execp_rclick_command, *execp_uwheel_command, *execp_dwheel_command; +extern GtkWidget *execp_font, *execp_font_color, *execp_padding_x, *execp_padding_y, *execp_centered, *execp_background; +extern GtkWidget *execp_icon_w, *execp_icon_h; + // launcher enum {
M src/tint2conf/properties_rw.csrc/tint2conf/properties_rw.c

@@ -641,6 +641,48 @@

fprintf(fp, "\n"); } +void config_write_execp(FILE *fp) +{ + fprintf(fp, "#-------------------------------------\n"); + fprintf(fp, "# Executor\n"); + + fprintf(fp, "execp_command = %s\n", gtk_entry_get_text(GTK_ENTRY(execp_command))); + fprintf(fp, "execp_interval = %d\n", (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(execp_interval))); + fprintf(fp, "execp_has_icon = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(execp_has_icon)) ? 1 : 0); + fprintf(fp, "execp_cache_icon = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(execp_cache_icon)) ? 1 : 0); + fprintf(fp, "execp_continuous = %d\n", (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(execp_continuous))); + fprintf(fp, "execp_markup = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(execp_markup)) ? 1 : 0); + if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(execp_show_tooltip))) { + fprintf(fp, "execp_tooltip = \n"); + } else { + fprintf(fp, "execp_tooltip = %s\n", gtk_entry_get_text(GTK_ENTRY(execp_tooltip))); + } + + fprintf(fp, "execp_lclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(execp_left_command))); + fprintf(fp, "execp_rclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(execp_right_command))); + fprintf(fp, "execp_mclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(execp_mclick_command))); + fprintf(fp, "execp_uwheel_command = %s\n", gtk_entry_get_text(GTK_ENTRY(execp_uwheel_command))); + fprintf(fp, "execp_dwheel_command = %s\n", gtk_entry_get_text(GTK_ENTRY(execp_dwheel_command))); + + fprintf(fp, "execp_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(execp_font))); + GdkColor color; + gtk_color_button_get_color(GTK_COLOR_BUTTON(execp_font_color), &color); + config_write_color(fp, + "execp_font_color", + color, + gtk_color_button_get_alpha(GTK_COLOR_BUTTON(execp_font_color)) * 100 / 0xffff); + fprintf(fp, + "execp_padding = %d %d\n", + (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(execp_padding_x)), + (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(execp_padding_y))); + fprintf(fp, "execp_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(execp_background))); + fprintf(fp, "execp_centered = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(execp_centered)) ? 1 : 0); + fprintf(fp, "execp_icon_w = %d\n", (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(execp_icon_w))); + fprintf(fp, "execp_icon_h = %d\n", (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(execp_icon_h))); + + fprintf(fp, "\n"); +} + void config_write_tooltip(FILE *fp) { fprintf(fp, "#-------------------------------------\n");

@@ -709,6 +751,7 @@ config_write_systray(fp);

config_write_launcher(fp); config_write_clock(fp); config_write_battery(fp); + config_write_execp(fp); config_write_tooltip(fp); checksum = checksum_txt(fp);

@@ -1569,6 +1612,76 @@ set_action(value, task_mouse_scroll_up);

} else if (strcmp(key, "mouse_scroll_down") == 0) { set_action(value, task_mouse_scroll_down); + } + + /* Executor */ + else if (strcmp(key, "execp_command") == 0) { + gtk_entry_set_text(GTK_ENTRY(execp_command), value); + } + else if (strcmp(key, "execp_interval") == 0) { + gtk_spin_button_set_value(GTK_SPIN_BUTTON(execp_interval), atoi(value)); + } + else if (strcmp(key, "execp_has_icon") == 0) { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(execp_has_icon), atoi(value)); + } + else if (strcmp(key, "execp_cache_icon") == 0) { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(execp_cache_icon), atoi(value)); + } + else if (strcmp(key, "execp_continuous") == 0) { + gtk_spin_button_set_value(GTK_SPIN_BUTTON(execp_continuous), atoi(value)); + } + else if (strcmp(key, "execp_markup") == 0) { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(execp_markup), atoi(value)); + } + else if (strcmp(key, "execp_tooltip") == 0) { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(execp_show_tooltip), 1); + gtk_entry_set_text(GTK_ENTRY(execp_tooltip), value); + } + else if (strcmp(key, "execp_lclick_command") == 0) { + gtk_entry_set_text(GTK_ENTRY(execp_left_command), value); + } + else if (strcmp(key, "execp_rclick_command") == 0) { + gtk_entry_set_text(GTK_ENTRY(execp_right_command), value); + } + else if (strcmp(key, "execp_mclick_command") == 0) { + gtk_entry_set_text(GTK_ENTRY(execp_mclick_command), value); + } + else if (strcmp(key, "execp_uwheel_command") == 0) { + gtk_entry_set_text(GTK_ENTRY(execp_uwheel_command), value); + } + else if (strcmp(key, "execp_dwheel_command") == 0) { + gtk_entry_set_text(GTK_ENTRY(execp_dwheel_command), value); + } + else if (strcmp(key, "execp_font") == 0) { + gtk_font_button_set_font_name(GTK_FONT_BUTTON(execp_font), value); + } + else if (strcmp(key, "execp_font_color") == 0) { + extract_values(value, &value1, &value2, &value3); + GdkColor col; + hex2gdk(value1, &col); + gtk_color_button_set_color(GTK_COLOR_BUTTON(execp_font_color), &col); + if (value2) { + int alpha = atoi(value2); + gtk_color_button_set_alpha(GTK_COLOR_BUTTON(execp_font_color), (alpha*65535)/100); + } + } + else if (strcmp(key, "execp_padding") == 0) { + extract_values(value, &value1, &value2, &value3); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(execp_padding_x), atoi(value1)); + if (value2) gtk_spin_button_set_value(GTK_SPIN_BUTTON(execp_padding_y), atoi(value2)); + } + else if (strcmp(key, "execp_background_id") == 0) { + int id = background_index_safe(atoi(value)); + gtk_combo_box_set_active(GTK_COMBO_BOX(execp_background), id); + } + else if (strcmp(key, "execp_icon_w") == 0) { + gtk_spin_button_set_value(GTK_SPIN_BUTTON(execp_icon_w), atoi(value)); + } + else if (strcmp(key, "execp_icon_h") == 0) { + gtk_spin_button_set_value(GTK_SPIN_BUTTON(execp_icon_h), atoi(value)); + } + else if (strcmp(key, "execp_centered") == 0) { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(execp_centered), atoi(value)); } if (value1) free(value1);