rename 'Pixmap' to 'Icon' throughout UI

diff --git a/ChangeLog.claws b/ChangeLog.claws
index ee369b55de334bc8186b159f3348974f0fefc302..eff8045a461936f67b9e84e2a7fbe0af4b0b874c 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,7 +1,11 @@
-2002-08-10 [paul]      0.8.1claws48
+2002-08-11 [paul]      0.8.1claws48
 
-       * src/prefs_toolbar.c
-               re-work the UI
+       * src/prefs_common.c
+         src/prefs_toolbar.c
+               rename 'Pixmap' -> 'Icon'
+
+       * src/toolbar.[ch]
+               rename  'A_SEND_QUEUD' -> 'A_SEND_QUEUED'
 
 2002-08-10 [paul]      0.8.1claws47
 

diff --git a/configure.in b/configure.in
index 3cef13416f41885c4faafcdd68f1ecaf72e19028..ccba1bb95e70d8497dbc96df1599c4b454a219c9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws48
+EXTRA_VERSION=claws49
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 83dff01bc19e74e7c2ef57b3e12fc092bb4b4f36..50132f7e4494acc2081a7ae13b2519b4b743a473 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -2700,7 +2700,7 @@ static void prefs_interface_create(void)
        gtk_signal_connect (GTK_OBJECT (button_keybind), "clicked",
                            GTK_SIGNAL_FUNC (prefs_keybind_select), NULL);
 
-       PACK_FRAME(vbox1, frame_pixmap_theme, _("Pixmap theme"));
+       PACK_FRAME(vbox1, frame_pixmap_theme, _("Icon theme"));
        
        vbox_pixmap_theme = gtk_vbox_new(FALSE, 0);
        gtk_widget_show(vbox_pixmap_theme);

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index aa4785214206f85d3b8dfeaac06ce6fd5405c249..d8510186dc968d702c1cf370297fdbdd85be4038 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001 Hiroyuki Yamamoto
+ * Copyright (C) 2002 Hiroyuki Yamamoto & the Sylpheed-Claws team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@
 
 typedef enum
 {
-       COL_PIXMAP      = 0,
+       COL_ICON        = 0,
        COL_FILENAME    = 1,
        COL_TEXT        = 2,
        COL_EVENT       = 3
@@ -592,7 +592,7 @@ static void prefs_toolbar_selection_changed(GtkList *list,
        } 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 (shown below Pixmap)"));
+               gtk_label_set_text (GTK_LABEL(mtoolbar.label_icon_text), _("Toolbar text"));
        }
 }
 
@@ -775,15 +775,15 @@ static void prefs_toolbar_create(void)
        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow_clist_icon), 
                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
-       titles[COL_PIXMAP]   = _("Pixmap");
+       titles[COL_ICON]     = _("Icon");
        titles[COL_FILENAME] = _("File name");
-       titles[COL_TEXT]     = _("Pixmap text");
+       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_PIXMAP  , 80);
+       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);