forked from enlightenment/enlightenment
Remove dup entry for mixer in b_and_w, Made widget/new for use in modules as its not really the same as 'add' in most cases. Applied that change in the ICM module so its uses the right widget name, added a pager and mixer icon to bling aswell... also, filled out some dummy icons in blingbling. Will make some icons for those soon. The idea is to make icons that can be used in blingbling and the new theme. Removed a whole lot of whitespace too, thanks to Scite. Its turned off now.
SVN revision: 36201
This commit is contained in:
parent
1bf597650f
commit
3d453c017d
|
@ -1,21 +1,21 @@
|
|||
images {
|
||||
image: "e17_icon_e_0.png" LOSSY 90;
|
||||
image: "e17_icon_e_glow_0.png" LOSSY 90;
|
||||
|
||||
|
||||
image: "e17_icon_icon_theme.png" LOSSY 90;
|
||||
image: "e17_icon_theme.png" LOSSY 90;
|
||||
image: "e17_icon_colors.png" LOSSY 90;
|
||||
|
||||
image: "e17_icon_windows.png" LOSSY 90;
|
||||
|
||||
image: "e17_icon_lost_windows.png" LOSSY 90;
|
||||
|
||||
|
||||
image: "e17_icon_lost_windows.png" LOSSY 90;
|
||||
|
||||
image: "e17_icon_module.png" LOSSY 90;
|
||||
|
||||
|
||||
image: "e17_icon_favorites.png" LOSSY 90;
|
||||
|
||||
|
||||
image: "e17_icon_desktop.png" LOSSY 90;
|
||||
|
||||
|
||||
image: "e17_icon_configuration.png" LOSSY 90;
|
||||
image: "e17_icon_intl.png" LOSSY 90;
|
||||
image: "e17_icon_run.png" LOSSY 90;
|
||||
|
@ -41,7 +41,9 @@ images {
|
|||
image: "e17_icon_regenerate_menus.png" LOSSY 90;
|
||||
|
||||
image: "e17_pager_window.png" COMP;
|
||||
|
||||
image: "e17_icon_pager.png" COMP;
|
||||
image: "e17_icon_mixer.png" COMP;
|
||||
|
||||
image: "e17_icon_right_arrow.png" COMP;
|
||||
image: "e17_icon_up_arrow.png" COMP;
|
||||
image: "e17_icon_down_arrow.png" COMP;
|
||||
|
@ -52,7 +54,7 @@ images {
|
|||
image: "e17_icon_mouse_extra.png" COMP;
|
||||
image: "e17_icon_mouse_wheel.png" COMP;
|
||||
image: "e17_icon_mouse_clean.png" COMP;
|
||||
|
||||
|
||||
image: "e17_shelf_bottom_left.png" COMP;
|
||||
image: "e17_shelf_bottom.png" COMP;
|
||||
image: "e17_shelf_bottom_right.png" COMP;
|
||||
|
@ -71,7 +73,7 @@ images {
|
|||
image: "e17_shelf_menu_bar.png" COMP;
|
||||
image: "e17_shelf_panel.png" COMP;
|
||||
image: "e17_shelf_top_desk.png" COMP;
|
||||
|
||||
|
||||
image: "e17_icon_screen_around.png" COMP;
|
||||
image: "e17_icon_screen_hflip.png" COMP;
|
||||
image: "e17_icon_screen_left.png" COMP;
|
||||
|
@ -91,7 +93,7 @@ images {
|
|||
image: "e17_icon_halt.png" COMP;
|
||||
image: "e17_icon_reboot.png" COMP;
|
||||
image: "e17_icon_screen_setup.png" COMP;
|
||||
|
||||
|
||||
image: "e17_icon_advanced.png" COMP;
|
||||
image: "e17_icon_behavior.png" COMP;
|
||||
image: "e17_icon_appearance.png" COMP;
|
||||
|
@ -107,7 +109,7 @@ images {
|
|||
image: "e17_icon_screensaver.png" COMP;
|
||||
|
||||
image: "e17_icon_window_remembers.png" COMP;
|
||||
|
||||
|
||||
image: "e17_icon_check.png" COMP;
|
||||
}
|
||||
|
||||
|
@ -115,7 +117,7 @@ group {
|
|||
name: "e/icons/enlightenment/e";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
part {
|
||||
name: "e";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
|
@ -154,7 +156,7 @@ group {
|
|||
}
|
||||
}
|
||||
programs {
|
||||
program {
|
||||
program {
|
||||
name: "e_in";
|
||||
signal: "e,state,selected";
|
||||
source: "e";
|
||||
|
@ -190,7 +192,7 @@ group {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
group {
|
||||
name: "e/icons/enlightenment/exit";
|
||||
max: 64 64;
|
||||
|
@ -209,7 +211,7 @@ group {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
group {
|
||||
name: "e/icons/enlightenment/logout";
|
||||
max: 64 64;
|
||||
|
@ -228,7 +230,7 @@ group {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
group {
|
||||
name: "e/icons/enlightenment/halt";
|
||||
max: 64 64;
|
||||
|
@ -247,7 +249,7 @@ group {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
group {
|
||||
name: "e/icons/enlightenment/reboot";
|
||||
max: 64 64;
|
||||
|
@ -266,7 +268,7 @@ group {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
group {
|
||||
name: "e/icons/enlightenment/suspend";
|
||||
max: 64 64;
|
||||
|
@ -285,7 +287,7 @@ group {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
group {
|
||||
name: "e/icons/enlightenment/hibernate";
|
||||
max: 64 64;
|
||||
|
@ -304,17 +306,17 @@ group {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
group {
|
||||
name: "e/icons/enlightenment/screen_setup";
|
||||
max: 64 64;
|
||||
parts {
|
||||
parts {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
state: "default" 0.0;
|
||||
aspect: 1.0 1.0;
|
||||
aspect: 1.0 1.0;
|
||||
aspect_preference: BOTH;
|
||||
max: 64 64;
|
||||
image {
|
||||
|
@ -328,7 +330,7 @@ group {
|
|||
name: "e/icons/enlightenment/themes";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
|
@ -342,12 +344,12 @@ group {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
group {
|
||||
name: "e/icons/enlightenment/colors";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
|
@ -355,7 +357,7 @@ group {
|
|||
aspect: 1.0 1.0;
|
||||
aspect_preference: BOTH;
|
||||
max: 64 64;
|
||||
image {
|
||||
image {
|
||||
normal: "e17_icon_colors.png";
|
||||
}
|
||||
}
|
||||
|
@ -576,7 +578,7 @@ group {
|
|||
name: "e/icons/enlightenment/fileman";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
part {
|
||||
name: "fileman_button";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
|
@ -615,7 +617,7 @@ group {
|
|||
}
|
||||
}
|
||||
programs {
|
||||
program {
|
||||
program {
|
||||
name: "fileman_button_in";
|
||||
signal: "e,state,selected";
|
||||
source: "e";
|
||||
|
@ -1032,8 +1034,8 @@ group {
|
|||
group {
|
||||
name: "e/icons/enlightenment/applications";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
parts {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
|
@ -1051,7 +1053,7 @@ group {
|
|||
group {
|
||||
name: "e/icons/enlightenment/transitions";
|
||||
max: 64 64;
|
||||
parts {
|
||||
parts {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
|
@ -1829,7 +1831,7 @@ group {
|
|||
mouse_events: 0;
|
||||
description {
|
||||
state: "default" 0.0;
|
||||
|
||||
|
||||
rel1 {
|
||||
to: "screen";
|
||||
}
|
||||
|
@ -1871,7 +1873,7 @@ group {
|
|||
mouse_events: 0;
|
||||
description {
|
||||
state: "default" 0.0;
|
||||
|
||||
|
||||
rel1 {
|
||||
to: "screen";
|
||||
}
|
||||
|
@ -1909,7 +1911,7 @@ group {
|
|||
mouse_events: 0;
|
||||
description {
|
||||
state: "default" 0.0;
|
||||
|
||||
|
||||
rel1 {
|
||||
to: "screen";
|
||||
}
|
||||
|
@ -1951,7 +1953,7 @@ group {
|
|||
mouse_events: 0;
|
||||
description {
|
||||
state: "default" 0.0;
|
||||
|
||||
|
||||
rel1 {
|
||||
to: "screen";
|
||||
}
|
||||
|
@ -1993,7 +1995,7 @@ group {
|
|||
mouse_events: 0;
|
||||
description {
|
||||
state: "default" 0.0;
|
||||
|
||||
|
||||
rel1 {
|
||||
to: "screen";
|
||||
}
|
||||
|
@ -2028,7 +2030,7 @@ group {
|
|||
name: "e/icons/enlightenment/advanced";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
|
@ -2036,7 +2038,7 @@ group {
|
|||
aspect: 1.0 1.0;
|
||||
aspect_preference: BOTH;
|
||||
max: 64 64;
|
||||
image {
|
||||
image {
|
||||
normal: "e17_icon_advanced.png";
|
||||
}
|
||||
}
|
||||
|
@ -2047,7 +2049,7 @@ group {
|
|||
name: "e/icons/enlightenment/behavior";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
|
@ -2055,7 +2057,7 @@ group {
|
|||
aspect: 1.0 1.0;
|
||||
aspect_preference: BOTH;
|
||||
max: 64 64;
|
||||
image {
|
||||
image {
|
||||
normal: "e17_icon_behavior.png";
|
||||
}
|
||||
}
|
||||
|
@ -2066,7 +2068,7 @@ group {
|
|||
name: "e/icons/enlightenment/appearance";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
|
@ -2074,7 +2076,7 @@ group {
|
|||
aspect: 1.0 1.0;
|
||||
aspect_preference: BOTH;
|
||||
max: 64 64;
|
||||
image {
|
||||
image {
|
||||
normal: "e17_icon_appearance.png";
|
||||
}
|
||||
}
|
||||
|
@ -2085,7 +2087,7 @@ group {
|
|||
name: "e/icons/enlightenment/extensions";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
|
@ -2093,7 +2095,7 @@ group {
|
|||
aspect: 1.0 1.0;
|
||||
aspect_preference: BOTH;
|
||||
max: 64 64;
|
||||
image {
|
||||
image {
|
||||
normal: "e17_icon_extensions.png";
|
||||
}
|
||||
}
|
||||
|
@ -2104,7 +2106,7 @@ group {
|
|||
name: "e/icons/enlightenment/imc";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
|
@ -2112,7 +2114,7 @@ group {
|
|||
aspect: 1.0 1.0;
|
||||
aspect_preference: BOTH;
|
||||
max: 64 64;
|
||||
image {
|
||||
image {
|
||||
normal: "e17_icon_imc.png";
|
||||
}
|
||||
}
|
||||
|
@ -2123,7 +2125,7 @@ group {
|
|||
name: "e/icons/enlightenment/file_icons";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
|
@ -2131,7 +2133,7 @@ group {
|
|||
aspect: 1.0 1.0;
|
||||
aspect_preference: BOTH;
|
||||
max: 64 64;
|
||||
image {
|
||||
image {
|
||||
normal: "e17_icon_file_icons.png";
|
||||
}
|
||||
}
|
||||
|
@ -2142,7 +2144,7 @@ group {
|
|||
name: "e/icons/enlightenment/menu_settings";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
|
@ -2150,7 +2152,7 @@ group {
|
|||
aspect: 1.0 1.0;
|
||||
aspect_preference: BOTH;
|
||||
max: 64 64;
|
||||
image {
|
||||
image {
|
||||
normal: "e17_icon_menu_settings.png";
|
||||
}
|
||||
}
|
||||
|
@ -2161,7 +2163,7 @@ group {
|
|||
name: "e/icons/enlightenment/ibar_applications";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
|
@ -2169,7 +2171,7 @@ group {
|
|||
aspect: 1.0 1.0;
|
||||
aspect_preference: BOTH;
|
||||
max: 64 64;
|
||||
image {
|
||||
image {
|
||||
normal: "e17_icon_ibar_applications.png";
|
||||
}
|
||||
}
|
||||
|
@ -2180,7 +2182,7 @@ group {
|
|||
name: "e/icons/enlightenment/restart_applications";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
|
@ -2188,7 +2190,7 @@ group {
|
|||
aspect: 1.0 1.0;
|
||||
aspect_preference: BOTH;
|
||||
max: 64 64;
|
||||
image {
|
||||
image {
|
||||
normal: "e17_icon_restart_applications.png";
|
||||
}
|
||||
}
|
||||
|
@ -2199,7 +2201,7 @@ group {
|
|||
name: "e/icons/enlightenment/startup_applications";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
|
@ -2207,7 +2209,7 @@ group {
|
|||
aspect: 1.0 1.0;
|
||||
aspect_preference: BOTH;
|
||||
max: 64 64;
|
||||
image {
|
||||
image {
|
||||
normal: "e17_icon_startup_applications.png";
|
||||
}
|
||||
}
|
||||
|
@ -2270,7 +2272,7 @@ group {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
group {
|
||||
name: "e/icons/enlightenment/check";
|
||||
|
@ -2290,8 +2292,118 @@ group {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
group {
|
||||
name: "e/icons/enlightenment/pager";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
state: "default" 0.0;
|
||||
aspect: 1.0 1.0;
|
||||
aspect_preference: BOTH;
|
||||
max: 64 64;
|
||||
image {
|
||||
normal: "e17_icon_pager.png";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
group {
|
||||
name: "e/icons/enlightenment/mixer";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
state: "default" 0.0;
|
||||
aspect: 1.0 1.0;
|
||||
aspect_preference: BOTH;
|
||||
max: 64 64;
|
||||
image {
|
||||
normal: "e17_icon_mixer.png";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
group {
|
||||
name: "e/icons/widget/config";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
state: "default" 0.0;
|
||||
aspect: 1.0 1.0;
|
||||
aspect_preference: BOTH;
|
||||
max: 64 64;
|
||||
image {
|
||||
normal: "e17_icon_configuration.png";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Dummy icon filler. Replace these with their own group and icon.
|
||||
group {
|
||||
name: "e/icons/enlightenment/engine";
|
||||
alias: "e/icons/enlightenment/profiles";
|
||||
alias: "e/icons/enlightenment/add_application";
|
||||
alias: "e/icons/enlightenment/picture";
|
||||
alias: "e/icons/enlightenment/gradient";
|
||||
alias: "e/icons/enlightenment/website";
|
||||
alias: "e/icons/enlightenment/swap";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
state: "default" 0.0;
|
||||
aspect: 1.0 1.0;
|
||||
aspect_preference: BOTH;
|
||||
max: 64 64;
|
||||
image {
|
||||
normal: "e17_icon_e_0.png";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
group {
|
||||
name: "e/icons/widget/add";
|
||||
alias: "e/icons/widget/del";
|
||||
//alias: "e/icons/widget/config";
|
||||
alias: "e/icons/widget/new";
|
||||
max: 64 64;
|
||||
parts {
|
||||
part {
|
||||
name: "icon";
|
||||
mouse_events: 0;
|
||||
description {
|
||||
state: "default" 0.0;
|
||||
aspect: 1.0 1.0;
|
||||
aspect_preference: BOTH;
|
||||
max: 64 64;
|
||||
image {
|
||||
normal: "e17_icon_e_0.png";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -390,6 +390,7 @@ e17_icon_logout.png \
|
|||
e17_icon_lost_windows.png \
|
||||
e17_icon_menu_settings.png \
|
||||
e17_icon_menus.png \
|
||||
e17_icon_mixer.png \
|
||||
e17_icon_module.png \
|
||||
e17_icon_mouse.png \
|
||||
e17_icon_mouse_clean.png \
|
||||
|
@ -398,6 +399,7 @@ e17_icon_mouse_left.png \
|
|||
e17_icon_mouse_middle.png \
|
||||
e17_icon_mouse_right.png \
|
||||
e17_icon_mouse_wheel.png \
|
||||
e17_icon_pager.png \
|
||||
e17_icon_performance.png \
|
||||
e17_icon_reboot.png \
|
||||
e17_icon_regenerate_menus.png \
|
||||
|
|
|
@ -42,33 +42,33 @@ static Evas_Bool _change_hash_apply_cb (const Evas_Hash *hash __UNUSED__,
|
|||
struct _E_Config_Dialog_Data
|
||||
{
|
||||
E_Config_Dialog *cfd;
|
||||
|
||||
|
||||
/* Maluable Widgets */
|
||||
Evas_Object *o_personal;
|
||||
Evas_Object *o_system;
|
||||
Evas_Object *o_up_button;
|
||||
Evas_Object *o_fm; /* File manager */
|
||||
Evas_Object *o_frame; /* scrollpane for file manager*/
|
||||
|
||||
|
||||
char *imc_current;
|
||||
Evas_Hash *imc_basic_map;
|
||||
|
||||
int imc_disable; /* 0=enable, 1=disable */
|
||||
|
||||
int imc_disable; /* 0=enable, 1=disable */
|
||||
int fmdir; /* 0=Local, 1=System*/
|
||||
struct
|
||||
{
|
||||
int dirty;
|
||||
int dirty;
|
||||
char *e_im_name;
|
||||
char *e_im_exec;
|
||||
char *e_im_setup_exec;
|
||||
|
||||
|
||||
char *gtk_im_module;
|
||||
char *qt_im_module;
|
||||
char *xmodifiers;
|
||||
} imc;
|
||||
|
||||
|
||||
Evas_Hash *imc_change_map;
|
||||
|
||||
|
||||
struct
|
||||
{
|
||||
Evas_Object *imc_basic_list;
|
||||
|
@ -77,7 +77,7 @@ struct _E_Config_Dialog_Data
|
|||
|
||||
Evas_Object *imc_advanced_disable;
|
||||
Evas_Object *imc_advanced_setup;
|
||||
|
||||
|
||||
Evas_Object *e_im_name;
|
||||
Evas_Object *e_im_exec;
|
||||
Evas_Object *e_im_setup_exec;
|
||||
|
@ -97,14 +97,14 @@ e_int_config_imc(E_Container *con, const char *params __UNUSED__)
|
|||
|
||||
if (e_config_dialog_find("E", "_config_imc_dialog")) return NULL;
|
||||
v = E_NEW(E_Config_Dialog_View, 1);
|
||||
|
||||
|
||||
v->create_cfdata = _create_data;
|
||||
v->free_cfdata = _free_data;
|
||||
v->advanced.create_widgets = _advanced_create_widgets;
|
||||
v->advanced.apply_cfdata = _advanced_apply_data;
|
||||
v->basic.create_widgets = _basic_create_widgets;
|
||||
v->basic.apply_cfdata = _basic_apply_data;
|
||||
|
||||
|
||||
cfd = e_config_dialog_new(con,
|
||||
_("Input Method Configuration"),
|
||||
"E", "_config_imc_dialog",
|
||||
|
@ -142,7 +142,7 @@ _create_data(E_Config_Dialog *cfd)
|
|||
return cfdata;
|
||||
}
|
||||
|
||||
static Evas_Bool
|
||||
static Evas_Bool
|
||||
_change_hash_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
|
||||
{
|
||||
E_Input_Method_Config *imc;
|
||||
|
@ -155,8 +155,8 @@ _change_hash_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED_
|
|||
static void
|
||||
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
if (cfdata->win_import)
|
||||
e_int_config_imc_import_del(cfdata->win_import);
|
||||
if (cfdata->win_import)
|
||||
e_int_config_imc_import_del(cfdata->win_import);
|
||||
E_FREE(cfdata->imc_current);
|
||||
|
||||
if (cfdata->imc_basic_map)
|
||||
|
@ -164,14 +164,14 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
evas_hash_foreach(cfdata->imc_basic_map, _change_hash_free_cb, NULL);
|
||||
evas_hash_free(cfdata->imc_basic_map);
|
||||
}
|
||||
|
||||
|
||||
if (cfdata->imc_change_map)
|
||||
{
|
||||
evas_hash_foreach(cfdata->imc_change_map, _change_hash_free_cb, NULL);
|
||||
evas_hash_free(cfdata->imc_change_map);
|
||||
}
|
||||
cfdata->imc_change_map = NULL;
|
||||
|
||||
|
||||
E_FREE(cfdata->imc.e_im_name);
|
||||
E_FREE(cfdata->imc.e_im_exec);
|
||||
E_FREE(cfdata->imc.e_im_setup_exec);
|
||||
|
@ -179,26 +179,26 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
E_FREE(cfdata->imc.qt_im_module);
|
||||
E_FREE(cfdata->imc.xmodifiers);
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
}
|
||||
|
||||
/*** Start Basic Dialog Logic ***/
|
||||
static int
|
||||
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
{
|
||||
if (cfdata->imc_current)
|
||||
{
|
||||
if (e_config->input_method)
|
||||
if (e_config->input_method)
|
||||
{
|
||||
evas_stringshare_del(e_config->input_method);
|
||||
e_config->input_method = NULL;
|
||||
}
|
||||
|
||||
|
||||
if (!cfdata->imc_disable)
|
||||
e_config->input_method = evas_stringshare_add(cfdata->imc_current);
|
||||
|
||||
|
||||
e_intl_input_method_set(e_config->input_method);
|
||||
}
|
||||
|
||||
|
||||
e_config_save_queue();
|
||||
return 1;
|
||||
}
|
||||
|
@ -208,41 +208,41 @@ _basic_list_sort_cb(void *d1, void *d2)
|
|||
{
|
||||
if (!d1) return 1;
|
||||
if (!d2) return -1;
|
||||
|
||||
|
||||
return (strcmp((const char*)d1, (const char*)d2));
|
||||
}
|
||||
|
||||
static void
|
||||
_e_imc_disable_change_cb(void *data, Evas_Object *obj)
|
||||
_e_imc_disable_change_cb(void *data, Evas_Object *obj)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
||||
cfdata = data;
|
||||
}
|
||||
|
||||
void
|
||||
_e_imc_setup_button_toggle(Evas_Object *button, E_Input_Method_Config *imc)
|
||||
{
|
||||
if (imc)
|
||||
{
|
||||
if (imc)
|
||||
{
|
||||
int flag;
|
||||
|
||||
|
||||
flag = (!imc->e_im_setup_exec) || (!imc->e_im_setup_exec[0]);
|
||||
e_widget_disabled_set(button, flag);
|
||||
}
|
||||
}
|
||||
else
|
||||
e_widget_disabled_set(button, 1);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_imc_list_change_cb(void *data, Evas_Object *obj)
|
||||
_e_imc_list_change_cb(void *data, Evas_Object *obj)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
E_Input_Method_Config *imc;
|
||||
|
||||
|
||||
cfdata = data;
|
||||
e_widget_check_checked_set(cfdata->gui.imc_basic_disable, 0);
|
||||
|
||||
|
||||
if (cfdata->imc_current)
|
||||
{
|
||||
imc = evas_hash_find(cfdata->imc_basic_map, cfdata->imc_current);
|
||||
|
@ -254,25 +254,25 @@ static void
|
|||
_e_imc_setup_cb(void *data, void *data2)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
cfdata = data;
|
||||
|
||||
cfdata = data;
|
||||
if (cfdata->imc_current && cfdata->imc_basic_map)
|
||||
{
|
||||
E_Input_Method_Config *imc;
|
||||
|
||||
|
||||
imc = evas_hash_find(cfdata->imc_basic_map, cfdata->imc_current);
|
||||
|
||||
|
||||
if ((imc) && (imc->e_im_setup_exec))
|
||||
{
|
||||
Ecore_Exe *exe;
|
||||
const char *cmd;
|
||||
|
||||
|
||||
cmd = imc->e_im_setup_exec;
|
||||
|
||||
e_util_library_path_strip();
|
||||
exe = ecore_exe_run(cmd, NULL);
|
||||
e_util_library_path_restore();
|
||||
|
||||
|
||||
if (!exe)
|
||||
{
|
||||
e_util_dialog_show(_("Run Error"),
|
||||
|
@ -282,7 +282,7 @@ _e_imc_setup_cb(void *data, void *data2)
|
|||
cmd);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static Evas_Object *
|
||||
|
@ -291,22 +291,22 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
Evas_Object *o, *of, *ob;
|
||||
int i;
|
||||
Evas_List *imc_basic_list;
|
||||
|
||||
|
||||
o = e_widget_list_add(evas, 0, 0);
|
||||
|
||||
|
||||
of = e_widget_frametable_add(evas, _("Input Method Selector"), 0);
|
||||
|
||||
|
||||
/* Disable imc checkbox */
|
||||
ob = e_widget_check_add(evas, _("Use No Input Method"), &(cfdata->imc_disable));
|
||||
cfdata->gui.imc_basic_disable = ob;
|
||||
cfdata->gui.imc_basic_disable = ob;
|
||||
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0);
|
||||
|
||||
|
||||
/* Configure imc button */
|
||||
ob = e_widget_button_add(evas, _("Setup Selected Input Method"), "widget/config", _e_imc_setup_cb, cfdata, NULL);
|
||||
cfdata->gui.imc_basic_setup = ob;
|
||||
e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 0);
|
||||
|
||||
/* Input method List */
|
||||
|
||||
/* Input method List */
|
||||
ob = e_widget_ilist_add(evas, 16, 16, &(cfdata->imc_current));
|
||||
e_widget_on_change_hook_set(ob, _e_imc_list_change_cb, cfdata);
|
||||
e_widget_min_size_set(ob, 175, 175);
|
||||
|
@ -315,11 +315,11 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
evas_event_freeze(evas_object_evas_get(ob));
|
||||
edje_freeze();
|
||||
e_widget_ilist_freeze(ob);
|
||||
|
||||
|
||||
imc_basic_list = e_intl_input_method_list();
|
||||
/* Sort basic input method list */
|
||||
imc_basic_list = evas_list_sort(imc_basic_list,
|
||||
evas_list_count(imc_basic_list),
|
||||
/* Sort basic input method list */
|
||||
imc_basic_list = evas_list_sort(imc_basic_list,
|
||||
evas_list_count(imc_basic_list),
|
||||
_basic_list_sort_cb);
|
||||
|
||||
if (cfdata->imc_basic_map)
|
||||
|
@ -328,46 +328,46 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
evas_hash_free(cfdata->imc_basic_map);
|
||||
cfdata->imc_basic_map = NULL;
|
||||
}
|
||||
|
||||
|
||||
i = 0;
|
||||
while (imc_basic_list)
|
||||
while (imc_basic_list)
|
||||
{
|
||||
E_Input_Method_Config *imc;
|
||||
Eet_File *imc_ef;
|
||||
char *imc_path;
|
||||
|
||||
imc_path = imc_basic_list->data;
|
||||
imc_ef = eet_open(imc_path, EET_FILE_MODE_READ);
|
||||
imc_ef = eet_open(imc_path, EET_FILE_MODE_READ);
|
||||
if (imc_ef)
|
||||
{
|
||||
imc = e_intl_input_method_config_read(imc_ef);
|
||||
eet_close(imc_ef);
|
||||
|
||||
|
||||
if (imc && imc->e_im_name)
|
||||
{
|
||||
Evas_Object *icon;
|
||||
|
||||
|
||||
icon = NULL;
|
||||
if (imc->e_im_setup_exec)
|
||||
if (imc->e_im_setup_exec)
|
||||
{
|
||||
Efreet_Desktop *desktop;
|
||||
desktop = efreet_util_desktop_exec_find(imc->e_im_setup_exec);
|
||||
if (desktop)
|
||||
icon = e_util_desktop_icon_add(desktop, 48, evas);
|
||||
}
|
||||
|
||||
|
||||
e_widget_ilist_append(cfdata->gui.imc_basic_list, icon, imc->e_im_name, NULL, NULL, imc_path);
|
||||
if (cfdata->imc_current && !strncmp(imc_path, cfdata->imc_current, strlen(cfdata->imc_current)))
|
||||
e_widget_ilist_selected_set(cfdata->gui.imc_basic_list, i);
|
||||
i++;
|
||||
|
||||
|
||||
cfdata->imc_basic_map = evas_hash_add(cfdata->imc_basic_map, imc_path, imc);
|
||||
}
|
||||
}
|
||||
free(imc_path);
|
||||
imc_basic_list = evas_list_remove_list(imc_basic_list, imc_basic_list);
|
||||
imc_basic_list = evas_list_remove_list(imc_basic_list, imc_basic_list);
|
||||
}
|
||||
|
||||
|
||||
_e_imc_setup_button_toggle(cfdata->gui.imc_basic_setup, evas_hash_find(cfdata->imc_basic_map, cfdata->imc_current));
|
||||
|
||||
e_widget_ilist_go(ob);
|
||||
|
@ -376,7 +376,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
evas_event_thaw(evas_object_evas_get(ob));
|
||||
|
||||
e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
|
||||
e_widget_framelist_content_align_set(of, 0.0, 0.0);
|
||||
e_widget_framelist_content_align_set(of, 0.0, 0.0);
|
||||
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
||||
e_dialog_resizable_set(cfd->dia, 1);
|
||||
return o;
|
||||
|
@ -384,13 +384,13 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
/*** End Basic Dialog Logic ***/
|
||||
|
||||
/*** Start Advanced Dialog Logic ***/
|
||||
static Evas_Bool
|
||||
static Evas_Bool
|
||||
_change_hash_apply_cb(const Evas_Hash *hash __UNUSED__, const char *key, void *data, void *fdata __UNUSED__)
|
||||
{
|
||||
E_Input_Method_Config *imc;
|
||||
Eet_File *ef;
|
||||
|
||||
imc = data;
|
||||
imc = data;
|
||||
|
||||
if (ecore_file_exists(key))
|
||||
{
|
||||
|
@ -401,7 +401,7 @@ _change_hash_apply_cb(const Evas_Hash *hash __UNUSED__, const char *key, void *d
|
|||
eet_close(ef);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
e_intl_input_method_config_free(imc);
|
||||
|
||||
return 1;
|
||||
|
@ -409,12 +409,12 @@ _change_hash_apply_cb(const Evas_Hash *hash __UNUSED__, const char *key, void *d
|
|||
|
||||
static int
|
||||
_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
{
|
||||
/* inherit basic apply functionality */
|
||||
_basic_apply_data(cfd, cfdata);
|
||||
|
||||
|
||||
/* Save all file changes */
|
||||
if (cfdata->imc_current)
|
||||
if (cfdata->imc_current)
|
||||
_e_imc_change_enqueue(cfdata);
|
||||
|
||||
if (cfdata->imc_change_map)
|
||||
|
@ -434,7 +434,7 @@ _cb_dir(void *data, Evas_Object *obj)
|
|||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
const char *path;
|
||||
|
||||
|
||||
cfdata = data;
|
||||
if (cfdata->fmdir == 1)
|
||||
path = e_intl_imc_system_path_get();
|
||||
|
@ -448,7 +448,7 @@ static void
|
|||
_cb_button_up(void *data, void *data2)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
||||
cfdata = data;
|
||||
if (cfdata->o_fm)
|
||||
e_fm2_parent_go(cfdata->o_fm);
|
||||
|
@ -461,26 +461,26 @@ static void
|
|||
_e_imc_entry_change_cb(void *data, Evas_Object *obj)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
||||
cfdata = data;
|
||||
cfdata->imc.dirty = 1;
|
||||
}
|
||||
|
||||
/* Creating a new IMC */
|
||||
static void
|
||||
static void
|
||||
_cb_new(void *data, void *data2)
|
||||
{
|
||||
E_Input_Method_Config *imc_new;
|
||||
Eet_File *ef;
|
||||
const char *file;
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
||||
cfdata = data;
|
||||
imc_new = E_NEW(E_Input_Method_Config, 1);
|
||||
imc_new->version = E_INTL_INPUT_METHOD_CONFIG_VERSION;
|
||||
|
||||
file = _e_imc_file_name_new_get();
|
||||
|
||||
|
||||
if (file)
|
||||
{
|
||||
ef = eet_open(file, EET_FILE_MODE_WRITE);
|
||||
|
@ -498,19 +498,19 @@ static void
|
|||
_e_imc_adv_setup_cb(void *data, void *data2)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
cfdata = data;
|
||||
|
||||
cfdata = data;
|
||||
if (cfdata->imc.e_im_setup_exec)
|
||||
{
|
||||
Ecore_Exe *exe;
|
||||
char *cmd;
|
||||
|
||||
|
||||
cmd = cfdata->imc.e_im_setup_exec;
|
||||
|
||||
e_util_library_path_strip();
|
||||
exe = ecore_exe_run(cmd, NULL);
|
||||
e_util_library_path_restore();
|
||||
|
||||
|
||||
if (!exe)
|
||||
{
|
||||
e_util_dialog_show(_("Run Error"),
|
||||
|
@ -519,7 +519,7 @@ _e_imc_adv_setup_cb(void *data, void *data2)
|
|||
"%s<br>"),
|
||||
cmd);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** End Button Callbacks **/
|
||||
|
@ -529,7 +529,7 @@ static void
|
|||
_cb_files_changed(void *data, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
||||
cfdata = data;
|
||||
if (!cfdata->o_fm) return;
|
||||
if (!e_fm2_has_parent_get(cfdata->o_fm))
|
||||
|
@ -545,7 +545,7 @@ _cb_files_changed(void *data, Evas_Object *obj, void *event_info)
|
|||
if (cfdata->o_frame)
|
||||
e_widget_scrollframe_child_pos_set(cfdata->o_frame, 0, 0);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
_cb_files_selection_change(void *data, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
|
@ -554,19 +554,19 @@ _cb_files_selection_change(void *data, Evas_Object *obj, void *event_info)
|
|||
E_Fm2_Icon_Info *ici;
|
||||
const char *realpath;
|
||||
char buf[4096];
|
||||
|
||||
|
||||
cfdata = data;
|
||||
if (!cfdata->o_fm) return;
|
||||
selected = e_fm2_selected_list_get(cfdata->o_fm);
|
||||
if (!selected) return;
|
||||
|
||||
if (cfdata->imc_current)
|
||||
if (cfdata->imc_current)
|
||||
{
|
||||
_e_imc_change_enqueue(cfdata);
|
||||
free(cfdata->imc_current);
|
||||
cfdata->imc_current = NULL;
|
||||
}
|
||||
|
||||
|
||||
ici = selected->data;
|
||||
realpath = e_fm2_real_path_get(cfdata->o_fm);
|
||||
if (!strcmp(realpath, "/"))
|
||||
|
@ -595,7 +595,7 @@ _cb_files_files_changed(void *data, Evas_Object *obj, void *event_info)
|
|||
const char *buf;
|
||||
const char *p;
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
||||
cfdata = data;
|
||||
if (!cfdata->imc_current) return;
|
||||
if (!cfdata->o_fm) return;
|
||||
|
@ -604,7 +604,7 @@ _cb_files_files_changed(void *data, Evas_Object *obj, void *event_info)
|
|||
{
|
||||
if (strncmp(p, cfdata->imc_current, strlen(p))) return;
|
||||
}
|
||||
|
||||
|
||||
buf = e_intl_imc_personal_path_get();
|
||||
if (!strncmp(cfdata->imc_current, buf, strlen(buf)))
|
||||
p = cfdata->imc_current + strlen(buf) + 1;
|
||||
|
@ -620,12 +620,12 @@ _cb_files_files_changed(void *data, Evas_Object *obj, void *event_info)
|
|||
}
|
||||
|
||||
static void
|
||||
_cb_files_files_deleted(void *data, Evas_Object *obj, void *event_info)
|
||||
_cb_files_files_deleted(void *data, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
Evas_List *sel, *all, *n;
|
||||
E_Fm2_Icon_Info *ici, *ic;
|
||||
|
||||
|
||||
cfdata = data;
|
||||
if (!cfdata->imc_current) return;
|
||||
if (!cfdata->o_fm) return;
|
||||
|
@ -636,23 +636,23 @@ _cb_files_files_deleted(void *data, Evas_Object *obj, void *event_info)
|
|||
if (!sel) return;
|
||||
|
||||
ici = sel->data;
|
||||
|
||||
|
||||
all = evas_list_find_list(all, ici);
|
||||
n = evas_list_next(all);
|
||||
if (!n)
|
||||
if (!n)
|
||||
{
|
||||
n = evas_list_prev(all);
|
||||
if (!n) return;
|
||||
}
|
||||
|
||||
|
||||
ic = n->data;
|
||||
if (!ic) return;
|
||||
|
||||
|
||||
e_fm2_select_set(cfdata->o_fm, ic->file, 1);
|
||||
e_fm2_file_show(cfdata->o_fm, ic->file);
|
||||
|
||||
|
||||
evas_list_free(n);
|
||||
|
||||
|
||||
evas_object_smart_callback_call(cfdata->o_fm, "selection_change", cfdata);
|
||||
}
|
||||
/** End IMC FM2 Callbacks **/
|
||||
|
@ -665,32 +665,32 @@ _e_imc_form_fill(E_Config_Dialog_Data *cfdata)
|
|||
Eet_File *imc_file;
|
||||
E_Input_Method_Config *imc;
|
||||
int imc_free;
|
||||
|
||||
if (!cfdata->imc_current)
|
||||
|
||||
if (!cfdata->imc_current)
|
||||
{
|
||||
e_widget_disabled_set(cfdata->gui.imc_advanced_setup, 1);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
imc_free = 0;
|
||||
imc = evas_hash_find(cfdata->imc_change_map, cfdata->imc_current);
|
||||
|
||||
imc = evas_hash_find(cfdata->imc_change_map, cfdata->imc_current);
|
||||
|
||||
if (!imc)
|
||||
{
|
||||
imc_free = 1;
|
||||
imc_file = eet_open(cfdata->imc_current, EET_FILE_MODE_READ);
|
||||
imc_file = eet_open(cfdata->imc_current, EET_FILE_MODE_READ);
|
||||
if (imc_file)
|
||||
{
|
||||
imc = e_intl_input_method_config_read(imc_file);
|
||||
eet_close(imc_file);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
_e_imc_setup_button_toggle(cfdata->gui.imc_advanced_setup, imc);
|
||||
|
||||
|
||||
if (imc)
|
||||
{
|
||||
e_widget_entry_text_set(cfdata->gui.e_im_name, imc->e_im_name);
|
||||
e_widget_entry_text_set(cfdata->gui.e_im_name, imc->e_im_name);
|
||||
e_widget_entry_text_set(cfdata->gui.e_im_exec, imc->e_im_exec);
|
||||
e_widget_entry_text_set(cfdata->gui.e_im_setup_exec, imc->e_im_setup_exec);
|
||||
e_widget_entry_text_set(cfdata->gui.gtk_im_module, imc->gtk_im_module);
|
||||
|
@ -714,14 +714,14 @@ static void
|
|||
_e_imc_change_enqueue(E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
if (cfdata->imc.dirty)
|
||||
{
|
||||
{
|
||||
E_Input_Method_Config *imc_update;
|
||||
E_Input_Method_Config *imc_update_old;
|
||||
|
||||
|
||||
imc_update = E_NEW(E_Input_Method_Config, 1);
|
||||
|
||||
|
||||
imc_update->version = E_INTL_INPUT_METHOD_CONFIG_VERSION;
|
||||
|
||||
|
||||
/* TODO: need to only add if the string is not empty */
|
||||
imc_update->e_im_name = evas_stringshare_add(cfdata->imc.e_im_name);
|
||||
imc_update->e_im_exec = evas_stringshare_add(cfdata->imc.e_im_exec);
|
||||
|
@ -736,7 +736,7 @@ _e_imc_change_enqueue(E_Config_Dialog_Data *cfdata)
|
|||
{
|
||||
cfdata->imc_change_map = evas_hash_del(cfdata->imc_change_map, cfdata->imc_current, NULL);
|
||||
e_intl_input_method_config_free(imc_update_old);
|
||||
|
||||
|
||||
}
|
||||
cfdata->imc_change_map = evas_hash_add(cfdata->imc_change_map, cfdata->imc_current, imc_update);
|
||||
}
|
||||
|
@ -748,15 +748,15 @@ _e_imc_file_name_new_get(void)
|
|||
{
|
||||
char path[4096];
|
||||
int i;
|
||||
|
||||
|
||||
for (i = 0; i < 32; i++)
|
||||
{
|
||||
snprintf(path, sizeof(path), "%s/new_input_method-%02d.imc",
|
||||
e_intl_imc_personal_path_get(), i);
|
||||
if (!ecore_file_exists(path))
|
||||
if (!ecore_file_exists(path))
|
||||
return evas_stringshare_add(path);
|
||||
}
|
||||
|
||||
|
||||
return NULL;
|
||||
}
|
||||
/** End IMC Utility Functions **/
|
||||
|
@ -766,7 +766,7 @@ EAPI void
|
|||
e_int_config_imc_import_done(E_Config_Dialog *dia)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
||||
cfdata = dia->cfdata;
|
||||
cfdata->win_import = NULL;
|
||||
}
|
||||
|
@ -775,21 +775,21 @@ static void
|
|||
_cb_import(void *data1, void *data2)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
||||
cfdata = data1;
|
||||
if (cfdata->win_import)
|
||||
e_win_raise(cfdata->win_import);
|
||||
else
|
||||
else
|
||||
cfdata->win_import = e_int_config_imc_import(cfdata->cfd);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
EAPI void
|
||||
e_int_config_imc_update(E_Config_Dialog *dia, const char *file)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
||||
cfdata = dia->cfdata;
|
||||
cfdata->fmdir = 1;
|
||||
cfdata->fmdir = 1;
|
||||
E_FREE(cfdata->imc_current);
|
||||
cfdata->imc_current = strdup(file);
|
||||
e_widget_radio_toggle_set(cfdata->o_personal, 1);
|
||||
|
@ -798,7 +798,7 @@ e_int_config_imc_update(E_Config_Dialog *dia, const char *file)
|
|||
e_fm2_path_set(cfdata->o_fm, e_intl_imc_personal_path_get(), "/");
|
||||
_e_imc_form_fill(cfdata);
|
||||
if (cfdata->o_frame)
|
||||
e_widget_change(cfdata->o_frame);
|
||||
e_widget_change(cfdata->o_frame);
|
||||
}
|
||||
|
||||
static Evas_Object *
|
||||
|
@ -808,34 +808,34 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
const char *path;
|
||||
E_Fm2_Config fmc;
|
||||
E_Radio_Group *rg;
|
||||
|
||||
|
||||
ot = e_widget_table_add(evas, 0);
|
||||
ol = e_widget_table_add(evas, 0);
|
||||
il = e_widget_table_add(evas, 1);
|
||||
|
||||
|
||||
rg = e_widget_radio_group_new(&(cfdata->fmdir));
|
||||
|
||||
|
||||
o = e_widget_radio_add(evas, _("Personal"), 0, rg);
|
||||
e_widget_table_object_append(il, o, 0, 0, 1, 1, 1, 1, 0, 0);
|
||||
e_widget_on_change_hook_set(o, _cb_dir, cfdata);
|
||||
cfdata->o_personal = o;
|
||||
|
||||
|
||||
o = e_widget_radio_add(evas, _("System"), 1, rg);
|
||||
e_widget_table_object_append(il, o, 1, 0, 1, 1, 1, 1, 0, 0);
|
||||
e_widget_table_object_append(il, o, 1, 0, 1, 1, 1, 1, 0, 0);
|
||||
e_widget_on_change_hook_set(o, _cb_dir, cfdata);
|
||||
cfdata->o_system = o;
|
||||
|
||||
|
||||
e_widget_table_object_append(ol, il, 0, 0, 1, 1, 0, 0, 0, 0);
|
||||
|
||||
|
||||
o = e_widget_button_add(evas, _("Go up a Directory"), "widget/up_dir", _cb_button_up, cfdata, NULL);
|
||||
cfdata->o_up_button = o;
|
||||
e_widget_table_object_append(ol, o, 0, 1, 1, 1, 0, 0, 0, 0);
|
||||
|
||||
|
||||
if (cfdata->fmdir == 1)
|
||||
path = e_intl_imc_system_path_get();
|
||||
else
|
||||
path = e_intl_imc_personal_path_get();
|
||||
|
||||
|
||||
o = e_fm2_add(evas);
|
||||
cfdata->o_fm = o;
|
||||
memset(&fmc, 0, sizeof(E_Fm2_Config));
|
||||
|
@ -880,30 +880,30 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
e_widget_min_size_set(of, 160, 160);
|
||||
e_widget_table_object_append(ol, of, 0, 2, 1, 1, 1, 1, 1, 1);
|
||||
e_widget_table_object_append(ot, ol, 0, 0, 1, 1, 1, 1, 1, 1);
|
||||
|
||||
|
||||
of = e_widget_list_add(evas, 0, 0);
|
||||
|
||||
/* Disable imc checkbox */
|
||||
/* il( o[Check], ol( o[Button], o[Button] ) ) */
|
||||
il = e_widget_list_add(evas, 0, 1);
|
||||
|
||||
|
||||
o = e_widget_check_add(evas, _("Use No Input Method"), &(cfdata->imc_disable));
|
||||
e_widget_on_change_hook_set(o, _e_imc_disable_change_cb, cfdata);
|
||||
cfdata->gui.imc_advanced_disable = o;
|
||||
cfdata->gui.imc_advanced_disable = o;
|
||||
e_widget_list_object_append(il, o, 1, 0, 0.5);
|
||||
|
||||
|
||||
ol = e_widget_list_add(evas, 1, 1);
|
||||
|
||||
o = e_widget_button_add(evas, _("New"), "widget/add", _cb_new, cfdata, NULL);
|
||||
|
||||
o = e_widget_button_add(evas, _("New"), "widget/new", _cb_new, cfdata, NULL);
|
||||
e_widget_list_object_append(ol, o, 1, 0, 0.5);
|
||||
o = e_widget_button_add(evas, _("Import..."), "enlightenment/imc", _cb_import, cfdata, NULL);
|
||||
e_widget_list_object_append(ol, o, 1, 0, 0.5);
|
||||
e_widget_list_object_append(il, ol, 1, 0, 0.5);
|
||||
e_widget_list_object_append(of, il, 1, 0, 0.0);
|
||||
|
||||
|
||||
ol = e_widget_frametable_add(evas, _("Input Method Parameters"), 0);
|
||||
e_widget_frametable_content_align_set(ol, 0.0, 0.0);
|
||||
|
||||
|
||||
o = e_widget_label_add(evas, _("Name"));
|
||||
e_widget_frametable_object_append(ol, o, 0, 0, 1, 1, 1, 1, 0, 0);
|
||||
o = e_widget_entry_add(evas, &(cfdata->imc.e_im_name), NULL, NULL, NULL);
|
||||
|
@ -917,48 +917,48 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
e_widget_on_change_hook_set(o, _e_imc_entry_change_cb, cfdata);
|
||||
cfdata->gui.e_im_exec = o;
|
||||
e_widget_frametable_object_append(ol, o, 1, 1, 1, 1, 1, 1, 1, 0);
|
||||
|
||||
|
||||
o = e_widget_label_add(evas, _("Setup Command"));
|
||||
e_widget_frametable_object_append(ol, o, 0, 2, 1, 1, 1, 1, 0, 0);
|
||||
o = e_widget_entry_add(evas, &(cfdata->imc.e_im_setup_exec), NULL, NULL, NULL);
|
||||
e_widget_on_change_hook_set(o, _e_imc_entry_change_cb, cfdata);
|
||||
cfdata->gui.e_im_setup_exec = o;
|
||||
e_widget_frametable_object_append(ol, o, 1, 2, 1, 1, 1, 1, 1, 0);
|
||||
|
||||
|
||||
e_widget_list_object_append(of, ol, 0, 1, 0.5);
|
||||
|
||||
|
||||
ol = e_widget_frametable_add(evas, _("Exported Environment Variables"), 0);
|
||||
e_widget_frametable_content_align_set(ol, 0.0, 0.0);
|
||||
|
||||
|
||||
o = e_widget_label_add(evas, "GTK_IM_MODULE");
|
||||
e_widget_frametable_object_append(ol, o, 0, 0, 1, 1, 1, 1, 0, 0);
|
||||
o = e_widget_entry_add(evas, &(cfdata->imc.gtk_im_module), NULL, NULL, NULL);
|
||||
e_widget_on_change_hook_set(o, _e_imc_entry_change_cb, cfdata);
|
||||
cfdata->gui.gtk_im_module = o;
|
||||
e_widget_frametable_object_append(ol, o, 1, 0, 1, 1, 1, 1, 1, 0);
|
||||
|
||||
|
||||
o = e_widget_label_add(evas, "QT_IM_MODULE");
|
||||
e_widget_frametable_object_append(ol, o, 0, 1, 1, 1, 1, 1, 0, 0);
|
||||
o = e_widget_entry_add(evas, &(cfdata->imc.qt_im_module), NULL, NULL, NULL);
|
||||
e_widget_on_change_hook_set(o, _e_imc_entry_change_cb, cfdata);
|
||||
cfdata->gui.qt_im_module = o;
|
||||
e_widget_frametable_object_append(ol, o, 1, 1, 1, 1, 1, 1, 1, 0);
|
||||
|
||||
|
||||
o = e_widget_label_add(evas, "XMODIFIERS");
|
||||
e_widget_frametable_object_append(ol, o, 0, 2, 1, 1, 1, 1, 0, 0);
|
||||
o = e_widget_entry_add(evas, &(cfdata->imc.xmodifiers), NULL, NULL, NULL);
|
||||
e_widget_on_change_hook_set(o, _e_imc_entry_change_cb, cfdata);
|
||||
cfdata->gui.xmodifiers = o;
|
||||
e_widget_frametable_object_append(ol, o, 1, 2, 1, 1, 1, 1, 1, 0);
|
||||
|
||||
|
||||
e_widget_list_object_append(of, ol, 0, 1, 0.5);
|
||||
e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
|
||||
|
||||
|
||||
o = e_widget_button_add(evas, _("Setup Selected Input Method"), "widget/config", _e_imc_adv_setup_cb, cfdata, NULL);
|
||||
e_widget_table_object_append(ot, o, 0, 1, 1, 1, 1, 1, 1, 0);
|
||||
cfdata->gui.imc_advanced_setup = o;
|
||||
|
||||
e_dialog_resizable_set(cfd->dia, 1);
|
||||
|
||||
e_dialog_resizable_set(cfd->dia, 1);
|
||||
|
||||
_e_imc_form_fill(cfdata);
|
||||
return ot;
|
||||
|
|
Loading…
Reference in New Issue