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

cph::erp valuepreference / IDEMPIERE-3950 Translation of valuepreference dialog

This commit is contained in:
sjeffen 2019-04-10 22:58:42 +02:00
parent 63561a06c8
commit 4cd2b500b1
4 changed files with 164 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
migration/i6.2/oracle/201904182132_IDEMPIERE-3950.sql Normal file
View File

@ -0,0 +1,52 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- sjeffen:
-- 10. apr. 2019 10.52.05 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','For ',0,0,'Y',TO_DATE('2019-04-10 10:52:04','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2019-04-10 10:52:04','YYYY-MM-DD HH24:MI:SS'),100,200492,'For ','U','261e6b45-140f-4105-a20a-3b490317d0ec')
;
-- 10. apr. 2019 10.52.42 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','this Client and Organization',0,0,'Y',TO_DATE('2019-04-10 10:52:41','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2019-04-10 10:52:41','YYYY-MM-DD HH24:MI:SS'),100,200493,'this Client and Organization','U','66aeeecc-fff7-4ff4-86f6-512198a41c93')
;
-- 10. apr. 2019 10.53.07 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','all Organizations of this Client',0,0,'Y',TO_DATE('2019-04-10 10:53:06','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2019-04-10 10:53:06','YYYY-MM-DD HH24:MI:SS'),100,200494,'all Organizations of this Client','U','ada1981e-3a7a-4b57-801a-b48ee0d970dd')
;
-- 10. apr. 2019 10.53.25 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','entire System',0,0,'Y',TO_DATE('2019-04-10 10:53:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2019-04-10 10:53:25','YYYY-MM-DD HH24:MI:SS'),100,200495,'entire System','U','6122979d-8153-44e1-bec8-94d989501719')
;
-- 10. apr. 2019 10.53.56 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','this User',0,0,'Y',TO_DATE('2019-04-10 10:53:56','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2019-04-10 10:53:56','YYYY-MM-DD HH24:MI:SS'),100,200496,'this User','U','e0e648b5-6778-4b08-8208-7ff419acc45f')
;
-- 10. apr. 2019 10.54.21 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','all Users',0,0,'Y',TO_DATE('2019-04-10 10:54:20','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2019-04-10 10:54:20','YYYY-MM-DD HH24:MI:SS'),100,200497,'all Users','U','e788b1d4-6a75-47f1-b406-3664263753f0')
;
-- 10. apr. 2019 10.54.42 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','and this Window',0,0,'Y',TO_DATE('2019-04-10 10:54:42','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2019-04-10 10:54:42','YYYY-MM-DD HH24:MI:SS'),100,200498,'and this Window','U','62ee5c8d-8e1a-4ddb-9670-4e8b3c38c719')
;
-- 10. apr. 2019 10.55.01 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','and all Windows',0,0,'Y',TO_DATE('2019-04-10 10:55:01','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2019-04-10 10:55:01','YYYY-MM-DD HH24:MI:SS'),100,200499,'and all Windows','U','baa13291-8bbf-4efb-8db5-99a3dcfdc263')
;
-- 10. apr. 2019 10.55.23 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','and this Process',0,0,'Y',TO_DATE('2019-04-10 10:55:23','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2019-04-10 10:55:23','YYYY-MM-DD HH24:MI:SS'),100,200500,'and this Process','U','29a050d6-dea8-436e-9b43-14d6ccd75d89')
;
-- 10. apr. 2019 10.55.47 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','and all Process',0,0,'Y',TO_DATE('2019-04-10 10:55:47','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2019-04-10 10:55:47','YYYY-MM-DD HH24:MI:SS'),100,200501,'and all Process','U','d7da7af7-3d7c-4294-817f-b1bc236c97bd')
;
-- 10. apr. 2019 10.56.08 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','and this Info Window',0,0,'Y',TO_DATE('2019-04-10 10:56:08','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2019-04-10 10:56:08','YYYY-MM-DD HH24:MI:SS'),100,200502,'and this Info Window','U','1ab5c8ba-f285-4ef9-a219-adb77c7fd86b')
;
-- 10. apr. 2019 10.56.25 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','and all Info Window',0,0,'Y',TO_DATE('2019-04-10 10:56:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2019-04-10 10:56:25','YYYY-MM-DD HH24:MI:SS'),100,200503,'and all Info Window','U','a122402b-89ad-4694-979a-065aa64fd704')
;

