Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
aclass.c menus.c tooltips.c
Log Message:
Localization tweak.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/aclass.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- aclass.c 10 Aug 2005 19:33:33 -0000 1.19
+++ aclass.c 14 Aug 2005 21:25:46 -0000 1.20
@@ -97,7 +97,7 @@
aa->key = XKeysymToKeycode(disp, XStringToKeysym(key));
aa->key_str = (aa->key) ? Estrdup(key) : NULL;
aa->tooltipstring =
- (tooltipstring) ? Estrdup((tooltipstring[0]) ? _(tooltipstring) : "?!?")
:
+ (tooltipstring) ? Estrdup((tooltipstring[0]) ? tooltipstring : "?!?") :
NULL;
return aa;
@@ -271,7 +271,7 @@
case CONFIG_CLOSE:
ac->tooltipstring =
(aclass_tooltipstring) ? Estrdup((aclass_tooltipstring[0]) ?
- _(aclass_tooltipstring) :
+ aclass_tooltipstring :
"?!?") : NULL;
_EFREE(aclass_tooltipstring);
_EFREE(action_tooltipstring);
@@ -660,15 +660,13 @@
/* FIXME - Multiple line strings may break */
if (aa)
{
- ss = Estrdupcat2(aa->tooltipstring, "\n", atword(s, 2));
- aa->tooltipstring = (ss && ss[0]) ? Estrdup(_(ss)) : NULL;
- _EFREE(ss);
+ aa->tooltipstring =
+ Estrdupcat2(aa->tooltipstring, "\n", atword(s, 2));
}
else if (ac)
{
- ss = Estrdupcat2(ac->tooltipstring, "\n", atword(s, 2));
- ac->tooltipstring = (ss && ss[0]) ? Estrdup(_(ss)) : NULL;
- _EFREE(ss);
+ ac->tooltipstring =
+ Estrdupcat2(ac->tooltipstring, "\n", atword(s, 2));
}
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -3 -r1.207 -r1.208
--- menus.c 7 Aug 2005 20:33:19 -0000 1.207
+++ menus.c 14 Aug 2005 21:25:46 -0000 1.208
@@ -369,7 +369,7 @@
if (iclass)
iclass->ref_count++;
- mi->text = (text) ? Estrdup((text[0]) ? _(text) : "?!?") : NULL;
+ mi->text = (text) ? Estrdup((text[0]) ? text : "?!?") : NULL;
mi->params = Estrdup(action_params);
mi->child = child;
mi->state = STATE_NORMAL;
@@ -390,9 +390,7 @@
void
MenuSetTitle(Menu * m, const char *title)
{
- if (m->title)
- Efree(m->title);
- m->title = (title) ? Estrdup(_(title)) : NULL;
+ _EFDUP(m->title, title);
}
void
@@ -604,7 +602,7 @@
if (m->title)
{
- HintsSetWindowName(m->win, m->title);
+ HintsSetWindowName(m->win, _(m->title));
}
maxh = maxw = 0;
@@ -630,7 +628,8 @@
if ((m->style) && (m->style->tclass) && (m->items[i]->text))
{
- TextSize(m->style->tclass, 0, 0, 0, m->items[i]->text, &w, &h, 17);
+ TextSize(m->style->tclass, 0, 0, 0, _(m->items[i]->text), &w, &h,
+ 17);
if (h > maxh)
maxh = h;
if (w > maxx1)
@@ -885,8 +884,8 @@
if (mi->text)
{
TextDraw(m->style->tclass, mi_pmm->pmap, 0, 0, mi->state,
- mi->text, mi->text_x, mi->text_y, mi->text_w, mi->text_h,
- 17, m->style->tclass->justification);
+ _(mi->text), mi->text_x, mi->text_y, mi->text_w,
+ mi->text_h, 17, m->style->tclass->justification);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/tooltips.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- tooltips.c 7 Aug 2005 20:33:20 -0000 1.81
+++ tooltips.c 14 Aug 2005 21:25:46 -0000 1.82
@@ -291,6 +291,7 @@
tts = ActionGetTooltipString(aa);
if (!tts)
continue;
+ tts = _(tts);
TextSize(tt->tclass, 0, 0, STATE_NORMAL, tts, &temp_w, &temp_h,
17);
@@ -588,6 +589,7 @@
tts = ActionGetTooltipString(aa);
if (!tts)
continue;
+ tts = _(tts);
if (ActionGetEvent(aa) == EVENT_DOUBLE_DOWN)
{
@@ -742,6 +744,8 @@
tts = ActionclassGetTooltipString(ac);
if (tts)
{
+ tts = _(tts);
+
if (Conf_tooltips.showroottooltip)
{
TooltipShow(ttip, tts, ac, x, y);
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
