Author: lluis
Date: 2007-07-19 12:36:12 -0400 (Thu, 19 Jul 2007)
New Revision: 82301

Added:
   trunk/monodevelop/Core/src/MonoDevelop.Ide/icons/pindown.png
   trunk/monodevelop/Core/src/MonoDevelop.Ide/icons/pinup.png
Modified:
   trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
   trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/DefaultMonitorPad.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/SearchResultPad.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Search/SearchProgressMonitor.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IPadContainer.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/OutputProgressMonitor.cs
   trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProgressMonitors.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs
   trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
   trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml
   trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
Log:
* MonoDevelop.Ide.Commands/ViewCommands.cs: Minor fix.
* MonoDevelop.Ide.Gui.Pads/DefaultMonitorPad.cs,
  MonoDevelop.Ide.Gui.Pads/SearchResultPad.cs,
  MonoDevelop.Ide.Gui/OutputProgressMonitor.cs,
  MonoDevelop.Ide.Gui/ProgressMonitors.cs,
  MonoDevelop.Ide.Gui.Search/SearchProgressMonitor.cs: Allow
  'pinning' output and search result pads. Pinned pads won't be
  reused (so they will keep the original results) until unpinned.
* MonoDevelop.Ide.addin.xml, MonoDevelop.Ide.mdp, Makefile.am,
  icons/pindown.png, icons/pinup.png: Added pushpin icons.
* MonoDevelop.Ide.Gui/IPadContainer.cs: Fix bug in show/hide event
  notification. Added Destroyed event, needed by the workbench so it
  can properly update the pad list.
* MonoDevelop.Ide.Gui/Workbench.cs,
  MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs: When a pad is closed,
  update the workbench pad list.
* MonoDevelop.Ide.Gui/Pad.cs: The new destroy method allow removing a
  pad from the workbench.

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog        2007-07-19 
16:29:14 UTC (rev 82300)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog        2007-07-19 
16:36:12 UTC (rev 82301)
@@ -1,3 +1,24 @@
+2007-07-19  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
+       * MonoDevelop.Ide.Commands/ViewCommands.cs: Minor fix.
+       * MonoDevelop.Ide.Gui.Pads/DefaultMonitorPad.cs,
+         MonoDevelop.Ide.Gui.Pads/SearchResultPad.cs,
+         MonoDevelop.Ide.Gui/OutputProgressMonitor.cs,
+         MonoDevelop.Ide.Gui/ProgressMonitors.cs,
+         MonoDevelop.Ide.Gui.Search/SearchProgressMonitor.cs: Allow
+         'pinning' output and search result pads. Pinned pads won't be
+         reused (so they will keep the original results) until unpinned.
+       * MonoDevelop.Ide.addin.xml, MonoDevelop.Ide.mdp, Makefile.am,
+         icons/pindown.png, icons/pinup.png: Added pushpin icons.
+       * MonoDevelop.Ide.Gui/IPadContainer.cs: Fix bug in show/hide event
+         notification. Added Destroyed event, needed by the workbench so it
+         can properly update the pad list.
+       * MonoDevelop.Ide.Gui/Workbench.cs,
+         MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs: When a pad is closed,
+         update the workbench pad list.
+       * MonoDevelop.Ide.Gui/Pad.cs: The new destroy method allow removing a
+         pad from the workbench.
+
 2007-07-19  Levi Bard <[EMAIL PROTECTED]>
 
        * MonoDevelop.Ide.Gui.Pads/SearchResultPad.cs: Clear status text on

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am      2007-07-19 
16:29:14 UTC (rev 82300)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am      2007-07-19 
16:36:12 UTC (rev 82301)
@@ -307,6 +307,8 @@
        icons/navigate-next.png \
        icons/navigate-previous.png \
        icons/parsing.png \
+       icons/pindown.png \
+       icons/pinup.png \
        icons/SplashScreen.png \
        icons/system-file-manager.png \
        MonoDevelop.Ide.StandardHeader/StandardHeaderTemplates.xml \

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
 2007-07-19 16:29:14 UTC (rev 82300)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs
 2007-07-19 16:36:12 UTC (rev 82301)
