Merge 523084d into df000d4

opencor · Apr 22, 2019 · 03a7e12 · 03a7e12
2 parents df000d4 + 523084d
commit 03a7e12
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 32 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -38,6 +38,7 @@ var jsonData = { "versions": [
                      ],
                      "changes": [
                        { "change": "<strong>General:</strong> now rely on <a href=\"https://visualstudio.microsoft.com/downloads/\">Visual Studio 2017 Update 9</a> to build OpenCOR on <a href=\"https://en.wikipedia.org/wiki/Microsoft_Windows\">Windows</a> (see issue <a href=\"https://github.com/opencor/opencor/issues/2041\">#2041</a>). Upgraded our minimum requirement to <a href=\"https://en.wikipedia.org/wiki/Ubuntu_version_history#Ubuntu_18.04_LTS_(Bionic_Beaver)\">Ubuntu 18.04 LTS</a> on Linux (see issue <a href=\"https://github.com/opencor/opencor/issues/2050\">#2050</a>)." },
+                       { "change": "<strong>PMR Workspaces window:</strong> first list changed files and then show the user's comment (in the synchronisation dialog; see issue <a href=\"https://github.com/opencor/opencor/issues/2065\">#2065</a>)." },
                        { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"http://www.llvm.org/\">LLVM</a>+<a href=\"http://clang.llvm.org/\">Clang</a> to version 8.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2040\">#2040</a>). Upgraded <a href=\"https://github.com/fbergmann/libSEDML/\">libSEDML</a> to version 0.4.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/2042\">#2042</a>). Upgraded <a href=\"https://www.mesa3d.org/\">Mesa</a> to version 18.3.5 (see issue <a href=\"https://github.com/opencor/opencor/issues/2044\">#2044</a>). Upgraded <a href=\"http://sbml.org/Software/libSBML/\">libSBML</a> to version 5.18.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2064\">#2064</a>). Upgraded <a href=\"https://jquery.com/\">jQuery</a> to version 3.4.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2068\">#2068</a>). Upgraded <a href=\"https://www.mesa3d.org/\">Mesa</a> to version 19.0.2 (see issue <a href=\"https://github.com/opencor/opencor/issues/2070\">#2070</a>)." }
                      ]
                    },

diff --git a/doc/whatIsNew.js b/doc/whatIsNew.js
@@ -15,6 +15,15 @@ var jsonData = { "versions": [
                            }
                          ]
                        },
