From e730bf1968a039edc33d21343f3a6bc01783b043 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Fri, 21 Oct 2016 09:24:21 +0200
Subject: [PATCH] Port to next (#3941)

---
 companion/src/modeledit/curves.cpp | 14 +++++++-------
 companion/src/modeledit/curves.ui  |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/companion/src/modeledit/curves.cpp b/companion/src/modeledit/curves.cpp
index 8b2178092..bdad1375b 100644
--- a/companion/src/modeledit/curves.cpp
+++ b/companion/src/modeledit/curves.cpp
@@ -134,7 +134,7 @@ Curves::Curves(QWidget * parent, ModelData & model, GeneralSettings & generalSet
     if (i<limit) {
       ui->curvesLayout->addWidget(edit, i, 1, 1, 1);
     } else {
-      ui->curvesLayout2->addWidget(edit, i-limit, 1, 1, 1);
+      ui->curvesLayout2->addWidget(edit, i-limit, 2, 1, 1);
     }
 
     // The curve plot checkbox
@@ -145,7 +145,7 @@ Curves::Curves(QWidget * parent, ModelData & model, GeneralSettings & generalSet
     if (i<limit) {
       ui->curvesLayout->addWidget(plot, i, 2, 1, 1);
     } else {
-      ui->curvesLayout2->addWidget(plot, i-limit, 2, 1, 1);
+      ui->curvesLayout2->addWidget(plot, i-limit, 1, 1, 1);
     }
   }
   QSpacerItem * item = new QSpacerItem(1,1, QSizePolicy::Fixed, QSizePolicy::Expanding);
@@ -570,13 +570,13 @@ void Curves::ShowContextMenu(const QPoint& pos) // this is a slot
   QAction *action;
   action = myMenu.addAction(CompanionIcon("copy.png"),tr("Copy"));
   action->setProperty("index", CURVE_COPY);
-  
+
   action = myMenu.addAction(CompanionIcon("paste.png"),tr("Paste"));
   if (!mimeData->hasFormat("application/x-companion-curve-item")) {
     action->setEnabled(false);
   }
   action->setProperty("index", CURVE_PASTE);
-  
+
   action = myMenu.addAction(CompanionIcon("clear.png"),tr("Clear"));
   action->setProperty("index", CURVE_RESET);
   action = myMenu.addAction(CompanionIcon("clear.png"),tr("Clear all curves"));
@@ -591,14 +591,14 @@ void Curves::ShowContextMenu(const QPoint& pos) // this is a slot
       curveData.append((char*)&model->curves[index], sizeof(CurveData));
       mimeData2->setData("application/x-companion-curve-item", curveData);
       QApplication::clipboard()->setMimeData(mimeData2, QClipboard::Clipboard);
-    } 
+    }
     else if (action==CURVE_PASTE) {
       QByteArray curveData = mimeData->data("application/x-companion-curve-item");
       CurveData *curve = &model->curves[index];
       memcpy(curve, curveData.constData(), sizeof(CurveData));
       update();
       emit modified();
-    } 
+    }
     else if (action==CURVE_RESET) {
       int res = QMessageBox::question(this, "companion", tr("Are you sure you want to reset curve %1?").arg(index+1), QMessageBox::Yes | QMessageBox::No);
       if (res == QMessageBox::Yes) {
@@ -606,7 +606,7 @@ void Curves::ShowContextMenu(const QPoint& pos) // this is a slot
         update();
         emit modified();
       }
-    } 
+    }
     else if (action==CURVE_RESETALL) {
       int res = QMessageBox::question(this, "companion", tr("Are you sure you want to reset all curves?"), QMessageBox::Yes | QMessageBox::No);
       if (res == QMessageBox::Yes) {
diff --git a/companion/src/modeledit/curves.ui b/companion/src/modeledit/curves.ui
index 13d94b54d..f7c58ee35 100644
--- a/companion/src/modeledit/curves.ui
+++ b/companion/src/modeledit/curves.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>624</width>
+    <width>672</width>
     <height>539</height>
    </rect>
   </property>
@@ -20,7 +20,7 @@
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_1">
      <property name="rightMargin">
-      <number>10</number>
+      <number>0</number>
      </property>
      <item>
       <widget class="QGraphicsView" name="curvePreview">