From 187a1f25b1e956703b24533f63fe43868331f3cf Mon Sep 17 00:00:00 2001 From: Garnica1999 Date: Fri, 30 Mar 2018 21:08:42 -0500 Subject: [PATCH] Actualizacion ExperienceUI Se han corregido el color de seleccion de los siguientes componentes: -JTable -JList Ademas, se ha corregido el color de fuente al seleccionar un JComboBox. Tambien se ha corrregido el error de renderizacion sobre JTable, ya que motaba el color del borde del header de las tablas de color gris, se cambio al color del fondo que defina el programador de la aplicacion. Co-Authored-By: garnica1999 --- ExperienceUI/build/built-jar.properties | 2 +- ExperienceUI/nbproject/private/private.xml | 1 + .../src/com/experienceui/ExperienceUI.java | 97 +++++++++++++++++-- .../experienceui/componentes/ExButton.java | 27 ++++-- .../componentes/ExButtonEditor.java | 1 + .../experienceui/componentes/ExComboBox.java | 25 ++++- .../experienceui/componentes/ExListBox.java | 14 ++- .../componentes/ExScrollPane.java | 15 ++- .../componentes/ExTabbedPane.java | 12 ++- .../com/experienceui/componentes/ExTable.java | 36 +++++-- .../experienceui/componentes/ExTextField.java | 13 ++- .../experienceui/componentes/ExTextPane.java | 11 ++- .../experienceui/componentes/ExUtilities.java | 14 +-- .../experienceui/componentes/IComponents.java | 26 +++++ .../componentes/TextUtilities.java | 4 +- .../experienceui/examples/ExampleBasic.form | 85 ++++++++++++++-- .../experienceui/examples/ExampleBasic.java | 74 ++++++++++++-- 17 files changed, 377 insertions(+), 80 deletions(-) create mode 100644 ExperienceUI/src/com/experienceui/componentes/IComponents.java diff --git a/ExperienceUI/build/built-jar.properties b/ExperienceUI/build/built-jar.properties index 3b8a2e1..d6bd814 100644 --- a/ExperienceUI/build/built-jar.properties +++ b/ExperienceUI/build/built-jar.properties @@ -1,4 +1,4 @@ -#Mon, 26 Mar 2018 21:33:08 -0500 +#Fri, 30 Mar 2018 21:05:57 -0500 C\:\\Users\\Carlos\\Desktop\\ExperienceUI\\ExperienceUI= diff --git a/ExperienceUI/nbproject/private/private.xml b/ExperienceUI/nbproject/private/private.xml index 42da35c..acc99b2 100644 --- a/ExperienceUI/nbproject/private/private.xml +++ b/ExperienceUI/nbproject/private/private.xml @@ -8,6 +8,7 @@ file:/C:/Users/Carlos/Desktop/ExperienceUI/ExperienceUI/src/com/experienceui/componentes/ExComboBox.java file:/C:/Users/Carlos/Desktop/ExperienceUI/ExperienceUI/src/com/experienceui/componentes/ExUtilities.java file:/C:/Users/Carlos/Desktop/ExperienceUI/ExperienceUI/src/com/experienceui/componentes/ExTextPane.java + file:/C:/Users/Carlos/Desktop/ExperienceUI/ExperienceUI/src/com/experienceui/componentes/IComponents.java file:/C:/Users/Carlos/Desktop/ExperienceUI/ExperienceUI/src/com/experienceui/componentes/ExTabbedPane.java file:/C:/Users/Carlos/Desktop/ExperienceUI/ExperienceUI/src/com/experienceui/color/ColorUI.java file:/C:/Users/Carlos/Desktop/ExperienceUI/ExperienceUI/src/com/experienceui/componentes/TextUtilities.java diff --git a/ExperienceUI/src/com/experienceui/ExperienceUI.java b/ExperienceUI/src/com/experienceui/ExperienceUI.java index abb4c2e..385e22f 100644 --- a/ExperienceUI/src/com/experienceui/ExperienceUI.java +++ b/ExperienceUI/src/com/experienceui/ExperienceUI.java @@ -6,6 +6,7 @@ package com.experienceui; import com.experienceui.color.ColorUI; +import com.experienceui.componentes.ExButton; import com.experienceui.componentes.ExComboBox; import com.experienceui.componentes.ExListBox; import com.experienceui.componentes.ExScrollPane; @@ -26,6 +27,22 @@ public class ExperienceUI { private static ColorUI colorUI; + public static ColorUI getColorUI() { + return colorUI; + } + + public static void setColorUI(ColorUI aColorUI) { + colorUI = aColorUI; + } + private ExListBox exListBox; + private ExTabbedPane exTabbedPane; + private ExScrollPane exScrollPane; + private ExTable exTable; + private ExTextField exTextField; + private ExTextPane exTextPane; + private ExComboBox exComboBox; + private ExButton exButton; + public ExperienceUI(ColorUI colorUI) { this.colorUI = colorUI; try { @@ -48,9 +65,10 @@ public void createUI() { } public void createIndependentUI() { - ExListBox exListBox = new ExListBox(colorUI); - ExTabbedPane exTabbedPane = new ExTabbedPane(colorUI); - ExScrollPane exScrollPane = new ExScrollPane(colorUI); + exListBox = new ExListBox(colorUI); + exTabbedPane = new ExTabbedPane(colorUI); + exScrollPane = new ExScrollPane(colorUI); + exButton = new ExButton(colorUI); exListBox.crearDisenio(); exTabbedPane.crearDisenio(); @@ -58,14 +76,79 @@ public void createIndependentUI() { } public void createDependentUI() { - ExTable exTable = new ExTable(colorUI); - ExTextField exTextField = new ExTextField(colorUI); - ExTextPane exTextPane = new ExTextPane(colorUI); - ExComboBox exComboBox = new ExComboBox(colorUI); + exTable = new ExTable(colorUI); + exTextField = new ExTextField(colorUI); + exTextPane = new ExTextPane(colorUI); + exComboBox = new ExComboBox(colorUI); exTable.crearDisenio(); exTextField.crearDisenio(); exTextPane.crearDisenio(); exComboBox.crearDisenio(); } + public ExListBox getExListBox() { + return exListBox; + } + + public void setExListBox(ExListBox exListBox) { + this.exListBox = exListBox; + } + + public ExTabbedPane getExTabbedPane() { + return exTabbedPane; + } + + public void setExTabbedPane(ExTabbedPane exTabbedPane) { + this.exTabbedPane = exTabbedPane; + } + + public ExScrollPane getExScrollPane() { + return exScrollPane; + } + + public void setExScrollPane(ExScrollPane exScrollPane) { + this.exScrollPane = exScrollPane; + } + + public ExTable getExTable() { + return exTable; + } + + public void setExTable(ExTable exTable) { + this.exTable = exTable; + } + + public ExTextField getExTextField() { + return exTextField; + } + + public void setExTextField(ExTextField exTextField) { + this.exTextField = exTextField; + } + + public ExTextPane getExTextPane() { + return exTextPane; + } + + public void setExTextPane(ExTextPane exTextPane) { + this.exTextPane = exTextPane; + } + + public ExComboBox getExComboBox() { + return exComboBox; + } + + public void setExComboBox(ExComboBox exComboBox) { + this.exComboBox = exComboBox; + } + + public ExButton getExButton() { + return exButton; + } + + public void setExButton(ExButton exButton) { + this.exButton = exButton; + } + + } diff --git a/ExperienceUI/src/com/experienceui/componentes/ExButton.java b/ExperienceUI/src/com/experienceui/componentes/ExButton.java index 046bd0f..1afef4e 100644 --- a/ExperienceUI/src/com/experienceui/componentes/ExButton.java +++ b/ExperienceUI/src/com/experienceui/componentes/ExButton.java @@ -9,8 +9,8 @@ import com.sun.glass.ui.Cursor; import java.awt.Font; import javax.swing.BorderFactory; -import javax.swing.JButton; import javax.swing.JComponent; +import javax.swing.UIManager; import javax.swing.border.Border; import javax.swing.plaf.ButtonUI; import javax.swing.plaf.basic.BasicButtonUI; @@ -19,10 +19,11 @@ * * @author Carlos */ -public class ExButton extends BasicButtonUI{ +public class ExButton extends BasicButtonUI implements IComponents{ private static ColorUI colorUI; private Font fuente; private Border border; + public ExButton(ColorUI colorUI, int size) { this.colorUI = colorUI; fuente = new Font("Segoe UI", Font.BOLD, size); @@ -53,14 +54,6 @@ public static ColorUI getColorUI() { public static void setColorUI(ColorUI aColorUI) { colorUI = aColorUI; } - - public void modificarBoton(JButton bt){ - bt.setFont(fuente); - bt.setBackground(this.colorUI.getColorFondo()); - bt.setBackground(this.colorUI.getColorForeground()); - bt.setBorder(border); - bt.setCursor(new java.awt.Cursor(Cursor.CURSOR_POINTING_HAND)); - } public Font getFuente() { return fuente; @@ -77,6 +70,20 @@ public Border getBorder() { public void setBorder(Border border) { this.border = border; } + + @Override + public void modificarUI(JComponent c) { + c.setFont(fuente); + c.setBackground(this.colorUI.getColorFondo()); + c.setForeground(this.colorUI.getColorTerciario()); + c.setBorder(border); + c.setCursor(new java.awt.Cursor(Cursor.CURSOR_POINTING_HAND)); + } + + @Override + public void crearDisenio() { + UIManager.put("Button.foreground", this.colorUI.getColorForeground()); + } } diff --git a/ExperienceUI/src/com/experienceui/componentes/ExButtonEditor.java b/ExperienceUI/src/com/experienceui/componentes/ExButtonEditor.java index a95ab83..08e7d3d 100644 --- a/ExperienceUI/src/com/experienceui/componentes/ExButtonEditor.java +++ b/ExperienceUI/src/com/experienceui/componentes/ExButtonEditor.java @@ -11,6 +11,7 @@ import javax.swing.DefaultCellEditor; import javax.swing.JButton; import javax.swing.JCheckBox; +import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.JTable; diff --git a/ExperienceUI/src/com/experienceui/componentes/ExComboBox.java b/ExperienceUI/src/com/experienceui/componentes/ExComboBox.java index a18bbb4..47d04c6 100644 --- a/ExperienceUI/src/com/experienceui/componentes/ExComboBox.java +++ b/ExperienceUI/src/com/experienceui/componentes/ExComboBox.java @@ -7,6 +7,7 @@ import com.experienceui.color.ColorUI; import java.awt.Color; +import java.awt.Font; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import javax.swing.BorderFactory; @@ -23,7 +24,7 @@ * * @author sala7 */ -public class ExComboBox extends BasicComboBoxUI{ +public class ExComboBox extends BasicComboBoxUI implements IComponents{ private static ColorUI colorUI; private Border borderButton; private Color buttonBackground; @@ -32,13 +33,17 @@ public class ExComboBox extends BasicComboBoxUI{ private Color selectionForeground; private Color selectionBackground; private Color control; + private Font fuente; public ExComboBox(ColorUI colorUI){ ExComboBox.colorUI = colorUI; borderButton = BorderFactory.createMatteBorder(0, 0, 2, 0, colorUI.getColorBorde()); + this.fuente = new Font("Segoe UI", Font.BOLD, 14); + selectionForeground = colorUI.getColorFondo(); + selectionBackground = colorUI.getColorTerciario(); } - public ExComboBox(ColorUI colorUI, Border borderButton, Color buttonBackground, Color buttonhighlight, Color buttonShadow, Color selectionForeground, Color selectionBackground, Color control) { + public ExComboBox(ColorUI colorUI, Border borderButton, Color buttonBackground, Color buttonhighlight, Color buttonShadow, Color selectionForeground, Color selectionBackground, Color control, Font fuente) { ExComboBox.colorUI = colorUI; this.borderButton = borderButton; this.buttonBackground = buttonBackground; @@ -47,9 +52,11 @@ public ExComboBox(ColorUI colorUI, Border borderButton, Color buttonBackground, this.selectionForeground = selectionForeground; this.selectionBackground = selectionBackground; this.control = control; + this.fuente = fuente; } - public ExComboBox(Color buttonBackground, Color buttonhighlight, Color buttonShadow, Color selectionForeground, Color selectionBackground, Color control) { + public ExComboBox(ColorUI colorUI, Color buttonBackground, Color buttonhighlight, Color buttonShadow, Color selectionForeground, Color selectionBackground, Color control) { + this.colorUI = colorUI; this.buttonBackground = buttonBackground; this.buttonhighlight = buttonhighlight; this.buttonShadow = buttonShadow; @@ -57,6 +64,7 @@ public ExComboBox(Color buttonBackground, Color buttonhighlight, Color buttonSha this.selectionBackground = selectionBackground; this.control = control; borderButton = BorderFactory.createMatteBorder(0, 0, 2, 0, colorUI.getColorBorde()); + this.fuente = new Font("Segoe UI", Font.BOLD, 14); } public Border getBorderButton() { @@ -130,8 +138,13 @@ protected JButton createArrowButton() { return a; } - public void modificarUI(JComboBox cb){ - cb.setUI(this); + @Override + public void modificarUI(JComponent c){ + if(c instanceof JComboBox){ + JComboBox cb = (JComboBox)c; + cb.setUI(this); + } + } public static void addFocusBorder(JComboBox comboBox){ @@ -153,6 +166,7 @@ protected static void addFocusOnSelectedComponent(JComboBox componente, Color ne componente.setBorder(BorderFactory.createMatteBorder(0, 0, 2, 0, newColor)); } + @Override public void crearDisenio(){ UIManager.put("Combobox.rendererUseListColors", true); UIManager.put("ComboBox.background", colorUI.getColorFondo()); @@ -162,6 +176,7 @@ public void crearDisenio(){ //UIManager.put("ComboBox.buttonDarkShadow", new Color(255,255,255)); UIManager.put("ComboBox.buttonHighlight", buttonhighlight); UIManager.put("ComboBox.buttonShadow", buttonShadow); + UIManager.put("ComboBox.font", fuente); UIManager.put("ComboBox.control", control); UIManager.put("ComboBox.selectionBackground", this.colorUI.getColorPrincipal()); UIManager.put("ComboBox.selectionForeground", selectionForeground); diff --git a/ExperienceUI/src/com/experienceui/componentes/ExListBox.java b/ExperienceUI/src/com/experienceui/componentes/ExListBox.java index 756c60f..1d7615d 100644 --- a/ExperienceUI/src/com/experienceui/componentes/ExListBox.java +++ b/ExperienceUI/src/com/experienceui/componentes/ExListBox.java @@ -8,6 +8,7 @@ import com.experienceui.color.ColorUI; import javax.swing.BorderFactory; import javax.swing.JComponent; +import javax.swing.JList; import javax.swing.UIManager; import javax.swing.plaf.ListUI; import javax.swing.plaf.basic.BasicListUI; @@ -16,7 +17,7 @@ * * @author Carlos */ -public class ExListBox extends BasicListUI{ +public class ExListBox extends BasicListUI implements IComponents{ private static ColorUI colorUI; public ExListBox(ColorUI colorUI) { @@ -28,9 +29,20 @@ public static ListUI createUI(JComponent c){ return new ExListBox(colorUI); } + @Override public void crearDisenio(){ UIManager.put("List.selectionForeground", this.colorUI.getColorFondo()); + UIManager.put("List.selectionBackground", this.colorUI.getColorTerciario()); UIManager.put("List.focusCellHighlightBorder", BorderFactory.createEmptyBorder()); UIManager.put("List.border", BorderFactory.createLineBorder(this.colorUI.getColorBordeSecundario())); } + + @Override + public void modificarUI(JComponent c) { + if(c instanceof JList){ + JList ls = (JList)c; + ls.setUI(this); + } + } + } diff --git a/ExperienceUI/src/com/experienceui/componentes/ExScrollPane.java b/ExperienceUI/src/com/experienceui/componentes/ExScrollPane.java index ae2ee09..1b0abd0 100644 --- a/ExperienceUI/src/com/experienceui/componentes/ExScrollPane.java +++ b/ExperienceUI/src/com/experienceui/componentes/ExScrollPane.java @@ -8,6 +8,7 @@ import com.experienceui.color.ColorUI; import java.awt.Insets; import javax.swing.JComponent; +import javax.swing.JScrollPane; import javax.swing.UIManager; import javax.swing.plaf.ScrollPaneUI; import javax.swing.plaf.basic.BasicScrollPaneUI; @@ -16,7 +17,7 @@ * * @author Carlos */ -public class ExScrollPane extends BasicScrollPaneUI{ +public class ExScrollPane extends BasicScrollPaneUI implements IComponents{ private static ColorUI colorUI; public ExScrollPane(ColorUI colorUI){ @@ -35,12 +36,18 @@ public static ScrollPaneUI createUI(JComponent c){ return new ExScrollPane(colorUI); } - + @Override public void crearDisenio(){ UIManager.put("ScrollPane.border", null); UIManager.put("ScrollPane.viewportBorder", null); UIManager.put("ScrollPane.viewportBorderInsets", new Insets(0,0,0,0)); } - - + + @Override + public void modificarUI(JComponent c) { + if(c instanceof JScrollPane){ + JScrollPane js = (JScrollPane)c; + js.setUI(this); + } + } } diff --git a/ExperienceUI/src/com/experienceui/componentes/ExTabbedPane.java b/ExperienceUI/src/com/experienceui/componentes/ExTabbedPane.java index 82ef1ec..9f8997b 100644 --- a/ExperienceUI/src/com/experienceui/componentes/ExTabbedPane.java +++ b/ExperienceUI/src/com/experienceui/componentes/ExTabbedPane.java @@ -18,7 +18,7 @@ * * @author Carlos */ -public class ExTabbedPane extends BasicTabbedPaneUI{ +public class ExTabbedPane extends BasicTabbedPaneUI implements IComponents{ private static ColorUI colorUI; private Font fuente; @@ -43,6 +43,7 @@ public static TabbedPaneUI createUI(JComponent c){ return new ExTabbedPane(colorUI); } + @Override public void crearDisenio(){ UIManager.put("TabbedPane.focus", this.colorUI.getColorTerciario()); UIManager.put("TabbedPane.selected", this.colorUI.getColorTerciario()); @@ -74,8 +75,13 @@ public void setFuente(Font fuente) { this.fuente = fuente; } - public void modificarUI(JTabbedPane tp){ - tp.setUI(this); + @Override + public void modificarUI(JComponent c){ + if(c instanceof JTabbedPane){ + JTabbedPane tp = (JTabbedPane)c; + tp.setUI(this); + } + } public void modificarUI(JTabbedPane... tps) throws IllegalArgumentException{ diff --git a/ExperienceUI/src/com/experienceui/componentes/ExTable.java b/ExperienceUI/src/com/experienceui/componentes/ExTable.java index 743ac1a..65af53d 100644 --- a/ExperienceUI/src/com/experienceui/componentes/ExTable.java +++ b/ExperienceUI/src/com/experienceui/componentes/ExTable.java @@ -24,7 +24,7 @@ * * @author Carlos */ -public class ExTable extends BasicTableUI{ +public class ExTable extends BasicTableUI implements IComponents{ private static ColorUI colorUI; private Color gridColor; private Border cellBorder; @@ -35,7 +35,7 @@ public class ExTable extends BasicTableUI{ public ExTable(ColorUI colorUI) { this.colorUI = colorUI; gridColor = new Color(204,204,204); - cellBorder = BorderFactory.createLineBorder(this.colorUI.getColorBorde()); + cellBorder = BorderFactory.createLineBorder(this.colorUI.getColorFondo()); fuenteHeader = new Font("Segoe UI", Font.BOLD,14); scrollPaneBorder = BorderFactory.createLineBorder(this.colorUI.getColorBorde(),1); borderCellHightlight = BorderFactory.createEmptyBorder(); @@ -50,7 +50,7 @@ public ExTable(ColorUI colorUI, Color gridColor, Border cellBorder, Font fuenteH this.borderCellHightlight = borderCellHightlight; } - + @Override public void crearDisenio(){ UIManager.put("Table.background", this.colorUI.getColorFondo()); UIManager.put("Table.darkShadow", this.colorUI.getColorFondo()); @@ -66,6 +66,7 @@ public void crearDisenio(){ UIManager.put("Table.light", colorUI.getColorFondo()); UIManager.put("Table.highlight", colorUI.getColorFondo()); UIManager.put("Table.selectionForeground", colorUI.getColorFondo()); + UIManager.put("Table.selectionBackground", colorUI.getColorTerciario()); } public static ColorUI getColorUI() { return colorUI; @@ -130,21 +131,36 @@ public static void modificarAlturaFilas(JTable componente) { } - public void modificarTabla(JTable tabla) { - modificarGridTabla(tabla); - modificarAlturaFilas(tabla); - renderizarTabla(tabla); + public static void modificarTabla(JTable... tabla) throws IllegalArgumentException{ + if(tabla.length == 0){ + throw new IllegalArgumentException("La función debe de tener uno o más parámetros de entrada que coincidan con la clase o clases padres de esta"); + } + + for(int i = 0; i < tabla.length; i++){ + modificarGridTabla(tabla[i]); + modificarAlturaFilas(tabla[i]); + renderizarTabla(tabla[i]); + } + } - public void modificarGridTabla(JTable tabla) { + public static void modificarGridTabla(JTable tabla) { ExTable.modificarGrid(tabla); } - public void renderizarTabla(JTable tabla) { + public static void renderizarTabla(JTable tabla) { tabla.setIntercellSpacing(new Dimension(0, 0)); ExTable.CustomRenderer cr = new ExTable.CustomRenderer(tabla.getDefaultRenderer(Object.class), Color.WHITE, Color.WHITE, new Color(204, 204, 204), Color.WHITE); tabla.setDefaultRenderer(Object.class, cr); } + + @Override + public void modificarUI(JComponent c) { + if(c instanceof JTable){ + JTable tb = (JTable)c; + tb.setUI(this); + } + } @SuppressWarnings("serial") public static class CustomRenderer extends DefaultTableCellRenderer { @@ -171,7 +187,7 @@ public Component getTableCellRendererComponent(JTable table, } private void alinearElementos() { - render.setHorizontalAlignment(SwingConstants.RIGHT); + render.setHorizontalAlignment(SwingConstants.CENTER); } private void construirBorde(Color top, Color left, Color bottom, Color right) { diff --git a/ExperienceUI/src/com/experienceui/componentes/ExTextField.java b/ExperienceUI/src/com/experienceui/componentes/ExTextField.java index d0c4d8c..a262400 100644 --- a/ExperienceUI/src/com/experienceui/componentes/ExTextField.java +++ b/ExperienceUI/src/com/experienceui/componentes/ExTextField.java @@ -17,7 +17,7 @@ * * @author sala7 */ -public class ExTextField extends TextUtilities{ +public class ExTextField extends TextUtilities implements IComponents{ private Font fuente; private Border border; @@ -49,7 +49,7 @@ public static TextUtilities createUI(JComponent c) { return new TextUtilities(colorUI); } - + @Override public void crearDisenio(){ UIManager.put("TextField.border", this.border); UIManager.put("TextField.background", colorUI.getColorFondo()); @@ -57,9 +57,12 @@ public void crearDisenio(){ UIManager.put("TextField.foreground", colorUI.getColorForeground()); } - public void modificarUI(JTextField tf){ - tf.setUI(this); - + @Override + public void modificarUI(JComponent c){ + if(c instanceof JTextField){ + JTextField tf = (JTextField)c; + tf.setUI(this); + } } public Font getFuente() { diff --git a/ExperienceUI/src/com/experienceui/componentes/ExTextPane.java b/ExperienceUI/src/com/experienceui/componentes/ExTextPane.java index 68443e6..d0e3f88 100644 --- a/ExperienceUI/src/com/experienceui/componentes/ExTextPane.java +++ b/ExperienceUI/src/com/experienceui/componentes/ExTextPane.java @@ -19,7 +19,7 @@ * * @author Carlos */ -public class ExTextPane extends BasicTextPaneUI{ +public class ExTextPane extends BasicTextPaneUI implements IComponents{ private static ColorUI colorUI; private Border border; private Font fuente; @@ -40,6 +40,7 @@ public static ComponentUI createUI(JComponent c){ return new ExTextPane(colorUI); } + @Override public void crearDisenio(){ UIManager.put("TextPane.border", border); UIManager.put("TextPane.background", this.colorUI.getColorFondo()); @@ -55,8 +56,12 @@ public static void setColorUI(ColorUI aColorUI) { colorUI = aColorUI; } - public void modificarUI(JTextPane tp){ - tp.setUI(this); + @Override + public void modificarUI(JComponent c){ + if (c instanceof JTextPane){ + JTextPane tp = (JTextPane)c; + tp.setUI(this); + } } public Border getBorder() { diff --git a/ExperienceUI/src/com/experienceui/componentes/ExUtilities.java b/ExperienceUI/src/com/experienceui/componentes/ExUtilities.java index 1995925..4cf80d4 100644 --- a/ExperienceUI/src/com/experienceui/componentes/ExUtilities.java +++ b/ExperienceUI/src/com/experienceui/componentes/ExUtilities.java @@ -130,7 +130,7 @@ public static void modificarUIComboBox(ColorUI colorUI, JPanel... panel) throws } } - public static void modificarTemaComboBox(ColorUI colorUI, JPanel... panel) throws IllegalArgumentException{ + public static void modificarTemaComboBox(ExComboBox exComboBox, JPanel... panel) throws IllegalArgumentException{ if (panel.length <= 0) { throw new IllegalArgumentException("El parametro de entrada debe de tener por lo menos uno o más elementos"); } @@ -139,7 +139,7 @@ public static void modificarTemaComboBox(ColorUI colorUI, JPanel... panel) throw for (int i = 0; i < panel[k].getComponentCount(); i++) { if (panel[k].getComponent(i) instanceof JComboBox) { JComboBox cb = (JComboBox) panel[k].getComponent(i); - cb.setUI(new ExComboBox(colorUI)); + cb.setUI(exComboBox); } } @@ -167,9 +167,9 @@ public void ingresarPosicionComboBox(int index, JPanel... panel) throws IllegalA return tm.getValueAt(tabla.getSelectedRow(), celda); } - public static void modificarElementos(ColorUI colorUI, JPanel panel){ + public static void modificarElementos(ColorUI colorUI, ExComboBox exComboBox, JPanel panel){ agregarFocusBorder(colorUI, panel); - modificarTemaComboBox(colorUI, panel); + modificarTemaComboBox(exComboBox, panel); } public static void modificarBotones(ExButton exButton, JPanel... pn) throws IllegalArgumentException{ @@ -181,11 +181,7 @@ public static void modificarBotones(ExButton exButton, JPanel... pn) throws Ille for(int componente = 0; componente < pn[i].getComponentCount(); componente++){ if(pn[i].getComponent(componente) instanceof JButton){ JButton bt = (JButton)pn[i].getComponent(componente); - bt.setFont(exButton.getFuente()); - bt.setBackground(exButton.getColorUI().getColorFondo()); - bt.setBackground(exButton.getColorUI().getColorForeground()); - bt.setBorder(exButton.getBorder()); - bt.setCursor(new java.awt.Cursor(Cursor.CURSOR_POINTING_HAND)); + exButton.modificarUI(bt); } } } diff --git a/ExperienceUI/src/com/experienceui/componentes/IComponents.java b/ExperienceUI/src/com/experienceui/componentes/IComponents.java new file mode 100644 index 0000000..bd565f1 --- /dev/null +++ b/ExperienceUI/src/com/experienceui/componentes/IComponents.java @@ -0,0 +1,26 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package com.experienceui.componentes; + +import javax.swing.JComponent; + +/** + * + * @author Carlos + */ +public interface IComponents { + + /** + * + * @param c + */ + public abstract void modificarUI(JComponent c); + + /** + * + */ + public abstract void crearDisenio(); +} diff --git a/ExperienceUI/src/com/experienceui/componentes/TextUtilities.java b/ExperienceUI/src/com/experienceui/componentes/TextUtilities.java index 14446fb..98ae2b4 100644 --- a/ExperienceUI/src/com/experienceui/componentes/TextUtilities.java +++ b/ExperienceUI/src/com/experienceui/componentes/TextUtilities.java @@ -11,14 +11,14 @@ import java.awt.event.FocusListener; import javax.swing.BorderFactory; import javax.swing.JComponent; -import javax.swing.plaf.basic.BasicTextPaneUI; +import javax.swing.plaf.basic.BasicTextFieldUI; import javax.swing.text.JTextComponent; /** * * @author sala7 */ -public class TextUtilities extends BasicTextPaneUI{ +public class TextUtilities extends BasicTextFieldUI{ protected static ColorUI colorUI; public TextUtilities() { diff --git a/ExperienceUI/src/com/experienceui/examples/ExampleBasic.form b/ExperienceUI/src/com/experienceui/examples/ExampleBasic.form index ed624de..5c32443 100644 --- a/ExperienceUI/src/com/experienceui/examples/ExampleBasic.form +++ b/ExperienceUI/src/com/experienceui/examples/ExampleBasic.form @@ -43,31 +43,54 @@ - - + + - - + + + + + + + + + + + + + + + + + - - - + - + - + - + + + + + + + + + + + @@ -118,6 +141,48 @@ + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExperienceUI/src/com/experienceui/examples/ExampleBasic.java b/ExperienceUI/src/com/experienceui/examples/ExampleBasic.java index 230e83b..9ab9217 100644 --- a/ExperienceUI/src/com/experienceui/examples/ExampleBasic.java +++ b/ExperienceUI/src/com/experienceui/examples/ExampleBasic.java @@ -7,6 +7,7 @@ import com.experienceui.ExperienceUI; import com.experienceui.color.ColorUI; +import com.experienceui.componentes.ExTable; import com.experienceui.componentes.ExUtilities; import java.awt.Color; @@ -14,6 +15,7 @@ * * @author Carlos */ +@SuppressWarnings("serial") public class ExampleBasic extends javax.swing.JFrame { /** @@ -24,10 +26,13 @@ public ExampleBasic() { ExperienceUI eu = new ExperienceUI(colorUI); eu.createUI(); initComponents(); - ExUtilities.modificarElementos(colorUI, jPanel1); + ExUtilities.modificarElementos(colorUI,eu.getExComboBox() ,jPanel1); ExUtilities.addPlaceHolder(jTextField1, "jTextField1", ""); ExUtilities.eliminarBordesScrollPane(jPanel1); - + //MODIFICAR TABLA + ExTable.modificarTabla(jTable1); + //MODIFICAR BOTONES + ExUtilities.modificarBotones(eu.getExButton(), jPanel1); } /** @@ -44,6 +49,12 @@ private void initComponents() { jTextField1 = new javax.swing.JTextField(); jScrollPane1 = new javax.swing.JScrollPane(); jList1 = new javax.swing.JList<>(); + jScrollPane2 = new javax.swing.JScrollPane(); + jTable1 = new javax.swing.JTable(); + jButton1 = new javax.swing.JButton(); + jScrollPane3 = new javax.swing.JScrollPane(); + jTextPane1 = new javax.swing.JTextPane(); + jButton2 = new javax.swing.JButton(); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); @@ -60,30 +71,67 @@ private void initComponents() { }); jScrollPane1.setViewportView(jList1); + jTable1.setModel(new javax.swing.table.DefaultTableModel( + new Object [][] { + {null, null, null, null}, + {null, null, null, null}, + {null, null, null, null}, + {null, null, null, null} + }, + new String [] { + "Title 1", "Title 2", "Title 3", "Title 4" + } + )); + jScrollPane2.setViewportView(jTable1); + + jButton1.setText("jButton1"); + + jScrollPane3.setViewportView(jTextPane1); + + jButton2.setText("jButton1"); + javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); jPanel1.setLayout(jPanel1Layout); jPanel1Layout.setHorizontalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel1Layout.createSequentialGroup() - .addGap(21, 21, 21) + .addContainerGap() .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(jTextField1, javax.swing.GroupLayout.DEFAULT_SIZE, 213, Short.MAX_VALUE) - .addComponent(jComboBox1, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addGap(87, 87, 87) - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 275, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(28, Short.MAX_VALUE)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addGap(10, 10, 10) + .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, 144, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jButton2, javax.swing.GroupLayout.PREFERRED_SIZE, 144, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 256, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(jScrollPane2) + .addGroup(jPanel1Layout.createSequentialGroup() + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(jTextField1) + .addComponent(jComboBox1, javax.swing.GroupLayout.PREFERRED_SIZE, 213, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(87, 87, 87) + .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 275, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addContainerGap(107, Short.MAX_VALUE)) ); jPanel1Layout.setVerticalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel1Layout.createSequentialGroup() - .addGap(68, 68, 68) + .addContainerGap() .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGroup(jPanel1Layout.createSequentialGroup() .addComponent(jComboBox1, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(18, 18, 18) .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, 54, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addContainerGap(306, Short.MAX_VALUE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 215, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, 52, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jButton2, javax.swing.GroupLayout.PREFERRED_SIZE, 52, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 129, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addContainerGap(260, Short.MAX_VALUE)) ); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); @@ -136,10 +184,16 @@ public void run() { } // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JButton jButton1; + private javax.swing.JButton jButton2; private javax.swing.JComboBox jComboBox1; private javax.swing.JList jList1; private javax.swing.JPanel jPanel1; private javax.swing.JScrollPane jScrollPane1; + private javax.swing.JScrollPane jScrollPane2; + private javax.swing.JScrollPane jScrollPane3; + private javax.swing.JTable jTable1; private javax.swing.JTextField jTextField1; + private javax.swing.JTextPane jTextPane1; // End of variables declaration//GEN-END:variables }