Fixed problems with RegexpTk.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@605 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/RegExpTk/Project/Resources/RegExpTkGroupForm.xfrm

@@ -2,28 +2,31 @@
   <System.Windows.Forms.Form>
     <Name value="GroupsForm" />
     <FormBorderStyle value="SizableToolWindow" />
-    <ClientSize value="{Width=328, Height=218}" />
-    <DockPadding value="" />
     <Text value="Groups" />
+    <ClientSize value="{Width=460, Height=222}" />
     <Controls>
       <System.Windows.Forms.Button>
         <Name value="CloseButton" />
-        <Location value="{X=208,Y=184}" />
-        <ClientSize value="{Width=112, Height=24}" />
+        <Location value="{X=340,Y=188}" />
         <Text value="${res:Global.OKButtonText}" />
+        <Size value="{Width=112, Height=24}" />
+        <Anchor value="Bottom, Right" />
+        <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
         <TabIndex value="4" />
       </System.Windows.Forms.Button>
       <System.Windows.Forms.ListView>
         <Name value="GroupsListView" />
-        <GridLines value="True" />
+        <Size value="{Width=444, Height=172}" />
         <TabIndex value="2" />
-        <View value="Details" />
         <FullRowSelect value="True" />
+        <GridLines value="True" />
+        <View value="Details" />
         <Location value="{X=8,Y=8}" />
-        <ClientSize value="{Width=308, Height=164}" />
+        <Anchor value="Top, Bottom, Left, Right" />
         <Columns>
           <System.Windows.Forms.ColumnHeader>
             <Name value="columnHeader" />
+            <Width value="205" />
             <Text value="${res:RegExpTk.MainDialog.StringColumn}" />
           </System.Windows.Forms.ColumnHeader>
           <System.Windows.Forms.ColumnHeader>
@@ -31,95 +34,32 @@
             <Text value="${res:RegExpTk.MainDialog.StartColumn}" />
           </System.Windows.Forms.ColumnHeader>
           <System.Windows.Forms.ColumnHeader>
+            <Text value="${res:RegExpTk.MainDialog.EndColumn}" />
             <Name value="columnHeader3" />
-            <Text value="${res:RegExpTk.MainDialog.LengthColumn}" />
           </System.Windows.Forms.ColumnHeader>
           <System.Windows.Forms.ColumnHeader>
             <Name value="columnHeader4" />
-            <Text value="Länge" />
+            <Text value="${res:RegExpTk.MainDialog.LengthColumn}" />
           </System.Windows.Forms.ColumnHeader>
         </Columns>
       </System.Windows.Forms.ListView>
     </Controls>
   </System.Windows.Forms.Form>
   <System.Windows.Forms.ColumnHeader>
-    <Name value="columnHeader3" />
-    <Text value="${res:RegExpTk.MainDialog.LengthColumn}" />
+    <Name value="columnHeader" />
+    <Width value="205" />
+    <Text value="${res:RegExpTk.MainDialog.StringColumn}" />
   </System.Windows.Forms.ColumnHeader>
   <System.Windows.Forms.ColumnHeader>
     <Name value="columnHeader2" />
     <Text value="${res:RegExpTk.MainDialog.StartColumn}" />
   </System.Windows.Forms.ColumnHeader>
   <System.Windows.Forms.ColumnHeader>
-    <Name value="columnHeader7" />
-    <Text value="${res:RegExpTk.MainDialog.LengthColumn}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Name value="columnHeader6" />
-    <Text value="${res:RegExpTk.MainDialog.StartColumn}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Name value="columnHeader5" />
-    <Text value="${res:RegExpTk.MainDialog.LengthColumn}" />
+    <Text value="${res:RegExpTk.MainDialog.EndColumn}" />
+    <Name value="columnHeader3" />
   </System.Windows.Forms.ColumnHeader>
   <System.Windows.Forms.ColumnHeader>
     <Name value="columnHeader4" />
-    <Text value="Länge" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Name value="columnHeader9" />
-    <Text value="${res:RegExpTk.MainDialog.StringColumn}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Name value="columnHeader8" />
-    <Text value="${res:RegExpTk.MainDialog.StartColumn}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Name value="columnHeader" />
-    <Text value="${res:RegExpTk.MainDialog.StringColumn}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Name value="columnHeader20" />
-    <Text value="${res:RegExpTk.MainDialog.LengthColumn}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Name value="columnHeader12" />
-    <Text value="Länge" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Name value="columnHeader13" />
-    <Text value="${res:RegExpTk.MainDialog.StringColumn}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Name value="columnHeader10" />
-    <Text value="Länge" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Name value="columnHeader11" />
-    <Text value="${res:RegExpTk.MainDialog.StringColumn}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Name value="columnHeader16" />
-    <Text value="${res:RegExpTk.MainDialog.StartColumn}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Name value="columnHeader17" />
     <Text value="${res:RegExpTk.MainDialog.LengthColumn}" />
   </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Name value="columnHeader14" />
