Changeset 33031

Timestamp:

05/02/09 22:56:11 (4 years ago)

Author:

hoge1e3

Message:

 

Location:

lang/csharp/soyText/soyText

Files:

• Form1.cs (modified) (5 diffs)
• KeywordCondition.cs (modified) (1 diff)
• PythonEngine.cs (modified) (3 diffs)
• soyText.suo (modified) (previous)

lang/csharp/soyText/soyText/Form1.cs

@@ -18 +18 @@
     {
         Workspace workspace;
-        Document curDoc;
+        Document _curDoc;
+        public Document curDoc
+        {
+            get { return _curDoc; }
+            set { open(value); }
+        }
         static int inst = 0;
         public static Form1 defaultInstance;
@@ -67 +72 @@
         }
         TerminableThread searchThread = new TerminableThread();
+        TerminableThread lineSearchThread = new TerminableThread();
         DocumentSercher documentSearcher;
         public void refreshList(String kw)
@@ -126 +132 @@
         private void open(Document newDoc)
         {
-            curDoc = null;
+            _curDoc = null;
             content.Text = newDoc.content;
-            curDoc = newDoc;
+            _curDoc = newDoc;
             //curDocLastUpdate = curDoc.lastUpdate;
             //command.Text = newDoc.lastUpdate+"";
             if (command.Text != "")
             {
-                if (autoSresMove && splitContainerSres.SplitterDistance < 64)
-                {
-                    splitContainerSres.SplitterDistance = 64;
-                }
-                var sc = SearchCondition.fromExpression(command.Text);
-                sresListBox.Items.Clear();
-                foreach (var l in curDoc.lines)
-                {
-                    if (sc.matches(l))
-                    {
-                        sresListBox.Items.Add(l);
-                    }
-                }
+                lineSearchThread.exec(delegate(TerminableThread t)
+                {
+                    if (autoSresMove && splitContainerSres.SplitterDistance < 64)
+                    {
+                        syncUI(delegate()
+                        {
+                            splitContainerSres.SplitterDistance = 64;
+                        });
+                    }
+                    var sc = SearchCondition.fromExpression(command.Text);
+                    syncUI(delegate() { sresListBox.Items.Clear(); });
+                    foreach (var l in curDoc.lines)
+                    {
+                        var l2 = l;
+                        if (sc.matches(l))
+                        {
+                            syncUI(delegate() { sresListBox.Items.Add(l2); });
+                        }
+                    }
+                });
             }
         }
@@ -213 +226 @@
                     workspace.indexer.make(oldActive);
                 }).Start();*/
+            }
+            if (e.KeyCode.Equals(Keys.F9))
+            {
                 var p = new PythonEngine();
-                var res = p.evaluate(curDoc.handle + "", curDoc.parsed.cdr);
-                Debug.print(res);
+                var res = p.evaluate(this , curDoc.parsed.cdr);
+                //Debug.print(res);
                 Text = res;
-            }
-            if (e.KeyCode.Equals(Keys.F9))
-            {
-                searchThread.exec(delegate(TerminableThread t) {
-                    statusText = "NEXT!!";
-                    Thread.Sleep(1000);
-                });
                 /*
                 tth.exec(delegate(TerminableThread t)
@@ -260 +269 @@
             var f = new Form1(workspace);
             f.Visible = true;
+        }
+        public void newWindow()
+        {
+            var f = new Form1(workspace);
+            f.Visible = true;
+
         }
 

lang/csharp/soyText/soyText/KeywordCondition.cs

@@ -11 +11 @@
         public KeywordCondition(String w)
         {
-            word = w;
+            word = w.ToLower();
         }
         public override bool matches(Document d)
         {
-            return d.content.IndexOf(word) >= 0;
+            return d.content.ToLower().IndexOf(word) >= 0;
         }
         public override bool matches(DocumentLine line)
         {
-            return line.content.IndexOf(word) >= 0;
+            return line.content.ToLower().IndexOf(word) >= 0;
         }
         public override string ToString()

lang/csharp/soyText/soyText/PythonEngine.cs

@@ -7 +7 @@
 using Microsoft.Scripting;
 using Microsoft.Scripting.Hosting;
+using System.Windows.Forms;
 
 namespace SoyText
@@ -31 +32 @@
             scope.SetVariable("x", x);
             scope.SetVariable("button", button);
+            /*var d=Delegate.CreateDelegate(;
+            d.Method=delegate(string s)
+            {
+                MessageBox.Show(s);
+            });
+            scope.("alert",);*/
 
             try
@@ -39 +46 @@
             catch (Exception ex)
             {
+                MessageBox.Show(ex.ToString());
                 return "Error executing code: " + ex.ToString();
             }