From commit-watcher at mono-cvs.ximian.com Tue Feb 1 00:54:44 2005 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Tue, 1 Feb 2005 00:54:44 -0500 (EST) Subject: [Monodevelop-patches-list] r2219 - in trunk/MonoDevelop/Core/src: AddIns/BackendBindings/CSharpBinding AddIns/BackendBindings/CSharpBinding/Parser AddIns/DisplayBindings/SourceEditor AddIns/DisplayBindings/SourceEditor/Gui ICSharpCode.SharpRefactory ICSharpCode.SharpRefactory/src/Parser/generated MonoDevelop.Base MonoDevelop.Base/Internal/Parser MonoDevelop.Base/Internal/Parser/Implementations Message-ID: <20050201055444.D2CC794764@mono-cvs.ximian.com> Author: jluke Date: 2005-02-01 00:54:44 -0500 (Tue, 01 Feb 2005) New Revision: 2219 Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Parser/Parser.cs trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/ChangeLog trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/src/Parser/generated/Error.cs trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/ICompilationUnitBase.cs trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/Implementations/AbstractCompilationUnit.cs Log: change the parser errors to be accessed easier and get closer to displaying errors better Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog 2005-02-01 04:21:19 UTC (rev 2218) +++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog 2005-02-01 05:54:44 UTC (rev 2219) @@ -1,3 +1,7 @@ +2005-02-01 John Luke + + * Parser/Parser.cs: use ErrorInfo + 2005-01-28 John Luke * Parser/Resolver.cs (IsAccessible): Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Parser/Parser.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Parser/Parser.cs 2005-02-01 04:21:19 UTC (rev 2218) +++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Parser/Parser.cs 2005-02-01 05:54:44 UTC (rev 2219) @@ -98,7 +98,7 @@ visitor.Visit(p.compilationUnit, null); visitor.Cu.ErrorsDuringCompile = p.Errors.count > 0; visitor.Cu.Tag = p.compilationUnit; - visitor.Cu.ErrorOutput = p.Errors.ErrorOutput; + visitor.Cu.ErrorInformation = p.Errors.ErrorInformation; RetrieveRegions(visitor.Cu, lexer.SpecialTracker); foreach (IClass c in visitor.Cu.Classes) c.Region.FileName = fileName; Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2005-02-01 04:21:19 UTC (rev 2218) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2005-02-01 05:54:44 UTC (rev 2219) @@ -1,3 +1,8 @@ +2005-02-01 John Luke + + * Gui.SourceEditorBuffer.cs: use ErrorInfo + and error underline improvements + 2005-01-31 John Luke * EditorBindings.glade: Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs 2005-02-01 04:21:19 UTC (rev 2218) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs 2005-02-01 05:54:44 UTC (rev 2219) @@ -15,6 +15,7 @@ using System.Collections; using System.Runtime.InteropServices; +using ICSharpCode.SharpRefactory.Parser; using GtkSourceView; namespace MonoDevelop.SourceEditor.Gui @@ -74,7 +75,6 @@ SourceEditorView view; int highlightLine = -1; bool underlineErrors = true; - ArrayList points; IParserService ps = (IParserService)ServiceManager.GetService (typeof (IParserService)); @@ -90,7 +90,6 @@ underlineErrors = value; /* still too broken to leave on if (underlineErrors) { - points = new ArrayList (); ps.ParseInformationChanged += (ParseInformationEventHandler) Runtime.DispatchService.GuiDispatch (new ParseInformationEventHandler (ParseChanged)); } else { @@ -122,48 +121,39 @@ TagTable.Add (highlightLineTag); } - public void ParseChanged (object o, ParseInformationEventArgs e) + void ParseChanged (object o, ParseInformationEventArgs e) { if (view != null) { if (view.ParentEditor.DisplayBinding.ContentName == e.FileName) { + + RemoveTag (compilation_error, StartIter, EndIter); + if (e.ParseInformation.MostRecentCompilationUnit.ErrorsDuringCompile) { - string[] errors = e.ParseInformation.MostRecentCompilationUnit.ErrorOutput.Split ('\n'); - foreach (string error in errors) { - string[] pieces = error.Split (' '); - if (pieces.Length == 1) - continue; - int[] point = new int[2]; - point[0] = Convert.ToInt32 (pieces[2]) - 1; - point[1] = Convert.ToInt32 (pieces[4]) - 1; - points.Add (point); + ErrorInfo[] errors = e.ParseInformation.MostRecentCompilationUnit.ErrorInformation; + foreach (ErrorInfo error in errors) { + // adjust to 0 base + DrawError (error.Line - 1, error.Column - 1); } } - else { - points.Clear (); - } - DrawErrors (); } } } - bool DrawErrors () + // FIXME: underlines under keywords get ignored + void DrawError (int line, int column) { - // FIXME: clear old ones nicer - RemoveTag (compilation_error, StartIter, EndIter); - if (!underlineErrors) - return false; + //Console.WriteLine ("error at: {0} {1}", line, column); + TextIter start = GetIterAtLine (line); + if (column < start.CharsInLine) + start.LineOffset = column; - foreach (int[] point in points) { - //Console.WriteLine ("Error is line: {0} col: {1}", point[0], point[1]); - // FIXME: maybe we can be more precise - TextIter start = GetIterAtLineOffset (point[0], point[1]); - TextIter end = start; + TextIter end = start; + if (!end.EndsLine ()) end.ForwardToLineEnd (); - ApplyTag (compilation_error, start, end); - } - // keep it running - return true; + // FIXME: we can either skip or go backwards + if (GetText (start, end, false).Trim () != "") + ApplyTag (compilation_error, start, end); } public void MarkupLine (int linenumber) Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am 2005-02-01 04:21:19 UTC (rev 2218) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am 2005-02-01 05:54:44 UTC (rev 2219) @@ -80,6 +80,7 @@ /r:$(top_builddir)/build/bin/MonoDevelop.Base.dll \ /r:$(top_builddir)/build/bin/MonoDevelop.Gui.Utils.dll \ /r:$(top_builddir)/build/bin/MonoDevelop.Gui.Widgets.dll \ + /r:$(top_builddir)/build/bin/ICSharpCode.SharpRefactory.dll \ $(GTK_SHARP_LIBS) \ $(GNOME_VFS_SHARP_LIBS) \ $(GLADE_SHARP_LIBS) \ Modified: trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/ChangeLog 2005-02-01 04:21:19 UTC (rev 2218) +++ trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/ChangeLog 2005-02-01 05:54:44 UTC (rev 2219) @@ -1,5 +1,11 @@ 2005-01-31 John Luke + * src/Parser/generated/Error.cs: lets not + force people to parse the error message + instead use an ErrorInfo struct + +2005-01-31 John Luke + * src/Lexer/Lexer.cs: * src/Parser/generated/cs.ATG: * src/Parser/generated/Parser.cs: Modified: trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/src/Parser/generated/Error.cs =================================================================== --- trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/src/Parser/generated/Error.cs 2005-02-01 04:21:19 UTC (rev 2218) +++ trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/src/Parser/generated/Error.cs 2005-02-01 05:54:44 UTC (rev 2219) @@ -1,48 +1,63 @@ using System; -using System.Text; +using System.Collections; namespace ICSharpCode.SharpRefactory.Parser { public delegate void ErrorCodeProc(int line, int col, int n); public delegate void ErrorMsgProc(int line, int col, string msg); + + public struct ErrorInfo + { + public int Column; + public int Line; + public string Message; + + public ErrorInfo (int line, int column, string message) + { + Column = column; + Line = line; + Message = message; + } + + public override string ToString () + { + return String.Format ("-- line {0} col {1} : {2}", Line, Column, Message); + } + } public class Errors { - public int count = 0; // number of errors detected + public int count = 0; // number of errors detected public ErrorCodeProc SynErr; public ErrorCodeProc SemErr; public ErrorMsgProc Error; - StringBuilder errorText = new StringBuilder(); - - public string ErrorOutput { - get { - return errorText.ToString(); - } - } + ArrayList errorInfo; + public Errors() { + errorInfo = new ArrayList (); SynErr = new ErrorCodeProc(DefaultCodeError); // syntactic errors SemErr = new ErrorCodeProc(DefaultCodeError); // semantic errors Error = new ErrorMsgProc(DefaultMsgError); // user defined string based errors } + + public ErrorInfo[] ErrorInformation + { + get { + return (ErrorInfo[]) errorInfo.ToArray (typeof (ErrorInfo)); + } + } - // public void Exception (string s) - // { - // Console.WriteLine(s); - // System.Environment.Exit(0); - // } - void DefaultCodeError (int line, int col, int n) { - errorText.Append(String.Format("-- line {0} col {1} : error {2}", line, col, n)); - errorText.Append("\n"); + errorInfo.Add (new ErrorInfo (line, col, String.Format ("error {0}", n))); count++; } void DefaultMsgError (int line, int col, string s) { - errorText.Append(String.Format("-- line {0} col {1} : {2}", line, col, s)); - errorText.Append("\n"); + errorInfo.Add (new ErrorInfo (line, col, s)); count++; } - } // Errors + } } + Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-02-01 04:21:19 UTC (rev 2218) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-02-01 05:54:44 UTC (rev 2219) @@ -1,3 +1,8 @@ +2005-02-02 John Luke + + * Parser/ICompilationUnitBase.cs: + * Parser/Implementations/AbstractCompilationUnit.cs: adjust to ErrorInfo + 2005-01-31 Lluis Sanchez Gual * Services/Project/DefaultProjectService.cs: In BuildActiveCombine(), Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/ICompilationUnitBase.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/ICompilationUnitBase.cs 2005-02-01 04:21:19 UTC (rev 2218) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/ICompilationUnitBase.cs 2005-02-01 05:54:44 UTC (rev 2219) @@ -7,6 +7,7 @@ using System.Collections; using System.Collections.Specialized; +using ICSharpCode.SharpRefactory.Parser; namespace MonoDevelop.Internal.Parser { @@ -17,7 +18,7 @@ set; } - string ErrorOutput { + ErrorInfo[] ErrorInformation { get; set; } Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/Implementations/AbstractCompilationUnit.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/Implementations/AbstractCompilationUnit.cs 2005-02-01 04:21:19 UTC (rev 2218) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/Implementations/AbstractCompilationUnit.cs 2005-02-01 05:54:44 UTC (rev 2219) @@ -7,6 +7,7 @@ using System; using System.Collections; using System.Collections.Specialized; +using ICSharpCode.SharpRefactory.Parser; namespace MonoDevelop.Internal.Parser { @@ -43,7 +44,7 @@ protected bool errorsDuringCompile = false; protected object tag = null; protected ArrayList foldingRegions = new ArrayList(); - protected string erroroutput = String.Empty; + protected ErrorInfo[] errorInfo; public bool ErrorsDuringCompile { get { @@ -54,12 +55,12 @@ } } - public string ErrorOutput { + public ErrorInfo[] ErrorInformation { get { - return erroroutput; + return errorInfo; } set { - erroroutput = value; + errorInfo = value; } } From commit-watcher at mono-cvs.ximian.com Tue Feb 1 22:20:18 2005 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Tue, 1 Feb 2005 22:20:18 -0500 (EST) Subject: [Monodevelop-patches-list] r2220 - trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui Message-ID: <20050202032018.64EC494764@mono-cvs.ximian.com> Author: jluke Date: 2005-02-01 22:20:18 -0500 (Tue, 01 Feb 2005) New Revision: 2220 Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs Log: a little more refinement to error underlines, it would be helpful if someone could test and send me a list of things it breaks on Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs 2005-02-01 05:54:44 UTC (rev 2219) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs 2005-02-02 03:20:18 UTC (rev 2220) @@ -109,51 +109,63 @@ markup = new TextTag ("breakpoint"); markup.Background = "yellow"; TagTable.Add (markup); + complete_ahead = new TextTag ("complete_ahead"); complete_ahead.Foreground = "grey"; TagTable.Add (complete_ahead); + compilation_error = new TextTag ("compilation_error"); compilation_error.Underline = Pango.Underline.Error; TagTable.Add (compilation_error); + complete_end = CreateMark (null, StartIter, true); highlightLineTag = new TextTag ("highlightLine"); highlightLineTag.Background = "lightgrey"; TagTable.Add (highlightLineTag); } - + void ParseChanged (object o, ParseInformationEventArgs e) { - if (view != null) { - if (view.ParentEditor.DisplayBinding.ContentName == e.FileName) { + if (view != null && view.ParentEditor.DisplayBinding.ContentName == e.FileName) + { + RemoveTag (compilation_error, StartIter, EndIter); - RemoveTag (compilation_error, StartIter, EndIter); - - if (e.ParseInformation.MostRecentCompilationUnit.ErrorsDuringCompile) { - ErrorInfo[] errors = e.ParseInformation.MostRecentCompilationUnit.ErrorInformation; - foreach (ErrorInfo error in errors) { - // adjust to 0 base - DrawError (error.Line - 1, error.Column - 1); - } - } - } + if (e.ParseInformation.MostRecentCompilationUnit.ErrorsDuringCompile) + DrawErrors (e.ParseInformation.MostRecentCompilationUnit.ErrorInformation); } } + void DrawErrors (ErrorInfo[] errors) + { + foreach (ErrorInfo error in errors) + DrawError (error.Line - 1, error.Column - 1); + } + // FIXME: underlines under keywords get ignored + // because we class with gtksourceview void DrawError (int line, int column) { - //Console.WriteLine ("error at: {0} {1}", line, column); TextIter start = GetIterAtLine (line); - if (column < start.CharsInLine) + + // FIXME: why is this necessary + if (column < start.CharsInLine) { start.LineOffset = column; + } + else { + start.LineOffset = start.CharsInLine; + } + // FIXME: sometimes this is wrong + start.BackwardWordStart (); + TextIter end = start; - if (!end.EndsLine ()) - end.ForwardToLineEnd (); + end.ForwardWordEnd (); - // FIXME: we can either skip or go backwards - if (GetText (start, end, false).Trim () != "") + //Console.WriteLine ("underline error: {0}", GetText (start, end, false)); + //if (GetText (start, end, false).Trim () != "") ApplyTag (compilation_error, start, end); + //else + // Console.WriteLine ("something didn't work"); } public void MarkupLine (int linenumber) From commit-watcher at mono-cvs.ximian.com Wed Feb 2 11:29:10 2005 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Wed, 2 Feb 2005 11:29:10 -0500 (EST) Subject: [Monodevelop-patches-list] r2221 - in trunk/MonoDevelop: . Extras/MonoQuery Extras/MonoQuery/Gui/SqlQueryView Message-ID: <20050202162910.2FE9494764@mono-cvs.ximian.com> Author: chergert Date: 2005-02-02 11:29:09 -0500 (Wed, 02 Feb 2005) New Revision: 2221 Modified: trunk/MonoDevelop/Extras/MonoQuery/ChangeLog trunk/MonoDevelop/Extras/MonoQuery/Gui/SqlQueryView/SqlQueryView.cs trunk/MonoDevelop/Extras/MonoQuery/Makefile.am trunk/MonoDevelop/configure.in Log: * Fix monoquery build on mono 1.0.x builds that lack SqliteDataAdapter. Modified: trunk/MonoDevelop/Extras/MonoQuery/ChangeLog =================================================================== --- trunk/MonoDevelop/Extras/MonoQuery/ChangeLog 2005-02-02 03:20:18 UTC (rev 2220) +++ trunk/MonoDevelop/Extras/MonoQuery/ChangeLog 2005-02-02 16:29:09 UTC (rev 2221) @@ -1,3 +1,7 @@ +2005-02-02 Christian Hergert + + * Extras/MonoQuery/Gui/SqlQueryView/SqlQueryView.cs: flush + 2005-01-31 Christian Hergert * Extras/MonoQuery/Gui/SqlQueryView/SqlQueryView.cs: Updated to new Modified: trunk/MonoDevelop/Extras/MonoQuery/Gui/SqlQueryView/SqlQueryView.cs =================================================================== --- trunk/MonoDevelop/Extras/MonoQuery/Gui/SqlQueryView/SqlQueryView.cs 2005-02-02 03:20:18 UTC (rev 2220) +++ trunk/MonoDevelop/Extras/MonoQuery/Gui/SqlQueryView/SqlQueryView.cs 2005-02-02 16:29:09 UTC (rev 2221) @@ -128,7 +128,6 @@ public SqlQueryViewToolbar() : base() { this.ToolbarStyle = ToolbarStyle.BothHoriz; - Tooltips tips = new Tooltips(); Gtk.ToolButton execute = new Gtk.ToolButton( Gtk.Stock.Execute ); execute.Clicked += new EventHandler( OnExecuteClicked ); @@ -140,4 +139,4 @@ this.Run( this, new EventArgs() ); } } -} \ No newline at end of file +} Modified: trunk/MonoDevelop/Extras/MonoQuery/Makefile.am =================================================================== --- trunk/MonoDevelop/Extras/MonoQuery/Makefile.am 2005-02-02 03:20:18 UTC (rev 2220) +++ trunk/MonoDevelop/Extras/MonoQuery/Makefile.am 2005-02-02 16:29:09 UTC (rev 2221) @@ -12,7 +12,6 @@ Connection/Interface/IConnection.cs \ Connection/Npgsql/NpgsqlConnectionWrapper.cs \ Connection/Mysql/MysqlConnectionWrapper.cs \ -Connection/Sqlite/SqliteConnectionWrapper.cs \ Exceptions/Abstract/MonoQueryAbstractException.cs \ Exceptions/ConnectionStringException.cs \ Exceptions/ExecuteProcedureException.cs \ @@ -34,8 +33,16 @@ Gui/SqlQueryView/SqlQueryView.cs \ Services/MonoQueryService.cs -build_sources = $(addprefix $(srcdir)/, $(FILES)) +if ENABLE_MONOQUERY_SQLITE +SQLITE_FILES=Connection/Sqlite/SqliteConnectionWrapper.cs +else +SQLITE_FILES= +endif + +build_sources = $(addprefix $(srcdir)/, $(FILES)) \ + $(addprefix $(srcdir)/, $(SQLITE_FILES)) + REFS = /r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \ /r:$(top_builddir)/build/bin/MonoDevelop.Base.dll \ /r:$(top_builddir)/build/bin/MonoDevelop.Gui.Widgets.dll \ Modified: trunk/MonoDevelop/configure.in =================================================================== --- trunk/MonoDevelop/configure.in 2005-02-02 03:20:18 UTC (rev 2220) +++ trunk/MonoDevelop/configure.in 2005-02-02 16:29:09 UTC (rev 2221) @@ -122,6 +122,10 @@ dnl AC_SUBST(MONO_DEBUGGER_LIBS) enable_debugger=no +dnl check for sqlite supported mono +MONOQUERY_REQUIRED_MONO_VERSION=1.1.2.99 +PKG_CHECK_MODULES(MONO_VERSION, mono >= MONOQUERY_REQUIRED_MONO_VERSION, enable_sqlite=yes, enable_sqliter=no) + MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`" AC_SUBST(MOZILLA_HOME) @@ -148,6 +152,9 @@ enable_update_mimedb=yes) AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes) +dnl MonoQuery +PKG_CHECK_MODULES(MONOQUERY_DEPENDENCIES_SQLITE,mono >= 1.1.2.99, enable_monoquery_sqlite=yes, enable_monoquery_sqlite=no) +AM_CONDITIONAL(ENABLE_MONOQUERY_SQLITE, test x$enable_monoquery_sqlite = xyes) dnl Intl ALL_LINGUAS="da es fr ja_JP pt_BR tr" From commit-watcher at mono-cvs.ximian.com Wed Feb 2 13:52:40 2005 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Wed, 2 Feb 2005 13:52:40 -0500 (EST) Subject: [Monodevelop-patches-list] r2222 - in trunk/MonoDevelop/Core/src: AddIns/DisplayBindings/SourceEditor AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels MonoDevelop.Base MonoDevelop.Base/Gui/Dialogs/CombineConfiguration MonoDevelop.Base/Gui/Dialogs/OptionPanels MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions Message-ID: <20050202185240.4D89194764@mono-cvs.ximian.com> Author: jluke Date: 2005-02-02 13:52:39 -0500 (Wed, 02 Feb 2005) New Revision: 2222 Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/EditorBindings.glade trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs trunk/MonoDevelop/Core/src/MonoDevelop.Base/ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Base.glade trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/OutputOptionsPanel.cs Log: some glade improvements to the OptionPanels, mostly using Gnome.FileEntry consistently Property changes on: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in MonoDevelop.SourceEditor.dll MonoDevelop.SourceEditor.dll.mdb MonoDevelop.SourceEditor.dll.config AssemblyInfo.cs SourceEditor.pidb + Makefile Makefile.in MonoDevelop.SourceEditor.dll MonoDevelop.SourceEditor.dll.mdb MonoDevelop.SourceEditor.dll.config AssemblyInfo.cs SourceEditor.pidb *.bak *.gladep Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2005-02-02 16:29:09 UTC (rev 2221) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2005-02-02 18:52:39 UTC (rev 2222) @@ -1,3 +1,12 @@ +2005-02-02 John Luke + + * EditorBindings.glade: + * Gui/OptionPanels/MarkersTextEditorPanel.cs: + * Gui/OptionPanels/GeneralTextEditorPanel.cs: + use Gnome.FileEntry where appropriate + remove window-ish editor props (show line endings, etc) + remove double buffering pref (we always are) + 2005-02-01 John Luke * Gui.SourceEditorBuffer.cs: use ErrorInfo Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/EditorBindings.glade =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/EditorBindings.glade 2005-02-02 16:29:09 UTC (rev 2221) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/EditorBindings.glade 2005-02-02 18:52:39 UTC (rev 2222) @@ -202,8 +202,8 @@ True True - Edit - True + gtk-edit + True GTK_RELIEF_NORMAL True @@ -403,25 +403,6 @@ False - - - - True - True - Enable double buffering - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - 0 @@ -900,168 +881,6 @@ False - - - - True - False - 6 - - - - True - False - Character Markers - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - True - Show _spaces - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - True - Show _tabs - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - True - Show _EOL markers - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - True - Show _invalid lines - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - 0 @@ -1145,25 +964,6 @@ 6 - - True - True - Show _horizontal ruler - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - True False Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs 2005-02-02 16:29:09 UTC (rev 2221) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs 2005-02-02 18:52:39 UTC (rev 2222) @@ -50,7 +50,7 @@ [Glade.Widget] Label genOptions, fontOptions; // encOptions, encVBox; // if you uncoment change to "," above [Glade.Widget] CheckButton enableCodeCompletionCheckBox, - enableFoldingCheckBox, enableDoublebufferingCheckBox; + enableFoldingCheckBox; // [Glade.Widget] ComboBox textEncodingComboBox; [Glade.Widget] FontButton fontNameDisplayTextBox; [Glade.Widget] VBox encodingBox; @@ -64,9 +64,6 @@ enableFoldingCheckBox.Active = ((IProperties) CustomizationObject).GetProperty("EnableFolding", true); - enableDoublebufferingCheckBox.Active = ((IProperties) CustomizationObject).GetProperty( - "DoubleBuffer", true); - string font_name = ((IProperties) CustomizationObject).GetProperty("DefaultFont", "__default_monospace").ToString (); switch (font_name) { @@ -112,16 +109,11 @@ // encoding = CharacterEncodings.GetEncodingByIndex(i).CodePage; // textEncodingComboBox.Changed += new EventHandler (OnOptionChanged); - - // FIXME: enable the sensitivity on these widgets when the implementation has been added - enableDoublebufferingCheckBox.Sensitive = false; } public void Store (IProperties CustomizationObject) { ((IProperties) CustomizationObject).SetProperty ( - "DoubleBuffer", enableDoublebufferingCheckBox.Active); - ((IProperties) CustomizationObject).SetProperty ( "EnableCodeCompletion", enableCodeCompletionCheckBox.Active); ((IProperties) CustomizationObject).SetProperty ( "EnableFolding", enableFoldingCheckBox.Active); Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs 2005-02-02 16:29:09 UTC (rev 2221) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs 2005-02-02 18:52:39 UTC (rev 2222) @@ -55,68 +55,36 @@ [Glade.Widget] Label rulersLabel; [Glade.Widget] Label atColumnLabel; [Glade.Widget] CheckButton showLineNumberCheckBox; - [Glade.Widget] CheckButton showInvalidLinesCheckBox; [Glade.Widget] CheckButton showBracketHighlighterCheckBox; [Glade.Widget] CheckButton showErrorsCheckBox; - [Glade.Widget] CheckButton showHRulerCheckBox; - [Glade.Widget] CheckButton showEOLMarkersCheckBox; [Glade.Widget] CheckButton showVRulerCheckBox; - [Glade.Widget] CheckButton showTabCharsCheckBox; - [Glade.Widget] CheckButton showSpaceCharsCheckBox; [Glade.Widget] SpinButton vRulerRowTextBox; public MarkersTextEditorPanelWidget (IProperties CustomizationObject) : base ("EditorBindings.glade", "MarkersTextEditorPanel") { - // Load Text - - // FIXME i8n the following labels: - - // Load Values - showLineNumberCheckBox.Active = ((IProperties)CustomizationObject).GetProperty( "ShowLineNumbers", true); - showInvalidLinesCheckBox.Active = ((IProperties)CustomizationObject).GetProperty( - "ShowInvalidLines", true); showBracketHighlighterCheckBox.Active = ((IProperties)CustomizationObject).GetProperty( "ShowBracketHighlight", true); showErrorsCheckBox.Active = ((IProperties)CustomizationObject).GetProperty( "ShowErrors", true); - showHRulerCheckBox.Active = ((IProperties)CustomizationObject).GetProperty( - "ShowHRuler", false); - showEOLMarkersCheckBox.Active = ((IProperties)CustomizationObject).GetProperty( - "ShowEOLMarkers", false); showVRulerCheckBox.Active = ((IProperties)CustomizationObject).GetProperty( "ShowVRuler", false); - showTabCharsCheckBox.Active = ((IProperties)CustomizationObject).GetProperty( - "ShowTabs", false); - showSpaceCharsCheckBox.Active = ((IProperties)CustomizationObject).GetProperty( - "ShowSpaces", false); vRulerRowTextBox.Value = ((IProperties)CustomizationObject).GetProperty("VRulerRow", 80); - - // FIXME: reenable these widget's when they're implemented - showInvalidLinesCheckBox.Sensitive = false; - showHRulerCheckBox.Sensitive = false; } public void Store (IProperties CustomizationObject) { - ((IProperties)CustomizationObject).SetProperty("ShowInvalidLines", showInvalidLinesCheckBox.Active); ((IProperties)CustomizationObject).SetProperty("ShowLineNumbers", showLineNumberCheckBox.Active); ((IProperties)CustomizationObject).SetProperty("ShowBracketHighlight", showBracketHighlighterCheckBox.Active); ((IProperties)CustomizationObject).SetProperty("ShowErrors", showErrorsCheckBox.Active); - ((IProperties)CustomizationObject).SetProperty("ShowHRuler", showHRulerCheckBox.Active); - ((IProperties)CustomizationObject).SetProperty("ShowEOLMarkers", showEOLMarkersCheckBox.Active); ((IProperties)CustomizationObject).SetProperty("ShowVRuler", showVRulerCheckBox.Active); - ((IProperties)CustomizationObject).SetProperty("ShowTabs", showTabCharsCheckBox.Active); - ((IProperties)CustomizationObject).SetProperty("ShowSpaces", showSpaceCharsCheckBox.Active); - try { ((IProperties)CustomizationObject).SetProperty("VRulerRow", vRulerRowTextBox.Value); } - catch (Exception) { - } + catch { } } } } Property changes on: trunk/MonoDevelop/Core/src/MonoDevelop.Base ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in MonoDevelop.Base.dll MonoDevelop.Base.dll.mdb MonoDevelop.Base.dll.config AssemblyInfo.cs MonoDevelop.Base.pidb + Makefile Makefile.in MonoDevelop.Base.dll MonoDevelop.Base.dll.mdb MonoDevelop.Base.dll.config AssemblyInfo.cs MonoDevelop.Base.pidb *.bak Base.gladep Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Base.glade =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Base.glade 2005-02-02 16:29:09 UTC (rev 2221) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Base.glade 2005-02-02 18:52:39 UTC (rev 2222) @@ -716,7 +716,7 @@ True True - Create seperate c_ombine subdirectory + Create seperate _Solution subdirectory True GTK_RELIEF_NORMAL True @@ -1331,7 +1331,7 @@ True True - Show Extensions in project scout + Show extensions in project scout True GTK_RELIEF_NORMAL True @@ -1401,7 +1401,7 @@ True - Default _solution location + Default _Solution location True False GTK_JUSTIFY_LEFT @@ -1423,10 +1423,11 @@ True 10 - False - False + Select default location + True + True True - GTK_FILE_CHOOSER_ACTION_OPEN + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER @@ -1666,146 +1667,6 @@ False - - - - True - Line Terminator Style - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - 6 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - True - Windows - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - Macintosh - True - GTK_RELIEF_NORMAL - True - False - False - True - windowsRadioButton - - - 0 - False - False - - - - - - True - True - Unix - True - GTK_RELIEF_NORMAL - True - False - False - True - windowsRadioButton - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - 0 @@ -2495,6 +2356,7 @@ 0.5 0 0 + combo-entry2 0 @@ -2558,7 +2420,7 @@ True - _Working Dir. + _Working Directory True False GTK_JUSTIFY_LEFT @@ -2698,16 +2560,17 @@ - + True - 1 - 2 - False - 0 - 0 + 10 + Select command + False + True + True + GTK_FILE_CHOOSER_ACTION_OPEN - - + + True True True @@ -2718,41 +2581,14 @@ * False - - 0 - 1 - 0 - 1 - - - - - - True - True - Browse - True - GTK_RELIEF_NORMAL - True - - - 1 - 2 - 0 - 1 - fill - - - 1 2 1 2 - fill - fill + @@ -2773,7 +2609,7 @@ True True - _Prompt for Arguments + _Prompt for arguments True GTK_RELIEF_NORMAL True @@ -3227,7 +3063,7 @@ True False - 0 + 6 @@ -3251,31 +3087,10 @@ - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - True True - Automaticly _include found files + Automatically _include found files True GTK_RELIEF_NORMAL True @@ -3514,13 +3329,17 @@ - + True - False - 6 + 10 + Select deploy script + False + True + True + GTK_FILE_CHOOSER_ACTION_OPEN - - + + True True True @@ -3531,28 +3350,7 @@ * False - - 0 - True - True - - - - - True - True - ... - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - 0 @@ -3714,7 +3512,7 @@ 0.5 0 0 - deployTargetEntry + combo-entry4 0 @@ -3724,16 +3522,28 @@ - + True - True - True - True - 0 - - True - * - False + 10 + Select target location + True + True + True + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + + + + True + True + True + True + 0 + + True + * + False + + 0 @@ -3741,22 +3551,6 @@ True - - - - True - True - ... - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - 0 @@ -4386,7 +4180,7 @@ True True True - Select All + Select _All True GTK_RELIEF_NORMAL True @@ -4398,8 +4192,8 @@ True True True - Clear Selection - True + gtk-clear + True GTK_RELIEF_NORMAL True @@ -4617,16 +4411,28 @@ - + True - True - True - True - 0 - - True - * - False + 10 + Select output directory + True + True + True + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + + + + True + True + True + True + 0 + + True + * + False + + 0 @@ -4634,22 +4440,6 @@ True - - - - True - True - _Browse... - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - 6 @@ -4745,7 +4535,7 @@ True 3 - 3 + 2 False 6 6 @@ -4788,7 +4578,7 @@ 0.5 0 0 - outputDirectoryEntry + combo-entry6 0 @@ -4826,7 +4616,7 @@ - + True True True @@ -4840,35 +4630,16 @@ 1 2 - 1 - 2 + 0 + 1 - + True True - ... - True - GTK_RELIEF_NORMAL - True - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - True True True 0 @@ -4879,30 +4650,42 @@ 1 - 3 - 0 - 1 + 2 + 2 + 3 - + True - True - True - True - 0 - - True - * - False + 10 + Select output path + True + True + True + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + + + + True + True + True + True + 0 + + True + * + False + + 1 - 3 - 2 - 3 + 2 + 1 + 2 @@ -5031,7 +4814,7 @@ True 3 - 3 + 2 False 6 6 @@ -5039,7 +4822,7 @@ True - Execute Co_mmand + Execute co_mmand True False GTK_JUSTIFY_LEFT @@ -5049,7 +4832,7 @@ 0.5 0 0 - executeScriptEntry + combo-entry7 0 @@ -5064,7 +4847,7 @@ True - _After Build + _After build True False GTK_JUSTIFY_LEFT @@ -5074,7 +4857,7 @@ 0.5 0 0 - executeAfterEntry + combo-entry8 0 @@ -5099,7 +4882,7 @@ 0.5 0 0 - executeBeforeEntry + combo-entry9 0 @@ -5112,16 +4895,27 @@ - + True - True - True - True - 0 - - True - * - False + 10 + False + True + True + GTK_FILE_CHOOSER_ACTION_OPEN + + + + True + True + True + True + 0 + + True + * + False + + 1 @@ -5133,16 +4927,27 @@ - + True - True - True - True - 0 - - True - * - False + 10 + False + True + True + GTK_FILE_CHOOSER_ACTION_OPEN + + + + True + True + True + True + 0 + + True + * + False + + 1 @@ -5154,16 +4959,27 @@ - + True - True - True - True - 0 - - True - * - False + 10 + False + True + True + GTK_FILE_CHOOSER_ACTION_OPEN + + + + True + True + True + True + 0 + + True + * + False + + 1 @@ -5173,63 +4989,6 @@ - - - - True - True - ... - True - GTK_RELIEF_NORMAL - True - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - True - ... - True - GTK_RELIEF_NORMAL - True - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - True - ... - True - GTK_RELIEF_NORMAL - True - - - 2 - 3 - 2 - 3 - fill - - - 0 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-02-02 16:29:09 UTC (rev 2221) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-02-02 18:52:39 UTC (rev 2222) @@ -1,5 +1,16 @@ 2005-02-02 John Luke + * Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs + * Gui/Dialogs/OptionPanels/ProjectOptions/OutputOptionsPanel.cs + * Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs + * Gui/Dialogs/OptionPanels/ExternalToolPanel.cs + * Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs + * Base.glade: use Gnome.FileEntry where appropriate + remove disabled line endings prefs + a few other spacing, spelling, capitalization improvements + +2005-02-02 John Luke + * Parser/ICompilationUnitBase.cs: * Parser/Implementations/AbstractCompilationUnit.cs: adjust to ErrorInfo Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs 2005-02-02 16:29:09 UTC (rev 2221) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs 2005-02-02 18:52:39 UTC (rev 2222) @@ -26,8 +26,7 @@ class CombineBuildOptionsWidget : GladeWidgetExtract { // Gtk Controls - [Glade.WidgetAttribute] Entry buildOutputLoc; - [Glade.WidgetAttribute] Button OutputDirBrowse; + [Glade.Widget] Gnome.FileEntry outputDirButton; Combine combine; @@ -35,23 +34,12 @@ base ("Base.glade", "CombineBuildOptions") { this.combine = (Combine)((IProperties)CustomizationObject).GetProperty("Combine"); - buildOutputLoc.Text = combine.OutputDirectory + System.IO.Path.DirectorySeparatorChar; - OutputDirBrowse.Clicked += new EventHandler (onClicked); + outputDirButton.Filename = combine.OutputDirectory + System.IO.Path.DirectorySeparatorChar; } - void onClicked (object o, EventArgs e) - { - FolderDialog fd = new FolderDialog ("Output Directory"); - fd.SetFilename (buildOutputLoc.Text); - int response = fd.Run (); - if (response == (int) ResponseType.Ok) - buildOutputLoc.Text = fd.Filename + System.IO.Path.DirectorySeparatorChar; - fd.Hide (); - } - public bool Store() { - combine.OutputDirectory = buildOutputLoc.Text; + combine.OutputDirectory = outputDirButton.Filename; return true; } } Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs 2005-02-02 16:29:09 UTC (rev 2221) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs 2005-02-02 18:52:39 UTC (rev 2222) @@ -80,7 +80,6 @@ [Glade.Widget] ListStore toolListBoxStore; [Glade.Widget] Gtk.TreeView toolListBox; [Glade.Widget] Gtk.Entry titleTextBox; - [Glade.Widget] Gtk.Entry commandTextBox; [Glade.Widget] Gtk.Entry argumentTextBox; [Glade.Widget] Gtk.Entry workingDirTextBox; [Glade.Widget] CheckButton promptArgsCheckBox; @@ -89,7 +88,7 @@ [Glade.Widget] Label argumentLabel; [Glade.Widget] Label commandLabel; [Glade.Widget] Label workingDirLabel; - [Glade.Widget] Button browseButton; + [Glade.Widget] Gnome.FileEntry browseButton; [Glade.Widget] Button argumentQuickInsertButton; [Glade.Widget] Button workingDirQuickInsertButton; [Glade.Widget] Button moveUpButton; @@ -109,7 +108,7 @@ toolListBoxStore = new ListStore (typeof (string), typeof (ExternalTool)); dependendControls = new Widget[] { - titleTextBox, commandTextBox, argumentTextBox, + titleTextBox, argumentTextBox, workingDirTextBox, promptArgsCheckBox, useOutputPadCheckBox, titleLabel, argumentLabel, commandLabel, workingDirLabel, browseButton, argumentQuickInsertButton, @@ -140,23 +139,10 @@ addButton.Clicked += new EventHandler (addEvent); moveUpButton.Clicked += new EventHandler (moveUpEvent); moveDownButton.Clicked += new EventHandler (moveDownEvent); - browseButton.Clicked += new EventHandler (browseEvent); selectEvent (this, EventArgs.Empty); } - void browseEvent (object sender, EventArgs e) - { - using (FileSelector fs = new FileSelector (GettextCatalog.GetString ("File to Open"))) { - int response = fs.Run (); - string name = fs.Filename; - fs.Hide (); - if (response == (int) Gtk.ResponseType.Ok) { - commandTextBox.Text = name; - } - } - } - void moveUpEvent (object sender, EventArgs e) { if(toolListBox.Selection.CountSelectedRows () == 1) @@ -212,7 +198,7 @@ lv.SetValue (selectedIter, 0, titleTextBox.Text); selectedItem.MenuCommand = titleTextBox.Text; - selectedItem.Command = commandTextBox.Text; + selectedItem.Command = browseButton.Filename; selectedItem.Arguments = argumentTextBox.Text; selectedItem.InitialDirectory = workingDirTextBox.Text; selectedItem.PromptForArguments = promptArgsCheckBox.Active; @@ -225,7 +211,6 @@ SetEnabledStatus (toolListBox.Selection.CountSelectedRows () > 0, removeButton); titleTextBox.Changed -= new EventHandler (setToolValues); - commandTextBox.Changed -= new EventHandler (setToolValues); argumentTextBox.Changed -= new EventHandler (setToolValues); workingDirTextBox.Changed -= new EventHandler (setToolValues); promptArgsCheckBox.Toggled -= new EventHandler (setToolValues); @@ -242,7 +227,7 @@ SetEnabledStatus (true, dependendControls); titleTextBox.Text = selectedItem.MenuCommand; - commandTextBox.Text = selectedItem.Command; + browseButton.Filename = selectedItem.Command; argumentTextBox.Text = selectedItem.Arguments; workingDirTextBox.Text = selectedItem.InitialDirectory; promptArgsCheckBox.Active = selectedItem.PromptForArguments; @@ -250,7 +235,7 @@ } else { SetEnabledStatus (false, dependendControls); titleTextBox.Text = String.Empty; - commandTextBox.Text = String.Empty; + browseButton.Filename = String.Empty; argumentTextBox.Text = String.Empty; workingDirTextBox.Text = String.Empty; promptArgsCheckBox.Active = false; @@ -258,7 +243,6 @@ } titleTextBox.Changed += new EventHandler (setToolValues); - commandTextBox.Changed += new EventHandler (setToolValues); argumentTextBox.Changed += new EventHandler (setToolValues); workingDirTextBox.Changed += new EventHandler (setToolValues); promptArgsCheckBox.Toggled += new EventHandler (setToolValues); Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs 2005-02-02 16:29:09 UTC (rev 2221) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs 2005-02-02 18:52:39 UTC (rev 2222) @@ -49,20 +49,10 @@ [Glade.Widget] public Gtk.CheckButton loadUserDataCheckButton; [Glade.Widget] public Gtk.CheckButton createBackupCopyCheckButton; [Glade.Widget] public Gtk.CheckButton loadPrevProjectCheckButton; - [Glade.Widget] public Gtk.RadioButton windowsRadioButton; - [Glade.Widget] public Gtk.RadioButton macintoshRadioButton; - [Glade.Widget] public Gtk.RadioButton unixRadioButton; [Glade.Widget] public Gtk.Label loadLabel; [Glade.Widget] public Gtk.Label saveLabel; - [Glade.Widget] public Gtk.Label terminatorLabel; [Glade.Widget] public Gtk.Label locationLabel; - public enum LineTerminatorStyle { - Windows, - Macintosh, - Unix - } - public LoadSavePanelWidget () : base ("Base.glade", "LoadSavePanel") { // @@ -82,25 +72,6 @@ "SharpDevelop.CreateBackupCopy", false); loadPrevProjectCheckButton.Active = (bool) Runtime.Properties.GetProperty( "SharpDevelop.LoadPrevProjectOnStartup", false); - - if (LineTerminatorStyle.Windows.Equals ( - Runtime.Properties.GetProperty ( - "SharpDevelop.LineTerminatorStyle", LineTerminatorStyle.Unix))) { - windowsRadioButton.Active = true;} - else if (LineTerminatorStyle.Macintosh.Equals ( - Runtime.Properties.GetProperty - ("SharpDevelop.LineTerminatorStyle", LineTerminatorStyle.Unix))) { - macintoshRadioButton.Active = true;} - else if (LineTerminatorStyle.Unix.Equals ( - Runtime.Properties.GetProperty ( - "SharpDevelop.LineTerminatorStyle", LineTerminatorStyle.Unix))) { - unixRadioButton.Active = true;} - - // FIXME: renable all terminator style radio buttons when they're implemented. - unixRadioButton.Sensitive = false; - macintoshRadioButton.Sensitive = false; - windowsRadioButton.Sensitive = false; - terminatorLabel.Sensitive = false; } public bool Store () @@ -109,13 +80,6 @@ Runtime.Properties.SetProperty ("SharpDevelop.LoadDocumentProperties", loadUserDataCheckButton.Active); Runtime.Properties.SetProperty ("SharpDevelop.CreateBackupCopy", createBackupCopyCheckButton.Active); - if (windowsRadioButton.Active) { - Runtime.Properties.SetProperty ("SharpDevelop.LineTerminatorStyle", LineTerminatorStyle.Windows);} - else if (macintoshRadioButton.Active) { - Runtime.Properties.SetProperty ("SharpDevelop.LineTerminatorStyle", LineTerminatorStyle.Macintosh);} - else if (unixRadioButton.Active){ - Runtime.Properties.SetProperty ("SharpDevelop.LineTerminatorStyle", LineTerminatorStyle.Unix);} - // check for correct settings string projectPath = projectLocationTextBox.GtkEntry.Text; if (projectPath.Length > 0) { Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs 2005-02-02 16:29:09 UTC (rev 2221) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs 2005-02-02 18:52:39 UTC (rev 2222) @@ -32,11 +32,9 @@ [Glade.Widget] RadioButton projectFileRadioButton; [Glade.Widget] RadioButton compiledAssemblyRadioButton; [Glade.Widget] RadioButton scriptFileRadioButton; - [Glade.Widget] Button selectScriptFileButton; - [Glade.Widget] Button selectTargetButton; - [Glade.Widget] Entry deployTargetEntry; - [Glade.Widget] Entry deployScriptEntry; - [Glade.Widget] VBox deployScriptBox; + [Glade.Widget] Gnome.FileEntry selectScriptButton; + [Glade.Widget] Gnome.FileEntry selectTargetButton; + //[Glade.Widget] VBox deployScriptBox; [Glade.Widget] VBox deployTargetBox; [Glade.Widget] Gtk.TreeView includeTreeView; public ListStore store; @@ -53,8 +51,6 @@ projectFileRadioButton.Clicked += new EventHandler(RadioButtonClicked); compiledAssemblyRadioButton.Clicked += new EventHandler(RadioButtonClicked); scriptFileRadioButton.Clicked += new EventHandler(RadioButtonClicked); - selectScriptFileButton.Clicked += new EventHandler(SelectScriptFileEvent); - selectTargetButton.Clicked += new EventHandler(SelectTargetFolderEvent); store = new ListStore (typeof(bool), typeof(string)); includeTreeView.Selection.Mode = SelectionMode.None; @@ -72,8 +68,8 @@ } } - deployTargetEntry.Text = project.DeployInformation.DeployTarget; - deployScriptEntry.Text = project.DeployInformation.DeployScript; + selectTargetButton.Filename = project.DeployInformation.DeployTarget; + selectScriptButton.Filename = project.DeployInformation.DeployScript; projectFileRadioButton.Active = project.DeployInformation.DeploymentStrategy == DeploymentStrategy.File; compiledAssemblyRadioButton.Active = project.DeployInformation.DeploymentStrategy == DeploymentStrategy.Assembly; @@ -82,32 +78,10 @@ RadioButtonClicked(null, null); } - //FIXME : Finish details in this dialog. - void SelectScriptFileEvent(object sender, EventArgs e) - { - using (FileSelector fs = new FileSelector (GettextCatalog.GetString ("Select your File"))) { // Put correct title - if ( fs.Run () == (int) ResponseType.Ok) { - deployScriptEntry.Text = fs.Filename; - } - fs.Hide (); - } - } - - void SelectTargetFolderEvent(object sender, EventArgs e) - { - using (FileSelector fs = new FileSelector (GettextCatalog.GetString ("Select the target directory"))) { - if ( fs.Run () == (int) ResponseType.Ok) { - deployTargetEntry.Text = fs.Filename; - } - fs.Hide (); - } - } - void RadioButtonClicked(object sender, EventArgs e) { deployTargetBox.Sensitive = compiledAssemblyRadioButton.Active || projectFileRadioButton.Active; - deployScriptEntry.Sensitive = scriptFileRadioButton.Active; - selectScriptFileButton.Sensitive = scriptFileRadioButton.Active; + selectScriptButton.Sensitive = scriptFileRadioButton.Active; } private void ItemToggled (object o, ToggledArgs args) @@ -123,27 +97,27 @@ public bool Store () { - if (deployTargetEntry.Text.Length > 0) { - if (!fileUtilityService.IsValidFileName(deployTargetEntry.Text)) { + if (selectTargetButton.Filename.Length > 0) { + if (!fileUtilityService.IsValidFileName(selectTargetButton.Filename)) { Runtime.MessageService.ShowError (GettextCatalog.GetString ("Invalid deploy target specified")); return false; } } - if (deployScriptEntry.Text.Length > 0) { - if (!fileUtilityService.IsValidFileName(deployScriptEntry.Text)) { + if (selectScriptButton.Filename.Length > 0) { + if (!fileUtilityService.IsValidFileName(selectScriptButton.Filename)) { Runtime.MessageService.ShowError (GettextCatalog.GetString ("Invalid deploy script specified")); return false; } } - if (!System.IO.File.Exists(deployScriptEntry.Text)) { + if (!System.IO.File.Exists(selectScriptButton.Filename)) { Runtime.MessageService.ShowError (GettextCatalog.GetString ("Deploy script doesn't exists")); return false; } - project.DeployInformation.DeployTarget = deployTargetEntry.Text; - project.DeployInformation.DeployScript = deployScriptEntry.Text; + project.DeployInformation.DeployTarget = selectTargetButton.Filename; + project.DeployInformation.DeployScript = selectScriptButton.Filename; if (projectFileRadioButton.Active) { project.DeployInformation.DeploymentStrategy = DeploymentStrategy.File; Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/OutputOptionsPanel.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/OutputOptionsPanel.cs 2005-02-02 16:29:09 UTC (rev 2221) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/OutputOptionsPanel.cs 2005-02-02 18:52:39 UTC (rev 2222) @@ -30,35 +30,27 @@ // Gtk Controls // [Glade.Widget] Entry assemblyNameEntry; - [Glade.Widget] Entry outputDirectoryEntry; + [Glade.Widget] Gnome.FileEntry outputPathButton; [Glade.Widget] Entry parametersEntry; - [Glade.Widget] Entry executeBeforeEntry; - [Glade.Widget] Entry executeScriptEntry; - [Glade.Widget] Entry executeAfterEntry; + [Glade.Widget] Gnome.FileEntry beforeButton; + [Glade.Widget] Gnome.FileEntry executeButton; + [Glade.Widget] Gnome.FileEntry afterButton; [Glade.Widget] CheckButton pauseConsoleOutputCheckButton; [Glade.Widget] CheckButton externalConsoleCheckButton; - [Glade.Widget] Button browseButton; - [Glade.Widget] Button browseButton2; - [Glade.Widget] Button browseButton3; - [Glade.Widget] Button browseButton4; DotNetProjectConfiguration configuration; public OutputOptionsPanelWidget(IProperties CustomizationObject) : base ("Base.glade", "OutputOptionsPanel") { configuration = (DotNetProjectConfiguration)((IProperties)CustomizationObject).GetProperty("Config"); - browseButton.Clicked += new EventHandler (SelectFolder); - browseButton2.Clicked += new EventHandler (SelectFile4); - browseButton3.Clicked += new EventHandler (SelectFile3); - browseButton4.Clicked += new EventHandler (SelectFile2); externalConsoleCheckButton.Toggled += new EventHandler (ExternalConsoleToggle); assemblyNameEntry.Text = configuration.OutputAssembly; - outputDirectoryEntry.Text = configuration.OutputDirectory; + outputPathButton.Filename = configuration.OutputDirectory; parametersEntry.Text = configuration.CommandLineParameters; - executeScriptEntry.Text = configuration.ExecuteScript; - executeBeforeEntry.Text = configuration.ExecuteBeforeBuild; - executeAfterEntry.Text = configuration.ExecuteAfterBuild; + executeButton.Filename = configuration.ExecuteScript; + beforeButton.Filename = configuration.ExecuteBeforeBuild; + afterButton.Filename = configuration.ExecuteAfterBuild; externalConsoleCheckButton.Active = configuration.ExternalConsole; pauseConsoleOutputCheckButton.Active = configuration.PauseConsoleOutput; @@ -75,75 +67,22 @@ return false; } - if (!Runtime.FileUtilityService.IsValidFileName (outputDirectoryEntry.Text)) { + if (!Runtime.FileUtilityService.IsValidFileName (outputPathButton.Filename)) { Runtime.MessageService.ShowError (GettextCatalog.GetString ("Invalid output directory specified")); return false; } configuration.OutputAssembly = assemblyNameEntry.Text; - configuration.OutputDirectory = outputDirectoryEntry.Text; + configuration.OutputDirectory = outputPathButton.Filename; configuration.CommandLineParameters = parametersEntry.Text; - configuration.ExecuteBeforeBuild = executeBeforeEntry.Text; - configuration.ExecuteAfterBuild = executeAfterEntry.Text; - configuration.ExecuteScript = executeScriptEntry.Text; + configuration.ExecuteBeforeBuild = beforeButton.Filename; + configuration.ExecuteAfterBuild = afterButton.Filename; + configuration.ExecuteScript = executeButton.Filename; configuration.ExternalConsole = externalConsoleCheckButton.Active; configuration.PauseConsoleOutput = pauseConsoleOutputCheckButton.Active; return true; } - void SelectFolder(object sender, EventArgs e) - { - using (FileSelector fdiag = new FileSelector (GettextCatalog.GetString ("Select the directory in which the assembly will be created"))) { - if (fdiag.Run () == (int) ResponseType.Ok) { - outputDirectoryEntry.Text = fdiag.Filename; - } - - fdiag.Hide (); - } - } - - void SelectFile2(object sender, EventArgs e) - { - using (FileSelector fdiag = new FileSelector ("")) { - //fdiag.Filter = StringParserService.Parse("${res:SharpDevelop.FileFilter.AllFiles}|*.*"); - fdiag.SelectMultiple = false; - - if(fdiag.Run () == (int) ResponseType.Ok) { - executeBeforeEntry.Text = fdiag.Filename; - } - - fdiag.Hide (); - } - } - - void SelectFile3(object sender, EventArgs e) - { - using (FileSelector fdiag = new FileSelector ("")) { - //fdiag.Filter = StringParserService.Parse("${res:SharpDevelop.FileFilter.AllFiles}|*.*"); - fdiag.SelectMultiple = false; - - if(fdiag.Run () == (int) ResponseType.Ok) { - executeAfterEntry.Text = fdiag.Filename; - } - - fdiag.Hide (); - } - } - - void SelectFile4(object sender, EventArgs e) - { - using (FileSelector fdiag = new FileSelector ("")) { - //fdiag.Filter = StringParserService.Parse("${res:SharpDevelop.FileFilter.AllFiles}|*.*"); - fdiag.SelectMultiple = false; - - if(fdiag.Run () == (int) ResponseType.Ok) { - executeScriptEntry.Text = fdiag.Filename; - } - - fdiag.Hide (); - } - } - void ExternalConsoleToggle (object sender, EventArgs e) { if (externalConsoleCheckButton.Active) { @@ -157,7 +96,6 @@ } OutputOptionsPanelWidget widget; - public override void LoadPanelContents() { Add (widget = new OutputOptionsPanelWidget ((IProperties) CustomizationObject)); From commit-watcher at mono-cvs.ximian.com Wed Feb 2 14:24:56 2005 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Wed, 2 Feb 2005 14:24:56 -0500 (EST) Subject: [Monodevelop-patches-list] r2223 - trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/DragNotebook Message-ID: <20050202192456.0582894764@mono-cvs.ximian.com> Author: tberman Date: 2005-02-02 14:24:55 -0500 (Wed, 02 Feb 2005) New Revision: 2223 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/DragNotebook/DragNotebook.cs Log: no more DnD, apparently it is buggy, and im sick of hearing about it. Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/DragNotebook/DragNotebook.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/DragNotebook/DragNotebook.cs 2005-02-02 18:52:39 UTC (rev 2222) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/DragNotebook/DragNotebook.cs 2005-02-02 19:24:55 UTC (rev 2223) @@ -16,9 +16,9 @@ bool DragInProgress; public DragNotebook () { - ButtonPressEvent += new ButtonPressEventHandler (OnButtonPress); - ButtonReleaseEvent += new ButtonReleaseEventHandler (OnButtonRelease); - AddEvents ((Int32) (EventMask.AllEventsMask)); + //ButtonPressEvent += new ButtonPressEventHandler (OnButtonPress); + //ButtonReleaseEvent += new ButtonReleaseEventHandler (OnButtonRelease); + //AddEvents ((Int32) (EventMask.AllEventsMask)); } int FindTabAtPosition (double cursorX, double cursorY) { From commit-watcher at mono-cvs.ximian.com Wed Feb 2 15:02:47 2005 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Wed, 2 Feb 2005 15:02:47 -0500 (EST) Subject: [Monodevelop-patches-list] r2224 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Commands Message-ID: <20050202200247.298CB94764@mono-cvs.ximian.com> Author: jluke Date: 2005-02-02 15:02:46 -0500 (Wed, 02 Feb 2005) New Revision: 2224 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/MenuItemBuilders.cs Log: fix disappearing recent menu labels Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-02-02 19:24:55 UTC (rev 2223) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-02-02 20:02:46 UTC (rev 2224) @@ -1,5 +1,10 @@ 2005-02-02 John Luke + * Commands/MenuItemBuilders.cs: only use RecentItem.Private + if it contains something, should fix disappearing labels + +2005-02-02 John Luke + * Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs * Gui/Dialogs/OptionPanels/ProjectOptions/OutputOptionsPanel.cs * Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/MenuItemBuilders.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/MenuItemBuilders.cs 2005-02-02 19:24:55 UTC (rev 2223) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/MenuItemBuilders.cs 2005-02-02 20:02:46 UTC (rev 2224) @@ -54,7 +54,7 @@ for (int i = 0; i < recentOpen.RecentFile.Length; ++i) { string accelaratorKeyPrefix = i < 10 ? "&" + ((i + 1) % 10).ToString() + " " : ""; RecentItem ri = recentOpen.RecentFile[i]; - string label = ri.Private == null ? ri.ToString () : ri.Private; + string label = ((ri.Private == null || ri.Private.Length < 1) ? Path.GetFileName (ri.ToString ()) : ri.Private); items[i] = new RFMItem (null, null, accelaratorKeyPrefix + label.Replace ("_", "__"), new EventHandler (LoadRecentFile)); items[i].Tag = ri.ToString (); } @@ -92,7 +92,7 @@ for (int i = 0; i < recentOpen.RecentProject.Length; ++i) { string accelaratorKeyPrefix = i < 10 ? "&" + ((i + 1) % 10).ToString() + " " : ""; RecentItem ri = recentOpen.RecentProject[i]; - string label = ri.Private == null ? ri.ToString () : ri.Private; + string label = ((ri.Private == null || ri.Private.Length < 1) ? Path.GetFileNameWithoutExtension (ri.ToString ()) : ri.Private); items[i] = new RPMItem(null, null, accelaratorKeyPrefix + label.Replace ("_", "__"), new EventHandler(LoadRecentProject)); items[i].Tag = ri.ToString (); items[i].Description = String.Format (GettextCatalog.GetString ("load solution {0}"), ri.ToString ()); From commit-watcher at mono-cvs.ximian.com Wed Feb 2 15:20:20 2005 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Wed, 2 Feb 2005 15:20:20 -0500 (EST) Subject: [Monodevelop-patches-list] r2225 - in trunk/MonoDevelop: . Extras/MonoQuery Message-ID: <20050202202020.9E98A94764@mono-cvs.ximian.com> Author: chergert Date: 2005-02-02 15:20:20 -0500 (Wed, 02 Feb 2005) New Revision: 2225 Added: trunk/MonoDevelop/Extras/MonoQuery/MonoQuery.addin.xml.in Removed: trunk/MonoDevelop/Extras/MonoQuery/MonoQuery.addin.xml Modified: trunk/MonoDevelop/ChangeLog trunk/MonoDevelop/Extras/MonoQuery/ChangeLog trunk/MonoDevelop/configure.in Log: Fix for MonoQuery addin to only add Sqlite provider if we are compiling with support for it. Modified: trunk/MonoDevelop/ChangeLog =================================================================== --- trunk/MonoDevelop/ChangeLog 2005-02-02 20:02:46 UTC (rev 2224) +++ trunk/MonoDevelop/ChangeLog 2005-02-02 20:20:20 UTC (rev 2225) @@ -1,3 +1,8 @@ +2005-02-02 Christian Hergert + + * configure.in: Added dynamic control of sqlite in monoquery + via substring autofoo. + 2005-01-31 Lluis Sanchez Gual * configure.in: Added MonoDeveloperExtensions addin. Modified: trunk/MonoDevelop/Extras/MonoQuery/ChangeLog =================================================================== --- trunk/MonoDevelop/Extras/MonoQuery/ChangeLog 2005-02-02 20:02:46 UTC (rev 2224) +++ trunk/MonoDevelop/Extras/MonoQuery/ChangeLog 2005-02-02 20:20:20 UTC (rev 2225) @@ -1,5 +1,10 @@ 2005-02-02 Christian Hergert + * MonoQuery/MonoQuery.addin.xml: Moved to .in to be autogenerated + by automake. + +2005-02-02 Christian Hergert + * Extras/MonoQuery/Gui/SqlQueryView/SqlQueryView.cs: flush 2005-01-31 Christian Hergert Deleted: trunk/MonoDevelop/Extras/MonoQuery/MonoQuery.addin.xml =================================================================== --- trunk/MonoDevelop/Extras/MonoQuery/MonoQuery.addin.xml 2005-02-02 20:02:46 UTC (rev 2224) +++ trunk/MonoDevelop/Extras/MonoQuery/MonoQuery.addin.xml 2005-02-02 20:20:20 UTC (rev 2225) @@ -1,251 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copied: trunk/MonoDevelop/Extras/MonoQuery/MonoQuery.addin.xml.in (from rev 2221, trunk/MonoDevelop/Extras/MonoQuery/MonoQuery.addin.xml) =================================================================== --- trunk/MonoDevelop/Extras/MonoQuery/MonoQuery.addin.xml 2005-02-02 16:29:09 UTC (rev 2221) +++ trunk/MonoDevelop/Extras/MonoQuery/MonoQuery.addin.xml.in 2005-02-02 20:20:20 UTC (rev 2225) @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @SQLITE_XML@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: trunk/MonoDevelop/configure.in =================================================================== --- trunk/MonoDevelop/configure.in 2005-02-02 20:02:46 UTC (rev 2224) +++ trunk/MonoDevelop/configure.in 2005-02-02 20:20:20 UTC (rev 2225) @@ -152,10 +152,17 @@ enable_update_mimedb=yes) AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes) + dnl MonoQuery PKG_CHECK_MODULES(MONOQUERY_DEPENDENCIES_SQLITE,mono >= 1.1.2.99, enable_monoquery_sqlite=yes, enable_monoquery_sqlite=no) AM_CONDITIONAL(ENABLE_MONOQUERY_SQLITE, test x$enable_monoquery_sqlite = xyes) +if test "x$enable_monoquery_sqlite" = "xyes" ; then +SQLITE_XML='' +else +SQLITE_XML= +fi + dnl Intl ALL_LINGUAS="da es fr ja_JP pt_BR tr" GETTEXT_PACKAGE=monodevelop @@ -167,6 +174,7 @@ AC_SUBST(LIB_PREFIX) AC_SUBST(ASSEMBLY_VERSION) AC_SUBST(MONO_POSIX_OEE) +AC_SUBST(SQLITE_XML) AC_OUTPUT([ Makefile @@ -219,6 +227,7 @@ Core/src/AddIns/prj2make-sharp-lib/AssemblyInfo.cs Extras/Makefile Extras/MonoQuery/Makefile +Extras/MonoQuery/MonoQuery.addin.xml Extras/MonoDeveloperExtensions/Makefile ]) From commit-watcher at mono-cvs.ximian.com Wed Feb 2 16:01:40 2005 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Wed, 2 Feb 2005 16:01:40 -0500 (EST) Subject: [Monodevelop-patches-list] r2226 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Gui/Dialogs/CombineConfiguration Message-ID: <20050202210140.3FA4D94764@mono-cvs.ximian.com> Author: lluis Date: 2005-02-02 16:01:40 -0500 (Wed, 02 Feb 2005) New Revision: 2226 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs Log: 2005-02-02 Lluis Sanchez Gual * Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs: Fix nullref exception when saving. 'store' wasn't being set. Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-02-02 20:20:20 UTC (rev 2225) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-02-02 21:01:40 UTC (rev 2226) @@ -1,3 +1,8 @@ +2005-02-02 Lluis Sanchez Gual + + * Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs: + Fix nullref exception when saving. 'store' wasn't being set. + 2005-02-02 John Luke * Commands/MenuItemBuilders.cs: only use RecentItem.Private Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs 2005-02-02 20:20:20 UTC (rev 2225) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs 2005-02-02 21:01:40 UTC (rev 2226) @@ -52,26 +52,26 @@ //singleRadioButton.Clicked += new EventHandler(OptionsChanged); // Setting up OptionMenus - ListStore store = new ListStore (typeof (string)); + ListStore tmpStore = new ListStore (typeof (string)); int active = -1; for (int i = 0; i < combine.Entries.Count; i++) { CombineEntry entry = (CombineEntry) combine.Entries[i]; - store.AppendValues (entry.Name); + tmpStore.AppendValues (entry.Name); if (combine.SingleStartProjectName == entry.Name) active = i; } - singleCombo.Model = store; + singleCombo.Model = tmpStore; CellRendererText cr = new CellRendererText (); singleCombo.PackStart (cr, true); singleCombo.AddAttribute (cr, "text", 0); singleCombo.Active = active; - store = new ListStore (typeof (string)); - store.AppendValues (GettextCatalog.GetString ("None")); - store.AppendValues (GettextCatalog.GetString ("Execute")); - actionCombo.Model = store; + tmpStore = new ListStore (typeof (string)); + tmpStore.AppendValues (GettextCatalog.GetString ("None")); + tmpStore.AppendValues (GettextCatalog.GetString ("Execute")); + actionCombo.Model = tmpStore; actionCombo.PackStart (cr, true); actionCombo.AddAttribute (cr, "text", 0); actionCombo.Changed += new EventHandler(OptionsChanged); From commit-watcher at mono-cvs.ximian.com Wed Feb 2 16:12:40 2005 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Wed, 2 Feb 2005 16:12:40 -0500 (EST) Subject: [Monodevelop-patches-list] r2227 - trunk/MonoDevelop/po Message-ID: <20050202211240.3238C94764@mono-cvs.ximian.com> Author: lluis Date: 2005-02-02 16:12:40 -0500 (Wed, 02 Feb 2005) New Revision: 2227 Modified: trunk/MonoDevelop/po/ChangeLog trunk/MonoDevelop/po/POTFILES.in Log: 2005-02-02 Lluis Sanchez Gual * POTFILES.in: Updated. Modified: trunk/MonoDevelop/po/ChangeLog =================================================================== --- trunk/MonoDevelop/po/ChangeLog 2005-02-02 21:01:40 UTC (rev 2226) +++ trunk/MonoDevelop/po/ChangeLog 2005-02-02 21:12:40 UTC (rev 2227) @@ -1,3 +1,7 @@ +2005-02-02 Lluis Sanchez Gual + + * POTFILES.in: Updated. + 2005-01-08 Christian Hergert * Added MonoQuery files to POTFILES.in Modified: trunk/MonoDevelop/po/POTFILES.in =================================================================== --- trunk/MonoDevelop/po/POTFILES.in 2005-02-02 21:01:40 UTC (rev 2226) +++ trunk/MonoDevelop/po/POTFILES.in 2005-02-02 21:12:40 UTC (rev 2227) @@ -54,7 +54,7 @@ Core/src/MonoDevelop.Base/Internal/ExternalTool/ToolLoader.cs Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntry.cs -Core/src/MonoDevelop.Base/Internal/Project/Project/AbstractProject.cs +Core/src/MonoDevelop.Base/Internal/Project/Project/Project.cs Core/src/MonoDevelop.Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs Core/src/MonoDevelop.Base/Internal/Project/Project/Deployment/FileDeploy.cs Core/src/MonoDevelop.Base/Internal/Project/Project/Deployment/ScriptDeploy.cs From commit-watcher at mono-cvs.ximian.com Wed Feb 2 20:40:29 2005 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Wed, 2 Feb 2005 20:40:29 -0500 (EST)