include/petrack.h

@@ -461,6 +461,7 @@ private:
 
     QFrame *mCentralWidget;
     Control *mControlWidget;
+    QSplitter *mSplitter;
     StereoWidget *mStereoWidget;
     ColorRangeWidget *mColorRangeWidget;
     ColorMarkerWidget *mColorMarkerWidget;

src/colorPlot.cpp

@@ -782,11 +782,8 @@ ColorPlot::ColorPlot(QWidget *parent) // default= NULL
     //setFrameShape(Box); // damit rahmen gleich wie alle anderen group boxen
     //setFrameShadow(Sunken);
 
-    QFont f("Courier", 10, QFont::Normal); //Times Helvetica, Normal Bold
     QwtText titleX("x");
     QwtText titleY("y");
-    titleX.setFont(f);
-    titleY.setFont(f);
 
     setAxisTitle(xBottom, titleX); //"x"
     setAxisTitle(yLeft, titleY); //"y"

src/control.cpp

@@ -163,6 +163,35 @@ Control::Control(QWidget *parent)
     recoMethod->addItem("code marker"); // 6
 
     recoMethod->setCurrentIndex(5); // default multicolor marker (until 11/2016 hermes marker)
+
+    scrollArea->setMinimumWidth(
+        scrollAreaWidgetContents->sizeHint().width() +
+        2 * scrollArea->frameWidth() +
+        scrollArea->verticalScrollBar()->sizeHint().width() +
+        scrollAreaWidgetContents->layout()->margin() * 2 +
+        scrollAreaWidgetContents->layout()->spacing() * 2
+    );
+    scrollArea_2->setMinimumWidth(
+        scrollAreaWidgetContents_2->sizeHint().width() +
+        2 * scrollArea_2->frameWidth() +
+        scrollArea_2->verticalScrollBar()->sizeHint().width()+
+        scrollAreaWidgetContents_2->layout()->margin() * 2 +
+        scrollAreaWidgetContents_2->layout()->spacing() * 2
+    );
+    scrollArea_3->setMinimumWidth(
+        scrollAreaWidgetContents_3->sizeHint().width() +
+        2 * scrollArea_3->frameWidth() +
+        scrollArea_3->verticalScrollBar()->sizeHint().width()+
+        scrollAreaWidgetContents_3->layout()->margin() * 2 +
+        scrollAreaWidgetContents_3->layout()->spacing() * 2
+    );
+    scrollArea_4->setMinimumWidth(
+        scrollAreaWidgetContents_4->sizeHint().width() +
+        2 * scrollArea_4->frameWidth() +
+        scrollArea_4->verticalScrollBar()->sizeHint().width()+
+        scrollAreaWidgetContents_4->layout()->margin() * 2 +
+        scrollAreaWidgetContents_4->layout()->spacing() * 2
+    );
 }
 
 void Control::setScene(QGraphicsScene *sc)

src/petrack.cpp

@@ -127,10 +127,6 @@ Petrack::Petrack()
     //mImageBorderSize=0;
 
     mControlWidget = new Control(this);
-    mControlWidget->setFixedWidth(mControlWidget->geometry().width());
-    mControlWidget->setMinimumHeight(mControlWidget->geometry().height());
-    mControlWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
-    //setFixedSize(mControlWidget->geometry().width(),mControlWidget->geometry().height());
     cw =  mControlWidget; // muss spaeter geloescht werden
 
     mStereoWidget = new StereoWidget(this);
@@ -227,10 +223,6 @@ Petrack::Petrack()
     vLayout->addWidget(mViewWidget);
     vLayout->addWidget(mPlayerWidget);
 
-    QVBoxLayout *vControlLayout = new QVBoxLayout;
-    //vControlLayout->setSpacing(space);
-    vControlLayout->addWidget(mControlWidget);
-
     //---------------------------
 
     mTracker = new Tracker(this);
@@ -293,9 +285,20 @@ Petrack::Petrack()
     mCentralWidget->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel);
     mCentralWidget->setLayout(mCentralLayout);
     setCentralWidget(mCentralWidget);
-    mCentralLayout->addLayout(vLayout);
-    mCentralLayout->addLayout(vControlLayout);
-    //mCentralLayout->addWidget(mControlWidget); //, 0, Qt::AlignTop
+    mSplitter = new QSplitter(this);
+    // create playAndView-Widget to wrap layout, since QSplitter only accepts widgets
+    QWidget *playAndView = new QWidget(this);
+    playAndView->setLayout(vLayout);
+    mSplitter->addWidget(playAndView);
+
+    mSplitter->addWidget(mControlWidget);
+
+    mSplitter->setStretchFactor(0,1);
+    mSplitter->setStretchFactor(1,0);
+
+    mCentralLayout->addWidget(mSplitter);
+
+
     setWindowTitle(tr("PeTrack"));
 
     //---------------------------
@@ -2379,6 +2382,7 @@ void Petrack::readSettings()
     move(pos);
     antialias();
     opengl();
+    mSplitter->restoreState(settings.value("controlSplitterSizes").toByteArray());
 }
 
 /**
@@ -2396,6 +2400,7 @@ void Petrack::writeSettings()
     settings.setValue("proFilePath", QFileInfo(mProFileName).path()); // nur path, damit bei saveCurrentProject
     if (!mAutoCalib.isEmptyCalibFiles()) //!mCalibFiles.isEmpty()
         settings.setValue("calibFile", mAutoCalib.getCalibFile(0));
+    settings.setValue("controlSplitterSizes", mSplitter->saveState());
 }
 
 bool Petrack::maybeSave()