From 8a1914182f4779ee33d84244f7f26afb281919cd Mon Sep 17 00:00:00 2001 From: Manuel Dobusch Date: Wed, 16 Dec 2015 16:58:40 +0100 Subject: [PATCH] ui: disabled language selection Disabled language selection because parsing C code caused crashes. --- bin/test/data/log/test_log.txt | 22 +++------------- .../qt/window/QtProjectSetupScreen.cpp | 26 +++++++++---------- 2 files changed, 16 insertions(+), 32 deletions(-) diff --git a/bin/test/data/log/test_log.txt b/bin/test/data/log/test_log.txt index a6b23a8f..6fa47543 100644 --- a/bin/test/data/log/test_log.txt +++ b/bin/test/data/log/test_log.txt @@ -337,13 +337,8 @@ Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config. Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config. -CxxTypeNameResolver.cpp INFO: Unhandled kind of type encountered: Auto -CxxTypeNameResolver.cpp INFO: Unhandled kind of type encountered: Auto Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config. -CxxTypeNameResolver.cpp INFO: Unhandled kind of type encountered: Auto -CxxTypeNameResolver.cpp INFO: Unhandled kind of type encountered: Auto -CxxTypeNameResolver.cpp INFO: Unhandled kind of type encountered: Auto Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config. Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml @@ -358,19 +353,8 @@ Edge.cpp ERROR: Edge type_of can't go from Node undefined to Node undefined Edge.cpp ERROR: Nodes are not plain copies. Edge.cpp ERROR: Edge type_of can't go from Node undefined to Node undefined Edge.cpp ERROR: Edge type_of can't go from Node undefined to Node undefined -Edge.cpp ERROR: Edge child can't go from Node undefined to Node undefined -Edge.cpp ERROR: Edge child can't go from Node undefined to Node undefined -Edge.cpp ERROR: Edge child can't go from Node undefined to Node undefined -Edge.cpp ERROR: Edge child can't go from Node undefined to Node undefined -Edge.cpp ERROR: Edge child can't go from Node undefined to Node undefined -Edge.cpp ERROR: Edge child can't go from Node undefined to Node undefined -Edge.cpp ERROR: Edge child can't go from Node undefined to Node undefined -Edge.cpp ERROR: Edge child can't go from Node undefined to Node undefined Edge.cpp ERROR: Edge use can't go from Node undefined to Node undefined -Edge.cpp ERROR: Edge child can't go from Node undefined to Node undefined -Edge.cpp ERROR: Edge child can't go from Node undefined to Node undefined Edge.cpp ERROR: Edge use can't go from Node undefined to Node undefined -Edge.cpp ERROR: Edge child can't go from Node undefined to Node undefined Settings.cpp WARNING: File for Settings not found: data/SettingsTestSuite/wrong_settings.xml ConfigManager.cpp WARNING: value Bool is not present in config. ConfigManager.cpp WARNING: value Int is not present in config. @@ -440,9 +424,9 @@ Storage.cpp INFO: struct: StructB Storage.cpp INFO: inheritance: StructB : StructA Storage.cpp INFO: file: file.cpp < 0:0 0:0> TextAccess.cpp ERROR: Could not open file file.cpp -Storage.cpp INFO: method: A::isMethod(bool) -Storage.cpp INFO: method: B::isMethod(bool) -Storage.cpp INFO: override: A::isMethod(bool) -> B::isMethod(bool) +Storage.cpp INFO: method: A::isMethod +Storage.cpp INFO: method: B::isMethod +Storage.cpp INFO: override: A::isMethod -> B::isMethod Storage.cpp INFO: file: file.cpp < 0:0 0:0> TextAccess.cpp ERROR: Could not open file file.cpp Storage.cpp INFO: function: isTrue diff --git a/src/lib_gui/qt/window/QtProjectSetupScreen.cpp b/src/lib_gui/qt/window/QtProjectSetupScreen.cpp index 8bb5148e..7ee29463 100644 --- a/src/lib_gui/qt/window/QtProjectSetupScreen.cpp +++ b/src/lib_gui/qt/window/QtProjectSetupScreen.cpp @@ -116,10 +116,10 @@ void QtProjectSetupScreen::loadProjectSettings() { m_cppStandard->setCurrentText(QString::fromStdString(projSettings->getStandard())); } - else if (m_language->currentIndex() == 1) // c - { - m_cStandard->setCurrentText(QString::fromStdString(projSettings->getStandard())); - } + //else if (m_language->currentIndex() == 1) // c + //{ + // m_cStandard->setCurrentText(QString::fromStdString(projSettings->getStandard())); + //} } m_sourcePaths->setList(projSettings->getSourcePaths()); @@ -150,7 +150,7 @@ void QtProjectSetupScreen::populateForm(QFormLayout* layout) QLabel* languageLabel = new QLabel("Language"); m_language = new QComboBox(); m_language->insertItem(0, "C++"); - m_language->insertItem(1, "C"); + // m_language->insertItem(1, "C"); connect(m_language, SIGNAL(currentIndexChanged(int)), this, SLOT(handleSelectionChanged(int))); layout->addRow(languageLabel, m_language); @@ -167,7 +167,7 @@ void QtProjectSetupScreen::populateForm(QFormLayout* layout) layout->addRow(m_cppStandardLabel, m_cppStandard); - m_cStandardLabel = new QLabel("Standard"); + /*m_cStandardLabel = new QLabel("Standard"); m_cStandard = new QComboBox(); m_cStandard->insertItem(0, "89"); @@ -178,7 +178,7 @@ void QtProjectSetupScreen::populateForm(QFormLayout* layout) m_cStandard->insertItem(5, "1x"); layout->addRow(m_cStandardLabel, m_cStandard); m_cStandardLabel->hide(); - m_cStandard->hide(); + m_cStandard->hide();*/ QPushButton* helpButton; @@ -244,10 +244,10 @@ void QtProjectSetupScreen::handleUpdateButtonPress() { projSettings->setStandard(m_cppStandard->currentText().toStdString()); } - else if (m_cStandard->isVisible()) + /*else if (m_cStandard->isVisible()) { projSettings->setStandard(m_cStandard->currentText().toStdString()); - } + }*/ projSettings->setSourcePaths(m_sourcePaths->getList()); projSettings->setHeaderSearchPaths(m_includePaths->getList()); @@ -266,10 +266,10 @@ void QtProjectSetupScreen::handleUpdateButtonPress() { projSettings->setStandard(m_cppStandard->currentText().toStdString()); } - else if (m_cStandard->isVisible()) + /*else if (m_cStandard->isVisible()) { projSettings->setStandard(m_cStandard->currentText().toStdString()); - } + }*/ MessageLoadProject(projectFile).dispatch(); clear(); @@ -310,7 +310,7 @@ void QtProjectSetupScreen::handlePreferencesButtonPress() void QtProjectSetupScreen::handleSelectionChanged(int index) { - if (index != 0) + /*if (index != 0) { m_cStandardLabel->show(); m_cStandard->show(); @@ -323,5 +323,5 @@ void QtProjectSetupScreen::handleSelectionChanged(int index) m_cppStandard->show(); m_cStandardLabel->hide(); m_cStandard->hide(); - } + }*/ }