Skip to content

Commit 8ea0820

Browse files
kovacsvkovacsv
committed
Constants for resource images.
1 parent 5de37ce commit 8ea0820

3 files changed

Lines changed: 58 additions & 38 deletions

File tree

‎Sources/WindowsEmbeddingDemo/main.cpp‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
#include "BI_BuiltInNodes.hpp"
1111
#include "NUIE_Localization.hpp"
1212

13-
#include <windows.h>
14-
#include <windowsx.h>
15-
1613
#include "WAS_Direct2DContext.hpp"
1714
#include "WAS_Direct2DOffscreenContext.hpp"
1815

16+
#include <windows.h>
17+
#include <windowsx.h>
18+
#include "resources.hpp"
19+
1920
#pragma comment (lib, "windowscodecs.lib")
2021
#pragma comment (lib, "d2d1.lib")
2122
#pragma comment (lib, "dwrite.lib")
@@ -115,60 +116,60 @@ class AppUIEnvironment : public NUIE::NodeUIEnvironment
115116
NUIE::NodeTree nodeTree;
116117

117118
size_t inputNodes = nodeTree.AddGroup (L"Input Nodes");
118-
AddNodeTreeItem (nodeTree, inputNodes, L"Boolean", NUIE::IconId (101), [&] (const NUIE::Point& position) {
119+
AddNodeTreeItem (nodeTree, inputNodes, L"Boolean", NUIE::IconId (BOOLEAN_ICON), [&] (const NUIE::Point& position) {
119120
return NUIE::UINodePtr (new BI::BooleanNode (NE::LocString (L"Boolean"), position, true));
120121
});
121-
AddNodeTreeItem (nodeTree, inputNodes, L"Integer", NUIE::IconId (102), [&] (const NUIE::Point& position) {
122+
AddNodeTreeItem (nodeTree, inputNodes, L"Integer", NUIE::IconId (INTEGER_ICON), [&] (const NUIE::Point& position) {
122123
return NUIE::UINodePtr (new BI::IntegerUpDownNode (NE::LocString (L"Integer"), position, 0, 5));
123124
});
124-
AddNodeTreeItem (nodeTree, inputNodes, L"Number", NUIE::IconId (103), [&] (const NUIE::Point& position) {
125+
AddNodeTreeItem (nodeTree, inputNodes, L"Number", NUIE::IconId (DOUBLE_ICON), [&] (const NUIE::Point& position) {
125126
return NUIE::UINodePtr (new BI::DoubleUpDownNode (NE::LocString (L"Number"), position, 0.0, 5.0));
126127
});
127-
AddNodeTreeItem (nodeTree, inputNodes, L"Integer Increment", NUIE::IconId (104), [&] (const NUIE::Point& position) {
128+
AddNodeTreeItem (nodeTree, inputNodes, L"Integer Increment", NUIE::IconId (INTEGERINCREMENTED_ICON), [&] (const NUIE::Point& position) {
128129
return NUIE::UINodePtr (new BI::IntegerIncrementedNode (NE::LocString (L"Integer Increment"), position));
129130
});
130-
AddNodeTreeItem (nodeTree, inputNodes, L"Number Increment", NUIE::IconId (105), [&] (const NUIE::Point& position) {
131+
AddNodeTreeItem (nodeTree, inputNodes, L"Number Increment", NUIE::IconId (DOUBLEINCREMENTED_ICON), [&] (const NUIE::Point& position) {
131132
return NUIE::UINodePtr (new BI::DoubleIncrementedNode (NE::LocString (L"Number Increment"), position));
132133
});
133-
AddNodeTreeItem (nodeTree, inputNodes, L"Number Distribution", NUIE::IconId (106), [&] (const NUIE::Point& position) {
134+
AddNodeTreeItem (nodeTree, inputNodes, L"Number Distribution", NUIE::IconId (DOUBLEDISTRIBUTED_ICON), [&] (const NUIE::Point& position) {
134135
return NUIE::UINodePtr (new BI::DoubleDistributedNode (NE::LocString (L"Number Distribution"), position));
135136
});
136137
size_t mathematicalNodes = nodeTree.AddGroup (L"Mathematical Nodes");
137-
AddNodeTreeItem (nodeTree, mathematicalNodes, L"Addition", NUIE::IconId (107), [&] (const NUIE::Point& position) {
138+
AddNodeTreeItem (nodeTree, mathematicalNodes, L"Addition", NUIE::IconId (ADDITION_ICON), [&] (const NUIE::Point& position) {
138139
return NUIE::UINodePtr (new BI::AdditionNode (NE::LocString (L"Addition"), position));
139140
});
140-
AddNodeTreeItem (nodeTree, mathematicalNodes, L"Subtraction", NUIE::IconId (108), [&] (const NUIE::Point& position) {
141+
AddNodeTreeItem (nodeTree, mathematicalNodes, L"Subtraction", NUIE::IconId (SUBTRACTION_ICON), [&] (const NUIE::Point& position) {
141142
return NUIE::UINodePtr (new BI::SubtractionNode (NE::LocString (L"Subtraction"), position));
142143
});
143-
AddNodeTreeItem (nodeTree, mathematicalNodes, L"Multiplication", NUIE::IconId (109), [&] (const NUIE::Point& position) {
144+
AddNodeTreeItem (nodeTree, mathematicalNodes, L"Multiplication", NUIE::IconId (MULTIPLICATION_ICON), [&] (const NUIE::Point& position) {
144145
return NUIE::UINodePtr (new BI::MultiplicationNode (NE::LocString (L"Multiplication"), position));
145146
});
146-
AddNodeTreeItem (nodeTree, mathematicalNodes, L"Division", NUIE::IconId (110), [&] (const NUIE::Point& position) {
147+
AddNodeTreeItem (nodeTree, mathematicalNodes, L"Division", NUIE::IconId (DIVISION_ICON), [&] (const NUIE::Point& position) {
147148
return NUIE::UINodePtr (new BI::DivisionNode (NE::LocString (L"Division"), position));
148149
});
149-
AddNodeTreeItem (nodeTree, mathematicalNodes, L"Floor", NUIE::IconId (113), [&] (const NUIE::Point& position) {
150+
AddNodeTreeItem (nodeTree, mathematicalNodes, L"Floor", NUIE::IconId (FLOOR_ICON), [&] (const NUIE::Point& position) {
150151
return NUIE::UINodePtr (new BI::FloorNode (NE::LocString (L"Floor"), position));
151152
});
152-
AddNodeTreeItem (nodeTree, mathematicalNodes, L"Ceil", NUIE::IconId (114), [&] (const NUIE::Point& position) {
153+
AddNodeTreeItem (nodeTree, mathematicalNodes, L"Ceil", NUIE::IconId (CEIL_ICON), [&] (const NUIE::Point& position) {
153154
return NUIE::UINodePtr (new BI::CeilNode (NE::LocString (L"Ceil"), position));
154155
});
155-
AddNodeTreeItem (nodeTree, mathematicalNodes, L"Abs", NUIE::IconId (115), [&] (const NUIE::Point& position) {
156+
AddNodeTreeItem (nodeTree, mathematicalNodes, L"Abs", NUIE::IconId (ABS_ICON), [&] (const NUIE::Point& position) {
156157
return NUIE::UINodePtr (new BI::AbsNode (NE::LocString (L"Abs"), position));
157158
});
158-
AddNodeTreeItem (nodeTree, mathematicalNodes, L"Negative", NUIE::IconId (116), [&] (const NUIE::Point& position) {
159+
AddNodeTreeItem (nodeTree, mathematicalNodes, L"Negative", NUIE::IconId (NEGATIVE_ICON), [&] (const NUIE::Point& position) {
159160
return NUIE::UINodePtr (new BI::NegativeNode (NE::LocString (L"Negative"), position));
160161
});
161-
AddNodeTreeItem (nodeTree, mathematicalNodes, L"Sqrt", NUIE::IconId (117), [&] (const NUIE::Point& position) {
162+
AddNodeTreeItem (nodeTree, mathematicalNodes, L"Sqrt", NUIE::IconId (SQRT_ICON), [&] (const NUIE::Point& position) {
162163
return NUIE::UINodePtr (new BI::SqrtNode (NE::LocString (L"Sqrt"), position));
163164
});
164165
size_t otherNodes = nodeTree.AddGroup (L"Other Nodes");
165-
AddNodeTreeItem (nodeTree, otherNodes, L"List Builder", NUIE::IconId (111), [&] (const NUIE::Point& position) {
166+
AddNodeTreeItem (nodeTree, otherNodes, L"List Builder", NUIE::IconId (LISTBUILDER_ICON), [&] (const NUIE::Point& position) {
166167
return NUIE::UINodePtr (new BI::ListBuilderNode (NE::LocString (L"List Builder"), position));
167168
});
168-
AddNodeTreeItem (nodeTree, otherNodes, L"Multiline Viewer", NUIE::IconId (112), [&] (const NUIE::Point& position) {
169+
AddNodeTreeItem (nodeTree, otherNodes, L"Multiline Viewer", NUIE::IconId (VIEWER_ICON), [&] (const NUIE::Point& position) {
169170
return NUIE::UINodePtr (new BI::MultiLineViewerNode (NE::LocString (L"Multiline Viewer"), position, 5));
170171
});
171-
AddNodeTreeItem (nodeTree, otherNodes, L"Viewer", NUIE::IconId (112), [&] (const NUIE::Point& position) {
172+
AddNodeTreeItem (nodeTree, otherNodes, L"Viewer", NUIE::IconId (VIEWER_ICON), [&] (const NUIE::Point& position) {
172173
return NUIE::UINodePtr (new BI::ViewerNode (NE::LocString (L"Viewer"), position));
173174
});
174175

‎Sources/WindowsEmbeddingDemo/resources.hpp‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#define BOOLEAN_ICON 101
2+
#define INTEGER_ICON 102
3+
#define DOUBLE_ICON 103
4+
#define INTEGERINCREMENTED_ICON 104
5+
#define DOUBLEINCREMENTED_ICON 105
6+
#define DOUBLEDISTRIBUTED_ICON 106
7+
#define ADDITION_ICON 107
8+
#define SUBTRACTION_ICON 108
9+
#define MULTIPLICATION_ICON 109
10+
#define DIVISION_ICON 110
11+
#define LISTBUILDER_ICON 111
12+
#define VIEWER_ICON 112
13+
#define FLOOR_ICON 113
14+
#define CEIL_ICON 114
15+
#define ABS_ICON 115
16+
#define NEGATIVE_ICON 116
17+
#define SQRT_ICON 117

‎Sources/WindowsEmbeddingDemo/resources.rc‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
101 IMAGE "icons/Boolean.png"
2-
102 IMAGE "icons/Integer.png"
3-
103 IMAGE "icons/Double.png"
4-
104 IMAGE "icons/IntegerIncremented.png"
5-
105 IMAGE "icons/DoubleIncremented.png"
6-
106 IMAGE "icons/DoubleDistributed.png"
7-
107 IMAGE "icons/Addition.png"
8-
108 IMAGE "icons/Subtraction.png"
9-
109 IMAGE "icons/Multiplication.png"
10-
110 IMAGE "icons/Division.png"
11-
111 IMAGE "icons/ListBuilder.png"
12-
112 IMAGE "icons/Viewer.png"
13-
113 IMAGE "icons/Floor.png"
14-
114 IMAGE "icons/Ceil.png"
15-
115 IMAGE "icons/Abs.png"
16-
116 IMAGE "icons/Negative.png"
17-
117 IMAGE "icons/Sqrt.png"
1+
#include "resources.hpp"
2+
3+
BOOLEAN_ICON IMAGE "icons/Boolean.png"
4+
INTEGER_ICON IMAGE "icons/Integer.png"
5+
DOUBLE_ICON IMAGE "icons/Double.png"
6+
INTEGERINCREMENTED_ICON IMAGE "icons/IntegerIncremented.png"
7+
DOUBLEINCREMENTED_ICON IMAGE "icons/DoubleIncremented.png"
8+
DOUBLEDISTRIBUTED_ICON IMAGE "icons/DoubleDistributed.png"
9+
ADDITION_ICON IMAGE "icons/Addition.png"
10+
SUBTRACTION_ICON IMAGE "icons/Subtraction.png"
11+
MULTIPLICATION_ICON IMAGE "icons/Multiplication.png"
12+
DIVISION_ICON IMAGE "icons/Division.png"
13+
LISTBUILDER_ICON IMAGE "icons/ListBuilder.png"
14+
VIEWER_ICON IMAGE "icons/Viewer.png"
15+
FLOOR_ICON IMAGE "icons/Floor.png"
16+
CEIL_ICON IMAGE "icons/Ceil.png"
17+
ABS_ICON IMAGE "icons/Abs.png"
18+
NEGATIVE_ICON IMAGE "icons/Negative.png"
19+
SQRT_ICON IMAGE "icons/Sqrt.png"

0 commit comments

Comments
 (0)