From a4ef973a31564928bbe1412bee705e6f78ec76dd Mon Sep 17 00:00:00 2001 From: Jaime Thomas Date: Fri, 16 Jan 2009 03:30:54 +0000 Subject: [PATCH] ECDB can scale now... Too bad it looks like crap with the current theme. --- experimental/ecdb/trunk/TODO | 1 + .../ecdb/trunk/data/themes/default/groups/burn_image.edc | 3 +++ .../ecdb/trunk/data/themes/default/groups/button.edc | 7 +++++++ .../ecdb/trunk/data/themes/default/groups/capacity.edc | 4 ++++ .../ecdb/trunk/data/themes/default/groups/check.edc | 3 +++ .../ecdb/trunk/data/themes/default/groups/combo.edc | 5 +++++ .../ecdb/trunk/data/themes/default/groups/config_inwin.edc | 2 ++ .../ecdb/trunk/data/themes/default/groups/entry.edc | 3 +++ .../ecdb/trunk/data/themes/default/groups/erase_disc.edc | 3 +++ .../ecdb/trunk/data/themes/default/groups/icons.edc | 4 ++++ experimental/ecdb/trunk/src/ecdb_gui.c | 4 ++++ 11 files changed, 39 insertions(+) diff --git a/experimental/ecdb/trunk/TODO b/experimental/ecdb/trunk/TODO index 311105f2..65b744ad 100644 --- a/experimental/ecdb/trunk/TODO +++ b/experimental/ecdb/trunk/TODO @@ -18,6 +18,7 @@ TODO -> don't load the sources all at one time (lots of memory consumed -- for my entire development tree containing 154256 files, ecdb uses 46mb) -> integrate exchange -> instead of always swallowing widgets, allow theme to specify on a widget-by-widget basis if it wants to emit signals from internal parts (so, for example, the settings could be triggered by a small + in the corner, and expand from there) +->able to allow entire gui to be handled by theme... so we only interact with signals (no widgets at all) DONE ////////////////////////////////////////////////////////////////////////////// diff --git a/experimental/ecdb/trunk/data/themes/default/groups/burn_image.edc b/experimental/ecdb/trunk/data/themes/default/groups/burn_image.edc index e384a110..16c5ae35 100644 --- a/experimental/ecdb/trunk/data/themes/default/groups/burn_image.edc +++ b/experimental/ecdb/trunk/data/themes/default/groups/burn_image.edc @@ -189,6 +189,7 @@ group { name: "progress_outline"; type: IMAGE; mouse_events: 0; + scale: 1; description { state: "default" 0.0; @@ -216,6 +217,7 @@ group { name: "progress_text"; type: TEXT; effect: SOFT_SHADOW; + scale: 1; description { state: "default" 0.0; @@ -255,6 +257,7 @@ group { name: "progress_percent"; type: TEXT; effect: SOFT_SHADOW; + scale: 1; description { state: "default" 0.0; diff --git a/experimental/ecdb/trunk/data/themes/default/groups/button.edc b/experimental/ecdb/trunk/data/themes/default/groups/button.edc index b730dac9..d3af61cc 100644 --- a/experimental/ecdb/trunk/data/themes/default/groups/button.edc +++ b/experimental/ecdb/trunk/data/themes/default/groups/button.edc @@ -13,6 +13,7 @@ group { name: "base"; type: IMAGE; mouse_events: 1; + scale: 1; description { state: "default" 0.0; @@ -81,6 +82,7 @@ group { type: IMAGE; mouse_events: 1; clip_to: "focus_clip"; + scale: 1; description { state: "default" 0.0; @@ -105,6 +107,7 @@ group { type: IMAGE; mouse_events: 1; clip_to: "button_clip"; + scale: 1; description { state: "default" 0.0; @@ -140,6 +143,7 @@ group { type: IMAGE; mouse_events: 1; clip_to: "button_clip"; + scale: 1; description { state: "default" 0.0; @@ -172,6 +176,7 @@ group { type: IMAGE; mouse_events: 1; clip_to: "button_clip"; + scale: 1; description { state: "default" 0.0; @@ -224,6 +229,7 @@ group { name: "ecdb.label"; type: TEXT; mouse_events: 1; + scale: 1; description { state: "default" 0.0; @@ -254,6 +260,7 @@ group { name: "ecdb.swallow.icon"; type: SWALLOW; mouse_events: 1; + scale: 1; description { state: "default" 0.0; diff --git a/experimental/ecdb/trunk/data/themes/default/groups/capacity.edc b/experimental/ecdb/trunk/data/themes/default/groups/capacity.edc index a940e2c1..4bd4583a 100644 --- a/experimental/ecdb/trunk/data/themes/default/groups/capacity.edc +++ b/experimental/ecdb/trunk/data/themes/default/groups/capacity.edc @@ -39,6 +39,7 @@ group { part { name: "bg"; type: IMAGE; + scale: 1; description { state: "default" 0.0; @@ -69,6 +70,7 @@ group { name: "progress_left"; type: IMAGE; clip_to: "confine"; + scale: 1; description { state: "default" 0.0; @@ -130,6 +132,7 @@ group { type: IMAGE; mouse_events: 0; clip_to: "confine"; + scale: 1; description { state: "default" 0.0; @@ -164,6 +167,7 @@ group { part { name: "progress_right"; type: IMAGE; + scale: 1; description { state: "default" 0.0; diff --git a/experimental/ecdb/trunk/data/themes/default/groups/check.edc b/experimental/ecdb/trunk/data/themes/default/groups/check.edc index dfa01ea6..0596ac90 100644 --- a/experimental/ecdb/trunk/data/themes/default/groups/check.edc +++ b/experimental/ecdb/trunk/data/themes/default/groups/check.edc @@ -25,6 +25,7 @@ group { part { name: "check_base"; type: IMAGE; + scale: 1; description { state: "default" 0.0; @@ -105,6 +106,7 @@ group { part { name: "check"; + scale: 1; description { state: "default" 0.0; @@ -153,6 +155,7 @@ group { part { name: "ecdb.label"; type: TEXT; + scale: 1; description { state: "default" 0.0; diff --git a/experimental/ecdb/trunk/data/themes/default/groups/combo.edc b/experimental/ecdb/trunk/data/themes/default/groups/combo.edc index a53835ae..64ef2af3 100644 --- a/experimental/ecdb/trunk/data/themes/default/groups/combo.edc +++ b/experimental/ecdb/trunk/data/themes/default/groups/combo.edc @@ -67,6 +67,7 @@ group { name: "base"; type: IMAGE; mouse_events: 0; + scale: 1; description { state: "default" 0.0; @@ -110,6 +111,7 @@ group { type: IMAGE; mouse_events: 0; clip_to: "focus_clip"; + scale: 1; description { state: "default" 0.0; @@ -132,6 +134,7 @@ group { part { name: "combo_button"; type: IMAGE; + scale: 1; description { state: "default" 0.0; @@ -177,6 +180,7 @@ group { part { name: "combo_arrows"; type: IMAGE; + scale: 1; description { state: "default" 0.0; @@ -208,6 +212,7 @@ group { part { name: "ecdb.header"; type: TEXT; + scale: 1; description { state: "default" 0.0; diff --git a/experimental/ecdb/trunk/data/themes/default/groups/config_inwin.edc b/experimental/ecdb/trunk/data/themes/default/groups/config_inwin.edc index 2af3d482..928bb89f 100644 --- a/experimental/ecdb/trunk/data/themes/default/groups/config_inwin.edc +++ b/experimental/ecdb/trunk/data/themes/default/groups/config_inwin.edc @@ -59,6 +59,7 @@ group { part { name: "back"; mouse_events: 0; + scale: 1; description { state: "default" 0.0; @@ -90,6 +91,7 @@ group { part { name: "ecdb.table"; type: TABLE; + scale: 1; description { state: "default" 0.0; diff --git a/experimental/ecdb/trunk/data/themes/default/groups/entry.edc b/experimental/ecdb/trunk/data/themes/default/groups/entry.edc index 231e534e..874311de 100644 --- a/experimental/ecdb/trunk/data/themes/default/groups/entry.edc +++ b/experimental/ecdb/trunk/data/themes/default/groups/entry.edc @@ -17,6 +17,7 @@ group { parts { part { name: "entry"; + scale: 1; description { state: "default" 0.0; @@ -36,6 +37,7 @@ group { part { name: "entry_focus"; + scale: 1; description { state: "default" 0.0; @@ -63,6 +65,7 @@ group { name: "ecdb.text"; type: TEXTBLOCK; mouse_events: 1; + scale: 1; entry_mode: EDITABLE; multiline: 0; source2: "entry/selection/default"; diff --git a/experimental/ecdb/trunk/data/themes/default/groups/erase_disc.edc b/experimental/ecdb/trunk/data/themes/default/groups/erase_disc.edc index 323cb7d3..d41d6bc3 100644 --- a/experimental/ecdb/trunk/data/themes/default/groups/erase_disc.edc +++ b/experimental/ecdb/trunk/data/themes/default/groups/erase_disc.edc @@ -162,6 +162,7 @@ group { name: "progress_outline"; type: IMAGE; mouse_events: 0; + scale: 1; description { state: "default" 0.0; @@ -189,6 +190,7 @@ group { name: "progress_text"; type: TEXT; effect: SOFT_SHADOW; + scale: 1; description { state: "default" 0.0; @@ -228,6 +230,7 @@ group { name: "progress_percent"; type: TEXT; effect: SOFT_SHADOW; + scale: 1; description { state: "default" 0.0; diff --git a/experimental/ecdb/trunk/data/themes/default/groups/icons.edc b/experimental/ecdb/trunk/data/themes/default/groups/icons.edc index 39d88762..d6a5d134 100644 --- a/experimental/ecdb/trunk/data/themes/default/groups/icons.edc +++ b/experimental/ecdb/trunk/data/themes/default/groups/icons.edc @@ -7,6 +7,7 @@ group { part { name: "image"; type: IMAGE; + scale: 1; description { state: "default" 0.0; @@ -39,6 +40,7 @@ group { part { name: "image"; type: IMAGE; + scale: 1; description { state: "default" 0.0; @@ -71,6 +73,7 @@ group { part { name: "image"; type: IMAGE; + scale: 1; description { state: "default" 0.0; @@ -103,6 +106,7 @@ group { part { name: "image"; type: IMAGE; + scale: 1; description { state: "default" 0.0; diff --git a/experimental/ecdb/trunk/src/ecdb_gui.c b/experimental/ecdb/trunk/src/ecdb_gui.c index b82b87cd..fba007d3 100644 --- a/experimental/ecdb/trunk/src/ecdb_gui.c +++ b/experimental/ecdb/trunk/src/ecdb_gui.c @@ -182,6 +182,7 @@ ecdb_create_main_gui(void) { Evas_Object *gui; Evas_Coord mw, mh; + const char *scale; /* This would be wonderful, but its a bit glitchy em->main_win_ee = ecore_evas_gl_x11_new(0, 0, 0, 0, 255, 255); @@ -214,6 +215,9 @@ ecdb_create_main_gui(void) /* Make this configurable at some point */ ecdb_set_main_theme(NULL); + scale = getenv("ECDB_SCALE"); + if (scale) + edje_scale_set(atof(scale)); gui = edje_object_add(ecore_evas_get(em->main_win_ee)); edje_object_file_set(gui, em->theme_path, "ecdb/window");