Author: mkrueger
Date: 2007-08-28 07:56:32 -0400 (Tue, 28 Aug 2007)
New Revision: 84945

Modified:
   trunk/monodevelop/Extras/WelcomePage/ChangeLog
   trunk/monodevelop/Extras/WelcomePage/Makefile.am
   trunk/monodevelop/Extras/WelcomePage/WelcomePage.addin.xml
   trunk/monodevelop/Extras/WelcomePage/WelcomePage.mdp
   trunk/monodevelop/Extras/WelcomePage/WelcomePageCommands.cs
   trunk/monodevelop/Extras/WelcomePage/WelcomePageView.cs
Log:
* WelcomePageView.cs, WelcomePageCommands.cs: Fixed 81660+82491: Crash
  when opening the Welcome-Page manually.

Modified: trunk/monodevelop/Extras/WelcomePage/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/WelcomePage/ChangeLog      2007-08-28 11:56:03 UTC 
(rev 84944)
+++ trunk/monodevelop/Extras/WelcomePage/ChangeLog      2007-08-28 11:56:32 UTC 
(rev 84945)
@@ -1,3 +1,8 @@
+2007-08-28  Mike Krüger <[EMAIL PROTECTED]> 
+
+       * WelcomePageView.cs, WelcomePageCommands.cs: Fixed 81660+82491: Crash 
when
+         opening the Welcome-Page manually.
+
 2007-08-21  Mike Krüger <[EMAIL PROTECTED]> 
 
        * WelcomePageView.cs: Fixed 82458: unable to open files that have a 
colon in

Modified: trunk/monodevelop/Extras/WelcomePage/Makefile.am
===================================================================
--- trunk/monodevelop/Extras/WelcomePage/Makefile.am    2007-08-28 11:56:03 UTC 
(rev 84944)
+++ trunk/monodevelop/Extras/WelcomePage/Makefile.am    2007-08-28 11:56:32 UTC 
(rev 84945)
@@ -19,14 +19,15 @@
        WelcomePageOptionPanel.cs \
        WelcomePageView.cs
 
-RES = WelcomePage.addin.xml
+RES =  \
+       WelcomePage.addin.xml \
+       WelcomePage.xsl \
+       WelcomePageContent.xml
  
 DATA_FILES =  \
        mono-bg.png \
        mono-logo.png \
-       WelcomePage.css \
-       WelcomePage.xsl \
-       WelcomePageContent.xml
+       WelcomePage.css
 
 
 DATA_FILE_BUILD = $(addprefix $(ADDIN_BUILD)/, $(DATA_FILES))

Modified: trunk/monodevelop/Extras/WelcomePage/WelcomePage.addin.xml
===================================================================
--- trunk/monodevelop/Extras/WelcomePage/WelcomePage.addin.xml  2007-08-28 
11:56:03 UTC (rev 84944)
+++ trunk/monodevelop/Extras/WelcomePage/WelcomePage.addin.xml  2007-08-28 
11:56:32 UTC (rev 84945)
@@ -11,7 +11,6 @@
        <Runtime>
                <Import assembly="WelcomePage.dll"/>
                <Import file="WelcomePage.css"/>                
-               <Import file="WelcomePage.xsl"/>                
                <Import file="mono-bg.png"/>            
                <Import file="mono-logo.png"/>          
        </Runtime>

Modified: trunk/monodevelop/Extras/WelcomePage/WelcomePage.mdp
===================================================================
--- trunk/monodevelop/Extras/WelcomePage/WelcomePage.mdp        2007-08-28 
11:56:03 UTC (rev 84944)
+++ trunk/monodevelop/Extras/WelcomePage/WelcomePage.mdp        2007-08-28 
11:56:32 UTC (rev 84945)
@@ -18,8 +18,8 @@
     <File name="./WelcomePageOptionPanel.cs" subtype="Code" 
buildaction="Compile" />
     <File name="./WelcomePageView.cs" subtype="Code" buildaction="Compile" />
     <File name="./WelcomePage.addin.xml" subtype="Code" 
