Use "X" and "Y" instead of "E/W" and "N/S". Closes #3337.

opentoonz · Sep 6, 2020 · 3e99558 · 3e99558
1 parent 89a2819
commit 3e99558
Show file tree

Hide file tree

Showing 37 changed files with 208 additions and 208 deletions.
diff --git a/stuff/config/current.txt b/stuff/config/current.txt
@@ -816,8 +816,8 @@
 
  <!------------------------------ Function Editor ------------------------------------------->
 
-  <item>W_NS		"N/S"		</item>
-  <item>W_EW		"E/W"		</item>
+  <item>W_Y		"Y"		</item>
+  <item>W_X		"X"		</item>
   <item>W_Z		"Z"		</item>
   <item>W_SO		"SO"		</item>
   <item>W_Rotation	"Rotation"	</item>

diff --git a/toonz/sources/tnztools/edittool.cpp b/toonz/sources/tnztools/edittool.cpp
@@ -753,17 +753,17 @@ EditTool::EditTool()
     , m_scaleConstraint("Scale Constraint:")  // W_ToolOptions_ScaleConstraint
     , m_autoSelect("Auto Select Column")      // W_ToolOptions_AutoSelect
     , m_globalKeyframes("Global Key", false)  // W_ToolsOptions_GlobalKeyframes
-    , m_lockCenterX("Lock Center E/W", false)
-    , m_lockCenterY("Lock Center N/S", false)
-    , m_lockPositionX("Lock Position E/W", false)
-    , m_lockPositionY("Lock Position N/S", false)
+    , m_lockCenterX("Lock Center X", false)
+    , m_lockCenterY("Lock Center Y", false)
+    , m_lockPositionX("Lock Position X", false)
+    , m_lockPositionY("Lock Position Y", false)
     , m_lockRotation("Lock Rotation", false)
     , m_lockShearH("Lock Shear H", false)
     , m_lockShearV("Lock Shear V", false)
     , m_lockScaleH("Lock Scale H", false)
     , m_lockScaleV("Lock Scale V", false)
     , m_lockGlobalScale("Lock Global Scale", false)
-    , m_showEWNSposition("E/W and N/S Positions", true)
+    , m_showEWNSposition("X and Y Positions", true)
     , m_showZposition("Z Position", true)
     , m_showSOposition("SO", true)
     , m_showRotation("Rotation", true)
