*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
/*
{
GtkTreePath *prev, *sel;
GtkTreeIter isel;
- GtkListStore *store;
+ GtkListStore *store = NULL;
+ GtkTreeModel *model = NULL;
GtkTreeIter iprev;
if (!gtk_tree_selection_get_selected
(gtk_tree_view_get_selection
(GTK_TREE_VIEW(prefs_toolbar->list_view_set)),
- (GtkTreeModel **) &store,
+ &model,
&isel))
return;
+ store = (GtkListStore *)model;
sel = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &isel);
if (!sel)
static void prefs_toolbar_down(GtkButton *button, ToolbarPage *prefs_toolbar)
{
- GtkListStore *store;
+ GtkListStore *store = NULL;
+ GtkTreeModel *model = NULL;
GtkTreeIter next, sel;
if (!gtk_tree_selection_get_selected
(gtk_tree_view_get_selection
(GTK_TREE_VIEW(prefs_toolbar->list_view_set)),
- (GtkTreeModel **) &store,
+ &model,
&sel))
return;
+ store = (GtkListStore *)model;
next = sel;
if (!gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &next))
return;
if (g_utf8_collate(cur_entry, actions_entry) == 0) {
gtk_widget_hide(prefs_toolbar->entry_icon_text);
gtk_widget_show(prefs_toolbar->combo_syl_action);
- gtk_label_set_text(GTK_LABEL(prefs_toolbar->label_icon_text), _("Sylpheed Action"));
+ gtk_label_set_text(GTK_LABEL(prefs_toolbar->label_icon_text), _("Sylpheed-Claws Action"));
if (prefs_common.actions_list == NULL) {
gtk_widget_set_sensitive(prefs_toolbar->combo_syl_action, FALSE);
GtkWidget *btn_vbox;
GtkWidget *up_btn;
GtkWidget *down_btn;
-
+
debug_print("Creating custom toolbar window...\n");
main_vbox = gtk_vbox_new(FALSE, 0);
vbox_frame = gtk_vbox_new(FALSE, 0);
gtk_container_add(GTK_CONTAINER(compose_frame), vbox_frame);
-
+
/* available icons */
scrolledwindow_list_view_icons = gtk_scrolled_window_new(NULL, NULL);
gtk_container_set_border_width(GTK_CONTAINER(scrolledwindow_list_view_icons), 5);
- gtk_container_add(GTK_CONTAINER(vbox_frame), scrolledwindow_list_view_icons);
+ gtk_box_pack_start(GTK_BOX(vbox_frame), scrolledwindow_list_view_icons,
+ TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow_list_view_icons),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-
+
list_view_icons = create_icon_list_view(prefs_toolbar);
gtk_widget_show(list_view_icons);
gtk_container_add(GTK_CONTAINER(scrolledwindow_list_view_icons), list_view_icons);
gtk_widget_set_size_request(list_view_icons, 225, 108);
table = gtk_table_new (2, 3, FALSE);
- gtk_container_add (GTK_CONTAINER (vbox_frame), table);
+ gtk_box_pack_start(GTK_BOX(vbox_frame), table,
+ FALSE, FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (table), 8);
gtk_table_set_row_spacings (GTK_TABLE (table), 8);
gtk_table_set_col_spacings (GTK_TABLE (table), 8);
G_CALLBACK(prefs_toolbar_substitute),
prefs_toolbar);
- del_btn = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
+ del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(del_btn), "clicked",
G_CALLBACK(prefs_toolbar_delete),
prefs_toolbar);
- default_btn = gtk_button_new_with_label(_(" Default "));
+ default_btn = gtk_button_new_with_label(_(" Use default "));
gtk_box_pack_end(GTK_BOX(reg_hbox), default_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(default_btn), "clicked",
G_CALLBACK(prefs_toolbar_default),
scrolledwindow_list_view_set = gtk_scrolled_window_new(NULL, NULL);
gtk_box_pack_start(GTK_BOX(hbox_bottom), scrolledwindow_list_view_set, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(scrolledwindow_list_view_set), 1);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow_list_view_icons),
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow_list_view_set),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
list_view_set = create_set_list_view(prefs_toolbar);
page->page.destroy_widget = prefs_toolbar_destroy_widget;
page->page.save_page = prefs_toolbar_save;
page->source = TOOLBAR_MAIN;
+ page->page.weight = 50.0;
prefs_gtk_register_page((PrefsPage *) page);
prefs_toolbar_mainwindow = page;
page->page.destroy_widget = prefs_toolbar_destroy_widget;
page->page.save_page = prefs_toolbar_save;
page->source = TOOLBAR_MSGVIEW;
+ page->page.weight = 45.0;
prefs_gtk_register_page((PrefsPage *) page);
prefs_toolbar_messageview = page;
page->page.destroy_widget = prefs_toolbar_destroy_widget;
page->page.save_page = prefs_toolbar_save;
page->source = TOOLBAR_COMPOSE;
+ page->page.weight = 40.0;
prefs_gtk_register_page((PrefsPage *) page);
prefs_toolbar_composewindow = page;
}
gtk_tree_view_append_column(list_view, column);
/* various other tree view attributes */
- gtk_tree_view_set_rules_hint(list_view, TRUE);
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
gtk_tree_view_set_headers_visible(list_view, FALSE);
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_view_append_column(list_view, column);
/* various other tree view attributes */
- gtk_tree_view_set_rules_hint(list_view, TRUE);
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
ToolbarPage *prefs_toolbar)
{
GtkTreeIter iter;
- GtkTreeView *list_ico = gtk_tree_selection_get_tree_view(selector);
gchar *text;
if (currently_selected ||!gtk_tree_model_get_iter(model, &iter, path))
{
GtkTreeIter iter;
GtkTreeView *list_ico = GTK_TREE_VIEW(prefs_toolbar->list_view_icons);
- GtkTreeView *list_set = GTK_TREE_VIEW(prefs_toolbar->list_view_set);
gchar *syl_act = toolbar_ret_descr_from_val(A_SYL_ACTIONS);
gchar *file, *icon_text, *descr;
GList *cur;
projects / claws.git / blobdiff