buildaction="EmbedAsResource" />
-    <File name="./WelcomePage.xsl" subtype="Code" buildaction="FileCopy" />
-    <File name="./WelcomePageContent.xml" subtype="Code" 
buildaction="FileCopy" />
+    <File name="./WelcomePage.xsl" subtype="Code" 
buildaction="EmbedAsResource" />
+    <File name="./WelcomePageContent.xml" subtype="Code" 
buildaction="EmbedAsResource" />
     <File name="./mono-bg.png" subtype="Code" buildaction="FileCopy" />
     <File name="./mono-logo.png" subtype="Code" buildaction="FileCopy" />
     <File name="./WelcomePage.css" subtype="Code" buildaction="FileCopy" />

Modified: trunk/monodevelop/Extras/WelcomePage/WelcomePageCommands.cs
===================================================================
--- trunk/monodevelop/Extras/WelcomePage/WelcomePageCommands.cs 2007-08-28 
11:56:03 UTC (rev 84944)
+++ trunk/monodevelop/Extras/WelcomePage/WelcomePageCommands.cs 2007-08-28 
11:56:32 UTC (rev 84945)
@@ -47,7 +47,7 @@
                        IdeApp.Workbench.OpenDocument(wpv, true);
 
                        // Html must be rendered after the widget has been drawn
-                       wpv.Initialize(null);
+                       wpv.Initialize ();
                }
        }
 
@@ -55,20 +55,17 @@
        {
                protected override void Run()
                {
-                       foreach (Document d in IdeApp.Workbench.Documents)
-                       {
-                               if (d.GetContent<WelcomePageView>() != null)
-                               {
+                       foreach (Document d in IdeApp.Workbench.Documents) {
+                               if (d.GetContent<WelcomePageView>() != null) {
                                        d.Select();
                                        return;
                                }
                        }
-                       
                        WelcomePageView wpv = new WelcomePageView();
-                       IdeApp.Workbench.OpenDocument(wpv, true);
-
+                       Document doc = IdeApp.Workbench.OpenDocument(wpv, true);
+                       
                        // Html must be rendered after the widget has been drawn
-                       wpv.Initialize(null);
+                       wpv.Initialize ();
                }
        }
 }

Modified: trunk/monodevelop/Extras/WelcomePage/WelcomePageView.cs
===================================================================
--- trunk/monodevelop/Extras/WelcomePage/WelcomePageView.cs     2007-08-28 
11:56:03 UTC (rev 84944)
+++ trunk/monodevelop/Extras/WelcomePage/WelcomePageView.cs     2007-08-28 
11:56:32 UTC (rev 84945)
@@ -23,6 +23,7 @@
 OTHER DEALINGS IN THE SOFTWARE. 
 */
 using System;
+using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -56,20 +57,17 @@
 }
 
 namespace MonoDevelop.WelcomePage