49
migration/i6.2/postgresql/201904182132_IDEMPIERE-3950.sql Normal file
View File

@ -0,0 +1,49 @@
-- sjeffen:
-- 10. apr. 2019 10.52.05 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','For ',0,0,'Y',TO_TIMESTAMP('2019-04-10 10:52:04','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2019-04-10 10:52:04','YYYY-MM-DD HH24:MI:SS'),100,200492,'For ','U','261e6b45-140f-4105-a20a-3b490317d0ec')
;
-- 10. apr. 2019 10.52.42 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','this Client and Organization',0,0,'Y',TO_TIMESTAMP('2019-04-10 10:52:41','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2019-04-10 10:52:41','YYYY-MM-DD HH24:MI:SS'),100,200493,'this Client and Organization','U','66aeeecc-fff7-4ff4-86f6-512198a41c93')
;
-- 10. apr. 2019 10.53.07 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','all Organizations of this Client',0,0,'Y',TO_TIMESTAMP('2019-04-10 10:53:06','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2019-04-10 10:53:06','YYYY-MM-DD HH24:MI:SS'),100,200494,'all Organizations of this Client','U','ada1981e-3a7a-4b57-801a-b48ee0d970dd')
;
-- 10. apr. 2019 10.53.25 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','entire System',0,0,'Y',TO_TIMESTAMP('2019-04-10 10:53:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2019-04-10 10:53:25','YYYY-MM-DD HH24:MI:SS'),100,200495,'entire System','U','6122979d-8153-44e1-bec8-94d989501719')
;
-- 10. apr. 2019 10.53.56 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','this User',0,0,'Y',TO_TIMESTAMP('2019-04-10 10:53:56','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2019-04-10 10:53:56','YYYY-MM-DD HH24:MI:SS'),100,200496,'this User','U','e0e648b5-6778-4b08-8208-7ff419acc45f')
;
-- 10. apr. 2019 10.54.21 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','all Users',0,0,'Y',TO_TIMESTAMP('2019-04-10 10:54:20','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2019-04-10 10:54:20','YYYY-MM-DD HH24:MI:SS'),100,200497,'all Users','U','e788b1d4-6a75-47f1-b406-3664263753f0')
;
-- 10. apr. 2019 10.54.42 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','and this Window',0,0,'Y',TO_TIMESTAMP('2019-04-10 10:54:42','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2019-04-10 10:54:42','YYYY-MM-DD HH24:MI:SS'),100,200498,'and this Window','U','62ee5c8d-8e1a-4ddb-9670-4e8b3c38c719')
;
-- 10. apr. 2019 10.55.01 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','and all Windows',0,0,'Y',TO_TIMESTAMP('2019-04-10 10:55:01','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2019-04-10 10:55:01','YYYY-MM-DD HH24:MI:SS'),100,200499,'and all Windows','U','baa13291-8bbf-4efb-8db5-99a3dcfdc263')
;
-- 10. apr. 2019 10.55.23 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','and this Process',0,0,'Y',TO_TIMESTAMP('2019-04-10 10:55:23','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2019-04-10 10:55:23','YYYY-MM-DD HH24:MI:SS'),100,200500,'and this Process','U','29a050d6-dea8-436e-9b43-14d6ccd75d89')
;
-- 10. apr. 2019 10.55.47 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','and all Process',0,0,'Y',TO_TIMESTAMP('2019-04-10 10:55:47','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2019-04-10 10:55:47','YYYY-MM-DD HH24:MI:SS'),100,200501,'and all Process','U','d7da7af7-3d7c-4294-817f-b1bc236c97bd')
;
-- 10. apr. 2019 10.56.08 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','and this Info Window',0,0,'Y',TO_TIMESTAMP('2019-04-10 10:56:08','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2019-04-10 10:56:08','YYYY-MM-DD HH24:MI:SS'),100,200502,'and this Info Window','U','1ab5c8ba-f285-4ef9-a219-adb77c7fd86b')
;
-- 10. apr. 2019 10.56.25 CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','and all Info Window',0,0,'Y',TO_TIMESTAMP('2019-04-10 10:56:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2019-04-10 10:56:25','YYYY-MM-DD HH24:MI:SS'),100,200503,'and all Info Window','U','a122402b-89ad-4694-979a-065aa64fd704')
;