@@ -846,17 +846,17 @@ void EditTool::updateTranslation() {
   m_autoSelect.setItemUIName(L"Pegbar", tr("Pegbar"));
 
   m_globalKeyframes.setQStringName(tr("Global Key"));
-  m_lockCenterX.setQStringName(tr("Lock Center E/W"));
-  m_lockCenterY.setQStringName(tr("Lock Center N/S"));
-  m_lockPositionX.setQStringName(tr("Lock Position E/W"));
-  m_lockPositionY.setQStringName(tr("Lock Position N/S"));
+  m_lockCenterX.setQStringName(tr("Lock Center X"));
+  m_lockCenterY.setQStringName(tr("Lock Center Y"));
+  m_lockPositionX.setQStringName(tr("Lock Position X"));
+  m_lockPositionY.setQStringName(tr("Lock Position Y"));
   m_lockRotation.setQStringName(tr("Lock Rotation"));
   m_lockShearH.setQStringName(tr("Lock Shear H"));
   m_lockShearV.setQStringName(tr("Lock Shear V"));
   m_lockScaleH.setQStringName(tr("Lock Scale H"));
   m_lockScaleV.setQStringName(tr("Lock Scale V"));
   m_lockGlobalScale.setQStringName(tr("Lock Global Scale"));
-  m_showEWNSposition.setQStringName(tr("E/W and N/S Positions"));
+  m_showEWNSposition.setQStringName(tr("X and Y Positions"));
   m_showZposition.setQStringName(tr("Z Position"));
   m_showSOposition.setQStringName(tr("SO"));
   m_showRotation.setQStringName(tr("Rotation"));

diff --git a/toonz/sources/tnztools/tooloptions.cpp b/toonz/sources/tnztools/tooloptions.cpp
@@ -542,18 +542,18 @@ ArrowToolOptionsBox::ArrowToolOptionsBox(
 
   m_zLabel             = new ClickableLabel(tr("Z:"), this);
   m_motionPathPosLabel = new ClickableLabel(tr("Position:"), this);
-  m_ewPosLabel         = new ClickableLabel(tr("E/W:"), this);
-  m_nsPosLabel         = new ClickableLabel(tr("N/S:"), this);
+  m_ewPosLabel         = new ClickableLabel(tr("X:"), this);
+  m_nsPosLabel         = new ClickableLabel(tr("Y:"), this);
 
-  // Lock E/W
+  // Lock X
   TBoolProperty *lockProp =
-      dynamic_cast<TBoolProperty *>(m_pg->getProperty("Lock Position E/W"));
+      dynamic_cast<TBoolProperty *>(m_pg->getProperty("Lock Position X"));
   if (lockProp)
     m_lockEWPosCheckbox =
         new ToolOptionCheckbox(m_tool, lockProp, toolHandle, this);
-  // Lock N/S
+  // Lock Y
   lockProp =
-      dynamic_cast<TBoolProperty *>(m_pg->getProperty("Lock Position N/S"));
+      dynamic_cast<TBoolProperty *>(m_pg->getProperty("Lock Position Y"));
   if (lockProp)
     m_lockNSPosCheckbox =
         new ToolOptionCheckbox(m_tool, lockProp, toolHandle, this);
@@ -625,18 +625,18 @@ ArrowToolOptionsBox::ArrowToolOptionsBox(
       new PegbarCenterField(m_tool, 0, "field", objHandle, xshHandle, this);
   m_nsCenterField =
       new PegbarCenterField(m_tool, 1, "field", objHandle, xshHandle, this);
-  m_ewCenterLabel = new ClickableLabel(tr("E/W:"), this);
-  m_nsCenterLabel = new ClickableLabel(tr("N/S:"), this);
+  m_ewCenterLabel = new ClickableLabel(tr("X:"), this);
+  m_nsCenterLabel = new ClickableLabel(tr("Y:"), this);
 
-  // Lock E/W Center
+  // Lock X Center
   lockProp =
-      dynamic_cast<TBoolProperty *>(m_pg->getProperty("Lock Center E/W"));
+      dynamic_cast<TBoolProperty *>(m_pg->getProperty("Lock Center X"));
   if (lockProp)
     m_lockEWCenterCheckbox =
         new ToolOptionCheckbox(m_tool, lockProp, toolHandle, this);
-  // Lock N/S Center
+  // Lock Y Center
   lockProp =
-      dynamic_cast<TBoolProperty *>(m_pg->getProperty("Lock Center N/S"));
+      dynamic_cast<TBoolProperty *>(m_pg->getProperty("Lock Center Y"));
   if (lockProp)
     m_lockNSCenterCheckbox =
         new ToolOptionCheckbox(m_tool, lockProp, toolHandle, this);
@@ -1207,9 +1207,9 @@ SelectionToolOptionsBox::SelectionToolOptionsBox(QWidget *parent, TTool *tool,
       new SimpleIconViewField("edit_rotation", tr("Rotation"));
   m_rotationField = new SelectionRotationField(selectionTool, tr("Rotation"));
 
-  m_moveXLabel = new ClickableLabel(tr("E/W:"), this);
+  m_moveXLabel = new ClickableLabel(tr("X:"), this);
   m_moveXField = new SelectionMoveField(selectionTool, 0, "Move X");
-  m_moveYLabel = new ClickableLabel(tr("N/S:"), this);
+  m_moveYLabel = new ClickableLabel(tr("Y:"), this);
   m_moveYField = new SelectionMoveField(selectionTool, 1, "Move Y");
 
   if (rasterSelectionTool) {

diff --git a/toonz/sources/toonzlib/stageobjectutil.cpp b/toonz/sources/toonzlib/stageobjectutil.cpp
@@ -164,10 +164,10 @@ QString TStageObjectValues::getStringForHistory() {
       channelStr = QObject::tr("Edit Rotation");
       break;
     case TStageObject::T_X:
-      channelStr = QObject::tr("Move E/W");
+      channelStr = QObject::tr("Move X");
       break;
     case TStageObject::T_Y:
-      channelStr = QObject::tr("Move N/S");
+      channelStr = QObject::tr("Move Y");
       break;
     case TStageObject::T_Z:
       channelStr = QObject::tr("Move Z");

diff --git a/toonz/sources/toonzlib/tstageobject.cpp b/toonz/sources/toonzlib/tstageobject.cpp
@@ -385,11 +385,11 @@ TStageObject::TStageObject(TStageObjectTree *tree, TStageObjectId id)
     , m_ikflag(0)
     , m_groupSelector(-1) {
   // NOTA: per le unita' di misura controlla anche tooloptions.cpp
-  m_x->setName("W_EW");
+  m_x->setName("W_X");
   m_x->setMeasureName("length.x");
   m_x->addObserver(this);
 
-  m_y->setName("W_NS");
+  m_y->setName("W_Y");
   m_y->setMeasureName("length.y");
   m_y->addObserver(this);
 

diff --git a/toonz/sources/toonzlib/txsheetexpr.cpp b/toonz/sources/toonzlib/txsheetexpr.cpp
@@ -193,9 +193,9 @@ class XsheetReferencePattern final : public Pattern {
 
   TStageObject::Channel matchChannelName(const Token &token) const {
     std::string s = toLower(token.getText());
-    if (s == "ns")
+    if (s == "y" || s == "ns")
       return TStageObject::T_Y;
-    else if (s == "ew")
+    else if (s == "x" || s == "ew")
       return TStageObject::T_X;
     else if (s == "rot" || s == "ang" || s == "angle")
       return TStageObject::T_Angle;

diff --git a/toonz/sources/toonzqt/cleanupcamerasettingswidget.cpp b/toonz/sources/toonzqt/cleanupcamerasettingswidget.cpp
@@ -54,10 +54,10 @@ CleanupCameraSettingsWidget::CleanupCameraSettingsWidget() {
     offsetLay->setVerticalSpacing(3);
     offsetLay->setMargin(3);
     {
-      offsetLay->addWidget(new QLabel(tr("N/S")), 0, 0);
+      offsetLay->addWidget(new QLabel(tr("Y")), 0, 0);
       offsetLay->addWidget(m_offsY, 0, 1);
       offsetLay->addWidget(m_offsy_lock, 0, 2);
-      offsetLay->addWidget(new QLabel(tr("E/W")), 1, 0);
+      offsetLay->addWidget(new QLabel(tr("X")), 1, 0);
       offsetLay->addWidget(m_offsX, 1, 1);
       offsetLay->addWidget(m_offsx_lock, 1, 2);
     }

diff --git a/toonz/sources/toonzqt/functiontreeviewer.cpp b/toonz/sources/toonzqt/functiontreeviewer.cpp
@@ -637,10 +637,10 @@ QString FunctionTreeModel::Channel::getExprRefName() const {
   StageObjectChannelGroup *stageGroup =
       dynamic_cast<StageObjectChannelGroup *>(m_group);
   if (stageGroup) {
-    if (tmpName == "N/S")
-      tmpName = "ns";
-    else if (tmpName == "E/W")
-      tmpName = "ew";
+    if (tmpName == "Y")
+      tmpName = "y";
+    else if (tmpName == "X")
+      tmpName = "x";
     else if (tmpName == "Z")
       tmpName = "z";
     else if (tmpName == "Rotation")

diff --git a/toonz/sources/translations/chinese/tnztools.ts b/toonz/sources/translations/chinese/tnztools.ts
@@ -12,11 +12,11 @@
         <translation>位置</translation>
     </message>
     <message>
-        <source>E/W:</source>
+        <source>X:</source>
         <translation>左右:</translation>
     </message>
     <message>
-        <source>N/S:</source>
+        <source>Y:</source>
         <translation>上下:</translation>
     </message>
     <message>
@@ -294,19 +294,19 @@
         <translation>全局关键帧</translation>
     </message>
     <message>
-        <source>Lock Center E/W</source>
+        <source>Lock Center X</source>
         <translation>锁定中心点(左右)</translation>
     </message>
     <message>
-        <source>Lock Center N/S</source>
+        <source>Lock Center Y</source>
         <translation>锁定中心点(上下)</translation>
     </message>
     <message>
-        <source>Lock Position E/W</source>
+        <source>Lock Position X</source>
         <translation>锁定位置(左右)</translation>
     </message>
     <message>
-        <source>Lock Position N/S</source>
+        <source>Lock Position Y</source>
         <translation>锁定位置(上下)</translation>
     </message>
     <message>
@@ -334,7 +334,7 @@
         <translation>锁定缩放(全局)</translation>
     </message>
     <message>
-        <source>E/W and N/S Positions</source>
+        <source>X and Y Positions</source>
         <translation>左右和上下位置</translation>
     </message>
     <message>
@@ -1379,11 +1379,11 @@ Do you want to proceed?</source>
         <translation>旋转</translation>
     </message>
     <message>
-        <source>E/W:</source>
+        <source>X:</source>
         <translation>左右:</translation>
     </message>
     <message>
-        <source>N/S:</source>
+        <source>Y:</source>
         <translation>上下:</translation>
     </message>
     <message>

diff --git a/toonz/sources/translations/chinese/toonzlib.ts b/toonz/sources/translations/chinese/toonzlib.ts
@@ -451,11 +451,11 @@
         <translation>编辑旋转</translation>
     </message>
     <message>
-        <source>Move E/W</source>
+        <source>Move X</source>
         <translation>左右移动</translation>
     </message>
     <message>
-        <source>Move N/S</source>
+        <source>Move Y</source>
         <translation>上下移动</translation>
     </message>
     <message>

diff --git a/toonz/sources/translations/chinese/toonzqt.ts b/toonz/sources/translations/chinese/toonzqt.ts
@@ -210,11 +210,11 @@ Possibly the preset file has been corrupted</source>
         <translation type="vanished">最靠近的:</translation>
     </message>
     <message>
-        <source>E/W:</source>
+        <source>X:</source>
         <translation type="vanished">左右:</translation>
     </message>
     <message>
-        <source>N/S:</source>
+        <source>Y:</source>
         <translation type="vanished">上下:</translation>
     </message>
     <message>
@@ -246,11 +246,11 @@ Possibly the preset file has been corrupted</source>
         <translation type="vanished">结果层级信息</translation>
     </message>
     <message>
-        <source>N/S</source>
+        <source>Y</source>
         <translation>上下</translation>
     </message>
     <message>
-        <source>E/W</source>
+        <source>X</source>
         <translation>左右</translation>
     </message>
 </context>

diff --git a/toonz/sources/translations/czech/tnztools.ts b/toonz/sources/translations/czech/tnztools.ts
@@ -16,13 +16,13 @@
     <message>
         <location filename="../../tnztools/tooloptions.cpp" line="544"/>
         <location filename="../../tnztools/tooloptions.cpp" line="627"/>
-        <source>E/W:</source>
+        <source>X:</source>
         <translation>V/Z:</translation>
     </message>
     <message>
         <location filename="../../tnztools/tooloptions.cpp" line="545"/>
         <location filename="../../tnztools/tooloptions.cpp" line="628"/>
-        <source>N/S:</source>
+        <source>Y:</source>
         <translation>S/J:</translation>
     </message>
     <message>
@@ -298,22 +298,22 @@
     </message>
     <message>
         <location filename="../../tnztools/edittool.cpp" line="849"/>
-        <source>Lock Center E/W</source>
+        <source>Lock Center X</source>
         <translation>Uzmknout střed [X]</translation>
     </message>
     <message>
         <location filename="../../tnztools/edittool.cpp" line="850"/>
-        <source>Lock Center N/S</source>
+        <source>Lock Center Y</source>
         <translation>Uzmknout střed [Y]</translation>
     </message>
     <message>
         <location filename="../../tnztools/edittool.cpp" line="851"/>
-        <source>Lock Position E/W</source>
+        <source>Lock Position X</source>
         <translation>Uzmknout polohu [X]</translation>
     </message>
     <message>
         <location filename="../../tnztools/edittool.cpp" line="852"/>
-        <source>Lock Position N/S</source>
+        <source>Lock Position Y</source>
         <translation>Uzmknout polohu [Y]</translation>
     </message>
     <message>
@@ -348,7 +348,7 @@
     </message>
     <message>
         <location filename="../../tnztools/edittool.cpp" line="859"/>
-        <source>E/W and N/S Positions</source>
+        <source>X and Y Positions</source>
         <translation>Polohy X a Y</translation>
     </message>
     <message>
@@ -1607,12 +1607,12 @@ Chcete pokračovat?</translation>
     </message>
     <message>
         <location filename="../../tnztools/tooloptions.cpp" line="1209"/>
-        <source>E/W:</source>
+        <source>X:</source>
         <translation>X:</translation>
     </message>
     <message>
         <location filename="../../tnztools/tooloptions.cpp" line="1211"/>
-        <source>N/S:</source>
+        <source>Y:</source>
         <translation>Y:</translation>
     </message>
     <message>

diff --git a/toonz/sources/translations/czech/toonzlib.ts b/toonz/sources/translations/czech/toonzlib.ts
@@ -383,12 +383,12 @@ Pravděpodobně kodek nemůže pracovat řádně.</translation>
     </message>
     <message>
         <location filename="../../toonzlib/stageobjectutil.cpp" line="167"/>
-        <source>Move E/W</source>
+        <source>Move X</source>
         <translation>Posunout V/Z</translation>
     </message>
     <message>
         <location filename="../../toonzlib/stageobjectutil.cpp" line="170"/>
-        <source>Move N/S</source>
+        <source>Move Y</source>
         <translation>Posunout S/J</translation>
     </message>
     <message>

diff --git a/toonz/sources/translations/czech/toonzqt.ts b/toonz/sources/translations/czech/toonzqt.ts
@@ -216,12 +216,12 @@ Možná byl soubor s přednastavením poškozen</translation>
     <name>CleanupCameraSettingsWidget</name>
     <message>
         <location filename="../../toonzqt/cleanupcamerasettingswidget.cpp" line="57"/>
-        <source>N/S</source>
+        <source>Y</source>
         <translation>S/J</translation>
     </message>
     <message>
         <location filename="../../toonzqt/cleanupcamerasettingswidget.cpp" line="60"/>
-        <source>E/W</source>
+        <source>X</source>
         <translation>V/Z</translation>
     </message>
 </context>