-{
-       
-       
+{      
        public class WelcomePageView : AbstractViewContent
        {
-               protected Frame control;
-               protected MozillaControl htmlControl;
+               MozillaControl htmlControl;
                bool loadingProject;
                
                string datadir;
                
                public override Gtk.Widget Control {
                        get {
-                               return control;
+                               return htmlControl;
                        }
                }
                
@@ -79,31 +77,25 @@
                        }
                }
                
-               public override void Load(string fileName) 
+               public override void Load (string fileName) 
                {
-                       //Initialize(null);
                }
 
-               public WelcomePageView() : base()
+               public WelcomePageView () : base ()
                {
-                       this.ContentName = GettextCatalog.GetString("Welcome");
+                       this.ContentName = GettextCatalog.GetString ("Welcome");
+                       this.IsViewOnly = true;
+
+                       htmlControl = new MozillaControl ();
+                       htmlControl.Show ();
+                       htmlControl.OpenUri += CatchUri;
+                       htmlControl.LinkMsg += LinkMessage;
                        
-                       control = new Frame();
-                       control.Show();
-                       
-                       htmlControl = new MozillaControl();
-                       control.Add(htmlControl);
-                       htmlControl.Show();
-                       htmlControl.OpenUri += new OpenUriHandler (CatchUri);
-                       htmlControl.LinkMsg += new EventHandler (LinkMessage);
-                       
                        datadir = "file://" + Path.GetDirectoryName 
(typeof(ShowWelcomePageHandler).Assembly.Location) + "/";
 
                        if (PlatformID.Unix != Environment.OSVersion.Platform)
                                datadir = datadir.Replace("\\","/");
 
-                       this.IsViewOnly = true;
-
                        LoadContent ();
 
                        IdeApp.Workbench.RecentOpen.RecentProjectChanged += 
RecentChangesHandler;
@@ -112,36 +104,33 @@
                void LoadContent ()
                {
                        // Get the Xml
-                       XmlDocument inxml = BuildXmlDocument();
+                       XmlDocument inxml = BuildXmlDocument ();
                        
-                       XsltArgumentList arg = new XsltArgumentList();
-                       
arg.AddExtensionObject("urn:MonoDevelop.Core.XslGettextCatalog", new 
MonoDevelop.Core.XslGettextCatalog());
+                       XsltArgumentList arg = new XsltArgumentList ();
+                       arg.AddExtensionObject 
("urn:MonoDevelop.Core.XslGettextCatalog", new 
MonoDevelop.Core.XslGettextCatalog ());
                        
                        XslTransform xslt = new XslTransform();
-                       xslt.Load(datadir + "WelcomePage.xsl");
-                       StringWriter fs = new StringWriter();
-                       xslt.Transform(inxml, arg, fs, null);
+               xslt.Load (new XmlTextReader 
(Assembly.GetExecutingAssembly().GetManifestResourceStream 
("WelcomePage.xsl")));
+                       StringWriter fs = new StringWriter ();
+                       xslt.Transform (inxml, arg, fs, null);
                        
-                       htmlControl.Html = fs.ToString();
-                       //Initialize(null);
+                       htmlControl.Html = fs.ToString ();
                }
 
-               void RecentChangesHandler ( object sender, EventArgs e )
+               void RecentChangesHandler (object sender, EventArgs e)
                {
                        LoadContent ();
-                       Initialize (null);
+                       Initialize ();
                }
                
                void LinkMessage (object sender, EventArgs e)
                {
-                       if (htmlControl.LinkMessage == null || 
htmlControl.LinkMessage == String.Empty
-                               || htmlControl.LinkMessage.IndexOf 
("monodevelop://") != -1)
-                       {
+                       if (String.IsNullOrEmpty (htmlControl.LinkMessage) || 
htmlControl.LinkMessage.IndexOf ("monodevelop://") != -1) {
                                IdeApp.Workbench.StatusBar.SetMessage (null);
-                       } else
-                       {
+                       } else {
                                string message = htmlControl.LinkMessage;
-                               if (message.IndexOf ("project://") != -1) 
message = message.Substring (10);
+                               if (message.IndexOf ("project://") != -1) 
+                                       message = message.Substring (10);
                                IdeApp.Workbench.StatusBar.SetMessage (message);
                        }
                }
@@ -156,31 +145,28 @@
                        if (PlatformID.Unix != Environment.OSVersion.Platform)
                                Console.WriteLine ("WelcomePage: Handling URI: 
" + URI);
 
-                       if (URI.StartsWith("project://"))
-                       {
+                       if (URI.StartsWith ("project://")) {
                                if (loadingProject)
                                        return;
                                        
-                               string projectUri = URI.Substring(10);          
        
-                               Uri fileuri = new Uri ( projectUri );
+                               string projectUri = URI.Substring (10);         
        
+                               Uri fileuri = new Uri (projectUri);
                                try {
                                        loadingProject = true;
-                                       IAsyncOperation oper = 
IdeApp.ProjectOperations.OpenCombine ( fileuri.LocalPath );
+                                       IAsyncOperation oper = 
IdeApp.ProjectOperations.OpenCombine (fileuri.LocalPath);
                                        oper.WaitForCompleted ();
                                } finally {
                                        loadingProject = false;
                                }
-                       }
-                       else if (URI.StartsWith("monodevelop://"))
-                       {
+                       } else if (URI.StartsWith ("monodevelop://")) {
                                // Launch MonoDevelop Gui Commands
-                               switch (URI.Substring(14))
+                               switch (URI.Substring (14))
                                {
                                        case "NewProject":
-                                               
IdeApp.CommandService.DispatchCommand(FileCommands.NewProject);
+                                               
IdeApp.CommandService.DispatchCommand (FileCommands.NewProject);
                                                break;
                                        case "OpenFile":
-                                               
IdeApp.CommandService.DispatchCommand(FileCommands.OpenFile);
+                                               
IdeApp.CommandService.DispatchCommand (FileCommands.OpenFile);
                                                break;
                                }
                        }
@@ -205,75 +191,64 @@
                private XmlDocument BuildXmlDocument()
                {
                        XmlDocument xml = new XmlDocument();
-                       xml.Load(datadir + "WelcomePageContent.xml");
+                       xml.Load (new XmlTextReader 
(Assembly.GetExecutingAssembly().GetManifestResourceStream 
("WelcomePageContent.xml")));
                        
                        // Get the Parent node
-                       XmlNode parent = xml.SelectSingleNode("/WelcomePage");
+                       XmlNode parent = xml.SelectSingleNode ("/WelcomePage");
                        
                        // Resource Path
-                       XmlElement element = xml.CreateElement("ResourcePath");
+                       XmlElement element = xml.CreateElement ("ResourcePath");
                        element.InnerText = datadir;
                        parent.AppendChild(element);
                        
                        RecentOpen recentOpen = IdeApp.Workbench.RecentOpen;
                        if (recentOpen.RecentProject != null && 
recentOpen.RecentProject.Length > 0)
                        {
-                               XmlElement projectList  = 
xml.CreateElement("RecentProjects");
+                               XmlElement projectList  = xml.CreateElement 
("RecentProjects");
                                parent.AppendChild(projectList);
                                foreach (RecentItem ri in 
recentOpen.RecentProject)
                                {
-                                       XmlElement project = 
xml.CreateElement("Project");
+                                       XmlElement project = xml.CreateElement 
("Project");
                                        projectList.AppendChild(project);
                                        // Uri
-                                       element = xml.CreateElement("Uri");
+                                       element = xml.CreateElement ("Uri");
                                        element.InnerText = ri.LocalPath;
-                                       project.AppendChild(element);
+                                       project.AppendChild (element);
                                        // Name
-                                       element = xml.CreateElement("Name");
+                                       element = xml.CreateElement ("Name");
                                        element.InnerText = (ri.Private != null 
&& ri.Private.Length > 0) ? ri.Private : 
Path.GetFileNameWithoutExtension(ri.LocalPath);
-                                       project.AppendChild(element);
+                                       project.AppendChild (element);
                                        // Date Modified
-                                       element = 
xml.CreateElement("DateModified");
-                                       element.InnerText = 
TimeSinceEdited(ri.Timestamp);
-                                       project.AppendChild(element);
+                                       element = xml.CreateElement 
("DateModified");
+                                       element.InnerText = TimeSinceEdited 
(ri.Timestamp);
+                                       project.AppendChild (element);
                                }
                        } 
                        return xml;
                }
 
-               public void Initialize(object obj)
+               public void Initialize()
                {
-                       htmlControl.DelayedInitialize();
+                       htmlControl.DelayedInitialize ();
                }
 
                public override void Dispose ()
                {
-                       base.Dispose ();
-
                        IdeApp.Workbench.RecentOpen.RecentProjectChanged -= 
RecentChangesHandler;
-                       htmlControl.Dispose ();
                }
                
-               public static string TimeSinceEdited(DateTime prjtime)
+               public static string TimeSinceEdited (DateTime prjtime)
                {
                        TimeSpan sincelast = DateTime.UtcNow - prjtime;
 
                        if (sincelast.Days >= 1)
-                       {
-                               return GettextCatalog.GetPluralString("{0} 
day", "{0} days", sincelast.Days, sincelast.Days);
-                       }
-                       else if (sincelast.Hours >= 1)
-                       {
-                               return GettextCatalog.GetPluralString("{0} 
hour", "{0} hours", sincelast.Hours, sincelast.Hours);
-                       }
-                       else if (sincelast.Minutes > 0)
-                       {
-                               return GettextCatalog.GetPluralString("{0} 
minute", "{0} minutes", sincelast.Minutes, sincelast.Minutes);
-                       }
-                       else
-                       {
-                               return GettextCatalog.GetString("Less than a 
minute");
-                       }
+                               return GettextCatalog.GetPluralString ("{0} 
day", "{0} days", sincelast.Days, sincelast.Days);
+                       if (sincelast.Hours >= 1)
+                               return GettextCatalog.GetPluralString ("{0} 
hour", "{0} hours", sincelast.Hours, sincelast.Hours);
+                       if (sincelast.Minutes > 0)
+                               return GettextCatalog.GetPluralString ("{0} 
minute", "{0} minutes", sincelast.Minutes, sincelast.Minutes);
+                       
+                       return GettextCatalog.GetString ("Less than a minute");
                }
        }
 }

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

Reply via email to