diff options
author | Jonathan Bauer | 2015-09-02 15:32:50 +0200 |
---|---|---|
committer | Jonathan Bauer | 2015-09-02 15:32:50 +0200 |
commit | 8f9f61ed474ec413f4fe4eaef1c5d2229fa357be (patch) | |
tree | 79e7fee1cce180059a4ff1b81656e8c71a5eb951 | |
parent | [client] disabled share mode combo for now (diff) | |
download | tutor-module-8f9f61ed474ec413f4fe4eaef1c5d2229fa357be.tar.gz tutor-module-8f9f61ed474ec413f4fe4eaef1c5d2229fa357be.tar.xz tutor-module-8f9f61ed474ec413f4fe4eaef1c5d2229fa357be.zip |
[client] agree box in DisclaimerWindow back in
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java | 13 | ||||
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java | 6 |
2 files changed, 17 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java index efa000ba..ae1c743f 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java @@ -34,6 +34,14 @@ public class DisclaimerWindow extends DisclaimerWindowLayout implements UiFeedba super(modalParent); setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); + // agree box toggles the "Continue" button + chkAgreeBox.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + btnContinue.setEnabled(chkAgreeBox.isSelected()); + } + }); + // function for continue button btnContinue.addActionListener(new ActionListener() { @Override @@ -50,6 +58,11 @@ public class DisclaimerWindow extends DisclaimerWindowLayout implements UiFeedba closeWindow(); } }); + if (!shouldBeShown()) { + chkAgreeBox.setVisible(false); + btnContinue.setText("Schließen"); + btnContinue.setEnabled(true); + } } public static boolean shouldBeShown() { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java index 5a6b6b07..0d651c0b 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java @@ -37,7 +37,7 @@ public abstract class DisclaimerWindowLayout extends JDialog { private static String title = "bwLehrpool Suite"; private static String noticeLabel = "Hinweis"; - private static String continueButtonLabel = "Schließen"; + private static String continueButtonLabel = "Weiter"; // Buttons protected JCheckBox chkAgreeBox; @@ -67,11 +67,13 @@ public abstract class DisclaimerWindowLayout extends JDialog { // checkbox for acknowledging the disclaimer JPanel buttonPanel = new JPanel(); buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.LINE_AXIS)); + chkAgreeBox = new JCheckBox(checkboxText); + buttonPanel.add(chkAgreeBox); // spacer buttonPanel.add(Box.createHorizontalGlue()); // the continue button btnContinue = new JButton(continueButtonLabel); - btnContinue.setEnabled(true); + btnContinue.setEnabled(false); buttonPanel.add(btnContinue); // put everything together |