vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Carsten Haitzler 2007-09-17 12:03:47 +00:00
parent c925fbf2cb
commit 1ab387ad73
18 changed files with 43 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/init/default.edc
View File

@ -56,8 +56,8 @@
#endif #endif
fonts { fonts {
font: "Vera.ttf" "Edje Vera"; font: "Vera.ttf" "Edje-Vera";
font: "VeraBd.ttf" "Edje Vera Bold"; font: "VeraBd.ttf" "Edje-Vera-Bold";
} }
images { images {
@ -560,7 +560,7 @@ collections {
color3: 0 0 0 32; color3: 0 0 0 32;
text { text {
text: "Enlightenment"; text: "Enlightenment";
font: "Edje Vera Bold"; font: "Serif:style=Bold,Edje-Vera-Bold";
size: TSIZE; size: TSIZE;
min: 1 1; min: 1 1;
align: 0.5 0.5; align: 0.5 0.5;
@ -587,7 +587,7 @@ collections {
color3: 255 255 255 128; color3: 255 255 255 128;
text { text {
text: "0.17.0"; text: "0.17.0";
font: "Edje Vera"; font: "Edje-Vera";
size: VSIZE; size: VSIZE;
min: 1 1; min: 1 1;
align: 0.0 0.0; align: 0.0 0.0;
@ -617,7 +617,7 @@ collections {
color3: 255 255 255 128; color3: 255 255 255 128;
text { text {
text: "Starting Enlightenment. Please wait."; text: "Starting Enlightenment. Please wait.";
font: "Edje Vera"; font: "Edje-Vera";
size: SSIZE; size: SSIZE;
min: 1 1; min: 1 1;
align: 0.5 0.5; align: 0.5 0.5;
@ -645,7 +645,7 @@ collections {
color3: 255 255 255 128; color3: 255 255 255 128;
text { text {
text: "Disable this splash screen in future."; text: "Disable this splash screen in future.";
font: "Edje Vera"; font: "Edje-Vera";
size: SSIZE; size: SSIZE;
min: 1 1; min: 1 1;
align: 0.0 0.5; align: 0.0 0.5;

4
data/themes/default_about.edc
View File

@ -425,7 +425,7 @@ group {
color_class: "about_title"; color_class: "about_title";
text { text {
text: "Enlightenment"; text: "Enlightenment";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 16; size: 16;
min: 1 1; min: 1 1;
align: 0.5 0.5; align: 0.5 0.5;
@ -457,7 +457,7 @@ group {
color_class: "about_version"; color_class: "about_version";
text { text {
text: "0.17.0.000"; text: "0.17.0.000";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 12; size: 12;
min: 1 1; min: 1 1;
align: 0.5 0.5; align: 0.5 0.5;

2
data/themes/default_battery.edc
View File

@ -162,7 +162,7 @@ group {
color_class: "module_label"; color_class: "module_label";
text { text {
text: "100%"; text: "100%";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 8; size: 8;
min: 1 1; min: 1 1;
align: 1.0 0.0; align: 1.0 0.0;

2
data/themes/default_configure.edc
View File

@ -89,7 +89,7 @@ group {
color_class: "configure_title"; color_class: "configure_title";
text { text {
text: "Enlightenment Configuration"; text: "Enlightenment Configuration";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 16; size: 16;
min: 1 1; min: 1 1;
align: 0.5 0.5; align: 0.5 0.5;

2
data/themes/default_cpufreq.edc
View File

@ -307,7 +307,7 @@ group {
color_class: "module_label"; color_class: "module_label";
text { text {
text: "??? Ghz"; text: "??? Ghz";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 8; size: 8;
align: 0.5 0.5; align: 0.5 0.5;
min: 1 1; min: 1 1;

4
data/themes/default_desklock.edc
View File

@ -80,7 +80,7 @@ group
color3: 255 255 255 128; color3: 255 255 255 128;
text { text {
text: "Please enter your unlock password"; text: "Please enter your unlock password";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 10; size: 10;
align: 0.0 0.5; align: 0.0 0.5;
min: 1 1; min: 1 1;
@ -183,7 +183,7 @@ group
color3: 255 255 255 128; color3: 255 255 255 128;
text { text {
text: "****"; text: "****";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 16; size: 16;
align: 0.0 0.5; align: 0.0 0.5;
min: 1 1; min: 1 1;

2
data/themes/default_error.edc
View File

@ -125,7 +125,7 @@ group {
color_class: "error_title"; color_class: "error_title";
text { text {
text: "Title"; text: "Title";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 12; size: 12;
min: 1 1; min: 1 1;
align: 0.0 0.5; align: 0.0 0.5;

2
data/themes/default_exebuf.edc
View File

@ -273,7 +273,7 @@ group {
color3: 255 255 255 128; color3: 255 255 255 128;
text { text {
text: "COMMAND"; text: "COMMAND";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 16; size: 16;
align: 0.0 0.5; align: 0.0 0.5;
min: 1 1; min: 1 1;

8
data/themes/default_fileman.edc
View File

@ -4153,7 +4153,7 @@ group {
color3: 0 0 0 24; color3: 0 0 0 24;
text { text {
text: ""; text: "";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 10; size: 10;
min: 0 0; min: 0 0;
align: 0.5 0.5; align: 0.5 0.5;
@ -4216,7 +4216,7 @@ group {
color3: 0 0 0 24; color3: 0 0 0 24;
text { text {
text: ""; text: "";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 10; size: 10;
min: 1 1; min: 1 1;
align: 1.0 0.5; align: 1.0 0.5;
@ -6945,7 +6945,7 @@ group {
text { text {
text: "No Title"; text: "No Title";
size: 10; size: 10;
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
min: 0 1; min: 0 1;
align: 0.5 1.0; align: 0.5 1.0;
elipsis: 0.0; elipsis: 0.0;
@ -7266,7 +7266,7 @@ group {
text { text {
text: "No Title"; text: "No Title";
size: 10; size: 10;
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
min: 0 1; min: 0 1;
align: 0.5 1.0; align: 0.5 1.0;
elipsis: 0.0; elipsis: 0.0;

2
data/themes/default_frame.edc
View File

@ -91,7 +91,7 @@ group {
color: 0 0 0 80; color: 0 0 0 80;
text { text {
text: "Frame Label"; text: "Frame Label";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 10; size: 10;
min: 1 1; min: 1 1;
max: 1 1; max: 1 1;

2
data/themes/default_ibox.edc
View File

@ -214,7 +214,7 @@ group {
color_class: "module_label"; color_class: "module_label";
text { text {
text: "Icon Name"; text: "Icon Name";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 10; size: 10;
min: 1 1; min: 1 1;
align: 0.5 0.5; align: 0.5 0.5;

2
data/themes/default_ilist.edc
View File

@ -992,7 +992,7 @@ group {
color_class: "ilist_header"; color_class: "ilist_header";
text { text {
text: "Item Label"; text: "Item Label";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 16; size: 16;
min: 1 1; min: 1 1;
align: 0.0 0.5; align: 0.0 0.5;

2
data/themes/default_menu.edc
View File

@ -101,7 +101,7 @@ group {
color_class: "menu_title"; color_class: "menu_title";
text { text {
text: "Menu Title"; text: "Menu Title";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 10; size: 10;
min: 0 0; min: 0 0;
align: 0.5 0.0; align: 0.5 0.0;

2
data/themes/default_pager.edc
View File

@ -117,7 +117,7 @@ group {
color_class: "module_label"; color_class: "module_label";
text { text {
text: "Title goes here"; text: "Title goes here";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 12; size: 12;
min: 1 1; min: 1 1;
align: 0.5 0.5; align: 0.5 0.5;

2
data/themes/default_temperature.edc
View File

@ -89,7 +89,7 @@ group {
color_class: "module_label"; color_class: "module_label";
text { text {
text: "99^C"; text: "99^C";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 8; size: 8;
min: 1 1; min: 1 1;
align: 0.0 0.0; align: 0.0 0.0;

4
data/themes/default_winlist.edc
View File

@ -181,7 +181,7 @@ group {
color_class: "winlist_title"; color_class: "winlist_title";
text { text {
text: "Title goes here"; text: "Title goes here";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 10; size: 10;
min: 0 1; min: 0 1;
align: 0.5 0.0; align: 0.5 0.0;
@ -230,7 +230,7 @@ group {
color_class: "winlist_label"; color_class: "winlist_label";
text { text {
text: "Title goes here"; text: "Title goes here";
font: "Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 10; size: 10;
min: 0 1; min: 0 1;
align: 0.0 0.5; align: 0.0 0.5;

6
data/themes/default_wizard.edc
View File

@ -96,7 +96,7 @@ group {
color3: 0 0 0 16; color3: 0 0 0 16;
text { text {
text: "Title"; text: "Title";
font: "Serif:style=Bold,Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 20; size: 20;
min: 0 1; min: 0 1;
align: 0.5 0.0; align: 0.5 0.0;
@ -161,7 +161,7 @@ group {
color3: 0 0 0 16; color3: 0 0 0 16;
text { text {
text: "Back"; text: "Back";
font: "Serif:style=Bold,Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 12; size: 12;
min: 1 1; min: 1 1;
align: 0.0 1.0; align: 0.0 1.0;
@ -240,7 +240,7 @@ group {
color3: 0 0 0 16; color3: 0 0 0 16;
text { text {
text: "Next"; text: "Next";
font: "Serif:style=Bold,Edje-Vera-Bold"; font: "Sans:style=Bold,Edje-Vera-Bold";
size: 12; size: 12;
min: 1 1; min: 1 1;
align: 1.0 1.0; align: 1.0 1.0;

30
src/modules/wizard/page_010.c
View File

@ -4,11 +4,7 @@
#include "e.h" #include "e.h"
#include "e_mod_main.h" #include "e_mod_main.h"
static void static char *lang = NULL;
button_cb(void *data, void *data2)
{
e_wizard_button_next_enable_set(1);
}
EAPI int EAPI int
wizard_page_init(E_Wizard_Page *pg) wizard_page_init(E_Wizard_Page *pg)
@ -23,18 +19,18 @@ wizard_page_shutdown(E_Wizard_Page *pg)
EAPI int EAPI int
wizard_page_show(E_Wizard_Page *pg) wizard_page_show(E_Wizard_Page *pg)
{ {
Evas_Object *ob, *o; Evas_Object *o, *of, *ob;
printf("t1\n"); o = e_widget_list_add(pg->evas, 1, 0);
ob = e_widget_list_add(pg->evas, 1, 0); of = e_widget_framelist_add(pg->evas, _("Choose Language"), 0);
o = e_widget_button_add(pg->evas, ob = e_widget_ilist_add(pg->evas, 16, 16, &lang);
"Hello World", NULL, e_widget_min_size_set(ob, 175, 175);
button_cb, NULL, NULL); e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(ob, o, 0, 0, 0.5); e_widget_list_object_append(o, of, 0, 0, 0.5);
evas_object_show(o); evas_object_show(ob);
e_wizard_page_show(ob); evas_object_show(of);
pg->data = ob; e_wizard_page_show(o);
e_wizard_button_next_enable_set(0); pg->data = of;
return 1; /* 1 == show ui, and wait for user, 0 == just continue */ return 1; /* 1 == show ui, and wait for user, 0 == just continue */
} }
EAPI int EAPI int
@ -46,6 +42,6 @@ wizard_page_hide(E_Wizard_Page *pg)
EAPI int EAPI int
wizard_page_apply(E_Wizard_Page *pg) wizard_page_apply(E_Wizard_Page *pg)
{ {
printf("a1\n"); printf("a2\n");
return 1; return 1;
} }