StephanRichter/BelegScanner
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improved GUI

Browse Source
This commit is contained in:
Stephan Richter
2022-01-05 19:01:57 +01:00
parent 0c107f7964
commit b5404252f5
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>BelegScanner</groupId> <groupId>BelegScanner</groupId>
<artifactId>BelegScanner</artifactId> <artifactId>BelegScanner</artifactId>
<version>0.0.9</version> <version>0.0.10</version>
<name>BelegScanner</name> <name>BelegScanner</name>
<packaging>jar</packaging> <packaging>jar</packaging>
@@ -53,7 +53,7 @@
<dependency> <dependency>
<groupId>de.srsoftware</groupId> <groupId>de.srsoftware</groupId>
<artifactId>tools.gui.selectcombobox</artifactId> <artifactId>tools.gui.selectcombobox</artifactId>
<version>0.1.2</version> <version>0.1.3</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

17
src/main/java/de/srsoftware/belegscanner/gui/Toolbar.java
View File

@@ -12,6 +12,7 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.TreeSet;
import java.util.Vector; import java.util.Vector;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -91,12 +92,14 @@ public class Toolbar extends JPanel {
add(input("Pfad",pathPicker = pathPicker())); add(input("Pfad",pathPicker = pathPicker()));
addFormatSelector(); addFormatSelector();
add(scanButton()); add(scanButton());
add(externButton()); add(new JPanel());
} }
private void addFormatSelector() { private void addFormatSelector() {
JPanel dummy = new JPanel(); JPanel dummy = new JPanel();
dummy.setLayout(new BorderLayout()); dummy.setLayout(new BorderLayout());
dummy.setMaximumSize(new Dimension(600, 40));
dummy.add(new JLabel("Breite:"),BorderLayout.WEST); dummy.add(new JLabel("Breite:"),BorderLayout.WEST);
dummy.add(width = new JTextField(209+""),BorderLayout.CENTER); dummy.add(width = new JTextField(209+""),BorderLayout.CENTER);
@@ -105,6 +108,7 @@ public class Toolbar extends JPanel {
dummy = new JPanel(); dummy = new JPanel();
dummy.setLayout(new BorderLayout()); dummy.setLayout(new BorderLayout());
dummy.setMaximumSize(new Dimension(600, 40));
dummy.add(new JLabel("Höhe:"),BorderLayout.WEST); dummy.add(new JLabel("Höhe:"),BorderLayout.WEST);
dummy.add(height = new JTextField(297+""),BorderLayout.CENTER); dummy.add(height = new JTextField(297+""),BorderLayout.CENTER);
@@ -184,12 +188,6 @@ public class Toolbar extends JPanel {
date.addActionListener(ev -> dateListeners.forEach(listener -> listener.setDate(date.getSelectedDate()))); date.addActionListener(ev -> dateListeners.forEach(listener -> listener.setDate(date.getSelectedDate())));
return date; return date;
} }
private JButton externButton() {
JButton btn = new JButton("extern öffnen");
return btn;
}
public Date getDate() { public Date getDate() {
return date.getSelectedDate(); return date.getSelectedDate();
@@ -206,6 +204,7 @@ public class Toolbar extends JPanel {
private JPanel input(String caption, Component component) { private JPanel input(String caption, Component component) {
component.setMaximumSize(new Dimension(600, 40));
JPanel panel = new JPanel(); JPanel panel = new JPanel();
panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS)); panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS));
panel.add(new JLabel(caption+" ")); panel.add(new JLabel(caption+" "));
@@ -258,8 +257,8 @@ public class Toolbar extends JPanel {
path = prefix+"fields."+fieldName; path = prefix+"fields."+fieldName;
JSONArray arr = config.getOrCreateArray(path); JSONArray arr = config.getOrCreateArray(path);
HashSet<Object> values = new HashSet<>(); TreeSet<Object> values = new TreeSet<>();
arr.forEach(values::add); arr.forEach(elem -> values.add(elem.toString().trim()));
SelectComboBox selector = getSelector(additonalComponents.get(fieldName)); SelectComboBox selector = getSelector(additonalComponents.get(fieldName));
if (selector != null) selector.setElements(values); if (selector != null) selector.setElements(values);
} }