[Xfce4-commits] <postler:master> Use search-specific labels for search properties

[Christian Dywan]

Updating branch refs/heads/master
         to b829c4979ea0d1a80a5d7fc82cb30a1eda7b848b (commit)
       from cf589a075bc8d7fdce94880c07f0892246e39a88 (commit)

commit b829c4979ea0d1a80a5d7fc82cb30a1eda7b848b
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Mar 6 21:58:04 2011 +0100

    Use search-specific labels for search properties
    
    Fixes: https://bugs.launchpad.net/postler/+bug/726718

 postler/postler-accountsetup.vala |   18 ++++++++++++++----
 postler/postler-folders.vala      |    2 ++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/postler/postler-accountsetup.vala b/postler/postler-accountsetup.vala
index 9b69433..4ad5009 100644
--- a/postler/postler-accountsetup.vala
+++ b/postler/postler-accountsetup.vala
@@ -237,6 +237,7 @@ public class Postler.AccountSetup : Gtk.Dialog {
     public signal void done (AccountInfo? info);
 
     private AccountSetup (AccountInfo? info=null) {
+        GLib.Object (title: _("Account Properties"));
         widget = new AccountWidget (info);
         widget.done.connect ((info) => {
             hide ();
@@ -269,8 +270,17 @@ public class Postler.AccountSetup : Gtk.Dialog {
     }
 
     public static AccountSetup edit_account (AccountInfo info) {
-        var setup = new AccountSetup (info);
-        var remove = new Gtk.Button.with_mnemonic (_("Remove account"));
+         var setup = new AccountSetup (info);
+
+        unowned string remove_label = _("Remove Account");
+        unowned string update_label = _("Update Account");
+        if (info.type == AccountType.SEARCH) {
+            setup.title = _("Saved Search Properties");
+            remove_label = _("Remove Saved Search");
+            update_label = _("Update Saved Search");
+        }
+
+        var remove = new Gtk.Button.with_mnemonic (remove_label);
         remove.set_image (new Gtk.Image.from_stock (Gtk.STOCK_DELETE,
                                                     Gtk.IconSize.BUTTON));
         remove.relief = Gtk.ReliefStyle.NONE;
@@ -283,7 +293,7 @@ public class Postler.AccountSetup : Gtk.Dialog {
                 Gtk.MessageType.WARNING, Gtk.ButtonsType.NONE,
                 _("You are about to remove the account \"%s\"."), info.name);
                 dialog.add_buttons (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-                    _("_Remove Account"), Gtk.ResponseType.OK);
+                    remove_label, Gtk.ResponseType.OK);
                 dialog.set_default_response (Gtk.ResponseType.CANCEL);
                 int response = dialog.run ();
                 dialog.destroy ();
@@ -293,7 +303,7 @@ public class Postler.AccountSetup : Gtk.Dialog {
                     setup.destroy ();
                 }
         });
-        var apply = setup.add_button (_("_Update Account"), Gtk.ResponseType.APPLY);
+        var apply = setup.add_button (update_label, Gtk.ResponseType.APPLY);
         (setup.action_area as Gtk.Box).set_child_packing (apply,
             true, true, 0, Gtk.PackType.END);
         setup.set_default_response (Gtk.ResponseType.APPLY);
diff --git a/postler/postler-folders.vala b/postler/postler-folders.vala
index 116362d..3a09f46 100644
--- a/postler/postler-folders.vala
+++ b/postler/postler-folders.vala
@@ -739,6 +739,8 @@ public class Postler.Folders : Gtk.TreeView {
             menu.append (new Gtk.SeparatorMenuItem ());
 
             menuitem = new Gtk.MenuItem.with_mnemonic (_("Account _Properties"));
+            if (is_search)
+                menuitem.label = _("Saved Search _Properties");
             menuitem.activate.connect ((menuitem) => {
                 Gtk.TreeIter iter;
                  if (get_selection ().get_selected (null, out iter)) {