[Monodevelop-patches-list] r2531 - in trunk/MonoDevelop: . Core/src/AddIns/DisplayBindings/SourceEditor/Commands Core/src/MonoDevelop.Base po
Todd Berman <tberman@sevenl.net>
tberman at mono-cvs.ximian.com
Sun May 15 16:11:04 EDT 2005
Author: tberman
Date: 2005-05-15 16:11:04 -0400 (Sun, 15 May 2005)
New Revision: 2531
Removed:
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/ToolCommands.cs
Modified:
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
trunk/MonoDevelop/Makefile.am
trunk/MonoDevelop/configure.in
trunk/MonoDevelop/po/POTFILES.in
Log:
commit a bunch of random changes for distchecking. giving up a bit because intltool is horribly broken.
Deleted: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/ToolCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/ToolCommands.cs 2005-05-15 19:02:30 UTC (rev 2530)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/ToolCommands.cs 2005-05-15 20:11:04 UTC (rev 2531)
@@ -1,220 +0,0 @@
-// <file>
-// <copyright see="prj:///doc/copyright.txt"/>
-// <license see="prj:///doc/license.txt"/>
-// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
-// <version value="$version"/>
-// </file>
-
-using System;
-using System.IO;
-using System.Text;
-
-using MonoDevelop.Core.AddIns;
-using MonoDevelop.Core.Properties;
-using MonoDevelop.Core.AddIns.Codons;
-using MonoDevelop.Gui.Dialogs;
-using MonoDevelop.TextEditor;
-using MonoDevelop.Gui;
-using MonoDevelop.Gui.HtmlControl;
-using MonoDevelop.Core.Services;
-using MonoDevelop.SourceEditor.Gui;
-using MonoDevelop.Services;
-
-using Gtk;
-
-namespace MonoDevelop.DefaultEditor.Commands
-{
- public class ColorDialog : ColorSelectionDialog
- {
- // FIXME: i18n
- public ColorDialog () : base (GettextCatalog.GetString ("Insert a color hex string"))
- {
- this.ColorSelection.HasPalette = true;
- this.ColorSelection.HasOpacityControl = false;
- this.TransientFor = (Window) WorkbenchSingleton.Workbench;
- }
-
- public string ColorStr ()
- {
- Gdk.Color color = this.ColorSelection.CurrentColor;
- StringBuilder s = new StringBuilder ();
- ushort[] vals = { color.Red, color.Green, color.Blue };
- char[] hexchars = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
- s.Append ("#");
- foreach (ushort val in vals) {
- /* Convert to a range of 0-255, then lookup the
- * digit for each half-byte */
- byte rounded = (byte) (val >> 8);
- s.Append (hexchars[(rounded & 0xf0) >> 4]);
- s.Append (hexchars[rounded & 0x0f]);
- }
- return s.ToString ();
- }
- }
-
- public class ShowColorDialog : AbstractMenuCommand
- {
- public override void Run()
- {
- IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
- if (window == null)
- return;
-
- SourceEditorDisplayBindingWrapper w = window.ViewContent as SourceEditorDisplayBindingWrapper;
- if (w == null)
- return;
-
- //FIXME:
- // - Return color name (not color value) if it IsKnownColor,
- // but it's still hasn't been implemented for System.Drawing.Color
- ColorDialog dialog = new ColorDialog ();
- if (dialog.Run () == (int) ResponseType.Ok)
- {
- w.InsertAtCursor (dialog.ColorStr ());
- }
-
- dialog.Hide ();
- dialog.Dispose ();
- }
- }
-
- public class QuickDocumentation : AbstractMenuCommand
- {
- public override void Run()
- {
- Console.WriteLine ("Not ported to the new editor yet");
- /*
- IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
-
- if (window == null || !(window.ViewContent is ITextEditorControlProvider)) {
- return;
- }
- TextEditorControl textAreaControl = ((ITextEditorControlProvider)window.ViewContent).TextEditorControl;
-
- int startLine = textAreaControl.Document.GetLineNumberForOffset(textAreaControl.ActiveTextAreaControl.Caret.Offset);
- int endLine = startLine;
-
- LineSegment line = textAreaControl.Document.GetLineSegment(startLine);
- string curLine = textAreaControl.Document.GetText(line.Offset, line.Length).Trim();
- if (!curLine.StartsWith("///")) {
- return;
- }
-
- while (startLine > 0) {
- line = textAreaControl.Document.GetLineSegment(startLine);
- curLine = textAreaControl.Document.GetText(line.Offset, line.Length).Trim();
- if (curLine.StartsWith("///")) {
- --startLine;
- } else {
- break;
- }
- }
-
- while (endLine < textAreaControl.Document.TotalNumberOfLines - 1) {
- line = textAreaControl.Document.GetLineSegment(endLine);
- curLine = textAreaControl.Document.GetText(line.Offset, line.Length).Trim();
- if (curLine.StartsWith("///")) {
- ++endLine;
- } else {
- break;
- }
- }
-
- StringBuilder documentation = new StringBuilder();
- for (int lineNr = startLine + 1; lineNr < endLine; ++lineNr) {
- line = textAreaControl.Document.GetLineSegment(lineNr);
- curLine = textAreaControl.Document.GetText(line.Offset, line.Length).Trim();
- documentation.Append(curLine.Substring(3));
- documentation.Append('\n');
- }
- string xml = "<member>" + documentation.ToString() + "</member>";
-
- string html = String.Empty;
-
- try {
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
- html = MonoDevelop.Internal.Project.ConvertXml.ConvertData(xml,
- propertyService.DataDirectory +
- Path.DirectorySeparatorChar + "ConversionStyleSheets" +
- Path.DirectorySeparatorChar + "ShowXmlDocumentation.xsl",
- null);
- } catch (Exception e) {
- //MessageBox.Show(e.ToString());
- }
- //new ToolWindowForm(textAreaControl, html).Show();
- */
- }
-
- class ToolWindowForm //: Form
- {/*
- public ToolWindowForm(TextEditorControl textEditorControl, string html)
- {
- Point caretPos = textEditorControl.ActiveTextAreaControl.Caret.Position;
- Point visualPos = new Point(textEditorControl.ActiveTextAreaControl.TextArea.TextView.GetDrawingXPos(caretPos.Y, caretPos.X) + textEditorControl.ActiveTextAreaControl.TextArea.TextView.DrawingPosition.X,
- (int)((1 + caretPos.Y) * textEditorControl.ActiveTextAreaControl.TextArea.TextView.FontHeight) - textEditorControl.ActiveTextAreaControl.TextArea.VirtualTop.Y - 1 + textEditorControl.ActiveTextAreaControl.TextArea.TextView.DrawingPosition.Y);
- //Location = textEditorControl.ActiveTextAreaControl.TextArea.PointToScreen(visualPos); //FIXME: Again, should we have this method?!?
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
-
- HtmlControl hc = new HtmlControl();
- hc.Html = html;
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- hc.CascadingStyleSheet = propertyService.DataDirectory +
- Path.DirectorySeparatorChar + "resources" +
- Path.DirectorySeparatorChar + "css" +
- Path.DirectorySeparatorChar + "MsdnHelp.css";
- //hc.Dock = DockStyle.Fill;
- hc.BeforeNavigate += new BrowserNavigateEventHandler(BrowserNavigateCancel);
- //Controls.Add(hc);
-
- //ShowInTaskbar = false;
- //FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- //StartPosition = FormStartPosition.Manual;
- }
-
- void BrowserNavigateCancel(object sender, BrowserNavigateEventArgs e)
- {
- e.Cancel = true;
- }
-
- protected void OnDeactivate(EventArgs e)
- {
- //Close();
- }
-
- protected bool ProcessDialogKey()
- {
-
- //if (keyData == Keys.Escape) {
- // Close();
- // return true;
- //}
- //return base.ProcessDialogKey(keyData);
-
- //return false;
- }
- */
- }
- }
-
- public class SplitTextEditor : AbstractMenuCommand
- {
- public override void Run()
- {
- Console.WriteLine ("Not implemented in the new Editor");
- /*
- IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
-
- if (window == null || !(window.ViewContent is ITextEditorControlProvider)) {
- return;
- }
- TextEditorControl textEditorControl = ((ITextEditorControlProvider)window.ViewContent).TextEditorControl;
- if (textEditorControl != null) {
- //textEditorControl.Split();
- }
- */
- }
- }
-
-}
-
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am 2005-05-15 19:02:30 UTC (rev 2530)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am 2005-05-15 20:11:04 UTC (rev 2531)
@@ -233,7 +233,6 @@
Services/ParserService/SimpleCodeCompletionDatabase.cs \
Services/ParserService/ReferenceEntry.cs \
Services/ResourceService.cs \
-Services/StockIcons.cs \
Services/MessageService.cs \
Services/Toolbar/ToolbarService.cs \
Services/MonodocService.cs \
@@ -489,14 +488,13 @@
cp $(srcdir)/$(ADDIN) $(ADDIN_BUILD)/.
$(ASSEMBLY): $(build_sources) $(srcdir)/Base.glade
+ mkdir -p $(top_builddir)/Core/src/MonoDevelop.Base/Services
+ perl -x$(srcdir)/../../../build/data/resources/icons -w $(srcdir)/./Services/process-icons.pl > $(top_builddir)/Core/src/MonoDevelop.Base/Services/StockIcons.cs
$(CSC) $(MONO_POSIX_OEE) -codepage:utf8 -out:$@ -target:library $(DLLS) \
-resource:$(srcdir)/Base.glade,Base.glade \
- $(monodoc_libflags) $(build_sources) \
+ $(monodoc_libflags) $(build_sources) $(top_builddir)/Core/src/MonoDevelop.Base/Services/StockIcons.cs \
&& cp $(CONFIG) $(top_builddir)/build/bin/.
-Services/StockIcons.cs : ./Services/process-icons.pl ../../../build/data/resources/icons
- perl -x$(srcdir)/../../../build/data/resources/icons -w $(srcdir)/./Services/process-icons.pl > $(srcdir)/Services/StockIcons.cs
-
assemblydir = $(MD_ASSEMBLY_DIR)
assembly_DATA = $(ASSEMBLY) $(CONFIG)
@@ -506,7 +504,7 @@
optionsdir = $(MD_DIR)/data/options
options_DATA = $(OPTIONS)
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(build_OPTIONS)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(build_OPTIONS) $(top_builddir)/Core/src/MonoDevelop.Base/Services/StockIcons.cs
DISTCLEANFILES = $(CONFIG)
EXTRA_DIST = $(FILES) ./Services/process-icons.pl $(CONFIG).in Base.glade $(ADDIN) $(OPTIONS)
Modified: trunk/MonoDevelop/Makefile.am
===================================================================
--- trunk/MonoDevelop/Makefile.am 2005-05-15 19:02:30 UTC (rev 2530)
+++ trunk/MonoDevelop/Makefile.am 2005-05-15 20:11:04 UTC (rev 2531)
@@ -51,4 +51,3 @@
DISTCLEANFILES = monodevelop intltool-extract intltool-merge intltool-update \
monodevelop.pc
-
Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in 2005-05-15 19:02:30 UTC (rev 2530)
+++ trunk/MonoDevelop/configure.in 2005-05-15 20:11:04 UTC (rev 2531)
@@ -1,11 +1,11 @@
-AC_INIT([monodevelop], 0.6, [monodevelop-list at lists.ximian.com])
+AC_INIT([monodevelop], 0.7, [monodevelop-list at lists.ximian.com])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([1.9 tar-ustar])
AM_MAINTAINER_MODE
AC_PROG_INTLTOOL([0.25])
-ASSEMBLY_VERSION=0.6.0.0
+ASSEMBLY_VERSION=0.7.0.0
AC_PATH_PROG(MONO, mono)
AC_PATH_PROG(MCS, mcs)
@@ -64,9 +64,9 @@
dnl hard dependencies
-GTKSHARP_REQUIRED_VERSION=1.9.3
-GTKSOURCEVIEWSHARP_REQUIRED_VERSION=0.7
-GECKOSHARP_REQUIRED_VERSION=0.7
+GTKSHARP_REQUIRED_VERSION=1.9.5
+GTKSOURCEVIEWSHARP_REQUIRED_VERSION=0.10
+GECKOSHARP_REQUIRED_VERSION=0.10
MONODOC_REQUIRED_VERSION=1.0
PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
Modified: trunk/MonoDevelop/po/POTFILES.in
===================================================================
--- trunk/MonoDevelop/po/POTFILES.in 2005-05-15 19:02:30 UTC (rev 2530)
+++ trunk/MonoDevelop/po/POTFILES.in 2005-05-15 20:11:04 UTC (rev 2531)
@@ -61,7 +61,6 @@
Core/src/MonoDevelop.Gui.Widgets/FolderDialog/BaseFileEntry.cs
Core/src/MonoDevelop.Gui.Widgets/Navbar/Navbar.cs
Core/src/MonoDevelop.Gui.Widgets/Tree/TreeNodeCollection.cs
-Core/src/AddIns/DisplayBindings/SourceEditor/Commands/ToolCommands.cs
Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs
Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/EditTemplateGroupDialog.cs
Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs
More information about the Monodevelop-patches-list
mailing list