summaryrefslogtreecommitdiff
path: root/trunk
diff options
context:
space:
mode:
authortkellner <tkellner@3a0b52a2-8410-0410-bc02-ff6273a87459>2012-10-31 16:36:51 +0000
committertkellner <tkellner@3a0b52a2-8410-0410-bc02-ff6273a87459>2012-10-31 16:36:51 +0000
commit114b82daf8a6ef8450feeaf3a1f2ffcc229a12c3 (patch)
treef0acaf68fad89c57509d8dda54df8424c479a472 /trunk
parent859c28a116497e189f2a636b348181137a9e3875 (diff)
downloadpdf-over-114b82daf8a6ef8450feeaf3a1f2ffcc229a12c3.tar.gz
pdf-over-114b82daf8a6ef8450feeaf3a1f2ffcc229a12c3.tar.bz2
pdf-over-114b82daf8a6ef8450feeaf3a1f2ffcc229a12c3.zip
Move config dialog up
git-svn-id: https://svn.iaik.tugraz.at/svn/egiz/prj/current/12PDF-OVER-4.0@12732 3a0b52a2-8410-0410-bc02-ff6273a87459
Diffstat (limited to 'trunk')
-rw-r--r--trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java42
1 files changed, 11 insertions, 31 deletions
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 57fe4902..7b57d46d 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
@@ -63,7 +63,10 @@ public class MainWindow {
private Shell shell;
+ private Composite mainbar;
+ private FormData mainBarFormData;
private Composite container;
+ private FormData containerFormData;
private StackLayout stack;
StateMachine stateMachine;
private MainBarButton btn_sign;
@@ -103,10 +106,6 @@ public class MainWindow {
private Map<Buttons, MainBarButton> buttonMap;
- private FormData mainBarFormData;
-
- private Composite mainbar;
-
/**
* Default constructor
*
@@ -158,27 +157,6 @@ public class MainWindow {
}
/**
- * Entrance point for swt designer
- *
- * @param args
- */
- public static void main(String[] args) {
- Display display = Display.getDefault();
-
- MainWindow window = new MainWindow(null);
-
- window.open();
-
- window.getShell().open();
- window.getShell().layout();
- while (!window.getShell().isDisposed()) {
- if (!display.readAndDispatch()) {
- display.sleep();
- }
- }
- }
-
- /**
* Open the window.
*
* @wbp.parser.entryPoint
@@ -307,12 +285,12 @@ public class MainWindow {
this.buttonMap.put(Buttons.FINAL, end);
this.container = new Composite(getShell(), SWT.RESIZE);
- FormData fd_composite_1 = new FormData();
- fd_composite_1.bottom = new FormAttachment(100, -10);
- fd_composite_1.right = new FormAttachment(100, -10);
- fd_composite_1.top = new FormAttachment(0, 70);
- fd_composite_1.left = new FormAttachment(0, 10);
- this.container.setLayoutData(fd_composite_1);
+ this.containerFormData = new FormData();
+ this.containerFormData.bottom = new FormAttachment(100, -10);
+ this.containerFormData.right = new FormAttachment(100, -10);
+ this.containerFormData.top = new FormAttachment(0, MAINBAR_HEIGHT + 10);
+ this.containerFormData.left = new FormAttachment(0, 10);
+ this.container.setLayoutData(this.containerFormData);
this.stack = new StackLayout();
this.container.setLayout(this.stack);
}
@@ -340,8 +318,10 @@ public class MainWindow {
if (behavior.getMainBarVisible()) {
this.mainBarFormData.bottom = new FormAttachment(0, MAINBAR_HEIGHT);
+ this.containerFormData.top = new FormAttachment(0, MAINBAR_HEIGHT + 10);
} else {
this.mainBarFormData.bottom = new FormAttachment(0, 0);
+ this.containerFormData.top = new FormAttachment(0, 10);
}
this.getShell().getDisplay().update();