Changeset 36601

Timestamp:

02/03/10 18:41:52 (5 weeks ago)

Author:

hoge1e3

Message:

 

Location:

lang/csharp/soyText/soyText

Files:

• Document.cs (modified) (2 diffs)
• DocumentWebServer.cs (modified) (1 diff)
• Form2.Designer.cs (modified) (9 diffs)
• Form2.cs (modified) (2 diffs)

lang/csharp/soyText/soyText/Document.cs

@@ -157 +157 @@
         public override String ToString()
         {
-            var t = parsed.getValue("title");
+            
             var tags = TagManipulator.getTags(this);
             var tgh = "";
@@ -164 +164 @@
                 tgh = tgh + "[" + tg + "]";
             }
+            var t = parsed.getValue("title");
             if (t != null) return tgh+t;
-            var c=parsed.body;
+            t = parsed.getValue("name");
+            if (t != null) return tgh + t;
+            var c = parsed.body;
             c=c.Replace("\n","");
             c = c.Replace("\r", "");

lang/csharp/soyText/soyText/DocumentWebServer.cs

@@ -12 +12 @@
     {
         DocumentSet documentSet;
+        public static string detectContentType(Document d)
+        {
+            var c = d.str["Content-Type"];
+            if (c != null) return c;
+            var n = d.str["name"];
+            if (n!=null) {
+                c = "text/plain; charset=utf-8";
+                if (n.EndsWith(".js"))
+                {
+                    c = "text/javascript; charset=utf-8";
+                }
+                if (n.EndsWith(".html"))
+                {
+                    c = "text/html; charset=utf-8";
+                }
+            }
+            return c;
+        }
         void feedDocument(Document d,HttpListenerResponse res) {
-            var c = d.str["Content-Type"];
-            if (c == null)
-            {
-                c = "text/plain; charset=utf-8";
-            }
-            res.ContentType = c;
+            res.ContentType = detectContentType(d);
             Httpd.respondByString(res, d.body);
         }

lang/csharp/soyText/soyText/Form2.Designer.cs

@@ -36 +36 @@
             this.選択範囲を新規ドキュメントに移動MToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.アーカイブAToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.印刷PToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
@@ -48 +49 @@
             this.外部プログラムを実行RToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.tESTToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.webStartToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.移動NToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ハイパーリンクLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -56 +58 @@
             this.閉じるCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.検索キャッシュ消去RToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ファイルToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.tabControl1 = new SoyText.TabControl2();
-            this.印刷PToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.webStartToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             this.tabMenu.SuspendLayout();
@@ -116 +117 @@
             this.アーカイブAToolStripMenuItem.Click += new System.EventHandler(this.アーカイブAToolStripMenuItem_Click);
             // 
+            // 印刷PToolStripMenuItem
+            // 
+            this.印刷PToolStripMenuItem.Name = "印刷PToolStripMenuItem";
+            this.印刷PToolStripMenuItem.Size = new System.Drawing.Size(291, 22);
+            this.印刷PToolStripMenuItem.Text = "印刷(&P)...";
+            this.印刷PToolStripMenuItem.Click += new System.EventHandler(this.印刷PToolStripMenuItem_Click);
+            // 
             // toolStripSeparator1
             // 
@@ -187 +195 @@
             this.外部プログラムを実行RToolStripMenuItem,
             this.tESTToolStripMenuItem,
-            this.webStartToolStripMenuItem});
+            this.webStartToolStripMenuItem,
+            this.ファイルToolStripMenuItem});
             this.実行RToolStripMenuItem.Name = "実行RToolStripMenuItem";
             this.実行RToolStripMenuItem.Size = new System.Drawing.Size(57, 20);
@@ -206 +215 @@
             this.tESTToolStripMenuItem.Text = "TEST";
             this.tESTToolStripMenuItem.Click += new System.EventHandler(this.tESTToolStripMenuItem_Click);
+            // 
+            // webStartToolStripMenuItem
+            // 
+            this.webStartToolStripMenuItem.Name = "webStartToolStripMenuItem";
+            this.webStartToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
+            this.webStartToolStripMenuItem.Text = "Web Start";
+            this.webStartToolStripMenuItem.Click += new System.EventHandler(this.webStartToolStripMenuItem_Click);
             // 
             // 移動NToolStripMenuItem
@@ -268 +284 @@
             this.検索キャッシュ消去RToolStripMenuItem.Text = "検索キャッシュ消去(&R)";
             this.検索キャッシュ消去RToolStripMenuItem.Click += new System.EventHandler(this.検索キャッシュ消去RToolStripMenuItem_Click);
+            // 
+            // ファイルToolStripMenuItem
+            // 
+            this.ファイルToolStripMenuItem.Name = "ファイルToolStripMenuItem";
+            this.ファイルToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5;
+            this.ファイルToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
+            this.ファイルToolStripMenuItem.Text = "ファイル/URLを開く(&O)";
+            this.ファイルToolStripMenuItem.Click += new System.EventHandler(this.ファイルToolStripMenuItem_Click);
             // 
             // tabControl1
@@ -280 +304 @@
             this.tabControl1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.tabControl1_MouseDown);
             this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
-            // 
-            // 印刷PToolStripMenuItem
-            // 
-            this.印刷PToolStripMenuItem.Name = "印刷PToolStripMenuItem";
-            this.印刷PToolStripMenuItem.Size = new System.Drawing.Size(291, 22);
-            this.印刷PToolStripMenuItem.Text = "印刷(&P)...";
-            this.印刷PToolStripMenuItem.Click += new System.EventHandler(this.印刷PToolStripMenuItem_Click);
-            // 
-            // webStartToolStripMenuItem
-            // 
-            this.webStartToolStripMenuItem.Name = "webStartToolStripMenuItem";
-            this.webStartToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
-            this.webStartToolStripMenuItem.Text = "Web Start";
-            this.webStartToolStripMenuItem.Click += new System.EventHandler(this.webStartToolStripMenuItem_Click);
             // 
             // Form2
@@ -348 +358 @@
         private ToolStripMenuItem 印刷PToolStripMenuItem;
         private ToolStripMenuItem webStartToolStripMenuItem;
+        private ToolStripMenuItem ファイルToolStripMenuItem;
     }
 }

lang/csharp/soyText/soyText/Form2.cs

@@ -7 +7 @@
 using System.Text;
 using System.Windows.Forms;
+using System.Diagnostics;
 
 namespace SoyText
@@ -297 +298 @@
             workspace.documentSet.startWeb();
         }
+
+        private void ファイルToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var d=curTab.curDoc;
+            if (d.parsed["file"] != null)
+            {
+                Process.Start(d.parsed["file"]);
+            }
+            if (d.parsed["dir"] != null)
+            {
+                Process.Start(d.parsed["dir"]);
+            }
+            if (d.parsed["url"] != null)
+            {
+                Process.Start(d.parsed["url"]);
+            }
+        }
     }
 }