[griffin.display] theme: make buttons like the old UM

Also use a textblock rather then text for the elm.text part, this allows
us to use multiline text on buttons

Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>

4 files changed, 38 insertions, 79 deletions

diff --git a/data/themes/default/edc/elm/button.edc b/data/themes/default/edc/elm/button.edc
index 4645f9e..8de9641 100644
--- a/data/themes/default/edc/elm/button.edc
+++ b/data/themes/default/edc/elm/button.edc
@@ -69,11 +69,25 @@ group { name: "elm/button/base/default";
          }
       }
    }
+   styles {
+      style { name: "button_style_default";
+         base: "font="FN" font_size=8 text_class=tb_plain color=#ffffffff align=center";
+	 FN_TAG_BR;
+      }
+      style { name: "button_style_focused";
+         base: "font="FN" font_size=8 text_class=tb_plain color=#000000ff align=center";
+	 FN_TAG_BR;
+      }
+      style { name: "button_style_disabled";
+         base: "font="FN" font_size=8 text_class=tb_plain color=#000000ff align=center";
+	 FN_TAG_BR;
+      }
+   }
    parts {
       part { name: "base"; mouse_events: 0;
          description { state: "default" 0.0;
             image.normal: "button_outline.png";
-            image.border: 13 13 13 13;
+            image.border: 3 3 3 3;
             image.middle: SOLID;
             rel1.offset: 0 0;
             rel2.offset: -1 -1;
@@ -128,7 +142,7 @@ group { name: "elm/button/base/default";
          description { state: "default" 0.0;
 //            fixed: 1 1;
             visible: 0;
-            text { font: FN; size: 8;
+            text { font: FN; size: 7;
                min: 0 0;
                text_class: "button_text";
             }
@@ -154,8 +168,7 @@ group { name: "elm/button/base/default";
             }
          }
       }
-      part { name: "elm.text"; type: TEXT; mouse_events: 0;
-         scale: 1;
+      part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0;
          description { state: "default" 0.0;
             rel1.offset: 0 5;
             rel1.relative: 1.0 0.0;
@@ -163,12 +176,10 @@ group { name: "elm/button/base/default";
             rel1.to_y: "base";
             rel2.offset: -8 -8;
             rel2.to: "base";
-            color_class: "button_text";
-            text { font: FN; size: 8;
-               align: 0.5 0.5;
-               min: 0 0;
-               text_class: "button";
-            }
+	    text {
+	       style: "button_style_default";
+	       min: 0 1;
+	    }
             visible: 0;
          }
 	 description { state: "unfocus" 0.0;
@@ -177,12 +188,18 @@ group { name: "elm/button/base/default";
 	 }
 	 description { state: "focus" 0.0;
 	    inherit: "default" 0.0;
-            color_class: "button_text_focus";
+	    text {
+	       style: "button_style_focused";
+	       min: 0 1;
+	    }
             visible: 1;
 	 }
 	 description { state: "clicked" 0.0;
 	    inherit: "default" 0.0;
-            color_class: "button_text_focus";
+	    text {
+	       style: "button_style_focused";
+	       min: 0 1;
+	    }
             visible: 1;
 	 }
 	 description { state: "unclicked" 0.0;
@@ -205,16 +222,22 @@ group { name: "elm/button/base/default";
          description { state: "disabled_visible" 0.0;
             inherit: "default" 0.0;
             rel1.offset: 2 5;
-            color_class: "button_text_disabled";
             text.min: 1 1;
             text.ellipsis: -1;
+	    text {
+	       style: "button_style_disabled";
+	       min: 0 1;
+	    }
             visible: 1;
          }
          description { state: "disabled_textonly" 0.0;
             inherit: "default" 0.0;
-            color_class: "button_text_disabled";
             text.min: 1 1;
             text.ellipsis: -1;
+	    text {
+	       style: "button_style_disabled";
+	       min: 0 1;
+	    }
             visible: 1;
          }
       }
diff --git a/data/themes/default/fonts.edc b/data/themes/default/fonts.edc
index 30aba78..c89ece8 100644
--- a/data/themes/default/fonts.edc
+++ b/data/themes/default/fonts.edc
@@ -25,68 +25,4 @@
 #define FN_COL_DISABLE 0 0 0 255;
 #define FN_COL_TRANSPARENT 255 255 255 0;
 
-#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";
+#define FN_TAG_BR tag: "br" "\n";
diff --git a/data/themes/default/img/button_normal.png b/data/themes/default/img/button_normal.png
index ed50f17..ba970ef 100644
--- a/data/themes/default/img/button_normal.png
+++ b/data/themes/default/img/button_normal.png
diff --git a/data/themes/default/img/button_outline.png b/data/themes/default/img/button_outline.png
index 0ddfad8..074976f 100644
--- a/data/themes/default/img/button_outline.png
+++ b/data/themes/default/img/button_outline.png