[Monodevelop-patches-list] r2469 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Gui/Pads Services/ProcessService Services/StatusBar
Lluis Sanchez <lluis@ximian.com>
lluis at mono-cvs.ximian.com
Mon Apr 25 05:56:00 EDT 2005
Author: lluis
Date: 2005-04-25 05:55:59 -0400 (Mon, 25 Apr 2005)
New Revision: 2469
Modified:
trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/DefaultMonitorPad.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/OpenTaskView.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ProcessService/ProcessService.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/StatusBar/DefaultStatusBarService.cs
Log:
2005-04-19 Ben Motmans <ben.motmans at gmail.com>
* Gui/Pads/DefaultMonitorPad.cs
* Services/StatusBar/DefaultStatusBarService.cs:
Clear the output when a combine closes.
* GUI/Pads/OpenTaskView.cs
Reorder of some columns for better view on small resolutions.
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-04-20 05:23:44 UTC (rev 2468)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-04-25 09:55:59 UTC (rev 2469)
@@ -1,3 +1,11 @@
+2005-04-19 Ben Motmans <ben.motmans at gmail.com>
+
+ * Gui/Pads/DefaultMonitorPad.cs
+ * Services/StatusBar/DefaultStatusBarService.cs:
+ Clear the output when a combine closes.
+ * GUI/Pads/OpenTaskView.cs
+ Reorder of some columns for better view on small resolutions.
+
2005-04-17 John Luke <john.luke at gmail.com>
* Makefile.am: fix distcheck
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/DefaultMonitorPad.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/DefaultMonitorPad.cs 2005-04-20 05:23:44 UTC (rev 2468)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/DefaultMonitorPad.cs 2005-04-25 09:55:59 UTC (rev 2469)
@@ -81,6 +81,9 @@
buffer.TagTable.Add (tag);
tags.Add (tag);
+ Runtime.ProjectService.CombineOpened += (CombineEventHandler) Runtime.DispatchService.GuiDispatch (new CombineEventHandler (OnCombineOpen));
+ Runtime.ProjectService.CombineClosed += (CombineEventHandler) Runtime.DispatchService.GuiDispatch (new CombineEventHandler (OnCombineClosed));
+
this.title = title;
this.icon = icon;
this.markupTitle = title;
@@ -95,14 +98,26 @@
}
}
- void OnButtonClearClick (object sender, EventArgs e) {
+ void OnButtonClearClick (object sender, EventArgs e)
+ {
buffer.Clear();
}
- void OnButtonStopClick (object sender, EventArgs e) {
+ void OnButtonStopClick (object sender, EventArgs e)
+ {
asyncOperation.Cancel ();
}
+ void OnCombineOpen (object sender, CombineEventArgs e)
+ {
+ buffer.Clear ();
+ }
+
+ void OnCombineClosed (object sender, CombineEventArgs e)
+ {
+ buffer.Clear ();
+ }
+
public void BeginProgress (string title)
{
this.title = title;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/OpenTaskView.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/OpenTaskView.cs 2005-04-20 05:23:44 UTC (rev 2468)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/OpenTaskView.cs 2005-04-25 09:55:59 UTC (rev 2469)
@@ -60,7 +60,7 @@
// FIXME
}
- const int COL_TYPE = 0, COL_LINE = 1, COL_DESC = 2, COL_PATH = 3, COL_FILE = 4, COL_TASK = 5, COL_READ = 6, COL_MARKED = 7, COL_READ_WEIGHT = 8;
+ const int COL_TYPE = 0, COL_LINE = 1, COL_DESC = 2, COL_FILE = 3, COL_PATH = 4, COL_TASK = 5, COL_READ = 6, COL_MARKED = 7, COL_READ_WEIGHT = 8;
public OpenTaskView()
{
@@ -68,8 +68,8 @@
typeof (Gdk.Pixbuf), // image
typeof (int), // line
typeof (string), // desc
+ typeof (string), // file
typeof (string), // path
- typeof (string), // file
typeof (Task), // task
typeof (bool), // read?
typeof (bool), // marked?
@@ -158,10 +158,10 @@
view.AppendColumn (GettextCatalog.GetString ("Line") , line , "text" , COL_LINE, "weight", COL_READ_WEIGHT);
col = view.AppendColumn (GettextCatalog.GetString ("Description") , desc , "text" , COL_DESC, "weight", COL_READ_WEIGHT, "strikethrough", COL_MARKED);
col.Resizable = true;
+ col = view.AppendColumn (GettextCatalog.GetString ("File") , file , "text" , COL_FILE, "weight", COL_READ_WEIGHT);
+ col.Resizable = true;
col = view.AppendColumn (GettextCatalog.GetString ("Path") , path , "text" , COL_PATH, "weight", COL_READ_WEIGHT);
col.Resizable = true;
- col = view.AppendColumn (GettextCatalog.GetString ("File") , file , "text" , COL_FILE, "weight", COL_READ_WEIGHT);
- col.Resizable = true;
}
void OnCombineOpen(object sender, CombineEventArgs e)
@@ -264,8 +264,8 @@
stock,
t.Line + 1,
t.Description,
+ fileName,
path,
- fileName,
t, false, false, (int) Pango.Weight.Bold);
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ProcessService/ProcessService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ProcessService/ProcessService.cs 2005-04-20 05:23:44 UTC (rev 2468)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ProcessService/ProcessService.cs 2005-04-25 09:55:59 UTC (rev 2469)
@@ -75,7 +75,10 @@
ProcessStartInfo psi = new ProcessStartInfo("xterm",
String.Format (@"-e ""cd {3} ; '{0}' {1} ; {2}""", command, arguments, additionalCommands, workingDirectory));
psi.UseShellExecute = false;
- psi.WorkingDirectory = workingDirectory;
+
+ if (workingDirectory != null)
+ psi.WorkingDirectory = workingDirectory;
+
psi.UseShellExecute = false;
ProcessWrapper p = new ProcessWrapper();
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/StatusBar/DefaultStatusBarService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/StatusBar/DefaultStatusBarService.cs 2005-04-20 05:23:44 UTC (rev 2468)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/StatusBar/DefaultStatusBarService.cs 2005-04-25 09:55:59 UTC (rev 2469)
@@ -25,6 +25,12 @@
statusBar = new SdStatusBar(this);
}
+ protected override void OnInitialize (EventArgs e)
+ {
+ base.OnInitialize (e);
+ Runtime.ProjectService.CombineClosed += OnCombineClosed;
+ }
+
public void Dispose()
{
if (statusBar != null) {
@@ -115,6 +121,11 @@
lastMessage = message;
statusBar.SetMessage(image, stringParserService.Parse(message));
}
+
+ void OnCombineClosed (object sender, CombineEventArgs e)
+ {
+ SetMessage ("");
+ }
bool wasError = false;
string lastMessage = "";
More information about the Monodevelop-patches-list
mailing list