[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50755] trunk/blender/source/blender/ editors/interface: Fixed "cleaning" of some menu labels ( those with all the ugly %t/|), wasn't working in all cases.
Bastien Montagne
montagne29 at wanadoo.fr
Wed Sep 19 21:42:01 CEST 2012
Revision: 50755
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50755
Author: mont29
Date: 2012-09-19 19:42:01 +0000 (Wed, 19 Sep 2012)
Log Message:
-----------
Fixed "cleaning" of some menu labels (those with all the ugly %t/|), wasn't working in all cases.
Also cleaned some old, no more used piece of code.
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2012-09-19 19:28:29 UTC (rev 50754)
+++ trunk/blender/source/blender/editors/interface/interface.c 2012-09-19 19:42:01 UTC (rev 50755)
@@ -3790,16 +3790,17 @@
if (type == BUT_GET_LABEL) {
if (but->str) {
/* Menu labels can have some complex formating stuff marked by pipes or %t, we don't want those here! */
- const char *tc;
-
- if (but->type == MENU)
- tc = strstr(but->str, "%t");
+ const char *tc1, *tc2;
+
+ tc1 = strstr(but->str, "%t");
+ tc2 = strstr(but->str, "|"); /* XXX For some reason strchr seems to not work here? */
+
+ if (tc2 && (!tc1 || tc1 > tc2))
+ tc1 = tc2;
+
+ if (tc1)
+ tmp = BLI_strdupn(but->str, tc1 - but->str);
else
- tc = strchr(but->str, '|');
-
- if (tc)
- tmp = BLI_strdupn(but->str, tc - but->str);
- else
tmp = BLI_strdup(but->str);
}
else
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-09-19 19:28:29 UTC (rev 50754)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-09-19 19:42:01 UTC (rev 50755)
@@ -4513,17 +4513,8 @@
button_timers_tooltip_remove(C, but);
-#if 0
- if (but->rnaprop)
- name = RNA_property_ui_name(but->rnaprop);
- else if (but->optype && but->optype->srna)
- name = RNA_struct_ui_name(but->optype->srna);
- else
- name = IFACE_("<needs_name>"); // XXX - should never happen.
-#else
uiButGetStrInfo(C, but, 1, &label);
name = label.strinfo;
-#endif
pup = uiPupMenuBegin(C, name, ICON_NONE);
layout = uiPupMenuLayout(pup);
More information about the Bf-blender-cvs
mailing list