From af6ec737d16525b427c5e61036b46c92cc79e07c Mon Sep 17 00:00:00 2001 From: psanxiao Date: Tue, 20 Sep 2011 13:30:47 +0200 Subject: [PATCH] Added new feature to filter dialog: Export selected to csv file Signed-off-by: psanxiao --- config/text.properties | 2 ++ .../filterPanel/AbstractFilterQueryJPanel.java | 4 ++-- .../TableFilterQueryJPanel.java | 17 +++++++++++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/config/text.properties b/config/text.properties index 631583d..40defc1 100644 --- a/config/text.properties +++ b/config/text.properties @@ -100,6 +100,7 @@ error_validating_filter_query=Error validando la consulta SQL errorMessageJComboBoxItemsSeekerConfigurable=Configuraci\u00f3n del comportamiento inv\u00e1lida. espere=Por favor, espere exportJOP2Title=Exportar a JOP2T +export_selected=Exportar selecci\u00f3n extraer=Extraer Failed_pausing_the_process=Fall\u00f3 pausando el proceso. Failed_resuming_the_process=Fall\u00f3 reanudando el proceso. @@ -107,6 +108,7 @@ Failed_the_process=Fall\u00f3 el proceso. feature=Capas fields=Campos fields_uppercase_first=Campos +file_already_exists=El archivo ya existe. ¿Desea sobreescribirlo? fill=Rellenar filter=Filtro filter_by_sentence=Filtrado por sentencia diff --git a/src/org/gvsig/gui/beans/filterPanel/AbstractFilterQueryJPanel.java b/src/org/gvsig/gui/beans/filterPanel/AbstractFilterQueryJPanel.java index ab16732..acc0f72 100644 --- a/src/org/gvsig/gui/beans/filterPanel/AbstractFilterQueryJPanel.java +++ b/src/org/gvsig/gui/beans/filterPanel/AbstractFilterQueryJPanel.java @@ -85,7 +85,7 @@ import org.gvsig.gui.beans.panelGroup.panels.AbstractPanel; * @author Pablo Piqueras Bartolomé (p_queras@hotmail.com) */ public abstract class AbstractFilterQueryJPanel extends AbstractPanel implements Serializable { - public static final int DefaultHeight = 280; + public static final int DefaultHeight = 380; public static final int DefaultWidth = 490; protected final int fieldsJPanelHeight = 145; @@ -93,7 +93,7 @@ public abstract class AbstractFilterQueryJPanel extends AbstractPanel implements protected final int valuesJPanelHeight = fieldsJPanelHeight; protected final int valuesJPanelWidth = fieldsJPanelWidth; protected final int defaultBottomJPanelWidth = 480; - protected final int defaultBottomJPanelHeight = 110; + protected final int defaultBottomJPanelHeight = 150; protected int filterJScrollPaneHeight; protected int filterJScrollPanelWidth; protected final int filterButtonsPanelHeight = FilterButtonsJPanel.default_FilterButtonsJPanelHeight; diff --git a/src/org/gvsig/gui/beans/filterPanel/tableFilterQueryPanel/TableFilterQueryJPanel.java b/src/org/gvsig/gui/beans/filterPanel/tableFilterQueryPanel/TableFilterQueryJPanel.java index 66431d3..061b3a3 100644 --- a/src/org/gvsig/gui/beans/filterPanel/tableFilterQueryPanel/TableFilterQueryJPanel.java +++ b/src/org/gvsig/gui/beans/filterPanel/tableFilterQueryPanel/TableFilterQueryJPanel.java @@ -69,8 +69,9 @@ public class TableFilterQueryJPanel extends AbstractFilterQueryJPanel implements protected JButtonML btnNewSet = null; protected JButtonML btnAddToCurrentSet = null; protected JButtonML btnFromSet = null; + protected JButtonML btnExportSet = null; protected int defaultButtonsSetPanelWidth = 190; - protected int defaultButtonsSetPanelHeight = 100; + protected int defaultButtonsSetPanelHeight = 150; protected int filterJScrollPaneHeight = defaultBottomJPanelHeight - 10; protected int filterJScrollPanelWidth = defaultBottomJPanelWidth - 10 - defaultButtonsSetPanelWidth; protected int setButtonWidth = defaultButtonsSetPanelWidth - 5; @@ -230,7 +231,8 @@ public class TableFilterQueryJPanel extends AbstractFilterQueryJPanel implements buttonsSetJPanel.setPreferredSize(new java.awt.Dimension(defaultButtonsSetPanelWidth, defaultButtonsSetPanelHeight)); buttonsSetJPanel.add(getBtnNewSet(), null); buttonsSetJPanel.add(getBtnAddToCurrentSet(), null); - buttonsSetJPanel.add(getBtnFromSet(), null); + buttonsSetJPanel.add(getBtnFromSet(), null); + buttonsSetJPanel.add(getBtnExportSet(), null); } return buttonsSetJPanel; @@ -285,6 +287,17 @@ public class TableFilterQueryJPanel extends AbstractFilterQueryJPanel implements return btnFromSet; } + protected javax.swing.JButton getBtnExportSet() { + if (btnExportSet == null) { + btnExportSet = new JButtonML(); + btnExportSet.setPreferredSize(new Dimension(this.setButtonWidth, + this.setButtonHeight)); + btnExportSet.setText(Messages.getText("export_selected")); + // btnFromSet.setMargin(new java.awt.Insets(2, 2, 2, 2)); + } + return btnExportSet; + } + /* * (non-Javadoc) * @see org.gvsig.gui.beans.filterPanel.AbstractFilterQueryJPanel#getTxtExpression() -- 1.7.1