From afd1a45c299c733d9f207d9f56421ecd97f416c6 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 7 Sep 2015 15:38:05 +0200 Subject: [client] ConfigWindow -> back to "Close" --- .../src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java | 4 ---- .../java/org/openslx/dozmod/gui/window/layout/ConfigWindowLayout.java | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'dozentenmodul/src/main/java') diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java index ddea0789..5f921d75 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java @@ -104,8 +104,6 @@ public class ConfigWindow extends ConfigWindowLayout implements UiFeedback, Acti // en/disable the save button btnSave.setEnabled(changed); - if (changed) - btnClose.setText("Abbrechen"); } private SatelliteUserConfig getSatUserConfig() { SatelliteUserConfig userConfig = null; @@ -152,8 +150,6 @@ public class ConfigWindow extends ConfigWindowLayout implements UiFeedback, Acti } // let the user know he needs to restart for the changes to apply Gui.showMessageBox(this, "Die Änderungen werden erst nach einem Programmneustart wirksam.", MessageType.INFO, LOGGER, null); - // "success" so change "Cancel" -> "Close" - btnClose.setText("Schließen"); } public static boolean shouldBeShown() { return true; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ConfigWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ConfigWindowLayout.java index 0b91191c..59709b2e 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ConfigWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ConfigWindowLayout.java @@ -104,7 +104,7 @@ public class ConfigWindowLayout extends JDialog { // bottom button panel JPanel buttonPanel = new JPanel(); - btnClose = new JButton("Abbrechen"); + btnClose = new JButton("Schließen"); btnSave = new JButton("Speichern"); buttonPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.LINE_AXIS)); @@ -128,7 +128,5 @@ public class ConfigWindowLayout extends JDialog { add(buttonPanel, BorderLayout.PAGE_END); pack(); - - } } -- cgit v1.2.3-55-g7522