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

* [ 2158633 ] CommitWarning in ad_tab is ignore 

* AboutWindow layout not correct for 3.5.1
This commit is contained in:
Heng Sin Low 2008-10-13 07:41:55 +00:00
parent 46c533d762
commit c6d2cdea7c
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zkwebui/WEB-INF/src/org/adempiere/webui/Desktop.java
View File

@ -917,9 +917,9 @@ public class Desktop extends AbstractUIPart implements MenuListener, Serializabl
public void showWindow(Window win, String pos) public void showWindow(Window win, String pos)
{ {
win.setPage(page); win.setPage(page);
Object objMode = win.getAttribute("mode"); Object objMode = win.getAttribute(Window.MODE_KEY);
String mode = "modal"; String mode = Window.MODE_MODAL;
if (objMode != null) if (objMode != null)
{ {

4
zkwebui/WEB-INF/src/org/adempiere/webui/component/Messagebox.java
View File

@ -224,13 +224,13 @@ public class Messagebox extends Window implements EventListener
this.setWidth("500px"); this.setWidth("500px");
this.setPosition("center"); this.setPosition("center");
this.setClosable(true); this.setClosable(true);
this.setAttribute("mode", "modal"); this.setAttribute(Window.MODE_KEY, Window.MODE_MODAL);
this.setSizable(true); this.setSizable(true);
} }
else else
{ {
this.setTitle(title); this.setTitle(title);
this.setAttribute("mode", "overlapped"); this.setAttribute(Window.MODE_KEY, Window.MODE_OVERLAPPED);
this.setWidth("500px"); this.setWidth("500px");
this.setClosable(true); this.setClosable(true);
this.setSizable(true); this.setSizable(true);

10
zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
View File

@ -548,7 +548,8 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To
if (curTab.needSave(true, true)) if (curTab.needSave(true, true))
{ {
// Automatic Save // Automatic Save
if (Env.isAutoCommit(ctx, curWindowNo)) if (Env.isAutoCommit(ctx, curWindowNo)
&& (curTab.getCommitWarning() == null || curTab.getCommitWarning().trim().length() == 0))
{ {
if (!curTab.dataSave(true)) if (!curTab.dataSave(true))
{ {
@ -922,6 +923,13 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To
} }
else else
{ {
if (curTab.getCommitWarning() != null && curTab.getCommitWarning().trim().length() > 0)
{
if (!FDialog.ask(curWindowNo, this.getComponent(), "SaveChanges?", curTab.getCommitWarning()))
{
return;
}
}
boolean retValue = curTab.dataSave(true); boolean retValue = curTab.dataSave(true);
if (!retValue) if (!retValue)

10
zkwebui/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
View File

@ -84,14 +84,14 @@ public class AboutWindow extends Window implements EventListener {
tabbox = new Tabbox(); tabbox = new Tabbox();
tabbox.setParent(layout); tabbox.setParent(layout);
tabbox.setWidth("490px"); tabbox.setWidth("480px");
tabbox.setHeight("380px"); tabbox.setHeight("380px");
// tabbox.setSclass("lite"); // tabbox.setSclass("lite");
Tabs tabs = new Tabs(); Tabs tabs = new Tabs();
tabs.setParent(tabbox); tabs.setParent(tabbox);
tabPanels = new Tabpanels(); tabPanels = new Tabpanels();
tabPanels.setParent(tabbox); tabPanels.setParent(tabbox);
tabPanels.setWidth("490px"); tabPanels.setWidth("480px");
//about //about
Tab tab = new Tab(); Tab tab = new Tab();
@ -363,13 +363,13 @@ public class AboutWindow extends Window implements EventListener {
int width = Integer.parseInt(event.getWidth().substring(0, event.getWidth().length() - 2)); int width = Integer.parseInt(event.getWidth().substring(0, event.getWidth().length() - 2));
int height = Integer.parseInt(event.getHeight().substring(0, event.getHeight().length() - 2)); int height = Integer.parseInt(event.getHeight().substring(0, event.getHeight().length() - 2));
tabbox.setWidth((width - 10) + "px"); tabbox.setWidth((width - 20) + "px");
tabbox.setHeight((height - 70) + "px"); tabbox.setHeight((height - 70) + "px");
tabPanels.setWidth((width - 10) + "px"); tabPanels.setWidth((width - 20) + "px");
logTable.setHeight((height - 140) + "px"); logTable.setHeight((height - 140) + "px");
logTable.setWidth((width - 20) + "px"); logTable.setWidth((width - 30) + "px");
} }
private void downloadLog() { private void downloadLog() {