Merge branch 'origin/next'

DONATIONS.txt

@@ -296,3 +296,5 @@ Harvest Lane
 Ville Kuvaja
 DK-System
 Heinz Vogel
+Heung Jin Choi
+MMJS van der Helm 

companion/src/companion.qrc

@@ -293,6 +293,7 @@
     <file>images/library/30002.png</file>
     <file>images/library/30003.png</file>
     <file>images/library/30004.png</file>
+    <file>themes/monochrome/16/paintbrush.png</file>
     <file>themes/monochrome/16/open.png</file>
     <file>themes/monochrome/16/edit.png</file>
     <file>themes/monochrome/16/information.png</file>
@@ -336,6 +337,7 @@
     <file>themes/monochrome/16/contributors.png</file>
     <file>themes/monochrome/16/stop.png</file>
     <file>themes/monochrome/16/write_eeprom.png</file>
+    <file>themes/monochrome/24/paintbrush.png</file>
     <file>themes/monochrome/24/open.png</file>
     <file>themes/monochrome/24/edit.png</file>
     <file>themes/monochrome/24/information.png</file>
@@ -379,6 +381,7 @@
     <file>themes/monochrome/24/contributors.png</file>
     <file>themes/monochrome/24/stop.png</file>
     <file>themes/monochrome/24/write_eeprom.png</file>
+    <file>themes/monochrome/32/paintbrush.png</file>
     <file>themes/monochrome/32/open.png</file>
     <file>themes/monochrome/32/edit.png</file>
     <file>themes/monochrome/32/information.png</file>
@@ -422,6 +425,7 @@
     <file>themes/monochrome/32/contributors.png</file>
     <file>themes/monochrome/32/stop.png</file>
     <file>themes/monochrome/32/write_eeprom.png</file>
+    <file>themes/monochrome/48/paintbrush.png</file>
     <file>themes/monochrome/48/open.png</file>
     <file>themes/monochrome/48/edit.png</file>
     <file>themes/monochrome/48/information.png</file>
@@ -465,6 +469,7 @@
     <file>themes/monochrome/48/contributors.png</file>
     <file>themes/monochrome/48/stop.png</file>
     <file>themes/monochrome/48/write_eeprom.png</file>
+    <file>themes/classic/16/paintbrush.png</file>
     <file>themes/classic/16/open.png</file>
     <file>themes/classic/16/edit.png</file>
     <file>themes/classic/16/information.png</file>
@@ -508,6 +513,7 @@
     <file>themes/classic/16/contributors.png</file>
     <file>themes/classic/16/stop.png</file>
     <file>themes/classic/16/write_eeprom.png</file>
+    <file>themes/classic/24/paintbrush.png</file>
     <file>themes/classic/24/open.png</file>
     <file>themes/classic/24/edit.png</file>
     <file>themes/classic/24/information.png</file>
@@ -551,6 +557,7 @@
     <file>themes/classic/24/contributors.png</file>
     <file>themes/classic/24/stop.png</file>
     <file>themes/classic/24/write_eeprom.png</file>
+    <file>themes/classic/32/paintbrush.png</file>
     <file>themes/classic/32/open.png</file>
     <file>themes/classic/32/edit.png</file>
     <file>themes/classic/32/information.png</file>
@@ -594,6 +601,7 @@
     <file>themes/classic/32/contributors.png</file>
     <file>themes/classic/32/stop.png</file>
     <file>themes/classic/32/write_eeprom.png</file>
+    <file>themes/classic/48/paintbrush.png</file>
     <file>themes/classic/48/open.png</file>
     <file>themes/classic/48/edit.png</file>
     <file>themes/classic/48/information.png</file>
@@ -637,6 +645,7 @@
     <file>themes/classic/48/contributors.png</file>
     <file>themes/classic/48/stop.png</file>
     <file>themes/classic/48/write_eeprom.png</file>
+    <file>themes/monoblue/16/paintbrush.png</file>
     <file>themes/monoblue/16/open.png</file>
     <file>themes/monoblue/16/edit.png</file>
     <file>themes/monoblue/16/information.png</file>
@@ -680,6 +689,7 @@
     <file>themes/monoblue/16/contributors.png</file>
     <file>themes/monoblue/16/stop.png</file>
     <file>themes/monoblue/16/write_eeprom.png</file>
+    <file>themes/monoblue/24/paintbrush.png</file>
     <file>themes/monoblue/24/open.png</file>
     <file>themes/monoblue/24/edit.png</file>
     <file>themes/monoblue/24/information.png</file>
@@ -723,6 +733,7 @@
     <file>themes/monoblue/24/contributors.png</file>
     <file>themes/monoblue/24/stop.png</file>
     <file>themes/monoblue/24/write_eeprom.png</file>
+    <file>themes/monoblue/32/paintbrush.png</file>
     <file>themes/monoblue/32/open.png</file>
     <file>themes/monoblue/32/edit.png</file>
     <file>themes/monoblue/32/information.png</file>
@@ -766,6 +777,7 @@
     <file>themes/monoblue/32/contributors.png</file>
     <file>themes/monoblue/32/stop.png</file>
     <file>themes/monoblue/32/write_eeprom.png</file>
+    <file>themes/monoblue/48/paintbrush.png</file>
     <file>themes/monoblue/48/open.png</file>
     <file>themes/monoblue/48/edit.png</file>
     <file>themes/monoblue/48/information.png</file>
@@ -809,6 +821,8 @@
     <file>themes/monoblue/48/contributors.png</file>
     <file>themes/monoblue/48/stop.png</file>
     <file>themes/monoblue/48/write_eeprom.png</file>
+    <file>themes/monowhite/16/paintbrush.png</file>
+    <file>themes/monowhite/16/open.png</file>
     <file>themes/monowhite/16/edit.png</file>
     <file>themes/monowhite/16/information.png</file>
     <file>themes/monowhite/16/configure.png</file>
@@ -851,6 +865,7 @@
     <file>themes/monowhite/16/contributors.png</file>
     <file>themes/monowhite/16/stop.png</file>
     <file>themes/monowhite/16/write_eeprom.png</file>
+    <file>themes/monowhite/24/paintbrush.png</file>
     <file>themes/monowhite/24/open.png</file>
     <file>themes/monowhite/24/edit.png</file>
     <file>themes/monowhite/24/information.png</file>
@@ -894,6 +909,7 @@
     <file>themes/monowhite/24/contributors.png</file>
     <file>themes/monowhite/24/stop.png</file>
     <file>themes/monowhite/24/write_eeprom.png</file>
+    <file>themes/monowhite/32/paintbrush.png</file>
     <file>themes/monowhite/32/open.png</file>
     <file>themes/monowhite/32/edit.png</file>
     <file>themes/monowhite/32/information.png</file>
@@ -937,6 +953,7 @@
     <file>themes/monowhite/32/contributors.png</file>
     <file>themes/monowhite/32/stop.png</file>
     <file>themes/monowhite/32/write_eeprom.png</file>
+    <file>themes/monowhite/48/paintbrush.png</file>
     <file>themes/monowhite/48/open.png</file>
     <file>themes/monowhite/48/edit.png</file>
     <file>themes/monowhite/48/information.png</file>

companion/src/eeprominterface.h

@@ -646,7 +646,7 @@ class FuncSwData { // Function Switches data
     char paramarm[10];
     unsigned int enabled; // TODO perhaps not any more the right name
     unsigned int adjustMode;
-    unsigned int repeatParam;
+    int repeatParam;
     void clear() { memset(this, 0, sizeof(FuncSwData)); }
 };
 
