From 15873d90b864030205fb88ad35e3231c9fa1a99e Mon Sep 17 00:00:00 2001 From: Dimitris Bounias Date: Thu, 16 May 2019 04:56:44 +0300 Subject: [PATCH] Final changes for release --- core/base/gui/DataTreeView.cpp | 2 +- core/modules/gui/MitkImageViewer/MitkImageViewer.cpp | 2 +- scripts/MLL_NSIS_SCRIPT.nsi | 6 +++--- src/mainwindow.cpp | 3 +++ src/mainwindow.ui | 6 +++--- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/core/base/gui/DataTreeView.cpp b/core/base/gui/DataTreeView.cpp index dac9e68..9e0ab12 100644 --- a/core/base/gui/DataTreeView.cpp +++ b/core/base/gui/DataTreeView.cpp @@ -146,7 +146,7 @@ void DataTreeView::SubjectAddedHandler(long uid) // Setup a layout for everything QHBoxLayout* hLayout = new QHBoxLayout(); - hLayout->setContentsMargins(7,9,7,9); + hLayout->setContentsMargins(7,9,14,9); hLayout->setSpacing(15); hLayout->addWidget(subjectNameLabel, Qt::AlignLeft); hLayout->addWidget(progressBarAndText, Qt::AlignRight); diff --git a/core/modules/gui/MitkImageViewer/MitkImageViewer.cpp b/core/modules/gui/MitkImageViewer/MitkImageViewer.cpp index 27427c6..c66d78d 100644 --- a/core/modules/gui/MitkImageViewer/MitkImageViewer.cpp +++ b/core/modules/gui/MitkImageViewer/MitkImageViewer.cpp @@ -47,7 +47,7 @@ MitkImageViewer::MitkImageViewer(QWidget *parent) : ImageViewerBase(parent), m_MitkWidget->SetWidgetPlanesVisibility(true); //logo - QFileInfo fileInfo(qApp->applicationDirPath() + "/../../../src/resources/cbica-logo.jpg"); + QFileInfo fileInfo(qApp->applicationDirPath() + "/cbica-logo.jpg"); std::string logoPath = fileInfo.absoluteFilePath().toStdString(); if (fileInfo.exists() && fileInfo.isReadable()) { diff --git a/scripts/MLL_NSIS_SCRIPT.nsi b/scripts/MLL_NSIS_SCRIPT.nsi index 84b2d80..1750a29 100644 --- a/scripts/MLL_NSIS_SCRIPT.nsi +++ b/scripts/MLL_NSIS_SCRIPT.nsi @@ -1,11 +1,11 @@ ; The name of the installer -Name "MLL_v0.3_installer" +Name "MLL_v0.7_installer" ; The file to write -OutFile "MLL_v0.3_installer.exe" +OutFile "MLL_v0.7_installer.exe" ; The default installation directory -InstallDir "C:\MLL\0.3.0" +InstallDir "C:\MLL\v0.7" ; Registry key to check for directory (so if you install again, it will ; overwrite the old one automatically) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index fbf6e00..93573a6 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -196,6 +196,9 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->actionToggle_fullscreen, SIGNAL(triggered()), this, SLOT(OnToggleFullscreen()) ); + + // Temporarily turn off Help in menu + delete ui->menuHelp; } MainWindow::~MainWindow() diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 809ad97..6855f3f 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -222,7 +222,7 @@ 0 0 986 - 26 + 17 @@ -248,7 +248,7 @@ - + Help @@ -256,7 +256,7 @@ - +