@@ -83,7 +83,6 @@
                                CommandInfo cmd = new CommandInfo (pad.Title);
                                cmd.Icon = pad.Icon;
                                cmd.UseMarkup = true;
-                               cmd.Checked = pad.Visible;
                                info.Add (cmd, pad);
                        }
                }

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IPadContainer.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IPadContainer.cs 
    2007-07-19 16:29:14 UTC (rev 82300)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IPadContainer.cs 
    2007-07-19 16:36:12 UTC (rev 82301)
@@ -31,6 +31,7 @@
 using System.Drawing;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Codons;
+using MonoDevelop.Core;
 
 namespace MonoDevelop.Ide.Gui
 {
@@ -46,6 +47,7 @@
                
                event EventHandler PadShown;
                event EventHandler PadHidden;
+               event EventHandler PadDestroyed;
        }
        
        internal class PadWindow: IPadWindow
@@ -63,6 +65,8 @@
                {
                        this.layout = layout;
                        this.codon = codon;
+                       this.title = GettextCatalog.GetString (codon.Label);
+                       this.icon = codon.Icon;
                }
                
                // This property keeps track of the last focused pad. It is 
used by the
@@ -136,20 +140,27 @@
                        }
                }
                
-               internal void NotifyHidden ()
+               internal void NotifyShown ()
                {
                        if (PadShown != null)
                                PadShown (this, EventArgs.Empty);
                }
                
-               internal void NotifyShown ()
+               internal void NotifyHidden ()
                {
                        if (PadHidden != null)
                                PadHidden (this, EventArgs.Empty);
                }
                
+               internal void NotifyDestroyed ()
+               {
+                       if (PadDestroyed != null)
+                               PadDestroyed (this, EventArgs.Empty);
+               }
+               
                public event EventHandler PadShown;
                public event EventHandler PadHidden;
+               public event EventHandler PadDestroyed;
                
                internal event EventHandler TitleChanged;
                internal event EventHandler IconChanged;

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/OutputProgressMonitor.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/OutputProgressMonitor.cs
     2007-07-19 16:29:14 UTC (rev 82300)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/OutputProgressMonitor.cs
     2007-07-19 16:36:12 UTC (rev 82301)
@@ -75,7 +75,6 @@
                        outputPad.EndProgress ();
                        base.OnCompleted ();
                        
-                       IdeApp.Workbench.ProgressMonitors.ReleasePad 
(outputPad);
                        outputPad = null;
                }
                

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs       
2007-07-19 16:29:14 UTC (rev 82300)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs       
2007-07-19 16:36:12 UTC (rev 82301)
@@ -82,5 +82,11 @@
                internal IPadWindow Window {
                        get { return window; }
                }
+               
+               public void Destroy ()
+               {
+                       Visible = false;
+                       ((DefaultWorkbench)workbench).RemovePad (content);
+               }
        }
 }

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProgressMonitors.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProgressMonitors.cs
  2007-07-19 16:29:14 UTC (rev 82300)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProgressMonitors.cs
  2007-07-19 16:36:12 UTC (rev 82301)
@@ -100,72 +100,95 @@
                        if (icon == null)
                                icon = MonoDevelop.Core.Gui.Stock.OutputIcon;
 
