Changes for linux

This commit is contained in:
Jim Norman 2005-10-12 23:10:40 +00:00
parent f19c024432
commit 143e833a8d

View File

@ -10,7 +10,7 @@ using Novell.CASA;
using Novell.CASA.MiCasa.Common; using Novell.CASA.MiCasa.Common;
using Novell.CASA.MiCasa.Communication; using Novell.CASA.MiCasa.Communication;
namespace Novell.CASA.GUI namespace Novell.CASA.GUI
{ {
public class CasaTray public class CasaTray
{ {
@ -23,8 +23,8 @@ namespace Novell.CASA.GUI
#endif #endif
#if LINUX #if LINUX
EventBox eb; EventBox eb;
private Gtk.Image m_imageLocked = new Image("../images/CASA_16.png", IconSize.Menu); private Gtk.Image m_imageLocked = new Image("images/CASA_16.png", IconSize.Menu);
private Gtk.Image m_imageUnlocked = new Image("../images/CASA_16.png", IconSize.Menu); private Gtk.Image m_imageUnlocked = new Image(Stock.Find, IconSize.Menu);
#endif #endif
@ -90,7 +90,7 @@ namespace Novell.CASA.GUI
#if LINUX #if LINUX
/* in order to receive signals, we need a eventbox, because Gtk.Image doesn't receive signals */ /* in order to receive signals, we need a eventbox, because Gtk.Image doesn't receive signals */
eb = new EventBox(); eb = new EventBox();
eb.Add(); // using stock icon eb.Add(m_imageUnlocked); // using stock icon
// hooking event // hooking event
eb.ButtonPressEvent += new ButtonPressEventHandler (this.OnImageClick); eb.ButtonPressEvent += new ButtonPressEventHandler (this.OnImageClick);
@ -110,7 +110,7 @@ namespace Novell.CASA.GUI
MenuItem miSep3 = new MenuItem(); MenuItem miSep3 = new MenuItem();
ImageMenuItem menuLaunchGUI = new ImageMenuItem ("Manage Secrets"); ImageMenuItem menuLaunchGUI = new ImageMenuItem ("Manage Secrets");
Image appimg = new Image("../images/CASA_16.png", IconSize.Menu); Image appimg = new Image(Stock.New, IconSize.Menu);
menuLaunchGUI.Image = appimg; // sets the menu item's image menuLaunchGUI.Image = appimg; // sets the menu item's image
menuLaunchGUI.Activated +=new EventHandler(menuLaunchGUI_Activated); menuLaunchGUI.Activated +=new EventHandler(menuLaunchGUI_Activated);
popupMenu.Add(menuLaunchGUI); popupMenu.Add(menuLaunchGUI);
@ -249,34 +249,34 @@ namespace Novell.CASA.GUI
string MICASA_PASSCODE_BY_MASTER_PASSWD_FILE = "/.miCASAPCByMPasswd"; string MICASA_PASSCODE_BY_MASTER_PASSWD_FILE = "/.miCASAPCByMPasswd";
string fileName = Environment.GetEnvironmentVariable("HOME")+MICASA_PASSCODE_BY_MASTER_PASSWD_FILE; string fileName = Environment.GetEnvironmentVariable("HOME")+MICASA_PASSCODE_BY_MASTER_PASSWD_FILE;
return (File.Exists(fileName)); return (File.Exists(fileName));
} }
*/ */
private void notifyIcon_DoubleClick(object sender, EventArgs e) private void notifyIcon_DoubleClick(object sender, EventArgs e)
{ {
menuLockMiCasa_Activated(sender, e); menuLockMiCasa_Activated(sender, e);
} }
private void menuDestroyMiCasa_Activated(object sender, EventArgs e) private void menuDestroyMiCasa_Activated(object sender, EventArgs e)
{ {
CommonGUI.menuDestroyMiCasa_Activated(sender, e); CommonGUI.menuDestroyMiCasa_Activated(sender, e);
} }
internal void UpdateTrayIcon(bool StoreIsLocked) internal void UpdateTrayIcon(bool StoreIsLocked)
{ {
#if W32 #if W32
if (StoreIsLocked) if (StoreIsLocked)
{ {
notifyIcon.Text = "miCASA - Locked"; notifyIcon.Text = "miCASA - Locked";
notifyIcon.Icon = m_iconLocked; notifyIcon.Icon = m_iconLocked;
} }
else else
{ {
notifyIcon.Text = "miCASA - Not Locked"; notifyIcon.Text = "miCASA - Not Locked";
notifyIcon.Icon = m_iconNormal; notifyIcon.Icon = m_iconNormal;
} }
#endif #endif
} }
} }
} }