summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-12-11 16:53:49 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-12-11 16:53:49 +0900
commite2c20040e82b4dc1b5de03aec35d04084c8ee95d (patch)
tree26615bebec8851df7d05033547cb341f29e84d2d
parent0c2d21558f6a741ed011456ee3f8569d7e99ed97 (diff)
e17 wizard - update missing flags and alignment in ui, as well as refresh
this adds moldova (moldavian?) flag for layouts of keyboards and refreshes some of the generic images for unknown, latin america, brail and arabic "flag" images, and forces flag icons to be 2:1 aspect ration with icon centered within that area to address T647
-rw-r--r--data/flags/Makefile.am1
-rw-r--r--data/flags/ara_flag.pngbin2229 -> 8839 bytes
-rw-r--r--data/flags/brai_flag.pngbin3816 -> 15557 bytes
-rw-r--r--data/flags/latam_flag.pngbin7068 -> 6555 bytes
-rw-r--r--data/flags/md_flag.pngbin0 -> 2489 bytes
-rw-r--r--data/flags/np_flag.pngbin10366 -> 10503 bytes
-rw-r--r--data/flags/unknown_flag.pngbin2260 -> 2127 bytes
-rw-r--r--src/modules/wizard/page_010.c6
-rw-r--r--src/modules/wizard/page_011.c5
9 files changed, 9 insertions, 3 deletions
diff --git a/data/flags/Makefile.am b/data/flags/Makefile.am
index 327a7f22c..ce80dd759 100644
--- a/data/flags/Makefile.am
+++ b/data/flags/Makefile.am
@@ -63,6 +63,7 @@ lt_flag.png \
63lv_flag.png \ 63lv_flag.png \
64ma_flag.png \ 64ma_flag.png \
65mao_flag.png \ 65mao_flag.png \
66md_flag.png \
66me_flag.png \ 67me_flag.png \
67mk_flag.png \ 68mk_flag.png \
68ml_flag.png \ 69ml_flag.png \
diff --git a/data/flags/ara_flag.png b/data/flags/ara_flag.png
index bfc10352f..a0c0890de 100644
--- a/data/flags/ara_flag.png
+++ b/data/flags/ara_flag.png
Binary files differ
diff --git a/data/flags/brai_flag.png b/data/flags/brai_flag.png
index fc215195d..7822bcaee 100644
--- a/data/flags/brai_flag.png
+++ b/data/flags/brai_flag.png
Binary files differ
diff --git a/data/flags/latam_flag.png b/data/flags/latam_flag.png
index 1025ca25c..8ecd78b05 100644
--- a/data/flags/latam_flag.png
+++ b/data/flags/latam_flag.png
Binary files differ
diff --git a/data/flags/md_flag.png b/data/flags/md_flag.png
new file mode 100644
index 000000000..4b0e9bc9e
--- /dev/null
+++ b/data/flags/md_flag.png
Binary files differ
diff --git a/data/flags/np_flag.png b/data/flags/np_flag.png
index 738805ebb..99c8116df 100644
--- a/data/flags/np_flag.png
+++ b/data/flags/np_flag.png
Binary files differ
diff --git a/data/flags/unknown_flag.png b/data/flags/unknown_flag.png
index 0a613b8e4..9f9b097fe 100644
--- a/data/flags/unknown_flag.png
+++ b/data/flags/unknown_flag.png
Binary files differ
diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c
index b7a63c3ab..d47d8f9c3 100644
--- a/src/modules/wizard/page_010.c
+++ b/src/modules/wizard/page_010.c
@@ -159,7 +159,7 @@ wizard_page_show(E_Wizard_Page *pg)
159 o = e_widget_list_add(pg->evas, 1, 0); 159 o = e_widget_list_add(pg->evas, 1, 0);
160 e_wizard_title_set(_("Language")); 160 e_wizard_title_set(_("Language"));
161 of = e_widget_framelist_add(pg->evas, _("Select one"), 0); 161 of = e_widget_framelist_add(pg->evas, _("Select one"), 0);
162 ob = e_widget_ilist_add(pg->evas, 32 * e_scale, 32 * e_scale, &lang); 162 ob = e_widget_ilist_add(pg->evas,10 * e_scale, 10 * e_scale, &lang);
163 e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale); 163 e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale);
164 164
165 e_widget_ilist_freeze(ob); 165 e_widget_ilist_freeze(ob);
@@ -180,7 +180,9 @@ wizard_page_show(E_Wizard_Page *pg)
180 } 180 }
181 else 181 else
182 ic = NULL; 182 ic = NULL;
183 183 if (ic)
184 evas_object_size_hint_aspect_set
185 (ic, EVAS_ASPECT_CONTROL_VERTICAL, 20, 10);
184 if (e_intl_language_get()) 186 if (e_intl_language_get())
185 { 187 {
186 if (!strcmp(pair->locale_key, e_intl_language_get())) 188 if (!strcmp(pair->locale_key, e_intl_language_get()))
diff --git a/src/modules/wizard/page_011.c b/src/modules/wizard/page_011.c
index 6dbfdbc7a..2681dfc61 100644
--- a/src/modules/wizard/page_011.c
+++ b/src/modules/wizard/page_011.c
@@ -145,7 +145,7 @@ wizard_page_show(E_Wizard_Page *pg)
145 o = e_widget_list_add(pg->evas, 1, 0); 145 o = e_widget_list_add(pg->evas, 1, 0);
146 e_wizard_title_set(_("Keyboard")); 146 e_wizard_title_set(_("Keyboard"));
147 of = e_widget_framelist_add(pg->evas, _("Select one"), 0); 147 of = e_widget_framelist_add(pg->evas, _("Select one"), 0);
148 ob = e_widget_ilist_add(pg->evas, 32 * e_scale, 32 * e_scale, &layout); 148 ob = e_widget_ilist_add(pg->evas, 10 * e_scale, 10 * e_scale, &layout);
149 e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale); 149 e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale);
150 150
151 e_widget_ilist_freeze(ob); 151 e_widget_ilist_freeze(ob);
@@ -159,6 +159,9 @@ wizard_page_show(E_Wizard_Page *pg)
159 e_xkb_e_icon_flag_setup(ic, lay->name); 159 e_xkb_e_icon_flag_setup(ic, lay->name);
160 label = lay->label; 160 label = lay->label;
161 if (!label) label = "Unknown"; 161 if (!label) label = "Unknown";
162 if (ic)
163 evas_object_size_hint_aspect_set
164 (ic, EVAS_ASPECT_CONTROL_VERTICAL, 20, 10);
162 e_widget_ilist_append(ob, ic, _(label), NULL, NULL, lay->name); 165 e_widget_ilist_append(ob, ic, _(label), NULL, NULL, lay->name);
163 if (lay->name) 166 if (lay->name)
164 { 167 {