Commit: e78b9b67ff561b8c9ac2697813317f2e5bfd119f - NotifyMessage (git)

Notifying a message in Action center.

Commit MetaInfo

• Revisão: e78b9b67ff561b8c9ac2697813317f2e5bfd119f (tree)
• Hora: 2015-09-16 15:21:48
• Autor: JeffyTS <JeffyTS@outl...>
• Commiter: JeffyTS

Mensagem de Log

Fixed bug.

Mudança Sumário

• modified: NotifyMessage/MainForm.Designer.cs
• modified: NotifyMessage/MainForm.cs
• modified: NotifyMessage/Program.cs
• modified: NotifyMessage/Properties/AssemblyInfo.cs
• modified: readme.txt

Diff

--- a/NotifyMessage/MainForm.Designer.cs
+++ b/NotifyMessage/MainForm.Designer.cs
@@ -46,7 +46,6 @@
             this.ClientSize = new System.Drawing.Size(284, 261);
             this.Name = "MainForm";
             this.Text = "NotifyMessage";
-            this.Load += new System.EventHandler(this.MainForm_Load);
             this.ResumeLayout(false);
 
         }

--- a/NotifyMessage/MainForm.cs
+++ b/NotifyMessage/MainForm.cs
@@ -7,6 +7,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using System.Reflection;    // Add
+
 
 namespace NotifyMessage
 {
@@ -22,21 +24,29 @@ namespace NotifyMessage
                                          "\r\n" +
                                          " Option:\r\n" +
                                          "    /INFO(default) | /WARN | /ERR";
+        private const string MSG_ABOUT = "Thanks to Microsoft Corporation.\r\n" +
+                                         "\r\n" +
+                                         "This program has been developed on\r\n" +
+                                         "   Visual Studio Community 2015\r\n" +
+                                         "   Windows10 Professional 64bit.\r\n" +
+                                         "\r\n" +
+                                         MSG_USAGE;
 
         public MainForm()
         {
             // Messageはここで出さないと終了処理がうまくいかない(プロセスが残る)
-            if (Program.NotifyMessage == "")
+            if (Program.Message == "")
             {
-                MessageBox.Show(MSG_USAGE, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                Program.NotifyMessage = "";           // 消してしまう(flag代わり)
+                //MessageBox.Show(MSG_USAGE, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                AboutDialog();
+                Program.Message = "";           // 消してしまう(flag代わり)
             }
-            else if (Program.NotifyMessage != "")     // vmxFilePathが指定されていないときは初期化せず終了
+            else if (Program.Message != "")     // vmxFilePathが指定されていないときは初期化せず終了
             {
                 InitializeComponent();
 
-                this.notifyIcon_MainForm.Text = PROGRAM_NAME;// Program.NotifyMessage;
-                this.notifyIcon_MainForm.BalloonTipText = Program.NotifyMessage;
+                this.notifyIcon_MainForm.Text = PROGRAM_NAME;   // Program.NotifyMessage;
+                this.notifyIcon_MainForm.BalloonTipText = Program.Message;
                 this.notifyIcon_MainForm.Icon = Properties.Resources.NotifyMessageTray;
 
                 switch (Program.msglevel)
@@ -54,20 +64,53 @@ namespace NotifyMessage
                         this.notifyIcon_MainForm.BalloonTipIcon = ToolTipIcon.None;
                         break;
                 }
-                this.notifyIcon_MainForm.ShowBalloonTip(500);
 
-                //System.Threading.Thread.Sleep(10000);
+                this.notifyIcon_MainForm.ShowBalloonTip(5000);  // Balloon tip 表示
+
+                System.Threading.Thread.Sleep(5000);
                 
                 // Exit
                 this.notifyIcon_MainForm.Visible = false;   // タスクトレイからアイコンを取り除く
                 Application.Exit();                         // アプリケーション終了
-
             }
         }
 
-        private void MainForm_Load(object sender, EventArgs e)
+        private void AboutDialog()
         {
+            string message;
+
+            //AssemblyTitleの取得
+            AssemblyTitleAttribute asmTitle = (AssemblyTitleAttribute)Attribute.GetCustomAttribute(
+                                                    Assembly.GetExecutingAssembly(), typeof(AssemblyTitleAttribute));
+            //AssemblyDescriptionの取得
+            AssemblyDescriptionAttribute asmDesc = (AssemblyDescriptionAttribute)Attribute.GetCustomAttribute(
+                                                    Assembly.GetExecutingAssembly(), typeof(AssemblyDescriptionAttribute));
+            //AssemblyCompanyの取得
+            AssemblyCompanyAttribute asmCompany = (AssemblyCompanyAttribute)Attribute.GetCustomAttribute(
+                                                    Assembly.GetExecutingAssembly(), typeof(AssemblyCompanyAttribute));
+            //AssemblyProductの取得
+            AssemblyProductAttribute asmPrdct = (AssemblyProductAttribute)Attribute.GetCustomAttribute(
+                                                    Assembly.GetExecutingAssembly(), typeof(AssemblyProductAttribute));
+            //AssemblyCopyrightの取得
+            AssemblyCopyrightAttribute asmCpyrght = (AssemblyCopyrightAttribute)Attribute.GetCustomAttribute(
+                                                    Assembly.GetExecutingAssembly(), typeof(AssemblyCopyrightAttribute));
+            //AssemblyTrademarkの取得
+            AssemblyTrademarkAttribute asmTM = (AssemblyTrademarkAttribute)Attribute.GetCustomAttribute(
+                                                    Assembly.GetExecutingAssembly(), typeof(AssemblyTrademarkAttribute));
+            //バージョンの取得
+            Assembly asm = Assembly.GetExecutingAssembly();
+            Version ver = asm.GetName().Version;
 
+            message = asmTitle.Title + "\r\n" +
+                      "\r\n" +
+                      asmDesc.Description + "\r\n" +
+                      "\r\n" +
+                      MSG_ABOUT + "\r\n" +
+                      "\r\n" +
+                      asmCompany.Company + "\r\n" +
+                      asmPrdct.Product + "  Rev. " + ver + "\r\n" +
+                      asmCpyrght.Copyright + "\r\n";
+            MessageBox.Show(message, PROGRAM_NAME, MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
     }
 }

--- a/NotifyMessage/Program.cs
+++ b/NotifyMessage/Program.cs
@@ -4,12 +4,13 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
+
 namespace NotifyMessage
 {
     static class Program
     {
         // グローバル変数
-        public static string NotifyMessage = "";
+        public static string Message = "";
         public enum MSGLEVEL : int  // MessageLevel
         {
             INFO = 1,
@@ -35,16 +36,15 @@ namespace NotifyMessage
                 if (0 <= cmds[i].IndexOf("/ERR", StringComparison.OrdinalIgnoreCase)) msglevel = MSGLEVEL.ERR;
                 else if (0 <= cmds[i].IndexOf("/WARN", StringComparison.OrdinalIgnoreCase)) msglevel = MSGLEVEL.WARN;
                 else if (0 <= cmds[i].IndexOf("/INFO", StringComparison.OrdinalIgnoreCase)) msglevel = MSGLEVEL.INFO;
-                else NotifyMessage = cmds[i];
+                else Message = cmds[i];
             }
 
             new MainForm();
 
-            if (NotifyMessage != "")
+            if (Message != "")
             {
                 //Application.Run();
             }
-
         }
     }
 }

--- a/NotifyMessage/Properties/AssemblyInfo.cs
+++ b/NotifyMessage/Properties/AssemblyInfo.cs
@@ -6,11 +6,11 @@ using System.Runtime.InteropServices;
 // アセンブリに関連付けられている情報を変更するには、
 // これらの属性値を変更してください。
 [assembly: AssemblyTitle("NotifyMessage")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Notifiying a message in Action center.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("NotifyMessage")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyCopyright("Copyright ©  2015 T.S. All rights reserved")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 NotifyMessage
 
-	Notifiying a message in Action center.
+	Notifying a message in Action center.
 
 	Copyright ©  2015 T.S. All rights reserved.