2005-09-14 [paul] 1.9.14cvs26

[claws.git] / src / prefs_toolbar.c

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index af0488186a3ef0bf376111b534d245bd1bde2d39..e8028ff0a0cf9e45b21070f944e64046f642af30 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -28,13 +28,13 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkoptionmenu.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "intl.h"
 #include "stock_pixmap.h"
 #include "manage_window.h"
 #include "gtkutils.h"
@@ -574,13 +574,13 @@ static void prefs_toolbar_up(GtkButton *button, ToolbarPage *prefs_toolbar)
 {
        GtkTreePath *prev, *sel;
        GtkTreeIter isel;
-       GtkListStore *store;
+       GtkListStore *store = NULL;
        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(prefs_toolbar->list_view_set)),
-                (GtkTreeModel **) &store,      
+                (GtkTreeModel **)(GtkListStore *) store,       
                 &isel))
                return;
 
@@ -606,13 +606,13 @@ static void prefs_toolbar_up(GtkButton *button, ToolbarPage *prefs_toolbar)
 
 static void prefs_toolbar_down(GtkButton *button, ToolbarPage *prefs_toolbar)
 {
-       GtkListStore *store;
+       GtkListStore *store = 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,
+                (GtkTreeModel **)(GtkListStore *) store,
                 &sel))
                return;
 
@@ -712,7 +712,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
        gtk_widget_show(list_view_icons);
        gtk_container_add(GTK_CONTAINER(scrolledwindow_list_view_icons), list_view_icons);
        gtk_container_set_border_width(GTK_CONTAINER(list_view_icons), 1);
-       gtk_widget_set_usize(list_view_icons, 225, 108); 
+       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);
@@ -774,7 +774,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
 
        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);
+       gtk_widget_set_size_request(arrow, -1, 16);
 
        btn_hbox = gtk_hbox_new(TRUE, 4);
        gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
@@ -820,7 +820,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
        list_view_set = create_set_list_view(prefs_toolbar); 
        gtk_widget_show(list_view_set);
        gtk_container_add(GTK_CONTAINER(scrolledwindow_list_view_set), list_view_set);
-       gtk_widget_set_usize(list_view_set, 225, 120);
+       gtk_widget_set_size_request(list_view_set, 225, 120);
 
        btn_vbox = gtk_vbox_new(FALSE, 8);
        gtk_widget_show(btn_vbox);
@@ -879,6 +879,7 @@ void prefs_toolbar_init(void)
        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;
 
@@ -892,6 +893,7 @@ void prefs_toolbar_init(void)
        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;
 
@@ -905,6 +907,7 @@ void prefs_toolbar_init(void)
        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;
 }
@@ -997,7 +1000,7 @@ static GtkWidget *create_icon_list_view(ToolbarPage *prefs_toolbar)
        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);
@@ -1080,7 +1083,7 @@ static GtkWidget *create_set_list_view(ToolbarPage *prefs_toolbar)
        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);
@@ -1099,7 +1102,6 @@ static gboolean icon_list_selected(GtkTreeSelection *selector,
                                   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))
@@ -1135,8 +1137,7 @@ static gboolean set_list_selected(GtkTreeSelection *selector,
 {
        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;
+       gchar *syl_act = toolbar_ret_descr_from_val(A_SYL_ACTIONS);
        gchar *file, *icon_text, *descr;
        GList *cur;
        gint item_num;