summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java
diff options
context:
space:
mode:
authorNino Breuer2014-10-01 13:08:11 +0200
committerNino Breuer2014-10-01 13:08:11 +0200
commitba72b1e7a599d7a7154e4e0c1671ba76094b5e96 (patch)
tree86eb9e5571ac948205204eae1fef0656c0b78792 /dozentenmodul/src/main/java
parentMerge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff)
downloadtutor-module-ba72b1e7a599d7a7154e4e0c1671ba76094b5e96.tar.gz
tutor-module-ba72b1e7a599d7a7154e4e0c1671ba76094b5e96.tar.xz
tutor-module-ba72b1e7a599d7a7154e4e0c1671ba76094b5e96.zip
dg
Diffstat (limited to 'dozentenmodul/src/main/java')
-rw-r--r--dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java29
-rw-r--r--dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java11
-rw-r--r--dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java51
3 files changed, 65 insertions, 26 deletions
diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
index 8ee3b522..21b5dcda 100644
--- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
@@ -19,13 +19,8 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.HashMap;
import javax.swing.ButtonGroup;
import javax.swing.JButton;
@@ -46,25 +41,18 @@ import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.xml.sax.SAXException;
-import org.apache.log4j.Logger;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import models.ImageRights;
import models.Links;
import models.SessionData;
import models.person;
+
+import org.apache.log4j.Logger;
+
import util.GuiOrganizer;
import util.News;
-import util.ResourceLoader;
import util.OpenLinks;
+import util.ResourceLoader;
@SuppressWarnings("serial")
public class MainMenue_GUI extends JFrame {
@@ -87,7 +75,8 @@ public class MainMenue_GUI extends JFrame {
private final ButtonGroup buttonGroup = new ButtonGroup();
private JMenuItem mntmAbout;
- private static final String HELP_MESSAGE = "";
+ private static final String HELP_MESSAGE = "<html>Bitte wählen Sie aus, was Sie anlegen möchten.<br /> " +
+ "Sie können </html>";
// for testing
ImageRights imageRights = new ImageRights();
@@ -444,14 +433,18 @@ public class MainMenue_GUI extends JFrame {
JMenu mnNewMenu_1 = new JMenu("Hilfe");
menuBar.add(mnNewMenu_1);
+ //Template for Help-Buttons
+ /*
JMenu mnNewMenu_Info = new JMenu("Info");
mnNewMenu_Info.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent arg0) {
- JOptionPane.showMessageDialog(null, HELP_MESSAGE, "title", JOptionPane.INFORMATION_MESSAGE);
+ JOptionPane.showMessageDialog(null, HELP_MESSAGE, "Hilfe zu dieser Oberfläche", JOptionPane.INFORMATION_MESSAGE);
}
});
menuBar.add(mnNewMenu_Info);
+ *
+ */
JMenuItem mntmFaq = new JMenuItem("FAQ");
mntmFaq.addMouseListener(new MouseAdapter() {
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
index 9e7b5d77..ef9dab15 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
@@ -287,7 +287,7 @@ public class PermissionCreateLecture_GUI extends JFrame {
panel_2.setBorder(new TitledBorder(null, "Sichtbarkeit im VMChooser", TitledBorder.LEADING, TitledBorder.TOP, null, null));
panel_2.setBackground(SystemColor.menu);
- JScrollPane scrollPane_1 = new JScrollPane();
+ final JScrollPane scrollPane_1 = new JScrollPane();
scrollPane_1.setEnabled(false);
scrollPane_1.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
scrollPane_1.setBounds(23, 83, 203, 185);
@@ -297,6 +297,7 @@ public class PermissionCreateLecture_GUI extends JFrame {
scrollPane_1.setViewportView(table_1);
JRadioButton rdbtnAlle = new JRadioButton("Sichtbar für alle");
+
rdbtnAlle.setEnabled(false);
rdbtnAlle.setSelected(true);
buttonGroup.add(rdbtnAlle);
@@ -309,10 +310,10 @@ public class PermissionCreateLecture_GUI extends JFrame {
rdbtnIndividuell.setBounds(6, 53, 109, 23);
panel_2.add(rdbtnIndividuell);
- JButton btnHinzufgen = new JButton("Hinzufügen");
- btnHinzufgen.setEnabled(false);
- btnHinzufgen.setBounds(23, 279, 89, 23);
- panel_2.add(btnHinzufgen);
+ JButton btnAddVmUser = new JButton("Hinzufügen");
+ btnAddVmUser.setEnabled(false);
+ btnAddVmUser.setBounds(23, 279, 89, 23);
+ panel_2.add(btnAddVmUser);
JButton btnLschen = new JButton("Löschen");
btnLschen.setEnabled(false);
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
index e66a2929..f356d3dd 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
@@ -62,6 +62,7 @@ import javax.swing.JTextField;
import org.eclipse.jface.viewers.CheckboxCellEditor;
import java.awt.Choice;
+import javax.swing.JRadioButton;
@SuppressWarnings("serial")
public class PermissionEditLecture_GUI extends JFrame {
@@ -177,14 +178,14 @@ public class PermissionEditLecture_GUI extends JFrame {
JPanel panel_1 = new JPanel();
panel_1.setBackground(SystemColor.menu);
- panel_1.setBorder(new TitledBorder(null, "Berechtigungen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
- panel_1.setBounds(10, 207, 557, 313);
+ panel_1.setBorder(new TitledBorder(null, "Suite-Berechtigungen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+ panel_1.setBounds(10, 207, 311, 313);
contentPanel.add(panel_1);
panel_1.setLayout(null);
JScrollPane scrollPane = new JScrollPane();
scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
- scrollPane.setBounds(10, 21, 537, 281);
+ scrollPane.setBounds(10, 21, 291, 249);
panel_1.add(scrollPane);
table = new JTable();
@@ -218,6 +219,16 @@ public class PermissionEditLecture_GUI extends JFrame {
*/
scrollPane.setViewportView(table);
+ JButton button = new JButton("Hinzufügen");
+ button.setEnabled(false);
+ button.setBounds(10, 279, 89, 23);
+ panel_1.add(button);
+
+ JButton button_1 = new JButton("Löschen");
+ button_1.setEnabled(false);
+ button_1.setBounds(109, 279, 89, 23);
+ panel_1.add(button_1);
+
JLabel lblHauptmen = new JLabel("Hauptmenü");
lblHauptmen.addMouseListener(new MouseAdapter() {
@Override
@@ -266,6 +277,40 @@ public class PermissionEditLecture_GUI extends JFrame {
comboBox.setModel(new DefaultComboBoxModel(new String[] {"Hochschule Offenburg", "Hochschule Reutlingen", "Universität Freiburg"}));
comboBox.setBounds(365, 36, 202, 20);
contentPanel.add(comboBox);
+
+ JPanel panel_2 = new JPanel();
+ panel_2.setLayout(null);
+ panel_2.setBorder(new TitledBorder(null, "Sichtbarkeit im VMChooser", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+ panel_2.setBackground(SystemColor.menu);
+ panel_2.setBounds(331, 207, 236, 313);
+ contentPanel.add(panel_2);
+
+ JScrollPane scrollPane_1 = new JScrollPane();
+ scrollPane_1.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+ scrollPane_1.setEnabled(false);
+ scrollPane_1.setBounds(23, 83, 203, 185);
+ panel_2.add(scrollPane_1);
+
+ JRadioButton radioButton = new JRadioButton("Sichtbar für alle");
+ radioButton.setSelected(true);
+ radioButton.setEnabled(false);
+ radioButton.setBounds(6, 27, 109, 23);
+ panel_2.add(radioButton);
+
+ JRadioButton radioButton_1 = new JRadioButton("Individuell");
+ radioButton_1.setEnabled(false);
+ radioButton_1.setBounds(6, 53, 109, 23);
+ panel_2.add(radioButton_1);
+
+ JButton button_2 = new JButton("Hinzufügen");
+ button_2.setEnabled(false);
+ button_2.setBounds(23, 279, 89, 23);
+ panel_2.add(button_2);
+
+ JButton button_3 = new JButton("Löschen");
+ button_3.setEnabled(false);
+ button_3.setBounds(122, 279, 89, 23);
+ panel_2.add(button_3);
{
JPanel buttonPane = new JPanel();
buttonPane.setBounds(0, 640, 597, 33);
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-07-14 09:31:38 +0200