From 1ab387ad739181166d385405a81c1f33cdcdb5b2 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 17 Sep 2007 12:03:47 +0000 Subject: [PATCH] more work on wiz - fix up bold font text part refs so they stay bold. lang list - but empty. need to fill. SVN revision: 31749 --- data/init/default.edc | 12 ++++++------ data/themes/default_about.edc | 4 ++-- data/themes/default_battery.edc | 2 +- data/themes/default_configure.edc | 2 +- data/themes/default_cpufreq.edc | 2 +- data/themes/default_desklock.edc | 4 ++-- data/themes/default_error.edc | 2 +- data/themes/default_exebuf.edc | 2 +- data/themes/default_fileman.edc | 8 ++++---- data/themes/default_frame.edc | 2 +- data/themes/default_ibox.edc | 2 +- data/themes/default_ilist.edc | 2 +- data/themes/default_menu.edc | 2 +- data/themes/default_pager.edc | 2 +- data/themes/default_temperature.edc | 2 +- data/themes/default_winlist.edc | 4 ++-- data/themes/default_wizard.edc | 6 +++--- src/modules/wizard/page_010.c | 30 +++++++++++++---------------- 18 files changed, 43 insertions(+), 47 deletions(-) diff --git a/data/init/default.edc b/data/init/default.edc index 96f162485..e0bcda571 100644 --- a/data/init/default.edc +++ b/data/init/default.edc @@ -56,8 +56,8 @@ #endif fonts { - font: "Vera.ttf" "Edje Vera"; - font: "VeraBd.ttf" "Edje Vera Bold"; + font: "Vera.ttf" "Edje-Vera"; + font: "VeraBd.ttf" "Edje-Vera-Bold"; } images { @@ -560,7 +560,7 @@ collections { color3: 0 0 0 32; text { text: "Enlightenment"; - font: "Edje Vera Bold"; + font: "Serif:style=Bold,Edje-Vera-Bold"; size: TSIZE; min: 1 1; align: 0.5 0.5; @@ -587,7 +587,7 @@ collections { color3: 255 255 255 128; text { text: "0.17.0"; - font: "Edje Vera"; + font: "Edje-Vera"; size: VSIZE; min: 1 1; align: 0.0 0.0; @@ -617,7 +617,7 @@ collections { color3: 255 255 255 128; text { text: "Starting Enlightenment. Please wait."; - font: "Edje Vera"; + font: "Edje-Vera"; size: SSIZE; min: 1 1; align: 0.5 0.5; @@ -645,7 +645,7 @@ collections { color3: 255 255 255 128; text { text: "Disable this splash screen in future."; - font: "Edje Vera"; + font: "Edje-Vera"; size: SSIZE; min: 1 1; align: 0.0 0.5; diff --git a/data/themes/default_about.edc b/data/themes/default_about.edc index a7811322a..84334d498 100644 --- a/data/themes/default_about.edc +++ b/data/themes/default_about.edc @@ -425,7 +425,7 @@ group { color_class: "about_title"; text { text: "Enlightenment"; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 16; min: 1 1; align: 0.5 0.5; @@ -457,7 +457,7 @@ group { color_class: "about_version"; text { text: "0.17.0.000"; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 12; min: 1 1; align: 0.5 0.5; diff --git a/data/themes/default_battery.edc b/data/themes/default_battery.edc index f85a2e224..aa3bc697d 100644 --- a/data/themes/default_battery.edc +++ b/data/themes/default_battery.edc @@ -162,7 +162,7 @@ group { color_class: "module_label"; text { text: "100%"; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 8; min: 1 1; align: 1.0 0.0; diff --git a/data/themes/default_configure.edc b/data/themes/default_configure.edc index bafda1ecc..5a822a2a8 100644 --- a/data/themes/default_configure.edc +++ b/data/themes/default_configure.edc @@ -89,7 +89,7 @@ group { color_class: "configure_title"; text { text: "Enlightenment Configuration"; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 16; min: 1 1; align: 0.5 0.5; diff --git a/data/themes/default_cpufreq.edc b/data/themes/default_cpufreq.edc index c94145867..7a5f4aee8 100644 --- a/data/themes/default_cpufreq.edc +++ b/data/themes/default_cpufreq.edc @@ -307,7 +307,7 @@ group { color_class: "module_label"; text { text: "??? Ghz"; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 8; align: 0.5 0.5; min: 1 1; diff --git a/data/themes/default_desklock.edc b/data/themes/default_desklock.edc index d5fc34039..b9fd1e63b 100644 --- a/data/themes/default_desklock.edc +++ b/data/themes/default_desklock.edc @@ -80,7 +80,7 @@ group color3: 255 255 255 128; text { text: "Please enter your unlock password"; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 10; align: 0.0 0.5; min: 1 1; @@ -183,7 +183,7 @@ group color3: 255 255 255 128; text { text: "****"; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 16; align: 0.0 0.5; min: 1 1; diff --git a/data/themes/default_error.edc b/data/themes/default_error.edc index 9ab5ae355..ec775b9f4 100644 --- a/data/themes/default_error.edc +++ b/data/themes/default_error.edc @@ -125,7 +125,7 @@ group { color_class: "error_title"; text { text: "Title"; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 12; min: 1 1; align: 0.0 0.5; diff --git a/data/themes/default_exebuf.edc b/data/themes/default_exebuf.edc index 0a0cd6634..5eae2e484 100644 --- a/data/themes/default_exebuf.edc +++ b/data/themes/default_exebuf.edc @@ -273,7 +273,7 @@ group { color3: 255 255 255 128; text { text: "COMMAND"; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 16; align: 0.0 0.5; min: 1 1; diff --git a/data/themes/default_fileman.edc b/data/themes/default_fileman.edc index 0295c69c4..ede03f292 100644 --- a/data/themes/default_fileman.edc +++ b/data/themes/default_fileman.edc @@ -4153,7 +4153,7 @@ group { color3: 0 0 0 24; text { text: ""; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 10; min: 0 0; align: 0.5 0.5; @@ -4216,7 +4216,7 @@ group { color3: 0 0 0 24; text { text: ""; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 10; min: 1 1; align: 1.0 0.5; @@ -6945,7 +6945,7 @@ group { text { text: "No Title"; size: 10; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; min: 0 1; align: 0.5 1.0; elipsis: 0.0; @@ -7266,7 +7266,7 @@ group { text { text: "No Title"; size: 10; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; min: 0 1; align: 0.5 1.0; elipsis: 0.0; diff --git a/data/themes/default_frame.edc b/data/themes/default_frame.edc index 306dba82f..dd1ca447e 100644 --- a/data/themes/default_frame.edc +++ b/data/themes/default_frame.edc @@ -91,7 +91,7 @@ group { color: 0 0 0 80; text { text: "Frame Label"; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 10; min: 1 1; max: 1 1; diff --git a/data/themes/default_ibox.edc b/data/themes/default_ibox.edc index a19aa34a9..69f5bc308 100644 --- a/data/themes/default_ibox.edc +++ b/data/themes/default_ibox.edc @@ -214,7 +214,7 @@ group { color_class: "module_label"; text { text: "Icon Name"; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 10; min: 1 1; align: 0.5 0.5; diff --git a/data/themes/default_ilist.edc b/data/themes/default_ilist.edc index 033003f70..ea5d1ba07 100644 --- a/data/themes/default_ilist.edc +++ b/data/themes/default_ilist.edc @@ -992,7 +992,7 @@ group { color_class: "ilist_header"; text { text: "Item Label"; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 16; min: 1 1; align: 0.0 0.5; diff --git a/data/themes/default_menu.edc b/data/themes/default_menu.edc index 991c11527..68bc2d10c 100644 --- a/data/themes/default_menu.edc +++ b/data/themes/default_menu.edc @@ -101,7 +101,7 @@ group { color_class: "menu_title"; text { text: "Menu Title"; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 10; min: 0 0; align: 0.5 0.0; diff --git a/data/themes/default_pager.edc b/data/themes/default_pager.edc index 21bf5c8f9..bd796bd49 100644 --- a/data/themes/default_pager.edc +++ b/data/themes/default_pager.edc @@ -117,7 +117,7 @@ group { color_class: "module_label"; text { text: "Title goes here"; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 12; min: 1 1; align: 0.5 0.5; diff --git a/data/themes/default_temperature.edc b/data/themes/default_temperature.edc index 165143a87..2e0caeee6 100644 --- a/data/themes/default_temperature.edc +++ b/data/themes/default_temperature.edc @@ -89,7 +89,7 @@ group { color_class: "module_label"; text { text: "99^C"; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 8; min: 1 1; align: 0.0 0.0; diff --git a/data/themes/default_winlist.edc b/data/themes/default_winlist.edc index bbbf95e59..68a4e7904 100644 --- a/data/themes/default_winlist.edc +++ b/data/themes/default_winlist.edc @@ -181,7 +181,7 @@ group { color_class: "winlist_title"; text { text: "Title goes here"; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 10; min: 0 1; align: 0.5 0.0; @@ -230,7 +230,7 @@ group { color_class: "winlist_label"; text { text: "Title goes here"; - font: "Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 10; min: 0 1; align: 0.0 0.5; diff --git a/data/themes/default_wizard.edc b/data/themes/default_wizard.edc index 3ef523c3d..a073ac287 100644 --- a/data/themes/default_wizard.edc +++ b/data/themes/default_wizard.edc @@ -96,7 +96,7 @@ group { color3: 0 0 0 16; text { text: "Title"; - font: "Serif:style=Bold,Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 20; min: 0 1; align: 0.5 0.0; @@ -161,7 +161,7 @@ group { color3: 0 0 0 16; text { text: "Back"; - font: "Serif:style=Bold,Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 12; min: 1 1; align: 0.0 1.0; @@ -240,7 +240,7 @@ group { color3: 0 0 0 16; text { text: "Next"; - font: "Serif:style=Bold,Edje-Vera-Bold"; + font: "Sans:style=Bold,Edje-Vera-Bold"; size: 12; min: 1 1; align: 1.0 1.0; diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c index d1897d49e..2d197fa9c 100644 --- a/src/modules/wizard/page_010.c +++ b/src/modules/wizard/page_010.c @@ -4,11 +4,7 @@ #include "e.h" #include "e_mod_main.h" -static void -button_cb(void *data, void *data2) -{ - e_wizard_button_next_enable_set(1); -} +static char *lang = NULL; EAPI int wizard_page_init(E_Wizard_Page *pg) @@ -23,18 +19,18 @@ wizard_page_shutdown(E_Wizard_Page *pg) EAPI int wizard_page_show(E_Wizard_Page *pg) { - Evas_Object *ob, *o; + Evas_Object *o, *of, *ob; - printf("t1\n"); - ob = e_widget_list_add(pg->evas, 1, 0); - o = e_widget_button_add(pg->evas, - "Hello World", NULL, - button_cb, NULL, NULL); - e_widget_list_object_append(ob, o, 0, 0, 0.5); - evas_object_show(o); - e_wizard_page_show(ob); - pg->data = ob; - e_wizard_button_next_enable_set(0); + o = e_widget_list_add(pg->evas, 1, 0); + of = e_widget_framelist_add(pg->evas, _("Choose Language"), 0); + ob = e_widget_ilist_add(pg->evas, 16, 16, &lang); + e_widget_min_size_set(ob, 175, 175); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o, of, 0, 0, 0.5); + evas_object_show(ob); + evas_object_show(of); + e_wizard_page_show(o); + pg->data = of; return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } EAPI int @@ -46,6 +42,6 @@ wizard_page_hide(E_Wizard_Page *pg) EAPI int wizard_page_apply(E_Wizard_Page *pg) { - printf("a1\n"); + printf("a2\n"); return 1; }