geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 141689. Windows: change mouse handler for notifyicon to mouse down event.

Browse Source
This commit is contained in:
Jim Norman 2006-02-21 23:25:34 +00:00
parent 78c518040b
commit 08966d2f82
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CASA.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 21 16:25:20 MST 2006 - jnorman@novell.com
- Bug 141689. Windows: change mouse handler for notifyicon to mouse
down event.
- Bug: Windows, start service at post install.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 21 12:22:17 MST 2006 - jnorman@novell.com Mon Feb 21 12:22:17 MST 2006 - jnorman@novell.com
- Bug 141651. On windows, uninstalls will kill CASAManager too. - Bug 141651. On windows, uninstalls will kill CASAManager too.

18
c_gui/CasaTray.cs
View File

@ -71,7 +71,8 @@ namespace Novell.CASA.GUI
notifyIcon = new System.Windows.Forms.NotifyIcon(); notifyIcon = new System.Windows.Forms.NotifyIcon();
try try
{ {
s = File.OpenRead("../images/CASAIcons.ico"); //s = File.OpenRead("../images/CASAIcons.ico");
s = File.OpenRead("D:/brandi/Client/App.ico");
m_iconNormal = new System.Drawing.Icon(s); m_iconNormal = new System.Drawing.Icon(s);
notifyIcon.Icon = m_iconNormal; notifyIcon.Icon = m_iconNormal;
} }
@ -113,8 +114,9 @@ namespace Novell.CASA.GUI
} }
} }
//notifyIcon.Click +=new EventHandler(notifyIcon_Click); //notifyIcon.Click +=new EventHandler(notifyIcon_Click);
notifyIcon.DoubleClick +=new EventHandler(notifyIcon_DoubleClick); notifyIcon.DoubleClick +=new EventHandler(notifyIcon_DoubleClick);
notifyIcon.MouseUp +=new System.Windows.Forms.MouseEventHandler(notifyIcon_MouseUp); notifyIcon.MouseDown += new System.Windows.Forms.MouseEventHandler(notifyIcon_MouseDown);
notifyIcon.Visible = true; notifyIcon.Visible = true;
UpdateTrayIcon(MiCASAStore.IsLocked()); UpdateTrayIcon(MiCASAStore.IsLocked());
@ -238,11 +240,13 @@ namespace Novell.CASA.GUI
Application.Quit(); // quits the application when the users clicks the popup menu Application.Quit(); // quits the application when the users clicks the popup menu
} }
#if W32 #if W32
private void notifyIcon_MouseUp(object sender, System.Windows.Forms.MouseEventArgs e)
{ private void notifyIcon_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
{
if (e.Button == System.Windows.Forms.MouseButtons.Right) if (e.Button == System.Windows.Forms.MouseButtons.Right)
ShowContextMenu(); ShowContextMenu();
} }
#endif #endif
public void CasaManagerQuit() public void CasaManagerQuit()
@ -345,6 +349,6 @@ namespace Novell.CASA.GUI
#endif #endif
Application.Quit(); Application.Quit();
} }
} }
} }