summaryrefslogtreecommitdiff
path: root/BKUCommonGUI/src
diff options
context:
space:
mode:
Diffstat (limited to 'BKUCommonGUI/src')
-rw-r--r--BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java112
-rw-r--r--BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java104
2 files changed, 25 insertions, 191 deletions
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java
index 53ec1088..64cd9f50 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java
@@ -67,7 +67,7 @@ public class BKUGUI implements BKUGUIFacade {
private static final Log log = LogFactory.getLog(BKUGUI.class);
public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
- public static final String LOGO_RESOURCE = "/images/logo.png";
+ public static final String DEFAULT_BACKGROUND = "/images/mocca_default.png"; //logo.png";
public static final String HASHDATA_FONT = "Monospaced";
public static final Color ERROR_COLOR = Color.RED;
public static final Color HYPERLINK_COLOR = Color.BLUE;
@@ -192,11 +192,19 @@ public class BKUGUI implements BKUGUIFacade {
protected void initContentPanel(URL background) {
- contentPanel = new JPanel();
+ if (background == null) {
+ background = this.getClass().getResource(DEFAULT_BACKGROUND);
+ }
+ contentPanel = new ImagePanel(background);
+// contentPanel.setBorder(new TitledBorder("content"));
+
// headerPanel = new JPanel();
- mainPanel = new JPanel();
- buttonPanel = new JPanel();
+// headerPanel.setOpaque(false);
+// mainPanel = new JPanel();
+// mainPanel.setOpaque(false);
+// buttonPanel = new JPanel();
+// buttonPanel.setOpaque(false);
// headerPanel.setBorder(new TitledBorder("header"));
// mainPanel.setBorder(new TitledBorder("main"));
@@ -389,16 +397,12 @@ public class BKUGUI implements BKUGUIFacade {
GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
buttonPanel.setLayout(buttonPanelLayout);
-// buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);
buttonPanelLayout.setHorizontalGroup(
buttonPanelLayout.createSequentialGroup()
-// buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-// .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
.addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
buttonPanelLayout.setVerticalGroup(
buttonPanelLayout.createSequentialGroup()
-// buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
.addComponent(cancelButton));
contentPanel.validate();
@@ -452,16 +456,12 @@ public class BKUGUI implements BKUGUIFacade {
GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
buttonPanel.setLayout(buttonPanelLayout);
-// buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);
buttonPanelLayout.setHorizontalGroup(
buttonPanelLayout.createSequentialGroup()
-// buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-// .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
.addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
buttonPanelLayout.setVerticalGroup(
buttonPanelLayout.createSequentialGroup()
-// buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
.addComponent(cancelButton));
contentPanel.validate();
@@ -522,8 +522,8 @@ public class BKUGUI implements BKUGUIFacade {
});
JLabel infoLabel = new JLabel();
+ infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
if (numRetries < 0) {
- infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
String pinsizePattern = messages.getString(LABEL_PINSIZE);
String pinSize = String.valueOf(pinSpec.getMinLength());
if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
@@ -593,7 +593,6 @@ public class BKUGUI implements BKUGUIFacade {
GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
buttonPanel.setLayout(buttonPanelLayout);
-// buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);
buttonPanelLayout.setHorizontalGroup(
buttonPanelLayout.createSequentialGroup()
.addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -738,7 +737,6 @@ public class BKUGUI implements BKUGUIFacade {
GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
buttonPanel.setLayout(buttonPanelLayout);
-// buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);
buttonPanelLayout.setHorizontalGroup(
buttonPanelLayout.createSequentialGroup()
.addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -844,16 +842,12 @@ public class BKUGUI implements BKUGUIFacade {
GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
buttonPanel.setLayout(buttonPanelLayout);
-// buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);
buttonPanelLayout.setHorizontalGroup(
buttonPanelLayout.createSequentialGroup()
-// buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-// .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
.addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
buttonPanelLayout.setVerticalGroup(
buttonPanelLayout.createSequentialGroup()
-// buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
.addComponent(okButton));
contentPanel.validate();
@@ -1068,7 +1062,6 @@ public class BKUGUI implements BKUGUIFacade {
GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
buttonPanel.setLayout(buttonPanelLayout);
- // buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);
buttonPanelLayout.setHorizontalGroup(
buttonPanelLayout.createSequentialGroup()
.addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -1211,7 +1204,6 @@ public class BKUGUI implements BKUGUIFacade {
GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
buttonPanel.setLayout(buttonPanelLayout);
- // buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);
buttonPanelLayout.setHorizontalGroup(
buttonPanelLayout.createSequentialGroup()
.addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -1343,82 +1335,4 @@ public class BKUGUI implements BKUGUIFacade {
}
}
}
-
-// private String parseToken(final char[] terminators) {
-// char ch;
-// i1 = pos;
-// i2 = pos;
-// while (hasChar()) {
-// ch = chars[pos];
-// if (isOneOf(ch, terminators)) {
-// break;
-// }
-// i2++;
-// pos++;
-// }
-// return getToken(false);
-// }
-
-// private static String getCharset(String contentType) {
-//
-// StringTokenizer t = new StringTokenizer
-//
-// if (contentType == null) {
-// return "UTF-8";
-// }
-//
-// int pos = 0;
-// int len = contentType.length();
-//
-// while (pos < len) {
-// pos++;
-// String paramName = parseToken(new char[] {
-// '=', separator });
-// }
-//
-// HashMap params = new HashMap();
-// this.chars = chars;
-// this.pos = offset;
-// this.len = length;
-//
-// String paramName = null;
-// String paramValue = null;
-// while (hasChar()) {
-// paramName = parseToken(new char[] {
-// '=', separator });
-// paramValue = null;
-// if (hasChar() && (chars[pos] == '=')) {
-// pos++; // skip '='
-// paramValue = parseQuotedToken(new char[] {
-// separator });
-// }
-// if (hasChar() && (chars[pos] == separator)) {
-// pos++; // skip separator
-// }
-// if ((paramName != null) && (paramName.length() > 0)) {
-// if (this.lowerCaseNames) {
-// paramName = paramName.toLowerCase();
-// }
-// params.put(paramName, paramValue);
-// }
-// }
-// return params;
-//
-//
-//
-// Parser
-// ParameterParser pf = new ParameterParser();
-// pf.setLowerCaseNames(true);
-// Map map = pf.parse(contentType, SEPERATOR);
-// String retVal = (String) map.get(CHAR_SET);
-// if ((retVal == null) && (replaceNullWithDefault)) {
-// if (map.containsKey(APPLICATION_URL_ENCODED)) {
-// // default charset for url encoded data
-// return "UTF-8";
-// }
-// retVal = getDefaultCharset();
-// }
-// return retVal;
-// }
-
}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
index 8e32d67e..e323d195 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
@@ -54,7 +54,6 @@ import javax.swing.JTable;
import javax.swing.JTextArea;
import javax.swing.LayoutStyle;
import javax.swing.SwingUtilities;
-import javax.swing.border.TitledBorder;
import javax.swing.table.TableColumn;
import javax.swing.table.TableModel;
import org.apache.commons.logging.Log;
@@ -196,14 +195,15 @@ public class SimpleGUI implements BKUGUIFacade {
if (background == null) {
background = this.getClass().getResource(DEFAULT_BACKGROUND);
}
- contentPanel = new ImagePanel(background);
+ contentPanel = new ImagePanel(background);
// contentPanel.setBorder(new TitledBorder("content"));
// headerPanel = new JPanel();
+// headerPanel.setOpaque(false);
mainPanel = new JPanel();
mainPanel.setOpaque(false);
- buttonPanel = new JPanel(); // new ImagePanel(LOGO_RESOURCE); //new JPanel();
+ buttonPanel = new JPanel();
buttonPanel.setOpaque(false);
// headerPanel.setBorder(new TitledBorder("header"));
@@ -570,13 +570,12 @@ public class SimpleGUI implements BKUGUIFacade {
mainPanel.setLayout(mainPanelLayout);
mainPanelLayout.setHorizontalGroup(
- mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
- .addGroup(mainPanelLayout.createSequentialGroup()
- .addComponent(cardPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-// .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
- .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) //))
- .addComponent(infoLabel));
+ mainPanelLayout.createSequentialGroup()
+ .addComponent(cardPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
+ .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) //))
+ .addComponent(infoLabel)));
mainPanelLayout.setVerticalGroup(
mainPanelLayout.createSequentialGroup()
@@ -589,7 +588,6 @@ public class SimpleGUI implements BKUGUIFacade {
.addComponent(infoLabel));
// .addGap(signPinLabel.getFont().getSize()));
-
GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
buttonPanel.setLayout(buttonPanelLayout);
@@ -731,9 +729,9 @@ public class SimpleGUI implements BKUGUIFacade {
.addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
.addComponent(signPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-// .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
- .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addComponent(infoLabel));
+ .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
+ .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(infoLabel))));
mainPanelLayout.setVerticalGroup(
mainPanelLayout.createSequentialGroup()
@@ -1384,82 +1382,4 @@ public class SimpleGUI implements BKUGUIFacade {
}
}
}
-
-// private String parseToken(final char[] terminators) {
-// char ch;
-// i1 = pos;
-// i2 = pos;
-// while (hasChar()) {
-// ch = chars[pos];
-// if (isOneOf(ch, terminators)) {
-// break;
-// }
-// i2++;
-// pos++;
-// }
-// return getToken(false);
-// }
-
-// private static String getCharset(String contentType) {
-//
-// StringTokenizer t = new StringTokenizer
-//
-// if (contentType == null) {
-// return "UTF-8";
-// }
-//
-// int pos = 0;
-// int len = contentType.length();
-//
-// while (pos < len) {
-// pos++;
-// String paramName = parseToken(new char[] {
-// '=', separator });
-// }
-//
-// HashMap params = new HashMap();
-// this.chars = chars;
-// this.pos = offset;
-// this.len = length;
-//
-// String paramName = null;
-// String paramValue = null;
-// while (hasChar()) {
-// paramName = parseToken(new char[] {
-// '=', separator });
-// paramValue = null;
-// if (hasChar() && (chars[pos] == '=')) {
-// pos++; // skip '='
-// paramValue = parseQuotedToken(new char[] {
-// separator });
-// }
-// if (hasChar() && (chars[pos] == separator)) {
-// pos++; // skip separator
-// }
-// if ((paramName != null) && (paramName.length() > 0)) {
-// if (this.lowerCaseNames) {
-// paramName = paramName.toLowerCase();
-// }
-// params.put(paramName, paramValue);
-// }
-// }
-// return params;
-//
-//
-//
-// Parser
-// ParameterParser pf = new ParameterParser();
-// pf.setLowerCaseNames(true);
-// Map map = pf.parse(contentType, SEPERATOR);
-// String retVal = (String) map.get(CHAR_SET);
-// if ((retVal == null) && (replaceNullWithDefault)) {
-// if (map.containsKey(APPLICATION_URL_ENCODED)) {
-// // default charset for url encoded data
-// return "UTF-8";
-// }
-// retVal = getDefaultCharset();
-// }
-// return retVal;
-// }
-
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-31 02:13:15 +0000