Changeset 33683

Timestamp:

05/31/09 15:06:58 (4 years ago)

Author:

hoge1e3

Message:

検索履歴をタブで自動表示。タブを隠す機能まだ

Location:

lang/csharp/soyText/soyText

Files:

• Debug.cs (modified) (2 diffs)
• DocumentSet.cs (modified) (3 diffs)
• EditorTab.cs (modified) (6 diffs)
• Form2.cs (modified) (6 diffs)
• NotCondition.cs (added)
• SearchLogSet.cs (modified) (4 diffs)
• bin/Debug/soyText.application (modified) (1 diff)
• bin/Debug/soyText.exe (modified) (previous)
• bin/Debug/soyText.exe.manifest (modified) (2 diffs)
• bin/Debug/soyText.pdb (modified) (previous)
• bin/Debug/soyText.vshost.application (modified) (1 diff)
• soyText.suo (modified) (previous)

lang/csharp/soyText/soyText/Debug.cs

@@ -3 +3 @@
 using System.Linq;
 using System.Text;
+using System.Windows.Forms;
 
 namespace SoyText
@@ -13 +14 @@
             statusText = o + "";
         }
+        public static void alert(object o)
+        {
+            MessageBox.Show(o + "");
+        }
     }
 }

lang/csharp/soyText/soyText/DocumentSet.cs

@@ -13 +13 @@
     public class DocumentSet
     {
+        internal SearchLogSet searchLogSet;
         public int maxHandle = -1;
         internal Workspace workspace;
@@ -27 +28 @@
         {
             workspace = w;
+            searchLogSet = new SearchLogSet(this);
         }
         public static int cnt=0;
@@ -91 +93 @@
             }
         }
