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

* New look and feel and theme selection UI. The old editor is still 

there but not used.
* Make compiere swing components works better under window and plastic
look and feel.
* Rename org.compiere.plaf.Adempiere*UI classes back to
org.compiere.plaf.Compiere*UI. This is to make a clean separation
between the new AdempiereLookAndFeel and the old CompiereLookAndFeel.
Any class used by AdempiereLookAndFeel should goes into the
org.adempiere.plaf package instead. As part of the exercise,
AdempierePLAF is moved from org.compiere.plaf to org.adempiere.plaf
* Fixed some bug related UI painting issue after switching of look and
feel. It is still not perfect but much better.
* Added a logout icon. Feel free to replace this if you have a better
one.

Please email me or post into the SF Developer forum is I break anything.
Also, I haven't tested the new code under Linux yet and some localization
work to be done.
This commit is contained in:
Heng Sin Low 2006-11-27 07:57:14 +00:00
parent 5b49fc0a01
commit 0092337fcb
62 changed files with 192 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -892,4 +892,24 @@ public final class AEnv
}
} // cacheReset
/**
* Update all windows after look and feel changes.
* @since 2006-11-27
*/
public static void updateUI()
{
Set<Window> updated = Env.updateUI();
JFrame top = Env.getWindow(0);
if (top instanceof AMenu)
{
CFrame[] frames = ((AMenu)top).getWindowManager().getWindows();
for (CFrame f : frames)
{
if (updated.contains(f)) continue;
SwingUtilities.updateComponentTreeUI(f);
updated.add(f);
}
}
}
} // AEnv

2
client/src/org/compiere/apps/AGlassPane.java
View File

@ -19,6 +19,8 @@ package org.compiere.apps;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.db.*;
import org.compiere.plaf.*;
import java.util.logging.*;

2
client/src/org/compiere/apps/ALogin.java
View File

@ -22,6 +22,8 @@ import java.sql.*;
import java.util.*;
import javax.swing.*;
import javax.swing.event.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.*;
import org.compiere.db.*;
import org.compiere.grid.ed.*;

1
client/src/org/compiere/apps/ALoginTest.java
View File

@ -23,6 +23,7 @@ import java.net.*;
import java.sql.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.plaf.*;
import org.compiere.swing.*;

2
client/src/org/compiere/apps/APanel.java
View File

