aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2015-04-19 22:44:17 +0200
committerHanspeter Portner <dev@open-music-kontrollers.ch>2015-04-19 22:44:17 +0200
commit6720e70e07e97cf2542a35577ea2475b21c2d2f8 (patch)
treea69e9d9acc66f73a948e27d41c14c933599bc774 /data
parentc13bf9a29bb36b7030b1d715a4e5e88042060092 (diff)
downloadsynthpod-6720e70e07e97cf2542a35577ea2475b21c2d2f8.tar.xz
implement two-stage ui-loading for better UX.
* load UI before app * load UI in two stages * load window + empty theme first * fill theme, lists, grids in a delayed worker job
Diffstat (limited to 'data')
-rw-r--r--data/CMakeLists.txt1
-rw-r--r--data/font/Rase-GPL.otfbin0 -> 26300 bytes
-rw-r--r--data/synthpod.edc5
-rw-r--r--data/theme.edc83
4 files changed, 85 insertions, 4 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 85625572..5bfb93be 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -18,6 +18,7 @@ if(BUILD_UI)
${PROJECT_BINARY_DIR}/synthpod.edj
DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/synthpod.edc
+ ${CMAKE_CURRENT_SOURCE_DIR}/theme.edc
${CMAKE_CURRENT_SOURCE_DIR}/modlist.edc
${CMAKE_CURRENT_SOURCE_DIR}/modgrid.edc
${CMAKE_CURRENT_SOURCE_DIR}/patcher.edc
diff --git a/data/font/Rase-GPL.otf b/data/font/Rase-GPL.otf
new file mode 100644
index 00000000..ae2e57be
--- /dev/null
+++ b/data/font/Rase-GPL.otf
Binary files differ
diff --git a/data/synthpod.edc b/data/synthpod.edc
index b02b693b..1e789014 100644
--- a/data/synthpod.edc
+++ b/data/synthpod.edc
@@ -20,10 +20,6 @@ collections {
image: "omk_logo_256x256.png" COMP;
}
- fonts {
- //font: "DejaVuSansMono-Bold.ttf" "default";
- }
-
#define COL00 0 0 0 255 // Black
#define COL01 255 179 0 255 // Vivid Yellow
#define COL02 128 62 117 255 // Strong Purple
@@ -46,6 +42,7 @@ collections {
#define COL19 241 58 19 255 // Vivid Reddish Orange
#define COL20 35 44 22 255 // Dark Olive Green
+#include <theme.edc>
#include <modlist.edc>
#include <modgrid.edc>
#include <patcher.edc>
diff --git a/data/theme.edc b/data/theme.edc
new file mode 100644
index 00000000..3e8ff791
--- /dev/null
+++ b/data/theme.edc
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2015 Hanspeter Portner (dev@open-music-kontrollers.ch)
+ *
+ * This is free software: you can redistribute it and/or modify
+ * it under the terms of the Artistic License 2.0 as published by
+ * The Perl Foundation.
+ *
+ * This source is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * Artistic License 2.0 for more details.
+ *
+ * You should have received a copy of the Artistic License 2.0
+ * along the source as a COPYING file. If not, obtain it from
+ * http://www.perlfoundation.org/artistic_license_2_0.
+ */
+
+fonts {
+ font: "Rase-GPL.otf" "logofont";
+}
+
+group {
+ name: "/synthpod/theme";
+
+ parts {
+ part {
+ name: "clip";
+ type: RECT;
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ description {
+ state: "default" 1.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 4;
+ }
+ }
+
+ part {
+ name: "label";
+ type: TEXT;
+ mouse_events: 0;
+ clip_to: "clip";
+ description {
+ state: "default" 0.0;
+ rel1.relative: 0.1 0.1;
+ rel2.relative: 0.9 0.9;
+ fixed: 1 1;
+ map {
+ on: 1;
+ rotation.z: -15;
+ }
+ text {
+ text: "Synth Pod";
+ font: "logofont";
+ size: 10;
+ fit: 1 1;
+ ellipsis: -1;
+ align: 0.5 0.5;
+ }
+ }
+ }
+
+ part {
+ name: "elm.swallow.content";
+ type: SWALLOW;
+ description {
+ state: "default" 0.0;
+ }
+ }
+ }
+
+ programs {
+ program {
+ signal: "show";
+ action: STATE_SET "default" 1.0;
+ transition: SINUSOIDAL 2.0;
+ target: "clip";
+ }
+ }
+}