Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module

5 files changed, 7 insertions, 0 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
index e481ecd1..24b0cb01 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit;
 
 import javax.swing.Box;
 import javax.swing.BoxLayout;
+import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -215,6 +216,9 @@ public abstract class MainWindow {
 		// Scale the ui with the font.
 		mainWindow.setMinimumSize(Gui.getScaledDimension(1050, 670));
 
+		// set icon for the window
+		mainWindow.setIconImage(new ImageIcon(MainWindow.class.getResource("/img/bwlp-icon.png")).getImage());
+
 		// register all pages of the main window
 		registerPage(new MainMenuWindow());
 		registerPage(new ImageListWindow());
diff --git a/dozentenmodul/src/main/properties/i18n/window_layout.properties b/dozentenmodul/src/main/properties/i18n/window_layout.properties
index 7077d090..982ce0b5 100644
--- a/dozentenmodul/src/main/properties/i18n/window_layout.properties
+++ b/dozentenmodul/src/main/properties/i18n/window_layout.properties
@@ -234,6 +234,7 @@ VirtDropDownConfigEditor.Label.pnlWarning.text=Here you can modify some settings
   it is necessary to make the change locally, \
   install the necessary drivers, and re-upload the VM.
 VirtDropDownConfigEditor.Label.sound.text=Sound card
+VirtDropDownConfigEditor.Label.graphics.text=Graphics
 VirtDropDownConfigEditor.Label.3DAcceleration.text=3D-Acceleration
 VirtDropDownConfigEditor.Label.HWVersion.text=Virtualizer HW-Version
 VirtDropDownConfigEditor.Label.E0VirtDev.text=Network interface card
diff --git a/dozentenmodul/src/main/properties/i18n/window_layout_de_DE.properties b/dozentenmodul/src/main/properties/i18n/window_layout_de_DE.properties
index 72fef21e..c26066b7 100644
--- a/dozentenmodul/src/main/properties/i18n/window_layout_de_DE.properties
+++ b/dozentenmodul/src/main/properties/i18n/window_layout_de_DE.properties
@@ -234,6 +234,7 @@ VirtDropDownConfigEditor.Label.pnlWarning.text=Hier können Sie einige Einstellu
   Sie die Änderung nach dem Herunterladen einer VM lokal \
   durchführen, die notwendigen Treiber installieren und die VM wieder hochladen.
 VirtDropDownConfigEditor.Label.sound.text=Soundkarte
+VirtDropDownConfigEditor.Label.graphics.text=Grafik
 VirtDropDownConfigEditor.Label.3DAcceleration.text=3D-Beschleunigung
 VirtDropDownConfigEditor.Label.HWVersion.text=Virtualisierer HW-Version
 VirtDropDownConfigEditor.Label.E0VirtDev.text=Netzwerkkarte
diff --git a/dozentenmodul/src/main/properties/i18n/window_layout_tr_TR.properties b/dozentenmodul/src/main/properties/i18n/window_layout_tr_TR.properties
index f28e66ed..fe5b7627 100644
--- a/dozentenmodul/src/main/properties/i18n/window_layout_tr_TR.properties
+++ b/dozentenmodul/src/main/properties/i18n/window_layout_tr_TR.properties
@@ -234,6 +234,7 @@ VirtDropDownConfigEditor.Label.pnlWarning.text=Burada, kullanılan sanal donanı
   değişikliği lokal olarak yapmanız, gerekli sürücüleri kurmanız \
   ve sanal makineyi tekrar yüklemeniz gerekir.
 VirtDropDownConfigEditor.Label.sound.text=Ses kartı
+VirtDropDownConfigEditor.Label.graphics.text=Grafik
 VirtDropDownConfigEditor.Label.3DAcceleration.text=3D hızlandırıcı
 VirtDropDownConfigEditor.Label.HWVersion.text=Virtualizer donanım sürümü
 VirtDropDownConfigEditor.Label.E0VirtDev.text=Ethernet kartı
diff --git a/dozentenmodul/src/main/resources/img/bwlp-icon.png b/dozentenmodul/src/main/resources/img/bwlp-icon.png
new file mode 100644
index 00000000..9504eade
--- /dev/null
+++ b/dozentenmodul/src/main/resources/img/bwlp-icon.png