blam r515 - in trunk: . src

[mmonreal svn gnome org]

Author: mmonreal
Date: Wed Jan  9 17:21:39 2008
New Revision: 515
URL: http://svn.gnome.org/viewvc/blam?rev=515&view=rev

Log:
2008-01-09  Michael Monreal  <mmonreal svn gnome org>

    ** Fix for bug 504709

    * src/Application.cs:
    * src/ChannelDialog.cs:
    * src/Dialogs.cs:
    * src/Opml.cs:
    * src/PreferencesDialog.cs:
    * src/TrayIcon.cs: Use the correct icon size for window- and tray 
    icons. Also adds a window icon to the export dialog.


Modified:
   trunk/ChangeLog
   trunk/src/Application.cs
   trunk/src/ChannelDialog.cs
   trunk/src/Dialogs.cs
   trunk/src/Opml.cs
   trunk/src/PreferencesDialog.cs
   trunk/src/TrayIcon.cs

Modified: trunk/src/Application.cs
==============================================================================
--- trunk/src/Application.cs	(original)
+++ trunk/src/Application.cs	Wed Jan  9 17:21:39 2008
@@ -181,7 +181,6 @@
             itemList.ItemSelected += ItemSelected;
 
             trayIcon = new TrayIcon (Catalog.GetString ("Imendio Blam News Reader"));
-            trayIcon.Pixbuf = new Pixbuf(Defines.DATADIR + "/icons/hicolor/16x16/apps/blam.png");
             trayIcon.ButtonPressEvent += TrayIconButtonPressCb;
             channelsLabelText = channelsLabel.Text;
             UpdateTotalNumberOfUnread ();
@@ -196,7 +195,7 @@
 
             RestoreWindowState();
 
-            mainWindow.Icon = new Pixbuf(Defines.DATADIR + "/icons/hicolor/scalable/apps/blam.svg");
+            mainWindow.IconName = "blam";
 
             mainWindow.ShowAll ();
 
@@ -370,6 +369,7 @@
                                       mainWindow, FileChooserAction.Save,
                                       Catalog.GetString("Cancel"), ResponseType.Cancel,
                                       Catalog.GetString("Save"), ResponseType.Ok);
+                exportFileDialog.IconName = "blam";
                 exportFileDialog.Modal = true;
                 exportFileDialog.TransientFor = mainWindow;
             }

Modified: trunk/src/ChannelDialog.cs
==============================================================================
--- trunk/src/ChannelDialog.cs	(original)
+++ trunk/src/ChannelDialog.cs	Wed Jan  9 17:21:39 2008
@@ -53,7 +53,7 @@
 							null);
 	    gladeXML.Autoconnect(this);
 	    channelDialog.TransientFor = mApp.Window;
-	    channelDialog.Icon = new Pixbuf(Defines.DATADIR + "/icons/hicolor/scalable/apps/blam.svg"); 
+	    channelDialog.IconName = "blam"; 
 	    
 	    dialogImage.Pixbuf =
 		Gdk.Pixbuf.LoadFromResource ("blam-edit-news.png");

Modified: trunk/src/Dialogs.cs
==============================================================================
--- trunk/src/Dialogs.cs	(original)
+++ trunk/src/Dialogs.cs	Wed Jan  9 17:21:39 2008
@@ -24,8 +24,8 @@
 
             aboutDialog.TransientFor = parent;
             aboutDialog.Version = Defines.VERSION;
-            aboutDialog.Logo = new Pixbuf(Defines.DATADIR + "/icons/hicolor/scalable/apps/blam.svg");
-            aboutDialog.Icon = new Pixbuf(Defines.DATADIR + "/icons/hicolor/scalable/apps/blam.svg");
+            aboutDialog.LogoIconName = "blam";
+            aboutDialog.IconName = "blam";
             aboutDialog.Copyright = "Copyright 2004-2006 (c) Mikael Hallendal <micke imendio com>\n"
                 + "Copyright 2006-2007 (c) Carlos MartÃn Nieto <carlos cmartin tk>";
             aboutDialog.Run();
