obey coding style; follow UI text conventions
authorPaul Mangan <paul@claws-mail.org>
Sat, 10 Aug 2002 12:36:07 +0000 (12:36 +0000)
committerPaul Mangan <paul@claws-mail.org>
Sat, 10 Aug 2002 12:36:07 +0000 (12:36 +0000)
ChangeLog.claws
configure.in
src/mainwindow.c
src/prefs_toolbar.c
src/toolbar.c
src/toolbar.h

index c87e775..f1a9ad6 100644 (file)
@@ -1,3 +1,12 @@
+2002-08-10 [paul]      0.8.1claws46
+
+       * src/mainwindow.c
+         src/prefs_toolbar.c
+         src/toolbar.c
+         src/toolbar.h
+               obey coding style
+               follow UI text conventions
+
 2002-08-10 [alfons]    0.8.1claws45
 
        * src/toolbar.c
index eb5eb37..58ff853 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws45
+EXTRA_VERSION=claws46
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 043c35f..46e8ae3 100644 (file)
@@ -655,7 +655,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Configuration"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Configuration/_Common preferences..."),
                                                NULL, prefs_common_open_cb, 0, NULL},
-       {N_("/_Configuration/C_ustom Toolbar"), NULL, prefs_toolbar_cb, 0, NULL},
+       {N_("/_Configuration/C_ustom toolbar..."),
+                                               NULL, prefs_toolbar_cb, 0, NULL},
        {N_("/_Configuration/_Filter setting..."),
                                                NULL, prefs_filter_open_cb, 0, NULL},
        {N_("/_Configuration/_Scoring..."),
index 3187422..1f6f936 100644 (file)
@@ -573,7 +573,7 @@ static void prefs_toolbar_selection_changed(GtkList *list,
        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), _("select Sylpheed 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);
@@ -582,7 +582,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), _("enter Toolbar Text (shown below Pixmap)"));
+               gtk_label_set_text (GTK_LABEL(mtoolbar.label_icon_text), _("Toolbar text (shown below Pixmap)"));
        }
 }
 
@@ -658,7 +658,7 @@ static void prefs_toolbar_create(void)
        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 (_("compose Toolbar Item"));
+       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);
 
@@ -704,7 +704,7 @@ static void prefs_toolbar_create(void)
        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 (_("select Action executed on click"));
+       label_action_sel = gtk_label_new (_("Event executed on click"));
        gtk_box_pack_start (GTK_BOX (hbox_action), label_action_sel, FALSE, FALSE, 0);
        gtk_label_set_justify (GTK_LABEL (label_action_sel), GTK_JUSTIFY_RIGHT);
        
@@ -746,7 +746,7 @@ static void prefs_toolbar_create(void)
                            NULL);
 
        /* currently active toolbar items */
-       frame_toolbar_items = gtk_frame_new (_("set ToolbarItems"));
+       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);
        
@@ -768,16 +768,16 @@ static void prefs_toolbar_create(void)
        gtk_clist_column_titles_show (GTK_CLIST (clist_set));
        gtk_widget_set_usize (clist_set, 300, 200);
 
-       label_icon = gtk_label_new (_("Toolbar Icon"));
+       label_icon = gtk_label_new (_("Pixmap"));
        gtk_clist_set_column_widget (GTK_CLIST (clist_set), 0, label_icon);
        
-       label_file = gtk_label_new (_("File Name"));
+       label_file = gtk_label_new (_("File name"));
        gtk_clist_set_column_widget (GTK_CLIST (clist_set), 1, label_file);
 
-       label_text = gtk_label_new (_("Icon Text"));
+       label_text = gtk_label_new (_("Pixmap text"));
        gtk_clist_set_column_widget (GTK_CLIST (clist_set), 2, label_text);
 
-       label_action = gtk_label_new (_("Mapped Action"));
+       label_action = gtk_label_new (_("Mapped event"));
        gtk_clist_set_column_widget (GTK_CLIST (clist_set), 3, label_action);
        
        toolbar = gtk_toolbar_new (GTK_ORIENTATION_VERTICAL, GTK_TOOLBAR_BOTH);
index cb9f959..84fce56 100644 (file)
@@ -72,40 +72,40 @@ static gint   toolbar_ret_val_from_text      (gchar *text);
 
 
 /* callback functions */
-static void toolbar_inc_cb                     (GtkWidget      *widget,
-                                       gpointer                 data);
+static void toolbar_inc_cb             (GtkWidget      *widget,
+                                        gpointer        data);
 
 static void toolbar_inc_all_cb         (GtkWidget      *widget,
-                                       gpointer                 data);
+                                        gpointer        data);
 
 static void toolbar_send_cb            (GtkWidget      *widget,
-                                       gpointer                 data);
+                                        gpointer        data);
 
 static void toolbar_compose_cb         (GtkWidget      *widget,
-                                       gpointer                 data);
+                                        gpointer        data);
 
 static void toolbar_reply_cb           (GtkWidget      *widget,
-                                       gpointer                 data);
+                                        gpointer        data);
 
-static void toolbar_reply_to_all_cb            (GtkWidget      *widget,
-                                       gpointer                 data);
+static void toolbar_reply_to_all_cb    (GtkWidget      *widget,
+                                        gpointer        data);
 
