midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Rename getMenuImageIcon to getImageIcon2 

* Added 24x24 logout icon
* Added logout menu to application window
This commit is contained in:
Heng Sin Low 2006-11-30 02:34:39 +00:00
parent 9f7cb1dd9c
commit 360f80a36b
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/org/compiere/apps/AEnv.java
View File

@ -257,7 +257,7 @@ public final class AEnv
if (iconName == null) if (iconName == null)
iconName = actionName; iconName = actionName;
String text = Msg.getMsg(Env.getCtx(), 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); CMenuItem mi = new CMenuItem(text, icon);
mi.setActionCommand(actionName); mi.setActionCommand(actionName);
if (ks != null) if (ks != null)

14
client/src/org/compiere/apps/APanel.java
View File

@ -162,7 +162,7 @@ public final class APanel extends CPanel
/** Private Lock Button */ /** Private Lock Button */
public AppsAction aLock; public AppsAction aLock;
// Local (added to toolbar) // 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, aAccount, aCalculator, aCalendar, aEditor, aPreference, aScript,
aOnline, aMailSupport, aAbout, aPrintScr, aScrShot, aExit, aBPartner, aDeleteSelection; 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); aPrint = addAction("Print", mFile, KeyStroke.getKeyStroke(KeyEvent.VK_F12, 0), false);
mFile.addSeparator(); mFile.addSeparator();
aEnd = addAction("End", mFile, KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.ALT_MASK), false); 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); aExit = addAction("Exit", mFile, KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.SHIFT_MASK+Event.ALT_MASK), false);
// Edit // Edit
JMenu mEdit = AEnv.getMenu("Edit"); JMenu mEdit = AEnv.getMenu("Edit");
@ -1248,6 +1249,8 @@ public final class APanel extends CPanel
else if (cmd.equals(aHelp.getName())) else if (cmd.equals(aHelp.getName()))
cmd_help(); cmd_help();
// General Commands (Environment) // General Commands (Environment)
else if (cmd.equals(aLogout.getName()))
cmd_logout();
else if (!AEnv.actionPerformed (e.getActionCommand(), m_curWindowNo, this)) else if (!AEnv.actionPerformed (e.getActionCommand(), m_curWindowNo, this))
log.log(Level.SEVERE, "No action for: " + cmd); log.log(Level.SEVERE, "No action for: " + cmd);
} }
@ -1265,6 +1268,15 @@ public final class APanel extends CPanel
setBusy(false, true); setBusy(false, true);
} // actionPerformed } // actionPerformed
private void cmd_logout() {
JFrame top = Env.getWindow(0);
if (top instanceof AMenu) {
((AMenu)top).logout();
}
}
/** /**
* Create New Record * Create New Record
* @param copy true if current record is to be copied * @param copy true if current record is to be copied

4
client/src/org/compiere/apps/AppsAction.java
View File

@ -159,8 +159,8 @@ public final class AppsAction extends AbstractAction
*/ */
private ImageIcon getIcon(String name, boolean small) private ImageIcon getIcon(String name, boolean small)
{ {
String fullName = name + (small ? "16.gif" : "24.gif"); String fullName = name + (small ? "16" : "24");
return Env.getImageIcon(fullName); return Env.getImageIcon2(fullName);
} // getIcon } // getIcon
/** /**

BIN
client/src/org/compiere/images/Logout24.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 829 B