damn - um... patches from mailing list - fix patch with layer number. da.po -


			
			
				devs/princeamd/enlightenment-0.17-elive
			
			
		
Carsten Haitzler 18 years ago
parent 8a4ecb99ce
commit 6e73e8ff11
  1. 1
      autogen.sh
  2. 3
      configure.in
  3. 143
      data/themes/default_clock.edc
  4. 85
      po/Makefile.am
  5. 1311
      po/da.po
  6. 3
      src/bin/e_apps.c
  7. 6
      src/bin/e_border.c
  8. 1
      src/bin/e_intl.c
  9. 1
      src/bin/e_ipc_handlers.h
  10. 3
      src/bin/e_utils.c
  11. 21
      src/bin/e_zone.c
  12. 1
      src/bin/e_zone.h
  13. 116
      src/modules/clock/e_mod_main.c
  14. 4
      src/modules/clock/e_mod_main.h
  15. 2
      src/modules/ibar/e_mod_main.c
  16. 2
      src/modules/test/e_mod_main.c

@ -10,7 +10,6 @@ echo "Running aclocal..."; aclocal $ACLOCAL_FLAGS -I m4 \
&& echo "Running automake..."; automake --add-missing --copy --gnu \
&& echo "Generating gettext enlightenment.pot template"; \
xgettext \
-s \
-n \
-C \
-d enlightenment \

