diff options
| author | tkellner <tkellner@3a0b52a2-8410-0410-bc02-ff6273a87459> | 2012-10-31 16:36:29 +0000 |
|---|---|---|
| committer | tkellner <tkellner@3a0b52a2-8410-0410-bc02-ff6273a87459> | 2012-10-31 16:36:29 +0000 |
| commit | e57e257772446e24eed8ebd34116c676f7efda8f (patch) | |
| tree | 2090c621f6d0210d688099a059720377e923daa6 | |
| parent | 0e1f70b5c0856d5e4179f3f5127616aac41d3fd6 (diff) | |
| parent | f617a0d0435f5c6822fd00ef79ce73314a4e90ce (diff) | |
| download | pdf-over-e57e257772446e24eed8ebd34116c676f7efda8f.tar.gz pdf-over-e57e257772446e24eed8ebd34116c676f7efda8f.tar.bz2 pdf-over-e57e257772446e24eed8ebd34116c676f7efda8f.zip | |
Merge branch 'master' of git@abyss:12PDF-OVER-4.0.git
git-svn-id: https://svn.iaik.tugraz.at/svn/egiz/prj/current/12PDF-OVER-4.0@12681 3a0b52a2-8410-0410-bc02-ff6273a87459
26 files changed, 95 insertions, 21 deletions
diff --git a/trunk/pdf-over-gui/pom.xml b/trunk/pdf-over-gui/pom.xml index ef3b745e..050097ae 100644 --- a/trunk/pdf-over-gui/pom.xml +++ b/trunk/pdf-over-gui/pom.xml @@ -184,6 +184,7 @@ <staging.dir>${project.build.directory}/staging</staging.dir> <target.name>linux</target.name> <izpack-standalone.version>4.3.5</izpack-standalone.version> + <project.maindir>${project.basedir}/..</project.maindir> </properties> <profiles> @@ -295,4 +296,4 @@ </pluginRepository> </pluginRepositories> -</project>
\ No newline at end of file +</project> 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 d981189d..d9bfe86f 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 @@ -191,6 +191,12 @@ public class MainWindow { getShell().setSize(1024, 768); getShell().setText(Messages.getString("main.title")); //$NON-NLS-1$ + ImageData data = new ImageData(this.getClass().getResourceAsStream("/img/icon.png"));//$NON-NLS-1$ + Image shellicon = new Image(this.shell.getDisplay(), data); + + this.shell.setImage(shellicon); + + getShell().setLayout(new FormLayout()); this.mainbar = new Composite(getShell(), SWT.NONE); diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java index da685f62..fb716104 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java +++ b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java @@ -24,6 +24,8 @@ import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.events.TraverseEvent; import org.eclipse.swt.events.TraverseListener; import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; @@ -192,8 +194,8 @@ public class MobileBKUEnterNumberComposite extends StateComposite { FormData fd_containerComposite = new FormData(); fd_containerComposite.top = new FormAttachment(50, -100); fd_containerComposite.bottom = new FormAttachment(50, 100); - fd_containerComposite.left = new FormAttachment(50, -250); - fd_containerComposite.right = new FormAttachment(50, 250); + fd_containerComposite.left = new FormAttachment(50, -200); + fd_containerComposite.right = new FormAttachment(50, 200); containerComposite.setLayoutData(fd_containerComposite); @@ -206,15 +208,31 @@ public class MobileBKUEnterNumberComposite extends StateComposite { this.txt_number.setLayoutData(fd_number); this.txt_number.setEditable(true); + Label lbl_number = new Label(containerComposite, SWT.NATIVE); + lbl_number.setAlignment(SWT.RIGHT); lbl_number.setText(Messages.getString("mobileBKU.number")); //$NON-NLS-1$ FormData fd_lbl_number = new FormData(); //fd_lbl_number.top = new FormAttachment(30, -15); fd_lbl_number.bottom = new FormAttachment(50, -10); - fd_lbl_number.left = new FormAttachment(0, 20); + //fd_lbl_number.left = new FormAttachment(0, 20); fd_lbl_number.right = new FormAttachment(50, -10); lbl_number.setLayoutData(fd_lbl_number); + Label lbl_image = new Label(containerComposite, SWT.NATIVE); + + ImageData data = new ImageData(this.getClass().getResourceAsStream("/img/handy.gif"));//$NON-NLS-1$ + Image mobile = new Image(getDisplay(), data); + + FormData fd_lbl_image = new FormData(); + fd_lbl_image.top = new FormAttachment(50, -1 * (data.width / 2)); + fd_lbl_image.bottom = new FormAttachment(50, data.width / 2); + fd_lbl_image.left = new FormAttachment(0, 10); + fd_lbl_image.width = data.width; + lbl_image.setLayoutData(fd_lbl_image); + lbl_image.setImage(mobile); + + this.txt_password = new Text(containerComposite, SWT.SINGLE | SWT.PASSWORD | SWT.BORDER | SWT.NATIVE); FormData fd_password = new FormData(); @@ -235,11 +253,12 @@ public class MobileBKUEnterNumberComposite extends StateComposite { }); Label lbl_password = new Label(containerComposite, SWT.NATIVE); + lbl_password.setAlignment(SWT.RIGHT); lbl_password.setText(Messages.getString("mobileBKU.password")); //$NON-NLS-1$ FormData fd_lbl_password = new FormData(); fd_lbl_password.top = new FormAttachment(50, 10); //fd_lbl_password.bottom = new FormAttachment(50, 15); - fd_lbl_password.left = new FormAttachment(0, 20); + //fd_lbl_password.left = new FormAttachment(0, 20); fd_lbl_password.right = new FormAttachment(50, -10); lbl_password.setLayoutData(fd_lbl_password); diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterTANComposite.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterTANComposite.java index 683ebd12..833d2670 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterTANComposite.java +++ b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterTANComposite.java @@ -26,6 +26,8 @@ import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.TraverseEvent; import org.eclipse.swt.events.TraverseListener; import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; @@ -198,20 +200,34 @@ public class MobileBKUEnterTANComposite extends StateComposite { FormData fd_containerComposite = new FormData(); fd_containerComposite.top = new FormAttachment(50, -100); fd_containerComposite.bottom = new FormAttachment(50, 100); - fd_containerComposite.left = new FormAttachment(50, -250); - fd_containerComposite.right = new FormAttachment(50, 250); + fd_containerComposite.left = new FormAttachment(50, -200); + fd_containerComposite.right = new FormAttachment(50, 200); containerComposite.setLayoutData(fd_containerComposite); Label lblVergleichswert = new Label(containerComposite, SWT.NATIVE); + lblVergleichswert.setAlignment(SWT.RIGHT); FormData fd_lblVergleichswert = new FormData(); - fd_lblVergleichswert.left = new FormAttachment(0, 20); + //fd_lblVergleichswert.left = new FormAttachment(0, 20); fd_lblVergleichswert.right = new FormAttachment(50, -10); //fd_lblVergleichswert.top = new FormAttachment(30, -15); fd_lblVergleichswert.bottom = new FormAttachment(50, -10); lblVergleichswert.setLayoutData(fd_lblVergleichswert); lblVergleichswert.setText(Messages.getString("tanEnter.ReferenceValue")); //$NON-NLS-1$ + Label lbl_image = new Label(containerComposite, SWT.NATIVE); + + ImageData data = new ImageData(this.getClass().getResourceAsStream("/img/handy.gif"));//$NON-NLS-1$ + Image mobile = new Image(getDisplay(), data); + + FormData fd_lbl_image = new FormData(); + fd_lbl_image.top = new FormAttachment(50, -1 * (data.width / 2)); + fd_lbl_image.bottom = new FormAttachment(50, data.width / 2); + fd_lbl_image.left = new FormAttachment(0, 10); + fd_lbl_image.width = data.width; + lbl_image.setLayoutData(fd_lbl_image); + lbl_image.setImage(mobile); + this.lblvergleich = new Label(containerComposite, SWT.NATIVE); FormData fd_lblvergleich = new FormData(); fd_lblvergleich.left = new FormAttachment(50, 10); @@ -222,8 +238,9 @@ public class MobileBKUEnterTANComposite extends StateComposite { this.lblvergleich.setText(""); //$NON-NLS-1$ Label lblTan = new Label(containerComposite, SWT.NATIVE); + lblTan.setAlignment(SWT.RIGHT); FormData fd_lblTan = new FormData(); - fd_lblTan.left = new FormAttachment(0, 20); + //fd_lblTan.left = new FormAttachment(0, 20); fd_lblTan.right = new FormAttachment(50, -10); fd_lblTan.top = new FormAttachment(50, 10); //fd_lblTan.bottom = new FormAttachment(50, 15); diff --git a/trunk/pdf-over-signer/pdf-over-sigpdfas/pom.xml b/trunk/pdf-over-signer/pdf-over-sigpdfas/pom.xml index 7a1122ea..3316cc55 100644 --- a/trunk/pdf-over-signer/pdf-over-sigpdfas/pom.xml +++ b/trunk/pdf-over-signer/pdf-over-sigpdfas/pom.xml @@ -9,6 +9,9 @@ </parent> <artifactId>pdf-over-sigpdfas</artifactId> <name>PDF-Over PDF-AS Signer</name> + <properties> + <project.maindir>${project.basedir}/../..</project.maindir> + </properties> <dependencies> <dependency> <groupId>a-sit.at</groupId> @@ -21,4 +24,4 @@ <version>3.2</version> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/trunk/pom.xml b/trunk/pom.xml index ae005667..08bbc108 100644 --- a/trunk/pom.xml +++ b/trunk/pom.xml @@ -78,6 +78,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.maindir>${project.basedir}</project.maindir> </properties> <reporting> @@ -163,7 +164,7 @@ <dependency> <groupId>com.sun</groupId> <artifactId>pdfview</artifactId> - <version>0.9.2</version> + <version>0.9.2-Borisvl</version> </dependency> </dependencies> </dependencyManagement> @@ -186,7 +187,7 @@ </repository> <repository> <id>local-repo</id> - <url>file://${project.basedir}/repo</url> + <url>file://${project.maindir}/repo</url> </repository> </repositories> -</project>
\ No newline at end of file +</project> diff --git a/trunk/repo/com/sun/pdfview/0.9.2/pdfview-0.9.2.jar b/trunk/repo/com/sun/pdfview/0.9.2-Borisvl/pdfview-0.9.2-Borisvl.jar Binary files differindex c051ff39..c051ff39 100644 --- a/trunk/repo/com/sun/pdfview/0.9.2/pdfview-0.9.2.jar +++ b/trunk/repo/com/sun/pdfview/0.9.2-Borisvl/pdfview-0.9.2-Borisvl.jar diff --git a/trunk/repo/com/sun/pdfview/0.9.2/pdfview-0.9.2.jar.md5 b/trunk/repo/com/sun/pdfview/0.9.2-Borisvl/pdfview-0.9.2-Borisvl.jar.md5 index 50fa9fb3..50fa9fb3 100644 --- a/trunk/repo/com/sun/pdfview/0.9.2/pdfview-0.9.2.jar.md5 +++ b/trunk/repo/com/sun/pdfview/0.9.2-Borisvl/pdfview-0.9.2-Borisvl.jar.md5 diff --git a/trunk/repo/com/sun/pdfview/0.9.2/pdfview-0.9.2.jar.sha1 b/trunk/repo/com/sun/pdfview/0.9.2-Borisvl/pdfview-0.9.2-Borisvl.jar.sha1 index eb8e5140..eb8e5140 100644 --- a/trunk/repo/com/sun/pdfview/0.9.2/pdfview-0.9.2.jar.sha1 +++ b/trunk/repo/com/sun/pdfview/0.9.2-Borisvl/pdfview-0.9.2-Borisvl.jar.sha1 diff --git a/trunk/repo/com/sun/pdfview/0.9.2/pdfview-0.9.2.pom b/trunk/repo/com/sun/pdfview/0.9.2-Borisvl/pdfview-0.9.2-Borisvl.pom index c2a115d0..5b518927 100644 --- a/trunk/repo/com/sun/pdfview/0.9.2/pdfview-0.9.2.pom +++ b/trunk/repo/com/sun/pdfview/0.9.2-Borisvl/pdfview-0.9.2-Borisvl.pom @@ -4,6 +4,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.sun</groupId> <artifactId>pdfview</artifactId> - <version>0.9.2</version> + <version>0.9.2-Borisvl</version> <description>POM was created from install:install-file</description> </project> diff --git a/trunk/repo/com/sun/pdfview/0.9.2-Borisvl/pdfview-0.9.2-Borisvl.pom.md5 b/trunk/repo/com/sun/pdfview/0.9.2-Borisvl/pdfview-0.9.2-Borisvl.pom.md5 new file mode 100644 index 00000000..d56ddc67 --- /dev/null +++ b/trunk/repo/com/sun/pdfview/0.9.2-Borisvl/pdfview-0.9.2-Borisvl.pom.md5 @@ -0,0 +1 @@ +95d76d70920beb27b5171bd0282a22d5
\ No newline at end of file diff --git a/trunk/repo/com/sun/pdfview/0.9.2-Borisvl/pdfview-0.9.2-Borisvl.pom.sha1 b/trunk/repo/com/sun/pdfview/0.9.2-Borisvl/pdfview-0.9.2-Borisvl.pom.sha1 new file mode 100644 index 00000000..ad0e94b5 --- /dev/null +++ b/trunk/repo/com/sun/pdfview/0.9.2-Borisvl/pdfview-0.9.2-Borisvl.pom.sha1 @@ -0,0 +1 @@ +514daec85cd5b97c216086f3c890222318ef1050
\ No newline at end of file diff --git a/trunk/repo/com/sun/pdfview/0.9.2/pdfview-0.9.2.pom.md5 b/trunk/repo/com/sun/pdfview/0.9.2/pdfview-0.9.2.pom.md5 deleted file mode 100644 index 5b55cf15..00000000 --- a/trunk/repo/com/sun/pdfview/0.9.2/pdfview-0.9.2.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -f4d6cdf65e8230987340e43e0bb18373
\ No newline at end of file diff --git a/trunk/repo/com/sun/pdfview/0.9.2/pdfview-0.9.2.pom.sha1 b/trunk/repo/com/sun/pdfview/0.9.2/pdfview-0.9.2.pom.sha1 deleted file mode 100644 index 9203424a..00000000 --- a/trunk/repo/com/sun/pdfview/0.9.2/pdfview-0.9.2.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -a56e3f8c021d8586a9236ca114136ce3c075a73a
\ No newline at end of file diff --git a/trunk/repo/com/sun/pdfview/maven-metadata-local.xml b/trunk/repo/com/sun/pdfview/maven-metadata-local.xml index 3b333323..b559b782 100644 --- a/trunk/repo/com/sun/pdfview/maven-metadata-local.xml +++ b/trunk/repo/com/sun/pdfview/maven-metadata-local.xml @@ -2,11 +2,11 @@ <metadata> <groupId>com.sun</groupId> <artifactId>pdfview</artifactId> - <version>0.9.2</version> + <version>0.9.2-Borisvl</version> <versioning> <versions> - <version>0.9.2</version> + <version>0.9.2-Borisvl</version> </versions> - <lastUpdated>20121023171708</lastUpdated> + <lastUpdated>20121024122652</lastUpdated> </versioning> </metadata> diff --git a/trunk/repo/com/sun/pdfview/maven-metadata-local.xml.md5 b/trunk/repo/com/sun/pdfview/maven-metadata-local.xml.md5 index b69dcb6a..7fe8ca0a 100644 --- a/trunk/repo/com/sun/pdfview/maven-metadata-local.xml.md5 +++ b/trunk/repo/com/sun/pdfview/maven-metadata-local.xml.md5 @@ -1 +1 @@ -95bd0fc3631723abc442b1e8a6577eb8
\ No newline at end of file +f966fbc4fc078a8abdbf5a228e329f50
\ No newline at end of file diff --git a/trunk/repo/com/sun/pdfview/maven-metadata-local.xml.sha1 b/trunk/repo/com/sun/pdfview/maven-metadata-local.xml.sha1 index bc8dc80b..cbb7e210 100644 --- a/trunk/repo/com/sun/pdfview/maven-metadata-local.xml.sha1 +++ b/trunk/repo/com/sun/pdfview/maven-metadata-local.xml.sha1 @@ -1 +1 @@ -1ded7fa89decc8f1732c5538965db3bb3b2349ae
\ No newline at end of file +b958accd1536f5dc54be571d07af3d288a13752f
\ No newline at end of file diff --git a/trunk/repo/knowcenter/pdf-as/3.2/pdf-as-3.2.jar b/trunk/repo/knowcenter/pdf-as/3.2/pdf-as-3.2.jar Binary files differnew file mode 100644 index 00000000..d3320cb2 --- /dev/null +++ b/trunk/repo/knowcenter/pdf-as/3.2/pdf-as-3.2.jar diff --git a/trunk/repo/knowcenter/pdf-as/3.2/pdf-as-3.2.jar.md5 b/trunk/repo/knowcenter/pdf-as/3.2/pdf-as-3.2.jar.md5 new file mode 100644 index 00000000..9f4fe1ce --- /dev/null +++ b/trunk/repo/knowcenter/pdf-as/3.2/pdf-as-3.2.jar.md5 @@ -0,0 +1 @@ +e0d05959883d17a865f1bf1fcc49bbf7
\ No newline at end of file diff --git a/trunk/repo/knowcenter/pdf-as/3.2/pdf-as-3.2.jar.sha1 b/trunk/repo/knowcenter/pdf-as/3.2/pdf-as-3.2.jar.sha1 new file mode 100644 index 00000000..b0987ac9 --- /dev/null +++ b/trunk/repo/knowcenter/pdf-as/3.2/pdf-as-3.2.jar.sha1 @@ -0,0 +1 @@ +725091dca8b46b660fe51076388f8529f6a10fdc
\ No newline at end of file diff --git a/trunk/repo/knowcenter/pdf-as/3.2/pdf-as-3.2.pom b/trunk/repo/knowcenter/pdf-as/3.2/pdf-as-3.2.pom new file mode 100644 index 00000000..4ccfd110 --- /dev/null +++ b/trunk/repo/knowcenter/pdf-as/3.2/pdf-as-3.2.pom @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>knowcenter</groupId> + <artifactId>pdf-as</artifactId> + <version>3.2</version> + <description>POM was created from install:install-file</description> +</project> diff --git a/trunk/repo/knowcenter/pdf-as/3.2/pdf-as-3.2.pom.md5 b/trunk/repo/knowcenter/pdf-as/3.2/pdf-as-3.2.pom.md5 new file mode 100644 index 00000000..577e27e0 --- /dev/null +++ b/trunk/repo/knowcenter/pdf-as/3.2/pdf-as-3.2.pom.md5 @@ -0,0 +1 @@ +cacd4a2a2866807e77625d2d900f0281
\ No newline at end of file diff --git a/trunk/repo/knowcenter/pdf-as/3.2/pdf-as-3.2.pom.sha1 b/trunk/repo/knowcenter/pdf-as/3.2/pdf-as-3.2.pom.sha1 new file mode 100644 index 00000000..cea141cb --- /dev/null +++ b/trunk/repo/knowcenter/pdf-as/3.2/pdf-as-3.2.pom.sha1 @@ -0,0 +1 @@ +d88f2b64bb34a6e4b4b197a1dc76778dd5952fa4
\ No newline at end of file diff --git a/trunk/repo/knowcenter/pdf-as/maven-metadata-local.xml b/trunk/repo/knowcenter/pdf-as/maven-metadata-local.xml new file mode 100644 index 00000000..f8c09e79 --- /dev/null +++ b/trunk/repo/knowcenter/pdf-as/maven-metadata-local.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<metadata> + <groupId>knowcenter</groupId> + <artifactId>pdf-as</artifactId> + <version>3.2</version> + <versioning> + <versions> + <version>3.2</version> + </versions> + <lastUpdated>20121024121829</lastUpdated> + </versioning> +</metadata> diff --git a/trunk/repo/knowcenter/pdf-as/maven-metadata-local.xml.md5 b/trunk/repo/knowcenter/pdf-as/maven-metadata-local.xml.md5 new file mode 100644 index 00000000..0c59c5f6 --- /dev/null +++ b/trunk/repo/knowcenter/pdf-as/maven-metadata-local.xml.md5 @@ -0,0 +1 @@ +be78dcdfdb88cedb00752c5533381634
\ No newline at end of file diff --git a/trunk/repo/knowcenter/pdf-as/maven-metadata-local.xml.sha1 b/trunk/repo/knowcenter/pdf-as/maven-metadata-local.xml.sha1 new file mode 100644 index 00000000..9fbd5416 --- /dev/null +++ b/trunk/repo/knowcenter/pdf-as/maven-metadata-local.xml.sha1 @@ -0,0 +1 @@ +4ffd9b52c8953fa6c69f020f898cf159f942cdc7
\ No newline at end of file |