| [qet] [GIT] qet/qet.git branch XMLPropertiesNew updated. 0.9-dev-61-g51ed21f |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
- To: qet@xxxxxxxxxxxxxxxxxxx
- Subject: [qet] [GIT] qet/qet.git branch XMLPropertiesNew updated. 0.9-dev-61-g51ed21f
- From: <git@xxxxxxxxxxxxx>
- Date: Thu, 04 Mar 2021 21:32:29 +0100
- Auto-submitted: auto-generated
This is an automated email from git. It was generated because a ref
change was pushed to the "qet/qet.git" repository.
The branch, XMLPropertiesNew has been updated
via 51ed21f9ef1ed11c5a3c52115ed8d4687560a43e (commit)
via b021ac3e1fb98a56810773c7c701e3329efb3148 (commit)
via faf4235bed6bdd6fb23e02c3bfe1c2ca98ae3c25 (commit)
via 0a51e22b7d7a618c334db5d3065969ad38c89b19 (commit)
via 632fba53669f7a9f053a86a50d03518ceea3daa5 (commit)
via 0ca883f11449aadb849394492cdd69c5b4975091 (commit)
via 170d856007ad52650dca857fd64de9517deab98c (commit)
via 0424eb9fba5f6eaa1ac2e8a33dfbf3779c8f270d (commit)
via 8210f069193bc684e541be99dcfe14c2fdd1fa4e (commit)
via 468618adda56610947bf5c7f6025260ce068a0da (commit)
via 8141a757388704d84984e408ba352e01b74c90c3 (commit)
via 8f201a6e5d147a8b0d8e191a7e678dffae595832 (commit)
via b8745c0a6b49b02d7f4e23359bb9e95b15a64a19 (commit)
via 7c3bde9118f002383e018eb4b26e0f49671d8d80 (commit)
from 221773ea8a12aab9353f5e72a958ddefede5e572 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 51ed21f9ef1ed11c5a3c52115ed8d4687560a43e
Merge: 221773e b021ac3
Author: Martin Marmsoler <martin.marmsoler@xxxxxxxxx>
Date: Thu Mar 4 21:31:55 2021 +0100
Merge commit 'b021ac3e1fb98a56810773c7c701e3329efb3148'
Conflicts:
sources/qetgraphicsitem/element.h
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 2 +-
SingleApplication/CHANGELOG.md | 69 +-
SingleApplication/CMakeLists.txt | 43 +-
SingleApplication/LICENSE | 2 +-
SingleApplication/README.md | 63 +-
SingleApplication/SingleApplication | 1 +
SingleApplication/examples/basic/CMakeLists.txt | 12 +
SingleApplication/examples/basic/basic.pro | 0
SingleApplication/examples/basic/main.cpp | 2 +
.../examples/calculator/CMakeLists.txt | 21 +
.../examples/calculator/calculator.cpp | 64 +-
.../examples/sending_arguments/CMakeLists.txt | 20 +
.../examples/sending_arguments/main.cpp | 3 +
.../sending_arguments/sending_arguments.pro | 0
SingleApplication/singleapplication.cpp | 351 ++-
SingleApplication/singleapplication.h | 202 +-
SingleApplication/singleapplication.pri | 5 +-
SingleApplication/singleapplication_p.cpp | 650 +++--
SingleApplication/singleapplication_p.h | 107 +-
.../flatpak/org.qelectrotech.QElectroTech.json | 2 +-
cmake/fetch_pugixml.cmake | 2 +-
cmake/fetch_singleapplication.cmake | 2 +-
cmake/qet_compilation_vars.cmake | 12 +-
.../common/pinball_em_williams_ground.elmt | 16 +
.../pinball_em_williams_not_connected_east.elmt | 15 +
.../pinball_em_williams_not_connected_north.elmt | 15 +
.../pinball_em_williams_not_connected_south.elmt | 15 +
.../pinball_em_williams_not_connected_west.elmt | 15 +
.../pinball/williams_em/common/qet_directory | 6 +
.../jacks/pinball_em_williams_jack_02.elmt | 20 +
.../jacks/pinball_em_williams_jack_03.elmt | 24 +
.../jacks/pinball_em_williams_jack_04.elmt | 28 +
.../jacks/pinball_em_williams_jack_05.elmt | 32 +
.../jacks/pinball_em_williams_jack_06.elmt | 36 +
.../jacks/pinball_em_williams_jack_07.elmt | 40 +
.../jacks/pinball_em_williams_jack_08.elmt | 44 +
.../jacks/pinball_em_williams_jack_09.elmt | 48 +
.../jacks/pinball_em_williams_jack_10.elmt | 52 +
.../jacks/pinball_em_williams_jack_plug.elmt | 16 +
.../pinball/williams_em/jacks/qet_directory | 6 +
.../output/pinball_em_williams_coil.elmt | 19 +
.../output/pinball_em_williams_flipper_coil.elmt | 22 +
.../output/pinball_em_williams_lite.elmt | 16 +
.../output/pinball_em_williams_motor.elmt | 18 +
.../pinball/williams_em/output/qet_directory | 6 +
.../power/pinball_em_williams_fuse.elmt | 21 +
.../power/pinball_em_williams_power_cord.elmt | 21 +
.../pinball_em_williams_power_cord_ground.elmt | 24 +
.../power/pinball_em_williams_service_outlet.elmt | 18 +
.../pinball/williams_em/power/qet_directory | 6 +
.../pinball/williams_em/qet_directory | 6 +
.../pinball_em_williams_switch_mb_bottom_m.elmt | 21 +
.../pinball_em_williams_switch_mb_bottom_mi.elmt | 21 +
.../pinball_em_williams_switch_mb_center_m.elmt | 21 +
.../pinball_em_williams_switch_mb_center_mi.elmt | 21 +
.../pinball_em_williams_switch_mb_top_m.elmt | 21 +
.../pinball_em_williams_switch_mb_top_mi.elmt | 21 +
.../switches_common/mirrored/qet_directory | 6 +
.../pinball_em_williams_switch_mb_bottom.elmt | 21 +
.../pinball_em_williams_switch_mb_bottom_i.elmt | 21 +
.../pinball_em_williams_switch_mb_center.elmt | 21 +
.../pinball_em_williams_switch_mb_center_i.elmt | 21 +
.../pinball_em_williams_switch_mb_top.elmt | 21 +
.../pinball_em_williams_switch_mb_top_i.elmt | 21 +
.../pinball_em_williams_switch_nc.elmt | 18 +
.../pinball_em_williams_switch_no.elmt | 17 +
.../williams_em/switches_common/qet_directory | 6 +
.../pinball_em_williams_switch_mb_sm_bottom_m.elmt | 25 +
...pinball_em_williams_switch_mb_sm_bottom_mi.elmt | 25 +
.../pinball_em_williams_switch_mb_sm_center_m.elmt | 25 +
...pinball_em_williams_switch_mb_sm_center_mi.elmt | 25 +
.../pinball_em_williams_switch_mb_sm_top_m.elmt | 25 +
.../pinball_em_williams_switch_mb_sm_top_mi.elmt | 25 +
.../switches_score_motor/mirrored/qet_directory | 6 +
.../pinball_em_williams_switch_mb_sm_bottom.elmt | 25 +
.../pinball_em_williams_switch_mb_sm_bottom_i.elmt | 25 +
.../pinball_em_williams_switch_mb_sm_center.elmt | 25 +
.../pinball_em_williams_switch_mb_sm_center_i.elmt | 25 +
.../pinball_em_williams_switch_mb_sm_top.elmt | 25 +
.../pinball_em_williams_switch_mb_sm_top_i.elmt | 25 +
.../pinball_em_williams_switch_nc_sm.elmt | 19 +
.../pinball_em_williams_switch_no_sm.elmt | 18 +
.../williams_em/switches_score_motor/qet_directory | 6 +
.../pinball/williams_em/units/qet_directory | 6 +
.../pinball_em_williams_unit_wiper_between_04.elmt | 39 +
.../pinball_em_williams_unit_wiper_between_10.elmt | 75 +
.../pinball_em_williams_wiper_3_between_3.elmt | 39 +
.../williams_em/units/wiper_between/qet_directory | 6 +
.../pinball_em_williams_unit_wiper_to_02.elmt | 21 +
.../pinball_em_williams_unit_wiper_to_03.elmt | 24 +
.../pinball_em_williams_unit_wiper_to_04.elmt | 27 +
.../pinball_em_williams_unit_wiper_to_05.elmt | 30 +
.../pinball_em_williams_unit_wiper_to_06.elmt | 33 +
.../pinball_em_williams_unit_wiper_to_10.elmt | 45 +
.../pinball_em_williams_unit_wiper_to_11.elmt | 48 +
.../williams_em/units/wiper_to/qet_directory | 6 +
examples/pinball_williams_em.qet | 3048 ++++++++++++++++++++
lang/qet_cs.ts | 100 +-
lang/qet_da.qm | Bin 257204 -> 260711 bytes
lang/qet_da.ts | 102 +-
lang/qet_de.qm | Bin 284288 -> 287870 bytes
lang/qet_de.ts | 681 ++---
lang/qet_hu.qm | Bin 284140 -> 288010 bytes
lang/qet_hu.ts | 102 +-
lang/qet_nl.qm | Bin 282719 -> 286447 bytes
lang/qet_nl.ts | 98 +-
.../editor/ui/elementpropertieseditorwidget.cpp | 8 +-
sources/qetgraphicsitem/element.cpp | 9 +
sources/qetgraphicsitem/element.h | 23 +-
sources/qetinformation.cpp | 13 +
sources/qetinformation.h | 2 +
sources/ui/elementinfowidget.cpp | 14 +-
sources/ui/elementinfowidget.h | 1 +
113 files changed, 6277 insertions(+), 1211 deletions(-)
create mode 100644 SingleApplication/SingleApplication
create mode 100644 SingleApplication/examples/basic/CMakeLists.txt
mode change 100644 => 100755 SingleApplication/examples/basic/basic.pro
mode change 100644 => 100755 SingleApplication/examples/basic/main.cpp
create mode 100644 SingleApplication/examples/calculator/CMakeLists.txt
create mode 100644 SingleApplication/examples/sending_arguments/CMakeLists.txt
mode change 100644 => 100755 SingleApplication/examples/sending_arguments/main.cpp
mode change 100644 => 100755 SingleApplication/examples/sending_arguments/sending_arguments.pro
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/common/pinball_em_williams_ground.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/common/pinball_em_williams_not_connected_east.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/common/pinball_em_williams_not_connected_north.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/common/pinball_em_williams_not_connected_south.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/common/pinball_em_williams_not_connected_west.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/common/qet_directory
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_02.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_03.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_04.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_05.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_06.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_07.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_08.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_09.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_10.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_plug.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/qet_directory
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/output/pinball_em_williams_coil.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/output/pinball_em_williams_flipper_coil.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/output/pinball_em_williams_lite.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/output/pinball_em_williams_motor.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/output/qet_directory
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/power/pinball_em_williams_fuse.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/power/pinball_em_williams_power_cord.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/power/pinball_em_williams_power_cord_ground.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/power/pinball_em_williams_service_outlet.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/power/qet_directory
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/qet_directory
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/pinball_em_williams_switch_mb_bottom_m.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/pinball_em_williams_switch_mb_bottom_mi.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/pinball_em_williams_switch_mb_center_m.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/pinball_em_williams_switch_mb_center_mi.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/pinball_em_williams_switch_mb_top_m.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/pinball_em_williams_switch_mb_top_mi.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/qet_directory
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_mb_bottom.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_mb_bottom_i.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_mb_center.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_mb_center_i.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_mb_top.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_mb_top_i.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_nc.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_no.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/qet_directory
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/pinball_em_williams_switch_mb_sm_bottom_m.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/pinball_em_williams_switch_mb_sm_bottom_mi.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/pinball_em_williams_switch_mb_sm_center_m.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/pinball_em_williams_switch_mb_sm_center_mi.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/pinball_em_williams_switch_mb_sm_top_m.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/pinball_em_williams_switch_mb_sm_top_mi.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/qet_directory
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_mb_sm_bottom.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_mb_sm_bottom_i.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_mb_sm_center.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_mb_sm_center_i.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_mb_sm_top.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_mb_sm_top_i.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_nc_sm.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_no_sm.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/qet_directory
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/qet_directory
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_between/pinball_em_williams_unit_wiper_between_04.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_between/pinball_em_williams_unit_wiper_between_10.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_between/pinball_em_williams_wiper_3_between_3.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_between/qet_directory
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_02.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_03.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_04.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_05.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_06.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_10.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_11.elmt
create mode 100644 elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/qet_directory
create mode 100644 examples/pinball_williams_em.qet
hooks/post-receive
--
qet/qet.git