aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/CMakeLists.txt4
-rw-r--r--data/fonts.edc114
-rw-r--r--data/omk_logo.edc38
-rw-r--r--data/synthpod.edc7
-rw-r--r--data/theme.edc63
5 files changed, 42 insertions, 184 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 703cb1b6..cb71cabb 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -17,7 +17,6 @@ if(BUILD_UI)
${CMAKE_CURRENT_SOURCE_DIR}/synthpod.edc
${PROJECT_BINARY_DIR}/synthpod.edj
DEPENDS
- ${CMAKE_CURRENT_SOURCE_DIR}/fonts.edc
${CMAKE_CURRENT_SOURCE_DIR}/modgrid.edc
${CMAKE_CURRENT_SOURCE_DIR}/modlist.edc
${CMAKE_CURRENT_SOURCE_DIR}/patcher.edc
@@ -26,7 +25,8 @@ if(BUILD_UI)
${CMAKE_CURRENT_SOURCE_DIR}/smart_spinner.edc
${CMAKE_CURRENT_SOURCE_DIR}/smart_toggle.edc
${CMAKE_CURRENT_SOURCE_DIR}/synthpod.edc
- ${CMAKE_CURRENT_SOURCE_DIR}/theme.edc)
+ ${CMAKE_CURRENT_SOURCE_DIR}/theme.edc
+ ${CMAKE_CURRENT_SOURCE_DIR}/omk_logo.edc)
add_custom_target(THEME ALL DEPENDS ${PROJECT_BINARY_DIR}/synthpod.edj)
install(FILES ${PROJECT_BINARY_DIR}/synthpod.edj DESTINATION ${SYNTHPOD_DATA_DIR})
endif()
diff --git a/data/fonts.edc b/data/fonts.edc
deleted file mode 100644
index a7fba6d1..00000000
--- a/data/fonts.edc
+++ /dev/null
@@ -1,114 +0,0 @@
-/*fonts {
- font: "PT_Sans-Web-Regular.ttf" "PTSans";
- font: "PT_Sans-Web-Bold.ttf" "PTSans-Bold";
- font: "PT_Sans-Web-Italic.ttf" "PTSans-Italic";
- font: "PT_Sans-Web-BoldItalic.ttf" "PTSans-BoldItalic";
-}
-
-#define FN "PTSans"
-#define FNBD "PTSans-Bold"
-#define FNIT "PTSans-Italic"
-#define FNBDIT "PTSans-BoldItalic"
-*/
-#define FN "Sans"
-#define FNBD "Sans:style=Bold"
-#define FNIT "Sans:style=Oblique"
-#define FNBDIT "Sans:style=Bold Italic"
-
-#define FN_COL_DEFAULT_BASIC 255 255 255 255
-/* fonts.edc not sure if this one is neccesary */
-#define FN_COL_DEFAULT 255 255 255 255; color3: 0 0 0 128
-#define FN_COL_DEFAULT_SOFT_SHADOW 255 255 255 255; color3: 0 0 0 18
-#define FN_COL_HIGHLIGHT 51 153 255 255; color2: 51 153 255 24; color3: 51 153 255 18
-#define FN_COL_HIGHLIGHT_CLICKED 255 255 255 255; color2: 51 153 255 64; color3: 51 153 255 32
-#define FN_COL_HIGHLIGHT_DISABLE 51 153 255 64; color2: 51 153 255 16; color3: 51 153 255 8
-#define FN_COL_MID_GREY 128 128 128 255
-#define FN_COL_DISABLE 21 21 21 255; color3: 255 255 255 25;
-#define FN_COL_DISABLE_SHADOW 21 21 21 255; color3: 255 255 255 192
-#define FN_COL_TRANSPARENT 255 255 255 0; color3: 0 0 0 0
-#define FN_COL_WHITE_GLOW 255 255 255 255; color2: 255 255 255 24; color3: 255 255 255 18
-/* e/module/conf_colors/preview/text */
-#define FN_COL_SHADOW 255 255 255 32
-#define FN_COL_OUTLINE_SHADOW 255 255 255 255; color2: 255 255 255 255; color3: 255 255 255 255
-/* temperature.edc */
-#define FN_COL_SHADOW_BOTTOM 255 255 255 0; color2: 0 0 0 255; color3: 0 0 0 0
-/* elm/diskselector */
-#define FN_COL_WHITE 255 255 255 255
-#define FN_COL_GREY_152 152 152 152 255
-#define FN_COL_GREY_172 172 172 172 255
-/* elm/flipselector */
-#define FN_COL_GREY_192 192 192 192 255; color3: 0 0 0 128
-/* TBD: This could probably just be disabled */
-#define FN_COL_GREY_16 16 16 16 255; color3: 255 255 255 25
-/* elm/various */
-/* TBD: should this just be the normal disabled */
-#define FN_COL_DISABLE_LIGHTER_SHADOW 21 21 21 255; color3: 255 255 255 15
-/* xkbswitch.edc */
-#define FN_COL_OUTLINE_TRANSPARENT 255 255 255 0; color2: 0 0 0 0; color3: 0 0 0 0;
-#define FN_COL_OUTLINE_DEFAULT 255 255 255 255; color2: 0 0 0 128; color3: 0 0 0 24;
-
-#define ENABLED_TEXTBLOCK_TAGS \
- tag: "em" "+ font_style=Oblique"; \
- tag: "hilight" "+ font_weight=Bold style=glow glow_color=#3399ff80"; \
- tag: "link" "+ color=#3399ff underline=on underline_color=#3399ff"; \
- tag: "preedit" "+ underline=on underline_color=#3399ff"; \
- tag: "preedit_sel" "+ backing=on backing_color=#000000 color=#ffffff"; \
- tag: "title" "+ font_size=26"; \
- tag: "subtitle" "+ font_size=18"; \
- tag: "bigger" "+ font_size=12"; \
- tag: "big" "+ font_size=11"; \
- tag: "small" "+ font_size=8"; \
- tag: "smaller" "+ font_size=7"; \
- tag: "name" "+ color=#888888 font_weight=Bold"; \
- tag: "val" "+ color=#ffffff"; \
- tag: "info" "+ color=#3399ff style=glow glow_color=#3399ff30"; \
- tag: "success" "+ color=#00ff00 style=glow glow_color=#00ff0030"; \
- tag: "warning" "+ color=#ff7c00 style=glow glow_color=#ff7c0030"; \
- tag: "failure" "+ color=#ff0000 style=glow glow_color=#ff000030"; \
- tag: "code" "+ font=Mono style=plain color=#ffffff"; \
- tag: "comment" "+ color=#00B000"; \
- tag: "string" "+ color=#ff3a35"; \
- tag: "number" "+ color=#D4D42A font_weight=Bold"; \
- tag: "brace" "+ color=#656565"; \
- tag: "type" "+ color=#3399ff"; \
- tag: "class" "+ color=#72AAD4 font_weight=Bold"; \
- tag: "function" "+ color=#72AAD4 font_weight=Bold"; \
- tag: "param" "+ color=#ffffff"; \
- tag: "keyword" "+ color=#ff9900 font_weight=Bold"; \
- tag: "preprocessor" "+ color=#3399ff font_weight=Bold"; \
- tag: "line_added" "+ color=#00B000"; \
- tag: "line_removed" "+ color=#ff3a35"; \
- tag: "line_changed" "+ color=#ff9900";
-
-#define DISABLED_TEXTBLOCK_TAGS \
- tag: "em" "+ font_style=Oblique"; \
- tag: "hilight" "+ font_weight=Bold style=glow glow_color=#3399ff20"; \
- tag: "link" "+ color=#101820 shadow_color=#66aaff28 underline=on underline_color=#101820"; \
- tag: "preedit" "+ underline=on underline_color=#3399ff88"; \
- tag: "preedit_sel" "+ backing=on backing_color=#000000 color=#888888"; \
- tag: "title" "+ font_size=26"; \
- tag: "subtitle" "+ font_size=18"; \
- tag: "bigger" "+ font_size=12"; \
- tag: "big" "+ font_size=11"; \
- tag: "small" "+ font_size=8"; \
- tag: "smaller" "+ font_size=7"; \
- tag: "name" "+ color=#151515 font_weight=Bold"; \
- tag: "val" "+ color=#151515"; \
- tag: "info" "+ color=#3399ff60 style=glow glow_color=#3399ff18"; \
- tag: "success" "+ color=#00ff0060 style=glow glow_color=#00ff0018"; \
- tag: "warning" "+ color=#ff7c0060 style=glow glow_color=#ff7c0018"; \
- tag: "failure" "+ color=#ff000060 style=glow glow_color=#ff000018"; \
- tag: "code" "+ style=shadow,bottom shadow_color=#ffffff19 font=Mono color=#151515"; \
- tag: "comment" "+ color=#002800"; \
- tag: "string" "+ color=#300504"; \
- tag: "number" "+ color=#202008 font_weight=Bold"; \
- tag: "brace" "+ color=#000000"; \
- tag: "type" "+ color=#101820"; \
- tag: "class" "+ color=#121c20 font_weight=Bold"; \
- tag: "function" "+ color=#121c20 font_weight=Bold"; \
- tag: "param" "+ color=#151515"; \
- tag: "keyword" "+ color=#201200 font_weight=Bold"; \
- tag: "preprocessor" "+ color=#101820 font_weight=Bold"; \
- tag: "line_added" "+ color=#002800"; \
- tag: "line_removed" "+ color=#300504"; \
- tag: "line_changed" "+ color=#201200";
diff --git a/data/omk_logo.edc b/data/omk_logo.edc
new file mode 100644
index 00000000..154eb5ef
--- /dev/null
+++ b/data/omk_logo.edc
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+images {
+ image: "omk_logo_256x256.png" COMP;
+}
+
+group {
+ name: "/omk/logo";
+
+ parts {
+ part {
+ name: "logo";
+ type: IMAGE;
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ image.normal: "omk_logo_256x256.png";
+ aspect: 1 1;
+ aspect_preference: BOTH;
+ }
+ }
+ }
+}
diff --git a/data/synthpod.edc b/data/synthpod.edc
index 0b839bf0..2d51354b 100644
--- a/data/synthpod.edc
+++ b/data/synthpod.edc
@@ -15,11 +15,6 @@
* http://www.perlfoundation.org/artistic_license_2_0.
*/
-collections {
- images {
- image: "omk_logo_256x256.png" COMP;
- }
-
#define COLORS_MAX "20"
#define COL00 0 0 0 255 // Black
#define COL01 255 179 0 255 // Vivid Yellow
@@ -43,7 +38,9 @@ collections {
#define COL19 241 58 19 255 // Vivid Reddish Orange
#define COL20 35 44 22 255 // Dark Olive Green
+collections {
#include <theme.edc>
+#include <omk_logo.edc>
#include <modlist.edc>
#include <modgrid.edc>
#include <patcher.edc>
diff --git a/data/theme.edc b/data/theme.edc
index 12cb129a..d037168d 100644
--- a/data/theme.edc
+++ b/data/theme.edc
@@ -15,73 +15,10 @@
* http://www.perlfoundation.org/artistic_license_2_0.
*/
-fonts {
- font: "Rase-GPL.otf" "logofont";
-}
-
group {
name: "/synthpod/theme";
data {
item: "colors_max" COLORS_MAX;
}
-
- 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";
- }
- }
}