X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fprefs_toolbar.c;h=48480987e44badac8d25b35fd630cbe1022e4956;hp=fa7b74729713fb770d63551cd494d9ffdbda8fd7;hb=356fa40ffbeb11e617e0d9812793a696adf78e97;hpb=996454e722cd54f09ec86d4a5d5b40bd6dd6c722 diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c index fa7b74729..48480987e 100644 --- a/src/prefs_toolbar.c +++ b/src/prefs_toolbar.c @@ -115,22 +115,22 @@ static gint prefs_toolbar_key_pressed (GtkWidget *widget, void prefs_toolbar(void) { toolbar_read_config_file(); - prefs_toolbar_open (); + prefs_toolbar_open(); } static void prefs_toolbar_open(void) { if (!mtoolbar.window) - prefs_toolbar_create (); + prefs_toolbar_create(); - manage_window_set_transient (GTK_WINDOW (mtoolbar.window)); - prefs_toolbar_populate (); + manage_window_set_transient(GTK_WINDOW(mtoolbar.window)); + prefs_toolbar_populate(); gtk_widget_show(mtoolbar.window); } void prefs_toolbar_close(void) { - gtk_widget_hide (mtoolbar.window); + gtk_widget_hide(mtoolbar.window); } static void prefs_toolbar_populate(void) @@ -147,84 +147,84 @@ static void prefs_toolbar_populate(void) gchar *activ[5] = {0}; gchar *act; - gtk_clist_clear (clist_icons); - gtk_clist_clear (clist_set); + gtk_clist_clear(clist_icons); + gtk_clist_clear(clist_set); - gtk_clist_freeze (clist_icons); - gtk_clist_freeze (clist_set); + gtk_clist_freeze(clist_icons); + gtk_clist_freeze(clist_set); /* set available icons */ - avail[0] = g_strdup (SEPARATOR_PIXMAP); - avail[1] = g_strdup (SEPARATOR); - gtk_clist_append (clist_icons, avail); - g_free (avail[0]); - g_free (avail[1]); - - combo_action_items = toolbar_get_action_items (); - gtk_combo_set_popdown_strings (GTK_COMBO (mtoolbar.combo_action), combo_action_items); - gtk_combo_set_value_in_list (GTK_COMBO (mtoolbar.combo_action), 0, FALSE); - gtk_entry_set_text (GTK_ENTRY (mtoolbar.combo_entry), combo_action_items->data); - g_list_free (combo_action_items); + avail[0] = g_strdup(SEPARATOR_PIXMAP); + avail[1] = g_strdup(SEPARATOR); + gtk_clist_append(clist_icons, avail); + g_free(avail[0]); + g_free(avail[1]); + + combo_action_items = toolbar_get_action_items(); + gtk_combo_set_popdown_strings(GTK_COMBO(mtoolbar.combo_action), combo_action_items); + gtk_combo_set_value_in_list(GTK_COMBO(mtoolbar.combo_action), 0, FALSE); + gtk_entry_set_text(GTK_ENTRY(mtoolbar.combo_entry), combo_action_items->data); + g_list_free(combo_action_items); /* get currently defined sylpheed actions */ if (prefs_common.actions_list != NULL) { for (cur = prefs_common.actions_list; cur != NULL; cur = cur->next) { act = (gchar *)cur->data; - syl_actions = g_list_append (syl_actions, act); + syl_actions = g_list_append(syl_actions, act); } - gtk_combo_set_popdown_strings (GTK_COMBO (mtoolbar.combo_syl_action), syl_actions); - gtk_combo_set_value_in_list (GTK_COMBO (mtoolbar.combo_syl_action), 0, FALSE); - gtk_entry_set_text (GTK_ENTRY (mtoolbar.combo_syl_entry), syl_actions->data); + gtk_combo_set_popdown_strings(GTK_COMBO(mtoolbar.combo_syl_action), syl_actions); + gtk_combo_set_value_in_list(GTK_COMBO(mtoolbar.combo_syl_action), 0, FALSE); + gtk_entry_set_text(GTK_ENTRY(mtoolbar.combo_syl_entry), syl_actions->data); prefs_toolbar_selection_changed(GTK_LIST(mtoolbar.combo_syl_list), NULL); - g_list_free (syl_actions); + g_list_free(syl_actions); } for (i = 0; i < N_STOCK_PIXMAPS; i++) { - avail[0] = g_strdup (""); - avail[1] = g_strdup (stock_pixmap_get_name ((StockPixmap)i)); + avail[0] = g_strdup(""); + avail[1] = g_strdup(stock_pixmap_get_name((StockPixmap)i)); - stock_pixmap_gdk (mtoolbar.clist_icons, i, + stock_pixmap_gdk(mtoolbar.clist_icons, i, &xpm, &xpmmask); - gtk_clist_append (clist_icons, avail); - gtk_clist_set_pixmap (clist_icons, + gtk_clist_append(clist_icons, avail); + gtk_clist_set_pixmap(clist_icons, i + 1, 0, xpm, xpmmask); - g_free (avail[0]); - g_free (avail[1]); + g_free(avail[0]); + g_free(avail[1]); } /* set currently active toolbar entries */ for (cur = toolbar_list; cur != NULL; cur = cur->next) { ToolbarItem *item = (ToolbarItem*) cur->data; - if (g_strcasecmp (item->file, SEPARATOR) != 0) { + if (g_strcasecmp(item->file, SEPARATOR) != 0) { gint row_num; - StockPixmap icon = stock_pixmap_get_icon (item->file); + StockPixmap icon = stock_pixmap_get_icon(item->file); - stock_pixmap_gdk (mtoolbar.clist_set, icon, + stock_pixmap_gdk(mtoolbar.clist_set, icon, &xpm, &xpmmask); - activ[0] = g_strdup (""); - activ[1] = g_strdup (item->file); - activ[2] = g_strdup (item->text); - activ[3] = g_strdup (toolbar_ret_descr_from_val (item->action)); - row_num = gtk_clist_append (clist_set, activ); - gtk_clist_set_pixmap (clist_set, + activ[0] = g_strdup(""); + activ[1] = g_strdup(item->file); + activ[2] = g_strdup(item->text); + activ[3] = g_strdup(toolbar_ret_descr_from_val(item->action)); + row_num = gtk_clist_append(clist_set, activ); + gtk_clist_set_pixmap(clist_set, row_num, 0, xpm, xpmmask); } else { - activ[0] = g_strdup (SEPARATOR_PIXMAP); - activ[1] = g_strdup (item->file); - activ[2] = g_strdup (""); - activ[3] = g_strdup (""); - gtk_clist_append (clist_set, activ); + activ[0] = g_strdup(SEPARATOR_PIXMAP); + activ[1] = g_strdup(item->file); + activ[2] = g_strdup(""); + activ[3] = g_strdup(""); + gtk_clist_append(clist_set, activ); } - g_free (activ[0]); - g_free (activ[1]); - g_free (activ[2]); - g_free (activ[3]); + g_free(activ[0]); + g_free(activ[1]); + g_free(activ[2]); + g_free(activ[3]); } gtk_clist_thaw(clist_icons); @@ -247,9 +247,9 @@ static gboolean is_duplicate(gchar *chosen_action) GtkCList *clist = GTK_CLIST(mtoolbar.clist_set); gchar *entry; gint row = 0; - gchar *syl_act = toolbar_ret_descr_from_val (A_SYL_ACTIONS); + gchar *syl_act = toolbar_ret_descr_from_val(A_SYL_ACTIONS); - g_return_val_if_fail (chosen_action != NULL, TRUE); + g_return_val_if_fail(chosen_action != NULL, TRUE); if (clist->rows == 0) return FALSE; @@ -258,8 +258,8 @@ static gboolean is_duplicate(gchar *chosen_action) return FALSE; do { - gtk_clist_get_text (clist, row, 3, &entry); - if ( g_strcasecmp (chosen_action, entry) == 0) + gtk_clist_get_text(clist, row, 3, &entry); + if ( g_strcasecmp(chosen_action, entry) == 0) return TRUE; row++; } while ((gtk_clist_get_text(clist, row, 3, &entry)) && (row <= clist->rows)); @@ -280,28 +280,26 @@ static void prefs_toolbar_save(void) } else { do { - ToolbarItem *toolbar_item = g_new0 (ToolbarItem, 1); + ToolbarItem *toolbar_item = g_new0(ToolbarItem, 1); - gtk_clist_get_text (clist, row, 1, &entry); - toolbar_item->file = g_strdup (entry); + gtk_clist_get_text(clist, row, 1, &entry); + toolbar_item->file = g_strdup(entry); - gtk_clist_get_text (clist, row, 2, &entry); - toolbar_item->text = g_strdup (entry); + gtk_clist_get_text(clist, row, 2, &entry); + toolbar_item->text = g_strdup(entry); - gtk_clist_get_text (clist, row, 3, &entry); - toolbar_item->action = toolbar_ret_val_from_descr (entry); + gtk_clist_get_text(clist, row, 3, &entry); + toolbar_item->action = toolbar_ret_val_from_descr(entry); /* TODO: save A_SYL_ACTIONS only if they are still active */ - toolbar_list = g_slist_append (toolbar_list, toolbar_item); + toolbar_list = g_slist_append(toolbar_list, toolbar_item); row++; - } while (gtk_clist_get_text (clist, row, 3, &entry)); + } while(gtk_clist_get_text(clist, row, 3, &entry)); } - - toolbar_save_config_file (); - toolbar_clear_list (); - + toolbar_save_config_file(); + toolbar_update(); main_window_reflect_prefs_all_real(TRUE); } @@ -313,6 +311,8 @@ static void prefs_toolbar_ok(void) static void prefs_toolbar_cancel(void) { + toolbar_update(); + main_window_reflect_prefs_all_real(TRUE); prefs_toolbar_close(); } @@ -322,7 +322,7 @@ static void get_action_name(gchar *entry, gchar **menu) if (prefs_common.actions_list != NULL) { - act = g_strdup (entry); + act = g_strdup(entry); act_p = strstr(act, ": "); if (act_p != NULL) act_p[0] = 0x00; @@ -348,47 +348,47 @@ static gint prefs_toolbar_register(void) if (clist_icons->selection->data) row_icons = GPOINTER_TO_INT(clist_icons->selection->data); - gtk_clist_get_text (clist_icons, row_icons, 1, &item[1]); - item[3] = g_strdup (gtk_entry_get_text (GTK_ENTRY (mtoolbar.combo_entry))); + gtk_clist_get_text(clist_icons, row_icons, 1, &item[1]); + item[3] = g_strdup(gtk_entry_get_text(GTK_ENTRY(mtoolbar.combo_entry))); /* SEPARATOR or other ? */ - if (g_strcasecmp (item[1], SEPARATOR) == 0) { - item[0] = g_strdup (SEPARATOR_PIXMAP); - item[2] = g_strdup (""); - item[3] = g_strdup (""); + if (g_strcasecmp(item[1], SEPARATOR) == 0) { + item[0] = g_strdup(SEPARATOR_PIXMAP); + item[2] = g_strdup(""); + item[3] = g_strdup(""); - row_set = gtk_clist_append (GTK_CLIST (mtoolbar.clist_set), item); + row_set = gtk_clist_append(GTK_CLIST(mtoolbar.clist_set), item); - g_free (item[0]); + g_free(item[0]); } else { - if (is_duplicate (item[3])) { + if (is_duplicate(item[3])) { alertpanel_error(ERROR_MSG); - g_free (item[3]); + g_free(item[3]); return -1; } - stock_pixmap_gdk (mtoolbar.clist_set, stock_pixmap_get_icon (item[1]), + stock_pixmap_gdk(mtoolbar.clist_set, stock_pixmap_get_icon(item[1]), &xpm, &xpmmask); - if (g_strcasecmp (item[3], syl_act) == 0) { + if (g_strcasecmp(item[3], syl_act) == 0) { gchar *entry = gtk_entry_get_text(GTK_ENTRY(mtoolbar.combo_syl_entry)); get_action_name(entry, &item[2]); } else { - item[2] = g_strdup (gtk_entry_get_text (GTK_ENTRY (mtoolbar.entry_icon_text))); + item[2] = g_strdup(gtk_entry_get_text(GTK_ENTRY(mtoolbar.entry_icon_text))); } - row_set = gtk_clist_append (GTK_CLIST (mtoolbar.clist_set), item); - gtk_clist_set_pixmap (clist_set, row_set, 0, xpm, xpmmask); + row_set = gtk_clist_append(GTK_CLIST(mtoolbar.clist_set), item); + gtk_clist_set_pixmap(clist_set, row_set, 0, xpm, xpmmask); } gtk_clist_moveto(clist_set, row_set, 0, row_set/clist_set->rows, 0); - gtk_clist_select_row (clist_set, row_set, 0); + gtk_clist_select_row(clist_set, row_set, 0); - g_free (item[2]); - g_free (item[3]); + g_free(item[2]); + g_free(item[3]); return 0; } @@ -416,55 +416,55 @@ static gint prefs_toolbar_substitute(void) if (clist_set->selection->data) row_set = GPOINTER_TO_INT(clist_set->selection->data); - gtk_clist_get_text (clist_icons, row_icons, 1, &item[1]); - gtk_clist_get_text (clist_set, row_set, 3, &ac_set); - item[3] = g_strdup (gtk_entry_get_text (GTK_ENTRY (mtoolbar.combo_entry))); + gtk_clist_get_text(clist_icons, row_icons, 1, &item[1]); + gtk_clist_get_text(clist_set, row_set, 3, &ac_set); + item[3] = g_strdup(gtk_entry_get_text(GTK_ENTRY(mtoolbar.combo_entry))); - if (g_strcasecmp (item[1], SEPARATOR) == 0) { - item[0] = g_strdup (SEPARATOR_PIXMAP); - item[2] = g_strdup (""); - item[3] = g_strdup (""); + if (g_strcasecmp(item[1], SEPARATOR) == 0) { + item[0] = g_strdup(SEPARATOR_PIXMAP); + item[2] = g_strdup(""); + item[3] = g_strdup(""); - gtk_clist_remove (clist_set, row_set); - row_set = gtk_clist_insert (clist_set, row_set, item); + gtk_clist_remove(clist_set, row_set); + row_set = gtk_clist_insert(clist_set, row_set, item); - g_free (item[0]); + g_free(item[0]); } else { if ((is_duplicate(item[3])) && (g_strcasecmp(item[3], ac_set) != 0)){ alertpanel_error(ERROR_MSG); - g_free (item[3]); + g_free(item[3]); return -1; } - stock_pixmap_gdk (mtoolbar.clist_set, stock_pixmap_get_icon (item[1]), + stock_pixmap_gdk(mtoolbar.clist_set, stock_pixmap_get_icon(item[1]), &xpm, &xpmmask); - if (g_strcasecmp (item[3], syl_act) == 0) { + if (g_strcasecmp(item[3], syl_act) == 0) { gchar *entry = gtk_entry_get_text(GTK_ENTRY(mtoolbar.combo_syl_entry)); get_action_name(entry, &item[2]); } else { - item[2] = g_strdup (gtk_entry_get_text (GTK_ENTRY (mtoolbar.entry_icon_text))); + item[2] = g_strdup(gtk_entry_get_text(GTK_ENTRY(mtoolbar.entry_icon_text))); } - gtk_clist_remove (clist_set, row_set); - row_set = gtk_clist_insert (clist_set, row_set, item); - gtk_clist_set_pixmap (clist_set, row_set, 0, xpm, xpmmask); + gtk_clist_remove(clist_set, row_set); + row_set = gtk_clist_insert(clist_set, row_set, item); + gtk_clist_set_pixmap(clist_set, row_set, 0, xpm, xpmmask); } gtk_clist_moveto(clist_set, row_set, 0, row_set/clist_set->rows, 0); - gtk_clist_select_row (clist_set, row_set, 0); + gtk_clist_select_row(clist_set, row_set, 0); - g_free (item[2]); - g_free (item[3]); + g_free(item[2]); + g_free(item[3]); return 0; } static gint prefs_toolbar_delete(void) { - GtkCList *clist_set = GTK_CLIST(mtoolbar.clist_set); + GtkCList *clist_set = GTK_CLIST(mtoolbar.clist_set); gint row_set = 0; if (clist_set->rows == 0) return -1; @@ -475,11 +475,11 @@ static gint prefs_toolbar_delete(void) if (clist_set->row_list != NULL) { row_set = GPOINTER_TO_INT(clist_set->selection->data); - gtk_clist_remove (clist_set, row_set); - gtk_clist_columns_autosize (clist_set); + gtk_clist_remove(clist_set, row_set); + gtk_clist_columns_autosize(clist_set); if (clist_set->rows > 0) - gtk_clist_select_row (clist_set, (row_set == 0) ? 0:row_set - 1, 0); + gtk_clist_select_row(clist_set,(row_set == 0) ? 0:row_set - 1, 0); } return 0; @@ -522,7 +522,7 @@ static void prefs_toolbar_down(void) static void prefs_toolbar_select_row_set(GtkCList *clist, gint row, gint column, GdkEvent *event, gpointer user_data) { - GtkCList *clist_ico = GTK_CLIST (mtoolbar.clist_icons); + GtkCList *clist_ico = GTK_CLIST(mtoolbar.clist_icons); gchar *syl_act = toolbar_ret_descr_from_val(A_SYL_ACTIONS); gint row_set = 0; gint row_ico = 0; @@ -531,21 +531,21 @@ static void prefs_toolbar_select_row_set(GtkCList *clist, gint row, gint column, if (clist->selection->data) row_set = GPOINTER_TO_INT(clist->selection->data); - gtk_clist_get_text (clist, row_set, 1, &file); - gtk_clist_get_text (clist, row_set, 2, &icon_text); - gtk_clist_get_text (clist, row_set, 3, &descr); + gtk_clist_get_text(clist, row_set, 1, &file); + gtk_clist_get_text(clist, row_set, 2, &icon_text); + gtk_clist_get_text(clist, row_set, 3, &descr); - if (g_strcasecmp (descr, syl_act) != 0) - gtk_entry_set_text (GTK_ENTRY (mtoolbar.entry_icon_text), icon_text); + if (g_strcasecmp(descr, syl_act) != 0) + gtk_entry_set_text(GTK_ENTRY(mtoolbar.entry_icon_text), icon_text); - gtk_list_select_item (GTK_LIST (mtoolbar.combo_list), - toolbar_ret_val_from_descr (descr)); + gtk_list_select_item(GTK_LIST(mtoolbar.combo_list), + toolbar_ret_val_from_descr(descr)); do { - gtk_clist_get_text (clist_ico, row_ico, 1, &entry); + gtk_clist_get_text(clist_ico, row_ico, 1, &entry); row_ico++; - } while (g_strcasecmp (entry, file) != 0); + } while(g_strcasecmp(entry, file) != 0); - gtk_clist_select_row (clist_ico, row_ico - 1, 0); + gtk_clist_select_row(clist_ico, row_ico - 1, 0); gtk_clist_moveto(clist_ico, row_ico - 1, 0, row_ico/clist_ico->rows, 0); } @@ -555,19 +555,19 @@ static void prefs_toolbar_select_row_icons(GtkCList *clist, gint row, gint colum GtkCList *clist_icons = GTK_CLIST(mtoolbar.clist_icons); gchar *text; - gtk_clist_get_text (clist_icons, row, 1, &text); + gtk_clist_get_text(clist_icons, row, 1, &text); if (!text) return; - if (g_strcasecmp (SEPARATOR, text) == 0) { - gtk_widget_set_sensitive (mtoolbar.combo_action, FALSE); - gtk_widget_set_sensitive (mtoolbar.entry_icon_text, FALSE); - gtk_widget_set_sensitive (mtoolbar.combo_syl_action, FALSE); + if (g_strcasecmp(SEPARATOR, text) == 0) { + gtk_widget_set_sensitive(mtoolbar.combo_action, FALSE); + gtk_widget_set_sensitive(mtoolbar.entry_icon_text, FALSE); + gtk_widget_set_sensitive(mtoolbar.combo_syl_action, FALSE); } else { - gtk_widget_set_sensitive (mtoolbar.combo_action, TRUE); - gtk_widget_set_sensitive (mtoolbar.entry_icon_text, TRUE); - gtk_widget_set_sensitive (mtoolbar.combo_syl_action, TRUE); + gtk_widget_set_sensitive(mtoolbar.combo_action, TRUE); + gtk_widget_set_sensitive(mtoolbar.entry_icon_text, TRUE); + gtk_widget_set_sensitive(mtoolbar.combo_syl_action, TRUE); } } @@ -575,24 +575,24 @@ static void prefs_toolbar_selection_changed(GtkList *list, gpointer user_data) { - gchar *cur_entry = g_strdup (gtk_entry_get_text (GTK_ENTRY (mtoolbar.combo_entry))); - gchar *actions_entry = toolbar_ret_descr_from_val (A_SYL_ACTIONS); + gchar *cur_entry = g_strdup(gtk_entry_get_text(GTK_ENTRY(mtoolbar.combo_entry))); + gchar *actions_entry = toolbar_ret_descr_from_val(A_SYL_ACTIONS); - gtk_widget_set_sensitive (mtoolbar.combo_syl_action, TRUE); + gtk_widget_set_sensitive(mtoolbar.combo_syl_action, TRUE); - if (g_strcasecmp (cur_entry, actions_entry) == 0) { - gtk_widget_hide (mtoolbar.entry_icon_text); - gtk_widget_show (mtoolbar.combo_syl_action); - gtk_label_set_text (GTK_LABEL(mtoolbar.label_icon_text), _("Sylpheed Action")); + if (g_strcasecmp(cur_entry, actions_entry) == 0) { + gtk_widget_hide(mtoolbar.entry_icon_text); + gtk_widget_show(mtoolbar.combo_syl_action); + gtk_label_set_text(GTK_LABEL(mtoolbar.label_icon_text), _("Sylpheed Action")); if (prefs_common.actions_list == NULL) { - gtk_widget_set_sensitive (mtoolbar.combo_syl_action, FALSE); + gtk_widget_set_sensitive(mtoolbar.combo_syl_action, FALSE); } } else { - gtk_widget_hide (mtoolbar.combo_syl_action); - gtk_widget_show (mtoolbar.entry_icon_text); - gtk_label_set_text (GTK_LABEL(mtoolbar.label_icon_text), _("Toolbar text")); + gtk_widget_hide(mtoolbar.combo_syl_action); + gtk_widget_show(mtoolbar.entry_icon_text); + gtk_label_set_text(GTK_LABEL(mtoolbar.label_icon_text), _("Toolbar text")); } } @@ -637,10 +637,6 @@ static void prefs_toolbar_create(void) GtkWidget *hbox_bottom; GtkWidget *scrolledwindow_clist_set; GtkWidget *clist_set; - GtkWidget *label_icon; - GtkWidget *label_file; - GtkWidget *label_text; - GtkWidget *label_action; GtkWidget *btn_vbox; GtkWidget *up_btn; @@ -652,128 +648,128 @@ static void prefs_toolbar_create(void) gchar *titles[N_DISPLAYED_ITEMS_COLS]; - debug_print(_("Creating custom toolbar window...\n")); + debug_print("Creating custom toolbar window...\n"); - window = gtk_window_new (GTK_WINDOW_DIALOG); - gtk_widget_set_usize (window, 450, -1); - gtk_container_set_border_width(GTK_CONTAINER (window), 8); + window = gtk_window_new(GTK_WINDOW_DIALOG); + gtk_widget_set_usize(window, 450, -1); + gtk_container_set_border_width(GTK_CONTAINER(window), 8); gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER); - gtk_window_set_title (GTK_WINDOW (window), _("Customize toolbar")); + gtk_window_set_title(GTK_WINDOW(window), _("Customize toolbar")); gtk_window_set_modal(GTK_WINDOW(window), TRUE); gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE); - gtk_signal_connect(GTK_OBJECT (window), "delete_event", - GTK_SIGNAL_FUNC (prefs_toolbar_cancel), + gtk_signal_connect(GTK_OBJECT(window), "delete_event", + GTK_SIGNAL_FUNC(prefs_toolbar_cancel), NULL); gtk_signal_connect(GTK_OBJECT(window), "key_press_event", GTK_SIGNAL_FUNC(prefs_toolbar_key_pressed), NULL); MANAGE_WINDOW_SIGNALS_CONNECT(window); - gtk_widget_realize (window); + gtk_widget_realize(window); - main_vbox = gtk_vbox_new (FALSE, 0); - gtk_widget_show (main_vbox); - gtk_container_add (GTK_CONTAINER (window), main_vbox); + main_vbox = gtk_vbox_new(FALSE, 0); + gtk_widget_show(main_vbox); + gtk_container_add(GTK_CONTAINER(window), main_vbox); - top_hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (main_vbox), top_hbox, TRUE, TRUE, 0); + top_hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(main_vbox), top_hbox, TRUE, TRUE, 0); - compose_frame = gtk_frame_new (_("Available toolbar items")); - gtk_box_pack_start (GTK_BOX (top_hbox), compose_frame, TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (compose_frame), 5); + compose_frame = gtk_frame_new(_("Available toolbar items")); + gtk_box_pack_start(GTK_BOX(top_hbox), compose_frame, TRUE, TRUE, 0); + gtk_container_set_border_width(GTK_CONTAINER(compose_frame), 5); - vbox_frame = gtk_vbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER (compose_frame), vbox_frame); + vbox_frame = gtk_vbox_new(FALSE, 0); + gtk_container_add(GTK_CONTAINER(compose_frame), vbox_frame); /* available icons */ - scrolledwindow_clist_icon = gtk_scrolled_window_new (NULL, NULL); - gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow_clist_icon), 5); - gtk_container_add (GTK_CONTAINER (vbox_frame), scrolledwindow_clist_icon); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow_clist_icon), + scrolledwindow_clist_icon = gtk_scrolled_window_new(NULL, NULL); + gtk_container_set_border_width(GTK_CONTAINER(scrolledwindow_clist_icon), 5); + gtk_container_add(GTK_CONTAINER(vbox_frame), scrolledwindow_clist_icon); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow_clist_icon), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - clist_icons = gtk_clist_new (2); - gtk_container_add (GTK_CONTAINER (scrolledwindow_clist_icon), clist_icons); - gtk_container_set_border_width (GTK_CONTAINER (clist_icons), 1); - gtk_clist_set_column_width (GTK_CLIST (clist_icons), 0, 35); - gtk_clist_set_column_width (GTK_CLIST (clist_icons), 1, 200); - gtk_clist_column_titles_hide (GTK_CLIST (clist_icons)); - gtk_widget_set_usize (clist_icons, 225, 108); + clist_icons = gtk_clist_new(2); + gtk_container_add(GTK_CONTAINER(scrolledwindow_clist_icon), clist_icons); + gtk_container_set_border_width(GTK_CONTAINER(clist_icons), 1); + gtk_clist_set_column_width(GTK_CLIST(clist_icons), 0, 35); + gtk_clist_set_column_width(GTK_CLIST(clist_icons), 1, 200); + gtk_clist_column_titles_hide(GTK_CLIST(clist_icons)); + gtk_widget_set_usize(clist_icons, 225, 108); /* icon description */ - hbox_icon_text = gtk_hbox_new (FALSE, 5); - gtk_container_add (GTK_CONTAINER (vbox_frame), hbox_icon_text); + hbox_icon_text = gtk_hbox_new(FALSE, 5); + gtk_container_add(GTK_CONTAINER(vbox_frame), hbox_icon_text); - label_icon_text = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (hbox_icon_text), label_icon_text, FALSE, FALSE, 5); + label_icon_text = gtk_label_new(""); + gtk_box_pack_start(GTK_BOX(hbox_icon_text), label_icon_text, FALSE, FALSE, 5); - entry_icon_text = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (hbox_icon_text), entry_icon_text, FALSE, FALSE, 0); + entry_icon_text = gtk_entry_new(); + gtk_box_pack_start(GTK_BOX(hbox_icon_text), entry_icon_text, FALSE, FALSE, 0); /* Sylpheed Action Combo Box */ - combo_syl_action = gtk_combo_new (); - gtk_box_pack_start (GTK_BOX (hbox_icon_text), combo_syl_action, FALSE, FALSE, 0); + combo_syl_action = gtk_combo_new(); + gtk_box_pack_start(GTK_BOX(hbox_icon_text), combo_syl_action, FALSE, FALSE, 0); - combo_syl_list = GTK_COMBO (combo_syl_action)->list; - combo_syl_entry = GTK_COMBO (combo_syl_action)->entry; - gtk_entry_set_editable (GTK_ENTRY (combo_syl_entry), FALSE); + combo_syl_list = GTK_COMBO(combo_syl_action)->list; + combo_syl_entry = GTK_COMBO(combo_syl_action)->entry; + gtk_entry_set_editable(GTK_ENTRY(combo_syl_entry), FALSE); /* available actions */ - hbox_action = gtk_hbox_new (FALSE, 5); - gtk_container_add (GTK_CONTAINER (vbox_frame), hbox_action); - gtk_container_set_border_width (GTK_CONTAINER (hbox_action), 5); + hbox_action = gtk_hbox_new(FALSE, 5); + gtk_container_add(GTK_CONTAINER(vbox_frame), hbox_action); + gtk_container_set_border_width(GTK_CONTAINER(hbox_action), 5); - label_action_sel = gtk_label_new (_("Event executed on click")); - gtk_box_pack_start (GTK_BOX (hbox_action), label_action_sel, FALSE, FALSE, 0); + label_action_sel = gtk_label_new(_("Event executed on click")); + gtk_box_pack_start(GTK_BOX(hbox_action), label_action_sel, FALSE, FALSE, 0); - combo_action = gtk_combo_new (); - gtk_box_pack_start (GTK_BOX (hbox_action), combo_action, FALSE, FALSE, 0); + combo_action = gtk_combo_new(); + gtk_box_pack_start(GTK_BOX(hbox_action), combo_action, FALSE, FALSE, 0); - combo_list = GTK_COMBO (combo_action)->list; - combo_entry = GTK_COMBO (combo_action)->entry; - gtk_entry_set_editable (GTK_ENTRY (combo_entry), FALSE); + combo_list = GTK_COMBO(combo_action)->list; + combo_entry = GTK_COMBO(combo_action)->entry; + gtk_entry_set_editable(GTK_ENTRY(combo_entry), FALSE); /* register / substitute / delete */ - reg_hbox = gtk_hbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (main_vbox), reg_hbox, FALSE, FALSE, 0); - gtk_container_set_border_width (GTK_CONTAINER (reg_hbox), 10); + reg_hbox = gtk_hbox_new(FALSE, 4); + gtk_box_pack_start(GTK_BOX(main_vbox), reg_hbox, FALSE, FALSE, 0); + gtk_container_set_border_width(GTK_CONTAINER(reg_hbox), 10); - arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT); - gtk_box_pack_start (GTK_BOX (reg_hbox), arrow, FALSE, FALSE, 0); - gtk_widget_set_usize (arrow, -1, 16); + arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT); + gtk_box_pack_start(GTK_BOX(reg_hbox), arrow, FALSE, FALSE, 0); + gtk_widget_set_usize(arrow, -1, 16); - btn_hbox = gtk_hbox_new (TRUE, 4); - gtk_box_pack_start (GTK_BOX (reg_hbox), btn_hbox, FALSE, FALSE, 0); + btn_hbox = gtk_hbox_new(TRUE, 4); + gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0); - reg_btn = gtk_button_new_with_label (_("Register")); - gtk_box_pack_start (GTK_BOX (btn_hbox), reg_btn, FALSE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (reg_btn), "clicked", - GTK_SIGNAL_FUNC (prefs_toolbar_register), + reg_btn = gtk_button_new_with_label(_("Register")); + gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0); + gtk_signal_connect(GTK_OBJECT(reg_btn), "clicked", + GTK_SIGNAL_FUNC(prefs_toolbar_register), NULL); - subst_btn = gtk_button_new_with_label (_(" Substitute ")); - gtk_box_pack_start (GTK_BOX (btn_hbox), subst_btn, FALSE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (subst_btn), "clicked", - GTK_SIGNAL_FUNC (prefs_toolbar_substitute), + subst_btn = gtk_button_new_with_label(_(" Substitute ")); + gtk_box_pack_start(GTK_BOX(btn_hbox), subst_btn, FALSE, TRUE, 0); + gtk_signal_connect(GTK_OBJECT(subst_btn), "clicked", + GTK_SIGNAL_FUNC(prefs_toolbar_substitute), NULL); - del_btn = gtk_button_new_with_label (_("Delete")); - gtk_box_pack_start (GTK_BOX (btn_hbox), del_btn, FALSE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (del_btn), "clicked", - GTK_SIGNAL_FUNC (prefs_toolbar_delete), + del_btn = gtk_button_new_with_label(_("Delete")); + gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0); + gtk_signal_connect(GTK_OBJECT(del_btn), "clicked", + GTK_SIGNAL_FUNC(prefs_toolbar_delete), NULL); /* currently active toolbar items */ - frame_toolbar_items = gtk_frame_new (_("Displayed toolbar items")); - gtk_box_pack_start (GTK_BOX (main_vbox), frame_toolbar_items, TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (frame_toolbar_items), 5); + frame_toolbar_items = gtk_frame_new(_("Displayed toolbar items")); + gtk_box_pack_start(GTK_BOX(main_vbox), frame_toolbar_items, TRUE, TRUE, 0); + gtk_container_set_border_width(GTK_CONTAINER(frame_toolbar_items), 5); - hbox_bottom = gtk_hbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER (frame_toolbar_items), hbox_bottom); + hbox_bottom = gtk_hbox_new(FALSE, 0); + gtk_container_add(GTK_CONTAINER(frame_toolbar_items), hbox_bottom); - scrolledwindow_clist_set = gtk_scrolled_window_new (NULL, NULL); - gtk_box_pack_start (GTK_BOX (hbox_bottom), scrolledwindow_clist_set, TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow_clist_set), 1); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow_clist_icon), + scrolledwindow_clist_set = gtk_scrolled_window_new(NULL, NULL); + gtk_box_pack_start(GTK_BOX(hbox_bottom), scrolledwindow_clist_set, TRUE, TRUE, 0); + gtk_container_set_border_width(GTK_CONTAINER(scrolledwindow_clist_set), 1); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow_clist_icon), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); titles[COL_ICON] = _("Icon"); @@ -781,51 +777,51 @@ static void prefs_toolbar_create(void) titles[COL_TEXT] = _("Icon text"); titles[COL_EVENT] = _("Mapped event"); - clist_set = gtk_clist_new_with_titles (N_DISPLAYED_ITEMS_COLS, titles); - gtk_widget_show (clist_set); - gtk_container_add (GTK_CONTAINER (scrolledwindow_clist_set), clist_set); - gtk_clist_set_column_width (GTK_CLIST(clist_set), COL_ICON , 80); - gtk_clist_set_column_width (GTK_CLIST(clist_set), COL_FILENAME, 80); - gtk_clist_set_column_width (GTK_CLIST(clist_set), COL_TEXT , 80); - gtk_clist_set_column_width (GTK_CLIST(clist_set), COL_EVENT , 80); - gtk_clist_column_titles_show (GTK_CLIST (clist_set)); - gtk_widget_set_usize (clist_set, 225, 120); - - btn_vbox = gtk_vbox_new (FALSE, 8); - gtk_widget_show (btn_vbox); - gtk_box_pack_start (GTK_BOX (hbox_bottom), btn_vbox, FALSE, FALSE, 5); - - up_btn = gtk_button_new_with_label (_("Up")); - gtk_widget_show (up_btn); - gtk_box_pack_start (GTK_BOX (btn_vbox), up_btn, FALSE, FALSE, 2); - - down_btn = gtk_button_new_with_label (_("Down")); - gtk_widget_show (down_btn); - gtk_box_pack_start (GTK_BOX (btn_vbox), down_btn, FALSE, FALSE, 0); + clist_set = gtk_clist_new_with_titles(N_DISPLAYED_ITEMS_COLS, titles); + gtk_widget_show(clist_set); + gtk_container_add(GTK_CONTAINER(scrolledwindow_clist_set), clist_set); + gtk_clist_set_column_width(GTK_CLIST(clist_set), COL_ICON , 80); + gtk_clist_set_column_width(GTK_CLIST(clist_set), COL_FILENAME, 80); + gtk_clist_set_column_width(GTK_CLIST(clist_set), COL_TEXT , 80); + gtk_clist_set_column_width(GTK_CLIST(clist_set), COL_EVENT , 80); + gtk_clist_column_titles_show(GTK_CLIST(clist_set)); + gtk_widget_set_usize(clist_set, 225, 120); + + btn_vbox = gtk_vbox_new(FALSE, 8); + gtk_widget_show(btn_vbox); + gtk_box_pack_start(GTK_BOX(hbox_bottom), btn_vbox, FALSE, FALSE, 5); + + up_btn = gtk_button_new_with_label(_("Up")); + gtk_widget_show(up_btn); + gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, FALSE, 2); + + down_btn = gtk_button_new_with_label(_("Down")); + gtk_widget_show(down_btn); + gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, FALSE, 0); gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"), &cancel_btn, _("Cancel"), NULL, NULL); - gtk_box_pack_end (GTK_BOX(main_vbox), confirm_area, FALSE, FALSE, 0); - gtk_container_set_border_width (GTK_CONTAINER (confirm_area), 5); - gtk_widget_grab_default (ok_btn); + gtk_box_pack_end(GTK_BOX(main_vbox), confirm_area, FALSE, FALSE, 0); + gtk_container_set_border_width(GTK_CONTAINER(confirm_area), 5); + gtk_widget_grab_default(ok_btn); gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked", GTK_SIGNAL_FUNC(prefs_toolbar_ok), NULL); gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked", GTK_SIGNAL_FUNC(prefs_toolbar_cancel), NULL); - gtk_signal_connect(GTK_OBJECT (clist_set), "select_row", - GTK_SIGNAL_FUNC (prefs_toolbar_select_row_set), + gtk_signal_connect(GTK_OBJECT(clist_set), "select_row", + GTK_SIGNAL_FUNC(prefs_toolbar_select_row_set), NULL); - gtk_signal_connect(GTK_OBJECT (clist_icons), "select_row", - GTK_SIGNAL_FUNC (prefs_toolbar_select_row_icons), + gtk_signal_connect(GTK_OBJECT(clist_icons), "select_row", + GTK_SIGNAL_FUNC(prefs_toolbar_select_row_icons), NULL); gtk_signal_connect(GTK_OBJECT(combo_list), "selection-changed", GTK_SIGNAL_FUNC(prefs_toolbar_selection_changed), NULL); - gtk_signal_connect(GTK_OBJECT (up_btn), "clicked", - GTK_SIGNAL_FUNC (prefs_toolbar_up), NULL); - gtk_signal_connect(GTK_OBJECT (down_btn), "clicked", - GTK_SIGNAL_FUNC (prefs_toolbar_down), NULL); + gtk_signal_connect(GTK_OBJECT(up_btn), "clicked", + GTK_SIGNAL_FUNC(prefs_toolbar_up), NULL); + gtk_signal_connect(GTK_OBJECT(down_btn), "clicked", + GTK_SIGNAL_FUNC(prefs_toolbar_down), NULL); mtoolbar.window = window; mtoolbar.clist_icons = clist_icons; @@ -840,5 +836,5 @@ static void prefs_toolbar_create(void) mtoolbar.label_icon_text = label_icon_text; - gtk_widget_show_all (window); + gtk_widget_show_all(window); }