diff options
author | Lluis Sanchez <lluis@novell.com> | 2007-07-31 21:30:15 +0400 |
---|---|---|
committer | Lluis Sanchez <lluis@novell.com> | 2007-07-31 21:30:15 +0400 |
commit | ac2d5754ecbfd13d9a90a8c0d4bb42dd79e15b90 (patch) | |
tree | 3e29f7d64c38187ba44c08b58b10f91c7892f516 | |
parent | 5844eedeebd9506a746972abebb58c3b53e5469a (diff) |
2007-07-31 Lluis Sanchez Gual <lluis@novell.com>
* lib/libsteticui.dll, lib/libstetic.dll,
MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fixed some
problems with the target gtk version. It was not assigned to the
stetic project. Also fixed some stock icon rendering issues in
Stetic.
2007-07-31 Lluis Sanchez Gual <lluis@novell.com>
* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
Includes a nullref fix.
svn path=/branches/monodevelop/0.15/; revision=83116
-rw-r--r-- | Extras/MonoDevelop.GtkCore/ChangeLog | 13 | ||||
-rw-r--r-- | Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs | 40 | ||||
-rw-r--r-- | Extras/MonoDevelop.GtkCore/lib/libstetic.dll | bin | 605184 -> 605184 bytes | |||
-rw-r--r-- | Extras/MonoDevelop.GtkCore/lib/libsteticui.dll | bin | 214016 -> 214016 bytes |
4 files changed, 39 insertions, 14 deletions
diff --git a/Extras/MonoDevelop.GtkCore/ChangeLog b/Extras/MonoDevelop.GtkCore/ChangeLog index e2e0ebeb4d..f7fe4876e0 100644 --- a/Extras/MonoDevelop.GtkCore/ChangeLog +++ b/Extras/MonoDevelop.GtkCore/ChangeLog @@ -1,3 +1,16 @@ +2007-07-31 Lluis Sanchez Gual <lluis@novell.com> + + * lib/libsteticui.dll, lib/libstetic.dll, + MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fixed some + problems with the target gtk version. It was not assigned to the + stetic project. Also fixed some stock icon rendering issues in + Stetic. + +2007-07-31 Lluis Sanchez Gual <lluis@novell.com> + + * lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module. + Includes a nullref fix. + 2007-07-30 Lluis Sanchez Gual <lluis@novell.com> * lib/libsteticui.dll, lib/libstetic.dll: Updated. diff --git a/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs b/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs index 64a20f549f..4aee7ebbe8 100644 --- a/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs +++ b/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs @@ -503,6 +503,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder if (hasError || disposed || gproject == null) return; + bool needsSave = false; librariesUpdated = true; string[] oldLibs = gproject.WidgetLibraries; @@ -518,6 +519,13 @@ namespace MonoDevelop.GtkCore.GuiBuilder // If the project is a library, add itself as a widget source GtkDesignInfo info = GtkCoreService.GetGtkInfo (project); + + // Make sure the target gtk version is properly set + if (gproject.TargetGtkVersion != info.TargetGtkVersion) { + gproject.TargetGtkVersion = info.TargetGtkVersion; + needsSave = true; + } + if (info != null && info.IsWidgetLibrary) internalLibs = new string [] { project.GetOutputFileName () }; else @@ -526,25 +534,29 @@ namespace MonoDevelop.GtkCore.GuiBuilder string[] newLibs = (string[]) libs.ToArray (typeof(string)); // See if something has changed + if (LibrariesChanged (oldLibs, internalLibs, newLibs)) { + gproject.SetWidgetLibraries (newLibs, internalLibs); + needsSave = true; + } + + if (needsSave) + Save (true); + } + + bool LibrariesChanged (string[] oldLibs, string[] internalLibs, string[] newLibs) + { if (oldLibs.Length == newLibs.Length + internalLibs.Length) { - bool found = false; foreach (string s in newLibs) { - if (!((IList)oldLibs).Contains (s)) { - found = true; - break; - } + if (!((IList)oldLibs).Contains (s)) + return true; } foreach (string s in internalLibs) { - if (!((IList)oldLibs).Contains (s)) { - found = true; - break; - } + if (!((IList)oldLibs).Contains (s)) + return true; } - if (!found) // Arrays are the same - return; - } - gproject.SetWidgetLibraries (newLibs, internalLibs); - Save (true); + return false; + } else + return true; } void NotifyChanged () diff --git a/Extras/MonoDevelop.GtkCore/lib/libstetic.dll b/Extras/MonoDevelop.GtkCore/lib/libstetic.dll Binary files differindex 15c03ab9af..084f38693b 100644 --- a/Extras/MonoDevelop.GtkCore/lib/libstetic.dll +++ b/Extras/MonoDevelop.GtkCore/lib/libstetic.dll diff --git a/Extras/MonoDevelop.GtkCore/lib/libsteticui.dll b/Extras/MonoDevelop.GtkCore/lib/libsteticui.dll Binary files differindex 0ce82b13d5..e37a0e59ec 100644 --- a/Extras/MonoDevelop.GtkCore/lib/libsteticui.dll +++ b/Extras/MonoDevelop.GtkCore/lib/libsteticui.dll |