Skip to content

Commit 8711226

Browse files
Fix warning of summing enums
1 parent dd1d1a7 commit 8711226

File tree

2 files changed

+25
-21
lines changed

2 files changed

+25
-21
lines changed

src/GUI/EditorWindow.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
#include "SettingsWindow.hpp"
2121
#include "EditorWindow.hpp"
2222

23+
// TODO: Move definition to the something like reflection header
24+
int operator+(Qt::Modifier mod, Qt::Key key) { return (static_cast<int>(mod) + static_cast<int>(key)); }
25+
2326
#pragma region CTORs and Setters
2427

2528
EditorWindow::EditorWindow(QWidget* parent)
@@ -559,3 +562,4 @@ void EditorWindow::ActOpen_NewHotkeyFileSelected(const QString& filepath)
559562
}
560563

561564
#pragma endregion
565+

src/GUI/Translations/ru.ts

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,99 +22,99 @@
2222
<context>
2323
<name>EditorWindow</name>
2424
<message>
25-
<location filename="../EditorWindow.cpp" line="170"/>
25+
<location filename="../EditorWindow.cpp" line="172"/>
2626
<source>File</source>
2727
<translation>Файл</translation>
2828
</message>
2929
<message>
30-
<location filename="../EditorWindow.cpp" line="171"/>
30+
<location filename="../EditorWindow.cpp" line="173"/>
3131
<source>Open</source>
3232
<translation>Открыть</translation>
3333
</message>
3434
<message>
35-
<location filename="../EditorWindow.cpp" line="172"/>
35+
<location filename="../EditorWindow.cpp" line="174"/>
3636
<source>Save</source>
3737
<translation>Сохранить</translation>
3838
</message>
3939
<message>
40-
<location filename="../EditorWindow.cpp" line="173"/>
40+
<location filename="../EditorWindow.cpp" line="175"/>
4141
<source>Save As...</source>
4242
<translation>Сохранить как...</translation>
4343
</message>
4444
<message>
45-
<location filename="../EditorWindow.cpp" line="174"/>
45+
<location filename="../EditorWindow.cpp" line="176"/>
4646
<source>Special</source>
4747
<translation>Дополнительно</translation>
4848
</message>
4949
<message>
50-
<location filename="../EditorWindow.cpp" line="190"/>
50+
<location filename="../EditorWindow.cpp" line="192"/>
5151
<source>View</source>
5252
<translation>Вид</translation>
5353
</message>
5454
<message>
55-
<location filename="../EditorWindow.cpp" line="191"/>
55+
<location filename="../EditorWindow.cpp" line="193"/>
5656
<source>Status Bar</source>
5757
<translation>Строка состояния</translation>
5858
</message>
5959
<message>
60-
<location filename="../EditorWindow.cpp" line="192"/>
60+
<location filename="../EditorWindow.cpp" line="194"/>
6161
<source>Enable</source>
6262
<translation>Включить</translation>
6363
</message>
6464
<message>
65-
<location filename="../EditorWindow.cpp" line="193"/>
65+
<location filename="../EditorWindow.cpp" line="195"/>
6666
<source>Disable</source>
6767
<translation>Отключить</translation>
6868
</message>
6969
<message>
70-
<location filename="../EditorWindow.cpp" line="197"/>
71-
<location filename="../EditorWindow.cpp" line="510"/>
70+
<location filename="../EditorWindow.cpp" line="199"/>
71+
<location filename="../EditorWindow.cpp" line="512"/>
7272
<source>Settings</source>
7373
<translation>Настройки</translation>
7474
</message>
7575
<message>
76-
<location filename="../EditorWindow.cpp" line="201"/>
77-
<location filename="../EditorWindow.cpp" line="475"/>
76+
<location filename="../EditorWindow.cpp" line="203"/>
77+
<location filename="../EditorWindow.cpp" line="477"/>
7878
<source>About</source>
7979
<translation>О программе</translation>
8080
</message>
8181
<message>
82-
<location filename="../EditorWindow.cpp" line="335"/>
82+
<location filename="../EditorWindow.cpp" line="337"/>
8383
<source>Layout %1</source>
8484
<translation>Раскладка %1</translation>
8585
</message>
8686
<message>
87-
<location filename="../EditorWindow.cpp" line="455"/>
87+
<location filename="../EditorWindow.cpp" line="457"/>
8888
<source>Authors: </source>
8989
<translation>Авторы: </translation>
9090
</message>
9191
<message>
92-
<location filename="../EditorWindow.cpp" line="456"/>
92+
<location filename="../EditorWindow.cpp" line="458"/>
9393
<source>Version: </source>
9494
<translation>Версия: </translation>
9595
</message>
9696
<message>
97-
<location filename="../EditorWindow.cpp" line="457"/>
97+
<location filename="../EditorWindow.cpp" line="459"/>
9898
<source>Program licensed with </source>
9999
<translation>Программа лицензирована под </translation>
100100
</message>
101101
<message>
102-
<location filename="../EditorWindow.cpp" line="458"/>
102+
<location filename="../EditorWindow.cpp" line="460"/>
103103
<source>GitHub repository:</source>
104104
<translation>Репозиторий на GitHub:</translation>
105105
</message>
106106
<message>
107-
<location filename="../EditorWindow.cpp" line="460"/>
107+
<location filename="../EditorWindow.cpp" line="462"/>
108108
<source>Support development:</source>
109109
<translation>Поддержать разработку:</translation>
110110
</message>
111111
<message>
112-
<location filename="../EditorWindow.cpp" line="550"/>
112+
<location filename="../EditorWindow.cpp" line="552"/>
113113
<source>Binary files</source>
114114
<translation>Двоичные файлы</translation>
115115
</message>
116116
<message>
117-
<location filename="../EditorWindow.cpp" line="551"/>
117+
<location filename="../EditorWindow.cpp" line="553"/>
118118
<source>Any files</source>
119119
<translation>Все файлы</translation>
120120
</message>

0 commit comments

Comments
 (0)