forked from enlightenment/enlightenment
illogict patches (minus a few that will break config despite fixing a typo)
SVN revision: 22405
This commit is contained in:
parent
d6ff645451
commit
2bc5d52739
3
AUTHORS
3
AUTHORS
|
@ -3,9 +3,10 @@ Ibukun Olumuyiwa <ibukun@computer.org>
|
||||||
Sebastian Dransfeld <sebastid@tango.flipp.net>
|
Sebastian Dransfeld <sebastid@tango.flipp.net>
|
||||||
HandyAndE (Andrew Williams) <andy@handyande.co.uk>
|
HandyAndE (Andrew Williams) <andy@handyande.co.uk>
|
||||||
CodeWarrior (Hisham Mardam Bey) <hisham@hisham.cc>
|
CodeWarrior (Hisham Mardam Bey) <hisham@hisham.cc>
|
||||||
dj2 (dan sinclair) <dj2@everburning.com>
|
dj2 (Dan Sinclair) <dj2@everburning.com>
|
||||||
Tilman Sauerbeck <tilman@code-monkey.de>
|
Tilman Sauerbeck <tilman@code-monkey.de>
|
||||||
Aleksej Struk <astruk@gmail.com>
|
Aleksej Struk <astruk@gmail.com>
|
||||||
Brian Mattern <rephorm@rephorm.com>
|
Brian Mattern <rephorm@rephorm.com>
|
||||||
Christopher Michael <devilhorns@comcast.net>
|
Christopher Michael <devilhorns@comcast.net>
|
||||||
Viktor Kojouharov <vkojouharov@gmail.com>
|
Viktor Kojouharov <vkojouharov@gmail.com>
|
||||||
|
ilLogict <illogict@online.fr>
|
||||||
|
|
|
@ -171,7 +171,7 @@ e_desklock_show(void)
|
||||||
/* everything failed - cant lock */
|
/* everything failed - cant lock */
|
||||||
e_util_dialog_show(_("Lock Failed"),
|
e_util_dialog_show(_("Lock Failed"),
|
||||||
_("Locking the desktop failed because some application<br>"
|
_("Locking the desktop failed because some application<br>"
|
||||||
"has grabbed either they keyboard or the mouse or both<br>"
|
"has grabbed either the keyboard or the mouse or both<br>"
|
||||||
"and their grab is unable to be broken."));
|
"and their grab is unable to be broken."));
|
||||||
ecore_x_window_del(edd->elock_wnd);
|
ecore_x_window_del(edd->elock_wnd);
|
||||||
free(edd);
|
free(edd);
|
||||||
|
|
|
@ -441,45 +441,92 @@ _e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
|
|
||||||
sd = data;
|
sd = data;
|
||||||
ev = event_info;
|
ev = event_info;
|
||||||
if (!strcmp(ev->keyname, "Up"))
|
if ((!strcmp(ev->keyname, "Up")) ||
|
||||||
|
(!strcmp(ev->keyname, "KP_Up")))
|
||||||
{
|
{
|
||||||
int n, ns;
|
int n, ns;
|
||||||
E_Smart_Item *si;
|
E_Smart_Item *si;
|
||||||
|
|
||||||
ns = e_ilist_selected_get(sd->smart_obj);
|
ns = e_ilist_selected_get(sd->smart_obj);
|
||||||
|
n = ns;
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
n = e_ilist_selected_get(sd->smart_obj);
|
|
||||||
if (n == 0)
|
if (n == 0)
|
||||||
{
|
{
|
||||||
e_ilist_selected_set(sd->smart_obj, ns);
|
n = ns;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
e_ilist_selected_set(sd->smart_obj, n - 1);
|
-- n;
|
||||||
si = evas_list_nth(sd->items, sd->selected);
|
si = evas_list_nth(sd->items, n);
|
||||||
}
|
}
|
||||||
while ((si) && (si->header));
|
while ((si) && (si->header));
|
||||||
|
if (n != ns) e_ilist_selected_set(sd->smart_obj, n);
|
||||||
}
|
}
|
||||||
else if (!strcmp(ev->keyname, "Down"))
|
else if ((!strcmp(ev->keyname, "Down")) ||
|
||||||
|
(!strcmp(ev->keyname, "KP_Down")))
|
||||||
{
|
{
|
||||||
int n, ns;
|
int n, ns;
|
||||||
E_Smart_Item *si;
|
E_Smart_Item *si;
|
||||||
|
|
||||||
ns = e_ilist_selected_get(sd->smart_obj);
|
ns = e_ilist_selected_get(sd->smart_obj);
|
||||||
|
n = ns;
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
n = e_ilist_selected_get(sd->smart_obj);
|
|
||||||
if (n == (evas_list_count(sd->items) - 1))
|
if (n == (evas_list_count(sd->items) - 1))
|
||||||
{
|
{
|
||||||
e_ilist_selected_set(sd->smart_obj, ns);
|
n = ns;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
e_ilist_selected_set(sd->smart_obj, n + 1);
|
++ n;
|
||||||
si = evas_list_nth(sd->items, sd->selected);
|
si = evas_list_nth(sd->items, n);
|
||||||
}
|
}
|
||||||
while ((si) && (si->header));
|
while ((si) && (si->header));
|
||||||
|
if (n != ns) e_ilist_selected_set(sd->smart_obj, n);
|
||||||
|
}
|
||||||
|
else if ((!strcmp(ev->keyname, "Home")) ||
|
||||||
|
(!strcmp(ev->keyname, "KP_Home")))
|
||||||
|
{
|
||||||
|
int n, ns;
|
||||||
|
E_Smart_Item *si;
|
||||||
|
|
||||||
|
ns = e_ilist_selected_get(sd->smart_obj);
|
||||||
|
n = -1;
|
||||||
|
do
|
||||||
|
{
|
||||||
|
if (n == (evas_list_count(sd->items) - 1))
|
||||||
|
{
|
||||||
|
n = ns;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
++ n;
|
||||||
|
si = evas_list_nth(sd->items, n);
|
||||||
|
}
|
||||||
|
while ((si) && (si->header));
|
||||||
|
if (n != ns) e_ilist_selected_set(sd->smart_obj, n);
|
||||||
|
}
|
||||||
|
else if ((!strcmp(ev->keyname, "End")) ||
|
||||||
|
(!strcmp(ev->keyname, "KP_End")))
|
||||||
|
{
|
||||||
|
int n, ns;
|
||||||
|
E_Smart_Item *si;
|
||||||
|
|
||||||
|
ns = e_ilist_selected_get(sd->smart_obj);
|
||||||
|
n = evas_list_count(sd->items);
|
||||||
|
do
|
||||||
|
{
|
||||||
|
if (n == 0)
|
||||||
|
{
|
||||||
|
n = ns;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
-- n;
|
||||||
|
si = evas_list_nth(sd->items, n);
|
||||||
|
}
|
||||||
|
while ((si) && (si->header));
|
||||||
|
if (n != ns) e_ilist_selected_set(sd->smart_obj, n);
|
||||||
}
|
}
|
||||||
else if ((!strcmp(ev->keyname, "Return")) ||
|
else if ((!strcmp(ev->keyname, "Return")) ||
|
||||||
|
(!strcmp(ev->keyname, "KP_Enter")) ||
|
||||||
(!strcmp(ev->keyname, "space")))
|
(!strcmp(ev->keyname, "space")))
|
||||||
{
|
{
|
||||||
E_Smart_Item *si;
|
E_Smart_Item *si;
|
||||||
|
|
|
@ -276,6 +276,9 @@ _load_bgs(E_Config_Dialog *cfd, Evas_Object *il)
|
||||||
Evas_List *bg_dirs, *bg;
|
Evas_List *bg_dirs, *bg;
|
||||||
Ecore_Evas *eebuf;
|
Ecore_Evas *eebuf;
|
||||||
Evas *evasbuf;
|
Evas *evasbuf;
|
||||||
|
E_Manager *man;
|
||||||
|
Ecore_X_Screen_Size size;
|
||||||
|
|
||||||
const char *f;
|
const char *f;
|
||||||
char *c;
|
char *c;
|
||||||
int selnum = -1;
|
int selnum = -1;
|
||||||
|
@ -310,7 +313,9 @@ _load_bgs(E_Config_Dialog *cfd, Evas_Object *il)
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
im = e_widget_preview_add(cfd->dia->win->evas, 320, 240);
|
man = e_manager_current_get();
|
||||||
|
size = ecore_x_randr_current_screen_size_get(man->root);
|
||||||
|
im = e_widget_preview_add(cfd->dia->win->evas, 320, 320 * size.height / size.width);
|
||||||
e_widget_preview_edje_set(im, f, "desktop/background");
|
e_widget_preview_edje_set(im, f, "desktop/background");
|
||||||
evas_object_del(bg_obj);
|
evas_object_del(bg_obj);
|
||||||
// im = e_widget_preview_add_from_object(cfd->dia->win->evas, bg_obj, 320, 240);
|
// im = e_widget_preview_add_from_object(cfd->dia->win->evas, bg_obj, 320, 240);
|
||||||
|
|
|
@ -45,7 +45,7 @@ static void _e_desklock_cb_lb_show_on_specific_screen(void *data, Evas_Object *o
|
||||||
#ifdef HAVE_PAM
|
#ifdef HAVE_PAM
|
||||||
static void _e_desklock_cb_syswide_auth_method(void *data, Evas_Object *obj,
|
static void _e_desklock_cb_syswide_auth_method(void *data, Evas_Object *obj,
|
||||||
const char *emission, const char *source);
|
const char *emission, const char *source);
|
||||||
static void _e_desklock_cb_personilized_auth_method(void *data, Evas_Object *obj,
|
static void _e_desklock_cb_personalized_auth_method(void *data, Evas_Object *obj,
|
||||||
const char *emission, const char *source);
|
const char *emission, const char *source);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -275,7 +275,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
||||||
|
|
||||||
rwd = e_widget_data_get(oc);
|
rwd = e_widget_data_get(oc);
|
||||||
edje_object_signal_callback_add(rwd->o_radio, "toggle_on", "",
|
edje_object_signal_callback_add(rwd->o_radio, "toggle_on", "",
|
||||||
_e_desklock_cb_personilized_auth_method, cfdata);
|
_e_desklock_cb_personalized_auth_method, cfdata);
|
||||||
}
|
}
|
||||||
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
||||||
#endif
|
#endif
|
||||||
|
@ -476,7 +476,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
||||||
|
|
||||||
wd = e_widget_data_get(oc);
|
wd = e_widget_data_get(oc);
|
||||||
edje_object_signal_callback_add(wd->o_radio, "toggle_on", "",
|
edje_object_signal_callback_add(wd->o_radio, "toggle_on", "",
|
||||||
_e_desklock_cb_personilized_auth_method, cfdata);
|
_e_desklock_cb_personalized_auth_method, cfdata);
|
||||||
}
|
}
|
||||||
e_widget_table_object_append(ot, of, 0, 2, 1, 1, 1, 1, 1, 1);
|
e_widget_table_object_append(ot, of, 0, 2, 1, 1, 1, 1, 1, 1);
|
||||||
#endif
|
#endif
|
||||||
|
@ -893,7 +893,7 @@ _e_desklock_cb_syswide_auth_method(void *data, Evas_Object *obj, const char *emi
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_e_desklock_cb_personilized_auth_method(void *data, Evas_Object *obj, const char *emission,
|
_e_desklock_cb_personalized_auth_method(void *data, Evas_Object *obj, const char *emission,
|
||||||
const char *source)
|
const char *source)
|
||||||
{
|
{
|
||||||
E_Config_Dialog_Data *cfdata;
|
E_Config_Dialog_Data *cfdata;
|
||||||
|
|
|
@ -92,12 +92,24 @@ _surebox_text_fill(SureBox *sb)
|
||||||
char buf[4096];
|
char buf[4096];
|
||||||
|
|
||||||
if (!sb->dia) return;
|
if (!sb->dia) return;
|
||||||
snprintf(buf, sizeof(buf),
|
if (sb->iterations > 1)
|
||||||
_("Does this look OK? Press <hilight>Yes</hilight> if it does, or No if not.<br>"
|
{
|
||||||
"If you do not press a button the old resolution of<br>"
|
snprintf(buf, sizeof(buf),
|
||||||
"%dx%d at %d Hz will be restored in %d seconds."),
|
_("Does this look OK? Press <hilight>Yes</hilight> if it does, or No if not.<br>"
|
||||||
sb->orig_size.width, sb->orig_size.height,
|
"If you do not press a button, the old resolution of<br>"
|
||||||
sb->orig_rate.rate, sb->iterations);
|
"%dx%d at %d Hz will be restored in %d seconds."),
|
||||||
|
sb->orig_size.width, sb->orig_size.height,
|
||||||
|
sb->orig_rate.rate, sb->iterations);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
snprintf(buf, sizeof(buf),
|
||||||
|
_("Does this look OK? Press <hilight>Yes</hilight> if it does, or No if not.<br>"
|
||||||
|
"If you do not press a button, the old resolution of<br>"
|
||||||
|
"%dx%d at %d Hz will be restored <hilight>IMMEDIATELY</hilight>."),
|
||||||
|
sb->orig_size.width, sb->orig_size.height,
|
||||||
|
sb->orig_rate.rate);
|
||||||
|
}
|
||||||
e_dialog_text_set(sb->dia, buf);
|
e_dialog_text_set(sb->dia, buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -381,7 +381,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
||||||
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
||||||
|
|
||||||
/* Create Hinting Widgets */
|
/* Create Hinting Widgets */
|
||||||
of = e_widget_framelist_add(evas, _("Hinting"), 0);
|
of = e_widget_framelist_add(evas, _("Hinting"), 1);
|
||||||
e_widget_framelist_content_align_set(of, 0.5, 0.5);
|
e_widget_framelist_content_align_set(of, 0.5, 0.5);
|
||||||
rg = e_widget_radio_group_new(&(cfdata->hinting));
|
rg = e_widget_radio_group_new(&(cfdata->hinting));
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
#define BINDING_LIST_ICON_W 16
|
#define BINDING_LIST_ICON_W 16
|
||||||
#define BINDING_LIST_ICON_H 16
|
#define BINDING_LIST_ICON_H 16
|
||||||
|
|
||||||
#define BTN_ASSIGN_KEYBINDING_TEXT _("Assign Key Binding...")
|
#define BTN_ASSIGN_KEYBINDING_TEXT _("Assign Key Binding…")
|
||||||
|
|
||||||
#define TEXT_ACTION _("Action")
|
#define TEXT_ACTION _("Action")
|
||||||
#define TEXT_NONE_ACTION_KEY _("<None>")
|
#define TEXT_NONE_ACTION_KEY _("<None>")
|
||||||
|
@ -98,13 +98,13 @@ const ACTION actions_predefined_names[ ] = {
|
||||||
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
||||||
{"Flip Desktop By", "desk_flip_by", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
{"Flip Desktop By", "desk_flip_by", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
||||||
{"Flip Desktop To", "desk_flip_to", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
{"Flip Desktop To", "desk_flip_to", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
||||||
/* These fuck with a lot of bindings like firefox, irssi, bitchx etc...
|
/* These fuck with a lot of bindings like firefox, irssi, bitchx etc…
|
||||||
{"Switch To Left Desktop", "desk_linear_flip_by", "-1", _DEFAULT_ACTION,
|
{"Switch To Left Desktop", "desk_linear_flip_by", "-1", _DEFAULT_ACTION,
|
||||||
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
||||||
{"Switch To Right Desktop", "desk_linear_flip_by", "1", _DEFAULT_ACTION,
|
{"Switch To Right Desktop", "desk_linear_flip_by", "1", _DEFAULT_ACTION,
|
||||||
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
||||||
*/
|
*/
|
||||||
{"Flip Desktop Linearly...", "desk_linear_flip_by", NULL, _NONDEFAULT_ACTION,
|
{"Flip Desktop Linearly…", "desk_linear_flip_by", NULL, _NONDEFAULT_ACTION,
|
||||||
EDIT_RESTRICT_ACTION },
|
EDIT_RESTRICT_ACTION },
|
||||||
{"Switch To Desktop 0", "desk_linear_flip_to", "0", _DEFAULT_ACTION,
|
{"Switch To Desktop 0", "desk_linear_flip_to", "0", _DEFAULT_ACTION,
|
||||||
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
||||||
|
@ -130,7 +130,7 @@ const ACTION actions_predefined_names[ ] = {
|
||||||
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
||||||
{"Switch To Desktop 11", "desk_linear_flip_to", "11", _DEFAULT_ACTION,
|
{"Switch To Desktop 11", "desk_linear_flip_to", "11", _DEFAULT_ACTION,
|
||||||
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
||||||
{"Switch To Desktop...", "desk_linear_flip_to", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
{"Switch To Desktop…", "desk_linear_flip_to", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
||||||
|
|
||||||
{"Run Command", "exebuf", NULL, _DEFAULT_ACTION, EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
{"Run Command", "exebuf", NULL, _DEFAULT_ACTION, EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
||||||
{"Exit Enlightenment", "exit", NULL,
|
{"Exit Enlightenment", "exit", NULL,
|
||||||
|
@ -144,7 +144,7 @@ const ACTION actions_predefined_names[ ] = {
|
||||||
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
||||||
{"Show Clients Menu", "menu_show", "clients", _DEFAULT_ACTION,
|
{"Show Clients Menu", "menu_show", "clients", _DEFAULT_ACTION,
|
||||||
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
||||||
{"Show Menu...", "menu_show", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
{"Show Menu…", "menu_show", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
||||||
|
|
||||||
{"Desktop Lock", "desk_lock", NULL, _DEFAULT_ACTION,
|
{"Desktop Lock", "desk_lock", NULL, _DEFAULT_ACTION,
|
||||||
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
||||||
|
@ -161,7 +161,7 @@ const ACTION actions_predefined_names[ ] = {
|
||||||
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
||||||
{"Window Move To Previous Desktop", "window_desk_move_by", "-1 0", _DEFAULT_ACTION,
|
{"Window Move To Previous Desktop", "window_desk_move_by", "-1 0", _DEFAULT_ACTION,
|
||||||
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
||||||
{"Window Move By Desktop...", "window_desk_move_by", NULL, _DEFAULT_ACTION,
|
{"Window Move By Desktop…", "window_desk_move_by", NULL, _DEFAULT_ACTION,
|
||||||
EDIT_RESTRICT_ACTION },
|
EDIT_RESTRICT_ACTION },
|
||||||
{"Window Move To Desktop 0", "window_desk_move_to", "0", _DEFAULT_ACTION,
|
{"Window Move To Desktop 0", "window_desk_move_to", "0", _DEFAULT_ACTION,
|
||||||
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
||||||
|
@ -187,7 +187,7 @@ const ACTION actions_predefined_names[ ] = {
|
||||||
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
||||||
{"Window Move To Desktop 11", "window_desk_move_to", "11", _DEFAULT_ACTION,
|
{"Window Move To Desktop 11", "window_desk_move_to", "11", _DEFAULT_ACTION,
|
||||||
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
||||||
{"Window Move To Desktop...", "window_desk_move_to", NULL, _NONDEFAULT_ACTION,
|
{"Window Move To Desktop…", "window_desk_move_to", NULL, _NONDEFAULT_ACTION,
|
||||||
EDIT_RESTRICT_ACTION },
|
EDIT_RESTRICT_ACTION },
|
||||||
{"Window Maximize", "window_maximized_toggle", NULL, _DEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
{"Window Maximize", "window_maximized_toggle", NULL, _DEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
||||||
{"Window Maximize Vertically", "window_maximized_toggle", "vertical", _DEFAULT_ACTION,
|
{"Window Maximize Vertically", "window_maximized_toggle", "vertical", _DEFAULT_ACTION,
|
||||||
|
@ -218,15 +218,15 @@ const ACTION actions_predefined_names[ ] = {
|
||||||
{"Window Menu", "window_menu", NULL, _DEFAULT_ACTION,
|
{"Window Menu", "window_menu", NULL, _DEFAULT_ACTION,
|
||||||
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
|
||||||
|
|
||||||
{"Window Move...", "window_move", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
{"Window Move…", "window_move", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
||||||
{"Window Move To...", "window_move_to", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
{"Window Move To…", "window_move_to", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
||||||
{"Window Move By...", "window_move_by", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
{"Window Move By…", "window_move_by", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
||||||
{"Window Resize To...", "window_resize", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
{"Window Resize To…", "window_resize", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
||||||
{"Window Resize By...", "window_resize_by", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
{"Window Resize By…", "window_resize_by", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
||||||
{"Window Drag Icon", "window_drag_icon", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
{"Window Drag Icon", "window_drag_icon", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
||||||
|
|
||||||
{"Application", "app", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
{"Application", "app", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
||||||
{"User Defined Actions...", "exec", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
{"User Defined Actions…", "exec", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
|
||||||
// {"Unknown Action", NULL, NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_NONE },
|
// {"Unknown Action", NULL, NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_NONE },
|
||||||
{NULL, NULL, NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_NONE }
|
{NULL, NULL, NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_NONE }
|
||||||
};
|
};
|
||||||
|
|
|
@ -132,6 +132,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
||||||
Ecore_Evas *eebuf;
|
Ecore_Evas *eebuf;
|
||||||
Evas *evasbuf;
|
Evas *evasbuf;
|
||||||
Evas_List *l, *paths;
|
Evas_List *l, *paths;
|
||||||
|
E_Manager *man;
|
||||||
|
Ecore_X_Screen_Size size;
|
||||||
|
|
||||||
theme = edje_object_add(evas);
|
theme = edje_object_add(evas);
|
||||||
|
|
||||||
|
@ -146,6 +148,9 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
||||||
evasbuf = ecore_evas_get(eebuf);
|
evasbuf = ecore_evas_get(eebuf);
|
||||||
o2 = edje_object_add(evasbuf);
|
o2 = edje_object_add(evasbuf);
|
||||||
|
|
||||||
|
man = e_manager_current_get();
|
||||||
|
size = ecore_x_randr_current_screen_size_get(man->root);
|
||||||
|
|
||||||
paths = e_path_dir_list_get(path_themes);
|
paths = e_path_dir_list_get(path_themes);
|
||||||
for (l = paths; l; l = l->next)
|
for (l = paths; l; l = l->next)
|
||||||
{
|
{
|
||||||
|
@ -217,7 +222,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
||||||
if (!(strcmp(themefile, cfdata->current_theme)))
|
if (!(strcmp(themefile, cfdata->current_theme)))
|
||||||
{
|
{
|
||||||
selnum = i;
|
selnum = i;
|
||||||
im = e_widget_preview_add(evas, 320, 240);
|
im = e_widget_preview_add(evas, 320, 320 * size.height / size.width);
|
||||||
e_widget_preview_edje_set(im, fulltheme, "desktop/background");
|
e_widget_preview_edje_set(im, fulltheme, "desktop/background");
|
||||||
// im = e_widget_image_add_from_object(evas, theme, 320, 240);
|
// im = e_widget_image_add_from_object(evas, theme, 320, 240);
|
||||||
// e_widget_image_object_set(im, e_thumb_evas_object_get(fulltheme, evas, 320, 240, 1));
|
// e_widget_image_object_set(im, e_thumb_evas_object_get(fulltheme, evas, 320, 240, 1));
|
||||||
|
@ -239,7 +244,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
||||||
if (im == NULL)
|
if (im == NULL)
|
||||||
{
|
{
|
||||||
snprintf(fulltheme, sizeof(fulltheme), PACKAGE_DATA_DIR"/data/themes/default.edj");
|
snprintf(fulltheme, sizeof(fulltheme), PACKAGE_DATA_DIR"/data/themes/default.edj");
|
||||||
im = e_widget_preview_add(evas, 320, 240);
|
im = e_widget_preview_add(evas, 320, 320 * size.height / size.width);
|
||||||
e_widget_preview_edje_set(im, fulltheme, "desktop/background");
|
e_widget_preview_edje_set(im, fulltheme, "desktop/background");
|
||||||
// theme = e_thumb_generate_begin(fulltheme, 320, 240, evas, &theme, NULL, NULL);
|
// theme = e_thumb_generate_begin(fulltheme, 320, 240, evas, &theme, NULL, NULL);
|
||||||
// im = e_widget_image_add_from_object(evas, theme, 320, 240);
|
// im = e_widget_image_add_from_object(evas, theme, 320, 240);
|
||||||
|
|
|
@ -178,22 +178,22 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
||||||
|
|
||||||
of = e_widget_framelist_add(evas, _("Stacking"), 0);
|
of = e_widget_framelist_add(evas, _("Stacking"), 0);
|
||||||
rg = e_widget_radio_group_new(&(cfdata->layering));
|
rg = e_widget_radio_group_new(&(cfdata->layering));
|
||||||
ob = e_widget_radio_add(evas, _("Below Everything"), 0, rg);
|
ob = e_widget_radio_add(evas, _("Above Everything"), 2, rg);
|
||||||
e_widget_framelist_object_append(of, ob);
|
e_widget_framelist_object_append(of, ob);
|
||||||
ob = e_widget_radio_add(evas, _("Below Windows"), 1, rg);
|
ob = e_widget_radio_add(evas, _("Below Windows"), 1, rg);
|
||||||
e_widget_framelist_object_append(of, ob);
|
e_widget_framelist_object_append(of, ob);
|
||||||
ob = e_widget_radio_add(evas, _("Above Everything"), 2, rg);
|
ob = e_widget_radio_add(evas, _("Below Everything"), 0, rg);
|
||||||
e_widget_framelist_object_append(of, ob);
|
e_widget_framelist_object_append(of, ob);
|
||||||
e_widget_list_object_append(o2, of, 1, 1, 0.5);
|
e_widget_list_object_append(o2, of, 1, 1, 0.5);
|
||||||
|
|
||||||
of = e_widget_framelist_add(evas, _("Size"), 0);
|
of = e_widget_framelist_add(evas, _("Size"), 0);
|
||||||
ob = e_widget_check_add(evas, _("Shrink length fit contents"), &(cfdata->fit_along));
|
ob = e_widget_check_add(evas, _("Shrink length fit contents"), &(cfdata->fit_along));
|
||||||
e_widget_framelist_object_append(of, ob);
|
e_widget_framelist_object_append(of, ob);
|
||||||
ob = e_widget_check_add(evas, _("Expand width to fit contents"), &(cfdata->fit_size));
|
// ob = e_widget_check_add(evas, _("Expand width to fit contents"), &(cfdata->fit_size));
|
||||||
e_widget_framelist_object_append(of, ob);
|
// e_widget_framelist_object_append(of, ob);
|
||||||
ob = e_widget_label_add(evas, _("Shelf Size"));
|
ob = e_widget_label_add(evas, _("Shelf Size"));
|
||||||
e_widget_framelist_object_append(of, ob);
|
e_widget_framelist_object_append(of, ob);
|
||||||
ob = e_widget_slider_add(evas, 1, 0, _("%3.0f pixels"), 4, 200, 4, 0, NULL, &(cfdata->size), 200);
|
ob = e_widget_slider_add(evas, 1, 0, _("%3.0f pixels"), 4, 120, 4, 0, NULL, &(cfdata->size), 200);
|
||||||
e_widget_framelist_object_append(of, ob);
|
e_widget_framelist_object_append(of, ob);
|
||||||
e_widget_list_object_append(o2, of, 1, 1, 0.5);
|
e_widget_list_object_append(o2, of, 1, 1, 0.5);
|
||||||
|
|
||||||
|
|
|
@ -249,12 +249,12 @@ e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int d
|
||||||
m->cur.y = y;
|
m->cur.y = y;
|
||||||
if ((m->cur.y + m->cur.h) > (m->zone->y + m->zone->h))
|
if ((m->cur.y + m->cur.h) > (m->zone->y + m->zone->h))
|
||||||
m->cur.y = y + h - m->cur.h;
|
m->cur.y = y + h - m->cur.h;
|
||||||
_e_menu_activate_first();
|
// _e_menu_activate_first();
|
||||||
break;
|
break;
|
||||||
case E_MENU_POP_DIRECTION_RIGHT:
|
case E_MENU_POP_DIRECTION_RIGHT:
|
||||||
m->cur.x = x + w;
|
m->cur.x = x + w;
|
||||||
m->cur.y = y ;
|
m->cur.y = y;
|
||||||
_e_menu_activate_first();
|
// _e_menu_activate_first();
|
||||||
break;
|
break;
|
||||||
case E_MENU_POP_DIRECTION_UP:
|
case E_MENU_POP_DIRECTION_UP:
|
||||||
_e_menu_realize(m);
|
_e_menu_realize(m);
|
||||||
|
@ -262,7 +262,7 @@ e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int d
|
||||||
if ((m->cur.x + m->cur.w) > (m->zone->x + m->zone->w))
|
if ((m->cur.x + m->cur.w) > (m->zone->x + m->zone->w))
|
||||||
m->cur.x = x + w - m->cur.w;
|
m->cur.x = x + w - m->cur.w;
|
||||||
m->cur.y = y - m->cur.h;
|
m->cur.y = y - m->cur.h;
|
||||||
_e_menu_activate_last();
|
// _e_menu_activate_last();
|
||||||
break;
|
break;
|
||||||
case E_MENU_POP_DIRECTION_DOWN:
|
case E_MENU_POP_DIRECTION_DOWN:
|
||||||
_e_menu_realize(m);
|
_e_menu_realize(m);
|
||||||
|
@ -272,7 +272,7 @@ e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int d
|
||||||
m->cur.y = y + h;
|
m->cur.y = y + h;
|
||||||
if ((m->cur.y + m->cur.h) > (m->zone->y + m->zone->h))
|
if ((m->cur.y + m->cur.h) > (m->zone->y + m->zone->h))
|
||||||
m->cur.y = y + h - m->cur.h;
|
m->cur.y = y + h - m->cur.h;
|
||||||
_e_menu_activate_first();
|
// _e_menu_activate_first();
|
||||||
break;
|
break;
|
||||||
case E_MENU_POP_DIRECTION_AUTO:
|
case E_MENU_POP_DIRECTION_AUTO:
|
||||||
_e_menu_auto_place(m, x, y, w, h);
|
_e_menu_auto_place(m, x, y, w, h);
|
||||||
|
|
|
@ -375,7 +375,9 @@ _e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
sd = data;
|
sd = data;
|
||||||
ev = event_info;
|
ev = event_info;
|
||||||
if ((!strcmp(ev->keyname, "Up")) ||
|
if ((!strcmp(ev->keyname, "Up")) ||
|
||||||
(!strcmp(ev->keyname, "Left")))
|
(!strcmp(ev->keyname, "KP_Up")) ||
|
||||||
|
(!strcmp(ev->keyname, "Left")) ||
|
||||||
|
(!strcmp(ev->keyname, "KP_Left")))
|
||||||
{
|
{
|
||||||
if (sd->step_count > 0)
|
if (sd->step_count > 0)
|
||||||
{
|
{
|
||||||
|
@ -388,7 +390,9 @@ _e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
edje_object_part_drag_step(sd->edje_obj, "slider", -sd->step_size, -sd->step_size);
|
edje_object_part_drag_step(sd->edje_obj, "slider", -sd->step_size, -sd->step_size);
|
||||||
}
|
}
|
||||||
else if ((!strcmp(ev->keyname, "Down")) ||
|
else if ((!strcmp(ev->keyname, "Down")) ||
|
||||||
(!strcmp(ev->keyname, "Right")))
|
(!strcmp(ev->keyname, "KP_Down")) ||
|
||||||
|
(!strcmp(ev->keyname, "Right")) ||
|
||||||
|
(!strcmp(ev->keyname, "KP_Right")))
|
||||||
{
|
{
|
||||||
if (sd->step_count > 0)
|
if (sd->step_count > 0)
|
||||||
{
|
{
|
||||||
|
@ -400,6 +404,16 @@ _e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
else
|
else
|
||||||
edje_object_part_drag_step(sd->edje_obj, "slider", sd->step_size, sd->step_size);
|
edje_object_part_drag_step(sd->edje_obj, "slider", sd->step_size, sd->step_size);
|
||||||
}
|
}
|
||||||
|
else if ((!strcmp(ev->keyname, "Home")) ||
|
||||||
|
(!strcmp(ev->keyname, "KP_Home")))
|
||||||
|
{
|
||||||
|
edje_object_part_drag_value_set(sd->edje_obj, "slider", 0., 0.);
|
||||||
|
}
|
||||||
|
else if ((!strcmp(ev->keyname, "End")) ||
|
||||||
|
(!strcmp(ev->keyname, "KP_End")))
|
||||||
|
{
|
||||||
|
edje_object_part_drag_value_set(sd->edje_obj, "slider", 1., 1.);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -293,6 +293,22 @@ e_tlist_count(Evas_Object * obj)
|
||||||
return evas_list_count(sd->items);
|
return evas_list_count(sd->items);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
EAPI void
|
||||||
|
e_tlist_clear(Evas_Object *obj)
|
||||||
|
{
|
||||||
|
INTERNAL_ENTRY;
|
||||||
|
while (sd->items)
|
||||||
|
{
|
||||||
|
E_Smart_Item *si;
|
||||||
|
|
||||||
|
si = sd->items->data;
|
||||||
|
sd->items = evas_list_remove_list(sd->items, sd->items);
|
||||||
|
evas_object_del(si->base_obj);
|
||||||
|
free(si);
|
||||||
|
}
|
||||||
|
sd->selected = -1;
|
||||||
|
}
|
||||||
|
|
||||||
/* local subsystem functions */
|
/* local subsystem functions */
|
||||||
static void
|
static void
|
||||||
_e_tlist_append(Evas_Object * obj, char *label,
|
_e_tlist_append(Evas_Object * obj, char *label,
|
||||||
|
|
|
@ -35,6 +35,7 @@ EAPI int e_tlist_selector_get(Evas_Object * obj);
|
||||||
EAPI void e_tlist_remove_num(Evas_Object * obj, int n);
|
EAPI void e_tlist_remove_num(Evas_Object * obj, int n);
|
||||||
EAPI void e_tlist_remove_label(Evas_Object * obj, char *label);
|
EAPI void e_tlist_remove_label(Evas_Object * obj, char *label);
|
||||||
EAPI int e_tlist_count(Evas_Object * obj);
|
EAPI int e_tlist_count(Evas_Object * obj);
|
||||||
|
EAPI void e_tlist_clear(Evas_Object * obj);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -205,7 +205,7 @@ e_util_head_exec(int head, const char *cmd)
|
||||||
p2 = strrchr(penv_display, '.');
|
p2 = strrchr(penv_display, '.');
|
||||||
if ((p1) && (p2) && (p2 > p1)) /* "blah:x.y" */
|
if ((p1) && (p2) && (p2 > p1)) /* "blah:x.y" */
|
||||||
{
|
{
|
||||||
/* yes it could overflow... but who will voerflow DISPLAY eh? why? to
|
/* yes it could overflow... but who will overflow DISPLAY eh? why? to
|
||||||
* "exploit" your own applications running as you?
|
* "exploit" your own applications running as you?
|
||||||
*/
|
*/
|
||||||
strcpy(buf, penv_display);
|
strcpy(buf, penv_display);
|
||||||
|
|
|
@ -194,6 +194,15 @@ _e_widget_tlist_append(Evas_Object * obj, char *label,
|
||||||
evas_object_resize(wd->o_tlist, vw, mh);
|
evas_object_resize(wd->o_tlist, vw, mh);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
EAPI void
|
||||||
|
e_widget_tlist_clear(Evas_Object *obj)
|
||||||
|
{
|
||||||
|
E_Widget_Data *wd;
|
||||||
|
|
||||||
|
wd = e_widget_data_get(obj);
|
||||||
|
e_tlist_clear(wd->o_tlist);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_e_wid_del_hook(Evas_Object * obj)
|
_e_wid_del_hook(Evas_Object * obj)
|
||||||
{
|
{
|
||||||
|
|
|
@ -22,6 +22,7 @@ EAPI const char *e_widget_tlist_selected_label_get(Evas_Object * obj);
|
||||||
EAPI void e_widget_tlist_remove_num(Evas_Object * obj, int n);
|
EAPI void e_widget_tlist_remove_num(Evas_Object * obj, int n);
|
||||||
EAPI void e_widget_tlist_remove_label(Evas_Object * obj, char *label);
|
EAPI void e_widget_tlist_remove_label(Evas_Object * obj, char *label);
|
||||||
EAPI int e_widget_tlist_count(Evas_Object * obj);
|
EAPI int e_widget_tlist_count(Evas_Object * obj);
|
||||||
|
EAPI void e_widget_tlist_clear(Evas_Object * obj);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -583,7 +583,7 @@ e_zone_exec(E_Zone *zone, char *exe)
|
||||||
p2 = strrchr(penv_display, '.');
|
p2 = strrchr(penv_display, '.');
|
||||||
if ((p1) && (p2) && (p2 > p1)) /* "blah:x.y" */
|
if ((p1) && (p2) && (p2 > p1)) /* "blah:x.y" */
|
||||||
{
|
{
|
||||||
/* yes it could overflow... but who will voerflow DISPLAY eh? why? to
|
/* yes it could overflow... but who will overflow DISPLAY eh? why? to
|
||||||
* "exploit" your own applications running as you?
|
* "exploit" your own applications running as you?
|
||||||
*/
|
*/
|
||||||
strcpy(buf, penv_display);
|
strcpy(buf, penv_display);
|
||||||
|
|
Loading…
Reference in New Issue