diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 10 |
2 files changed, 2 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 24603599..85ba23f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,9 +3,6 @@ cmake_minimum_required(VERSION 3.16) # TODO: clean include directives set(MO2_CMAKE_DEPRECATED_UIBASE_INCLUDE ON) -# Remove tutorials until Qt is fixed -set(MO2_SKIP_TUTORIALS_INSTALL ON) - project(organizer) # if MO2_INSTALL_IS_BIN is set, this means that we should install directly into the diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 6a662173..75ff30e8 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -481,8 +481,8 @@ MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore, m_StartTime = QTime::currentTime(); - // m_Tutorial.expose("modList", m_OrganizerCore.modList()); - // m_Tutorial.expose("espList", m_OrganizerCore.pluginList()); + m_Tutorial.expose("modList", m_OrganizerCore.modList()); + m_Tutorial.expose("espList", m_OrganizerCore.pluginList()); m_OrganizerCore.setUserInterface(this); m_OrganizerCore.onFinishedRun([=](const QString, unsigned int) { @@ -1116,7 +1116,6 @@ void MainWindow::createHelpMenu() connect(issueAction, SIGNAL(triggered()), this, SLOT(issueTriggered())); menu->addAction(issueAction); - /* Disable tutorials QMenu* tutorialMenu = new QMenu(tr("Tutorials"), menu); typedef std::vector<std::pair<int, QAction*>> ActionList; @@ -1159,7 +1158,6 @@ void MainWindow::createHelpMenu() } menu->addMenu(tutorialMenu); - */ menu->addAction(tr("About"), this, SLOT(about())); menu->addAction(tr("About Qt"), qApp, SLOT(aboutQt())); } @@ -1251,13 +1249,10 @@ void MainWindow::showEvent(QShowEvent* event) connect(this, SIGNAL(styleChanged(QString)), this, SLOT(updateStyle(QString))); // only the first time the window becomes visible - /* Disabling tutorials m_Tutorial.registerControl(); hookUpWindowTutorials(); - */ if (m_OrganizerCore.settings().firstStart()) { - /* Disabling tutorials QString firstStepsTutorial = ToQString(AppConfig::firstStepsTutorial()); if (TutorialManager::instance().hasTutorial(firstStepsTutorial)) { if (shouldStartTutorial()) { @@ -1273,7 +1268,6 @@ void MainWindow::showEvent(QShowEvent* event) QObject::tr("Please use \"Help\" from the toolbar to get " "usage instructions to all elements")); } - */ if (!m_OrganizerCore.managedGame()->getSupportURL().isEmpty()) { QMessageBox::information(this, tr("Game Support Wiki"), tr("Do you know how to mod this game? Do you need to " |