@ -553,7 +553,7 @@ public final class APanel extends CPanel
else // normal tab
{
GridController gc = new GridController(); // Timing: ca. .1 sec
AdempiereColor cc = mWindow.getColor();
CompiereColor cc = mWindow.getColor();
if (cc != null)
gc.setBackgroundColor(cc); // set color on Window level
gc.initGrid(gTab, false, m_curWindowNo, this, mWindow); // will set color on Tab level

1
client/src/org/compiere/apps/ATask.java
View File

@ -21,6 +21,7 @@ import java.awt.event.*;
import java.util.logging.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.*;
import org.compiere.plaf.*;
import org.compiere.util.*;

3
client/src/org/compiere/apps/Attachment.java
View File

@ -21,10 +21,13 @@ import java.awt.event.*;
import java.io.*;
import java.util.logging.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.model.*;
import org.compiere.plaf.*;
import org.compiere.swing.*;
import org.compiere.util.*;
import com.qoppa.pdf.*;
import com.qoppa.pdfViewer.*;

1
client/src/org/compiere/apps/Help.java
View File

@ -22,6 +22,7 @@ import java.net.*;
import javax.swing.*;
import java.util.logging.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.model.*;
import org.compiere.plaf.*;
import org.compiere.swing.*;

2
client/src/org/compiere/apps/OnlineHelp.java
View File

@ -24,6 +24,8 @@ import javax.swing.*;
import javax.swing.event.*;
import javax.swing.text.*;
import javax.swing.text.html.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.plaf.*;
/**

61
client/src/org/compiere/apps/Preference.java
View File

@ -24,8 +24,13 @@ import java.util.logging.*;
import javax.swing.*;
import javax.swing.border.Border;
import javax.swing.event.*;
import javax.swing.plaf.metal.MetalLookAndFeel;
import javax.swing.plaf.metal.MetalTheme;
import javax.swing.table.*;
//
import org.adempiere.plaf.PLAFEditor;
import org.adempiere.plaf.PLAFEditorPanel;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.db.*;
import org.compiere.grid.ed.*;
import org.compiere.minigrid.*;
@ -40,6 +45,9 @@ import org.compiere.util.*;
*
* @author Jorg Janke
* @version $Id: Preference.java,v 1.2 2006/07/30 00:51:27 jjanke Exp $
*
* @author Low Heng Sin
* @version 2006-11-27
*/
public final class Preference extends CDialog
implements ActionListener, ListSelectionListener
@ -109,7 +117,6 @@ public final class Preference extends CDialog
private CCheckBox showAcct = new CCheckBox();
private CCheckBox showAdvanced = new CCheckBox();
private CCheckBox cacheWindow = new CCheckBox();
private CButton uiTheme = new CButton();
private CLabel lPrinter = new CLabel();
private CPrinter fPrinter = new CPrinter();
private CLabel lDate = new CLabel();
@ -129,6 +136,8 @@ public final class Preference extends CDialog
private CPanel configPanel = new CPanel();
private PLAFEditorPanel plafEditor = new PLAFEditorPanel();
/**
* Static Init.
* <pre>
@ -157,8 +166,6 @@ public final class Preference extends CDialog
traceFile.setText(Msg.getMsg(Env.getCtx(), "TraceFile", true));
traceFile.setToolTipText(Msg.getMsg(Env.getCtx(), "TraceFile", false));
uiTheme.setText(Msg.getMsg(Env.getCtx(), "UITheme", true));
uiTheme.setToolTipText(Msg.getMsg(Env.getCtx(), "UITheme", false));
autoCommit.setText(Msg.getMsg(Env.getCtx(), "AutoCommit", true));
autoCommit.setToolTipText(Msg.getMsg(Env.getCtx(), "AutoCommit", false));
autoNew.setText(Msg.getMsg(Env.getCtx(), "AutoNew", true));
@ -193,7 +200,6 @@ public final class Preference extends CDialog
panel.setLayout(panelLayout);
panel.add(tabPane, BorderLayout.CENTER);
// Customize
// tabPane.add(customizePane, Msg.getMsg(Env.getCtx(), "Preference"));
tabPane.add(customizePane, Msg.getMsg(Env.getCtx(), "Preference"));
customizePane.setLayout(customizeLayout);
customizePane.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
@ -273,9 +279,10 @@ public final class Preference extends CDialog
,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(2, 0, 2, 0), 0, 0));
CPanel themePanel = new CPanel();
themePanel.add(uiTheme);
//TODO
tabPane.add(themePanel, uiTheme.getText());
themePanel.setLayout(new GridLayout(1, 1));
themePanel.add(plafEditor);
tabPane.add(themePanel, Msg.getMsg(Env.getCtx(), "UITheme", true));
configPanel.setLayout(new BorderLayout());
configPanel.add(infoArea, BorderLayout.CENTER);
@ -287,7 +294,6 @@ public final class Preference extends CDialog
tabPane.add(configPanel, "Info");
// Info
// tabPane.add(contextPane, Msg.getMsg(Env.getCtx(), "Context"));
tabPane.add(contextPane, Msg.getMsg(Env.getCtx(), "Context"));
contextPane.setLayout(icontextLayout);
contextPane.add(contextListScrollPane, BorderLayout.CENTER);
@ -365,12 +371,7 @@ public final class Preference extends CDialog
*/
public void actionPerformed(ActionEvent e)
{
// UI Change
if (e.getSource() == uiTheme)
{
new AdempierePLAFEditor(this, false);
}
else if (e.getActionCommand().equals(ConfirmPanel.A_CANCEL))
if (e.getActionCommand().equals(ConfirmPanel.A_CANCEL))
dispose();
else if (e.getActionCommand().equals(ConfirmPanel.A_OK))
cmd_save();
@ -399,8 +400,6 @@ public final class Preference extends CDialog
infoArea.setCaretPosition(0);
// -- Load Settings --
// UI
uiTheme.addActionListener(this);
// AutoCommit
autoCommit.setSelected(Env.isAutoCommit(Env.getCtx()));
autoNew.setSelected(Env.isAutoNew(Env.getCtx()));
@ -539,6 +538,36 @@ public final class Preference extends CDialog
if (ts != null)
Env.setContext(Env.getCtx(), "#Date", ts);
//UI
ValueNamePair laf = plafEditor.getSelectedLook();
ValueNamePair theme = plafEditor.getSelectedTheme();
if ( laf != null ) {
String clazz = laf.getValue();
String currentLaf = UIManager.getLookAndFeel().getClass().getName();
if (clazz != null && clazz.length() > 0 && !currentLaf.equals(clazz))
{
//laf changed
AdempierePLAF.setPLAF(laf, theme, true);
AEnv.updateUI();
}
else
{
if (UIManager.getLookAndFeel() instanceof MetalLookAndFeel)
{
MetalTheme currentTheme = MetalLookAndFeel.getCurrentTheme();
String themeClass = currentTheme.getClass().getName();
String sTheme = theme.getValue();
if (sTheme != null && sTheme.length() > 0 && !sTheme.equals(themeClass))
{
ValueNamePair plaf = new ValueNamePair(UIManager.getLookAndFeel().getName(),
UIManager.getLookAndFeel().getClass().getName());
AdempierePLAF.setPLAF(plaf, theme, true);
AEnv.updateUI();
}
}
}
}
Ini.saveProperties(Ini.isClient());
dispose();
} // cmd_save

2
client/src/org/compiere/apps/ProcessDialog.java
View File

@ -21,6 +21,8 @@ import java.awt.event.*;
import java.sql.*;
import java.util.logging.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.plaf.*;
import org.compiere.print.*;
import org.compiere.process.*;

2
client/src/org/compiere/apps/StatusBar.java
View File

@ -19,6 +19,8 @@ package org.compiere.apps;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.model.*;
import org.compiere.plaf.*;
import org.compiere.swing.*;

4
client/src/org/compiere/apps/form/VAllocation.java
View File

@ -27,6 +27,8 @@ import java.util.logging.*;
import javax.swing.*;
import javax.swing.event.*;
import javax.swing.table.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.grid.ed.*;
import org.compiere.minigrid.*;
@ -135,7 +137,7 @@ public class VAllocation extends CPanel
*/
private void jbInit() throws Exception
{
AdempiereColor.setBackground(this);
CompiereColor.setBackground(this);
//
mainPanel.setLayout(mainLayout);
dateLabel.setText(Msg.getMsg(Env.getCtx(), "Date"));

4
client/src/org/compiere/apps/form/VCharge.java
View File

@ -24,6 +24,8 @@ import java.util.logging.*;
import javax.swing.*;
import javax.swing.border.*;
import javax.swing.table.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.minigrid.*;
import org.compiere.model.*;
@ -109,7 +111,7 @@ public class VCharge extends CPanel
*/
private void jbInit() throws Exception
{
AdempiereColor.setBackground(this);
CompiereColor.setBackground(this);
newBorder = new TitledBorder("");
accountBorder = new TitledBorder("");
mainPanel.setLayout(mainLayout);

2
client/src/org/compiere/apps/form/VFileImport.java
View File

@ -101,7 +101,7 @@ public class VFileImport extends CPanel
*/
private void jbInit() throws Exception
{
AdempiereColor.setBackground(this);
CompiereColor.setBackground(this);
bFile.setText(Msg.getMsg(Env.getCtx(), "FileImportFile"));
bFile.setToolTipText(Msg.getMsg(Env.getCtx(), "FileImportFileInfo"));
bFile.addActionListener(this);

4
client/src/org/compiere/apps/form/VInOutGen.java
View File

@ -25,6 +25,8 @@ import java.util.*;
import java.util.logging.*;
import javax.swing.*;
import javax.swing.event.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.grid.ed.*;
import org.compiere.minigrid.*;
@ -113,7 +115,7 @@ public class VInOutGen extends CPanel
*/
void jbInit() throws Exception
{
AdempiereColor.setBackground(this);
CompiereColor.setBackground(this);
//
selPanel.setLayout(selPanelLayout);
lWarehouse.setLabelFor(fWarehouse);

4
client/src/org/compiere/apps/form/VInvoiceGen.java
View File

@ -25,6 +25,8 @@ import java.util.*;
import java.util.logging.*;
import javax.swing.*;
import javax.swing.event.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.grid.ed.*;
import org.compiere.minigrid.*;
@ -112,7 +114,7 @@ public class VInvoiceGen extends CPanel
*/
void jbInit() throws Exception
{
AdempiereColor.setBackground(this);
CompiereColor.setBackground(this);
//
selPanel.setLayout(selPanelLayout);
lOrg.setLabelFor(fOrg);

2
client/src/org/compiere/apps/form/VMatch.java
View File

@ -289,7 +289,7 @@ public class VMatch extends CPanel
xMatchedToTable.prepareTable(layout, "", "", true, "");
// Visual
AdempiereColor.setBackground (this);
CompiereColor.setBackground (this);
// Listener
matchFrom.addActionListener(this);

2
client/src/org/compiere/apps/form/VPayPrint.java
View File

@ -105,7 +105,7 @@ public class VPayPrint extends CPanel
*/
private void jbInit() throws Exception
{
AdempiereColor.setBackground(this);
CompiereColor.setBackground(this);
//
southPanel.setLayout(southLayout);
southLayout.setAlignment(FlowLayout.RIGHT);

2
client/src/org/compiere/apps/form/VPaySelect.java
View File

@ -125,7 +125,7 @@ public class VPaySelect extends CPanel
*/
private void jbInit() throws Exception
{
AdempiereColor.setBackground(this);
CompiereColor.setBackground(this);
//
mainPanel.setLayout(mainLayout);
parameterPanel.setLayout(parameterLayout);

4
client/src/org/compiere/apps/form/VSetup.java
View File

@ -22,6 +22,8 @@ import java.io.*;
import java.sql.*;
import java.util.logging.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.model.*;
import org.compiere.plaf.*;
@ -106,7 +108,7 @@ public class VSetup extends CPanel
*/
private void jbInit() throws Exception
{
AdempiereColor.setBackground(this);
CompiereColor.setBackground(this);
centerPanel.setLayout(centerLayout);
String optional = Msg.translate(Env.getCtx(), "Optional");
//

2
client/src/org/compiere/apps/form/VTrxMaterial.java
View File

@ -109,7 +109,7 @@ public class VTrxMaterial extends CPanel
*/
void jbInit() throws Exception
{
AdempiereColor.setBackground(this);
CompiereColor.setBackground(this);
mainPanel.setLayout(mainLayout);
mainLayout.setVgap(10);
parameterPanel.setLayout(parameterLayout);

2
client/src/org/compiere/apps/search/FindValueRenderer.java
View File

@ -20,6 +20,8 @@ import java.awt.*;
import java.sql.*;
import javax.swing.*;
import javax.swing.table.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.model.*;
import org.compiere.plaf.*;
import java.util.logging.*;

2
client/src/org/compiere/apps/search/InfoAsset.java
View File

@ -18,6 +18,8 @@ package org.compiere.apps.search;
import java.awt.*;
import java.sql.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.grid.ed.*;
import org.compiere.minigrid.*;

2
client/src/org/compiere/apps/search/InfoBPartner.java
View File

@ -20,6 +20,8 @@ import java.awt.*;
import java.math.*;
import java.sql.*;
import java.util.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.grid.ed.*;
import org.compiere.minigrid.*;

2
client/src/org/compiere/apps/search/InfoCashLine.java
View File

@ -20,6 +20,8 @@ import java.awt.*;
import java.math.*;
import java.sql.*;
import java.util.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.grid.ed.*;
import org.compiere.minigrid.*;

2
client/src/org/compiere/apps/search/InfoGeneral.java
View File

@ -22,6 +22,8 @@ import java.sql.*;
import java.util.*;
import java.util.logging.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.minigrid.*;
import org.compiere.plaf.*;

2
client/src/org/compiere/apps/search/InfoInOut.java
View File

@ -19,6 +19,8 @@ package org.compiere.apps.search;
import java.awt.*;
import java.sql.*;
import java.util.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.grid.ed.*;
import org.compiere.minigrid.*;

2
client/src/org/compiere/apps/search/InfoInvoice.java
View File

@ -20,6 +20,8 @@ import java.awt.*;
import java.math.*;
import java.sql.*;
import java.util.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.grid.ed.*;
import org.compiere.minigrid.*;

2
client/src/org/compiere/apps/search/InfoOrder.java
View File

@ -20,6 +20,8 @@ import java.awt.*;
import java.math.*;
import java.sql.*;
import java.util.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.grid.ed.*;
import org.compiere.minigrid.*;

2
client/src/org/compiere/apps/search/InfoPayment.java
View File

@ -20,6 +20,8 @@ import java.awt.*;
import java.math.*;
import java.sql.*;
import java.util.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.grid.ed.*;
import org.compiere.minigrid.*;

1
client/src/org/compiere/apps/search/InfoProduct.java
View File

@ -23,6 +23,7 @@ import java.sql.*;
import java.util.*;
import java.util.logging.*;
//
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.grid.ed.*;
import org.compiere.minigrid.*;

2
client/src/org/compiere/apps/search/VSchedulePanel.java
View File

@ -247,7 +247,7 @@ public class VSchedulePanel extends JComponent implements MouseListener
if (!where.intersects(clipBounds))
continue;
// Header Background
AdempiereUtils.paint3Deffect(g2D, where, false, true);
CompiereUtils.paint3Deffect(g2D, where, false, true);
g2D.setPaint(Color.blue);
TextLayout layout = new TextLayout (getHeading(i), g2D.getFont(), g2D.getFontRenderContext());
float hh = layout.getAscent() + layout.getDescent();

2
client/src/org/compiere/apps/search/VScheduleTimePanel.java
View File

@ -241,7 +241,7 @@ public class VScheduleTimePanel extends JComponent
// Header Background
Rectangle where = new Rectangle(0, 0, w, getHeaderHeight());
AdempiereUtils.paint3Deffect(g2D, where, false, true);
CompiereUtils.paint3Deffect(g2D, where, false, true);
// heading
TextLayout layout = null;

4
client/src/org/compiere/apps/wf/WFPanel.java
View File

@ -22,6 +22,8 @@ import java.beans.*;
import java.util.*;
import java.util.logging.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.apps.form.*;
import org.compiere.model.*;
@ -122,7 +124,7 @@ public class WFPanel extends CPanel
private void jbInit() throws Exception
{
this.setLayout(mainLayout);
AdempiereColor.setBackground(this);
CompiereColor.setBackground(this);
southPanel.setLayout(southLayout);
// Center
this.add(new JScrollPane(centerPanel), BorderLayout.CENTER);

2
client/src/org/compiere/grid/VCreateFromShipment.java
View File

@ -23,6 +23,8 @@ import java.sql.*;
import java.util.*;
import java.util.logging.*;
import javax.swing.table.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.grid.ed.*;
import org.compiere.model.*;
import org.compiere.plaf.*;

2
client/src/org/compiere/grid/VPayment.java
View File

@ -24,6 +24,8 @@ import java.text.*;
import java.util.*;
import java.util.logging.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.grid.ed.*;
import org.compiere.model.*;

2
client/src/org/compiere/grid/ed/Calendar.java
View File

@ -24,6 +24,8 @@ import java.util.*;
import java.util.logging.*;
import javax.swing.*;
import javax.swing.event.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.plaf.*;
import org.compiere.swing.*;
import org.compiere.util.*;

2
client/src/org/compiere/grid/ed/Editor.java
View File

@ -21,6 +21,8 @@ import java.awt.event.*;
import java.io.*;
import javax.swing.*;
import javax.swing.event.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.plaf.*;
import org.compiere.swing.*;

2
client/src/org/compiere/grid/ed/VAccount.java
View File

@ -21,6 +21,8 @@ import java.awt.event.*;
import java.beans.*;
import java.sql.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.model.*;
import org.compiere.plaf.*;
import org.compiere.swing.*;

2
client/src/org/compiere/grid/ed/VAssignment.java
View File

@ -22,6 +22,8 @@ import java.beans.*;
import java.sql.*;
import java.text.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.search.*;
import org.compiere.model.*;
import org.compiere.plaf.*;

2
client/src/org/compiere/grid/ed/VBPartner.java
View File

@ -20,6 +20,8 @@ import java.awt.*;
import java.awt.event.*;
import java.util.logging.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.model.*;
import org.compiere.plaf.*;

2
client/src/org/compiere/grid/ed/VCellEditor.java
View File

@ -22,6 +22,8 @@ import java.beans.*;
import java.util.*;
import javax.swing.*;
import javax.swing.table.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.model.*;
import org.compiere.plaf.*;
import org.compiere.util.*;

3
client/src/org/compiere/grid/ed/VCellRenderer.java
View File

@ -20,11 +20,14 @@ import java.awt.*;
import java.text.*;
import javax.swing.*;
import javax.swing.table.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.graph.*;
import org.compiere.model.*;
import org.compiere.plaf.*;
import java.util.logging.*;
import org.compiere.util.*;
import sun.security.krb5.internal.*;
/**

28
client/src/org/compiere/grid/ed/VColor.java
View File

@ -23,6 +23,8 @@ import java.math.*;
import java.sql.*;
import java.util.logging.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.model.*;
import org.compiere.plaf.*;
import org.compiere.swing.*;
@ -63,7 +65,7 @@ public class VColor extends CButton
private GridTab m_mTab;
private boolean m_mandatory;
// private int m_AD_Color_ID = 0;
private AdempiereColor m_cc = null;
private CompiereColor m_cc = null;
private Object m_value;
/** Logger */
private static CLogger log = CLogger.getCLogger(VColor.class);
@ -111,7 +113,7 @@ public class VColor extends CButton
else
{
setOpaque(false);
putClientProperty(AdempierePLAF.BACKGROUND, null);
putClientProperty(CompiereLookAndFeel.BACKGROUND, null);
}
repaint();
} // setValue
@ -166,11 +168,11 @@ public class VColor extends CButton
* @return true if loaded
* @see org.compiere.model.MColor#getAdempiereColor
*/
private AdempiereColor getAdempiereColor()
private CompiereColor getAdempiereColor()
{
Integer AD_Color_ID = (Integer)m_mTab.getValue("AD_Color_ID");
log.fine("AD_Color_ID=" + AD_Color_ID);
AdempiereColor cc = null;
CompiereColor cc = null;
// Color Type
String ColorType = (String)m_mTab.getValue("ColorType");
@ -180,27 +182,27 @@ public class VColor extends CButton
return null;
}
//
if (ColorType.equals(AdempiereColor.TYPE_FLAT))
if (ColorType.equals(CompiereColor.TYPE_FLAT))
{
cc = new AdempiereColor(getColor(true), true);
cc = new CompiereColor(getColor(true), true);
}
else if (ColorType.equals(AdempiereColor.TYPE_GRADIENT))
else if (ColorType.equals(CompiereColor.TYPE_GRADIENT))
{
Integer RepeatDistance = (Integer)m_mTab.getValue("RepeatDistance");
String StartPoint = (String)m_mTab.getValue("StartPoint");
int repeatDistance = RepeatDistance == null ? 0 : RepeatDistance.intValue();
int startPoint = StartPoint == null ? 0 : Integer.parseInt(StartPoint);
cc = new AdempiereColor(getColor(true), getColor(false), startPoint, repeatDistance);
cc = new CompiereColor(getColor(true), getColor(false), startPoint, repeatDistance);
}
else if (ColorType.equals(AdempiereColor.TYPE_LINES))
else if (ColorType.equals(CompiereColor.TYPE_LINES))
{
BigDecimal LineWidth = (BigDecimal)m_mTab.getValue("LineWidth");
BigDecimal LineDistance = (BigDecimal)m_mTab.getValue("LineDistance");
int lineWidth = LineWidth == null ? 0 : LineWidth.intValue();
int lineDistance = LineDistance == null ? 0 : LineDistance.intValue();
cc = new AdempiereColor(getColor(false), getColor(true), lineWidth, lineDistance);
cc = new CompiereColor(getColor(false), getColor(true), lineWidth, lineDistance);
}
else if (ColorType.equals(AdempiereColor.TYPE_TEXTURE))
else if (ColorType.equals(CompiereColor.TYPE_TEXTURE))
{
Integer AD_Image_ID = (Integer)m_mTab.getValue("AD_Image_ID");
String url = getURL(AD_Image_ID);
@ -208,7 +210,7 @@ public class VColor extends CButton
return null;
BigDecimal ImageAlpha = (BigDecimal)m_mTab.getValue("ImageAlpha");
float compositeAlpha = ImageAlpha == null ? 0.7f : ImageAlpha.floatValue();
cc = new AdempiereColor(url, getColor(true), compositeAlpha);
cc = new CompiereColor(url, getColor(true), compositeAlpha);
}
else
return null;
@ -277,7 +279,7 @@ public class VColor extends CButton
public void actionPerformed (ActionEvent e)
{
// Show Dialog
AdempiereColor cc = AdempiereColorEditor.showDialog((JFrame)Env.getParent(this), m_cc);
CompiereColor cc = ColorEditor.showDialog((JFrame)Env.getParent(this), m_cc);
if (cc == null)
{
log.info( "VColor.actionPerformed - no color");

2
client/src/org/compiere/grid/ed/VDate.java
View File

@ -24,6 +24,8 @@ import java.text.*;
import java.util.logging.*;
import javax.swing.*;
import javax.swing.text.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.model.*;
import org.compiere.plaf.*;

2
client/src/org/compiere/grid/ed/VDocAction.java
View File

@ -22,6 +22,8 @@ import java.sql.*;
import java.util.*;
import java.util.logging.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.model.*;
import org.compiere.plaf.*;

1
client/src/org/compiere/grid/ed/VFile.java
View File

@ -23,6 +23,7 @@ import java.io.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.plaf.*;
import org.compiere.swing.*;
import org.compiere.util.*;

2
client/src/org/compiere/grid/ed/VLine.java
View File

@ -18,6 +18,8 @@ package org.compiere.grid.ed;
import java.awt.*;
import javax.swing.border.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.plaf.*;
import org.compiere.util.*;

2
client/src/org/compiere/grid/ed/VLocation.java
View File

@ -20,6 +20,8 @@ import java.awt.*;
import java.awt.event.*;
import java.beans.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.model.*;
import org.compiere.plaf.*;
import org.compiere.swing.*;

2
client/src/org/compiere/grid/ed/VLocator.java
View File

@ -22,6 +22,8 @@ import java.beans.*;
import java.sql.*;
import java.util.logging.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.model.*;
import org.compiere.plaf.*;

2
client/src/org/compiere/grid/ed/VLocatorDialog.java
View File

@ -21,6 +21,8 @@ import java.awt.event.*;
import java.sql.*;
import java.util.logging.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.model.*;
import org.compiere.plaf.*;

2
client/src/org/compiere/grid/ed/VMemo.java
View File

@ -20,6 +20,8 @@ import java.awt.*;
import java.awt.event.*;
import java.beans.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.plaf.*;
import org.compiere.swing.*;

2
client/src/org/compiere/grid/ed/VPAttribute.java
View File

@ -21,6 +21,8 @@ import java.awt.event.*;
import java.beans.*;
import java.util.logging.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.model.*;
import org.compiere.plaf.*;
import org.compiere.swing.*;

1
client/src/org/compiere/grid/ed/VPassword.java
View File

@ -19,6 +19,7 @@ package org.compiere.grid.ed;
import java.awt.event.*;
import java.beans.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.plaf.*;
import org.compiere.swing.*;
import org.compiere.model.*;

2
client/src/org/compiere/grid/ed/VString.java
View File

@ -20,6 +20,8 @@ import java.awt.*;
import java.awt.event.*;
import java.beans.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.model.*;
import org.compiere.plaf.*;
import org.compiere.swing.*;

2
client/src/org/compiere/grid/ed/VText.java
View File

@ -20,6 +20,8 @@ import java.awt.*;
import java.awt.event.*;
import java.beans.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.plaf.*;
import org.compiere.swing.*;

2
client/src/org/compiere/grid/ed/VTextLong.java
View File

@ -20,6 +20,8 @@ import java.awt.*;
import java.awt.event.*;
import java.beans.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.plaf.*;
import org.compiere.swing.*;
import org.compiere.util.*;

2
client/src/org/compiere/grid/ed/VURL.java
View File

@ -21,6 +21,8 @@ import java.awt.event.*;
import java.beans.*;
import java.net.*;
import javax.swing.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.model.*;
import org.compiere.plaf.*;

5
client/src/org/compiere/grid/tree/VTreePanel.java
View File

@ -30,6 +30,8 @@ import javax.swing.*;
import javax.swing.plaf.SplitPaneUI;
import javax.swing.plaf.basic.BasicSplitPaneUI;
import javax.swing.tree.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.apps.*;
import org.compiere.model.*;
import org.compiere.plaf.*;
@ -230,6 +232,8 @@ public final class VTreePanel extends CPanel
southPanel.add(treeSearch, BorderLayout.EAST);
this.add(southPanel, BorderLayout.SOUTH);
//
centerSplitPane.setOpaque(false);
toolbar.setOpaque(false);
centerSplitPane.add(treePane, JSplitPane.RIGHT);
centerSplitPane.add(bar, JSplitPane.LEFT);
centerSplitPane.setBorder(BorderFactory.createEmptyBorder());
@ -871,6 +875,7 @@ public final class VTreePanel extends CPanel
// label = label.substring(0, space);
CButton button = new CButton(label);
button.setOpaque(false);
button.setHorizontalAlignment(JButton.LEFT);
button.setToolTipText(nd.getDescription());
button.setActionCommand(String.valueOf(nd.getNode_ID()));

BIN
client/src/org/compiere/images/Logout16.GIF Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 961 B

1
client/src/org/compiere/minigrid/CheckRenderer.java
View File

@ -20,6 +20,7 @@ import javax.swing.*;
import javax.swing.table.*;
import java.awt.*;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.plaf.*;
/**