@@ -55,8 +55,7 @@
 							 null);
 	    gladeXML.Autoconnect (this);
 	    addChannelDialog.TransientFor = mApp.Window;
-        addChannelDialog.Icon = new Pixbuf(Defines.DATADIR + "/icons/hicolor/scalable/apps/blam.svg");
-	    //addChannelDialog.Icon = Gdk.Pixbuf.LoadFromResource ("blam.png");
+        addChannelDialog.IconName = "blam";
 	    
 	    dialogImage.Pixbuf =
 		Gdk.Pixbuf.LoadFromResource ("blam-add-news.png");
@@ -145,7 +144,7 @@
 							null);
 	    gladeXML.Autoconnect(this);
 	    removeChannelDialog.TransientFor = parent;
-	    removeChannelDialog.Icon = new Pixbuf(Defines.DATADIR + "/icons/hicolor/scalable/apps/blam.svg");
+	    removeChannelDialog.IconName = "blam";
 	}
 
 	public static void Show (Gtk.Window parent, ChannelCollection collection, Channel channel)

Modified: trunk/src/Opml.cs
==============================================================================
--- trunk/src/Opml.cs	(original)
+++ trunk/src/Opml.cs	Wed Jan  9 17:21:39 2008
@@ -52,7 +52,7 @@
 
 	    mParentWindow = parentWindow;
 	    opmlDialog.TransientFor = mParentWindow;
-	    opmlDialog.Icon = new Pixbuf(Defines.DATADIR + "/icons/hicolor/scalable/apps/blam.svg");
+	    opmlDialog.IconName = "blam";
 
 	    dialogImage.Pixbuf =
 		Gdk.Pixbuf.LoadFromResource ("blam-add-news.png");
@@ -242,7 +242,7 @@
 							    null);
 		gladeXML.Autoconnect(this);
 		opmlStatusDialog.TransientFor = parentWindow;
-		opmlStatusDialog.Icon = new Pixbuf(Defines.DATADIR + "/icons/hicolor/scalable/apps/blam.svg");
+		opmlStatusDialog.IconName = "blam";
 	    }
 
 	    public void Show (string initialStatus)

Modified: trunk/src/PreferencesDialog.cs
==============================================================================
--- trunk/src/PreferencesDialog.cs	(original)
+++ trunk/src/PreferencesDialog.cs	Wed Jan  9 17:21:39 2008
@@ -45,7 +45,7 @@
 								null);
 			gladeXML.Autoconnect (this);
 			preferencesDialog.TransientFor = parentWindow;
-			preferencesDialog.Icon = new Gdk.Pixbuf(Defines.DATADIR + "/icons/hicolor/scalable/apps/blam.svg");
+			preferencesDialog.IconName = "blam";
 
 			boldBehaviourLabel.Markup = "<b>" + boldBehaviourLabel.Text + "</b>";
 			bool reverseEntries = Conf.Get (Preference.REVERSE_ENTRIES, false);

Modified: trunk/src/TrayIcon.cs
==============================================================================
--- trunk/src/TrayIcon.cs	(original)
+++ trunk/src/TrayIcon.cs	Wed Jan  9 17:21:39 2008
@@ -14,15 +14,6 @@
 
 	public event EventHandler ButtonPressEvent;
 
-    public Gdk.Pixbuf Pixbuf {
-        get {
-            return mIcon.Pixbuf;
-        }
-        set {
-            mIcon.Pixbuf = value;
-        }
-    }
-
 	public string Tooltip {
 	    set {
 		    mIcon.Tooltip = value;
@@ -32,6 +23,7 @@
 	public TrayIcon (string name)
 	{
         mIcon = new Gtk.StatusIcon();
+        mIcon.IconName = "blam";
         mIcon.Tooltip = name;
         mIcon.Activate += ButtonPressedCb;
 	}