summarylogtreecommitdiffstats
path: root/sem.patch
diff options
context:
space:
mode:
Diffstat (limited to 'sem.patch')
-rw-r--r--sem.patch24
1 files changed, 4 insertions, 20 deletions
diff --git a/sem.patch b/sem.patch
index 531c50c5036e..a87a80338a8b 100644
--- a/sem.patch
+++ b/sem.patch
@@ -1,8 +1,8 @@
diff --git a/JASP-Desktop/mainwindow.cpp b/JASP-Desktop/mainwindow.cpp
-index 80cd705..d8ccc6c 100644
+index 147ee34..fdd4e08 100644
--- a/JASP-Desktop/mainwindow.cpp
+++ b/JASP-Desktop/mainwindow.cpp
-@@ -87,9 +87,7 @@ MainWindow::MainWindow(QWidget *parent) :
+@@ -91,9 +91,7 @@ MainWindow::MainWindow(QWidget *parent) :
ui->tabBar->setFocusPolicy(Qt::NoFocus);
ui->tabBar->addTab("File");
ui->tabBar->addTab("Common");
@@ -12,28 +12,12 @@ index 80cd705..d8ccc6c 100644
ui->tabBar->addHelpTab();
connect(ui->tabBar, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
-@@ -543,7 +541,6 @@ void MainWindow::tabChanged(int index)
- {
- ui->topLevelWidgets->setCurrentIndex(0);
- }
--#ifndef __linux__
- else if (index == ui->tabBar->count() - 1)
- {
- if (_optionsForm == NULL)
-@@ -555,7 +552,6 @@ void MainWindow::tabChanged(int index)
-
- ui->topLevelWidgets->setCurrentWidget(_optionsForm);
- }
--#endif
- else
- {
- ui->topLevelWidgets->setCurrentIndex(1);
-@@ -789,15 +785,12 @@ void MainWindow::updateMenuEnabledDisabledStatus()
+@@ -918,15 +916,11 @@ void MainWindow::updateMenuEnabledDisabledStatus()
void MainWindow::updateUIFromOptions()
{
-#ifdef __linux__
- ui->tabBar->removeTab("SEM");
+- ui->tabBar->removeTab("SEM");
-#else
QVariant sem = _settings.value("plugins/sem", false);
if (sem.canConvert(QVariant::Bool) && sem.toBool())