Merge d4f05a0 into 881727c

opencor · Nov 12, 2018 · 02a1848 · 02a1848
2 parents 881727c + d4f05a0
commit 02a1848
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -37,6 +37,7 @@ var jsonData = { "versions": [
                        }
                      ],
                      "changes": [
+                       { "change": "<strong>General:</strong> properly keep track of the sizes of some splitters (see issue <a href=\"https://github.com/opencor/opencor/issues/1871\">#1871</a>)." },
                        { "change": "<strong>Graph Panel widget:</strong> don't skip the first data point (see issue <a href=\"https://github.com/opencor/opencor/issues/1860\">#1860</a>)." },
                        { "change": "<strong>PMR-based windows:</strong> make sure that the spinning wheel is hidden when changing instances of PMR (see issue <a href=\"https://github.com/opencor/opencor/issues/1862\">#1862</a>). Make sure they get populated when being shown after having changed instances of PMR (see issue <a href=\"https://github.com/opencor/opencor/issues/1865\">#1865</a>)." }
                      ]

diff --git a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationvieweditingwidget.cpp b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationvieweditingwidget.cpp
@@ -85,7 +85,7 @@ CellmlAnnotationViewEditingWidget::CellmlAnnotationViewEditingWidget(CellMLAnnot
 
     // Keep track of our splitter being moved
 
-    connect(this, &CellmlAnnotationViewEditingWidget::splitterMoved,
+    connect(this, &Core::SplitterWidget::splitterMoved,
             this, &CellmlAnnotationViewEditingWidget::emitSplitterMoved);
 
     // A connection to let our details widget know that we want to see the

diff --git a/src/plugins/editing/CellMLEditingView/src/cellmleditingviewwidget.cpp b/src/plugins/editing/CellMLEditingView/src/cellmleditingviewwidget.cpp
@@ -75,7 +75,7 @@ CellmlEditingViewWidget::CellmlEditingViewWidget(const QString &pContents,
 
     // Keep track of our movement
 
-    connect(this, &QSplitter::splitterMoved,
+    connect(this, &Core::SplitterWidget::splitterMoved,
             this, &CellmlEditingViewWidget::splitterMoved);
 
     // Create our MathML viewer, editor and editor list widgets

diff --git a/src/plugins/editing/SEDMLEditingView/src/sedmleditingviewwidget.cpp b/src/plugins/editing/SEDMLEditingView/src/sedmleditingviewwidget.cpp
@@ -54,7 +54,7 @@ SedmlEditingViewWidget::SedmlEditingViewWidget(const QString &pContents,
 
     // Keep track of our movement
 
-    connect(this, &QSplitter::splitterMoved,
+    connect(this, &Core::SplitterWidget::splitterMoved,
             this, &SedmlEditingViewWidget::splitterMoved);
 
     // Create our editor and editor list widgets

diff --git a/...lugins/simulation/SimulationExperimentView/src/simulationexperimentviewcontentswidget.cpp b/...lugins/simulation/SimulationExperimentView/src/simulationexperimentviewcontentswidget.cpp
@@ -44,7 +44,7 @@ SimulationExperimentViewContentsWidget::SimulationExperimentViewContentsWidget(S
 {
     // Keep track of our movement
 
-    connect(this, &SimulationExperimentViewContentsWidget::splitterMoved,
+    connect(this, &Core::SplitterWidget::splitterMoved,
             this, &SimulationExperimentViewContentsWidget::emitSplitterMoved);
 
     // Create our information widget

diff --git a/src/plugins/widget/GraphPanelWidget/src/graphpanelswidget.cpp b/src/plugins/widget/GraphPanelWidget/src/graphpanelswidget.cpp
@@ -67,7 +67,7 @@ GraphPanelsWidget::GraphPanelsWidget(QWidget *pParent) :
     // Check whether one of our splitters has move and, therefore, whether our
     // sizes have changed
 
-    connect(this, &GraphPanelsWidget::splitterMoved,
+    connect(this, &Core::SplitterWidget::splitterMoved,
             this, &GraphPanelsWidget::stopUsingInternalSizes);
 }