diff --git a/app/util/launcher/resources/NEURPOLI.TTF b/app/util/launcher/resources/NEURPOLI.TTF
deleted file mode 100644
index 6db04ebc46..0000000000
Binary files a/app/util/launcher/resources/NEURPOLI.TTF and /dev/null differ
diff --git a/app/util/launcher/resources/labels/exit.svg b/app/util/launcher/resources/labels/exit.svg
new file mode 100644
index 0000000000..a5f49a7f81
--- /dev/null
+++ b/app/util/launcher/resources/labels/exit.svg
@@ -0,0 +1,101 @@
+
+
diff --git a/app/util/launcher/resources/labels/info.svg b/app/util/launcher/resources/labels/info.svg
new file mode 100644
index 0000000000..dc18826613
--- /dev/null
+++ b/app/util/launcher/resources/labels/info.svg
@@ -0,0 +1,101 @@
+
+
diff --git a/app/util/launcher/resources/labels/logo.svg b/app/util/launcher/resources/labels/logo.svg
new file mode 100644
index 0000000000..d0175ce8ae
--- /dev/null
+++ b/app/util/launcher/resources/labels/logo.svg
@@ -0,0 +1,219 @@
+
+
diff --git a/app/util/launcher/resources/labels/monitor.svg b/app/util/launcher/resources/labels/monitor.svg
new file mode 100644
index 0000000000..6571478c09
--- /dev/null
+++ b/app/util/launcher/resources/labels/monitor.svg
@@ -0,0 +1,113 @@
+
+
diff --git a/app/util/launcher/resources/labels/play.svg b/app/util/launcher/resources/labels/play.svg
new file mode 100644
index 0000000000..28ce0a1292
--- /dev/null
+++ b/app/util/launcher/resources/labels/play.svg
@@ -0,0 +1,101 @@
+
+
diff --git a/app/util/launcher/resources/labels/rec.svg b/app/util/launcher/resources/labels/rec.svg
new file mode 100644
index 0000000000..1556c8945b
--- /dev/null
+++ b/app/util/launcher/resources/labels/rec.svg
@@ -0,0 +1,97 @@
+
+
diff --git a/app/util/launcher/resources/labels/src/button_image_as_layers.svg b/app/util/launcher/resources/labels/src/button_image_as_layers.svg
new file mode 100644
index 0000000000..ee4b616e82
--- /dev/null
+++ b/app/util/launcher/resources/labels/src/button_image_as_layers.svg
@@ -0,0 +1,215 @@
+
+
diff --git a/app/util/launcher/resources/labels/src/button_text_as_layers.svg b/app/util/launcher/resources/labels/src/button_text_as_layers.svg
new file mode 100644
index 0000000000..7f896462b1
--- /dev/null
+++ b/app/util/launcher/resources/labels/src/button_text_as_layers.svg
@@ -0,0 +1,151 @@
+
+
diff --git a/app/util/launcher/resources/labels/sys.svg b/app/util/launcher/resources/labels/sys.svg
new file mode 100644
index 0000000000..7435102dd7
--- /dev/null
+++ b/app/util/launcher/resources/labels/sys.svg
@@ -0,0 +1,97 @@
+
+
diff --git a/app/util/launcher/resources/resources.qrc b/app/util/launcher/resources/resources.qrc
index c4bafa3e9f..d945fa31b2 100644
--- a/app/util/launcher/resources/resources.qrc
+++ b/app/util/launcher/resources/resources.qrc
@@ -1,6 +1,12 @@
ecallauncher.ico
- NEURPOLI.TTF
+ labels/exit.svg
+ labels/info.svg
+ labels/logo.svg
+ labels/monitor.svg
+ labels/play.svg
+ labels/rec.svg
+ labels/sys.svg
diff --git a/app/util/launcher/src/main.cpp b/app/util/launcher/src/main.cpp
index ec0801dfea..795cb6151d 100644
--- a/app/util/launcher/src/main.cpp
+++ b/app/util/launcher/src/main.cpp
@@ -24,12 +24,10 @@
#include "main_window.h"
#include
-#include
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
- QFontDatabase::addApplicationFont(":/ecallauncher/APP_FONT");
MainWindow w;
w.show();
diff --git a/app/util/launcher/src/main_window.ui b/app/util/launcher/src/main_window.ui
index 11ef436d99..d8ad22ad89 100644
--- a/app/util/launcher/src/main_window.ui
+++ b/app/util/launcher/src/main_window.ui
@@ -43,7 +43,7 @@
Qt::PreventContextMenu
- eCALLauncher
+ eCAL Launcher
@@ -130,7 +130,6 @@
- Neuropolitical
11
75
true
@@ -164,10 +163,7 @@ QPushButton:!hover {background-color: rgb(0,0,0);color:rgb(255,200,0);padding_bo
- Neuropolitical
11
- 50
- false
@@ -201,20 +197,18 @@ QPushButton:!hover {background-color: rgb(0,0,0);color:rgb(255,200,0)}
-
-
-
-
- Neuropolitical
- 48
- 50
- false
-
+
+
+
+ 16777215
+ 90
+
-
- QLabel {color:rgb(255,200,0)}
+
+ :/ecallauncher/LOGO
-
- eCAL5
+
+ false
Qt::AlignCenter
@@ -274,18 +268,19 @@ QPushButton:!hover {background-color: rgb(0,0,0);color:rgb(255,200,0)}
80
-
-
- Neuropolitical
- 22
-
-
QPushButton:hover {background-color:rgb(125, 125, 125);color:rgb(0,0,0)}
QPushButton:!hover {background-color:rgb(0,0,0);color:rgb(255,200,0)}
-
- monitor
+
+
+ :/ecallauncher/LABEL_MONITOR:/ecallauncher/LABEL_MONITOR
+
+
+
+ 1024
+ 30
+
@@ -316,15 +311,6 @@ QPushButton:!hover {background-color:rgb(0,0,0);color:rgb(255,200,0)}
80
-
-
- Neuropolitical
- 22
- 50
- false
- false
-
-
Qt::NoFocus
@@ -335,11 +321,15 @@ QPushButton:!hover {background-color:rgb(0,0,0);color:rgb(255,200,0)}
QPushButton:hover {background-color:rgb(125, 125, 125);color:rgb(0,0,0)}
QPushButton:!hover {background-color:rgb(0,0,0);color:rgb(255,200,0)}
-
- play
+
+
+ :/ecallauncher/LABEL_PLAY:/ecallauncher/LABEL_PLAY
-
- false
+
+
+ 1024
+ 30
+
@@ -376,15 +366,6 @@ QPushButton:!hover {background-color:rgb(0,0,0);color:rgb(255,200,0)}
50
-
-
- Neuropolitical
- 16
- 50
- false
- false
-
-
Qt::NoFocus
@@ -398,8 +379,15 @@ QPushButton:!hover {background-color:rgb(0,0,0);color:rgb(255,200,0)}
QPushButton:hover {background-color:rgb(125, 125, 125);color:rgb(0,0,0)}
QPushButton:!hover {background-color:rgb(0,0,0);color:rgb(255,200,0)}
-
- info
+
+
+ :/ecallauncher/LABEL_INFO:/ecallauncher/LABEL_INFO
+
+
+
+ 1024
+ 20
+
false
@@ -450,18 +438,19 @@ QPushButton:!hover {background-color:rgb(0,0,0);color:rgb(255,200,0)}
80
-
-
- Neuropolitical
- 22
-
-
QPushButton:hover {background-color:rgb(125, 125, 125);color:rgb(0,0,0)}
QPushButton:!hover {background-color:rgb(0,0,0);color:rgb(255,200,0)}
-
- sys
+
+
+ :/ecallauncher/LABEL_SYS:/ecallauncher/LABEL_SYS
+
+
+
+ 1024
+ 30
+
@@ -492,15 +481,6 @@ QPushButton:!hover {background-color:rgb(0,0,0);color:rgb(255,200,0)}
80
-
-
- Neuropolitical
- 22
- 50
- false
- false
-
-
Qt::NoFocus
@@ -511,8 +491,15 @@ QPushButton:!hover {background-color:rgb(0,0,0);color:rgb(255,200,0)}
QPushButton:hover {background-color:rgb(125, 125, 125);color:rgb(0,0,0)}
QPushButton:!hover {background-color:rgb(0,0,0);color:rgb(255,200,0)}
-
- rec
+
+
+ :/ecallauncher/LABEL_REC:/ecallauncher/LABEL_REC
+
+
+
+ 1024
+ 30
+
false
@@ -549,15 +536,6 @@ QPushButton:!hover {background-color:rgb(0,0,0);color:rgb(255,200,0)}
50
-
-
- Neuropolitical
- 16
- 50
- false
- false
-
-
Qt::NoFocus
@@ -568,8 +546,15 @@ QPushButton:!hover {background-color:rgb(0,0,0);color:rgb(255,200,0)}
QPushButton:hover {background-color:rgb(125, 125, 125);color:rgb(0,0,0)}
QPushButton:!hover {background-color:rgb(0,0,0);color:rgb(255,200,0)}
-
- exit
+
+
+ :/ecallauncher/LABEL_EXIT:/ecallauncher/LABEL_EXIT
+
+
+
+ 1024
+ 20
+
false
@@ -615,6 +600,10 @@ QPushButton:!hover {background-color:rgb(0,0,0);color:rgb(255,200,0)}
+
+ pushButton_monitor
+ pushButton_sys
+
diff --git a/cpack/innosetup/gfx/NEURPOLI.TTF b/cpack/innosetup/gfx/NEURPOLI.TTF
deleted file mode 100644
index 6db04ebc46..0000000000
Binary files a/cpack/innosetup/gfx/NEURPOLI.TTF and /dev/null differ