+        public void clear()
+        {
+            cache = null;
+        }
         public int createHandle()
         {

lang/csharp/soyText/soyText/EditorTab.cs

@@ -17 +17 @@
         public TabPage tabPage;
         public Workspace workspace;
+        public Form2 parentForm;
         Document _curDoc;
         public Document curDoc
@@ -27 +28 @@
         //String _statusText = "";
         //Queue<SyncUIAction> uiActionQueue = new Queue<SyncUIAction>();
+        string initialCondition;
         public void onLoad(object sender, EventArgs e)
         {
+            if (searchOnLoad) initList();
+            ActiveControl = command;
+        }
+        public void initList()
+        {
+            if (listInited) return;
             documentSet.getRecents();
-            newDocument();
-            refreshList();
-
-            ActiveControl = command;
+            if (initialCondition != "")
+            {
+                refreshList(initialCondition);
+            }
+            else
+            {
+                newDocument();
+                refreshList();
+            }
+            listInited = true;
         }
         /*public String statusText
@@ -42 +56 @@
             }
         }*/
-        public EditorTab(Workspace w)
-        {
-            workspace = w;
+        bool searchOnLoad;
+        bool listInited = false;
+
+        public EditorTab(Form2 parent,string condition, bool searchOnLoad)
+        {
+            initialCondition = condition;
+            this.searchOnLoad = searchOnLoad;
+            parentForm = parent;
+            workspace = parentForm.workspace;
             InitializeComponent();
+            command.Text = condition;
             prevDist = splitContainer1.SplitterDistance;
             //curDoc = documentSet.createDocument();
@@ -79 +100 @@
             SyncUI.exe(a);
         }
-        public void refreshList(String kw)
+        static bool firstTab=true;
+        public void refreshList(string kw)
         {
             if (kw == "" || kw==null) Text = "soyText";
@@ -85 +107 @@
             if (titleChanged != null) titleChanged(kw);
             if (documentSearcher != null) documentSearcher.terminate();
+            if (kw!=null && kw!="") documentSet.searchLogSet.addOrGet(kw);
+            var ft = firstTab;
+            firstTab = false;
             searchThread.exec(delegate(TerminableThread t)
             {
@@ -95 +120 @@
                 delegate(Document d)
                 {
-                    cnt++;
                     if (cnt < 100)
                     {
-                        syncUI(delegate() { docListBox.Items.Add(d); });
+                        if (documentSet.searchLogSet.add(d))
+                        {
+                            if (ft)
+                            {
+                                //Debug.alert(d.content + " / " + d.parsed["condition"]);
+                                syncUI(delegate()
+                                {   
+                                    parentForm.newTab(d.parsed["condition"],false);
+                                });
+                            }
+                        }
+                        else
+                        {
+                            cnt++;
+                            syncUI(delegate() { docListBox.Items.Add(d); });
+                        } 
                         return FoundHandlerAction.Accept;
                     }

lang/csharp/soyText/soyText/Form2.cs

@@ -13 +13 @@
     {
         EditorTab curTab;
-        Workspace workspace;
+        public Workspace workspace;
         public int inst = 0;
-        public void newTab(string query)
+        public void newTab(string query, bool searchOnLoad)
         {
             var t=tabControl1.TabPages;
             t.Add(query!=""?query:"all");
             var b = t[t.Count - 1];
-            curTab = new EditorTab(workspace);
-            curTab.Dock = DockStyle.Fill;
-            curTab.Load += curTab.onLoad;
-            curTab.titleChanged = delegate(string kw)
+            var nTab = new EditorTab(this,query,searchOnLoad);
+            nTab.Dock = DockStyle.Fill;
+            nTab.Load += nTab.onLoad;
+            nTab.titleChanged = delegate(string kw)
             {
                 if (kw == "" || kw == null) Text = "soyText";
@@ -29 +29 @@
                 b.Text = (kw==""|| kw==null) ? "all":kw;
             };
-            
-            tabControl1.SelectedTab = b;
-            b.Controls.Add(curTab);
+            if (searchOnLoad)
+            {
+                tabControl1.SelectedTab = b;
+                curTab = nTab;
+            }
+            b.Controls.Add(nTab);
         }
         public Form2(Workspace workspace)
@@ -37 +40 @@
             this.workspace = workspace;
             InitializeComponent();
-            newTab("");
+            newTab("",true);
             inst++;
         }
@@ -83 +86 @@
         private void 最新の情報に更新RToolStripMenuItem_Click(object sender, EventArgs e)
         {
+            curTab.documentSet.clear();
             curTab.refreshList(curTab.command.Text);
         }
@@ -93 +97 @@
         private void 新規タブTToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            newTab("");
+            newTab("",true);
         }
 
@@ -107 +111 @@
             {
                 Text = curTab.Text;
+                curTab.initList();
             }
         }

lang/csharp/soyText/soyText/SearchLogSet.cs

@@ -12 +12 @@
         {
             this.superSet = superSet;
-            list = new Dictionary<string, Document>();
+            expr2doc = new Dictionary<string, Document>();
             recents = new DocumentList();
         }
-        Dictionary<string,Document> list = null;
+        Dictionary<string,Document> expr2doc = null;
         DocumentList recents;
 
@@ -22 +22 @@
             if (d.parsed["type"] != "SearchLog") return false;
             var c=d.parsed["condition"];
-            if (!list.ContainsKey(c)) {
-                           list[c]=d;
+            if (!expr2doc.ContainsKey(c)) {
+                           expr2doc[c]=d;
                            recents.add(d);
             }
@@ -32 +32 @@
             return recents;
         }
-        public void add(string searchExpr)
+        public Document addOrGet(string searchExpr)
         {
             var c = searchExpr;
-            if (!list.ContainsKey(c))
+            if (!expr2doc.ContainsKey(c))
             {
                 var d = superSet.createDocument();
@@ -42 +42 @@
                 d.save();
                 add(d);
+                return d;
             }
+            return expr2doc[c];
         }
     }

lang/csharp/soyText/soyText/bin/Debug/soyText.application

@@ -12 +12 @@
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>NzImv/+409azqvCZyF3CI7ckSG0=</dsig:DigestValue>
+        <dsig:DigestValue>C9XaxFQ/9lz54FYwGPtvEdCF4YM=</dsig:DigestValue>
       </hash>
     </dependentAssembly>

lang/csharp/soyText/soyText/bin/Debug/soyText.exe.manifest

@@ -113 +113 @@
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="soyText.exe" size="80896">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="soyText.exe" size="81920">
       <assemblyIdentity name="soyText" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
@@ -120 +120 @@
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>xoIpTSHlzPf6s71Jq19Wy0TeQ30=</dsig:DigestValue>
+        <dsig:DigestValue>uF4OMnEc8Lq66CZx9rxVUYlFjWo=</dsig:DigestValue>
       </hash>
     </dependentAssembly>

lang/csharp/soyText/soyText/bin/Debug/soyText.vshost.application

@@ -12 +12 @@
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>NzImv/+409azqvCZyF3CI7ckSG0=</dsig:DigestValue>
+        <dsig:DigestValue>C9XaxFQ/9lz54FYwGPtvEdCF4YM=</dsig:DigestValue>
       </hash>
     </dependentAssembly>