[Xfce4-commits] <postler:master> Make Save and Send buttons in composer homogeneous

[Christian Dywan]

Updating branch refs/heads/master
         to 1c91d20fd5f516ab370412e19c2a8939b96649a6 (commit)
       from 46381c45ecd83b6552f0da151db2da7d33f02c60 (commit)

commit 1c91d20fd5f516ab370412e19c2a8939b96649a6
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Jan 30 08:49:07 2011 +0100

    Make Save and Send buttons in composer homogeneous
    
    Fixes: https://bugs.launchpad.net/postler/+bug/709568

 postler/postler-app.vala      |    2 +-
 postler/postler-composer.vala |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/postler/postler-app.vala b/postler/postler-app.vala
index 5a63e57..019c695 100644
--- a/postler/postler-app.vala
+++ b/postler/postler-app.vala
@@ -95,7 +95,7 @@ public class Postler.App : Unique.App {
 	{ STOCK_MAIL_REPLIED, "mail-replied", 0, 0, STOCK_MAIL_REPLY_SENDER },
         { STOCK_MAIL_REPLY_SENDER, N_("Reply To _Sender") },
         { STOCK_MAIL_REPLY_ALL, N_("Reply to _All") },
-        { STOCK_MAIL_SEND, N_("_Send Message"), 0, 0, "stock_mail-send" },
+        { STOCK_MAIL_SEND, N_("S_end"), 0, 0, "stock_mail-send" },
         { STOCK_MAIL_SEND_RECEIVE, N_("_Receive Mail") },
 	{ STOCK_MAIL_UNREAD, "mail-unread", 0, 0, Gtk.STOCK_NEW },
         { STOCK_IMAGE, null, 0, 0, "gnome-mime-image" },
diff --git a/postler/postler-composer.vala b/postler/postler-composer.vala
index 650b332..257014d 100644
--- a/postler/postler-composer.vala
+++ b/postler/postler-composer.vala
@@ -356,7 +356,7 @@ public class Postler.Composer : Gtk.Window {
         { "Mail", null, N_("_Mail") },
         { "MessageSend", STOCK_MAIL_SEND, null, "<Ctrl>Return",
           N_("Send the message"), action_mail_send },
-        { "MessageSave", Gtk.STOCK_SAVE, N_("Save as _Draft"), "<Ctrl>s",
+        { "MessageSave", Gtk.STOCK_SAVE, null, "<Ctrl>s",
           N_("Save message as draft"), null },
         { "FileAttach", STOCK_MAIL_ATTACHMENT, N_("_Attach File"), "",
           N_("Attach a file to the message"), action_insert_attachment },
@@ -486,6 +486,10 @@ public class Postler.Composer : Gtk.Window {
         });
         toolbar.insert (toolitem, 0);
 
+        /* Make non-tool-buttons homogeneous like in a dialogue */
+        foreach (var child in toolbar.get_children ())
+            (child as Gtk.ToolItem).set_homogeneous (!(child is Gtk.ToolButton));
+
         shelf.pack_end (toolbar, false, false, 0);
         var sizegroup = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL);
         var box = new Gtk.HBox (false, 0);