diff options
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window')
15 files changed, 60 insertions, 76 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/BwIDMLinkWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/BwIDMLinkWindow.java index 52eefc19..951b9f0c 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/BwIDMLinkWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/BwIDMLinkWindow.java @@ -22,7 +22,6 @@ import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.helper.UiFeedback; import org.openslx.dozmod.util.OpenLinks; -import org.openslx.dozmod.util.OpenLinks.Link; /** * Class for showing window with button to open registration page in browser. @@ -44,7 +43,8 @@ public class BwIDMLinkWindow extends JDialog implements UiFeedback { * Don't use this, use static function open instead! */ public BwIDMLinkWindow(Frame modalParent) { - super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL : ModalityType.MODELESS); + super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL + : ModalityType.MODELESS); final BwIDMLinkWindow me = this; setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); @@ -100,7 +100,6 @@ public class BwIDMLinkWindow extends JDialog implements UiFeedback { }); bottomPane.add(OkButton); - grid.add(bottomPane).fill(true, false).expand(true, false); grid.nextRow(); grid.finish(false); @@ -113,6 +112,7 @@ public class BwIDMLinkWindow extends JDialog implements UiFeedback { /** * Open a new window for showing the registration page in browser. + * * @param modalParent the parent of the window. */ public static void open(Frame modalParent) { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java index 457cb4a8..f9e9daba 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java @@ -3,18 +3,10 @@ package org.openslx.dozmod.gui.window; import java.awt.Frame; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; - -import javax.swing.JFrame; import org.apache.log4j.Logger; -import org.openslx.dozmod.Config; -import org.openslx.dozmod.gui.Gui; -import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.gui.helper.UiFeedback; import org.openslx.dozmod.gui.window.layout.CheckUpdateWindowLayout; -import org.openslx.dozmod.gui.window.layout.DisclaimerWindowLayout; import org.openslx.dozmod.util.ClientVersion; import org.openslx.dozmod.util.FormatHelper; import org.openslx.dozmod.util.OpenLinks; @@ -35,13 +27,14 @@ public class CheckUpdateWindow extends CheckUpdateWindowLayout implements UiFeed btnLink.addActionListener(this); btnLink.setEnabled(!ClientVersion.isNewest()); - lblLocalVersion.setText(ClientVersion.getLocalRevision() - + " (" + FormatHelper.longDate(ClientVersion.getLocalRevTimestamp()) + ")"); - lblRemoteVersion.setText(ClientVersion.getRemoteRevision() - + " (" + FormatHelper.longDate(ClientVersion.getRemoteRevTimestamp()) + ")"); + lblLocalVersion.setText(ClientVersion.getLocalRevision() + " (" + + FormatHelper.longDate(ClientVersion.getLocalRevTimestamp()) + ")"); + lblRemoteVersion.setText(ClientVersion.getRemoteRevision() + " (" + + FormatHelper.longDate(ClientVersion.getRemoteRevTimestamp()) + ")"); txtChangelog.setText(ClientVersion.getChangelog()); } + @Override public void actionPerformed(ActionEvent e) { if (e.getSource() == btnLink) { @@ -51,6 +44,7 @@ public class CheckUpdateWindow extends CheckUpdateWindowLayout implements UiFeed dispose(); } } + public static void open(Frame modalParent) { new CheckUpdateWindow(modalParent).setVisible(true); } 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 b787275e..ea44ef8d 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 @@ -22,7 +22,8 @@ import org.openslx.dozmod.gui.window.layout.DisclaimerWindowLayout; public class DisclaimerWindow extends DisclaimerWindowLayout implements UiFeedback { /** - * Use a version number for the disclaimer. Whenever we add/change something, this will be increased + * Use a version number for the disclaimer. Whenever we add/change + * something, this will be increased */ public static final int DISCLAIMER_VERSION = 1; @@ -82,15 +83,17 @@ public class DisclaimerWindow extends DisclaimerWindowLayout implements UiFeedba public void escapePressed() { closeWindow(); } - - + /** - * Check, whether to ask for confirmation, when disclaimer hasn't been accepted or just close. + * Check, whether to ask for confirmation, when disclaimer hasn't been + * accepted or just close. */ - private void closeWindow(){ - if(shouldBeShown()) { - if(Gui.showMessageBox(me, "Wenn diesen rechtlichen Hinweis nicht akzeptieren, können Sie die Software nicht verwenden! " - + "Sind Sie sicher, dass sie abbrechen wollen?", MessageType.QUESTION_YESNO , LOGGER, null)){ + private void closeWindow() { + if (shouldBeShown()) { + if (Gui.showMessageBox(me, + "Wenn diesen rechtlichen Hinweis nicht akzeptieren, können Sie die Software nicht verwenden! " + + "Sind Sie sicher, dass sie abbrechen wollen?", MessageType.QUESTION_YESNO, + LOGGER, null)) { System.exit(ABORT); } } else { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePermissionWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePermissionWindow.java index 9147ef83..e8c8ba06 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePermissionWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePermissionWindow.java @@ -9,7 +9,6 @@ import org.apache.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImagePermissions; import org.openslx.dozmod.gui.helper.UiFeedback; import org.openslx.dozmod.gui.window.layout.ImagePermissionWindowLayout; -import org.openslx.dozmod.permissions.DefaultCustomPerms; /** * Window for modifying the custom permissions of an image. @@ -76,7 +75,7 @@ public class ImagePermissionWindow extends ImagePermissionWindowLayout implement } /** - * Creates a new ImageCustomPermissionWindow dialog + * Creates a new ImageCustomPermissionWindow dialog * * @param modalParent * parent window of this dialog diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java index 0b99f842..ba714cf3 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java @@ -65,7 +65,8 @@ public class UserListWindow extends UserListWindowLayout implements UiFeedback { // Scale the window after getting the list of users. int calcHeight = 150 + userList.size() * 20; calcHeight = calcHeight > 350 ? calcHeight : 350; - me.setPreferredSize(Gui.getScaledDimension(450, (calcHeight < 600) ? calcHeight : 600)); + me.setPreferredSize(Gui.getScaledDimension(450, + (calcHeight < 600) ? calcHeight : 600)); me.pack(); userTable.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS); } @@ -138,15 +139,16 @@ public class UserListWindow extends UserListWindowLayout implements UiFeedback { * @param modalParent * @param callback * @param buttonCaption - * @param ownerId The Id of the owner of an image or lecture. Should not be shown in the list. Can be null + * @param ownerId The Id of the owner of an image or lecture. Should not be + * shown in the list. Can be null */ - public static void open(Window modalParent, UserAddedCallback callback, String buttonCaption, String ownerId) { + public static void open(Window modalParent, UserAddedCallback callback, String buttonCaption, + String ownerId) { UserListWindow win = new UserListWindow(modalParent, callback, buttonCaption); win.ownerId = ownerId; win.setVisible(true); } - @Override public boolean wantConfirmQuit() { return false; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java index 8a5f647d..bdb7e806 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java @@ -16,7 +16,6 @@ import javax.swing.JTextArea; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.GridManager; - @SuppressWarnings("serial") public abstract class CheckUpdateWindowLayout extends JDialog { @@ -36,7 +35,8 @@ public abstract class CheckUpdateWindowLayout extends JDialog { protected JTextArea txtChangelog; public CheckUpdateWindowLayout(Frame modalParent) { - super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL : ModalityType.MODELESS); + super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL + : ModalityType.MODELESS); setLayout(new BorderLayout()); setPreferredSize(Gui.getScaledDimension(680, 400)); @@ -67,7 +67,6 @@ public abstract class CheckUpdateWindowLayout extends JDialog { JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); changelogPanel.setBorder(BorderFactory.createTitledBorder("Changelog")); - // checkbox for acknowledging the disclaimer btnLink = new JButton("Neueste Version herunterladen"); btnClose = new JButton(closeButtonLabel); @@ -76,7 +75,6 @@ public abstract class CheckUpdateWindowLayout extends JDialog { buttonPanel.add(Box.createHorizontalGlue()); buttonPanel.add(btnLink); buttonPanel.add(btnClose); - // put everything together GridManager grid = new GridManager(borderPanel, 1); 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 77f37405..c2061287 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 @@ -17,7 +17,6 @@ import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.control.QLabel; import org.openslx.dozmod.gui.helper.GridManager; - @SuppressWarnings("serial") public abstract class DisclaimerWindowLayout extends JDialog { @@ -40,7 +39,8 @@ public abstract class DisclaimerWindowLayout extends JDialog { protected JButton btnContinue; public DisclaimerWindowLayout(Frame modalParent) { - super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL : ModalityType.MODELESS); + super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL + : ModalityType.MODELESS); this.setLayout(new BorderLayout()); // Panel used for creating border. We'll add everything into this. @@ -75,13 +75,13 @@ public abstract class DisclaimerWindowLayout extends JDialog { // put everything together GridManager grid = new GridManager(borderPanel, 1); - grid.add(noticePanel).fill(true, false).expand(true,false); + grid.add(noticePanel).fill(true, false).expand(true, false); grid.nextRow(); grid.add(disclaimerPanel).fill(true, true).expand(true, true); grid.nextRow(); - grid.add(buttonPanel).fill(true, false).expand(true,false); + grid.add(buttonPanel).fill(true, false).expand(true, false); grid.finish(false); pack(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java index 3fdff1c7..e14267e3 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java @@ -17,7 +17,6 @@ import org.openslx.dozmod.gui.control.QLabel; import org.openslx.dozmod.gui.helper.CompositePage; import org.openslx.dozmod.gui.helper.GridManager; - @SuppressWarnings("serial") public abstract class ImageListWindowLayout extends CompositePage { @@ -69,11 +68,11 @@ public abstract class ImageListWindowLayout extends CompositePage { downloadButton = new JButton(downloadButtonLabel); switchViewButton = new JButton(switchViewButtonLabel); buttonPanel.add(newButton); - buttonPanel.add(Box.createRigidArea(new Dimension(5, 0))); + buttonPanel.add(Box.createRigidArea(new Dimension(5, 0))); buttonPanel.add(newLectureButton); buttonPanel.add(editButton); buttonPanel.add(downloadButton); - buttonPanel.add(Box.createRigidArea(new Dimension(5, 0))); + buttonPanel.add(Box.createRigidArea(new Dimension(5, 0))); buttonPanel.add(deleteButton); buttonPanel.add(Box.createHorizontalGlue()); buttonPanel.add(switchViewButton); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePermissionWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePermissionWindowLayout.java index cdf2add7..ee3f784e 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePermissionWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePermissionWindowLayout.java @@ -1,6 +1,5 @@ package org.openslx.dozmod.gui.window.layout; -import java.awt.Component; import java.awt.Window; import javax.swing.BorderFactory; @@ -17,7 +16,6 @@ import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.control.ImageCustomPermissionManager; import org.openslx.dozmod.gui.helper.GridManager; - /** * Window for editing permissions of an Image */ @@ -26,7 +24,6 @@ public class ImagePermissionWindowLayout extends JDialog { private static final Logger LOGGER = Logger.getLogger(ImagePermissionWindowLayout.class); - protected final JCheckBox chkCustomPermAdmin; protected final JCheckBox chkCustomPermEdit; protected final JCheckBox chkCustomPermDownload; @@ -39,8 +36,8 @@ public class ImagePermissionWindowLayout extends JDialog { private static String title = "Berechtigungen"; private static String infoTextDefPerms = "<html><body style='width:100%'>" - + "Hier können Sie Rechte für nicht in der Liste angegebene Nutzer festlegen:" - + "</body></html>"; + + "Hier können Sie Rechte für nicht in der Liste angegebene Nutzer festlegen:" + "</body></html>"; + protected ImagePermissionWindowLayout(Window modalParent) { super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL : ModalityType.MODELESS); @@ -67,7 +64,7 @@ public class ImagePermissionWindowLayout extends JDialog { defaultPermissionPane.setBorder(BorderFactory.createTitledBorder("Andere Nutzer")); defaultPermissionPane.setLayout(new BoxLayout(defaultPermissionPane, BoxLayout.PAGE_AXIS)); JLabel txtDefaultPerms = new JLabel(infoTextDefPerms); - + JPanel txtDefaultPermsPanel = new JPanel(); // Panel + BoxLayout + Label = wordwrap txtDefaultPermsPanel.setLayout(new BoxLayout(txtDefaultPermsPanel, BoxLayout.LINE_AXIS)); @@ -77,8 +74,8 @@ public class ImagePermissionWindowLayout extends JDialog { chkCustomPermAdmin = new JCheckBox("Admin"); chkCustomPermDownload = new JCheckBox("Download"); chkCustomPermEdit = new JCheckBox("Bearbeiten"); - chkCustomPermLink = new JCheckBox("Link"); - + chkCustomPermLink = new JCheckBox("Link"); + defaultPermsSubPanel.add(chkCustomPermLink); defaultPermsSubPanel.add(chkCustomPermDownload); defaultPermsSubPanel.add(chkCustomPermEdit); @@ -101,6 +98,6 @@ public class ImagePermissionWindowLayout extends JDialog { contentPanel.setPreferredSize(Gui.getScaledDimension(480, 350)); pack(); - setLocationRelativeTo( modalParent ); + setLocationRelativeTo(modalParent); } } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeImageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeImageLayout.java index 092bf819..4bad25e1 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeImageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeImageLayout.java @@ -15,7 +15,6 @@ import org.openslx.dozmod.gui.control.ImageListViewer; import org.openslx.dozmod.gui.control.ImageListViewer.FilterType; import org.openslx.dozmod.gui.helper.GridManager; - /** * Layout for the ChangeLinkedImage of a lecture */ @@ -30,7 +29,6 @@ public class LectureChangeImageLayout extends JDialog { protected final JButton btnOk; protected final JButton btnClose; - /** * The ListViewer to use. */ diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java index a1f2114b..9f4a4875 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java @@ -16,7 +16,6 @@ import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JDialog; import javax.swing.JFrame; -import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JSpinner; @@ -199,7 +198,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog { endTimePanel.add(endTime); endTimePanel.setMinimumSize(endTimePanel.getPreferredSize()); endTimePanel.setMaximumSize(endTimePanel.getPreferredSize()); - + lblEndTime = new QLabel(); grid.add(new QLabel("Enddatum")); grid.add(endTimePanel, 2); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java index 31f20a11..20795474 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java @@ -34,7 +34,6 @@ public abstract class LectureListWindowLayout extends CompositePage { private static final String filterPanelLabel = "Suchen"; private static final String infoTextString = "Hier können Sie Veranstaltungen anlegen, bearbeiten und löschen."; - // buttons protected final JButton newButton; protected final JButton deleteButton; @@ -62,7 +61,6 @@ public abstract class LectureListWindowLayout extends CompositePage { infoPanel.add(infoText, BorderLayout.CENTER); // ---------------- end group of title ------------------------------ - // ------------ panel for the table and filter ----------------------- JPanel tablePanel = new JPanel(); GridManager tableGrid = new GridManager(tablePanel, 1); @@ -105,10 +103,10 @@ public abstract class LectureListWindowLayout extends CompositePage { newButton = new JButton(newButtonLabel); buttonPanel.add(newButton); - buttonPanel.add(Box.createRigidArea(new Dimension(5, 0))); + buttonPanel.add(Box.createRigidArea(new Dimension(5, 0))); editButton = new JButton(editButtonLabel); buttonPanel.add(editButton); - buttonPanel.add(Box.createRigidArea(new Dimension(5, 0))); + buttonPanel.add(Box.createRigidArea(new Dimension(5, 0))); deleteButton = new JButton(deleteButtonLabel); buttonPanel.add(deleteButton); buttonPanel.add(Box.createHorizontalGlue()); @@ -125,8 +123,8 @@ public abstract class LectureListWindowLayout extends CompositePage { grid.finish(false); } - - protected void setLectureCountLabel(int i){ + + protected void setLectureCountLabel(int i) { lectureCountLabel.setText(Integer.toString(i)); } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LecturePermissionWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LecturePermissionWindowLayout.java index fe36e321..5e67de86 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LecturePermissionWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LecturePermissionWindowLayout.java @@ -15,7 +15,6 @@ import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.control.LectureCustomPermissionManager; import org.openslx.dozmod.gui.helper.GridManager; - /** * Layout for the LectureCustomPermissionWindow */ @@ -58,7 +57,7 @@ public class LecturePermissionWindowLayout extends JDialog { // Panel with the default permissions JPanel defaultPermissionPane = new JPanel(); - defaultPermissionPane.setBorder(BorderFactory.createTitledBorder( "Andere Nutzer")); + defaultPermissionPane.setBorder(BorderFactory.createTitledBorder("Andere Nutzer")); chkCustomPermEdit = new JCheckBox("Bearbeiten"); chkCustomPermAdmin = new JCheckBox("Admin"); defaultPermissionPane.add(chkCustomPermEdit); @@ -73,7 +72,6 @@ public class LecturePermissionWindowLayout extends JDialog { btnOk = new JButton("Übernehmen"); buttonPane.add(btnOk); - // Put everything into the grid grid.add(lecturePermissionManager).fill(true, true).expand(true, true); grid.nextRow(); @@ -86,6 +84,6 @@ public class LecturePermissionWindowLayout extends JDialog { contentPanel.setPreferredSize(Gui.getScaledDimension(480, 350)); pack(); - setLocationRelativeTo( modalParent ); + setLocationRelativeTo(modalParent); } } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java index c8b38a79..e319550e 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java @@ -14,7 +14,7 @@ public abstract class MainMenuWindowLayout extends CompositePage { protected String vmInfo = "<html><b>Übersicht Virtueller Maschinen</b><br>" + "Zur Übersicht über die verfügbaren Virtuellen Maschinen wechseln. Hier können Sie:<br><br>" + "1) Veranstaltungen auf Basis einer Virtuellen Maschine erstellen<br>" - + "2) Neue Virtuelle Maschinen hochladen<br>" + + "2) Neue Virtuelle Maschinen hochladen<br>" + "3) Virtuelle Maschinen herunterladen<br>" + "4) Virtuelle Maschinen bearbeiten und löschen</html>"; @@ -33,7 +33,7 @@ public abstract class MainMenuWindowLayout extends CompositePage { public MainMenuWindowLayout() { this.setBorder(BorderFactory.createTitledBorder("bwSuite-Hauptmenü")); GridManager grid = new GridManager(this, 2); - + vmImage = new JLabel(ResourceLoader.getIcon("/img/virtualization.png", "VM-Übersicht")); JLabel vmInfoLabel = new JLabel(vmInfo); vmInfoLabel.setVerticalAlignment(JLabel.TOP); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java index ccc835c4..71e6e8a6 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java @@ -23,20 +23,20 @@ public abstract class VirtualizerNoticeWindowLayout extends JDialog { + "Wenn Sie bereits den VMWare Player oder die VMWare Workstation installiert haben, können Sie diesen Hinweis ignorieren." + "</body></html>"; - -// protected JButton windowsDLButton; + // protected JButton windowsDLButton; protected JButton btnDL; protected JButton continueButton; public VirtualizerNoticeWindowLayout(Frame modalParent) { - super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL : ModalityType.MODELESS); - + super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL + : ModalityType.MODELESS); + JPanel contentPanel = new JPanel(); contentPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); add(contentPanel); - + GridManager grid = new GridManager(contentPanel, 1); - + JPanel infoPane = new JPanel(); infoPane.setLayout(new BoxLayout(infoPane, BoxLayout.PAGE_AXIS)); @@ -44,21 +44,20 @@ public abstract class VirtualizerNoticeWindowLayout extends JDialog { JLabel infoLabel = new JLabel(infoText); infoLabel.setBorder(BorderFactory.createTitledBorder("Hinweis")); infoPane.add(infoLabel); - + // Spacing infoPane.add(Box.createRigidArea(new Dimension(0, 10))); // Download buttons -// windowsDLButton = new JButton("<html>VMWare Player für <b>Windows</b> herunterladen</html>"); + // windowsDLButton = new JButton("<html>VMWare Player für <b>Windows</b> herunterladen</html>"); btnDL = new JButton("<html>VMWare Player herunterladen</html>"); -// infoPane.add(windowsDLButton); + // infoPane.add(windowsDLButton); infoPane.add(btnDL); - + // Bottom controls JPanel bottomPane = new JPanel(); bottomPane.setLayout(new BoxLayout(bottomPane, BoxLayout.LINE_AXIS)); - bottomPane.add(Box.createHorizontalGlue()); continueButton = new JButton("Schließen"); |