@@ -788,14 +788,13 @@ enum TimerMode {
 class TimerData {
   public:
     TimerData() { clear(); }
-    TimerMode mode;   // timer trigger source -> off, abs, THs, TH%, THt, sw/!sw, !m_sw/!m_sw
+    TimerMode    mode;   // timer trigger source -> off, abs, THs, TH%, THt, sw/!sw, !m_sw/!m_sw
-    int8_t    modeB;
+    bool         minuteBeep;
-    bool minuteBeep;
+    unsigned int countdownBeep;
-    bool countdownBeep;
+    bool         dir;    // 0=>Count Down, 1=>Count Up
-    bool      dir;    // 0=>Count Down, 1=>Count Up
     unsigned int val;
-    bool      persistent;
+    bool         persistent;
-    int pvalue;
+    int          pvalue;
     void clear() { memset(this, 0, sizeof(TimerData)); }
 };
 
@@ -915,8 +914,6 @@ enum Capability {
  MixesWithoutExpo,
  Timers,
  TimeDivisions,
- minuteBeep,
- countdownBeep,
  CustomFunctions,
  VoicesAsNumbers,
  VoicesMaxLength,

companion/src/firmwares/er9x/er9xeeprom.cpp

@@ -366,9 +366,7 @@ t_Er9xModelData::operator ModelData ()
   c9x.timers[0].mode = getEr9xTimerMode(tmrMode);
   c9x.timers[0].dir = tmrDir;
   c9x.timers[0].val = tmrVal;
-  c9x.timers[0].modeB = tmrModeB;
+  switch(protocol) {
-
-    switch(protocol) {
     case 1:
       c9x.moduleData[0].protocol = PXX_DJT;
       break;

companion/src/firmwares/ersky9x/ersky9xeeprom.cpp

@@ -508,7 +508,6 @@ t_Ersky9xModelData_v10::operator ModelData ()
   getEEPROMString(c9x.name, name, sizeof(name));
   for (int i=0; i<2; i++) {
     c9x.timers[i].mode = getErSky9xTimerMode(timer[i].tmrModeA);
-    c9x.timers[i].modeB = timer[i].tmrModeB;
     c9x.timers[i].dir = timer[i].tmrDir;
     c9x.timers[i].val = timer[i].tmrVal;
   }
@@ -630,7 +629,6 @@ t_Ersky9xModelData_v11::operator ModelData ()
   getEEPROMString(c9x.name, name, sizeof(name));
   for (int i=0; i<2; i++) {
     c9x.timers[i].mode = getErSky9xTimerMode(timer[i].tmrModeA);
-    c9x.timers[i].modeB = timer[i].tmrModeB;
     c9x.timers[i].dir = timer[i].tmrDir;
     c9x.timers[i].val = timer[i].tmrVal;
   }

companion/src/firmwares/opentx/opentxeeprom.cpp

@@ -1338,10 +1338,10 @@ class CustomFunctionField: public TransformedField {
           internalField.Append(new CharField<6>(_arm_param));
         if (version >= 214) {
           internalField.Append(new UnsignedField<2>(_mode));
-          internalField.Append(new UnsignedField<6>(_delay));
+          internalField.Append(new SignedField<6>(_delay));
         }
         else {
-          internalField.Append(new UnsignedField<8>(_delay));
+          internalField.Append(new UnsignedField<8>((unsigned int &)_delay));
         }
         if (version < 214)
           internalField.Append(new SpareBitsField<8>());
@@ -1364,7 +1364,7 @@ class CustomFunctionField: public TransformedField {
       if (IS_ARM(board)) {
         _mode = 0;
         if (fn.func == FuncPlaySound || fn.func == FuncPlayPrompt || fn.func == FuncPlayValue)
-          _delay = fn.repeatParam / 5;
+          _delay = (version >= 216 ? fn.repeatParam : (fn.repeatParam/5));
         else
           _delay = (fn.enabled ? 1 : 0);
         if (fn.func <= FuncInstantTrim) {
@@ -1439,7 +1439,7 @@ class CustomFunctionField: public TransformedField {
     {
       if (IS_ARM(board)) {
         if (fn.func == FuncPlaySound || fn.func == FuncPlayPrompt || fn.func == FuncPlayValue)
-          fn.repeatParam = _delay * 5;
+          fn.repeatParam = (version >= 216 ? _delay : (_delay*5));
         else
           fn.enabled = (_delay & 0x01);
 
@@ -1529,7 +1529,7 @@ class CustomFunctionField: public TransformedField {
     SourcesConversionTable * sourcesConversionTable;
     char _arm_param[10];
     unsigned int _param;
-    unsigned int _delay;
+    int _delay;
     unsigned int _mode;
     unsigned int _union_param;
 };
@@ -1688,8 +1688,7 @@ class FrskyField: public StructField {
         Append(new UnsignedField<8>(frsky.usrProto));
         if (version >= 216) {
           Append(new UnsignedField<7>(frsky.voltsSource));
-          // TODO altitude displayed
+          Append(new BoolField<1>(frsky.altitudeDisplayed));
-          Append(new SpareBitsField<1>());
         }
         else {
           Append(new UnsignedField<8>(frsky.voltsSource));
@@ -1812,7 +1811,7 @@ Open9xModelDataNew::Open9xModelDataNew(ModelData & modelData, BoardEnum board, u
     internalField.Append(new TimerModeField(modelData.timers[i].mode, board, version));
     if ((IS_ARM(board) || IS_2560(board)) && version >= 216) {
       internalField.Append(new UnsignedField<16>(modelData.timers[i].val));
-      internalField.Append(new BoolField<2>(modelData.timers[i].countdownBeep));
+      internalField.Append(new UnsignedField<2>(modelData.timers[i].countdownBeep));
       internalField.Append(new BoolField<1>(modelData.timers[i].minuteBeep));
       internalField.Append(new BoolField<1>(modelData.timers[i].persistent));
       internalField.Append(new SpareBitsField<4>());
@@ -1820,7 +1819,7 @@ Open9xModelDataNew::Open9xModelDataNew(ModelData & modelData, BoardEnum board, u
     }
     else if (release21March2013) {
       internalField.Append(new UnsignedField<12>(modelData.timers[i].val));
-      internalField.Append(new BoolField<1>(modelData.timers[i].countdownBeep));
+      internalField.Append(new BoolField<1>((bool &)modelData.timers[i].countdownBeep));
       internalField.Append(new BoolField<1>(modelData.timers[i].minuteBeep));
       if (HAS_PERSISTENT_TIMERS(board)) {
         internalField.Append(new BoolField<1>(modelData.timers[i].persistent));

companion/src/firmwares/opentx/opentxinterface.cpp

@@ -513,10 +513,6 @@ int Open9xInterface::getCapability(const Capability capability)
         return 1;
       else
         return 0;
-    case minuteBeep:
-        return 1;
-    case countdownBeep:
-        return 1;
     case Pots:
       return (IS_TARANIS(board) ? 4 : 3);
     case Switches:

companion/src/helpers.cpp

@@ -12,7 +12,8 @@ QString getPhaseName(int val, char * phasename)
     phaseName.append(phasename);
     if (phaseName.isEmpty()) {
       return QString(val < 0 ? "!" : "") + QObject::tr("FM%1").arg(abs(val) - 1);
-    } else {
+    }
+    else {
       return QString(val < 0 ? "!" : "") + phaseName;
     }
   }
@@ -449,17 +450,6 @@ void populateFuncParamCB(QComboBox *b, const ModelData & model, uint function, u
   }
 }
 
-void populateRepeatCB(QComboBox *b, unsigned int value)
-{
-  b->clear();
-  b->addItem(QObject::tr("No repeat", 0));
-  unsigned int step = IS_ARM(GetEepromInterface()->getBoard()) ? 5 : 10;
-  for (unsigned int i=step; i<=60; i+=step) {
-    b->addItem(QObject::tr("%1s").arg(i), i);
-    if (i==value) b->setCurrentIndex(b->count()-1);
-  }
-}
-
 void populateGVmodeCB(QComboBox *b, unsigned int value)
 {
   b->clear();

companion/src/helpers.h

@@ -84,7 +84,6 @@ class CurveGroup : public QObject {
 #define POPULATE_AND_SWITCHES 0x04
 void populateSwitchCB(QComboBox *b, const RawSwitch & value, unsigned long attr=0, UseContext context=DefaultContext);
 void populateFuncCB(QComboBox *b, unsigned int value);
-void populateRepeatCB(QComboBox *b, unsigned int value);
 void populateGVmodeCB(QComboBox *b, unsigned int value);
 QString FuncParam(uint function, int value, QString paramT="",unsigned int adjustmode=0);
 void populateFuncParamCB(QComboBox *b, const ModelData & model, uint function, unsigned int value, unsigned int adjustmode=0);

companion/src/images/linuxicons/scalable/companion.svg

@@ -1,104 +1,340 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg
-<svg version="1.2" width="190mm" height="190mm" viewBox="0 0 19000 19000" preserveAspectRatio="xMidYMid" fill-rule="evenodd" clip-path="url(#presentation_clip_path)" stroke-width="28.222" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg" xmlns:ooo="http://xml.openoffice.org/svg/export" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve">
+   xmlns:ooo="http://xml.openoffice.org/svg/export"
- <defs class="ClipPathGroup">
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-  <clipPath id="presentation_clip_path" clipPathUnits="userSpaceOnUse">
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   <rect x="0" y="0" width="19000" height="19000"/>
+   xmlns:cc="http://creativecommons.org/ns#"
-  </clipPath>
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- </defs>
+   xmlns:svg="http://www.w3.org/2000/svg"
- <defs class="TextShapeIndex">
+   xmlns="http://www.w3.org/2000/svg"
-  <g ooo:slide="id1" ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10"/>
+   xmlns:xlink="http://www.w3.org/1999/xlink"
- </defs>
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- <defs class="EmbeddedBulletChars">
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-  <g id="bullet-char-template(57356)" transform="scale(0.00048828125,-0.00048828125)">
+   version="1.2"
-   <path d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"/>
+   width="190mm"
-  </g>
+   height="190mm"
-  <g id="bullet-char-template(57354)" transform="scale(0.00048828125,-0.00048828125)">
+   viewBox="0 0 19000 19000"
-   <path d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"/>
+   preserveAspectRatio="xMidYMid"
-  </g>
+   fill-rule="evenodd"
-  <g id="bullet-char-template(10146)" transform="scale(0.00048828125,-0.00048828125)">
+   clip-path="url(#presentation_clip_path)"
-   <path d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"/>
+   stroke-width="28.222"
-  </g>
+   stroke-linejoin="round"
-  <g id="bullet-char-template(10132)" transform="scale(0.00048828125,-0.00048828125)">
+   xml:space="preserve"
-   <path d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"/>
+   id="svg3347"
-  </g>
+   inkscape:version="0.48.4 r9939"
-  <g id="bullet-char-template(10007)" transform="scale(0.00048828125,-0.00048828125)">
+   sodipodi:docname="opentx_logo.svg"><metadata
-   <path d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"/>
+     id="metadata3491"><rdf:RDF><cc:Work
-  </g>
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-  <g id="bullet-char-template(10004)" transform="scale(0.00048828125,-0.00048828125)">
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
-   <path d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"/>
+     pagecolor="#ffffff"
-  </g>
+     bordercolor="#666666"
-  <g id="bullet-char-template(9679)" transform="scale(0.00048828125,-0.00048828125)">
+     borderopacity="1"
-   <path d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"/>
+     objecttolerance="10"
-  </g>
+     gridtolerance="10"
-  <g id="bullet-char-template(8226)" transform="scale(0.00048828125,-0.00048828125)">
+     guidetolerance="10"
-   <path d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"/>
+     inkscape:pageopacity="0"
-  </g>
+     inkscape:pageshadow="2"
-  <g id="bullet-char-template(8211)" transform="scale(0.00048828125,-0.00048828125)">
+     inkscape:window-width="1280"
-   <path d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"/>
+     inkscape:window-height="775"
-  </g>
+     id="namedview3489"
- </defs>
+     showgrid="false"
- <defs class="TextEmbeddedBitmaps"/>
+     inkscape:zoom="0.20481287"
- <g>
+     inkscape:cx="-1144.0445"
-  <g id="id2" class="Master_Slide">
+     inkscape:cy="70.041471"
-   <g id="bg-id2" class="Background"/>
+     inkscape:window-x="0"
-   <g id="bo-id2" class="BackgroundObjects"/>
+     inkscape:window-y="0"
-  </g>
+     inkscape:window-maximized="1"
- </g>
+     inkscape:current-layer="g3399" /><defs
- <g class="SlideGroup">
+     class="ClipPathGroup"
-  <g>
+     id="defs3349"><linearGradient
-   <g id="id1" class="Slide" clip-path="url(#presentation_clip_path)">
+       id="linearGradient3844"
-    <g class="Page">
+       osb:paint="solid"><stop
-     <g class="Group">
+         style="stop-color:#000000;stop-opacity:1;"
-      <g class="com.sun.star.drawing.CustomShape">
+         offset="0"
-       <g id="id3">
+         id="stop3846" /></linearGradient><linearGradient
-        <path fill="rgb(0,0,0)" stroke="none" d="M 9500,19000 L 0,19000 0,0 19000,0 19000,19000 9500,19000 Z"/>
+       id="linearGradient3838"
-        <path fill="none" stroke="rgb(0,0,0)" d="M 9500,19000 L 0,19000 0,0 19000,0 19000,19000 9500,19000 Z"/>
+       osb:paint="solid"><stop
-       </g>
+         style="stop-color:#000000;stop-opacity:1;"
-      </g>
+         offset="0"
-      <g class="com.sun.star.drawing.PolyPolygonShape">
+         id="stop3840" /></linearGradient><linearGradient
-       <g id="id4">
+       id="linearGradient3826"
-        <path fill="rgb(255,255,255)" stroke="none" d="M 1500,4800 L 7800,4800 7800,6800 5800,6800 5800,14800 3500,14800 3500,6800 1500,6800 1500,6000 1500,4800 Z"/>
+       osb:paint="solid"><stop
-        <path fill="none" stroke="rgb(255,255,255)" d="M 1500,4800 L 7800,4800 7800,6800 5800,6800 5800,14800 3500,14800 3500,6800 1500,6800 1500,6000 1500,4800 Z"/>
+         style="stop-color:#ffffff;stop-opacity:1;"
-        <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="3228" y="10021"><tspan fill="rgb(0,0,0)" stroke="none">                </tspan></tspan></tspan></text>
+         offset="0"
-       </g>
+         id="stop3828" /></linearGradient><linearGradient
-      </g>
+       id="linearGradient3820"
-      <g class="com.sun.star.drawing.PolyPolygonShape">
+       osb:paint="solid"><stop
-       <g id="id5">
+         style="stop-color:#ffffff;stop-opacity:1;"
-        <path fill="rgb(51,102,51)" stroke="none" d="M 17400,4800 L 14800,4800 13000,7900 11100,4800 8500,4800 11500,9800 8400,14800 10900,14800 13000,11500 15000,14800 17600,14800 14400,9800 17400,4800 Z"/>
+         offset="0"
-        <path fill="none" stroke="rgb(51,102,51)" d="M 17400,4800 L 14800,4800 13000,7900 11100,4800 8500,4800 11500,9800 8400,14800 10900,14800 13000,11500 15000,14800 17600,14800 14400,9800 17400,4800 Z"/>
+         id="stop3822" /></linearGradient><linearGradient
-       </g>
+       id="linearGradient3814"
-      </g>
+       osb:paint="solid"><stop
-      <g class="com.sun.star.drawing.TextShape">
+         style="stop-color:#009000;stop-opacity:1;"
-       <g id="id6">
+         offset="0"
-        <text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="2540px" font-weight="700"><tspan class="TextPosition" x="1201" y="17891"><tspan fill="rgb(255,255,255)" stroke="none">COMPANION</tspan></tspan></tspan></text>
+         id="stop3816" /></linearGradient><clipPath
-       </g>
+       id="presentation_clip_path"
-      </g>
+       clipPathUnits="userSpaceOnUse"><rect
-      <g class="Group">
+         x="0"
-       <g class="com.sun.star.drawing.TextShape">
+         y="0"
-        <g id="id7">
+         width="19000"
-         <text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="1391" y="3521"><tspan fill="rgb(255,255,255)" stroke="none">O</tspan></tspan></tspan></text>
+         height="19000"
-        </g>
+         id="rect3352" /></clipPath><linearGradient
-       </g>
+       inkscape:collect="always"
-       <g class="com.sun.star.drawing.TextShape">
+       xlink:href="#linearGradient3814"
-        <g id="id8">
+       id="linearGradient3818"
-         <text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="6282" y="3521"><tspan fill="rgb(255,255,255)" stroke="none">P</tspan></tspan></tspan></text>
+       x1="8385.889"
-        </g>
+       y1="9800"
-       </g>
+       x2="17614.111"
-       <g class="com.sun.star.drawing.TextShape">
+       y2="9800"
-        <g id="id9">
+       gradientUnits="userSpaceOnUse" /><linearGradient
-         <text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="10696" y="3586"><tspan fill="rgb(255,255,255)" stroke="none">E</tspan></tspan></tspan></text>
+       inkscape:collect="always"
-        </g>
+       xlink:href="#linearGradient3820"
-       </g>
+       id="linearGradient3824"
-       <g class="com.sun.star.drawing.TextShape">
+       x1="1485.889"
-        <g id="id10">
+       y1="9800"
-         <text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="14950" y="3586"><tspan fill="rgb(255,255,255)" stroke="none">N</tspan></tspan></tspan></text>
+       x2="7814.111"
-        </g>
+       y2="9800"
-       </g>
+       gradientUnits="userSpaceOnUse" /><linearGradient
-      </g>
+       inkscape:collect="always"
-     </g>
+       xlink:href="#linearGradient3826"
-    </g>
+       id="linearGradient3830"
-   </g>
+       x1="15416.328"
-  </g>
+       y1="1734.3301"
- </g>
+       x2="18735.195"
-</svg>
+       y2="1734.3301"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3826"
+       id="linearGradient3832"
+       x1="11162.328"
+       y1="1734.3301"
+       x2="13794.105"
+       y2="1734.3301"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3826"
+       id="linearGradient3834"
+       x1="6748.3281"
+       y1="1669.3301"
+       x2="9796.8242"
+       y2="1669.3301"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3826"
+       id="linearGradient3836"
+       x1="1644.0078"
+       y1="1671.8105"
+       x2="5454.0078"
+       y2="1671.8105"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3838"
+       id="linearGradient3842"
+       x1="-14.111"
+       y1="9500"
+       x2="19014.111"
+       y2="9500"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3844"
+       id="linearGradient3848"
+       x1="-14.111"
+       y1="9500"
+       x2="19014.111"
+       y2="9500"
+       gradientUnits="userSpaceOnUse" /></defs><defs
+     class="TextShapeIndex"
+     id="defs3354"><g
+       ooo:slide="id1"
+       ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10"
+       id="g3356" /></defs><defs
+     class="EmbeddedBulletChars"
+     id="defs3358"><g
+       id="bullet-char-template(57356)"
+       transform="scale(0.00048828125,-0.00048828125)"><path
+         d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"
+         id="path3361" /></g><g
+       id="bullet-char-template(57354)"
+       transform="scale(0.00048828125,-0.00048828125)"><path
+         d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"
+         id="path3364" /></g><g
+       id="bullet-char-template(10146)"
+       transform="scale(0.00048828125,-0.00048828125)"><path
+         d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"
+         id="path3367" /></g><g
+       id="bullet-char-template(10132)"
+       transform="scale(0.00048828125,-0.00048828125)"><path
+         d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"
+         id="path3370" /></g><g
+       id="bullet-char-template(10007)"
+       transform="scale(0.00048828125,-0.00048828125)"><path
+         d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"
+         id="path3373" /></g><g
+       id="bullet-char-template(10004)"
+       transform="scale(0.00048828125,-0.00048828125)"><path
+         d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"
+         id="path3376" /></g><g
+       id="bullet-char-template(9679)"
+       transform="scale(0.00048828125,-0.00048828125)"><path
+         d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"
+         id="path3379" /></g><g
+       id="bullet-char-template(8226)"
+       transform="scale(0.00048828125,-0.00048828125)"><path
+         d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"
+         id="path3382" /></g><g
+       id="bullet-char-template(8211)"
+       transform="scale(0.00048828125,-0.00048828125)"><path
+         d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"
+         id="path3385" /></g></defs><defs
+     class="TextEmbeddedBitmaps"
+     id="defs3387" /><g
+     id="g3389"><g
+       id="id2"
+       class="Master_Slide"><g
+         id="bg-id2"
+         class="Background" /><g
+         id="bo-id2"
+         class="BackgroundObjects" /></g></g><g
+     id="g3399"
+     class="Page"><g
+       class="com.sun.star.drawing.CustomShape"
+       id="g3403"
+       style="stroke:url(#linearGradient3842);fill-opacity:1;fill:url(#linearGradient3848)"><g
+         id="id3"
+         style="stroke:url(#linearGradient3842);fill-opacity:1;fill:url(#linearGradient3848)"><path
+           d="M 9500,19000 0,19000 0,0 l 19000,0 0,19000 -9500,0 z"
+           id="path3406"
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3848);stroke:url(#linearGradient3842);fill-opacity:1" /><path
+           d="M 9500,19000 0,19000 0,0 l 19000,0 0,19000 -9500,0 z"
+           id="path3408"
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3848);stroke:url(#linearGradient3842);fill-opacity:1" /></g></g><g
+       class="com.sun.star.drawing.PolyPolygonShape"
+       id="g3410"
+       transform="translate(0,2427.1101)"
+       style="fill:#ffffff;stroke:url(#linearGradient3824)"><g
+         id="id4"
+         style="fill:#ffffff;stroke:url(#linearGradient3824)"><path
+           d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z"
+           id="path3413"
+           inkscape:connector-curvature="0"
+           style="fill:#ffffff;stroke:url(#linearGradient3824)" /><path
+           d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z"
+           id="path3415"
+           inkscape:connector-curvature="0"
+           style="fill:#ffffff;stroke:url(#linearGradient3824)" /><text
+           class="TextShape"
+           id="text3417"
+           style="fill:#ffffff;stroke:url(#linearGradient3824)"><tspan
+             class="TextParagraph"
+             font-size="635px"
+             font-weight="400"
+             id="tspan3419"
+             style="font-size:635px;font-weight:400;fill:#ffffff;font-family:'Liberation Sans, sans-serif';stroke:url(#linearGradient3824)"><tspan
+               class="TextPosition"
+               x="3228"
+               y="10021"
+               id="tspan3421"
+               style="fill:#ffffff;stroke:url(#linearGradient3824)"><tspan
+                 id="tspan3423"
+                 style="fill:#ffffff;stroke:url(#linearGradient3824)" /></tspan></tspan></text>
+</g></g><g
+       class="com.sun.star.drawing.PolyPolygonShape"
+       id="g3425"
+       transform="translate(0,2427.1101)"
+       style="fill:#009000;fill-opacity:1;stroke:url(#linearGradient3818)"><g
+         id="id5"
+         style="fill:#009000;fill-opacity:1;stroke:url(#linearGradient3818)"><path
+           d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
+           id="path3428"
+           inkscape:connector-curvature="0"
+           style="fill:#009000;stroke:url(#linearGradient3818);fill-opacity:1" /><path
+           d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
+           id="path3430"
+           inkscape:connector-curvature="0"
+           style="fill:#009000;stroke:url(#linearGradient3818);fill-opacity:1" /></g></g><g
+       id="g3445"
+       class="com.sun.star.drawing.TextShape"
+       transform="translate(-169.33334,2144.8881)"
+       style="stroke:url(#linearGradient3836)"><g
+         id="id7"
+         style="stroke:url(#linearGradient3836)"><text
+           style="line-height:125%;stroke:url(#linearGradient3836)"
+           id="text3448"
+           class="TextShape"
+           sodipodi:linespacing="125%"><tspan
+             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold;stroke:url(#linearGradient3836)"
+             id="tspan3450"
+             font-weight="700"
+             font-size="3104px"
+             class="TextParagraph"><tspan
+               id="tspan3452"
+               y="3521"
+               x="1391"
+               class="TextPosition"
+               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:url(#linearGradient3836);font-family:Sans;-inkscape-font-specification:Sans Bold">O</tspan></tspan></text>
+</g></g><g
+       id="g3456"
+       class="com.sun.star.drawing.TextShape"
+       transform="translate(-508.00004,2144.8881)"
+       style="stroke:url(#linearGradient3834)"><g
+         id="id8"
+         style="stroke:url(#linearGradient3834)"><text
+           style="line-height:125%;stroke:url(#linearGradient3834)"
+           id="text3459"
+           class="TextShape"
+           sodipodi:linespacing="125%"><tspan
+             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold;stroke:url(#linearGradient3834)"
+             id="tspan3461"
+             font-weight="700"
+             font-size="3104px"
+             class="TextParagraph"><tspan
+               id="tspan3463"
+               y="3521"
+               x="6282"
+               class="TextPosition"
+               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:url(#linearGradient3834);font-family:Sans;-inkscape-font-specification:Sans Bold">P</tspan></tspan></text>
+</g></g><g
+       id="g3467"
+       class="com.sun.star.drawing.TextShape"
+       transform="translate(-846.66674,2144.8881)"
+       style="stroke:url(#linearGradient3832)"><g
+         id="id9"
+         style="stroke:url(#linearGradient3832)"><text
+           style="line-height:125%;stroke:url(#linearGradient3832)"
+           id="text3470"
+           class="TextShape"
+           sodipodi:linespacing="125%"><tspan
+             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold;stroke:url(#linearGradient3832)"
+             id="tspan3472"
+             font-weight="700"
+             font-size="3104px"
+             class="TextParagraph"><tspan
+               id="tspan3474"
+               y="3586"
+               x="10696"
+               class="TextPosition"
+               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:url(#linearGradient3832);font-family:Sans;-inkscape-font-specification:Sans Bold">E</tspan></tspan></text>
+</g></g><g
+       id="g3478"
+       class="com.sun.star.drawing.TextShape"
+       transform="translate(-1241.7777,2144.8881)"
+       style="stroke:url(#linearGradient3830)"><g
+         id="id10"
+         style="stroke:url(#linearGradient3830)"><text
+           style="line-height:125%;stroke:url(#linearGradient3830)"
+           id="text3481"
+           class="TextShape"
+           sodipodi:linespacing="125%"><tspan
+             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold;stroke:url(#linearGradient3830)"
+             id="tspan3483"
+             font-weight="700"
+             font-size="3104px"
+             class="TextParagraph"><tspan
+               id="tspan3485"
+               y="3586"
+               x="14950"
+               class="TextPosition"
+               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:url(#linearGradient3830);font-family:Sans;-inkscape-font-specification:Sans Bold">N</tspan></tspan></text>
+</g></g></g></svg>

companion/src/images/originals/logotypes/opentx_2_logo.svg

@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    height="673.22906"
@@ -15,11 +17,131 @@
    id="svg2"
    inkscape:version="0.48.4 r9939"
    sodipodi:docname="opentx_2_logo.svg"
-   inkscape:export-filename="/home/kjell/github/opentx/companion/src/images/originals/logotypes/opentx_2_logo.png"
+   inkscape:export-filename="/home/kernen/github/opentx/companion/src/images/originals/logotypes/opentx_2_logo.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
-     id="defs78" />
+     id="defs78">
+    <linearGradient
+       id="linearGradient3821"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#009000;stop-opacity:1;"
+         offset="0"
+         id="stop3823" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3815"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3817" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3807"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3809" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3801"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3803" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3795"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3797" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3789"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3791" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3783"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#009000;stop-opacity:1;"
+         offset="0"
+         id="stop3785" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3783"
+       id="linearGradient3787"
+       x1="8399.5"
+       y1="9800"
+       x2="17600.5"
+       y2="9800"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3789"
+       id="linearGradient3793"
+       x1="1499.5"
+       y1="9800"
+       x2="7800.5"
+       y2="9800"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3795"
+       id="linearGradient3799"
+       x1="1499.5"
+       y1="9800"
+       x2="7800.5"
+       y2="9800"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3801"
+       id="linearGradient3805"
+       x1="1488.8206"
+       y1="3830.8831"
+       x2="17507.216"
+       y2="3830.8831"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3807"
+       id="linearGradient3811"
+       x1="1488.3206"
+       y1="3830.8831"
+       x2="17507.716"
+       y2="3830.8831"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3815"
+       id="linearGradient3819"
+       x1="-531.16998"
+       y1="236.981"
+       x2="-307.17701"
+       y2="236.981"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3821"
+       id="linearGradient3825"
+       x1="0"
+       y1="9500"
+       x2="19000"
+       y2="9500"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -29,13 +151,13 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1398"
+     inkscape:window-width="1280"
-     inkscape:window-height="1000"
+     inkscape:window-height="775"
      id="namedview76"
      showgrid="false"
-     inkscape:zoom="0.18023158"
+     inkscape:zoom="0.36046316"
-     inkscape:cx="802.7999"
+     inkscape:cx="1169.5417"
-     inkscape:cy="49.836102"
+     inkscape:cy="345.32082"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="1"
@@ -77,54 +199,56 @@
   <g
      id="g16"
      class="com.sun.star.drawing.PolyPolygonShape"
-     transform="matrix(0.03543311,0,0,0.03543311,0,86.000062)">
+     transform="matrix(0.03543311,0,0,0.03543311,0,86.000062)"
+     style="fill-opacity:1;fill:url(#linearGradient3793);stroke:url(#linearGradient3799)">
     <path
-       style="fill:#ffffff"
+       style="fill:url(#linearGradient3793);fill-opacity:1;stroke:url(#linearGradient3799)"
        inkscape:connector-curvature="0"
        id="path18"
        d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z" />
     <path
-       style="fill:#ffffff;stroke:#ffffff"
+       style="fill:url(#linearGradient3793);stroke:url(#linearGradient3799);fill-opacity:1"
        inkscape:connector-curvature="0"
        id="path20"
        d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z" />
     <text
-       style="fill:#ffffff"
+       style="fill:url(#linearGradient3793);fill-opacity:1;stroke:url(#linearGradient3799)"
        id="text22"
        class="TextShape">
       <tspan
-         style="font-size:635px;font-weight:400;fill:#ffffff;font-family:'Liberation Sans, sans-serif'"
+         style="font-size:635px;font-weight:400;fill:url(#linearGradient3793);font-family:'Liberation Sans, sans-serif';fill-opacity:1;stroke:url(#linearGradient3799)"
          id="tspan24"
          class="TextParagraph"
          font-size="635px"
          font-weight="400">
         <tspan
-           style="fill:#ffffff"
+           style="fill:url(#linearGradient3793);fill-opacity:1;stroke:url(#linearGradient3799)"
            id="tspan26"
            x="3228"
            y="10021"
            class="TextPosition">
           <tspan
-             style="fill:#ffffff"
+             style="fill:url(#linearGradient3793);fill-opacity:1;stroke:url(#linearGradient3799)"
              id="tspan28" />
         </tspan>
       </tspan>
     </text>
   </g>
   <g
-     style="fill:#009100"
+     style="fill:#009000;stroke:url(#linearGradient3787);fill-opacity:1"
      id="g30"
      class="com.sun.star.drawing.PolyPolygonShape"
      transform="matrix(0.03543311,0,0,0.03543311,0,86.000062)">
     <g
-       style="fill:#009100"
+       style="fill:#009000;stroke:url(#linearGradient3787);fill-opacity:1"
        id="g32">
       <path
          inkscape:connector-curvature="0"
          id="path34"
-         d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z" />
+         d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
+         style="stroke:url(#linearGradient3787);fill:#009000;fill-opacity:1" />
       <path
-         style="stroke:#336633"
+         style="stroke:url(#linearGradient3787);fill:#009000;fill-opacity:1"
          inkscape:connector-curvature="0"
          id="path36"
          d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z" />
@@ -132,17 +256,19 @@
   </g>
   <g
      id="g38"
-     transform="matrix(0.03543311,0,0,0.03543311,-0.5005,-0.50049)">
+     transform="matrix(0.03543311,0,0,0.03543311,-0.5005,-0.50049)"
+     style="stroke:url(#linearGradient3805);fill-opacity:1;fill:url(#linearGradient3811)">
     <g
        id="g40"
        class="com.sun.star.drawing.TextShape"
-       transform="translate(-155.20944,2159.0131)">
+       transform="translate(-155.20944,2159.0131)"
+       style="stroke:url(#linearGradient3805);fill-opacity:1;fill:url(#linearGradient3811)">
       <g
-         style="line-height:125%"
+         style="line-height:125%;stroke:url(#linearGradient3805);fill-opacity:1;fill:url(#linearGradient3811)"
          id="g42"
          line-height="125%">
         <path
-           style="fill:#ffffff"
+           style="fill:url(#linearGradient3811);stroke:url(#linearGradient3805);fill-opacity:1"
            inkscape:connector-curvature="0"
            id="path44"
            d="m 3549,442.74 c -291.04,0.003 -516.77,107.49 -677.17,322.46 -160.4,214.98 -240.61,517.59 -240.61,907.85 0,388.61 80.2,690.4 240.61,905.37 160.4,214.97 386.12,322.46 677.17,322.46 292.69,6e-4 519.24,-107.49 679.65,-322.46 160.4,-214.97 240.6,-516.76 240.61,-905.37 0,-390.26 -80.205,-692.88 -240.61,-907.85 -160.4,-214.92 -386.9,-322.41 -679.6,-322.41 m 0,-692.05 c 595.31,0.004 1061.6,170.33 1399,510.98 337.34,340.65 506.01,811.12 506.02,1411.4 0,598.62 -168.68,1068.3 -506.02,1408.9 -337.35,340.65 -803.67,510.98 -1399,510.98 -593.66,-1e-4 -1060,-170.33 -1399,-510.98 -337.34,-340.65 -506.02,-810.29 -506.02,-1408.9 -2e-4,-600.27 168.67,-1070.7 506.02,-1411.4 339,-340.65 805.32,-510.97 1399,-510.98" />
@@ -151,13 +277,14 @@
     <g
        id="g46"
        class="com.sun.star.drawing.TextShape"
-       transform="translate(-493.87614,2159.0131)">
+       transform="translate(-493.87614,2159.0131)"
+       style="stroke:url(#linearGradient3805);fill-opacity:1;fill:url(#linearGradient3811)">
       <g
-         style="line-height:125%"
+         style="line-height:125%;stroke:url(#linearGradient3805);fill-opacity:1;fill:url(#linearGradient3811)"
          id="g48"
          line-height="125%">
         <path
-           style="fill:#ffffff"
+           style="fill:url(#linearGradient3811);stroke:url(#linearGradient3805);fill-opacity:1"
            inkscape:connector-curvature="0"
            id="path50"
            d="m 6748.3,-182.34 1585,0 c 471.29,0.004 832.61,105.01 1084,315.02 253,208.36 379.51,506.02 379.51,892.97 0,388.61 -126.51,687.92 -379.51,897.93 -251.36,208.36 -612.68,312.54 -1084,312.54 h -630.04 v 1284.9 h -954.98 v -3703.3 m 954.98,692.05 0,1034.4 528.34,0 c 185.21,0 328.25,-44.646 429.12,-133.95 100.87,-90.948 151.31,-219.11 151.31,-384.47 0,-165.36 -50.439,-292.69 -151.31,-381.99 C 8559.85,554.466 8416.81,509.82 8231.6,509.81 h -528.34" />
@@ -166,13 +293,14 @@
     <g
        id="g52"
        class="com.sun.star.drawing.TextShape"
-       transform="translate(-832.54284,2159.0131)">
+       transform="translate(-832.54284,2159.0131)"
+       style="stroke:url(#linearGradient3805);fill-opacity:1;fill:url(#linearGradient3811)">
       <g
-         style="line-height:125%"
+         style="line-height:125%;stroke:url(#linearGradient3805);fill-opacity:1;fill:url(#linearGradient3811)"
          id="g54"
          line-height="125%">
         <path
-           style="fill:#ffffff"
+           style="fill:url(#linearGradient3811);stroke:url(#linearGradient3805);fill-opacity:1"
            inkscape:connector-curvature="0"
            id="path56"
            d="m 11162,-117.34 2577.2,0 0,721.82 -1622.2,0 0,689.57 1525.5,0 0,721.82 -1525.5,0 0,848.32 1676.8,0 0,721.82 -2631.8,0 0,-3703.3" />
@@ -181,13 +309,14 @@
     <g
        id="g58"
        class="com.sun.star.drawing.TextShape"
-       transform="translate(-1227.6538,2159.0131)">
+       transform="translate(-1227.6538,2159.0131)"
+       style="stroke:url(#linearGradient3805);fill-opacity:1;fill:url(#linearGradient3811)">
       <g
-         style="line-height:125%"
+         style="line-height:125%;stroke:url(#linearGradient3805);fill-opacity:1;fill:url(#linearGradient3811)"
          id="g60"
          line-height="125%">
         <path
-           style="fill:#ffffff"
+           style="fill:url(#linearGradient3811);stroke:url(#linearGradient3805);fill-opacity:1"
            inkscape:connector-curvature="0"
            id="path62"
            d="m 15416,-117.34 1066.6,0 1346.9,2540 0,-2540 905.37,0 0,3703.3 -1066.6,0 -1346.9,-2540 0,2540 -905.37,0 0,-3703.3" />
@@ -195,34 +324,38 @@
     </g>
   </g>
   <g
-     style="fill:#009100"
+     style="fill:#009000;stroke:url(#linearGradient3825);fill-opacity:1"
      id="g64"
      class="com.sun.star.drawing.CustomShape"
      transform="matrix(0.03543311,0,0,0.03543311,672.43766,0)">
     <path
        inkscape:connector-curvature="0"
        id="path66"
-       d="M 9500,19000 0,19000 0,0 H 19000 V 19000 H 9500 z" />
+       d="M 9500,19000 0,19000 0,0 H 19000 V 19000 H 9500 z"
+       style="stroke:url(#linearGradient3825);fill:#009000;fill-opacity:1" />
     <path
        inkscape:connector-curvature="0"
        id="path68"
-       d="M 9500,19000 0,19000 0,0 H 19000 V 19000 H 9500 z" />
+       d="M 9500,19000 0,19000 0,0 H 19000 V 19000 H 9500 z"
+       style="stroke:url(#linearGradient3825);fill:#009000;fill-opacity:1" />
   </g>
   <g
-     style="fill:#ffffff"
+     style="fill:#ffffff;stroke:url(#linearGradient3819)"
      id="g70"
-     transform="matrix(1.1733935,0,0,1.0743315,1511.2227,89.174002)">
+     transform="matrix(1.1733935,0,0,1.0743315,1501.2227,81.174002)">
     <rect
        id="rect72"
        x="-531.16998"
        y="59.701"
        width="82.833"
-       height="354.56" />
+       height="354.56"
+       style="stroke:url(#linearGradient3819)" />
     <rect
        id="rect74"
        x="-390.01001"
        y="59.701"
        width="82.833"
-       height="354.56" />
+       height="354.56"
+       style="stroke:url(#linearGradient3819)" />
   </g>
 </svg>

companion/src/images/originals/logotypes/opentx_2_logo_v2.svg

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="673.23" width="1345.7" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <metadata>
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g transform="translate(1429.9602,109.96665)">
-  <g transform="matrix(0.03543311,0,0,0.03543311,-1429.9603,-109.96665)"></g>
-  <g transform="matrix(0.03543311,0,0,0.03543311,-1429.9602,-109.96665)" class="com.sun.star.drawing.CustomShape">
-   <path d="M9500,19000,0,19000,0,0h19000v19000h-9500z" fill="#000"/>
-   <path d="M9500,19000,0,19000,0,0h19000v19000h-9500z" fill="none"/>
-  </g>
-  <g transform="matrix(0.03543311,0,0,0.03543311,-1429.9602,-23.966588)" class="com.sun.star.drawing.PolyPolygonShape">
-   <path d="m1500,4800,6300,0,0,2000-2000,0,0,8000-2300,0,0-8000-2000,0,0-800,0-1200z" fill="#FFF"/>
-   <path d="m1500,4800,6300,0,0,2000-2000,0,0,8000-2300,0,0-8000-2000,0,0-800,0-1200z" fill="#FFF" stroke="#FFF"/>
-   <text fill="#ffffff" class="TextShape">
-    <tspan font-weight="400" font-size="635px" class="TextParagraph" font-family="&apos;Liberation Sans, sans-serif&apos;" fill="#ffffff">
-     <tspan class="TextPosition" y="10021" x="3228" fill="#ffffff">
-      <tspan fill="#ffffff"/>
-     </tspan>
-    </tspan>
-   </text>
-  </g>
-  <g transform="matrix(0.03543311,0,0,0.03543311,-1429.9602,-23.966588)" class="com.sun.star.drawing.PolyPolygonShape" fill="#009100">
-   <g fill="#009100">
-    <path d="m17400,4800-2600,0-1800,3100-1900-3100-2600,0,3000,5000-3100,5000,2500,0,2100-3300,2000,3300,2600,0-3200-5000,3000-5000z"/>
-    <path d="m17400,4800-2600,0-1800,3100-1900-3100-2600,0,3000,5000-3100,5000,2500,0,2100-3300,2000,3300,2600,0-3200-5000,3000-5000z" stroke="#363"/>
-   </g>
-  </g>
-  <g transform="matrix(0.03543311,0,0,0.03543311,-1430.4607,-110.46714)">
-   <g transform="translate(-155.20944,2159.0131)" class="com.sun.star.drawing.TextShape">
-    <g line-height="125%">
-     <path fill="#FFF" d="m3549,442.74c-291.04,0.003-516.77,107.49-677.17,322.46-160.4,214.98-240.61,517.59-240.61,907.85,0,388.61,80.2,690.4,240.61,905.37,160.4,214.97,386.12,322.46,677.17,322.46,292.69,0.0006,519.24-107.49,679.65-322.46,160.4-214.97,240.6-516.76,240.61-905.37,0-390.26-80.205-692.88-240.61-907.85-160.4-214.92-386.9-322.41-679.6-322.41m0-692.05c595.31,0.004,1061.6,170.33,1399,510.98,337.34,340.65,506.01,811.12,506.02,1411.4,0,598.62-168.68,1068.3-506.02,1408.9-337.35,340.65-803.67,510.98-1399,510.98-593.66-0.0001-1060-170.33-1399-510.98-337.34-340.65-506.02-810.29-506.02-1408.9-0.0002-600.27,168.67-1070.7,506.02-1411.4,339-340.65,805.32-510.97,1399-510.98"/>
-    </g>
-   </g>
-   <g transform="translate(-493.87614,2159.0131)" class="com.sun.star.drawing.TextShape">
-    <g line-height="125%">
-     <path fill="#FFF" d="m6748.3-182.34,1585,0c471.29,0.004,832.61,105.01,1084,315.02,253,208.36,379.51,506.02,379.51,892.97,0,388.61-126.51,687.92-379.51,897.93-251.36,208.36-612.68,312.54-1084,312.54h-630.04v1284.9h-954.98v-3703.3m954.98,692.05,0,1034.4,528.34,0c185.21,0,328.25-44.646,429.12-133.95,100.87-90.948,151.31-219.11,151.31-384.47s-50.439-292.69-151.31-381.99c-100.87-89.294-243.91-133.94-429.12-133.95h-528.34"/>
-    </g>
-   </g>
-   <g transform="translate(-832.54284,2159.0131)" class="com.sun.star.drawing.TextShape">
-    <g line-height="125%">
-     <path fill="#FFF" d="m11162-117.34,2577.2,0,0,721.82-1622.2,0,0,689.57,1525.5,0,0,721.82-1525.5,0,0,848.32,1676.8,0,0,721.82-2631.8,0,0-3703.3"/>
-    </g>
-   </g>
-   <g transform="translate(-1227.6538,2159.0131)" class="com.sun.star.drawing.TextShape">
-    <g line-height="125%">
-     <path fill="#FFF" d="m15416-117.34,1066.6,0,1346.9,2540,0-2540,905.37,0,0,3703.3-1066.6,0-1346.9-2540,0,2540-905.37,0,0-3703.3"/>
-    </g>
-   </g>
-  </g>
-  <g transform="matrix(0.03543311,0,0,0.03543311,-757.52254,-109.96665)" class="com.sun.star.drawing.CustomShape" fill="#009100">
-   <path d="M9500,19000,0,19000,0,0h19000v19000h-9500z"/>
-   <path d="M9500,19000,0,19000,0,0h19000v19000h-9500z"/>
-  </g>
-  <g style="writing-mode:lr-tb;letter-spacing:0px;text-anchor:start;word-spacing:0px;text-align:start;" font-weight="bold" font-size="600px" font-stretch="normal" font-variant="normal" font-style="normal" font-family="DejaVu Sans" line-height="125%" fill="#FFF">
-   <path fill="#FFF" d="m-297.97,167.03c-0.00025,19.667-4.3336,37.5-13,53.5-8.3336,16-19,29.5-32,40.5-13,10.667-26.334,20.667-40,30-13.667,9.0001-26.833,19-39.5,30-12.667,10.667-21.667,21.667-27,33h150v62.5h-241c1.6666-32.667,8.1666-58.5,19.5-77.5,11.667-19.333,32.5-39.5,62.5-60.5,39-27.333,63.833-47.5,74.5-60.5,10.666-13.333,16-29.833,16-49.5-0.00018-17.666-4.5002-31.5-13.5-41.5-8.6668-10.333-20.833-15.5-36.5-15.5-16,0.00031-28.5,5.5003-37.5,16.5-8.6668,11-13,26.334-13,46v11.5h-67c-0.33335-3.6664-0.50002-7.8331-0.5-12.5-0.00002-37.333,10.167-66.333,30.5-87,20.667-21,49.333-31.5,86-31.5,37.333,0.000362,66.833,10.167,88.5,30.5,22,20.334,33,47.667,33,82"/>
-  </g>
- </g>
-</svg>

companion/src/images/originals/logotypes/opentx_companion_logo.svg

@@ -2,31 +2,81 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="2948.4922"
+   width="2947.7456"
-   height="673.22906"
+   height="673.15546"
    id="svg3088"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="opentx_logo_blue3.svg">
+   sodipodi:docname="opentx_companion_logo.svg"
+   inkscape:export-filename="/home/kernen/github/opentx/companion/src/images/originals/logotypes/opentx_companion_logo.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <defs
-     id="defs3090" />
+     id="defs3090">
+    <linearGradient
+       id="linearGradient3820"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3822" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3820"
+       id="linearGradient3824"
+       x1="0"
+       y1="9500"
+       x2="19000"
+       y2="9500"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3820"
+       id="linearGradient3826"
+       gradientUnits="userSpaceOnUse"
+       x1="0"
+       y1="9500"
+       x2="19000"
+       y2="9500" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3820"
+       id="linearGradient3828"
+       gradientUnits="userSpaceOnUse"
+       x1="0"
+       y1="9500"
+       x2="19000"
+       y2="9500" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3820"
+       id="linearGradient3830"
+       gradientUnits="userSpaceOnUse"
+       x1="0"
+       y1="9500"
+       x2="19000"
+       y2="9500" />
+  </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#000000"
      bordercolor="#666666"
      borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.175"
+     inkscape:zoom="0.35"
-     inkscape:cx="1033.4316"
+     inkscape:cx="1493.6349"
-     inkscape:cy="88.376325"
+     inkscape:cy="154.38925"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -34,8 +84,8 @@
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-width="1398"
+     inkscape:window-width="1280"
-     inkscape:window-height="1000"
+     inkscape:window-height="775"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="1" />
@@ -55,7 +105,27 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(1429.9602,109.96665)">
+     transform="translate(1428.6413,109.23949)">
+    <g
+       style="fill:#000000;fill-rule:evenodd;stroke:url(#linearGradient3824)"
+       id="g101-6"
+       class="com.sun.star.drawing.CustomShape"
+       transform="matrix(0.15513634,0,0,0.03542737,-1428.5637,-109.22178)">
+      <g
+         style="fill:#000000;stroke:url(#linearGradient3830)"
+         id="g103-1">
+        <path
+           inkscape:connector-curvature="0"
+           id="path105-1"
+           d="M 9500,19000 0,19000 0,0 H 19000 V 19000 H 9500 z"
+           style="fill:#000000;stroke:url(#linearGradient3826)" />
+        <path
+           style="fill:#000000;stroke:url(#linearGradient3828)"
+           inkscape:connector-curvature="0"
+           id="path107-6"
+           d="M 9500,19000 0,19000 0,0 H 19000 V 19000 H 9500 z" />
+      </g>
+    </g>
     <g
        transform="matrix(0.03543311,0,0,0.03543311,-1429.9603,-109.96665)"
        id="g33">
@@ -63,22 +133,6 @@
          class="Master_Slide"
          id="g35" />
     </g>
-    <g
-       id="g39"
-       class="com.sun.star.drawing.CustomShape"
-       transform="matrix(0.03543311,0,0,0.03543311,-1429.9602,-109.96665)"
-       style="stroke:none">
-      <path
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         id="path41"
-         d="M 9500,19000 0,19000 0,0 H 19000 V 19000 H 9500 z" />
-      <path
-         style="fill:none;stroke:none"
-         inkscape:connector-curvature="0"
-         id="path43"
-         d="M 9500,19000 0,19000 0,0 H 19000 V 19000 H 9500 z" />
-    </g>
     <g
        style="fill:#ffffff"
        id="g45"
@@ -140,7 +194,7 @@
            d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
            style="fill:#009100" />
         <path
-           style="stroke:#336633;fill:#009100"
+           style="fill:#009100;stroke:#336633"
            inkscape:connector-curvature="0"
            id="path67"
            d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z" />
@@ -218,9 +272,9 @@
            inkscape:connector-curvature="0"
            id="path105"
            d="M 9500,19000 0,19000 0,0 H 19000 V 19000 H 9500 z"
-           style="stroke:none;fill:#009100" />
+           style="fill:#009100;stroke:none" />
         <path
-           style="stroke:none;fill:#009100"
+           style="fill:#009100;stroke:none"
            inkscape:connector-curvature="0"
            id="path107"
            d="M 9500,19000 0,19000 0,0 H 19000 V 19000 H 9500 z" />

companion/src/images/originals/logotypes/opentx_logo.svg

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
    xmlns:ooo="http://xml.openoffice.org/svg/export"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.2"
@@ -20,10 +22,10 @@
    xml:space="preserve"
    id="svg3347"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="opentx_logo_red.svg"><metadata
+   sodipodi:docname="opentx_logo.svg"><metadata
      id="metadata3491"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1"
@@ -32,26 +34,115 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1398"
+     inkscape:window-width="1280"
-     inkscape:window-height="1000"
+     inkscape:window-height="775"
      id="namedview3489"
      showgrid="false"
      inkscape:zoom="0.20481287"
-     inkscape:cx="-309.136"
+     inkscape:cx="-1144.0445"
      inkscape:cy="70.041471"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="g3399" /><defs
      class="ClipPathGroup"
-     id="defs3349"><clipPath
+     id="defs3349"><linearGradient
+       id="linearGradient3844"
+       osb:paint="solid"><stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3846" /></linearGradient><linearGradient
+       id="linearGradient3838"
+       osb:paint="solid"><stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3840" /></linearGradient><linearGradient
+       id="linearGradient3826"
+       osb:paint="solid"><stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3828" /></linearGradient><linearGradient
+       id="linearGradient3820"
+       osb:paint="solid"><stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3822" /></linearGradient><linearGradient
+       id="linearGradient3814"
+       osb:paint="solid"><stop
+         style="stop-color:#009000;stop-opacity:1;"
+         offset="0"
+         id="stop3816" /></linearGradient><clipPath
        id="presentation_clip_path"
        clipPathUnits="userSpaceOnUse"><rect
          x="0"
          y="0"
          width="19000"
          height="19000"
-         id="rect3352" /></clipPath></defs><defs
+         id="rect3352" /></clipPath><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3814"
+       id="linearGradient3818"
+       x1="8385.889"
+       y1="9800"
+       x2="17614.111"
+       y2="9800"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3820"
+       id="linearGradient3824"
+       x1="1485.889"
+       y1="9800"
+       x2="7814.111"
+       y2="9800"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3826"
+       id="linearGradient3830"
+       x1="15416.328"
+       y1="1734.3301"
+       x2="18735.195"
+       y2="1734.3301"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3826"
+       id="linearGradient3832"
+       x1="11162.328"
+       y1="1734.3301"
+       x2="13794.105"
+       y2="1734.3301"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3826"
+       id="linearGradient3834"
+       x1="6748.3281"
+       y1="1669.3301"
+       x2="9796.8242"
+       y2="1669.3301"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3826"
+       id="linearGradient3836"
+       x1="1644.0078"
+       y1="1671.8105"
+       x2="5454.0078"
+       y2="1671.8105"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3838"
+       id="linearGradient3842"
+       x1="-14.111"
+       y1="9500"
+       x2="19014.111"
+       y2="9500"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3844"
+       id="linearGradient3848"
+       x1="-14.111"
+       y1="9500"
+       x2="19014.111"
+       y2="9500"
+       gradientUnits="userSpaceOnUse" /></defs><defs
      class="TextShapeIndex"
      id="defs3354"><g
        ooo:slide="id1"
@@ -107,69 +198,73 @@
      id="g3399"
      class="Page"><g
        class="com.sun.star.drawing.CustomShape"
-       id="g3403"><g
+       id="g3403"
-         id="id3"><path
+       style="stroke:url(#linearGradient3842);fill-opacity:1;fill:url(#linearGradient3848)"><g
+         id="id3"
+         style="stroke:url(#linearGradient3842);fill-opacity:1;fill:url(#linearGradient3848)"><path
            d="M 9500,19000 0,19000 0,0 l 19000,0 0,19000 -9500,0 z"
            id="path3406"
            inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none" /><path
+           style="fill:url(#linearGradient3848);stroke:url(#linearGradient3842);fill-opacity:1" /><path
            d="M 9500,19000 0,19000 0,0 l 19000,0 0,19000 -9500,0 z"
            id="path3408"
            inkscape:connector-curvature="0"
-           style="fill:none;stroke:#000000" /></g></g><g
+           style="fill:url(#linearGradient3848);stroke:url(#linearGradient3842);fill-opacity:1" /></g></g><g
        class="com.sun.star.drawing.PolyPolygonShape"
        id="g3410"
        transform="translate(0,2427.1101)"
-       style="fill:#ffffff"><g
+       style="fill:#ffffff;stroke:url(#linearGradient3824)"><g
          id="id4"
-         style="fill:#ffffff"><path
+         style="fill:#ffffff;stroke:url(#linearGradient3824)"><path
            d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z"
            id="path3413"
            inkscape:connector-curvature="0"
-           style="fill:#ffffff;stroke:none" /><path
+           style="fill:#ffffff;stroke:url(#linearGradient3824)" /><path
            d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z"
            id="path3415"
            inkscape:connector-curvature="0"
-           style="fill:#ffffff;stroke:#ffffff" /><text
+           style="fill:#ffffff;stroke:url(#linearGradient3824)" /><text
            class="TextShape"
            id="text3417"
-           style="fill:#ffffff"><tspan
+           style="fill:#ffffff;stroke:url(#linearGradient3824)"><tspan
              class="TextParagraph"
              font-size="635px"
              font-weight="400"
              id="tspan3419"
-             style="font-size:635px;font-weight:400;fill:#ffffff;font-family:'Liberation Sans, sans-serif'"><tspan
+             style="font-size:635px;font-weight:400;fill:#ffffff;font-family:'Liberation Sans, sans-serif';stroke:url(#linearGradient3824)"><tspan
                class="TextPosition"
                x="3228"
                y="10021"
                id="tspan3421"
-               style="fill:#ffffff"><tspan
+               style="fill:#ffffff;stroke:url(#linearGradient3824)"><tspan
                  id="tspan3423"
-                 style="fill:#ffffff;stroke:none" /></tspan></tspan></text>
+                 style="fill:#ffffff;stroke:url(#linearGradient3824)" /></tspan></tspan></text>
 </g></g><g
        class="com.sun.star.drawing.PolyPolygonShape"
        id="g3425"
        transform="translate(0,2427.1101)"
-       style="fill:#009100"><g
+       style="fill:#009000;fill-opacity:1;stroke:url(#linearGradient3818)"><g
          id="id5"
-         style="fill:#009100"><path
+         style="fill:#009000;fill-opacity:1;stroke:url(#linearGradient3818)"><path
            d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
            id="path3428"
            inkscape:connector-curvature="0"
-           style="fill:#009100;stroke:none" /><path
+           style="fill:#009000;stroke:url(#linearGradient3818);fill-opacity:1" /><path
            d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
            id="path3430"
            inkscape:connector-curvature="0"
-           style="fill:#009100;stroke:#336633" /></g></g><g
+           style="fill:#009000;stroke:url(#linearGradient3818);fill-opacity:1" /></g></g><g
        id="g3445"
        class="com.sun.star.drawing.TextShape"
-       transform="translate(-169.33334,2144.8881)"><g
+       transform="translate(-169.33334,2144.8881)"
-         id="id7"><text
+       style="stroke:url(#linearGradient3836)"><g
-           style="line-height:125%"
+         id="id7"
+         style="stroke:url(#linearGradient3836)"><text
+           style="line-height:125%;stroke:url(#linearGradient3836)"
            id="text3448"
            class="TextShape"
            sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
+             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold;stroke:url(#linearGradient3836)"
              id="tspan3450"
              font-weight="700"
              font-size="3104px"
@@ -178,17 +273,19 @@
                y="3521"
                x="1391"
                class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">O</tspan></tspan></text>
+               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:url(#linearGradient3836);font-family:Sans;-inkscape-font-specification:Sans Bold">O</tspan></tspan></text>
 </g></g><g
        id="g3456"
        class="com.sun.star.drawing.TextShape"
-       transform="translate(-508.00004,2144.8881)"><g
+       transform="translate(-508.00004,2144.8881)"
-         id="id8"><text
+       style="stroke:url(#linearGradient3834)"><g
-           style="line-height:125%"
+         id="id8"
+         style="stroke:url(#linearGradient3834)"><text
+           style="line-height:125%;stroke:url(#linearGradient3834)"
            id="text3459"
            class="TextShape"
            sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
+             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold;stroke:url(#linearGradient3834)"
              id="tspan3461"
              font-weight="700"
              font-size="3104px"
@@ -197,17 +294,19 @@
                y="3521"
                x="6282"
                class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">P</tspan></tspan></text>
+               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:url(#linearGradient3834);font-family:Sans;-inkscape-font-specification:Sans Bold">P</tspan></tspan></text>
 </g></g><g
        id="g3467"
        class="com.sun.star.drawing.TextShape"
-       transform="translate(-846.66674,2144.8881)"><g
+       transform="translate(-846.66674,2144.8881)"
-         id="id9"><text
+       style="stroke:url(#linearGradient3832)"><g
-           style="line-height:125%"
+         id="id9"
+         style="stroke:url(#linearGradient3832)"><text
+           style="line-height:125%;stroke:url(#linearGradient3832)"
            id="text3470"
            class="TextShape"
            sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
+             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold;stroke:url(#linearGradient3832)"
              id="tspan3472"
              font-weight="700"
              font-size="3104px"
@@ -216,17 +315,19 @@
                y="3586"
                x="10696"
                class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">E</tspan></tspan></text>
+               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:url(#linearGradient3832);font-family:Sans;-inkscape-font-specification:Sans Bold">E</tspan></tspan></text>
 </g></g><g
        id="g3478"
        class="com.sun.star.drawing.TextShape"
-       transform="translate(-1241.7777,2144.8881)"><g
+       transform="translate(-1241.7777,2144.8881)"
-         id="id10"><text
+       style="stroke:url(#linearGradient3830)"><g
-           style="line-height:125%"
+         id="id10"
+         style="stroke:url(#linearGradient3830)"><text
+           style="line-height:125%;stroke:url(#linearGradient3830)"
            id="text3481"
            class="TextShape"
            sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
+             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold;stroke:url(#linearGradient3830)"
              id="tspan3483"
              font-weight="700"
              font-size="3104px"
@@ -235,5 +336,5 @@
                y="3586"
                x="14950"
                class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">N</tspan></tspan></text>
+               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:url(#linearGradient3830);font-family:Sans;-inkscape-font-specification:Sans Bold">N</tspan></tspan></text>
 </g></g></g></svg>

companion/src/images/originals/logotypes/opentx_logo_red_1.svg

@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:ooo="http://xml.openoffice.org/svg/export"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.2"
-   width="190mm"
-   height="190mm"
-   viewBox="0 0 19000 19000"
-   preserveAspectRatio="xMidYMid"
-   fill-rule="evenodd"
-   clip-path="url(#presentation_clip_path)"
-   stroke-width="28.222"
-   stroke-linejoin="round"
-   xml:space="preserve"
-   id="svg3347"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="opentx_logo.svg"><metadata
-     id="metadata3491"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1398"
-     inkscape:window-height="1000"
-     id="namedview3489"
-     showgrid="false"
-     inkscape:zoom="0.20481287"
-     inkscape:cx="-309.136"
-     inkscape:cy="70.041471"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3399" /><defs
-     class="ClipPathGroup"
-     id="defs3349"><clipPath
-       id="presentation_clip_path"
-       clipPathUnits="userSpaceOnUse"><rect
-         x="0"
-         y="0"
-         width="19000"
-         height="19000"
-         id="rect3352" /></clipPath></defs><defs
-     class="TextShapeIndex"
-     id="defs3354"><g
-       ooo:slide="id1"
-       ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10"
-       id="g3356" /></defs><defs
-     class="EmbeddedBulletChars"
-     id="defs3358"><g
-       id="bullet-char-template(57356)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"
-         id="path3361" /></g><g
-       id="bullet-char-template(57354)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"
-         id="path3364" /></g><g
-       id="bullet-char-template(10146)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"
-         id="path3367" /></g><g
-       id="bullet-char-template(10132)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"
-         id="path3370" /></g><g
-       id="bullet-char-template(10007)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"
-         id="path3373" /></g><g
-       id="bullet-char-template(10004)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"
-         id="path3376" /></g><g
-       id="bullet-char-template(9679)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"
-         id="path3379" /></g><g
-       id="bullet-char-template(8226)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"
-         id="path3382" /></g><g
-       id="bullet-char-template(8211)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"
-         id="path3385" /></g></defs><defs
-     class="TextEmbeddedBitmaps"
-     id="defs3387" /><g
-     id="g3389"><g
-       id="id2"
-       class="Master_Slide"><g
-         id="bg-id2"
-         class="Background" /><g
-         id="bo-id2"
-         class="BackgroundObjects" /></g></g><g
-     id="g3399"
-     class="Page"><g
-       class="com.sun.star.drawing.CustomShape"
-       id="g3403"><g
-         id="id3"><path
-           d="M 9500,19000 0,19000 0,0 l 19000,0 0,19000 -9500,0 z"
-           id="path3406"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none" /><path
-           d="M 9500,19000 0,19000 0,0 l 19000,0 0,19000 -9500,0 z"
-           id="path3408"
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#000000" /></g></g><g
-       class="com.sun.star.drawing.PolyPolygonShape"
-       id="g3410"
-       transform="translate(0,2427.1101)"
-       style="fill:#ffffff"><g
-         id="id4"
-         style="fill:#ffffff"><path
-           d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z"
-           id="path3413"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;stroke:none" /><path
-           d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z"
-           id="path3415"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;stroke:#ffffff" /><text
-           class="TextShape"
-           id="text3417"
-           style="fill:#ffffff"><tspan
-             class="TextParagraph"
-             font-size="635px"
-             font-weight="400"
-             id="tspan3419"
-             style="font-size:635px;font-weight:400;fill:#ffffff;font-family:'Liberation Sans, sans-serif'"><tspan
-               class="TextPosition"
-               x="3228"
-               y="10021"
-               id="tspan3421"
-               style="fill:#ffffff"><tspan
-                 id="tspan3423"
-                 style="fill:#ffffff;stroke:none" /></tspan></tspan></text>
-</g></g><g
-       class="com.sun.star.drawing.PolyPolygonShape"
-       id="g3425"
-       transform="translate(0,2427.1101)"
-       style="fill:#d40000"><g
-         id="id5"
-         style="fill:#d40000"><path
-           d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
-           id="path3428"
-           inkscape:connector-curvature="0"
-           style="fill:#d40000;stroke:none" /><path
-           d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
-           id="path3430"
-           inkscape:connector-curvature="0"
-           style="fill:#d40000;stroke:#336633" /></g></g><g
-       id="g3445"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-169.33334,2144.8881)"><g
-         id="id7"><text
-           style="line-height:125%"
-           id="text3448"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3450"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3452"
-               y="3521"
-               x="1391"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">O</tspan></tspan></text>
-</g></g><g
-       id="g3456"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-508.00004,2144.8881)"><g
-         id="id8"><text
-           style="line-height:125%"
-           id="text3459"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3461"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3463"
-               y="3521"
-               x="6282"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">P</tspan></tspan></text>
-</g></g><g
-       id="g3467"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-846.66674,2144.8881)"><g
-         id="id9"><text
-           style="line-height:125%"
-           id="text3470"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3472"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3474"
-               y="3586"
-               x="10696"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">E</tspan></tspan></text>
-</g></g><g
-       id="g3478"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-1241.7777,2144.8881)"><g
-         id="id10"><text
-           style="line-height:125%"
-           id="text3481"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3483"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3485"
-               y="3586"
-               x="14950"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">N</tspan></tspan></text>
-</g></g></g></svg>

companion/src/images/originals/logotypes/opentx_logo_red_2.svg

@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:ooo="http://xml.openoffice.org/svg/export"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.2"
-   width="190mm"
-   height="190mm"
-   viewBox="0 0 19000 19000"
-   preserveAspectRatio="xMidYMid"
-   fill-rule="evenodd"
-   clip-path="url(#presentation_clip_path)"
-   stroke-width="28.222"
-   stroke-linejoin="round"
-   xml:space="preserve"
-   id="svg3347"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="opentx_logo_red_1.svg"><metadata
-     id="metadata3491"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1398"
-     inkscape:window-height="1000"
-     id="namedview3489"
-     showgrid="false"
-     inkscape:zoom="0.20481287"
-     inkscape:cx="-309.136"
-     inkscape:cy="109.10152"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3399" /><defs
-     class="ClipPathGroup"
-     id="defs3349"><clipPath
-       id="presentation_clip_path"
-       clipPathUnits="userSpaceOnUse"><rect
-         x="0"
-         y="0"
-         width="19000"
-         height="19000"
-         id="rect3352" /></clipPath></defs><defs
-     class="TextShapeIndex"
-     id="defs3354"><g
-       ooo:slide="id1"
-       ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10"
-       id="g3356" /></defs><defs
-     class="EmbeddedBulletChars"
-     id="defs3358"><g
-       id="bullet-char-template(57356)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"
-         id="path3361" /></g><g
-       id="bullet-char-template(57354)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"
-         id="path3364" /></g><g
-       id="bullet-char-template(10146)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"
-         id="path3367" /></g><g
-       id="bullet-char-template(10132)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"
-         id="path3370" /></g><g
-       id="bullet-char-template(10007)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"
-         id="path3373" /></g><g
-       id="bullet-char-template(10004)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"
-         id="path3376" /></g><g
-       id="bullet-char-template(9679)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"
-         id="path3379" /></g><g
-       id="bullet-char-template(8226)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"
-         id="path3382" /></g><g
-       id="bullet-char-template(8211)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"
-         id="path3385" /></g></defs><defs
-     class="TextEmbeddedBitmaps"
-     id="defs3387" /><g
-     id="g3389"><g
-       id="id2"
-       class="Master_Slide"><g
-         id="bg-id2"
-         class="Background" /><g
-         id="bo-id2"
-         class="BackgroundObjects" /></g></g><g
-     id="g3399"
-     class="Page"><g
-       class="com.sun.star.drawing.CustomShape"
-       id="g3403"><g
-         id="id3"><path
-           d="M 9500,19000 0,19000 0,0 l 19000,0 0,19000 -9500,0 z"
-           id="path3406"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none" /><path
-           d="M 9500,19000 0,19000 0,0 l 19000,0 0,19000 -9500,0 z"
-           id="path3408"
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#000000" /></g></g><g
-       class="com.sun.star.drawing.PolyPolygonShape"
-       id="g3410"
-       transform="translate(0,2427.1101)"
-       style="fill:#ffffff"><g
-         id="id4"
-         style="fill:#ffffff"><path
-           d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z"
-           id="path3413"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;stroke:none" /><path
-           d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z"
-           id="path3415"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;stroke:#ffffff" /><text
-           class="TextShape"
-           id="text3417"
-           style="fill:#ffffff"><tspan
-             class="TextParagraph"
-             font-size="635px"
-             font-weight="400"
-             id="tspan3419"
-             style="font-size:635px;font-weight:400;fill:#ffffff;font-family:'Liberation Sans, sans-serif'"><tspan
-               class="TextPosition"
-               x="3228"
-               y="10021"
-               id="tspan3421"
-               style="fill:#ffffff"><tspan
-                 id="tspan3423"
-                 style="fill:#ffffff;stroke:none" /></tspan></tspan></text>
-</g></g><g
-       class="com.sun.star.drawing.PolyPolygonShape"
-       id="g3425"
-       transform="translate(0,2427.1101)"
-       style="fill:#ff0066"><g
-         id="id5"
-         style="fill:#ff0066"><path
-           d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
-           id="path3428"
-           inkscape:connector-curvature="0"
-           style="fill:#ff0066;stroke:none" /><path
-           d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
-           id="path3430"
-           inkscape:connector-curvature="0"
-           style="fill:#ff0066;stroke:#336633" /></g></g><g
-       id="g3445"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-169.33334,2144.8881)"><g
-         id="id7"><text
-           style="line-height:125%"
-           id="text3448"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3450"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3452"
-               y="3521"
-               x="1391"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">O</tspan></tspan></text>
-</g></g><g
-       id="g3456"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-508.00004,2144.8881)"><g
-         id="id8"><text
-           style="line-height:125%"
-           id="text3459"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3461"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3463"
-               y="3521"
-               x="6282"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">P</tspan></tspan></text>
-</g></g><g
-       id="g3467"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-846.66674,2144.8881)"><g
-         id="id9"><text
-           style="line-height:125%"
-           id="text3470"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3472"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3474"
-               y="3586"
-               x="10696"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">E</tspan></tspan></text>
-</g></g><g
-       id="g3478"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-1241.7777,2144.8881)"><g
-         id="id10"><text
-           style="line-height:125%"
-           id="text3481"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3483"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3485"
-               y="3586"
-               x="14950"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">N</tspan></tspan></text>
-</g></g></g></svg>

companion/src/images/originals/logotypes/opentx_logo_red_3.svg

@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:ooo="http://xml.openoffice.org/svg/export"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.2"
-   width="190mm"
-   height="190mm"
-   viewBox="0 0 19000 19000"
-   preserveAspectRatio="xMidYMid"
-   fill-rule="evenodd"
-   clip-path="url(#presentation_clip_path)"
-   stroke-width="28.222"
-   stroke-linejoin="round"
-   xml:space="preserve"
-   id="svg3347"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="opentx_logo_red_2.svg"><metadata
-     id="metadata3491"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1398"
-     inkscape:window-height="1000"
-     id="namedview3489"
-     showgrid="false"
-     inkscape:zoom="0.20481287"
-     inkscape:cx="-309.136"
-     inkscape:cy="109.10152"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3399" /><defs
-     class="ClipPathGroup"
-     id="defs3349"><clipPath
-       id="presentation_clip_path"
-       clipPathUnits="userSpaceOnUse"><rect
-         x="0"
-         y="0"
-         width="19000"
-         height="19000"
-         id="rect3352" /></clipPath></defs><defs
-     class="TextShapeIndex"
-     id="defs3354"><g
-       ooo:slide="id1"
-       ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10"
-       id="g3356" /></defs><defs
-     class="EmbeddedBulletChars"
-     id="defs3358"><g
-       id="bullet-char-template(57356)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"
-         id="path3361" /></g><g
-       id="bullet-char-template(57354)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"
-         id="path3364" /></g><g
-       id="bullet-char-template(10146)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"
-         id="path3367" /></g><g
-       id="bullet-char-template(10132)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"
-         id="path3370" /></g><g
-       id="bullet-char-template(10007)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"
-         id="path3373" /></g><g
-       id="bullet-char-template(10004)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"
-         id="path3376" /></g><g
-       id="bullet-char-template(9679)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"
-         id="path3379" /></g><g
-       id="bullet-char-template(8226)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"
-         id="path3382" /></g><g
-       id="bullet-char-template(8211)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"
-         id="path3385" /></g></defs><defs
-     class="TextEmbeddedBitmaps"
-     id="defs3387" /><g
-     id="g3389"><g
-       id="id2"
-       class="Master_Slide"><g
-         id="bg-id2"
-         class="Background" /><g
-         id="bo-id2"
-         class="BackgroundObjects" /></g></g><g
-     id="g3399"
-     class="Page"><g
-       class="com.sun.star.drawing.CustomShape"
-       id="g3403"><g
-         id="id3"><path
-           d="M 9500,19000 0,19000 0,0 l 19000,0 0,19000 -9500,0 z"
-           id="path3406"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none" /><path
-           d="M 9500,19000 0,19000 0,0 l 19000,0 0,19000 -9500,0 z"
-           id="path3408"
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#000000" /></g></g><g
-       class="com.sun.star.drawing.PolyPolygonShape"
-       id="g3410"
-       transform="translate(0,2427.1101)"
-       style="fill:#ffffff"><g
-         id="id4"
-         style="fill:#ffffff"><path
-           d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z"
-           id="path3413"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;stroke:none" /><path
-           d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z"
-           id="path3415"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;stroke:#ffffff" /><text
-           class="TextShape"
-           id="text3417"
-           style="fill:#ffffff"><tspan
-             class="TextParagraph"
-             font-size="635px"
-             font-weight="400"
-             id="tspan3419"
-             style="font-size:635px;font-weight:400;fill:#ffffff;font-family:'Liberation Sans, sans-serif'"><tspan
-               class="TextPosition"
-               x="3228"
-               y="10021"
-               id="tspan3421"
-               style="fill:#ffffff"><tspan
-                 id="tspan3423"
-                 style="fill:#ffffff;stroke:none" /></tspan></tspan></text>
-</g></g><g
-       class="com.sun.star.drawing.PolyPolygonShape"
-       id="g3425"
-       transform="translate(0,2427.1101)"
-       style="fill:#ff6600"><g
-         id="id5"
-         style="fill:#ff6600"><path
-           d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
-           id="path3428"
-           inkscape:connector-curvature="0"
-           style="fill:#ff6600;stroke:none" /><path
-           d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
-           id="path3430"
-           inkscape:connector-curvature="0"
-           style="fill:#ff6600;stroke:#336633" /></g></g><g
-       id="g3445"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-169.33334,2144.8881)"><g
-         id="id7"><text
-           style="line-height:125%"
-           id="text3448"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3450"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3452"
-               y="3521"
-               x="1391"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">O</tspan></tspan></text>
-</g></g><g
-       id="g3456"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-508.00004,2144.8881)"><g
-         id="id8"><text
-           style="line-height:125%"
-           id="text3459"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3461"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3463"
-               y="3521"
-               x="6282"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">P</tspan></tspan></text>
-</g></g><g
-       id="g3467"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-846.66674,2144.8881)"><g
-         id="id9"><text
-           style="line-height:125%"
-           id="text3470"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3472"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3474"
-               y="3586"
-               x="10696"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">E</tspan></tspan></text>
-</g></g><g
-       id="g3478"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-1241.7777,2144.8881)"><g
-         id="id10"><text
-           style="line-height:125%"
-           id="text3481"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3483"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3485"
-               y="3586"
-               x="14950"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">N</tspan></tspan></text>
-</g></g></g></svg>

companion/src/images/originals/logotypes/opentx_logo_red_4.svg

@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:ooo="http://xml.openoffice.org/svg/export"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.2"
-   width="190mm"
-   height="190mm"
-   viewBox="0 0 19000 19000"
-   preserveAspectRatio="xMidYMid"
-   fill-rule="evenodd"
-   clip-path="url(#presentation_clip_path)"
-   stroke-width="28.222"
-   stroke-linejoin="round"
-   xml:space="preserve"
-   id="svg3347"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="opentx_logo_red_3.svg"><metadata
-     id="metadata3491"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1398"
-     inkscape:window-height="1000"
-     id="namedview3489"
-     showgrid="false"
-     inkscape:zoom="0.20481287"
-     inkscape:cx="-309.136"
-     inkscape:cy="109.10152"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3399" /><defs
-     class="ClipPathGroup"
-     id="defs3349"><clipPath
-       id="presentation_clip_path"
-       clipPathUnits="userSpaceOnUse"><rect
-         x="0"
-         y="0"
-         width="19000"
-         height="19000"
-         id="rect3352" /></clipPath></defs><defs
-     class="TextShapeIndex"
-     id="defs3354"><g
-       ooo:slide="id1"
-       ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10"
-       id="g3356" /></defs><defs
-     class="EmbeddedBulletChars"
-     id="defs3358"><g
-       id="bullet-char-template(57356)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"
-         id="path3361" /></g><g
-       id="bullet-char-template(57354)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"
-         id="path3364" /></g><g
-       id="bullet-char-template(10146)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"
-         id="path3367" /></g><g
-       id="bullet-char-template(10132)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"
-         id="path3370" /></g><g
-       id="bullet-char-template(10007)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"
-         id="path3373" /></g><g
-       id="bullet-char-template(10004)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"
-         id="path3376" /></g><g
-       id="bullet-char-template(9679)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"
-         id="path3379" /></g><g
-       id="bullet-char-template(8226)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"
-         id="path3382" /></g><g
-       id="bullet-char-template(8211)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"
-         id="path3385" /></g></defs><defs
-     class="TextEmbeddedBitmaps"
-     id="defs3387" /><g
-     id="g3389"><g
-       id="id2"
-       class="Master_Slide"><g
-         id="bg-id2"
-         class="Background" /><g
-         id="bo-id2"
-         class="BackgroundObjects" /></g></g><g
-     id="g3399"
-     class="Page"><g
-       class="com.sun.star.drawing.CustomShape"
-       id="g3403"><g
-         id="id3"><path
-           d="M 9500,19000 0,19000 0,0 l 19000,0 0,19000 -9500,0 z"
-           id="path3406"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none" /><path
-           d="M 9500,19000 0,19000 0,0 l 19000,0 0,19000 -9500,0 z"
-           id="path3408"
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#000000" /></g></g><g
-       class="com.sun.star.drawing.PolyPolygonShape"
-       id="g3410"
-       transform="translate(0,2427.1101)"
-       style="fill:#ffffff"><g
-         id="id4"
-         style="fill:#ffffff"><path
-           d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z"
-           id="path3413"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;stroke:none" /><path
-           d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z"
-           id="path3415"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;stroke:#ffffff" /><text
-           class="TextShape"
-           id="text3417"
-           style="fill:#ffffff"><tspan
-             class="TextParagraph"
-             font-size="635px"
-             font-weight="400"
-             id="tspan3419"
-             style="font-size:635px;font-weight:400;fill:#ffffff;font-family:'Liberation Sans, sans-serif'"><tspan
-               class="TextPosition"
-               x="3228"
-               y="10021"
-               id="tspan3421"
-               style="fill:#ffffff"><tspan
-                 id="tspan3423"
-                 style="fill:#ffffff;stroke:none" /></tspan></tspan></text>
-</g></g><g
-       class="com.sun.star.drawing.PolyPolygonShape"
-       id="g3425"
-       transform="translate(0,2427.1101)"
-       style="fill:#cc0033"><g
-         id="id5"
-         style="fill:#cc0033"><path
-           d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
-           id="path3428"
-           inkscape:connector-curvature="0"
-           style="fill:#cc0033;stroke:none" /><path
-           d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
-           id="path3430"
-           inkscape:connector-curvature="0"
-           style="fill:#cc0033;stroke:#336633" /></g></g><g
-       id="g3445"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-169.33334,2144.8881)"><g
-         id="id7"><text
-           style="line-height:125%"
-           id="text3448"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3450"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3452"
-               y="3521"
-               x="1391"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">O</tspan></tspan></text>
-</g></g><g
-       id="g3456"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-508.00004,2144.8881)"><g
-         id="id8"><text
-           style="line-height:125%"
-           id="text3459"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3461"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3463"
-               y="3521"
-               x="6282"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">P</tspan></tspan></text>
-</g></g><g
-       id="g3467"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-846.66674,2144.8881)"><g
-         id="id9"><text
-           style="line-height:125%"
-           id="text3470"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3472"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3474"
-               y="3586"
-               x="10696"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">E</tspan></tspan></text>
-</g></g><g
-       id="g3478"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-1241.7777,2144.8881)"><g
-         id="id10"><text
-           style="line-height:125%"
-           id="text3481"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3483"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3485"
-               y="3586"
-               x="14950"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">N</tspan></tspan></text>
-</g></g></g></svg>

companion/src/images/originals/logotypes/opentx_logo_red_5.svg

@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:ooo="http://xml.openoffice.org/svg/export"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.2"
-   width="190mm"
-   height="190mm"
-   viewBox="0 0 19000 19000"
-   preserveAspectRatio="xMidYMid"
-   fill-rule="evenodd"
-   clip-path="url(#presentation_clip_path)"
-   stroke-width="28.222"
-   stroke-linejoin="round"
-   xml:space="preserve"
-   id="svg3347"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="opentx_logo_red_4.svg"><metadata
-     id="metadata3491"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1398"
-     inkscape:window-height="1000"
-     id="namedview3489"
-     showgrid="false"
-     inkscape:zoom="0.20481287"
-     inkscape:cx="-309.136"
-     inkscape:cy="109.10152"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3399" /><defs
-     class="ClipPathGroup"
-     id="defs3349"><clipPath
-       id="presentation_clip_path"
-       clipPathUnits="userSpaceOnUse"><rect
-         x="0"
-         y="0"
-         width="19000"
-         height="19000"
-         id="rect3352" /></clipPath></defs><defs
-     class="TextShapeIndex"
-     id="defs3354"><g
-       ooo:slide="id1"
-       ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10"
-       id="g3356" /></defs><defs
-     class="EmbeddedBulletChars"
-     id="defs3358"><g
-       id="bullet-char-template(57356)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"
-         id="path3361" /></g><g
-       id="bullet-char-template(57354)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"
-         id="path3364" /></g><g
-       id="bullet-char-template(10146)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"
-         id="path3367" /></g><g
-       id="bullet-char-template(10132)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"
-         id="path3370" /></g><g
-       id="bullet-char-template(10007)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"
-         id="path3373" /></g><g
-       id="bullet-char-template(10004)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"
-         id="path3376" /></g><g
-       id="bullet-char-template(9679)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"
-         id="path3379" /></g><g
-       id="bullet-char-template(8226)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"
-         id="path3382" /></g><g
-       id="bullet-char-template(8211)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"
-         id="path3385" /></g></defs><defs
-     class="TextEmbeddedBitmaps"
-     id="defs3387" /><g
-     id="g3389"><g
-       id="id2"
-       class="Master_Slide"><g
-         id="bg-id2"
-         class="Background" /><g
-         id="bo-id2"
-         class="BackgroundObjects" /></g></g><g
-     id="g3399"
-     class="Page"><g
-       class="com.sun.star.drawing.CustomShape"
-       id="g3403"><g
-         id="id3"><path
-           d="M 9500,19000 0,19000 0,0 l 19000,0 0,19000 -9500,0 z"
-           id="path3406"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none" /><path
-           d="M 9500,19000 0,19000 0,0 l 19000,0 0,19000 -9500,0 z"
-           id="path3408"
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#000000" /></g></g><g
-       class="com.sun.star.drawing.PolyPolygonShape"
-       id="g3410"
-       transform="translate(0,2427.1101)"
-       style="fill:#ffffff"><g
-         id="id4"
-         style="fill:#ffffff"><path
-           d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z"
-           id="path3413"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;stroke:none" /><path
-           d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z"
-           id="path3415"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;stroke:#ffffff" /><text
-           class="TextShape"
-           id="text3417"
-           style="fill:#ffffff"><tspan
-             class="TextParagraph"
-             font-size="635px"
-             font-weight="400"
-             id="tspan3419"
-             style="font-size:635px;font-weight:400;fill:#ffffff;font-family:'Liberation Sans, sans-serif'"><tspan
-               class="TextPosition"
-               x="3228"
-               y="10021"
-               id="tspan3421"
-               style="fill:#ffffff"><tspan
-                 id="tspan3423"
-                 style="fill:#ffffff;stroke:none" /></tspan></tspan></text>
-</g></g><g
-       class="com.sun.star.drawing.PolyPolygonShape"
-       id="g3425"
-       transform="translate(0,2427.1101)"
-       style="fill:#ff6600"><g
-         id="id5"
-         style="fill:#ff6600"><path
-           d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
-           id="path3428"
-           inkscape:connector-curvature="0"
-           style="fill:#ff6600;stroke:none" /><path
-           d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
-           id="path3430"
-           inkscape:connector-curvature="0"
-           style="fill:#ff6600;stroke:#336633" /></g></g><g
-       id="g3445"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-169.33334,2144.8881)"><g
-         id="id7"><text
-           style="line-height:125%"
-           id="text3448"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3450"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3452"
-               y="3521"
-               x="1391"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">O</tspan></tspan></text>
-</g></g><g
-       id="g3456"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-508.00004,2144.8881)"><g
-         id="id8"><text
-           style="line-height:125%"
-           id="text3459"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3461"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3463"
-               y="3521"
-               x="6282"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">P</tspan></tspan></text>
-</g></g><g
-       id="g3467"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-846.66674,2144.8881)"><g
-         id="id9"><text
-           style="line-height:125%"
-           id="text3470"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3472"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3474"
-               y="3586"
-               x="10696"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">E</tspan></tspan></text>
-</g></g><g
-       id="g3478"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-1241.7777,2144.8881)"><g
-         id="id10"><text
-           style="line-height:125%"
-           id="text3481"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3483"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3485"
-               y="3586"
-               x="14950"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">N</tspan></tspan></text>
-</g></g></g></svg>

companion/src/images/originals/logotypes/opentx_logo_red_6.svg

@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:ooo="http://xml.openoffice.org/svg/export"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.2"
-   width="190mm"
-   height="190mm"
-   viewBox="0 0 19000 19000"
-   preserveAspectRatio="xMidYMid"
-   fill-rule="evenodd"
-   clip-path="url(#presentation_clip_path)"
-   stroke-width="28.222"
-   stroke-linejoin="round"
-   xml:space="preserve"
-   id="svg3347"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="opentx_logo_red_5.svg"><metadata
-     id="metadata3491"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1398"
-     inkscape:window-height="1000"
-     id="namedview3489"
-     showgrid="false"
-     inkscape:zoom="0.20481287"
-     inkscape:cx="-309.136"
-     inkscape:cy="109.10152"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3399" /><defs
-     class="ClipPathGroup"
-     id="defs3349"><clipPath
-       id="presentation_clip_path"
-       clipPathUnits="userSpaceOnUse"><rect
-         x="0"
-         y="0"
-         width="19000"
-         height="19000"
-         id="rect3352" /></clipPath></defs><defs
-     class="TextShapeIndex"
-     id="defs3354"><g
-       ooo:slide="id1"
-       ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10"
-       id="g3356" /></defs><defs
-     class="EmbeddedBulletChars"
-     id="defs3358"><g
-       id="bullet-char-template(57356)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"
-         id="path3361" /></g><g
-       id="bullet-char-template(57354)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"
-         id="path3364" /></g><g
-       id="bullet-char-template(10146)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"
-         id="path3367" /></g><g
-       id="bullet-char-template(10132)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"
-         id="path3370" /></g><g
-       id="bullet-char-template(10007)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"
-         id="path3373" /></g><g
-       id="bullet-char-template(10004)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"
-         id="path3376" /></g><g
-       id="bullet-char-template(9679)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"
-         id="path3379" /></g><g
-       id="bullet-char-template(8226)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"
-         id="path3382" /></g><g
-       id="bullet-char-template(8211)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"
-         id="path3385" /></g></defs><defs
-     class="TextEmbeddedBitmaps"
-     id="defs3387" /><g
-     id="g3389"><g
-       id="id2"
-       class="Master_Slide"><g
-         id="bg-id2"
-         class="Background" /><g
-         id="bo-id2"
-         class="BackgroundObjects" /></g></g><g
-     id="g3399"
-     class="Page"><g
-       class="com.sun.star.drawing.CustomShape"
-       id="g3403"><g
-         id="id3"><path
-           d="M 9500,19000 0,19000 0,0 l 19000,0 0,19000 -9500,0 z"
-           id="path3406"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none" /><path
-           d="M 9500,19000 0,19000 0,0 l 19000,0 0,19000 -9500,0 z"
-           id="path3408"
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#000000" /></g></g><g
-       class="com.sun.star.drawing.PolyPolygonShape"
-       id="g3410"
-       transform="translate(0,2427.1101)"
-       style="fill:#ffffff"><g
-         id="id4"
-         style="fill:#ffffff"><path
-           d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z"
-           id="path3413"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;stroke:none" /><path
-           d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z"
-           id="path3415"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;stroke:#ffffff" /><text
-           class="TextShape"
-           id="text3417"
-           style="fill:#ffffff"><tspan
-             class="TextParagraph"
-             font-size="635px"
-             font-weight="400"
-             id="tspan3419"
-             style="font-size:635px;font-weight:400;fill:#ffffff;font-family:'Liberation Sans, sans-serif'"><tspan
-               class="TextPosition"
-               x="3228"
-               y="10021"
-               id="tspan3421"
-               style="fill:#ffffff"><tspan
-                 id="tspan3423"
-                 style="fill:#ffffff;stroke:none" /></tspan></tspan></text>
-</g></g><g
-       class="com.sun.star.drawing.PolyPolygonShape"
-       id="g3425"
-       transform="translate(0,2427.1101)"
-       style="fill:#ff7f2a"><g
-         id="id5"
-         style="fill:#ff7f2a"><path
-           d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
-           id="path3428"
-           inkscape:connector-curvature="0"
-           style="fill:#ff7f2a;stroke:none" /><path
-           d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
-           id="path3430"
-           inkscape:connector-curvature="0"
-           style="fill:#ff7f2a;stroke:#336633" /></g></g><g
-       id="g3445"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-169.33334,2144.8881)"><g
-         id="id7"><text
-           style="line-height:125%"
-           id="text3448"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3450"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3452"
-               y="3521"
-               x="1391"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">O</tspan></tspan></text>
-</g></g><g
-       id="g3456"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-508.00004,2144.8881)"><g
-         id="id8"><text
-           style="line-height:125%"
-           id="text3459"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3461"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3463"
-               y="3521"
-               x="6282"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">P</tspan></tspan></text>
-</g></g><g
-       id="g3467"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-846.66674,2144.8881)"><g
-         id="id9"><text
-           style="line-height:125%"
-           id="text3470"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3472"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3474"
-               y="3586"
-               x="10696"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">E</tspan></tspan></text>
-</g></g><g
-       id="g3478"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-1241.7777,2144.8881)"><g
-         id="id10"><text
-           style="line-height:125%"
-           id="text3481"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3483"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3485"
-               y="3586"
-               x="14950"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">N</tspan></tspan></text>
-</g></g></g></svg>

companion/src/images/originals/logotypes/opentx_logo_red_7.svg

@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:ooo="http://xml.openoffice.org/svg/export"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.2"
-   width="190mm"
-   height="190mm"
-   viewBox="0 0 19000 19000"
-   preserveAspectRatio="xMidYMid"
-   fill-rule="evenodd"
-   clip-path="url(#presentation_clip_path)"
-   stroke-width="28.222"
-   stroke-linejoin="round"
-   xml:space="preserve"
-   id="svg3347"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="opentx_logo_red_6.svg"><metadata
-     id="metadata3491"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1398"
-     inkscape:window-height="1000"
-     id="namedview3489"
-     showgrid="false"
-     inkscape:zoom="0.20481287"
-     inkscape:cx="-309.136"
-     inkscape:cy="109.10152"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3399" /><defs
-     class="ClipPathGroup"
-     id="defs3349"><clipPath
-       id="presentation_clip_path"
-       clipPathUnits="userSpaceOnUse"><rect
-         x="0"
-         y="0"
-         width="19000"
-         height="19000"
-         id="rect3352" /></clipPath></defs><defs
-     class="TextShapeIndex"
-     id="defs3354"><g
-       ooo:slide="id1"
-       ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10"
-       id="g3356" /></defs><defs
-     class="EmbeddedBulletChars"
-     id="defs3358"><g
-       id="bullet-char-template(57356)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"
-         id="path3361" /></g><g
-       id="bullet-char-template(57354)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"
-         id="path3364" /></g><g
-       id="bullet-char-template(10146)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"
-         id="path3367" /></g><g
-       id="bullet-char-template(10132)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"
-         id="path3370" /></g><g
-       id="bullet-char-template(10007)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"
-         id="path3373" /></g><g
-       id="bullet-char-template(10004)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"
-         id="path3376" /></g><g
-       id="bullet-char-template(9679)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"
-         id="path3379" /></g><g
-       id="bullet-char-template(8226)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"
-         id="path3382" /></g><g
-       id="bullet-char-template(8211)"
-       transform="scale(0.00048828125,-0.00048828125)"><path
-         d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"
-         id="path3385" /></g></defs><defs
-     class="TextEmbeddedBitmaps"
-     id="defs3387" /><g
-     id="g3389"><g
-       id="id2"
-       class="Master_Slide"><g
-         id="bg-id2"
-         class="Background" /><g
-         id="bo-id2"
-         class="BackgroundObjects" /></g></g><g
-     id="g3399"
-     class="Page"><g
-       class="com.sun.star.drawing.CustomShape"
-       id="g3403"><g
-         id="id3"><path
-           d="M 9500,19000 0,19000 0,0 l 19000,0 0,19000 -9500,0 z"
-           id="path3406"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none" /><path
-           d="M 9500,19000 0,19000 0,0 l 19000,0 0,19000 -9500,0 z"
-           id="path3408"
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#000000" /></g></g><g
-       class="com.sun.star.drawing.PolyPolygonShape"
-       id="g3410"
-       transform="translate(0,2427.1101)"
-       style="fill:#ffffff"><g
-         id="id4"
-         style="fill:#ffffff"><path
-           d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z"
-           id="path3413"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;stroke:none" /><path
-           d="m 1500,4800 6300,0 0,2000 -2000,0 0,8000 -2300,0 0,-8000 -2000,0 0,-800 0,-1200 z"
-           id="path3415"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;stroke:#ffffff" /><text
-           class="TextShape"
-           id="text3417"
-           style="fill:#ffffff"><tspan
-             class="TextParagraph"
-             font-size="635px"
-             font-weight="400"
-             id="tspan3419"
-             style="font-size:635px;font-weight:400;fill:#ffffff;font-family:'Liberation Sans, sans-serif'"><tspan
-               class="TextPosition"
-               x="3228"
-               y="10021"
-               id="tspan3421"
-               style="fill:#ffffff"><tspan
-                 id="tspan3423"
-                 style="fill:#ffffff;stroke:none" /></tspan></tspan></text>
-</g></g><g
-       class="com.sun.star.drawing.PolyPolygonShape"
-       id="g3425"
-       transform="translate(0,2427.1101)"
-       style="fill:#ff0000"><g
-         id="id5"
-         style="fill:#ff0000"><path
-           d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
-           id="path3428"
-           inkscape:connector-curvature="0"
-           style="fill:#ff0000;stroke:none" /><path
-           d="m 17400,4800 -2600,0 -1800,3100 -1900,-3100 -2600,0 3000,5000 -3100,5000 2500,0 2100,-3300 2000,3300 2600,0 -3200,-5000 3000,-5000 z"
-           id="path3430"
-           inkscape:connector-curvature="0"
-           style="fill:#ff0000;stroke:#336633" /></g></g><g
-       id="g3445"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-169.33334,2144.8881)"><g
-         id="id7"><text
-           style="line-height:125%"
-           id="text3448"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3450"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3452"
-               y="3521"
-               x="1391"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">O</tspan></tspan></text>
-</g></g><g
-       id="g3456"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-508.00004,2144.8881)"><g
-         id="id8"><text
-           style="line-height:125%"
-           id="text3459"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3461"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3463"
-               y="3521"
-               x="6282"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">P</tspan></tspan></text>
-</g></g><g
-       id="g3467"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-846.66674,2144.8881)"><g
-         id="id9"><text
-           style="line-height:125%"
-           id="text3470"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3472"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3474"
-               y="3586"
-               x="10696"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">E</tspan></tspan></text>
-</g></g><g
-       id="g3478"
-       class="com.sun.star.drawing.TextShape"
-       transform="translate(-1241.7777,2144.8881)"><g
-         id="id10"><text
-           style="line-height:125%"
-           id="text3481"
-           class="TextShape"
-           sodipodi:linespacing="125%"><tspan
-             style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Bold"
-             id="tspan3483"
-             font-weight="700"
-             font-size="3104px"
-             class="TextParagraph"><tspan
-               id="tspan3485"
-               y="3586"
-               x="14950"
-               class="TextPosition"
-               style="font-size:5080px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold">N</tspan></tspan></text>
-</g></g></g></svg>

companion/src/mainwindow.cpp

@@ -1544,7 +1544,10 @@ void MainWindow::about()
     aboutStr.append(tr("Version %1, %3").arg(C9X_VERSION).arg(__DATE__));
     aboutStr.append("<br/><br/>");
     aboutStr.append(tr("Copyright") + " Bertrand Songis & Romolo Manfredini<br/>&copy; 2011-2014<br/>");
-    QMessageBox::about(this, tr("About Companion"), aboutStr);
+    QMessageBox msgBox(this);
+    msgBox.setWindowTitle(tr("About Companion"));
+    msgBox.setText(aboutStr);
+    msgBox.exec();
 }
 
 void MainWindow::updateMenus()
@@ -1686,12 +1689,12 @@ void MainWindow::createActions()
     fwchangelogAct->setStatusTip(tr("Show firmware changelog"));
     connect(fwchangelogAct, SIGNAL(triggered()), this, SLOT(fwchangelog()));
     
-    compareAct = new QAction(CompanionIcon("customize.png"), tr("Compare..."), this);
+    compareAct = new QAction(CompanionIcon("compare.png"), tr("Compare..."), this);
     compareAct->setStatusTip(tr("Compare models"));
     compareAct->setEnabled(false);
     connect(compareAct, SIGNAL(triggered()), this, SLOT(compare()));
     
-    customizeSplashAct = new QAction(CompanionIcon("customize.png"), tr("Customize your &TX..."), this);
+    customizeSplashAct = new QAction(CompanionIcon("paintbrush.png"), tr("Customize your &TX..."), this);
     customizeSplashAct->setStatusTip(tr("Customize the splash screen of your TX"));
     connect(customizeSplashAct, SIGNAL(triggered()), this, SLOT(customizeSplash()));
     

companion/src/modeledit/curves.cpp

@@ -8,8 +8,6 @@
 #include <QPushButton>
 #include <QMessageBox>
 
-// TODO Capability CustomCurves to be removed
-
 #define GFX_MARGIN 16
 
 static const QColor colors[C9X_MAX_CURVES] = {
@@ -76,9 +74,11 @@ Curves::Curves(QWidget * parent, ModelData & model):
 {
   ui->setupUi(this);
 
+  lock = true;
+
   if (!GetEepromInterface()->getCapability(HasCvNames)) {
-    ui->cname_LE->hide();
+    ui->curveName->hide();
-    ui->cname_label->hide();
+    ui->curveNameLabel->hide();
   }
 
   QGraphicsScene *scene = new QGraphicsScene(ui->curvePreview);
@@ -132,7 +132,20 @@ Curves::Curves(QWidget * parent, ModelData & model):
     spnx[i]->setAccelerated(true);
     connect(spnx[i], SIGNAL(valueChanged(int)), this, SLOT(onPointEdited()));
     ui->pointsLayout->addWidget(spnx[i], i, 1, 1, 1);
+
+    bool insert;
+    if (GetEepromInterface()->getCapability(EnhancedCurves)) {
+      insert = (i >= 1);
+    }
+    else {
+      insert = (i==2 || i==4 || i==8 || i==16);
+    }
+    if (insert) {
+      ui->curvePoints->addItem(tr("%1 points").arg(i+1), i+1);
+    }
   }
+
+  lock = false;
 }
 
 Curves::~Curves()
@@ -173,7 +186,7 @@ void Curves::update()
   lock = true;
 
   if (GetEepromInterface()->getCapability(HasCvNames)) {
-    ui->cname_LE->setText(model.curves[currentCurve].name);
+    ui->curveName->setText(model.curves[currentCurve].name);
   }
 
   int count = model.curves[currentCurve].count;
@@ -215,14 +228,27 @@ void Curves::setCurrentCurve(int index)
 
 void Curves::updateCurveType()
 {
-  int index = (model.curves[currentCurve].type == CurveData::CURVE_TYPE_CUSTOM ? 1 : 0);
+  lock = true;
-  if (model.curves[currentCurve].count==5)
+
-    index += 2;
+  int index = 0;
-  else if (model.curves[currentCurve].count==9)
+
-    index += 4;
+  if (GetEepromInterface()->getCapability(EnhancedCurves)) {
-  else if (model.curves[currentCurve].count==17)
+    index = model.curves[currentCurve].count - 2;
-    index += 6;
+  }
-  ui->curvetype_CB->setCurrentIndex(index);
+  else {
+    if (model.curves[currentCurve].count == 5)
+      index += 2;
+    else if (model.curves[currentCurve].count == 9)
+      index += 4;
+    else if (model.curves[currentCurve].count == 17)
+      index += 6;
+  }
+
+  ui->curvePoints->setCurrentIndex(index);
+  ui->curveCustom->setCurrentIndex(model.curves[currentCurve].type);
+  ui->curveSmooth->setCurrentIndex(model.curves[currentCurve].smooth);
+
+  lock = false;
 }
 
 void Curves::updateCurve()
@@ -333,61 +359,83 @@ void Curves::onNodeUnfocus()
   updateCurve();
 }
 
-void Curves::on_curvetype_CB_currentIndexChanged(int index)
+bool Curves::allowCurveType(int points, CurveData::CurveType type)
 {
-  static const int numpoint[] = {3,3,5,5,9,9,17,17};
+  int numcurves = GetEepromInterface()->getCapability(NumCurves);
-  static const CurveData::CurveType types[] = {CurveData::CURVE_TYPE_STANDARD, CurveData::CURVE_TYPE_CUSTOM, CurveData::CURVE_TYPE_STANDARD, CurveData::CURVE_TYPE_CUSTOM, CurveData::CURVE_TYPE_STANDARD, CurveData::CURVE_TYPE_CUSTOM, CurveData::CURVE_TYPE_STANDARD, CurveData::CURVE_TYPE_CUSTOM};
 
-  if (!lock) {
+  int totalpoints = 0;
-    lock = true;
+  for (int i=0; i<numcurves; i++) {
+    int cvPoints = (i==currentCurve ? points : model.curves[i].count);
+    CurveData::CurveType cvType = (i==currentCurve ? type : model.curves[i].type);
+    totalpoints += cvPoints + (cvType==CurveData::CURVE_TYPE_CUSTOM ? cvPoints-2 : 0);
+  }
 
-    int numcurves = GetEepromInterface()->getCapability(NumCurves);
+  int fwpoints = GetEepromInterface()->getCapability(NumCurvePoints);
-    // int currpoints = model.curves[currentCurve].count;
+  if (totalpoints > fwpoints) {
-    // bool currcustom = model.curves[currentCurve].custom;
+    QMessageBox::warning(this, "companion", tr("Not enough free points in EEPROM to store the curve."));
-
+    return false;
-    int totalpoints=0;
+  }
-    for (int i=0; i<numcurves; i++) {
+  else {
-      if (i!=currentCurve) {
+    return true;
-        totalpoints += model.curves[i].count;
-        if (model.curves[i].type == CurveData::CURVE_TYPE_CUSTOM) {
-          totalpoints += model.curves[i].count-2;
-        }
-      }
-    }
-    totalpoints += numpoint[index];
-    if (types[index] == CurveData::CURVE_TYPE_CUSTOM) {
-      totalpoints += numpoint[index]-2;
-    }
-
-    int fwpoints = GetEepromInterface()->getCapability(NumCurvePoints);
-    if (fwpoints!=0) {
-      if (fwpoints < totalpoints) {
-        QMessageBox::warning(this, "companion", tr("Not enough free points in EEPROM to store the curve."));
-        updateCurveType();
-        lock = false;
-        return;
-      }
-    }
-
-    model.curves[currentCurve].count = numpoint[index];
-    model.curves[currentCurve].type = types[index];
-
-    // TODO something better!
-    for (int i=0; i<C9X_MAX_POINTS; i++) {
-      model.curves[currentCurve].points[i].x = (i >= model.curves[currentCurve].count-1 ? +100 : -100 + (200*i)/(numpoint[index]-1));
-      model.curves[currentCurve].points[i].y = 0;
-    }
-
-    update();
-    emit modified();
-    lock = false;
   }
 }
 
-void Curves::on_cname_LE_editingFinished()
+void Curves::on_curvePoints_currentIndexChanged(int index)
+{
+  if (!lock) {
+    int numpoints = ((QComboBox *)sender())->itemData(index).toInt();
+
+    if (allowCurveType(numpoints, model.curves[currentCurve].type)) {
+      model.curves[currentCurve].count = numpoints;
+
+      // TODO something better + reuse!
+      for (int i=0; i<C9X_MAX_POINTS; i++) {
+        model.curves[currentCurve].points[i].x = (i >= model.curves[currentCurve].count-1 ? +100 : -100 + (200*i)/(numpoints-1));
+        model.curves[currentCurve].points[i].y = 0;
+      }
+
+      update();
+      emit modified();
+    }
+    else {
+      updateCurveType();
+    }
+  }
+}
+
+void Curves::on_curveCustom_currentIndexChanged(int index)
+{
+  if (!lock) {
+    CurveData::CurveType type = (CurveData::CurveType)index;
+    int numpoints = ui->curvePoints->itemData(ui->curvePoints->currentIndex()).toInt();
+    if (allowCurveType(model.curves[currentCurve].count, type)) {
+      model.curves[currentCurve].type = type;
+
+      // TODO something better + reuse!
+      for (int i=0; i<C9X_MAX_POINTS; i++) {
+        model.curves[currentCurve].points[i].x = (i >= model.curves[currentCurve].count-1 ? +100 : -100 + (200*i)/(numpoints-1));
+        model.curves[currentCurve].points[i].y = 0;
+      }
+
+      update();
+      emit modified();
+    }
+    else {
+      updateCurveType();
+    }
+  }
+}
+
+void Curves::on_curveSmooth_currentIndexChanged(int index)
+{
+  model.curves[currentCurve].smooth = index;
+  update();
+}
+
+void Curves::on_curveName_editingFinished()
 {
   memset(model.curves[currentCurve].name, 0, sizeof(model.curves[currentCurve].name));
-  strcpy(model.curves[currentCurve].name, ui->cname_LE->text().toAscii());
+  strcpy(model.curves[currentCurve].name, ui->curveName->text().toAscii());
   emit modified();
 }
 
@@ -621,47 +669,11 @@ void ModelEdit::clearCurves(bool ask)
     currentCurve=0;
     curvesLock=false;
     ui->curvetype_CB->setCurrentIndex(2);
-    ui->cname_LE->clear();
+    ui->curveName->clear();
     updateSettings();
     drawCurve();
 }
 
-void ModelEdit::setCurve(uint8_t c, int8_t ar[])
-{
-    int len=sizeof(ar)/sizeof(int8_t);
-    if (GetEepromInterface()->getCapability(CustomCurves)) {
-      if (GetEepromInterface()->getCapability(NumCurves)>c) {
-        if (len<9) {
-          model.curves[c].count=5;
-          model.curves[c].custom=false;
-          for (int i=0; i< 5; i++) {
-            model.curves[c].points[i].y=ar[i];
-          }
-        } else {
-          model.curves[c].count=5;
-          model.curves[c].custom=false;
-          for (int i=0; i< 5; i++) {
-            model.curves[c].points[i].y=ar[i];
-          }
-        }
-      }
-    } else {
-      if (len<9) {
-        model.curves[c].count=5;
-        model.curves[c].custom=false;
-        for (int i=0; i< 5; i++) {
-          model.curves[c].points[i].y=ar[i];
-        }
-      } else {
-        model.curves[c+8].count=5;
-        model.curves[c+8].custom=false;
-        for (int i=0; i< 5; i++) {
-          model.curves[c+8].points[i].y=ar[i];
-        }
-      }
-    }
-}
-
 void ModelEdit::ControlCurveSignal(bool flag)
 {
     foreach(QSpinBox *sb, findChildren<QSpinBox *>(QRegExp("curvePt[0-9]+"))) {

companion/src/modeledit/curves.h

@@ -22,8 +22,10 @@ class Curves : public ModelPanel
     void resetCurve();
     void editCurve();
     void plotCurve(bool checked);
-    void on_cname_LE_editingFinished();
+    void on_curveName_editingFinished();
-    void on_curvetype_CB_currentIndexChanged(int index);
+    void on_curvePoints_currentIndexChanged(int index);
+    void on_curveCustom_currentIndexChanged(int index);
+    void on_curveSmooth_currentIndexChanged(int index);
     void onPointEdited();
     void onNodeMoved(int x, int y);
     void onNodeFocus();
@@ -41,6 +43,7 @@ class Curves : public ModelPanel
     void setCurrentCurve(int index);
     void updateCurve();
     void updateCurveType();
+    bool allowCurveType(int points, CurveData::CurveType type);
 
 };
 

companion/src/modeledit/curves.ui

@@ -20,9 +20,47 @@
       <layout class="QGridLayout" name="curvesLayout"/>
      </item>
      <item row="0" column="1" rowspan="3">
-      <layout class="QGridLayout" name="gridLayout_8" rowstretch="0,0,0" columnstretch="1,1">
+      <layout class="QGridLayout" name="gridLayout_8" rowstretch="0,0,0" columnstretch="1,0">
+       <item row="1" column="1">
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QComboBox" name="curvePoints"/>
+         </item>
+         <item>
+          <widget class="QComboBox" name="curveCustom">
+           <item>
+            <property name="text">
+             <string>Standard</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Custom</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="curveSmooth">
+           <item>
+            <property name="text">
+             <string>Lines</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Smooth</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
        <item row="1" column="0">
-        <widget class="QLabel" name="curvetype_label">
+        <widget class="QLabel" name="curveTypeLabel">
          <property name="text">
           <string>Curve type</string>
          </property>
@@ -31,52 +69,8 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QComboBox" name="curvetype_CB">
-         <item>
-          <property name="text">
-           <string>3 points</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>3 points custom</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>5 points</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>5 points custom</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>9 points</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>9 points custom</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>17 points</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>17 points custom</string>
-          </property>
-         </item>
-        </widget>
-       </item>
        <item row="2" column="0">
-        <widget class="QLabel" name="cname_label">
+        <widget class="QLabel" name="curveNameLabel">
          <property name="text">
           <string>Curve name</string>
          </property>
@@ -86,7 +80,7 @@
         </widget>
        </item>
        <item row="2" column="1">
-        <widget class="QLineEdit" name="cname_LE">
+        <widget class="QLineEdit" name="curveName">
          <property name="maxLength">
           <number>6</number>
          </property>
@@ -129,7 +123,7 @@
        </property>
       </layout>
      </item>
-     <item row="4" column="0" colspan="5">
+     <item row="5" column="0" colspan="5">
       <spacer name="verticalSpacer_6">
        <property name="orientation">
         <enum>Qt::Vertical</enum>

companion/src/modeledit/customfunctions.cpp

@@ -7,6 +7,35 @@
 #include <QDoubleSpinBox>
 #include "helpers.h"
 
+RepeatComboBox::RepeatComboBox(QWidget *parent, int & repeatParam):
+  QComboBox(parent),
+  repeatParam(repeatParam)
+{
+  unsigned int step = IS_ARM(GetEepromInterface()->getBoard()) ? 1 : 10;
+  int value = repeatParam/step;
+
+  if (step == 1) {
+    addItem(QObject::tr("Played once, not during startup"), -1);
+    value++;
+  }
+
+  addItem(QObject::tr("No repeat"), 0);
+
+  for (unsigned int i=step; i<=60; i+=step) {
+    addItem(QObject::tr("%1s").arg(i), i);
+  }
+
+  setCurrentIndex(value);
+
+  connect(this, SIGNAL(currentIndexChanged(int)), this, SLOT(onIndexChanged(int)));
+}
+
+void RepeatComboBox::onIndexChanged(int index)
+{
+  repeatParam = itemData(index).toInt();
+  emit modified();
+}
+
 CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model, GeneralSettings & generalSettings):
   ModelPanel(parent, model),
   generalSettings(generalSettings),
@@ -132,12 +161,9 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
 
     QHBoxLayout *repeatLayout = new QHBoxLayout();
     gridLayout->addLayout(repeatLayout, i+1, 4);
-
+    fswtchRepeat[i] = new RepeatComboBox(this, model.funcSw[i].repeatParam);
-    fswtchRepeat[i] = new QComboBox(this);
-    fswtchRepeat[i]->setProperty("index", i);
-    connect(fswtchRepeat[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
     repeatLayout->addWidget(fswtchRepeat[i], i+1);
-    populateRepeatCB(fswtchRepeat[i], model.funcSw[i].repeatParam);
+    connect(fswtchRepeat[i], SIGNAL(modified()), this, SLOT(onChildModified()));
 
     fswtchEnable[i] = new QCheckBox(this);
     fswtchEnable[i]->setProperty("index", i);
@@ -252,6 +278,11 @@ void CustomFunctionsPanel::customFunctionEdited()
   }
 }
 
+void CustomFunctionsPanel::onChildModified()
+{
+  emit modified();
+}
+
 void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
 {
     unsigned int widgetsMask = 0;
@@ -259,7 +290,6 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
       model.funcSw[i].swtch = RawSwitch(fswtchSwtch[i]->itemData(fswtchSwtch[i]->currentIndex()).toInt());
       model.funcSw[i].func = (AssignFunc)fswtchFunc[i]->currentIndex();
       model.funcSw[i].enabled = fswtchEnable[i]->isChecked();
-      model.funcSw[i].repeatParam = (AssignFunc)fswtchRepeat[i]->currentIndex();
       model.funcSw[i].adjustMode = (AssignFunc)fswtchGVmode[i]->currentIndex();
     }
 
@@ -314,11 +344,8 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
       widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM + CUSTOM_FUNCTION_ENABLE;
     }
     else if (index==FuncPlaySound || index==FuncPlayHaptic || index==FuncPlayValue || index==FuncPlayPrompt || index==FuncPlayBoth || index==FuncBackgroundMusic) {
-      if (modified) model.funcSw[i].repeatParam = fswtchRepeat[i]->itemData(fswtchRepeat[i]->currentIndex()).toInt();
+      if (index != FuncBackgroundMusic && GetEepromInterface()->getCapability(HasFuncRepeat)) {
-      if (index != FuncBackgroundMusic) {
+        widgetsMask |= CUSTOM_FUNCTION_REPEAT;
-        if (GetEepromInterface()->getCapability(HasFuncRepeat)) {
-          widgetsMask |= CUSTOM_FUNCTION_REPEAT;
-        }
       }
       if (index==FuncPlayValue) {
         if (modified) model.funcSw[i].param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt();
@@ -422,9 +449,11 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
 
 void CustomFunctionsPanel::update()
 {
+  lock = true;
   for (int i=0; i<GetEepromInterface()->getCapability(CustomFunctions); i++) {
     refreshCustomFunction(i);
   }
+  lock = false;
 }
 
 void CustomFunctionsPanel::fswPaste()

companion/src/modeledit/customfunctions.h

@@ -13,6 +13,23 @@
 #include <phonon/mediasource.h>
 #endif
 
+class RepeatComboBox: public QComboBox
+{
+    Q_OBJECT
+
+  public:
+    RepeatComboBox(QWidget *parent, int & repeatParam);
+
+  signals:
+    void modified();
+
+  private slots:
+    void onIndexChanged(int);
+
+  protected:
+    int & repeatParam;
+};
+
 class CustomFunctionsPanel : public ModelPanel
 {
     Q_OBJECT
@@ -28,6 +45,7 @@ class CustomFunctionsPanel : public ModelPanel
     void fsw_customContextMenuRequested(QPoint pos);
     void refreshCustomFunction(int index, bool modified=false);
     void playMusic();
+    void onChildModified();
 #ifdef PHONON
     void mediaPlayer_state(Phonon::State newState, Phonon::State oldState);
 #endif

companion/src/modeledit/expodialog.cpp

@@ -62,6 +62,10 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, i
     ui->trimCB->hide();
   }
 
+  ui->trimCB->addItem(tr("Rud"), 1);
+  ui->trimCB->addItem(tr("Ele"), 2);
+  ui->trimCB->addItem(tr("Thr"), 3);
+  ui->trimCB->addItem(tr("Ail"), 4);
   ui->trimCB->setCurrentIndex(1 - ed->carryTrim);
 
   int expolength = GetEepromInterface()->getCapability(HasExpoNames);
@@ -81,12 +85,13 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, i
 
   valuesChanged();
 
-  connect(ui->lineName,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
+  connect(ui->lineName,SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
-  connect(ui->sourceCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
+  connect(ui->sourceCB,SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
-  connect(ui->switchesCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
+  connect(ui->trimCB,SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
-  connect(ui->sideCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
+  connect(ui->switchesCB,SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
+  connect(ui->sideCB,SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
   for (int i=0; i<9; i++) {
-    connect(cb_fp[i],SIGNAL(toggled(bool)),this,SLOT(valuesChanged()));
+    connect(cb_fp[i], SIGNAL(toggled(bool)), this, SLOT(valuesChanged()));
   }
   QTimer::singleShot(0, this, SLOT(shrink()));
 }
@@ -115,6 +120,7 @@ void ExpoDialog::valuesChanged()
     QCheckBox * cb_fp[] = {ui->cb_FP0,ui->cb_FP1,ui->cb_FP2,ui->cb_FP3,ui->cb_FP4,ui->cb_FP5,ui->cb_FP6,ui->cb_FP7,ui->cb_FP8 };
 
     ed->srcRaw  = RawSource(ui->sourceCB->itemData(ui->sourceCB->currentIndex()).toInt());
+    ed->carryTrim = 1 - ui->trimCB->currentIndex();
     ed->swtch  = RawSwitch(ui->switchesCB->itemData(ui->switchesCB->currentIndex()).toInt());
     ed->mode   = ui->sideCB->currentIndex() + 1;
 

companion/src/modeledit/inputs.cpp

@@ -88,6 +88,12 @@ void InputsPanel::update()
 
     if (GetEepromInterface()->getCapability(VirtualInputs)) {
       str += " " + tr("Source(%1)").arg(md->srcRaw.toString());
+      if (md->carryTrim>0) {
+        str += " " + tr("No Trim");
+      }
+      else if (md->carryTrim<0) {
+        str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();
+      }
     }
     else {
       switch (md->mode) {

companion/src/modeledit/mixerdialog.cpp

@@ -45,7 +45,6 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, i
     ui->trimCB->addItem(tr("Ele"), 2);
     ui->trimCB->addItem(tr("Thr"), 3);
     ui->trimCB->addItem(tr("Ail"), 4);
-
     ui->trimCB->setCurrentIndex(1 - md->carryTrim);
 
     int namelength = GetEepromInterface()->getCapability(HasMixerNames);

companion/src/modeledit/mixes.cpp

@@ -112,11 +112,13 @@ void MixesPanel::update()
 
     if (md->swtch.type != SWITCH_TYPE_NONE) str += " " + tr("Switch(%1)").arg(md->swtch.toString());
 
-    if (md->carryTrim>0) {
+    if (!GetEepromInterface()->getCapability(VirtualInputs)) {
-      str += " " + tr("No Trim");
+      if (md->carryTrim>0) {
-    }
+        str += " " + tr("No Trim");
-    else if (md->carryTrim<0) {
+      }
-      str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();
+      else if (md->carryTrim<0) {
+        str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();
+      }
     }
 
     if (md->noExpo)      str += " " + tr("No DR/Expo");

companion/src/modeledit/setup.cpp

@@ -19,13 +19,10 @@ TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer):
     ui->persistentValue->hide();
   }
 
-  if (!GetEepromInterface()->getCapability(minuteBeep)) {
+  ui->countdownBeep->addItem(tr("None"));
-    ui->minuteBeep->hide();
+  ui->countdownBeep->addItem(tr("Beeps"));
-  }
+  if (IS_ARM(GetEepromInterface()->getBoard()) || IS_2560(GetEepromInterface()->getBoard()))
-
+    ui->countdownBeep->addItem(tr("Countdown"));
-  if (!GetEepromInterface()->getCapability(countdownBeep)) {
-    ui->countdownBeep->hide();
-  }
 }
 
 TimerPanel::~TimerPanel()
@@ -54,13 +51,8 @@ void TimerPanel::update()
     ui->persistentValue->setText(QString(" %1(%2:%3:%4)").arg(sign<0 ? "-" :" ").arg(hours, 2, 10, QLatin1Char('0')).arg(minutes, 2, 10, QLatin1Char('0')).arg(seconds, 2, 10, QLatin1Char('0')));
   }
 
-  if (GetEepromInterface()->getCapability(minuteBeep)) {
+  ui->countdownBeep->setCurrentIndex(timer.countdownBeep);
-    ui->minuteBeep->setChecked(timer.minuteBeep);
+  ui->minuteBeep->setChecked(timer.minuteBeep);
-  }
-
-  if (GetEepromInterface()->getCapability(countdownBeep)) {
-    ui->countdownBeep->setChecked(timer.countdownBeep);
-  }
 }
 
 void TimerPanel::on_value_editingFinished()
@@ -81,15 +73,15 @@ void TimerPanel::on_persistent_toggled(bool checked)
   emit modified();
 }
 
-void TimerPanel::on_minuteBeep_toggled(bool checked)
+void TimerPanel::on_countdownBeep_currentIndexChanged(int index)
 {
-  timer.minuteBeep = checked;
+  timer.countdownBeep = index;
   emit modified();
 }
 
-void TimerPanel::on_countdownBeep_toggled(bool checked)
+void TimerPanel::on_minuteBeep_toggled(bool checked)
 {
-  timer.countdownBeep = checked;
+  timer.minuteBeep = checked;
   emit modified();
 }
 
@@ -224,14 +216,18 @@ void ModulePanel::update()
     ui->label_failsafeMode->setVisible(mask & MASK_FAILSAFES);
     ui->failsafeMode->setVisible(mask & MASK_FAILSAFES);
     ui->failsafeMode->setCurrentIndex(module.failsafeMode);
-    ui->label_failsafeFrame->setVisible(mask & MASK_FAILSAFES);
-    ui->failsafesFrame->setVisible(mask & MASK_FAILSAFES);
     ui->failsafesFrame->setEnabled(module.failsafeMode == 1);
     for (int i=0; i<failsafeSliders.size(); i++) {
       failsafeSliders[i]->setValue(module.failsafeChannels[i]);
       failsafeSpins[i]->setValue(module.failsafeChannels[i]);
     }
   }
+  else {
+    mask = 0;
+  }
+  
+  ui->failsafesLayoutLabel->setVisible(mask & MASK_FAILSAFES);
+  ui->failsafesFrame->setVisible(mask & MASK_FAILSAFES);
 }
 
 void ModulePanel::on_trainerMode_currentIndexChanged(int index)

companion/src/modeledit/setup.h

@@ -28,7 +28,7 @@ class TimerPanel : public ModelPanel
     void on_value_editingFinished();
     void on_persistent_toggled(bool checked);
     void on_minuteBeep_toggled(bool checked);
-    void on_countdownBeep_toggled(bool checked);
+    void on_countdownBeep_currentIndexChanged(int index);
 
   private:
     TimerData & timer;

companion/src/modeledit/setup_module.ui

@@ -443,7 +443,7 @@
        </widget>
       </item>
       <item row="7" column="0" alignment="Qt::AlignRight">
-       <widget class="QLabel" name="label_failsafeFrame">
+       <widget class="QLabel" name="failsafesLayoutLabel">
         <property name="maximumSize">
          <size>
           <width>16777215</width>

companion/src/modeledit/setup_timer.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>726</width>
+    <width>586</width>
-    <height>54</height>
+    <height>38</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -33,6 +33,23 @@
    <item>
     <widget class="QComboBox" name="mode"/>
    </item>
+   <item>
+    <widget class="QLabel" name="countdownBeepLabel">
+     <property name="text">
+      <string>Countdown</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QComboBox" name="countdownBeep"/>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="minuteBeep">
+     <property name="text">
+      <string>MinuteBeep</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QCheckBox" name="persistent">
      <property name="text">
@@ -47,20 +64,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QCheckBox" name="minuteBeep">
-     <property name="text">
-      <string>MinuteBeep</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="countdownBeep">
-     <property name="text">
-      <string>CountDownBeep</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <spacer name="spacer">
      <property name="orientation">

companion/src/modeledit/telemetry.cpp

@@ -371,16 +371,19 @@ void TelemetryPanel::setup()
 
     if (!GetEepromInterface()->getCapability(HasAltitudeSel)) {
       ui->AltitudeGPS_ChkB->hide();
-    } else {
+    }
+    else {
       ui->AltitudeGPS_ChkB->setChecked(model.frsky.FrSkyGpsAlt);
     }
-    int varioCap=GetEepromInterface()->getCapability(HasVario);
+
-  //  if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+    if (IS_TARANIS(GetEepromInterface()->getBoard())) {
-    if (false) {
       ui->AltitudeToolbar_ChkB->setChecked(model.frsky.altitudeDisplayed);
-    } else {
+    }
+    else {
       ui->AltitudeToolbar_ChkB->hide();
     }
+
+    int varioCap = GetEepromInterface()->getCapability(HasVario);
     if (!varioCap) {
       ui->varioLimitMax_DSB->hide();
       ui->varioLimitMinOff_ChkB->hide();
@@ -649,7 +652,6 @@ void TelemetryPanel::on_AltitudeGPS_ChkB_toggled(bool checked)
     if (lock) return;
     model.frsky.FrSkyGpsAlt = checked;
     emit modified();
-    //AltitudeGPS_CB
 }
 
 void TelemetryPanel::on_AltitudeToolbar_ChkB_toggled(bool checked)

companion/src/modeledit/templates.cpp

@@ -2,6 +2,28 @@
 #include <QListWidget>
 #include <QMessageBox>
 
+void ModelEdit::setCurve(uint8_t c, int8_t ar[])
+{
+  int len=sizeof(ar)/sizeof(int8_t);
+
+  if (GetEepromInterface()->getCapability(NumCurves)>c) {
+    if (len<9) {
+      model.curves[c].count=5;
+      model.curves[c].custom=false;
+      for (int i=0; i< 5; i++) {
+        model.curves[c].points[i].y=ar[i];
+      }
+    }
+    else {
+      model.curves[c].count=5;
+      model.curves[c].custom=false;
+      for (int i=0; i< 5; i++) {
+        model.curves[c].points[i].y=ar[i];
+      }
+    }
+  }
+}
+
 Templates::Templates(QWidget * parent, ModelData & model):
   QWidget(parent),
   model(model)