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

* minor UI facelift 

* commited teo_sarca patch for bug [ 1628773 ] with some minor adjustment
This commit is contained in:
Heng Sin Low 2007-01-15 03:11:19 +00:00
parent b652ec819e
commit b808820bc3
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@ import java.util.*;
import java.util.logging.*; import java.util.logging.*;
import javax.swing.*; import javax.swing.*;
import org.compiere.db.*; import org.compiere.db.*;
import org.compiere.grid.ed.Calculator;
import org.compiere.interfaces.*; import org.compiere.interfaces.*;
import org.compiere.model.*; import org.compiere.model.*;
import org.compiere.swing.*; import org.compiere.swing.*;
@ -363,7 +364,9 @@ public final class AEnv
// Tools Menu ------------------------ // Tools Menu ------------------------
else if (actionCommand.equals("Calculator")) else if (actionCommand.equals("Calculator"))
{ {
AEnv.showCenterScreen (new org.compiere.grid.ed.Calculator(Env.getFrame(c))); Calculator calc = new org.compiere.grid.ed.Calculator(Env.getFrame(c));
calc.setDisposeOnEqual(false);
AEnv.showCenterScreen (calc);
} }
else if (actionCommand.equals("Calendar")) else if (actionCommand.equals("Calendar"))
{ {

30
client/src/org/compiere/grid/ed/Calculator.java
View File

@ -25,6 +25,7 @@ import java.util.*;
import java.util.logging.*; import java.util.logging.*;
import javax.swing.*; import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.swing.*; import org.compiere.swing.*;
import org.compiere.apps.*; import org.compiere.apps.*;
import org.compiere.model.*; import org.compiere.model.*;
@ -104,6 +105,7 @@ public final class Calculator extends CDialog
private int m_WindowNo; private int m_WindowNo;
private boolean m_abort = true; private boolean m_abort = true;
private boolean m_currencyOK = false; private boolean m_currencyOK = false;
private boolean p_disposeOnEqual = true; //teo_sarca, bug[ 1628773 ]
private final static String OPERANDS = "/*-+%"; private final static String OPERANDS = "/*-+%";
private char m_decimal = '.'; private char m_decimal = '.';
@ -156,13 +158,17 @@ public final class Calculator extends CDialog
keyPanel.setLayout(keyLayout); keyPanel.setLayout(keyLayout);
mainLayout.setHgap(2); mainLayout.setHgap(2);
mainLayout.setVgap(2); mainLayout.setVgap(2);
mainPanel.setBorder(BorderFactory.createLoweredBevelBorder()); mainPanel.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
mainPanel.addKeyListener(this); mainPanel.addKeyListener(this);
display.setBackground(Color.white); display.setBackground(Color.white);
display.setFont(new java.awt.Font("SansSerif", 0, 14)); display.setFont(new java.awt.Font("SansSerif", 0, 14));
display.setBorder(BorderFactory.createLoweredBevelBorder()); display.setBorder(BorderFactory.createCompoundBorder(
BorderFactory.createEmptyBorder(2, 0, 2, 1),
BorderFactory.createLineBorder(AdempierePLAF.getPrimary1())));
display.setText("0"); display.setText("0");
display.setHorizontalAlignment(SwingConstants.RIGHT); display.setHorizontalAlignment(SwingConstants.RIGHT);
b7.setText("7"); b7.setText("7");
b8.setText("8"); b8.setText("8");
b9.setText("9"); b9.setText("9");
@ -266,8 +272,11 @@ public final class Calculator extends CDialog
m_decimal = m_format.getDecimalFormatSymbols().getDecimalSeparator(); m_decimal = m_format.getDecimalFormatSymbols().getDecimalSeparator();
// display start number // display start number
m_display = m_format.format(m_number); if (m_number.doubleValue() > 0.00 )
display.setText(m_display); {
m_display = m_format.format(m_number);
display.setText(m_display);
}
} // finishSetup } // finishSetup
/** /**
@ -362,7 +371,8 @@ public final class Calculator extends CDialog
case '=': case '=':
m_display = m_format.format(evaluate()); m_display = m_format.format(evaluate());
m_abort = false; m_abort = false;
dispose(); if (isDisposeOnEqual()) //teo_sarca, bug [ 1628773 ]
dispose();
break; break;
// Error =============================== // Error ===============================
@ -578,6 +588,16 @@ public final class Calculator extends CDialog
return m_number; return m_number;
} // getNumber } // getNumber
public boolean isDisposeOnEqual()
{
return p_disposeOnEqual;
}
public void setDisposeOnEqual(boolean b)
{
p_disposeOnEqual = b;
}
/*************************************************************************/ /*************************************************************************/