summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wilson2014-08-25 13:38:32 +0200
committerMichael Wilson2014-08-25 13:38:32 +0200
commitc204c2c95ab2dfccf9d6ecfafbf2ccdc78205941 (patch)
tree298bbe0138316436201ff1ac07bd19efe362d83b
parentMerge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff)
parentVL-Image in Image geändert (diff)
downloadtutor-module-c204c2c95ab2dfccf9d6ecfafbf2ccdc78205941.tar.gz
tutor-module-c204c2c95ab2dfccf9d6ecfafbf2ccdc78205941.tar.xz
tutor-module-c204c2c95ab2dfccf9d6ecfafbf2ccdc78205941.zip
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts: Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
Diffstat
-rw-r--r--Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.classbin9383 -> 9380 bytes
-rw-r--r--Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.classbin10096 -> 9965 bytes
-rw-r--r--Dozentenmodul/bin/gui/image/DeleteImage_GUI.classbin16839 -> 16836 bytes
-rw-r--r--Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.classbin11694 -> 11691 bytes
-rw-r--r--Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.classbin10891 -> 10888 bytes
-rw-r--r--Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.classbin13715 -> 13712 bytes
-rw-r--r--Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.classbin13259 -> 13256 bytes
-rw-r--r--Dozentenmodul/bin/gui/image/SearchEditImage_GUI.classbin16984 -> 16981 bytes
-rw-r--r--Dozentenmodul/bin/gui/image/SearchImage_GUI.classbin16760 -> 16757 bytes
-rw-r--r--Dozentenmodul/bin/gui/intro/Login_GUI.classbin10690 -> 10686 bytes
-rw-r--r--Dozentenmodul/bin/gui/intro/MainMenue_GUI.classbin11815 -> 11813 bytes
-rw-r--r--Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java2
-rw-r--r--Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java8
-rw-r--r--Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java10
-rw-r--r--Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java2
-rw-r--r--Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java10
-rw-r--r--Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java2
-rw-r--r--Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java2
-rw-r--r--Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java2
-rw-r--r--Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java2
-rw-r--r--Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java2
-rw-r--r--Dozentenmodul/src/gui/image/PermissionCreateImage_GUI.java10
-rw-r--r--Dozentenmodul/src/gui/image/PermissionEditImage_GUI.java10
-rw-r--r--Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java5
-rw-r--r--Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java6
25 files changed, 16 insertions, 57 deletions
diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class
index 7a06b18d..95304c06 100644
--- a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class
+++ b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class
index 29e1b8fb..933ab951 100644
--- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class
+++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
index 18b00f77..a15ca0fe 100644
--- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
index c2666cee..3ed6d48c 100644
--- a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
+++ b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class
index 98947f75..0c82438c 100644
--- a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class
+++ b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
index 81198ca7..b34abb62 100644
--- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
+++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
index 205e8370..bafbc05d 100644
--- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
+++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
index 8051fcb8..0a129b98 100644
--- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
index 8173d4ba..d59c5e1b 100644
--- a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class
index dfb790f4..383dc69b 100644
--- a/Dozentenmodul/bin/gui/intro/Login_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/Login_GUI.class
Binary files differ
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
index 368d6277..8c085373 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
Binary files differ
diff --git a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java
index 106fee58..669bab3a 100644
--- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java
@@ -252,7 +252,7 @@ public class CreateImageAllgemein_GUI extends JFrame {
label_1.setBounds(69, 11, 13, 14);
contentPanel.add(label_1);
- JLabel lblVlimage = new JLabel("VL-Image");
+ JLabel lblVlimage = new JLabel("Image");
lblVlimage.setForeground(Color.BLUE);
lblVlimage.setBounds(81, 11, 45, 14);
contentPanel.add(lblVlimage);
diff --git a/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java b/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java
index 84d61fdd..dea785d3 100644
--- a/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java
+++ b/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java
@@ -138,7 +138,7 @@ public class CreateImageFreigabe_GUI extends JFrame {
label_1.setBounds(69, 11, 13, 14);
contentPanel.add(label_1);
- JLabel lblVlimage = new JLabel("VL-Image");
+ JLabel lblVlimage = new JLabel("Image");
lblVlimage.setForeground(Color.BLUE);
lblVlimage.setBounds(81, 11, 45, 14);
contentPanel.add(lblVlimage);
@@ -199,12 +199,6 @@ public class CreateImageFreigabe_GUI extends JFrame {
JMenuBar menuBar = new JMenuBar();
setJMenuBar(menuBar);
- JMenu mnNewMenu = new JMenu("Suchen");
- menuBar.add(mnNewMenu);
-
- JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
- mnNewMenu.add(mntmVlSuche);
-
JMenu mnNewMenu_1 = new JMenu("Hilfe");
menuBar.add(mnNewMenu_1);
diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
index a31e0ecb..6ffd9f19 100644
--- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
@@ -286,7 +286,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
label_1.setBounds(69, 11, 13, 14);
contentPanel.add(label_1);
- JLabel lblVlimage = new JLabel("VL-Image");
+ JLabel lblVlimage = new JLabel("Image");
lblVlimage.setForeground(Color.BLUE);
lblVlimage.setBounds(81, 11, 45, 14);
contentPanel.add(lblVlimage);
@@ -393,13 +393,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
JMenuBar menuBar = new JMenuBar();
setJMenuBar(menuBar);
-
- JMenu mnNewMenu = new JMenu("Suchen");
- menuBar.add(mnNewMenu);
-
- JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
- mnNewMenu.add(mntmVlSuche);
-
+
JMenu mnNewMenu_1 = new JMenu("Hilfe");
menuBar.add(mnNewMenu_1);
diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
index f1ebcd98..396d8f28 100644
--- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
@@ -257,7 +257,7 @@ public class EditImageAllgemein_GUI extends JFrame {
label_1.setBounds(69, 11, 13, 14);
contentPanel.add(label_1);
- JLabel lblVlimage = new JLabel("VL-Image");
+ JLabel lblVlimage = new JLabel("Image");
lblVlimage.setForeground(Color.BLUE);
lblVlimage.setBounds(81, 11, 45, 14);
contentPanel.add(lblVlimage);
diff --git a/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java b/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java
index 97237c84..147900fe 100644
--- a/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java
+++ b/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java
@@ -135,7 +135,7 @@ public class EditImageFreigabe_GUI extends JFrame {
label_1.setBounds(69, 11, 13, 14);
contentPanel.add(label_1);
- JLabel lblVlimage = new JLabel("VL-Image");
+ JLabel lblVlimage = new JLabel("Image");
lblVlimage.setForeground(Color.BLUE);
lblVlimage.setBounds(81, 11, 45, 14);
contentPanel.add(lblVlimage);
@@ -195,13 +195,7 @@ public class EditImageFreigabe_GUI extends JFrame {
JMenuBar menuBar = new JMenuBar();
setJMenuBar(menuBar);
-
- JMenu mnNewMenu = new JMenu("Suchen");
- menuBar.add(mnNewMenu);
-
- JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
- mnNewMenu.add(mntmVlSuche);
-
+
JMenu mnNewMenu_1 = new JMenu("Hilfe");
menuBar.add(mnNewMenu_1);
diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
index f44378fb..217e2825 100644
--- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
@@ -246,7 +246,7 @@ public class EditImageTechnisch_GUI extends JFrame {
label_1.setBounds(69, 0, 13, 14);
contentPanel.add(label_1);
- JLabel lblVlimage = new JLabel("VL-Image");
+ JLabel lblVlimage = new JLabel("Image");
lblVlimage.setForeground(Color.BLUE);
lblVlimage.setBounds(81, 0, 45, 14);
contentPanel.add(lblVlimage);
diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index 235a46dd..ba442928 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -290,7 +290,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
label_3.setBounds(80, 91, 14, 14);
contentPanel.add(label_3);
- JLabel lblVlimage = new JLabel("VL-Image");
+ JLabel lblVlimage = new JLabel("Image");
lblVlimage.setForeground(Color.BLUE);
lblVlimage.setBounds(91, 88, 46, 20);
contentPanel.add(lblVlimage);
diff --git a/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java
index 5bf766e8..e03d07a3 100644
--- a/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java
@@ -275,7 +275,7 @@ public class FTPEditDownloader_GUI extends JFrame implements
label_2.setBounds(80, 95, 14, 14);
contentPanel.add(label_2);
- JLabel label_3 = new JLabel("VL-Image");
+ JLabel label_3 = new JLabel("Image");
label_3.setForeground(Color.BLUE);
label_3.setBounds(91, 92, 46, 20);
contentPanel.add(label_3);
diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
index 5b2ffe90..7826e979 100644
--- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
@@ -279,7 +279,7 @@ public class FTPEditUploader_GUI extends JFrame implements
label_3.setBounds(80, 91, 14, 14);
contentPanel.add(label_3);
- JLabel lblVlimage = new JLabel("VL-Image");
+ JLabel lblVlimage = new JLabel("Image");
lblVlimage.setForeground(Color.BLUE);
lblVlimage.setBounds(91, 88, 46, 20);
contentPanel.add(lblVlimage);
diff --git a/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java
index 66f0890a..41176f05 100644
--- a/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java
@@ -276,7 +276,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements
label_2.setBounds(80, 95, 14, 14);
contentPanel.add(label_2);
- JLabel label_3 = new JLabel("VL-Image");
+ JLabel label_3 = new JLabel("Image");
label_3.setForeground(Color.BLUE);
label_3.setBounds(91, 92, 46, 20);
contentPanel.add(label_3);
diff --git a/Dozentenmodul/src/gui/image/PermissionCreateImage_GUI.java b/Dozentenmodul/src/gui/image/PermissionCreateImage_GUI.java
index 24605b6d..434c7d89 100644
--- a/Dozentenmodul/src/gui/image/PermissionCreateImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/PermissionCreateImage_GUI.java
@@ -220,7 +220,7 @@ public class PermissionCreateImage_GUI extends JFrame {
label_1.setBounds(69, 11, 13, 14);
contentPanel.add(label_1);
- JLabel lblVlimage = new JLabel("VL-Image");
+ JLabel lblVlimage = new JLabel("Image");
lblVlimage.setForeground(Color.BLUE);
lblVlimage.setBounds(81, 11, 45, 14);
contentPanel.add(lblVlimage);
@@ -347,13 +347,7 @@ public class PermissionCreateImage_GUI extends JFrame {
JMenuBar menuBar = new JMenuBar();
setJMenuBar(menuBar);
-
- JMenu mnNewMenu = new JMenu("Suchen");
- menuBar.add(mnNewMenu);
-
- JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
- mnNewMenu.add(mntmVlSuche);
-
+
JMenu mnNewMenu_1 = new JMenu("Hilfe");
menuBar.add(mnNewMenu_1);
diff --git a/Dozentenmodul/src/gui/image/PermissionEditImage_GUI.java b/Dozentenmodul/src/gui/image/PermissionEditImage_GUI.java
index 744532b4..416d515a 100644
--- a/Dozentenmodul/src/gui/image/PermissionEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/PermissionEditImage_GUI.java
@@ -210,7 +210,7 @@ public class PermissionEditImage_GUI extends JFrame {
label_1.setBounds(69, 11, 13, 14);
contentPanel.add(label_1);
- JLabel lblVlimage = new JLabel("VL-Image");
+ JLabel lblVlimage = new JLabel("Image");
lblVlimage.setForeground(Color.BLUE);
lblVlimage.setBounds(81, 11, 45, 14);
contentPanel.add(lblVlimage);
@@ -335,13 +335,7 @@ public class PermissionEditImage_GUI extends JFrame {
JMenuBar menuBar = new JMenuBar();
setJMenuBar(menuBar);
-
- JMenu mnNewMenu = new JMenu("Suchen");
- menuBar.add(mnNewMenu);
-
- JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
- mnNewMenu.add(mntmVlSuche);
-
+
JMenu mnNewMenu_1 = new JMenu("Hilfe");
menuBar.add(mnNewMenu_1);
diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
index 2eee9ae7..6118ae1e 100644
--- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
@@ -856,11 +856,6 @@ public class CreateLectureLink_GUI extends JFrame {
JMenuBar menuBar = new JMenuBar();
setJMenuBar(menuBar);
- JMenu mnNewMenu = new JMenu("Suchen");
- menuBar.add(mnNewMenu);
-
- JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
- mnNewMenu.add(mntmVlSuche);
JMenu mnNewMenu_1 = new JMenu("Hilfe");
menuBar.add(mnNewMenu_1);
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
index c0f896c0..29fc58bf 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
@@ -862,12 +862,6 @@ public class EditLectureLink_GUI extends JFrame {
JMenuBar menuBar = new JMenuBar();
setJMenuBar(menuBar);
- JMenu mnNewMenu = new JMenu("Suchen");
- menuBar.add(mnNewMenu);
-
- JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
- mnNewMenu.add(mntmVlSuche);
-
JMenu mnNewMenu_1 = new JMenu("Hilfe");
menuBar.add(mnNewMenu_1);
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-03-03 01:20:40 +0100