- create text menu items instead of graphical buttons;

- updated icons with the new ones;




git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@89 c66351dc-e62f-0410-b875-e3a5c0b9693f

src/webimtray/WebIMTray/Main.Designer.cs

@@ -25,14 +25,14 @@ namespace webImTray {
             this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
             this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolbar = new System.Windows.Forms.ToolStrip();
-            this.toolNavigate = new System.Windows.Forms.ToolStripButton();
-            this.toolOptions = new System.Windows.Forms.ToolStripButton();
-            this.toolHideWindow = new System.Windows.Forms.ToolStripButton();
             this.webBrowser1 = new System.Windows.Forms.WebBrowser();
             this.reloadPageTimer = new System.Windows.Forms.Timer(this.components);
+            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+            this.refreshToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.optionsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.hideWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.notifyMenu.SuspendLayout();
-            this.toolbar.SuspendLayout();
+            this.menuStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
             // notifyIcon
@@ -49,73 +49,34 @@ namespace webImTray {
             this.toolStripMenuItem1,
             this.exitToolStripMenuItem});
             this.notifyMenu.Name = "notifyMenu";
-            this.notifyMenu.Size = new System.Drawing.Size(131, 54);
+            this.notifyMenu.Size = new System.Drawing.Size(79, 54);
             // 
             // optionsToolStripMenuItem
             // 
             this.optionsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("optionsToolStripMenuItem.Image")));
             this.optionsToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver;
             this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
-            this.optionsToolStripMenuItem.Size = new System.Drawing.Size(130, 22);
+            this.optionsToolStripMenuItem.Size = new System.Drawing.Size(78, 22);
             this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsMenu_Click);
             // 
             // toolStripMenuItem1
             // 
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(127, 6);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(75, 6);
             // 
             // exitToolStripMenuItem
             // 
             this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
-            this.exitToolStripMenuItem.Size = new System.Drawing.Size(130, 22);
+            this.exitToolStripMenuItem.Size = new System.Drawing.Size(78, 22);
             this.exitToolStripMenuItem.Click += new System.EventHandler(this.menuExitClick);
             // 
-            // toolbar
-            // 
-            this.toolbar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolNavigate,
-            this.toolOptions,
-            this.toolHideWindow});
-            this.toolbar.Location = new System.Drawing.Point(0, 0);
-            this.toolbar.Name = "toolbar";
-            this.toolbar.Size = new System.Drawing.Size(864, 25);
-            this.toolbar.TabIndex = 1;
-            // 
-            // toolNavigate
-            // 
-            this.toolNavigate.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.toolNavigate.Image = ((System.Drawing.Image)(resources.GetObject("toolNavigate.Image")));
-            this.toolNavigate.ImageTransparentColor = System.Drawing.Color.Silver;
-            this.toolNavigate.Name = "toolNavigate";
-            this.toolNavigate.Size = new System.Drawing.Size(23, 22);
-            this.toolNavigate.Click += new System.EventHandler(this.toolNavigate_Click);
-            // 
-            // toolOptions
-            // 
-            this.toolOptions.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.toolOptions.Image = ((System.Drawing.Image)(resources.GetObject("toolOptions.Image")));
-            this.toolOptions.ImageTransparentColor = System.Drawing.Color.Silver;
-            this.toolOptions.Name = "toolOptions";
-            this.toolOptions.Size = new System.Drawing.Size(23, 22);
-            this.toolOptions.Click += new System.EventHandler(this.optionsMenu_Click);
-            // 
-            // toolHideWindow
-            // 
-            this.toolHideWindow.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.toolHideWindow.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.toolHideWindow.Image = ((System.Drawing.Image)(resources.GetObject("toolHideWindow.Image")));
-            this.toolHideWindow.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolHideWindow.Name = "toolHideWindow";
-            this.toolHideWindow.Size = new System.Drawing.Size(71, 22);
-            this.toolHideWindow.Click += new System.EventHandler(this.toolHideWindow_Click);
-            // 
             // webBrowser1
             // 
             this.webBrowser1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.webBrowser1.Location = new System.Drawing.Point(0, 25);
+            this.webBrowser1.Location = new System.Drawing.Point(0, 24);
             this.webBrowser1.MinimumSize = new System.Drawing.Size(20, 20);
             this.webBrowser1.Name = "webBrowser1";
-            this.webBrowser1.Size = new System.Drawing.Size(864, 460);
+            this.webBrowser1.Size = new System.Drawing.Size(864, 461);
             this.webBrowser1.TabIndex = 2;
             this.webBrowser1.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.webBrowser1_PreviewKeyDown);
             // 
