From 360f80a36b3e7d1fa5988292b0a787a8feec1b48 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Thu, 30 Nov 2006 02:34:39 +0000
Subject: [PATCH] * Rename getMenuImageIcon to getImageIcon2 * Added 24x24
 logout icon * Added logout menu to application window

---
 client/src/org/compiere/apps/AEnv.java       |   2 +-
 client/src/org/compiere/apps/APanel.java     |  14 +++++++++++++-
 client/src/org/compiere/apps/AppsAction.java |   4 ++--
 client/src/org/compiere/images/Logout24.png  | Bin 0 -> 829 bytes
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 client/src/org/compiere/images/Logout24.png

diff --git a/client/src/org/compiere/apps/AEnv.java b/client/src/org/compiere/apps/AEnv.java
index 6425e96470..5411e78858 100644
--- a/client/src/org/compiere/apps/AEnv.java
+++ b/client/src/org/compiere/apps/AEnv.java
@@ -257,7 +257,7 @@ public final class AEnv
 		if (iconName == null)
 			iconName = actionName;
 		String text = Msg.getMsg(Env.getCtx(), actionName);
-		ImageIcon icon = Env.getMenuImageIcon(iconName + "16");
+		ImageIcon icon = Env.getImageIcon2(iconName + "16");
 		CMenuItem mi = new CMenuItem(text, icon);
 		mi.setActionCommand(actionName);
 		if (ks != null)
diff --git a/client/src/org/compiere/apps/APanel.java b/client/src/org/compiere/apps/APanel.java
index 03dbf8438c..30521484c9 100644
--- a/client/src/org/compiere/apps/APanel.java
+++ b/client/src/org/compiere/apps/APanel.java
@@ -162,7 +162,7 @@ public final class APanel extends CPanel
 	/** Private Lock Button	*/
 	public AppsAction		aLock;
 	//	Local (added to toolbar)
-	private AppsAction	    aReport, aEnd, aHome, aHelp, aProduct,
+	private AppsAction	    aReport, aEnd, aHome, aHelp, aProduct, aLogout,
 							aAccount, aCalculator, aCalendar, aEditor, aPreference, aScript,
 							aOnline, aMailSupport, aAbout, aPrintScr, aScrShot, aExit, aBPartner, aDeleteSelection;
 
@@ -186,6 +186,7 @@ public final class APanel extends CPanel
 		aPrint = 	addAction("Print",			mFile, 	KeyStroke.getKeyStroke(KeyEvent.VK_F12, 0),	false);
 		mFile.addSeparator();
 		aEnd =	 	addAction("End",			mFile, 	KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.ALT_MASK),	false);
+		aLogout = 	addAction("Logout", 		mFile, 	KeyStroke.getKeyStroke(KeyEvent.VK_L, Event.SHIFT_MASK+Event.ALT_MASK), false);
 		aExit =		addAction("Exit",			mFile, 	KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.SHIFT_MASK+Event.ALT_MASK),	false);
 		//								Edit
 		JMenu mEdit = AEnv.getMenu("Edit");
@@ -1248,6 +1249,8 @@ public final class APanel extends CPanel
 			else if (cmd.equals(aHelp.getName()))
 				cmd_help();
 			//  General Commands (Environment)
+			else if (cmd.equals(aLogout.getName()))
+				cmd_logout();
 			else if (!AEnv.actionPerformed (e.getActionCommand(), m_curWindowNo, this))
 				log.log(Level.SEVERE, "No action for: " + cmd);
 		}
@@ -1265,6 +1268,15 @@ public final class APanel extends CPanel
 		setBusy(false, true);
 	}	//	actionPerformed
 
+	private void cmd_logout() {
+		JFrame top = Env.getWindow(0);
+		if (top instanceof AMenu) {
+			((AMenu)top).logout();
+		}
+		
+	}
+
+
 	/**
 	 *  Create New Record
 	 *  @param copy true if current record is to be copied
diff --git a/client/src/org/compiere/apps/AppsAction.java b/client/src/org/compiere/apps/AppsAction.java
index 9cfa91383d..6f9c06ddf8 100644
--- a/client/src/org/compiere/apps/AppsAction.java
+++ b/client/src/org/compiere/apps/AppsAction.java
@@ -159,8 +159,8 @@ public final class AppsAction extends AbstractAction
 	 */
 	private ImageIcon getIcon(String name, boolean small)
 	{
-		String fullName = name + (small ? "16.gif" : "24.gif");
-		return Env.getImageIcon(fullName);
+		String fullName = name + (small ? "16" : "24");
+		return Env.getImageIcon2(fullName);
 	}	//	getIcon
 
 	/**
diff --git a/client/src/org/compiere/images/Logout24.png b/client/src/org/compiere/images/Logout24.png
new file mode 100644
index 0000000000000000000000000000000000000000..393598b9f30951de2b8d48f569104eb6c69ebd65
GIT binary patch
literal 829
zcmV-D1H$}?P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x0`f^jK~#9!#g<D?Q$ZBRfA`)qb8o4SB3QxdrXew6+?bfKC2k~fXJn%b
zSFT(TKY+&QH}DH+0zM$TVpJ4LL)2)3kHi=?m<X6sunkm7FN#X9i(+kU3y2|3GP%i|
zd;Y&OGv~|<Y;rT!uzUZiFKhkr=FMxSr)NkeXGkQHOiWIanw!hpqtOv2CMGNTR|0GU
z(g2}Qh(I8~-n}7QcacMfGQ?srUc7jTVL&#UT{S?n!uUK;Tgj=qdIwESP1M!Z<2b$z
z0RWP#Ir{y68XFr4g?4WY@afW70A^=ri+9Z^&Wmt3j3`00plp@zg#fQi$NRcSysedR
zxPeqEg<%*a;`xnK7FsKm7PPI<1poo~+;@$yqa#I5){dQgc{0SO^Jmy~;2@);Pf<!&
z00@?tMM1cQ0B>QQFHeTbIxjvNAl}x>?!!$)qY<>uMc3Zm!KqUxb0S(0u`n&OWR~W7
zs%7cbQ{ru{G&dh1olfV+j~_pg1BiuMS(>s-^kFj1v*C}cQ-(j%77WtTa*XTOJLv80
zqr1C{&dx4G2}%o=SS2%%_164dpg)nIr>6_Qe+%8+U3r^w6xz`n2SkB>;Le@f1OnU1
zWZWXVQi9S7Q568a(I|6&h&sT&74e%uBr-@%O%1M_DLv5)1H%BzGO@%e1ze6qN}SFW
zh(CV(kYI2puDe)vhTp&aK(v5iAWAT;-?<~FFCHz)q^lPOvLApx;Q8}W>g(&vM*gcU
zFE8f~J;T5h6H&7E9`vnz8yXsLUAM&Ux-O|yiiL#*w5_lmjcqGzTVt&U0PF|emJ^P}
zVvLQwXK>^J^O+QZ+U-<r@!|Mwlvc${RQ3cEGZfqtNX$&k;dvgO=aEb%iN|LcA0OvN
zPY2(!OZc}{v8OJC?dV(`C=1gx|L)2h8+*sp)D(lmgWQh}AU+eH-@&f3aeOwS1#2bZ
z!W6xArGI@_=DneNboSrC-m2LZuEq9g><UHoUoQR4ezouu5`gUc2<;1$00000NkvXX
Hu0mjf%-w)v

literal 0
HcmV?d00001