aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2015-04-12 22:09:39 +0200
committerHanspeter Portner <dev@open-music-kontrollers.ch>2015-04-12 22:09:39 +0200
commitcb127fec11cfd9ea5cfb6aff3e6c97c9fb7bf26d (patch)
tree032047c8748608bee7fd83fe637bc0370856af8d /data
parent1366116d591d4f2e27a298c9a85e446755b2a43d (diff)
downloadsynthpod-cb127fec11cfd9ea5cfb6aff3e6c97c9fb7bf26d.tar.xz
theming updates.
* add color border for gengrid boxes & separate EoUI windows. * add full scaling support for modlist genlist.
Diffstat (limited to 'data')
-rw-r--r--data/CMakeLists.txt1
-rw-r--r--data/modgrid.edc103
-rw-r--r--data/modlist.edc122
-rw-r--r--data/synthpod.edc1
4 files changed, 174 insertions, 53 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 5cee1076..85625572 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -19,6 +19,7 @@ if(BUILD_UI)
DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/synthpod.edc
${CMAKE_CURRENT_SOURCE_DIR}/modlist.edc
+ ${CMAKE_CURRENT_SOURCE_DIR}/modgrid.edc
${CMAKE_CURRENT_SOURCE_DIR}/patcher.edc
${CMAKE_CURRENT_SOURCE_DIR}/slider.edc)
add_custom_target(THEME ALL DEPENDS ${PROJECT_BINARY_DIR}/synthpod.edj)
diff --git a/data/modgrid.edc b/data/modgrid.edc
new file mode 100644
index 00000000..2b4c2054
--- /dev/null
+++ b/data/modgrid.edc
@@ -0,0 +1,103 @@
+/*
+ * 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.
+ */
+
+#define MODGRID_UI "/synthpod/modgrid/ui"
+
+images {
+ image: "border.png" COMP;
+}
+
+group {
+ name: "/synthpod/modgrid/container";
+
+ parts {
+ part {
+ name: "clip";
+ type: RECT;
+ mouse_events: 0;
+ description { state: "default" 0.00; fixed: 1 1; color: COL00; }
+ description { state: "default" 0.01; fixed: 1 1; color: COL01; }
+ description { state: "default" 0.02; fixed: 1 1; color: COL02; }
+ description { state: "default" 0.03; fixed: 1 1; color: COL03; }
+ description { state: "default" 0.04; fixed: 1 1; color: COL04; }
+ description { state: "default" 0.05; fixed: 1 1; color: COL05; }
+ description { state: "default" 0.06; fixed: 1 1; color: COL06; }
+ description { state: "default" 0.07; fixed: 1 1; color: COL07; }
+ description { state: "default" 0.08; fixed: 1 1; color: COL08; }
+ description { state: "default" 0.09; fixed: 1 1; color: COL09; }
+ description { state: "default" 0.10; fixed: 1 1; color: COL10; }
+ description { state: "default" 0.11; fixed: 1 1; color: COL11; }
+ description { state: "default" 0.12; fixed: 1 1; color: COL12; }
+ description { state: "default" 0.13; fixed: 1 1; color: COL13; }
+ description { state: "default" 0.14; fixed: 1 1; color: COL14; }
+ description { state: "default" 0.15; fixed: 1 1; color: COL15; }
+ description { state: "default" 0.16; fixed: 1 1; color: COL16; }
+ description { state: "default" 0.17; fixed: 1 1; color: COL17; }
+ description { state: "default" 0.18; fixed: 1 1; color: COL18; }
+ description { state: "default" 0.19; fixed: 1 1; color: COL19; }
+ description { state: "default" 0.20; fixed: 1 1; color: COL20; }
+ }
+ part {
+ name: "border";
+ type: IMAGE;
+ mouse_events: 0;
+ clip_to: "clip";
+ description {
+ state: "default" 0.0;
+ fixed: 1 1;
+ image.normal: "border.png";
+ image.border: 2 2 2 2;
+ image.middle: 0;
+ }
+ }
+ part {
+ name: "elm.swallow.content";
+ type: SWALLOW;
+ mouse_events: 1;
+ description {
+ state: "default" 0.0;
+ fixed: 1 1;
+ rel1.offset: 2 2;
+ rel2.offset: -2 -2;
+ }
+ }
+ }
+
+ programs {
+ program { signal: "col,00"; source: MODGRID_UI; action: STATE_SET "default" 0.00; target: "clip"; }
+ program { signal: "col,01"; source: MODGRID_UI; action: STATE_SET "default" 0.01; target: "clip"; }
+ program { signal: "col,02"; source: MODGRID_UI; action: STATE_SET "default" 0.02; target: "clip"; }
+ program { signal: "col,03"; source: MODGRID_UI; action: STATE_SET "default" 0.03; target: "clip"; }
+ program { signal: "col,04"; source: MODGRID_UI; action: STATE_SET "default" 0.04; target: "clip"; }
+ program { signal: "col,05"; source: MODGRID_UI; action: STATE_SET "default" 0.05; target: "clip"; }
+ program { signal: "col,06"; source: MODGRID_UI; action: STATE_SET "default" 0.06; target: "clip"; }
+ program { signal: "col,07"; source: MODGRID_UI; action: STATE_SET "default" 0.07; target: "clip"; }
+ program { signal: "col,08"; source: MODGRID_UI; action: STATE_SET "default" 0.08; target: "clip"; }
+ program { signal: "col,09"; source: MODGRID_UI; action: STATE_SET "default" 0.09; target: "clip"; }
+ program { signal: "col,10"; source: MODGRID_UI; action: STATE_SET "default" 0.10; target: "clip"; }
+ program { signal: "col,11"; source: MODGRID_UI; action: STATE_SET "default" 0.11; target: "clip"; }
+ program { signal: "col,12"; source: MODGRID_UI; action: STATE_SET "default" 0.12; target: "clip"; }
+ program { signal: "col,13"; source: MODGRID_UI; action: STATE_SET "default" 0.13; target: "clip"; }
+ program { signal: "col,14"; source: MODGRID_UI; action: STATE_SET "default" 0.14; target: "clip"; }
+ program { signal: "col,15"; source: MODGRID_UI; action: STATE_SET "default" 0.15; target: "clip"; }
+ program { signal: "col,16"; source: MODGRID_UI; action: STATE_SET "default" 0.16; target: "clip"; }
+ program { signal: "col,17"; source: MODGRID_UI; action: STATE_SET "default" 0.17; target: "clip"; }
+ program { signal: "col,18"; source: MODGRID_UI; action: STATE_SET "default" 0.18; target: "clip"; }
+ program { signal: "col,19"; source: MODGRID_UI; action: STATE_SET "default" 0.19; target: "clip"; }
+ program { signal: "col,20"; source: MODGRID_UI; action: STATE_SET "default" 0.20; target: "clip"; }
+ }
+}
diff --git a/data/modlist.edc b/data/modlist.edc
index 4ef0dea7..4b117d94 100644
--- a/data/modlist.edc
+++ b/data/modlist.edc
@@ -48,34 +48,39 @@ group {
description { state: "default" 0.20; fixed: 1 1; color: COL20; }
}
part {
- name: "elm.text";
- type: TEXT;
- mouse_events: 0;
+ name: "elm.swallow.icon";
+ type: SWALLOW;
+ mouse_events: 1;
description {
state: "default" 0.0;
fixed: 1 1;
+ align: 0.0 0.5;
+ aspect: 1.0 1.0;
rel1.relative: 0 0;
- rel1.offset: 16 0;
- rel2.relative: 1 1;
- rel2.offset: -32 0;
- text {
- text: "";
- font: "default";
- size: 11;
- align: 0.0 0.5;
- };
+ rel2.relative: 0 1;
+ min: 16 16;
}
}
part {
- name: "elm.swallow.icon";
- type: SWALLOW;
- mouse_events: 1;
+ name: "elm.text";
+ type: TEXT;
+ effect: OUTLINE;
+ mouse_events: 0;
+ scale: 1;
description {
state: "default" 0.0;
fixed: 1 1;
- rel1.relative: 0 0;
+ rel1.to_x: "elm.swallow.icon";
+ rel1.relative: 1 0;
+ rel2.to_x: "elm.swallow.preend";
rel2.relative: 0 1;
- rel2.offset: 16 0;
+ text {
+ text: "";
+ size: 10;
+ align: 0.0 0.5;
+ };
+ color: 255 255 255 255;
+ color2: 255 255 255 96;
}
}
part {
@@ -85,10 +90,13 @@ group {
description {
state: "default" 0.0;
fixed: 1 1;
- rel1.relative: 1 0;
- rel1.offset: -32 0;
- rel2.relative: 1 1;
- rel2.offset: -16 0;
+ align: 1.0 0.5;
+ aspect: 1.0 1.0;
+ rel1.to_x: "elm.swallow.end";
+ rel1.relative: -1 0;
+ rel2.to_x: "elm.swallow.end";
+ rel2.relative: 0 1;
+ min: 16 16;
}
}
part {
@@ -98,9 +106,11 @@ group {
description {
state: "default" 0.0;
fixed: 1 1;
+ align: 1.0 0.5;
+ aspect: 1.0 1.0;
rel1.relative: 1 0;
- rel1.offset: -16 0;
rel2.relative: 1 1;
+ min: 16 16;
}
}
}
@@ -135,58 +145,63 @@ group {
parts {
part {
- name: "elm.text";
- type: TEXT;
- mouse_events: 0;
+ name: "elm.swallow.icon";
+ type: SWALLOW;
+ mouse_events: 1;
description {
state: "default" 0.0;
fixed: 1 1;
+ align: 0.0 0.5;
+ aspect: 1.0 1.0;
rel1.relative: 0 0;
- rel1.offset: 32 0;
- rel2.relative: 0.3 1;
- text {
- text: "";
- font: "default";
- size: 11;
- align: 0.0 0.5;
- };
+ rel2.relative: 0 1;
+ min: 16 16;
}
}
part {
- name: "elm.swallow.content";
+ name: "elm.swallow.sink";
type: SWALLOW;
- mouse_events: 1;
+ mouse_events: 0;
description {
state: "default" 0.0;
fixed: 1 1;
- rel1.relative: 0.3 0;
+ align: 0.0 0.5;
+ aspect: 1.0 1.0;
+ rel1.to_x: "elm.swallow.icon";
+ rel1.relative: 1 0;
+ rel2.to_x: "elm.swallow.icon";
rel2.relative: 1 1;
- rel2.offset: -16 0;
+ min: 16 16;
}
}
part {
- name: "elm.swallow.icon";
- type: SWALLOW;
- mouse_events: 1;
+ name: "elm.text";
+ type: TEXT;
+ mouse_events: 0;
+ scale: 1;
description {
state: "default" 0.0;
fixed: 1 1;
- rel1.relative: 0 0;
- rel2.relative: 0 1;
- rel2.offset: 16 0;
+ rel1.to_x: "elm.swallow.sink";
+ rel1.relative: 1 0;
+ rel2.relative: 0.4 1;
+ text {
+ text: "";
+ size: 10;
+ align: 0.0 0.5;
+ };
}
}
part {
- name: "elm.swallow.sink";
+ name: "elm.swallow.content";
type: SWALLOW;
- mouse_events: 0;
+ mouse_events: 1;
description {
state: "default" 0.0;
fixed: 1 1;
- rel1.relative: 0 0.5;
- rel1.offset: 16 -8;
- rel2.relative: 0 0.5;
- rel2.offset: 32 8;
+ rel1.relative: 0.4 0;
+ rel2.to_x: "elm.swallow.source";
+ rel2.relative: 0 1;
}
}
part {
@@ -196,10 +211,11 @@ group {
description {
state: "default" 0.0;
fixed: 1 1;
- rel1.relative: 1 0.5;
- rel1.offset: -16 -8;
- rel2.relative: 1 0.5;
- rel2.offset: 0 8;
+ align: 1.0 0.5;
+ aspect: 1.0 1.0;
+ rel1.relative: 1 0;
+ rel2.relative: 1 1;
+ min: 16 16;
}
}
}
diff --git a/data/synthpod.edc b/data/synthpod.edc
index 6b2c55af..b02b693b 100644
--- a/data/synthpod.edc
+++ b/data/synthpod.edc
@@ -47,6 +47,7 @@ collections {
#define COL20 35 44 22 255 // Dark Olive Green
#include <modlist.edc>
+#include <modgrid.edc>
#include <patcher.edc>
#include <slider.edc>
}