From 915bf9c68c728d4a3fed8a82ebc01c8b28591adb Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 15 Oct 2019 15:14:34 +0200 Subject: [client] LoginWindow: Show same update notification as in main window --- .../openslx/dozmod/gui/window/layout/LoginWindowLayout.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java') diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java index e5970b9f..0264da11 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java @@ -14,6 +14,7 @@ import javax.swing.JDialog; import javax.swing.JPanel; import javax.swing.JPasswordField; import javax.swing.JRadioButton; +import javax.swing.JSeparator; import javax.swing.JTextField; import javax.swing.border.TitledBorder; @@ -70,7 +71,7 @@ public abstract class LoginWindowLayout extends JDialog { // advanced panel protected final JButton btnSettings; protected final JButton btnLogDir; - protected final JButton btnUpdateCheck; + protected final JPanel pnlActivity; /** * Create a new login composite @@ -92,7 +93,6 @@ public abstract class LoginWindowLayout extends JDialog { rdoLoginType[2] = new JRadioButton("Direkter Zugang zum Satelliten"); btnSettings = new JButton("Einstellungen"); btnLogDir = new JButton("Logverzeichnis"); - btnUpdateCheck = new JButton("Update"); cboOrganization = new ComboBox<>(new ComboBoxRenderer() { @Override @@ -121,6 +121,13 @@ public abstract class LoginWindowLayout extends JDialog { pnlAdvanced = makeAdvancedPanel(); grid.add(pnlAdvanced).expand(true, true).fill(true, true); + + grid.nextRow(); + pnlActivity = new JPanel(); + pnlActivity.setLayout(new BoxLayout(pnlActivity, BoxLayout.PAGE_AXIS)); + pnlActivity.setVisible(false); + pnlActivity.add(new JSeparator()); + grid.add(pnlActivity, 2).expand(true, false).fill(true, true); grid.finish(false); @@ -175,7 +182,6 @@ public abstract class LoginWindowLayout extends JDialog { p.setBorder(new TitledBorder(ADVANCED_LABEL)); p.add(btnSettings); p.add(btnLogDir); - p.add(btnUpdateCheck); return p; } -- cgit v1.2.3-55-g7522