@@ -124,13 +85,47 @@ namespace webImTray {
             this.reloadPageTimer.Interval = 5000;
             this.reloadPageTimer.Tick += new System.EventHandler(this.timer1_Tick);
             // 
+            // menuStrip1
+            // 
+            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.refreshToolStripMenuItem,
+            this.optionsMenuItem,
+            this.hideWindowMenuItem});
+            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip1.Name = "menuStrip1";
+            this.menuStrip1.Size = new System.Drawing.Size(864, 24);
+            this.menuStrip1.TabIndex = 3;
+            this.menuStrip1.Text = "menuStrip1";
+            // 
+            // refreshToolStripMenuItem
+            // 
+            this.refreshToolStripMenuItem.Name = "refreshToolStripMenuItem";
+            this.refreshToolStripMenuItem.Size = new System.Drawing.Size(57, 20);
+            this.refreshToolStripMenuItem.Text = "Refresh";
+            this.refreshToolStripMenuItem.Click += new System.EventHandler(this.refreshToolStripMenuItem_Click);
+            // 
+            // optionsMenuItem
+            // 
+            this.optionsMenuItem.Name = "optionsMenuItem";
+            this.optionsMenuItem.Size = new System.Drawing.Size(56, 20);
+            this.optionsMenuItem.Text = "Options";
+            this.optionsMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem1_Click);
+            // 
+            // hideWindowMenuItem
+            // 
+            this.hideWindowMenuItem.Name = "hideWindowMenuItem";
+            this.hideWindowMenuItem.Size = new System.Drawing.Size(79, 20);
+            this.hideWindowMenuItem.Text = "Hide window";
+            this.hideWindowMenuItem.Click += new System.EventHandler(this.hideWindowToolStripMenuItem_Click);
+            // 
             // MainWindow
             // 
             this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
             this.ClientSize = new System.Drawing.Size(864, 485);
             this.Controls.Add(this.webBrowser1);
-            this.Controls.Add(this.toolbar);
+            this.Controls.Add(this.menuStrip1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MainMenuStrip = this.menuStrip1;
             this.MinimizeBox = false;
             this.Name = "MainWindow";
             this.ShowInTaskbar = false;
@@ -138,24 +133,24 @@ namespace webImTray {
             this.GotFocus += new System.EventHandler(this.gotFocus);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Client_FormClosing);
             this.notifyMenu.ResumeLayout(false);
-            this.toolbar.ResumeLayout(false);
+            this.menuStrip1.ResumeLayout(false);
-            this.toolbar.PerformLayout();
+            this.menuStrip1.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
         }
         #endregion
 
-        private System.Windows.Forms.ToolStrip toolbar;
-        private System.Windows.Forms.ToolStripButton toolNavigate;
         private System.Windows.Forms.WebBrowser webBrowser1;
         private System.Windows.Forms.Timer reloadPageTimer;
-        private System.Windows.Forms.ToolStripButton toolOptions;
         private System.Windows.Forms.ContextMenuStrip notifyMenu;
         private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem;
         private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
         private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
-        private System.Windows.Forms.ToolStripButton toolHideWindow;
+        private System.Windows.Forms.MenuStrip menuStrip1;
+        private System.Windows.Forms.ToolStripMenuItem refreshToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem optionsMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem hideWindowMenuItem;
 
     }
 }

src/webimtray/WebIMTray/Main.cs

@@ -49,9 +49,9 @@ namespace webImTray {
 
         private void updateLocalizedControls() {
             // Update localized controls
-            toolHideWindow.Text = Options.resourceManager.GetString("hideWindow");
+            hideWindowMenuItem.Text = Options.resourceManager.GetString("hideWindow");
-            toolOptions.ToolTipText = Options.resourceManager.GetString("optionsToolTip");
+            optionsMenuItem.Text = Options.resourceManager.GetString("optionsMenuItem");
-            toolNavigate.ToolTipText = Options.resourceManager.GetString("navigateToolTip");
+            refreshToolStripMenuItem.Text = Options.resourceManager.GetString("refreshMenuItem");
             optionsToolStripMenuItem.Text = Options.resourceManager.GetString("trayOptions");
             exitToolStripMenuItem.Text = Options.resourceManager.GetString("trayExit");
         }
@@ -189,5 +189,34 @@ namespace webImTray {
                 navigateThere();
             }
         }
+
+        private void exitToolStripMenuItem1_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void optionsToolStripMenuItem1_Click(object sender, EventArgs e) {
+            OptionsDialog dialog = new OptionsDialog();
+            dialog.ShowDialog(this);
+
+            // apply options
+            if (Options.ShowInTaskBar != this.ShowInTaskbar) {
+                this.ShowInTaskbar = !this.ShowInTaskbar;
+            }
+
+            // Update localized controls
+            updateLocalizedControls();
+
+            setupReloadTimer();
+
+        }
+
+        private void refreshToolStripMenuItem_Click(object sender, EventArgs e) {
+            navigateThere();
+        }
+
+        private void hideWindowToolStripMenuItem_Click(object sender, EventArgs e) {
+            hideWindow();
+        }
     }
 }

src/webimtray/WebIMTray/Main.resx

@@ -159,51 +159,14 @@
         CgoKCgrv7+/v7wr39/f3CgoKCgoK7+/v7+8K7+/v7woKCgoKCgrv7+8KCu/v7woKCgoKCgoKCgoKCgoK
         CgoKCgoKCgoKCgoKCgoKCgoKCgoKCv//AAD//wAAgDEAAIAxAACAMQAAwGMAAODHAADxjwAA//8AAPGP
         AADghwAA4IcAAOCHAADxjwAA//8AAP//AAA=
