diff --git a/bin/app/data/gui/graph_view/images/bundle.png b/bin/app/data/gui/graph_view/images/bundle.png index 7dad7bf4..eca6e3ce 100644 Binary files a/bin/app/data/gui/graph_view/images/bundle.png and b/bin/app/data/gui/graph_view/images/bundle.png differ diff --git a/bin/app/data/gui/graph_view/images/enum.png b/bin/app/data/gui/graph_view/images/enum.png new file mode 100644 index 00000000..c5ade5e0 Binary files /dev/null and b/bin/app/data/gui/graph_view/images/enum.png differ diff --git a/bin/app/data/gui/graph_view/images/enum_1.png b/bin/app/data/gui/graph_view/images/enum_1.png deleted file mode 100644 index e23ba3d5..00000000 Binary files a/bin/app/data/gui/graph_view/images/enum_1.png and /dev/null differ diff --git a/bin/app/data/gui/graph_view/images/enum_2.png b/bin/app/data/gui/graph_view/images/enum_2.png deleted file mode 100644 index 40751b74..00000000 Binary files a/bin/app/data/gui/graph_view/images/enum_2.png and /dev/null differ diff --git a/bin/app/data/gui/graph_view/images/file.png b/bin/app/data/gui/graph_view/images/file.png index 96ada559..5eb244dd 100644 Binary files a/bin/app/data/gui/graph_view/images/file.png and b/bin/app/data/gui/graph_view/images/file.png differ diff --git a/bin/app/data/gui/graph_view/images/macro.png b/bin/app/data/gui/graph_view/images/macro.png new file mode 100644 index 00000000..526d8ff9 Binary files /dev/null and b/bin/app/data/gui/graph_view/images/macro.png differ diff --git a/bin/app/data/gui/graph_view/images/macro_1.png b/bin/app/data/gui/graph_view/images/macro_1.png deleted file mode 100644 index dd956ed2..00000000 Binary files a/bin/app/data/gui/graph_view/images/macro_1.png and /dev/null differ diff --git a/bin/app/data/gui/graph_view/images/macro_2.png b/bin/app/data/gui/graph_view/images/macro_2.png deleted file mode 100644 index 6a29ac9d..00000000 Binary files a/bin/app/data/gui/graph_view/images/macro_2.png and /dev/null differ diff --git a/bin/app/data/gui/graph_view/images/macro_3.png b/bin/app/data/gui/graph_view/images/macro_3.png deleted file mode 100644 index 8544a179..00000000 Binary files a/bin/app/data/gui/graph_view/images/macro_3.png and /dev/null differ diff --git a/bin/app/data/gui/graph_view/images/typedef.png b/bin/app/data/gui/graph_view/images/typedef.png new file mode 100644 index 00000000..d7b84c94 Binary files /dev/null and b/bin/app/data/gui/graph_view/images/typedef.png differ diff --git a/bin/app/data/gui/graph_view/images/typedef_1.png b/bin/app/data/gui/graph_view/images/typedef_1.png deleted file mode 100644 index 5172eb4d..00000000 Binary files a/bin/app/data/gui/graph_view/images/typedef_1.png and /dev/null differ diff --git a/bin/app/data/gui/graph_view/images/typedef_2.png b/bin/app/data/gui/graph_view/images/typedef_2.png deleted file mode 100644 index fec468df..00000000 Binary files a/bin/app/data/gui/graph_view/images/typedef_2.png and /dev/null differ diff --git a/bin/app/data/gui/graph_view/images/typedef_3.png b/bin/app/data/gui/graph_view/images/typedef_3.png deleted file mode 100644 index 5362c845..00000000 Binary files a/bin/app/data/gui/graph_view/images/typedef_3.png and /dev/null differ diff --git a/bin/app/data/gui/icon/c_icon.png b/bin/app/data/gui/icon/c_icon.png index 6fb17e49..3bf19c8f 100644 Binary files a/bin/app/data/gui/icon/c_icon.png and b/bin/app/data/gui/icon/c_icon.png differ diff --git a/bin/app/data/gui/icon/cdb_icon.png b/bin/app/data/gui/icon/cdb_icon.png new file mode 100644 index 00000000..94c66be5 Binary files /dev/null and b/bin/app/data/gui/icon/cdb_icon.png differ diff --git a/bin/app/data/gui/icon/cpp_icon.png b/bin/app/data/gui/icon/cpp_icon.png index a5c40769..a08febf5 100644 Binary files a/bin/app/data/gui/icon/cpp_icon.png and b/bin/app/data/gui/icon/cpp_icon.png differ diff --git a/bin/app/data/gui/icon/empty_icon.png b/bin/app/data/gui/icon/empty_icon.png new file mode 100644 index 00000000..7b2eb50d Binary files /dev/null and b/bin/app/data/gui/icon/empty_icon.png differ diff --git a/bin/app/data/gui/icon/java_icon.png b/bin/app/data/gui/icon/java_icon.png index 8503e0ea..b1150f3e 100644 Binary files a/bin/app/data/gui/icon/java_icon.png and b/bin/app/data/gui/icon/java_icon.png differ diff --git a/bin/app/data/gui/icon/project_cdb_256_256.png b/bin/app/data/gui/icon/project_cdb_256_256.png deleted file mode 100644 index 123de25f..00000000 Binary files a/bin/app/data/gui/icon/project_cdb_256_256.png and /dev/null differ diff --git a/bin/app/data/gui/icon/project_vs_256_256.png b/bin/app/data/gui/icon/project_vs_256_256.png deleted file mode 100644 index 8ccc28fd..00000000 Binary files a/bin/app/data/gui/icon/project_vs_256_256.png and /dev/null differ diff --git a/bin/app/data/gui/icon/vs_icon.png b/bin/app/data/gui/icon/vs_icon.png new file mode 100644 index 00000000..be412ea3 Binary files /dev/null and b/bin/app/data/gui/icon/vs_icon.png differ diff --git a/bin/app/data/gui/startscreen/startscreen.css b/bin/app/data/gui/startscreen/startscreen.css index e7b15f7e..c491cf92 100644 --- a/bin/app/data/gui/startscreen/startscreen.css +++ b/bin/app/data/gui/startscreen/startscreen.css @@ -13,7 +13,7 @@ background: #2D3F85; } -#recentButton { +#recentButton, #recentButtonMissing { background: none; border: none; color: black; @@ -21,10 +21,7 @@ } #recentButtonMissing { - background: none; - border: none; color: grey; - font-size: 12px; } #recentButton:hover, #recentButtonMissing:hover { diff --git a/src/lib/component/view/GraphViewStyle.cpp b/src/lib/component/view/GraphViewStyle.cpp index 262c893c..70c35f6e 100644 --- a/src/lib/component/view/GraphViewStyle.cpp +++ b/src/lib/component/view/GraphViewStyle.cpp @@ -131,7 +131,7 @@ size_t GraphViewStyle::getFontSizeForNodeType(Node::NodeType type) { case Node::NODE_NAMESPACE: case Node::NODE_PACKAGE: - return s_fontSize - 2; + return s_fontSize - 3; case Node::NODE_UNDEFINED: case Node::NODE_TYPE: @@ -620,13 +620,13 @@ void GraphViewStyle::addIcon(Node::NodeType type, bool hasChildren, NodeStyle* s return; case Node::NODE_ENUM: - style->iconPath = ResourcePaths::getGuiPath() + "graph_view/images/enum_1.png"; + style->iconPath = ResourcePaths::getGuiPath() + "graph_view/images/enum.png"; break; case Node::NODE_TYPEDEF: - style->iconPath = ResourcePaths::getGuiPath() + "graph_view/images/typedef_2.png"; + style->iconPath = ResourcePaths::getGuiPath() + "graph_view/images/typedef.png"; break; case Node::NODE_MACRO: - style->iconPath = ResourcePaths::getGuiPath() + "graph_view/images/macro_3.png"; + style->iconPath = ResourcePaths::getGuiPath() + "graph_view/images/macro.png"; break; case Node::NODE_FILE: style->iconPath = ResourcePaths::getGuiPath() + "graph_view/images/file.png"; diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNode.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNode.cpp index 19f317ab..d538ba0b 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNode.cpp +++ b/src/lib_gui/qt/view/graphElements/QtGraphNode.cpp @@ -425,6 +425,8 @@ void QtGraphNode::setStyle(const GraphViewStyle::NodeStyle& style) pixmap.scaleToHeight(style.iconSize); m_icon = new QGraphicsPixmapItem(utility::colorizePixmap(pixmap.pixmap(), style.color.icon.c_str()), this); + m_icon->setTransformationMode(Qt::SmoothTransformation); + m_icon->setShapeMode(QGraphicsPixmapItem::BoundingRectShape); m_icon->setPos(style.iconOffset.x, style.iconOffset.y); } diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp index a4663dc5..86c8b7e1 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp @@ -52,6 +52,7 @@ QtGraphNodeAccess::QtGraphNodeAccess(AccessKind accessKind) m_accessIcon = new QGraphicsPixmapItem(pixmap.pixmap(), this); m_accessIcon->setTransformationMode(Qt::SmoothTransformation); + m_accessIcon->setShapeMode(QGraphicsPixmapItem::BoundingRectShape); } } diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp index b0634e11..26aefa53 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp @@ -24,6 +24,7 @@ QtGraphNodeExpandToggle::QtGraphNodeExpandToggle(bool expanded, int invisibleSub const int iconHeight = 4; m_icon = new QGraphicsPixmapItem(this); m_icon->setTransformationMode(Qt::SmoothTransformation); + m_icon->setShapeMode(QGraphicsPixmapItem::BoundingRectShape); QtDeviceScaledPixmap pixmap((ResourcePaths::getGuiPath() + "graph_view/images/arrow.png").c_str()); pixmap.scaleToHeight(iconHeight); diff --git a/src/lib_gui/qt/window/QtStartScreen.cpp b/src/lib_gui/qt/window/QtStartScreen.cpp index a36f835f..7c654da2 100644 --- a/src/lib_gui/qt/window/QtStartScreen.cpp +++ b/src/lib_gui/qt/window/QtStartScreen.cpp @@ -231,7 +231,7 @@ void QtStartScreen::setupStartScreen(bool unlocked) m_cppIcon = new QIcon((ResourcePaths::getGuiPath() + "icon/cpp_icon.png").c_str()); m_cIcon = new QIcon((ResourcePaths::getGuiPath() + "icon/c_icon.png").c_str()); m_javaIcon = new QIcon((ResourcePaths::getGuiPath() + "icon/java_icon.png").c_str()); - m_projectIcon = new QIcon((ResourcePaths::getGuiPath() + "icon/project_256_256.png").c_str()); + m_projectIcon = new QIcon((ResourcePaths::getGuiPath() + "icon/empty_icon.png").c_str()); for (int i = 0 ; i < ApplicationSettings::getInstance()->getMaxRecentProjectsCount() ; i++) @@ -239,7 +239,7 @@ void QtStartScreen::setupStartScreen(bool unlocked) QtRecentProjectButton* button = new QtRecentProjectButton(this); button->setAttribute(Qt::WA_LayoutUsesWidgetRect); // fixes layouting on Mac button->setIcon(*m_projectIcon); - button->setIconSize(QSize(25, 25)); + button->setIconSize(QSize(30, 30)); button->setMinimumSize(button->fontMetrics().width(button->text()) + 45, 40); button->setObjectName("recentButtonMissing"); button->minimumSizeHint(); // force font loading diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp index 931ae59f..329176bb 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp @@ -82,9 +82,9 @@ void QtProjectWizzardContentSelect::populate(QGridLayout* layout, int& row) QToolButton* a = createProjectButton( - "Empty Project", (ResourcePaths::getGuiPath() + "icon/project_256_256.png").c_str()); + "Empty Project", (ResourcePaths::getGuiPath() + "icon/empty_icon.png").c_str()); QToolButton* c = createProjectButton( - "from Compilation\nDatabase", (ResourcePaths::getGuiPath() + "icon/project_cdb_256_256.png").c_str()); + "from Compilation\nDatabase", (ResourcePaths::getGuiPath() + "icon/cdb_icon.png").c_str()); m_solutionDescription.push_back("Create a new Coati project by defining what files will be indexed."); m_solutionDescription.push_back( @@ -132,7 +132,7 @@ void QtProjectWizzardContentSelect::populate(QGridLayout* layout, int& row) std::string name = "Visual Studio"; QToolButton* button = createProjectButton(name.c_str(), - (ResourcePaths::getGuiPath() + "icon/project_vs_256_256.png").c_str()); + (ResourcePaths::getGuiPath() + "icon/vs_icon.png").c_str()); m_buttons->addButton(button);