Add preset author explicitly to preset info tab.

Ideally we should make these editable so that a user could create a mapping in
the GUI and then hit the Export button to save it.

3 files changed, 73 insertions, 36 deletions

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index fee7d49288..1736c2e4aa 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -171,14 +171,31 @@ QString DlgPrefController::presetShortName(const ControllerPresetPointer pPreset
     return presetName;
 }
 
+QString DlgPrefController::presetName(const ControllerPresetPointer pPreset) const {
+    if (pPreset) {
+        QString name = pPreset->name();
+        if (name.length() > 0)
+            return name;
+    }
+    return tr("No Name");
+}
+
 QString DlgPrefController::presetDescription(const ControllerPresetPointer pPreset) const {
-    QString description = tr("No Description");
     if (pPreset) {
-        QString descr = pPreset->description();
+        QString description = pPreset->description();
         if (description.length() > 0)
-            description = descr;
+            return description;
+    }
+    return tr("No Description");
+}
+
+QString DlgPrefController::presetAuthor(const ControllerPresetPointer pPreset) const {
+    if (pPreset) {
+        QString author = pPreset->author();
+        if (author.length() > 0)
+            return author;
     }
-    return description;
+    return tr("No Author");
 }
 
 QString DlgPrefController::presetForumLink(const ControllerPresetPointer pPreset) const {
@@ -341,8 +358,9 @@ void DlgPrefController::initTableView(QTableView* pTable) {
 }
 
 void DlgPrefController::slotPresetLoaded(ControllerPresetPointer preset) {
-    m_ui.labelLoadedPreset->setText(presetShortName(preset));
+    m_ui.labelLoadedPreset->setText(presetName(preset));
     m_ui.labelLoadedPresetDescription->setText(presetDescription(preset));
+    m_ui.labelLoadedPresetAuthor->setText(presetAuthor(preset));
     QStringList supportLinks;
 
     QString forumLink = presetForumLink(preset);
diff --git a/src/controllers/dlgprefcontroller.h b/src/controllers/dlgprefcontroller.h
index 28a2928bee..148e9bd5ca 100644
--- a/src/controllers/dlgprefcontroller.h
+++ b/src/controllers/dlgprefcontroller.h
@@ -75,6 +75,8 @@ class DlgPrefController : public DlgPreferencePage {
 
   private:
     QString presetShortName(const ControllerPresetPointer pPreset) const;
+    QString presetName(const ControllerPresetPointer pPreset) const;
+    QString presetAuthor(const ControllerPresetPointer pPreset) const;
     QString presetDescription(const ControllerPresetPointer pPreset) const;
     QString presetForumLink(const ControllerPresetPointer pPreset) const;
     QString presetWikiLink(const ControllerPresetPointer pPreset) const;
diff --git a/src/controllers/dlgprefcontrollerdlg.ui b/src/controllers/dlgprefcontrollerdlg.ui
index f98695dc7b..7974d4c7cf 100644
--- a/src/controllers/dlgprefcontrollerdlg.ui
+++ b/src/controllers/dlgprefcontrollerdlg.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>447</width>
-    <height>390</height>
+    <height>359</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -96,22 +96,6 @@
         </property>
        </widget>
       </item>
-      <item row="6" column="1">
-       <widget class="QComboBox" name="comboBoxPreset">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>250</width>
-          <height>16777215</height>
-         </size>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="1">
        <widget class="QCheckBox" name="chkEnabledDevice">
         <property name="text">
@@ -119,7 +103,14 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
+      <item row="0" column="2">
+       <widget class="QPushButton" name="btnApply">
+        <property name="text">
+         <string>Apply</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="2">
        <widget class="QPushButton" name="btnLearningWizard">
         <property name="toolTip">
          <string>Click to start the Controller Learning wizard.</string>
@@ -138,6 +129,22 @@
         </property>
        </widget>
       </item>
+      <item row="6" column="1" colspan="2">
+       <widget class="QComboBox" name="comboBoxPreset">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777215</height>
+         </size>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -151,7 +158,7 @@
        <string>Preset Info</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
-       <item row="1" column="1">
+       <item row="2" column="1">
         <widget class="QLabel" name="labelLoadedPresetDescription">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -198,7 +205,7 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
+       <item row="3" column="0">
         <widget class="QLabel" name="label_3">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -239,7 +246,7 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
+       <item row="2" column="0">
         <widget class="QLabel" name="label_description">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -255,7 +262,7 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
+       <item row="3" column="1">
         <widget class="QLabel" name="labelLoadedPresetSupportLinks">
          <property name="focusPolicy">
           <enum>Qt::ClickFocus</enum>
@@ -277,7 +284,7 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
+       <item row="4" column="1">
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -285,11 +292,28 @@
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
-           <height>33</height>
+           <height>9</height>
           </size>
          </property>
         </spacer>
        </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>Author:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLabel" name="labelLoadedPresetAuthor">
+         <property name="text">
+          <string notr="true">(preset author goes here)</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="inputMappingsTab">
@@ -432,13 +456,6 @@
      </widget>
     </widget>
    </item>
-   <item>
-    <widget class="QPushButton" name="btnApply">
-     <property name="text">
-      <string>Apply</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>