rename pager16 to pager and pager to pager_plain
this will mean all users upgrading from e18 to e19 get the new preview pager. thoose wanting the older plain pager can switch ti pager_plain. anyon using git will find pager16 remove (or if still installed not updated) so switch back to pager from pager16. :)
This commit is contained in:
parent
6d0ef37821
commit
e2ec390021
|
@ -913,7 +913,7 @@ AM_CONDITIONAL([HAVE_WL_DRM], [test "x${WL_DRM}" = "xtrue"])
|
|||
AC_E_OPTIONAL_MODULE([ibar], true)
|
||||
AC_E_OPTIONAL_MODULE([clock], true)
|
||||
AC_E_OPTIONAL_MODULE([pager], true)
|
||||
AC_E_OPTIONAL_MODULE([pager16], true)
|
||||
AC_E_OPTIONAL_MODULE([pager_plain], true)
|
||||
AC_E_OPTIONAL_MODULE([battery], true, [CHECK_MODULE_BATTERY])
|
||||
AC_E_OPTIONAL_MODULE([temperature], true, [CHECK_MODULE_TEMPERATURE])
|
||||
AC_E_OPTIONAL_MODULE([notification], true, [CHECK_MODULE_NOTIFICATION])
|
||||
|
@ -1027,7 +1027,7 @@ src/bin/e_fm_shared_types.h
|
|||
src/modules/ibar/module.desktop
|
||||
src/modules/clock/module.desktop
|
||||
src/modules/pager/module.desktop
|
||||
src/modules/pager16/module.desktop
|
||||
src/modules/pager_plain/module.desktop
|
||||
src/modules/battery/module.desktop
|
||||
src/modules/temperature/module.desktop
|
||||
src/modules/notification/module.desktop
|
||||
|
|
|
@ -20,7 +20,7 @@ include src/modules/Makefile_clock.mk
|
|||
|
||||
include src/modules/Makefile_pager.mk
|
||||
|
||||
include src/modules/Makefile_pager16.mk
|
||||
include src/modules/Makefile_pager_plain.mk
|
||||
|
||||
include src/modules/Makefile_battery.mk
|
||||
|
||||
|
|
|
@ -1,22 +0,0 @@
|
|||
EXTRA_DIST += src/modules/pager16/module.desktop.in \
|
||||
src/modules/pager16/e-module-pager16.edj
|
||||
if USE_MODULE_PAGER16
|
||||
pager16dir = $(MDIR)/pager16
|
||||
pager16_DATA = src/modules/pager16/e-module-pager16.edj \
|
||||
src/modules/pager16/module.desktop
|
||||
|
||||
|
||||
pager16pkgdir = $(MDIR)/pager16/$(MODULE_ARCH)
|
||||
pager16pkg_LTLIBRARIES = src/modules/pager16/module.la
|
||||
|
||||
src_modules_pager16_module_la_LIBADD = $(MOD_LIBS)
|
||||
src_modules_pager16_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
|
||||
src_modules_pager16_module_la_LDFLAGS = $(MOD_LDFLAGS)
|
||||
src_modules_pager16_module_la_SOURCES = src/modules/pager16/e_mod_main.h \
|
||||
src/modules/pager16/e_mod_main.c \
|
||||
src/modules/pager16/e_mod_config.c
|
||||
|
||||
PHONIES += pager16 install-pager16
|
||||
pager16: $(pager16pkg_LTLIBRARIES) $(pager16_DATA)
|
||||
install-pager16: install-pager16DATA install-pager16pkgLTLIBRARIES
|
||||
endif
|
|
@ -0,0 +1,22 @@
|
|||
EXTRA_DIST += src/modules/pager_plain/module.desktop.in \
|
||||
src/modules/pager_plain/e-module-pager-plain.edj
|
||||
if USE_MODULE_PAGER_PLAIN
|
||||
pager_plaindir = $(MDIR)/pager_plain
|
||||
pager_plain_DATA = src/modules/pager_plain/e-module-pager-plain.edj \
|
||||
src/modules/pager_plain/module.desktop
|
||||
|
||||
|
||||
pager_plainpkgdir = $(MDIR)/pager_plain/$(MODULE_ARCH)
|
||||
pager_plainpkg_LTLIBRARIES = src/modules/pager_plain/module.la
|
||||
|
||||
src_modules_pager_plain_module_la_LIBADD = $(MOD_LIBS)
|
||||
src_modules_pager_plain_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
|
||||
src_modules_pager_plain_module_la_LDFLAGS = $(MOD_LDFLAGS)
|
||||
src_modules_pager_plain_module_la_SOURCES = src/modules/pager_plain/e_mod_main.h \
|
||||
src/modules/pager_plain/e_mod_main.c \
|
||||
src/modules/pager_plain/e_mod_config.c
|
||||
|
||||
PHONIES += pager-plain install-pager-plain
|
||||
pager_plain: $(pager_plainpkg_LTLIBRARIES) $(pager_plain_DATA)
|
||||
install-pager-plain: install-pager-plainDATA install-pager-plainpkgLTLIBRARIES
|
||||
endif
|
|
@ -29,7 +29,7 @@ struct _E_Config_Dialog_Data
|
|||
Evas_Object *ob1, *ob2, *ob3;
|
||||
Eina_List *popup_list, *urgent_list;
|
||||
} gui;
|
||||
int drag_resist, flip_desk, show_desk_names, live_preview;
|
||||
int drag_resist, flip_desk, show_desk_names;
|
||||
E_Config_Dialog *cfd;
|
||||
};
|
||||
|
||||
|
@ -105,7 +105,6 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
|||
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;
|
||||
}
|
||||
|
||||
|
@ -133,9 +132,6 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
|||
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);
|
||||
|
@ -155,7 +151,6 @@ _basic_apply(E_Config_Dialog *cfd __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();
|
||||
|
@ -168,7 +163,6 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
|
|||
{
|
||||
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;
|
||||
|
||||
|
@ -192,9 +186,6 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
|||
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,
|
||||
|
@ -303,7 +294,6 @@ _adv_apply(E_Config_Dialog *cfd __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;
|
||||
|
@ -326,7 +316,6 @@ _adv_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata
|
|||
if ((int)pager_config->popup != cfdata->popup.show) return 1;
|
||||
if (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;
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -31,7 +31,6 @@ struct _Config
|
|||
unsigned int btn_noplace;
|
||||
unsigned int btn_desk;
|
||||
unsigned int flip_desk;
|
||||
unsigned int disable_live_preview;
|
||||
|
||||
/* just config state */
|
||||
E_Module *module;
|
||||
|
|
|
@ -13,7 +13,6 @@ Name[hu]=Lapozó
|
|||
Name[ms]=Penghalaman
|
||||
Name[pt]=Paginador
|
||||
Name[ru]=Пейджер
|
||||
Name[sr]=Страничник
|
||||
Name[tr]=Sayfalayıcı
|
||||
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.
|
||||
|
|
|
@ -29,7 +29,7 @@ struct _E_Config_Dialog_Data
|
|||
Evas_Object *ob1, *ob2, *ob3;
|
||||
Eina_List *popup_list, *urgent_list;
|
||||
} gui;
|
||||
int drag_resist, flip_desk, show_desk_names;
|
||||
int drag_resist, flip_desk, show_desk_names, live_preview;
|
||||
E_Config_Dialog *cfd;
|
||||
};
|
||||
|
||||
|
@ -70,7 +70,7 @@ _config_pager_module(Config_Item *ci)
|
|||
v->advanced.apply_cfdata = _adv_apply;
|
||||
v->advanced.check_changed = _adv_check_changed;
|
||||
|
||||
snprintf(buff, sizeof(buff), "%s/e-module-pager.edj",
|
||||
snprintf(buff, sizeof(buff), "%s/e-module-pager-plain.edj",
|
||||
pager_config->module->dir);
|
||||
comp = e_comp_get(NULL);
|
||||
cfd = e_config_dialog_new(comp, _("Pager Settings"), "E",
|
||||
|
@ -105,6 +105,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
|||
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;
|
||||
}
|
||||
|
||||
|
@ -132,6 +133,9 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
|||
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);
|
||||
|
@ -151,6 +155,7 @@ _basic_apply(E_Config_Dialog *cfd __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();
|
||||
|
@ -163,6 +168,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
|
|||
{
|
||||
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;
|
||||
|
||||
|
@ -186,6 +192,9 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
|||
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,
|
||||
|
@ -294,6 +303,7 @@ _adv_apply(E_Config_Dialog *cfd __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;
|
||||
|
@ -316,6 +326,7 @@ _adv_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata
|
|||
if ((int)pager_config->popup != cfdata->popup.show) return 1;
|
||||
if (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;
|
File diff suppressed because it is too large
Load Diff
|
@ -31,6 +31,7 @@ struct _Config
|
|||
unsigned int btn_noplace;
|
||||
unsigned int btn_desk;
|
||||
unsigned int flip_desk;
|
||||
unsigned int disable_live_preview;
|
||||
|
||||
/* just config state */
|
||||
E_Module *module;
|
|
@ -1,19 +1,20 @@
|
|||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Type=Link
|
||||
Name=Pager16
|
||||
Name[ca]=Paginador
|
||||
Name[cs]=Přepínač ploch
|
||||
Name[de]=Pager
|
||||
Name[eo]=Tabulpaĝilo
|
||||
Name[es]=Paginador
|
||||
Name[fr]=Miniature des bureaux
|
||||
Name[gl]=Paxinador
|
||||
Name[hu]=Lapozó
|
||||
Name[ms]=Penghalaman16
|
||||
Name[pt]=Paginador
|
||||
Name[ru]=Пейджер16
|
||||
Name[tr]=Sayfalayıcı
|
||||
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 Plain
|
||||
Name[gl]=Paxinador Plain
|
||||
Name[hu]=Lapozó Plain
|
||||
Name[ms]=Penghalaman Plain
|
||||
Name[pt]=Paginador Plain
|
||||
Name[ru]=Пейджер Plain
|
||||
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í.
|
||||
|
@ -30,5 +31,5 @@ Comment[pt]=Permite-lhe visualizar as áreas virtuais e as janelas que nelas exi
|
|||
Comment[ru]=Гаджет для отображения виртуальных столов и содержащихся на них окон.
|
||||
Comment[sr]=Справица која дочарава нестварне површи и прозоре које оне садрже.
|
||||
Comment[tr]=Sanal masaüstlerini ve içerisindeki pencereleri görselleştirmenizi sağlayan araç.
|
||||
Icon=e-module-pager
|
||||
Icon=e-module-pager-plain
|
||||
X-Enlightenment-ModuleType=utils
|
Loading…
Reference in New Issue