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

and now wizard is pretty much required. functionalyl its almost all there. 

just the init of ibar/fileman favorites is the old untar code moved to
wizard. icons for all profiels are nto done yet - doing. broung some
backgrounds back - small .edj files though.



SVN revision: 37119
This commit is contained in:
Carsten Haitzler 2008-10-26 09:04:05 +00:00
parent 5d77d647ff
commit 20fd541692
62 changed files with 6764 additions and 2238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/Makefile.am
View File

@ -1,5 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = default standard
SUBDIRS = default standard minimalist scaleable netbook
EET_EET = @eet_eet@

20
config/default/Makefile.am
View File

@ -3,29 +3,13 @@ MAINTAINERCLEANFILES = Makefile.in
EET_EET = @eet_eet@
EXTRA_DIST = \
e.src \
module.battery.src \
module.cpufreq.src \
module.dropshadow.src \
module.fileman.src \
module.ibar.src \
module.ibox.src \
module.pager.src \
module.temperature.src
e.src
filesdir = $(datadir)/enlightenment/data/config/default
files_DATA = \
profile.desktop \
icon.png \
e.cfg \
module.battery.cfg \
module.cpufreq.cfg \
module.dropshadow.cfg \
module.fileman.cfg \
module.ibar.cfg \
module.ibox.cfg \
module.pager.cfg \
module.temperature.cfg
e.cfg
%.cfg: %.src
$(EET_EET) -e \

1604
config/default/e.src
View File

File diff suppressed because it is too large Load Diff

3
config/minimalist/.cvsignore Normal file
View File

@ -0,0 +1,3 @@
Makefile
Makefile.in
*.cfg

37
config/minimalist/Makefile.am Normal file
View File

@ -0,0 +1,37 @@
MAINTAINERCLEANFILES = Makefile.in
EET_EET = @eet_eet@
EXTRA_DIST = \
e.src \
module.battery.src \
module.cpufreq.src \
module.dropshadow.src \
module.fileman.src \
module.ibar.src \
module.ibox.src \
module.pager.src \
module.temperature.src
filesdir = $(datadir)/enlightenment/data/config/minimalist
files_DATA = \
profile.desktop \
icon.png \
e.cfg \
module.battery.cfg \
module.cpufreq.cfg \
module.dropshadow.cfg \
module.fileman.cfg \
module.ibar.cfg \
module.ibox.cfg \
module.pager.cfg \
module.temperature.cfg
%.cfg: %.src
$(EET_EET) -e \
$(top_builddir)/config/minimalist/$@ config \
$< 1
clean-local:
rm -rf *.cfg *~

1935
config/minimalist/e.src Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
config/minimalist/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

0
config/default/module.battery.src → config/minimalist/module.battery.src
View File

0
config/default/module.cpufreq.src → config/minimalist/module.cpufreq.src
View File

7
config/minimalist/module.dropshadow.src Normal file
View File

@ -0,0 +1,7 @@
group "Dropshadow_Config" struct {
value "shadow_x" int: 2;
value "shadow_y" int: 2;
value "blur_size" int: 10;
value "quality" int: 4;
value "shadow_darkness" double: 0.2500000000000000000000000;
}

0
config/default/module.fileman.src → config/minimalist/module.fileman.src
View File

7
config/default/module.ibar.src → config/minimalist/module.ibar.src
View File

