Skip to content

Commit a01bad7

Browse files
MahBoiDeveloperMahBoiDeveloper
committed
Preparation for the future unhardcode for faction short names
1 parent 8ba22eb commit a01bad7

File tree

3 files changed

+53
-60
lines changed

3 files changed

+53
-60
lines changed

‎src/GUI/HotkeysMainWindow.cpp‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,12 @@ HotkeysMainWindow::HotkeysMainWindow(const QVariant& configuration, QWidget* par
6565
QPushButton* factionButton = new QPushButton{currFaction.GetDisplayName()};
6666

6767
auto shortName = currFaction.GetShortName();
68-
if (shortName == "USA" ||
69-
shortName == "SWG" ||
70-
shortName == "AIR" ||
71-
shortName == "LSR")
72-
;
73-
74-
if (shortName == "PRC" ||
75-
shortName == "TNK" ||
76-
shortName == "INF" ||
77-
shortName == "NUK")
68+
if (vUSAShorNames.contains(shortName)) ;
69+
70+
if (vPRCShorNames.contains(shortName))
7871
factionButton->setProperty("faction", "PRC");
7972

80-
if (shortName == "GLA" ||
81-
shortName == "TOX" ||
82-
shortName == "STL" ||
83-
shortName == "DML")
73+
if (vGLAShorNames.contains(shortName))
8474
factionButton->setProperty("faction", "GLA");
8575

8676
connect(factionButton, &QPushButton::pressed, this, [=, this]()

‎src/GUI/Translations/ru.ts‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -114,83 +114,83 @@
114114
<context>
115115
<name>HotkeysMainWindow</name>
116116
<message>
117-
<location filename="../HotkeysMainWindow.cpp" line="177"/>
117+
<location filename="../HotkeysMainWindow.cpp" line="167"/>
118118
<source>File</source>
119119
<translation>Файл</translation>
120120
</message>
121121
<message>
122-
<location filename="../HotkeysMainWindow.cpp" line="178"/>
122+
<location filename="../HotkeysMainWindow.cpp" line="168"/>
123123
<source>Special</source>
124124
<translation>Доп</translation>
125125
</message>
126126
<message>
127-
<location filename="../HotkeysMainWindow.cpp" line="180"/>
127+
<location filename="../HotkeysMainWindow.cpp" line="170"/>
128128
<source>View</source>
129129
<translation>Вид</translation>
130130
</message>
131131
<message>
132-
<location filename="../HotkeysMainWindow.cpp" line="182"/>
132+
<location filename="../HotkeysMainWindow.cpp" line="172"/>
133133
<source>Settings</source>
134134
<translation>Настройки</translation>
135135
</message>
136136
<message>
137-
<location filename="../HotkeysMainWindow.cpp" line="185"/>
137+
<location filename="../HotkeysMainWindow.cpp" line="175"/>
138138
<source>Language</source>
139139
<translation>Язык</translation>
140140
</message>
141141
<message>
142-
<location filename="../HotkeysMainWindow.cpp" line="189"/>
143-
<location filename="../HotkeysMainWindow.cpp" line="466"/>
142+
<location filename="../HotkeysMainWindow.cpp" line="179"/>
143+
<location filename="../HotkeysMainWindow.cpp" line="456"/>
144144
<source>About</source>
145145
<translation>О программе</translation>
146146
</message>
147147
<message>
148-
<location filename="../HotkeysMainWindow.cpp" line="319"/>
148+
<location filename="../HotkeysMainWindow.cpp" line="309"/>
149149
<source>Layout %1</source>
150150
<translation>Раскладка %1</translation>
151151
</message>
152152
<message>
153-
<location filename="../HotkeysMainWindow.cpp" line="446"/>
153+
<location filename="../HotkeysMainWindow.cpp" line="436"/>
154154
<source>Authors: </source>
155155
<translation>Авторы: </translation>
156156
</message>
157157
<message>
158-
<location filename="../HotkeysMainWindow.cpp" line="447"/>
158+
<location filename="../HotkeysMainWindow.cpp" line="437"/>
159159
<source>Version: </source>
160160
<translation>Версия: </translation>
161161
</message>
162162
<message>
163-
<location filename="../HotkeysMainWindow.cpp" line="448"/>
163+
<location filename="../HotkeysMainWindow.cpp" line="438"/>
164164
<source>Program licensed with </source>
165165
<translation>Программа лицензирована под </translation>
166166
</message>
167167
<message>
168-
<location filename="../HotkeysMainWindow.cpp" line="449"/>
168+
<location filename="../HotkeysMainWindow.cpp" line="439"/>
169169
<source>GitHub repository:</source>
170170
<translation>Репозиторий на GitHub:</translation>
171171
</message>
172172
<message>
173-
<location filename="../HotkeysMainWindow.cpp" line="451"/>
173+
<location filename="../HotkeysMainWindow.cpp" line="441"/>
174174
<source>Support development:</source>
175175
<translation>Поддержать разработку:</translation>
176176
</message>
177177
<message>
178-
<location filename="../HotkeysMainWindow.cpp" line="500"/>
178+
<location filename="../HotkeysMainWindow.cpp" line="490"/>
179179
<source>Lanugage</source>
180180
<translation>Язык</translation>
181181
</message>
182182
<message>
183-
<location filename="../HotkeysMainWindow.cpp" line="509"/>
183+
<location filename="../HotkeysMainWindow.cpp" line="499"/>
184184
<source>LANGUAGE</source>
185185
<translation>ЯЗЫК</translation>
186186
</message>
187187
<message>
188-
<location filename="../HotkeysMainWindow.cpp" line="521"/>
188+
<location filename="../HotkeysMainWindow.cpp" line="511"/>
189189
<source>OK</source>
190190
<translation>Ок</translation>
191191
</message>
192192
<message>
193-
<location filename="../HotkeysMainWindow.cpp" line="522"/>
193+
<location filename="../HotkeysMainWindow.cpp" line="512"/>
194194
<source>Cancel</source>
195195
<translation>Отмена</translation>
196196
</message>
@@ -246,22 +246,22 @@
246246
<context>
247247
<name>QObject</name>
248248
<message>
249-
<location filename="../../ProgramConstants.hpp" line="47"/>
249+
<location filename="../../ProgramConstants.hpp" line="50"/>
250250
<source>Buildings</source>
251251
<translation>Здания</translation>
252252
</message>
253253
<message>
254-
<location filename="../../ProgramConstants.hpp" line="48"/>
254+
<location filename="../../ProgramConstants.hpp" line="51"/>
255255
<source>Infantry</source>
256256
<translation>Пехота</translation>
257257
</message>
258258
<message>
259-
<location filename="../../ProgramConstants.hpp" line="49"/>
259+
<location filename="../../ProgramConstants.hpp" line="52"/>
260260
<source>Vehicles</source>
261261
<translation>Техника</translation>
262262
</message>
263263
<message>
264-
<location filename="../../ProgramConstants.hpp" line="50"/>
264+
<location filename="../../ProgramConstants.hpp" line="53"/>
265265
<source>Aircrafts</source>
266266
<translation>Авиация</translation>
267267
</message>

‎src/ProgramConstants.hpp‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,34 @@
88

99
#define PROGRAM_CONSTANTS ProgramConstants::Instance
1010

11-
inline const static QString RESOURCE_FOLDER = "Resources";
12-
inline const static QString BINARIES_FOLDER = RESOURCE_FOLDER + "\\Binaries";
13-
inline const static QString TRANSLATIONS_FOLDER = RESOURCE_FOLDER + "/Translations";
14-
inline const static QString TECH_TREE_PATH = RESOURCE_FOLDER + "/TechTree.json";
15-
inline const static QString SETTINGS_PATH = RESOURCE_FOLDER + "/Settings.json";
16-
inline const static double START_WIDGET_SIZE_RATIO = 3./7.;
17-
inline const static QSize START_BUTTON_SIZE = QSize(230, 110);
18-
inline const static QSize LANGUAGE_CHANGE_SIZE = QSize(250, 100);
19-
inline const static int ICON_MIN_HEIGHT = 80;
20-
inline const static int ICON_SCALING_HEIGHT = 25;
21-
inline const static int KEYBOARD_KEY_WIDTH = 50;
22-
inline const static int EMPTY_KEY_WIDTH = 25;
23-
inline const static QString ICONS_FOLDER = RESOURCE_FOLDER + "/Icons";
24-
inline const static QString THEME_FOLDER = RESOURCE_FOLDER + "/Theme";
25-
inline const static QString STYLES_SHEET = THEME_FOLDER + "/Styles.css";
26-
inline const static QString QT_ICONS_FOLDER = ":/icons";
27-
inline const static QString MISSING_ICON_PATH = QT_ICONS_FOLDER + "/NoImageSmall.webp";
28-
inline const static QString EDITOR_ICON_PATH = QT_ICONS_FOLDER + "/EditorIconSmall.webp";
29-
inline const static QString EDITOR_BIG_ICON_PATH = QT_ICONS_FOLDER + "/EditorIconBig.webp";
30-
inline const static char* SETTINGS_NO_FOUND = "Unable to find Settings.json in Resource folder.";
31-
inline const static char* TECH_TREE_NO_FOUND = "Unable to find TechTree.json in Resource folder.";
32-
inline const static char* THEME_FOLDER_NO_FOUND = "Unable to find Resource/Theme folder.";
33-
inline const static char* ICONS_FOLDER_NO_FOUND = "Unable to find Resource/Icons folder.";
34-
inline const static char* TRANSLATIONS_NO_FOUND = "Unable to find Resource/Translations folder.";
35-
inline const static char* UNKNOWN_ERROR = "Unknown error has been occured.";
11+
inline const static QString RESOURCE_FOLDER = "Resources";
12+
inline const static QString BINARIES_FOLDER = RESOURCE_FOLDER + "\\Binaries";
13+
inline const static QString TRANSLATIONS_FOLDER = RESOURCE_FOLDER + "/Translations";
14+
inline const static QString TECH_TREE_PATH = RESOURCE_FOLDER + "/TechTree.json";
15+
inline const static QString SETTINGS_PATH = RESOURCE_FOLDER + "/Settings.json";
16+
inline const static double START_WIDGET_SIZE_RATIO = 3./7.;
17+
inline const static QSize START_BUTTON_SIZE = QSize(230, 110);
18+
inline const static QSize LANGUAGE_CHANGE_SIZE = QSize(250, 100);
19+
inline const static int ICON_MIN_HEIGHT = 80;
20+
inline const static int ICON_SCALING_HEIGHT = 25;
21+
inline const static int KEYBOARD_KEY_WIDTH = 50;
22+
inline const static int EMPTY_KEY_WIDTH = 25;
23+
inline const static QString ICONS_FOLDER = RESOURCE_FOLDER + "/Icons";
24+
inline const static QString THEME_FOLDER = RESOURCE_FOLDER + "/Theme";
25+
inline const static QString STYLES_SHEET = THEME_FOLDER + "/Styles.css";
26+
inline const static QString QT_ICONS_FOLDER = ":/icons";
27+
inline const static QString MISSING_ICON_PATH = QT_ICONS_FOLDER + "/NoImageSmall.webp";
28+
inline const static QString EDITOR_ICON_PATH = QT_ICONS_FOLDER + "/EditorIconSmall.webp";
29+
inline const static QString EDITOR_BIG_ICON_PATH = QT_ICONS_FOLDER + "/EditorIconBig.webp";
30+
inline const static char* SETTINGS_NO_FOUND = "Unable to find Settings.json in Resource folder.";
31+
inline const static char* TECH_TREE_NO_FOUND = "Unable to find TechTree.json in Resource folder.";
32+
inline const static char* THEME_FOLDER_NO_FOUND = "Unable to find Resource/Theme folder.";
33+
inline const static char* ICONS_FOLDER_NO_FOUND = "Unable to find Resource/Icons folder.";
34+
inline const static char* TRANSLATIONS_NO_FOUND = "Unable to find Resource/Translations folder.";
35+
inline const static char* UNKNOWN_ERROR = "Unknown error has been occured.";
36+
inline const static QVector<QString> vGLAShorNames = {"GLA", "TOX", "STL", "DML"};
37+
inline const static QVector<QString> vUSAShorNames = {"USA", "SWG", "AIR", "LSR"};
38+
inline const static QVector<QString> vPRCShorNames = {"PRC", "TNK", "INF", "NUK"};
3639

3740
enum class GameObjectTypes
3841
{

0 commit comments

Comments
 (0)