From 53f7ac73fbb1810770cbf68eb87e3db165245e64 Mon Sep 17 00:00:00 2001 From: Tobias Kellner Date: Wed, 17 Oct 2012 18:19:45 +0200 Subject: Move izpack stuff to resources, add icons dir --- trunk/pdf-over-gui/src/main/izpack/install.xml | 68 ---------------------- .../src/main/izpack/unix_shortcutSpec.xml | 29 --------- .../src/main/izpack/win_shortcutSpec.xml | 29 --------- .../src/main/resources/icons/delete_me | 0 .../src/main/resources/izpack/install.xml | 68 ++++++++++++++++++++++ .../main/resources/izpack/unix_shortcutSpec.xml | 29 +++++++++ .../src/main/resources/izpack/win_shortcutSpec.xml | 29 +++++++++ .../src/main/resources/scripts/pdfover_linux.sh | 2 + .../src/main/resources/scripts/pdfover_mac.sh | 2 + .../src/main/resources/scripts/pdfover_win.bat | 1 + .../pdf-over-gui/src/main/scripts/pdfover_linux.sh | 2 - trunk/pdf-over-gui/src/main/scripts/pdfover_mac.sh | 2 - .../pdf-over-gui/src/main/scripts/pdfover_win.bat | 1 - 13 files changed, 131 insertions(+), 131 deletions(-) delete mode 100644 trunk/pdf-over-gui/src/main/izpack/install.xml delete mode 100644 trunk/pdf-over-gui/src/main/izpack/unix_shortcutSpec.xml delete mode 100644 trunk/pdf-over-gui/src/main/izpack/win_shortcutSpec.xml create mode 100644 trunk/pdf-over-gui/src/main/resources/icons/delete_me create mode 100644 trunk/pdf-over-gui/src/main/resources/izpack/install.xml create mode 100644 trunk/pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml create mode 100644 trunk/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml create mode 100644 trunk/pdf-over-gui/src/main/resources/scripts/pdfover_linux.sh create mode 100644 trunk/pdf-over-gui/src/main/resources/scripts/pdfover_mac.sh create mode 100644 trunk/pdf-over-gui/src/main/resources/scripts/pdfover_win.bat delete mode 100644 trunk/pdf-over-gui/src/main/scripts/pdfover_linux.sh delete mode 100644 trunk/pdf-over-gui/src/main/scripts/pdfover_mac.sh delete mode 100644 trunk/pdf-over-gui/src/main/scripts/pdfover_win.bat (limited to 'trunk/pdf-over-gui/src') diff --git a/trunk/pdf-over-gui/src/main/izpack/install.xml b/trunk/pdf-over-gui/src/main/izpack/install.xml deleted file mode 100644 index 002584ca..00000000 --- a/trunk/pdf-over-gui/src/main/izpack/install.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - PDFOver - 4.0 - - 1.6 - - - - - http://www.a-sit.at/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Main Installation - - - - - - - - - - \ No newline at end of file diff --git a/trunk/pdf-over-gui/src/main/izpack/unix_shortcutSpec.xml b/trunk/pdf-over-gui/src/main/izpack/unix_shortcutSpec.xml deleted file mode 100644 index 05e8bee8..00000000 --- a/trunk/pdf-over-gui/src/main/izpack/unix_shortcutSpec.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/trunk/pdf-over-gui/src/main/izpack/win_shortcutSpec.xml b/trunk/pdf-over-gui/src/main/izpack/win_shortcutSpec.xml deleted file mode 100644 index 8ad6666f..00000000 --- a/trunk/pdf-over-gui/src/main/izpack/win_shortcutSpec.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/trunk/pdf-over-gui/src/main/resources/icons/delete_me b/trunk/pdf-over-gui/src/main/resources/icons/delete_me new file mode 100644 index 00000000..e69de29b diff --git a/trunk/pdf-over-gui/src/main/resources/izpack/install.xml b/trunk/pdf-over-gui/src/main/resources/izpack/install.xml new file mode 100644 index 00000000..002584ca --- /dev/null +++ b/trunk/pdf-over-gui/src/main/resources/izpack/install.xml @@ -0,0 +1,68 @@ + + + + + + PDFOver + 4.0 + + 1.6 + + + + + http://www.a-sit.at/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Main Installation + + + + + + + + + + \ No newline at end of file diff --git a/trunk/pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml b/trunk/pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml new file mode 100644 index 00000000..05e8bee8 --- /dev/null +++ b/trunk/pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml b/trunk/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml new file mode 100644 index 00000000..8ad6666f --- /dev/null +++ b/trunk/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/pdf-over-gui/src/main/resources/scripts/pdfover_linux.sh b/trunk/pdf-over-gui/src/main/resources/scripts/pdfover_linux.sh new file mode 100644 index 00000000..b785db7c --- /dev/null +++ b/trunk/pdf-over-gui/src/main/resources/scripts/pdfover_linux.sh @@ -0,0 +1,2 @@ +#!/bin/sh +java -cp "lib/*" at.asit.pdfover.gui.Main \ No newline at end of file diff --git a/trunk/pdf-over-gui/src/main/resources/scripts/pdfover_mac.sh b/trunk/pdf-over-gui/src/main/resources/scripts/pdfover_mac.sh new file mode 100644 index 00000000..b785db7c --- /dev/null +++ b/trunk/pdf-over-gui/src/main/resources/scripts/pdfover_mac.sh @@ -0,0 +1,2 @@ +#!/bin/sh +java -cp "lib/*" at.asit.pdfover.gui.Main \ No newline at end of file diff --git a/trunk/pdf-over-gui/src/main/resources/scripts/pdfover_win.bat b/trunk/pdf-over-gui/src/main/resources/scripts/pdfover_win.bat new file mode 100644 index 00000000..222bd263 --- /dev/null +++ b/trunk/pdf-over-gui/src/main/resources/scripts/pdfover_win.bat @@ -0,0 +1 @@ +..\lib\pdf-over-gui-4.0.0-SNAPSHOT.jar %* \ No newline at end of file diff --git a/trunk/pdf-over-gui/src/main/scripts/pdfover_linux.sh b/trunk/pdf-over-gui/src/main/scripts/pdfover_linux.sh deleted file mode 100644 index b785db7c..00000000 --- a/trunk/pdf-over-gui/src/main/scripts/pdfover_linux.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -java -cp "lib/*" at.asit.pdfover.gui.Main \ No newline at end of file diff --git a/trunk/pdf-over-gui/src/main/scripts/pdfover_mac.sh b/trunk/pdf-over-gui/src/main/scripts/pdfover_mac.sh deleted file mode 100644 index b785db7c..00000000 --- a/trunk/pdf-over-gui/src/main/scripts/pdfover_mac.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -java -cp "lib/*" at.asit.pdfover.gui.Main \ No newline at end of file diff --git a/trunk/pdf-over-gui/src/main/scripts/pdfover_win.bat b/trunk/pdf-over-gui/src/main/scripts/pdfover_win.bat deleted file mode 100644 index 222bd263..00000000 --- a/trunk/pdf-over-gui/src/main/scripts/pdfover_win.bat +++ /dev/null @@ -1 +0,0 @@ -..\lib\pdf-over-gui-4.0.0-SNAPSHOT.jar %* \ No newline at end of file -- cgit v1.2.3 From 1b21c58a97db6be37186690a7e830dde1e6ad97e Mon Sep 17 00:00:00 2001 From: Andreas Fitzek Date: Thu, 18 Oct 2012 08:46:13 +0200 Subject: Set foreground color to black --- .../src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'trunk/pdf-over-gui/src') diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java index 5ee261f1..a3e95e23 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java +++ b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java @@ -83,7 +83,8 @@ public abstract class MainBarButton extends Canvas { this.inactiveBackground = new Color(getDisplay(),0xD4, 0xE7, 0xF1); this.activeBackground1 = new Color(getDisplay(),0x6B, 0xA5, 0xD9); this.activeBackground = new Color(getDisplay(),0xB4, 0xCD, 0xEC); - this.textColor = this.getForeground(); + //this.textColor = this.getForeground(); + this.textColor = new Color(getDisplay(), 0x00, 0x00, 0x00); this.borderColor = new Color(getDisplay(), 0xf9, 0xf9, 0xf9); this.inactiveText = new Color(getDisplay(), 0x40, 0x40, 0x40); this.textsize = StateComposite.TEXT_SIZE_BUTTON; -- cgit v1.2.3 From edd77362bcc7592f749608bf34761fc6c7aa4d80 Mon Sep 17 00:00:00 2001 From: vkrnjic Date: Thu, 18 Oct 2012 13:29:28 +0200 Subject: pdf-over icon for 256 x 256 --- .../src/main/resources/img/pdf-over-icon.png | Bin 13796 -> 14903 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'trunk/pdf-over-gui/src') diff --git a/trunk/pdf-over-gui/src/main/resources/img/pdf-over-icon.png b/trunk/pdf-over-gui/src/main/resources/img/pdf-over-icon.png index ceffae90..d74070d4 100644 Binary files a/trunk/pdf-over-gui/src/main/resources/img/pdf-over-icon.png and b/trunk/pdf-over-gui/src/main/resources/img/pdf-over-icon.png differ -- cgit v1.2.3 From 3032162bb2d76b0b4ac5d2e8abe7f9731a0768e9 Mon Sep 17 00:00:00 2001 From: vkrnjic Date: Thu, 18 Oct 2012 15:59:44 +0200 Subject: 96x96 icon --- .../pdf-over-gui/src/main/resources/icons/icon96x96.png | Bin 0 -> 4091 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 trunk/pdf-over-gui/src/main/resources/icons/icon96x96.png (limited to 'trunk/pdf-over-gui/src') diff --git a/trunk/pdf-over-gui/src/main/resources/icons/icon96x96.png b/trunk/pdf-over-gui/src/main/resources/icons/icon96x96.png new file mode 100644 index 00000000..e4a3df8a Binary files /dev/null and b/trunk/pdf-over-gui/src/main/resources/icons/icon96x96.png differ -- cgit v1.2.3 From d843a72193d30509157b9bd8a439cd975bfef8a0 Mon Sep 17 00:00:00 2001 From: Andreas Fitzek Date: Tue, 23 Oct 2012 08:30:58 +0200 Subject: + Color changed for drop border, + removed pack in BKUSelectionComposite + using default background color as mainbar border color --- .../java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java | 3 ++- .../java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java | 2 +- .../src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'trunk/pdf-over-gui/src') diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java index c59d50f9..a7a1b6aa 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java +++ b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java @@ -41,6 +41,7 @@ import at.asit.pdfover.signator.BKUs; */ public class BKUSelectionComposite extends StateComposite { + public static final int btnMargin = 2; /** * Listener for local bku selection @@ -151,7 +152,7 @@ public class BKUSelectionComposite extends StateComposite { btn_card.setImage(karte); - this.pack(); + //this.pack(); } @Override diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java index dffa38e7..fd466897 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java +++ b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java @@ -142,7 +142,7 @@ public class DataSourceSelectComposite extends StateComposite { Rectangle clientArea = DataSourceSelectComposite.this .drop_area.getClientArea(); - e.gc.setForeground(new Color(getDisplay(), 0x7E, 0x9F, 0xA5)); + e.gc.setForeground(new Color(getDisplay(),0x6B, 0xA5, 0xD9)); e.gc.setLineStyle(SWT.LINE_DASH); e.gc.drawRoundRectangle(clientArea.x, clientArea.y, clientArea.width - 2, clientArea.height - 2, diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java index a3e95e23..32b44a78 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java +++ b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java @@ -85,7 +85,8 @@ public abstract class MainBarButton extends Canvas { this.activeBackground = new Color(getDisplay(),0xB4, 0xCD, 0xEC); //this.textColor = this.getForeground(); this.textColor = new Color(getDisplay(), 0x00, 0x00, 0x00); - this.borderColor = new Color(getDisplay(), 0xf9, 0xf9, 0xf9); + //this.borderColor = new Color(getDisplay(), 0xf9, 0xf9, 0xf9); + this.borderColor = this.getBackground(); this.inactiveText = new Color(getDisplay(), 0x40, 0x40, 0x40); this.textsize = StateComposite.TEXT_SIZE_BUTTON; -- cgit v1.2.3 From b8ce94f8e7392124e7f0db6c2558dfda66ea6c22 Mon Sep 17 00:00:00 2001 From: Andreas Fitzek Date: Tue, 23 Oct 2012 08:31:32 +0200 Subject: + try to fix mainbar repaint issue for windows platform --- .../main/java/at/asit/pdfover/gui/MainWindow.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'trunk/pdf-over-gui/src') diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java index 2bf827b6..fb29ae9b 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java +++ b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java @@ -101,6 +101,8 @@ public class MainWindow { private FormData mainBarFormData; + private Composite mainbar; + /** * Default constructor * @@ -191,16 +193,16 @@ public class MainWindow { getShell().setLayout(new FormLayout()); - Composite composite = new Composite(getShell(), SWT.NONE); - composite.setLayout(new FormLayout()); + this.mainbar = new Composite(getShell(), SWT.NONE); + this.mainbar.setLayout(new FormLayout()); this.mainBarFormData = new FormData(); this.mainBarFormData.left = new FormAttachment(0, 10); this.mainBarFormData.right = new FormAttachment(100, -10); this.mainBarFormData.top = new FormAttachment(0, 10); this.mainBarFormData.bottom = new FormAttachment(0, 67); - composite.setLayoutData(this.mainBarFormData); + this.mainbar.setLayoutData(this.mainBarFormData); - this.btn_config = new MainBarRectangleButton(composite, SWT.NONE); + this.btn_config = new MainBarRectangleButton(this.mainbar, SWT.NONE); FormData fd_btn_config = new FormData(); fd_btn_config.bottom = new FormAttachment(100); fd_btn_config.right = new FormAttachment(0, 57); @@ -236,7 +238,7 @@ public class MainWindow { this.btn_config.setImage(new Image(Display.getDefault(), new ImageData( is))); - this.btn_open = new MainBarStartButton(composite, SWT.NONE); + this.btn_open = new MainBarStartButton(this.mainbar, SWT.NONE); FormData fd_btn_open = new FormData(); fd_btn_open.bottom = new FormAttachment(100); fd_btn_open.right = new FormAttachment(35, (MainBarButton.SplitFactor / 2)); @@ -265,7 +267,7 @@ public class MainWindow { }); this.buttonMap.put(Buttons.OPEN, this.btn_open); - this.btn_position = new MainBarMiddleButton(composite, SWT.NONE); + this.btn_position = new MainBarMiddleButton(this.mainbar, SWT.NONE); FormData fd_btn_position = new FormData(); fd_btn_position.bottom = new FormAttachment(100); fd_btn_position.right = new FormAttachment(60, (MainBarButton.SplitFactor / 2)); @@ -294,7 +296,7 @@ public class MainWindow { }); this.buttonMap.put(Buttons.POSITION, this.btn_position); - this.btn_sign = new MainBarMiddleButton(composite, SWT.NONE); + this.btn_sign = new MainBarMiddleButton(this.mainbar, SWT.NONE); FormData fd_btn_sign = new FormData(); fd_btn_sign.bottom = new FormAttachment(100); fd_btn_sign.right = new FormAttachment(85, (MainBarButton.SplitFactor / 2)); @@ -323,7 +325,7 @@ public class MainWindow { }); this.buttonMap.put(Buttons.SIGN, this.btn_sign); - MainBarEndButton end = new MainBarEndButton(composite, SWT.NONE); + MainBarEndButton end = new MainBarEndButton(this.mainbar, SWT.NONE); FormData fd_btn_end = new FormData(); fd_btn_end.bottom = new FormAttachment(100); fd_btn_end.right = new FormAttachment(100); @@ -371,6 +373,8 @@ public class MainWindow { } else { this.mainBarFormData.bottom = new FormAttachment(0, 0); } + + this.mainbar.redraw(); } /** -- cgit v1.2.3 From 86f1565d19616563bfa492a3f7ab56135a2f7d7f Mon Sep 17 00:00:00 2001 From: Andreas Fitzek Date: Tue, 23 Oct 2012 09:10:47 +0200 Subject: + fixed windows mainbar redraw issue --- trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'trunk/pdf-over-gui/src') diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java index fb29ae9b..c8455d3f 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java +++ b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java @@ -205,7 +205,7 @@ public class MainWindow { this.btn_config = new MainBarRectangleButton(this.mainbar, SWT.NONE); FormData fd_btn_config = new FormData(); fd_btn_config.bottom = new FormAttachment(100); - fd_btn_config.right = new FormAttachment(0, 57); + fd_btn_config.right = new FormAttachment(0, 50); fd_btn_config.top = new FormAttachment(0); fd_btn_config.left = new FormAttachment(0); this.btn_config.setLayoutData(fd_btn_config); @@ -374,6 +374,8 @@ public class MainWindow { this.mainBarFormData.bottom = new FormAttachment(0, 0); } + this.getShell().getDisplay().update(); + this.mainbar.layout(true, true); this.mainbar.redraw(); } -- cgit v1.2.3 From e96e9dd6bcab614a60fa491ef68017bea4862af3 Mon Sep 17 00:00:00 2001 From: Andreas Fitzek Date: Tue, 23 Oct 2012 15:46:53 +0200 Subject: + added Signator Placeholder generation for PDF-AS: check: SignatureParameter.getPlaceholder() --- .../asit/pdfover/gui/controls/MainBarButton.java | 20 +- .../pdfover/gui/workflow/states/OpenState.java | 8 +- .../asit/pdfover/signator/SignatureParameter.java | 9 + .../at/asit/pdfover/signer/pdfas/PDFASHelper.java | 4 + .../at/asit/pdfover/signer/pdfas/PDFASSigner.java | 56 ++-- .../signer/pdfas/PdfAsSignatureParameter.java | 343 ++++++++++++++++++++- 6 files changed, 405 insertions(+), 35 deletions(-) (limited to 'trunk/pdf-over-gui/src') diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java index 32b44a78..5c7af927 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java +++ b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java @@ -309,7 +309,7 @@ public abstract class MainBarButton extends Canvas { */ protected void paintText(PaintEvent e) { Point size = this.getSize(); - int height = size.y - 2; + int height = size.y; int width = size.x; @@ -351,9 +351,21 @@ public abstract class MainBarButton extends Canvas { e.gc.setForeground(current); } else { - int imgx = (width - height) / 2; - Image tmp = new Image(getDisplay(), this.image.getImageData()); - e.gc.drawImage(tmp, imgx, 0); + + //log.debug("Width: " + width + " Height: " + height); + + int w = 0; + Image tmp = null; + if(this.image.getImageData().width < width) { + tmp = new Image(getDisplay(), this.image.getImageData()); + w = (width - this.image.getImageData().width) / 2; + } else if(this.image.getImageData().width > width) { + tmp = new Image(getDisplay(), this.image.getImageData().scaledTo(width, width)); + } else { + tmp = new Image(getDisplay(), this.image.getImageData()); + } + + e.gc.drawImage(tmp, w, w); } } diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java index 08212c8f..a158d7ca 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java +++ b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java @@ -26,6 +26,9 @@ import at.asit.pdfover.gui.composites.DataSourceSelectComposite; import at.asit.pdfover.gui.workflow.ConfigProvider; import at.asit.pdfover.gui.workflow.StateMachine; import at.asit.pdfover.gui.workflow.Status; +import at.asit.pdfover.signator.FileNameEmlbem; +import at.asit.pdfover.signator.SignatureException; +import at.asit.pdfover.signator.SignatureParameter; /** * Selects the data source for the signature process. @@ -58,6 +61,9 @@ public class OpenState extends State { @Override public void run() { + + + Status status = this.stateMachine.getStatus(); if (!(status.getPreviousState() instanceof PrepareConfigurationState) && !(status.getPreviousState() instanceof OpenState)) @@ -67,7 +73,7 @@ public class OpenState extends State { status.setDocument(null); status.setSignaturePosition(config.getDefaultSignaturePosition()); } - + if (status.getDocument() == null) { DataSourceSelectComposite selection = this .getSelectionComposite(); diff --git a/trunk/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SignatureParameter.java b/trunk/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SignatureParameter.java index e16656dd..8cc97f7e 100644 --- a/trunk/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SignatureParameter.java +++ b/trunk/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SignatureParameter.java @@ -15,6 +15,8 @@ */ package at.asit.pdfover.signator; +import java.awt.Image; + //Imports /** @@ -121,6 +123,13 @@ public abstract class SignatureParameter { */ public abstract SignatureDimension getPlaceholderDimension(); + /** + * Gets the Dimension to display the Placeholder + * @return the placeholder dimensions + */ + public abstract Image getPlaceholder() throws SignatureException; + + /** * Gets the Emblem * @return the Emblem diff --git a/trunk/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PDFASHelper.java b/trunk/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PDFASHelper.java index ee3cc7a9..2553eaad 100644 --- a/trunk/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PDFASHelper.java +++ b/trunk/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PDFASHelper.java @@ -50,6 +50,10 @@ public class PDFASHelper { return new at.gv.egiz.pdfas.impl.api.PdfAsObject(); } + public static String getWorkDir() { + return System.getProperty("user.home")+"/.pdfover"; + } + /** * Creates a PDF-AS Internal object * @return the PDF-AS Internal object diff --git a/trunk/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PDFASSigner.java b/trunk/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PDFASSigner.java index 1b058553..91581a17 100644 --- a/trunk/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PDFASSigner.java +++ b/trunk/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PDFASSigner.java @@ -1,5 +1,11 @@ package at.asit.pdfover.signer.pdfas; +import java.util.Iterator; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import at.asit.pdfover.signator.BKUs; import at.asit.pdfover.signator.ByteArrayDocumentSource; import at.asit.pdfover.signator.SLResponse; @@ -19,12 +25,18 @@ import at.gv.egiz.pdfas.api.commons.Constants; import at.gv.egiz.pdfas.api.exceptions.PdfAsException; import at.gv.egiz.pdfas.api.internal.LocalBKUParams; import at.gv.egiz.pdfas.api.internal.PdfAsInternal; +import at.knowcenter.wag.egov.egiz.cfg.SettingsReader; /** * PDF AS Signer Implementation */ public class PDFASSigner implements Signer { + /** + * SFL4J Logger instance + **/ + static final Logger log = LoggerFactory.getLogger(PDFASSigner.class); + /** * The profile ID */ @@ -38,8 +50,9 @@ public class PDFASSigner implements Signer { /** * Location reference string */ - protected static final String LOC_REF = "" + URL_TEMPLATE + ""; - + protected static final String LOC_REF = "" + URL_TEMPLATE + + ""; + @Override public SigningState prepare(SignatureParameter parameter) throws SignatureException { @@ -60,12 +73,12 @@ public class PDFASSigner implements Signer { SignParameters params = new SignParameters(); params.setSignaturePositioning(sign_para.getPDFASPositioning()); - - if(parameter.getSignatureDevice() == BKUs.LOCAL) { + + if (parameter.getSignatureDevice() == BKUs.LOCAL) { params.setSignatureDevice(Constants.SIGNATURE_DEVICE_BKU); - } else if(parameter.getSignatureDevice() == BKUs.MOBILE) { + } else if (parameter.getSignatureDevice() == BKUs.MOBILE) { params.setSignatureDevice(Constants.SIGNATURE_DEVICE_MOBILE); - //params.setSignatureDevice(Constants.SIGNATURE_DEVICE_MOBILETEST); + // params.setSignatureDevice(Constants.SIGNATURE_DEVICE_MOBILETEST); } params.setSignatureType(Constants.SIGNATURE_TYPE_BINARY); params.setSignatureProfileId(PROFILE_ID); @@ -75,7 +88,7 @@ public class PDFASSigner implements Signer { params.setProfileOverrideValue("SIG_LABEL", parameter .getEmblem().getFileName()); } - + // Prepare Output sink state.setOutput(new ByteArrayDataSink()); params.setOutput(state.getOutput()); @@ -95,17 +108,18 @@ public class PDFASSigner implements Signer { String slRequest = pdfasInternal.prepareLocalSignRequest(params, false, URL_TEMPLATE, sdi); - at.gv.egiz.pdfas.api.io.DataSource sig_data = sdi.getSignatureData(); - - PDFASSLRequest request = new PDFASSLRequest(slRequest, sig_data.getAsByteArray()); + at.gv.egiz.pdfas.api.io.DataSource sig_data = sdi + .getSignatureData(); + + PDFASSLRequest request = new PDFASSLRequest(slRequest, + sig_data.getAsByteArray()); state.setSignatureRequest(request); return state; - } catch(PDFASSLRequestException e) { + } catch (PDFASSLRequestException e) { throw new SignatureException(e); - } - catch (PdfAsException e) { + } catch (PdfAsException e) { throw new SignatureException(e); } } @@ -130,13 +144,14 @@ public class PDFASSigner implements Signer { SignParameters params = sstate.getSignParameters(); - SignatureDetailInformation sdi = sstate .getSignatureDetailInformation(); SLResponse slResponse = sstate.getSignatureResponse(); - - LocalBKUParams bkuParams = new LocalBKUParams(slResponse.getServer(), slResponse.getUserAgent(), slResponse.getSignaturLayout()); + + LocalBKUParams bkuParams = new LocalBKUParams( + slResponse.getServer(), slResponse.getUserAgent(), + slResponse.getSignaturLayout()); // Perform signature at.gv.egiz.pdfas.api.sign.SignResult signResult = pdfasInternal @@ -154,12 +169,15 @@ public class PDFASSigner implements Signer { // Set Signature position SignaturePosition pos = new SignaturePosition(pdfasPos.getX(), pdfasPos.getY(), pdfasPos.getPage()); -/* pos.SetAuto(sstate.getPDFAsSignatureParameter() - .getSignaturePosition().useAutoPositioning());*/ + /* + * pos.SetAuto(sstate.getPDFAsSignatureParameter() + * .getSignaturePosition().useAutoPositioning()); + */ result.setSignaturePosition(pos); // Set signed Document - result.setSignedDocument(new ByteArrayDocumentSource(((ByteArrayDataSink)sstate.getOutput()).getData())); + result.setSignedDocument(new ByteArrayDocumentSource( + ((ByteArrayDataSink) sstate.getOutput()).getData())); return result; } catch (PdfAsException e) { diff --git a/trunk/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PdfAsSignatureParameter.java b/trunk/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PdfAsSignatureParameter.java index fa1572e9..eb598f07 100644 --- a/trunk/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PdfAsSignatureParameter.java +++ b/trunk/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PdfAsSignatureParameter.java @@ -16,53 +16,87 @@ package at.asit.pdfover.signer.pdfas; //Imports +import java.awt.Color; +import java.awt.Font; +import java.awt.Graphics; +import java.awt.Image; +import java.awt.ImageCapabilities; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; import java.util.HashMap; +import javax.imageio.ImageIO; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import at.asit.pdfover.signator.SignatureDimension; +import at.asit.pdfover.signator.SignatureException; import at.asit.pdfover.signator.SignatureParameter; import at.asit.pdfover.signator.SignaturePosition; +import at.asit.pdfover.signer.pdfas.exceptions.PDFASSLRequestException; import at.gv.egiz.pdfas.api.io.DataSource; import at.gv.egiz.pdfas.api.sign.pos.SignaturePositioning; +import at.gv.egiz.pdfas.impl.signator.binary.BinarySignator_1_1_0; import at.knowcenter.wag.egov.egiz.exceptions.PDFDocumentException; +import at.knowcenter.wag.egov.egiz.sig.SignatureObject; +import at.knowcenter.wag.egov.egiz.table.Entry; +import at.knowcenter.wag.egov.egiz.table.Style; +import at.knowcenter.wag.egov.egiz.table.Table; /** * Implementation of SignatureParameter specific for PDF - AS Library */ public class PdfAsSignatureParameter extends SignatureParameter { - private HashMap genericProperties = new HashMap(); - + /** + * SFL4J Logger instance + **/ + static final Logger log = LoggerFactory + .getLogger(PdfAsSignatureParameter.class); + + private HashMap genericProperties = new HashMap(); + @Override public SignatureDimension getPlaceholderDimension() { - return new SignatureDimension(487, 206); + // return new SignatureDimension(487, 206); + + return new SignatureDimension(976, 329); } /** * Gets the PDFAS Positioning + * * @return SignaturePositioning - * @throws PDFDocumentException + * @throws PDFDocumentException */ - public SignaturePositioning getPDFASPositioning() throws PDFDocumentException { + public SignaturePositioning getPDFASPositioning() + throws PDFDocumentException { SignaturePosition position = this.getSignaturePosition(); position.useAutoPositioning(); - + SignaturePositioning positioning = null; - if(!position.useAutoPositioning()) { - positioning = new SignaturePositioning(String.format("p:%d;x:%f;y:%f", - position.getPage(), position.getX(), position.getY())); + if (!position.useAutoPositioning()) { + positioning = new SignaturePositioning(String.format( + "p:%d;x:%f;y:%f", position.getPage(), position.getX(), + position.getY())); } else { positioning = new SignaturePositioning(); } - + return positioning; } /** * Gets PDF - AS specific data source + * * @return ByteArrayPDFASDataSource */ public DataSource getPDFASDataSource() { - return new ByteArrayPDFASDataSource(this.getInputDocument().getByteArray()); + return new ByteArrayPDFASDataSource(this.getInputDocument() + .getByteArray()); } @Override @@ -74,4 +108,291 @@ public class PdfAsSignatureParameter extends SignatureParameter { public String getProperty(String key) { return this.genericProperties.get(key); } + + /* + * (non-Javadoc) + * + * @see at.asit.pdfover.signator.SignatureParameter#getPlaceholder() + */ + @Override + public Image getPlaceholder() throws SignatureException { + + try + { + PDFASHelper.getPdfAs(); + + SignatureObject sign_obj = at.knowcenter.wag.egov.egiz.PdfAS + .createSignatureObjectFromType(PDFASSigner.PROFILE_ID); + + sign_obj.fillValues(' ', true, false); + sign_obj.setKZ(BinarySignator_1_1_0.MY_ID); + + float width = getPlaceholderDimension().getWidth(); + float height = getPlaceholderDimension().getHeight(); + + Table table = sign_obj.getAbstractTable(); + + table.getStyle().getBgColor(); + + log.info(table.toString()); + + float[] heights = this.getTableHeights(table, table.getStyle(), height); + + log.info("Width: " + width + " Height: " + height); + BufferedImage image = new BufferedImage((int) width, (int) height, + BufferedImage.TYPE_INT_RGB); + Graphics graphic = image.getGraphics(); + + graphic.setColor(table.getStyle().getBgColor()); + graphic.fillRect(0, 0, (int) width, (int) height); + + graphic.setColor(Color.black); + graphic.drawRect(0, 0, (int) width, (int) height); + + this.drawTable(0, 0, (int) width, (int) height, table, + table.getStyle(), graphic, heights); + + save(image, "jpg"); + + return image; + } + catch (Exception ex) { + log.error("Failed to create Placeholder!", ex); + throw new SignatureException(ex.getMessage()); + } + } + + private static void save(BufferedImage image, String ext) { + String fileName = "savingAnImage"; + File file = new File(fileName + "." + ext); + try { + ImageIO.write(image, ext, file); // ignore returned boolean + log.debug("Saved as: " + file.getAbsolutePath()); + } catch (IOException e) { + System.out.println("Write error for " + file.getPath() + ": " + + e.getMessage()); + } + } + + private Font getFont(Style style) { + String def = "COURIER-NORMAL-8"; + String fontString = style.getFont(); + String[] font_arr = fontString.split(","); + if (font_arr.length != 3) { + return Font.decode(def); + } + return Font.decode(String.format("%s-%s-%s", font_arr[0], font_arr[2], + font_arr[1])); + + } + + private Font getValueFont(Style style) { + String def = "COURIER-NORMAL-8"; + String fontString = style.getValueFont(); + String[] font_arr = fontString.split(","); + if (font_arr.length != 3) { + return Font.decode(def); + } + return Font.decode(String.format("%s-%s-%s", font_arr[0], font_arr[2], + font_arr[1])); + } + + private int drawTable(int xoff, int yoff, int width, int height, + Table table, Style parentstyle, Graphics graphic, float[] heights) { + Style style = parentstyle; + if (table.getStyle() != null) { + style = table.getStyle(); + } + + log.debug(String.format("Table@ %dx%d", xoff, yoff)); + + Font oldFont = graphic.getFont(); + Font font = this.getFont(style); + Font valuefont = this.getValueFont(style); + + // draw background + // graphic.setColor(style.getBgColor()); + // graphic.fillRect(xoff, yoff, width, height); + + graphic.setColor(Color.black); + + // draw border + if (style.getBorder() > 0) { + graphic.setColor(Color.black); + graphic.drawRect(xoff, yoff, width, height); + } + float[] colWidths = table.getColsRelativeWith(); + float sum = 0; + + for (int i = 0; i < colWidths.length; i++) { + sum += colWidths[i]; + } + + float perUnit = width / sum; + + int padding = (int) (style.getPadding() * this.perUnitHeight); + + ArrayList rows = table.getRows(); + float roffset = 0; + for (int rowidx = 0; rowidx < rows.size(); rowidx++) { + ArrayList cols = (ArrayList) rows.get(rowidx); + int rsize = (int) heights[rowidx]; + for (int j = 0; j < cols.size(); j++) { + Entry entry = (Entry) cols.get(j); + float offset = 0; + for (int k = 0; k < j; k++) { + offset += colWidths[k] * perUnit; + } + if (entry.getType() == 0 || entry.getType() == 1) { + // Text + graphic.drawRect((int) (xoff + offset), + (int) (yoff + roffset), + (int) (colWidths[j] * perUnit), rsize); + + graphic.drawString(entry.getValue().toString(), (int) (xoff + + offset + padding), (int) (yoff + padding + + roffset + font.getSize() * this.perUnitHeight)); + } else if (entry.getType() == 2) { + // Image ... + BufferedImage image; + try { + if (this.getEmblem() != null + && this.getEmblem().getFileName() != null + && new File(this.getEmblem().getFileName()) + .exists()) { + image = ImageIO.read(new File(this.getEmblem() + .getFileName())); + } else { + image = ImageIO.read(new File(PDFASHelper + .getWorkDir() + + "/" + + entry.getValue().toString())); + } + Image img = image.getScaledInstance(80, 80, + Image.SCALE_DEFAULT); + + graphic.drawImage( + img, + (int) (xoff + offset + padding + (((colWidths[j] * perUnit) - 80 - padding)) / 2), + (int) (yoff + roffset + padding + ((rsize - 80 - padding) / 2)), + null); + } catch (IOException e) { + log.warn("Failed to paint emblem to placeholder image"); + } + } else { + // Table + + float[] cheights = this.getTableHeights( + (Table) entry.getValue(), style, rsize); + + int tsize = this.drawTable( + (int) (xoff + offset), + (int) (yoff + roffset), + (int) (colWidths[j] * perUnit), + // (int)this.getTableHeight((Table) + // entry.getValue(), style), + rsize, (Table) entry.getValue(), style, graphic, + cheights); + /* + * if (rsize < tsize) { rsize = tsize; } + */ + } + } + roffset += rsize; + } + + graphic.setFont(oldFont); + + return (int) roffset; + } + + private float perUnitHeight = 0; + + private float[] getTableHeights(Table table, Style parentstyle, float height) { + ArrayList rows = table.getRows(); + float[] sizes = new float[rows.size()]; + + float total_height = this.getTableHeight(table, parentstyle); + + float perUnit = height / total_height; + + this.perUnitHeight = perUnit; + + Style style = parentstyle; + if (table.getStyle() != null) { + style = table.getStyle(); + } + + for (int i = 0; i < rows.size(); i++) { + Object robj = rows.get(i); + ArrayList cols = (ArrayList) robj; + float tsize = 0; + float rsize = 0; + for (int j = 0; j < cols.size(); j++) { + Entry entry = (Entry) cols.get(j); + if (entry.getType() == 0 || entry.getType() == 1) { + String fontString = style.getFont(); + String[] font_arr = fontString.split(","); + int fontSize = 8; + + if (font_arr.length == 3) { + fontSize = Integer.parseInt(font_arr[1]); + } + + if (rsize < ((style.getPadding() * 2) + fontSize)) { + rsize = ((style.getPadding() * 2) + fontSize); + } + } else if (entry.getType() == 3) { + tsize = this + .getTableHeight((Table) entry.getValue(), style); + if (rsize < tsize) { + rsize = tsize; + } + } + } + sizes[i] = perUnit * rsize; + } + + return sizes; + } + + private float getTableHeight(Table table, Style parentstyle) { + ArrayList rows = table.getRows(); + Style style = parentstyle; + if (table.getStyle() != null) { + style = table.getStyle(); + } + float size = 0; + for (int i = 0; i < rows.size(); i++) { + Object robj = rows.get(i); + ArrayList cols = (ArrayList) robj; + float tsize = 0; + float rsize = 0; + for (int j = 0; j < cols.size(); j++) { + Entry entry = (Entry) cols.get(j); + if (entry.getType() == 0 || entry.getType() == 1) { + String fontString = style.getFont(); + String[] font_arr = fontString.split(","); + int fontSize = 8; + + if (font_arr.length == 3) { + fontSize = Integer.parseInt(font_arr[1]); + } + + if (rsize < ((style.getPadding() * 2) + fontSize)) { + rsize = ((style.getPadding() * 2) + fontSize); + } + } else if (entry.getType() == 3) { + tsize = this + .getTableHeight((Table) entry.getValue(), style); + if (rsize < tsize) { + rsize = tsize; + } + } + } + size += rsize; + } + + return size; + } } -- cgit v1.2.3 From 74ff027ae135c9280912009d23cbd9945121b088 Mon Sep 17 00:00:00 2001 From: Andreas Fitzek Date: Tue, 23 Oct 2012 17:00:12 +0200 Subject: + fixed Warnings --- .../gui/composites/BKUSelectionComposite.java | 31 +++- .../pdfover/gui/workflow/states/OpenState.java | 3 - .../workflow/states/PrepareConfigurationState.java | 4 +- .../at/asit/pdfover/gui/messages.properties | 188 +++++++++------------ .../asit/pdfover/signator/SignatureParameter.java | 1 + .../at/asit/pdfover/signer/pdfas/PDFASHelper.java | 4 + .../at/asit/pdfover/signer/pdfas/PDFASSigner.java | 14 +- .../signer/pdfas/PdfAsSignatureParameter.java | 20 ++- 8 files changed, 135 insertions(+), 130 deletions(-) (limited to 'trunk/pdf-over-gui/src') diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java index a7a1b6aa..522b3bad 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java +++ b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java @@ -41,6 +41,9 @@ import at.asit.pdfover.signator.BKUs; */ public class BKUSelectionComposite extends StateComposite { + /** + * Margin for button + */ public static final int btnMargin = 2; /** @@ -115,12 +118,12 @@ public class BKUSelectionComposite extends StateComposite { Button btn_mobile = new Button(this, SWT.NATIVE | SWT.RESIZE); - btn_mobile.setText(Messages.getString("bku_selection.mobile")); //$NON-NLS-1$ + //btn_mobile.setText(Messages.getString("bku_selection.mobile")); //$NON-NLS-1$ //Point mobile_size = btn_mobile.computeSize(SWT.DEFAULT, SWT.DEFAULT); FormData fd_btn_mobile = new FormData(); //fd_btn_mobile.left = new FormAttachment(40, 0); fd_btn_mobile.right = new FormAttachment(50, -5); - fd_btn_mobile.top = new FormAttachment(40, 0); + fd_btn_mobile.top = new FormAttachment(40, -20); //fd_btn_mobile.bottom = new FormAttachment(55, 0); btn_mobile.setLayoutData(fd_btn_mobile); btn_mobile.addSelectionListener(new MobileSelectionListener()); @@ -134,12 +137,12 @@ public class BKUSelectionComposite extends StateComposite { btn_mobile.setFont(new Font(Display.getCurrent(), fD_btn_mobile[0])); Button btn_card = new Button(this, SWT.NATIVE | SWT.RESIZE); - btn_card.setText(Messages.getString("bku_selection.card")); //$NON-NLS-1$ + //btn_card.setText(Messages.getString("bku_selection.card")); //$NON-NLS-1$ //Point card_size = btn_card.computeSize(SWT.DEFAULT, SWT.DEFAULT); FormData fd_btn_card = new FormData(); fd_btn_card.left = new FormAttachment(50, 5); //fd_btn_card.right = new FormAttachment(60, 0); - fd_btn_card.top = new FormAttachment(40, 0); + fd_btn_card.top = new FormAttachment(40, -20); //fd_btn_card.bottom = new FormAttachment(55, 0); btn_card.setLayoutData(fd_btn_card); btn_card.addSelectionListener(new LocalSelectionListener()); @@ -152,6 +155,25 @@ public class BKUSelectionComposite extends StateComposite { btn_card.setImage(karte); + Button btnMobile = new Button(this, SWT.NONE); + FormData fd_btnMobile = new FormData(); + fd_btnMobile.top = new FormAttachment(btn_mobile, 10); + //fd_btnMobile.left = new FormAttachment(btn_mobile, 0); + fd_btnMobile.right = new FormAttachment(50, -5); + fd_btnMobile.width = btn_mobile.computeSize(SWT.DEFAULT, SWT.DEFAULT).x; + btnMobile.setLayoutData(fd_btnMobile); + btnMobile.setText(Messages.getString("bku_selection.mobile")); //$NON-NLS-1$ + btnMobile.addSelectionListener(new MobileSelectionListener()); + + Button btnCard = new Button(this, SWT.NONE); + FormData fd_btnCard = new FormData(); + fd_btnCard.top = new FormAttachment(btn_card, 10); + //fd_btnMobile.left = new FormAttachment(btn_mobile, 0); + fd_btnCard.left = new FormAttachment(50, 5); + fd_btnCard.width = btn_card.computeSize(SWT.DEFAULT, SWT.DEFAULT).x; + btnCard.setLayoutData(fd_btnCard); + btnCard.setText(Messages.getString("bku_selection.card")); //$NON-NLS-1$ + btnCard.addSelectionListener(new LocalSelectionListener()); //this.pack(); } @@ -167,5 +189,4 @@ public class BKUSelectionComposite extends StateComposite { public void doLayout() { this.layout(true, true); } - } diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java index a158d7ca..cafcc64e 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java +++ b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java @@ -26,9 +26,6 @@ import at.asit.pdfover.gui.composites.DataSourceSelectComposite; import at.asit.pdfover.gui.workflow.ConfigProvider; import at.asit.pdfover.gui.workflow.StateMachine; import at.asit.pdfover.gui.workflow.Status; -import at.asit.pdfover.signator.FileNameEmlbem; -import at.asit.pdfover.signator.SignatureException; -import at.asit.pdfover.signator.SignatureParameter; /** * Selects the data source for the signature process. diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java index 92cdb774..b4398581 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java +++ b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java @@ -170,7 +170,7 @@ public class PrepareConfigurationState extends State { log.error( "Failed to write PDF Over config file to config directory", e); //$NON-NLS-1$ throw new InitializationException( - "Failed to write PDF Over config file to config directory", + "Failed to write PDF Over config file to config directory", //$NON-NLS-1$ e); } finally { if (pdfOverConfig != null) { @@ -201,7 +201,7 @@ public class PrepareConfigurationState extends State { log.error( "Failed to create local configuration directory!", e); //$NON-NLS-1$ throw new InitializationException( - "Failed to create local configuration directory!", + "Failed to create local configuration directory!", //$NON-NLS-1$ e); } allOK = true; diff --git a/trunk/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties b/trunk/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties index 7f7e8590..643d3cff 100644 --- a/trunk/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties +++ b/trunk/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties @@ -1,117 +1,97 @@ +#Eclipse messages class +#Tue Oct 23 16:04:42 CEST 2012 +BKU.LOCAL=Local BKU +BKU.MOBILE=Mobile BKU +BKU.NONE=no default +BKUSelectionComposite.btnMobile.text=MOBILE TrustedSocketFactory.FailedToCreateSecureConnection=Failed to create secure network connection - -main.title=PDF-Over -main.configuration=Configuration -main.position=Positioning -main.signature=Signing -main.done=Finish - -common.browse=browse +advanced_config.AutoPosition=Automatic positioning +advanced_config.AutoPosition_Title=Positioning +advanced_config.BKUSelection_Title=BKU Selection +advanced_config.OutputFolder=Default output folder\: +advanced_config.OutputFolder.Dialog=Select a folder +advanced_config.OutputFolder.Dialog_Title=Select Output folder +advanced_config.OutputFolder_Title=Output location +argument.error.output=is not a directory +argument.help.bku=Select the BKU to use values are\: LOCAL, MOBILE (example\: -b