Author: lluis
Date: 2006-01-13 12:56:03 -0500 (Fri, 13 Jan 2006)
New Revision: 55530

Modified:
   trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
   trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
Log:
2006-01-13 Lluis Sanchez Gual  <[EMAIL PROTECTED]>   

        * MonoDevelop.Ide.Gui/Workbench.cs: WrapDocument() does not create
        a Document if it already exists. In ActiveDocument use WrapDocument
        instead of FindDocument since the document may not yet exist.
        * MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs: Set the name of the file
        as a tooltip of the tab.



Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog        2006-01-13 
17:55:48 UTC (rev 55529)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog        2006-01-13 
17:56:03 UTC (rev 55530)
@@ -1,3 +1,11 @@
+2006-01-13 Lluis Sanchez Gual  <[EMAIL PROTECTED]>   
+
+       * MonoDevelop.Ide.Gui/Workbench.cs: WrapDocument() does not create
+       a Document if it already exists. In ActiveDocument use WrapDocument
+       instead of FindDocument since the document may not yet exist.
+       * MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs: Set the name of the file
+       as a tooltip of the tab.
+
 2006-01-10 Lluis Sanchez Gual  <[EMAIL PROTECTED]>   
 
        * MonoDevelop.Ide.Templates/FileTemplate.cs: Make FileTemplate public

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
        2006-01-13 17:55:48 UTC (rev 55529)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
        2006-01-13 17:56:03 UTC (rev 55530)
@@ -295,6 +295,10 @@
                                tabLabel.Label.UseMarkup = false;
                        }
                        
+                       if (content.ContentName != null && content.ContentName 
!= "") {
+                               tabLabel.SetTooltip (content.ContentName, 
content.ContentName);
+                       }
+                       
                        try {
                                if (content.ContentName.IndexOfAny (new char[] 
{ '*', '+'}) == -1) {
                                        tabLabel.Icon.Pixbuf = 
FileIconLoader.GetPixbufForFile (content.ContentName, 16);

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs 
2006-01-13 17:55:48 UTC (rev 55529)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs 
2006-01-13 17:56:03 UTC (rev 55530)
@@ -129,7 +129,7 @@
                }
 
                public Document ActiveDocument {
-                       get { return FindDocument 
(workbench.ActiveWorkbenchWindow); }
+                       get { return WrapDocument 
(workbench.ActiveWorkbenchWindow); }
                }
                
                public PadCollection Pads {
@@ -289,7 +289,10 @@
                
                Document WrapDocument (IWorkbenchWindow window)
                {
-                       Document doc = new Document (window);
+                       if (window == null) return null;
+                       Document doc = FindDocument (window);
+                       if (doc != null) return doc;
+                       doc = new Document (window);
                        window.Closing += new WorkbenchWindowEventHandler 
(OnWindowClosing);
                        window.Closed += new EventHandler (OnWindowClosed);
                        Documents.Add (doc);

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

Reply via email to