diff --git a/bin/app/data/gui/window/window.css b/bin/app/data/gui/window/window.css index ce9a5056..26235a4b 100644 --- a/bin/app/data/gui/window/window.css +++ b/bin/app/data/gui/window/window.css @@ -112,7 +112,6 @@ border-top-right-radius: 0px; font-size: 15pt; margin-right: 0px; - margin-bottom: 7px; height: 25px; width: 90px; } diff --git a/src/lib/utility/solution/ISolutionParser.h b/src/lib/utility/solution/ISolutionParser.h index 6475a1fa..2e056e49 100644 --- a/src/lib/utility/solution/ISolutionParser.h +++ b/src/lib/utility/solution/ISolutionParser.h @@ -31,6 +31,7 @@ public: virtual ProjectSettings getProjectSettings(const std::string& solutionFilePath) = 0; virtual std::string getIdeName() const = 0; + virtual std::string getButtonText() const = 0; virtual std::string getDescription() const = 0; virtual std::string getIconPath() const = 0; virtual std::string getFileExtension() const = 0; diff --git a/src/lib/utility/solution/SolutionParserCodeBlocks.cpp b/src/lib/utility/solution/SolutionParserCodeBlocks.cpp index 8b9eba0a..feddc344 100644 --- a/src/lib/utility/solution/SolutionParserCodeBlocks.cpp +++ b/src/lib/utility/solution/SolutionParserCodeBlocks.cpp @@ -208,6 +208,11 @@ std::string SolutionParserCodeBlocks::getIdeName() const return "Code Blocks"; } +std::string SolutionParserCodeBlocks::getButtonText() const +{ + return "from Code\nBlocks Project"; +} + std::string SolutionParserCodeBlocks::getDescription() const { return "idunno"; diff --git a/src/lib/utility/solution/SolutionParserCodeBlocks.h b/src/lib/utility/solution/SolutionParserCodeBlocks.h index c60b5336..2df10afa 100644 --- a/src/lib/utility/solution/SolutionParserCodeBlocks.h +++ b/src/lib/utility/solution/SolutionParserCodeBlocks.h @@ -24,6 +24,7 @@ public: virtual ProjectSettings getProjectSettings(const std::string& solutionFilePath); virtual std::string getIdeName() const; + virtual std::string getButtonText() const; virtual std::string getDescription() const; virtual std::string getIconPath() const; virtual std::string getFileExtension() const; diff --git a/src/lib/utility/solution/SolutionParserManager.cpp b/src/lib/utility/solution/SolutionParserManager.cpp index fbd13429..94062a9e 100644 --- a/src/lib/utility/solution/SolutionParserManager.cpp +++ b/src/lib/utility/solution/SolutionParserManager.cpp @@ -77,6 +77,18 @@ std::string SolutionParserManager::getParserName(const unsigned int idx) const return ""; } +std::string SolutionParserManager::getParserButtonText(const unsigned int idx) const +{ + if (checkIndex(idx)) + { + return m_solutionParsers[idx]->getButtonText(); + } + + LOG_WARNING_STREAM(<< "Index is out of range, was " << idx << ". Max is " << m_solutionParsers.size() - 1); + + return ""; +} + std::string SolutionParserManager::getParserDescription(const unsigned int idx) const { if (checkIndex(idx)) diff --git a/src/lib/utility/solution/SolutionParserManager.h b/src/lib/utility/solution/SolutionParserManager.h index 6e99e6da..73313c96 100644 --- a/src/lib/utility/solution/SolutionParserManager.h +++ b/src/lib/utility/solution/SolutionParserManager.h @@ -20,6 +20,7 @@ public: unsigned int getParserCount() const; std::string getParserName(const unsigned int idx) const; + std::string getParserButtonText(const unsigned int idx) const; std::string getParserDescription(const unsigned int idx) const; std::string getParserFileEnding(const unsigned int idx) const; std::string getParserIdeId(const unsigned int idx) const; diff --git a/src/lib/utility/solution/SolutionParserVisualStudio.cpp b/src/lib/utility/solution/SolutionParserVisualStudio.cpp index 043769e0..de0ac92b 100644 --- a/src/lib/utility/solution/SolutionParserVisualStudio.cpp +++ b/src/lib/utility/solution/SolutionParserVisualStudio.cpp @@ -204,6 +204,11 @@ std::string SolutionParserVisualStudio::getIdeName() const return "Visual Studio"; } +std::string SolutionParserVisualStudio::getButtonText() const +{ + return "from Visual\nStudio Solution"; +} + std::string SolutionParserVisualStudio::getDescription() const { return "Create a new project from an existing Visual Studio Solution file."; @@ -462,7 +467,7 @@ std::vector SolutionParserVisualStudio::getProjectBlocks(const std: blockStart = subSolution.find(solutionOpenTag); blockEnd = subSolution.find(solutionCloseTag); - + blocks.push_back(block); } @@ -490,7 +495,7 @@ std::string SolutionParserVisualStudio::getProjectFilePath(const std::string& pr std::vector SolutionParserVisualStudio::seperateIncludePaths(const std::vector& includePaths) const { std::vector seperatedPaths; - + for (unsigned int i = 0; i < includePaths.size(); i++) { std::vector paths = seperateIncludePaths(includePaths[i]); diff --git a/src/lib/utility/solution/SolutionParserVisualStudio.h b/src/lib/utility/solution/SolutionParserVisualStudio.h index d01d5da6..d87c7285 100644 --- a/src/lib/utility/solution/SolutionParserVisualStudio.h +++ b/src/lib/utility/solution/SolutionParserVisualStudio.h @@ -24,6 +24,7 @@ public: virtual ProjectSettings getProjectSettings(const std::string& solutionFilePath); virtual std::string getIdeName() const; + virtual std::string getButtonText() const; virtual std::string getDescription() const; virtual std::string getIconPath() const; virtual std::string getFileExtension() const; diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp index a421204f..5996e986 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp @@ -21,7 +21,7 @@ #include "utility/messaging/type/MessageLoadProject.h" #include "utility/solution/SolutionParserVisualStudio.h" -#include "utility/solution/SolutionParserCodeBlocks.h" +// #include "utility/solution/SolutionParserCodeBlocks.h" #include "utility/messaging/type/MessageStatus.h" @@ -38,7 +38,7 @@ QtProjectWizzard::QtProjectWizzard(QWidget* parent) // wip m_parserManager->pushSolutionParser(std::make_shared()); - m_parserManager->pushSolutionParser(std::make_shared()); + // m_parserManager->pushSolutionParser(std::make_shared()); } void QtProjectWizzard::showWindow() diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp index 5cbfe636..609b310a 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp @@ -100,7 +100,7 @@ void QtProjectWizzardContentSelect::populateWindow(QGridLayout* layout) { for (unsigned int i = 0; i < manager->getParserCount(); i++) { - std::string name = manager->getParserName(i); + std::string name = manager->getParserButtonText(i); QToolButton* button = createProjectButton(name.c_str(), (ResourcePaths::getGuiPath() + "icon/project_vs_256_256.png").c_str()); @@ -142,7 +142,7 @@ void QtProjectWizzardContentSelect::populateWindow(QGridLayout* layout) } ); - + QFrame* container = new QFrame(); container->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);