From e73b0120ccaee3089c9f3147b53fc8d2f0297633 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Mon, 29 Sep 2014 09:01:13 +0200
Subject: [PATCH] New trainer modes added in Companion

---
 companion/src/generaledit/calibration.ui | 14 +++++++++--
 companion/src/modeledit/setup_module.ui  | 31 +++++++++++++++---------
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/companion/src/generaledit/calibration.ui b/companion/src/generaledit/calibration.ui
index 44cef4ddd..a5b0cdece 100755
--- a/companion/src/generaledit/calibration.ui
+++ b/companion/src/generaledit/calibration.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>717</width>
-    <height>431</height>
+    <width>780</width>
+    <height>450</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -839,6 +839,16 @@
        <string>S-Port Mirror</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>Telemetry</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>SBUS Trainer</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>Debug</string>
diff --git a/companion/src/modeledit/setup_module.ui b/companion/src/modeledit/setup_module.ui
index 7815a75ca..91b5b9c84 100644
--- a/companion/src/modeledit/setup_module.ui
+++ b/companion/src/modeledit/setup_module.ui
@@ -67,12 +67,12 @@
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <layout class="QGridLayout" name="gridLayout_69" rowstretch="0,0,0,0,0,0,0,0,0" columnstretch="0,0,0,0,0,0,0">
-      <property name="margin">
-       <number>0</number>
-      </property>
       <property name="verticalSpacing">
        <number>6</number>
       </property>
+      <property name="margin">
+       <number>0</number>
+      </property>
       <item row="2" column="3" alignment="Qt::AlignLeft">
        <widget class="QSpinBox" name="channelsStart">
         <property name="maximumSize">
@@ -245,20 +245,29 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="maximumSize">
-         <size>
-          <width>125</width>
-          <height>16777215</height>
-         </size>
-        </property>
         <item>
          <property name="text">
-          <string>Master</string>
+          <string>Master/Jack</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>Slave</string>
+          <string>Slave/Jack</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Master/SBUS Module</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Master/CPPM Module</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Master/SBUS in battery compartment</string>
          </property>
         </item>
        </widget>