diff --git a/bin/app/data/color_schemes/bad_rainbow.xml b/bin/app/data/color_schemes/bad_rainbow.xml index 58bdb04b..7ca361bd 100644 --- a/bin/app/data/color_schemes/bad_rainbow.xml +++ b/bin/app/data/color_schemes/bad_rainbow.xml @@ -315,9 +315,4 @@ - - - black - #E0E0E0 - diff --git a/bin/app/data/color_schemes/bright.xml b/bin/app/data/color_schemes/bright.xml index 16b3e59f..7830e192 100644 --- a/bin/app/data/color_schemes/bright.xml +++ b/bin/app/data/color_schemes/bright.xml @@ -299,9 +299,4 @@ - - - black - #E0E0E0 - diff --git a/bin/app/data/color_schemes/dark.xml b/bin/app/data/color_schemes/dark.xml index b1e52e8b..2bf30aa9 100644 --- a/bin/app/data/color_schemes/dark.xml +++ b/bin/app/data/color_schemes/dark.xml @@ -321,9 +321,4 @@ - - - black - #E0E0E0 - diff --git a/bin/app/data/gui/code_view/code_view.css b/bin/app/data/gui/code_view/code_view.css index afbfd254..8a98266e 100644 --- a/bin/app/data/gui/code_view/code_view.css +++ b/bin/app/data/gui/code_view/code_view.css @@ -132,7 +132,7 @@ } QToolTip { - background-color: ; - color: ; + background-color: #E0E0E0; + color: black; font-size: pt; } diff --git a/bin/app/data/gui/graph_view/graph_view.css b/bin/app/data/gui/graph_view/graph_view.css index 1ee653b5..79c2d608 100644 --- a/bin/app/data/gui/graph_view/graph_view.css +++ b/bin/app/data/gui/graph_view/graph_view.css @@ -3,7 +3,7 @@ QGraphicsView, QGraphicsScene { } QToolTip { - background-color: ; - color: ; + background-color: #E0E0E0; + color: black; font-size: pt; } diff --git a/bin/app/data/gui/refresh_view/refresh_view.css b/bin/app/data/gui/refresh_view/refresh_view.css index e2fc78d7..ac0fe029 100644 --- a/bin/app/data/gui/refresh_view/refresh_view.css +++ b/bin/app/data/gui/refresh_view/refresh_view.css @@ -29,7 +29,7 @@ QPushButton:pressed { } QToolTip { - background-color: ; - color: ; + background-color: #E0E0E0; + color: black; font-size: pt; } diff --git a/bin/app/data/gui/search_view/search_view.css b/bin/app/data/gui/search_view/search_view.css index 36f01e0d..fec963b7 100644 --- a/bin/app/data/gui/search_view/search_view.css +++ b/bin/app/data/gui/search_view/search_view.css @@ -59,7 +59,7 @@ QPushButton#search_button { } QToolTip { - background-color: ; - color: ; + background-color: #E0E0E0; + color: black; font-size: pt; } diff --git a/bin/app/data/gui/setting_window/window.css b/bin/app/data/gui/setting_window/window.css index 75c5bc12..f6e91bb9 100644 --- a/bin/app/data/gui/setting_window/window.css +++ b/bin/app/data/gui/setting_window/window.css @@ -75,3 +75,9 @@ QLineEdit:disabled { color: white; background: #2D3F85; } + +QToolTip { + background-color: #E0E0E0; + color: black; + font-size: pt; +} diff --git a/bin/app/data/gui/startscreen/startscreen.css b/bin/app/data/gui/startscreen/startscreen.css index 3be3e854..ceac74cd 100644 --- a/bin/app/data/gui/startscreen/startscreen.css +++ b/bin/app/data/gui/startscreen/startscreen.css @@ -27,9 +27,3 @@ font-size: 16pt; font-weight: bold; } - -QToolTip { - background-color: ; - color: ; - font-size: pt; -} diff --git a/bin/app/data/gui/undoredo_view/undoredo_view.css b/bin/app/data/gui/undoredo_view/undoredo_view.css index 4aa0d7c2..bb7b3c62 100644 --- a/bin/app/data/gui/undoredo_view/undoredo_view.css +++ b/bin/app/data/gui/undoredo_view/undoredo_view.css @@ -34,7 +34,7 @@ QPushButton:pressed { } QToolTip { - background-color: ; - color: ; + background-color: #E0E0E0; + color: black; font-size: pt; } diff --git a/src/lib/data/graph/Edge.cpp b/src/lib/data/graph/Edge.cpp index 688b0cd3..e1878a67 100644 --- a/src/lib/data/graph/Edge.cpp +++ b/src/lib/data/graph/Edge.cpp @@ -243,7 +243,7 @@ std::ostream& operator<<(std::ostream& ostream, const Edge& edge) bool Edge::checkType() const // TODO: remove this function { Node::NodeTypeMask complexTypeMask = Node::NODE_CLASS | Node::NODE_STRUCT | Node:: NODE_TEMPLATE_PARAMETER_TYPE; - Node::NodeTypeMask typeMask = Node::NODE_ENUM | Node::NODE_TYPEDEF | complexTypeMask; + Node::NodeTypeMask typeMask = Node::NODE_UNDEFINED | Node::NODE_TYPE | Node::NODE_ENUM | Node::NODE_TYPEDEF | complexTypeMask; Node::NodeTypeMask variableMask = Node::NODE_GLOBAL_VARIABLE | Node::NODE_FIELD; Node::NodeTypeMask functionMask = Node::NODE_FUNCTION | Node::NODE_METHOD; diff --git a/src/lib/settings/ColorScheme.cpp b/src/lib/settings/ColorScheme.cpp index a603ac24..fb867756 100644 --- a/src/lib/settings/ColorScheme.cpp +++ b/src/lib/settings/ColorScheme.cpp @@ -28,6 +28,8 @@ std::string ColorScheme::getNodeTypeColor(Node::NodeType type, const std::string std::string ColorScheme::getNodeTypeColor(const std::string& typeStr, const std::string& key, ColorState state) const { + disableWarnings(); + std::string type = getValue("graph/node/" + typeStr + "/like", typeStr); std::string color = getValue("graph/node/" + type + "/" + key + "/" + stateToString(state), ""); @@ -41,6 +43,8 @@ std::string ColorScheme::getNodeTypeColor(const std::string& typeStr, const std: color = getValue("graph/node/default/" + key + "/" + stateToString(state), ""); } + enableWarnings(); + if (!color.size() && state != NORMAL) { color = getValue("graph/node/default/" + key + "/" + stateToString(NORMAL), "#FFFFFF"); @@ -56,6 +60,8 @@ std::string ColorScheme::getEdgeTypeColor(Edge::EdgeType type, ColorState state) std::string ColorScheme::getEdgeTypeColor(const std::string& typeStr, ColorState state) const { + disableWarnings(); + std::string type = getValue("graph/edge/" + typeStr + "/like", typeStr); std::string color = getValue("graph/edge/" + type + "/" + stateToString(state), ""); @@ -69,6 +75,8 @@ std::string ColorScheme::getEdgeTypeColor(const std::string& typeStr, ColorState color = getValue("graph/edge/default/" + stateToString(state), ""); } + enableWarnings(); + if (!color.size() && state != NORMAL) { color = getValue("graph/edge/default/" + stateToString(NORMAL), "#FFFFFF"); diff --git a/src/lib/settings/ProjectSettings.cpp b/src/lib/settings/ProjectSettings.cpp index 1b02120f..ef68808a 100644 --- a/src/lib/settings/ProjectSettings.cpp +++ b/src/lib/settings/ProjectSettings.cpp @@ -14,6 +14,7 @@ std::vector ProjectSettings::getDefaultSourceExtensions() defaultValues.push_back(".cpp"); defaultValues.push_back(".cxx"); defaultValues.push_back(".cc"); + defaultValues.push_back(".c"); return defaultValues; } diff --git a/src/lib/settings/Settings.cpp b/src/lib/settings/Settings.cpp index 7b739fe0..9cddd882 100644 --- a/src/lib/settings/Settings.cpp +++ b/src/lib/settings/Settings.cpp @@ -136,3 +136,13 @@ bool Settings::moveRelativePathValues(const std::string& key, const FilePath& fi return setValues(key, values); } + +void Settings::enableWarnings() const +{ + m_config->setWarnOnEmptyKey(true); +} + +void Settings::disableWarnings() const +{ + m_config->setWarnOnEmptyKey(false); +} diff --git a/src/lib/settings/Settings.h b/src/lib/settings/Settings.h index c6216025..66ed1ecb 100644 --- a/src/lib/settings/Settings.h +++ b/src/lib/settings/Settings.h @@ -43,6 +43,9 @@ protected: bool setPathValues(const std::string& key, const std::vector& paths); bool moveRelativePathValues(const std::string& key, const FilePath& filePath); + void enableWarnings() const; + void disableWarnings() const; + private: FilePath m_filePath; std::shared_ptr m_config; diff --git a/src/lib/utility/ConfigManager.cpp b/src/lib/utility/ConfigManager.cpp index f157e68f..764d2a2a 100644 --- a/src/lib/utility/ConfigManager.cpp +++ b/src/lib/utility/ConfigManager.cpp @@ -34,7 +34,10 @@ bool ConfigManager::getValue(const std::string& key, std::string& value) const } else { - LOG_WARNING("value " + key + " is not present in config."); + if (m_warnOnEmptyKey) + { + LOG_WARNING("value " + key + " is not present in config."); + } return false; } } @@ -89,7 +92,10 @@ bool ConfigManager::getValues(const std::string& key, std::vector& } else { - LOG_WARNING("value " + key + " is not present in config."); + if (m_warnOnEmptyKey) + { + LOG_WARNING("value " + key + " is not present in config."); + } return false; } } @@ -236,6 +242,11 @@ void ConfigManager::save(const std::string filepath) createXmlDocument(true, filepath, output); } +void ConfigManager::setWarnOnEmptyKey(bool warnOnEmptyKey) const +{ + m_warnOnEmptyKey = warnOnEmptyKey; +} + ConfigManager::ConfigManager() { } diff --git a/src/lib/utility/ConfigManager.h b/src/lib/utility/ConfigManager.h index 0aeed0fc..c6922130 100644 --- a/src/lib/utility/ConfigManager.h +++ b/src/lib/utility/ConfigManager.h @@ -41,6 +41,8 @@ public: void save(const std::string filepath); std::string toString(); + void setWarnOnEmptyKey(bool warnOnEmptyKey) const; + private: ConfigManager(); ConfigManager(const ConfigManager&); @@ -50,6 +52,7 @@ private: bool createXmlDocument(bool saveAsFile, std::string filepath, std::string& output); std::multimap m_values; + mutable bool m_warnOnEmptyKey; }; #endif // CONFIG_MANAGER_H diff --git a/src/lib_gui/qt/window/QtProjectSetupScreen.cpp b/src/lib_gui/qt/window/QtProjectSetupScreen.cpp index 52995ad3..8bb5148e 100644 --- a/src/lib_gui/qt/window/QtProjectSetupScreen.cpp +++ b/src/lib_gui/qt/window/QtProjectSetupScreen.cpp @@ -182,7 +182,7 @@ void QtProjectSetupScreen::populateForm(QFormLayout* layout) QPushButton* helpButton; - QWidget* sourcePathsWidget = createLabelWithHelpButton("Source Paths", &helpButton); + QWidget* sourcePathsWidget = createLabelWithHelpButton("Analyzed Paths", &helpButton); connect(helpButton, SIGNAL(clicked()), this, SLOT(handleSourcePathHelpPress())); m_sourcePaths = new QtDirectoryListBox(this); m_sourcePaths->setMinimumWidth(minimumWidthForSecondCol); @@ -261,7 +261,7 @@ void QtProjectSetupScreen::handleUpdateButtonPress() projSettings->save(projectFile); projSettings->setLanguage(m_language->currentText().toStdString()); - + if (m_cppStandard->isVisible()) { projSettings->setStandard(m_cppStandard->currentText().toStdString()); @@ -280,8 +280,8 @@ void QtProjectSetupScreen::handleUpdateButtonPress() void QtProjectSetupScreen::handleSourcePathHelpPress() { showHelpMessage( - "Source Paths define the files and directories that will be analysed by Coati. Usually these are the source " - "files of your project or a subset of them." + "Analyzed Paths define the source files and directories that will be analysed by Coati. Usually these are the source " + "and header files of your project or a subset of them." ); } @@ -307,7 +307,7 @@ void QtProjectSetupScreen::handlePreferencesButtonPress() { emit showPreferences(); } - + void QtProjectSetupScreen::handleSelectionChanged(int index) { if (index != 0)