Author: lluis
Date: 2008-01-23 14:42:56 -0500 (Wed, 23 Jan 2008)
New Revision: 93695

Removed:
   
branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/icons/view-fullscreen.png
   
branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/icons/view-fullscreen_22.png
Modified:
   branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/ChangeLog
   branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/Makefile.am
   
branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.mdp
   
branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/ResourceService.cs
   
branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/StockIcons.cs
Log:
2008-01-22  Michael Hutchinson <[EMAIL PROTECTED]> 

        * MonoDevelop.Core.Gui.mdp, Makefile.am, icons/view-fullscreen_22.png,
          icons/view-fullscreen.png: Remove unused icon.
        * MonoDevelop.Core.Gui/StockIcons.cs: Use GTK fullscreen icon (was 
added in
          2.8)
        * MonoDevelop.Core.Gui/ResourceService.cs: Fix Path.Combine call.



Modified: branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/ChangeLog
===================================================================
--- branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/ChangeLog       
2008-01-23 19:33:08 UTC (rev 93694)
+++ branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/ChangeLog       
2008-01-23 19:42:56 UTC (rev 93695)
@@ -1,3 +1,11 @@
+2008-01-22  Michael Hutchinson <[EMAIL PROTECTED]> 
+
+       * MonoDevelop.Core.Gui.mdp, Makefile.am, icons/view-fullscreen_22.png,
+         icons/view-fullscreen.png: Remove unused icon.
+       * MonoDevelop.Core.Gui/StockIcons.cs: Use GTK fullscreen icon (was 
added in
+         2.8)
+       * MonoDevelop.Core.Gui/ResourceService.cs: Fix Path.Combine call.
+
 2008-01-08  Michael Hutchinson  <[EMAIL PROTECTED]> 
 
        * Base.glade: Make ErrorDialog modal, like all the other MessageService 

Modified: 
branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/Makefile.am
===================================================================
--- branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/Makefile.am     
2008-01-23 19:33:08 UTC (rev 93694)
+++ branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/Makefile.am     
2008-01-23 19:42:56 UTC (rev 93695)
@@ -180,8 +180,6 @@
        icons/system-software-update_22.png \
        icons/uncomment.png \
        icons/user-package.png \
-       icons/view-fullscreen.png \
-       icons/view-fullscreen_22.png \
        icons/visual-studio.png \
        icons/web-overlay-16.png \
        icons/web-overlay-32.png \

Modified: 
branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/ResourceService.cs
===================================================================
--- 
branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/ResourceService.cs
 2008-01-23 19:33:08 UTC (rev 93694)
+++ 
branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/ResourceService.cs
 2008-01-23 19:42:56 UTC (rev 93695)
@@ -244,7 +244,8 @@
                                }
 
                                Gtk.IconSource source = new Gtk.IconSource ();
-                               source.Filename = Path.GetFullPath 
(Path.Combine ("../data/resources/icons", filename));
+                               source.Filename = Path.GetFullPath 
(Path.Combine (Path.Combine ( Path.Combine ( Path.Combine (
+                                                                   "..", 
"data"), "resources"), "icons"), filename));
                                source.Size = iconSize;
                                iconSet.AddSource (source);
 

Modified: 
branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/StockIcons.cs
===================================================================
--- 
branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/StockIcons.cs
      2008-01-23 19:33:08 UTC (rev 93694)
+++ 
branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/StockIcons.cs
      2008-01-23 19:42:56 UTC (rev 93695)
@@ -60,7 +60,7 @@
                public static readonly string FindIcon = Gtk.Stock.Find;
                public static readonly string FindInFiles = "md-find-in-files";
                public static readonly string FindNextIcon = 
"md-find-next-icon";
-               public static readonly string FullScreen = "md-fullscreen";
+               public static readonly string FullScreen = Gtk.Stock.Fullscreen;
                public static readonly string GotoNextbookmark = 
"md-goto-nextbookmark";
                public static readonly string GotoPrevbookmark = 
"md-goto-prevbookmark";
                public static readonly string Information = 
Gtk.Stock.DialogInfo;

Modified: 
branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.mdp
===================================================================
--- 
branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.mdp
        2008-01-23 19:33:08 UTC (rev 93694)
+++ 
branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.mdp
        2008-01-23 19:42:56 UTC (rev 93695)
@@ -138,8 +138,6 @@
     <File name="MonoDevelop.Core.Gui.addin.xml" subtype="Code" 
buildaction="EmbedAsResource" />
     <File name="Makefile.am" subtype="Code" buildaction="Nothing" />
     <File name="ChangeLog" subtype="Code" buildaction="Nothing" />
-    <File name="icons/view-fullscreen.png" subtype="Code" 
buildaction="EmbedAsResource" />
-    <File name="icons/view-fullscreen_22.png" subtype="Code" 
buildaction="EmbedAsResource" />
     <File name="icons/Icons.24x24.SaveAllIcon" subtype="Code" 
buildaction="EmbedAsResource" />
     <File name="icons/Icons.SharpDevelopIcon-22.png" subtype="Code" 
buildaction="EmbedAsResource" />
     <File name="icons/edit-select-all.png" subtype="Code" 
buildaction="EmbedAsResource" />
@@ -192,18 +190,18 @@
     <ProjectReference type="Gac" localcopy="False" 
refto="ICSharpCode.SharpZipLib, Version=2.84.0.0, Culture=neutral, 
PublicKeyToken=1b03e6acf1164f73" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Drawing, 
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, 
Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
-    <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="gnome-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Project" localcopy="False" 
refto="MonoDevelop.Core" />
     <ProjectReference type="Project" localcopy="False" 
refto="MonoDevelop.Components" />
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, 
Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins.Gui, 
Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins.Setup, 
Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, 
Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gnome-sharp, 
Version=2.16.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp, 
Version=2.16.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, 
Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, 
Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, 
Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, 
Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </References>
   <GtkDesignInfo gtkVersion="2.8.3" />
   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" 
RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" 
SyncReferences="True" IsAutotoolsProject="True" 
RelativeConfigureInPath="../../../">

Deleted: 
branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/icons/view-fullscreen.png
===================================================================
(Binary files differ)

Deleted: 
branches/monodevelop/main/1.0/src/core/MonoDevelop.Core.Gui/icons/view-fullscreen_22.png
===================================================================
(Binary files differ)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to