-    <Text value="Länge" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Name value="columnHeader15" />
-    <Text value="${res:RegExpTk.MainDialog.StringColumn}" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Name value="columnHeader18" />
-    <Text value="Länge" />
-  </System.Windows.Forms.ColumnHeader>
-  <System.Windows.Forms.ColumnHeader>
-    <Name value="columnHeader19" />
-    <Text value="${res:RegExpTk.MainDialog.StartColumn}" />
-  </System.Windows.Forms.ColumnHeader>
-</Components>
+</Components>

src/AddIns/Misc/RegExpTk/Project/Src/Dialogs/MainWindow.cs

@@ -92,16 +92,17 @@ namespace Plugins.RegExpTk {
 			((Button)ControlDictionary["CreateAssemblyFileCompileButton"]).Click += new EventHandler(CreateAssemblyFile);
 			((Button)ControlDictionary["quickInsertButton"]).MouseDown += new MouseEventHandler(showQuickInsertMenu);
 			((Button)ControlDictionary["quickInsertButton"]).Image = ResourceService.GetBitmap("Icons.16x16.PasteIcon");
-	
+			ControlDictionary["RegularExpressionTextBox"].KeyPress += delegate(object sender, KeyPressEventArgs e) {
+				if (e.KeyChar == '\r') { OkButton_Click(null, null); e.Handled = true; }
+			};
+			((RichTextBox)ControlDictionary["InputTextBox"]).DetectUrls = false;
+			
 			ReplaceCheckBox_CheckedChanged((CheckBox)ControlDictionary["ReplaceCheckBox"], null);
 
-			this.AcceptButton=(Button)ControlDictionary["OkButton"];
-		
 			this.StartPosition=FormStartPosition.CenterScreen;
 			this.Width=Screen.PrimaryScreen.WorkingArea.Width / 2;
 			
 			((TextBox)ControlDictionary["RegularExpressionTextBox"]).TextChanged+=new EventHandler(SetRegEx);
-			
 		}
 		
 		
@@ -148,7 +149,7 @@ namespace Plugins.RegExpTk {
 		
 		private void quickInsert(object sender, EventArgs e)
 		{
-//// Alex: changed to text box
+			//// Alex: changed to text box
 			((TextBox)ControlDictionary["RegularExpressionTextBox"]).SelectedText += (string)((MenuCommand)sender).Tag;
 		}
 		
@@ -229,10 +230,10 @@ namespace Plugins.RegExpTk {
 			}
 			
 			RegexCompilationInfo  rci = new RegexCompilationInfo(((TextBox)ControlDictionary["RegularExpressionCompileTextBox"]).Text,
-				options, 
-				((TextBox)ControlDictionary["ClassNameCompileTextBox"]).Text, 
-				((TextBox)ControlDictionary["NamespaceCompileTextBox"]).Text,
-				((CheckBox)ControlDictionary["PublibVisibleCompileCheckBox"]).Checked);
+			                                                     options,
+			                                                     ((TextBox)ControlDictionary["ClassNameCompileTextBox"]).Text,
+			                                                     ((TextBox)ControlDictionary["NamespaceCompileTextBox"]).Text,
+			                                                     ((CheckBox)ControlDictionary["PublibVisibleCompileCheckBox"]).Checked);
 			
 			AssemblyName asmName = new AssemblyName();
 			asmName.Name = Path.GetFileNameWithoutExtension(((TextBox)ControlDictionary["AssemblyFileCompileFileTextBox"]).Text);
@@ -308,26 +309,33 @@ namespace Plugins.RegExpTk {
 			inputBox.SelectionColor = Color.Black;
 			inputBox.SelectionFont = dummy.Font;
 			
+			int colorIndex = 0;
+			Color[] colors = new Color[] {Color.Blue, Color.Red, Color.DarkGreen,
+				Color.DarkRed, Color.Navy, Color.DarkGray};
+			
 			foreach (Match match in matches) {
-				inputBox.Select(match.Index, match.Length);
-				inputBox.SelectionColor = Color.Blue;
-				
 				ListViewItem lvwitem = ((ListView)ControlDictionary["GroupListView"]).Items.Add(match.ToString());
 				lvwitem.Tag = match;
 				lvwitem.SubItems.Add(match.Index.ToString());
 				lvwitem.SubItems.Add((match.Index + match.Length).ToString());
 				lvwitem.SubItems.Add(match.Length.ToString());
 				lvwitem.SubItems.Add(match.Groups.Count.ToString());
+				
+				// the whole match is group #0
+				foreach (Group g in match.Groups) {
+					inputBox.Select(g.Index, g.Length);
+					inputBox.SelectionColor = colors[colorIndex++ % colors.Length];
+				}
 			}
 			inputBox.Select(0, 0);
 		}
 		
 		private void GroupListView_SelectedIndexChanged(object sender, System.EventArgs e)
 		{
-			try 
+			try
 			{
 				((RichTextBox)ControlDictionary["InputTextBox"]).Select(System.Convert.ToInt32(((ListView)ControlDictionary["GroupListView"]).SelectedItems[0].SubItems[1].Text),
-				                                                         System.Convert.ToInt32(((ListView)ControlDictionary["GroupListView"]).SelectedItems[0].SubItems[3].Text));
+				                                                        System.Convert.ToInt32(((ListView)ControlDictionary["GroupListView"]).SelectedItems[0].SubItems[3].Text));
 			} catch {
 			}
 		}