+                       { "name": "Organisation",
+                         "entries": [
+                           { "type": "subCategory", "name": "PMR Workspaces window",
+                             "entries": [
+                               { "type": "improved", "description": "Synchronisation dialog." }
+                             ]
+                           }
+                         ]
+                       },
                        { "name": "Simulation",
                          "entries": [
                            { "type": "subCategory", "name": "Simulation Experiment view",

diff --git a/src/plugins/organisation/PMRWorkspacesWindow/src/pmrworkspaceswindowsynchronizedialog.cpp b/src/plugins/organisation/PMRWorkspacesWindow/src/pmrworkspaceswindowsynchronizedialog.cpp
@@ -133,46 +133,25 @@ PmrWorkspacesWindowSynchronizeDialog::PmrWorkspacesWindowSynchronizeDialog(PMRSu
     mHorizontalSplitter = new Core::SplitterWidget(this);
     mVerticalSplitter = new Core::SplitterWidget(Qt::Vertical, mHorizontalSplitter);
 
-    // Create our message-related widget, populate it, and add it to our
+    // Create our changes-related widget, populate it, and add it to our
     // vertical splitter
 
-    auto messageWidget = new QWidget(mVerticalSplitter);
-    auto messageLayout = new QVBoxLayout(messageWidget);
+    auto changesWidget = new QWidget(mVerticalSplitter);
+    auto changesLayout = new QVBoxLayout(changesWidget);
     int margin;
 
-    messageLayout->getContentsMargins(nullptr, nullptr, nullptr, &margin);
+    changesLayout->getContentsMargins(nullptr, nullptr, nullptr, &margin);
 
     int halfMargin = margin/2;
 
-    messageLayout->setContentsMargins(0, 0, halfMargin, halfMargin);
-
-    messageWidget->setLayout(messageLayout);
-
-    auto messageLabel = new QLabel(tr("Message:"), messageWidget);
-    QFont newFont = messageLabel->font();
-
-    newFont.setBold(true);
-
-    messageLabel->setFont(newFont);
-
-    mMessageValue = new QTextEdit(messageWidget);
-
-    messageLayout->addWidget(messageLabel);
-    messageLayout->addWidget(mMessageValue);
-
-    mVerticalSplitter->addWidget(messageWidget);
-
-    // Create our changes-related widget, populate it, and add it to our
-    // vertical splitter
-
-    auto changesWidget = new QWidget(mVerticalSplitter);
-    auto changesLayout = new QVBoxLayout(changesWidget);
-
     changesLayout->setContentsMargins(0, halfMargin, halfMargin, 0);
 
     changesWidget->setLayout(changesLayout);
 
     auto changesLabel = new QLabel(changesWidget);
+    QFont newFont = changesLabel->font();
+
+    newFont.setBold(true);
 
     changesLabel->setFont(newFont);
 
@@ -193,17 +172,38 @@ PmrWorkspacesWindowSynchronizeDialog::PmrWorkspacesWindowSynchronizeDialog(PMRSu
 
     mVerticalSplitter->addWidget(changesWidget);
 
+    // Create our message-related widget, populate it, and add it to our
+    // vertical splitter
+
+    auto messageWidget = new QWidget(mVerticalSplitter);
+    auto messageLayout = new QVBoxLayout(messageWidget);
+
+    messageLayout->setContentsMargins(0, 0, halfMargin, halfMargin);
+
+    messageWidget->setLayout(messageLayout);
+
+    auto messageLabel = new QLabel(tr("Message:"), messageWidget);
+
+    messageLabel->setFont(newFont);
+
+    mMessageValue = new QTextEdit(messageWidget);
+
+    messageLayout->addWidget(messageLabel);
+    messageLayout->addWidget(mMessageValue);
+
+    mVerticalSplitter->addWidget(messageWidget);
+
     // Customise our vertical splitter and add it to our horizontal splitter
 
     mVerticalSplitter->setCollapsible(0, false);
     mVerticalSplitter->setCollapsible(1, false);
-    mVerticalSplitter->setStretchFactor(1, 1);
+    mVerticalSplitter->setStretchFactor(0, 1);
 
     mHorizontalSplitter->addWidget(mVerticalSplitter);
 
     // Create our Web viewer and add it to our horizontal splitter
 
-    auto webViewerWidget = new QWidget(mVerticalSplitter);
+    auto webViewerWidget = new QWidget(mHorizontalSplitter);
     auto webViewerLayout = new QVBoxLayout(webViewerWidget);
 
     webViewerLayout->setContentsMargins(halfMargin, 0, 0, 0);
@@ -273,7 +273,7 @@ PmrWorkspacesWindowSynchronizeDialog::PmrWorkspacesWindowSynchronizeDialog(PMRSu
 
     mHorizontalSplitter->setSizes(qVariantListToIntList(mSettings.value(SettingsHorizontalSplitterSizes).toList()));
     mVerticalSplitter->setSizes(qVariantListToIntList(mSettings.value(SettingsVerticalSplitterSizes,
-                                                                      QVariantList() << 222 << 555).toList()));
+                                                                      QVariantList() << 555 << 222).toList()));
 
     // Add some dialog buttons
 

diff --git a/src/plugins/organisation/PMRWorkspacesWindow/src/pmrworkspaceswindowsynchronizedialog.h b/src/plugins/organisation/PMRWorkspacesWindow/src/pmrworkspaceswindowsynchronizedialog.h
@@ -126,8 +126,8 @@ class PmrWorkspacesWindowSynchronizeDialog : public Core::Dialog
     QStandardItemModel *mModel;
     QSortFilterProxyModel *mProxyModel;
 
-    QTextEdit *mMessageValue;
     QListView *mChangesValue;
+    QTextEdit *mMessageValue;
 
     WebViewerWidget::WebViewerWidget *mWebViewer;
     QAction *mWebViewerCellmlTextFormatAction;