-</value>
-  </data>
-  <metadata name="toolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>421, 11</value>
-  </metadata>
-  <data name="toolNavigate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAY9JREFUOE9jYBh0
-        wHTS1/+mEz7/N+n/8B/mOOOeN/+Ne17/N+59AxfD6nCzqb//m035+d908rf/JhM+/jfpew/WYNz9EmyA
-        UddLIH6B2xCwAVN//TedBDQA6AKQzSADDNsf/zdse/TfsPXBf4PW+3gMmPzjv+nEL0Cb34FtAmkEGaDf
-        dPu/fsON/3r11/7r1V3B7w2wUzuf/TdoQdikW3Pxv07V2f86lWfwa6ZKjOrWXAbadu6/dsUpuG2ahfv/
-        axTs/a+Rvxu/CzRLTv7XLD7+X6PoCFDDgf/qeXvhGtSytv1Xy9r6Xy1zC3ZDVLP2/lfJ2vNfJXPnf1Ug
-        Vknf9l85bct/5dRNcA3KKRv+g7BK6gZUQxQSN/1XSNj4XyF+PRjLx68D0mv/y8euBmOFuFVwDQpxQH78
-        6v+KCWsQhkhHLP8vHQbEoUuBNBCHL/0vA6RlwpcAMYSGBTCILxux7L9c1HKEARIBC/5L+IPwvP8SASA8
-        H4ID5/+XDASKA9kwA0B8yaCF/6VDFtEhSolJFwDyA+nk71GvlAAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="toolOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAIVJREFUOE/dk0EO
-        gCAMBPlgv+l/DBcTH4O2WrLCFi56kaQJgXbYbUNKXy4RKSz2bT3PF4vwfS3MOdO4oAOAF48hN4BJ1Jdn
-        kKpAE321RRHkYcEBmKxABnO12rhOgV9WOQ3Eodh1mwJawGK0hftubDNAqygEoAU2GWbBYD9REH0adv76
-        5z0AIQLwRor4ZGsAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="toolHideWindow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL
-        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI
-        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ
-        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4
-        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9
-        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j
-        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR
-        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb
-        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE
-        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
 </value>
   </data>
   <metadata name="reloadPageTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>544, 11</value>
   </metadata>
+  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 48</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>173</value>
   </metadata>

src/webimtray/WebIMTray/webImTray.csproj

@@ -6,7 +6,8 @@
     <ProjectGuid>{21C7CA72-7F77-416C-9FD7-2DF748443E46}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>icons\App.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>webImTray</AssemblyName>

src/webimtray/WebIMTray/webImTray.en-US.resx

@@ -174,9 +174,6 @@
   <data name="minutes" xml:space="preserve">
     <value>minutes</value>
   </data>
-  <data name="navigateToolTip" xml:space="preserve">
-    <value>Show pending users</value>
-  </data>
   <data name="notifications" xml:space="preserve">
     <value>Notifications</value>
   </data>
@@ -186,15 +183,18 @@
   <data name="operatorPreferences" xml:space="preserve">
     <value>Operator preferences</value>
   </data>
+  <data name="optionsMenuItem" xml:space="preserve">
+    <value>Options</value>
+  </data>
   <data name="optionsTitle" xml:space="preserve">
     <value>Web IM Tray Options</value>
   </data>
-  <data name="optionsToolTip" xml:space="preserve">
-    <value>Options...</value>
-  </data>
   <data name="playSoundOnVisitor" xml:space="preserve">
     <value>Play sound when visitor comes</value>
   </data>
+  <data name="refreshMenuItem" xml:space="preserve">
+    <value>Refresh</value>
+  </data>
   <data name="russian" xml:space="preserve">
     <value>Russian</value>
   </data>

src/webimtray/WebIMTray/webImTray.ru-RU.resx

@@ -174,9 +174,6 @@
   <data name="minutes" xml:space="preserve">
     <value>минут</value>
   </data>
-  <data name="navigateToolTip" xml:space="preserve">
-    <value>Показать ожидающих клиентов</value>
-  </data>
   <data name="notifications" xml:space="preserve">
     <value>Звуковые уведомления</value>
   </data>
@@ -186,15 +183,18 @@
   <data name="operatorPreferences" xml:space="preserve">
     <value>Настройки оператора</value>
   </data>
+  <data name="optionsMenuItem" xml:space="preserve">
+    <value>Настройки</value>
+  </data>
   <data name="optionsTitle" xml:space="preserve">
     <value>Настройки Веб Мессенджер "Трей"</value>
   </data>
-  <data name="optionsToolTip" xml:space="preserve">
-    <value>Настройки...</value>
-  </data>
   <data name="playSoundOnVisitor" xml:space="preserve">
     <value>Звуковое уведомление о появлении посетителя</value>
   </data>
+  <data name="refreshMenuItem" xml:space="preserve">
+    <value>Обновить</value>
+  </data>
   <data name="russian" xml:space="preserve">
     <value>Русский</value>
   </data>