+                       int instanceCount = -1;
                        if (allowMonitorReuse) {
                                lock (outputMonitors) {
                                        // Look for an available pad
                                        for (int n=0; n<outputMonitors.Count; 
n++) {
                                                Pad mpad = (Pad) outputMonitors 
[n];
-                                               if (mpad.Title == title) {
-                                                       pad = mpad;
-                                                       outputMonitors.RemoveAt 
(n);
-                                                       break;
+                                               DefaultMonitorPad mon = 
(DefaultMonitorPad) mpad.Content;
+                                               if (mon.TypeTag == title) {
+                                                       if (mon.InstanceNum > 
instanceCount)
+                                                               instanceCount = 
mon.InstanceNum;
+                                                       if (mon.AllowReuse) {
+                                                               pad = mpad;
+                                                               break;
+                                                       }
                                                }
                                        }
                                }
                                if (pad != null) {
                                        if (bringToFront) pad.BringToFront ();
-                                       return new OutputProgressMonitor 
((DefaultMonitorPad) pad.Content, title, icon);
+                                       return new OutputProgressMonitor 
((DefaultMonitorPad) pad.Content, pad.Title, icon);
                                }
                        }
+
+                       instanceCount++;
+                       DefaultMonitorPad monitorPad = new DefaultMonitorPad 
(title, icon, instanceCount);
+                       monitorId++;
                        
-                       DefaultMonitorPad monitorPad = new DefaultMonitorPad 
(title, icon);
-                       monitorId++;
+                       if (instanceCount > 0)
+                               title += " (" + (instanceCount+1) + ")";
                        pad = IdeApp.Workbench.ShowPad (monitorPad, "OutputPad" 
+ monitorId, title, "Bottom", icon);
-                       if (bringToFront) pad.BringToFront ();
+                       outputMonitors.Add (pad);
+                       
+                       if (instanceCount > 0) {
+                               // Additional output pads will be destroyed 
when hidden
+                               pad.Window.PadHidden += delegate {
+                                       outputMonitors.Remove (pad);
+                                       pad.Destroy ();
+                               };
+                       }
+                       if (bringToFront)
+                               pad.BringToFront ();
 
                        return new OutputProgressMonitor (monitorPad, title, 
icon);
                }
 
-               internal void ReleasePad (DefaultMonitorPad pad)
-               {
-                       lock (outputMonitors) {
-                               outputMonitors.Add (IdeApp.Workbench.FindPad 
(pad));
-                       }
-               }
-               
                public ISearchProgressMonitor GetSearchProgressMonitor (bool 
bringToFront)
                {
                        Pad pad = null;
                        string title = GettextCatalog.GetString ("Search 
Results");
                        
+                       int instanceNum = -1;
                        lock (searchMonitors) {
                                // Look for an available pad
                                for (int n=0; n<searchMonitors.Count; n++) {
                                        Pad mpad = (Pad) searchMonitors [n];
-                                       if 
(((SearchResultPad)mpad.Content).AllowReuse) {
+                                       SearchResultPad rp = (SearchResultPad) 
mpad.Content;
+                                       if (rp.InstanceNum > instanceNum)
+                                               instanceNum = rp.InstanceNum;
+                                       if (rp.AllowReuse) {
                                                pad = mpad;
-                                               searchMonitors.RemoveAt (n);
                                                break;
                                        }
                                }
                        }
                        if (pad != null) {
                                if (bringToFront) pad.BringToFront ();
-                               return new SearchProgressMonitor 
((SearchResultPad) pad.Content, title);
+                               return new SearchProgressMonitor 
((SearchResultPad) pad.Content, pad.Title);
                        }
                        
-                       SearchResultPad monitorPad = new SearchResultPad ();
-                       pad = IdeApp.Workbench.ShowPad (monitorPad, "SearchPad" 
+ (monitorId++), GettextCatalog.GetString ("Search Results"), "Bottom", 
MonoDevelop.Core.Gui.Stock.FindIcon);
-                       if (bringToFront) pad.BringToFront ();
+                       instanceNum++;
+                       if (instanceNum > 0)
+                               title += " (" + (instanceNum+1) + ")";
+                       
+                       SearchResultPad monitorPad = new SearchResultPad 
(instanceNum);
+                       pad = IdeApp.Workbench.ShowPad (monitorPad, "SearchPad" 
+ (monitorId++), title, "Bottom", MonoDevelop.Core.Gui.Stock.FindIcon);
+                   searchMonitors.Add (pad);
 
-                       return new SearchProgressMonitor (monitorPad, title);
-               }
+                       if (searchMonitors.Count > 1) {
+                               // Additional search pads will be destroyed 
when hidden
+                               pad.Window.PadHidden += delegate {
+                                       searchMonitors.Remove (pad);
+                                       pad.Destroy ();
+                               };
+                       }
+                       
+                       if (bringToFront)
+                           pad.BringToFront ();
 
-               internal void ReleasePad (SearchResultPad pad)
-               {
-                       lock (searchMonitors) {
-                               searchMonitors.Add (IdeApp.Workbench.FindPad 
(pad));
-                       }
+                       return new SearchProgressMonitor (monitorPad, 
pad.Title);
                }
        }
 }

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs
        2007-07-19 16:29:14 UTC (rev 82300)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs
        2007-07-19 16:36:12 UTC (rev 82301)
