enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

move animation hint into bg group so we can use a better codepath to check it 

SVN revision: 75093
This commit is contained in:
Mike Blumenkrantz 2012-08-10 10:49:56 +00:00
parent f697879b23
commit 63fcb74610
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/bin/e_import_config_dialog.c
View File

@ -89,8 +89,6 @@ _import_edj_gen(E_Import_Config_Dialog *import)
else else
snprintf(enc, sizeof(enc), "LOSSY %i", import->quality); snprintf(enc, sizeof(enc), "LOSSY %i", import->quality);
} }
if (!anim)
fprintf(f, "data.item: \"noanimation\" \"1\";\n");
switch (import->method) switch (import->method)
{ {
case IMPORT_STRETCH: case IMPORT_STRETCH:
@ -98,6 +96,7 @@ _import_edj_gen(E_Import_Config_Dialog *import)
"images { image: \"%s\" %s; }\n" "images { image: \"%s\" %s; }\n"
"collections {\n" "collections {\n"
"group { name: \"e/desktop/background\";\n" "group { name: \"e/desktop/background\";\n"
"%s"
"data { item: \"style\" \"0\"; }\n" "data { item: \"style\" \"0\"; }\n"
"max: %i %i;\n" "max: %i %i;\n"
"parts {\n" "parts {\n"
@ -105,7 +104,7 @@ _import_edj_gen(E_Import_Config_Dialog *import)
"description { state: \"default\" 0.0;\n" "description { state: \"default\" 0.0;\n"
"image { normal: \"%s\"; scale_hint: STATIC; }\n" "image { normal: \"%s\"; scale_hint: STATIC; }\n"
"} } } } }\n" "} } } } }\n"
, fstrip, enc, w, h, fstrip); , fstrip, enc, anim ? "" : "data.item: \"noanimation\" \"1\";\n", w, h, fstrip);
break; break;
case IMPORT_TILE: case IMPORT_TILE:
@ -114,6 +113,7 @@ _import_edj_gen(E_Import_Config_Dialog *import)
"collections {\n" "collections {\n"
"group { name: \"e/desktop/background\";\n" "group { name: \"e/desktop/background\";\n"
"data { item: \"style\" \"1\"; }\n" "data { item: \"style\" \"1\"; }\n"
"%s"
"max: %i %i;\n" "max: %i %i;\n"
"parts {\n" "parts {\n"
"part { name: \"bg\"; mouse_events: 0;\n" "part { name: \"bg\"; mouse_events: 0;\n"
@ -123,7 +123,7 @@ _import_edj_gen(E_Import_Config_Dialog *import)
"relative: 0.0 0.0;\n" "relative: 0.0 0.0;\n"
"offset: %i %i;\n" "offset: %i %i;\n"
"} } } } } } }\n" "} } } } } } }\n"
, fstrip, enc, w, h, fstrip, w, h); , fstrip, enc, anim ? "" : "data.item: \"noanimation\" \"1\";\n", w, h, fstrip, w, h);
break; break;
case IMPORT_CENTER: case IMPORT_CENTER:
@ -132,6 +132,7 @@ _import_edj_gen(E_Import_Config_Dialog *import)
"collections {\n" "collections {\n"
"group { name: \"e/desktop/background\";\n" "group { name: \"e/desktop/background\";\n"
"data { item: \"style\" \"2\"; }\n" "data { item: \"style\" \"2\"; }\n"
"%s"
"max: %i %i;\n" "max: %i %i;\n"
"parts {\n" "parts {\n"
"part { name: \"col\"; type: RECT; mouse_events: 0;\n" "part { name: \"col\"; type: RECT; mouse_events: 0;\n"
@ -143,7 +144,7 @@ _import_edj_gen(E_Import_Config_Dialog *import)
"min: %i %i; max: %i %i;\n" "min: %i %i; max: %i %i;\n"
"image { normal: \"%s\"; }\n" "image { normal: \"%s\"; }\n"
"} } } } }\n" "} } } } }\n"
, fstrip, enc, w, h, cr, cg, cb, ca, w, h, w, h, fstrip); , fstrip, enc, anim ? "" : "data.item: \"noanimation\" \"1\";\n", w, h, cr, cg, cb, ca, w, h, w, h, fstrip);
break; break;
case IMPORT_SCALE_ASPECT_IN: case IMPORT_SCALE_ASPECT_IN:
@ -154,6 +155,7 @@ _import_edj_gen(E_Import_Config_Dialog *import)
"collections {\n" "collections {\n"
"group { name: \"e/desktop/background\";\n" "group { name: \"e/desktop/background\";\n"
"data { item: \"style\" \"3\"; }\n" "data { item: \"style\" \"3\"; }\n"
"%s"
"max: %i %i;\n" "max: %i %i;\n"
"parts {\n" "parts {\n"
"part { name: \"col\"; type: RECT; mouse_events: 0;\n" "part { name: \"col\"; type: RECT; mouse_events: 0;\n"
@ -165,7 +167,8 @@ _import_edj_gen(E_Import_Config_Dialog *import)
"aspect: %1.9f %1.9f; aspect_preference: BOTH;\n" "aspect: %1.9f %1.9f; aspect_preference: BOTH;\n"
"image { normal: \"%s\"; scale_hint: STATIC; }\n" "image { normal: \"%s\"; scale_hint: STATIC; }\n"
"} } } } }\n" "} } } } }\n"
, fstrip, enc, w, h, cr, cg, cb, ca, (double)w / (double)h, (double)w / (double)h, fstrip); , fstrip, enc, anim ? "" : "data.item: \"noanimation\" \"1\";\n",
w, h, cr, cg, cb, ca, (double)w / (double)h, (double)w / (double)h, fstrip);
setlocale(LC_NUMERIC, locale); setlocale(LC_NUMERIC, locale);
break; break;
@ -177,6 +180,7 @@ _import_edj_gen(E_Import_Config_Dialog *import)
"collections {\n" "collections {\n"
"group { name: \"e/desktop/background\";\n" "group { name: \"e/desktop/background\";\n"
"data { item: \"style\" \"4\"; }\n" "data { item: \"style\" \"4\"; }\n"
"%s"
"max: %i %i;\n" "max: %i %i;\n"
"parts {\n" "parts {\n"
"part { name: \"bg\"; mouse_events: 0;\n" "part { name: \"bg\"; mouse_events: 0;\n"
@ -184,7 +188,8 @@ _import_edj_gen(E_Import_Config_Dialog *import)
"aspect: %1.9f %1.9f; aspect_preference: NONE;\n" "aspect: %1.9f %1.9f; aspect_preference: NONE;\n"
"image { normal: \"%s\"; scale_hint: STATIC; }\n" "image { normal: \"%s\"; scale_hint: STATIC; }\n"
"} } } } }\n" "} } } } }\n"
, fstrip, enc, w, h, (double)w / (double)h, (double)w / (double)h, fstrip); , fstrip, enc, anim ? "" : "data.item: \"noanimation\" \"1\";\n",
w, h, (double)w / (double)h, (double)w / (double)h, fstrip);
setlocale(LC_NUMERIC, locale); setlocale(LC_NUMERIC, locale);
break; break;
@ -196,6 +201,7 @@ _import_edj_gen(E_Import_Config_Dialog *import)
"collections {\n" "collections {\n"
"group { name: \"e/desktop/background\";\n" "group { name: \"e/desktop/background\";\n"
"data { item: \"style\" \"4\"; }\n" "data { item: \"style\" \"4\"; }\n"
"%s"
"max: %i %i;\n" "max: %i %i;\n"
"script {\n" "script {\n"
"public cur_anim; public cur_x; public cur_y; public prev_x;\n" "public cur_anim; public cur_x; public cur_y; public prev_x;\n"
@ -246,7 +252,8 @@ _import_edj_gen(E_Import_Config_Dialog *import)
" set_state(PART:\"bg\", \"custom\", 0.0);\n" " set_state(PART:\"bg\", \"custom\", 0.0);\n"
" set_float(prev_x, 0.0); set_float(prev_y, 0.0);\n" " set_float(prev_x, 0.0); set_float(prev_y, 0.0);\n"
"} } } } }\n" "} } } } }\n"
, fstrip, enc, w, h, (double)w / (double)h, (double)w / (double)h, fstrip); , fstrip, enc, anim ? "" : "data.item: \"noanimation\" \"1\";\n",
w, h, (double)w / (double)h, (double)w / (double)h, fstrip);
setlocale(LC_NUMERIC, locale); setlocale(LC_NUMERIC, locale);
break; break;