summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java
diff options
context:
space:
mode:
authorJonathan Bauer2015-09-17 18:19:00 +0200
committerJonathan Bauer2015-09-17 18:19:00 +0200
commitadadb806c777cce949f85468802bf8964a8803cb (patch)
tree570238996240e7a17550c82f4ce9aa3f0a2a96b9 /dozentenmodul/src/main/java
parent[client] success message when the upload creation finished (diff)
parent[server] Rename variable (since I messed up in the sqldump) (diff)
downloadtutor-module-adadb806c777cce949f85468802bf8964a8803cb.tar.gz
tutor-module-adadb806c777cce949f85468802bf8964a8803cb.tar.xz
tutor-module-adadb806c777cce949f85468802bf8964a8803cb.zip
Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1
Diffstat (limited to 'dozentenmodul/src/main/java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java2
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java1
2 files changed, 2 insertions, 1 deletions
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 e2e778d6..54ef67fe 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
@@ -25,7 +25,7 @@ public abstract class ImageListWindowLayout extends CompositePage {
protected final static String infoTextString = "Hier können Sie Virtuelle Maschinen hochladen, herunterladen, bearbeiten und löschen.";
protected final static String infoTitleString = "Übersicht Virtuelle Maschinen";
- protected final static String newButtonLabel = "Neu";
+ protected final static String newButtonLabel = "Neue VM";
protected final static String newLectureButtonLabel = "Neue Veranstaltung";
protected final static String editButtonLabel = "Bearbeiten";
protected final static String downloadButtonLabel = "Download";
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
index b25ed4a7..d97e6da8 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
@@ -93,6 +93,7 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
setActiveCheck.setSelected(state.isEnabled);
isTemplateCheck.setSelected(state.isTemplate);
licencedSoftwareCheck.setSelected(state.isRestricted);
+ reactToUserInput();
}
@Override