From 1374cd1d576e8c20f4f53040f59aa7af78579778 Mon Sep 17 00:00:00 2001 From: Olliver Schinagl Date: Thu, 5 Feb 2015 12:19:34 +0100 Subject: more temp commits --- data/themes/ulticontroller_2.0/eulogium/build.sh | 2 + .../eulogium/ulticontroller_2.0.edc | 12 + data/themes/ulticontroller_2.0/mainscreen.edc | 713 ++++++++++----------- data/themes/ulticontroller_2.0/material.edc | 393 ++++++++++++ .../ulticontroller_2.0/ulticontroller_2.0.edc | 56 +- src/eulogium.c | 17 +- 6 files changed, 829 insertions(+), 364 deletions(-) create mode 100755 data/themes/ulticontroller_2.0/eulogium/build.sh create mode 100644 data/themes/ulticontroller_2.0/eulogium/ulticontroller_2.0.edc create mode 100644 data/themes/ulticontroller_2.0/material.edc diff --git a/data/themes/ulticontroller_2.0/eulogium/build.sh b/data/themes/ulticontroller_2.0/eulogium/build.sh new file mode 100755 index 0000000..a278a1b --- /dev/null +++ b/data/themes/ulticontroller_2.0/eulogium/build.sh @@ -0,0 +1,2 @@ +#!/bin/sh +edje_cc $@ -id . -fd . ulticontroller_2.0.edc -o eulogium.edj diff --git a/data/themes/ulticontroller_2.0/eulogium/ulticontroller_2.0.edc b/data/themes/ulticontroller_2.0/eulogium/ulticontroller_2.0.edc new file mode 100644 index 0000000..70da76c --- /dev/null +++ b/data/themes/ulticontroller_2.0/eulogium/ulticontroller_2.0.edc @@ -0,0 +1,12 @@ +//#include "mainscreen.edc" + +data { + item: "theme/name" "Ulticontroller 2.0"; + item: "height" "128"; + item: "width" "64"; +} + +fonts { + font: "5x7.pcf.gz" "oled_font_small"; + font: "6x9.pcf.gz" "oled_font_large"; +} diff --git a/data/themes/ulticontroller_2.0/mainscreen.edc b/data/themes/ulticontroller_2.0/mainscreen.edc index 01d19e3..a5fe4ae 100644 --- a/data/themes/ulticontroller_2.0/mainscreen.edc +++ b/data/themes/ulticontroller_2.0/mainscreen.edc @@ -1,398 +1,393 @@ -collections { - sounds { - sample { - name: "sclick" RAW; - source: "what.wav"; - } - tone: "tclick" 2600; - } - group { - name: "mainscreen"; - min: 128 64; - max: 128 64; - parts { - part { - name: "background"; - type: RECT; - mouse_events: 0; - - description { - state: "default" 0.0; - color: 0 0 0 255; - - rel1 { - relative: 0.0 0.0; - offset: 0 0; - } - rel2 { - relative: 1.0 1.0; - offset: 0 0; - } - } - - description { - state: "error" 0.0; - color: 255 255 255 255; - - rel1 { - relative: 0.0 0.0; - offset: 0 0; - } - rel2 { - relative: 1.0 1.0; - offset: 0 0; - } +group { + name: "mainscreen"; + min: 128 64; + max: 128 64; + parts { + part { + name: "background"; + type: RECT; + mouse_events: 0; + + description { + state: "default" 0.0; + color: 0 0 0 255; + + rel1 { + relative: 0.0 0.0; + offset: 0 0; + } + rel2 { + relative: 1.0 1.0; + offset: 0 0; } } - part { - name: "print"; - type: RECT; - mouse_events: 1; - - description { - state: "default" 0.0; - min: 60 40; - max: 60 40; - align: 0.0 0.0; - color: 0 0 0 255; - - rel1 { - to_x: "vspacer"; - offset: -62 3; - } - } - description { - state: "active" 0.0; - min: 60 40; - max: 60 40; - align: 0.0 0.0; - color: 255 255 255 255; - - rel1 { - to_x: "vspacer"; - offset: -62 3; - } + description { + state: "error" 0.0; + color: 255 255 255 255; + + rel1 { + relative: 0.0 0.0; + offset: 0 0; + } + rel2 { + relative: 1.0 1.0; + offset: 0 0; } } + } - part { - name: "print.text"; - type: TEXT; - mouse_events: 0; - - description { - state: "default" 0.0; - color: 255 255 255 255; - - rel1 { - relative: 0.0 0.0; - offset: 0 0; - to: "print"; - } - rel2 { - relative: 1.0 1.0; - offset: 0 0; - to: "print"; - } - text { - text: "Print"; - font: "oled_font_large"; - align: 0.5 0.5; - } - } - description { - state: "active" 0.0; - color: 0 0 0 255; - - rel1 { - relative: 0.0 0.0; - offset: 0 0; - to: "print"; - } - rel2 { - relative: 1.0 1.0; - offset: 0 0; - to: "print"; - } - text { - text: "Print"; - font: "oled_font_large"; - align: 0.5 0.5; - } + part { + name: "print"; + type: RECT; + mouse_events: 1; + + description { + state: "default" 0.0; + min: 60 40; + max: 60 40; + align: 0.0 0.0; + color: 0 0 0 255; + + rel1 { + to_x: "vspacer"; + offset: -62 3; } } - - part { - name: "vspacer"; - type: RECT; - mouse_events: 0; - - description { - state: "default" 0.0; - min: 1 45; - max: 1 45; - align: 0.0 0.0; - color: 255 255 255 255; - - rel1 { - relative: 0.0 0.0; - offset: 64 0; - } - rel2 { - relative: 1.0 1.0; - offset: 64 45; - } + description { + state: "active" 0.0; + min: 60 40; + max: 60 40; + align: 0.0 0.0; + color: 255 255 255 255; + + rel1 { + to_x: "vspacer"; + offset: -62 3; } } + } - part { - name: "material"; - type: RECT; - mouse_events: 1; - - description { - state: "default" 0.0; - min: 60 40; - max: 60 40; - align: 0.0 0.0; - color: 0 0 0 255; - - rel1 { - to_x: "vspacer"; - offset: 3 3; - } - } - description { - state: "active" 0.0; - min: 60 40; - max: 60 40; - align: 0.0 0.0; - color: 255 255 255 255; - - rel1 { - to_x: "vspacer"; - offset: 3 3; - } + part { + name: "print.text"; + type: TEXT; + mouse_events: 0; + + description { + state: "default" 0.0; + color: 255 255 255 255; + + rel1 { + relative: 0.0 0.0; + offset: 0 0; + to: "print"; + } + rel2 { + relative: 1.0 1.0; + offset: 0 0; + to: "print"; + } + text { + text: "Print"; + font: "oled_font_large"; + align: 0.5 0.5; } } - - part { - name: "material.text"; - type: TEXT; - mouse_events: 0; - - description { - state: "default" 0.0; - color: 255 255 255 255; - - rel1 { - relative: 0.0 0.0; - offset: 0 0; - to: "material"; - } - rel2 { - relative: 1.0 1.0; - offset: 0 0; - to: "material"; - } - text { - text: "Material"; - font: "oled_font_large"; - align: 0.5 0.5; - } - } - - description { - state: "active" 0.0; - color: 0 0 0 255; - - rel1 { - relative: 0.0 0.0; - offset: 0 0; - to: "material"; - } - rel2 { - relative: 1.0 1.0; - offset: 0 0; - to: "material"; - } - text { - text: "Material"; - font: "oled_font_large"; - align: 0.5 0.5; - } + description { + state: "active" 0.0; + color: 0 0 0 255; + + rel1 { + relative: 0.0 0.0; + offset: 0 0; + to: "print"; + } + rel2 { + relative: 1.0 1.0; + offset: 0 0; + to: "print"; + } + text { + text: "Print"; + font: "oled_font_large"; + align: 0.5 0.5; } } + } - part { - name: "hspacer"; - type: RECT; - mouse_events: 0; - - description { - state: "default" 0.0; - min: 128 1; - max: 128 1; - align: 0.0 0.0; - color: 255 255 255 255; - - rel1 { - relative: 0.0 0.0; - offset: 0 46; - } - rel2 { - relative: 1.0 1.0; - offset: 128 46; - } + part { + name: "vspacer"; + type: RECT; + mouse_events: 0; + + description { + state: "default" 0.0; + min: 1 45; + max: 1 45; + align: 0.0 0.0; + color: 255 255 255 255; + + rel1 { + relative: 0.0 0.0; + offset: 64 0; + } + rel2 { + relative: 1.0 1.0; + offset: 64 45; } } + } - part { - name: "maintanance"; - type: RECT; - mouse_events: 1; - - description { - state: "default" 0.0; - min: 126 20; - max: 126 20; - align: 0.0 0.0; - color: 0 0 0 255; - - rel1 { - to_y: "hspacer"; - offset: 2 2; - } - } - description { - state: "active" 0.0; - min: 126 20; - max: 126 20; - align: 0.0 0.0; - color: 255 255 255 255; - - rel1 { - to_y: "hspacer"; - offset: 2 2; - } + part { + name: "material"; + type: RECT; + mouse_events: 1; + + description { + state: "default" 0.0; + min: 60 40; + max: 60 40; + align: 0.0 0.0; + color: 0 0 0 255; + + rel1 { + to_x: "vspacer"; + offset: 3 3; } } - - part { - name: "maintanance.text"; - type: TEXT; - mouse_events: 0; - - description { - state: "default" 0.0; - color: 255 255 255 255; - - rel1 { - relative: 0.0 0.0; - offset: 0 0; - to: "maintanance"; - } - rel2 { - relative: 1.0 1.0; - offset: 0 0; - to: "maintanance"; - } - text { - text: "Maintanance"; - font: "oled_font_large"; - align: 0.5 0.5; - } - } - - description { - state: "active" 0.0; - color: 0 0 0 255; - - rel1 { - relative: 0.0 0.0; - offset: 0 0; - to: "maintanance"; - } - rel2 { - relative: 1.0 1.0; - offset: 0 0; - to: "maintanance"; - } - text { - text: "Maintanance"; - font: "oled_font_large"; - align: 0.5 0.5; - } + description { + state: "active" 0.0; + min: 60 40; + max: 60 40; + align: 0.0 0.0; + color: 255 255 255 255; + + rel1 { + to_x: "vspacer"; + offset: 3 3; } } } - programs { - program { - name: "wheel_rotate_up"; - signal: "mouse,wheel,0,-1"; - source: "*"; - action: STATE_SET "active" 0.0; - target: "print"; - target: "print.text"; - } + part { + name: "material.text"; + type: TEXT; + mouse_events: 0; + + description { + state: "default" 0.0; + color: 255 255 255 255; - program { - name: "wheel_rotate_down"; - signal: "mouse,wheel,0,1"; - source: "*"; - action: STATE_SET "default" 0.0; - target: "print"; - target: "print.text"; + rel1 { + relative: 0.0 0.0; + offset: 0 0; + to: "material"; + } + rel2 { + relative: 1.0 1.0; + offset: 0 0; + to: "material"; + } + text { + text: "Material"; + font: "oled_font_large"; + align: 0.5 0.5; + } } - program { - name: "button_print_click"; - signal: "mouse,down,2"; - source: "print"; - action: PLAY_TONE "tclick" 3.0; + description { + state: "active" 0.0; + color: 0 0 0 255; + + rel1 { + relative: 0.0 0.0; + offset: 0 0; + to: "material"; + } + rel2 { + relative: 1.0 1.0; + offset: 0 0; + to: "material"; + } + text { + text: "Material"; + font: "oled_font_large"; + align: 0.5 0.5; + } } - program { - name: "button_print_unclick"; - signal: "mouse,up,2"; - source: "print"; - action: PLAY_SAMPLE "sclick" 3.0; + } + + part { + name: "hspacer"; + type: RECT; + mouse_events: 0; + + description { + state: "default" 0.0; + min: 128 1; + max: 128 1; + align: 0.0 0.0; + color: 255 255 255 255; + + rel1 { + relative: 0.0 0.0; + offset: 0 46; + } + rel2 { + relative: 1.0 1.0; + offset: 128 46; + } } + } - program { - name: "button_material_click"; - signal: "mouse,down,2"; - source: "material"; - action: STATE_SET "active" 0.0; - target: "material"; - target: "material.text"; + part { + name: "maintanance"; + type: RECT; + mouse_events: 1; + + description { + state: "default" 0.0; + min: 126 20; + max: 126 20; + align: 0.0 0.0; + color: 0 0 0 255; + + rel1 { + to_y: "hspacer"; + offset: 2 2; + } } - program { - name: "button_material_unclick"; - signal: "mouse,up,2"; - source: "material"; - action: STATE_SET "default" 0.0; - target: "material"; - target: "material.text"; + description { + state: "active" 0.0; + min: 126 20; + max: 126 20; + align: 0.0 0.0; + color: 255 255 255 255; + + rel1 { + to_y: "hspacer"; + offset: 2 2; + } } + } + + part { + name: "maintanance.text"; + type: TEXT; + mouse_events: 0; + + description { + state: "default" 0.0; + color: 255 255 255 255; - program { - name: "button_maintanance_click"; - signal: "mouse,down,2"; - source: "maintanance"; - action: STATE_SET "active" 0.0; - target: "maintanance"; - target: "maintanance.text"; + rel1 { + relative: 0.0 0.0; + offset: 0 0; + to: "maintanance"; + } + rel2 { + relative: 1.0 1.0; + offset: 0 0; + to: "maintanance"; + } + text { + text: "Maintanance"; + font: "oled_font_large"; + align: 0.5 0.5; + } } - program { - name: "button_maintanance_unclick"; - signal: "mouse,up,2"; - source: "maintanance"; - action: STATE_SET "default" 0.0; - target: "maintanance"; - target: "maintanance.text"; + + description { + state: "active" 0.0; + color: 0 0 0 255; + + rel1 { + relative: 0.0 0.0; + offset: 0 0; + to: "maintanance"; + } + rel2 { + relative: 1.0 1.0; + offset: 0 0; + to: "maintanance"; + } + text { + text: "Maintanance"; + font: "oled_font_large"; + align: 0.5 0.5; + } } } } + + programs { + program { + name: "wheel_rotate_up"; + signal: "mouse,wheel,0,-1"; + source: "*"; + action: STATE_SET "active" 0.0; + target: "print"; + target: "print.text"; + } + + program { + name: "wheel_rotate_down"; + signal: "mouse,wheel,0,1"; + source: "*"; + action: STATE_SET "default" 0.0; + target: "print"; + target: "print.text"; + } + + program { + name: "button_print_click"; + signal: "mouse,down,2"; + source: "print"; + action: STATE_SET "active" 0.0; + target: "print"; + target: "print.text"; + } + program { + name: "button_print_unclick"; + signal: "mouse,up,2"; + source: "print"; + action: STATE_SET "default" 0.0; + target: "print"; + target: "print.text"; + } + + program { + name: "button_material_click"; + signal: "mouse,down,*"; + source: "material"; + action: STATE_SET "active" 0.0; + target: "material"; + target: "material.text"; + } + program { + name: "button_material_unclick"; + signal: "mouse,up,*"; + source: "material"; + action: STATE_SET "default" 0.0; + target: "material"; + target: "material.text"; + } + + program { + name: "button_maintanance_click"; + signal: "mouse,down,2"; + source: "maintanance"; + action: STATE_SET "active" 0.0; + target: "maintanance"; + target: "maintanance.text"; + } + program { + name: "button_maintanance_unclick"; + signal: "mouse,up,2"; + source: "maintanance"; + action: STATE_SET "default" 0.0; + target: "maintanance"; + target: "maintanance.text"; + } + } } diff --git a/data/themes/ulticontroller_2.0/material.edc b/data/themes/ulticontroller_2.0/material.edc new file mode 100644 index 0000000..b1166b7 --- /dev/null +++ b/data/themes/ulticontroller_2.0/material.edc @@ -0,0 +1,393 @@ +group { + name: "material"; + min: 128 64; + max: 128 64; + parts { + part { + name: "background"; + type: RECT; + mouse_events: 0; + + description { + state: "default" 0.0; + color: 0 0 0 255; + + rel1 { + relative: 0.0 0.0; + offset: 0 0; + } + rel2 { + relative: 1.0 1.0; + offset: 0 0; + } + } + + description { + state: "error" 0.0; + color: 255 255 255 255; + + rel1 { + relative: 0.0 0.0; + offset: 0 0; + } + rel2 { + relative: 1.0 1.0; + offset: 0 0; + } + } + } + + part { + name: "change"; + type: RECT; + mouse_events: 1; + + description { + state: "default" 0.0; + min: 60 40; + max: 60 40; + align: 0.0 0.0; + color: 0 0 0 255; + + rel1 { + to_x: "vspacer"; + offset: -62 3; + } + } + description { + state: "active" 0.0; + min: 60 40; + max: 60 40; + align: 0.0 0.0; + color: 255 255 255 255; + + rel1 { + to_x: "vspacer"; + offset: -62 3; + } + } + } + + part { + name: "change.text"; + type: TEXT; + mouse_events: 0; + + description { + state: "default" 0.0; + color: 255 255 255 255; + + rel1 { + relative: 0.0 0.0; + offset: 0 0; + to: "change"; + } + rel2 { + relative: 1.0 1.0; + offset: 0 0; + to: "change"; + } + text { + text: "Change"; + font: "oled_font_large"; + align: 0.5 0.5; + } + } + description { + state: "active" 0.0; + color: 0 0 0 255; + + rel1 { + relative: 0.0 0.0; + offset: 0 0; + to: "print"; + } + rel2 { + relative: 1.0 1.0; + offset: 0 0; + to: "print"; + } + text { + text: "Change"; + font: "oled_font_large"; + align: 0.5 0.5; + } + } + } + + part { + name: "vspacer"; + type: RECT; + mouse_events: 0; + + description { + state: "default" 0.0; + min: 1 45; + max: 1 45; + align: 0.0 0.0; + color: 255 255 255 255; + + rel1 { + relative: 0.0 0.0; + offset: 64 0; + } + rel2 { + relative: 1.0 1.0; + offset: 64 45; + } + } + } + + part { + name: "settings"; + type: RECT; + mouse_events: 1; + + description { + state: "default" 0.0; + min: 60 40; + max: 60 40; + align: 0.0 0.0; + color: 0 0 0 255; + + rel1 { + to_x: "vspacer"; + offset: 3 3; + } + } + description { + state: "active" 0.0; + min: 60 40; + max: 60 40; + align: 0.0 0.0; + color: 255 255 255 255; + + rel1 { + to_x: "vspacer"; + offset: 3 3; + } + } + } + + part { + name: "settings.text"; + type: TEXT; + mouse_events: 0; + + description { + state: "default" 0.0; + color: 255 255 255 255; + + rel1 { + relative: 0.0 0.0; + offset: 0 0; + to: "settings"; + } + rel2 { + relative: 1.0 1.0; + offset: 0 0; + to: "settings"; + } + text { + text: "Settings"; + font: "oled_font_large"; + align: 0.5 0.5; + } + } + + description { + state: "active" 0.0; + color: 0 0 0 255; + + rel1 { + relative: 0.0 0.0; + offset: 0 0; + to: "settings"; + } + rel2 { + relative: 1.0 1.0; + offset: 0 0; + to: "settings"; + } + text { + text: "Settings"; + font: "oled_font_large"; + align: 0.5 0.5; + } + } + } + + part { + name: "hspacer"; + type: RECT; + mouse_events: 0; + + description { + state: "default" 0.0; + min: 128 1; + max: 128 1; + align: 0.0 0.0; + color: 255 255 255 255; + + rel1 { + relative: 0.0 0.0; + offset: 0 46; + } + rel2 { + relative: 1.0 1.0; + offset: 128 46; + } + } + } + + part { + name: "return"; + type: RECT; + mouse_events: 1; + + description { + state: "default" 0.0; + min: 126 20; + max: 126 20; + align: 0.0 0.0; + color: 0 0 0 255; + + rel1 { + to_y: "hspacer"; + offset: 2 2; + } + } + description { + state: "active" 0.0; + min: 126 20; + max: 126 20; + align: 0.0 0.0; + color: 255 255 255 255; + + rel1 { + to_y: "hspacer"; + offset: 2 2; + } + } + } + + part { + name: "return.text"; + type: TEXT; + mouse_events: 0; + + description { + state: "default" 0.0; + color: 255 255 255 255; + + rel1 { + relative: 0.0 0.0; + offset: 0 0; + to: "return"; + } + rel2 { + relative: 1.0 1.0; + offset: 0 0; + to: "return"; + } + text { + text: "Return"; + font: "oled_font_large"; + align: 0.5 0.5; + } + } + + description { + state: "active" 0.0; + color: 0 0 0 255; + + rel1 { + relative: 0.0 0.0; + offset: 0 0; + to: "return"; + } + rel2 { + relative: 1.0 1.0; + offset: 0 0; + to: "return"; + } + text { + text: "Return"; + font: "oled_font_large"; + align: 0.5 0.5; + } + } + } + } + + programs { + program { + name: "wheel_rotate_up"; + signal: "mouse,wheel,0,-1"; + source: "*"; + action: STATE_SET "active" 0.0; + target: "change"; + target: "change.text"; + } + + program { + name: "wheel_rotate_down"; + signal: "mouse,wheel,0,1"; + source: "*"; + action: STATE_SET "default" 0.0; + target: "change"; + target: "change.text"; + } + + program { + name: "button_change_click"; + signal: "mouse,down,*"; + source: "change"; + action: STATE_SET "active" 0.0; + target: "change"; + target: "change.text"; + } + program { + name: "button_change_unclick"; + signal: "mouse,up,*"; + source: "change"; + action: STATE_SET "default" 0.0; + target: "change"; + target: "change.text"; + } + + program { + name: "button_material_click"; + signal: "mouse,down,2"; + source: "material"; + action: STATE_SET "active" 0.0; + target: "material"; + target: "material.text"; + } + program { + name: "button_material_unclick"; + signal: "mouse,up,2"; + source: "material"; + action: STATE_SET "default" 0.0; + target: "material"; + target: "material.text"; + } + + program { + name: "button_maintanance_click"; + signal: "mouse,down,2"; + source: "maintanance"; + action: STATE_SET "active" 0.0; + target: "maintanance"; + target: "maintanance.text"; + } + program { + name: "button_maintanance_unclick"; + signal: "mouse,up,2"; + source: "maintanance"; + action: STATE_SET "default" 0.0; + target: "maintanance"; + target: "maintanance.text"; + } + } +} diff --git a/data/themes/ulticontroller_2.0/ulticontroller_2.0.edc b/data/themes/ulticontroller_2.0/ulticontroller_2.0.edc index 03c0fed..4fd789c 100644 --- a/data/themes/ulticontroller_2.0/ulticontroller_2.0.edc +++ b/data/themes/ulticontroller_2.0/ulticontroller_2.0.edc @@ -1,10 +1,62 @@ -#include "mainscreen.edc" - data { item: "theme/name" "Ulticontroller 2.0"; + item: "height" "128"; + item: "width" "64"; } fonts { font: "5x7.pcf.gz" "oled_font_small"; font: "6x9.pcf.gz" "oled_font_large"; } + +collections { + group { + name: "menu_animation"; + min: 128 64; + max: 128 64; + + parts { + part { + name: "screen"; + type: RECT; + + description { + state: "default" 0.0; + color: 0 0 255 255; + + rel1 { + relative: 0.0 0.0; + offset: 0 0; + } + + rel2 { + relative: 1.0 1.0; + offset: 0 0; + } + } + } + + part { + name: "screen_next"; + type: RECT; + + description { + state: "default" 0.0; + color: 255 0 0 255; + + rel1 { + relative: 0.0 0.0; + offset: 0 0; + } + + rel2 { + relative: 1.0 1.0; + offset: 0 0; + } + } + } + } + } + //#include "mainscreen.edc" + //#include "material.edc" +} diff --git a/src/eulogium.c b/src/eulogium.c index e1198ee..cdfff46 100644 --- a/src/eulogium.c +++ b/src/eulogium.c @@ -15,8 +15,6 @@ #define COPYRIGHT "Copyright © 2015 Olliver Schinagl and various contributors (see AUTHORS)." #define EULOGIUM_THEME "eulogium.edj" -#define WIDTH 128 -#define HEIGHT 64 int main(int argc EINA_UNUSED, char **argv EINA_UNUSED) { @@ -55,6 +53,7 @@ int main(int argc EINA_UNUSED, char **argv EINA_UNUSED) int prefix_size; char *theme_file; int theme_file_size; + int height, width; #if ENABLE_NLS setlocale(LC_ALL, ""); @@ -87,7 +86,11 @@ int main(int argc EINA_UNUSED, char **argv EINA_UNUSED) return EXIT_FAILURE; } - window = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); + /* Initialize the window with fake dimensions, we'll set the proper dimensions via the theme */ + height = 0; + width = 0; + + window = ecore_evas_new(NULL, 0, 0, height, width, NULL); canvas = ecore_evas_get(window); edje = edje_object_add(canvas); if (!edje) { @@ -108,9 +111,17 @@ int main(int argc EINA_UNUSED, char **argv EINA_UNUSED) evas_object_del(edje); return EXIT_FAILURE; } + + height = atoi(edje_file_data_get(theme_file, "height")); + width = atoi(edje_file_data_get(theme_file, "width")); + if (height < 1 || width < 1) { + EINA_LOG_ERR("Invalid height (%d) or width (%d) parameter in %s", height, width, theme_file); + return EXIT_FAILURE; + } free(theme_file); evas_object_show(edje); + ecore_evas_resize(window, height, width); ecore_evas_title_set(window, PACKAGE_NAME); ecore_evas_show(window); -- cgit v0.12