summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorS.Brandt <s.brandt@mixxx.org>2015-12-20 13:38:44 +0100
committerOwen Williams <owilliams@mixxx.org>2015-12-26 10:58:04 -0500
commitcc60e3cd74f3207e191eefc758c4c90308e9eedd (patch)
tree0038e4ff0d7180086a20d10e4aa2c68d2330e341
parentaca35f48bb93a8b88a1c65343f7ded9ba961919c (diff)
Update default lauchimage, that is displayed on startup. Found the current one looks a bit fuzzy.
Changes: filetype png->svg, color -> monochrome, icon height = text height, spacing now 0.5 em between icon and text Follow up to mixxxdj#650
-rw-r--r--res/images/mixxx-icon-logo-symbolic.pngbin7484 -> 0 bytes
-rw-r--r--res/images/mixxx-icon-logo-symbolic.svg1
-rw-r--r--res/images/mixxx-icon-symbolic.pngbin797 -> 0 bytes
-rw-r--r--res/mixxx.qrc3
-rw-r--r--src/skin/launchimage.cpp10
-rw-r--r--src/skin/launchimage.h2
-rw-r--r--src/skin/legacyskinparser.cpp2
7 files changed, 9 insertions, 9 deletions
diff --git a/res/images/mixxx-icon-logo-symbolic.png b/res/images/mixxx-icon-logo-symbolic.png
deleted file mode 100644
index 549d283773..0000000000
--- a/res/images/mixxx-icon-logo-symbolic.png
+++ /dev/null
Binary files differ
diff --git a/res/images/mixxx-icon-logo-symbolic.svg b/res/images/mixxx-icon-logo-symbolic.svg
new file mode 100644
index 0000000000..4c9904ee24
--- /dev/null
+++ b/res/images/mixxx-icon-logo-symbolic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48" width="236" viewBox="0 0 236 48.000001"><g fill="#fff"><path d="M137.32 4.042l27.411 39.985h12.132l-27.423-39.985zM164.778 4.042l27.423 39.985h12.132l-27.423-39.985zM192.247 4.042l27.423 39.985h12.121l-27.423-39.985zM122.808 4.042h10.372v39.991h-10.372zM81.232 44.026v-23.417l13.143 19.946h.267l13.27-20.143v23.615h10.31v-39.985h-11.18l-12.399 19.934-12.399-19.934h-11.18v39.985zM171.536 34.181l6.063 8.843 6.25-9.116-6.063-8.841-6.25 9.114zm-13.733-20.031l6.064 8.846 6.249-9.114-6.065-8.843-6.247 9.112zm61.871-10.113l-6.938 10.117 6.062 8.84 12.997-18.957h-12.121zm-82.359 39.991h12.131l6.935-10.115-6.065-8.846-13.001 18.96zm61.689-9.848l6.063 8.841 6.247-9.112-6.063-8.841-6.247 9.112zm-13.732-20.027l6.062 8.84 6.247-9.112-6.062-8.839-6.247 9.11z"/><path style="text-decoration-color:#000000;isolation:auto;mix-blend-mode:normal;solid-color:#000000;block-progression:tb;text-decoration-line:none;text-decoration-style:solid;white-space:normal;text-indent:0;text-transform:none" d="M22.4 10c-1.307 0-2.375 1.068-2.375 2.375v8.25c0 1.307 1.068 2.375 2.375 2.375h7.25c1.307 0 2.375-1.068 2.375-2.375v-8.25c0-1.307-1.068-2.375-2.375-2.375h-7.25zm3.303 1.998h.643c.376 0 .68.304.68.68v7.643c0 .376-.304.678-.68.678h-.643c-.376 0-.678-.302-.678-.678v-7.643c0-.376.302-.68.678-.68zm-19.107-7.998c-1.416 0-2.57 1.092-2.57 2.432v30.135c0 1.339 1.155 2.434 2.57 2.434h38.857c1.416 0 2.572-1.094 2.572-2.434v-30.135c0-1.339-1.156-2.432-2.572-2.432h-38.857zm12.805 4h13.25c1.307 0 2.375 1.068 2.375 2.375v6.625h6.688c.719 0 1.313.594 1.313 1.313v.375c0 .718-.594 1.313-1.313 1.313h-6.688v5.625c0 1.307-1.068 2.375-2.375 2.375h-13.25c-1.307 0-2.375-1.068-2.375-2.375v-5.625h-6.688c-.719 0-1.313-.594-1.313-1.313v-.375c0-.719.594-1.313 1.313-1.313h6.688v-6.625c0-1.307 1.068-2.375 2.375-2.375zm-9.375 21.998h1v6h-1v-6zm4 0h1v5h-1v-5zm4 0h1v4h-1v-4zm4 0h1v3h-1v-3zm4 0h1v6h-1v-6zm4 0h1v3h-1v-3zm4 0h1v4h-1v-4zm3 0h1v5h-1v-5zm4 0h1v6h-1v-6zm-37 8.43v3c0 1.417 1.16 2.572 2.578 2.572h38.844c1.418 0 2.578-1.155 2.578-2.572v-3c0 1.416-1.156 2.572-2.572 2.572h-38.857c-1.416 0-2.57-1.156-2.57-2.572z" color="#000"/></g></svg> \ No newline at end of file
diff --git a/res/images/mixxx-icon-symbolic.png b/res/images/mixxx-icon-symbolic.png
deleted file mode 100644
index 1c63eb4d35..0000000000
--- a/res/images/mixxx-icon-symbolic.png
+++ /dev/null
Binary files differ
diff --git a/res/mixxx.qrc b/res/mixxx.qrc
index d6bfa12d8e..ec6c2b8c78 100644
--- a/res/mixxx.qrc
+++ b/res/mixxx.qrc
@@ -24,8 +24,7 @@
<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/mixxx-icon-logo-symbolic.svg</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/src/skin/launchimage.cpp b/src/skin/launchimage.cpp
index 6dce6ed037..4a4b0e11d9 100644
--- a/src/skin/launchimage.cpp
+++ b/src/skin/launchimage.cpp
@@ -13,21 +13,21 @@ LaunchImage::LaunchImage(QWidget* pParent, const QString& styleSheet)
setStyleSheet(
"LaunchImage { background-color: #202020; }"
"QLabel { "
- "image: url(:/images/mixxx-icon-logo-symbolic.png);"
+ "image: url(:/images/mixxx-icon-logo-symbolic.svg);"
"padding:0;"
"margin:0;"
"border:none;"
- "min-width: 208px;"
+ "min-width: 236px;"
"min-height: 48px;"
- "max-width: 208px;"
+ "max-width: 236px;"
"max-height: 48px;"
"}"
"QProgressBar {"
"background-color: #202020; "
"border:none;"
- "min-width: 208px;"
+ "min-width: 236px;"
"min-height: 3px;"
- "max-width: 208px;"
+ "max-width: 236px;"
"max-height: 3px;"
"}"
"QProgressBar::chunk { background-color: #f3efed; }");
diff --git a/src/skin/launchimage.h b/src/skin/launchimage.h
index 4790a68458..c04f3b5d3a 100644
--- a/src/skin/launchimage.h
+++ b/src/skin/launchimage.h
@@ -14,7 +14,7 @@ class QProgressBar;
// <LaunchImageStyle>
// LaunchImage { background-color: #202020; }
// QLabel {
-// image: url(skin:/style/mixxx-icon-logo-symbolic.png);
+// image: url(skin:/style/mixxx-icon-logo-symbolic.svg);
// padding:0;
// margin:0;
// border:none;
diff --git a/src/skin/legacyskinparser.cpp b/src/skin/legacyskinparser.cpp
index 8568d9957f..447f06b086 100644
--- a/src/skin/legacyskinparser.cpp
+++ b/src/skin/legacyskinparser.cpp
@@ -408,7 +408,7 @@ LaunchImage* LegacySkinParser::parseLaunchImage(QString skinPath, QWidget* pPare
}
// This allows image urls like
- // url(skin:/style/mixxx-icon-logo-symbolic.png);
+ // url(skin:/style/mixxx-icon-logo-symbolic.svg);
QStringList skinPaths(skinPath);
QDir::setSearchPaths("skin", skinPaths);