106
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java
View File

@ -27,6 +27,7 @@ import org.adempiere.webui.component.Button;
import org.adempiere.webui.component.Checkbox; import org.adempiere.webui.component.Checkbox;
import org.adempiere.webui.component.ConfirmPanel; import org.adempiere.webui.component.ConfirmPanel;
import org.adempiere.webui.component.Grid; import org.adempiere.webui.component.Grid;
import org.adempiere.webui.component.GridFactory;
import org.adempiere.webui.component.Label; import org.adempiere.webui.component.Label;
import org.adempiere.webui.component.Panel; import org.adempiere.webui.component.Panel;
import org.adempiere.webui.component.Row; import org.adempiere.webui.component.Row;
@ -53,6 +54,7 @@ import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.Events;
import org.zkoss.zul.Div; import org.zkoss.zul.Div;
import org.zkoss.zul.Hlayout; import org.zkoss.zul.Hlayout;
import org.zkoss.zul.Vlayout;
import org.zkoss.zul.Separator; import org.zkoss.zul.Separator;
import org.zkoss.zul.Space; import org.zkoss.zul.Space;
import org.zkoss.zul.Vbox; import org.zkoss.zul.Vbox;
@ -270,10 +272,12 @@ public class ValuePreference extends Window implements EventListener<Event>
private Grid setLayout = new Grid(); private Grid setLayout = new Grid();
private Label lAttribute = new Label(); private Label lAttribute = new Label();
private Textbox fAttribute = new Textbox(); private Textbox fAttribute = new Textbox();
private Label lAttributeValue = new Label(); private Textbox fAttributeValue = new Textbox();
private Label lValue = new Label(); private Label lValue = new Label();
private Label lValueValue = new Label(); private Label lValueValue = new Label();
private Textbox fValue = new Textbox(); private Textbox fValue = new Textbox();
private Label lidValue = new Label();
private Textbox fidValue = new Textbox();
private Label lSetFor = new Label(); private Label lSetFor = new Label();
private Checkbox cbClient = new Checkbox(); private Checkbox cbClient = new Checkbox();
private Checkbox cbOrg = new Checkbox(); private Checkbox cbOrg = new Checkbox();
@ -297,9 +301,13 @@ public class ValuePreference extends Window implements EventListener<Event>
*/ */
private void init() throws Exception private void init() throws Exception
{ {
// setSclass("popup-dialog");
Vlayout vlayout = new Vlayout();
vlayout.setHflex("1");
this.appendChild(vlayout);
lAttribute.setValue(Msg.translate(m_ctx, "Attribute").replace("&", "")); lAttribute.setValue(Msg.translate(m_ctx, "Attribute").replace("&", ""));
lValue.setValue(Msg.translate(m_ctx, "Value").replace("&", "")); lValue.setValue(Msg.translate(m_ctx, "Value").replace("&", ""));
lidValue.setValue("Id");
lSetFor.setValue(Msg.getMsg(m_ctx, "ValuePreferenceSetFor")); lSetFor.setValue(Msg.getMsg(m_ctx, "ValuePreferenceSetFor"));
cbClient.setLabel(Msg.translate(m_ctx, "AD_Client_ID")); cbClient.setLabel(Msg.translate(m_ctx, "AD_Client_ID"));
cbOrg.setLabel(Msg.translate(m_ctx, "AD_Org_ID")); cbOrg.setLabel(Msg.translate(m_ctx, "AD_Org_ID"));
@ -315,36 +323,46 @@ public class ValuePreference extends Window implements EventListener<Event>
setPanel.appendChild(setLayout); setPanel.appendChild(setLayout);
ZKUpdateUtil.setHflex(setPanel, "1"); ZKUpdateUtil.setHflex(setPanel, "1");
fAttribute.setReadonly(true); fAttribute.setReadonly(true);
fAttributeValue.setReadonly(true);
fValue.setReadonly(true); fValue.setReadonly(true);
Vbox box = new Vbox(); Grid grid = GridFactory.newGridLayout();
ZKUpdateUtil.setWidth(box, "100%"); grid.setStyle("background-image: none;");
ZKUpdateUtil.setHeight(box, "100%"); LayoutUtils.addSclass("dialog-content", grid);
box.setParent(this); vlayout.appendChild(grid);
ZKUpdateUtil.setHflex(box, "1");
box.appendChild(setPanel);
Rows rows = new Rows(); Rows rows = new Rows();
rows.setParent(setLayout); grid.appendChild(rows);
Row row = new Row(); Row row = new Row();
Div div = new Div(); Div div = new Div();
div.setStyle("text-align: right"); div.setStyle("text-align: right");
div.appendChild(lAttribute); div.appendChild(lAttribute);
row.appendCellChild(div, 1); row.appendCellChild(div, 1);
row.appendCellChild(fAttribute, 4); row.appendCellChild(fAttribute, 3);
ZKUpdateUtil.setWidth(fAttribute, "96%"); ZKUpdateUtil.setWidth(fAttribute, "98%");
row.appendCellChild(lAttributeValue, 1); row.appendCellChild(fAttributeValue, 3);
fAttributeValue.setWidth("98%");
rows.appendChild(row); rows.appendChild(row);
row = new Row();
div = new Div();
div.setStyle("text-align: right");
div.appendChild(lidValue);
row.appendCellChild(div, 1);
row.appendCellChild(fidValue, 6);
fidValue.setWidth("99%");
fidValue.setReadonly(true);
rows.appendChild(row);
rows.appendChild(row);
row = new Row(); row = new Row();
div = new Div(); div = new Div();
div.setStyle("text-align: right"); div.setStyle("text-align: right");
div.appendChild(lValue); div.appendChild(lValue);
row.appendCellChild(div, 1); row.appendCellChild(div, 1);
row.appendCellChild(fValue, 4); row.appendCellChild(fValue, 6);
ZKUpdateUtil.setWidth(fValue, "96%"); ZKUpdateUtil.setWidth(fValue, "99%");
row.appendCellChild(lValueValue, 1);
rows.appendChild(row); rows.appendChild(row);
row = new Row(); row = new Row();
@ -357,6 +375,7 @@ public class ValuePreference extends Window implements EventListener<Event>
chlayout.appendChild(cbClient); chlayout.appendChild(cbClient);
chlayout.appendChild(cbOrg); chlayout.appendChild(cbOrg);
chlayout.appendChild(cbUser); chlayout.appendChild(cbUser);
if(isProcessInIW){ if(isProcessInIW){
// in case show process in info window, don't show checkbox window in value preference dialog. // in case show process in info window, don't show checkbox window in value preference dialog.
// must set is checked to save current windowID (dummy) with value preference other it will save null, // must set is checked to save current windowID (dummy) with value preference other it will save null,
@ -376,25 +395,26 @@ public class ValuePreference extends Window implements EventListener<Event>
row.appendCellChild(chlayout, 5); row.appendCellChild(chlayout, 5);
rows.appendChild(row); rows.appendChild(row);
row = new Row(); row = new Row();
row.appendCellChild(new Space(), 1); row.appendCellChild(new Space(), 1);
row.appendCellChild(lExplanation, 5); row.appendCellChild(lExplanation, 5);
rows.appendChild(row); rows.appendChild(row);
// Div footer = new Div();
Separator separator = new Separator(); vlayout.appendChild(footer);
ZKUpdateUtil.setHeight(separator, "10px");
box.appendChild(separator);
box.appendChild(confirmPanel);
this.setBorder("normal");
setLayout.makeNoStrip();
setLayout.setOddRowSclass("even");
if (!ThemeManager.isUseCSSForWindowSize()) { if (!ThemeManager.isUseCSSForWindowSize()) {
ZKUpdateUtil.setWindowWidthX(this, 500); ZKUpdateUtil.setWindowWidthX(this, 500);
} }
else
{
ZKUpdateUtil.setWindowWidthX(this, 740);
}
confirmPanel.setVflex("min");
confirmPanel.setClass("dialog-footer");
footer.appendChild(confirmPanel);
this.setSizable(true); this.setSizable(true);
this.setSclass("value-preference-dialog"); this.setSclass("value-preference-dialog");
} // jbInit } // jbInit
@ -406,12 +426,13 @@ public class ValuePreference extends Window implements EventListener<Event>
{ {
// Set Attribute/Value // Set Attribute/Value
fAttribute.setText(m_DisplayAttribute); fAttribute.setText(m_DisplayAttribute);
lAttributeValue.setValue(m_Attribute); fAttributeValue.setValue(m_Attribute);
fValue.setText(m_DisplayValue); fValue.setText(m_DisplayValue);
fidValue.setText(m_Value);
lValueValue.setValue(m_Value); lValueValue.setValue(m_Value);
if (CLogMgt.isLevelFine()) if (CLogMgt.isLevelFine())
{ {
lAttributeValue.setVisible(false); fAttributeValue.setVisible(false);
lValueValue.setVisible(false); lValueValue.setVisible(false);
} }
@ -484,34 +505,34 @@ public class ValuePreference extends Window implements EventListener<Event>
private void setExplanation() private void setExplanation()
{ {
/** @todo translation */ /** @todo translation */
StringBuilder expl = new StringBuilder("For "); StringBuilder expl = new StringBuilder(Msg.getCleanMsg(Env.getCtx(), "For "));
if (cbClient.isChecked() && cbOrg.isChecked() ) if (cbClient.isChecked() && cbOrg.isChecked() )
expl.append("this Client and Organization"); expl.append(Msg.getCleanMsg(Env.getCtx(), "this Client and Organization"));
else if (cbClient.isChecked() && !cbOrg.isChecked()) else if (cbClient.isChecked() && !cbOrg.isChecked())
expl.append("all Organizations of this Client"); expl.append(Msg.getCleanMsg(Env.getCtx(), "all Organizations of this Client"));
else if (!cbClient.isChecked() && cbOrg.isChecked()) else if (!cbClient.isChecked() && cbOrg.isChecked())
{ {
cbOrg.setChecked(false); cbOrg.setChecked(false);
expl.append("entire System"); expl.append("Msg.getCleanMsg(Env.getCtx(), entire System");
} }
else else
expl.append("entire System"); expl.append("Msg.getCleanMsg(Env.getCtx(), entire System");
// //
if (cbUser.isChecked()) if (cbUser.isChecked())
expl.append(", this User"); expl.append(", " + Msg.getCleanMsg(Env.getCtx(), "this User"));
else else
expl.append(", all Users"); expl.append(", " + Msg.getCleanMsg(Env.getCtx(), "all Users"));
// //
if (cbWindow.isChecked()) if (cbWindow.isChecked())
expl.append(" and this Window"); expl.append(" " + Msg.getCleanMsg(Env.getCtx(), " and this Window"));
else else
expl.append(" and all Windows"); expl.append(" " + Msg.getCleanMsg(Env.getCtx(), "and all Windows"));
// //
if (m_AD_Process_ID_Of_Panel > 0){ if (m_AD_Process_ID_Of_Panel > 0){
if (cbProcess.isChecked()) if (cbProcess.isChecked())
expl.append(" and this Process"); expl.append(" " + Msg.getCleanMsg(Env.getCtx(), "and this Process"));
else else
expl.append(" and all Process"); expl.append(" " + Msg.getCleanMsg(Env.getCtx(), "and all Process"));
} }
// //
if (m_AD_Infowindow_ID > 0){ if (m_AD_Infowindow_ID > 0){
@ -521,11 +542,8 @@ public class ValuePreference extends Window implements EventListener<Event>
expl.append(" and all Info Window"); expl.append(" and all Info Window");
} }
// lExplanation.setValue(expl.toString ());
if (Env.getLanguage(Env.getCtx()).isBaseLanguage())
{
lExplanation.setValue(expl.toString ());
}
} // setExplanation } // setExplanation
/** /**

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
View File

@ -673,7 +673,7 @@ ContextMenuListener, IZoomableEditor
else if (WEditorPopupMenu.PREFERENCE_EVENT.equals(evt.getContextEvent())) else if (WEditorPopupMenu.PREFERENCE_EVENT.equals(evt.getContextEvent()))
{ {
if (isShowPreference()) if (isShowPreference())
ValuePreference.start (getComponent(), this.getGridField(), getValue()); ValuePreference.start (getComponent(), this.getGridField(), getValue(), getDisplay());
return; return;
} }
else if (WEditorPopupMenu.NEW_EVENT.equals(evt.getContextEvent())) else if (WEditorPopupMenu.NEW_EVENT.equals(evt.getContextEvent()))