feat(i18n): make Markdown settings translatable

qTox · May 11, 2016 · 3e22593 · 3e22593
1 parent 5cb271b
commit 3e22593
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/src/widget/form/settings/generalform.cpp b/src/widget/form/settings/generalform.cpp
@@ -92,9 +92,6 @@ static QStringList langs = {"Arabic",
                             "Türkçe",
                             "Українська",
                             "简体中文"};
-static QStringList mdPrefs = {"Plaintext",
-                              "Show Formatting Characters",
-                              "Don't Show Formatting Characters"};
 
 static QStringList timeFormats = {"hh:mm AP", "hh:mm", "hh:mm:ss AP", "hh:mm:ss"};
 // http://doc.qt.io/qt-4.8/qdate.html#fromString
@@ -116,8 +113,6 @@ GeneralForm::GeneralForm(SettingsWidget *myParent) :
         bodyUI->transComboBox->insertItem(i, langs[i]);
 
     bodyUI->transComboBox->setCurrentIndex(locales.indexOf(Settings::getInstance().getTranslation()));
-    for (int i = 0; i < mdPrefs.size(); i++)
-        bodyUI->markdownComboBox->insertItem(i, mdPrefs[i]);
 
     bodyUI->markdownComboBox->setCurrentIndex(Settings::getInstance().getMarkdownPreference());
     bodyUI->cbAutorun->setChecked(Settings::getInstance().getAutorun());

diff --git a/src/widget/form/settings/generalsettings.ui b/src/widget/form/settings/generalsettings.ui
@@ -39,8 +39,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>1277</width>
-        <height>1272</height>
+        <width>1278</width>
+        <height>1413</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_4" stretch="0,0,0,1">
@@ -382,6 +382,21 @@ instead of closing itself.</string>
               <property name="toolTip">
                <string>Select Markdown preference.</string>
               </property>
+              <item>
+               <property name="text">
+                <string>Plaintext</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Show formatting characters</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Don't show formatting characters</string>
+               </property>
+              </item>
              </widget>
             </item>
             <item>