diff --git a/resources/resources.qrc b/resources/resources.qrc index 603c7658..a9877b07 100644 --- a/resources/resources.qrc +++ b/resources/resources.qrc @@ -7,6 +7,8 @@ font_awesome.otf noggit_font.ttf + OpenSans-Regular.ttf + OpenSans-SemiBold.ttf ../media/noggit_icon.png diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/LoadImageNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/LoadImageNode.cpp index 48ce2c20..2134ef1a 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/LoadImageNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/LoadImageNode.cpp @@ -13,8 +13,8 @@ using namespace noggit::Red::NodeEditor::Nodes; LoadImageNode::LoadImageNode() : LogicNodeBase() { - setName("Load :: Image"); - setCaption("Load :: Image"); + setName("Image :: Load"); + setCaption("Image :: Load"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Logic", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector2DToXYNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector2DToXYNode.cpp index 09847102..6194189e 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector2DToXYNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector2DToXYNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; Vector2DToXYNode::Vector2DToXYNode() : BaseNode() { - setName("Vector :: 2DToXY"); - setCaption("Vector :: 2DToXY"); + setName("Vector :: Vector2DToXY"); + setCaption("Vector :: Vector2DToXY"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Vector2D", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector3DToXYZNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector3DToXYZNode.cpp index e299c639..f696cd0e 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector3DToXYZNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector3DToXYZNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; Vector3DToXYZNode::Vector3DToXYZNode() : BaseNode() { - setName("Vector :: 3DToXYZ"); - setCaption("Vector :: 3DToXYZ"); + setName("Vector :: Vector3DToXYZ"); + setCaption("Vector :: Vector3DToXYZ"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Vector3D", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector4DToXYZWNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector4DToXYZWNode.cpp index a710bbc7..9101e0d1 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector4DToXYZWNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector4DToXYZWNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; Vector4DToXYZWNode::Vector4DToXYZWNode() : BaseNode() { - setName("Vector :: 4DToXYZW"); - setCaption("Vector :: 4DToXYZW"); + setName("Vector :: Vector4DToXYZW"); + setCaption("Vector :: Vector4DToXYZW"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Vector4D", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/RewiringPointNode.cpp b/src/noggit/Red/NodeEditor/Nodes/RewiringPointNode.cpp index 8dba9e19..60294679 100644 --- a/src/noggit/Red/NodeEditor/Nodes/RewiringPointNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/RewiringPointNode.cpp @@ -13,7 +13,7 @@ using QtNodes::Node; RewiringPointNode::RewiringPointNode() : BaseNode() { - setName("RewiringPointNode"); + setName("RewiringPoint"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "", false); @@ -92,4 +92,3 @@ void RewiringPointNode::restore(const QJsonObject& json_obj) _in_ports[0].data_type.reset(TypeFactory::create(type_id)); _in_ports[0].data_type->set_parameter_type(param_type_id); } -