STYLE: Mark translatable strings in Base/QTGUI

Separation of SliceOrientationMarkerTypeComboBox item text and data so that to ease translations See Slicer/SlicerLanguagePacks#12
mhdiop · Dec 19, 2022 · 052dec1 · 052dec1
1 parent a4cc0f2
commit 052dec1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/Base/QTGUI/Resources/UI/qSlicerSettingsViewsPanel.ui b/Base/QTGUI/Resources/UI/qSlicerSettingsViewsPanel.ui
@@ -54,28 +54,7 @@
           <item row="0" column="1">
            <layout class="QHBoxLayout" name="horizontalLayout_2">
             <item>
-             <widget class="ctkComboBox" name="SliceOrientationMarkerTypeComboBox">
-              <item>
-               <property name="text">
-                <string>none</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>cube</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>human</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>axes</string>
-               </property>
-              </item>
-             </widget>
+             <widget class="ctkComboBox" name="SliceOrientationMarkerTypeComboBox"/>
             </item>
             <item>
              <widget class="ctkComboBox" name="SliceOrientationMarkerSizeComboBox">

diff --git a/Base/QTGUI/qSlicerSettingsViewsPanel.cxx b/Base/QTGUI/qSlicerSettingsViewsPanel.cxx
@@ -83,6 +83,11 @@ void qSlicerSettingsViewsPanelPrivate::init()
                       qSlicerSettingsViewsPanel::tr("Multisampling (MSAA)"),
                       ctkSettingsPanel::OptionRequireRestart);
 
+  this->SliceOrientationMarkerTypeComboBox->addItem(qSlicerSettingsViewsPanel::tr("none"), QString(/*no tr*/"none"));
+  this->SliceOrientationMarkerTypeComboBox->addItem(qSlicerSettingsViewsPanel::tr("cube"), QString(/*no tr*/"cube"));
+  this->SliceOrientationMarkerTypeComboBox->addItem(qSlicerSettingsViewsPanel::tr("human"), QString(/*no tr*/"human"));
+  this->SliceOrientationMarkerTypeComboBox->addItem(qSlicerSettingsViewsPanel::tr("axes"), QString(/*no tr*/"axes"));
+
   QObject::connect(this->SliceOrientationMarkerTypeComboBox, SIGNAL(currentIndexChanged(QString)),
                    q, SIGNAL(currentSliceOrientationMarkerTypeChanged(QString)));
   q->registerProperty("DefaultSliceView/OrientationMarkerType", q,
@@ -292,11 +297,12 @@ void qSlicerSettingsViewsPanel::sliceViewOrientationChangedByUser()
   Q_D(qSlicerSettingsViewsPanel);
   if (d->SliceViewOrientationComboBox->currentUserDataAsString() == "PatientRightIsScreenRight")
     {
-    if (d->SliceOrientationMarkerTypeComboBox->currentText() == tr("none"))
+    if (d->SliceOrientationMarkerTypeComboBox->currentData() == /*no tr*/"none")
       {
       // Non-default orientation is chosen and no orientation marker is displayed.
       // To ensure that there is no accidental mixup of orientations, show the orientation marker.
-      d->SliceOrientationMarkerTypeComboBox->setCurrentText(tr("axes"));
+      int index = d->SliceOrientationMarkerTypeComboBox->findData(/*no tr*/"axes");
+      d->SliceOrientationMarkerTypeComboBox->setCurrentIndex(index);
       }
     }
 }