Final changes for release

dboun · May 16, 2019 · 15873d9 · 15873d9
1 parent 49cf504
commit 15873d9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -222,7 +222,7 @@
      <x>0</x>
      <y>0</y>
      <width>986</width>
-     <height>26</height>
+     <height>17</height>
     </rect>
    </property>
    <property name="styleSheet">
@@ -248,15 +248,15 @@
     </property>
     <addaction name="actionToggle_fullscreen"/>
    </widget>
-   <widget class="QMenu" name="menuAbout">
+   <widget class="QMenu" name="menuHelp">
     <property name="title">
      <string>Help</string>
     </property>
     <addaction name="actionAbout"/>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menuView"/>
-   <addaction name="menuAbout"/>
+   <addaction name="menuHelp"/>
   </widget>
   <action name="actionOpen_Dicom">
    <property name="text">