ui: Updated graph node and project type icons

This commit is contained in:
Eberhard Graether
2016-11-29 15:51:47 +01:00
parent d24e5b5bbd
commit c7886cfb3a
28 changed files with 14 additions and 13 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 827 B

After

Width:  |  Height:  |  Size: 909 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 646 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 693 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 588 B

After

Width:  |  Height:  |  Size: 478 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 803 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 475 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 811 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 886 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 699 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 816 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 953 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

+1 -4
View File
@@ -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 {
+4 -4
View File
@@ -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";
@@ -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);
}
@@ -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);
}
}
@@ -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);
+2 -2
View File
@@ -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
@@ -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);