@@ -563,6 +563,9 @@
                
                public void RemovePad (PadCodon content)
                {
+                       PadWindow win = (PadWindow) padWindows [content];
+                       win.NotifyDestroyed ();
+                       
                        DockItem item = GetDockItem (content);
                        if (item != null) {
                                if (item.IsAttached) {
@@ -571,7 +574,6 @@
                                }
                                item.Destroy ();
                        }
-                       PadWindow win = (PadWindow) padWindows [content];
                        padWindows.Remove (content);
                        padCodons.Remove (win);
                        

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs 
2007-07-19 16:29:14 UTC (rev 82300)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs 
2007-07-19 16:36:12 UTC (rev 82301)
@@ -250,7 +250,7 @@
                                ActiveDocument.Close ();
                }
 
-               public Pad ShowPad (PadCodon content)
+               internal Pad ShowPad (PadCodon content)
                {
                        workbench.ShowPad (content);
                        return WrapPad (content);
@@ -499,6 +499,9 @@
                {
                        Pad pad = new Pad (workbench, padContent);
                        Pads.Add (pad);
+                       pad.Window.PadDestroyed += delegate {
+                               Pads.Remove (pad);
+                       };
                        return pad;
                }
                

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/DefaultMonitorPad.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/DefaultMonitorPad.cs
    2007-07-19 16:29:14 UTC (rev 82300)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/DefaultMonitorPad.cs
    2007-07-19 16:36:12 UTC (rev 82301)
@@ -31,6 +31,7 @@
                Gtk.ScrolledWindow scroller;
                Gtk.HBox hbox;
                ToolButton buttonStop;
+               ToggleToolButton buttonPin;
 
                private static Gtk.Tooltips tips = new Gtk.Tooltips ();
                
@@ -40,14 +41,21 @@
                ArrayList tags = new ArrayList ();
                Stack indents = new Stack ();
 
-               string title;
+               string originalTitle;
                string icon;
                string id;
+               int instanceNum;
+               string typeTag;
 
                private IAsyncOperation asyncOperation;
 
-               public DefaultMonitorPad (string title, string icon)
+               public DefaultMonitorPad (string typeTag, string icon, int 
instanceNum)
                {
+                       this.instanceNum = instanceNum;
+                       this.typeTag = typeTag;
+                       
+                       this.icon = icon;
+                       
                        buffer = new Gtk.TextBuffer (new Gtk.TextTagTable ());
                        textEditorControl = new Gtk.TextView (buffer);
                        textEditorControl.Editable = false;
@@ -56,9 +64,10 @@
                        scroller.Add (textEditorControl);
 
                        Toolbar toolbar = new Toolbar ();
-                       toolbar.IconSize = IconSize.SmallToolbar;
+                       toolbar.IconSize = IconSize.Menu;
                        toolbar.Orientation = Orientation.Vertical;
                        toolbar.ToolbarStyle = ToolbarStyle.Icons;
+                       toolbar.ShowArrow = true;
 
                        buttonStop = new ToolButton ("gtk-stop");
                        buttonStop.Clicked += new EventHandler 
(OnButtonStopClick);
@@ -70,6 +79,11 @@
                        buttonClear.SetTooltip (tips, GettextCatalog.GetString 
("Clear console"), GettextCatalog.GetString ("Clear console"));
                        toolbar.Insert (buttonClear, -1);
 
+                       buttonPin = new ToggleToolButton ("md-pin-up");
+                       buttonPin.Clicked += new EventHandler 
(OnButtonPinClick);
+                       buttonPin.SetTooltip (tips, GettextCatalog.GetString 
("Pin output pad"), GettextCatalog.GetString ("Pin output pad"));
+                       toolbar.Insert (buttonPin, -1);
+
                        hbox = new HBox (false, 5);
                        hbox.PackStart (scroller, true, true, 0);
                        hbox.PackEnd (toolbar, false, false, 0);
@@ -86,16 +100,12 @@
                        IdeApp.ProjectOperations.CombineOpened += 
(CombineEventHandler) Services.DispatchService.GuiDispatch (new 
CombineEventHandler (OnCombineOpen));
                        IdeApp.ProjectOperations.CombineClosed += 
(CombineEventHandler) Services.DispatchService.GuiDispatch (new 
CombineEventHandler (OnCombineClosed));
 
-                       this.title = title;
-                       this.icon = icon;
-                       
                        Control.ShowAll ();
                }
 
                void IPadContent.Initialize (IPadWindow window)
                {
                        this.window = window;
-                       window.Title = title;
                        window.Icon = icon;
                }
                
@@ -127,12 +137,24 @@
                {
                        buffer.Clear ();
                }
+               
+               void OnButtonPinClick (object sender, EventArgs e)
+               {
+                       if (buttonPin.Active)
+                               buttonPin.StockId = "md-pin-down";
+                       else
+                               buttonPin.StockId = "md-pin-up";
+               }
+               
+               public bool AllowReuse {
+                       get { return !buttonStop.Sensitive && 
!buttonPin.Active; }
+               }
 
                public void BeginProgress (string title)
                {
-                       this.title = title;
+                       originalTitle = window.Title;
                        buffer.Clear ();
-                       window.Title = "<span foreground=\"blue\">" + title + 
"</span>";
+                       window.Title = "<span foreground=\"blue\">" + 
originalTitle + "</span>";
                        buttonStop.Sensitive = true;
                }
                
@@ -177,10 +199,22 @@
                public string DefaultPlacement {
                        get { return "Bottom"; }
                }
-               
+
+               public string TypeTag {
+                       get {
+                               return typeTag;
+                       }
+               }
+
+               public int InstanceNum {
+                       get {
+                               return instanceNum;
+                       }
+               }
+
                public void EndProgress ()
                {
-                       window.Title = title;
+                       window.Title = originalTitle;
                        buttonStop.Sensitive = false;
                }
                

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/SearchResultPad.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/SearchResultPad.cs
      2007-07-19 16:29:14 UTC (rev 82300)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/SearchResultPad.cs
      2007-07-19 16:36:12 UTC (rev 82301)
@@ -27,10 +27,11 @@
                ListStore store;
                string basePath;
                IAsyncOperation asyncOperation;
-               string title;
+               string originalTitle;
                string id;
                int matchCount;
                string statusText;
+               int instanceNum;
                
                const int COL_TYPE = 0, COL_LINE = 1, COL_COLUMN = 2, COL_DESC 
= 3, COL_FILE = 4, COL_PATH = 5, COL_FULLPATH = 6, COL_READ = 7, 
COL_READ_WEIGHT = 8, COL_ISFILE = 9;
                
@@ -39,6 +40,7 @@
                Gtk.ScrolledWindow logScroller;
                ToggleToolButton buttonOutput;
                ToolButton buttonStop;
+               ToggleToolButton buttonPin;
                Label status;
                Gtk.Tooltips tips = new Gtk.Tooltips ();
                
@@ -46,14 +48,17 @@
                Widget control;
                IPadWindow window;
                
-               public SearchResultPad ()
+               public SearchResultPad (int instanceNum)
                {
+                       this.instanceNum = instanceNum;
+                       
                        // Toolbar
                        
                        Toolbar toolbar = new Toolbar ();
-                       toolbar.IconSize = IconSize.SmallToolbar;
+                       toolbar.IconSize = IconSize.Menu;
                        toolbar.Orientation = Orientation.Vertical;
                        toolbar.ToolbarStyle = ToolbarStyle.Icons;
+                       toolbar.ShowArrow = true;
 
                        buttonStop = new ToolButton ("gtk-stop");
                        buttonStop.Clicked += new EventHandler 
(OnButtonStopClick);
@@ -69,6 +74,11 @@
                        buttonOutput.Clicked += new EventHandler 
(OnButtonOutputClick);
                        buttonOutput.SetTooltip (tips, GettextCatalog.GetString 
("Show output"), "Show output");
                        toolbar.Insert (buttonOutput, -1);
+
+                       buttonPin = new ToggleToolButton ("md-pin-up");
+                       buttonPin.Clicked += new EventHandler 
(OnButtonPinClick);
+                       buttonPin.SetTooltip (tips, GettextCatalog.GetString 
("Pin results pad"), GettextCatalog.GetString ("Pin results pad"));
+                       toolbar.Insert (buttonPin, -1);
                        
                        // Results list
                        
@@ -133,13 +143,12 @@
                {
                        this.window = window;
                        window.Icon = MonoDevelop.Core.Gui.Stock.FindIcon;
-                       window.Title = GettextCatalog.GetString ("Search 
Results");
                }
                
                public void BeginProgress (string title)
                {
-                       this.title = title;
-                       window.Title = "<span foreground=\"blue\">" + title + 
"</span>";
+                       originalTitle = window.Title;
+                       window.Title = "<span foreground=\"blue\">" + 
originalTitle + "</span>";
                        
                        matchCount = 0;
                        store.Clear ();
@@ -152,13 +161,13 @@
                
                public void EndProgress ()
                {
-                       window.Title = title;
+                       window.Title = originalTitle;
                        buttonStop.Sensitive = false;
                        status.Text = " " + statusText;
                }
                
                public bool AllowReuse {
-                       get { return !buttonStop.Sensitive; }
+                       get { return !buttonStop.Sensitive && 
!buttonPin.Active; }
                }
                
                public IAsyncOperation AsyncOperation {
@@ -220,6 +229,20 @@
                                logScroller.Hide ();
                        }
                }
+               
+               void OnButtonPinClick (object sender, EventArgs e)
+               {
+                       if (buttonPin.Active)
+                               buttonPin.StockId = "md-pin-down";
+                       else
+                               buttonPin.StockId = "md-pin-up";
+               }
+               
+               public int InstanceNum {
+                       get {
+                               return instanceNum;
+                       }
+               }
 
                public void WriteText (string text)
                {

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Search/SearchProgressMonitor.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Search/SearchProgressMonitor.cs
      2007-07-19 16:29:14 UTC (rev 82300)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Search/SearchProgressMonitor.cs
      2007-07-19 16:36:12 UTC (rev 82301)
@@ -95,7 +95,6 @@
                        outputPad.EndProgress ();
                        base.OnCompleted ();
                        
-                       IdeApp.Workbench.ProgressMonitors.ReleasePad 
(outputPad);
                        outputPad = null;
                }
                

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml        
2007-07-19 16:29:14 UTC (rev 82300)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml        
2007-07-19 16:36:12 UTC (rev 82301)
@@ -1257,6 +1257,8 @@
                <StockIcon stockid = "md-parser" resource = "parsing.png" />
                <StockIcon stockid = "md-navigate-next" resource = 
"navigate-next.png" />
                <StockIcon stockid = "md-navigate-previous" resource = 
"navigate-previous.png" />
+               <StockIcon stockid = "md-pin-up" resource = "pinup.png" />
+               <StockIcon stockid = "md-pin-down" resource = "pindown.png" />
                <StockIcon stockid = "system-file-manager" resource = 
"system-file-manager.png" />
        </Extension>
        

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp      
2007-07-19 16:29:14 UTC (rev 82300)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp      
2007-07-19 16:36:12 UTC (rev 82301)
@@ -305,6 +305,8 @@
     <File 
name="./gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs" 
subtype="Code" buildaction="Compile" />
     <File name="./MonoDevelop.Ide.Commands/TextEditorCommands.cs" 
subtype="Code" buildaction="Compile" />
     <File name="./icons/system-file-manager.png" subtype="Code" 
buildaction="EmbedAsResource" />
+    <File name="./icons/pindown.png" subtype="Code" 
buildaction="EmbedAsResource" />
+    <File name="./icons/pinup.png" subtype="Code" 
buildaction="EmbedAsResource" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="False" refto="gecko-sharp, 
Version=2.0.0.0, Culture=neutral, PublicKeyToken=ccf7d78a55e9f021" />

Added: trunk/monodevelop/Core/src/MonoDevelop.Ide/icons/pindown.png
===================================================================
(Binary files differ)


Property changes on: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/icons/pindown.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/monodevelop/Core/src/MonoDevelop.Ide/icons/pinup.png
===================================================================
(Binary files differ)


Property changes on: trunk/monodevelop/Core/src/MonoDevelop.Ide/icons/pinup.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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

Reply via email to