-static void toolbar_reply_to_sender_cb       (GtkWidget        *widget,
-                                       gpointer                 data);
+static void toolbar_reply_to_sender_cb (GtkWidget      *widget,
+                                        gpointer        data);
 
 static void toolbar_forward_cb         (GtkWidget      *widget,
-                                       gpointer                  data);
+                                        gpointer        data);
 
 static void toolbar_delete_cb          (GtkWidget      *widget,
-                                       gpointer                 data);
+                                        gpointer        data);
 
 static void toolbar_exec_cb            (GtkWidget      *widget,
-                                       gpointer                 data);
+                                        gpointer        data);
 
 static void toolbar_next_unread_cb     (GtkWidget      *widget,
-                                gpointer        data);
+                                        gpointer        data);
 
-static void toolbar_actions_execute_cb       (GtkWidget        *widget,
+static void toolbar_actions_execute_cb (GtkWidget      *widget,
                                         gpointer        data);
 
 static void toolbar_reply_popup_cb     (GtkWidget      *widget,
@@ -118,39 +118,42 @@ static void toolbar_reply_to_all_popup_cb(GtkWidget       *widget,
                                         GdkEventButton *event,
                                         gpointer        data);
 
-static void toolbar_reply_to_all_popup_closed_cb(GtkMenuShell  *menu_shell,
+static void toolbar_reply_to_all_popup_closed_cb
+                                       (GtkMenuShell   *menu_shell,
                                         gpointer        data);
 
 static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget,
                                         GdkEventButton *event,
                                         gpointer        data);
-static void toolbar_reply_to_sender_popup_closed_cb(GtkMenuShell       *menu_shell,
+static void toolbar_reply_to_sender_popup_closed_cb
+                                       (GtkMenuShell   *menu_shell,
                                         gpointer        data);
 
 static void toolbar_forward_popup_cb    (GtkWidget      *widget,
                                         GdkEventButton    *event,
                                         gpointer        data);
 
-static void toolbar_forward_popup_closed_cb   (GtkMenuShell    *menu_shell,
+static void toolbar_forward_popup_closed_cb            
+                                       (GtkMenuShell   *menu_shell,
                                         gpointer        data);
 
 static ToolbarAction t_action[] = 
 {
-       { "A_RECEIVE_ALL",   N_("Receive Mail on all Accounts"),    toolbar_inc_all_cb               },
-       { "A_RECEIVE_CUR",   N_("Receive Mail on current Account"), toolbar_inc_cb                   },
-       { "A_SEND_QUEUD",    N_("Send Queud Message(s)"),           toolbar_send_cb                  },
-       { "A_COMPOSE_EMAIL", N_("Compose Email"),                   toolbar_compose_cb               },
-       { "A_REPLY_MESSAGE", N_("Reply to Message"),                toolbar_reply_cb                 },
-       { "A_REPLY_SENDER",  N_("Reply to Sender"),                 toolbar_reply_to_sender_cb       },
-       { "A_REPLY_ALL",     N_("Reply to All"),                    toolbar_reply_to_all_cb          },
-       { "A_FORWARD",       N_("Forward Message"),                 toolbar_forward_cb               },
-       { "A_DELETE",        N_("Delete Message"),                  toolbar_delete_cb                },
-       { "A_EXECUTE",       N_("Execute"),                         toolbar_exec_cb                  },
-       { "A_GOTO_NEXT",     N_("Goto Next Message"),               toolbar_next_unread_cb           },
-       { "A_SYL_ACTIONS",   N_("Sylpheed Actions Feature"),        toolbar_actions_execute_cb       },
-
-       { "A_COMPOSE_NEWS",  N_("Compose News"),                    toolbar_compose_cb               },    
-       { "A_SEPARATOR",     SEPARATOR,                             NULL                             },
+       { "A_RECEIVE_ALL",   N_("Receive Mail on all Accounts"),    toolbar_inc_all_cb        },
+       { "A_RECEIVE_CUR",   N_("Receive Mail on current Account"), toolbar_inc_cb            },
+       { "A_SEND_QUEUD",    N_("Send Queued Message(s)"),          toolbar_send_cb           },
+       { "A_COMPOSE_EMAIL", N_("Compose Email"),                   toolbar_compose_cb        },
+       { "A_REPLY_MESSAGE", N_("Reply to Message"),                toolbar_reply_cb          },
+       { "A_REPLY_SENDER",  N_("Reply to Sender"),                 toolbar_reply_to_sender_cb},
+       { "A_REPLY_ALL",     N_("Reply to All"),                    toolbar_reply_to_all_cb   },
+       { "A_FORWARD",       N_("Forward Message"),                 toolbar_forward_cb        },
+       { "A_DELETE",        N_("Delete Message"),                  toolbar_delete_cb         },
+       { "A_EXECUTE",       N_("Execute"),                         toolbar_exec_cb           },
+       { "A_GOTO_NEXT",     N_("Goto Next Message"),               toolbar_next_unread_cb    },
+       { "A_SYL_ACTIONS",   N_("Sylpheed Actions Feature"),        toolbar_actions_execute_cb},
+
+       { "A_COMPOSE_NEWS",  N_("Compose News"),                    toolbar_compose_cb        },    
+       { "A_SEPARATOR",     SEPARATOR,                             NULL                      }
 };
 
 static GtkItemFactoryEntry reply_popup_entries[] =
index a7a09f6..367e894 100644 (file)
@@ -40,7 +40,7 @@ typedef enum
        A_GOTO_NEXT,
        A_SYL_ACTIONS, 
        
-       N_ACTION_VAL,
+       N_ACTION_VAL
 } CTActionVal;
 
 #define A_COMPOSE_NEWS N_ACTION_VAL + 1