[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51045] trunk/blender/source/blender/ editors: Kind of cleanup of "menu strings": always have a space between the entry's label and value ( these strings are a nightmare to handle in RTL languages like arabic or persian , but a bit less of a nightmare this way ; ) ).
Bastien Montagne
montagne29 at wanadoo.fr
Thu Oct 4 15:59:14 CEST 2012
Revision: 51045
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51045
Author: mont29
Date: 2012-10-04 13:59:14 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
Kind of cleanup of "menu strings": always have a space between the entry's label and value (these strings are a nightmare to handle in RTL languages like arabic or persian, but a bit less of a nightmare this way ;) ).
Modified Paths:
--------------
trunk/blender/source/blender/editors/armature/editarmature_sketch.c
trunk/blender/source/blender/editors/armature/poseobject.c
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/transform/transform_orientations.c
Modified: trunk/blender/source/blender/editors/armature/editarmature_sketch.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_sketch.c 2012-10-04 13:49:39 UTC (rev 51044)
+++ trunk/blender/source/blender/editors/armature/editarmature_sketch.c 2012-10-04 13:59:14 UTC (rev 51045)
@@ -41,6 +41,8 @@
#include "BLI_graph.h"
#include "BLI_ghash.h"
+#include "BLF_translation.h"
+
#include "BKE_context.h"
#include "BKE_sketch.h"
@@ -175,7 +177,7 @@
const char *BIF_listTemplates(const bContext *UNUSED(C))
{
GHashIterator ghi;
- char menu_header[] = "Template%t|None%x0|";
+ const char *menu_header = IFACE_("Template %t|None %x0|");
char *p;
if (TEMPLATES_MENU != NULL) {
@@ -194,7 +196,7 @@
Object *ob = BLI_ghashIterator_getValue(&ghi);
int key = GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(&ghi));
- p += sprintf(p, "|%s%%x%i", ob->id.name + 2, key);
+ p += sprintf(p, "|%s %%x%i", ob->id.name + 2, key);
BLI_ghashIterator_step(&ghi);
}
@@ -1717,8 +1719,8 @@
SK_Intersection *isect;
int command = 1;
-// XXX
-// command = pupmenu("Action %t|Flatten %x1|Straighten %x2|Polygonize %x3");
+/* XXX */
+/* command = pupmenu("Action %t|Flatten %x1|Straighten %x2|Polygonize %x3"); */
if (command < 1) return;
for (isect = gest->intersections.first; isect; isect = isect->next) {
Modified: trunk/blender/source/blender/editors/armature/poseobject.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poseobject.c 2012-10-04 13:49:39 UTC (rev 51044)
+++ trunk/blender/source/blender/editors/armature/poseobject.c 2012-10-04 13:59:14 UTC (rev 51045)
@@ -888,16 +888,16 @@
if (pose_has_protected_selected(ob, 0)) {
i = BLI_countlist(&(pchanact->constraints)); /* if there are 24 or less, allow for the user to select constraints */
if (i < 25)
- nr = pupmenu("Copy Pose Attributes %t|Local Location%x1|Local Rotation%x2|Local Size%x3|%l|Visual Location %x9|Visual Rotation%x10|Visual Size%x11|%l|Constraints (All)%x4|Constraints...%x5");
+ nr = pupmenu("Copy Pose Attributes %t|Local Location %x1|Local Rotation %x2|Local Size %x3|%l|Visual Location %x9|Visual Rotation %x10|Visual Size %x11|%l|Constraints (All) %x4|Constraints... %x5");
else
- nr = pupmenu("Copy Pose Attributes %t|Local Location%x1|Local Rotation%x2|Local Size%x3|%l|Visual Location %x9|Visual Rotation%x10|Visual Size%x11|%l|Constraints (All)%x4");
+ nr = pupmenu("Copy Pose Attributes %t|Local Location %x1|Local Rotation %x2|Local Size %x3|%l|Visual Location %x9|Visual Rotation %x10|Visual Size %x11|%l|Constraints (All) %x4");
}
else {
i = BLI_countlist(&(pchanact->constraints)); /* if there are 24 or less, allow for the user to select constraints */
if (i < 25)
- nr = pupmenu("Copy Pose Attributes %t|Local Location%x1|Local Rotation%x2|Local Size%x3|%l|Visual Location %x9|Visual Rotation%x10|Visual Size%x11|%l|Constraints (All)%x4|Constraints...%x5|%l|Transform Locks%x6|IK Limits%x7|Bone Shape%x8");
+ nr = pupmenu("Copy Pose Attributes %t|Local Location %x1|Local Rotation %x2|Local Size %x3|%l|Visual Location %x9|Visual Rotation %x10|Visual Size %x11|%l|Constraints (All) %x4|Constraints... %x5|%l|Transform Locks %x6|IK Limits %x7|Bone Shape %x8");
else
- nr = pupmenu("Copy Pose Attributes %t|Local Location%x1|Local Rotation%x2|Local Size%x3|%l|Visual Location %x9|Visual Rotation%x10|Visual Size%x11|%l|Constraints (All)%x4|%l|Transform Locks%x6|IK Limits%x7|Bone Shape%x8");
+ nr = pupmenu("Copy Pose Attributes %t|Local Location %x1|Local Rotation %x2|Local Size %x3|%l|Visual Location %x9|Visual Rotation %x10|Visual Size %x11|%l|Constraints (All) %x4|%l|Transform Locks %x6|IK Limits %x7|Bone Shape %x8");
}
if (nr <= 0)
Modified: trunk/blender/source/blender/editors/mesh/editface.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editface.c 2012-10-04 13:49:39 UTC (rev 51044)
+++ trunk/blender/source/blender/editors/mesh/editface.c 2012-10-04 13:59:14 UTC (rev 51045)
@@ -426,7 +426,7 @@
if (me == 0 || me->totpoly == 0) return;
if (mode == 0)
- mode = pupmenu("Seams%t|Mark Border Seam %x1|Clear Seam %x2");
+ mode = pupmenu("Seams %t|Mark Border Seam %x1|Clear Seam %x2");
if (mode != 1 && mode != 2)
return;
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-10-04 13:49:39 UTC (rev 51044)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-10-04 13:59:14 UTC (rev 51045)
@@ -439,16 +439,17 @@
zero_v3(nor);
+ /* XXX If those popup menus were to be enabled again, please get rid of this "menu string" syntax! */
if (em->selectmode & SCE_SELECT_VERTEX) {
if (em->bm->totvertsel == 0) nr = 0;
else if (em->bm->totvertsel == 1) nr = 4;
else if (em->bm->totedgesel == 0) nr = 4;
else if (em->bm->totfacesel == 0)
- nr = 3; // pupmenu("Extrude %t|Only Edges%x3|Only Vertices%x4");
+ nr = 3; /* pupmenu("Extrude %t|Only Edges %x3|Only Vertices %x4"); */
else if (em->bm->totfacesel == 1)
- nr = 1; // pupmenu("Extrude %t|Region %x1|Only Edges%x3|Only Vertices%x4");
+ nr = 1; /* pupmenu("Extrude %t|Region %x1|Only Edges% x3|Only Vertices %x4"); */
else
- nr = 1; // pupmenu("Extrude %t|Region %x1||Individual Faces %x2|Only Edges%x3|Only Vertices%x4");
+ nr = 1; /* pupmenu("Extrude %t|Region %x1|Individual Faces %x2|Only Edges %x3|Only Vertices %x4"); */
}
else if (em->selectmode & SCE_SELECT_EDGE) {
if (em->bm->totedgesel == 0) nr = 0;
@@ -458,16 +459,16 @@
else if (em->totedgesel == 1) nr = 3;
else if (em->totfacesel == 0) nr = 3;
else if (em->totfacesel == 1)
- nr = 1; // pupmenu("Extrude %t|Region %x1|Only Edges%x3");
+ nr = 1; /* pupmenu("Extrude %t|Region %x1|Only Edges %x3"); */
else
- nr = 1; // pupmenu("Extrude %t|Region %x1||Individual Faces %x2|Only Edges%x3");
+ nr = 1; /* pupmenu("Extrude %t|Region %x1|Individual Faces %x2|Only Edges %x3"); */
#endif
}
else {
if (em->bm->totfacesel == 0) nr = 0;
else if (em->bm->totfacesel == 1) nr = 1;
else
- nr = 1; // pupmenu("Extrude %t|Region %x1||Individual Faces %x2");
+ nr = 1; /* pupmenu("Extrude %t|Region %x1|Individual Faces %x2"); */
}
if (nr < 1) return 'g';
Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c 2012-10-04 13:49:39 UTC (rev 51044)
+++ trunk/blender/source/blender/editors/object/object_edit.c 2012-10-04 13:59:14 UTC (rev 51045)
@@ -1017,9 +1017,9 @@
if (!(ob = OBACT)) return;
- if (scene->obedit) { // XXX get from context
-// if (ob->type == OB_MESH)
-// XXX mesh_copy_menu();
+ if (scene->obedit) { /* XXX get from context */
+/* if (ob->type == OB_MESH) */
+/* XXX mesh_copy_menu(); */
return;
}
@@ -1030,34 +1030,34 @@
*/
strcpy(str,
- "Copy Attributes %t|Location%x1|Rotation%x2|Size%x3|Draw Options%x4|"
- "Time Offset%x5|Dupli%x6|Object Color%x31|%l|Mass%x7|Damping%x8|All Physical Attributes%x11|Properties%x9|"
- "Logic Bricks%x10|Protected Transform%x29|%l");
+ "Copy Attributes %t|Location %x1|Rotation %x2|Size %x3|Draw Options %x4|"
+ "Time Offset %x5|Dupli %x6|Object Color %x31|%l|Mass %x7|Damping %x8|All Physical Attributes %x11|Properties %x9|"
+ "Logic Bricks %x10|Protected Transform %x29|%l");
- strcat(str, "|Object Constraints%x22");
- strcat(str, "|NLA Strips%x26");
+ strcat(str, "|Object Constraints %x22");
+ strcat(str, "|NLA Strips %x26");
-// XXX if (OB_TYPE_SUPPORT_MATERIAL(ob->type)) {
-// strcat(str, "|Texture Space%x17");
-// }
+/* XXX if (OB_TYPE_SUPPORT_MATERIAL(ob->type)) { */
+/* strcat(str, "|Texture Space %x17"); */
+/* } */
- if (ob->type == OB_FONT) strcat(str, "|Font Settings%x18|Bevel Settings%x19");
- if (ob->type == OB_CURVE) strcat(str, "|Bevel Settings%x19|UV Orco%x28");
+ if (ob->type == OB_FONT) strcat(str, "|Font Settings %x18|Bevel Settings %x19");
+ if (ob->type == OB_CURVE) strcat(str, "|Bevel Settings %x19|UV Orco %x28");
if ((ob->type == OB_FONT) || (ob->type == OB_CURVE)) {
- strcat(str, "|Curve Resolution%x25");
+ strcat(str, "|Curve Resolution %x25");
}
if (ob->type == OB_MESH) {
- strcat(str, "|Subsurf Settings%x21|AutoSmooth%x27");
+ strcat(str, "|Subsurf Settings %x21|AutoSmooth %x27");
}
- if (ob->soft) strcat(str, "|Soft Body Settings%x23");
+ if (ob->soft) strcat(str, "|Soft Body Settings %x23");
- strcat(str, "|Pass Index%x30");
+ strcat(str, "|Pass Index %x30");
if (ob->type == OB_MESH || ob->type == OB_CURVE || ob->type == OB_LATTICE || ob->type == OB_SURF) {
- strcat(str, "|Modifiers ...%x24");
+ strcat(str, "|Modifiers ... %x24");
}
event = pupmenu(str);
Modified: trunk/blender/source/blender/editors/physics/physics_fluid.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_fluid.c 2012-10-04 13:49:39 UTC (rev 51044)
+++ trunk/blender/source/blender/editors/physics/physics_fluid.c 2012-10-04 13:59:14 UTC (rev 51045)
@@ -695,21 +695,21 @@
outStringsChanged=1;
}
- // check if modified output dir is ok
+ /* check if modified output dir is ok */
#if 0
if (outStringsChanged) {
char dispmsg[FILE_MAX+256];
int selection=0;
BLI_strncpy(dispmsg, "Output settings set to: '", sizeof(dispmsg));
strcat(dispmsg, newSurfdataPath);
- strcat(dispmsg, "'%t|Continue with changed settings%x1|Discard and abort%x0");
+ strcat(dispmsg, "'%t|Continue with changed settings %x1|Discard and abort %x0");
- // ask user if thats what he/she wants...
+ /* ask user if thats what he/she wants... */
selection = pupmenu(dispmsg);
- if (selection < 1) return 0; // 0 from menu, or -1 aborted
+ if (selection < 1) return 0; /* 0 from menu, or -1 aborted */
BLI_strncpy(targetDir, newSurfdataPath, sizeof(targetDir));
strncpy(domainSettings->surfdataPath, newSurfdataPath, FILE_MAXDIR);
- BLI_path_abs(targetDir, G.main->name); // fixed #frame-no
+ BLI_path_abs(targetDir, G.main->name); /* fixed #frame-no */
}
#endif
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list