blam r680 - trunk/src

[cmartin svn gnome org]

Author: cmartin
Date: Tue Mar 10 02:09:18 2009
New Revision: 680
URL: http://svn.gnome.org/viewvc/blam?rev=680&view=rev

Log:
Make a few strings nicer.

Use Gtk.Stock.* a bit more and make the tray-icon i18n-able.

Modified:
   trunk/src/ChannelList.cs
   trunk/src/TrayIcon.cs

Modified: trunk/src/ChannelList.cs
==============================================================================
--- trunk/src/ChannelList.cs	(original)
+++ trunk/src/ChannelList.cs	Tue Mar 10 02:09:18 2009
@@ -454,20 +454,20 @@
             GtkUtil.AppendMenuItem (popup_menu, 
                                     Catalog.GetString ("_Mark as read"),
                                     new EventHandler (EmitMarkAsReadCb));
-            GtkUtil.AppendMenuItem (popup_menu, 
+            GtkUtil.AppendMenuItem (popup_menu,
                                     Catalog.GetString ("_Refresh"),
-                                    "gtk-refresh",
+                                    Stock.Refresh,
                                     new EventHandler (EmitRefreshChannelCb),
                                     true);
             GtkUtil.AppendMenuSeparator (popup_menu);
             GtkUtil.AppendMenuItem (popup_menu,
                                     Catalog.GetString ("_Edit"),
-                                    "gtk-edit",
+                                    Stock.Edit,
                                     new EventHandler (EmitEditCb),
                                     true);
             GtkUtil.AppendMenuItem (popup_menu,
                                     Catalog.GetString ("Remo_ve"),
-                                    "gtk-remove",
+                                    Stock.Remove,
                                     new EventHandler (EmitRemoveCb), true);
             popup_menu.Popup (null, null, null, 
                               eb.Button, eb.Time);

Modified: trunk/src/TrayIcon.cs
==============================================================================
--- trunk/src/TrayIcon.cs	(original)
+++ trunk/src/TrayIcon.cs	Tue Mar 10 02:09:18 2009
@@ -6,12 +6,12 @@
 //
 
 using Gtk;
+using Mono.Unix;
 using System;
 
 namespace Imendio.Blam {
     public class TrayIcon {
     private Gtk.StatusIcon mIcon = null;
-	private Application mParent = null;
 
 	public event EventHandler RefreshAllEvent;
 	public event EventHandler PreferencesEvent;
@@ -28,7 +28,6 @@
 
 	public TrayIcon (string name)
 	{
-        mParent = Application.TheApp;
         mIcon = new Gtk.StatusIcon();
         mIcon.IconName = "blam";
         mIcon.Tooltip = name;
@@ -58,19 +57,19 @@
 	public void PopupCb(object o, EventArgs args)
 	{
 		Gtk.Menu menu = new Gtk.Menu();
-		Gtk.ImageMenuItem refreshItem = new Gtk.ImageMenuItem("Refresh");
+		Gtk.ImageMenuItem refreshItem = new Gtk.ImageMenuItem(Catalog.GetString("_Refresh"));
 		refreshItem.Image = new Gtk.Image(Stock.Refresh,IconSize.Menu);
 		refreshItem.Activated += RefreshAllEvent;
 
-		Gtk.ImageMenuItem prefItem = new Gtk.ImageMenuItem("Preferences...");
+		Gtk.ImageMenuItem prefItem = new Gtk.ImageMenuItem(Catalog.GetString("Preferences"));
 		prefItem.Image = new Gtk.Image(Stock.Preferences,IconSize.Menu);
 		prefItem.Activated += PreferencesEvent;
 
-		Gtk.ImageMenuItem aboutItem = new Gtk.ImageMenuItem("About Blam!");
+		Gtk.ImageMenuItem aboutItem = new Gtk.ImageMenuItem(Catalog.GetString("About Blam"));
 		aboutItem.Image = new Gtk.Image(Stock.About,IconSize.Menu);
 		aboutItem.Activated += AboutEvent;
 
-		Gtk.ImageMenuItem quitItem = new Gtk.ImageMenuItem("Quit");
+		Gtk.ImageMenuItem quitItem = new Gtk.ImageMenuItem(Catalog.GetString("Quit"));
 		quitItem.Image = new Gtk.Image(Stock.Quit,IconSize.Menu);
 		quitItem.Activated += QuitEvent;