diff options
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui')
3 files changed, 50 insertions, 1 deletions
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 c64fbfca..3003624c 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java @@ -38,6 +38,7 @@ public class ConfigWindow extends ConfigWindowLayout implements UiFeedback, Acti private final static Logger LOGGER = LogManager.getLogger(ConfigWindow.class); private SatelliteUserConfig userConfig = null; private JRadioButton selectedLookAndFeel = null; + private JRadioButton selectedTransferEnc = null; public ConfigWindow(Window modalParent) { super(modalParent); @@ -114,6 +115,26 @@ public class ConfigWindow extends ConfigWindowLayout implements UiFeedback, Acti // non-critical but log it anyways LOGGER.error("Failed to detect the current look & feel theme."); } + + // -- Transfer connection encryption -- + for (Enumeration<AbstractButton> btn = btnGroupTransferEnc.getElements(); btn.hasMoreElements();) { + final JRadioButton b = (JRadioButton) btn.nextElement(); + if (Config.getFileTransferMode().name().equals(b.getToolTipText())) { + selectedTransferEnc = b; + b.setSelected(true); + } + b.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + selectedTransferEnc = b; + reactToInput(); + } + }); + } + if (selectedTransferEnc == null) { + selectedTransferEnc = (JRadioButton) btnGroupTransferEnc.getElements().nextElement(); + selectedTransferEnc.setSelected(true); + } // Transfer connection count sldConnections.setValue(Config.getTransferConnectionCount()); @@ -171,6 +192,8 @@ public class ConfigWindow extends ConfigWindowLayout implements UiFeedback, Acti changed = true; } else if (!selectedLookAndFeel.getToolTipText().equals(Config.getLookAndFeel())) { changed = true; + } else if (!selectedTransferEnc.getToolTipText().equals(Config.getFileTransferMode().name())) { + changed = true; } else if (!newLanguage.value.equals(Config.getPreferredLanguage())) { changed = true; } @@ -239,6 +262,10 @@ public class ConfigWindow extends ConfigWindowLayout implements UiFeedback, Acti restartRequired = restartRequired || !selectedLookAndFeel.getToolTipText().equals(Config.getLookAndFeel()); Config.setLookAndFeel(selectedLookAndFeel.getToolTipText()); } + // save TransferEnc + if (selectedTransferEnc != null) { + Config.setFileTransferMode(selectedTransferEnc.getToolTipText()); + } // save language Language newLanguage = (Language)cboLanguage.getSelectedItem(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java index 0f2e1f35..b7448a94 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java @@ -53,6 +53,7 @@ import org.openslx.dozmod.util.ClientVersion; import org.openslx.dozmod.util.DesktopEnvironment; import org.openslx.dozmod.util.DesktopEnvironment.Link; import org.openslx.util.QuickTimer; +import org.openslx.util.Util; import org.openslx.util.QuickTimer.Task; import edu.kit.scc.dei.ecplean.ECPAuthenticationException; @@ -169,8 +170,9 @@ public class LoginWindow extends LoginWindowLayout { Iterator<Organization> iterator = orgs.iterator(); while (iterator.hasNext()) { Organization current = iterator.next(); - if (current == null || !current.isSetEcpUrl() || current.getEcpUrl().isEmpty()) + if (current == null || !current.isSetEcpUrl() || Util.isEmptyString(current.getEcpUrl())) { iterator.remove(); + } } // now send the organisations back to the LoginWindow // through populateIdpCombo() 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 8254cda2..432654f7 100755 --- 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 @@ -9,6 +9,7 @@ import javax.swing.UIManager.LookAndFeelInfo; import org.openslx.dozmod.Branding; import org.openslx.dozmod.Config; +import org.openslx.dozmod.Config.FileTransferMode; import org.openslx.dozmod.gui.control.ComboBox; import org.openslx.dozmod.gui.control.QLabel; import org.openslx.dozmod.gui.control.WordWrapLabel; @@ -32,6 +33,7 @@ public class ConfigWindowLayout extends JDialog { protected final JSlider sldFontSize; protected final JSlider sldConnections; protected ButtonGroup btnGroupLookAndFeel = null; + protected ButtonGroup btnGroupTransferEnc = null; protected final ComboBox<Language> cboLanguage; @@ -141,6 +143,24 @@ public class ConfigWindowLayout extends JDialog { sldConnections.setPaintTicks(true); sldConnections.setPaintLabels(true); grid.add(sldConnections).expand(true, false).fill(true, false); + + // Transfer SSL or plain + grid.add(new WordWrapLabel(I18n.WINDOW_LAYOUT.getString("Config.Label.transferEncryption.text"), + true, false)) + .insets(headingInset) + .fill(true, false) + .expand(true, false); + JPanel encGroupPanel = new JPanel(); + encGroupPanel.setLayout(new BoxLayout(encGroupPanel, BoxLayout.LINE_AXIS)); + btnGroupTransferEnc = new ButtonGroup(); + + for (FileTransferMode mode : Config.FileTransferMode.values()) { + JRadioButton btn = new JRadioButton(I18n.WINDOW_LAYOUT.getString("Config.Button.transfermode." + mode.name())); + btn.setToolTipText(mode.name()); + btnGroupTransferEnc.add(btn); + encGroupPanel.add(btn); + } + grid.add(encGroupPanel).expand(true, false).fill(true, false); // Language grid.add(new WordWrapLabel(I18n.WINDOW_LAYOUT.getString("Config.Label.language.text"), |