behaviour.cpp: translate values in Placement Policy QComboBox

...by providing both text (the translated stuff) and data (the value
that we want to go into rc.xml) when calling addItem().

Fixes: #128

Author: johanmalm

CMakeLists.txt

@@ -45,6 +45,7 @@ set(PROJECT_SOURCES
     src/settings.cpp src/settings.h
     src/xml.cpp src/xml.h
     src/find-themes.cpp src/find-themes.h
+    src/pair.h
 
     src/appearance.cpp src/appearance.h src/appearance.ui
     src/behaviour.cpp src/behaviour.h src/behaviour.ui

src/behaviour.cpp

@@ -1,6 +1,8 @@
 #include "behaviour.h"
+#include <QVectorIterator>
 #include "find-themes.h"
 #include "macros.h"
+#include "pair.h"
 #include "settings.h"
 #include "./ui_behaviour.h"
 
@@ -17,13 +19,24 @@ Behaviour::~Behaviour()
 void Behaviour::activate()
 {
     /* Placement Policy */
-    QStringList policies = { "", "Automatic", "Cascade", "Center", "Cursor" };
-    ui->placementPolicy->addItems(policies);
-    ui->placementPolicy->setCurrentIndex(
-            policies.indexOf(getStr("/labwc_config/placement/policy")));
+    QVector<QSharedPointer<Pair>> policies;
+    policies.append(QSharedPointer<Pair>(new Pair("automatic", tr("Automatic"))));
+    policies.append(QSharedPointer<Pair>(new Pair("cascade", tr("Cascade"))));
+    policies.append(QSharedPointer<Pair>(new Pair("center", tr("Center"))));
+    policies.append(QSharedPointer<Pair>(new Pair("cursor", tr("Cursor"))));
+
+    QString current = getStr("/labwc_config/placement/policy");
+    int index = -1;
+    foreach (auto policy, policies) {
+        ui->placementPolicy->addItem(policy.get()->description(), QVariant(policy.get()->value()));
+        ++index;
+        if (current == policy.get()->value()) {
+            ui->placementPolicy->setCurrentIndex(index);
+        }
+    }
 }
 
 void Behaviour::onApply()
 {
-    setStr("/labwc_config/placement/policy", TEXT(ui->placementPolicy));
+    setStr("/labwc_config/placement/policy", DATA(ui->placementPolicy));
 }

src/macros.h

@@ -3,4 +3,11 @@
 
 #define TEXT(widget) widget->currentText().toLatin1().data()
 
+/*
+ * Typically used when a widget like a QComboBox contains translated text
+ * which obviously would not be very good to feed to rc.xml and we therefore
+ * need the QVariant userdata instead.
+ */
+#define DATA(widget) widget->currentData().toString().toLatin1().data()
+
 #endif // MACROS_H

src/pair.h

@@ -0,0 +1,21 @@
+#pragma once
+#include <QString>
+
+class Pair
+{
+public:
+    Pair(QString value, QString description)
+    {
+        m_value = value;
+        m_description = description;
+    };
+    ~Pair() { };
+
+private:
+    QString m_value;
+    QString m_description;
+
+public:
+    QString value() const { return m_value; }
+    QString description() const { return m_description; }
+};