pager_plain - remove module and migrate people to just plain pager
let's not keep 2 plager gadgets ... one only - yes. it's mini previews. it's easier to maintain this way.
This commit is contained in:
parent
14e7a5c362
commit
b7c5fd2a0b
|
@ -1,5 +1,5 @@
|
||||||
group "E_Config" struct {
|
group "E_Config" struct {
|
||||||
value "config_version" int: 1000029;
|
value "config_version" int: 1000030;
|
||||||
value "config_type" uint: 0; // this profile seems to just be super minimalist
|
value "config_type" uint: 0; // this profile seems to just be super minimalist
|
||||||
value "show_splash" int: 0;
|
value "show_splash" int: 0;
|
||||||
value "desktop_default_name" string: "%i-%i";
|
value "desktop_default_name" string: "%i-%i";
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
group "E_Config" struct {
|
group "E_Config" struct {
|
||||||
value "config_version" int: 1000029;
|
value "config_version" int: 1000030;
|
||||||
value "config_type" uint: 3;
|
value "config_type" uint: 3;
|
||||||
value "show_splash" int: 1;
|
value "show_splash" int: 1;
|
||||||
value "desktop_default_name" string: "%i-%i";
|
value "desktop_default_name" string: "%i-%i";
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
group "E_Config" struct {
|
group "E_Config" struct {
|
||||||
value "config_version" int: 1000029;
|
value "config_version" int: 1000030;
|
||||||
value "config_type" uint: 3;
|
value "config_type" uint: 3;
|
||||||
value "show_splash" int: 1;
|
value "show_splash" int: 1;
|
||||||
value "desktop_default_name" string: "%i-%i";
|
value "desktop_default_name" string: "%i-%i";
|
||||||
|
|
|
@ -1601,6 +1601,23 @@ e_config_load(void)
|
||||||
}
|
}
|
||||||
e_config_save_queue();
|
e_config_save_queue();
|
||||||
}
|
}
|
||||||
|
CONFIG_VERSION_CHECK(30)
|
||||||
|
{
|
||||||
|
Eina_List *l;
|
||||||
|
E_Config_Module *em;
|
||||||
|
|
||||||
|
CONFIG_VERSION_UPDATE_INFO(30);
|
||||||
|
EINA_LIST_FOREACH(e_config->modules, l, em)
|
||||||
|
{
|
||||||
|
if (!em->enabled) continue;
|
||||||
|
if (!em->name) continue;
|
||||||
|
if (eina_streq(em->name, "pager_plain"))
|
||||||
|
{
|
||||||
|
eina_stringshare_replace(&(em->name), "pager");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
e_config_save_queue();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
elm_config_profile_set(_e_config_profile);
|
elm_config_profile_set(_e_config_profile);
|
||||||
if (!e_config->remember_internal_fm_windows)
|
if (!e_config->remember_internal_fm_windows)
|
||||||
|
|
|
@ -46,7 +46,7 @@ typedef enum
|
||||||
/* increment this whenever a new set of config values are added but the users
|
/* increment this whenever a new set of config values are added but the users
|
||||||
* config doesn't need to be wiped - simply new values need to be put in
|
* config doesn't need to be wiped - simply new values need to be put in
|
||||||
*/
|
*/
|
||||||
#define E_CONFIG_FILE_GENERATION 29
|
#define E_CONFIG_FILE_GENERATION 30
|
||||||
#define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH * 1000000) + E_CONFIG_FILE_GENERATION)
|
#define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH * 1000000) + E_CONFIG_FILE_GENERATION)
|
||||||
|
|
||||||
#define E_CONFIG_BINDINGS_VERSION 0 // DO NOT INCREMENT UNLESS YOU WANT TO WIPE ALL BINDINGS!!!!!
|
#define E_CONFIG_BINDINGS_VERSION 0 // DO NOT INCREMENT UNLESS YOU WANT TO WIPE ALL BINDINGS!!!!!
|
||||||
|
|
|
@ -759,7 +759,6 @@ _e_module_whitelist_check(void)
|
||||||
"notification",
|
"notification",
|
||||||
"ofono",
|
"ofono",
|
||||||
"pager",
|
"pager",
|
||||||
"pager_plain",
|
|
||||||
"quickaccess",
|
"quickaccess",
|
||||||
"shot",
|
"shot",
|
||||||
"start",
|
"start",
|
||||||
|
|
|
@ -8,7 +8,6 @@ mods = [
|
||||||
# standard run of the mill modules with cion and desktop
|
# standard run of the mill modules with cion and desktop
|
||||||
'ibar',
|
'ibar',
|
||||||
'pager',
|
'pager',
|
||||||
'pager_plain',
|
|
||||||
'temperature',
|
'temperature',
|
||||||
'mixer',
|
'mixer',
|
||||||
'notification',
|
'notification',
|
||||||
|
|
Binary file not shown.
|
@ -1,520 +0,0 @@
|
||||||
#include "e.h"
|
|
||||||
#include "e_mod_main.h"
|
|
||||||
|
|
||||||
#define BUTTON_DRAG 0
|
|
||||||
#define BUTTON_NOPLACE 1
|
|
||||||
#define BUTTON_DESK 2
|
|
||||||
|
|
||||||
struct _E_Config_Dialog_Data
|
|
||||||
{
|
|
||||||
struct
|
|
||||||
{
|
|
||||||
int show, urgent_show, urgent_stick, urgent_focus;
|
|
||||||
double speed, urgent_speed;
|
|
||||||
int height, act_height;
|
|
||||||
} popup;
|
|
||||||
struct
|
|
||||||
{
|
|
||||||
unsigned int drag, noplace, desk;
|
|
||||||
} btn;
|
|
||||||
struct
|
|
||||||
{
|
|
||||||
Ecore_X_Window bind_win;
|
|
||||||
E_Grab_Dialog *dia;
|
|
||||||
Eina_List *hdls;
|
|
||||||
int btn;
|
|
||||||
} grab;
|
|
||||||
struct
|
|
||||||
{
|
|
||||||
Evas_Object *ob1, *ob2, *ob3;
|
|
||||||
Eina_List *popup_list, *urgent_list;
|
|
||||||
} gui;
|
|
||||||
int drag_resist, flip_desk, show_desk_names, live_preview;
|
|
||||||
E_Config_Dialog *cfd;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* local function prototypes */
|
|
||||||
static void *_create_data(E_Config_Dialog *cfd);
|
|
||||||
static void _fill_data(E_Config_Dialog_Data *cfdata);
|
|
||||||
static void _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata);
|
|
||||||
static Evas_Object *_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata);
|
|
||||||
static int _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata);
|
|
||||||
static int _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata);
|
|
||||||
static Evas_Object *_adv_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata);
|
|
||||||
static int _adv_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata);
|
|
||||||
static int _adv_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata);
|
|
||||||
static void _update_btns(E_Config_Dialog_Data *cfdata);
|
|
||||||
static void _update_btn(E_Config_Dialog_Data *cfdata, Evas_Object *button, const int mouse_button);
|
|
||||||
static void _grab_window_show(void *data1, void *data2);
|
|
||||||
static Eina_Bool _grab_cb_mouse_down(void *data, int type, void *event);
|
|
||||||
static Eina_Bool _grab_cb_key_down(void *data, int type, void *event);
|
|
||||||
static void _cb_disable_check_list(void *data, Evas_Object *obj);
|
|
||||||
|
|
||||||
EINTERN void
|
|
||||||
_config_pager_module(Config_Item *ci)
|
|
||||||
{
|
|
||||||
E_Config_Dialog *cfd;
|
|
||||||
E_Config_Dialog_View *v;
|
|
||||||
char buff[PATH_MAX];
|
|
||||||
|
|
||||||
v = E_NEW(E_Config_Dialog_View, 1);
|
|
||||||
if (!v) return;
|
|
||||||
|
|
||||||
v->create_cfdata = _create_data;
|
|
||||||
v->free_cfdata = _free_data;
|
|
||||||
v->basic.create_widgets = _basic_create;
|
|
||||||
v->basic.apply_cfdata = _basic_apply;
|
|
||||||
v->basic.check_changed = _basic_check_changed;
|
|
||||||
v->advanced.create_widgets = _adv_create;
|
|
||||||
v->advanced.apply_cfdata = _adv_apply;
|
|
||||||
v->advanced.check_changed = _adv_check_changed;
|
|
||||||
|
|
||||||
snprintf(buff, sizeof(buff), "%s/e-module-pager-plain.edj",
|
|
||||||
pager_config->module->dir);
|
|
||||||
cfd = e_config_dialog_new(NULL, _("Pager Settings"), "E",
|
|
||||||
"_e_mod_pager_config_dialog", buff, 0, v, ci);
|
|
||||||
pager_config->config_dialog = cfd;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* local function prototypes */
|
|
||||||
static void *
|
|
||||||
_create_data(E_Config_Dialog *cfd EINA_UNUSED)
|
|
||||||
{
|
|
||||||
E_Config_Dialog_Data *cfdata;
|
|
||||||
|
|
||||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
|
||||||
_fill_data(cfdata);
|
|
||||||
return cfdata;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_fill_data(E_Config_Dialog_Data *cfdata)
|
|
||||||
{
|
|
||||||
cfdata->popup.show = pager_config->popup;
|
|
||||||
cfdata->popup.speed = pager_config->popup_speed;
|
|
||||||
cfdata->popup.urgent_show = pager_config->popup_urgent;
|
|
||||||
cfdata->popup.urgent_stick = pager_config->popup_urgent_stick;
|
|
||||||
cfdata->popup.urgent_focus = pager_config->popup_urgent_focus;
|
|
||||||
cfdata->popup.urgent_speed = pager_config->popup_urgent_speed;
|
|
||||||
cfdata->popup.height = pager_config->popup_height;
|
|
||||||
cfdata->popup.act_height = pager_config->popup_act_height;
|
|
||||||
cfdata->drag_resist = pager_config->drag_resist;
|
|
||||||
cfdata->btn.drag = pager_config->btn_drag;
|
|
||||||
cfdata->btn.noplace = pager_config->btn_noplace;
|
|
||||||
cfdata->btn.desk = pager_config->btn_desk;
|
|
||||||
cfdata->flip_desk = pager_config->flip_desk;
|
|
||||||
cfdata->live_preview = !pager_config->disable_live_preview;
|
|
||||||
cfdata->show_desk_names = pager_config->show_desk_names;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
|
|
||||||
{
|
|
||||||
cfdata->gui.popup_list = eina_list_free(cfdata->gui.popup_list);
|
|
||||||
cfdata->gui.urgent_list = eina_list_free(cfdata->gui.urgent_list);
|
|
||||||
pager_config->config_dialog = NULL;
|
|
||||||
E_FREE(cfdata);
|
|
||||||
}
|
|
||||||
|
|
||||||
static Evas_Object *
|
|
||||||
_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
|
||||||
{
|
|
||||||
Evas_Object *ol, *of, *ow;
|
|
||||||
|
|
||||||
e_dialog_resizable_set(cfd->dia, 1);
|
|
||||||
cfdata->cfd = cfd;
|
|
||||||
ol = e_widget_list_add(evas, 0, 0);
|
|
||||||
|
|
||||||
of = e_widget_framelist_add(evas, _("General"), 0);
|
|
||||||
ow = e_widget_check_add(evas, _("Flip desktop on mouse wheel"),
|
|
||||||
&(cfdata->flip_desk));
|
|
||||||
e_widget_framelist_object_append(of, ow);
|
|
||||||
ow = e_widget_check_add(evas, _("Always show desktop names"),
|
|
||||||
&(cfdata->show_desk_names));
|
|
||||||
e_widget_framelist_object_append(of, ow);
|
|
||||||
ow = e_widget_check_add(evas, _("Live preview"),
|
|
||||||
&(cfdata->live_preview));
|
|
||||||
e_widget_framelist_object_append(of, ow);
|
|
||||||
e_widget_list_object_append(ol, of, 1, 0, 0.5);
|
|
||||||
|
|
||||||
of = e_widget_framelist_add(evas, _("Popup"), 0);
|
|
||||||
ow = e_widget_check_add(evas, _("Show popup on desktop change"),
|
|
||||||
&(cfdata->popup.show));
|
|
||||||
e_widget_framelist_object_append(of, ow);
|
|
||||||
ow = e_widget_check_add(evas, _("Show popup for urgent windows"),
|
|
||||||
&(cfdata->popup.urgent_show));
|
|
||||||
e_widget_framelist_object_append(of, ow);
|
|
||||||
e_widget_list_object_append(ol, of, 1, 0, 0.5);
|
|
||||||
|
|
||||||
return ol;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
|
|
||||||
{
|
|
||||||
pager_config->popup = cfdata->popup.show;
|
|
||||||
pager_config->flip_desk = cfdata->flip_desk;
|
|
||||||
pager_config->disable_live_preview = !cfdata->live_preview;
|
|
||||||
pager_config->show_desk_names = cfdata->show_desk_names;
|
|
||||||
pager_config->popup_urgent = cfdata->popup.urgent_show;
|
|
||||||
_pager_cb_config_updated();
|
|
||||||
e_config_save_queue();
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
|
|
||||||
{
|
|
||||||
if ((int)pager_config->popup != cfdata->popup.show) return 1;
|
|
||||||
if ((int)pager_config->flip_desk != cfdata->flip_desk) return 1;
|
|
||||||
if ((int)pager_config->disable_live_preview != !cfdata->live_preview) return 1;
|
|
||||||
if ((int)pager_config->show_desk_names != cfdata->show_desk_names) return 1;
|
|
||||||
if ((int)pager_config->popup_urgent != cfdata->popup.urgent_show) return 1;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Evas_Object *
|
|
||||||
_adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
|
||||||
{
|
|
||||||
Evas_Object *otb, *ol, *ow;
|
|
||||||
Evas_Object *pc, *uc;
|
|
||||||
|
|
||||||
e_dialog_resizable_set(cfd->dia, 1);
|
|
||||||
cfdata->cfd = cfd;
|
|
||||||
otb = e_widget_toolbook_add(evas, (48 * e_scale), (48 * e_scale));
|
|
||||||
|
|
||||||
/* General Page */
|
|
||||||
ol = e_widget_list_add(evas, 0, 0);
|
|
||||||
ow = e_widget_check_add(evas, _("Flip desktop on mouse wheel"),
|
|
||||||
&(cfdata->flip_desk));
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
ow = e_widget_check_add(evas, _("Always show desktop names"),
|
|
||||||
&(cfdata->show_desk_names));
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
ow = e_widget_check_add(evas, _("Live preview"),
|
|
||||||
&(cfdata->live_preview));
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
ow = e_widget_label_add(evas, _("Resistance to dragging"));
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
ow = e_widget_slider_add(evas, 1, 0, _("%.0f pixels"), 0.0, 10.0, 1.0, 0, NULL,
|
|
||||||
&(cfdata->drag_resist), 100);
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
|
|
||||||
#if 0
|
|
||||||
ow = e_widget_label_add(evas, _("Select and Slide button"));
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
ow = e_widget_button_add(evas, _("Click to set"), NULL,
|
|
||||||
_grab_window_show, (void *)BUTTON_DRAG, cfdata);
|
|
||||||
cfdata->gui.ob1 = ow;
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ow = e_widget_label_add(evas, _("Drag and Drop button"));
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
ow = e_widget_button_add(evas, _("Click to set"), NULL,
|
|
||||||
_grab_window_show, (void *)BUTTON_NOPLACE, cfdata);
|
|
||||||
cfdata->gui.ob2 = ow;
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
ow = e_widget_label_add(evas, _("Drag whole desktop"));
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
ow = e_widget_button_add(evas, _("Click to set"), NULL,
|
|
||||||
_grab_window_show, (void *)BUTTON_DESK, cfdata);
|
|
||||||
cfdata->gui.ob3 = ow;
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
_update_btns(cfdata);
|
|
||||||
e_widget_toolbook_page_append(otb, NULL, _("General"), ol, 1, 0, 1, 0,
|
|
||||||
0.5, 0.0);
|
|
||||||
|
|
||||||
/* Popup Page */
|
|
||||||
ol = e_widget_list_add(evas, 0, 0);
|
|
||||||
pc = e_widget_check_add(evas, _("Show popup on desktop change"),
|
|
||||||
&(cfdata->popup.show));
|
|
||||||
e_widget_list_object_append(ol, pc, 1, 0, 0.5);
|
|
||||||
|
|
||||||
ow = e_widget_label_add(evas, _("Popup pager height"));
|
|
||||||
cfdata->gui.popup_list = eina_list_append(cfdata->gui.popup_list, ow);
|
|
||||||
e_widget_disabled_set(ow, !cfdata->popup.show);
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
ow = e_widget_slider_add(evas, 1, 0, _("%.0f pixels"), 20.0, 200.0, 1.0, 0, NULL,
|
|
||||||
&(cfdata->popup.height), 100);
|
|
||||||
cfdata->gui.popup_list = eina_list_append(cfdata->gui.popup_list, ow);
|
|
||||||
e_widget_disabled_set(ow, !cfdata->popup.show);
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
|
|
||||||
ow = e_widget_label_add(evas, _("Popup duration"));
|
|
||||||
cfdata->gui.popup_list = eina_list_append(cfdata->gui.popup_list, ow);
|
|
||||||
e_widget_disabled_set(ow, !cfdata->popup.show);
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
ow = e_widget_slider_add(evas, 1, 0, _("%1.1f seconds"), 0.1, 10.0, 0.1, 0,
|
|
||||||
&(cfdata->popup.speed), NULL, 100);
|
|
||||||
cfdata->gui.popup_list = eina_list_append(cfdata->gui.popup_list, ow);
|
|
||||||
e_widget_disabled_set(ow, !cfdata->popup.show);
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
e_widget_on_change_hook_set(pc, _cb_disable_check_list,
|
|
||||||
cfdata->gui.popup_list);
|
|
||||||
ow = e_widget_label_add(evas, _("Pager action popup height"));
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
ow = e_widget_slider_add(evas, 1, 0, _("%.0f pixels"), 20.0, 200.0, 1.0, 0, NULL,
|
|
||||||
&(cfdata->popup.act_height), 100);
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
e_widget_toolbook_page_append(otb, NULL, _("Popup"), ol, 1, 0, 1, 0,
|
|
||||||
0.5, 0.0);
|
|
||||||
|
|
||||||
/* Urgent Page */
|
|
||||||
ol = e_widget_list_add(evas, 0, 0);
|
|
||||||
uc = e_widget_check_add(evas, _("Show popup for urgent window"),
|
|
||||||
&(cfdata->popup.urgent_show));
|
|
||||||
e_widget_list_object_append(ol, uc, 1, 0, 0.5);
|
|
||||||
|
|
||||||
ow = e_widget_check_add(evas, _("Urgent popup sticks on screen"),
|
|
||||||
&(cfdata->popup.urgent_stick));
|
|
||||||
cfdata->gui.urgent_list = eina_list_append(cfdata->gui.urgent_list, ow);
|
|
||||||
e_widget_disabled_set(ow, !cfdata->popup.urgent_show);
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
|
|
||||||
ow = e_widget_check_add(evas, _("Show popup for focused windows"),
|
|
||||||
&(cfdata->popup.urgent_focus));
|
|
||||||
cfdata->gui.urgent_list = eina_list_append(cfdata->gui.urgent_list, ow);
|
|
||||||
e_widget_disabled_set(ow, !cfdata->popup.urgent_show);
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
|
|
||||||
ow = e_widget_label_add(evas, _("Urgent popup duration"));
|
|
||||||
cfdata->gui.urgent_list = eina_list_append(cfdata->gui.urgent_list, ow);
|
|
||||||
e_widget_disabled_set(ow, !cfdata->popup.urgent_show);
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
ow = e_widget_slider_add(evas, 1, 0, _("%1.1f seconds"), 0.1, 10.0, 0.1, 0,
|
|
||||||
&(cfdata->popup.urgent_speed), NULL, 100);
|
|
||||||
cfdata->gui.urgent_list = eina_list_append(cfdata->gui.urgent_list, ow);
|
|
||||||
e_widget_disabled_set(ow, !cfdata->popup.urgent_show);
|
|
||||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
|
||||||
e_widget_on_change_hook_set(uc, _cb_disable_check_list,
|
|
||||||
cfdata->gui.urgent_list);
|
|
||||||
e_widget_toolbook_page_append(otb, NULL, _("Urgent Windows"), ol,
|
|
||||||
1, 0, 1, 0, 0.5, 0.0);
|
|
||||||
|
|
||||||
e_widget_toolbook_page_show(otb, 0);
|
|
||||||
return otb;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
_adv_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
|
|
||||||
{
|
|
||||||
pager_config->popup = cfdata->popup.show;
|
|
||||||
pager_config->popup_speed = cfdata->popup.speed;
|
|
||||||
pager_config->flip_desk = cfdata->flip_desk;
|
|
||||||
pager_config->disable_live_preview = !cfdata->live_preview;
|
|
||||||
pager_config->popup_urgent = cfdata->popup.urgent_show;
|
|
||||||
pager_config->popup_urgent_stick = cfdata->popup.urgent_stick;
|
|
||||||
pager_config->popup_urgent_focus = cfdata->popup.urgent_focus;
|
|
||||||
pager_config->popup_urgent_speed = cfdata->popup.urgent_speed;
|
|
||||||
pager_config->show_desk_names = cfdata->show_desk_names;
|
|
||||||
pager_config->popup_height = cfdata->popup.height;
|
|
||||||
pager_config->popup_act_height = cfdata->popup.act_height;
|
|
||||||
pager_config->drag_resist = cfdata->drag_resist;
|
|
||||||
pager_config->btn_drag = cfdata->btn.drag;
|
|
||||||
pager_config->btn_noplace = cfdata->btn.noplace;
|
|
||||||
pager_config->btn_desk = cfdata->btn.desk;
|
|
||||||
_pager_cb_config_updated();
|
|
||||||
e_config_save_queue();
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
_adv_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
|
|
||||||
{
|
|
||||||
if ((int)pager_config->popup != cfdata->popup.show) return 1;
|
|
||||||
if (!EINA_DBL_EQ(pager_config->popup_speed, cfdata->popup.speed)) return 1;
|
|
||||||
if ((int)pager_config->flip_desk != cfdata->flip_desk) return 1;
|
|
||||||
if ((int)pager_config->disable_live_preview != !cfdata->live_preview) return 1;
|
|
||||||
if ((int)pager_config->popup_urgent != cfdata->popup.urgent_show) return 1;
|
|
||||||
if ((int)pager_config->popup_urgent_stick != cfdata->popup.urgent_stick)
|
|
||||||
return 1;
|
|
||||||
if ((int)pager_config->popup_urgent_focus != cfdata->popup.urgent_focus)
|
|
||||||
return 1;
|
|
||||||
if (!EINA_DBL_EQ(pager_config->popup_urgent_speed, cfdata->popup.urgent_speed))
|
|
||||||
return 1;
|
|
||||||
if ((int)pager_config->show_desk_names != cfdata->show_desk_names) return 1;
|
|
||||||
if (pager_config->popup_height != cfdata->popup.height) return 1;
|
|
||||||
if (pager_config->popup_act_height != cfdata->popup.act_height) return 1;
|
|
||||||
if ((int)pager_config->drag_resist != cfdata->drag_resist) return 1;
|
|
||||||
if (pager_config->btn_drag != cfdata->btn.drag) return 1;
|
|
||||||
if (pager_config->btn_noplace != cfdata->btn.noplace) return 1;
|
|
||||||
if (pager_config->btn_desk != cfdata->btn.desk) return 1;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_update_btns(E_Config_Dialog_Data *cfdata)
|
|
||||||
{
|
|
||||||
#if 0
|
|
||||||
_update_btn(cfdata, cfdata->gui.ob1, cfdata->btn.drag);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
_update_btn(cfdata, cfdata->gui.ob2, cfdata->btn.noplace);
|
|
||||||
_update_btn(cfdata, cfdata->gui.ob3, cfdata->btn.desk);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_update_btn(E_Config_Dialog_Data *cfdata EINA_UNUSED, Evas_Object *button, const int mouse_button)
|
|
||||||
{
|
|
||||||
char lbl[256];
|
|
||||||
char *icon = NULL;
|
|
||||||
Evas_Object *ic = NULL;
|
|
||||||
|
|
||||||
switch (mouse_button)
|
|
||||||
{
|
|
||||||
case 0:
|
|
||||||
snprintf(lbl, sizeof(lbl), _("Click to set"));
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
if (e_config->mouse_hand == E_MOUSE_HAND_RIGHT)
|
|
||||||
{
|
|
||||||
snprintf(lbl, sizeof(lbl), _("Left button"));
|
|
||||||
icon = "preferences-desktop-mouse-left";
|
|
||||||
}
|
|
||||||
else if (e_config->mouse_hand == E_MOUSE_HAND_LEFT)
|
|
||||||
{
|
|
||||||
snprintf(lbl, sizeof(lbl), _("Right button"));
|
|
||||||
icon = "preferences-desktop-mouse-right";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
snprintf(lbl, sizeof(lbl), _("Button %i"), mouse_button);
|
|
||||||
icon = "preferences-desktop-mouse-extra";
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
snprintf(lbl, sizeof(lbl), _("Middle button"));
|
|
||||||
icon = "preferences-desktop-mouse-middle";
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
if (e_config->mouse_hand == E_MOUSE_HAND_RIGHT)
|
|
||||||
{
|
|
||||||
snprintf(lbl, sizeof(lbl), _("Right button"));
|
|
||||||
icon = "preferences-desktop-mouse-right";
|
|
||||||
}
|
|
||||||
else if (e_config->mouse_hand == E_MOUSE_HAND_LEFT)
|
|
||||||
{
|
|
||||||
snprintf(lbl, sizeof(lbl), _("Left button"));
|
|
||||||
icon = "preferences-desktop-mouse-left";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
snprintf(lbl, sizeof(lbl), _("Button %i"), mouse_button);
|
|
||||||
icon = "preferences-desktop-mouse-extra";
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
snprintf(lbl, sizeof(lbl), _("Button %i"), mouse_button);
|
|
||||||
icon = "preferences-desktop-mouse-extra";
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
e_widget_button_label_set(button, lbl);
|
|
||||||
if (icon)
|
|
||||||
{
|
|
||||||
ic = e_icon_add(evas_object_evas_get(button));
|
|
||||||
e_util_icon_theme_set(ic, icon);
|
|
||||||
}
|
|
||||||
e_widget_button_icon_set(button, ic);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_grab_window_del(void *data)
|
|
||||||
{
|
|
||||||
E_Config_Dialog_Data *cfdata;
|
|
||||||
|
|
||||||
cfdata = e_object_data_get(data);
|
|
||||||
if (!cfdata) return;
|
|
||||||
cfdata->grab.dia = NULL;
|
|
||||||
_update_btns(cfdata);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_grab_window_show(void *data1, void *data2)
|
|
||||||
{
|
|
||||||
E_Config_Dialog_Data *cfdata;
|
|
||||||
|
|
||||||
if (!(cfdata = data2)) return;
|
|
||||||
|
|
||||||
cfdata->grab.btn = 0;
|
|
||||||
if ((long)data1 == BUTTON_DRAG)
|
|
||||||
cfdata->grab.btn = 1;
|
|
||||||
else if ((long)data1 == BUTTON_NOPLACE)
|
|
||||||
cfdata->grab.btn = 2;
|
|
||||||
|
|
||||||
cfdata->grab.dia = e_grab_dialog_show(cfdata->cfd->dia->win, EINA_TRUE, _grab_cb_key_down, _grab_cb_mouse_down, NULL, cfdata);
|
|
||||||
e_object_data_set(E_OBJECT(cfdata->grab.dia), cfdata);
|
|
||||||
e_object_del_attach_func_set(E_OBJECT(cfdata->grab.dia), _grab_window_del);
|
|
||||||
}
|
|
||||||
|
|
||||||
static Eina_Bool
|
|
||||||
_grab_cb_mouse_down(void *data, EINA_UNUSED int type, void *event)
|
|
||||||
{
|
|
||||||
E_Config_Dialog_Data *cfdata = NULL;
|
|
||||||
Ecore_Event_Mouse_Button *ev;
|
|
||||||
|
|
||||||
ev = event;
|
|
||||||
if (!(cfdata = data)) return ECORE_CALLBACK_PASS_ON;
|
|
||||||
if (ev->buttons == 3)
|
|
||||||
{
|
|
||||||
e_util_dialog_show(_("Attention"),
|
|
||||||
_("You cannot use the right mouse button in the<ps/>"
|
|
||||||
"shelf for this as it is already taken by internal<ps/>"
|
|
||||||
"code for context menus.<ps/>"
|
|
||||||
"This button only works in the popup."));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (ev->buttons == cfdata->btn.drag)
|
|
||||||
cfdata->btn.drag = 0;
|
|
||||||
else if (ev->buttons == cfdata->btn.noplace)
|
|
||||||
cfdata->btn.noplace = 0;
|
|
||||||
else if (ev->buttons == cfdata->btn.desk)
|
|
||||||
cfdata->btn.desk = 0;
|
|
||||||
|
|
||||||
if (cfdata->grab.btn == 1)
|
|
||||||
cfdata->btn.drag = ev->buttons;
|
|
||||||
else if (cfdata->grab.btn == 2)
|
|
||||||
cfdata->btn.noplace = ev->buttons;
|
|
||||||
else
|
|
||||||
cfdata->btn.desk = ev->buttons;
|
|
||||||
}
|
|
||||||
|
|
||||||
e_object_del(E_OBJECT(cfdata->grab.dia));
|
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Eina_Bool
|
|
||||||
_grab_cb_key_down(void *data, EINA_UNUSED int type, void *event)
|
|
||||||
{
|
|
||||||
E_Config_Dialog_Data *cfdata = NULL;
|
|
||||||
Ecore_Event_Key *ev;
|
|
||||||
|
|
||||||
ev = event;
|
|
||||||
if (!(cfdata = data)) return ECORE_CALLBACK_PASS_ON;
|
|
||||||
if (!strcmp(ev->key, "Delete"))
|
|
||||||
{
|
|
||||||
if (cfdata->grab.btn == 1)
|
|
||||||
cfdata->btn.drag = 0;
|
|
||||||
else if (cfdata->grab.btn == 2)
|
|
||||||
cfdata->btn.noplace = 0;
|
|
||||||
else
|
|
||||||
cfdata->btn.desk = 0;
|
|
||||||
}
|
|
||||||
e_object_del(E_OBJECT(cfdata->grab.dia));
|
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_cb_disable_check_list(void *data, Evas_Object *obj)
|
|
||||||
{
|
|
||||||
Eina_List *list = (Eina_List *)data;
|
|
||||||
Eina_List *l;
|
|
||||||
Evas_Object *o;
|
|
||||||
|
|
||||||
EINA_LIST_FOREACH(list, l, o)
|
|
||||||
e_widget_disabled_set(o, !e_widget_check_checked_get(obj));
|
|
||||||
}
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,63 +0,0 @@
|
||||||
#ifndef E_MOD_MAIN_H
|
|
||||||
#define E_MOD_MAIN_H
|
|
||||||
|
|
||||||
typedef struct _Config Config;
|
|
||||||
typedef struct _Config_Item Config_Item;
|
|
||||||
|
|
||||||
#define PAGER_RESIZE_NONE 0
|
|
||||||
#define PAGER_RESIZE_HORZ 1
|
|
||||||
#define PAGER_RESIZE_VERT 2
|
|
||||||
#define PAGER_RESIZE_BOTH 3
|
|
||||||
|
|
||||||
#define PAGER_DESKNAME_NONE 0
|
|
||||||
#define PAGER_DESKNAME_TOP 1
|
|
||||||
#define PAGER_DESKNAME_BOTTOM 2
|
|
||||||
#define PAGER_DESKNAME_LEFT 3
|
|
||||||
#define PAGER_DESKNAME_RIGHT 4
|
|
||||||
|
|
||||||
struct _Config
|
|
||||||
{
|
|
||||||
unsigned int popup;
|
|
||||||
double popup_speed;
|
|
||||||
unsigned int popup_urgent;
|
|
||||||
unsigned int popup_urgent_stick;
|
|
||||||
unsigned int popup_urgent_focus;
|
|
||||||
double popup_urgent_speed;
|
|
||||||
unsigned int show_desk_names;
|
|
||||||
int popup_act_height; /*keyaction popup */
|
|
||||||
int popup_height; /* urgent/on-deskswitch popup*/
|
|
||||||
unsigned int drag_resist;
|
|
||||||
unsigned int btn_drag;
|
|
||||||
unsigned int btn_noplace;
|
|
||||||
unsigned int btn_desk;
|
|
||||||
unsigned int flip_desk;
|
|
||||||
unsigned int disable_live_preview;
|
|
||||||
|
|
||||||
/* just config state */
|
|
||||||
E_Module *module;
|
|
||||||
E_Config_Dialog *config_dialog;
|
|
||||||
Eina_List *instances, *handlers;
|
|
||||||
};
|
|
||||||
|
|
||||||
E_API extern E_Module_Api e_modapi;
|
|
||||||
|
|
||||||
E_API void *e_modapi_init(E_Module *m);
|
|
||||||
E_API int e_modapi_shutdown(E_Module *m);
|
|
||||||
E_API int e_modapi_save(E_Module *m);
|
|
||||||
|
|
||||||
EINTERN void _pager_cb_config_updated(void);
|
|
||||||
EINTERN void _config_pager_module(Config_Item *ci);
|
|
||||||
extern Config *pager_config;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @addtogroup Optional_Gadgets
|
|
||||||
* @{
|
|
||||||
*
|
|
||||||
* @defgroup Module_Pager Virtual Desktop Pager
|
|
||||||
*
|
|
||||||
* Shows the grid of virtual desktops and allows changing between
|
|
||||||
* them.
|
|
||||||
*
|
|
||||||
* @}
|
|
||||||
*/
|
|
||||||
#endif
|
|
|
@ -1,5 +0,0 @@
|
||||||
src = files(
|
|
||||||
'e_mod_main.c',
|
|
||||||
'e_mod_config.c',
|
|
||||||
'e_mod_main.h'
|
|
||||||
)
|
|
|
@ -1,35 +0,0 @@
|
||||||
[Desktop Entry]
|
|
||||||
Type=Link
|
|
||||||
Name=Pager Plain
|
|
||||||
Name[ca]=Paginador Plain
|
|
||||||
Name[cs]=Přepínač ploch Plain
|
|
||||||
Name[de]=Pager Plain
|
|
||||||
Name[eo]=Tabulpaĝilo Plain
|
|
||||||
Name[es]=Paginador Plain
|
|
||||||
Name[fr]=Miniature des bureaux ordinaire
|
|
||||||
Name[gl]=Paxinador Plain
|
|
||||||
Name[hu]=Lapozó Plain
|
|
||||||
Name[it]=Pager (senza miniature)
|
|
||||||
Name[ms]=Penghalaman Plain
|
|
||||||
Name[pt]=Paginador Plain
|
|
||||||
Name[ru]=Простой пейджер
|
|
||||||
Name[sr]=Страничник Plain
|
|
||||||
Name[tr]=Sayfalayıcı Plain
|
|
||||||
Comment=Gadget to allow you to visualize your virtual desktops and the windows they contain.
|
|
||||||
Comment[ca]=Permet visualitzar els escriptoris virtuals i les finestres que contenen.
|
|
||||||
Comment[cs]=Gadget pro zobrazení/přepínání virtuálních ploch a oken, které obsahují.
|
|
||||||
Comment[de]=Visualisiert die virtuellen Desktops und die enthaltenen Fenster.
|
|
||||||
Comment[eo]=Vidigi siajn virtualajn labortablojn kaj ties fenestrojn.
|
|
||||||
Comment[es]=Dispositivo que permite visualizar los escritorios virtuales y las ventanas que contienen.
|
|
||||||
Comment[fr]=Visualise les bureaux virtuels et les fenêtres qu'ils contiennent.
|
|
||||||
Comment[gl]=Gadget que lle permite visualizar os escritorios virtuais e as xanelas que conteñen.
|
|
||||||
Comment[hu]=Ez a modul lehetővé teszi számunkra a látványos, virtuális munkaasztalok közötti váltást.
|
|
||||||
Comment[it]=Modulo che permette di visualizzare i desktop virtuali e le finestre che contengono.
|
|
||||||
Comment[ms]=Gadjet yang membolehkan anda visualkan desktop maya anda dan tetingkap didalamnya.
|
|
||||||
Comment[nl]=Programmaatje om uw virtuele bureaubladen te visualiseren en de vensters die ze bevatten.
|
|
||||||
Comment[pt]=Permite-lhe visualizar as áreas virtuais e as janelas que nelas existem
|
|
||||||
Comment[ru]=Гаджет для отображения виртуальных столов и содержащихся на них окон.
|
|
||||||
Comment[sr]=Справица која дочарава нестварне површи и прозоре које оне садрже.
|
|
||||||
Comment[tr]=Sanal masaüstlerini ve içerisindeki pencereleri görselleştirmenizi sağlayan araç.
|
|
||||||
Icon=e-module-pager_plain
|
|
||||||
X-Enlightenment-ModuleType=utils
|
|
Loading…
Reference in New Issue