Merge pull request #650 from daschuer/launchimage

LaunchImage

6 files changed, 25 insertions, 1 deletions

diff --git a/res/images/mixxx-icon-logo-symbolic.png b/res/images/mixxx-icon-logo-symbolic.png
new file mode 100644
index 0000000000..549d283773
--- /dev/null
+++ b/res/images/mixxx-icon-logo-symbolic.png
diff --git a/res/images/mixxx-icon-symbolic.png b/res/images/mixxx-icon-symbolic.png
new file mode 100644
index 0000000000..1c63eb4d35
--- /dev/null
+++ b/res/images/mixxx-icon-symbolic.png
diff --git a/res/mixxx.qrc b/res/mixxx.qrc
index 05d5c5c524..d6bfa12d8e 100644
--- a/res/mixxx.qrc
+++ b/res/mixxx.qrc
@@ -24,6 +24,8 @@
         <file>images/library/ic_library_traktor.png</file>
         <file>images/library/ic_library_unchecked.png</file>
         <file>images/mixxx-icon.png</file>
+        <file>images/mixxx-icon-symbolic.png</file>
+        <file>images/mixxx-icon-logo-symbolic.png</file>
         <file>images/preferences/ic_preferences_autodj.png</file>
         <file>images/preferences/ic_preferences_bpmdetect.png</file>
         <file>images/preferences/ic_preferences_broadcast.png</file>
diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index 80df39a532..f5ef4ed36f 100644
--- a/res/skins/Deere/skin.xml
+++ b/res/skins/Deere/skin.xml
@@ -28,7 +28,7 @@
   <ObjectName>Mixxx</ObjectName>
   <Style src="skin:style.qss"/>
 
-  <MinimumSize>800,-1</MinimumSize>
+  <MinimumSize>800,450</MinimumSize>
   <SizePolicy>me,me</SizePolicy>
   <Layout>horizontal</Layout>
 
diff --git a/res/skins/Shade/skin.xml b/res/skins/Shade/skin.xml
index 0f46c72dfa..4a9ef552dc 100644
--- a/res/skins/Shade/skin.xml
+++ b/res/skins/Shade/skin.xml
@@ -130,6 +130,28 @@
 	<MinimumSize>1024,500</MinimumSize>
 	<SizePolicy>me,me</SizePolicy>
 	<Layout>vertical</Layout>
+    <LaunchImageStyle>
+    	LaunchImage { background-color: #202020; }
+        QLabel {
+        	image: url(skin:/style/mixxx-icon-logo-symbolic.png);
+          	padding:0;
+            margin:0;
+            border:none;
+            min-width: 208px;
+            min-height: 48px;
+    	    max-width: 208px;
+            max-height: 48px;
+        }
+        QProgressBar {
+        	background-color: #202020;
+            border:none;
+            min-width: 208px;
+            min-height: 3px;
+            max-width: 208px;
+            max-height: 3px;
+        }
+        QProgressBar::chunk { background-color: #ec4522; }
+    </LaunchImageStyle>
 
 	<Children>
 		<WidgetGroup>
diff --git a/res/skins/Shade/style/mixxx-icon-logo-symbolic.png b/res/skins/Shade/style/mixxx-icon-logo-symbolic.png
new file mode 100644
index 0000000000..3232b9f7a3
--- /dev/null
+++ b/res/skins/Shade/style/mixxx-icon-logo-symbolic.png