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

IDEMPIERE-952 Setup wizard issue on setup wizard window

This commit is contained in:
Carlos Ruiz 2013-06-04 23:19:26 -05:00
parent f1fe920b97
commit 0616175792
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.adempiere.base/src/org/compiere/util/Msg.java
View File

@ -686,4 +686,15 @@ public final class Msg
return outStr.toString(); return outStr.toString();
} // parseTranslation } // parseTranslation
/**
* Get translated text message for AD_Message, ampersand cleaned (used to indicate shortcut)
* @param ctx Context to retrieve language
* @param AD_Message - Message Key
* @return translated text
*/
public static String getCleanMsg(Properties ctx, String string) {
return Util.cleanAmp(getMsg(Env.getAD_Language(ctx), string));
}
} // Msg } // Msg

24
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java
View File

@ -98,7 +98,7 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
private Label statusLabel = new Label(); private Label statusLabel = new Label();
private WTableDirEditor statusField; private WTableDirEditor statusField;
private Label bZoomLabel = new Label(Msg.getMsg(Env.getCtx(), "ZoomLabel")); private Label bZoomLabel = new Label(Msg.getMsg(Env.getCtx(), "Zoom"));
private Button bRefresh = new Button(); private Button bRefresh = new Button();
private Button bOK = new Button(); private Button bOK = new Button();
private Button bNext = new Button(); private Button bNext = new Button();
@ -306,32 +306,32 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
mainLayout.setHeight("100%"); mainLayout.setHeight("100%");
mainLayout.setStyle("position: absolute"); mainLayout.setStyle("position: absolute");
bRefresh.setImage(ThemeManager.getThemeResource("images/Refresh24.png")); bRefresh.setImage(ThemeManager.getThemeResource("images/Refresh16.png"));
bRefresh.setTooltiptext(Msg.getMsg(Env.getCtx(), "Refresh")); bRefresh.setTooltiptext(Msg.getCleanMsg(Env.getCtx(), "Refresh"));
bRefresh.addEventListener(Events.ON_CLICK, this); bRefresh.addEventListener(Events.ON_CLICK, this);
bOK.setImage(ThemeManager.getThemeResource("images/Ok24.png")); bOK.setImage(ThemeManager.getThemeResource("images/Ok16.png"));
bOK.setTooltiptext(Msg.getMsg(Env.getCtx(), "Update")); bOK.setTooltiptext(Msg.getCleanMsg(Env.getCtx(), "Update"));
bOK.addEventListener(Events.ON_CLICK, this); bOK.addEventListener(Events.ON_CLICK, this);
bNext.setImage(ThemeManager.getThemeResource("images/Next24.png")); bNext.setImage(ThemeManager.getThemeResource("images/Next16.png"));
bNext.setTooltiptext(Msg.getMsg(Env.getCtx(), "Next")); bNext.setTooltiptext(Msg.getCleanMsg(Env.getCtx(), "Next"));
bNext.addEventListener(Events.ON_CLICK, this); bNext.addEventListener(Events.ON_CLICK, this);
bZoom.setImage(ThemeManager.getThemeResource("images/Zoom16.png")); bZoom.setImage(ThemeManager.getThemeResource("images/Zoom16.png"));
bZoom.setTooltiptext(Msg.getMsg(Env.getCtx(), "Zoom")); bZoom.setTooltiptext(Msg.getCleanMsg(Env.getCtx(), "Zoom"));
bZoom.addEventListener(Events.ON_CLICK, this); bZoom.addEventListener(Events.ON_CLICK, this);
bExpand.setLabel("Expand Tree"); bExpand.setLabel("Expand Tree");
bExpand.setTooltiptext(Msg.getMsg(Env.getCtx(), "ExpandTree")); bExpand.setTooltiptext(Msg.getCleanMsg(Env.getCtx(), "ExpandTree"));
bExpand.addEventListener(Events.ON_CLICK, this); bExpand.addEventListener(Events.ON_CLICK, this);
justmine.setLabel("Just Mine"); justmine.setLabel("Just Mine");
justmine.setTooltiptext(Msg.getMsg(Env.getCtx(), "JustMine")); justmine.setTooltiptext(Msg.getCleanMsg(Env.getCtx(), "JustMine"));
justmine.addEventListener(Events.ON_CHECK,this); justmine.addEventListener(Events.ON_CHECK,this);
showColors.setLabel("Show Colors"); showColors.setLabel("Show Colors");
showColors.setTooltiptext(Msg.getMsg(Env.getCtx(), "ShowColors")); showColors.setTooltiptext(Msg.getCleanMsg(Env.getCtx(), "ShowColors"));
showColors.addEventListener(Events.ON_CHECK,this); showColors.addEventListener(Events.ON_CHECK,this);
North north = new North(); North north = new North();
@ -381,7 +381,7 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
div.appendChild(helpFrame); div.appendChild(helpFrame);
helpFrame.setWidth("99%"); helpFrame.setWidth("99%");
helpFrame.setHeight("90%"); helpFrame.setHeight("80%");
helpFrame.setStyle("border: 1px solid lightgray; margin:auto"); helpFrame.setStyle("border: 1px solid lightgray; margin:auto");
Div divNote = new Div(); Div divNote = new Div();

BIN
org.adempiere.ui.zk/theme/default/images/Next16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 850 B

After

Width:  |  Height:  |  Size: 318 B