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

Merge f23a102ab4bb

This commit is contained in:
Heng Sin Low 2012-12-20 14:47:31 +08:00
parent 42be0bf8c6 dda97fbadd
commit 1dde3e4227
52 changed files with 292 additions and 511 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
migration/i1.0a-release/oracle/201212192345_IDEMPIERE-362_ConnectionProfile.sql Normal file
View File

@ -0,0 +1,18 @@
-- Dec 19, 2012 11:41:02 PM COT
-- Drop deprecated connection profile
UPDATE AD_Field SET IsDisplayed='N', IsActive='N',Updated=TO_DATE('2012-12-19 23:41:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12640
;
-- Dec 19, 2012 11:41:44 PM COT
-- Drop deprecated connection profile
UPDATE AD_Column SET IsActive='N',Updated=TO_DATE('2012-12-19 23:41:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=14619
;
-- Dec 19, 2012 11:43:43 PM COT
-- Drop deprecated connection profile
UPDATE AD_Column SET IsActive='N',Updated=TO_DATE('2012-12-19 23:43:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=14618
;
SELECT register_migration_script('201212192345_IDEMPIERE-362_ConnectionProfile.sql') FROM dual
;

18
migration/i1.0a-release/postgresql/201212192345_IDEMPIERE-362_ConnectionProfile.sql Normal file
View File

@ -0,0 +1,18 @@
-- Dec 19, 2012 11:41:02 PM COT
-- Drop deprecated connection profile
UPDATE AD_Field SET IsDisplayed='N', IsActive='N',Updated=TO_TIMESTAMP('2012-12-19 23:41:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12640
;
-- Dec 19, 2012 11:41:44 PM COT
-- Drop deprecated connection profile
UPDATE AD_Column SET IsActive='N',Updated=TO_TIMESTAMP('2012-12-19 23:41:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=14619
;
-- Dec 19, 2012 11:43:43 PM COT
-- Drop deprecated connection profile
UPDATE AD_Column SET IsActive='N',Updated=TO_TIMESTAMP('2012-12-19 23:43:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=14618
;
SELECT register_migration_script('201212192345_IDEMPIERE-362_ConnectionProfile.sql') FROM dual
;

98
org.adempiere.base/src/org/compiere/db/CConnection.java
View File

@ -32,7 +32,6 @@ import org.compiere.interfaces.Server;
import org.compiere.interfaces.Status;
import org.compiere.util.CLogger;
import org.compiere.util.Ini;
import org.compiere.util.ValueNamePair;
/**
* Adempiere Connection Descriptor
@ -44,34 +43,15 @@ import org.compiere.util.ValueNamePair;
public class CConnection implements Serializable, Cloneable
{
/**
*
*
*/
private static final long serialVersionUID = -7893119456331485444L;
private static final long serialVersionUID = -858558852550858165L;
/** Connection */
private volatile static CConnection s_cc = null;
/** Logger */
private static CLogger log = CLogger.getCLogger (CConnection.class);
/** Connection profiles */
@Deprecated
public static ValueNamePair[] CONNECTIONProfiles = new ValueNamePair[]{
new ValueNamePair("L", "LAN")};
/** Connection Profile LAN */
@Deprecated
public static final String PROFILE_LAN = "L";
/**
* Connection Profile Terminal Server
* @deprecated
**/
public static final String PROFILE_TERMINAL = "T";
/** Connection Profile VPM */
@Deprecated
public static final String PROFILE_VPN = "V";
/** Connection Profile WAN */
@Deprecated
public static final String PROFILE_WAN = "W";
/**
* Get/Set default client/server Connection
* @return Connection Descriptor
@ -98,7 +78,6 @@ public class CConnection implements Serializable, Cloneable
if (apps_host != null && Adempiere.isWebStartClient())
{
cc = new CConnection(apps_host);
cc.setConnectionProfile(CConnection.PROFILE_LAN);
if (cc.testAppsServer() == null)
{
s_cc = cc;
@ -553,77 +532,6 @@ public class CConnection implements Serializable, Cloneable
return false;
} // isRMIoverHTTP
/**
* Set Connection Profile
* @param connectionProfile connection profile
* @deprecated
*/
public void setConnectionProfile (ValueNamePair connectionProfile)
{
if (connectionProfile != null)
setConnectionProfile(PROFILE_LAN);
} // setConnectionProfile
/**
* Set Connection Profile
* @param connectionProfile connection profile
* @deprecated
*/
public void setConnectionProfile (String connectionProfile)
{
} // setConnectionProfile
/**
* Get Connection Profile
* @return connection profile
* @deprecated
*/
public String getConnectionProfile ()
{
return PROFILE_LAN;
} // getConnectionProfile
/**
* Get Connection Profile Text
* @param connectionProfile
* @return connection profile text
* @deprecated
*/
public String getConnectionProfileText (String connectionProfile)
{
for (int i = 0; i < CONNECTIONProfiles.length; i++)
{
if (CONNECTIONProfiles[i].getValue().equals(connectionProfile))
return CONNECTIONProfiles[i].getName();
}
return CONNECTIONProfiles[0].getName();
} // getConnectionProfileText
/**
* Get Connection Profile Text
* @return connection profile text
* @deprecated
*/
public String getConnectionProfileText ()
{
return getConnectionProfileText(getConnectionProfile());
} // getConnectionProfileText
/**
* Get Connection Profile
* @return connection profile
* @deprecated
*/
public ValueNamePair getConnectionProfilePair ()
{
for (int i = 0; i < CONNECTIONProfiles.length; i++)
{
if (CONNECTIONProfiles[i].getValue().equals(getConnectionProfile()))
return CONNECTIONProfiles[i];
}
return CONNECTIONProfiles[0];
} // getConnectionProfilePair
/**
* Should objects be created on Server ?
* @return true if client and VPN/WAN

13
org.adempiere.base/src/org/compiere/model/I_AD_Role.java
View File

@ -258,19 +258,6 @@ public interface I_AD_Role
*/
public int getConfirmQueryRecords();
/** Column name ConnectionProfile */
public static final String COLUMNNAME_ConnectionProfile = "ConnectionProfile";
/** Set Connection Profile.
* How a Java Client connects to the server(s)
*/
public void setConnectionProfile (String ConnectionProfile);
/** Get Connection Profile.
* How a Java Client connects to the server(s)
*/
public String getConnectionProfile();
/** Column name Created */
public static final String COLUMNNAME_Created = "Created";

13
org.adempiere.base/src/org/compiere/model/I_AD_User.java
View File

@ -192,19 +192,6 @@ public interface I_AD_User
*/
public String getComments();
/** Column name ConnectionProfile */
public static final String COLUMNNAME_ConnectionProfile = "ConnectionProfile";
/** Set Connection Profile.
* How a Java Client connects to the server(s)
*/
public void setConnectionProfile (String ConnectionProfile);
/** Get Connection Profile.
* How a Java Client connects to the server(s)
*/
public String getConnectionProfile();
/** Column name Created */
public static final String COLUMNNAME_Created = "Created";

30
org.adempiere.base/src/org/compiere/model/X_AD_Role.java
View File

@ -32,7 +32,7 @@ public class X_AD_Role extends PO implements I_AD_Role, I_Persistent
/**
*
*/
private static final long serialVersionUID = 20121031L;
private static final long serialVersionUID = 20121219L;
/** Standard Constructor */
public X_AD_Role (Properties ctx, int AD_Role_ID, String trxName)
@ -518,34 +518,6 @@ public class X_AD_Role extends PO implements I_AD_Role, I_Persistent
return ii.intValue();
}
/** ConnectionProfile AD_Reference_ID=364 */
public static final int CONNECTIONPROFILE_AD_Reference_ID=364;
/** LAN = L */
public static final String CONNECTIONPROFILE_LAN = "L";
/** Terminal Server = T */
public static final String CONNECTIONPROFILE_TerminalServer = "T";
/** VPN = V */
public static final String CONNECTIONPROFILE_VPN = "V";
/** WAN = W */
public static final String CONNECTIONPROFILE_WAN = "W";
/** Set Connection Profile.
@param ConnectionProfile
How a Java Client connects to the server(s)
*/
public void setConnectionProfile (String ConnectionProfile)
{
set_Value (COLUMNNAME_ConnectionProfile, ConnectionProfile);
}
/** Get Connection Profile.
@return How a Java Client connects to the server(s)
*/
public String getConnectionProfile ()
{
return (String)get_Value(COLUMNNAME_ConnectionProfile);
}
/** Set Days Approval Accumulated.
@param DaysApprovalAccum
The days approval indicates the days to take into account to verify the accumulated approval amount.

30
org.adempiere.base/src/org/compiere/model/X_AD_User.java
View File

@ -31,7 +31,7 @@ public class X_AD_User extends PO implements I_AD_User, I_Persistent
/**
*
*/
private static final long serialVersionUID = 20121031L;
private static final long serialVersionUID = 20121219L;
/** Standard Constructor */
public X_AD_User (Properties ctx, int AD_User_ID, String trxName)
@ -306,34 +306,6 @@ public class X_AD_User extends PO implements I_AD_User, I_Persistent
return (String)get_Value(COLUMNNAME_Comments);
}
/** ConnectionProfile AD_Reference_ID=364 */
public static final int CONNECTIONPROFILE_AD_Reference_ID=364;
/** LAN = L */
public static final String CONNECTIONPROFILE_LAN = "L";
/** Terminal Server = T */
public static final String CONNECTIONPROFILE_TerminalServer = "T";
/** VPN = V */
public static final String CONNECTIONPROFILE_VPN = "V";
/** WAN = W */
public static final String CONNECTIONPROFILE_WAN = "W";
/** Set Connection Profile.
@param ConnectionProfile
How a Java Client connects to the server(s)
*/
public void setConnectionProfile (String ConnectionProfile)
{
set_Value (COLUMNNAME_ConnectionProfile, ConnectionProfile);
}
/** Get Connection Profile.
@return How a Java Client connects to the server(s)
*/
public String getConnectionProfile ()
{
return (String)get_Value(COLUMNNAME_ConnectionProfile);
}
/** Set Date Account Locked.
@param DateAccountLocked Date Account Locked */
public void setDateAccountLocked (Timestamp DateAccountLocked)

41
org.adempiere.base/src/org/compiere/util/Login.java
View File

@ -157,9 +157,6 @@ public class Login
private static CLogger log = CLogger.getCLogger(Login.class);
/** Context */
private Properties m_ctx = null;
/** Connection Profile */
private String m_connectionProfile = null;
/**
* (Test) Client Login.
@ -409,18 +406,6 @@ public class Login
Ini.setProperty(Ini.P_UID, "");
if (Ini.isPropertyBool(Ini.P_STORE_PWD) && MSystem.isSwingRememberPasswordAllowed())
Ini.setProperty(Ini.P_PWD, app_pwd);
m_connectionProfile = rs.getString(4); // User Based
if (m_connectionProfile != null)
{
CConnection cc = CConnection.get();
if (!cc.getConnectionProfile().equals(m_connectionProfile))
{
cc.setConnectionProfile(m_connectionProfile);
Ini.setProperty(Ini.P_CONNECTION, cc.toStringLong());
Ini.saveProperties(false);
}
}
}
do // read all roles
@ -508,20 +493,6 @@ public class Login
// User Level
Env.setContext(m_ctx, "#User_Level", rs.getString(1)); // Format 'SCO'
// ConnectionProfile
CConnection cc = CConnection.get();
if (m_connectionProfile == null) // No User Based
{
m_connectionProfile = rs.getString(2); // Role Based
if (m_connectionProfile != null
&& !cc.getConnectionProfile().equals(m_connectionProfile))
{
cc.setConnectionProfile(m_connectionProfile);
Ini.setProperty(Ini.P_CONNECTION, cc.toStringLong());
Ini.saveProperties(false);
}
}
// load Clients
do
{
@ -615,18 +586,6 @@ public class Login
Ini.setProperty(Ini.P_ROLE, rol.getName());
// User Level
Env.setContext(m_ctx, "#User_Level", rs.getString(1)); // Format 'SCO'
// ConnectionProfile
CConnection cc = CConnection.get();
if (m_connectionProfile == null) // No User Based
{
m_connectionProfile = rs.getString(2); // Role Based
if (m_connectionProfile != null && !cc.getConnectionProfile().equals(m_connectionProfile))
{
cc.setConnectionProfile(m_connectionProfile);
Ini.setProperty(Ini.P_CONNECTION, cc.toStringLong());
Ini.saveProperties(false);
}
}
// load Orgs
do{

2
org.adempiere.ui.swing-feature/adempiere-client.bat
View File

@ -17,4 +17,4 @@ goto START
@Echo Starting Adempiere Client ...
@Echo =======================================
@"%JAVA%" -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar -application org.adempiere.ui.swing.client
@"%JAVA%" -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.*.jar -application org.adempiere.ui.swing.client

6
org.adempiere.ui.swing-feature/adempiere-client.sh
View File

@ -1,5 +1,9 @@
#!/bin/sh
#
# script parameters are used as VM args. e.g.:
# ./adempiere-client.sh -DPropertyFile=/home/tbayen/idempiere-conf2.properties
# -- tbayen
if [ $JAVA_HOME ]; then
JAVA=$JAVA_HOME/bin/java
else
@ -13,4 +17,4 @@ echo ===================================
echo Starting Adempiere Client
echo ===================================
$JAVA -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar -application org.adempiere.ui.swing.client
$JAVA -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true $@ -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_ 1.*.jar -application org.adempiere.ui.swing.client

29
org.adempiere.ui.swing/src/org/compiere/apps/Preference.java
View File

@ -49,7 +49,6 @@ import javax.swing.table.DefaultTableModel;
import org.adempiere.plaf.AdempierePLAF;
import org.adempiere.plaf.PLAFEditorPanel;
import org.compiere.db.CConnection;
import org.compiere.grid.ed.VDate;
import org.compiere.minigrid.MiniTable;
import org.compiere.model.MRole;
@ -93,7 +92,7 @@ public final class Preference extends CDialog
/**
*
*/
private static final long serialVersionUID = -8923143271736597338L;
private static final long serialVersionUID = -4691368295400769754L;
/**
* Standard Constructor
@ -165,8 +164,6 @@ public final class Preference extends CDialog
private CPrinter fPrinter = new CPrinter();
private CLabel lDate = new CLabel();
private VDate fDate = new VDate();
private CComboBox connectionProfile = new CComboBox(CConnection.CONNECTIONProfiles);
private CLabel connectionProfileLabel = new CLabel();
private CPanel errorPane = new CPanel();
private BorderLayout errorLayout = new BorderLayout();
private JScrollPane errorScrollPane = new JScrollPane();
@ -239,7 +236,6 @@ public final class Preference extends CDialog
showAcct.setToolTipText(Msg.getMsg(Env.getCtx(), "ShowAcctTab", false));
showAdvanced.setText(Msg.getMsg(Env.getCtx(), "ShowAdvancedTab", true));
showAdvanced.setToolTipText(Msg.getMsg(Env.getCtx(), "ShowAdvancedTab", false));
connectionProfileLabel.setText(Msg.getElement(Env.getCtx(), "ConnectionProfile"));
cacheWindow.setText(Msg.getMsg(Env.getCtx(), "CacheWindow", true));
cacheWindow.setToolTipText(Msg.getMsg(Env.getCtx(), "CacheWindow", false));
lPrinter.setText(Msg.getMsg(Env.getCtx(), "Printer"));
@ -288,10 +284,6 @@ public final class Preference extends CDialog
CPanel connPanel = new CPanel();
connPanel.setBorder(BorderFactory.createTitledBorder(Msg.getMsg(Env.getCtx(), "Connection")));
connPanel.setLayout(new GridBagLayout());
connPanel.add(connectionProfileLabel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(2, 2, 2, 0), 0, 0));
connPanel.add(connectionProfile, new GridBagConstraints(1, 0, 1, 1, 1.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(2, 2, 2, 0), 0, 0));
connPanel.add(validateConnectionOnStartup, new GridBagConstraints(0, 1, 2, 1, 1.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(2, 2, 2, 0), 0, 0));
customizePane.add(connPanel, new GridBagConstraints(0, 2, 1, 1, 1.0, 0.0
@ -505,17 +497,6 @@ public final class Preference extends CDialog
showTrl.setSelected(Ini.isPropertyBool(Ini.P_SHOW_TRL));
showAdvanced.setSelected(Ini.isPropertyBool(Ini.P_SHOW_ADVANCED));
// Connection Profile
MUser user = MUser.get(Env.getCtx());
String cp = user.getConnectionProfile();
if (cp == null)
cp = MRole.getDefault().getConnectionProfile();
if (cp != null)
{
CConnection.get().setConnectionProfile(cp);
connectionProfile.setReadWrite(false);
}
connectionProfile.setSelectedItem(CConnection.get().getConnectionProfilePair());
cacheWindow.setSelected(Ini.isCacheWindow());
// Print Preview
@ -594,14 +575,6 @@ public final class Preference extends CDialog
Ini.setProperty(Ini.P_SHOW_ADVANCED, (showAdvanced.isSelected()));
Env.setContext(Env.getCtx(), "#ShowAdvanced", (showAdvanced.isSelected()));
// ConnectionProfile
ValueNamePair ppNew = (ValueNamePair)connectionProfile.getSelectedItem();
String cpNew = ppNew.getValue();
String cpOld = CConnection.get().getConnectionProfile();
CConnection.get().setConnectionProfile(cpNew);
if (!cpNew.equals(cpOld)
&& (cpNew.equals(CConnection.PROFILE_WAN) || cpOld.equals(CConnection.PROFILE_WAN)))
ADialog.info(0, this, "ConnectionProfileChange");
Ini.setProperty(Ini.P_CACHE_WINDOW, cacheWindow.isSelected());
// Print Preview

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

@ -276,25 +276,23 @@ public class ValuePreference extends Window implements EventListener<Event>
rows.setParent(setLayout);
Row row = new Row();
row.setSpans("1, 4, 1");
Div div = new Div();
div.setStyle("text-align: right");
div.appendChild(lAttribute);
row.appendChild(div);
row.appendChild(fAttribute);
row.appendCellChild(div, 1);
row.appendCellChild(fAttribute, 4);
fAttribute.setWidth("100%");
row.appendChild(lAttributeValue);
row.appendCellChild(lAttributeValue, 1);
rows.appendChild(row);
row = new Row();
row.setSpans("1, 4, 1");
div = new Div();
div.setStyle("text-align: right");
div.appendChild(lValue);
row.appendChild(div);
row.appendChild(fValue);
row.appendCellChild(div, 1);
row.appendCellChild(fValue, 4);
fValue.setWidth("100%");
row.appendChild(lValueValue);
row.appendCellChild(lValueValue, 1);
rows.appendChild(row);
row = new Row();
@ -309,9 +307,8 @@ public class ValuePreference extends Window implements EventListener<Event>
rows.appendChild(row);
row = new Row();
row.setSpans("1, 5");
row.appendChild(new Space());
row.appendChild(lExplanation);
row.appendCellChild(new Space(), 1);
row.appendCellChild(lExplanation, 5);
rows.appendChild(row);
//

10
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
View File

@ -76,6 +76,7 @@ import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.Button;
import org.zkoss.zul.Cell;
import org.zkoss.zul.Center;
import org.zkoss.zul.DefaultTreeNode;
import org.zkoss.zul.Div;
@ -454,7 +455,10 @@ DataStatusListener, IADTabpanel, IdSpace
else
{
Group rowg = new Group(fieldGroup);
rowg.setSpans(numColsS);
Cell cell = new Cell();
cell.setColspan(numCols);
rowg.appendChild(cell);
allCollapsibleGroups.add(rowg);
if (X_AD_FieldGroup.FIELDGROUPTYPE_Tab.equals(field.getFieldGroupType()) || field.getIsCollapsedByDefault())
{
@ -502,7 +506,7 @@ DataStatusListener, IADTabpanel, IdSpace
editorComps.add(editor.getComponent());
if (paintLabel) {
Div div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
Label label = editor.getLabel();
div.appendChild(label);
if (label.getDecorator() != null)
@ -556,7 +560,7 @@ DataStatusListener, IADTabpanel, IdSpace
//display just a label if we are "heading only"
Label label = new Label(field.getHeader());
Div div = new Div();
div.setAlign("center");
div.setStyle("text-align: center;");
row.appendCellChild(createSpacer());
div.appendChild(label);
row.appendCellChild(div);

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java
View File

@ -288,7 +288,7 @@ public class ProcessParameterPanel extends Panel implements
m_wEditors.add(editor); // add to Editors
Div div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
org.adempiere.webui.component.Label label = editor.getLabel();
div.appendChild(label);
if (label.getDecorator() != null)

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

@ -194,12 +194,11 @@ public class WAllocation extends Allocation
row.appendChild(organizationPick.getComponent());
row = rows.newRow();
row.appendChild(currencyLabel.rightAlign());
row.appendChild(currencyPick.getComponent());
row.appendChild(multiCurrency);
row.appendChild(new Space());
row.appendChild(new Space());
row.setSpans("1,1,2,1,1");
row.appendCellChild(currencyLabel.rightAlign(),1);
row.appendCellChild(currencyPick.getComponent(),1);
row.appendCellChild(multiCurrency,2);
row.appendCellChild(new Space(),1);
row.appendCellChild(new Space(),1);
row = rows.newRow();
row.appendChild(new Space());

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

@ -231,90 +231,82 @@ public class WArchiveViewer extends Archive implements IFormController, EventLis
Row row = new Row();
rows.appendChild(row);
row.setSpans("3");
row.setAlign("right");
row.appendChild(reportField);
row.appendCellChild(reportField, 3);
row = new Row();
rows.appendChild(row);
row.setSpans("1, 2");
Div div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(processLabel);
row.appendChild(div);
row.appendChild(processField);
row.appendCellChild(div, 1);
row.appendCellChild(processField, 2);
processField.setWidth("100%");
row = new Row();
rows.appendChild(row);
row.setSpans("1, 2");
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(bPartnerLabel);
row.appendChild(div);
row.appendChild(bPartnerField.getComponent());
row.appendCellChild(div, 1);
row.appendCellChild(bPartnerField.getComponent(), 2);
row = new Row();
rows.appendChild(row);
row.setSpans("1, 2");
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(tableLabel);
row.appendChild(div);
row.appendChild(tableField);
row.appendCellChild(div, 1);
row.appendCellChild(tableField, 2);
tableField.setWidth("100%");
row = new Row();
rows.appendChild(row);
row.setSpans("1, 2");
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(nameQLabel);
row.appendChild(div);
row.appendChild(nameQField);
row.appendCellChild(div, 1);
row.appendCellChild(nameQField, 2);
nameQField.setWidth("100%");
row = new Row();
rows.appendChild(row);
row.setSpans("1, 2");
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(descriptionQLabel);
row.appendChild(div);
row.appendChild(descriptionQField);
row.appendCellChild(div, 1);
row.appendCellChild(descriptionQField, 2);
descriptionQField.setWidth("100%");
row = new Row();
rows.appendChild(row);
row.setSpans("1, 2");
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(helpQLabel);
row.appendChild(div);
row.appendChild(helpQField);
row.appendCellChild(div, 1);
row.appendCellChild(helpQField, 2);
helpQField.setWidth("100%");
row = new Row();
rows.appendChild(row);
row.setSpans("1, 2");
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(createdByQLabel);
row.appendChild(div);
row.appendChild(createdByQField);
row.appendCellChild(div, 1);
row.appendCellChild(createdByQField, 2);
createdByQField.setWidth("100%");
row = new Row();
rows.appendChild(row);
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(createdQLabel);
row.appendChild(div);
row.appendChild(createdQFrom);
row.appendChild(createdQTo);
div = new Div();
div.setAlign("center");
div.setStyle("text-align: center;");
div.appendChild(gridQuery);
Tabpanel tabQueryPanel = new Tabpanel();
@ -335,87 +327,76 @@ public class WArchiveViewer extends Archive implements IFormController, EventLis
row = new Row();
rows.appendChild(row);
row.setSpans("1, 2, 1");
div = new Div();
div.setAlign("left");
div.setStyle("text-align: left;");
div.appendChild(bBack);
row.appendChild(div);
row.appendCellChild(div, 1);
div = new Div();
div.setAlign("center");
div.setStyle("text-align: center;");
div.appendChild(positionInfo);
row.appendChild(div);
row.appendCellChild(div, 2);
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(bNext);
row.appendChild(div);
row.appendCellChild(div, 1);
row = new Row();
rows.appendChild(row);
row.setSpans("4");
row.appendChild(createdByLabel);
row.appendCellChild(createdByLabel, 4);
createdByLabel.setWidth("100%");
row = new Row();
rows.appendChild(row);
row.setSpans("4");
row.appendChild(createdByField);
row.appendCellChild(createdByField, 4);
createdByField.setWidth("100%");
row = new Row();
rows.appendChild(row);
row.setSpans("4");
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(createdField);
row.appendChild(div);
row.appendCellChild(div, 4);
row = new Row();
rows.appendChild(row);
row.setSpans("4");
row.appendChild(nameLabel);
row.appendCellChild(nameLabel, 4);
nameLabel.setWidth("100%");
row = new Row();
rows.appendChild(row);
row.setSpans("4");
row.appendChild(nameField);
row.appendCellChild(nameField, 4);
nameField.setWidth("100%");
row = new Row();
rows.appendChild(row);
row.setSpans("4");
row.appendChild(descriptionLabel);
row.appendCellChild(descriptionLabel, 4);
descriptionLabel.setWidth("100%");
row = new Row();
rows.appendChild(row);
row.setSpans("4");
row.appendChild(descriptionField);
row.appendCellChild(descriptionField, 4);
descriptionField.setRows(3);
descriptionField.setWidth("100%");
row = new Row();
rows.appendChild(row);
row.setSpans("4");
row.appendChild(helpLabel);
row.appendCellChild(helpLabel, 4);
helpLabel.setWidth("100%");
row = new Row();
rows.appendChild(row);
row.setSpans("4");
row.appendChild(helpField);
row.appendCellChild(helpField, 4);
helpField.setRows(3);
helpField.setWidth("100%");
row = new Row();
rows.appendChild(row);
row.setSpans("4");
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(deleteArchive);
div.appendChild(bRefresh);
div.appendChild(updateArchive);
row.appendChild(div);
div.appendChild(updateArchive);
row.appendCellChild(div, 4);
createdByField.setReadonly(true);
createdField.getDatebox().setReadonly(true);

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

@ -122,46 +122,42 @@ public class WAttributeGrid extends ADForm implements EventListener<Event>
Row row = new Row();
rows.appendChild(row);
row.setSpans("1, 2");
Div div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(attributeLabel1);
row.appendChild(div);
row.appendChild(attributeCombo1);
row.appendCellChild(div, 1);
row.appendCellChild(attributeCombo1, 2);
attributeCombo1.setWidth("100%");
row = new Row();
rows.appendChild(row);
row.setSpans("1, 2");
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(attributeLabel2);
row.appendChild(div);
row.appendChild(attributeCombo2);
row.appendCellChild(div, 1);
row.appendCellChild(attributeCombo2, 2);
attributeCombo2.setWidth("100%");
row = new Row();
rows.appendChild(row);
row.setSpans("1, 2");
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(labelPriceList);
row.appendChild(div);
row.appendChild(pickPriceList);
row.appendCellChild(div, 1);
row.appendCellChild(pickPriceList, 2);
pickPriceList.setWidth("100%");
row = new Row();
rows.appendChild(row);
row.setSpans("1, 2");
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(labelWarehouse);
row.appendChild(div);
row.appendChild(pickWarehouse);
row.appendCellChild(div, 1);
row.appendCellChild(pickWarehouse, 2);
pickWarehouse.setWidth("100%");
div = new Div();
div.setAlign("center");
div.setStyle("text-align: center;");
div.appendChild(gridSelection);
Tabpanel tabSelectionPanel = new Tabpanel();
@ -172,7 +168,7 @@ public class WAttributeGrid extends ADForm implements EventListener<Event>
tabs.appendChild(tabSelection);
div = new Div();
div.setAlign("center");
div.setStyle("text-align: center;");
div.appendChild(modeLabel);
div.appendChild(modeCombo);
modeCombo.addEventListener(Events.ON_CHANGE, this);
@ -456,7 +452,7 @@ public class WAttributeGrid extends ADForm implements EventListener<Event>
if (xValues != null)
{
Div div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(new Label(m_attributes[indexAttr1].getName()));
descr.appendChild(div);
}
@ -470,7 +466,7 @@ public class WAttributeGrid extends ADForm implements EventListener<Event>
if (xValue != null)
{
Div div = new Div();
div.setAlign("center");
div.setStyle("text-align: center;");
div.appendChild(new Label(xValue.getName()));
row.appendChild(div);
}

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

@ -273,7 +273,7 @@ public class WCharge extends Charge implements IFormController, EventListener<Ev
south.setBorder("none");
borderlayout.appendChild(south);
Panel southPanel = new Panel();
southPanel.setAlign("right");
southPanel.setStyle("text-align: right;");
south.appendChild(southPanel);
m_btnAccount.setLabel(Msg.getMsg(Env.getCtx(), AD_MESSAGE_CREATE) + " " + Msg.getMsg(Env.getCtx(), "From") + " " + Msg.getElement(Env.getCtx(), "Account_ID"));
m_btnAccount.addEventListener(Events.ON_CLICK, this);
@ -310,10 +310,10 @@ public class WCharge extends Charge implements IFormController, EventListener<Ev
Row row = new Row();
rows.appendChild(row);
row.setSpans("3");
Label label = new Label(Msg.getMsg(Env.getCtx(), "ChargeNewAccount"));
label.setStyle("font-weight: bold;");
row.appendChild(label);
row.appendCellChild(label, 3);
row = new Row();
rows.appendChild(row);
@ -329,8 +329,7 @@ public class WCharge extends Charge implements IFormController, EventListener<Ev
row = new Row();
rows.appendChild(row);
row.setSpans("3");
row.appendChild(new Separator());
row.appendCellChild(new Separator(), 3);
return;
}

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

@ -236,10 +236,9 @@ public class WMatch extends Match
row.appendChild(new Space());
row = rows.newRow();
row.setSpans("1,1,3");
row.appendChild(matchModeLabel.rightAlign());
row.appendChild(matchMode);
row.appendChild(new Space());
row.appendCellChild(matchModeLabel.rightAlign(), 1);
row.appendCellChild(matchMode, 1);
row.appendCellChild(new Space(), 3);
row = rows.newRow();
row.appendChild(onlyVendorLabel.rightAlign());

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

@ -341,9 +341,8 @@ public class WPayment extends Window
row.appendChild(kOnline);
row = rows.newRow();
row.setSpans("3,1");
row.appendChild(kStatus);
row.appendChild(new Space());
row.appendCellChild(kStatus, 3);
row.appendCellChild(new Space(), 1);
// DircetDebit/Credit
tPanel.appendChild(tPanelLayout);
@ -379,9 +378,8 @@ public class WPayment extends Window
row.appendChild(tOnline);
row = rows.newRow();
row.setSpans("3,1");
row.appendChild(tStatus);
row.appendChild(new Space());
row.appendCellChild(tStatus, 3);
row.appendCellChild(new Space(), 1);
// Cheque
sPanel.appendChild(sPanelLayout);
@ -439,9 +437,8 @@ public class WPayment extends Window
row.appendChild(sOnline);
row = rows.newRow();
row.setSpans("3,1");
row.appendChild(sStatus);
row.appendChild(new Space());
row.appendCellChild(sStatus, 3);
row.appendCellChild(new Space(), 1);
// Cash
pPanel.appendChild(pPanelLayout);

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

@ -415,7 +415,7 @@ public class WReportCustomization implements IFormController,EventListener<Even
Hbox hb = new Hbox();
Div div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(new Label(Msg.getMsg(Env.getCtx(), "FilesOfType")));
hb.appendChild(div);
hb.appendChild(cboType);

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

@ -96,8 +96,9 @@ public class WResetPassword implements IFormController, EventListener<Event>, Va
Center center = new Center();
center.setStyle("border: none");
contentPane.appendChild(center);
gridPanel.setHflex("true");
gridPanel.setVflex("true");
center.appendChild(gridPanel);
center.setFlex(true);
South south = new South();
south.setStyle("border: none");
contentPane.appendChild(south);

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

@ -118,8 +118,7 @@ public class WSQLProcess extends ADForm implements EventListener<Event>
m_txbResultField.setRows(noResultRows);
m_txbResultField.setReadonly(true);
rwBottom.appendChild(m_txbResultField);
rwBottom.setSpans("3");
rwBottom.appendCellChild(m_txbResultField, 3);
rwBottom.setAlign("center");
rows.appendChild(rwBottom);

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

@ -188,7 +188,6 @@ public class WTabEditor extends TabEditor implements IFormController, EventListe
// set size in percentage per column leaving a MARGIN on right
Columns columns = new Columns();
form.appendChild(columns);
String numColsS=String.valueOf(numCols);
int equalWidth = 98 / numCols;
for (int h=0;h<numCols;h++){
@ -244,7 +243,9 @@ public class WTabEditor extends TabEditor implements IFormController, EventListe
else
{
Group rowg = new Group(fieldGroup);
rowg.setSpans(numColsS);
Cell cell = new Cell();
cell.setColspan(numCols);
rowg.appendChild(cell);
if (X_AD_FieldGroup.FIELDGROUPTYPE_Tab.equals(gridField.getFieldGroupType()) || gridField.getIsCollapsedByDefault())
{
rowg.setOpen(false);
@ -301,7 +302,7 @@ public class WTabEditor extends TabEditor implements IFormController, EventListe
}
if (paintLabel) {
Div div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
Label label = editor.getLabel();
div.appendChild(label);
if (label.getDecorator() != null)
@ -322,7 +323,7 @@ public class WTabEditor extends TabEditor implements IFormController, EventListe
//display just a label if we are "heading only"
Label label = new Label(gridField.getHeader());
Div div = new Div();
div.setAlign("center");
div.setStyle("text-align: center;");
row.appendCellChild(createSpacer());
div.appendChild(label);
row.appendCellChild(div);

14
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
View File

@ -155,7 +155,7 @@ public class WWFActivity extends ADForm implements EventListener<Event>
Row row = new Row();
rows.appendChild(row);
Div div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(lNode);
row.appendChild(div);
row.appendChild(fNode);
@ -166,7 +166,7 @@ public class WWFActivity extends ADForm implements EventListener<Event>
rows.appendChild(row);
row.setValign("top");
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(lDesctiption);
row.appendChild(div);
row.appendChild(fDescription);
@ -177,7 +177,7 @@ public class WWFActivity extends ADForm implements EventListener<Event>
row = new Row();
rows.appendChild(row);
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(lHelp);
row.appendChild(div);
row.appendChild(fHelp);
@ -190,7 +190,7 @@ public class WWFActivity extends ADForm implements EventListener<Event>
row = new Row();
rows.appendChild(row);
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(lHistory);
row.appendChild(div);
row.appendChild(fHistory);
@ -199,7 +199,7 @@ public class WWFActivity extends ADForm implements EventListener<Event>
row = new Row();
rows.appendChild(row);
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(lAnswer);
row.appendChild(div);
Hbox hbox = new Hbox();
@ -214,7 +214,7 @@ public class WWFActivity extends ADForm implements EventListener<Event>
row = new Row();
rows.appendChild(row);
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(lTextMsg);
row.appendChild(div);
row.appendChild(fTextMsg);
@ -225,7 +225,7 @@ public class WWFActivity extends ADForm implements EventListener<Event>
row = new Row();
rows.appendChild(row);
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(lForward);
row.appendChild(div);
hbox = new Hbox();

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/install/WTranslationDialog.java
View File

@ -125,7 +125,7 @@ public class WTranslationDialog extends TranslationController implements IFormCo
row.appendChild(cbTable);
Div div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(bExport);
row = rows.newRow();

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomizeGridViewPanel.java
View File

@ -240,7 +240,7 @@ public class CustomizeGridViewPanel extends Panel
south.setStyle("border: none; margin: none");
Panel southPanel = new Panel();
south.setHeight("35px");
southPanel.setAlign("Right");
south.setStyle("text-align: right;");
southPanel.setStyle("margin-top: 2px; margin-right: 4px");
@SuppressWarnings("unused")
String label = Msg.getMsg(Env.getCtx(), "save");

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java
View File

@ -213,11 +213,11 @@ public class InfoAssignmentPanel extends InfoPanel implements EventListener<Even
row.appendChild(fieldResourceType.getComponent());
row.appendChild(fieldResource.getComponent());
Div div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(fieldFrom);
row.appendChild(div);
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(fieldTo);
row.appendChild(div);
row.appendChild(bNew);

24
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java
View File

@ -226,29 +226,27 @@ public class InfoCashLinePanel extends InfoPanel implements ValueChangeListener,
row.appendChild(cbAbsolute);
row = new Row();
row.setSpans("1, 1, 1, 2");
rows.appendChild(row);
row.appendChild(fInvoice_ID.getLabel().rightAlign());
row.appendChild(fInvoice_ID.getComponent());
row.appendChild(lDateFrom.rightAlign());
row.appendCellChild(fInvoice_ID.getLabel().rightAlign(), 1);
row.appendCellChild(fInvoice_ID.getComponent(), 1);
row.appendCellChild(lDateFrom.rightAlign(), 1);
Hbox hbox = new Hbox();
hbox.appendChild(fDateFrom);
hbox.appendChild(lDateTo);
hbox.appendChild(fDateTo);
row.appendChild(hbox);
row.appendCellChild(hbox, 2);
rows.appendChild(row);
row = new Row();
row.setSpans("1, 1, 1, 2");
rows.appendChild(row);
row.appendChild(fBankAccount_ID.getLabel().rightAlign());
row.appendChild(fBankAccount_ID.getComponent());
row.appendChild(lAmtFrom.rightAlign());
row.appendCellChild(fBankAccount_ID.getLabel().rightAlign(), 1);
row.appendCellChild(fBankAccount_ID.getComponent(), 1);
row.appendCellChild(lAmtFrom.rightAlign(), 1);
hbox = new Hbox();
hbox.appendChild(fAmtFrom);
hbox.appendChild(lAmtTo);
hbox.appendChild(fAmtTo);
row.appendChild(hbox);
row.appendCellChild(hbox, 2);
rows.appendChild(row);
layout = new Borderlayout();
layout.setWidth("100%");
layout.setHeight("100%");

18
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java
View File

@ -205,23 +205,21 @@ public class InfoInOutPanel extends InfoPanel implements ValueChangeListener, Ev
row.appendChild(fIsSOTrx);
row = new Row();
row.setSpans("1, 1, 1, 2");
rows.appendChild(row);
row.appendChild(lDescription.rightAlign());
row.appendChild(fDescription);
row.appendChild(lDateFrom.rightAlign());
row.appendCellChild(lDescription.rightAlign(), 1);
row.appendCellChild(fDescription, 1);
row.appendCellChild(lDateFrom.rightAlign(), 1);
Hbox hbox = new Hbox();
hbox.appendChild(fDateFrom);
hbox.appendChild(lDateTo);
hbox.appendChild(fDateTo);
row.appendChild(hbox);
row.appendCellChild(hbox, 2);
rows.appendChild(row);
row = new Row();
row.setSpans("1, 1, 3");
row.appendCellChild(lPOReference.rightAlign(), 1);
row.appendCellChild(fPOReference, 1);
row.appendCellChild(new Label(), 3);
rows.appendChild(row);
row.appendChild(lPOReference.rightAlign());
row.appendChild(fPOReference);
row.appendChild(new Label());
layout = new Borderlayout();
layout.setWidth("100%");

22
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java
View File

@ -234,28 +234,26 @@ public class InfoInvoicePanel extends InfoPanel implements ValueChangeListener
row.appendChild(isPaid);
row = new Row();
row.setSpans("1, 1, 1, 3");
rows.appendChild(row);
row.appendChild(lblDescription.rightAlign());
row.appendChild(txtDescription);
row.appendChild(lblDateInvoiced.rightAlign());
row.appendCellChild(lblDescription.rightAlign(), 1);
row.appendCellChild(txtDescription, 1);
row.appendCellChild(lblDateInvoiced.rightAlign(), 1);
Hbox hbox = new Hbox();
hbox.appendChild(dateFrom);
hbox.appendChild(new Label("-"));
hbox.appendChild(dateTo);
row.appendChild(hbox);
row.appendCellChild(hbox, 3);
rows.appendChild(row);
row = new Row();
row.setSpans("1, 1, 1, 3");
rows.appendChild(row);
row.appendChild(editorOrder.getLabel().rightAlign());
row.appendChild(editorOrder.getComponent());
row.appendChild(lblGrandTotal.rightAlign());
row.appendCellChild(editorOrder.getLabel().rightAlign(), 1);
row.appendCellChild(editorOrder.getComponent(), 1);
row.appendCellChild(lblGrandTotal.rightAlign(), 1);
hbox = new Hbox();
hbox.appendChild(amountFrom);
hbox.appendChild(new Label("-"));
hbox.appendChild(amountTo);
row.appendChild(hbox);
row.appendCellChild(hbox, 3);
rows.appendChild(row);
layout = new Borderlayout();
layout.setWidth("100%");

22
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java
View File

@ -211,28 +211,26 @@ public class InfoOrderPanel extends InfoPanel implements ValueChangeListener
row.appendChild(isSoTrx);
row = new Row();
row.setSpans("1, 1, 1, 2");
rows.appendChild(row);
row.appendChild(lblDescription.rightAlign());
row.appendChild(txtDescription);
row.appendChild(lblDateOrdered.rightAlign());
row.appendCellChild(lblDescription.rightAlign(), 1);
row.appendCellChild(txtDescription, 1);
row.appendCellChild(lblDateOrdered.rightAlign(), 1);
Hbox hbox = new Hbox();
hbox.appendChild(dateFrom);
hbox.appendChild(new Label("-"));
hbox.appendChild(dateTo);
row.appendChild(hbox);
row.appendCellChild(hbox, 2);
rows.appendChild(row);
row = new Row();
row.setSpans("1, 1, 1, 2");
rows.appendChild(row);
row.appendChild(lblOrderRef.rightAlign());
row.appendChild(txtOrderRef);
row.appendChild(lblGrandTotal.rightAlign());
row.appendCellChild(lblOrderRef.rightAlign(), 1);
row.appendCellChild(txtOrderRef, 1);
row.appendCellChild(lblGrandTotal.rightAlign(), 1);
hbox = new Hbox();
hbox.appendChild(amountFrom);
hbox.appendChild(new Label("-"));
hbox.appendChild(amountTo);
row.appendChild(hbox);
row.appendCellChild(hbox, 2);
rows.appendChild(row);
layout = new Borderlayout();
layout.setWidth("100%");

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributeInstancePanel.java
View File

@ -129,7 +129,7 @@ public class InfoPAttributeInstancePanel extends Window implements EventListener
North north = new North();
borderlayout.appendChild(north);
Div div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(showAll);
north.appendChild(div);

29
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java
View File

@ -44,6 +44,7 @@ import org.compiere.util.Msg;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zul.Cell;
import org.zkoss.zul.Div;
import org.zkoss.zul.Separator;
import org.zkoss.zul.Textbox;
@ -176,7 +177,7 @@ public class InfoPAttributePanel extends Window implements EventListener<Event>
row = new Row();
rows.appendChild(row);
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(serNoLabel);
row.appendChild(div);
row.appendChild(serNoField.getComponent());
@ -187,7 +188,7 @@ public class InfoPAttributePanel extends Window implements EventListener<Event>
row = new Row();
rows.appendChild(row);
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(lotLabel);
row.appendChild(div);
row.appendChild(lotField.getComponent());
@ -196,7 +197,7 @@ public class InfoPAttributePanel extends Window implements EventListener<Event>
row = new Row();
rows.appendChild(row);
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(lotLabel2);
row.appendChild(div);
row.appendChild(lotSelection);
@ -206,7 +207,7 @@ public class InfoPAttributePanel extends Window implements EventListener<Event>
row = new Row();
rows.appendChild(row);
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(guaranteeDateSelection);
row.appendChild(div);
row.appendChild(guaranteeDateField);
@ -250,14 +251,18 @@ public class InfoPAttributePanel extends Window implements EventListener<Event>
{
Row row = new Row();
rows.appendChild(row);
row.setSpans("2");
Cell cell = new Cell();
cell.setColspan(2);
row.appendCellChild(cell);
Label group = new Label(Msg.translate(Env.getCtx(), "IsInstanceAttribute"));
row.appendChild(group);
rows.appendChild(row);
row = new Row();
rows.appendChild(row);
row.setSpans("2");
cell = new Cell();
cell.setColspan(2);
row.appendCellChild(cell);
Separator separator = new Separator();
separator.setBar(true);
row.appendChild(separator);
@ -275,7 +280,7 @@ public class InfoPAttributePanel extends Window implements EventListener<Event>
label.setTooltiptext(description);
Div div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(label);
row.appendChild(div);
@ -318,7 +323,7 @@ public class InfoPAttributePanel extends Window implements EventListener<Event>
row = new Row();
rows.appendChild(row);
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(new Label("-"));
row.appendChild(div);
row.appendChild(fieldTo);
@ -352,14 +357,18 @@ public class InfoPAttributePanel extends Window implements EventListener<Event>
if (isGuarantee || isSerial || isLot) {
Row row = new Row();
rows.appendChild(row);
row.setSpans("2");
Cell cell = new Cell();
cell.setColspan(2);
row.appendCellChild(cell);
Label group = new Label(Msg.translate(Env.getCtx(), "IsInstanceAttribute"));
row.appendChild(group);
rows.appendChild(row);
row = new Row();
rows.appendChild(row);
row.setSpans("2");
cell = new Cell();
cell.setColspan(2);
row.appendCellChild(cell);
Separator separator = new Separator();
separator.setBar(true);
row.appendChild(separator);

14
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java
View File

@ -212,24 +212,22 @@ public class InfoPaymentPanel extends InfoPanel implements ValueChangeListener,
row.appendChild(fIsReceipt);
row = new Row();
row.setSpans("3, 2");
rows.appendChild(row);
row.appendChild(lDateFrom.rightAlign());
row.appendCellChild(lDateFrom.rightAlign(), 3);
Hbox hbox = new Hbox();
hbox.appendChild(fDateFrom);
hbox.appendChild(lDateTo);
hbox.appendChild(fDateTo);
row.appendChild(hbox);
row.appendCellChild(hbox, 2);
rows.appendChild(row);
row = new Row();
row.setSpans("3, 2");
rows.appendChild(row);
row.appendChild(lAmtFrom.rightAlign());
row.appendCellChild(lAmtFrom.rightAlign(), 3);
hbox = new Hbox();
hbox.appendChild(fAmtFrom);
hbox.appendChild(lAmtTo);
hbox.appendChild(fAmtTo);
row.appendChild(hbox);
row.appendCellChild(hbox, 2);
rows.appendChild(row);
layout = new Borderlayout();
layout.setWidth("100%");

21
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java
View File

@ -80,6 +80,7 @@ import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Cell;
import org.zkoss.zul.Center;
import org.zkoss.zul.North;
import org.zkoss.zul.South;
@ -332,17 +333,17 @@ public class InfoProductPanel extends InfoPanel implements EventListener<Event>
row.appendChild(m_InfoPAttributeButton);
row = new Row();
row.setSpans("1, 1, 1, 1, 1, 1, 1, 2");
rows.appendChild(row);
row.appendChild(lblName.rightAlign());
row.appendChild(fieldName);
row.appendCellChild(lblName.rightAlign());
row.appendCellChild(fieldName);
fieldName.setHflex("1");
row.appendChild(lblSKU.rightAlign());
row.appendChild(fieldSKU);
row.appendCellChild(lblSKU.rightAlign());
row.appendCellChild(fieldSKU);
fieldSKU.setHflex("1");
row.appendChild(lblVendor.rightAlign());
row.appendChild(fieldVendor);
row.appendCellChild(lblVendor.rightAlign());
row.appendCellChild(fieldVendor);
rows.appendChild(row);
fieldVendor.setHflex("1");
//
row = new Row();
@ -357,7 +358,9 @@ public class InfoProductPanel extends InfoPanel implements EventListener<Event>
row = new Row();
rows.appendChild(row);
row.appendChild(statusBar);
row.setSpans("6");
Cell cell = new Cell();
cell.setColspan(6);
row.appendCellChild(cell);
statusBar.setEastVisibility(false);
statusBar.setWidth("100%");

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ExportAction.java
View File

@ -117,7 +117,7 @@ public class ExportAction implements EventListener<Event>
Hbox hb = new Hbox();
Div div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(new Label(Msg.getMsg(Env.getCtx(), "FilesOfType")));
hb.appendChild(div);
hb.appendChild(cboType);

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java
View File

@ -146,7 +146,7 @@ public class FileImportAction implements EventListener<Event>
Hbox hb = new Hbox();
Div div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(new Label(Msg.getMsg(Env.getCtx(), "FilesOfType")));
hb.appendChild(div);
hb.appendChild(cboType);

13
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
View File

@ -60,6 +60,7 @@ import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Cell;
import org.zkoss.zul.Center;
import org.zkoss.zul.North;
import org.zkoss.zul.South;
@ -224,15 +225,17 @@ public final class WAccountDialog extends Window
North nRegion = new North();
nRegion.setParent(layout);
nRegion.setFlex(false);
northPanel.setHflex("false");
northPanel.setVflex("false");
nRegion.appendChild(northPanel);
nRegion.setStyle("background-color: transparent; border: none");
northPanel.setStyle("background-color: transparent;");
Center cRegion = new Center();
cRegion.setParent(layout);
m_adTabPanel.setHflex("true");
m_adTabPanel.setVflex("true");
cRegion.appendChild(m_adTabPanel);
cRegion.setFlex(true);
South sRegion = new South();
sRegion.setParent(layout);
@ -424,8 +427,10 @@ public final class WAccountDialog extends Window
m_newRow = true;
Row row = new Row();
f_Description.setStyle("font-decoration: italic;");
row.appendChild(f_Description);
row.setSpans("4");
Cell cell = new Cell();
cell.setColspan(4);
cell.appendChild(f_Description);
row.appendChild(cell);
row.setStyle("background-color: transparent;");
m_rows.appendChild(row);

21
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java
View File

@ -170,8 +170,7 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
rows.appendChild(row);
row = new Row();
row.setSpans("1, 2");
row.appendChild(LayoutUtils.makeRightAlign(lDate));
row.appendCellChild(LayoutUtils.makeRightAlign(lDate), 1);
Div div = new Div();
div.setHflex("1");
div.appendChild(fDateFrom);
@ -179,7 +178,7 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
div.appendChild(fTimeFrom);
fTimeFrom.setCols(10);
fTimeFrom.setStyle("margin-left: 1px");
row.appendChild(div);
row.appendCellChild(div, 2);
rows.appendChild(row);
row = new Row();
@ -189,29 +188,25 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
rows.appendChild(row);
row = new Row();
row.setSpans("1, 2");
row.appendChild(LayoutUtils.makeRightAlign(lName));
row.appendChild(fName);
row.appendCellChild(LayoutUtils.makeRightAlign(lName), 1);
row.appendCellChild(fName, 2);
fName.setStyle("width: 100%");
rows.appendChild(row);
row = new Row();
row.setSpans("1, 2");
row.appendChild(LayoutUtils.makeRightAlign(lDescription));
row.appendChild(fDescription);
row.appendCellChild(LayoutUtils.makeRightAlign(lDescription), 1);
row.appendCellChild(fDescription, 2);
fDescription.setMultiline(true);
fDescription.setRows(3);
fDescription.setStyle("width: 100%");
rows.appendChild(row);
row = new Row();
row.setSpans("3");
row.appendChild(new Label(" "));
row.appendCellChild(new Label(" "), 3);
rows.appendChild(row);
row = new Row();
row.setSpans("3");
row.appendChild(confirmPanel);
row.appendCellChild(confirmPanel, 3);
rows.appendChild(row);
//
} // jbInit

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java
View File

@ -137,8 +137,9 @@ public class WChat extends Window implements EventListener<Event>, DialogEvents
//
Center center = new Center();
messageTree.setHflex("true");
messageTree.setVflex("true");
center.appendChild(messageTree);
center.setFlex(true);
center.setAutoscroll(true);
mainPanel.appendChild(center);
//

22
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
View File

@ -206,7 +206,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
Row row = new Row();
rows.appendChild(row);
Div div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(lFrom);
row.appendChild(div);
row.appendChild(fFrom);
@ -215,7 +215,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
row = new Row();
rows.appendChild(row);
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(lTo);
row.appendChild(div);
row.appendChild(fUser.getComponent());
@ -230,7 +230,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
row = new Row();
rows.appendChild(row);
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(lCc);
row.appendChild(div);
row.appendChild(fCcUser.getComponent());
@ -244,13 +244,12 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
row = new Row();
rows.appendChild(row);
row.setSpans("2");
row.appendChild(new Separator());
row.appendCellChild(new Separator(), 2);
row = new Row();
rows.appendChild(row);
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(lSubject);
row.appendChild(div);
row.appendChild(fSubject);
@ -258,13 +257,12 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
row = new Row();
rows.appendChild(row);
row.setSpans("2");
row.appendChild(new Separator());
row.appendCellChild(new Separator(), 2);
row = new Row();
rows.appendChild(row);
div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(lAttachment);
row.appendChild(div);
row.appendChild(fAttachment);
@ -272,8 +270,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
row = new Row();
rows.appendChild(row);
row.setSpans("2");
row.appendChild(fMessage);
row.appendCellChild(fMessage, 2);
fMessage.setHflex("1");
fMessage.setRows(10);
@ -285,10 +282,11 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
layout.setStyle("background-color: white; position: absolute; margin:0; border:0; padding:0");
Center center = new Center();
grid.setHflex("true");
grid.setVflex("true");
center.appendChild(grid);
layout.appendChild(center);
center.setStyle("background-color: white; border: 0");
center.setFlex(true);
South south = new South();
Div southDiv = new Div();

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java
View File

@ -138,12 +138,12 @@ public class WFieldRecordInfo extends Window implements EventListener<Event>
Center center = new Center();
center.setParent(layout);
center.setFlex(true);
if (showTable)
{
table.setHflex("true");
table.setVflex("true");
center.appendChild(table);
table.setWidth("100%");
table.setVflex(true);
}
//
South south = new South();

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
View File

@ -137,7 +137,8 @@ public class WImageDialog extends Window implements EventListener<Event>
parameterPanel.appendChild((fileButton));
Center center = new Center();
center.setFlex(true);
image.setHflex("true");
image.setVflex("true");
center.setParent(mainLayout);
center.appendChild(image);
center.setStyle("background-color: transparent");

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
View File

@ -171,7 +171,8 @@ public class WMediaDialog extends Window implements EventListener<Event>
Center centerPane = new Center();
centerPane.setAutoscroll(true);
centerPane.setFlex(true);
previewPanel.setHflex("true");
previewPanel.setVflex("true");
mainPanel.appendChild(centerPane);
centerPane.appendChild(previewPanel);

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java
View File

@ -205,7 +205,8 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
Center center = new Center();
center.setParent(mainLayout);
center.setFlex(true);
centerPanel.setHflex("true");
centerPanel.setVflex("true");
center.appendChild(centerPanel);
South south = new South();

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeInstance.java
View File

@ -145,7 +145,8 @@ public class WPAttributeInstance extends Window implements EventListener<Event>
// Center
Center center = new Center();
center.setParent(mainLayout);
center.setFlex(true);
m_table.setHflex("true");
m_table.setVflex("true");
center.appendChild(m_table);
// South

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java
View File

@ -208,11 +208,10 @@ public class WRecordAccessDialog extends Window implements EventListener<Event>
row = new Row();
rows.appendChild(row);
row.setSpans("7");
Div div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(confirmPanel);
row.appendChild(div);
row.appendCellChild(div, 7);
bUp.addEventListener(Events.ON_CLICK, this);
bDown.addEventListener(Events.ON_CLICK, this);

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java
View File

@ -154,9 +154,10 @@ public class WRecordInfo extends Window implements EventListener<Event>
Center center = new Center();
center.setParent(layout);
center.setFlex(true);
if (showTable)
{
table.setHflex("true");
table.setVflex("true");
North north = new North();
north.setParent(layout);
north.appendChild(div);
@ -167,6 +168,8 @@ public class WRecordInfo extends Window implements EventListener<Event>
}
else
{
div.setHflex("true");
div.setVflex("true");
center.appendChild(div);
}
//

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTask.java
View File

@ -173,8 +173,9 @@ public class WTask extends Window implements EventListener<Event>
Div div = new Div();
div.setStyle("width: 100%; height:100%; overflow: auto");
div.appendChild(info);
div.setHflex("true");
div.setVflex("true");
center.appendChild(div);
center.setFlex(true);
South south = new South();
layout.appendChild(south);

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java
View File

@ -82,9 +82,10 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
north.appendChild(toolbar);
Center center = new Center();
center.setFlex(true);
layout.appendChild(center);
iframe = new Iframe();
iframe.setHflex("true");
iframe.setVflex("true");
iframe.setId("reportFrame");
iframe.setHeight("100%");
iframe.setWidth("100%");

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
View File

@ -316,9 +316,10 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
north.appendChild(toolBar);
Center center = new Center();
center.setFlex(true);
layout.appendChild(center);
iframe = new Iframe();
iframe.setHflex("true");
iframe.setVflex("true");
iframe.setId("reportFrame");
center.appendChild(iframe);
@ -806,7 +807,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
Hbox hb = new Hbox();
Div div = new Div();
div.setAlign("right");
div.setStyle("text-align: right;");
div.appendChild(new Label(Msg.getMsg(Env.getCtx(), "FilesOfType")));
hb.appendChild(div);
hb.appendChild(cboType);