@ -7,13 +7,6 @@ group "IBar_Config" struct {
value "eap_label" int: 0;
}
}
group "items" list {
group "IBar_Config_Item" struct {
value "id" string: "ibar.1";
value "show_label" int: 1;
value "eap_label" int: 0;
}
}
group "items" list {
group "IBar_Config_Item" struct {
value "id" string: "ibar.1";

0
config/default/module.ibox.src → config/minimalist/module.ibox.src
View File

15
config/minimalist/module.pager.src Normal file
View File

@ -0,0 +1,15 @@
group "Pager_Config" struct {
value "popup" uint: 1;
value "popup_speed" double: 1.0000000000000000000000000;
value "popup_urgent" uint: 0;
value "popup_urgent_stick" uint: 0;
value "popup_urgent_speed" double: 1.5000000000000000000000000;
value "show_desk_names" uint: 0;
value "popup_height" int: 60;
value "popup_act_height" int: 60;
value "drag_resist" uint: 3;
value "btn_drag" uchar: 1;
value "btn_noplace" uchar: 2;
value "btn_desk" uchar: 0;
value "flip_desk" uchar: 0;
}

0
config/default/module.temperature.src → config/minimalist/module.temperature.src
View File

5
config/minimalist/profile.desktop Normal file
View File

@ -0,0 +1,5 @@
[Desktop Entry]
Type=Link
Name=Minimalist
Icon=icon.png
Comment=A mininimalist setup<br>with very few things on<br>the screen. Should<br>appeal to Those<br>that like as little<br>clutter as possible.

3
config/netbook/.cvsignore Normal file
View File

@ -0,0 +1,3 @@
Makefile
Makefile.in
*.cfg

37
config/netbook/Makefile.am Normal file
View File

@ -0,0 +1,37 @@
MAINTAINERCLEANFILES = Makefile.in
EET_EET = @eet_eet@
EXTRA_DIST = \
e.src \
module.battery.src \
module.cpufreq.src \
module.dropshadow.src \
module.fileman.src \
module.ibar.src \
module.ibox.src \
module.pager.src \
module.temperature.src
filesdir = $(datadir)/enlightenment/data/config/netbook
files_DATA = \
profile.desktop \
icon.png \
e.cfg \
module.battery.cfg \
module.cpufreq.cfg \
module.dropshadow.cfg \
module.fileman.cfg \
module.ibar.cfg \
module.ibox.cfg \
module.pager.cfg \
module.temperature.cfg
%.cfg: %.src
$(EET_EET) -e \
$(top_builddir)/config/netbook/$@ config \
$< 1
clean-local:
rm -rf *.cfg *~

1999
config/netbook/e.src Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
config/netbook/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

6
config/netbook/module.battery.src Normal file
View File

@ -0,0 +1,6 @@
group "Battery_Config" struct {
value "poll_interval" int: 512;
value "alert" int: 30;
value "alert_p" int: 10;
value "alert_timeout" int: 0;
}

4
config/netbook/module.cpufreq.src Normal file
View File

@ -0,0 +1,4 @@
group "Cpufreq_Config" struct {
value "poll_interval" int: 32;
value "restore_governor" int: 1;
}

2
config/default/module.dropshadow.src → config/netbook/module.dropshadow.src
View File

@ -3,5 +3,5 @@ group "Dropshadow_Config" struct {
value "shadow_y" int: 4;
value "blur_size" int: 10;
value "quality" int: 2;
value "shadow_darkness" double: 0.5;
value "shadow_darkness" double: 0.5000000000000000000000000;
}

28
config/netbook/module.fileman.src Normal file
View File

@ -0,0 +1,28 @@
group "Fileman_Config" struct {
value "config_version" int: 65793;
value "view.mode" int: 1;
value "view.open_dirs_in_place" uchar: 0;
value "view.selector" uchar: 0;
value "view.single_click" uchar: 0;
value "view.no_subdir_jump" uchar: 0;
value "view.no_subdir_drop" uchar: 0;
value "view.always_order" uchar: 0;
value "view.link_drop" uchar: 0;
value "view.fit_custom_pos" uchar: 0;
value "view.show_full_path" uchar: 0;
value "view.show_desktop_icons" uchar: 1;
value "view.show_toolbar" uchar: 0;
value "icon.icon.w" int: 48;
value "icon.icon.h" int: 48;
value "icon.list.w" int: 16;
value "icon.list.h" int: 16;
value "icon.fixed.w" uchar: 0;
value "icon.fixed.h" uchar: 0;
value "icon.extension.show" uchar: 1;
value "list.sort.no_case" uchar: 1;
value "list.sort.dirs.first" uchar: 1;
value "list.sort.dirs.last" uchar: 0;
value "selection.single" uchar: 0;
value "selection.windows_modifiers" uchar: 0;
value "theme.fixed" uchar: 0;
}

18
config/netbook/module.ibar.src Normal file
View File

@ -0,0 +1,18 @@
group "IBar_Config" struct {
group "items" list {
group "IBar_Config_Item" struct {
value "id" string: "0";
value "dir" string: "default";
value "show_label" int: 1;
value "eap_label" int: 0;
}
}
group "items" list {
group "IBar_Config_Item" struct {
value "id" string: "ibar.1";
value "dir" string: "default";
value "show_label" int: 1;
value "eap_label" int: 0;
}
}
}

20
config/netbook/module.ibox.src Normal file
View File

@ -0,0 +1,20 @@
group "IBox_Config" struct {
group "items" list {
group "IBox_Config_Item" struct {
value "id" string: "0";
value "show_label" int: 0;
value "show_zone" int: 1;
value "show_desk" int: 0;
value "icon_label" int: 0;
}
}
group "items" list {
group "IBox_Config_Item" struct {
value "id" string: "ibox.1";
value "show_label" int: 0;
value "show_zone" int: 1;
value "show_desk" int: 0;
value "icon_label" int: 0;
}
}
}

4
config/default/module.pager.src → config/netbook/module.pager.src
View File

@ -1,9 +1,9 @@
group "Pager_Config" struct {
value "popup" uint: 1;
value "popup_speed" double: 1.0;
value "popup_speed" double: 1.0000000000000000000000000;
value "popup_urgent" uint: 0;
value "popup_urgent_stick" uint: 0;
value "popup_urgent_speed" double: 1.5;
value "popup_urgent_speed" double: 1.5000000000000000000000000;
value "show_desk_names" uint: 1;
value "popup_height" int: 60;
value "popup_act_height" int: 60;

13
config/netbook/module.temperature.src Normal file
View File

@ -0,0 +1,13 @@
group "Temperature_Config" struct {
group "faces" hash {
key "temperature.1";
group "Temperature_Config_Face" struct {
value "id" string: "temperature.1";
value "poll_interval" int: 128;
value "low" int: 30;
value "high" int: 80;
value "sensor_type" int: 0;
value "units" int: 0;
}
}
}

5
config/netbook/profile.desktop Normal file
View File

@ -0,0 +1,5 @@
[Desktop Entry]
Type=Link
Name=Netbook
Icon=icon.png
Comment=If you have a very<br>small, low-powered laptop<br>(also known as Netbooks),<br>then this profile is for<br>you. It has heavier<br>features turned off<br>to save resources.

3
config/scaleable/.cvsignore Normal file
View File

@ -0,0 +1,3 @@
Makefile
Makefile.in
*.cfg

37
config/scaleable/Makefile.am Normal file
View File

@ -0,0 +1,37 @@
MAINTAINERCLEANFILES = Makefile.in
EET_EET = @eet_eet@
EXTRA_DIST = \
e.src \
module.battery.src \
module.cpufreq.src \
module.dropshadow.src \
module.fileman.src \
module.ibar.src \
module.ibox.src \
module.pager.src \
module.temperature.src
filesdir = $(datadir)/enlightenment/data/config/scaleable
files_DATA = \
profile.desktop \
icon.png \
e.cfg \
module.battery.cfg \
module.cpufreq.cfg \
module.dropshadow.cfg \
module.fileman.cfg \
module.ibar.cfg \
module.ibox.cfg \
module.pager.cfg \
module.temperature.cfg
%.cfg: %.src
$(EET_EET) -e \
$(top_builddir)/config/scaleable/$@ config \
$< 1
clean-local:
rm -rf *.cfg *~

2022
config/scaleable/e.src Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
config/scaleable/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

6
config/scaleable/module.battery.src Normal file
View File

@ -0,0 +1,6 @@
group "Battery_Config" struct {
value "poll_interval" int: 512;
value "alert" int: 30;
value "alert_p" int: 10;
value "alert_timeout" int: 0;
}

4
config/scaleable/module.cpufreq.src Normal file
View File

@ -0,0 +1,4 @@
group "Cpufreq_Config" struct {
value "poll_interval" int: 32;
value "restore_governor" int: 1;
}

7
config/scaleable/module.dropshadow.src Normal file
View File

@ -0,0 +1,7 @@
group "Dropshadow_Config" struct {
value "shadow_x" int: 4;
value "shadow_y" int: 4;
value "blur_size" int: 10;
value "quality" int: 2;
value "shadow_darkness" double: 0.5000000000000000000000000;
}

28
config/scaleable/module.fileman.src Normal file
View File

@ -0,0 +1,28 @@
group "Fileman_Config" struct {
value "config_version" int: 65793;
value "view.mode" int: 1;
value "view.open_dirs_in_place" uchar: 0;
value "view.selector" uchar: 0;
value "view.single_click" uchar: 0;
value "view.no_subdir_jump" uchar: 0;
value "view.no_subdir_drop" uchar: 0;
value "view.always_order" uchar: 0;
value "view.link_drop" uchar: 0;
value "view.fit_custom_pos" uchar: 0;
value "view.show_full_path" uchar: 0;
value "view.show_desktop_icons" uchar: 1;
value "view.show_toolbar" uchar: 0;
value "icon.icon.w" int: 48;
value "icon.icon.h" int: 48;
value "icon.list.w" int: 16;
value "icon.list.h" int: 16;
value "icon.fixed.w" uchar: 0;
value "icon.fixed.h" uchar: 0;
value "icon.extension.show" uchar: 1;
value "list.sort.no_case" uchar: 1;
value "list.sort.dirs.first" uchar: 1;
value "list.sort.dirs.last" uchar: 0;
value "selection.single" uchar: 0;
value "selection.windows_modifiers" uchar: 0;
value "theme.fixed" uchar: 0;
}

18
config/scaleable/module.ibar.src Normal file
View File

@ -0,0 +1,18 @@
group "IBar_Config" struct {
group "items" list {
group "IBar_Config_Item" struct {
value "id" string: "0";
value "dir" string: "default";
value "show_label" int: 1;
value "eap_label" int: 0;
}
}
group "items" list {
group "IBar_Config_Item" struct {
value "id" string: "ibar.1";
value "dir" string: "default";
value "show_label" int: 1;
value "eap_label" int: 0;
}
}
}

20
config/scaleable/module.ibox.src Normal file
View File

@ -0,0 +1,20 @@
group "IBox_Config" struct {
group "items" list {
group "IBox_Config_Item" struct {
value "id" string: "0";
value "show_label" int: 0;
value "show_zone" int: 1;
value "show_desk" int: 0;
value "icon_label" int: 0;
}
}
group "items" list {
group "IBox_Config_Item" struct {
value "id" string: "ibox.1";
value "show_label" int: 0;
value "show_zone" int: 1;
value "show_desk" int: 0;
value "icon_label" int: 0;
}
}
}

15
config/scaleable/module.pager.src Normal file
View File

@ -0,0 +1,15 @@
group "Pager_Config" struct {
value "popup" uint: 1;
value "popup_speed" double: 1.0000000000000000000000000;
value "popup_urgent" uint: 0;
value "popup_urgent_stick" uint: 0;
value "popup_urgent_speed" double: 1.5000000000000000000000000;
value "show_desk_names" uint: 1;
value "popup_height" int: 60;
value "popup_act_height" int: 60;
value "drag_resist" uint: 3;
value "btn_drag" uchar: 1;
value "btn_noplace" uchar: 2;
value "btn_desk" uchar: 0;
value "flip_desk" uchar: 0;
}

13
config/scaleable/module.temperature.src Normal file
View File

@ -0,0 +1,13 @@
group "Temperature_Config" struct {
group "faces" hash {
key "temperature.1";
group "Temperature_Config_Face" struct {
value "id" string: "temperature.1";
value "poll_interval" int: 128;
value "low" int: 30;
value "high" int: 80;
value "sensor_type" int: 0;
value "units" int: 0;
}
}
}

5
config/scaleable/profile.desktop Normal file
View File

@ -0,0 +1,5 @@
[Desktop Entry]
Type=Link
Name=Scaleable
Icon=icon.png
Comment=The Stanard setup, but<br>width automatic scaling<br>enabled to adapt to<br>the resolution of your<br>display, if it is set<br>correctly.

215
config/standard/e.src
View File

@ -3,13 +3,13 @@ group "E_Config" struct {
value "show_splash" int: 1;
value "init_default_theme" string: "default.edj";
value "desktop_default_name" string: "Desktop %i, %i";
value "menus_scroll_speed" double: 1000.0;
value "menus_fast_mouse_move_threshhold" double: 300.0;
value "menus_click_drag_timeout" double: 0.25;
value "menus_scroll_speed" double: 1000.0000000000000000000000000;
value "menus_fast_mouse_move_threshhold" double: 300.0000000000000000000000000;
value "menus_click_drag_timeout" double: 0.2500000000000000000000000;
value "border_shade_animate" int: 1;
value "border_shade_transition" int: 3;
value "border_shade_speed" double: 3000.0;
value "framerate" double: 30.0;
value "border_shade_speed" double: 3000.0000000000000000000000000;
value "framerate" double: 30.0000000000000000000000000;
value "image_cache" int: 4096;
value "font_cache" int: 512;
value "edje_cache" int: 32;
@ -20,7 +20,7 @@ group "E_Config" struct {
value "show_desktop_icons" int: 1;
value "edge_flip_dragging" int: 1;
value "edge_flip_moving" int: 1;
value "edge_flip_timeout" double: 0.25;
value "edge_flip_timeout" double: 0.2500000000000000000000000;
value "evas_engine_default" int: 1;
value "evas_engine_container" int: 0;
value "evas_engine_init" int: 0;
@ -31,7 +31,32 @@ group "E_Config" struct {
value "evas_engine_drag" int: 0;
value "evas_engine_win" int: 0;
value "evas_engine_zone" int: 0;
value "use_composite" int: 0;
value "use_composite" int: 0;
value "language" string: "en_US.UTF-8";
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "mixer";
value "enabled" uchar: 1;
value "delayed" uchar: 0;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_window_remembers";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_scale";
value "enabled" uchar: 1;
value "delayed" uchar: 1;
value "priority" int: 0;
}
}
group "modules" list {
group "E_Config_Module" struct {
value "name" string: "conf_interaction";
@ -1405,7 +1430,7 @@ group "E_Config" struct {
value "always_click_to_raise" int: 0;
value "always_click_to_focus" int: 0;
value "use_auto_raise" int: 0;
value "auto_raise_delay" double: 0.5;
value "auto_raise_delay" double: 0.5000000000000000000000000;
value "use_resist" int: 1;
value "drag_resist" int: 16;
value "desk_resist" int: 32;
@ -1413,9 +1438,9 @@ group "E_Config" struct {
value "gadget_resist" int: 32;
value "winlist_warp_while_selecting" int: 1;
value "winlist_warp_at_end" int: 1;
value "winlist_warp_speed" double: 0.1;
value "winlist_warp_speed" double: 0.1000000000000000055511151;
value "winlist_scroll_animate" int: 1;
value "winlist_scroll_speed" double: 0.1;
value "winlist_scroll_speed" double: 0.1000000000000000055511151;
value "winlist_list_show_iconified" int: 1;
value "winlist_list_show_other_desk_iconified" int: 1;
value "winlist_list_show_other_screen_iconified" int: 0;
@ -1425,10 +1450,10 @@ group "E_Config" struct {
value "winlist_list_jump_desk_while_selecting" int: 0;
value "winlist_list_focus_while_selecting" int: 1;
value "winlist_list_raise_while_selecting" int: 1;
value "winlist_pos_align_x" double: 0.5;
value "winlist_pos_align_y" double: 0.5;
value "winlist_pos_size_w" double: 0.5;
value "winlist_pos_size_h" double: 0.5;
value "winlist_pos_align_x" double: 0.5000000000000000000000000;
value "winlist_pos_align_y" double: 0.5000000000000000000000000;
value "winlist_pos_size_w" double: 0.5000000000000000000000000;
value "winlist_pos_size_h" double: 0.5000000000000000000000000;
value "winlist_pos_min_w" int: 0;
value "winlist_pos_min_h" int: 0;
value "winlist_pos_max_w" int: 320;
@ -1439,11 +1464,11 @@ group "E_Config" struct {
value "allow_above_fullscreen" int: 0;
value "kill_if_close_not_possible" int: 1;
value "kill_process" int: 1;
value "kill_timer_wait" double: 10.0;
value "kill_timer_wait" double: 10.0000000000000000000000000;
value "ping_clients" int: 1;
value "transition_desk" string: "vswipe";
value "transition_change" string: "crossfade";
value "remember_internal_windows" int: 1;
value "remember_internal_windows" int: 0;
value "move_info_follows" int: 1;
value "resize_info_follows" int: 1;
value "move_info_visible" int: 1;
@ -1471,11 +1496,11 @@ group "E_Config" struct {
value "exebuf_max_eap_list" int: 20;
value "exebuf_max_hist_list" int: 20;
value "exebuf_scroll_animate" int: 1;
value "exebuf_scroll_speed" double: 0.1;
value "exebuf_pos_align_x" double: 0.5;
value "exebuf_pos_align_y" double: 0.5;
value "exebuf_pos_size_w" double: 0.75;
value "exebuf_pos_size_h" double: 0.25;
value "exebuf_scroll_speed" double: 0.1000000000000000055511151;
value "exebuf_pos_align_x" double: 0.5000000000000000000000000;
value "exebuf_pos_align_y" double: 0.5000000000000000000000000;
value "exebuf_pos_size_w" double: 0.7500000000000000000000000;
value "exebuf_pos_size_h" double: 0.2500000000000000000000000;
value "exebuf_pos_min_w" int: 200;
value "exebuf_pos_min_h" int: 160;
value "exebuf_pos_max_w" int: 400;
@ -1496,10 +1521,10 @@ group "E_Config" struct {
value "geom.pos" int: 0;
value "geom.size" int: 32;
value "geom.res" int: 800;
value "geom.pos_x" double: 0.0;
value "geom.pos_y" double: 0.0;
value "geom.size_w" double: 0.0;
value "geom.size_h" double: 0.0;
value "geom.pos_x" double: 0.0000000000000000000000000;
value "geom.pos_y" double: 0.0000000000000000000000000;
value "geom.size_w" double: 0.0000000000000000000000000;
value "geom.size_h" double: 0.0000000000000000000000000;
value "state_info.seq" int: 2;
value "state_info.flags" int: 0;
value "style" string: "plain";
@ -1514,10 +1539,10 @@ group "E_Config" struct {
value "geom.pos" int: 32;
value "geom.size" int: 120;
value "geom.res" int: 800;
value "geom.pos_x" double: 0.0;
value "geom.pos_y" double: 0.0;
value "geom.size_w" double: 0.0;
value "geom.size_h" double: 0.0;
value "geom.pos_x" double: 0.0000000000000000000000000;
value "geom.pos_y" double: 0.0000000000000000000000000;
value "geom.size_w" double: 0.0000000000000000000000000;
value "geom.size_h" double: 0.0000000000000000000000000;
value "state_info.seq" int: 3;
value "state_info.flags" int: 0;
value "style" string: "inset";
@ -1532,10 +1557,10 @@ group "E_Config" struct {
value "geom.pos" int: 152;
value "geom.size" int: 32;
value "geom.res" int: 800;
value "geom.pos_x" double: 0.0;
value "geom.pos_y" double: 0.0;
value "geom.size_w" double: 0.0;
value "geom.size_h" double: 0.0;
value "geom.pos_x" double: 0.0000000000000000000000000;
value "geom.pos_y" double: 0.0000000000000000000000000;
value "geom.size_w" double: 0.0000000000000000000000000;
value "geom.size_h" double: 0.0000000000000000000000000;
value "state_info.seq" int: 4;
value "state_info.flags" int: 0;
value "style" string: "inset";
@ -1550,10 +1575,10 @@ group "E_Config" struct {
value "geom.pos" int: 350;
value "geom.size" int: 200;
value "geom.res" int: 800;
value "geom.pos_x" double: 0.0;
value "geom.pos_y" double: 0.0;
value "geom.size_w" double: 0.0;
value "geom.size_h" double: 0.0;
value "geom.pos_x" double: 0.0000000000000000000000000;
value "geom.pos_y" double: 0.0000000000000000000000000;
value "geom.size_w" double: 0.0000000000000000000000000;
value "geom.size_h" double: 0.0000000000000000000000000;
value "state_info.seq" int: 5;
value "state_info.flags" int: 0;
value "style" string: "inset";
@ -1568,10 +1593,10 @@ group "E_Config" struct {
value "geom.pos" int: 672;
value "geom.size" int: 32;
value "geom.res" int: 800;
value "geom.pos_x" double: 0.0;
value "geom.pos_y" double: 0.0;
value "geom.size_w" double: 0.0;
value "geom.size_h" double: 0.0;
value "geom.pos_x" double: 0.0000000000000000000000000;
value "geom.pos_y" double: 0.0000000000000000000000000;
value "geom.size_w" double: 0.0000000000000000000000000;
value "geom.size_h" double: 0.0000000000000000000000000;
value "state_info.seq" int: 6;
value "state_info.flags" int: 0;
value "style" string: "plain";
@ -1586,10 +1611,10 @@ group "E_Config" struct {
value "geom.pos" int: 704;
value "geom.size" int: 32;
value "geom.res" int: 800;
value "geom.pos_x" double: 0.0;
value "geom.pos_y" double: 0.0;
value "geom.size_w" double: 0.0;
value "geom.size_h" double: 0.0;
value "geom.pos_x" double: 0.0000000000000000000000000;
value "geom.pos_y" double: 0.0000000000000000000000000;
value "geom.size_w" double: 0.0000000000000000000000000;
value "geom.size_h" double: 0.0000000000000000000000000;
value "state_info.seq" int: 7;
value "state_info.flags" int: 0;
value "style" string: "plain";
@ -1604,10 +1629,10 @@ group "E_Config" struct {
value "geom.pos" int: 736;
value "geom.size" int: 32;
value "geom.res" int: 800;
value "geom.pos_x" double: 0.0;
value "geom.pos_y" double: 0.0;
value "geom.size_w" double: 0.0;
value "geom.size_h" double: 0.0;
value "geom.pos_x" double: 0.0000000000000000000000000;
value "geom.pos_y" double: 0.0000000000000000000000000;
value "geom.size_w" double: 0.0000000000000000000000000;
value "geom.size_h" double: 0.0000000000000000000000000;
value "state_info.seq" int: 8;
value "state_info.flags" int: 0;
value "style" string: "plain";
@ -1622,10 +1647,10 @@ group "E_Config" struct {
value "geom.pos" int: 768;
value "geom.size" int: 32;
value "geom.res" int: 800;
value "geom.pos_x" double: 0.0;
value "geom.pos_y" double: 0.0;
value "geom.size_w" double: 0.0;
value "geom.size_h" double: 0.0;
value "geom.pos_x" double: 0.0000000000000000000000000;
value "geom.pos_y" double: 0.0000000000000000000000000;
value "geom.size_w" double: 0.0000000000000000000000000;
value "geom.size_h" double: 0.0000000000000000000000000;
value "state_info.seq" int: 9;
value "state_info.flags" int: 0;
value "style" string: "plain";
@ -1645,10 +1670,10 @@ group "E_Config" struct {
value "geom.pos" int: 0;
value "geom.size" int: 120;
value "geom.res" int: 800;
value "geom.pos_x" double: 0.0;
value "geom.pos_y" double: 0.0;
value "geom.size_w" double: 0.0;
value "geom.size_h" double: 0.0;
value "geom.pos_x" double: 0.0000000000000000000000000;
value "geom.pos_y" double: 0.0000000000000000000000000;
value "geom.size_w" double: 0.0000000000000000000000000;
value "geom.size_h" double: 0.0000000000000000000000000;
value "state_info.seq" int: 0;
value "state_info.flags" int: 0;
value "autoscroll" uchar: 0;
@ -1661,10 +1686,10 @@ group "E_Config" struct {
value "geom.pos" int: 768;
value "geom.size" int: 32;
value "geom.res" int: 800;
value "geom.pos_x" double: 0.0;
value "geom.pos_y" double: 0.0;
value "geom.size_w" double: 0.0;
value "geom.size_h" double: 0.0;
value "geom.pos_x" double: 0.0000000000000000000000000;
value "geom.pos_y" double: 0.0000000000000000000000000;
value "geom.size_w" double: 0.0000000000000000000000000;
value "geom.size_h" double: 0.0000000000000000000000000;
value "state_info.seq" int: 0;
value "state_info.flags" int: 0;
value "autoscroll" uchar: 0;
@ -1683,10 +1708,10 @@ group "E_Config" struct {
value "geom.pos" int: 0;
value "geom.size" int: 120;
value "geom.res" int: 800;
value "geom.pos_x" double: 0.0;
value "geom.pos_y" double: 0.0;
value "geom.size_w" double: 0.0;
value "geom.size_h" double: 0.0;
value "geom.pos_x" double: 0.0000000000000000000000000;
value "geom.pos_y" double: 0.0000000000000000000000000;
value "geom.size_w" double: 0.0000000000000000000000000;
value "geom.size_h" double: 0.0000000000000000000000000;
value "state_info.seq" int: 0;
value "state_info.flags" int: 0;
value "autoscroll" uchar: 0;
@ -1699,10 +1724,10 @@ group "E_Config" struct {
value "geom.pos" int: 768;
value "geom.size" int: 32;
value "geom.res" int: 800;
value "geom.pos_x" double: 0.0;
value "geom.pos_y" double: 0.0;
value "geom.size_w" double: 0.0;
value "geom.size_h" double: 0.0;
value "geom.pos_x" double: 0.0000000000000000000000000;
value "geom.pos_y" double: 0.0000000000000000000000000;
value "geom.size_w" double: 0.0000000000000000000000000;
value "geom.size_h" double: 0.0000000000000000000000000;
value "state_info.seq" int: 0;
value "state_info.flags" int: 0;
value "autoscroll" uchar: 0;
@ -1721,10 +1746,10 @@ group "E_Config" struct {
value "geom.pos" int: 0;
value "geom.size" int: 120;
value "geom.res" int: 800;
value "geom.pos_x" double: 0.0;
value "geom.pos_y" double: 0.0;
value "geom.size_w" double: 0.0;
value "geom.size_h" double: 0.0;
value "geom.pos_x" double: 0.0000000000000000000000000;
value "geom.pos_y" double: 0.0000000000000000000000000;
value "geom.size_w" double: 0.0000000000000000000000000;
value "geom.size_h" double: 0.0000000000000000000000000;
value "state_info.seq" int: 0;
value "state_info.flags" int: 0;
value "autoscroll" uchar: 0;
@ -1737,10 +1762,10 @@ group "E_Config" struct {
value "geom.pos" int: 768;
value "geom.size" int: 32;
value "geom.res" int: 800;
value "geom.pos_x" double: 0.0;
value "geom.pos_y" double: 0.0;
value "geom.size_w" double: 0.0;
value "geom.size_h" double: 0.0;
value "geom.pos_x" double: 0.0000000000000000000000000;
value "geom.pos_y" double: 0.0000000000000000000000000;
value "geom.size_w" double: 0.0000000000000000000000000;
value "geom.size_h" double: 0.0000000000000000000000000;
value "state_info.seq" int: 0;
value "state_info.flags" int: 0;
value "autoscroll" uchar: 0;
@ -1777,8 +1802,8 @@ group "E_Config" struct {
value "overlap" int: 0;
value "autohide" int: 0;
value "autohide_show_action" int: 0;
value "hide_timeout" float: 1.0;
value "hide_duration" float: 1.0;
value "hide_timeout" float: 1.0000000000000000000000000;
value "hide_duration" float: 1.0000000000000000000000000;
value "desk_show_mode" int: 0;
group "desk_list" list {
group "E_Config_Shelf_Desk" struct {
@ -1804,8 +1829,8 @@ group "E_Config" struct {
value "overlap" int: 0;
value "autohide" int: 0;
value "autohide_show_action" int: 0;
value "hide_timeout" float: 1.0;
value "hide_duration" float: 1.0;
value "hide_timeout" float: 1.0000000000000000000000000;
value "hide_duration" float: 1.0000000000000000000000000;
value "desk_show_mode" int: 0;
group "desk_list" list {
group "E_Config_Shelf_Desk" struct {
@ -1831,8 +1856,8 @@ group "E_Config" struct {
value "overlap" int: 0;
value "autohide" int: 0;
value "autohide_show_action" int: 0;
value "hide_timeout" float: 1.0;
value "hide_duration" float: 1.0;
value "hide_timeout" float: 1.0000000000000000000000000;
value "hide_duration" float: 1.0000000000000000000000000;
value "desk_show_mode" int: 0;
group "desk_list" list {
group "E_Config_Shelf_Desk" struct {
@ -1858,8 +1883,8 @@ group "E_Config" struct {
value "overlap" int: 0;
value "autohide" int: 0;
value "autohide_show_action" int: 0;
value "hide_timeout" float: 1.0;
value "hide_duration" float: 1.0;
value "hide_timeout" float: 1.0000000000000000000000000;
value "hide_duration" float: 1.0000000000000000000000000;
value "desk_show_mode" int: 0;
group "desk_list" list {
group "E_Config_Shelf_Desk" struct {
@ -1874,7 +1899,7 @@ group "E_Config" struct {
value "desklock_login_box_zone" int: -1;
value "desklock_autolock_screensaver" int: 0;
value "desklock_autolock_idle" int: 0;
value "desklock_autolock_idle_timeout" double: 300.0;
value "desklock_autolock_idle_timeout" double: 300.0000000000000000000000000;
value "desklock_use_custom_desklock" int: 0;
value "display_res_restore" int: 0;
value "display_res_width" int: 1;
@ -1908,10 +1933,10 @@ group "E_Config" struct {
value "border_raise_on_mouse_action" int: 1;
value "border_raise_on_focus" int: 1;
value "desk_flip_wrap" int: 0;
value "icon_theme" string: "hicolor";
value "icon_theme" string: "Tango";
value "desk_flip_animate_mode" int: 1;
value "desk_flip_animate_interpolation" int: 0;
value "desk_flip_animate_time" double: 0.2;
value "desk_flip_animate_time" double: 0.2000000000000000111022302;
value "wallpaper_import_last_dev" string: "~/";
value "wallpaper_import_last_path" string: "/";
value "wallpaper_grad_c1_r" int: 0;
@ -1977,21 +2002,21 @@ group "E_Config" struct {
value "cache_flush_poll_interval" int: 512;
value "thumbscroll_enable" int: 0;
value "thumbscroll_threshhold" int: 8;
value "thumbscroll_momentum_threshhold" double: 100.0;
value "thumbscroll_friction" double: 1.0;
value "thumbscroll_momentum_threshhold" double: 100.0000000000000000000000000;
value "thumbscroll_friction" double: 1.0000000000000000000000000;
value "hal_desktop" int: 1;
value "border_keyboard.timeout" double: 5.0000000000000000000000000;
value "border_keyboard.move.dx" uchar: 5;
value "border_keyboard.move.dy" uchar: 5;
value "border_keyboard.resize.dx" uchar: 5;
value "border_keyboard.resize.dy" uchar: 5;
value "scale.min" double: 1.0;
value "scale.max" double: 3.0;
value "scale.factor" double: 1.0;
value "hal_desktop" int: 1;
value "scale.min" double: 1.0000000000000000000000000;
value "scale.max" double: 3.0000000000000000000000000;
value "scale.factor" double: 1.0000000000000000000000000;
value "scale.base_dpi" int: 142;
value "scale.use_dpi" uchar: 0;
value "scale.use_custom" uchar: 1;
value "scale.use_custom" uchar: 0;
value "show_cursor" uchar: 1;
value "idle_cursor" uchar: 1;
value "default_system_menu" string: "";
}

2
config/standard/module.dropshadow.src
View File

@ -3,5 +3,5 @@ group "Dropshadow_Config" struct {
value "shadow_y" int: 4;
value "blur_size" int: 10;
value "quality" int: 2;
value "shadow_darkness" double: 0.5;
value "shadow_darkness" double: 0.5000000000000000000000000;
}

7
config/standard/module.ibar.src
View File

@ -7,13 +7,6 @@ group "IBar_Config" struct {
value "eap_label" int: 0;
}
}
group "items" list {
group "IBar_Config_Item" struct {
value "id" string: "ibar.1";
value "show_label" int: 1;
value "eap_label" int: 0;
}
}
group "items" list {
group "IBar_Config_Item" struct {
value "id" string: "ibar.1";

4
config/standard/module.pager.src
View File

@ -1,9 +1,9 @@
group "Pager_Config" struct {
value "popup" uint: 1;
value "popup_speed" double: 1.0;
value "popup_speed" double: 1.0000000000000000000000000;
value "popup_urgent" uint: 0;
value "popup_urgent_stick" uint: 0;
value "popup_urgent_speed" double: 1.5;
value "popup_urgent_speed" double: 1.5000000000000000000000000;
value "show_desk_names" uint: 1;
value "popup_height" int: 60;
value "popup_act_height" int: 60;

4
configure.ac
View File

@ -450,9 +450,13 @@ data/xsession/Makefile
data/xsession/enlightenment.desktop
data/etc/Makefile
data/icons/Makefile
data/backgrounds/Makefile
doc/Makefile
config/Makefile
config/default/Makefile
config/standard/Makefile
config/minimalist/Makefile
config/scaleable/Makefile
config/netbook/Makefile
po/Makefile.in
])

3
data/Makefile.am
View File

@ -6,5 +6,6 @@ other \
xsession \
input_methods \
etc \
icons
icons \
backgrounds

BIN
data/backgrounds/Dark_Gradient.edj Normal file
View File

Binary file not shown.

BIN
data/backgrounds/Light_Gradient.edj Normal file
View File

Binary file not shown.

7
data/backgrounds/Makefile.am Normal file
View File

@ -0,0 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
filesdir = $(datadir)/enlightenment/data/backgrounds
files_DATA = \
Dark_Gradient.edj \
Light_Gradient.edj
EXTRA_DIST = $(files_DATA)

43
src/bin/e_bg.c
View File

@ -79,6 +79,7 @@ e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y)
{
Eina_List *l, *ll, *entries;
E_Config_Desktop_Background *bg = NULL;
const char *bgfile = "";
int current_spec = 0; /* how specific the setting is - we want the least general one that applies */
/* look for desk specific background. */
@ -102,8 +103,18 @@ e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y)
else if (cfbg->desk_y >= 0) continue;
if (spec <= current_spec) continue;
entries = edje_file_collection_list(cfbg->file);
bgfile = cfbg->file;
if (bgfile)
{
if (bgfile[0] != '/')
{
const char *bf;
bf = e_path_find(path_backgrounds, bgfile);
if (bf) bgfile = bf;
}
}
entries = edje_file_collection_list(bgfile);
if (entries)
{
for (ll = entries; ll; ll = ll->next)
@ -133,17 +144,39 @@ e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y)
/* fall back to default */
if (cfbg)
bgfile = cfbg->file;
{
bgfile = cfbg->file;
if (bgfile)
{
if (bgfile[0] != '/')
{
const char *bf;
bf = e_path_find(path_backgrounds, bgfile);
if (bf) bgfile = bf;
}
}
}
else
{
entries = edje_file_collection_list(e_config->desktop_default_background);
bgfile = e_config->desktop_default_background;
if (bgfile)
{
if (bgfile[0] != '/')
{
const char *bf;
bf = e_path_find(path_backgrounds, bgfile);
if (bf) bgfile = bf;
}
}
entries = edje_file_collection_list(bgfile);
if (entries)
{
for (l = entries; l; l = l->next)
{
if (!strcmp(l->data, "e/desktop/background"))
{
bgfile = e_config->desktop_default_background;
ok = 1;
break;
}

505
src/bin/e_config.c
View File

@ -637,7 +637,40 @@ e_config_init(void)
E_CONFIG_VAL(D, T, idle_cursor, UCHAR); /**/
E_CONFIG_VAL(D, T, default_system_menu, STR);
e_config_load();
e_config_save_queue();
return 1;
}
EAPI int
e_config_shutdown(void)
{
E_FREE(_e_config_profile);
E_CONFIG_DD_FREE(_e_config_edd);
E_CONFIG_DD_FREE(_e_config_module_edd);
E_CONFIG_DD_FREE(_e_config_font_default_edd);
E_CONFIG_DD_FREE(_e_config_font_fallback_edd);
E_CONFIG_DD_FREE(_e_config_theme_edd);
E_CONFIG_DD_FREE(_e_config_bindings_mouse_edd);
E_CONFIG_DD_FREE(_e_config_bindings_key_edd);
E_CONFIG_DD_FREE(_e_config_bindings_signal_edd);
E_CONFIG_DD_FREE(_e_config_bindings_wheel_edd);
E_CONFIG_DD_FREE(_e_config_path_append_edd);
E_CONFIG_DD_FREE(_e_config_desktop_bg_edd);
E_CONFIG_DD_FREE(_e_config_desktop_name_edd);
E_CONFIG_DD_FREE(_e_config_remember_edd);
E_CONFIG_DD_FREE(_e_config_gadcon_edd);
E_CONFIG_DD_FREE(_e_config_gadcon_client_edd);
E_CONFIG_DD_FREE(_e_config_shelf_edd);
E_CONFIG_DD_FREE(_e_config_shelf_desk_edd);
return 1;
}
EAPI void
e_config_load(void)
{
e_config = e_config_domain_load("e", _e_config_edd);
if (e_config)
{
@ -694,11 +727,11 @@ e_config_init(void)
e_config->font_cache = 512;
e_config->edje_cache = 32;
e_config->edje_collection_cache = 64;
e_config->zone_desks_x_count = 4;
e_config->zone_desks_x_count = 1;
e_config->zone_desks_y_count = 1;
e_config->use_virtual_roots = 0;
e_config->edge_flip_dragging = 1;
e_config->edge_flip_moving = 1;
e_config->edge_flip_dragging = 0;
e_config->edge_flip_moving = 0;
e_config->edge_flip_timeout = 0.25;
e_config->evas_engine_default = E_EVAS_ENGINE_SOFTWARE_X11;
e_config->evas_engine_container = E_EVAS_ENGINE_DEFAULT;
@ -834,120 +867,7 @@ e_config_init(void)
em->priority = _priority; \
e_config->modules = eina_list_append(e_config->modules, em)
CFG_MODULE("start", 1, 0, 0);
CFG_MODULE("ibar", 1, 0, 0);
CFG_MODULE("ibox", 1, 0, 0);
CFG_MODULE("dropshadow", 1, 0, 0);
CFG_MODULE("clock", 1, 0, 0);
CFG_MODULE("battery", 1, 0, 0);
CFG_MODULE("cpufreq", 1, 0, 0);
CFG_MODULE("temperature", 1, 0, 0);
CFG_MODULE("gadman", 1, 0, -100);
CFG_MODULE("pager", 1, 0, 0);
CFG_MODULE("exebuf", 1, 1, 0);
CFG_MODULE("winlist", 1, 1, 0);
CFG_MODULE("conf", 1, 1, 0);
CFG_MODULE("conf_applications", 1, 1, 0);
CFG_MODULE("conf_borders", 1, 1, 0);
CFG_MODULE("conf_clientlist", 1, 1, 0);
CFG_MODULE("conf_colors", 1, 1, 0);
CFG_MODULE("conf_desk", 1, 1, 0);
CFG_MODULE("conf_desklock", 1, 1, 0);
CFG_MODULE("conf_desks", 1, 1, 0);
CFG_MODULE("conf_dialogs", 1, 1, 0);
CFG_MODULE("conf_display", 1, 1, 0);
CFG_MODULE("conf_dpms", 1, 1, 0);
CFG_MODULE("conf_exebuf", 1, 1, 0);
CFG_MODULE("conf_fonts", 1, 1, 0);
CFG_MODULE("conf_icon_theme", 1, 1, 0);
CFG_MODULE("conf_imc", 1, 1, 0);
CFG_MODULE("conf_intl", 1, 1, 0);
CFG_MODULE("conf_keybindings", 1, 1, 0);
CFG_MODULE("conf_menus", 1, 1, 0);
CFG_MODULE("conf_mime", 1, 1, 0);
CFG_MODULE("conf_mouse", 1, 1, 0);
CFG_MODULE("conf_mousebindings", 1, 1, 0);
CFG_MODULE("conf_mouse_cursor", 1, 1, 0);
CFG_MODULE("conf_paths", 1, 1, 0);
CFG_MODULE("conf_performance", 1, 1, 0);
CFG_MODULE("conf_profiles", 1, 1, 0);
CFG_MODULE("conf_screensaver", 1, 1, 0);
CFG_MODULE("conf_shelves", 1, 1, 0);
CFG_MODULE("conf_startup", 1, 1, 0);
CFG_MODULE("conf_theme", 1, 1, 0);
CFG_MODULE("conf_transitions", 1, 1, 0);
CFG_MODULE("conf_wallpaper", 1, 1, 0);
CFG_MODULE("conf_window_display", 1, 1, 0);
CFG_MODULE("conf_window_focus", 1, 1, 0);
CFG_MODULE("conf_window_manipulation", 1, 1, 0);
CFG_MODULE("conf_winlist", 1, 1, 0);
CFG_MODULE("conf_engine", 1, 1, 0);
CFG_MODULE("fileman", 1, 1, 0);
CFG_MODULE("conf_interaction", 1, 1, 0);
}
#if 0
{
E_Font_Fallback* eff;
#define CFG_FONTFALLBACK(_name) \
eff = E_NEW(E_Font_Fallback, 1); \
eff->name = eina_stringshare_add(_name); \
e_config->font_fallbacks = eina_list_append(e_config->font_fallbacks, eff)
CFG_FONTFALLBACK("New-Sung");
CFG_FONTFALLBACK("Kochi-Gothic");
CFG_FONTFALLBACK("Baekmuk-Dotum");
}
#endif
{
E_Font_Default* efd;
#define CFG_FONTDEFAULT(_tclass, _name, _size) \
efd = E_NEW(E_Font_Default, 1); \
efd->text_class = eina_stringshare_add(_tclass); \
efd->font = eina_stringshare_add(_name); \
efd->size = _size; \
e_config->font_defaults = eina_list_append(e_config->font_defaults, efd)
CFG_FONTDEFAULT("default", "Vera", 10);
}
{
E_Config_Theme *et;
et = E_NEW(E_Config_Theme, 1);
et->category = eina_stringshare_add("theme");
et->file = eina_stringshare_add("default.edj");
e_config->themes = eina_list_append(e_config->themes, et);
}
{
E_Config_Binding_Mouse *eb;
#define CFG_MOUSEBIND(_context, _button, _modifiers, _anymod, _action, _params) \
eb = E_NEW(E_Config_Binding_Mouse, 1); \
eb->context = _context; \
eb->button = _button; \
eb->modifiers = _modifiers; \
eb->any_mod = _anymod; \
eb->action = _action == NULL ? NULL : eina_stringshare_add(_action); \
eb->params = _params == NULL ? NULL : eina_stringshare_add(_params); \
e_config->mouse_bindings = eina_list_append(e_config->mouse_bindings, eb)
/*
* FIXME:
* If new mouse binding are added/changed/modified, then do not
* forget to reflect those changes in e_int_config_mousebinding.c in
* _restore_defaults_cb function
*/
CFG_MOUSEBIND(E_BINDING_CONTEXT_BORDER, 1,
E_BINDING_MODIFIER_ALT, 0, "window_move", NULL);
CFG_MOUSEBIND(E_BINDING_CONTEXT_BORDER, 2,
E_BINDING_MODIFIER_ALT, 0, "window_resize", NULL);
CFG_MOUSEBIND(E_BINDING_CONTEXT_BORDER, 3,
E_BINDING_MODIFIER_ALT, 0, "window_menu", NULL);
CFG_MOUSEBIND(E_BINDING_CONTEXT_ZONE, 1, 0, 0, "menu_show", "main");
CFG_MOUSEBIND(E_BINDING_CONTEXT_ZONE, 2, 0, 0, "menu_show", "clients");
CFG_MOUSEBIND(E_BINDING_CONTEXT_ZONE, 3, 0, 0, "menu_show", "favorites");
CFG_MODULE("wizard", 1, 0, 0);
}
{
E_Config_Binding_Key *eb;
@ -969,150 +889,15 @@ e_config_init(void)
* _restore_key_binding_defaults_cb function
*/
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Left",
E_BINDING_MODIFIER_SHIFT | E_BINDING_MODIFIER_ALT, 0,
"desk_flip_by", "-1 0");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Right",
E_BINDING_MODIFIER_SHIFT | E_BINDING_MODIFIER_ALT, 0,
"desk_flip_by", "1 0");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Up",
E_BINDING_MODIFIER_SHIFT | E_BINDING_MODIFIER_ALT, 0,
"desk_flip_by", "0 -1");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Down",
E_BINDING_MODIFIER_SHIFT | E_BINDING_MODIFIER_ALT, 0,
"desk_flip_by", "0 1");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Up",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"window_raise", NULL);
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Down",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"window_lower", NULL);
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "x",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"window_close", NULL);
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "k",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"window_kill", NULL);
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "w",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"window_menu", NULL);
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "s",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"window_sticky_toggle", NULL);
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "i",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"window_iconic_toggle", NULL);
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "f",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"window_maximized_toggle", NULL);
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F10",
E_BINDING_MODIFIER_SHIFT, 0,
"window_maximized_toggle", "default vertical");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F10",
E_BINDING_MODIFIER_SHIFT | E_BINDING_MODIFIER_ALT, 0,
"window_maximized_toggle", "default horizontal");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "r",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"window_shaded_toggle", NULL);
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Left",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_by", "-1");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Right",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_by", "1");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F1",
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_to", "0");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F2",
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_to", "1");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F3",
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_to", "2");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F4",
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_to", "3");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F5",
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_to", "4");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F6",
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_to", "5");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F7",
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_to", "6");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F8",
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_to", "7");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F9",
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_to", "8");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F10",
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_to", "9");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F11",
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_to", "10");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F12",
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_to", "11");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "m",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"menu_show", "main");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "a",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"menu_show", "favorites");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Menu",
0, 0,
"menu_show", "main");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Menu",
E_BINDING_MODIFIER_CTRL, 0,
"menu_show", "clients");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Menu",
E_BINDING_MODIFIER_ALT, 0,
"menu_show", "favorites");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Insert",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"exec", "Eterm");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Tab",
E_BINDING_MODIFIER_ALT, 0,
"winlist", "next");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Tab",
E_BINDING_MODIFIER_SHIFT | E_BINDING_MODIFIER_ALT, 0,
"winlist", "prev");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "End",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"restart", NULL);
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Delete",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"logout", NULL);
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Escape",
E_BINDING_MODIFIER_ALT, 0,
"exebuf", NULL);
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "l",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"desk_lock", NULL);
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "d",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"desk_deskshow_toggle", NULL);
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Left",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_SHIFT, 0,
"screen_send_by", "-1");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Right",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_SHIFT, 0,
"screen_send_by", "1");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F1",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_SHIFT, 0,
"screen_send_to", "0");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F2",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_SHIFT, 0,
"screen_send_to", "1");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F3",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_SHIFT, 0,
"screen_send_to", "2");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F4",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_SHIFT, 0,
"screen_send_to", "3");
}
{
E_Config_Binding_Signal *eb;
@ -1241,107 +1026,12 @@ e_config_init(void)
E_BINDING_MODIFIER_NONE, 1,
"window_move", "end");
}
{
E_Config_Binding_Wheel *eb;
#define CFG_WHEELBIND(_context, _direction, _z, _modifiers, _anymod, _action, _params) \
eb = E_NEW(E_Config_Binding_Wheel, 1); \
eb->context = _context; \
eb->direction = _direction; \
eb->z = _z; \
eb->modifiers = _modifiers; \
eb->any_mod = _anymod; \
eb->action = _action == NULL ? NULL : eina_stringshare_add(_action); \
eb->params = _params == NULL ? NULL : eina_stringshare_add(_params); \
e_config->wheel_bindings = eina_list_append(e_config->wheel_bindings, eb)
/*
* FIXME:
* If new wheel binding are added/changed/modified, then do not
* forget to reflect those changes in e_int_config_mousebinding.c in
* _restore_defaults_cb function
*/
CFG_WHEELBIND(E_BINDING_CONTEXT_CONTAINER, 0, -1,
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_by", "-1");
CFG_WHEELBIND(E_BINDING_CONTEXT_CONTAINER, 1, -1,
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_by", "-1");
CFG_WHEELBIND(E_BINDING_CONTEXT_CONTAINER, 0, 1,
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_by", "1");
CFG_WHEELBIND(E_BINDING_CONTEXT_CONTAINER, 1, 1,
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_by", "1");
CFG_WHEELBIND(E_BINDING_CONTEXT_BORDER, 0, -1,
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_by", "-1");
CFG_WHEELBIND(E_BINDING_CONTEXT_BORDER, 1, -1,
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_by", "-1");
CFG_WHEELBIND(E_BINDING_CONTEXT_BORDER, 0, 1,
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_by", "1");
CFG_WHEELBIND(E_BINDING_CONTEXT_BORDER, 1, 1,
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_by", "1");
CFG_WHEELBIND(E_BINDING_CONTEXT_POPUP, 0, -1,
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_by", "-1");
CFG_WHEELBIND(E_BINDING_CONTEXT_POPUP, 1, -1,
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_by", "-1");
CFG_WHEELBIND(E_BINDING_CONTEXT_POPUP, 0, 1,
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_by", "1");
CFG_WHEELBIND(E_BINDING_CONTEXT_POPUP, 1, 1,
E_BINDING_MODIFIER_ALT, 0,
"desk_linear_flip_by", "1");
}
IFCFGEND;
IFCFG(0x0093); /* the version # where this value(s) was introduced */
/* FIXME: wipe previous shelves and gadcons - remove this eventually */
e_config->shelves = NULL;
e_config->gadcons = NULL;
{
E_Config_Shelf *cf_es;
int id = 0;
#define CFG_SHELF(_name, _con, _zone, _pop, _lay, _orient, _fita, _fits, _style, _size, _overlap, _autohide, _autohide_show_action, _hide_timeout, _hide_duration, _desk_show_mode, _desk_list) \
cf_es = E_NEW(E_Config_Shelf, 1); \
cf_es->name = eina_stringshare_add(_name); \
cf_es->id = ++id; \
cf_es->container = _con; \
cf_es->zone = _zone; \
cf_es->popup = _pop; \
cf_es->layer = _lay; \
cf_es->orient = _orient; \
cf_es->fit_along = _fita; \
cf_es->fit_size = _fits; \
cf_es->style = eina_stringshare_add(_style); \
cf_es->size = _size; \
cf_es->overlap = _overlap; \
cf_es->autohide = _autohide; \
cf_es->autohide_show_action = _autohide_show_action; \
cf_es->hide_timeout = _hide_timeout; \
cf_es->hide_duration = _hide_duration; \
cf_es->desk_show_mode = _desk_show_mode; \
cf_es->desk_list = eina_list_append(cf_es->desk_list, cf_es); \
e_config->shelves = eina_list_append(e_config->shelves, cf_es)
CFG_SHELF("shelf", 0, 0,
1, 200, E_GADCON_ORIENT_BOTTOM,
1, 0, "default", 40, 0, 0, 0, 1.0, 1.0, 0, NULL);
CFG_SHELF("shelf", 1, 0,
1, 200, E_GADCON_ORIENT_BOTTOM,
1, 0, "default", 40, 0, 0, 0, 1.0, 1.0, 0, NULL);
CFG_SHELF("shelf", 2, 0,
1, 200, E_GADCON_ORIENT_BOTTOM,
1, 0, "default", 40, 0, 0, 0, 1.0, 1.0, 0, NULL);
CFG_SHELF("shelf", 3, 0,
1, 200, E_GADCON_ORIENT_BOTTOM,
1, 0, "default", 40, 0, 0, 0, 1.0, 1.0, 0, NULL);
}
IFCFGEND;
IFCFG(0x0094); /* the version # where this value(s) was introduced */
@ -1373,25 +1063,7 @@ e_config_init(void)
IFCFGEND;
IFCFG(0x0102);
{
E_Config_Mime_Icon *mi;
#define CFG_MIME_ICON(_mime, _icon) \
mi = E_NEW(E_Config_Mime_Icon, 1); \
mi->mime = eina_stringshare_add(_mime); \
mi->icon = eina_stringshare_add(_icon); \
e_config->mime_icons = eina_list_append(e_config->mime_icons, mi)
CFG_MIME_ICON("image/jpeg", "THUMB");
CFG_MIME_ICON("image/png", "THUMB");
CFG_MIME_ICON("image/x-pixmap", "THUMB");
CFG_MIME_ICON("image/x-xpixmap", "THUMB");
CFG_MIME_ICON("image/svg+xml", "THUMB");
CFG_MIME_ICON("image/gif", "THUMB");
CFG_MIME_ICON("image/tiff", "THUMB");
CFG_MIME_ICON("application/x-desktop", "DESKTOP");
}
e_config->mime_icons = NULL;
IFCFGEND;
IFCFG(0x00103);
@ -1404,7 +1076,7 @@ e_config_init(void)
IFCFGEND;
IFCFG(0x00105);
e_config->remember_internal_windows = 1;
e_config->remember_internal_windows = 0;
IFCFGEND;
IFCFG(0x00106);
@ -1413,69 +1085,7 @@ e_config_init(void)
IFCFGEND;
IFCFG(0x0121);
{
E_Config_Gadcon *cf_gc;
E_Config_Gadcon_Client *cf_gcc;
int id = 0;
e_config->gadcons = NULL;
#define CFG_GADCON(_name) \
cf_gc = E_NEW(E_Config_Gadcon, 1);\
cf_gc->name = eina_stringshare_add(_name); \
cf_gc->id = ++id; \
e_config->gadcons = eina_list_append(e_config->gadcons, cf_gc)
#define CFG_GADCON_CLIENT(_name, _res, _size, _pos, _style, _autoscr, _resizable) \
cf_gcc = E_NEW(E_Config_Gadcon_Client, 1); \
cf_gcc->name = eina_stringshare_add(_name); \
cf_gcc->id = NULL; \
cf_gcc->geom.res = _res; \
cf_gcc->geom.size = _size; \
cf_gcc->geom.pos = _pos; \
cf_gcc->state_info.seq = 0; \
cf_gcc->state_info.flags = 0; \
if (_style) cf_gcc->style = eina_stringshare_add(_style); \
else cf_gcc->style = NULL; \
cf_gcc->autoscroll = _autoscr; \
cf_gcc->resizable = _resizable; \
cf_gc->clients = eina_list_append(cf_gc->clients, cf_gcc)
/* the default shelf on the default head/zone */
CFG_GADCON("shelf");
CFG_GADCON_CLIENT("start", 800, 32,
0, NULL, 0, 0);
CFG_GADCON_CLIENT("pager", 800, 120,
32, NULL, 0, 0);
CFG_GADCON_CLIENT("ibox", 800, 32,
32 + 120, NULL, 0, 0);
CFG_GADCON_CLIENT("ibar", 800, 200,
(800 / 2) - (100 / 2), NULL, 0, 0);
CFG_GADCON_CLIENT("temperature", 800, 32,
800 - 128, NULL, 0, 0);
CFG_GADCON_CLIENT("cpufreq", 800, 32,
800 - 96, NULL, 0, 0);
CFG_GADCON_CLIENT("battery", 800, 32,
800 - 64, NULL, 0, 0);
CFG_GADCON_CLIENT("clock", 800, 32,
800 - 32, NULL, 0, 0);
/* additional shelves for up to 3 more heads by default */
CFG_GADCON("shelf");
CFG_GADCON_CLIENT("pager", 800, 120,
0, NULL, 0, 0);
CFG_GADCON_CLIENT("ibox", 800, 32,
800 - 32, NULL, 0, 0);
CFG_GADCON("shelf");
CFG_GADCON_CLIENT("pager", 800, 120,
0, NULL, 0, 0);
CFG_GADCON_CLIENT("ibox", 800, 32,
800 - 32, NULL, 0, 0);
CFG_GADCON("shelf");
CFG_GADCON_CLIENT("pager", 800, 120,
0, NULL, 0, 0);
CFG_GADCON_CLIENT("ibox", 800, 32,
800 - 32, NULL, 0, 0);
}
e_config->gadcons = NULL;
IFCFGEND;
IFCFG(0x0108);
@ -1556,8 +1166,8 @@ e_config_init(void)
IFCFGEND;
IFCFG(0x0124);
e_config->thumbscroll_enable = 0;
e_config->thumbscroll_threshhold = 8;
e_config->thumbscroll_enable = 1;
e_config->thumbscroll_threshhold = 24;
e_config->thumbscroll_momentum_threshhold = 100.0;
e_config->thumbscroll_friction = 1.0;
IFCFGEND;
@ -1585,7 +1195,7 @@ e_config_init(void)
IFCFG(0x0128);
e_config->show_cursor = 1;
e_config->idle_cursor = 1;
e_config->idle_cursor = 0;
IFCFGEND;
IFCFG(0x0129);
@ -1735,33 +1345,6 @@ e_config_init(void)
if (e_config->desklock_personal_passwd)
eina_stringshare_del(e_config->desklock_personal_passwd);
e_config->desklock_personal_passwd = NULL;
e_config_save_queue();
return 1;
}
EAPI int
e_config_shutdown(void)
{
E_FREE(_e_config_profile);
E_CONFIG_DD_FREE(_e_config_edd);
E_CONFIG_DD_FREE(_e_config_module_edd);
E_CONFIG_DD_FREE(_e_config_font_default_edd);
E_CONFIG_DD_FREE(_e_config_font_fallback_edd);
E_CONFIG_DD_FREE(_e_config_theme_edd);
E_CONFIG_DD_FREE(_e_config_bindings_mouse_edd);
E_CONFIG_DD_FREE(_e_config_bindings_key_edd);
E_CONFIG_DD_FREE(_e_config_bindings_signal_edd);
E_CONFIG_DD_FREE(_e_config_bindings_wheel_edd);
E_CONFIG_DD_FREE(_e_config_path_append_edd);
E_CONFIG_DD_FREE(_e_config_desktop_bg_edd);
E_CONFIG_DD_FREE(_e_config_desktop_name_edd);
E_CONFIG_DD_FREE(_e_config_remember_edd);
E_CONFIG_DD_FREE(_e_config_gadcon_edd);
E_CONFIG_DD_FREE(_e_config_gadcon_client_edd);
E_CONFIG_DD_FREE(_e_config_shelf_edd);
E_CONFIG_DD_FREE(_e_config_shelf_desk_edd);
return 1;
}
EAPI int

2
src/bin/e_config.h
View File

@ -454,6 +454,8 @@ struct _E_Event_Config_Icon_Theme
EAPI int e_config_init(void);
EAPI int e_config_shutdown(void);
EAPI void e_config_load(void);
EAPI int e_config_save(void);
EAPI void e_config_save_flush(void);
EAPI void e_config_save_queue(void);

46
src/bin/e_main.c
View File

@ -1140,50 +1140,6 @@ _e_main_dirs_init(void)
}
}
}
snprintf(buf, sizeof(buf), "%s/applications", efreet_data_home_get());
if (!ecore_file_mkpath(buf))
{
if (!ecore_file_is_dir(buf))
{
e_error_message_show("Error creating directory:\n"
"%s",
buf);
return 0;
}
}
/* FIXME: THIS is a hack to get people started!!! */
/* err dont just disable it - replace it with a proper wizard tool */
/* outside e's main source to populate these directories from gnome/kde */
/* app menu data etc. */
snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/default/.order", homedir);
if (!ecore_file_exists(buf))
{
snprintf(buf, sizeof(buf),
"gzip -d -c < %s/data/other/desktop_files.tar.gz | "
"(cd %s/applications/ ; tar -xkf -)",
e_prefix_data_get(),
efreet_data_home_get());
system(buf);
snprintf(buf, sizeof(buf),
"gzip -d -c < %s/data/other/desktop_order.tar.gz | "
"(cd %s/.e/e/ ; tar -xkf -)",
e_prefix_data_get(),
homedir);
system(buf);
}
/* FIXME: THIS is to get people started - shoudl be in a wizard */
snprintf(buf, sizeof(buf), "%s/.e/e/fileman/favorites", homedir);
if (!ecore_file_exists(buf))
{
snprintf(buf, sizeof(buf),
"gzip -d -c < %s/data/other/efm_favorites.tar.gz | "
"(cd %s/.e/e/ ; tar -xkf -)",
e_prefix_data_get(),
homedir);
system(buf);
}
return 1;
}
@ -1379,6 +1335,8 @@ _e_main_path_init(void)
return 0;
}
e_path_default_path_append(path_backgrounds, "~/.e/e/backgrounds");
snprintf(buf, sizeof(buf), "%s/data/backgrounds", e_prefix_data_get());
e_path_default_path_append(path_backgrounds, buf);
e_path_user_path_set(path_backgrounds, &(e_config->path_append_backgrounds));
path_messages = e_path_new();

33
src/modules/wizard/Makefile.am
View File

@ -22,11 +22,14 @@ pkg_LTLIBRARIES = module.la \
page_010.la \
page_020.la \
page_030.la \
page_040.la \
page_050.la \
page_060.la \
page_070.la
### disabled because profile selector really does the job. code here just for
### informational purposes on how to make wizard pages
# page_040.la
# page_050.la
# page_060.la
module_la_SOURCES = e_mod_main.c \
e_mod_main.h \
e_wizard.c \
@ -56,20 +59,20 @@ page_030_la_LIBADD = @e_libs@ @dlopen_libs@
page_030_la_LDFLAGS = -module -avoid-version
page_030_la_DEPENDENCIES = $(top_builddir)/config.h
page_040_la_SOURCES = page_040.c
page_040_la_LIBADD = @e_libs@ @dlopen_libs@
page_040_la_LDFLAGS = -module -avoid-version
page_040_la_DEPENDENCIES = $(top_builddir)/config.h
#page_040_la_SOURCES = page_040.c
#page_040_la_LIBADD = @e_libs@ @dlopen_libs@
#page_040_la_LDFLAGS = -module -avoid-version
#page_040_la_DEPENDENCIES = $(top_builddir)/config.h
page_050_la_SOURCES = page_050.c
page_050_la_LIBADD = @e_libs@ @dlopen_libs@
page_050_la_LDFLAGS = -module -avoid-version
page_050_la_DEPENDENCIES = $(top_builddir)/config.h
#page_050_la_SOURCES = page_050.c
#page_050_la_LIBADD = @e_libs@ @dlopen_libs@
#page_050_la_LDFLAGS = -module -avoid-version
#page_050_la_DEPENDENCIES = $(top_builddir)/config.h
page_060_la_SOURCES = page_060.c
page_060_la_LIBADD = @e_libs@ @dlopen_libs@
page_060_la_LDFLAGS = -module -avoid-version
page_060_la_DEPENDENCIES = $(top_builddir)/config.h
#page_060_la_SOURCES = page_060.c
#page_060_la_LIBADD = @e_libs@ @dlopen_libs@
#page_060_la_LDFLAGS = -module -avoid-version
#page_060_la_DEPENDENCIES = $(top_builddir)/config.h
page_070_la_SOURCES = page_070.c
page_070_la_LIBADD = @e_libs@ @dlopen_libs@

15
src/modules/wizard/e_mod_main.c
View File

@ -22,17 +22,24 @@ static E_Module *conf_module = NULL;
* o == interactive
* . == automatic (no gui - none implemented currently)
*
* * = done
* - = code here, but disabled in build
*
* --- THE LIST
* o *ask for language (default selection is current locale).
* o *ask for initial profile
* o *find XDG app menus/repositories and list them let user choose which
* one(s) are to be used.
* o ask for ibar initial app set
* o ask if user wants desktop icons or not (enable fwin module but seed it
* o -ask for ibar initial app set
* o -ask if user wants desktop icons or not (enable fwin module but seed it
* with default config icons on desktop and favorites).
* o ask click to focus or sloppy
* . take some of current config (language, fileman, profile) and load
* o -ask click to focus or sloppy
* . *take some of current config (language, fileman, profile) and load
* load profile, apply language to it and save, restart e.
*
* why are some disabled? profiels take care of this and do a better job
* at collecting all the things together. for example illume makes no sense
* with pointer focus and ibar icons/desktop makes no sense.
*/
/**/

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

@ -196,5 +196,11 @@ wizard_page_hide(E_Wizard_Page *pg)
EAPI int
wizard_page_apply(E_Wizard_Page *pg)
{
// do this again as we want it to apply to the new profile
if (e_config->language) eina_stringshare_del(e_config->language);
e_config->language = NULL;
if (lang) e_config->language = eina_stringshare_add(lang);
e_intl_language_set(e_config->language);
e_wizard_labels_update();
return 1;
}

39
src/modules/wizard/page_020.c
View File

@ -31,6 +31,8 @@ _profile_change(void *data, Evas_Object *obj)
e_widget_textblock_markup_set(textblock, _("Unknown"));
if (desk) efreet_desktop_free(desk);
free(dir);
// enable next once you choose a profile
e_wizard_button_next_enable_set(1);
}
EAPI int
@ -71,19 +73,31 @@ wizard_page_show(E_Wizard_Page *pg)
Evas_Object *ic;
prof = l->data;
if (e_config_profile_get())
{
if (!strcmp(prof, e_config_profile_get()))
{
free(prof);
continue;
}
}
dir = e_prefix_data_get();
snprintf(buf, sizeof(buf), "%s/data/config/%s", dir, prof);
// if it's not a system profile - don't offer it
if (!ecore_file_is_dir(buf))
{
free(prof);
continue;
}
dir = strdup(buf);
if (!dir)
{
free(prof);
continue;
}
snprintf(buf, sizeof(buf), "%s/profile.desktop", dir);
desk = efreet_desktop_get(buf);
label = prof;
// FIXME: filter out wizard default profile
if ((desk) && (desk->name)) label = desk->name;
snprintf(buf, sizeof(buf), "%s/icon.edj", dir);
if ((desk) && (desk->icon))
@ -92,10 +106,6 @@ wizard_page_show(E_Wizard_Page *pg)
snprintf(buf, sizeof(buf), "%s/data/images/enlightenment.png", e_prefix_data_get());
ic = e_util_icon_add(buf, pg->evas);
e_widget_ilist_append(ob, ic, label, NULL, NULL, prof);
if (e_config_profile_get())
{
if (!strcmp(prof, e_config_profile_get())) sel = i;
}
free(dir);
free(prof);
if (desk) efreet_desktop_free(desk);
@ -122,19 +132,30 @@ wizard_page_show(E_Wizard_Page *pg)
evas_object_show(of);
e_wizard_page_show(o);
pg->data = of;
e_wizard_button_next_enable_set(0);
return 1; /* 1 == show ui, and wait for user, 0 == just continue */
}
EAPI int
wizard_page_hide(E_Wizard_Page *pg)
{
evas_object_del(pg->data);
// actually apply profile
if (e_config_profile_get())
{
char buf[PATH_MAX];
const char *homedir;
homedir = e_user_homedir_get();
snprintf(buf, sizeof(buf), "%s/.e/e/config/%s", homedir, e_config_profile_get());
ecore_file_recursive_rm(buf);
}
if (!profile) profile = "standard";
e_config_profile_set(profile);
return 1;
}
EAPI int
wizard_page_apply(E_Wizard_Page *pg)
{
// FIXME: actually apply profile
if (!profile) profile = "default";
e_config_profile_set(profile);
// no need. done in page_070's wizard_page_show()
return 1;
}

33
src/modules/wizard/page_050.c
View File

@ -4,6 +4,8 @@
#include "e.h"
#include "e_mod_main.h"
static int desktop_files = 1;
EAPI int
wizard_page_init(E_Wizard_Page *pg)
{
@ -18,25 +20,23 @@ EAPI int
wizard_page_show(E_Wizard_Page *pg)
{
Evas_Object *o, *of, *ob;
Eina_List *l;
int i, sel = -1;
E_Radio_Group *rg;
o = e_widget_list_add(pg->evas, 1, 0);
e_wizard_title_set(_("File Manager"));
of = e_widget_framelist_add(pg->evas, _("Desktop Files"), 0);
ob = e_widget_ilist_add(pg->evas, 32 * e_scale, 32 * e_scale, NULL);
e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale);
e_widget_ilist_freeze(ob);
e_widget_ilist_go(ob);
e_widget_ilist_thaw(ob);
if (sel >= 0) e_widget_ilist_selected_set(ob, sel);
rg = e_widget_radio_group_new(&desktop_files);
ob = e_widget_radio_add(pg->evas, _("No icons on desktop"), 0, rg);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
evas_object_show(ob);
ob = e_widget_radio_add(pg->evas, _("Enable desktop icons"), 1, rg);
e_widget_framelist_object_append(of, ob);
evas_object_show(ob);
e_widget_list_object_append(o, of, 0, 0, 0.5);
evas_object_show(ob);
evas_object_show(of);
@ -53,5 +53,14 @@ wizard_page_hide(E_Wizard_Page *pg)
EAPI int
wizard_page_apply(E_Wizard_Page *pg)
{
if (!desktop_files)
{
// FIXME: disable fileman
}
else
{
// FIXME: enable fileman
// FIXME: populate ~/Desktop
}
return 1;
}

34
src/modules/wizard/page_060.c
View File

@ -4,6 +4,8 @@
#include "e.h"
#include "e_mod_main.h"
static int focus_mode = 1;
EAPI int
wizard_page_init(E_Wizard_Page *pg)
{
@ -18,25 +20,23 @@ EAPI int
wizard_page_show(E_Wizard_Page *pg)
{
Evas_Object *o, *of, *ob;
Eina_List *l;
int i, sel = -1;
E_Radio_Group *rg;
o = e_widget_list_add(pg->evas, 1, 0);
e_wizard_title_set(_("Window Focus"));
of = e_widget_framelist_add(pg->evas, _("Focus Mode"), 0);
ob = e_widget_ilist_add(pg->evas, 32 * e_scale, 32 * e_scale, NULL);
e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale);
e_widget_ilist_freeze(ob);
e_widget_ilist_go(ob);
e_widget_ilist_thaw(ob);
if (sel >= 0) e_widget_ilist_selected_set(ob, sel);
of = e_widget_framelist_add(pg->evas, _("Focus mode"), 0);
rg = e_widget_radio_group_new(&focus_mode);
ob = e_widget_radio_add(pg->evas, _("Click to focus windows"), 0, rg);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
evas_object_show(ob);
ob = e_widget_radio_add(pg->evas, _("Mouse over focuses windows"), 1, rg);
e_widget_framelist_object_append(of, ob);
evas_object_show(ob);
e_widget_list_object_append(o, of, 0, 0, 0.5);
evas_object_show(ob);
evas_object_show(of);
@ -53,5 +53,13 @@ wizard_page_hide(E_Wizard_Page *pg)
EAPI int
wizard_page_apply(E_Wizard_Page *pg)
{
if (!focus_mode)
{
// FIXME: click to focus
}
else
{
// FIXME: sloppy focus
}
return 1;
}

52
src/modules/wizard/page_070.c
View File

@ -17,7 +17,19 @@ wizard_page_shutdown(E_Wizard_Page *pg)
EAPI int
wizard_page_show(E_Wizard_Page *pg)
{
// FIXME: implement stuff, profile and restart
char buf[PATH_MAX];
const char *homedir;
if ((e_config_profile_get()) && (strlen(e_config_profile_get()) > 0))
{
// delete profile
homedir = e_user_homedir_get();
snprintf(buf, sizeof(buf), "%s/.e/e/config/%s", homedir, e_config_profile_get());
printf("del %s\n", buf);
if (ecore_file_is_dir(buf)) ecore_file_recursive_rm(buf);
}
// load profile as e_config
e_config_load();
return 0; /* 1 == show ui, and wait for user, 0 == just continue */
}
EAPI int
@ -29,5 +41,43 @@ wizard_page_hide(E_Wizard_Page *pg)
EAPI int
wizard_page_apply(E_Wizard_Page *pg)
{
char buf[PATH_MAX];
const char *homedir;
// setup ~/Desktop and ~/.e/e/fileman/favorites and
// ~/.e/e/applications/bar/default, maybe ~/.e/e/applications/startup/.order
homedir = e_user_homedir_get();
// setup default .desktop files
snprintf(buf, sizeof(buf), "%s/applications", efreet_data_home_get());
ecore_file_mkpath(buf);
snprintf(buf, sizeof(buf),
"gzip -d -c < %s/data/other/desktop_files.tar.gz | "
"(cd %s/applications/ ; tar -xkf -)",
e_prefix_data_get(), efreet_data_home_get());
system(buf);
// setup ibar
snprintf(buf, sizeof(buf),
"gzip -d -c < %s/data/other/desktop_order.tar.gz | "
"(cd %s/.e/e/ ; tar -xkf -)",
e_prefix_data_get(), homedir);
system(buf);
// setup fileman favorites
snprintf(buf, sizeof(buf),
"gzip -d -c < %s/data/other/efm_favorites.tar.gz | "
"(cd %s/.e/e/ ; tar -xkf -)",
e_prefix_data_get(), homedir);
system(buf);
// ~/Desktop
snprintf(buf, sizeof(buf), "%s/Desktop", homedir);
ecore_file_mkpath(buf);
// FIXME: ln -s the .desktop files in favorites
// save the config now everyone has modified it
e_config_save();
// restart e
e_sys_action_do(E_SYS_RESTART, NULL);
return 1;
}