@ -124,7 +124,8 @@ AC_CHECK_HEADER(X11/X.h,
AC_SUBST(x_cflags)
AC_SUBST(x_libs)
ALL_LINGUAS="bg de es fi fr ja pl pt ru zh_CN hu sl it cs"
ALL_LINGUAS="bg de es fi fr ja pl pt ru zh_CN hu sl it cs da"
AC_SUBST(ALL_LINGUAS)
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION(0.12.1)

@ -1,6 +1,7 @@
images {
image: "e17_clock_bg.png" COMP;
image: "e17_clock_fg.png" COMP;
image: "e17_button.png" COMP;
image: "e17_clock_seconds_00.png" COMP;
image: "e17_clock_seconds_01.png" COMP;
image: "e17_clock_seconds_02.png" COMP;
@ -187,9 +188,23 @@ group {
script {
public clock_cb(val) {
new buf[11];
new digitalVal[15];
new hourStr[4], minuteStr[4], secondStr[4];
new year, month, day, yearday, weekday, hour, minute;
new Float:second;
new v;
new isAfternoon;
new digiBuf[2];
new digitalStyle;
new DIGITAL_STYLE_NONE, DIGITAL_STYLE_NORMAL, DIGITAL_STYLE_MILITARY;
DIGITAL_STYLE_NONE = 0;
DIGITAL_STYLE_NORMAL = 1;
DIGITAL_STYLE_MILITARY = 2;
get_text(PART:"digitalStyle", digiBuf, 2);
digitalStyle = atoi(digiBuf);
date(year, month, day, yearday, weekday, hour, minute, second);
v = round(second);
@ -200,6 +215,7 @@ group {
#endif
#if E17_PROFILE != HIRES_PDA && E17_PROFILE != LOWRES_PDA && E17_PROFILE != MEDIUMRES_PDA
buf[0] = 0;
digitalVal[0] = 0;
if (v < 10) {snprintf(buf, 10, "0%i", v);}
else {snprintf(buf, 10, "%i", v);}
set_state(PART:"seconds", buf, 0.0);
@ -209,11 +225,61 @@ group {
if (v < 10) {snprintf(buf, 10, "0%i", v);}
else {snprintf(buf, 10, "%i", v);}
set_state(PART:"minutes", buf, 0.0);
v = ((hour % 12) * 5) + ((minute * 5) / 60);
buf[0] = 0;
if (v < 10) {snprintf(buf, 10, "0%i", v);}
else {snprintf(buf, 10, "%i", v);}
set_state(PART:"hour", buf, 0.0);
buf[0] = 0;
v = round(second);
if (v < 10) {snprintf(buf, 10, "0%i", v);}
else {snprintf(buf, 10, "%i", v);}
snprintf(secondStr, 3, "%s", buf);
buf[0] = 0;
if (minute < 10) {snprintf(buf, 10, "0%i", minute);}
else {snprintf(buf, 10, "%i", minute);}
snprintf(minuteStr, 3, "%s", buf);
buf[0] = 0;
isAfternoon = 0;
v = hour;
if (hour >= 12 && hour < 24) { isAfternoon = 1; }
if (digitalStyle == DIGITAL_STYLE_MILITARY) {
if (v == 0) { v = 24; }
} else {
v = (v % 12);
if (v == 0) { v = 12; }
}
snprintf(buf, 10, "%i", v);
snprintf(hourStr, 3, "%s", buf);
buf[0] = 0;
if (isAfternoon == 1) {
snprintf(buf, 10, "PM");
} else {
snprintf(buf, 10, "AM");
}
if (digitalStyle != DIGITAL_STYLE_NONE) {
if (digitalStyle == DIGITAL_STYLE_NORMAL) {
snprintf(digitalVal, 14, "%s:%s:%s %s", hourStr, minuteStr, secondStr, buf);
} else if (digitalStyle == DIGITAL_STYLE_MILITARY) {
snprintf(digitalVal, 14, "%s:%s:%s", hourStr, minuteStr, secondStr);
}
set_text(PART:"digital", digitalVal);
set_state(PART:"digital", "digital", 0.0);
set_state(PART:"digital_bg", "digital", 0.0);
} else {
set_text(PART:"digital", "");
set_state(PART:"digital", "hidden", 0.0);
set_state(PART:"digital_bg", "hidden", 0.0);
}
}
}
parts {
@ -521,6 +587,83 @@ group {
}
}
}
part {
name: "digital_bg";
mouse_events: 0;
description {
state: "digital" 0.0;
image {
normal: "e17_button.png";
}
rel1 {
relative: 0.0 1.0;
}
rel2 {
relative: 1.0 1.2;
}
}
description {
state: "hidden" 0.0;
image {
normal: "e17_button.png";
}
rel1 {
relative: 0.0 0.0;
}
rel2 {
relative: 0.0 0.0;
}
}
}
part {
name: "digital";
type: TEXT;
effect: SOFT_SHADOW;
description {
state: "digital" 0.0;
min: 0 11;
rel1 {
relative: 0.0 0.9;
}
rel2 {
relative: 1.0 1.0;
}
color: 255 255 255 255;
color3: 0 0 0 32;
text {
text: "00:00:00 AM";
font: "Edje Vera";
size: 7;
min: 1 0;
fit: 0 1;
align: 0.5 1.0;
}
}
description {
state: "hidden" 0.0;
aspect: 0.0 0.0;
rel1 {
relative: 0.0 0.0;
}
rel2 {
relative: 0.0 0.0;
}
}
}
part {
name: "digitalStyle";
type: TEXT;
description {
state: "hidden" 0.0;
aspect: 0.0 0.0;
rel1 {
relative: 0.0 0.0;
}
rel2 {
relative: 0.0 0.0;
}
}
}
}
programs {
program {

@ -3,95 +3,24 @@ MAINTAINERCLEANFILES = Makefile.in
MSGFMT = msgfmt
podir =
po_DATA = \
fr.mo \
ja.mo \
es.mo \
pt.mo \
fi.mo \
ru.mo \
bg.mo \
de.mo \
pl.mo \
zh_CN.mo \
hu.mo \
sl.mo \
it.mo \
cs.mo
po_DATA = $(addsuffix .mo,$(ALL_LINGUAS))
LANGS = \
fr \
ja \
es \
pt \
fi \
ru \
bg \
de \
pl \
zh_CN \
hu \
sl \
it \
cs
EXTRA_DIST = enlightenment.pot $(addsuffix .po,$(ALL_LINGUAS))
EXTRA_DIST = \
enlightenment.pot \
fr.po \
ja.po \
es.po \
pt.po \
fi.po \
ru.po \
bg.po \
de.po \
pl.po \
zh_CN.po \
hu.po \
sl.po \
it.po \
cs.po
ja.mo:
$(MSGFMT) -f -o $@ $(top_srcdir)/po/ja.po
fr.mo:
$(MSGFMT) -f -o $@ $(top_srcdir)/po/fr.po
es.mo:
$(MSGFMT) -f -o $@ $(top_srcdir)/po/es.po
pt.mo:
$(MSGFMT) -f -o $@ $(top_srcdir)/po/pt.po
fi.mo:
$(MSGFMT) -f -o $@ $(top_srcdir)/po/fi.po
ru.mo:
$(MSGFMT) -f -o $@ $(top_srcdir)/po/ru.po
bg.mo:
$(MSGFMT) -f -o $@ $(top_srcdir)/po/bg.po
de.mo:
$(MSGFMT) -f -o $@ $(top_srcdir)/po/de.po
pl.mo:
$(MSGFMT) -f -o $@ $(top_srcdir)/po/pl.po
zh_CN.mo:
$(MSGFMT) -f -o $@ $(top_srcdir)/po/zh_CN.po
hu.mo:
$(MSGFMT) -f -o $@ $(top_srcdir)/po/hu.po
sl.mo:
$(MSGFMT) -f -o $@ $(top_srcdir)/po/sl.po
it.mo:
$(MSGFMT) -f -o $@ $(top_srcdir)/po/it.po
cs.mo:
$(MSGFMT) -f -o $@ $(top_srcdir)/po/cs.po
%.mo : %.po
$(MSGFMT) -f -o $@ $<
install-poDATA:
uninstall-poDATA:
install-data-local:
for L in $(LANGS); do \
for L in $(ALL_LINGUAS); do \
$(mkinstalldirs) $(DESTDIR)$(datadir)/locale/$$L/LC_MESSAGES; \
$(INSTALL_DATA) \
$$L.mo $(DESTDIR)$(datadir)/locale/$$L/LC_MESSAGES/$(PACKAGE).mo; \
done
uninstall:
for L in $(LANGS); do \
for L in $(ALL_LINGUAS); do \
rm -f $(DESTDIR)$(datadir)/locale/$$L/LC_MESSAGES/$(PACKAGE).mo; \
done

1311
po/da.po

File diff suppressed because it is too large Load Diff

@ -263,8 +263,7 @@ e_app_exec(E_App *a)
if (!exe)
{
e_error_dialog_show(_("Run Error"),
_("Enlightenment was unable fork a child process\n"
"to run the execute line:\n"
_("Enlightenment was unable fork a child process:\n"
"\n"
"%s\n"
"\n"),

@ -5736,7 +5736,7 @@ _e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key)
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Always Below"));
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, (bd->layer == 0 ? 1 : 0));
e_menu_item_toggle_set(mi, (bd->layer == 50 ? 1 : 0));
e_menu_item_callback_set(mi, _e_border_menu_cb_below, bd);
e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/borders",
@ -5991,14 +5991,14 @@ _e_border_menu_cb_below(void *data, E_Menu *m, E_Menu_Item *mi)
E_Border *bd;
bd = data;
if (bd->layer == 0)
if (bd->layer == 50)
{
bd->layer = 100;
e_hints_window_stacking_set(bd, E_STACKING_NONE);
}
else
{
bd->layer = 0;
bd->layer = 50;
e_hints_window_stacking_set(bd, E_STACKING_BELOW);
}
e_container_border_raise(bd);

@ -63,6 +63,7 @@ e_intl_init(void)
ADD_LANG("sl_SI.UTF-8");
ADD_LANG("it_IT.UTF-8");
ADD_LANG("cs_CS.UTF-8");
ADD_LANG("da_DK.UTF-8");
if ((s = getenv("LC_MESSAGES"))) _e_intl_orig_lc_messages = strdup(s);
if ((s = getenv("LANGUAGE"))) _e_intl_orig_language = strdup(s);

@ -1492,6 +1492,7 @@ break;
START_INT(value, HDL);
e_config->use_edge_flip = value;
E_CONFIG_LIMIT(e_config->use_edge_flip, 0, 1);
e_zone_update_flip_all();
SAVE;
END_INT;
#elif (TYPE == E_REMOTE_IN)

@ -198,8 +198,7 @@ e_util_head_exec(int head, char *cmd)
if (!exe)
{
e_error_dialog_show(_("Run Error"),
_("Enlightenment was unable fork a child process\n"
"to run the execute line:\n"
_("Enlightenment was unable fork a child process:\n"
"\n"
"%s\n"
"\n"),

@ -384,6 +384,27 @@ e_zone_update_flip(E_Zone *zone)
_e_zone_update_flip(zone);
}
void
e_zone_update_flip_all(void)
{
Evas_List *l, *ll;
E_Manager *man;
E_Container *con;
E_Zone *zone;
for (l = e_manager_list(); l; l = l->next)
{
man = l->data;
for (ll = man->containers; ll; ll = ll->next)
{
con = ll->data;
zone = e_zone_current_get(con);
e_zone_update_flip(zone);
}
}
}
void
e_zone_desk_flip_by(E_Zone *zone, int dx, int dy)
{

@ -75,6 +75,7 @@ EAPI void e_zone_flip_coords_handle(E_Zone *zone, int x, int y);
EAPI void e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count);
EAPI void e_zone_desk_count_get(E_Zone *zone, int *x_count, int *y_count);
EAPI void e_zone_update_flip(E_Zone *zone);
EAPI void e_zone_update_flip_all(void);
EAPI void e_zone_desk_flip_by(E_Zone *zone, int dx, int dy);
EAPI void e_zone_desk_flip_to(E_Zone *zone, int x, int y);
EAPI void e_zone_desk_linear_flip_by(E_Zone *zone, int dx);

@ -22,12 +22,21 @@ static void _clock_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gad
static void _clock_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _clock_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi);
static void _clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi);
static void _clock_face_cb_digital_none(void *data, E_Menu *m, E_Menu_Item *mi);
static void _clock_face_cb_digital_normal(void *data, E_Menu *m, E_Menu_Item *mi);
static void _clock_face_cb_digital_military(void *data, E_Menu *m, E_Menu_Item *mi);
static int _clock_count;
static E_Config_DD *conf_edd;
static E_Config_DD *conf_face_edd;
const int
DIGITAL_STYLE_NONE = 0,
DIGITAL_STYLE_NORMAL = 1,
DIGITAL_STYLE_MILITARY = 2
;
/* public module routines. all modules must have these */
void *
e_modapi_init(E_Module *module)
@ -115,6 +124,7 @@ _clock_new()
#define T Config_Face
#define D conf_face_edd
E_CONFIG_VAL(D, T, enabled, UCHAR);
E_CONFIG_VAL(D, T, digitalStyle, INT);
conf_edd = E_CONFIG_DD_NEW("Clock_Config", Config);
#undef T
@ -153,6 +163,7 @@ _clock_new()
{
face->conf = E_NEW(Config_Face, 1);
face->conf->enabled = 1;
face->conf->digitalStyle = DIGITAL_STYLE_NONE;
clock->conf->faces = evas_list_append(clock->conf->faces, face->conf);
}
else
@ -289,7 +300,7 @@ _clock_face_disable(Clock_Face *face)
static void
_clock_face_menu_new(Clock_Face *face)
{
E_Menu *mn;
E_Menu *mn, *smn;
E_Menu_Item *mi;
mn = e_menu_new();
@ -308,6 +319,52 @@ _clock_face_menu_new(Clock_Face *face)
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Edit Mode"));
e_menu_item_callback_set(mi, _clock_face_cb_menu_edit, face);
/*
* Create a Digital submenu
*/
smn = e_menu_new();
/* Hide digital time */
mi = e_menu_item_new(smn);
e_menu_item_label_set(mi, _("No Digital Display"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (face->conf->digitalStyle == DIGITAL_STYLE_NONE) {
e_menu_item_toggle_set(mi, 1);
_clock_face_cb_digital_none(face, smn, mi);
}
e_menu_item_callback_set(mi, _clock_face_cb_digital_none, face);
/* Show normal time */
mi = e_menu_item_new(smn);
e_menu_item_label_set(mi, _("Normal Time"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (face->conf->digitalStyle == DIGITAL_STYLE_NORMAL) {
e_menu_item_toggle_set(mi, 1);
_clock_face_cb_digital_normal(face, smn, mi);
}
e_menu_item_callback_set(mi, _clock_face_cb_digital_normal, face);
/* Show military time */
mi = e_menu_item_new(smn);
e_menu_item_label_set(mi, _("Military Time"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (face->conf->digitalStyle == DIGITAL_STYLE_MILITARY) {
e_menu_item_toggle_set(mi, 1);
_clock_face_cb_digital_military(face, smn, mi);
}
e_menu_item_callback_set(mi, _clock_face_cb_digital_military, face);
face->digital_menu = smn;
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Digital Display"));
e_menu_item_submenu_set(mi, face->digital_menu);
}
static void
@ -374,6 +431,63 @@ _clock_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi)
}
}
static void
_clock_face_cb_digital_none(void *data, E_Menu *m, E_Menu_Item *mi)
{
Clock_Face *face;
char buf[2];
face = data;
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf), "%i", DIGITAL_STYLE_NONE);
edje_object_part_text_set(face->clock_object, "digitalStyle", buf);
face->conf->digitalStyle = DIGITAL_STYLE_NONE;
e_config_save_queue();
}
static void
_clock_face_cb_digital_normal(void *data, E_Menu *m, E_Menu_Item *mi)
{
Clock_Face *face;
char buf[2];
face = data;
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf), "%i", DIGITAL_STYLE_NORMAL);
edje_object_part_text_set(face->clock_object, "digitalStyle", buf);
face->conf->digitalStyle = DIGITAL_STYLE_NORMAL;
e_config_save_queue();
}
static void
_clock_face_cb_digital_military(void *data, E_Menu *m, E_Menu_Item *mi)
{
Clock_Face *face;
char buf[2];
face = data;
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf), "%i", DIGITAL_STYLE_MILITARY);
edje_object_part_text_set(face->clock_object, "digitalStyle", buf);
face->conf->digitalStyle = DIGITAL_STYLE_MILITARY;
e_config_save_queue();
}
static void
_clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi)
{

@ -17,6 +17,9 @@ struct _Config
struct _Config_Face
{
unsigned char enabled;
int
digitalStyle
;
};
struct _Clock
@ -31,6 +34,7 @@ struct _Clock_Face
{
E_Container *con;
E_Menu *menu;
E_Menu *digital_menu;
Config_Face *conf;
Evas_Object *clock_object;

@ -172,7 +172,7 @@ e_modapi_about(E_Module *m)
e_error_dialog_show(_("Enlightenment IBar Module"),
_("This is the IBar Application Launcher bar module for Enlightenment.\n"
"It is a first example module and is being used to flesh out several\n"
"Interfaces in Enlightenment 0.17.0. It is under heavy development,\n"
"interfaces in Enlightenment 0.17.0. It is under heavy development,\n"
"so expect it to break often and change as it improves."));
return 1;
}

@ -66,6 +66,6 @@ e_modapi_about(E_Module *m)
e_error_dialog_show(_("Enlightenment Test Module"),
_("This module is VERY simple and is only used to test the basic\n"
"interface of the Enlightenment 0.17.0 module system. Please\n"
"Ignore this module unless you are working on the module system."));
"ignore this module unless you are working on the module system."));
return 1;
}

Loading…
Cancel
Save