[Monodevelop-patches-list] r2177 - in trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor: . CodeCompletion Commands Gui Gui/Dialogs Gui/OptionPanels InsightWindow Search/DocumentIterator
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Thu Jan 27 02:45:42 EST 2005
Author: jluke
Date: 2005-01-27 02:45:41 -0500 (Thu, 27 Jan 2005)
New Revision: 2177
Removed:
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs
Modified:
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ListWindow.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/ProjectCommands.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/EditorBindings.glade
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/InsightWindow.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/DirectoryDocumentIterator.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/texteditoraddin.glade
Log:
* EditorBindings.glade:
* texteditoraddin.glade:
* CodeCompletion/ListWindow.cs:
* Gui/SourceEditorBuffer.cs:
* Gui/SourceEditorDisplayBinding.cs
* Gui/SourceEditorWidget.cs:
* Gui/SourceEditorView.cs:
* Gui/Dialogs/ReplaceDialog.cs:
* Gui/Dialogs/ReplaceInFilesDialog.cs:
* Gui/OptionPanels/CodeTemplatePanel.cs:
* Gui/OptionPanels/GeneralTextEditorPanel.cs:
* InsightWindow/InsightWindow.cs:
* Search/DocumentIterator/DirectoryDocumentIterator.cs:
use ComboBox instead of OptionMenus
use Gtk.Entry w/completion instead of Gnome.Entry
remove obselete warnings, etc.
* Makefile.am: remove Html from build
* Commands/ProjectCommands.cs: comment out that
* Gui/Dialogs/ExportProjectToHtmlDialog.cs: kill this
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2005-01-27 04:38:02 UTC (rev 2176)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2005-01-27 07:45:41 UTC (rev 2177)
@@ -3,10 +3,30 @@
* EditorBindings.glade:
* texteditoraddin.glade: update to new glade format
+ * EditorBindings.glade:
+ * texteditoraddin.glade:
+ * CodeCompletion/ListWindow.cs:
+ * Gui/SourceEditorBuffer.cs:
+ * Gui/SourceEditorDisplayBinding.cs
+ * Gui/SourceEditorWidget.cs:
+ * Gui/SourceEditorView.cs:
+ * Gui/Dialogs/ReplaceDialog.cs:
+ * Gui/Dialogs/ReplaceInFilesDialog.cs:
+ * Gui/OptionPanels/CodeTemplatePanel.cs:
+ * Gui/OptionPanels/GeneralTextEditorPanel.cs:
+ * InsightWindow/InsightWindow.cs:
+ * Search/DocumentIterator/DirectoryDocumentIterator.cs:
+ use ComboBox instead of OptionMenus
+ use Gtk.Entry w/completion instead of Gnome.Entry
+ remove obselete warnings, etc.
+
+ * Makefile.am: remove Html from build
+ * Commands/ProjectCommands.cs: comment out that
+ * Gui/Dialogs/ExportProjectToHtmlDialog.cs: kill this
+
2005-01-26 Christian Hergert <chris at mosaix.net>
-
- * Gui/SourceEditorView.cs: Fix for new ShowView method in
- DefaultWorkbench.
+ * Gui/SourceEditorView.cs: Fix for new ShowView method in
+ DefaultWorkbench.
2005-01-26 John Luke <john.luke at gmail.com>
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ListWindow.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ListWindow.cs 2005-01-27 04:38:02 UTC (rev 2176)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ListWindow.cs 2005-01-27 07:45:41 UTC (rev 2177)
@@ -356,8 +356,6 @@
int ypos = margin;
int lineWidth = winWidth - margin*2;
- int count = win.DataProvider.ItemCount;
-
int xpos = margin + padding;
int n = 0;
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/ProjectCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/ProjectCommands.cs 2005-01-27 04:38:02 UTC (rev 2176)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/ProjectCommands.cs 2005-01-27 07:45:41 UTC (rev 2177)
@@ -15,6 +15,7 @@
namespace MonoDevelop.DefaultEditor.Commands
{
+/*
public class ExportProjectToHtml : AbstractMenuCommand
{
public override void Run()
@@ -30,4 +31,5 @@
}
}
}
+*/
}
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/EditorBindings.glade
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/EditorBindings.glade 2005-01-27 04:38:02 UTC (rev 2176)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/EditorBindings.glade 2005-01-27 07:45:41 UTC (rev 2177)
@@ -47,7 +47,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="mnemonic_widget">groupOptionMenu</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -123,10 +122,8 @@
</child>
<child>
- <widget class="GtkOptionMenu" id="groupOptionMenu">
+ <widget class="GtkComboBox" id="groupCombo">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">-1</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -134,7 +131,7 @@
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
<property name="x_options">fill</property>
- <property name="y_options"></property>
+ <property name="y_options">fill</property>
</packing>
</child>
</widget>
@@ -157,7 +154,7 @@
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
@@ -255,7 +252,7 @@
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
@@ -734,10 +731,8 @@
</child>
<child>
- <widget class="GtkOptionMenu" id="textEncodingComboBox">
+ <widget class="GtkComboBox" id="textEncodingComboBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">-1</property>
</widget>
<packing>
<property name="padding">0</property>
Deleted: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs 2005-01-27 04:38:02 UTC (rev 2176)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs 2005-01-27 07:45:41 UTC (rev 2177)
@@ -1,452 +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.Drawing;
-using System.IO;
-using System.Collections;
-using System.Collections.Specialized;
-
-using MonoDevelop.Core.Properties;
-using MonoDevelop.Core.Services;
-using MonoDevelop.Internal.Project;
-using MonoDevelop.TextEditor.Document;
-//using MonoDevelop.TextEditor.Util;
-using MonoDevelop.Gui.Widgets;
-using MonoDevelop.Services;
-
-using Gtk;
-
-// FIXME: use IdleHandler instead of threads here
-// also, what is the point of exporting to HTML?
-
-namespace MonoDevelop.Gui.Dialogs
-{
- public class ExportProjectToHtmlDialog : Dialog
- {
- Entry pathTextBox = new Entry ();
- Label pathLabel = new Label ();
- Button okButton = new Button ();
- Button cancelButton = new Button ();
- Button browseButton = new Button ();
- ProgressBar progressBar = new ProgressBar ();
-
- FileUtilityService fileUtilityService = (FileUtilityService) ServiceManager.GetService(typeof(FileUtilityService));
- IconService iconService = (IconService) ServiceManager.GetService(typeof(IconService));
-
- Project project;
- int filesExported = 0;
-
- int FilesExported
- {
- get {
- return filesExported;
- }
- set {
- progressBar.Fraction = filesExported = value / 100;
- }
- }
-
- void StartExporting ()
- {
- cancelButton = new Button (Gtk.Stock.Cancel);
- cancelButton.Clicked += new EventHandler (StopThread);
- }
-
- public ExportProjectToHtmlDialog (Project project)
- {
- PropertyService propertyService = (PropertyService) ServiceManager.GetService (typeof (PropertyService));
- this.project = project;
-
- pathLabel.Text = GettextCatalog.GetString ("Folder");
-
- //browseButton.Text = "...";
- //browseButton.Click += new EventHandler(BrowseDirectories);
-
- //okButton.Text = resourceService.GetString("Global.OKButtonText");
- //okButton.Click += new EventHandler(ExportProject);
-
- //cancelButton.DialogResult = DialogResult.Cancel;
-
- SetSizeRequest (350, 88 + 6);
- WindowPosition = WindowPosition.CenterOnParent;
-
- Title = GettextCatalog.GetString ("Export Project to HTML");
- }
-
- void BrowseDirectories (object sender, EventArgs e)
- {
- using (FolderDialog fd = new FolderDialog (GettextCatalog.GetString ("Select Target Directory"))) {
- if (fd.Run () == (int) ResponseType.Ok) {
- //pathTextBox.Text = fd.Path;
- }
-
- fd.Hide ();
- }
- }
-
- Hashtable projectTable = new Hashtable ();
- Hashtable bitmapTable = new Hashtable ();
- int bitmapIconIndex = 0;
- int indexFileIndex = 0;
-
- public Hashtable GetPath (string filename, Hashtable table, bool create)
- {
- string directory = System.IO.Path.GetDirectoryName (filename);
- string[] treepath = directory.Split (new char[] { System.IO.Path.DirectorySeparatorChar });
- Hashtable curTable = table;
-
- foreach (string path in treepath) {
- if (path.Length == 0 || path[0] == '.')
- continue;
-
- object node = curTable[path];
-
- if (node == null) {
- if (create) {
- Hashtable newTable = new Hashtable();
- curTable[path] = newTable;
- curTable = newTable;
- continue;
- } else {
- return null;
- }
- }
-
- curTable = (Hashtable)node;
- }
-
- return curTable;
- }
-
- int GetImageIndex (string filename)
- {
- if (filename != null) {
- return 0; //iconService.GetImageIndexForFile (filename);
- }
-
- return -1;
- }
-
- class Descriptor
- {
- public string title;
- public string url;
-
- public Descriptor (string title, string url)
- {
- this.title = title;
- this.url = url;
- }
- }
-
- StreamWriter curFileStream = null;
- Stack curIndexStreamStack = new Stack ();
- int curSpanNumber = 0;
- Hashtable Spans = new Hashtable();
-
- string ExportFile (string fileName, string targetPath)
- {
- string targetFile = fileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, fileName).Substring (2).Replace (System.IO.Path.DirectorySeparatorChar.ToString (), "") + ".html";
-
- //IDocument document = new DocumentFactory ().CreateDocument ();
- //document.HighlightingStrategy = HighlightingStrategyFactory.CreateHighlightingStrategyForFile (fileName);
- StreamReader stream = System.IO.File.OpenText (fileName);
- //document.TextContent = stream.ReadToEnd ();
- stream.Close ();
-
- curFileStream = System.IO.File.CreateText (System.IO.Path.Combine (targetPath, targetFile));
- curFileStream.Write ("<html>\r\n");
- curFileStream.Write ("<head>\r\n");
- curFileStream.Write ("<link rel=\"stylesheet\" type=\"text/css\" href=\"sdcss.css\">\r\n");
- curFileStream.Write ("<title>" + System.IO.Path.GetFileName (fileName) + "</title>\r\n");
- curFileStream.Write ("</head>\r\n");
- curFileStream.Write ("<body>\r\n");
-
- curFileStream.Write ("<div class=\"code\"><TABLE SUMMARY=\"SourceCode\" BORDER=0 CELLSPACING=0 CELLPADDING=2 WIDTH=\"100%\">\r\n");
- curFileStream.Write (" <TR BGCOLOR=\"#FFFFFF\">\r\n");
- curFileStream.Write (" <TH WIDTH=\"50\" NOWRAP ALIGN=LEFT></TH>\r\n");
- curFileStream.Write (" <TH WIDTH=\"1%\" NOWRAP ALIGN=LEFT></TH>\r\n");
- curFileStream.Write (" <TH VALIGN=TOP ALIGN=LEFT> \r\n");
- curFileStream.Write (" </TH>\r\n");
-
- curFileStream.Write (" </TR>\r\n");
- int i = 0;
-
- /*foreach (LineSegment line in document.LineSegmentCollection) {
- curFileStream.Write (" <TR BGCOLOR=\"#FFFFFF\" VALIGN=TOP>\r\n");
- curFileStream.Write (" <TD NOWRAP VALIGN=TOP ALIGN=RIGHT>" + ++i + ":</TD>\r\n");
- curFileStream.Write (" <TD NOWRAP VALIGN=TOP ALIGN=LEFT> \r\n");
- bool spanOpen = false;
- Color curColor = Color.Black;
- bool oldItalic = false;
- bool oldBold = false;
- bool firstSpan = true;
-
- foreach (TextWord word in line.Words) {
- switch (word.Type) {
- case TextWordType.Space:
- curFileStream.Write (" ");
- break;
-
- case TextWordType.Tab:
- for (int k = 0; k < document.TextEditorProperties.TabIndent; ++k) {
- curFileStream.Write (" ");
- }
- break;
-
- case TextWordType.Word:
- Color c = word.Color;
- string colorstr = c.R + ", " + c.G + ", " + c.B;
-
- if (word.Font.Italic) {
- colorstr = "i" + colorstr;
- }
-
- if (word.Font.Bold) {
- colorstr = "b" + colorstr;
- }
-
- if (Spans[colorstr] == null) {
- Spans[colorstr] = "span" + ++curSpanNumber;
- }
- bool newColor = c != curColor || oldItalic != word.Font.Italic || oldBold != word.Font.Bold;
-
- if (newColor) {
- if (!firstSpan) {
- curFileStream.Write ("</span>" );
- }
-
- curFileStream.Write ("<span class=\"" + Spans[colorstr].ToString () + "\">" );
- spanOpen = true;
- firstSpan = false;
- }
-
- curFileStream.Write (HtmlLize (word.Word));
-
- if (newColor) {
- curColor = c;
- oldItalic = word.Font.Italic;
- oldBold = word.Font.Bold;
- }
- break;
- }
- }
-
- if (spanOpen) {
- curFileStream.Write ("</span>" );
- }
-
- curFileStream.Write ("</TD>\r\n");
- curFileStream.Write ("</TR>\r\n");
- }
- */
- curFileStream.Write ("</TABLE></div>\r\n");
-
- curFileStream.Write ("<P>\r\n");
- curFileStream.Write ("This page was automatically generated by \r\n");
- curFileStream.Write ("<A TARGET=\"_blank\" HREF=\"http://www.icsharpcode.net/OpenSource/SD\">SharpDevelop</A>.\r\n");
- curFileStream.Write ("</p>\r\n");
- curFileStream.Write ("</body>\r\n");
- curFileStream.Write ("</html>\r\n");
- curFileStream.Close ();
- return targetFile;
- }
-
- string HtmlLize (string str)
- {
- return str.Replace ("&", "&").Replace ("<", "<").Replace (">", ">");
- }
-
- void WriteIndexTable (string fileName, string name, ArrayList nameList, Hashtable table)
- {
- curIndexStreamStack.Push (System.IO.File.CreateText(fileName));
- StreamWriter curIndexStream = (StreamWriter) curIndexStreamStack.Peek();
-
- curIndexStream.Write ("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\r\n");
- curIndexStream.Write ("<html>\r\n");
- curIndexStream.Write ("<head>\r\n");
- curIndexStream.Write ("<title>" + project.Name + "</title>\r\n");
- curIndexStream.Write ("</head>\r\n");
-
- curIndexStream.Write ("<body>\r\n");
- curIndexStream.Write ("<p>Location : ");
- foreach (Descriptor d in nameList) {
- curIndexStream.Write ("<a href=\""+ d.url + "\">" + d.title + "</a>/");
- }
- curIndexStream.Write (name);
- curIndexStream.Write ("</p>\r\n");
-
- nameList.Add (new Descriptor (name, System.IO.Path.GetFileName (fileName)));
-
- curIndexStream.Write ("<TABLE SUMMARY=\"Directory\" BORDER=0 CELLSPACING=0 CELLPADDING=2 WIDTH=\"100%\">\r\n");
- curIndexStream.Write (" <TR BGCOLOR=\"#F38C00\">\r\n");
- curIndexStream.Write (" <TH WIDTH=\"1%\"> </TH>\r\n");
- curIndexStream.Write (" <TH WIDTH=\"1%\" NOWRAP ALIGN=LEFT>Name</TH>\r\n");
- curIndexStream.Write (" <TH WIDTH=\"1%\" NOWRAP ALIGN=RIGHT>Size</TH>\r\n");
- curIndexStream.Write (" <TH WIDTH=\"1%\" NOWRAP ALIGN=LEFT>Date</TH>\r\n");
- curIndexStream.Write (" <TH VALIGN=TOP ALIGN=LEFT> \r\n");
- curIndexStream.Write (" </TH>\r\n");
- curIndexStream.Write (" </TR>\r\n");
-
- bool coloring = false;
- foreach (DictionaryEntry entry in table) {
- if (entry.Value is Hashtable) {
- string filename = "index" + ++indexFileIndex + ".html";
- WriteIndexTable (System.IO.Path.GetDirectoryName (fileName) + System.IO.Path.DirectorySeparatorChar + filename, entry.Key.ToString(), nameList, (Hashtable)entry.Value);
- nameList.RemoveAt (nameList.Count - 1);
- curIndexStream.Write (" <TR BGCOLOR=\"" + (coloring ? "#FFFFFF" : "#EEEEEE") + "\" VALIGN=TOP>\r\n");
- curIndexStream.Write (" <TD NOWRAP VALIGN=TOP ALIGN=RIGHT><a href=\"" + filename + "\"><IMG ALIGN=ABSBOTTOM BORDER=0 WIDTH=16 HEIGHT=16 SRC=\"folderbitmap.png\"></a></TD>\r\n");
- curIndexStream.Write (" <TD NOWRAP VALIGN=TOP ALIGN=LEFT><a href=\""+ filename + "\">" + entry.Key.ToString() + "</a> </TD>\r\n");
- curIndexStream.Write (" <TD NOWRAP VALIGN=TOP ALIGN=RIGHT>-</TD>\r\n");
- curIndexStream.Write (" <TD NOWRAP VALIGN=TOP ALIGN=RIGHT>-</TD>\r\n");
- curIndexStream.Write (" <TD VALIGN=TOP ALIGN=LEFT> \r\n");
- curIndexStream.Write (" </TD>\r\n");
- curIndexStream.Write (" </TR>\r\n");
- } else if (entry.Value is ProjectFile) {
- ProjectFile fInfo = (ProjectFile) entry.Value;
- DateTime time = Directory.GetLastAccessTime (fInfo.Name);
- FileStream reader = System.IO.File.OpenRead (fInfo.Name);
- long size = reader.Length;
- reader.Close ();
-
- int idx = GetImageIndex (fInfo.Name);
- if (bitmapTable[idx] == null) {
- string filename = "fileicon" + ++bitmapIconIndex + ".png";
-
- //Bitmap bmp = (Bitmap)iconService.ImageList.Images[idx];
- //bmp.Save(Path.GetDirectoryName(fileName) + Path.DirectorySeparatorChar + filename);
- //bitmapTable[idx] = filename;
- }
- string outFile = ExportFile(fInfo.Name, System.IO.Path.GetDirectoryName(fileName));
- ++FilesExported;
- curIndexStream.Write (" <TR BGCOLOR=\"" + (coloring ? "#FFFFFF" : "#EEEEEE") + "\" VALIGN=TOP>\r\n");
- curIndexStream.Write (" <TD NOWRAP VALIGN=TOP ALIGN=RIGHT><a href=\"" + outFile + "\"><IMG ALIGN=ABSBOTTOM BORDER=0 WIDTH=16 HEIGHT=16 SRC=\"" + bitmapTable[idx].ToString() +"\"></a></TD>\r\n");
- curIndexStream.Write (" <TD NOWRAP VALIGN=TOP ALIGN=LEFT><a href=\"" + outFile + "\">" + System.IO.Path.GetFileName(fInfo.Name) + "</a> </TD>\r\n");
- curIndexStream.Write (" <TD NOWRAP VALIGN=TOP ALIGN=RIGHT>" + size + "</TD>\r\n");
- curIndexStream.Write (" <TD NOWRAP VALIGN=TOP ALIGN=RIGHT>" + time.ToString("d") + "</TD>\r\n");
- curIndexStream.Write (" <TD VALIGN=TOP ALIGN=LEFT> \r\n");
- curIndexStream.Write (" </TD>\r\n");
- curIndexStream.Write (" </TR>\r\n");
- }
-
- coloring = !coloring;
- }
-
- curIndexStream.Write ("</TABLE>\r\n");
-
- curIndexStream.Write ("<p>\r\n");
- curIndexStream.Write ("This page was automatically generated by \r\n");
- curIndexStream.Write ("<A TARGET=\"_blank\" HREF=\"http://www.icsharpcode.net/OpenSource/SD\">SharpDevelop</A>.\r\n");
- curIndexStream.Write ("</p>\r\n");
- curIndexStream.Write ("</body>\r\n");
- curIndexStream.Write ("</html>\r\n");
-
- lock (this) {
- curIndexStream.Close ();
- curIndexStreamStack.Pop ();
- }
- }
-
- delegate void MyD ();
-
- void QuitDialog ()
- {
- //DialogResult = DialogResult.OK;
- }
-
-// Thread exportFilesThread;
- void ExportFilesThread ()
- {
- //resourceService.GetBitmap ("Icons.16x16.ClosedFolderBitmap").Save (fileUtilityService.GetDirectoryNameWithSeparator (pathTextBox.Text) + "folderbitmap.png");
- WriteIndexTable (fileUtilityService.GetDirectoryNameWithSeparator (pathTextBox.Text) + "index.html", "[ROOT]", new ArrayList (), projectTable);
- CreateCSS (pathTextBox.Text);
- //Invoke (new MyD (QuitDialog));
- }
-
- void StopThread(object sender, EventArgs e)
- {
- //lock (this) {
- //exportFilesThread.Abort ();
- curFileStream.Close ();
- while (curIndexStreamStack.Count > 0) {
- ((StreamWriter) curIndexStreamStack.Pop ()).Close ();
- }
- QuitDialog ();
- //}
- }
-
- void CreateCSS (string targetPath)
- {
- //lock (this) {
- StreamWriter sw = System.IO.File.CreateText (System.IO.Path.Combine (targetPath, "sdcss.css"));
- sw.Write ("div.code\r\n");
- sw.Write ("{\r\n");
- sw.Write (" background-color: rgb(255,255,255);\r\n");
- sw.Write (" font-family: \"Lucida Console\", \"courier new\", courier;\r\n");
- sw.Write (" color: rgb(0,0,0);\r\n");
- sw.Write (" font-size: x-small;\r\n");
- sw.Write (" padding: 1em;\r\n");
- sw.Write (" margin: 1em;\r\n");
- sw.Write ("}\r\n");
-
- foreach (DictionaryEntry entry in Spans) {
- string color = entry.Key.ToString ();
- string name = entry.Value.ToString ();
- bool bold = color.StartsWith ("b");
- if (bold) {
- color = color.Substring(1);
- }
- bool italic = color.StartsWith ("i");
- if (italic) {
- color = color.Substring (1);
- }
-
- sw.Write ("div.code span." + name +"\r\n");
- sw.Write ("{\r\n");
- sw.Write (" color: rgb("+ color + ");\r\n");
- if (bold) {
- sw.Write (" font-weight: bold;\r\n");
- } else
- if (italic) {
- sw.Write (" font-weight: italic;\r\n");
- } else {
- sw.Write (" font-weight: normal;\r\n");
- }
-
- sw.Write("}\r\n");
- }
- sw.Close ();
- //}
-
- }
-
- void ExportProject (object sender, EventArgs e)
- {
- if (!Directory.Exists (pathTextBox.Text)) {
- //MessageBox.Show ("Directory doesn't exists", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
-
- foreach (ProjectFile fInfo in project.ProjectFiles) {
- if (fInfo.Subtype != Subtype.Directory) {
- if (fInfo.BuildAction == BuildAction.Compile ||
- fInfo.BuildAction == BuildAction.Nothing) {
- string relativefile = fileUtilityService.AbsoluteToRelativePath(project.BaseDirectory, fInfo.Name);
- Hashtable table = GetPath (relativefile, projectTable, true);
- table [System.IO.Path.GetFileName(fInfo.Name)] = fInfo;
- }
- }
- }
-
- StartExporting ();
- /*exportFilesThread = new Thread (new ThreadStart(ExportFilesThread));
- exportFilesThread.IsBackground = true;
- exportFilesThread.Start ();*/
- }
- }
-}
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs 2005-01-27 04:38:02 UTC (rev 2176)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs 2005-01-27 07:45:41 UTC (rev 2177)
@@ -14,11 +14,9 @@
using MonoDevelop.Gui;
using MonoDevelop.TextEditor.Document;
using MonoDevelop.Core.Properties;
-
using MonoDevelop.Core.Services;
using MonoDevelop.Services;
using MonoDevelop.TextEditor;
-//using MonoDevelop.EditorBindings.Search;
using Gtk;
using Glade;
@@ -27,8 +25,8 @@
{
public class ReplaceDialog
{
- private const int HISTORY_LIMIT = 20;
- private const char HISTORY_SEPARATOR_CHAR = (char) 10;
+ private const int historyLimit = 20;
+ private const char historySeparator = (char) 10;
// regular members
public bool replaceMode;
StringCollection findHistory = new StringCollection();
@@ -40,8 +38,8 @@
StringParserService stringParserService = (StringParserService)ServiceManager.GetService (typeof (StringParserService));
// gtk widgets
- [Glade.Widget] Gnome.Entry searchPatternEntry;
- [Glade.Widget] Gnome.Entry replacePatternEntry;
+ [Glade.Widget] Gtk.Entry searchPatternEntry;
+ [Glade.Widget] Gtk.Entry replacePatternEntry;
[Glade.Widget] Gtk.Button findHelpButton;
[Glade.Widget] Gtk.Button findButton;
[Glade.Widget] Gtk.Button markAllButton;
@@ -52,8 +50,8 @@
[Glade.Widget] Gtk.CheckButton ignoreCaseCheckBox;
[Glade.Widget] Gtk.CheckButton searchWholeWordOnlyCheckBox;
[Glade.Widget] Gtk.CheckButton useSpecialSearchStrategyCheckBox;
- [Glade.Widget] Gtk.OptionMenu specialSearchStrategyComboBox;
- [Glade.Widget] Gtk.OptionMenu searchLocationComboBox;
+ [Glade.Widget] Gtk.ComboBox specialSearchStrategyComboBox;
+ [Glade.Widget] Gtk.ComboBox searchLocationComboBox;
[Glade.Widget] Gtk.Label label1;
[Glade.Widget] Gtk.Label label2;
[Glade.Widget] Gtk.Label searchLocationLabel;
@@ -81,13 +79,21 @@
checkButtons.AddWidget(searchLocationLabel);
options.AddWidget(specialSearchStrategyComboBox);
options.AddWidget(searchLocationComboBox);
+
+ searchPatternEntry.Completion = new EntryCompletion ();
+ searchPatternEntry.Completion.Model = new ListStore (typeof (string));
+ searchPatternEntry.Completion.TextColumn = 0;
// set button sensitivity
findHelpButton.Sensitive = false;
// set replace dialog properties
- if(replaceMode)
+ if (replaceMode)
{
+ replacePatternEntry.Completion = new EntryCompletion ();
+ replacePatternEntry.Completion.Model = new ListStore (typeof (string));
+ replacePatternEntry.Completion.TextColumn = 0;
+
ReplaceDialogPointer = this.ReplaceDialogWidget;
// set the label properties
replaceButton.UseUnderline = true;
@@ -118,18 +124,7 @@
Glade.XML glade = new XML (null, "texteditoraddin.glade", dialogName, null);
glade.Autoconnect (this);
InitDialog ();
- /*if (replaceMode) {
- //this.SetupFromXml(Path.Combine(propertyService.DataDirectory, @"resources\dialogs\ReplaceDialog.xfrm"));
- //ControlDictionary["replaceHelpButton"].Enabled = false;
- InitDialogForReplace ();
- } else {
- InitDialogForFind ();
- //this.SetupFromXml(Path.Combine(propertyService.DataDirectory, @"resources\dialogs\FindDialog.xfrm"));
- }*/
- //AcceptButton = (Button)ControlDictionary["findButton"];
- //CancelButton = (Button)ControlDictionary["closeButton"];
-
LoadHistoryValues();
ignoreCaseCheckBox.Active = !SearchReplaceManager.SearchOptions.IgnoreCase;
@@ -138,14 +133,16 @@
useSpecialSearchStrategyCheckBox.Active = SearchReplaceManager.SearchOptions.SearchStrategyType != SearchStrategyType.Normal;
useSpecialSearchStrategyCheckBox.Toggled += new EventHandler(SpecialSearchStrategyCheckBoxChangedEvent);
- Gtk.MenuItem tmpItem = new Gtk.MenuItem (GettextCatalog.GetString ("Wildcards"));
- Gtk.Menu stratMenu = new Gtk.Menu ();
- stratMenu.Append (tmpItem);
- tmpItem = new Gtk.MenuItem (GettextCatalog.GetString("Regular Expressions"));
- stratMenu.Append (tmpItem);
- specialSearchStrategyComboBox.Menu = stratMenu;
+ ListStore store = new ListStore (typeof (string));
+ store.AppendValues (GettextCatalog.GetString ("Wildcards"));
+ store.AppendValues (GettextCatalog.GetString ("Regular Expressions"));
+ specialSearchStrategyComboBox.Model = store;
+
+ CellRendererText cr = new CellRendererText ();
+ specialSearchStrategyComboBox.PackStart (cr, true);
+ specialSearchStrategyComboBox.AddAttribute (cr, "text", 0);
- uint index = 0;
+ int index = 0;
switch (SearchReplaceManager.SearchOptions.SearchStrategyType) {
case SearchStrategyType.Normal:
case SearchStrategyType.Wildcard:
@@ -154,17 +151,16 @@
index = 1;
break;
}
- specialSearchStrategyComboBox.SetHistory (index);
+ specialSearchStrategyComboBox.Active = index;
- Gtk.Menu locMenu = new Gtk.Menu ();
- tmpItem = new Gtk.MenuItem (GettextCatalog.GetString ("Current File"));
- locMenu.Append (tmpItem);
- tmpItem = new Gtk.MenuItem (GettextCatalog.GetString ("All Open Files"));
- locMenu.Append (tmpItem);
- tmpItem = new Gtk.MenuItem (GettextCatalog.GetString ("Entire Project"));
- locMenu.Append (tmpItem);
+ store = new ListStore (typeof (string));
+ store.AppendValues (GettextCatalog.GetString ("Current File"));
+ store.AppendValues (GettextCatalog.GetString ("All Open Files"));
+ store.AppendValues (GettextCatalog.GetString ("Entire Project"));
- searchLocationComboBox.Menu = locMenu;
+ searchLocationComboBox.Model = store;
+ searchLocationComboBox.PackStart (cr, true);
+ searchLocationComboBox.AddAttribute (cr, "text", 0);
index = 0;
switch (SearchReplaceManager.SearchOptions.DocumentIteratorType) {
@@ -175,9 +171,9 @@
SearchReplaceManager.SearchOptions.DocumentIteratorType = DocumentIteratorType.CurrentDocument;
break;
}
- searchLocationComboBox.SetHistory (index);
+ searchLocationComboBox.Active = index;
- searchPatternEntry.GtkEntry.Text = SearchReplaceManager.SearchOptions.SearchPattern;
+ searchPatternEntry.Text = SearchReplaceManager.SearchOptions.SearchPattern;
// insert event handlers
findButton.Clicked += new EventHandler(FindNextEvent);
@@ -189,20 +185,13 @@
ReplaceDialogPointer.Title = GettextCatalog.GetString ("Replace");
replaceButton.Clicked += new EventHandler(ReplaceEvent);
replaceAllButton.Clicked += new EventHandler(ReplaceAllEvent);
- replacePatternEntry.GtkEntry.Text = SearchReplaceManager.SearchOptions.ReplacePattern;
+ replacePatternEntry.Text = SearchReplaceManager.SearchOptions.ReplacePattern;
} else {
ReplaceDialogPointer.Title = GettextCatalog.GetString ("Find");
markAllButton.Clicked += new EventHandler(MarkAllEvent);
}
- searchPatternEntry.GtkEntry.SelectRegion(0, searchPatternEntry.GtkEntry.Text.Length);
+ searchPatternEntry.SelectRegion(0, searchPatternEntry.Text.Length);
- //ControlDictionary["replacePatternEntry"].Visible = false;
- //ControlDictionary["replaceAllButton"].Visible = false;
- //ControlDictionary["replacePatternLabel"].Visible = false;
- //ControlDictionary["replacePatternButton"].Visible = false;
- //ControlDictionary["replaceButton"].Text = resourceService.GetString("Dialog.NewProject.SearchReplace.ToggleReplaceModeButton");
- //ClientSize = new Size(ClientSize.Width, ClientSize.Height - 32);
-
SpecialSearchStrategyCheckBoxChangedEvent(null, null);
SearchReplaceManager.ReplaceDialog = this;
}
@@ -222,21 +211,21 @@
public void SetSearchPattern(string pattern)
{
- searchPatternEntry.GtkEntry.Text = pattern;
+ searchPatternEntry.Text = pattern;
}
void SetupSearchReplaceManager()
{
- SearchReplaceManager.SearchOptions.SearchPattern = searchPatternEntry.GtkEntry.Text;
+ SearchReplaceManager.SearchOptions.SearchPattern = searchPatternEntry.Text;
if (replaceMode) {
- SearchReplaceManager.SearchOptions.ReplacePattern = replacePatternEntry.GtkEntry.Text;
+ SearchReplaceManager.SearchOptions.ReplacePattern = replacePatternEntry.Text;
}
SearchReplaceManager.SearchOptions.IgnoreCase = !ignoreCaseCheckBox.Active;
SearchReplaceManager.SearchOptions.SearchWholeWordOnly = searchWholeWordOnlyCheckBox.Active;
if (useSpecialSearchStrategyCheckBox.Active) {
- switch (specialSearchStrategyComboBox.History) {
+ switch (specialSearchStrategyComboBox.Active) {
case 0:
SearchReplaceManager.SearchOptions.SearchStrategyType = SearchStrategyType.Wildcard;
break;
@@ -248,7 +237,7 @@
SearchReplaceManager.SearchOptions.SearchStrategyType = SearchStrategyType.Normal;
}
- switch (searchLocationComboBox.History) {
+ switch (searchLocationComboBox.Active) {
case 0:
SearchReplaceManager.SearchOptions.DocumentIteratorType = DocumentIteratorType.CurrentDocument;
break;
@@ -263,76 +252,46 @@
void FindNextEvent(object sender, EventArgs e)
{
- if (searchPatternEntry.GtkEntry.Text.Length == 0) {
+ if (searchPatternEntry.Text.Length == 0)
return;
- }
- try {
- //Cursor = Cursors.WaitCursor;
- SetupSearchReplaceManager();
- SearchReplaceManager.FindNext();
- //this.Focus();
- }
- finally {
- //Cursor = Cursors.Default;
- }
+ SetupSearchReplaceManager();
+ SearchReplaceManager.FindNext();
- AddSearchHistoryItem(findHistory, searchPatternEntry.GtkEntry.Text);
+ AddSearchHistoryItem(findHistory, searchPatternEntry.Text);
}
void ReplaceEvent(object sender, EventArgs e)
{
- if (searchPatternEntry.GtkEntry.Text.Length == 0) {
+ if (searchPatternEntry.Text.Length == 0)
return;
- }
- try {
- //Cursor = Cursors.WaitCursor;
-
- SetupSearchReplaceManager();
- SearchReplaceManager.Replace();
- }
- finally {
- //Cursor = Cursors.Default;
- }
+ SetupSearchReplaceManager();
+ SearchReplaceManager.Replace();
- AddSearchHistoryItem(replaceHistory, replacePatternEntry.GtkEntry.Text);
+ AddSearchHistoryItem(replaceHistory, replacePatternEntry.Text);
}
void ReplaceAllEvent(object sender, EventArgs e)
{
- if (searchPatternEntry.GtkEntry.Text.Length == 0) {
+ if (searchPatternEntry.Text.Length == 0)
return;
- }
- try {
- //Cursor = Cursors.WaitCursor;
-
- SetupSearchReplaceManager();
- SearchReplaceManager.ReplaceAll();
- } finally {
- //Cursor = Cursors.Default;
- }
+ SetupSearchReplaceManager();
+ SearchReplaceManager.ReplaceAll();
- AddSearchHistoryItem(replaceHistory, replacePatternEntry.GtkEntry.Text);
+ AddSearchHistoryItem(replaceHistory, replacePatternEntry.Text);
}
void MarkAllEvent(object sender, EventArgs e)
{
- if (searchPatternEntry.GtkEntry.Text.Length == 0) {
+ if (searchPatternEntry.Text.Length == 0)
return;
- }
- try {
- //Cursor = Cursors.WaitCursor;
-
- SetupSearchReplaceManager();
- SearchReplaceManager.MarkAll();
- } finally {
- //Cursor = Cursors.Default;
- }
+ SetupSearchReplaceManager();
+ SearchReplaceManager.MarkAll();
- AddSearchHistoryItem(findHistory, searchPatternEntry.GtkEntry.Text);
+ AddSearchHistoryItem(findHistory, searchPatternEntry.Text);
}
void CloseDialogEvent(object sender, EventArgs e)
@@ -349,7 +308,7 @@
}
// generic method to add a string to a history item
- private void AddSearchHistoryItem(StringCollection history, string toAdd)
+ private void AddSearchHistoryItem (StringCollection history, string toAdd)
{
// add the item to the find history
if (history.Contains(toAdd)) {
@@ -357,59 +316,70 @@
history.Remove(toAdd);
}
// make sure there is only 20
- if (history.Count == HISTORY_LIMIT) {
- history.RemoveAt(HISTORY_LIMIT - 1);
+ if (history.Count == historyLimit) {
+ history.RemoveAt(historyLimit - 1);
}
history.Insert(0, toAdd);
// update the drop down for the combobox
- string[] stringArray = new string[history.Count];
- history.CopyTo(stringArray, 0);
- if (history == findHistory) {
- searchPatternEntry.PopdownStrings = stringArray;
- } else if( history == replaceHistory) {
- replacePatternEntry.PopdownStrings = stringArray;
- }
+ ListStore store = new ListStore (typeof (string));
+ for (int i = 0; i < history.Count; i ++)
+ store.AppendValues (history[i]);
+
+ if (history == findHistory)
+ searchPatternEntry.Completion.Model = store;
+ else if( history == replaceHistory)
+ replacePatternEntry.Completion.Model = store;
}
// loads the history arrays from the property service
- // NOTE: this dialog uses a newline character to separate search history strings in the properties file
+ // NOTE: a newline character separates the search history strings
private void LoadHistoryValues()
{
object stringArray;
// set the history in properties
stringArray = propertyService.GetProperty("MonoDevelop.FindReplaceDialogs.FindHistory");
- if(stringArray != null) {
- findHistory.AddRange(stringArray.ToString().Split(HISTORY_SEPARATOR_CHAR));
- searchPatternEntry.PopdownStrings = stringArray.ToString().Split(HISTORY_SEPARATOR_CHAR);
+ if (stringArray != null) {
+ string[] items = stringArray.ToString ().Split (historySeparator);
+ findHistory.AddRange (items);
+
+ ListStore store = new ListStore (typeof (string));
+ foreach (string i in items)
+ store.AppendValues (i);
+ searchPatternEntry.Completion.Model = store;
}
// now do the replace history
- if(replaceMode) {
- stringArray = propertyService.GetProperty("MonoDevelop.FindReplaceDialogs.ReplaceHistory");
- if(stringArray != null) {
- replaceHistory.AddRange(stringArray.ToString().Split(HISTORY_SEPARATOR_CHAR));
- replacePatternEntry.PopdownStrings = stringArray.ToString().Split(HISTORY_SEPARATOR_CHAR);
+ if (replaceMode) {
+ string[] items = stringArray.ToString ().Split (historySeparator);
+ stringArray = propertyService.GetProperty ("MonoDevelop.FindReplaceDialogs.ReplaceHistory");
+
+ if (stringArray != null) {
+ replaceHistory.AddRange (items);
+ ListStore store = new ListStore (typeof (string));
+ foreach (string i in items)
+ store.AppendValues (i);
+ replacePatternEntry.Completion.Model = store;
}
}
}
// saves the history arrays to the property service
- // NOTE: this dialog uses a newline character to separate search history strings in the properties file
+ // NOTE: a newline character separates the search history strings
private void SaveHistoryValues()
{
string[] stringArray;
// set the history in properties
stringArray = new string[findHistory.Count];
- findHistory.CopyTo(stringArray, 0);
- propertyService.SetProperty("MonoDevelop.FindReplaceDialogs.FindHistory", string.Join(HISTORY_SEPARATOR_CHAR.ToString(), stringArray));
+ findHistory.CopyTo (stringArray, 0);
+ propertyService.SetProperty ("MonoDevelop.FindReplaceDialogs.FindHistory", string.Join(historySeparator.ToString(), stringArray));
// now do the replace history
- if(replaceMode) {
+ if (replaceMode) {
stringArray = new string[replaceHistory.Count];
- replaceHistory.CopyTo(stringArray, 0);
- propertyService.SetProperty("MonoDevelop.FindReplaceDialogs.ReplaceHistory", string.Join(HISTORY_SEPARATOR_CHAR.ToString(), stringArray));
+ replaceHistory.CopyTo (stringArray, 0);
+ propertyService.SetProperty ("MonoDevelop.FindReplaceDialogs.ReplaceHistory", string.Join(historySeparator.ToString(), stringArray));
}
}
@@ -429,7 +399,7 @@
public void ShowAll()
{
ReplaceDialogPointer.ShowAll();
- searchPatternEntry.GtkEntry.SelectRegion (0, searchPatternEntry.GtkEntry.Text.Length);
+ searchPatternEntry.SelectRegion (0, searchPatternEntry.Text.Length);
}
#endregion
}
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs 2005-01-27 04:38:02 UTC (rev 2176)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs 2005-01-27 07:45:41 UTC (rev 2177)
@@ -13,11 +13,9 @@
using MonoDevelop.Gui;
using MonoDevelop.TextEditor.Document;
using MonoDevelop.Core.Properties;
-
using MonoDevelop.Core.Services;
using MonoDevelop.Services;
using MonoDevelop.TextEditor;
-
using MonoDevelop.Gui.Widgets;
using Glade;
@@ -28,12 +26,10 @@
public class ReplaceInFilesDialog
{
IMessageService messageService = (IMessageService)ServiceManager.GetService(typeof(IMessageService));
- StringParserService stringParserService = (StringParserService)ServiceManager.GetService (typeof (StringParserService));
- static PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
public bool replaceMode;
- [Glade.Widget] Gnome.Entry searchPatternEntry;
- [Glade.Widget] Gnome.Entry replacePatternEntry;
+ [Glade.Widget] Gtk.Entry searchPatternEntry;
+ [Glade.Widget] Gtk.Entry replacePatternEntry;
[Glade.Widget] Gtk.Button findHelpButton;
[Glade.Widget] Gtk.Button findButton;
[Glade.Widget] Gtk.Button markAllButton;
@@ -44,8 +40,8 @@
[Glade.Widget] Gtk.CheckButton ignoreCaseCheckBox;
[Glade.Widget] Gtk.CheckButton searchWholeWordOnlyCheckBox;
[Glade.Widget] Gtk.CheckButton useSpecialSearchStrategyCheckBox;
- [Glade.Widget] Gtk.OptionMenu specialSearchStrategyComboBox;
- [Glade.Widget] Gtk.OptionMenu searchLocationComboBox;
+ [Glade.Widget] Gtk.ComboBox specialSearchStrategyComboBox;
+ [Glade.Widget] Gtk.ComboBox searchLocationComboBox;
[Glade.Widget] Gtk.Label label1;
[Glade.Widget] Gtk.Label label2;
[Glade.Widget] Gtk.Label searchLocationLabel;
@@ -87,19 +83,24 @@
checkButtons.AddWidget(searchLocationLabel);
options.AddWidget(specialSearchStrategyComboBox);
options.AddWidget(searchLocationComboBox);
+
+ searchPatternEntry.Completion = new EntryCompletion ();
+ searchPatternEntry.Completion.Model = new ListStore (typeof (string));
+ searchPatternEntry.Completion.TextColumn = 0;
// set button sensitivity
findHelpButton.Sensitive = false;
// set replace dialog properties
- if(replaceMode)
+ if (replaceMode)
{
- // set the label properties
+ replacePatternEntry.Completion = new EntryCompletion ();
+ replacePatternEntry.Completion.Model = new ListStore (typeof (string));
+ replacePatternEntry.Completion.TextColumn = 0;
+
label2.Text = GettextCatalog.GetString ("Replace in Files");
- //replaceButton.Label = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.ReplaceButton}");
- //replaceButton.UseUnderline = true;
- // set te size groups to include the replace dialog
+ // set the size groups to include the replace dialog
labels.AddWidget(label2);
combos.AddWidget(replacePatternEntry);
helpButtons.AddWidget(replaceHelpButton);
@@ -146,40 +147,26 @@
{
ReplaceDialogPointer.ShowAll ();
SearchReplaceInFilesManager.ReplaceDialog = this;
- searchPatternEntry.GtkEntry.SelectRegion (0, searchPatternEntry.GtkEntry.Text.Length);
+ searchPatternEntry.SelectRegion (0, searchPatternEntry.Text.Length);
}
- public ReplaceInFilesDialog(bool replaceMode)
+ public ReplaceInFilesDialog (bool replaceMode)
{
this.replaceMode = replaceMode;
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
string dialogName = (replaceMode) ? "ReplaceInFilesDialogWidget" : "FindInFilesDialogWidget";
Glade.XML glade = new XML (null, "texteditoraddin.glade", dialogName, null);
glade.Autoconnect (this);
InitDialog ();
- /*
- if (replaceMode) {
- this.SetupFromXml(propertyService.DataDirectory + @"\resources\dialogs\ReplaceInFilesDialog.xfrm");
- ControlDictionary["replacePatternEntry"].Text = SearchReplaceInFilesManager.SearchOptions.ReplacePattern;
- ControlDictionary["replaceHelpButton"].Enabled = false;
- } else {
- this.SetupFromXml(propertyService.DataDirectory + @"\resources\dialogs\FindInFilesDialog.xfrm");
- }*/
+
+ CellRendererText cr = new CellRendererText ();
+ Gtk.ListStore store = new ListStore (typeof (string));
+ store.AppendValues (GettextCatalog.GetString ("Wildcards"));
+ store.AppendValues (GettextCatalog.GetString ("Regular Expressions"));
+ specialSearchStrategyComboBox.Model = store;
+ specialSearchStrategyComboBox.PackStart (cr, true);
+ specialSearchStrategyComboBox.AddAttribute (cr, "text", 0);
- //ControlDictionary["findHelpButton"].Enabled = false;
- //ControlDictionary["searchPatternEntry"].Text = SearchReplaceInFilesManager.SearchOptions.SearchPattern;
-
- //AcceptButton = (Button)ControlDictionary["findButton"];
- //CancelButton = (Button)ControlDictionary["closeButton"];
- Gtk.MenuItem tmpItem;
- Gtk.Menu stratMenu = new Gtk.Menu ();
- tmpItem = new Gtk.MenuItem (GettextCatalog.GetString ("Wildcards"));
- stratMenu.Append (tmpItem);
- tmpItem = new Gtk.MenuItem (GettextCatalog.GetString ("Regular Expressions"));
- stratMenu.Append (tmpItem);
- specialSearchStrategyComboBox.Menu = stratMenu;
-
- uint index = 0;
+ int index = 0;
switch (SearchReplaceManager.SearchOptions.SearchStrategyType) {
case SearchStrategyType.Normal:
case SearchStrategyType.Wildcard:
@@ -188,16 +175,15 @@
index = 1;
break;
}
- specialSearchStrategyComboBox.SetHistory (index);
+ specialSearchStrategyComboBox.Active = index;
- Gtk.Menu locMenu = new Gtk.Menu ();
- tmpItem = new Gtk.MenuItem (GettextCatalog.GetString ("Directories"));
- locMenu.Append (tmpItem);
- tmpItem = new Gtk.MenuItem (GettextCatalog.GetString ("All open files"));
- locMenu.Append (tmpItem);
- tmpItem = new Gtk.MenuItem (GettextCatalog.GetString ("Whole project"));
- locMenu.Append (tmpItem);
- searchLocationComboBox.Menu = locMenu;
+ store = new ListStore (typeof (string));
+ store.AppendValues (GettextCatalog.GetString ("Directories"));
+ store.AppendValues (GettextCatalog.GetString ("All open files"));
+ store.AppendValues (GettextCatalog.GetString ("Whole project"));
+ searchLocationComboBox.Model = store;
+ searchLocationComboBox.PackStart (cr, true);
+ searchLocationComboBox.AddAttribute (cr, "text", 0);
index = 0;
switch (SearchReplaceInFilesManager.SearchOptions.DocumentIteratorType) {
@@ -209,10 +195,8 @@
break;
}
- searchLocationComboBox.SetHistory (index);
-
+ searchLocationComboBox.Active = index;
searchLocationComboBox.Changed += new EventHandler(SearchLocationCheckBoxChangedEvent);
-
useSpecialSearchStrategyCheckBox.Toggled += new EventHandler(SpecialSearchStrategyCheckBoxChangedEvent);
directoryTextBox.Text = SearchReplaceInFilesManager.SearchOptions.SearchDirectory;
@@ -222,39 +206,37 @@
browseButton.Clicked += new EventHandler(BrowseDirectoryEvent);
findButton.Clicked += new EventHandler(FindEvent);
- searchPatternEntry.GtkEntry.Text = SearchReplaceInFilesManager.SearchOptions.SearchPattern;
+ searchPatternEntry.Text = SearchReplaceInFilesManager.SearchOptions.SearchPattern;
if (replaceMode) {
replaceAllButton.Clicked += new EventHandler(ReplaceEvent);
- replacePatternEntry.GtkEntry.Text = SearchReplaceInFilesManager.SearchOptions.ReplacePattern;
+ replacePatternEntry.Text = SearchReplaceInFilesManager.SearchOptions.ReplacePattern;
}
ReplaceDialogPointer.Close += new EventHandler (CloseDialogEvent);
closeButton.Clicked += new EventHandler (CloseDialogEvent);
ReplaceDialogPointer.DeleteEvent += new DeleteEventHandler (OnDeleted);
- SearchLocationCheckBoxChangedEvent(null, null);
- SpecialSearchStrategyCheckBoxChangedEvent(null, null);
+ SearchLocationCheckBoxChangedEvent (null, null);
+ SpecialSearchStrategyCheckBoxChangedEvent (null, null);
}
- void FindEvent(object sender, EventArgs e)
+ void FindEvent (object sender, EventArgs e)
{
- if (SetupSearchReplaceInFilesManager()) {
- SearchReplaceInFilesManager.FindAll();
- }
+ if (SetupSearchReplaceInFilesManager ())
+ SearchReplaceInFilesManager.FindAll ();
}
void ReplaceEvent(object sender, EventArgs e)
{
- if (SetupSearchReplaceInFilesManager()) {
- SearchReplaceInFilesManager.ReplaceAll();
- }
+ if (SetupSearchReplaceInFilesManager ())
+ SearchReplaceInFilesManager.ReplaceAll ();
}
- void BrowseDirectoryEvent(object sender, EventArgs e)
+ void BrowseDirectoryEvent (object sender, EventArgs e)
{
PropertyService PropertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
- FolderDialog fd = new FolderDialog(GettextCatalog.GetString ("Select directory"));
+ FolderDialog fd = new FolderDialog (GettextCatalog.GetString ("Select directory"));
// set up the dialog to point to currently selected folder, or the default projects folder
string defaultFolder = this.directoryTextBox.Text;
@@ -276,19 +258,16 @@
void SearchLocationCheckBoxChangedEvent(object sender, EventArgs e)
{
- bool enableDirectorySearch = searchLocationComboBox.History == 0;
+ bool enableDirectorySearch = searchLocationComboBox.Active == 0;
fileMaskTextBox.Sensitive = enableDirectorySearch;
directoryTextBox.Sensitive = enableDirectorySearch;
browseButton.Sensitive = enableDirectorySearch;
includeSubdirectoriesCheckBox.Sensitive = enableDirectorySearch;
}
- void SpecialSearchStrategyCheckBoxChangedEvent(object sender, EventArgs e)
+ void SpecialSearchStrategyCheckBoxChangedEvent (object sender, EventArgs e)
{
- //CheckBox cb = (CheckBox)ControlDictionary["useSpecialSearchStrategyCheckBox"];
- //if (cb != null) {
- specialSearchStrategyComboBox.Sensitive = useSpecialSearchStrategyCheckBox.Active;
- //}
+ specialSearchStrategyComboBox.Sensitive = useSpecialSearchStrategyCheckBox.Active;
}
bool SetupSearchReplaceInFilesManager()
@@ -326,16 +305,15 @@
SearchReplaceInFilesManager.SearchOptions.SearchDirectory = directoryName;
SearchReplaceInFilesManager.SearchOptions.SearchSubdirectories = includeSubdirectoriesCheckBox.Active;
- SearchReplaceInFilesManager.SearchOptions.SearchPattern = searchPatternEntry.GtkEntry.Text;
- if (replaceMode) {
- SearchReplaceInFilesManager.SearchOptions.ReplacePattern = replacePatternEntry.GtkEntry.Text;
- }
+ SearchReplaceInFilesManager.SearchOptions.SearchPattern = searchPatternEntry.Text;
+ if (replaceMode)
+ SearchReplaceInFilesManager.SearchOptions.ReplacePattern = replacePatternEntry.Text;
SearchReplaceInFilesManager.SearchOptions.IgnoreCase = !ignoreCaseCheckBox.Active;
SearchReplaceInFilesManager.SearchOptions.SearchWholeWordOnly = searchWholeWordOnlyCheckBox.Active;
if (useSpecialSearchStrategyCheckBox.Active) {
- switch (specialSearchStrategyComboBox.History) {
+ switch (specialSearchStrategyComboBox.Active) {
case 0:
SearchReplaceInFilesManager.SearchOptions.SearchStrategyType = SearchStrategyType.Wildcard;
break;
@@ -347,7 +325,7 @@
SearchReplaceInFilesManager.SearchOptions.SearchStrategyType = SearchStrategyType.Normal;
}
- switch (searchLocationComboBox.History) {
+ switch (searchLocationComboBox.Active) {
case 0:
SearchReplaceInFilesManager.SearchOptions.DocumentIteratorType = DocumentIteratorType.Directory;
break;
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs 2005-01-27 04:38:02 UTC (rev 2176)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs 2005-01-27 07:45:41 UTC (rev 2177)
@@ -8,19 +8,17 @@
using System;
using System.IO;
using System.Collections;
+using Gtk;
-using MonoDevelop.Internal.ExternalTool;
-using MonoDevelop.Internal.Templates;
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.AddIns.Codons;
-
using MonoDevelop.Core.Services;
-using MonoDevelop.Services;
+using MonoDevelop.EditorBindings.Gui.Dialogs;
using MonoDevelop.Gui.Dialogs;
-
-using Gtk;
using MonoDevelop.Gui.Widgets;
-using MonoDevelop.EditorBindings.Gui.Dialogs;
+using MonoDevelop.Internal.ExternalTool;
+using MonoDevelop.Internal.Templates;
+using MonoDevelop.Services;
namespace MonoDevelop.EditorBindings.Gui.OptionPanels
{
@@ -32,10 +30,7 @@
int currentSelectedGroup = -1;
// Services
- StringParserService StringParserService = (StringParserService)ServiceManager.GetService (typeof (StringParserService));
- PropertyService PropertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
MessageService MessageService = (MessageService)ServiceManager.GetService(typeof(MessageService));
-
// Gtk widgets
[Glade.Widget] Label extensionLabel;
[Glade.Widget] Gtk.TreeView templateListView;
@@ -48,8 +43,7 @@
[Glade.Widget] Button removeGroupButton;
TextBuffer templateTextBuffer = new TextBuffer(null);
[Glade.Widget] Gtk.TextView templateTextView;
- [Glade.Widget] OptionMenu groupOptionMenu;
- Menu groupMenu;
+ [Glade.Widget] ComboBox groupCombo;
public CodeTemplateGroup CurrentTemplateGroup {
get {
@@ -122,8 +116,6 @@
// function to render the cell
void TemplateListViewCellDataFunc(TreeViewColumn column, CellRenderer renderer, TreeModel model, TreeIter iter)
{
- string toWrite = string.Empty;
-
CodeTemplate codeTemplate = ((ListStore)model).GetValue(iter, 0) as CodeTemplate;
if(column.Title == GettextCatalog.GetString ("Template"))
@@ -144,7 +136,7 @@
bool groupsEmpty = templateGroups.Count != 0;
SetEnabledStatus(groupSelected, addButton, editButton, removeButton, templateListView, templateTextView);
- SetEnabledStatus(groupsEmpty, groupOptionMenu, extensionLabel);
+ SetEnabledStatus(groupsEmpty, groupCombo, extensionLabel);
if (groupSelected) {
bool oneItemSelected = templateListView.Selection.CountSelectedRows() == 1;
bool isItemSelected = templateListView.Selection.CountSelectedRows() > 0;
@@ -168,7 +160,7 @@
#region GroupComboBox event handler
void SetGroupSelection(object sender, EventArgs e)
{
- currentSelectedGroup = groupOptionMenu.History;
+ currentSelectedGroup = groupCombo.Active;
BuildListView();
}
@@ -181,7 +173,7 @@
if(ShowEditTemplateGroupDialog(ref templateGroup, GettextCatalog.GetString ("New "))) {
templateGroups.Add(templateGroup);
FillGroupOptionMenu();
- groupOptionMenu.SetHistory((uint) templateGroups.Count - 1);
+ groupCombo.Active = (int) templateGroups.Count - 1;
SetEnabledStatus();
}
}
@@ -189,12 +181,12 @@
void EditGroupEvent(object sender, EventArgs e)
{
- int index = groupOptionMenu.History;
+ int index = groupCombo.Active;
CodeTemplateGroup templateGroup = (CodeTemplateGroup) templateGroups[index];
if(ShowEditTemplateGroupDialog(ref templateGroup, GettextCatalog.GetString ("Edit "))) {
templateGroups[index] = templateGroup;
FillGroupOptionMenu();
- groupOptionMenu.SetHistory((uint)index);
+ groupCombo.Active = index;
SetEnabledStatus();
}
}
@@ -206,7 +198,7 @@
if (templateGroups.Count == 0) {
currentSelectedGroup = -1;
} else {
- groupOptionMenu.SetHistory((uint) Math.Min(currentSelectedGroup, templateGroups.Count - 1));
+ groupCombo.Active = (int) Math.Min(currentSelectedGroup, templateGroups.Count - 1);
}
FillGroupOptionMenu();
BuildListView();
@@ -309,24 +301,22 @@
void FillGroupOptionMenu()
{
- groupOptionMenu.Changed -= new EventHandler(SetGroupSelection);
+ groupCombo.Changed -= new EventHandler(SetGroupSelection);
- // remove the menu items
- groupOptionMenu.RemoveMenu();
- groupMenu = new Menu();
+ ListStore store = new ListStore (typeof (string));
+ foreach (CodeTemplateGroup templateGroup in templateGroups)
+ store.AppendValues (String.Join (";", templateGroup.ExtensionStrings));
- foreach (CodeTemplateGroup templateGroup in templateGroups) {
- groupMenu.Append(new Gtk.MenuItem (String.Join(";", templateGroup.ExtensionStrings)));
- }
+ groupCombo.Model = store;
+ CellRendererText cr = new CellRendererText ();
+ groupCombo.PackStart (cr, true);
+ groupCombo.AddAttribute (cr, "text", 0);
+
+ if (currentSelectedGroup >= 0)
+ groupCombo.Active = (int) currentSelectedGroup;
- groupMenu.ShowAll();
- groupOptionMenu.Menu = groupMenu;
- if (currentSelectedGroup >= 0) {
- groupOptionMenu.SetHistory((uint)currentSelectedGroup);
- }
-
- groupOptionMenu.Changed += new EventHandler(SetGroupSelection);
+ groupCombo.Changed += new EventHandler(SetGroupSelection);
}
void IndexChange(object sender, System.EventArgs e)
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs 2005-01-27 04:38:02 UTC (rev 2176)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs 2005-01-27 07:45:41 UTC (rev 2177)
@@ -11,15 +11,14 @@
using System.Text;
using Gtk;
using Gnome;
-using MonoDevelop.Gui.Widgets;
using Pango;
-using MonoDevelop.Internal.ExternalTool;
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.Services;
-
using MonoDevelop.Core.AddIns.Codons;
+using MonoDevelop.Internal.ExternalTool;
using MonoDevelop.Gui.Dialogs;
+using MonoDevelop.Gui.Widgets;
namespace MonoDevelop.EditorBindings.Gui.OptionPanels
{
@@ -28,7 +27,6 @@
/// </summary>
public class GeneralTextEditorPanel : AbstractOptionPanel
{
-
GeneralTextEditorPanelWidget widget;
public override void LoadPanelContents()
@@ -53,7 +51,7 @@
// encOptions, encVBox; // if you uncoment change to "," above
[Glade.Widget] CheckButton enableCodeCompletionCheckBox,
enableFoldingCheckBox, enableDoublebufferingCheckBox;
-// [Glade.Widget] OptionMenu textEncodingComboBox;
+// [Glade.Widget] ComboBox textEncodingComboBox;
[Glade.Widget] FontPicker fontNameDisplayTextBox;
[Glade.Widget] VBox encodingBox;
[Glade.Widget] RadioButton use_monospace, use_sans, use_cust;
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs 2005-01-27 04:38:02 UTC (rev 2176)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs 2005-01-27 07:45:41 UTC (rev 2177)
@@ -249,7 +249,7 @@
PlaceCursor (StartIter);
if (View != null) {
View.ScrollMarkOnscreen (InsertMark);
- Gtk.Timeout.Add (20, new Gtk.Function (changeFocus));
+ GLib.Timeout.Add (20, changeFocus);
}
}
@@ -511,7 +511,7 @@
int ln = loc.Line;
IntPtr prevMarker = gtk_source_buffer_get_prev_marker (Handle, ref loc);
- IntPtr firstMarker = prevMarker;
+ //IntPtr firstMarker = prevMarker;
bool first = true;
while (true) {
// Thats a wrap!
@@ -554,7 +554,7 @@
int ln = loc.Line;
IntPtr nextMarker = gtk_source_buffer_get_next_marker (Handle, ref loc);
- IntPtr firstMarker = nextMarker;
+ //IntPtr firstMarker = nextMarker;
bool first = true;
while (true) {
// Thats a wrap!
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs 2005-01-27 04:38:02 UTC (rev 2176)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs 2005-01-27 07:45:41 UTC (rev 2177)
@@ -207,7 +207,7 @@
se.Buffer.PlaceCursor (itr);
se.View.ScrollMarkOnscreen (se.Buffer.InsertMark);
- Gtk.Timeout.Add (20, new Gtk.Function (changeFocus));
+ GLib.Timeout.Add (20, changeFocus);
}
//This code exists to workaround a gtk+ 2.4 regression/bug
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs 2005-01-27 04:38:02 UTC (rev 2176)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs 2005-01-27 07:45:41 UTC (rev 2177)
@@ -25,7 +25,6 @@
{
public class SourceEditorView : SourceView, IFormattableDocument
{
- private static GLib.GType gtype;
public readonly SourceEditor ParentEditor;
internal IFormattingStrategy fmtr;
public SourceEditorBuffer buf;
@@ -33,22 +32,12 @@
bool codeCompleteEnabled;
bool autoHideCompletionWindow = true;
- public static new GLib.GType GType
- {
- get
- {
- if (gtype == GLib.GType.Invalid)
- gtype = RegisterGType (typeof (SourceEditorView));
- return gtype;
- }
- }
-
public bool EnableCodeCompletion {
get { return codeCompleteEnabled; }
set { codeCompleteEnabled = value; }
}
- public SourceEditorView (SourceEditorBuffer buf, SourceEditor parent) : base (GType)
+ public SourceEditorView (SourceEditorBuffer buf, SourceEditor parent)
{
this.ParentEditor = parent;
this.TabsWidth = 4;
@@ -260,7 +249,7 @@
Gdk.Key key = evnt.Key;
uint state = (uint)evnt.State;
state &= 1101u;
- const uint Normal = 0, Shift = 1, Control = 4, ShiftControl = 5, Alt = 8;
+ const uint Normal = 0, Shift = 1, Control = 4; /*ShiftControl = 5, Alt = 8*/
switch (state) {
case Normal:
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs 2005-01-27 04:38:02 UTC (rev 2176)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs 2005-01-27 07:45:41 UTC (rev 2177)
@@ -10,20 +10,9 @@
public readonly SourceEditorBuffer Buffer;
public readonly SourceEditorView View;
public readonly SourceEditorDisplayBindingWrapper DisplayBinding;
- private static GLib.GType gtype;
- public static new GLib.GType GType
+ public SourceEditor (SourceEditorDisplayBindingWrapper bind)
{
- get
- {
- if (gtype == GLib.GType.Invalid)
- gtype = RegisterGType (typeof (SourceEditor));
- return gtype;
- }
- }
-
- public SourceEditor (SourceEditorDisplayBindingWrapper bind) : base (GType)
- {
ShadowType = Gtk.ShadowType.In;
DisplayBinding = bind;
Buffer = new SourceEditorBuffer ();
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/InsightWindow.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/InsightWindow.cs 2005-01-27 04:38:02 UTC (rev 2176)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/InsightWindow.cs 2005-01-27 07:45:41 UTC (rev 2177)
@@ -21,7 +21,6 @@
{
public class InsightWindow : Window
{
- static GLib.GType type;
SourceEditorView control;
Stack insightDataProviderStack = new Stack();
@@ -109,13 +108,8 @@
}
}
- static InsightWindow ()
+ public InsightWindow (SourceEditorView control, Project project, string fileName) : base (WindowType.Popup)
{
- type = RegisterGType (typeof (InsightWindow));
- }
-
- public InsightWindow(SourceEditorView control, Project project, string fileName) : base (type)
- {
this.control = control;
this.fileName = fileName;
this.project = project;
@@ -237,7 +231,7 @@
protected void BeforeShow ()
{
- string methodCountMessage = null;
+ //string methodCountMessage = null;
if (DataProvider == null || DataProvider.InsightDataCount < 1) {
description = "Unknown Method";
} else {
@@ -245,7 +239,7 @@
StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
stringParserService.Properties["CurrentMethodNumber"] = (CurrentData + 1).ToString();
stringParserService.Properties["NumberOfTotalMethods"] = DataProvider.InsightDataCount.ToString();
- methodCountMessage = stringParserService.Parse("${res:MonoDevelop.DefaultEditor.Gui.Editor.InsightWindow.NumberOfText}");
+ //methodCountMessage = stringParserService.Parse("${res:MonoDevelop.DefaultEditor.Gui.Editor.InsightWindow.NumberOfText}");
}
//I know this call looks stupid, but really it isnt.
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am 2005-01-27 04:38:02 UTC (rev 2176)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am 2005-01-27 07:45:41 UTC (rev 2177)
@@ -22,7 +22,6 @@
Gui/OptionPanels/CodeTemplatePanel.cs \
Gui/OptionPanels/GeneralTextEditorPanel.cs \
Gui/Dialogs/EditTemplateGroupDialog.cs \
-Gui/Dialogs/ExportProjectToHtmlDialog.cs \
Gui/Dialogs/GotoLineNumberDialog.cs \
Gui/Dialogs/ReplaceDialog.cs \
Gui/Dialogs/ReplaceInFilesDialog.cs \
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/DirectoryDocumentIterator.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/DirectoryDocumentIterator.cs 2005-01-27 04:38:02 UTC (rev 2176)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/DirectoryDocumentIterator.cs 2005-01-27 07:45:41 UTC (rev 2177)
@@ -58,7 +58,6 @@
++curIndex;
return Current;
}
- SourceEditor_ document;
string fileName = files[curIndex].ToString();
return new FileDocumentInformation(fileName, 0);
}
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/texteditoraddin.glade
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/texteditoraddin.glade 2005-01-27 04:38:02 UTC (rev 2176)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/texteditoraddin.glade 2005-01-27 07:45:41 UTC (rev 2177)
@@ -421,24 +421,16 @@
</child>
<child>
- <widget class="GnomeEntry" id="searchPatternEntry">
+ <widget class="GtkEntry" id="searchPatternEntry">
<property name="visible">True</property>
- <property name="max_saved">20</property>
-
- <child internal-child="entry">
- <widget class="GtkEntry" id="entry7">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">True</property>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -498,23 +490,16 @@
</child>
<child>
- <widget class="GnomeEntry" id="replacePatternEntry">
+ <widget class="GtkEntry" id="replacePatternEntry">
<property name="visible">True</property>
- <property name="max_saved">20</property>
-
- <child internal-child="entry">
- <widget class="GtkEntry" id="entry9">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -610,10 +595,8 @@
</child>
<child>
- <widget class="GtkOptionMenu" id="specialSearchStrategyComboBox">
+ <widget class="GtkComboBox" id="specialSearchStrategyComboBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">-1</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -657,10 +640,8 @@
</child>
<child>
- <widget class="GtkOptionMenu" id="searchLocationComboBox">
+ <widget class="GtkComboBox" id="searchLocationComboBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">-1</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -782,24 +763,16 @@
</child>
<child>
- <widget class="GnomeEntry" id="searchPatternEntry">
+ <widget class="GtkEntry" id="searchPatternEntry">
<property name="visible">True</property>
- <property name="max_saved">20</property>
-
- <child internal-child="entry">
- <widget class="GtkEntry" id="entry11">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">True</property>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1036,10 +1009,8 @@
</child>
<child>
- <widget class="GtkOptionMenu" id="specialSearchStrategyComboBox">
+ <widget class="GtkComboBox" id="specialSearchStrategyComboBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">-1</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1083,10 +1054,8 @@
</child>
<child>
- <widget class="GtkOptionMenu" id="searchLocationComboBox">
+ <widget class="GtkComboBox" id="searchLocationComboBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">-1</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1279,24 +1248,16 @@
</child>
<child>
- <widget class="GnomeEntry" id="searchPatternEntry">
+ <widget class="GtkEntry" id="searchPatternEntry">
<property name="visible">True</property>
- <property name="max_saved">20</property>
-
- <child internal-child="entry">
- <widget class="GtkEntry" id="entry3">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">True</property>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1356,23 +1317,16 @@
</child>
<child>
- <widget class="GnomeEntry" id="replacePatternEntry">
+ <widget class="GtkEntry" id="replacePatternEntry">
<property name="visible">True</property>
- <property name="max_saved">20</property>
-
- <child internal-child="entry">
- <widget class="GtkEntry" id="entry5">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1609,10 +1563,8 @@
</child>
<child>
- <widget class="GtkOptionMenu" id="specialSearchStrategyComboBox">
+ <widget class="GtkComboBox" id="specialSearchStrategyComboBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">-1</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1656,10 +1608,8 @@
</child>
<child>
- <widget class="GtkOptionMenu" id="searchLocationComboBox">
+ <widget class="GtkComboBox" id="searchLocationComboBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">-1</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1852,27 +1802,16 @@
</child>
<child>
- <widget class="GnomeEntry" id="searchPatternEntry">
+ <widget class="GtkEntry" id="searchPatternEntry">
<property name="visible">True</property>
- <property name="max_saved">20</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">searchPatternEntry</atkproperty>
- </accessibility>
-
- <child internal-child="entry">
- <widget class="GtkEntry" id="combo-entry3">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">True</property>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1968,10 +1907,8 @@
</child>
<child>
- <widget class="GtkOptionMenu" id="specialSearchStrategyComboBox">
+ <widget class="GtkComboBox" id="specialSearchStrategyComboBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">-1</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2015,10 +1952,8 @@
</child>
<child>
- <widget class="GtkOptionMenu" id="searchLocationComboBox">
+ <widget class="GtkComboBox" id="searchLocationComboBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">-1</property>
</widget>
<packing>
<property name="padding">0</property>
More information about the Monodevelop-patches-list
mailing list