Skip to content

Commit 74859ad

Browse files
Secret-chestSecret-chest
committed
Main -> execute() bridge is wrong.
1 parent 2ce072a commit 74859ad

File tree

5 files changed

+259
-34
lines changed

5 files changed

+259
-34
lines changed

‎MainMenu.glade

Lines changed: 223 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,12 @@
334334
<property name="step-increment">4</property>
335335
<property name="page-increment">10</property>
336336
</object>
337+
<object class="GtkAdjustment" id="keyDelay">
338+
<property name="upper">3000</property>
339+
<property name="value">250</property>
340+
<property name="step-increment">25</property>
341+
<property name="page-increment">10</property>
342+
</object>
337343
<object class="GtkAdjustment" id="maxFPS">
338344
<property name="upper">240</property>
339345
<property name="step-increment">15</property>
@@ -416,7 +422,7 @@
416422
<object class="GtkNotebook">
417423
<property name="visible">True</property>
418424
<property name="can-focus">True</property>
419-
<property name="tab-pos">bottom</property>
425+
<property name="tab-pos">left</property>
420426
<property name="scrollable">True</property>
421427
<property name="enable-popup">True</property>
422428
<child>
@@ -532,10 +538,35 @@
532538
</object>
533539
</child>
534540
<child type="tab">
535-
<object class="GtkLabel">
541+
<object class="GtkBox">
536542
<property name="visible">True</property>
537543
<property name="can-focus">False</property>
538-
<property name="label" translatable="yes">Download cache</property>
544+
<child>
545+
<object class="GtkImage">
546+
<property name="visible">True</property>
547+
<property name="can-focus">False</property>
548+
<property name="icon-name">folder-download</property>
549+
<property name="icon_size">3</property>
550+
</object>
551+
<packing>
552+
<property name="expand">False</property>
553+
<property name="fill">True</property>
554+
<property name="position">0</property>
555+
</packing>
556+
</child>
557+
<child>
558+
<object class="GtkLabel">
559+
<property name="visible">True</property>
560+
<property name="can-focus">False</property>
561+
<property name="label" translatable="yes">Download cache</property>
562+
<property name="xalign">1</property>
563+
</object>
564+
<packing>
565+
<property name="expand">False</property>
566+
<property name="fill">True</property>
567+
<property name="position">1</property>
568+
</packing>
569+
</child>
539570
</object>
540571
<packing>
541572
<property name="tab-fill">False</property>
@@ -613,7 +644,7 @@
613644
<property name="text" translatable="yes">0</property>
614645
<property name="adjustment">maxFPS</property>
615646
<property name="wrap">True</property>
616-
<property name="value">30</property>
647+
<property name="value">30.000000000223519</property>
617648
</object>
618649
<packing>
619650
<property name="left-attach">1</property>
@@ -929,10 +960,35 @@
929960
</packing>
930961
</child>
931962
<child type="tab">
932-
<object class="GtkLabel">
963+
<object class="GtkBox">
933964
<property name="visible">True</property>
934965
<property name="can-focus">False</property>
935-
<property name="label" translatable="yes">Project defaults</property>
966+
<child>
967+
<object class="GtkImage">
968+
<property name="visible">True</property>
969+
<property name="can-focus">False</property>
970+
<property name="icon-name">computer</property>
971+
<property name="icon_size">3</property>
972+
</object>
973+
<packing>
974+
<property name="expand">False</property>
975+
<property name="fill">True</property>
976+
<property name="position">0</property>
977+
</packing>
978+
</child>
979+
<child>
980+
<object class="GtkLabel">
981+
<property name="visible">True</property>
982+
<property name="can-focus">False</property>
983+
<property name="label" translatable="yes">Project defaults</property>
984+
<property name="xalign">1</property>
985+
</object>
986+
<packing>
987+
<property name="expand">False</property>
988+
<property name="fill">True</property>
989+
<property name="position">1</property>
990+
</packing>
991+
</child>
936992
</object>
937993
<packing>
938994
<property name="position">1</property>
@@ -966,10 +1022,35 @@
9661022
</packing>
9671023
</child>
9681024
<child type="tab">
969-
<object class="GtkLabel">
1025+
<object class="GtkBox">
9701026
<property name="visible">True</property>
9711027
<property name="can-focus">False</property>
972-
<property name="label" translatable="yes">Language</property>
1028+
<child>
1029+
<object class="GtkImage">
1030+
<property name="visible">True</property>
1031+
<property name="can-focus">False</property>
1032+
<property name="icon-name">preferences-desktop-locale</property>
1033+
<property name="icon_size">3</property>
1034+
</object>
1035+
<packing>
1036+
<property name="expand">False</property>
1037+
<property name="fill">True</property>
1038+
<property name="position">0</property>
1039+
</packing>
1040+
</child>
1041+
<child>
1042+
<object class="GtkLabel">
1043+
<property name="visible">True</property>
1044+
<property name="can-focus">False</property>
1045+
<property name="label" translatable="yes">Languages</property>
1046+
<property name="xalign">1</property>
1047+
</object>
1048+
<packing>
1049+
<property name="expand">False</property>
1050+
<property name="fill">True</property>
1051+
<property name="position">1</property>
1052+
</packing>
1053+
</child>
9731054
</object>
9741055
<packing>
9751056
<property name="position">2</property>
@@ -1199,16 +1280,148 @@ on startup.</property>
11991280
</packing>
12001281
</child>
12011282
<child type="tab">
1202-
<object class="GtkLabel">
1283+
<object class="GtkBox">
12031284
<property name="visible">True</property>
12041285
<property name="can-focus">False</property>
1205-
<property name="label" translatable="yes">Debug</property>
1286+
<child>
1287+
<object class="GtkImage">
1288+
<property name="visible">True</property>
1289+
<property name="can-focus">False</property>
1290+
<property name="icon-name">utilities-system-monitor</property>
1291+
<property name="icon_size">3</property>
1292+
</object>
1293+
<packing>
1294+
<property name="expand">False</property>
1295+
<property name="fill">True</property>
1296+
<property name="position">0</property>
1297+
</packing>
1298+
</child>
1299+
<child>
1300+
<object class="GtkLabel">
1301+
<property name="visible">True</property>
1302+
<property name="can-focus">False</property>
1303+
<property name="label" translatable="yes">Debug</property>
1304+
<property name="xalign">1</property>
1305+
</object>
1306+
<packing>
1307+
<property name="expand">False</property>
1308+
<property name="fill">True</property>
1309+
<property name="position">1</property>
1310+
</packing>
1311+
</child>
12061312
</object>
12071313
<packing>
12081314
<property name="position">3</property>
12091315
<property name="tab-fill">False</property>
12101316
</packing>
12111317
</child>
1318+
<child>
1319+
<!-- n-columns=2 n-rows=1 -->
1320+
<object class="GtkGrid">
1321+
<property name="visible">True</property>
1322+
<property name="can-focus">False</property>
1323+
<property name="row-spacing">8</property>
1324+
<property name="column-spacing">4</property>
1325+
<child>
1326+
<object class="GtkBox">
1327+
<property name="visible">True</property>
1328+
<property name="can-focus">False</property>
1329+
<property name="orientation">vertical</property>
1330+
<child>
1331+
<object class="GtkLabel">
1332+
<property name="visible">True</property>
1333+
<property name="can-focus">False</property>
1334+
<property name="label" translatable="yes">Key delay</property>
1335+
<property name="xalign">0</property>
1336+
<attributes>
1337+
<attribute name="weight" value="medium"/>
1338+
</attributes>
1339+
</object>
1340+
<packing>
1341+
<property name="expand">False</property>
1342+
<property name="fill">True</property>
1343+
<property name="position">0</property>
1344+
</packing>
1345+
</child>
1346+
<child>
1347+
<object class="GtkLabel">
1348+
<property name="visible">True</property>
1349+
<property name="can-focus">False</property>
1350+
<property name="label" translatable="yes">Milliseconds before keys will start repeating, 0 means keys won't repeat.</property>
1351+
<property name="wrap">True</property>
1352+
<property name="xalign">0</property>
1353+
<attributes>
1354+
<attribute name="style" value="italic"/>
1355+
<attribute name="weight" value="light"/>
1356+
</attributes>
1357+
</object>
1358+
<packing>
1359+
<property name="expand">False</property>
1360+
<property name="fill">True</property>
1361+
<property name="position">1</property>
1362+
</packing>
1363+
</child>
1364+
</object>
1365+
<packing>
1366+
<property name="left-attach">0</property>
1367+
<property name="top-attach">0</property>
1368+
</packing>
1369+
</child>
1370+
<child>
1371+
<object class="GtkSpinButton">
1372+
<property name="visible">True</property>
1373+
<property name="can-focus">True</property>
1374+
<property name="text" translatable="yes">4</property>
1375+
<property name="adjustment">keyDelay</property>
1376+
<property name="wrap">True</property>
1377+
<property name="value">4</property>
1378+
</object>
1379+
<packing>
1380+
<property name="left-attach">1</property>
1381+
<property name="top-attach">0</property>
1382+
</packing>
1383+
</child>
1384+
</object>
1385+
<packing>
1386+
<property name="position">4</property>
1387+
</packing>
1388+
</child>
1389+
<child type="tab">
1390+
<object class="GtkBox">
1391+
<property name="visible">True</property>
1392+
<property name="can-focus">False</property>
1393+
<child>
1394+
<object class="GtkImage">
1395+
<property name="visible">True</property>
1396+
<property name="can-focus">False</property>
1397+
<property name="icon-name">preferences-desktop-accessibility</property>
1398+
<property name="icon_size">3</property>
1399+
</object>
1400+
<packing>
1401+
<property name="expand">False</property>
1402+
<property name="fill">True</property>
1403+
<property name="position">0</property>
1404+
</packing>
1405+
</child>
1406+
<child>
1407+
<object class="GtkLabel">
1408+
<property name="visible">True</property>
1409+
<property name="can-focus">False</property>
1410+
<property name="label" translatable="yes">Accesibility</property>
1411+
<property name="xalign">1</property>
1412+
</object>
1413+
<packing>
1414+
<property name="expand">False</property>
1415+
<property name="fill">True</property>
1416+
<property name="position">1</property>
1417+
</packing>
1418+
</child>
1419+
</object>
1420+
<packing>
1421+
<property name="position">4</property>
1422+
<property name="tab-fill">False</property>
1423+
</packing>
1424+
</child>
12121425
</object>
12131426
</child>
12141427
</object>

‎config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363

6464
# Key delay
6565
# Set the delay before key events start repeating. (in milliseconds)
66-
keyDelay: int = 10000
66+
keyDelay: int = 250
6767

6868
# Screen width/height
6969
# Stage size. You can change that, but most projects won't work with it.

‎eventContainer.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
class EventContainer:
2+
def __init__(self):
3+
self.keys = set()
4+
self.keyEvents = set()
5+
self.otherEvents = set()
6+

0 commit comments

Comments
 (0)