From e510c829e1fe68379cc413bab75b4d5f6a2b179e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 29 Apr 2019 10:16:59 -0400
Subject: [PATCH] [oemid] Add form explanation

---
 src/modules/oemid/OEMPage.ui      | 44 +++++++++++++++++++++++++------
 src/modules/oemid/OEMViewStep.cpp |  9 +++++++
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/modules/oemid/OEMPage.ui b/src/modules/oemid/OEMPage.ui
index d84984f0a..8a6d1c1fa 100644
--- a/src/modules/oemid/OEMPage.ui
+++ b/src/modules/oemid/OEMPage.ui
@@ -6,34 +6,62 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
+    <width>592</width>
     <height>300</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+    <horstretch>1</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">OEMPage</string>
   </property>
   <widget class="QWidget" name="gridLayoutWidget">
    <property name="geometry">
     <rect>
      <x>-1</x>
      <y>9</y>
-     <width>391</width>
-     <height>281</height>
+     <width>601</width>
+     <height>271</height>
     </rect>
    </property>
-   <layout class="QGridLayout" name="gridLayout">
-    <item row="0" column="1">
+   <layout class="QGridLayout" name="gridLayout" rowstretch="0,0" columnstretch="1,3">
+    <item row="1" column="1">
      <widget class="QLineEdit" name="batchIdentifier">
       <property name="toolTip">
        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter a batch-identifier here. This will be stored in the target system.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
       </property>
+      <property name="accessibleName">
+       <string notr="true">batch-identifier</string>
+      </property>
      </widget>
     </item>
-    <item row="0" column="0">
+    <item row="1" column="0" alignment="Qt::AlignRight">
      <widget class="QLabel" name="batchIdentifier_label">
       <property name="text">
-       <string>Batch:</string>
+       <string>Ba&amp;tch:</string>
+      </property>
+      <property name="buddy">
+       <cstring>batchIdentifier</cstring>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="0" colspan="2">
+     <widget class="QLabel" name="label">
+      <property name="text">
+       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;h1&gt;OEM Configuration&lt;/h1&gt;&lt;p&gt;Calamares will use OEM settings while configuring the target system.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      </property>
+      <property name="textFormat">
+       <enum>Qt::RichText</enum>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+      <property name="wordWrap">
+       <bool>true</bool>
       </property>
      </widget>
     </item>
diff --git a/src/modules/oemid/OEMViewStep.cpp b/src/modules/oemid/OEMViewStep.cpp
index 7af97a3a3..3cec79361 100644
--- a/src/modules/oemid/OEMViewStep.cpp
+++ b/src/modules/oemid/OEMViewStep.cpp
@@ -20,6 +20,7 @@
 
 #include "ui_OEMPage.h"
 
+#include "utils/Retranslator.h"
 #include "utils/Variant.h"
 
 #include <QDate>
@@ -34,6 +35,10 @@ public:
         , m_ui( new Ui_OEMPage() )
     {
         m_ui->setupUi( this );
+
+        CALAMARES_RETRANSLATE(
+            m_ui->retranslateUi( this );
+        )
     }
 
     Ui_OEMPage* m_ui;
@@ -92,11 +97,15 @@ void OEMViewStep::onActivate()
     if ( !m_visited && m_widget )
         m_widget->m_ui->batchIdentifier->setText( m_user_batchIdentifier );
     m_visited = true;
+
+    ViewStep::onActivate();
 }
 
 void OEMViewStep::onLeave()
 {
     m_user_batchIdentifier = m_widget->m_ui->batchIdentifier->text();
+
+    ViewStep::onLeave();
 }
 
 QString OEMViewStep::prettyName() const