Compare commits

...

2025 Commits

Author SHA1 Message Date
Laurent Trinques
093ec563e1 Generate Chengelog.MD file 2025-09-21 10:44:16 +02:00
Laurent Trinques
1a1e8a2299 Fix Summary headline issue on german 2025-09-13 09:43:04 +02:00
Laurent Trinques
75c1485ead Merge pull request #404 from arummler/master-fix-missing-language
Fixing translation file list in CMake
2025-09-12 10:46:37 +02:00
Laurent Trinques
4ebaf073d6 Fix bug https://qelectrotech.org/bugtracker/view.php?id=330 2025-09-12 10:44:39 +02:00
Laurent Trinques
8a96097d41 Fix Summary headline issue in German
https://qelectrotech.org/forum/viewtopic.php?pid=22082#p22082
2025-09-11 13:32:29 +02:00
Laurent Trinques
43826361a4 Merge pull request #403 from arummler/master-update-dependencies
Update dependencies to fix compilation errors
2025-09-11 12:40:53 +02:00
Andre Rummler
67b80364e1 CMAKE/FIX: BE was missing as it had been renamed to nl_BE. RS and UK were not included. 2025-09-08 23:52:27 +02:00
Andre Rummler
ea9d57cdde Update googltest library to v1.17.0 2025-09-08 13:27:56 +02:00
Andre Rummler
bad60834cc Update Catch2 library to v2.13.10 2025-09-08 13:26:54 +02:00
Laurent Trinques
6119d49d15 Add new Photovoltaïque examples found on www.. 2025-09-06 10:10:00 +02:00
Laurent Trinques
acf0eb8f6a git submodule update --remote elements 2025-09-01 05:06:50 +02:00
Laurent Trinques
3cadedaf9e Merge pull request #401 from Evilscrack/master
Minor corrections to prevent crashes
2025-08-31 11:47:41 +02:00
Pascal Sander
84ac394d3b Refactor to more QRectF to be more compatible with QPrinter. #5 2025-08-30 12:08:54 +02:00
Pascal Sander
27b21b38aa Fixed incorrect cast from ElementCollectionItem to FileElementCollectionItem #4 2025-08-22 20:12:27 +02:00
Evilscrack
12b33e15a3 Merge branch 'qelectrotech:master' into master 2025-08-22 19:26:25 +02:00
Laurent Trinques
2ec1aecd53 Merge pull request #399 from ChuckNr11/master
Correct compositeText alignment on copying
2025-08-20 16:38:57 +02:00
achim
73ce3ae9fe Correct compositeText alignment on copying
After the commit 'Correcting dynamicElementTextItem alignment on
copying', not all composite text was displayed correctly. As soon as the
composite text contained multiple variables in a line or user text, the
alignment was no longer correct. Furthermore, the text value was not
correctly written to the clipboard, so it was no longer present when
pasting. I have corrected these errors here.
2025-08-19 20:16:31 +02:00
Laurent Trinques
6375136a50 Fix bughttps://qelectrotech.org/bugtracker/view.php?id=329
Modification of the int BACKUP_INTERVAL from 2 min to 20 min used by
KautoSaveFile.

On a large project with a 256 MB folio printed in A0 format, the
graphical interface freezes for 30 seconds when KautoSaveFile writes
this large amount of data to the disk every two minutes.

Even if the programme crashes, you only lose 20 minutes of your work,
which is not a big deal.

Thanks to Enzo for reporting it and finding the problem.
2025-08-18 14:04:27 +02:00
Pascal Sander
ee49086d03 QMenu must set a parent for correct position. #3 2025-08-17 17:48:29 +02:00
Pascal Sander
c31cab34e4 Check QAbstractItemModel for nullptr before access. #2 2025-08-17 10:33:04 +02:00
Evilscrack
a61d70e40e Merge branch 'qelectrotech:master' into master 2025-08-17 09:56:49 +02:00
Laurent Trinques
f43ce82052 Minor: m_autosave_sb QSpinbox set max 99 to 200 minutes
Change singlestep 1 to 10 enable accelerated function

See: https://qelectrotech.org/bugtracker/view.php?id=329
2025-08-17 08:47:19 +02:00
Laurent Trinques
707005879b Merge pull request #398 from ChuckNr11/master
Better handling of conductors when moving
2025-08-15 16:06:35 +02:00
achim
29c362fe4c Better handling of conductors when moving
For conductors, the setPos() function can result in negative
coordinates.
For unknown reasons, this can lead to an offset in the scene coordinate
system, resulting in a free space above and to the left of the drawing
frame. This free space could not be removed.

It is better to set the conductors using the conductor::updatePath()
function. If the conductor text has been moved by the user, the new
position of the text must be calculated.
It is important to position the elements first and then 'connect' the
conductors.
Setting the conductor position via setPos() was done in elemntsmover.cpp
(corrected here) and in Diagram::fromXML (corrected in the commit
'Better handling of conductors when creating from XML').
2025-08-14 22:03:05 +02:00
Pascal Sander
dad637689d QScopedPointer removes QDrag to early and will still be accessed in another thread. #1 2025-08-13 20:01:22 +02:00
plc-user
0f179a5d49 add and correct English comments 2025-08-09 09:05:34 +02:00
plc-user
3a0546e638 add English comments / translate variable-names to English 2025-08-08 12:46:11 +02:00
Laurent Trinques
c9ea538999 Merge pull request #395 from ChuckNr11/master
A few small improvements
2025-08-05 15:02:25 +02:00
achim
96d84bf852 Better handling of conductors when creating from XML
The position of a conductor is determined by the two terminals the
conductor connects. Therefore, it makes no sense to set the position
with 'setPos()'.

It is better to first load all elements (but not the conductors),
position them if necessary, and only then load the conductors and assign
them to the elements (terminals).
2025-08-03 01:04:37 +02:00
achim
0a6efa466e Correcting dynamicElementTextItem alignment on copying
When copying and pasting selected areas, right-aligned dynamic text in
report and slave elements was not displayed correctly. The text
insertion point was always shifted to the left by the text width.

To correct this, the insertion point of dynamicElementTextItems is reset
to its origin insertion point before writing to clipboard.
2025-08-02 23:27:09 +02:00
achim
f20ea041b6 correcting the visibility of Variables in CompositeText
When using composite text in report elements, the name of the variable
was displayed when inserting the reportElement into the drawing (e.g.
%{function}). This is corrected here.
Add missing variables to assignvariables.cpp
2025-08-02 22:16:12 +02:00
Laurent Trinques
fb01e51bbb Try to fix symbolic links are resolved to "ordinary" files for both macOS-Packages,
thanks plc-user
7244e4a59c (commitcomment-162938064)
2025-08-01 10:29:46 +02:00
Laurent Trinques
5f252fbd00 Revert "Remove symbolic links"
This reverts commit 22f8034ddb.
2025-08-01 10:26:03 +02:00
Laurent Trinques
22f8034ddb Remove symbolic links 2025-07-27 13:27:11 +02:00
Laurent Trinques
60b013786d git submodule update --remote pugixml 2025-07-26 09:49:56 +02:00
Laurent Trinques
55b2ab797d git submodule update --remote SingleApplication to new release v3.5.3 2025-07-26 09:46:31 +02:00
Laurent Trinques
4726db5f15 git submodule update --remote elements 2025-07-20 12:48:10 +02:00
Laurent Trinques
704aa6cbdb Add qet ts file for Serbian translation 2025-07-20 12:45:13 +02:00
joshua
1607c7f5dc Minor : improve behavior when rotate terminal part.
iIn the element editor, every rotation is made around the center of the
scene, this is usefull when rotate several part but less when only one
need to be rotated, especially when it is the terminal part and we only
want to change the orientation.
This commit solve it. Now when only a terminal part is selected, the
terminal don't rotate around the center of the scene but change the
orientation.

The rotation, flip and mirror of parts are good features but always
rotate around the center of the scene and if the parts are far from the
center of the scene the behavior look inappropriate from the POV of user
(because parts move far from original position and can out of the view).
A good new features should be to solve it (rotate around the center of
the bounding rect of the selection) and probably extract the function
rotate/flip/mirror from the parts class and create a new class with for
only goal to calculate and apply these modifiaction trough an undo
command.
2025-07-15 22:47:33 +02:00
plc-user
07c6ac6c9f correct some English comments 2025-07-09 15:23:01 +02:00
Laurent Trinques
acb4b21070 Update packaging_script_AppImage_aarch64.sh 2025-06-13 16:03:35 +02:00
Laurent Trinques
1e7660fcab Update packaging_script_AppImage_aarch64.sh 2025-06-13 13:06:21 +02:00
plc-user
6586fa3f91 adjust English translation 2025-06-01 11:14:57 +02:00
plc-user
7244e4a59c use symbolic links to collect all licenses in one directory and adjust sourcecode 2025-06-01 11:03:49 +02:00
plc-user
1868f91ff8 use symbolic links to collect all licenses in one directory and adjust sourcecode 2025-06-01 11:01:32 +02:00
plc-user
0b1491b59a fix typo in German translation 2025-06-01 08:52:46 +02:00
Laurent Trinques
7495901d07 macOS add licenses folder in BUNDLE/Contents/Resources/licenses 2025-05-31 12:51:23 +02:00
Laurent Trinques
33445de6c0 Try to add embed fonts for macOS 2025-05-31 12:31:03 +02:00
plc-user
5ba984be56 add copyright-sign to about-dialog 2025-05-30 10:49:32 +02:00
Laurent Trinques
ab03530a14 git submodule update --remote elements 2025-05-30 10:01:03 +02:00
plc-user
1b671990ee prevent crash, when adding text to element in diagram-editor 2025-05-30 09:42:22 +02:00
plc-user
ce18bd1666 use "%" for string-concatenation (less memory-usage) 2025-05-30 09:40:11 +02:00
plc-user
e371fe9845 add font-links to about-dialog – tab "libraries" 2025-05-22 22:35:09 +02:00
plc-user
ad29893842 use "%" for string-concatenation
Qt-Docs says it's less memory-usage...
2025-05-22 21:33:32 +02:00
plc-user
3a8e6b16f5 update osifont (-medium) from upstream 2025-05-22 19:15:47 +02:00
Laurent Trinques
6dbc1cd392 git submodule update --remote elements 2025-05-22 09:08:10 +02:00
plc-user
c7ed744481 Include some fonts to QElectroTech
- include Liberation-Fonts and osifont
  (thanks elevatormind!)
- use "Liberation Sans" as default-font
- adjust License-Tab in About-Form
- Bugfix: When selecting a font, the current
  font is highlighted in dialog
- adjust some whitespace and English comments
2025-05-18 14:15:20 +02:00
plc-user
cf39ae2417 Include some fonts to QElectroTech
- include Liberation-Fonts and osifont
  (thanks elevatormind!)
- use "Liberation Sans" as default-font
- adjust License-Tab in About-Form
- Bugfix: When selecting a font, the current
  font is highlighted in dialog
- adjust some whitespace and English comments
2025-05-18 13:54:31 +02:00
Laurent Trinques
b82a05881a Update packaging_script_AppImage_aarch64.sh 2025-05-16 14:57:31 +02:00
Laurent Trinques
8082274e41 Add packaging_script_AppImage_aarch64.sh 2025-05-11 16:35:22 +02:00
Laurent Trinques
f16d48ec67 Update org.qelectrotech.QElectroTech.json 2025-05-06 11:11:11 +02:00
Laurent Trinques
c259832de4 git submodule update --remote elements 2025-05-04 15:54:06 +02:00
Laurent Trinques
80c0831361 Update org.qelectrotech.QElectroTech.json 2025-04-28 11:35:58 +02:00
plc-user
4e4a26a410 added Chinese translations to titleblocks 2025-04-27 11:45:55 +02:00
plc-user
f2674a0a46 added Chinese translations to default-titleblock 2025-04-27 11:08:28 +02:00
Laurent Trinques
64ace66f8b Update MacQetDeploy_arm64.sh 2025-04-17 16:07:37 +02:00
plc-user
d007035237 whitespace and comment 2025-03-28 20:21:09 +01:00
plc-user
c1559d2a99 Fix signal for KColorButton 2025-03-28 20:16:37 +01:00
plc-user
936a27500c BugFix: Font for titleblock was hardcoded to Sans Serif
Because of a typo it was never read from settings.
2025-03-23 07:25:37 +01:00
Laurent Trinques
31aaf50572 Merge pull request #388 from Bisku/master
qet_de updated
2025-03-16 09:26:49 +01:00
Bisku
81ec28d1cf Update of qet_de
Translation error fixed.
2025-03-15 21:11:02 +01:00
Laurent Trinques
3bbb6385b8 Merge pull request #387 from plc-user/master
only calculate grid-point-size, when min != max
2025-03-15 18:45:16 +01:00
plc-user
757df90951 minor: added some English comments 2025-03-13 21:05:21 +01:00
plc-user
eeb453f120 only calculate grid-point-size, when min != max 2025-03-13 20:46:04 +01:00
Laurent Trinques
6afd9fe48d Merge pull request #386 from elevatormind/master
Mouse hover text for dynamic text items
2025-03-13 11:07:40 +01:00
Laurent Trinques
6eff69bc6b Merge pull request #384 from plc-user/master
improvement: adjust size of grid-dots with zoom-factor
2025-03-13 11:06:30 +01:00
Magnus Hellströmer
c9304892e0 Mouse hover text for dynamic text items
- Added text for dynamic text item to indicate that shift needs to be held down to move the text.
2025-03-12 21:16:25 +01:00
plc-user
59f547b4a2 unify German wording 2025-03-08 15:16:33 +01:00
plc-user
0084dcf289 fix typo with function-name 2025-03-07 20:53:07 +01:00
plc-user
0804d3524a improvement: ajust size of grid-dots with zoom-factor
Introduced additional spinboxes in config-page for
setting min- and max-size of grid-dots separately for
diagram- and element-editor.
That assures maximal flexibility for setting the grids.
Don't want the grid-dots to change over zooming-levels?
Set min- and max-values to the same number.
Preset-values for all min-/max-values is "1".
If the adjustable range of 1 to 5 is not sufficient, it
can be easily adjusted. Only need feedback for this.
2025-03-07 20:16:21 +01:00
plc-user
2b0dd1b188 comments and whitespace 2025-03-07 18:13:53 +01:00
Laurent Trinques
3c2c889922 Merge pull request #383 from plc-user/master
adjust zoom-factor to use cosmetic-line and fixed comments
2025-03-07 11:07:31 +01:00
plc-user
27cff81ee7 adjust zoom-factor to use cosmetic-line and fixed comments 2025-03-07 10:58:47 +01:00
Laurent Trinques
40a7995993 Merge pull request #382 from plc-user/master
element-editor: fix jumping positions when rotate, mirror or flip
2025-03-07 07:57:16 +01:00
plc-user
45afd9af0e element-editor: fix jumping positions when rotate, mirror or flip 2025-03-07 07:43:20 +01:00
Laurent Trinques
20b7e1763d Merge pull request #379 from plc-user/master
unify some more code for Qt5 & Qt6 (and more)
2025-03-07 06:35:07 +01:00
plc-user
9044d532ac corrected English comments 2025-03-06 08:07:49 +01:00
plc-user
50efc318e0 change to run code with Qt5 & Qt6 as described in forum 2025-03-06 08:06:36 +01:00
plc-user
e4d2dbd2a6 a minor change is enough to run code in Qt5 & Qt6 - no need to differentiate anymore 2025-03-05 15:24:07 +01:00
plc-user
ddf40854dc fix comment 2025-03-05 11:54:58 +01:00
plc-user
ef0fa6e7ac same change for polygons as for other primitives to support Qt5 & Qt6 2025-03-05 09:49:16 +01:00
plc-user
237c21bad8 use same code for Qt5 & Qt6 for XRef-list 2025-03-05 07:05:12 +01:00
plc-user
260ce2a8bc unify NamesList "imported elements" to be used with Qt5 & Qt6; still need to decide whether to use list of QChars or written text in utf-8; kept both variants for now... 2025-03-05 07:03:38 +01:00
plc-user
6199367166 remove unused NamesList from qetproject.* 2025-03-05 06:59:09 +01:00
plc-user
d073e810b8 set default-value for QFont::Weight to prevent warning at runtime 2025-03-05 06:55:14 +01:00
Laurent Trinques
a1572be8fa Merge pull request #377 from plc-user/master
same simplifications as in #376 "use the same code for Qt5 & Qt6"
2025-03-04 15:09:20 +01:00
plc-user
6c52d95201 same simplifications as in #376 "use the same code for Qt5 & Qt6" 2025-03-03 22:41:44 +01:00
Laurent Trinques
d3463def98 Merge pull request #376 from plc-user/master
simplify and use the same code for Qt5 & Qt6
2025-03-03 06:16:21 +01:00
plc-user
4009e6aaab simplify and use the same code for Qt5 & Qt6
When reading and comparing Qt5-docs and Qt6-docs, I read,
that there are no differences in the functions!
So it is not necessary to have the differentiation
between the Qt-Versions.
Code compiles without errors or warnings for Qt5 and Qt6.
2025-03-02 18:56:34 +01:00
Laurent Trinques
6ff518ec3b Merge pull request #375 from plc-user/master
bordertitleblock: use same code for Qt5 & Qt6 for "numbering" rows
2025-03-02 09:53:11 +01:00
plc-user
513927424f bordertitleblock: use same code for Qt5 & Qt6 for "numbering" rows 2025-03-02 08:48:19 +01:00
Laurent Trinques
864a3f166f Merge pull request #374 from plc-user/master
some minor changes
2025-03-01 07:19:28 +01:00
plc-user
6111d8ca2c only write author-information, if available 2025-02-28 21:08:12 +01:00
plc-user
e0b26592c7 fix typos 2025-02-28 20:36:38 +01:00
plc-user
a17ceaba85 sort names in desktop-file by alphabet 2025-02-28 20:27:00 +01:00
plc-user
e987d8c271 fix typo in variable-name 2025-02-28 20:25:31 +01:00
Laurent Trinques
74e6657ca5 Add translations FR 2025-02-28 17:35:57 +01:00
Laurent Trinques
e1d15f3b77 Merge pull request #372 from plc-user/master
implement setting of point-size of grids
2025-02-28 17:30:58 +01:00
plc-user
81f51b3d58 update language-files 2025-02-28 16:55:18 +01:00
plc-user
a36de7de74 implement variable point-size of grid 2025-02-28 16:33:24 +01:00
plc-user
15ae8b0058 fix typo of variable 2025-02-28 16:02:58 +01:00
Laurent Trinques
e66061fdca Merge pull request #370 from plc-user/master
some small changes for selective move
2025-02-28 09:57:41 +01:00
plc-user
e2e84a56f7 limit movement to int-values to be able to re-position to original position 2025-02-28 07:40:59 +01:00
plc-user
565374f174 additional ControlModifier does not work here as expected 2025-02-28 07:36:53 +01:00
plc-user
7bdca47d8e use brackets to be more clear what is meant 2025-02-28 07:33:17 +01:00
Laurent Trinques
f0c954329f git submodule update --remote elements 2025-02-25 16:49:12 +01:00
Laurent Trinques
e99ad6b424 Merge pull request #369 from prescott66/patch-1
Added slovak translation to org.qelectrotech.qelectrotech.desktop
2025-02-25 12:53:10 +01:00
Dušan Kazik
74460a6645 Added slovak translation to org.qelectrotech.qelectrotech.desktop
Added slovak translation for app name and comment.
2025-02-25 09:20:04 +01:00
Laurent Trinques
231a1c919a git submodule update --remote elements 2025-02-22 10:31:24 +01:00
Laurent Trinques
19c9d614e8 Merge pull request #367 from plc-user/master
unify calls to "setRotation" for element-primitives again
2025-02-22 10:18:14 +01:00
plc-user
43386aa14f unify calls to "setRotation" for element-primitives 2025-02-22 09:30:15 +01:00
plc-user
181680e6f1 add English comments 2025-02-22 09:20:46 +01:00
Laurent Trinques
667d25899f Merge pull request #364 from elevatormind/conductor_texts
New variables for conductor text formulas
2025-02-21 17:13:18 +01:00
Laurent Trinques
c9b9165911 Merge pull request #365 from elevatormind/selective_move
Added option to only move dynamic texts
2025-02-21 17:12:54 +01:00
Magnus Hellströmer
78ee65a21b Added option to only move dynamic texts 2025-02-19 21:33:29 +01:00
Magnus Hellströmer
68a2ddde18 New variables for conductor text formulas 2025-02-19 20:26:53 +01:00
Laurent Trinques
8c3343795a Merge pull request #362 from pkess/fix_typo
Fix typo widht to width
2025-02-19 15:54:59 +01:00
Peter Kessen
2097b24d37 Fix typo for variable 2025-02-18 20:14:51 +01:00
Peter Kessen
5351746dc7 Fix typo within settings entry 2025-02-18 20:13:10 +01:00
Laurent Trinques
1af3c5b852 Merge pull request #361 from plc-user/master
element-editor: add mirror and flip for "text"
2025-02-18 06:27:14 +01:00
plc-user
c2a2e5f5eb minor: whitespace and comments 2025-02-17 19:45:53 +01:00
plc-user
dc836248f0 element editor: add mirror and flip for “text”
Maybe not (yet) perfect, but it looks pretty good to me!

Why am I doing this to myself?
All this crap with fonts and stuff!
It's been crap for as long as I can remember.
2025-02-17 19:39:53 +01:00
Laurent Trinques
a3bf2e2800 minor for Swedish translation
Add translation for Imported elements in QET project widget
2025-02-17 16:00:46 +01:00
Laurent Trinques
83f960a983 Merge pull request #360 from elevatormind/lang_sv
Add Swedish translation
2025-02-17 15:42:25 +01:00
Laurent Trinques
c223121f00 git submodule update --remote elements 2025-02-17 15:30:42 +01:00
plc-user
0f647a5c38 fix: do not add "kindInformations" for thumbnail-elements 2025-02-17 09:48:51 +01:00
plc-user
67112bf8e5 fix typo in enum-entry and comments 2025-02-17 09:33:35 +01:00
Laurent Trinques
1b60f7c52a Merge pull request #359 from pkess/linux_installer
German text for launcher and debian package code style
2025-02-17 06:36:55 +01:00
Magnus Hellströmer
9a96eb914d Updated qet_sv.qm 2025-02-16 20:59:02 +01:00
Magnus Hellströmer
bf8723015a Update swedish translation 2025-02-16 20:54:15 +01:00
Magnus Hellströmer
82d7bbda68 Added swedish language 2025-02-16 20:54:15 +01:00
Peter Kessen
0df3ecb5f7 Edit german translation 2025-02-16 19:57:56 +01:00
Peter Kessen
1e27cac8c5 Remove trailing whitespace 2025-02-16 19:57:07 +01:00
Laurent Trinques
16dea9f3de Update Polish translation, thanks Paweł 2025-02-16 17:49:15 +01:00
Laurent Trinques
20e852cbaf Merge pull request #358 from plc-user/master
some more rotation, mirror and flip
2025-02-16 17:24:33 +01:00
plc-user
51225d5f59 element-editor: add rotation with smaller increments for "line", "polygon", "text" and "dynamic_text" with shortcut <Ctrl>+<Space> 2025-02-16 16:31:18 +01:00
plc-user
3fc5469aee element-editor: add mirror and flip for "dynamic_text" 2025-02-16 16:15:46 +01:00
plc-user
6fdc243552 fix indention - no code-change 2025-02-16 15:43:58 +01:00
plc-user
da109b1522 element-editor: add rotation-functions to "text" and "dynamic_text" 2025-02-16 15:42:33 +01:00
plc-user
2aeae1fe46 use Qt-functions to rotate lines and polygons 2025-02-16 15:28:15 +01:00
plc-user
e98ce4de1d add English comments 2025-02-16 10:02:19 +01:00
plc-user
da0951d5a0 fix typo in variable-name (mixture of French and English) 2025-02-15 20:36:21 +01:00
Laurent Trinques
0be9e2beae minor add qInfo-Text "SQLite version: " 2025-02-15 17:10:39 +01:00
Laurent Trinques
52946f9e3a Merge pull request #357 from plc-user/master
BugFix: Flip and Mirror of terminals
2025-02-15 09:35:10 +01:00
plc-user
007ce79cee BugFix: Flip and Mirror of terminals 2025-02-15 09:13:56 +01:00
Laurent Trinques
5aee30edee Merge pull request #356 from plc-user/master
element-editor: fix rotation and more
2025-02-15 08:21:44 +01:00
plc-user
b9a8dc0918 fix typo in translation 2025-02-14 20:57:30 +01:00
plc-user
bd3b39cea3 element-editor: fix rotation, add mirror, add flip for graphical primitives
Now that the problem with the translations of keyboard shortcuts has been resolved and rotation using the space bar works reliably in principle, I took a closer look at the rotation function itself in the element editor.

I noticed, for example, that arcs can be rotated at an angle of 15°. This doesn't really make sense, as the “arc” part doesn't have the “rotation” property. There is only width and height.
And somehow rotating arcs didn't work well: start- and span-angles weren't adjusted.

Lines and polygons can be rotated in 15° increments, which doesn't make much sense, if other parts that can only be rotated in 90° increments are selected at the same time.

To make a long story short:
I reworked the rotation functions of the graphical parts so that now all parts are rotated in 90° steps around the origin! This means that it is now possible to mark several parts and rotate them around the same point at the same time!

In addition, the functions for mirroring graphic parts at y-axis (shortcut "M") and flipping at x-axis (shortcut "F") have been implemented.

I have saved the text elements for later!
(or someone else)
2025-02-14 20:31:03 +01:00
plc-user
fc286cca22 fix one last hardcoded shortcut-translation 2025-02-14 19:52:39 +01:00
plc-user
4d5af028be menu: move "About QElectroTech" in Help-Menu to bottom
If the version number of QElectroTech is requested in the forum in case of error messages or anomalies, the Qt version used is very often stated because the entry “About QElectroTech” does not appear very prominently in the help menu: The entry “About Qt” is used much more frequently because it appears eye-catchingly as the lowest entry. However, specifying the Qt version is often not helpful for troubleshooting: We need the QET version!
That's why I'm moving the “About QElectroTech” entry to the bottom, so that it is easier to see and find!
2025-02-14 19:47:19 +01:00
Laurent Trinques
9afc97108b Merge pull request #355 from plc-user/master
minor: mostly typos
2025-02-14 17:39:43 +01:00
plc-user
a4a3733670 typos, whitespace and brackets 2025-02-14 16:59:23 +01:00
plc-user
3471140b64 fix typo in fuction-name (looked like a mixture of French and English) 2025-02-14 16:47:39 +01:00
Laurent Trinques
43f0107eb1 Revert "Try Clazy fix-its"
Segfault on old Qt versions!
This reverts commit dba7caed30.
2025-02-14 16:17:58 +01:00
Laurent Trinques
dba7caed30 Try Clazy fix-its
clazy is a compiler plugin which allows clang to understand Qt
semantics. You get more than 50 Qt related compiler warnings, ranging
from unneeded memory allocations to misusage of API, including fix-its
for automatic refactoring.

https://invent.kde.org/sdk/clazy
2025-02-14 15:52:23 +01:00
Laurent Trinques
adcf77e34a Replacing modules includes <QtConcurrent> with QtConcurrentRun and
QtConcurrentMap

Signed-off-by: Laurent Trinques <scorpio@qelectrotech.org>
2025-02-14 14:07:41 +01:00
Laurent Trinques
59236170b2 Merge pull request #354 from plc-user/master
a few translated shortcuts were still there ... fixed!
2025-02-13 08:14:09 +01:00
plc-user
3d82aff4e7 FIX: shortcut for rotation in element-editor was hardcoded in UI 2025-02-12 15:35:45 +01:00
plc-user
516eb9eb45 fixed English comments 2025-02-12 14:02:30 +01:00
plc-user
0b80d1b5b9 a few translated shortcuts were still there ... fixed! 2025-02-12 13:41:39 +01:00
Laurent Trinques
073e4080fd Merge pull request #353 from plc-user/master
FIX: some shortcuts do not work with language set to local
2025-02-11 18:23:32 +01:00
plc-user
b512aee2bf update language-files 2025-02-11 15:55:24 +01:00
plc-user
38f5547228 use "positive logic" for conditional compiling 2025-02-11 14:43:18 +01:00
plc-user
317c90c769 do not hardcode translations for shortcuts: let the system do it for you! 2025-02-11 14:36:15 +01:00
Laurent Trinques
f308ea6b93 Merge pull request #352 from plc-user/master
fix movement of element, when origin is outside of graphics
2025-02-11 12:54:37 +01:00
plc-user
4808b04a31 fix movement of element, when origin is outside of graphics
When saving an element it is checked, if the origin (0/0)
is inside the graphical parts. If outside, the element is
moved by integer values for x- and y-offset before saving.
Old calculation for offset could lead to "strange" new
values for positions.

Additionally: fix typos and English comments
2025-02-11 11:46:36 +01:00
Laurent Trinques
3a43fbfa61 Merge pull request #351 from plc-user/master
FIX copy-and-paste in element-editor: set paste-position to meaningful values
2025-02-11 06:41:40 +01:00
plc-user
29aee8e80c copy-and-paste: set paste-position to meaningful values 2025-02-10 18:33:49 +01:00
plc-user
717b257fa0 added English comments 2025-02-10 18:26:14 +01:00
plc-user
13f432571d comments: fixed typos and added English comments 2025-02-09 17:51:15 +01:00
Laurent Trinques
610f4d6dfa Merge pull request #350 from plc-user/master
some cleaning for element-file
2025-02-09 13:32:59 +01:00
plc-user
a20d02f5f0 element-editor: remove leading and trailing whitespace from author-info 2025-02-09 12:43:35 +01:00
plc-user
1fc33aa1ba element-editor: limit decimal places for sizes and positions to two, when saving file 2025-02-09 12:33:24 +01:00
plc-user
706eba6612 fix typos and whitespace 2025-02-09 12:25:09 +01:00
Laurent Trinques
f675ce3452 git submodule update --remote elements 2025-02-08 10:56:36 +01:00
Laurent Trinques
3ae47a714d Merge pull request #348 from plc-user/master
fix: properties in project-file
2025-02-08 10:33:37 +01:00
plc-user
58aae63616 sorted translations \“imported elements\” in sourcecode and added some for Qt6 2025-02-08 07:45:48 +01:00
plc-user
b8e4fca09f fix: remove empty elementInformation, but keep empty properties 2025-02-08 07:39:21 +01:00
Laurent Trinques
075289797a Merge pull request #347 from plc-user/master
translation: update German and English
2025-02-08 07:11:13 +01:00
plc-user
f26733f34e translation: update German and English 2025-02-07 20:47:16 +01:00
Laurent Trinques
ba9fea3fd1 Merge pull request #346 from plc-user/master
export: set maximum width / height according limitations in QPainter
2025-02-07 15:16:40 +01:00
plc-user
bbbf77597a export: set maximum width / height according limitations in QPainter 2025-02-07 11:34:05 +01:00
Laurent Trinques
1cf156c47a Merge pull request #345 from plc-user/master
export: set maximum width / height according specifications of export-type
2025-02-06 16:11:36 +01:00
plc-user
924d1c1b05 use "static const" - variables instead of multiple times values in source-code
use multiplication-sign "×" instead of asterisk "*" between widht and height
2025-02-06 15:16:19 +01:00
plc-user
33570ffceb export: set maximum width / height according specifications of export-type 2025-02-06 12:58:32 +01:00
Laurent Trinques
40b7aa999f git submodule update --remote elements 2025-02-06 07:18:42 +01:00
Laurent Trinques
c9ba7bee6c ExportDialog increase spinBox limit 10 000px to 100 000px
See: https://qelectrotech.org/forum/viewtopic.php?pid=21002#p21002
2025-02-06 07:12:56 +01:00
Laurent Trinques
7466793e71 Merge pull request #344 from plc-user/master
some clean-up for element-file and in code
2025-02-05 19:26:24 +01:00
plc-user
408481a023 some clean-up for "elementInformations" in element-file
- for some time now and for whatever reason, element-editor
  sometimes adds element-information without content –> do not
  save info-lines without any content
- sort element-information alphabetically by name in element-file
- use trimmed strings for element-information to remove leading
  and trailing whitestpace
2025-02-05 13:11:37 +01:00
plc-user
b0324bd6e8 fix typo 2025-02-05 12:58:49 +01:00
plc-user
812ac83ab6 NamesList: move while-loop into "else"-clause, to be more precise and added english text to comments 2025-02-05 12:57:50 +01:00
Laurent Trinques
d1c6fb7e3c Merge pull request #343 from plc-user/master
minor: typos, comments, whitespace, translation
2025-02-04 18:15:26 +01:00
plc-user
9dad6963cb minor: typos, comments, whitespace, translation 2025-02-04 13:48:35 +01:00
Laurent Trinques
28df44d1ba Merge pull request #342 from plc-user/master
Sort names in element-file by language-code
2025-02-04 12:56:03 +01:00
plc-user
25a81f24fa NamesList: Use ‘Qmap’ instead of ‘Qhash’
to automatically sort the names of an element by
language code before saving the element-file.
Added English comment in header-file.
2025-02-03 13:23:32 +01:00
plc-user
7a39e69a32 element-name: if no name is set, set to "en" / "NoName" (also adjusted comment) 2025-02-03 13:03:55 +01:00
Laurent Trinques
af33719995 Merge pull request #341 from plc-user/master
more precise Log-Text for search of "qet_tb_generator"
2025-02-02 15:48:48 +01:00
Laurent Trinques
4c12b3c679 Flatpak upgrade tkinter git to update to python 3.11 2025-02-02 15:16:53 +01:00
plc-user
e1dc978f97 more precise Log-Text for search of "qet_tb_generator" to avoid misunderstandings 2025-02-02 14:48:38 +01:00
Laurent Trinques
1b2d8061a5 Merge pull request #340 from plc-user/master
machine_info: add entry for QETApp::configDir() also for win
2025-02-02 13:34:42 +01:00
plc-user
b0f0a56a88 machine_info: add entry for QETApp::configDir() also for win
We use QETApp::configDir() to save configuration-files (*.json)
for creating BOM, nomenclature, etc. during runtime.
So it's interesting for win-users, too, which configDir is used.
2025-02-02 12:49:59 +01:00
Laurent Trinques
d6d38141c9 Merge pull request #339 from plc-user/master
remove dead code (local variables that were never used)
2025-02-02 12:24:19 +01:00
plc-user
331cecc05c remove dead code (local variables that were never used) 2025-02-02 12:16:28 +01:00
Laurent Trinques
de0fa1fa20 Merge pull request #338 from plc-user/master
minor changes
2025-02-01 12:49:43 +01:00
plc-user
1698e062ab remove dead code (local variables that were never used) 2025-02-01 08:52:07 +01:00
plc-user
3051c225bb minor: typos, witespace, comments 2025-02-01 08:49:12 +01:00
Laurent Trinques
ffef9aaea5 Merge pull request #337 from Bisku/de_translation
Update of qet_de
2025-01-31 15:52:37 +01:00
Bisku
9fc270c8a8 Aktualisierung 2025-01-30
Aktualisierung auf aktuelle Version
2025-01-31 14:41:10 +01:00
Laurent Trinques
2c8797415c Merge pull request #335 from plc-user/master
rewrite code for executing “qet_tb_generator” plugin
2025-01-30 10:20:24 +01:00
plc-user
8162da1515 reorder search-paths and added currentPath() 2025-01-30 08:30:11 +01:00
plc-user
3cadc9275e improve readability 2025-01-30 07:25:30 +01:00
plc-user
a459029f0d simplify code even more... 2025-01-30 00:15:09 +01:00
plc-user
9dda9f890f close the process in any case 2025-01-29 22:27:56 +01:00
plc-user
9be2ed604e moved "#endif" to always close process and adjusted qInfo-Text 2025-01-29 22:15:36 +01:00
plc-user
a450680f6e rewrite code for executing “qet_tb_generator” plugin
Now it's better readable and maintainable up to the moment
we have our own internal Terminal-Manager for productive use.
Additionally added the storage location “dataDir()/binary”,
so that the new structure for the separation of
configuration and data can be properly kept
2025-01-29 21:57:38 +01:00
Laurent Trinques
22e6188bb6 Merge pull request #333 from plc-user/master
corrected a few places where QETApp::documentDir() should also be used
2025-01-29 14:38:25 +01:00
Laurent Trinques
9d83d3180a Merge pull request #334 from zultron/zultron/2025-01-29_Fix_snap_qet_tb_generator
build-aux/snap/snapcraft.yaml:  python3.8 -> 3.10
2025-01-29 13:31:46 +01:00
John Morris
09c87cf811 build-aux/snap/snapcraft.yaml: python3.8 -> 3.10
Fix traceback when selecting "Project" menu "Launch the terminal block
creation plugin" item:

    Traceback (most recent call last):
      File "/snap/qelectrotech/1973/bin/qet_tb_generator", line 33, in <module>
        sys.exit(load_entry_point('qet-tb-generator==1.3.1', 'console_scripts', 'qet_tb_generator')())
      File "/snap/qelectrotech/1973/bin/qet_tb_generator", line 25, in importlib_load_entry_point
        return next(matches).load()
      File "/usr/lib/python3.10/importlib/metadata/__init__.py", line 171, in load
        module = import_module(match.group('module'))
      File "/usr/lib/python3.10/importlib/__init__.py", line 126, in import_module
        return _bootstrap._gcd_import(name[level:], package, level)
      File "<frozen importlib._bootstrap>", line 1050, in _gcd_import
      File "<frozen importlib._bootstrap>", line 1027, in _find_and_load
      File "<frozen importlib._bootstrap>", line 1006, in _find_and_load_unlocked
      File "<frozen importlib._bootstrap>", line 688, in _load_unlocked
      File "<frozen importlib._bootstrap_external>", line 883, in exec_module
      File "<frozen importlib._bootstrap>", line 241, in _call_with_frames_removed
      File "/snap/qelectrotech/1973/lib/python3.10/site-packages/src/main.py", line 98, in <module>
        import src.PySimpleGUI as sg
      File "/snap/qelectrotech/1973/lib/python3.10/site-packages/src/PySimpleGUI.py", line 95, in <module>
        import tkinter as tk
    ModuleNotFoundError: No module named 'tkinter'
2025-01-29 00:22:17 -06:00
plc-user
bdee8e3e36 set default search-path of non-standard locations of collections and titleblocks (common, company and user) also to QETApp::documentsDir() 2025-01-28 19:01:32 +01:00
plc-user
30a6221e45 remove unused function 2025-01-28 18:56:16 +01:00
plc-user
9f8287206b fix: "dxf2elmt" and "QET_ElementScaler" also read imported files from QETApp::documentDir() by default 2025-01-28 18:44:19 +01:00
Laurent Trinques
bb770ae4f1 Merge pull request #332 from plc-user/master
add commandline-parameter "--data-dir"
2025-01-28 15:04:47 +01:00
plc-user
d971da5ac7 add commandline-parameter "--data-dir" 2025-01-27 21:48:36 +01:00
Laurent Trinques
e9d2c13630 Merge pull request #331 from plc-user/master
machine_info: fix element-count and make static text a bit shorter
2025-01-27 17:58:22 +01:00
plc-user
c01549f315 machine_info: write configured directories to log\n(may have been changed with commandline-parameters) 2025-01-27 17:38:06 +01:00
plc-user
39e287f60d machine_info: fix element-count and make static text a bit shorter 2025-01-27 17:04:26 +01:00
Laurent Trinques
11e3f91029 Merge pull request #330 from plc-user/master
formatting / whitespace - unify declarations
2025-01-26 14:45:36 +01:00
Laurent Trinques
1ac324242a Polish 2025-01-26 14:44:47 +01:00
plc-user
940ae0c34a formatting / whitespace - unify declarations 2025-01-26 14:29:52 +01:00
Laurent Trinques
7a19756f13 Polish 2025-01-26 14:27:02 +01:00
Laurent Trinques
3b24bd25c7 Merge pull request #329 from plc-user/master
Set default-location for projects to documents-dir.
2025-01-26 12:43:00 +01:00
Laurent Trinques
a73452bf6d Polish 2025-01-26 12:31:10 +01:00
Laurent Trinques
24165ee8ee Machine info ; try to Count *elmt Files in alls collections
(include subfolders)
2025-01-26 12:16:46 +01:00
plc-user
4c7cc9a110 adjust comments 2025-01-26 11:55:52 +01:00
plc-user
79f894a327 Set default-location for projects to documents-dir.
All export files that are derived from the project (BOM,
nomenclature, etc.) are saved in the same directory by default.
In this context, the standard directories have been grouped
together in qetapp.cpp / qetapp.h so that only one place needs
to be searched for in case of any adjustments.
2025-01-26 11:32:46 +01:00
Laurent Trinques
f26e936ea9 Polish 2025-01-26 10:48:50 +01:00
Laurent Trinques
1ddfe1d433 Polish 2025-01-26 08:43:07 +01:00
Laurent Trinques
194edbd799 Machine info : try to fix FTFS under Windows 2025-01-25 20:29:11 +01:00
Laurent Trinques
162c402102 Minor 2025-01-25 20:09:31 +01:00
Laurent Trinques
c6427cbfc1 Fix previuois commit 2025-01-25 19:54:41 +01:00
Laurent Trinques
c4b6939ed6 machine_info.cpp: Minor 2025-01-25 19:37:39 +01:00
Laurent Trinques
2436daa16f machine_info.cpp: Minor 2025-01-25 19:03:33 +01:00
Laurent Trinques
4050e8351e machine_info.cpp: Minor 2025-01-25 14:23:51 +01:00
Laurent Trinques
d6f119742d machine_info.cpp: Minor 2025-01-25 14:15:30 +01:00
Laurent Trinques
3e4f3def3e machine_info.cpp: add more informations about OS language and country 2025-01-25 14:00:57 +01:00
Laurent Trinques
4aff7d1a1d Merge pull request #328 from plc-user/master
machine_info.cpp: add explaining text for directory-list
2025-01-25 07:01:18 +01:00
plc-user
d451bd4df5 machine_info.cpp: add explaining text for directory-list 2025-01-24 21:19:45 +01:00
Laurent Trinques
2cc5de6f7c Merge pull request #327 from plc-user/master
set config- and data-dir to system-specific paths
2025-01-24 13:48:11 +01:00
plc-user
661530030a Update machine_info.cpp
second try to resolve PR-conflict
2025-01-24 13:28:52 +01:00
plc-user
620aa665f2 Update machine_info.cpp
try to resolve PR-conflict
2025-01-24 13:25:57 +01:00
Laurent Trinques
8f23a3d94d Improve logs in machine info 2025-01-24 11:49:53 +01:00
Laurent Trinques
c343df3fc9 Minor 2025-01-24 11:12:36 +01:00
plc-user
d7ac2af4d6 use QETApp::dataDir() instead of QStamdardPaths 2025-01-24 08:35:03 +01:00
plc-user
ec7ba05ec1 adjust info-text 2025-01-24 07:19:36 +01:00
plc-user
600cba6a8f update comment 2025-01-24 07:10:36 +01:00
plc-user
4221bb84fb create "AppDataLocation" if not present 2025-01-24 07:02:57 +01:00
plc-user
b6d29fbbf0 update comment 2025-01-24 06:56:04 +01:00
plc-user
635af67100 "writableLocation" is a QString 2025-01-23 20:20:17 +01:00
plc-user
ba9cd71816 set config- and data-dir to system-specific paths 2025-01-23 18:47:10 +01:00
Laurent Trinques
b19fbd2522 Minor 2025-01-23 17:25:36 +01:00
Laurent Trinques
dc403e5e8f Machine info: add new informations about config 2025-01-23 16:34:48 +01:00
Laurent Trinques
be96da650c Maichine info: add new QStandardPaths 2025-01-23 12:35:03 +01:00
Laurent Trinques
cf9b07aeb5 Update qet_cs.ts binary 2025-01-16 08:22:17 +01:00
Laurent Trinques
6aa2c3c7be Merge pull request #326 from pafri/patch-1
Update qet_cs.ts
2025-01-16 08:19:59 +01:00
pafri
17788dc432 Update qet_cs.ts
I've updated the translation of the Czech localization file. Please commit it.

Greetings.
2025-01-15 19:49:47 +01:00
Laurent Trinques
9bfde721bf Update pugixml to v1.15 2025-01-12 16:39:33 +01:00
Laurent Trinques
9964eee202 Merge pull request #324 from plc-user/master
update German translation
2025-01-09 11:49:53 +01:00
Laurent Trinques
03d31986b7 Update README.md 2025-01-09 05:23:56 +01:00
plc-user
33ce130296 update German translation 2025-01-08 16:17:52 +01:00
Laurent Trinques
e21536d184 git submodule update --remote elements 2025-01-05 14:09:04 +01:00
Laurent Trinques
ffba440c6e Rename (be) translation to Belgium-Flemish nl_BE 2025-01-05 13:55:48 +01:00
Laurent Trinques
ad997605ec Rename (be) translation to Belgium-Flemish nl_BE 2025-01-05 13:17:59 +01:00
Laurent Trinques
e2eace06d3 Merge pull request #323 from plc-user/master
fix copyright-year
2025-01-05 07:30:10 +01:00
plc-user
ed8728c45a fix copyright-year 2025-01-04 17:25:20 +01:00
Laurent Trinques
77bfe84a4c One year 2025-01-04 13:37:40 +01:00
Laurent Trinques
e053acb065 Add binary pt_BR translation 2025-01-03 06:50:24 +01:00
Laurent Trinques
b5d57086bc Merge pull request #322 from gleissonjoaquim3/master
PT-BR language update
2025-01-03 06:05:12 +01:00
gleissonjoaquim3
b456bedaa3 lang/qet_pt_BR.ts
PT-BR language update
2025-01-03 01:33:13 -03:00
Laurent Trinques
db18095cfb Merge pull request #319 from ChuckNr11/master
Change Sorting of ElementInfo ComboBox
2025-01-01 09:01:48 +01:00
Achim
3438ba9ab3 composite text of report element corrected
In the ElementEditor, incorrect variables were displayed for
CompositeText in ReportElements.  This is corrected here
2024-12-31 21:58:42 +01:00
Laurent Trinques
1078496bb1 Merge pull request #320 from plc-user/master
Fix: Only scroll diagram-view, when moved text leaves visible area
2024-12-31 16:04:26 +01:00
plc-user
711353bb58 Fix whitespace 2024-12-31 16:01:47 +01:00
plc-user
dd7955e50e Fix: Only scroll diagram-view, when moved text leaves visible area 2024-12-31 15:52:17 +01:00
Achim
7a617e72bd a few small corrections 2024-12-31 08:40:56 +01:00
Achim
e73aa3b84d ComboBox change sorting
alphabetical sorting in the ComboBox changed according to the order in
the elementInfoKeys list
2024-12-31 08:40:03 +01:00
Achim
8e0c3f4252 german language file adapted 2024-12-31 08:32:41 +01:00
Laurent Trinques
27474b0822 Refresh translation binary 2024-12-27 15:00:44 +01:00
Laurent Trinques
d6dcc85157 Update qet_be.ts 2024-12-27 14:59:06 +01:00
Laurent Trinques
b2dc6ba738 Add be-nl translation, thanks Ronny 2024-12-27 14:16:31 +01:00
Laurent Trinques
31ed09f185 Revert "Try to fix https://github.com/qelectrotech/qelectrotech-source-mirror/"
This reverts commit 3992c60c45.
2024-12-22 16:17:32 +01:00
Laurent Trinques
3992c60c45 Try to fix https://github.com/qelectrotech/qelectrotech-source-mirror/
pull/314
2024-12-22 14:25:30 +01:00
Laurent Trinques
fef351df8b Typo 2024-12-22 08:44:19 +01:00
Laurent Trinques
fa322af060 Merge pull request #317 from qelectrotech/revert-314-master
Revert "ElementEditor elmt_info_cb sorting changed"
2024-12-21 13:22:10 +01:00
Laurent Trinques
34cc26a325 Revert "ElementEditor elmt_info_cb sorting changed" 2024-12-21 12:59:43 +01:00
Laurent Trinques
ba14c6112e Merge pull request #316 from plc-user/master
Fix typo and some whitespace
2024-12-19 16:22:45 +01:00
Laurent Trinques
cb8256bd48 Add de binary translation, thanks ChuckNr11 for update translation 2024-12-19 10:52:13 +01:00
Laurent Trinques
3dd512b587 Merge pull request #314 from ChuckNr11/master
ElementEditor elmt_info_cb sorting changed
2024-12-19 10:41:58 +01:00
Laurent Trinques
31c0267cd5 Merge pull request #315 from plc-user/master
Fix missing company-titleblocks in properties-dialog
2024-12-19 09:58:37 +01:00
plc-user
88b2955b00 Fix typo and some whitespace 2024-12-18 16:48:11 +01:00
plc-user
46378ca2a7 Fix missing company-titleblocks in properties-dialog 2024-12-18 15:18:34 +01:00
Achim
c7481011e8 german language file adapted 2024-12-16 16:01:37 +01:00
Achim
15d9708c46 a few small corrections 2024-12-16 16:00:50 +01:00
Achim
3b32daf15d ComboBox change sorting
alphabetical sorting in the ComboBox changed according to the order in
the elementInfoKeys list
2024-12-16 15:55:16 +01:00
ChuckNr11
0a658d5d61 Merge branch 'qelectrotech:master' into master 2024-12-15 22:17:14 +01:00
Laurent Trinques
a140c5ad39 Update CMakeLists.txt
Some checks failed
Publish Edge Snap / publish_amd64 (push) Failing after 15s
2024-12-15 15:05:23 +01:00
Laurent Trinques
4894284520 Fix segfault due to calling method of uninitialized object, thanks
ladmanj

https://github.com/qelectrotech/qelectrotech-source-mirror/issues/311
2024-12-15 14:41:34 +01:00
Laurent Trinques
efc8745bc7 Update packaging_script_AppImage.sh 2024-12-15 09:35:26 +01:00
Laurent Trinques
406af16e94 Update org.qelectrotech.QElectroTech.json 2024-12-15 09:32:16 +01:00
Laurent Trinques
e3e48d3966 Fix snapcraft.yaml
Some checks failed
Publish Edge Snap / publish_amd64 (push) Failing after 14s
2024-12-14 16:09:07 +01:00
Laurent Trinques
0e646aed0b Update translations_stat.pl
Some checks failed
Publish Edge Snap / publish_amd64 (push) Failing after 16s
2024-12-14 14:25:35 +01:00
Laurent Trinques
52d56c18a2 Try to fix icon on Wayland 2024-12-14 13:31:42 +01:00
Laurent Trinques
d3f132adc6 Try to fix icon on Wayland 2024-12-14 13:28:17 +01:00
Achim
7b50f10749 ElementEditor elmt_info_cb sorting changed
alphabetical sorting in the ComboBox changed according to the order in
the elementInfoKeys list
2024-12-08 19:36:22 +01:00
Laurent Trinques
64bb2308d8 git submodule update --remote elements
Some checks failed
Publish Edge Snap / publish_amd64 (push) Failing after 15s
2024-12-07 17:05:23 +01:00
Laurent Trinques
dd3cee5d8e Merge pull request #313 from plc-user/master
Some checks failed
Publish Edge Snap / publish_amd64 (push) Failing after 15s
fix typos and whitespace
2024-11-24 08:15:23 +01:00
plc-user
6dcb6ebcb7 fix typos and whitespace 2024-11-23 21:17:39 +01:00
Laurent Trinques
a9f5e2945b Update qetmainwindow.cpp
Some checks failed
Publish Edge Snap / publish_amd64 (push) Failing after 21s
2024-11-23 16:01:39 +01:00
Laurent Trinques
732d317e81 Update qetmainwindow.cpp
Fix download url
2024-11-23 13:17:57 +01:00
Laurent Trinques
2b77964881 git submodule update --remote elements
Some checks failed
Publish Edge Snap / publish_amd64 (push) Failing after 17s
2024-11-17 12:00:00 +01:00
Laurent Trinques
5702ed3d04 Merge pull request #312 from Arusekk/dark-mode-collections
Force light mode in collections like projects
2024-11-17 11:24:07 +01:00
Arkadiusz Kozdra
a2c1c5515a Force light mode in collections like projects 2024-11-16 10:03:29 +01:00
Laurent Trinques
8b66709ea3 Update en, fr translations 2024-11-03 14:59:37 +01:00
Laurent Trinques
e6d995c190 Update *ts files 2024-11-03 14:42:35 +01:00
Laurent Trinques
c1706cb055 Add new variables to elementInfoKeys
aux1, aux2, aux3, aux4
See:
https://qelectrotech.org/forum/viewtopic.php?pid=20558#p20558
2024-11-03 14:40:24 +01:00
Laurent Trinques
fe3ffd890b Update snapcraft.yaml 2024-10-31 11:15:50 +01:00
Laurent Trinques
8b5a4cea0d Update translations *ts files 2024-10-18 16:37:29 +02:00
Laurent Trinques
ca48684b39 Update Polish translation, thanks Pawel 2024-10-13 14:28:27 +02:00
Laurent Trinques
c4fd1efb4f Minor 2024-10-13 10:02:49 +02:00
Laurent Trinques
fc0dcb6ab0 Improve message box 2024-10-13 09:55:24 +02:00
Laurent Trinques
e02ad585a9 Minor 2024-10-10 11:42:37 +02:00
Laurent Trinques
75cd943dbd Update *TS files 2024-10-10 11:06:28 +02:00
Laurent Trinques
e6d3121a32 Uniformise MessageBox
Add QObjet for translate box message
2024-10-10 10:57:09 +02:00
Laurent Trinques
429726f463 Merge pull request #310 from plc-user/master
About QET: improvements in usability
2024-10-08 16:30:40 +02:00
plc-user
b9c9d0e31f About-Dialog - Log: Scroll to most recent log-entry 2024-10-08 12:48:02 +02:00
plc-user
7918cbb7ab remove unneeded #include 2024-10-08 12:21:45 +02:00
plc-user
1454a8d4e7 About-Dialog - Log: Show most recent log file by default 2024-10-08 12:10:10 +02:00
Laurent Trinques
35018ba314 Merge pull request #308 from plc-user/master
use MessageBox to inform user about additional info when importing scaled element
2024-10-06 16:35:14 +02:00
plc-user
3bf4c852c9 use MessageBox to inform user about additional info when importing scaled element 2024-10-06 16:15:08 +02:00
Laurent Trinques
a118c33f80 add messageBox to inform user when dxf2elmt can't convert DXF file 2024-10-06 14:30:31 +02:00
Laurent Trinques
326387895a Update qetdiagrameditor.cpp 2024-10-06 06:29:24 +02:00
Laurent Trinques
566e7f7004 Update qetdiagrameditor.cpp 2024-10-06 06:18:48 +02:00
Laurent Trinques
625e673385 Update qetdiagrameditor.cpp 2024-10-05 14:34:20 +02:00
Laurent Trinques
1863329ca0 Typo 2024-10-05 13:47:08 +02:00
Laurent Trinques
e83424459c Try to fix false positive message box warning when launching process-
>startDetached("qet_tb_generator")
Launch program "qet_tb_generator" by QET only when an project was open
2024-10-05 13:41:20 +02:00
Laurent Trinques
59253019ff Update snapcraft.yaml 2024-09-30 06:13:24 +02:00
Laurent Trinques
c66b873631 Update qelectrotech-launch 2024-09-29 15:21:20 +02:00
Laurent Trinques
b2a999cec5 Update snapcraft.yaml 2024-09-29 14:38:39 +02:00
Laurent Trinques
f1cb63cf0c Snap elementeditor: remove old plugin DXFtoQET 2024-09-29 14:37:25 +02:00
Laurent Trinques
4138b8998c qetelementeditor: remove old plugin DXFtoQET 2024-09-29 14:33:14 +02:00
Laurent Trinques
24929861ba Improve 2024-09-29 13:11:40 +02:00
Laurent Trinques
fcd2f68f68 dxftoelmt: add Print standard error and filepath to the log file 2024-09-29 12:54:47 +02:00
Laurent Trinques
f0b0af9a76 git submodule update --remote elements 2024-09-27 16:22:47 +02:00
Laurent Trinques
6a7f24a2af git submodule update --remote elements 2024-08-29 11:34:02 +02:00
Laurent Trinques
59e06a4087 Update Polish translation, thanks Pawel 2024-08-28 13:38:17 +02:00
Laurent Trinques
3738c79ec6 Merge pull request #304 from plc-user/master
make text for missing software "dxf2elmt" translatable
2024-08-21 09:09:43 +02:00
Laurent Trinques
4871aae59d revert Try to improve Unable to run the app on OSX 2024-08-20 18:55:47 +02:00
plc-user
8649d21298 fix French translation 2024-08-20 16:46:10 +02:00
plc-user
de41f29e6b make text for missing software "dxf2elmt" translatable 2024-08-20 16:31:21 +02:00
Laurent Trinques
f1a8c00028 Update *TS files 2024-08-20 12:43:36 +02:00
Laurent Trinques
e4f5e8c68a Merge pull request #303 from plc-user/master
QET_ElementScaler: fix error for Qt 5.9 and added mirroring
2024-08-20 12:38:01 +02:00
plc-user
1649e8d28b QET_ElementScaler: fix for "cancel" 2024-08-20 11:48:41 +02:00
plc-user
5e3ca46133 QET_ElementScaler: fix error for Qt 5.9 and added mirroring 2024-08-20 11:38:29 +02:00
Laurent Trinques
a162f158ad Update *Ts files 2024-08-20 00:51:31 +02:00
Laurent Trinques
6aebbfeaa7 Merge pull request #302 from plc-user/master
integrate "QET_ElementScaler" as external software
2024-08-20 00:34:07 +02:00
plc-user
5d725f6d55 fix typo 2024-08-19 09:48:11 +02:00
plc-user
85d10fc0e6 integrate "QET_ElementScaler" as external software 2024-08-19 09:19:28 +02:00
Laurent Trinques
1baf9db799 Typo 2024-08-07 12:42:39 +02:00
Laurent Trinques
32c0e04c56 Try to improve Unable to run the app on OSX
https://qelectrotech.org/bugtracker/view.php?id=290
2024-08-07 09:13:14 +02:00
Laurent Trinques
57b5819f07 Revert 2024-07-28 01:54:27 +02:00
Laurent Trinques
7c5e0135a6 Add to drag and drop the multiple selection in collections
See:https://qelectrotech.org/forum/viewtopic.php?pid=20125#p20125
2024-07-27 16:37:39 +02:00
Laurent Trinques
7d8734e192 Update README.md 2024-07-22 12:33:37 +02:00
Laurent Trinques
30184bdd06 Merge pull request #300 from plc-user/master
move code into else-clause to avoid possible crashes
2024-07-15 14:04:58 +02:00
plc-user
1062d217f0 move code into else-clause to avoid possible crashes 2024-07-15 00:01:20 +02:00
Laurent Trinques
6cad599664 git submodule update --remote elements 2024-07-06 08:19:19 +02:00
Laurent Trinques
cbd309ec5a
Fix :
Add element1_linked element2_linked informations to terminal-name
connected in qet-file
2024-06-30 15:02:42 +02:00
Laurent Trinques
23c4ba2a3e Fix segfault in previous commit 2024-06-21 17:48:57 +02:00
Laurent Trinques
dd03f0eece Add elements informations to terminal-name connected in qet-file 2024-06-21 15:28:57 +02:00
Laurent Trinques
491b8ce64c git submodule update --remote elements 2024-06-19 06:00:27 +02:00
Laurent Trinques
2d8dd2b480 git submodule update --remote elements 2024-06-17 06:41:57 +02:00
Laurent Trinques
fda314d585 Merge pull request #297 from plc-user/master
add terminal-names to connection in qet-file
2024-06-17 06:21:17 +02:00
plc-user
f9073ca5fb add terminal-names to connection in qet-file 2024-06-16 15:53:09 +02:00
Laurent Trinques
36da291be6 Merge pull request #296 from plc-user/master
fix: editing SpinBoxes with keyboard lose focus
2024-06-09 15:59:24 +02:00
plc-user
4da78939d0 fix: editing SpinBoxes with keyboard lose focus 2024-06-09 15:26:18 +02:00
Laurent Trinques
a942f42927 git submodule update --remote elements 2024-06-05 17:05:31 +02:00
Laurent Trinques
e9e2ea5b0e Try to fix bug #307 2024-06-02 17:02:53 +02:00
Laurent Trinques
701265e393 Revert 2024-06-01 12:39:59 +02:00
Laurent Trinques
073763d9bf Try to fix bug #307 2024-06-01 12:27:26 +02:00
Laurent Trinques
ca7dc28ecf Merge pull request #295 from joseyspain/master
Spanish lang update
2024-05-20 06:11:57 +02:00
Josey
a70cc75504 Spanish lang update
Hi, more spanish updates. Regards, Josey
2024-05-19 21:05:36 +02:00
Laurent Trinques
6cc297def1 Merge pull request #294 from joseyspain/master
More spanish translations.Josey
2024-05-14 07:33:23 +02:00
Josey
1baf9125dc More spanish translations.Josey
More spanish translations. Josey
2024-05-13 21:28:08 +02:00
Laurent Trinques
78bae2dc60 Merge pull request #293 from plc-user/master
update German and English translations
2024-05-13 06:11:58 +02:00
plc-user
d0a10ef9af modified accelerators in English translation to avoid doubles... 2024-05-12 12:00:09 +02:00
plc-user
c6bc23addc update German translations 2024-05-12 11:56:22 +02:00
Laurent Trinques
9a7da28fc5 Add spanish translation, thanks Josey 2024-05-12 07:49:17 +02:00
Laurent Trinques
dd7f295f5c Add spanish translation, thanks Josey 2024-05-11 19:16:18 +02:00
Laurent Trinques
774b604b50 Minor 2024-05-08 20:08:16 +02:00
Laurent Trinques
e36df6f7d2 git submodule update --remote elements 2024-05-08 19:36:53 +02:00
Laurent Trinques
9076d9da80 Update TS files 2024-05-08 19:35:15 +02:00
Laurent Trinques
c7d6312997 Try to fix bug #303 2024-05-08 19:18:48 +02:00
Laurent Trinques
5492cd3f71 Update org.qelectrotech.QElectroTech.json 2024-05-08 14:06:12 +02:00
Laurent Trinques
9b4bbfbf0d Merge pull request #292 from plc-user/master
hide SVG background checkbox in print preferences
2024-05-06 20:25:37 +02:00
plc-user
b20456d0d6 hide SVG background checkbox in print preferences 2024-05-06 11:21:42 +02:00
Laurent Trinques
69338962bc revert Update snapcraft.yaml 2024-05-05 20:46:37 +02:00
Laurent Trinques
78005f812a Update snapcraft.yaml 2024-05-05 16:30:12 +02:00
Laurent Trinques
3479b98242 Update snapcraft.yaml 2024-05-05 16:02:41 +02:00
Laurent Trinques
f4f28b83bd git submodule update --remote elements 2024-05-05 05:56:25 +02:00
Laurent Trinques
4c8e7f4856 git submodule update --remote elements 2024-05-03 15:54:33 +02:00
Laurent Trinques
ba1123cf73 Merge pull request #291 from plc-user/master
fixed indentations of the remaining *.cpp/*.h files
2024-05-03 08:59:48 +02:00
plc-user
b3ac3c82af fixed indentations of the remaining *.cpp/*.h files 2024-05-02 08:39:27 +02:00
Laurent Trinques
e9448be986 Update README.md 2024-05-01 13:15:54 +02:00
Laurent Trinques
f72a2545bd Update LICENSE 2024-05-01 13:15:06 +02:00
Laurent Trinques
206a48a15f Merge pull request #289 from plc-user/master
correct more indentations / whitespace
2024-04-24 18:59:36 +02:00
plc-user
f33ea64b99 correct more indentations / whitespace (too many tabs) 2024-04-24 18:21:12 +02:00
plc-user
0d44933432 correct more indentations / whitespace 2024-04-24 18:02:00 +02:00
plc-user
fa68d545d0 correct more indentations / whitespace 2024-04-24 14:14:40 +02:00
Laurent Trinques
171f2eab4e git submodule update --remote elements 2024-04-21 12:45:50 +02:00
Laurent Trinques
ce86e18664 git submodule update --remote elements 2024-04-14 13:39:02 +02:00
Laurent Trinques
17030aaa80 Update packaging_script_Flatpak.sh 2024-04-11 15:57:13 +02:00
Laurent Trinques
09b1c0905e Update packaging_script_AppImage.sh 2024-04-11 15:56:13 +02:00
Laurent Trinques
b453832d46 Update packaging_script_Debian_Ubuntu_Windows.sh 2024-04-11 15:54:48 +02:00
Laurent Trinques
109efa03d2 Update MacQetDeploy.sh 2024-04-11 15:53:19 +02:00
Laurent Trinques
99a8b5f46d Update MacQetDeploy_arm64.sh 2024-04-11 15:51:51 +02:00
Laurent Trinques
d8b7fc3642 Merge pull request #288 from plc-user/master
update German and English translations
2024-04-10 15:32:49 +02:00
plc-user
5f7f72f292 update German and English translations 2024-04-10 15:21:48 +02:00
Laurent Trinques
7e6befdf0a Merge pull request #286 from plc-user/master
some minor changes
2024-04-10 12:33:09 +02:00
plc-user
4c52c8c9d0 correct indentations / whitespace 2024-04-10 10:28:58 +02:00
plc-user
4da6465318 add Help in Project-Setting / AutoNum / elements 2024-04-09 12:49:44 +02:00
plc-user
4c7d42251c correct some indention / whitespace 2024-04-07 22:53:51 +02:00
plc-user
6dac8e2005 correct some indention / whitespace 2024-04-07 22:39:33 +02:00
plc-user
15b625021c fix warnings: "control reaches end of non-void function" 2024-04-07 15:17:04 +02:00
plc-user
f4c880dc9f fix indention to get rid of warnings: "if/else does not guard" 2024-04-07 14:46:40 +02:00
Laurent Trinques
f343395da0 Disable menu-entry for show grid, when no project is loaded 2024-04-07 11:13:39 +02:00
Laurent Trinques
6d8e9f51cd Merge pull request #285 from plc-user/master
correct comments
2024-04-07 11:00:04 +02:00
plc-user
ef66350b30 correct comments 2024-04-07 10:55:28 +02:00
plc-user
f74616d2e4 correct comments 2024-04-07 10:42:37 +02:00
Laurent Trinques
8ce47848c2 Disable menu-entry for terminalBlock plugin, when no project is loaded 2024-04-05 12:59:55 +02:00
Laurent Trinques
d7b83140ab git submodule update --remote elements 2024-04-03 06:16:31 +02:00
Laurent Trinques
2263c798c7 Merge pull request #284 from plc-user/master
FIX SegFault: Disable menu-entry for DB-export when no project loaded
2024-04-02 12:24:36 +02:00
plc-user
cad7fa1ae7 FIX SegFault: Disable menu-entry for DB-export, when no project is loaded 2024-04-02 00:32:34 +02:00
Laurent Trinques
3a02be3f0e git submodule update --remote elements 2024-04-01 13:45:49 +02:00
Laurent Trinques
e73cf633ce 2023->2024 2024-03-29 10:09:48 +01:00
Laurent Trinques
21944b6739 Merge pull request #282 from plc-user/master
changed some remaining "pt_br" to "pt_BR"
2024-03-29 05:17:43 +01:00
plc-user
d54a8b9369 added sanity-check for 5-letter-language; adjusted comments 2024-03-28 19:40:56 +01:00
plc-user
3f796fea4b added translation to "pt_BR" 2024-03-28 17:57:12 +01:00
plc-user
73f7d44dcf changed some remaining "pt_br" to "pt_BR" 2024-03-28 17:43:15 +01:00
Laurent Trinques
c0390a4bd3 Try to fix bug #274 #278 2024-03-28 15:49:17 +01:00
Laurent Trinques
acb7a4cc4c Try to fix bug #274 #278 2024-03-28 15:45:29 +01:00
Laurent Trinques
28135a77db Try to fix bug #274 #278 2024-03-28 15:41:31 +01:00
Laurent Trinques
1b5df9733a git submodule update --remote elements 2024-03-28 15:39:52 +01:00
Laurent Trinques
c88d2b45cc Try to fix bug #274 #278
https://github.com/qelectrotech/qelectrotech-source-mirror/issues/274
2024-03-28 15:16:11 +01:00
Laurent Trinques
c4cae24ba7 Update *TS files 2024-03-28 13:24:06 +01:00
Laurent Trinques
6f22d5d37a Merge pull request #281 from plc-user/master
add option "transparent background" in SVG-export
2024-03-28 12:49:27 +01:00
plc-user
a7a072b977 corrected English translation 2024-03-28 11:23:37 +01:00
plc-user
90fa934976 corrected German and English translations 2024-03-28 10:35:33 +01:00
plc-user
4cfe658ff0 corrected English translations 2024-03-28 10:30:26 +01:00
plc-user
b55623bfc4 added German and English translations (CheckBox SVG-background) 2024-03-28 10:19:37 +01:00
plc-user
ec3952237f simplify setting of alpha-value for SVG-background 2024-03-28 09:32:55 +01:00
plc-user
2043fc2700 fix: add alpha-channel for SVG-background 2024-03-27 20:20:37 +01:00
plc-user
4de379d884 fix: no hardcoded colors for SVG-background 2024-03-27 20:13:35 +01:00
plc-user
2e379a3024 fix: specified colors for filled and transparent SVG 2024-03-27 19:23:19 +01:00
plc-user
21d293a928 fix: add CheckBox-value "SVG-transparency" to constructor 2024-03-27 15:30:02 +01:00
plc-user
a8aa772321 fix: save setting of CheckBox "SVG-transparency" 2024-03-27 15:15:53 +01:00
plc-user
cc20c218d8 add option "transparent background" in SVG-export 2024-03-27 14:50:26 +01:00
Laurent Trinques
a2beabd559 Update *TS files 2024-03-16 16:46:35 +01:00
Laurent Trinques
0109f3bc23 Minor: When the user right-clicks on the collection tree and
selects the collection property, the collection name,
file path and number of elements will be added
to the qInfo log file.
2024-03-16 16:15:23 +01:00
Laurent Trinques
e4b6b2b180 Merge pull request #280 from plc-user/master
Fix sizes
2024-03-14 09:31:58 +01:00
plc-user
06a6e5e5f4 fix font-size of graphical elements "input" 2024-03-14 08:55:59 +01:00
plc-user
5df77291fe fix size of SVG-export 2024-03-14 08:51:53 +01:00
Laurent Trinques
8da2f980cd git submodule update --remote elements 2024-03-11 09:29:57 +01:00
Laurent Trinques
8aaa596ff2 git submodule update --remote elements 2024-03-09 17:46:43 +01:00
Laurent Trinques
3c8d612742 The Elements Collection progress bar adds the number value of all the
elements counted.
2024-02-23 12:39:23 +01:00
Laurent Trinques
667e5eccf4 New Element Wizard add Company Collection in build Step 1 tree_view 2024-02-20 13:24:25 +01:00
joshua
ff3b497da2 Element editor : minor fix
In the part list widget, the terminal name is empty if terminal haven't
got name.
Now "terminal" is always displayed and if the terminal have a name the
name is appended to "terminal".
Example :
if the terminal name is 24 then the the part list widget show "terminal
: 24"
2024-02-15 22:04:11 +01:00
Laurent Trinques
7fe4765bff Update NL translations, thanks Dik 2023-12-25 17:24:10 +01:00
Laurent Trinques
c956e60ad0 Remove wrong translation files 2023-12-22 11:05:57 +01:00
Laurent Trinques
f44abb12d7 git submodule update --remote elements
revert PR 8 & 9
2023-12-21 15:48:36 +01:00
Laurent Trinques
bd3eacd1d6 git submodule update --remote elements 2023-12-21 13:04:43 +01:00
Laurent Trinques
3e0545f6b5 Update NL translations, thanks Dik 2023-12-21 07:36:33 +01:00
Laurent Trinques
c0466c0d45 git submodule update --remote elements 2023-12-20 13:08:14 +01:00
Laurent Trinques
f62b0fc812 Update French translations 2023-12-19 10:25:17 +01:00
Laurent Trinques
a3dc317246 Merge pull request #277 from plc-user/master
added folder "company-titleblocks" (incl. language-files)
2023-12-16 11:58:40 +01:00
plc-user
f12b11bee3 added folder "company-titleblocks" \(incl. language-files\) 2023-12-16 09:32:44 +01:00
Laurent Trinques
a4495d50d1 Merge pull request #276 from plc-user/master
update translations: de, en, nl
2023-12-13 13:31:20 +01:00
plc-user
e0b0caaf14 update translations: de, en, nl 2023-12-13 12:11:13 +01:00
Laurent Trinques
ae9e2eb678 Minor Fix En translation 2023-12-13 09:57:19 +01:00
Laurent Trinques
9a2bee851c Merge pull request #275 from plc-user/master
fix: set default "company-element-dir"
2023-12-12 09:25:18 +01:00
plc-user
3d8ad98ef2 fix: set default "company-element-dir" 2023-12-12 09:03:48 +01:00
Laurent Trinques
439463ab98 git submodule update --remote elements 2023-12-11 09:58:11 +01:00
Laurent Trinques
f7114fb0bb Update *TS files 2023-12-11 09:54:31 +01:00
Laurent Trinques
5190c0e929 Merge pull request #272 from plc-user/master
added "company-collection" as second user-collection
2023-12-11 09:43:26 +01:00
Laurent Trinques
e6aeaf6799 Merge pull request #273 from De-Backer/master
Fix Cmake build
2023-12-11 09:05:43 +01:00
Simon De Backer
d35b1623a4 Fix Cmake build
When creating new files.
Add the new files to: "cmake/qet_compilation_vars.cmake".

So that Cmake stays up to date.

thank you.
2023-12-10 22:58:31 +01:00
plc-user
2471547f70 reverted unwanted change 2023-12-10 20:18:17 +01:00
plc-user
4ca76b9993 fix: path-setting for company-collection 2023-12-10 18:00:06 +01:00
plc-user
74d022328e reverted some unwanted changes 2023-12-09 13:50:03 +01:00
plc-user
72092300ed added icons for "company-collection" 2023-12-09 12:02:52 +01:00
plc-user
f519499a66 added a second user-collection 2023-12-09 12:02:04 +01:00
Laurent Trinques
457aeb6883 Merge pull request #269 from plc-user/master
corrected german texts for "line-style"
2023-12-02 22:17:05 +01:00
plc-user
92b1e6c728 corrected german texts for "line-style" 2023-12-01 11:53:40 +01:00
Laurent Trinques
3d6ab1b050 Minor 2023-11-20 22:24:36 +01:00
Laurent Trinques
76798341b4 git submodule update --remote elements 2023-11-20 10:19:07 +01:00
Laurent Trinques
b6485353f1 Update publish-edge-snap.yml 2023-11-17 13:53:57 +01:00
Laurent Trinques
ffb2d9c63c git submodule update --remote elements 2023-11-15 16:48:24 +01:00
Laurent Trinques
55f7a2cb85 git submodule update --remote elements 2023-11-15 10:26:46 +01:00
Laurent Trinques
2ae3d3d5ae Update snapcraft.yaml 2023-11-13 10:33:16 +01:00
Laurent Trinques
4d50136146 Update packaging_script_AppImage.sh 2023-11-10 15:00:45 +01:00
Laurent Trinques
8b64343c91 Update packaging_script_AppImage.sh 2023-11-10 14:31:27 +01:00
Laurent Trinques
5e763bc8d2 Update packaging_script_AppImage.sh 2023-11-10 14:29:21 +01:00
Laurent Trinques
7447a7fd44 Update README.md 2023-11-09 20:47:54 +01:00
Laurent Trinques
eeb6107ec7 Update README.md 2023-11-09 20:35:11 +01:00
Laurent Trinques
4d60836851 Update README.md 2023-11-09 20:34:45 +01:00
Laurent Trinques
9f2dbfa39a Update *TS files 2023-11-09 13:57:35 +01:00
Laurent Trinques
a9f6583189 Fix URL 2023-11-09 13:46:45 +01:00
Laurent Trinques
9f8abed4b8 git submodule update --remote elements 2023-11-08 14:11:36 +01:00
Laurent Trinques
29ebc6000b Fix Cmake files 2023-11-08 13:38:55 +01:00
Laurent Trinques
663068e688 Update publish-edge-snap.yml 2023-11-07 13:11:31 +01:00
Laurent Trinques
b7fc8834a2 Fix bug 293: Automatic conductor numbering does not work 2023-11-07 08:04:16 +01:00
Laurent Trinques
902a976cc3 Change weighting of second conductor color
See: https://qelectrotech.org/bugtracker/view.php?id=292
On old project you replace in text editor
dash-size="10" by dash-size="5"
2023-11-05 16:09:48 +01:00
Laurent Trinques
489bfe1a7f Delete very old 32 bits NSIS 2 script 2023-10-28 14:32:57 +02:00
Laurent Trinques
9fceb6f000 Update QET64.nsi
Fix old URL in help links
2023-10-28 14:28:43 +02:00
Laurent Trinques
1a4fcbd274 Update qelectrotech.pro 2023-10-21 00:33:16 +02:00
Laurent Trinques
2c67b831bb Update qelectrotech.pro 2023-10-21 00:30:38 +02:00
Laurent Trinques
ae31b8270c Update .gitmodules 2023-10-20 19:30:50 +02:00
Laurent Trinques
75d2e7c148 Update qelectrotech.pro
Try to detect OSX arch
2023-10-20 19:22:17 +02:00
joshua
fbcab7c770 Fix : new conductor have text without variable replaced
For a new conductor with the text set from the default conductor text
defined in the folio properties, and this text contain variables, in
this case the variables are not replaced.
This commit fix it.
2023-10-19 21:59:05 +02:00
Laurent Trinques
083b1d8500 git submodule update --remote https://github.com/qelectrotech/qelectrotech-elements 2023-10-19 16:38:13 +02:00
Laurent Trinques
0a4c6e7d00 Minor 2023-10-19 16:13:44 +02:00
Laurent Trinques
a8df33d1fd Add submodule qelectrotech-elements 2023-10-19 16:03:22 +02:00
Laurent Trinques
8579e117ee Update README.md 2023-10-19 10:02:30 +02:00
joshua
471f87690c Remove unused signal 2023-10-17 23:12:05 +02:00
joshua
27dcd5ef00 Improve last commit
Remove setter function : void BorderTitleBlock::setTitle(const QString
&title)
Remove singal diagramTitleChanged from BorderTitleBlock and use instead
the signal informationChanged.
2023-10-17 22:46:04 +02:00
joshua
75746be0d8 remove unnecessary setters 2023-10-17 22:13:30 +02:00
joshua
8955ca2c82 Improve commit 73c0848fcd 2023-10-17 21:50:37 +02:00
joshua
107c59d680 diagram.cpp : remove unused #include 2023-10-16 22:31:47 +02:00
joshua
73c0848fcd Fix : conductor don't display well user defined variable as conductor text
see : https://qelectrotech.org/forum/viewtopic.php?pid=18835#p18835
2023-10-16 22:24:18 +02:00
Laurent Trinques
4ce67bb532 Update packaging_script_Flatpak.sh 2023-10-16 18:04:17 +02:00
Laurent Trinques
b29c8b8a1d Update packaging_script_Debian_Ubuntu_Windows.sh 2023-10-16 18:03:47 +02:00
Laurent Trinques
da82fff011 Update packaging_script_AppImage.sh 2023-10-16 18:03:19 +02:00
Laurent Trinques
6224c1160e Update MacQetDeploy_arm64.sh 2023-10-16 18:02:54 +02:00
Laurent Trinques
5955ff3d83 Update MacQetDeploy.sh 2023-10-16 17:57:38 +02:00
Laurent Trinques
5856d3e22a Update MacQetDeploy_arm64.sh 2023-10-16 17:33:38 +02:00
Laurent Trinques
1eca1f7d74 Update MacQetDeploy.sh 2023-10-16 17:32:58 +02:00
Laurent Trinques
809575e2b4 Update packaging_script_Debian_Ubuntu_Windows.sh 2023-10-16 17:30:43 +02:00
Laurent Trinques
c43a40a455 Update packaging_script_AppImage.sh 2023-10-16 17:29:45 +02:00
Laurent Trinques
9c68414165 Fix FTBFS 2023-10-16 17:17:48 +02:00
Laurent Trinques
be94f39087 Fix FTBFS 2023-10-16 17:03:00 +02:00
Laurent Trinques
eb2e45a66d Init submodule's
using git submodule instead of copy paste code from other repos
start pugixml form https://github.com/zeux/pugixml.git
start SingleApplication from https://github.com/itay-grudev/SingleApplication.git
2023-10-16 16:48:04 +02:00
Laurent Trinques
9840c18ed1 Update ELEMENTS.LICENSE 2023-10-16 16:12:37 +02:00
Laurent Trinques
b5a6c9d189 Update ELEMENTS.LICENSE 2023-10-16 16:11:43 +02:00
Laurent Trinques
3febbcfd8c Update LICENSE 2023-10-16 16:10:56 +02:00
Laurent Trinques
8f3d031383 Update README.md 2023-10-16 16:08:55 +02:00
Laurent Trinques
251f5aee5c Update org.qelectrotech.QElectroTech.json 2023-10-16 09:32:10 +02:00
Laurent Trinques
92e2f18d3c Update org.qelectrotech.QElectroTech.json 2023-10-16 09:12:48 +02:00
Laurent Trinques
9d2088c5e5 Update SingleApplication to v3.5.1 version 2023-10-15 14:47:30 +02:00
Laurent Trinques
c8ad8f2ba4 Update pugixml to 1.14 version 2023-10-15 14:44:08 +02:00
Laurent Trinques
7a222dc207 Update MacQetDeploy.sh 2023-10-13 19:33:18 +02:00
Laurent Trinques
233897550b Update MacQetDeploy_arm64.sh 2023-10-13 19:26:57 +02:00
Laurent Trinques
60833cb0d6 Update MacQetDeploy_arm64.sh
Typo
2023-10-13 19:25:32 +02:00
Laurent Trinques
6803ac42be Update MacQetDeploy_arm64.sh
Force MacOSX12.3.sdk
2023-10-13 19:24:28 +02:00
Laurent Trinques
13b9ae55b9 Update MacQetDeploy_arm64.sh 2023-10-13 11:20:17 +02:00
Laurent Trinques
71db1a1db5 Update MacQetDeploy.sh 2023-10-13 11:16:42 +02:00
Laurent Trinques
905a2aa570 Update MacQetDeploy.sh 2023-10-13 10:48:42 +02:00
Laurent Trinques
976877a59e Merge pull request #268 from Murmele/TooManyParts
Too many parts
2023-10-13 09:39:24 +02:00
Laurent Trinques
4d5a235887 Update snapcraft.yaml 2023-10-13 09:13:47 +02:00
Martin Marmsoler
8bc4053d35 fix compilation 2023-10-12 21:37:04 +02:00
Martin Marmsoler
e51ddbaa42 Give the user a possibility to set the maximum number of parts during import on an dxf file. Because sometimes the dxf file can contain more than 200 elements and the user is deleting some elements afterwards 2023-10-12 20:46:09 +02:00
Laurent Trinques
0cfde21758 Update MacQetDeploy.sh 2023-10-12 12:52:50 +02:00
Laurent Trinques
52ced12ab1 Update MacQetDeploy_arm64.sh 2023-10-12 12:49:08 +02:00
Laurent Trinques
dbe8f503dd Update packaging_script_Debian_Ubuntu_Windows.sh 2023-10-12 12:46:14 +02:00
Laurent Trinques
1f8c34491e Update packaging_script_Flatpak.sh 2023-10-12 12:43:50 +02:00
Laurent Trinques
0780f6627f Update Info.plist 2023-10-01 06:45:31 +02:00
Laurent Trinques
f161fecb02 Update Info.plist 2023-09-30 15:23:46 +02:00
Laurent Trinques
05b8392812 Fix chinese unicode character map, thanks Eric 2023-09-27 09:52:53 +02:00
Laurent Trinques
6be82ed4e9 Update en & fr translation 2023-09-26 14:16:29 +02:00
Laurent Trinques
bcbfdf10ae Update *TS files 2023-09-26 13:58:47 +02:00
Laurent Trinques
7543cc4122 Updated Czech translation of GUI, thanks Pavel 2023-09-26 08:35:37 +02:00
Laurent Trinques
e7ad6c4f3d Update README.md 2023-09-20 20:30:41 +02:00
Laurent Trinques
52a314b116 Update README.md 2023-09-20 20:29:13 +02:00
Laurent Trinques
0f1b1c9b5e Update Doxyfile 2023-09-20 19:30:14 +02:00
Laurent Trinques
103ad993c0 Merge pull request #267 from qelectrotech/terminal_strip
Merge Terminal strip to master
2023-09-20 08:29:23 +02:00
joshua
258bfd7957 terminal strip Layout editor add help preview button 2023-09-20 08:25:58 +02:00
joshua
b422d9c6c5 Demo terminal strip : add 4 level terminal strip 2023-09-20 08:24:12 +02:00
Laurent Trinques
d508ecb26b Update README.md 2023-09-19 22:10:52 +02:00
Laurent Trinques
fbe07c129f Update README.md 2023-09-19 22:07:39 +02:00
Laurent Trinques
0a7964209a Merge pull request #266 from qelectrotech/terminal_strip
Terminal strip
2023-09-19 15:30:06 +02:00
joshua
12b7c7c47c Terminal strip layout editor : add preview of terminal strip layout 2023-09-19 15:23:29 +02:00
Laurent Trinques
6811388fc2 Update README.md 2023-09-13 14:08:23 +02:00
Laurent Trinques
a53b1b0462 Update README.md 2023-09-13 14:07:43 +02:00
Laurent Trinques
0b5237e90d Update README.md 2023-09-13 14:06:26 +02:00
Laurent Trinques
c6bb1ae4ad Update README.md 2023-09-13 14:04:17 +02:00
Laurent Trinques
7829669b07 Update snapcraft.yaml
change Environment variables 
SNAPCRAFT_*→ CRAFT_*
2023-09-06 18:35:42 +02:00
Laurent Trinques
02d31874ae Update snapcraft.yaml 2023-09-06 17:49:52 +02:00
Laurent Trinques
525ce6124d Update snapcraft.yaml
replace 'snapcraftctl' with 'craftctl' to 
migrate from core20 to core22
2023-09-06 17:34:07 +02:00
Laurent Trinques
f2ef554290 Update snapcraft.yaml
change to kf5-5-108-qt-5-15-10-core22-sdk
2023-09-06 16:28:57 +02:00
Laurent Trinques
92604d5d65 Update publish-edge-snap.yml 2023-09-06 12:46:24 +02:00
Laurent Trinques
e2f5b007a9 Update publish-edge-snap.yml 2023-09-06 12:26:29 +02:00
Laurent Trinques
16afd275d7 Update publish-edge-snap.yml 2023-09-06 09:34:50 +02:00
Laurent Trinques
1d159f8772 Update publish-edge-snap.yml 2023-09-05 17:23:50 +02:00
Laurent Trinques
f25e72c069 Update publish-edge-snap.yml 2023-09-05 17:20:56 +02:00
Laurent Trinques
c0f29bbfe5 Update publish-edge-snap.yml 2023-09-05 15:37:21 +02:00
Laurent Trinques
660707bf28 Update snapcraft.yaml 2023-09-05 15:06:47 +02:00
Laurent Trinques
6423dfe3cc Update snapcraft.yaml 2023-09-05 14:43:11 +02:00
Laurent Trinques
1f75953648 Update snapcraft.yaml 2023-09-05 14:17:41 +02:00
Laurent Trinques
920274acc1 Update snapcraft.yaml 2023-09-05 14:15:44 +02:00
Laurent Trinques
9ba24337f9 Update snapcraft.yaml 2023-09-05 14:12:46 +02:00
Laurent Trinques
55297efab9 Update snapcraft.yaml 2023-09-05 14:10:08 +02:00
Laurent Trinques
fe6814c65f Update snapcraft.yaml 2023-09-05 14:05:00 +02:00
Laurent Trinques
5289fc7527 Update snapcraft.yaml 2023-09-05 14:03:01 +02:00
Laurent Trinques
341bfa5d10 Update snapcraft.yaml 2023-09-05 13:38:13 +02:00
Laurent Trinques
8433fbeec2 Update snapcraft.yaml 2023-09-05 13:30:07 +02:00
Laurent Trinques
219d17840b Update snapcraft.yaml 2023-09-05 12:59:02 +02:00
Laurent Trinques
2154461b1d Update snapcraft.yaml 2023-09-05 11:53:55 +02:00
Laurent Trinques
e8c876c88e Update snapcraft.yaml 2023-09-05 10:51:50 +02:00
Laurent Trinques
e6abff81bb Update snapcraft.yaml 2023-09-05 10:34:04 +02:00
Laurent Trinques
6ec41f7ceb Update snapcraft.yaml 2023-09-05 10:27:43 +02:00
Laurent Trinques
4b28b1b38a Update publish-edge-snap.yml
Try to fix Error: The process '/usr/bin/sg' failed with exit code 2
2023-09-05 10:07:33 +02:00
Laurent Trinques
18301b6ce4 Merge pull request #264 from kamikazzyyyy/new-elements
Added new symbols
2023-09-05 09:48:15 +02:00
Baptiste HADJAB
6920b2febd Added new symbols
New symbols:
phoenix_contact
johnson_controls
sofrel
2023-09-05 08:59:34 +02:00
Laurent Trinques
0e233d6783 Update chine data QChar 2023-08-28 06:15:57 +02:00
Laurent Trinques
888c25ec02 Add Chinese switch 2023-08-27 12:36:08 +02:00
Laurent Trinques
b9cd8288fc Update Chinese translation, thanks Eric Wang 2023-08-23 10:04:20 +02:00
joshua
8ca1e0487e Add demo terminal strip class
Not available for user now.
2023-06-28 21:56:03 +02:00
plc-user
171ee5d2ae fixed and scaled Siemens front-views 2023-06-19 06:08:19 +02:00
plc-user
cafa58df73 fixed and scaled MDT front-views 2023-06-19 06:08:19 +02:00
plc-user
137d02ae43 scaled General Electric front-views 2023-06-19 06:08:19 +02:00
plc-user
856172db91 scaled and corrected Hager front-views 2023-06-19 06:08:19 +02:00
plc-user
02ad9349a7 scaled ABB front-views 2023-06-19 06:08:19 +02:00
plc-user
5240b30f81 re-sorted elements 2023-06-19 06:08:19 +02:00
plc-user
668a9848e8 re-sorted elements 2023-06-19 06:08:19 +02:00
plc-user
eb4dc48563 removed empty folder 2023-06-19 06:08:19 +02:00
Laurent Trinques
8241041c1a Add new example project 2023-06-19 06:06:11 +02:00
plc-user
c5ffff76ee removed empty directories 2023-06-14 09:07:57 +02:00
plc-user
411d8d73f7 fixed some terminal-positions to whole numbers (many left\!) 2023-06-14 09:07:57 +02:00
plc-user
7a3989e065 corrections, new terminals and new sub-dir "discontinued" 2023-06-13 09:00:13 +02:00
Laurent Trinques
08e8409ce0 Add qet_it.qm 2023-05-22 05:45:40 +02:00
clabacchio
753abff183 Fixed some italian translations 2023-05-22 05:44:38 +02:00
joshua
48f9ef7632 Add AbstractTerminalStrip class to be used by TerminalStripDrawer class 2023-05-15 22:22:12 +02:00
Laurent Trinques
4e6ea06d0d Resore qetshapeitem::polygon contextMenuEvent
reverted by commit: 0a8376c189
see:
https://qelectrotech.org/bugtracker/view.php?id=220
and
https://qelectrotech.org/forum/viewtopic.php?pid=18204#p18204
2023-05-13 18:12:28 +02:00
Laurent Trinques
1748280b80 Try to fix Github action to build snap 2023-05-10 16:54:02 +02:00
Laurent Trinques
2a1d3ae1f1 Try to fix Github action to build snap 2023-05-10 10:20:38 +02:00
Laurent Trinques
3cd124f348 Node.js 12 actions are deprecated. update the following actions to use Node.js 16 2023-05-10 10:09:59 +02:00
Laurent Trinques
1cc6a42fd8 Add new weidmuller elements, thanks KevinarCZ 2023-05-09 09:26:19 +02:00
Laurent Trinques
de89997c4e Improve changeover contact view in list mode 2023-04-28 16:43:14 +02:00
Laurent Trinques
c989437982 Add new GCE elements 2023-04-25 10:55:19 +02:00
joshua
247b98da41 Fix minor bug : conductor text is not updated when folio id is used
See https://qelectrotech.org/forum/viewtopic.php?pid=18157#p18157
2023-04-17 22:09:18 +02:00
Laurent Trinques
31b648c2a0 MacQetDeploy_arm64.sh script add staple to the app 2023-04-11 16:59:41 +02:00
Laurent Trinques
a7590558b9 Add new arduino sensors, thanks KevinarCZ 2023-04-02 14:19:32 +02:00
Laurent
5cbb444c0a macOS fix: add Move diagram item with the keyboard arrow 2023-03-29 13:10:50 +02:00
Laurent
6919369a92 MacQetDeploy_arm64.sh add Enable hardened runtime flag to fix notarization
Add process to Upload a macOS app to be notarized and validate before upload to QET download servers
2023-03-21 14:18:33 +01:00
Laurent Trinques
6d178b324c MacQetDeploy_arm64.sh add examples in bundle 2023-03-20 14:54:15 +01:00
laurent
ea08c588db Add new MacOS arm64 build script 2023-03-20 13:37:03 +01:00
joshua
752fe032e7 Draw strong line for better sepration between terminal 2023-03-19 19:19:53 +01:00
Laurent Trinques
9e04432597 Minor 2023-03-14 10:44:07 +01:00
Laurent Trinques
a67add6c0c Add new arduino sensors, thanks KevinarCZ 2023-03-14 10:37:18 +01:00
plc-user
a6be1c8004 translations and corrected elements 2023-03-12 16:28:20 +01:00
plc-user
3f550cbbb6 translations and corrected elements 2023-03-12 16:28:20 +01:00
plc-user
9d88abeac2 translations and corrected elements 2023-03-12 16:28:19 +01:00
plc-user
c60f04da2f corrected filename and translations 2023-03-12 16:28:19 +01:00
plc-user
1d1776441d German translations and corrected directory-name 2023-03-12 16:28:19 +01:00
plc-user
fec9def35b some German translations and Element-Corrections 2023-03-12 13:42:18 +01:00
joshua
45b8cb34f3 Fix minor gui wrong behavior 2023-03-10 20:19:12 +01:00
THGSCST
0edc3a083f PT-BR Language small fixes 2023-03-03 06:47:46 +01:00
THGSCST
b0324c6654 PT-BR Titleblocks
Added pt_br attribute to titleblocks templates
2023-03-03 06:47:46 +01:00
THGSCST
55263b5b8d PT-BR Language update
Correction of spelling errors, inclusion of missing texts and adequacy of Brazilian technical terms.
2023-03-03 06:47:46 +01:00
joshua
03094e1328 Fix wrong display in widget used to link folio report 2023-03-01 19:33:26 +01:00
Laurent Trinques
32e9ee9f36 Try to fix FTBS on not c++17 system 2023-02-27 10:42:13 +01:00
Laurent Trinques
047462f226 Fix macOS Deprecated synonym for Q_OS_DARWIN 2023-02-25 14:28:02 +01:00
joshua
ec3ac92b5e Fix minor bug
When two shapes item have line and filling color and the dock widget
used for edit the current selection is visible, switching selection
between the two shapes, the last selected shape filling color change
and become the filling color of the previous shape.
2023-02-24 19:08:10 +01:00
Laurent Trinques
78644a3524 macOS update python PATH to launch qet_tb_generator to python 3.11 2023-02-22 15:40:38 +01:00
joshua
470e4a059b Add widget to edit terminal strip item layout
The widget is available in the project properties editor.
WIP
2023-02-21 21:44:28 +01:00
Laurent Trinques
c53f5fbc66 Add save as shortcut in qetdiagrameditor 2023-02-16 06:10:17 +01:00
Laurent Trinques
8857b1c731 Update hungarian translation, thanks Gabor 2023-02-12 22:25:00 +01:00
Paweł Śmiech
25e93bde56 Update polish translation 2023-02-06 16:42:56 +01:00
Laurent Trinques
6e60842d69 Improve numbering of the elements symbols for pneumatic, thanks Vbxler 2023-02-05 20:27:46 +01:00
Laurent Trinques
3d3ebc99fd Update * TS files, only add simplified Chinese code is zh-cn 2023-02-02 06:34:29 +01:00
joshua
ec5cda10db Minor : improve first and last segment position of conducteur 2023-01-31 23:13:05 +01:00
dlee99
8298f56b7e modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2023-01-30 22:30:58 +01:00
Laurent Trinques
08b0bde0d7 Add Siemens 6es5090-8ma01.elmt, thanks LievenC 2023-01-30 13:57:51 +01:00
Laurent Trinques
7023b7033f Improve 20 logic elements, thanks Vbxier 2023-01-28 14:38:41 +01:00
joshua
092b18cefd Fix wrong calculation of the bounding rect of an arc 2023-01-27 19:39:53 +01:00
Laurent Trinques
45e3e92022 Update translations binary files 2023-01-25 15:43:07 +01:00
Laurent Trinques
bfa349406d Refresh packaging_script_AppImage.sh scripts 2023-01-25 13:31:42 +01:00
Laurent Trinques
921f9109f8 Refresh packaging_script_Flatpak.sh 2023-01-25 12:57:12 +01:00
Laurent Trinques
7db9430b3c Refresh MacQetDeploy.sh scripts 2023-01-25 12:27:25 +01:00
Laurent Trinques
ede9e7f063 Minor clean in packaging_script_Debian_Ubuntu_Windows.sh scripts 2023-01-25 12:03:12 +01:00
Laurent Trinques
0f06f90516 Refresh packaging_script_Debian_Ubuntu_Windows.sh example scripts 2023-01-25 11:56:50 +01:00
dlee99
e18c7117c5 modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2023-01-24 22:53:18 +01:00
Laurent Trinques
845bd38d88 Refresh splash image size 2023-01-24 17:59:47 +01:00
Laurent Trinques
c287182d4b MacQetDeploy.sh change the method for version package naming 2023-01-24 17:38:07 +01:00
Laurent Trinques
ae493f16c6 Update splash image 2023-01-24 07:28:32 +01:00
Remi Collet
880bd8f7bd Only display git revision when available 2023-01-23 16:39:03 +01:00
plc-user
15282292c9 fixed hotspots and decimals of logic-elements 2023-01-22 05:24:06 +01:00
plc-user
9a80760c71 fixed typo again 2023-01-22 05:24:06 +01:00
plc-user
a833da45b5 simplified element / corrected terminal-positions 2023-01-22 05:24:06 +01:00
plc-user
14d7ceca1a added some German phrases 2023-01-22 05:24:06 +01:00
plc-user
c03a079b89 added German part to "INSTALL" 2023-01-22 05:24:06 +01:00
plc-user
4870b070f6 added German part to Elements-Licence 2023-01-22 05:24:06 +01:00
plc-user
1671b4ca58 corrected line-numbers to original 2023-01-22 05:24:06 +01:00
plc-user
d45b84d242 some translations and whitespace-fixing 2023-01-22 05:24:06 +01:00
Laurent Trinques
be43afaf78 Update *TS file 2023-01-21 17:15:42 +01:00
Laurent Trinques
77920280c7 Add Git Revision in aboutqetdialog 2023-01-21 14:46:34 +01:00
joshua
a0970b37b9 Improve and simplify the use of versions 2023-01-19 20:18:21 +01:00
plc-user
ad4e263198 German translations (including binary file) 2023-01-14 17:48:53 +01:00
plc-user
3f27b0d007 some more German translations
left some "unfinished": maybe we'll find even better translations in the future
2023-01-14 11:18:29 +01:00
plc-user
6bbf9d30b2 small modifications and translations 2023-01-14 11:18:29 +01:00
dlee99
86487b392b modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2023-01-13 23:50:12 +01:00
Laurent Trinques
cfc5bbc6bb Force Plc-user patch 2023-01-13 18:28:58 +01:00
plc-user
53eaa2a81d more German translations 2023-01-13 18:25:34 +01:00
plc-user
9f1164a174 some German translations 2023-01-13 18:25:34 +01:00
Remi Collet
fece536b55 avoid false warning for project created by qet >= 0.100 2023-01-13 13:42:50 +01:00
Laurent Trinques
51a4cd3982 Update *TS files 2023-01-13 10:56:58 +01:00
Laurent Trinques
9f7754c3bc Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2023-01-13 10:48:24 +01:00
Laurent Trinques
28878ed53c Fix previous translations 2023-01-13 10:47:52 +01:00
Laurent Trinques
43cd9f98cb Update *TS files and add EN + FR translations 2023-01-13 09:44:31 +01:00
Laurent Trinques
289175b775 Minor 2023-01-13 09:32:05 +01:00
Laurent Trinques
45ec061cf1 Improves the warning message box when the version of the project to load
differs from the version used.
Added information about the version of the launched project and the
version currently in use.
2023-01-13 09:28:05 +01:00
Remi Collet
1be93fa581 fix comment 2023-01-12 18:24:58 +01:00
Remi Collet
812a262b63 move decl close to usage 2023-01-12 18:24:58 +01:00
Remi Collet
038d2d7033 use QVersionNumber and switch to "list of int" standard 2023-01-12 18:24:58 +01:00
Remi Collet
19d867f6a4 fix segfault on load cancelled 2023-01-12 16:56:02 +01:00
Laurent Trinques
2180805637 Update README.md 2023-01-09 12:32:32 +01:00
joshua
d3223c8ca4 Merge branch 'master' into terminal_strip
* master:
  Fix crash
  Change displayed version on master
  avoid WARNING: mime_xml.path is not defined
  Update changelog
2023-01-08 16:30:59 +01:00
joshua
b1f6b1823a Fix crash 2023-01-08 16:20:13 +01:00
Laurent Trinques
1e2bdc203b Change displayed version on master 2023-01-06 15:28:32 +01:00
Remi Collet
f75f6d3f3f avoid WARNING: mime_xml.path is not defined 2023-01-06 14:07:35 +01:00
joshua
f07e4319d3 Fix ftbfs 2023-01-05 19:20:41 +01:00
Laurent Trinques
d5f0a7932a Update changelog 2023-01-05 10:17:25 +01:00
joshua
4da7f6cd13 TerminalStripLayoutPattern is now shared
TerminalStripLayoutPattern class is now a shared pointer between all
terminal strip item.
QETProject have now a new class : ProjectPropertiesHandler
the goal of this class is to manage every kind of properties used in the
project, this class will be strongly used in future.
2023-01-04 22:40:18 +01:00
joshua
c6739b5bec Fix ftbfs on macOS 2023-01-03 22:30:13 +01:00
Laurent Trinques
cc7e185d59 Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2023-01-03 01:47:09 +01:00
Laurent Trinques
60ceab8a32 Add unicode HEX codes from a string in Ukranian: "Імпортовані
елементи"
Refresh namesListForIntegrationCategory
2023-01-02 20:13:42 +01:00
joshua
539e0a7a49 Merge branch 'terminal_strip'
* terminal_strip:
  Terminal strip item can saved / loaded to .qet file
  See previous commit...
  Move terminal strip drawer class in is own file
  Fix wrong use of QStringLiteral and QLatin1String
  Double click a TerminalStripItem open the editor
  Minor change about checkable QAction of QetDiagramEditor
  Minor : corrects a minor aesthetic defect when unbridge terminals
  Revamp code
  Add and move terminal strip item are now managed by undo command
  TerminalStripItem : Draw terminal bridge
  Terminal strip item can be added to diagram
  Minor : add QGIUtility namespace
2023-01-02 19:40:08 +01:00
Laurent Trinques
9afef79629 Update Copyright date 2023-01-01 17:05:57 +01:00
Laurent Trinques
62fcdec958 Add Qubino elements, thanks KevinarCZ 2022-12-30 12:23:42 +01:00
Laurent Trinques
2ace2ca104 macOS restore sqlite3 database export 2022-12-30 07:20:50 +01:00
Laurent Trinques
b0c3c90f3c Try to fix sqlite3 database export on macOS
Now I use macports with Digikam scripts
See:
https://invent.kde.org/graphics/digikam/-/tree/master/project/bundles/macports
2022-12-30 07:12:02 +01:00
Laurent Trinques
8c35559480 Update *TS files 2022-12-27 17:40:34 +01:00
Laurent Trinques
66614072a6 Typo 2022-12-27 17:36:59 +01:00
Laurent Trinques
bd4c7cf2ff Update *TS files 2022-12-26 11:56:18 +01:00
Laurent Trinques
4a568c4e89 Typo 2022-12-26 11:47:55 +01:00
Laurent Trinques
caf5dc5dd4 Add new Annex Projects 2022-12-26 11:36:44 +01:00
Laurent Trinques
eeadbde8d2 Add new Translators in aboutqetdialog.cpp 2022-12-26 09:06:16 +01:00
artgg7300
85892b1c54 the new Hungarian lang files 2022-12-25 11:30:03 +01:00
joshua
f54bea713e Terminal strip item can saved / loaded to .qet file 2022-12-21 19:18:49 +01:00
Laurent Trinques
949db14699 Update *TS files 2022-12-21 14:21:04 +01:00
Laurent Trinques
0753bac62f Add Ukrainian switch language 2022-12-19 13:04:19 +01:00
Laurent Trinques
808598f759 Update Ukrainian translation, thanks Yaroslav 2022-12-19 06:09:14 +01:00
plc-user
7377cf394c simplify graphics, add terminal-names 2022-12-16 08:27:44 +01:00
plc-user
555c243905 add Controller 2022-12-16 08:27:44 +01:00
dlee99
7b6f357870 modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2022-12-14 22:34:39 +01:00
Laurent Trinques
b9f28c1567 Update *TS files 2022-12-14 19:06:07 +01:00
luz paz
6a4b250213 Fix source typo 'Hidding' 2022-12-07 12:10:34 +01:00
luz paz
4caf5e0211 Fix source typo 'cross_min_heigth' 2022-12-07 12:10:34 +01:00
luz paz
8242e4cfd7 Fix source typo 'minimumRowHeigth' 2022-12-07 12:10:34 +01:00
luz paz
a1f9d05f1c Fix source typo 'Rigth' 2022-12-07 12:10:34 +01:00
luz paz
2032ba76ed Fix various typos in source documentation and comments (cont.)
Found via `codespell`
2022-12-06 07:56:45 +01:00
luz paz
1994235bc5 Fix various typos in source documentation and comments (cont.)
Found via `codespell`
2022-12-04 20:46:32 +01:00
luz paz
a76e5446aa Fix various typos in source documentation and comments
Found via `codespell`
2022-12-04 13:30:01 +01:00
joshua
f41b5a4ed4 See previous commit...
Je suis une tête de linotte
2022-12-02 19:39:56 +01:00
joshua
1f99a40f1b Move terminal strip drawer class in is own file 2022-12-02 19:35:17 +01:00
joshua
d23a5bbdc7 Fix wrong use of QStringLiteral and QLatin1String 2022-12-02 18:26:56 +01:00
joshua
81640015e5 Double click a TerminalStripItem open the editor 2022-12-02 18:12:47 +01:00
aitolos
1eed13c617 Greek Lang update 2022-11-30 19:58:01 +02:00
aitolos
6869d20813 Greek Language Update 2022-11-29 20:46:19 +02:00
Ole Carlsen
c17492183f Danish translation updated 2022-11-24 17:54:18 +01:00
joshua
e3d1467352 Remove minimum height of project properties dialog 2022-11-23 21:58:08 +01:00
dlee99
b626130071 modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2022-11-18 20:20:59 +01:00
Laurent Trinques
7f4bad712e In ISO 639-1, the Ukrainian language is "UK".
"UA" is the country code in ISO 3166-1.
2022-11-18 09:05:50 +01:00
joshua
300440454e Fix crash introduced in commit 5a057b1c20 2022-11-16 19:06:56 +01:00
Laurent Trinques
05416a5fdc Add TS file for Ukrainian language 2022-11-16 08:26:35 +01:00
Laurent Trinques
d6bcde5f8d Update pugixml to version 1.13 2022-11-15 18:22:00 +01:00
joshua
e1cb55f218 Better use of QObject inheritence 2022-11-14 22:42:27 +01:00
joshua
a18cd2461f Minor change about checkable QAction of QetDiagramEditor 2022-11-14 21:51:14 +01:00
joshua
aca3b8ad1e Minor : corrects a minor aesthetic defect when unbridge terminals 2022-11-14 21:10:38 +01:00
joshua
937afea351 Minor : check if pointer is valid 2022-11-14 20:45:16 +01:00
Laurent Trinques
3341d65a89 Workaround to fix crash when moving element by arrows keys
@driver_item item moved by mouse and don't be moved by Element mover
Disable position x, y in statusBar when moving elements by arrows keys
2022-11-12 12:14:27 +01:00
Laurent Trinques
c397bb6c1d Update translations *TS files 2022-11-11 13:06:25 +01:00
Laurent Trinques
2f72c60f64 Add shorcut for moving up/down folio by 10
add new entries for moving up/down folio by 100 and shorcut
2022-11-11 12:56:22 +01:00
joshua
9e1ef8c42f Revamp code
-Move MoveElementsCommand class from diagramcommands file to
movegraphicsitemcommand file.
-Rename the to class MoveGraphicsItemCommand.
-Minor code change to make it more modern.
2022-11-08 22:06:50 +01:00
joshua
7fede2277f Add and move terminal strip item are now managed by undo command 2022-11-08 19:20:32 +01:00
joshua
5a057b1c20 Minor
More modern c++
2022-11-08 18:17:55 +01:00
joshua
57929e6e38 Minor.
ElementsMover class :
Rename some member variable and add some indentation.
2022-11-05 13:36:46 +01:00
joshua
ae8c20bb04 Minor 2022-11-05 13:28:39 +01:00
Laurent Trinques
ad97559b7c Try to fix FTBFS on Debian Bullseye 2022-11-04 21:34:24 +01:00
Laurent Trinques
e3cc89b546 Try to fix FTBFS on Debian Bullseye 2022-11-04 21:26:08 +01:00
Laurent Trinques
0f215c2902 Try to fix FTBFS on Debian Bullseye 2022-11-04 21:12:19 +01:00
joshua
0ae0ce04cd Show x:y pos when drag element in the status bar 2022-11-04 20:25:49 +01:00
plc-user
850cc5d0f2 added some (non-electric) accessories 2022-11-01 22:57:24 +01:00
plc-user
914ae348c6 added PoE-Injectors 2022-11-01 22:57:24 +01:00
plc-user
bb47a1852e added Weidmüller-Couplers 2022-11-01 22:57:24 +01:00
plc-user
28329c3f1b simplify some Hager-Thumbnails 2022-11-01 22:57:24 +01:00
joshua
21de926367 TerminalStripItem : Draw terminal bridge 2022-10-23 19:30:58 +02:00
OlesyaGerasimenko
71297a0e45 Update Russian translation 2022-10-21 05:35:24 +02:00
plc-user
0e0b680131 added RCBO 1P+N (thanks Vbxler) and Hager-RCBO 2022-10-20 05:30:36 +02:00
plc-user
554dc388a6 new PLC-controllers 2022-10-19 09:23:31 +02:00
plc-user
33c22c72f8 fix graphic-errors and descriptions 2022-10-19 09:23:31 +02:00
plc-user
d4658e64b1 fix formatting and number of decimals 2022-10-18 08:41:05 +02:00
plc-user
9633c32c2c some new elements 2022-10-18 08:41:04 +02:00
Laurent Trinques
6f52be4145 Addd new contrôleurs TM262 of schneider, thanks Galexis 2022-10-14 11:52:15 +02:00
joshua
e26efb6c3a Fix wrong size of new element wizard on windows
See https://qelectrotech.org/bugtracker/view.php?id=264
2022-10-12 21:54:44 +02:00
Laurent Trinques
04f2094466 little modify at hungarian lang file -> publish binary update 2022-10-01 18:04:36 +02:00
plc-user
346900ecbd fix elements that could not be loaded 2022-10-01 06:33:16 +02:00
artgg7300
d80669c253 add new sew movimot mm...d drive element 2022-09-30 13:09:16 +02:00
artgg7300
922f96d79c little modify at hungarian lang file 2022-09-29 12:12:45 +02:00
joshua
0d90defcfe Remove unused include 2022-09-28 21:54:02 +02:00
joshua
ea1ede9cb3 Remove unnecessary assert
Just call :
void DynamicTextFieldEditor::disconnectConnections()
instead of use an assert if there is an active connection.
2022-09-28 21:53:30 +02:00
joshua
ffc2a7a7d7 Fix warning 2022-09-26 21:48:08 +02:00
joshua
3e75bedef0 Fix crash
https://qelectrotech.org/forum/viewtopic.php?pid=16647#p16647
2022-09-26 21:40:47 +02:00
artgg7300
05bd6b43f2 add new Allen Bradley element 2022-09-20 06:15:12 +02:00
artgg7300
718a6a6872 add new Allen Bradley element 2022-09-20 06:12:21 +02:00
artgg7300
42746aa710 delete duplicated Allen Bradley element 2022-09-19 06:25:06 +02:00
artgg7300
662ec3496b delete old Allen Bradley element 2022-09-19 06:18:25 +02:00
artgg7300
cec479aefb add new Allen Bradley element 2022-09-19 06:10:08 +02:00
artgg7300
43821bea0f add new Allen Bradley element 2022-09-19 05:59:57 +02:00
joshua
ff80453f2c Terminal strip item can be added to diagram
Initial commit about graphics item of a terminal strip, Work in
progress.
2022-08-27 21:24:25 +02:00
artgg7300
8775d1e1bd add two new Allen Bradley elements 2022-08-18 12:13:31 +02:00
artgg7300
c6f45c5862 hungarian lang files 2022-08-18 11:59:53 +02:00
dlee99
d7e1813ff3 modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2022-08-13 16:44:36 +02:00
joshua
d6e8a1c133 Element editor : improve deletion speed 2022-08-13 13:06:46 +02:00
joshua
eee1c7fff7 Element editor : Improve responsiveness when several shapes are selected. 2022-08-13 12:40:59 +02:00
David Varley
af5d5e0aa3 Allow for open polygons (ie polylines) when saving as dxf 2022-08-13 11:57:29 +10:00
Laurent Trinques
e9931511de Update EATOn elements, thanks dmsque 2022-08-09 02:32:23 +02:00
Laurent Trinques
acf1e713fc Fix position of label XREF in 'Other' option for slave device contact
type
2022-08-08 10:39:04 +02:00
Laurent Trinques
21524ee528 Add symbol and improve 'Other' option for slave device contact type. 2022-08-06 18:42:05 +02:00
Laurent Trinques
f0919d5fa6 Minor fix in ABB element directory 2022-08-04 09:14:35 +02:00
Laurent Trinques
695e4d95aa Refresh en translation 2022-08-04 09:05:32 +02:00
joshua
02769fe881 Improve opening time of dxf 2022-08-03 13:54:39 +02:00
joshua
e57ba72d7c Fix crash 2022-08-03 12:37:32 +02:00
Ole Carlsen
1b3599e673 Danish translation updated 2022-08-01 20:28:58 +02:00
Laurent Trinques
d0d6b299e4 update polish translation, thanks Paweł 2022-07-31 14:54:17 +02:00
Laurent Trinques
56b7458951 Workaround to fix launch dxf2elmt binary from QET element editor menu on macOS 2022-07-27 18:04:48 +02:00
joshua
74a187e659 Minor 2022-07-27 14:52:50 +02:00
joshua
8b62318588 Return an empty QByteArray if something goes wrong with dxf2elmt 2022-07-27 14:52:00 +02:00
joshua
31466a65ba Fix fail to build from sources
Fix ftbfs for :
ubuntu 18.04 bionic beaver
ubuntu 20.04 focal fossa
debian 11 bullseye
2022-07-27 14:15:32 +02:00
Laurent Trinques
a7160ba9b7 Fix dxf2Elmt Binary name on macOS 2022-07-26 20:18:54 +02:00
Laurent Trinques
cacbce6cec Update *TS file and FR & EN translation 2022-07-26 18:19:27 +02:00
joshua
6fd5209364 Merge branch 'dxf2elmt'
* dxf2elmt:
  Element editor : improve code
  Element editor : improve code
  Import dxf is managed by undo command
  Add import dxf feature
2022-07-26 17:04:22 +02:00
joshua
57695bbbea Element editor : improve code
Better use of signal partsAdded and partsRemoved
2022-07-26 17:03:18 +02:00
joshua
5a497cd6b5 Element editor : improve code
Better use of signal partsAdded and partsRemoved
2022-07-26 16:17:47 +02:00
joshua
cae7cbdbd8 Import dxf is managed by undo command 2022-07-24 20:58:00 +02:00
Laurent Trinques
b65ff83805 Update en translation 2022-07-24 18:17:26 +02:00
Laurent Trinques
c1f2b345e4 Update Fr translation 2022-07-24 16:50:50 +02:00
Peter Kessen
f9600f5dbb Fix german translations 2022-07-24 10:51:12 +02:00
joshua
6e81451b46 Add import dxf feature
Use dxf2elmt to import dxf.
See https://github.com/antonioaja/dxf2elmt
2022-07-23 21:54:23 +02:00
Laurent Trinques
2a7848e1ca Update *TS files 2022-07-21 19:17:09 +02:00
Lars Biskupek
c22abdd2f8 Update of German language files 2022-07-18 18:35:22 +02:00
Laurent Trinques
9e2d4abd01 Add Nidec Leroy-Somer Digitax HD M750 servo drive, thanks Matteo 2022-07-16 16:44:14 +02:00
Laurent Trinques
acd151c9ca Improve last commit 2022-07-16 13:36:05 +02:00
Laurent Trinques
ab724377c0 Fixed a bug with many slaves of type Other, whose XREFs overlap in list
mode
2022-07-16 12:58:35 +02:00
joshua
d9a0b03e23 Minor : add QGIUtility namespace 2022-07-15 20:48:06 +02:00
Laurent Trinques
4c5d27e9af Minor 2022-07-08 21:34:10 +02:00
Laurent Trinques
8af850df44 Add the architecture of the CPU that Qt was compiled for in widget aboutqetdialog and in the logs 2022-07-08 20:50:45 +02:00
Pino Toscano
8a1f509b62 flatpak: refresh 0001-build-Fix-the-installation-paths.patch
Needed after the recent build system changes to MIME-related paths.
2022-07-05 18:16:51 +02:00
Pino Toscano
cf479bc113 Drop old mimelnk MIME types
Those desktop MIME types were needed only with KDE up to 3.x, as it
used to have its own desktop-based MIME type system. KDE 3 is EOL for
many years now, and there are already XDG MIME types.
2022-07-05 18:16:51 +02:00
Pino Toscano
08e206deeb Drop XML files autogenerated from qelectrotech.xml
These files are the bare XML definitions, and they are automatically
generated by update-mime-database (part of shared-mime-info) on update
(e.g. by distro hooks) or manually. Keeping them in the sources, and
installing them, is definitely not correct, as qelectrotech.xml is
their canonical definition.

Hence, drop them from the sources, together with references to them.
2022-07-05 18:16:51 +02:00
joshua
ba1e8381f2 Merge branch 'terminal_strip'
* terminal_strip:
  Improve execution time of some actions.
  Minor : fix little gui defect
  Improve opening time of terminal strip editor window
  Display conductor number
2022-07-04 21:45:18 +02:00
Laurent Trinques
d082c9c9a6 Minor refresh element abe7-h16210-11.elmt 2022-07-04 10:24:07 +02:00
Laurent Trinques
84631b238c Add new symbol Telefast 2022-07-02 18:42:15 +02:00
artgg7300
aa50224b00 add new element AB 1734-ep24dc 2022-07-01 06:42:46 +02:00
Laurent Trinques
d44486f468 Add new eaton_moeller easy elements, thanks dmsque 2022-06-28 18:21:57 +02:00
joshua
2a307a74da Improve execution time of some actions.
Improve the execution time when we add, change or remove
several terminals to/from terminal strip.
2022-06-23 21:36:24 +02:00
Tadeáš Pilař
1a2fea84ff Add 'Other' option for slave device contact type
This option alows for displaying XRef without contact drawing.
This is useful for spliting one physical part into multiple
logical elements when the slave element is not a switch.
2022-06-23 05:41:33 +02:00
Laurent Trinques
f603b229db Add new ABB drives, thanks dmsque 2022-06-23 05:34:08 +02:00
joshua
fa753449ad Minor : fix little gui defect
At opening of terminal strip editor window, click on free terminal
in the tree dock don't show up the free terminal table.
2022-06-22 18:56:22 +02:00
joshua
fe19b270f9 Improve opening time of terminal strip editor window
Need serious refactoring of codes who use the method
Element::actualLabel() and also actualLabel itself.
This part of code is crappy.
2022-06-22 17:34:05 +02:00
Laurent Trinques
5c96c6d773 Add new Delta As_series elements, thanks dmsque 2022-06-18 04:05:19 +02:00
Maximilian Federle
637d0bf6de publish edge snap: Adapt to snapcraft 7 2022-06-15 16:32:43 +02:00
Laurent Trinques
d917c697b0 Add new symbols 2022-06-15 14:28:40 +02:00
Laurent Trinques
1be21782fd Add new symbols 2022-06-15 14:18:48 +02:00
joshua
2e15372aab Display conductor number 2022-06-14 19:30:45 +02:00
plc-user
5c6b9f1829 changed more elements to "thumbnails" 2022-06-14 14:13:15 +02:00
plc-user
9c55378f49 added some parts of series 2003 2022-06-14 14:13:15 +02:00
plc-user
e367436358 Bugfix for "Weidmüller"-Part 2022-06-14 14:13:15 +02:00
joshua
c9ebdace04 Update some code.
Update some part of class LinkSingleElementWidget with more modern
c++ and recent change of Qet.
2022-06-13 21:06:00 +02:00
joshua
3e6e38e566 Continue revamp of elementprovider 2022-06-13 20:46:22 +02:00
joshua
c83d4e5aea Refactoring.
Refactor elementProvider class  : Use the ElementData::Types instead of
deprecated Element::kind
2022-06-13 20:27:06 +02:00
Laurent Trinques
0e9d09c62e Minor revamp last commit: Add Shelly elments... 2022-06-12 10:35:10 +02:00
Laurent Trinques
fe66caf5ac Add Shelly elments, thanks TheKilroy with add these on
qelectrotech-element-contrib
2022-06-10 12:21:50 +02:00
plc-user
c58d61594b added some parts from manufacturer "Weidmüller" 2022-06-06 13:49:03 +02:00
plc-user
3cd3535c18 changed Front-Views to "thumbnails" and added some parts "2003" 2022-06-06 13:49:03 +02:00
joshua
97ecd26749 Use QLatin1String and QStringLiteral for better performance
In class ElementData.
2022-06-01 22:45:59 +02:00
joshua
2e70d2e599 Nomenclature now use properly the element type 'thumbnail'
Use function provided by ElementData to check element type and
master type instead of use plain text (code is more strong)
2022-06-01 22:29:12 +02:00
joshua
3dd0986c4f Fix some warning and write more modern c++ 2022-05-25 23:40:08 +02:00
joshua
899caeabe9 Fix wrong behavior when edit the element information
In the diagram editor, when we edit the element information in the side
panel, each time we tip something in the text field the cursor always go
to the end if the "label" information is empty.
2022-05-25 23:16:13 +02:00
joshua
a2b73ea2bc Definitely fix the rotation problem :)
Only use space for every rotation
2022-05-25 21:47:31 +02:00
Laurent Trinques
bf32219154 Fix previous workaround
Now the shortcut for the rotate action is key_space and use key_R to
rotate terminal on the fly before placing it in the drawing.
2022-05-25 17:39:49 +02:00
Laurent Trinques
6a669f1399 Fix previous workaround
Because strange behaviour with Qt::key_space if used for keyPressEvent
and also in shortcut.
Now the shortcut for the rotate action is ctrl + R and key_space to
rotate terminal on the fly before placing it in the drawing.
2022-05-25 13:47:22 +02:00
joshua
4ab1ed7fc9 Fix previous workaround
The rotate action shortcut was 'space' before this commit and so the
keyPressEvent with space key was never propagated because always grabbed
by the rotate action.
Now the shortcut for the rotate action is ctrl + space.
Note that even if rotate exist in element editor, this doesn't work well
because the rotation is not well managed by the save/load from elmt
file.
2022-05-22 21:05:54 +02:00
Laurent Trinques
89d03e5503 Element editor : Workaround for Qt::Key_Space event not working
Use of ALT key as a replacement to rotate terminal on the fly before
placing it in the drawing.
Fix bug #262
https://qelectrotech.org/bugtracker/view.php?id=262
2022-05-21 23:28:44 +02:00
Laurent Trinques
9a6e1d2a61 Editor commands: change the rotation with the space key on the keyboard
from 90° to 15° for more precision for part lines, polygons, texts, arcs
and circles.
2022-05-20 10:18:37 +02:00
Laurent Trinques
fad6983cf1 Element::Thumbnail fix for BOM pages 2022-05-16 09:30:32 +02:00
Laurent Trinques
daeec311b2 Element::Thumbnail WIP 2022-05-16 08:59:25 +02:00
Laurent Trinques
db8c76c184 Element::Thumbnail WIP 2022-05-15 14:29:01 +02:00
Laurent Trinques
2ec7e6aa45 In 99_assembly_plan directory change link_type="simple" by link_type="thumbnail" 2022-05-15 06:28:20 +02:00
joshua
021aea1d8b Add the new element type : thumbnail
This type must be used for element who goal is to display a
thumbnail/front view of an element, notably used for cabinet contents
view and placement.
2022-05-13 20:02:29 +02:00
Laurent Trinques
1f4dfdba3f Add QPrinter::HighResolution 2022-05-05 13:37:24 +02:00
joshua
f0694f0daf Merge branch 'terminal_strip'
* terminal_strip:
  Remove terminal strip widget
  Several terminals can be removed or moved from strip in one shot
2022-05-04 18:48:46 +02:00
joshua
baf412614c Remove terminal strip widget
Since this commit, the terminals can't be moved from the tree widget,
instead we need to use the "move in" widget to move one or several
selected terminals in the table view.
2022-05-04 18:38:45 +02:00
Laurent Trinques
e1865fec62 Update Ewon elements, thanks Vbxler 2022-04-28 13:31:31 +02:00
Laurent Trinques
1e255af3be Update SingleApplication and pugixml to latest upstream release 2022-04-27 13:52:41 +02:00
Laurent Trinques
1c99cb5c2d Add Qt::AA_UseHighDpiPixmaps 2022-04-27 09:14:13 +02:00
Laurent Trinques
4ca21a3bff Add new ewon elements, thanks Vbxler 2022-04-26 13:26:07 +02:00
Laurent Trinques
189d92f2a9 Minor 2022-04-26 08:15:20 +02:00
Laurent Trinques
34a7e0f3fe Minor : machineinfo change RAM informations MB to GB 2022-04-26 07:54:41 +02:00
joshua
17290ae3b3 Try to fix fail to build for old Qt version 2022-04-25 18:24:43 +02:00
Laurent Trinques
8b65d240db Add new example found on www 2022-04-23 13:37:36 +02:00
joshua
bce6a43427 Several terminals can be removed or moved from strip in one shot 2022-04-10 13:52:45 +02:00
joshua
1c52cd71a9 Merge branch 'terminal_strip'
* terminal_strip:
  Minor fix : wrong variable name
2022-04-09 16:35:02 +02:00
joshua
898edb6c12 Minor fix : wrong variable name 2022-04-09 16:34:30 +02:00
joshua
de3fa988b1 Fix some clazy warning 2022-04-09 13:07:47 +02:00
joshua
b42aec7bdf Minor
Block database signal when a project is currently being deleted.
Among other things, this avoid the multiple show of the dialog "table
limitation".
2022-04-09 12:46:07 +02:00
joshua
ea46a92f3f Merge branch 'terminal_strip'
* terminal_strip:
  Several real terminal can be added to terminal strip in one shot
  Minor : avoid unnecessary multiple function call
  The free terminal properties can be edited by batch.
  Change made inside the free terminal table can be applied
  Hide/show apply/reset buttons according to current displayed widget
  Edited data of terminal strip can be applied
  Change terminal strip editor class
  Add free terminal editor widget
  Add toolbar and buttons
  Start to move terminal strip editor from QDialog to QMainWindow
  Add table widget and item model for free terminal
  Revamp code
  Improve undo command when add/move/remove terminal in/from/to terminal strip
  Revamp code.
  Revamp code, make it more simple
  Remove the real terminal uuid, and use instead the uuid of the terminal element itself
  RealTerminal is created by the TerminalElement itself
  Change relationship betwen classes RealTerminal PhysicalTerminald and TerminalElement
  QTreeWidget "terminal explorer" : improve item text
  minor : remove unused code
2022-04-09 11:54:58 +02:00
joshua
6197d0215a Several real terminal can be added to terminal strip in one shot
User can select several real terminals in the free terminal editor
and add it with one operation on a terminal strip.
2022-04-08 20:48:32 +02:00
Laurent Trinques
6fd342e265 Fix typo 2022-04-07 17:01:23 +02:00
Laurent Trinques
395d968ab5 Minor 2022-04-07 16:48:37 +02:00
Laurent Trinques
e41b7f7d6c Machine_info add disk and partition informations 2022-04-07 16:33:20 +02:00
Laurent Trinques
fabf0109ff Remove element surpresseur_mono_hyd.elmt 2022-04-02 19:58:29 +02:00
Laurent Trinques
cabfdc0a54 Add reworked pneumatic symbols, thanks Vbxler 2022-04-02 19:52:17 +02:00
joshua
6f4122f65c Fix a funny bug
When we create a summary table and uncheck the option "adjust the size
of the table to the folio" an infinity of new diagram are added to the
project.
2022-04-01 20:41:07 +02:00
joshua
ce21a812c0 Fix bug 244
I was thinking that the commit 5a51f6bace
fix the bug 244, but not they only fix this bug :
https://qelectrotech.org/forum/viewtopic.php?pid=16022#p16022

This commit really fix the bug 244
2022-04-01 20:04:17 +02:00
joshua
5a51f6bace Fix crash
See bug N°244
https://qelectrotech.org/bugtracker/view.php?id=244
2022-03-31 19:05:45 +02:00
joshua
a38d97896d Minor : avoid unnecessary multiple function call
TerminalStripTreeDockWidget::on_m_tree_view_currentItemChanged
call setCurrentStrip only when current strip changed, and not every time
when user click in another item on the tree view.
2022-03-30 20:30:57 +02:00
joshua
c4b0c1435c The free terminal properties can be edited by batch. 2022-03-25 19:49:31 +01:00
joshua
a4445c411d Change made inside the free terminal table can be applied 2022-03-25 19:25:46 +01:00
joshua
e92bd36f9b Hide/show apply/reset buttons according to current displayed widget 2022-03-25 19:00:09 +01:00
Laurent Trinques
61ff8884e0 Minor 2022-03-24 06:25:28 +01:00
Laurent Trinques
b8af2e9d1d Minor : add informations in aboutqetdialog widget 2022-03-24 06:13:03 +01:00
joshua
8084fa8f29 Edited data of terminal strip can be applied 2022-03-23 21:18:22 +01:00
plc-user
1066e55262 rework and new elements (Hager) 2022-03-21 05:19:01 +01:00
joshua
edfb23be23 Change terminal strip editor class
Change parent class from QDialog to QWidget.
Terminal strip editor is now embedded in TerminalStripEditorWindow.
2022-03-20 18:25:25 +01:00
plc-user
516a1a7826 more cleanup, rework and new elements 2022-03-19 15:18:29 +01:00
plc-user
be1d87c5d4 cleanup, rework and new elements 2022-03-17 08:38:38 +01:00
joshua
b48ba939de Add free terminal editor widget 2022-03-16 22:44:08 +01:00
joshua
b1ad16d482 Add toolbar and buttons
Add 'add terminal strip' button.
Add 'remove terminal strip' button
Add 'reload' button
2022-03-16 18:58:36 +01:00
joshua
ceb54fbc6a Start to move terminal strip editor from QDialog to QMainWindow 2022-03-14 17:56:18 +01:00
plc-user
e42bcb5ec9 bugfix, rework and new elements 2022-03-12 22:01:25 +01:00
joshua
9cbc3a2265 Add table widget and item model for free terminal
WIP, the change made in the table widget can't be applied.
2022-03-12 19:07:49 +01:00
plc-user
e93990a6e4 rework of some Elements and some new Terminals 2022-02-26 15:50:07 +01:00
Laurent Trinques
bb1a0767a3 Change &amp; by undferscore in qet_labels.xml 2022-02-24 13:33:06 +01:00
Laurent Trinques
0b7afe4781 Flatpak & AppImage : restore Sqlite3 for database export 2022-02-21 13:45:55 +01:00
plc-user
9a3de1f780 rework of some Elements an some new ones 2022-02-21 13:36:09 +01:00
joshua
0ff099fb52 Revamp code
Change the way to know who is the physical terminal of a real terminal
when we got only the real terminal.
2022-02-20 13:13:29 +01:00
joshua
05a2e4b37b Improve undo command when add/move/remove terminal in/from/to terminal strip 2022-02-19 12:34:38 +01:00
Laurent Trinques
830a70ac94 Add Linux pc.gpu.RAM informations,
but need glxinfo dependency
2022-02-17 19:01:56 +01:00
Laurent Trinques
e63a8c8482 Minor 2022-02-16 13:57:04 +01:00
Laurent Trinques
855162bb03 Improve QElapsedTimer in seconds to compute time used for reload element collection 2022-02-16 12:34:04 +01:00
Ole Carlsen
d2c15cf57b Update Danish translation 2022-02-14 19:37:51 +01:00
artgg7300
02ce65b3a9 little mod on element 2022-02-14 05:20:11 +01:00
pavelfric
0bf1f89c13 Updated Czech translations of elements. 2022-02-13 11:28:37 +01:00
joshua
74c3ab1b82 Fix can't resize QetGraphicsTableItem
User can't grab the handler item.
2022-02-10 19:13:59 +01:00
joshua
062ae6e9eb Fix intensive call of updateUi when move a QetGraphicsTableItem 2022-02-10 19:11:06 +01:00
joshua
dcc5a4dd0b Revamp code.
Remove a QVector member variable and use instead a function who
return the same vector, but created on the fly
2022-02-09 19:15:45 +01:00
joshua
ba638f52e5 Revamp code, make it more simple 2022-02-09 18:57:27 +01:00
joshua
ffd904749e Remove the real terminal uuid, and use instead the uuid of the terminal element itself 2022-02-09 18:13:35 +01:00
joshua
c037d3ea0a RealTerminal is created by the TerminalElement itself 2022-02-09 18:08:20 +01:00
artgg7300
087c8980f0 little modif on element 2022-02-09 06:07:42 +01:00
joshua
70f50ff362 Change relationship betwen classes RealTerminal PhysicalTerminald and TerminalElement 2022-02-08 19:24:16 +01:00
artgg7300
904e805935 add new elements and remove a old 2022-02-08 06:27:36 +01:00
artgg7300
04d478882e add new element Dahlander motor 2022-02-06 17:34:01 +01:00
joshua
35cd790c8f Fix crash 2022-02-06 16:36:00 +01:00
joshua
1a26133a78 Add a QElapsedTimer to compute time used for reload element collection 2022-02-06 15:50:25 +01:00
joshua
a028b774bf QTreeWidget "terminal explorer" : improve item text
In the QTreeWidget "terminal explorer", when the physical terminal is
composed by several real terminal, the text of the QTreeWidgetItem
display the label of each real terminal.
2022-02-06 15:05:24 +01:00
Laurent Trinques
72b7bc210f Minor 2022-02-06 14:03:49 +01:00
Laurent Trinques
5fe2efca1a Minor 2022-02-05 15:36:44 +01:00
Laurent Trinques
3ce09775ac Minor 2022-02-05 13:12:11 +01:00
joshua
3a53c2d53b minor : remove unused code 2022-02-05 12:02:59 +01:00
joshua
7ba27ec9d9 Fix very weird bug
see
https://linuxfr.org/forums/programmation-c/posts/erreur-de-compilation-aucun-fichier-ou-dossier-de-ce-type
2022-02-05 11:40:47 +01:00
Laurent Trinques
d74dcdea6c Minor 2022-02-04 16:16:34 +01:00
joshua
9cb86a7e54 Fix fail to build for older version of Qt 2022-02-01 11:29:06 +01:00
joshua
826991e6d6 Improve how real terminals are grouped 2022-02-01 11:13:23 +01:00
joshua
53157afd12 Minor : rebuild terminal vector everywhere is needed 2022-02-01 10:30:42 +01:00
joshua
a165a3cb28 When undo an ungroup terminal command, the terminal keep the same level. 2022-02-01 09:53:06 +01:00
joshua
1d20018a26 Merge branch 'terminal_strip'
* terminal_strip:
  Terminal strip bridge are now save in .qet file
Minor : don't push an undo command when change bridge color by the
same color
2022-01-31 18:17:27 +01:00
joshua
c02238cab8 Terminal strip bridge are now save in .qet file 2022-01-31 18:11:21 +01:00
joshua
35a40f1aba Fix fail to build from sources for some Qt version 2022-01-31 17:25:10 +01:00
Laurent Trinques
6e55a630b4 Rename Folder names containing the '&' character cause the PHP file _exist() function to fail. 2022-01-30 11:24:11 +01:00
Laurent Trinques
9a17c8f72c Rename Folder names containing the '&' character cause the PHP file _exist() function to fail. 2022-01-30 11:21:59 +01:00
Laurent Trinques
04c17ac5ac Rename Folder names containing the '&' character cause the PHP file _exist() function to fail. 2022-01-30 10:50:21 +01:00
Laurent Trinques
686bd8dff1 Rename Folder names containing the '&' character cause the PHP file _exist() function to fail. 2022-01-30 10:36:18 +01:00
joshua
bd635b8e43 Minor : don't push an undo command when change bridge color by the same color 2022-01-28 18:37:40 +01:00
joshua
0bd0476cb1 Merge branch 'terminal_strip'
* terminal_strip:
  Fix fail to build from sources
  Minor improvement about undo/redo for bridge creation
  Minor Fix : undo command for unbridge strip don't work
  Minor : add undo text
2022-01-28 18:09:20 +01:00
joshua
d562ca8a39 Fix fail to build from sources 2022-01-28 18:08:16 +01:00
joshua
a31bd6eb0d Minor improvement about undo/redo for bridge creation
When a new bridge is created, an undo command is created for that.
When undo the action and redo it, all terminals are bridged to a new
bridge instead of the first one, who continue to exist but is now
empty and 'lost' because he will never be reused.
In addition of that, if a more recent undo command (we call it undo2)
use this bridge,
there is a unknown behavior, because the status of the bridge is not the
same as when the undo2  was created.
2022-01-27 20:00:46 +01:00
joshua
d114b097bf Minor Fix : undo command for unbridge strip don't work 2022-01-27 19:45:33 +01:00
joshua
993eb58d46 Minor : add undo text 2022-01-27 19:07:49 +01:00
joshua
7aa048740b Merge branch 'terminal_strip'
* terminal_strip:
  TerminalStripBridge color can be edited.
  Use QSharedPointer instead of QWeakPointer + remove unused include
  Change struct TerminalStripBridge to class
  Revamp terminalStrip feature code
  Revamp PhysicalTerminal class
  Revamp RealTerminal class...... again
  Improve bridge edition
  Improve code readability
  Fix copy constructo warning
  Make code less spaghetti
  Draw bridge pixmap in the tableview (wip)
  REmove unused method : levelCellCount
  Remove isXrefCell method...
  Add terminal bridge feature
2022-01-27 19:02:43 +01:00
Maximilian Federle
306f4c7b54 projectview: Only append .qet if not snap or flatpak 2022-01-27 12:02:08 +01:00
Laurent Trinques
4334c8ec8c Add new symbols, thanks Vbxler 2022-01-26 11:47:16 +01:00
dlee99
7aabdd1781 modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2022-01-21 21:55:02 +01:00
artgg7300
bb48c4607a translated hungarian files 2022-01-20 10:49:33 +01:00
dlee99
0600b85e8a modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2022-01-19 22:30:42 +01:00
Maximilian Federle
688d9fe4c1 projectview: Re-enable appending qet suffix if not running as flatpak
It was removed in b121dad for all platforms.
Only disable appending the suffix for the flatpak platform
by testing for the FLATPAK_ID environment variable.
2022-01-19 20:29:34 +01:00
joshua
683095173e TerminalStripBridge color can be edited. 2022-01-18 11:24:07 +01:00
dlee99
0d70ed53a9 modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2022-01-15 21:45:46 +01:00
joshua
7d33b48b3a Merge branch 'master' into terminal_strip
* master:
  BugFix : default element collection path is wrong
  snap: Remove framework snap prompt
  Update translation and add cn chinese ts files
  Danish translation updated
  Danish translation
  Danish translation
  Add new thumbnail element
  Flatpak add --share=network
Flatpak : add --socket=cups see :
https://github.com/flathub/org.libreoffice.LibreOffice/issues/90
  Graphics item handler is bigger when overred
  Add toolbar widget for edit size of handler in diagram editor.
  Fix Multiple translation in elements
  Fix Multiple translation in elements
  Fix segfault.
  new Analog-In - Module
  cleanup and upgraded elements
  modified:   lang/qet_nl.qm 	modified:   lang/qet_nl.ts
  Add Russian translation, thanks "А.Разживин"
  little modification in hungarian language
  Fixed typo
2022-01-14 19:47:28 +01:00
joshua
d7e2ef283a BugFix : default element collection path is wrong 2022-01-14 19:04:53 +01:00
Maximilian Federle
782eaff4d2 snap: Remove framework snap prompt
Now that https://github.com/snapcore/snapcraft/pull/3596 has been
released in snapcraft 6.0.1, drop the prompt that tells users to
disconnect the old framework snap.

Also drop --enable-experimental-extensions from CI  because kde-neon
has been declared stable for core20.
2022-01-14 18:12:45 +01:00
Laurent Trinques
9bd2ea22f3 Update translation and add cn chinese ts files 2022-01-11 10:03:22 +01:00
Ole Carlsen
ee4ce5db4e Danish translation updated 2022-01-09 18:45:25 +01:00
Ole Carlsen
b90d06aa5c Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2022-01-09 16:29:35 +01:00
Ole Carlsen
ba47a11282 Danish translation 2022-01-09 16:28:30 +01:00
Ole Carlsen
4041073c96 Danish translation 2022-01-09 16:24:53 +01:00
joshua
8830204c0c Add new thumbnail element 2022-01-07 16:41:04 +01:00
Laurent Trinques
d932f8ea01 Flatpak add --share=network 2022-01-05 11:16:22 +01:00
Laurent Trinques
8cfa852077 Flatpak : add --socket=cups see :
https://github.com/flathub/org.libreoffice.LibreOffice/issues/90
2022-01-05 07:24:56 +01:00
joshua
1a75eb19d0 Graphics item handler is bigger when overred 2022-01-04 18:41:46 +01:00
joshua
ae9faa2192 Add toolbar widget for edit size of handler in diagram editor.
Add a combo box in the tool bar of diagram editor
to quickly change the size of the graphics handler item.

The sarto commit :D

NOTE
only available for diagram editor, element editor will
come later.
2022-01-03 21:01:25 +01:00
Laurent Trinques
e087270b6d Fix Multiple translation in elements 2021-12-31 13:29:17 +01:00
Laurent Trinques
b8263b03bc Fix Multiple translation in elements 2021-12-31 13:23:03 +01:00
joshua
778837a770 Fix segfault.
Fix bug 249.
https://qelectrotech.org/bugtracker/view.php?id=249
2021-12-28 15:25:35 +01:00
joshua
09694ddec9 Use QSharedPointer instead of QWeakPointer + remove unused include 2021-12-26 18:48:11 +01:00
joshua
1572fafabe Change struct TerminalStripBridge to class
And move it in a new file
2021-12-26 18:43:17 +01:00
joshua
5709f469fc Revamp terminalStrip feature code
Move RealTerminal class in a new file
Move PhysicalTerminal class in a new file.
Remove the use of QWeakPointer and use instead QSharedPointer
in a big part of the revamp.
2021-12-26 17:26:00 +01:00
joshua
2ea9f8a2c6 Revamp PhysicalTerminal class 2021-12-23 22:17:37 +01:00
joshua
a2e5989f3b Revamp RealTerminal class...... again
I don't know what I want, I'm crazy :D.
Next commit will also revamp PhysicalTerminal
and TerminalStripBridge class, code will be more clear and
easy to understand.
2021-12-23 18:37:17 +01:00
plc-user
e556abbab3 new Analog-In - Module 2021-12-23 09:06:00 +01:00
plc-user
337dd7c13b cleanup and upgraded elements 2021-12-23 09:05:59 +01:00
dlee99
34a3325ba9 modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2021-12-22 21:04:59 +01:00
joshua
02b385e0b7 Improve bridge edition 2021-12-22 19:21:54 +01:00
joshua
e2454faa36 Improve code readability 2021-12-19 21:05:48 +01:00
joshua
57e80e7b5e Fix copy constructo warning 2021-12-19 20:03:26 +01:00
joshua
6505330b5f Make code less spaghetti
Not finished yet.
2021-12-19 14:55:02 +01:00
Laurent Trinques
56685d0f30 Add Russian translation, thanks "А.Разживин" 2021-12-17 16:29:26 +01:00
artgg7300
ee7a752a52 little modification in hungarian language 2021-12-16 15:51:32 +01:00
Jop Huttenhuis
7084f5bcf0 Fixed typo
Fixed a typo which caused a wrong summary table header.
2021-12-12 18:08:55 +01:00
joshua
cd914c8726 Merge branch 'master' into terminal_strip
* master: (21 commits)
  Minor: remove spaces in filenames
  minor: remove capital letters
  Add new symbols Fibaro, thanks Bertus
  Update Hungarian translation, thanks Gubányi
  modified:   lang/qet_nl.qm 	modified:   lang/qet_nl.ts
  Add preprocessor to check Qt version
  Update *TS files
  Add possibility to user to choose hdpi round policy
  Minor improvement for function QETApp::customElementsDir() and QETApp::commonElementsDir()
  Add new GCE symbol
  Flatpak: update qet_tb_generator to version 1.3.1
  Add new symbol nodemcu_v3, thanks Bertus
  Add new symbols
  ci: Build edge snaps on GitHub & release to store
  snap: Port to core20
  Flatpak update qet_tb_generator to 1.3.0 version
  Fix typo in URL
  SNAP change Github source to https://github.com/raulroda/qet_tb_generator-plugin
  modified:   lang/qet_nl.qm 	modified:   lang/qet_nl.ts
  upgraded elements and renamed company
  ...
2021-12-11 21:27:34 +01:00
joshua
beee4a06c8 Draw bridge pixmap in the tableview (wip) 2021-12-11 21:25:40 +01:00
Laurent Trinques
98960f5b2b Minor: remove spaces in filenames 2021-12-07 14:35:29 +01:00
Laurent Trinques
2bdecd3bd2 minor: remove capital letters 2021-12-07 14:32:34 +01:00
Laurent Trinques
c22f3c84bb Add new symbols Fibaro, thanks Bertus 2021-12-07 14:31:05 +01:00
Laurent Trinques
959dee7889 Update Hungarian translation, thanks Gubányi 2021-12-06 19:11:13 +01:00
dlee99
dd82a705d6 modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2021-12-04 22:05:11 +01:00
joshua
c744356b0f Add preprocessor to check Qt version
Use to check if Qt is 5.14 for using
QGuiApplication::setHighDpiScaleFactorRoundingPolicy
2021-12-04 19:12:11 +01:00
Laurent Trinques
1073ebeebc Update *TS files 2021-12-04 15:18:39 +01:00
joshua
b94ec0938b Add possibility to user to choose hdpi round policy
Add combo box in general configuration dialog to let user
choose the round policy to use with hdpi screen.
2021-12-04 14:38:41 +01:00
joshua
eed1223c1d Minor improvement for function QETApp::customElementsDir() and QETApp::commonElementsDir()
the path is set the first time the function is called.
Each other call will immediately return the previously setted path
instead of check again what path to return.
2021-12-04 12:22:47 +01:00
joshua
291e163ee2 REmove unused method : levelCellCount 2021-12-02 18:55:56 +01:00
joshua
6e68e6047a Remove isXrefCell method...
and use instead columnTypeForIndex method
2021-12-02 18:54:45 +01:00
joshua
ce8bd7fae3 Add terminal bridge feature 2021-12-01 21:27:04 +01:00
Laurent Trinques
94f66553ac Add new GCE symbol 2021-11-29 04:59:58 +01:00
Laurent Trinques
c7579db674 Flatpak: update qet_tb_generator to version 1.3.1 2021-11-28 13:56:31 +01:00
Laurent Trinques
478c7771b7 Add new symbol nodemcu_v3, thanks Bertus 2021-11-28 00:01:35 +01:00
Laurent Trinques
b46bf67c58 Add new symbols 2021-11-27 07:20:05 +01:00
Maximilian Federle
8c09399804 ci: Build edge snaps on GitHub & release to store 2021-11-20 16:57:45 +01:00
Maximilian Federle
5055e93114 snap: Port to core20 2021-11-20 16:57:45 +01:00
Laurent Trinques
c70eb65259 Flatpak update qet_tb_generator to 1.3.0 version 2021-11-16 13:36:13 +01:00
Laurent Trinques
ebeeb04aa4 Fix typo in URL 2021-11-16 13:31:52 +01:00
Laurent Trinques
f0413ce9a5 SNAP change Github source to https://github.com/raulroda/qet_tb_generator-plugin 2021-11-16 13:30:02 +01:00
dlee99
21bb3f8426 modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2021-11-09 22:14:23 +01:00
plc-user
acf7478c8b upgraded elements and renamed company 2021-11-07 15:50:20 +01:00
Laurent Trinques
f08811aca0 Add Loxome symbols 2021-11-07 10:16:30 +01:00
dlee99
ea26f0b04e modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2021-11-04 19:39:04 +01:00
Laurent Trinques
9485e3360b Update *TS files 2021-11-04 09:39:59 +01:00
joshua
3e5713a512 Fix FTBFS for ubuntu bionic beaver 2021-11-01 13:36:41 +01:00
joshua
58a3e72abe Fix FTBFS for ubuntu Bionic Beaver 2021-11-01 12:41:43 +01:00
joshua
2252feca16 Fix some FTBS for older version of Qt and std c++ 2021-11-01 11:53:16 +01:00
joshua
985988ee53 Remove the use of c++17 if initializer 2021-10-29 20:57:11 +02:00
joshua
1cc162867f Fix fail to build for QT version lesser than 5.14 2021-10-29 19:37:02 +02:00
joshua
91ac46df83 Fix wrong use of static method QUuid::fromString() 2021-10-29 18:53:36 +02:00
joshua
f01b15d00a Merge branch 'master' into terminal_strip
* master:
  Danish translation updated
  translated hungarian files
  Update of German Language File, thanks Lars
2021-10-27 20:56:19 +02:00
joshua
3fdba11c73 Add buttons to quickly edit the type, function and led of several terminal at once. 2021-10-27 20:54:34 +02:00
Ole Carlsen
7afa1b8a59 Danish translation updated 2021-10-25 19:31:37 +02:00
artgg7300
6f197c2bb7 translated hungarian files 2021-10-22 20:04:22 +02:00
Laurent Trinques
5b788c177b Update of German Language File, thanks Lars 2021-10-22 06:41:57 +02:00
joshua
204b53cd00 Merge branch 'master' into terminal_strip
* master: (55 commits)
  modified:   lang/qet_nl.qm 	modified:   lang/qet_nl.ts
  Update *TS files
  Fix some misprint
  new and upgraded elements
  fix typo
  add terminals to thermo-couples
  upgraded elements and descriptions
  upgraded / added elements and descriptions
  updated descriptions
  more elements and descriptions
  fix typos
  update element-descriptions
  update elements / more element-descriptions
  fix designations / update descriptions
  fix designations / update descriptions
  update element-descriptions
  fix typo
  update element-descriptions
  update / add elements
  update element-descriptions
  ...
2021-10-20 21:32:45 +02:00
dlee99
a646359d51 modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2021-10-19 22:55:30 +02:00
Laurent Trinques
91f034272c Update *TS files 2021-10-19 06:17:19 +02:00
joshua
aefae7b73b Fix some misprint
When print on printer with low resolution, some lines are not printed
because to thin.
Thin line of elements : set width to 0.5 instead of 0 and set cosmetic
option to false.
Folio border and titleblock : set width to 1 and set cosmetic option to
false.
2021-10-16 10:15:45 +02:00
joshua
107d7ff806 Level of real terminal can be edited
The level of each real terminal who compose a physical terminal can be
edited. Several real terminal can be edited in one shot.
2021-10-12 19:25:35 +02:00
joshua
8b1f2fb0d9 Change the way how multi-level terminals are sorted 2021-10-10 10:58:38 +02:00
joshua
7c6fca2aac Ungroup terminal is now managed by undo stack 2021-10-09 14:45:54 +02:00
joshua
c6e3e385ff Clear code 2021-10-09 12:08:18 +02:00
joshua
089f260d9b Group terminals together is now managed by undo stack 2021-10-09 11:58:10 +02:00
plc-user
09e345ee4a new and upgraded elements 2021-10-06 06:14:55 +02:00
joshua
828424cae8 Level terminals can be disassembled 2021-10-04 21:26:51 +02:00
joshua
dca643f7aa Multi-level terminal can be created. 2021-10-03 13:22:21 +02:00
plc-user
cc327cb761 fix typo 2021-10-01 14:56:15 +02:00
plc-user
c03f2b605f add terminals to thermo-couples 2021-10-01 14:56:15 +02:00
plc-user
7ce23598e4 upgraded elements and descriptions 2021-10-01 14:56:15 +02:00
plc-user
3097a59c68 upgraded / added elements and descriptions 2021-10-01 14:56:15 +02:00
plc-user
53178cf17a updated descriptions 2021-09-30 04:29:56 +02:00
plc-user
6d02cd1779 more elements and descriptions 2021-09-30 04:29:56 +02:00
plc-user
1839e988f6 fix typos 2021-09-29 09:45:24 +02:00
plc-user
543c706e0c update element-descriptions 2021-09-29 09:45:24 +02:00
plc-user
5af8665e24 update elements / more element-descriptions 2021-09-29 09:45:24 +02:00
plc-user
86595f4114 fix designations / update descriptions 2021-09-26 07:09:50 +02:00
plc-user
f8cc42e3a7 fix designations / update descriptions 2021-09-25 05:53:10 +02:00
plc-user
085f56d192 update element-descriptions 2021-09-25 05:53:10 +02:00
plc-user
b580c2bb73 fix typo 2021-09-25 05:53:10 +02:00
plc-user
c6e168bb20 update element-descriptions 2021-09-25 05:53:10 +02:00
plc-user
a2a0c166d9 update / add elements 2021-09-25 05:53:10 +02:00
plc-user
96d6e21e2f update element-descriptions 2021-09-24 18:16:59 +02:00
plc-user
4093d1fa27 update translations and elements / added elements 2021-09-24 18:16:59 +02:00
Peter Keresztes Schmidt
de80d10f5e Build fix for non-C++17 compatible systems
std::variant/std::visit was only introduced with C++17. Remove its usage.
We don't even need it in these cases since QColor has an implicit constructor accepting Qt::GlobalColor.

Follow-up for b69c7b1027
2021-09-23 21:50:37 +02:00
joshua
1699ad9dd8 Add a push button to automatically reorder the terminal strip 2021-09-22 23:02:33 +02:00
Peter Keresztes Schmidt
e9a5fded5c DiagramContextWidget: Fix verification of keys 2021-09-22 21:54:00 +02:00
Peter Keresztes Schmidt
a8d42b0f9a Add MSVC support to MachineInfo 2021-09-22 21:53:21 +02:00
Peter Keresztes Schmidt
b69c7b1027 Refactor deeply nested statements
Compilation using MSVC fails with a C1061 error since MSVC has a hard limit on block nesting.
Refactor the code in question to use map lookups instead.
2021-09-22 21:53:21 +02:00
Olivier
7b0a581008 Correct a writing mistake in a name 2021-09-21 04:00:57 +02:00
Olivier
4f1a6d55e5 Redraw some switches and organize the folder a bit 2021-09-21 04:00:57 +02:00
Olivier
1048cef845 IEC 60617: Modification of group names 2021-09-21 04:00:57 +02:00
Olivier
dccbf92964 IEC 60617: Adding English names of elements 2021-09-21 04:00:57 +02:00
Olivier
626bf4ce9c IEC 60617: Manual changes in element names 2021-09-21 04:00:57 +02:00
Olivier
1f22a5a0a8 IEC 60617: Correction of a file name 2021-09-21 04:00:57 +02:00
Olivier
ce4729e1c0 IEC 60617: Correction of wrong file names 2021-09-21 04:00:57 +02:00
Olivier
d99b035aa6 IEC 60617: Rename two elements that had wrong names 2021-09-21 04:00:57 +02:00
Olivier
ad77482235 IEC 60617: Rename files that had wrong names. 2021-09-21 04:00:57 +02:00
Olivier
b02ed7fe51 IEC 60617: Correct two elements 2021-09-21 04:00:57 +02:00
Olivier
58efc14633 IEC 60617: Rename files that had wrong names. 2021-09-21 04:00:57 +02:00
Olivier
b03deb8e3e IEC 60617: Manual adjustment of "qet_directory" files 2021-09-21 04:00:57 +02:00
Olivier
580bb07685 IEC 60617: Addition of English in "qet_directory" files. 2021-09-21 04:00:57 +02:00
Olivier
818e5ef484 IEC 60617: manual change for some "qet_directory" files. 2021-09-21 04:00:57 +02:00
Olivier
bd6920e049 Correction of the family names in IEC 60617 2021-09-21 04:00:57 +02:00
joshua
377f8b1521 Overridden properties of terminal elements are now saved/loaded from project
The overridden properties of terminal elements made in the terminal
strip dialog are now saved and loaded from/to the project file.
2021-09-20 18:34:48 +02:00
joshua
67dbc798aa Minor 2021-09-20 18:21:23 +02:00
plc-user
6d17f3d0ad declare terminals as such / more element-descriptions 2021-09-20 14:50:18 +02:00
plc-user
5fc5a33543 some more element-descriptions 2021-09-18 10:13:56 +02:00
plc-user
337a2a45b4 added element-descriptions and elements 2021-09-18 10:13:56 +02:00
plc-user
8cb2fcc09c more element-descriptions / new elements 2021-09-17 10:02:37 +02:00
plc-user
8547940ab2 more element-descriptions 2021-09-16 14:05:46 +02:00
plc-user
f52ed8cf51 upgrade descriptions, new elements 2021-09-16 14:05:46 +02:00
Adrien Allain
ccfb46b354 Implemented QET coding style (replaced 4 space with tab) 2021-09-14 09:35:14 +02:00
Adrien Allain
c640d96bca * Added the m_rotate_action to qetelementeditor.ui * Adding QAction to qetelementeditor.cpp and connecting it to new slot RotateElementsCommand defined in editorcommands.cpp
* Some types of elements need to specialize the setRotation method in order to behave correctly :
- PartTerminal needs to call setOrientation
- PartLine, PartRectangle and PartPolygon need a different rotation center.
2021-09-14 09:35:14 +02:00
joshua
37e74b397e Use RealTerminalData struct instead of TerminalStripIndex class 2021-09-12 12:49:12 +02:00
plc-user
9135099dbf cleanup, upgrade descriptions, new elements 2021-09-12 12:13:18 +02:00
plc-user
76d68f5025 upgraded some descriptions 2021-09-12 12:13:18 +02:00
plc-user
710067969e upgraded some elements 2021-09-12 12:13:18 +02:00
plc-user
ddc171cfa2 removed some un-necessary line-breaks 2021-09-12 12:13:18 +02:00
plc-user
896ffb9c72 upgrade some elements 2021-09-12 12:13:18 +02:00
plc-user
db8529c536 moved DIN-rails to separate directory; new elements 2021-09-12 12:13:18 +02:00
plc-user
fcab77420d added/fixed translations and added elements 2021-09-12 12:13:18 +02:00
joshua
8c554e875d Use QLatin1String 2021-09-10 23:43:36 +02:00
joshua
5ef073b6c1 Merge branch 'terminal_strip' into merge_confli_master_terminal_strip
* terminal_strip:
  User can edit the label of terminal inside the terminal strip editor
  Code refactoring
  Double click on Xref cell show the terminal in the diagram
  terminal function can be edited, edted value is applied to element
  Table widget : led and type is editable
  Minor gui change
  Remove position section of terminalStripModel
2021-09-10 23:31:26 +02:00
joshua
895417c98c Revert "Revert "Add terminalStripModel class""
This reverts commit 4615e6d060.
2021-09-10 23:30:49 +02:00
joshua
374805d6ab Revert "Revert "Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet into terminal_strip""
This reverts commit bb26954bd4.
2021-09-10 23:30:20 +02:00
joshua
b08c2bd90b User can edit the label of terminal inside the terminal strip editor 2021-09-10 21:01:03 +02:00
plc-user
543447aa31 added element-descriptions 2021-09-08 13:23:16 +02:00
plc-user
4622df84e3 added element-descriptions 2021-09-08 13:23:16 +02:00
plc-user
9e3cca101d added translations 2021-09-08 13:23:16 +02:00
plc-user
5627295002 added element-descriptions and some elements 2021-09-08 13:23:16 +02:00
joshua
a765fe24be Bug fix : in some condition element are not loaded when open a project
If an element are overwrite by a modified element and the terminals of
the modified element are moved, the old element is not loaded because
some terminal are not found.
This commit remove the checking of not found terminal because it's
useless now.
2021-09-07 22:23:43 +02:00
sdeffaux
07e38236d2 add and update symbols 2021-09-07 12:54:37 +02:00
sdeffaux
6e03e022e1 Add and update symbols 2021-09-07 12:54:37 +02:00
sdeffaux
883bee496c Update symbols 2021-09-07 12:54:37 +02:00
pavelfric
9e5267aeb9 Updated Czech translation. 2021-09-06 10:02:51 +02:00
plc-user
ec367e847b added translations 2021-09-02 14:19:44 +02:00
plc-user
77d38d80ea adjusted terminals and text / added elements 2021-09-02 14:19:44 +02:00
plc-user
915e553a2f added translations / simplified graphics 2021-09-02 14:19:44 +02:00
plc-user
318c49897c removed duplicate elements 2021-09-02 14:19:44 +02:00
plc-user
87f8b1f154 fix typo in filename 2021-08-31 15:16:39 +02:00
plc-user
d6fd14dd5f fixed fonts / added schematics for MID-Counters 2021-08-31 15:16:39 +02:00
plc-user
f4464ab5a3 added RF-modules and front-views of MID-Counters 2021-08-27 05:36:08 +02:00
plc-user
38e957f078 add translations 2021-08-25 13:59:55 +02:00
plc-user
62b23aa530 fix typos, add translations, add elements 2021-08-25 13:59:55 +02:00
joshua
4dd2dc259f Code refactoring 2021-08-23 20:44:53 +02:00
joshua
f3811d3035 Add annex project 2021-08-20 17:41:08 +02:00
joshua
5288cd8c8b Add tab "annex project" to about qelectrotech dialog
The goal is to list annex project of QElectroTech.
2021-08-20 17:31:37 +02:00
Laurent Trinques
d1974349e0 Restore Wago 2206_terminals symbols 2021-08-19 10:20:11 +02:00
joshua
80601a415a Double click on Xref cell show the terminal in the diagram 2021-08-17 20:49:48 +02:00
sdeffaux
f3171dc0db Add symbols 2021-08-15 22:57:20 +02:00
sdeffaux
359a09f40a update symbols
ajout de symboles et traduction
2021-08-15 22:57:20 +02:00
plc-user
1899ef0336 further bugfixing and new elements 2021-08-13 08:47:36 +02:00
plc-user
0fa171470c some new elements 2021-08-13 08:47:36 +02:00
plc-user
7a08847522 BugFixing, Labelling & Beautification of some elements 2021-08-13 08:47:36 +02:00
Simon De Backer
a3dfc3efa6 Fix Cmake
See:
3220a58b96 ("Move file", 2021-05-14)
2021-07-27 20:45:13 +02:00
Laurent Trinques
e730800a98 Add new symbols, thanks Vbxler 2021-07-19 07:18:15 +02:00
dlee99
63c98225ef modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2021-07-18 23:02:27 +02:00
joshua
cc6f66ad11 terminal function can be edited, edted value is applied to element 2021-07-17 13:44:44 +02:00
dlee99
8ac9d0d9a8 modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2021-07-16 21:18:48 +02:00
joshua
30dc34ebe1 Table widget : led and type is editable
But not applied yet to the terminal strip
2021-07-13 12:27:08 +02:00
joshua
efed7ab5c0 Minor gui change 2021-07-12 19:16:01 +02:00
dlee99
1e7dfb8f5a modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2021-07-11 00:12:44 +02:00
Laurent Trinques
6f736cb785 Add new ewon element, thanks Vbxler 2021-07-06 19:55:57 +02:00
joshua
52e884b793 Minor fix : slave Xref item is not updated when variable %F is used 2021-06-28 21:31:15 +02:00
joshua
5912a99c16 Minor fix : master XRef is not updated when variable %F is used 2021-06-28 21:24:28 +02:00
joshua
8f051fc612 Remove table useless qetgraphicstableitem when model is reseted
When the model of a qetgraphicstableitem is reseted (for exemple when
the sql query is modified) we check if there is useless tables (table
with 0 row displayed) and remove it.
2021-06-24 19:46:18 +02:00
joshua
bd96faa14f Fix crash
When a qetgraphicstable is deleted, the next and previous table is not
aware about the deletion and keep a dangled pointer of the deleted table
who cause a segfault.
2021-06-24 19:15:24 +02:00
joshua
f410fbf7e2 Remove position section of terminalStripModel 2021-06-07 21:56:27 +02:00
joshua
bb26954bd4 Revert "Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet into terminal_strip"
This reverts commit 364bce618c, reversing
changes made to efb4a8dd71.
2021-06-07 20:00:52 +02:00
joshua
4615e6d060 Revert "Add terminalStripModel class"
This reverts commit a1e18d2bba.
2021-06-07 19:45:45 +02:00
joshua
a1e18d2bba Add terminalStripModel class 2021-06-07 19:26:41 +02:00
joshua
364bce618c Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet into terminal_strip 2021-06-07 19:25:30 +02:00
artgg7300
efb4a8dd71 translated hungarian element names 2021-06-05 07:43:06 +02:00
plc-user
f1e353b342 added some additional front-views (100mm->200px) 2021-06-04 21:43:38 +02:00
plc-user
78a48e48c1 changed scaling of front-views to 100mm->200px 2021-06-04 21:43:38 +02:00
Kevin Tee
b448c26d71 Fix typo.
Fix typo.
Also, can we add more screenshots?
2021-05-26 22:40:15 +02:00
Laurent Trinques
c7648fe2af Snap : try to add PySimpleGUI python-packages 2021-05-21 19:38:11 +02:00
joshua
6660caa70f Merge branch 'master' into terminal_strip 2021-05-21 19:18:16 +02:00
joshua
fdbfca9a8c Change ElementData enum
Change enum value 'ground' from enum 'function' to enum 'type'
2021-05-21 19:15:26 +02:00
Laurent Trinques
93b164d077 Update Flatpak, thanks kevinsmia1939 2021-05-20 16:10:01 +02:00
Laurent Trinques
8ed4e742f5 Minor 2021-05-18 08:09:36 +02:00
joshua
c1fdc1adaa Fix xrefproperties bug
Change only slave Xrefproperties is not applied due to overload operator
== who don't compare the formula string of slave.
2021-05-15 18:58:26 +02:00
joshua
789e195ace Fix include path from previous commit 2021-05-14 19:50:30 +02:00
joshua
3220a58b96 Move file 2021-05-14 19:37:36 +02:00
joshua
21c35bc744 Minor improvement at element picture creation
Call once the uuid() method of element location instead of four (and so
parse once time the xml) to store the uuid/picture and uuid/primitive to
hash.
2021-05-14 16:15:49 +02:00
joshua
fd9ab47041 Load project from xml is a little more faster
Like previous commit, in the method loadDiadrams() we call the method
diagramAdded(), in this method we call rebuildDiagramsMap()
updateAllTabsTitle() and these methods operate a loop for each existing
DiagramView.

Now loadDiagrams don't call diagramAdded (which must be used only when
user add a diagram during the use of QElectroTech) but make operations
itself and when all DiagramView are added, call rebuildDiagramsMap()
updateAllTabsTitle() only once.
2021-05-14 15:47:10 +02:00
joshua
71636ba874 Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2021-05-14 13:39:33 +02:00
joshua
0aea48bdaa Open project is a litle more faster
In the methods readDiagramsXml we call addDiagram for each diagrams
loaded from xml, inside the addDiagram method we call the method
updateDiagramsFolioData() and to finish this method operate a loop for
each existing diagram.

Then when we load a project from xml of
10 folios, loop inside updateDiagramsFolioData() is called 55 time.
50 folios, loop inside updateDiagramsFolioData() is called 1275 time.
100 folios, loop inside updateDiagramsFolioData() is called 5050 time.

Now instead of call addDiagram, we add diagram directly inside the
methods readDiagramsXml and call the method updateDiagramsFolioData()
only once when all diagrams are loaded.
2021-05-14 13:38:59 +02:00
Ole Carlsen
dd51819403 Updated Danish Translation 2021-05-13 21:39:48 +02:00
joshua
ffabeb9caa Avoid excessive debug outputs
Avoid excessive debug outputs when terminal type doesn't exist (99.99%
of actual elements collections).
2021-05-13 20:48:56 +02:00
dlee99
bfc1df633e modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2021-05-12 21:06:49 +02:00
joshua
507c1b4f73 Minor gui behavior improvement 2021-05-11 18:46:12 +02:00
joshua
580ebe8b97 Terminal strip can now be edited and managed by undo command 2021-05-11 18:20:46 +02:00
joshua
e0579b3040 Add widgets to edit terminal strip data (WIP) 2021-05-11 18:20:46 +02:00
joshua
ded4ea555f Terminal element can be removed from a terminal strip 2021-05-11 18:20:46 +02:00
joshua
f07f4cb150 Fix drag and drop bug 2021-05-11 18:20:46 +02:00
joshua
dbb21373e1 Read terminal strip from xml 2021-05-11 18:20:46 +02:00
joshua
89f3ce1eb3 terminal strip can be saved to xml 2021-05-11 18:20:46 +02:00
joshua
36068abce7 Add a reload push button
Add a reload push button to quickly reload/update the gui according to
the current state of the terminal strip.
2021-05-11 18:20:46 +02:00
joshua
d551c8e6b9 Improve undo command when remove a terminal strip 2021-05-11 18:20:46 +02:00
joshua
2572e1c25d Display terminals owned by terminal strip in the tree view 2021-05-11 18:20:46 +02:00
joshua
b158984464 Set parent terminal strip of terminal element
Call the method :
void TerminalElement::setParentTerminalStrip(TerminalStrip *strip)
when a terminal element is added to a terminal strip.
2021-05-11 18:20:46 +02:00
joshua
256d42d030 Add and move terminal element to strip is managed by undo 2021-05-11 18:20:46 +02:00
joshua
171e95fb17 Enable drag and drop of terminal tree widget item 2021-05-11 18:20:46 +02:00
joshua
d3ad490b84 Initial comit to use drag and drop 2021-05-11 18:20:46 +02:00
joshua
df07f373d8 Terminal strip add/remove is managed by undo stack 2021-05-11 18:20:46 +02:00
joshua
5d17461c6e Add RemoveTerminalStripCommand class 2021-05-11 18:20:46 +02:00
joshua
2cf5ea11fd Fix : undo code is executed in redo function and vice versa
Need to sleep ?
2021-05-11 18:20:46 +02:00
joshua
573c0c236a Add undo command for add/remove a terminal strip 2021-05-11 18:20:46 +02:00
joshua
63429ab087 Terminal strip editor display the free terminal elements 2021-05-11 18:20:46 +02:00
joshua
00846c1418 Add "parent terminal" strip member to TerminalElement class 2021-05-11 18:20:46 +02:00
joshua
a3f776b7db Add 'comment' to terminal strip 2021-05-11 18:20:46 +02:00
joshua
91db58bb64 Add dialog to create terminal strip + display existing terminal strip 2021-05-11 18:20:46 +02:00
joshua
0a2ec297bf Minor 2021-05-11 18:20:46 +02:00
joshua
bbfe9ed377 Add terminal strip editor widget 2021-05-11 18:20:46 +02:00
joshua
39aee4ad07 Add terminal strip data class 2021-05-11 18:20:46 +02:00
joshua
49674e7d33 Add terminal strip class 2021-05-11 18:20:46 +02:00
joshua
12c0dbd8d1 Minor gui change 2021-05-11 18:20:19 +02:00
artgg7300
734e70ffb1 translated hungarian lang files 2021-05-11 06:11:43 +02:00
Laurent Trinques
480066cc6d Update *TS files 2021-05-09 12:46:47 +02:00
joshua
74dcf96e4b Element editor: make element text option "keep visual rotation" editable. 2021-05-08 22:14:15 +02:00
Laurent Trinques
222c86f550 Minor update README.md 2021-05-06 23:34:18 +02:00
Laurent Trinques
b255423245 Update README.md 2021-05-06 23:27:09 +02:00
joshua
09c0929040 Element editor gui fix
When select a primitive an unparented windows appear and can't be
deleted. Fix it.
2021-04-30 20:27:24 +02:00
Laurent Trinques
7312d06cc4 Minor 2021-04-30 11:52:44 +02:00
Laurent Trinques
5c75bc4194 OSX update qet_tb_generator PATH to python 3.9 2021-04-30 11:34:32 +02:00
Laurent Trinques
760a1f6c43 Try to improve HIGHDPI_SCALING 2021-04-21 09:38:48 +02:00
joshua
b6cfc8c755 Improve element collection loading time
According to Qt creator flame graph, call QSettings take lot of time.
When loading the element collection, each items of the collection get
the current language by calling the function QString
QETApp::langFromSetting().
This function instantiate a QSettings object each time and take a lot of
time.
Now the QSettings is instantiate only at the first call, and the value
is stored in memory, then all other call of the function don't
instantiate a QSettings, but just return the value in memory.
2021-04-18 20:03:13 +02:00
sdeffaux
820a01cb7d add symbol 2021-04-17 16:15:10 +02:00
sdeffaux
bfd7c1ea7c Update symbols and examples 2021-04-17 16:15:10 +02:00
Laurent Trinques
b8d9d38d31 Minor 2021-04-12 06:40:59 +02:00
Laurent Trinques
c05d76c633 Flatpak update org.qelectrotech.QElectroTech.json 2021-04-12 06:36:16 +02:00
joshua
5a8197b2b3 Element query widget : make code more readable 2021-04-11 14:08:21 +02:00
joshua
c1169f0e04 Element nomenclature sql query minor fix
Filter "is empty" don't work for any case :
We must to filter for NULL and empty string then replace the sql
sentence "value IS NULL" by "(value IS NULL OR value = '')"
2021-04-11 14:03:02 +02:00
joshua
794af49a3a Element nomenclature SQL query : minor fix
the filter "is not empty" in nomenclature don't work for every case.
Replace SQL sentence "IS NULL" by "!= ''" because an empty string is not
a NULL value string, but a NULL value string is like an empty string
2021-04-11 12:39:38 +02:00
Laurent Trinques
8ef0d0b2f0 Flatpak fix location patch 2021-04-09 16:22:41 +02:00
Laurent Trinques
3729bec350 Flatpak update flatpak/org.qelectrotech.QElectroTech.json 2021-04-09 16:15:26 +02:00
Laurent Trinques
157377e1c1 Faltpak update org.qelectrotech.QElectroTech.json
see :https://github.com/flathub/flathub/pull/2146
2021-04-09 16:01:14 +02:00
joshua
7cb47f3b9e Fix unwanted moving part in element editor.
Fix an unwanted behavior when the properties dock widget is displayed :

1 there is no selection
2 the dock widget width is set to minimum
3 select a part, the dock widget gain new widgets used to edit the
current selected part and the width of the dock grow so the width of the
QGraphicsView is reduced and cause a mouse move event.
When this case occur the part is moved but they should not.
2021-04-07 12:56:43 +02:00
joshua
9db15f91e7 Improve gui layout for low resolution screen 2021-04-07 12:34:56 +02:00
plc-user
c54ee9b66d Bug-Fixing on an element 2021-04-07 01:05:42 +02:00
Laurent Trinques
7a2c62d4d2 Minor: update readme.md files 2021-04-04 17:21:50 +02:00
joshua
7f5b446fc9 Use QStringLiteral and QLatin1String. 2021-04-02 19:16:32 +02:00
Laurent Trinques
bba1f07f57 Revert "Flatpak add --socket=cups for work with LAN printers"
This reverts commit d32c322e5a.
2021-03-31 16:16:41 +02:00
Laurent Trinques
d32c322e5a Flatpak add --socket=cups for work with LAN printers 2021-03-31 15:03:18 +02:00
joshua
8960981f09 Use QStringLiteral and QLatin1String. 2021-03-30 20:48:56 +02:00
joshua
f2f50084e0 Use QStringLiteral and QLatin1String.
According to the Qt documentation
(https://doc.qt.io/qt-5/qstring.html#QStringLiteral)
(https://woboq.com/blog/qstringliteral.html), use QStringLiteral and
QLatin1String is better on some conditions (faster).
This commit change the code related to the loading of a project (in
qetproject class), let see if loading time is improved.
2021-03-30 19:59:14 +02:00
Ole Carlsen
48be92cde5 Updated Danish translation 2021-03-29 20:18:26 +02:00
Kevin Tee
845431179d Update qelectrotech.appdata.xml
Add missing release tag.
I also suggest changing the license of this file.
This document suggest using permissive license, also it can be accept to Flathub.
https://freedesktop.org/software/appstream/docs/chap-Quickstart.html#qsr-app-contents

I suggest MIT, what do you think?
2021-03-29 05:50:47 +02:00
Kevin Tee
f6161af258 Update qelectrotech.appdata.xml
I forgot missing closing release tag.
2021-03-29 05:50:47 +02:00
Kevin Tee
8755a12698 Update qelectrotech.appdata.xml
I'm not sure about the date for this 2021-02-21
2021-03-28 18:52:41 +02:00
Kevin Tee
a361e16a8e Update qelectrotech.appdata.xml
add content rating, release date, and license according to SPDX.
2021-03-28 18:52:41 +02:00
Laurent Trinques
0f8f26e177 Refrersh splash 2021-03-23 00:58:56 +01:00
joshua
d53bb22509 Make MachineInfo a singleton class
Because on windows MachineInfo take a little time to init, we make it to
a singleton.
MachineInfo is build the first time in main.cpp.
Now all other places where we use MachineInfo (aboutqetdialog and
configdialog) gui don't hang anymore in waiting to MachineInfo finish to
build.
2021-03-22 19:20:07 +01:00
joshua
3d25beaea0 Rename class Machine_info to MachinInfo
Rename to follow the code style of QElectroTech
2021-03-22 19:01:46 +01:00
Laurent Trinques
1a3656f7be Add MINGW flag for cmake 2021-03-22 08:15:37 +01:00
Joshua Claveau
7de810bac4 little fix 2021-03-21 19:06:12 +01:00
Joshua Claveau
1b6cf7d5f3 Project properties dialog launch a little more faster (especially on windows)
Instead of build machine_info class which take time, only to get the max
width and height of screens, call  of methods
Machine_info::i_max_screen_width() and
Machine_info::i_max_screen_height() are now static and compute only
this.
The project properties dialog is now faster because don't wait the end
build of machine_info.
2021-03-21 19:01:54 +01:00
Joshua Claveau
6cf79e6e75 Qet start a little more faster (especially on windows)
Machine_Info class take time on windows even in powerful computer.
Run the machine_info in main.cpp in parallel into another thread.
2021-03-21 18:36:03 +01:00
artgg7300
8fdb9ba21a translated hungarian element names 2021-03-20 20:22:52 +01:00
Simon De Backer
a4adcf4865 Fix cmake user properties class
for commit 44db25e76b
2021-03-18 21:22:39 +01:00
Gleb Popov
9300130aaf Add installation phase to CMake build system 2021-03-18 13:44:26 +01:00
Gleb Popov
d7dd32ff1a Fix CMake build when git revision can't be determined 2021-03-18 13:44:15 +01:00
Gleb Popov
564f38396f Add CMake option to allow using system pugixml library 2021-03-18 13:44:04 +01:00
Gleb Popov
ab5dd39556 Add CMake option to allow using system KF5 libraries 2021-03-18 13:43:50 +01:00
Gleisson Jesuino Joaquim Cardoso
b12a4525a2 Update PT_BR translation 2021-03-17 22:00:38 +01:00
Laurent Trinques
e0f2a66f3c Update Mongolian translation, thanks Nathalie 2021-03-17 09:59:12 +01:00
Laurent Trinques
20f5c3e443 Minor update README.md files 2021-03-15 23:44:26 +01:00
Paweł Śmiech
ea730a2fa1 Polish translation update 2021-03-14 21:03:08 +01:00
anvilex
28d98a1a30 Update qelectrotech.xml
1. Russian translation added.
2021-03-14 15:30:48 +01:00
anvilex
a75565e30d Update x-qet-titleblock.xml
1. Russian translation added.
2. German translation added.
2021-03-13 22:08:16 +01:00
anvilex
6ededf94bf Update x-qet-titleblock.desktop
1. Russian translation added.
2. Englisch translation improved.
3. German translation improved.
2021-03-13 22:07:21 +01:00
anvilex
9ca44f2557 Update qelectrotech.desktop
Russian translation added
2021-03-13 22:02:33 +01:00
anvilex
9aad769a37 Update qelectrotech.appdata.xml
1. German translation added.
2. Russian translation improved.
2021-03-13 22:01:36 +01:00
plc-user
1f0f44233e Update qet_directory 2021-03-13 22:00:24 +01:00
plc-user
5594197aab some Bug-Fixing of elements 2021-03-13 22:00:24 +01:00
plc-user
13b6b0c6c9 removed HTML-Tag &amp;#xd; from some element-informations 2021-03-13 12:19:47 +01:00
plc-user
b0e6ad46ac centered some elements on DIN-rail (allows rotating without changing Y-position) 2021-03-13 12:19:47 +01:00
Lars Biskupek
b417edaff8 Fixed grammer issues in German language file 2021-03-12 06:39:53 +01:00
anvilex
301fa629d8 Update qet_fr_ru.qph 2021-03-12 06:32:55 +01:00
joshua
44db25e76b Add user properties class
Add a specific class for user properties instead of embedded user
properties in properties interface.
2021-03-11 21:39:57 +01:00
joshua
d5df9703d0 Add new XML function 2021-03-11 20:20:07 +01:00
joshua
11b8ef927b Revert "Merge branch 'XMLPropertiesNew'"
**Break a lot of thing.**

This reverts commit 1db1800572, reversing
changes made to 4c563821e8.
2021-03-11 19:52:50 +01:00
joshua
83b69253dc Revert "fix compile error"
This reverts commit b181311162.
2021-03-11 19:49:46 +01:00
joshua
b96eff00ef Revert "Fix for cmake"
This reverts commit 4051bbd309.
2021-03-11 19:49:32 +01:00
Laurent Trinques
4051bbd309 Fix for cmake 2021-03-11 07:59:54 +01:00
Martin Marmsoler
b181311162 fix compile error 2021-03-10 19:12:00 +01:00
joshua
1db1800572 Merge branch 'XMLPropertiesNew' 2021-03-09 19:09:31 +01:00
joshua
001e93bc6f Forgoten revert ToXml() 2021-03-09 18:43:03 +01:00
Martin Marmsoler
6e17996d37 fix problem that default conductor is not found 2021-03-08 20:48:23 +01:00
Simon De Backer
4c563821e8 [Qt6] ad QCloseEvent to Widgets 2021-03-07 20:23:07 +01:00
Simon De Backer
a4872bf686 [Qt6] mod QRegExp to QRegularExpression
note ad Core5Compat to Cmake
2021-03-07 20:21:39 +01:00
Simon De Backer
332d978043 [QT6] QtConcurrent its backwards now...function, object, args 2021-03-07 19:58:49 +01:00
Martin Marmsoler
755bcf640d fix conductor properties xml load 2021-03-07 14:07:47 +01:00
joshua
38a825865c Fix ftbfs on debian buster 2021-03-07 12:18:30 +01:00
Martin Marmsoler
5d3710c4b2 copy all toXML() from master commit 4b82c3a0c4 into the current branch, because the new concept will be used only for user properties 2021-03-07 10:09:45 +01:00
Martin Marmsoler
058824f29a move all static xml functions to qetxml 2021-03-06 20:01:31 +01:00
joshua
4b82c3a0c4 Fix crash
Fix crash for a special case (the first time since qet exist) when a
conductor have all segments to 0 in the .qet file.
See https://qelectrotech.org/forum/viewtopic.php?id=1964
2021-03-06 15:17:10 +01:00
Martin Marmsoler
ea793125a5 move m_change_connections to ElementItemEditor, so it must not be defined by every editor it self 2021-03-05 20:59:36 +01:00
Laurent Trinques
153aecbbf3 Flatpak change to --socket=fallback-x11 2021-03-05 18:17:25 +01:00
Martin
bc88f2ec2e reimplement Priv function, so the ElementEditor gets called automatically 2021-03-05 17:38:51 +01:00
Martin
6887c543da add possibilities to fill the userProperties 2021-03-05 07:56:35 +01:00
Martin Marmsoler
51ed21f9ef Merge commit 'b021ac3e1fb98a56810773c7c701e3329efb3148'
Conflicts:
	sources/qetgraphicsitem/element.h
2021-03-04 21:31:55 +01:00
Martin Marmsoler
221773ea8a fix some issues 2021-03-04 21:25:04 +01:00
Martin Marmsoler
9d4b90da1a Add userProperties 2021-03-04 19:18:28 +01:00
Thomas Gravekamp
b021ac3e1f Add Williams EM symbols 2021-03-03 21:53:25 +01:00
joshua
faf4235bed Terminal element info
Provide only useful information for terminal
2021-03-03 21:28:22 +01:00
Laurent Trinques
0a51e22b7d Update org.kde.Platform" to "runtime-version": "5.15" 2021-03-03 18:38:13 +01:00
Laurent Trinques
632fba5366 Add binary hungarian lang file 2021-03-03 14:28:01 +01:00
artgg7300
0ca883f114 translated hungarian lang file 2021-03-03 14:10:24 +01:00
Simon De Backer
170d856007 Fix Cmake
did not compile
2021-03-02 22:15:44 +01:00
joshua
0424eb9fba Mark deprecated method 2021-03-01 22:17:58 +01:00
Lars Biskupek
8210f06919 Update of German Language File qet_de 2021-03-01 20:41:40 +01:00
Ole Carlsen
468618adda Danish translation updated 2021-03-01 20:28:58 +01:00
pavelfric
8141a75738 Updated Czech translations of elements. 2021-03-01 10:40:11 +01:00
dlee99
8f201a6e5d modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2021-02-28 22:18:33 +01:00
Lars Biskupek
b8745c0a6b Update of German language file qet_de 2021-02-28 21:23:50 +01:00
Laurent Trinques
7c3bde9118 Update SingleApplication to upstream master 2021-02-28 18:05:18 +01:00
Martin Marmsoler
ed8c1dea9d Merge commit '28cd389695248b56a99a417bc10640bb3e99c298' 2021-02-28 17:33:43 +01:00
Laurent Trinques
28cd389695 Upgrade pugixml XML parser to 1.11 release
https://pugixml.org/docs/manual.html#v1.11
2021-02-28 17:12:53 +01:00
Laurent Trinques
56bb2a399b Refresh splash size 2021-02-28 05:56:59 +01:00
Laurent Trinques
dc726792d3 Update *TS files 2021-02-28 05:53:40 +01:00
joshua
d8707a4ef2 Add dialog to inform user when open a non compatible project 2021-02-27 14:01:33 +01:00
Martin Marmsoler
01d6cdb920 Merge commit '77710e1cc5e597d06196d2ee163198176032987a'
Conflicts:
	sources/conductorproperties.cpp
	sources/qetgraphicsitem/element.cpp
	sources/qetgraphicsitem/qetshapeitem.cpp
2021-02-27 07:49:24 +01:00
joshua
77710e1cc5 Remove compatibility of QetShapItem from version prior to svn 4075
Befor svn 4075 QetShapItem was saved as int in xml, after as a string.
Remove retro-compatibility (int to string) svn 4075 is older than 5
years.
2021-02-25 20:47:43 +01:00
joshua
1d2c00819d Element collection cache remove old code
Remove old code use to drop table when qet was using mtime instead of
uuid for check if an element was changed.
2021-02-25 20:31:14 +01:00
joshua
eee0469bd7 Remove retro compatibility of conductor text prior to qet 0.4
The property hide/show compatibility of conductor text is not maintained
for project made before qet 0.4
2021-02-25 20:21:18 +01:00
joshua
5118037cb5 Remove retro compatibility of element label prior to qet 0.5
Compatibility is not maintained anymore with the old project which
contain variable in the element information "label"
2021-02-25 19:42:14 +01:00
joshua
1f53c39290 Remove retro compatibility of element text item prior to qet 0.7
Compatibility is not maintained anymore with the old project which
contain old element text item.
2021-02-25 19:35:04 +01:00
Martin
f499507b2d fix load issue 2021-02-25 16:55:13 +01:00
joshua
b71aec9548 Fix wrong element type 2021-02-24 20:49:10 +01:00
joshua
c7798e1a80 Fix wrong element type 2021-02-24 20:41:47 +01:00
Martin
5430692359 remove not needed declaration, because the definition was already deleted. And so a linker error occured 2021-02-24 19:04:14 +01:00
Martin
02b7ead041 fix compile issues 2021-02-24 18:48:59 +01:00
Martin
ea364f9c4e merge 2021-02-23 17:35:55 +01:00
Laurent Trinques
f97edad75a DiagramView::mouseMoveEvent remove "DEV" in toolTip message mouse
postion
2021-02-23 00:51:50 +01:00
Laurent Trinques
454b2c8a0f Update splash to 0.9 version 2021-02-22 16:22:08 +01:00
Lars Biskupek
b2782bc460 Tab-stop definitions inserted where appropriate
Tab stop definitions inserted in some dialogs, so that the order of tab-stops-moves corresponds as closely as possible to the fields' position in the window.
2021-02-22 13:47:39 +01:00
Lars Biskupek
059f0eb1b6 Modifications to SaveFile-Dialog for "Save As PDF"
Fixed a typo that prevented existing PDF files from being displayed in SaveFileDialog for PDFs.

The way the file name for the PDF is generated has changed. If the project has already been saved, the PDF has the same file name (with .pdf of course); If not, the file name is generated from the project title (= same behavior as Save as - dialog for a .qet project file).
2021-02-22 13:47:39 +01:00
joshua
ce318ac667 Element : start use ElementData
Element now use ElementData for namelist and element information
2021-02-21 19:40:33 +01:00
joshua
be2067148e Element editor : add terminal properties editable 2021-02-21 19:40:33 +01:00
joshua
444f62a1f8 element data : add terminal type enum and terminal function enum 2021-02-21 19:40:33 +01:00
joshua
8f85cacb06 QetElementEditor : Use elementData class 2021-02-21 19:40:33 +01:00
joshua
ffe3d98279 Add element data class 2021-02-21 19:40:33 +01:00
joshua
dea926e4b4 Remove unnecessary method 2021-02-21 19:40:33 +01:00
joshua
a1779d1a7a Rewrite terminaleditor with ui file.
Write terminal editor with ui file.
The terminalData::type of a terminal can be edited with the terminal
editor.
2021-02-21 19:40:33 +01:00
joshua
252106178b Add enum Type to terminalData class 2021-02-21 19:40:32 +01:00
joshua
a00404bc9f clean terminal and terminaldata class 2021-02-21 19:40:32 +01:00
joshua
e2ebb445a8 Terminal : remove unused code 2021-02-21 19:40:32 +01:00
joshua
24ec94d73e QetElementEditor : rewrite gui with ui file 2021-02-21 19:40:32 +01:00
joshua
edb42caa16 Fix typo
Fixed a typo that resulted in existing PDF files not being displayed in
the dialog box "Save As PDF".
Thanks Bisku
2021-02-21 19:38:53 +01:00
Pawel Śmiech
c110acc0ac Polish translation updated
Signed-off-by: Pawel Śmiech <pawel@localhost.localdomain>
2021-02-21 13:46:41 +01:00
Laurent Trinques
3467c09c1e Change displayedVersion = "0.90-DEV" 2021-02-21 11:00:42 +01:00
Laurent Trinques
664537c178 Change displayedVersion 2021-02-21 10:15:38 +01:00
joshua
5f908fcd88 ElementCollectionWidgetWidget : Set search start when text to search have at least 3 letters.
The goal is to avoid gui freeze when search for 1 or 2 letters (in this
case qet search for every item and take a lot of time).
2021-02-21 09:44:38 +01:00
Laurent Trinques
ef58f34c14 Update Copyright date 2021-02-20 12:13:46 +01:00
artgg7300
34eb14a97e translated hungarian element names 2021-02-15 20:26:47 +01:00
joshua
30858f9a4d Minor fix :
Combobox "information of element" don't display the real information set
to the dynamic text field
2021-02-15 18:53:22 +01:00
Lars Biskupek
108513ef97 Update German Language file qet_de 2021-02-15 12:14:47 +01:00
Simon De Backer
81e6f217b4 Fix Cmake will not build
missing files in Cmake
From: 0c4f87bd76
2021-02-14 06:52:05 +01:00
joshua
c592b7a7fd Fix crash
When use the function "invert selection" qet crash when a selected
conductor is being deselected.
2021-02-09 21:05:32 +01:00
Laurent Trinques
e3fab9508f Update pl translation, thanks Pawel 2021-02-08 05:45:18 +01:00
joshua
c13af5ace0 Clean some include 2021-02-07 20:44:17 +01:00
joshua
0c4f87bd76 Replace AddItemCommand class by AddGraphicsObjectCommand
The class is the same except the name and the use of QPointer to avoid
segfault with deleted QGraphicsObject.
2021-02-07 16:20:55 +01:00
joshua
ac23010559 Fix crash 2021-02-07 13:25:21 +01:00
joshua
b335a4af4f Fix bug 225
https://qelectrotech.org/bugtracker/view.php?id=225
2021-02-06 19:41:22 +01:00
joshua
2513961cd6 Revert "Update Copyright date"
This reverts commit d04bccc384.
2021-02-06 19:00:48 +01:00
Laurent Trinques
d04bccc384 Update Copyright date 2021-02-06 18:33:42 +01:00
Ole Carlsen
47ea5a3da9 Updated Danish Translation 2021-02-01 20:43:18 +01:00
joshua
e1b98ce5b5 Revert "QetElementEditor : rewrite gui with ui file"
This reverts commit e3db2bc898.
2021-02-01 19:52:15 +01:00
pavelfric
70947ac5b9 Updated Czech translations of elements. 2021-02-01 18:35:26 +01:00
pavelfric
b58898b6c8 Updated Czech translations of elements. 2021-02-01 18:10:47 +01:00
plc-user
6da28a1845 added MDT-elements (by a.funke) and some cleanup of elements 2021-02-01 02:51:35 +01:00
Lars Biskupek
4ade6f3227 MantisBT Issue #219 solved
Translation for "Formater en tant que liste de materiel" added.
2021-01-31 14:42:59 +01:00
Lars Biskupek
507841208d Updated German language file qet_de.qm 2021-01-31 07:53:15 +01:00
dlee99
762a9e3718 modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2021-01-31 00:25:56 +01:00
joshua
b1a7f2e26c Minor : Text of folio report is now set as "label" 2021-01-30 19:44:18 +01:00
joshua
e3db2bc898 QetElementEditor : rewrite gui with ui file 2021-01-30 19:34:21 +01:00
artgg7300
85fa9245a4 translated hungarian element names 2021-01-30 18:33:13 +01:00
artgg7300
4df313cbeb translated hungarian lang files 2021-01-30 16:49:50 +01:00
Laurent Trinques
f62feaef94 Update *ts files 2021-01-30 15:20:57 +01:00
Laurent Trinques
ad340cf95a Minor 2021-01-30 15:16:43 +01:00
Laurent Trinques
692bf0ed72 Replace the flag of the Arab country 2021-01-30 15:05:56 +01:00
pavelfric
3aceb436be Updated Czech translations of elements. 2021-01-30 11:43:02 +01:00
pavelfric
330299e9df Updated Czech translations of elements. 2021-01-30 11:17:13 +01:00
Lars Biskupek
eefa4de8f8 Updated German translation qet_de.ts
Translation for 'Mongol' and 'Modifier les informations de plusieurs éléments' added.
2021-01-30 07:14:58 +01:00
pavelfric
1d28f29c07 Updated Czech translations of elements. 2021-01-29 20:15:31 +01:00
artgg7300
5abf93dd8d translated hungarian lang files 2021-01-29 19:48:49 +01:00
Laurent Trinques
07a6dd887e Update translations_stat.pl files 2021-01-29 18:27:18 +01:00
Laurent Trinques
4a63aca8cd Update translation en fr 2021-01-29 17:40:54 +01:00
Laurent Trinques
3c278bbbfb Update *ts files 2021-01-29 17:36:40 +01:00
Laurent Trinques
d333b6a188 Prepare to add new country Mongolian switch 2021-01-29 17:12:44 +01:00
Laurent Trinques
f235022c44 Update Mongolian translation, thanks Nathalie 2021-01-29 16:22:55 +01:00
artgg7300
750f60f571 Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2021-01-28 20:10:21 +01:00
artgg7300
1558d0c00a translated hungarian element names 2021-01-28 20:07:22 +01:00
joshua
aa66eabe7c Fix bug 221
https://qelectrotech.org/bugtracker/view.php?id=221
2021-01-28 19:25:42 +01:00
joshua
20cd0366eb Update typo 2021-01-28 19:14:26 +01:00
pavelfric
ec63d7a1cb Updated Czech translations of elements. 2021-01-28 17:37:51 +01:00
plc-user
fdd617f9a5 added german translations for elements 2021-01-24 20:33:39 +01:00
plc-user
3e9c17030c added german translations for elements 2021-01-24 20:33:39 +01:00
artgg7300
8c07daaf8e translated hungarian element names 2021-01-24 07:31:06 +01:00
artgg7300
3cf178d056 translated hungarian element names 2021-01-24 06:58:26 +01:00
plc-user
842fa28390 corrected filenames and added german translations 2021-01-24 04:26:57 +01:00
plc-user
5041fa9ccc some german translations for elements 2021-01-24 04:26:57 +01:00
plc-user
2ce0205d94 some german translations in "qet_directory" 2021-01-24 04:26:57 +01:00
Simon De Backer
b64086fbcd Fix add project_title on save
see
https://qelectrotech.org/forum/viewtopic.php?pid=14160
2021-01-23 21:57:56 +01:00
artgg7300
4c075ed551 Translated hungarian element names 2021-01-23 06:42:22 +01:00
artgg7300
51087551c9 little modif for elements directory 2021-01-22 06:01:05 +01:00
joshua
bb82a616de Minor fix : widget lose focus each time user tip
Each time a QUndoCommand is pushed to a QUndoStack, the current focused
widget lose focus.
So each time user change a value in a widget (for exemple a QSpinBox)
the widget lose focus and user will have to click again in the widget to
gain focus and continue to edit.
The workaround is to call the method focus of the current widget each
time we push a undo command
2021-01-21 19:35:38 +01:00
pavelfric
da1fda6b03 Updated Czech translations of elements. 2021-01-20 22:40:13 +01:00
pavelfric
7d9926ccfc Updated Czech translations of elements. 2021-01-20 22:37:11 +01:00
pavelfric
dd4c016b46 Updated Czech translations of elements. 2021-01-20 22:25:53 +01:00
plc-user
c954f204ac some bugfixing and some new elements 2021-01-19 16:12:46 +01:00
artgg7300
743557b604 translated hungarian files little mod 2021-01-18 21:00:02 +01:00
pavelfric
4fc7c1abd9 Updated Czech translations of elements. 2021-01-18 19:38:02 +01:00
plc-user
48fa67fc3d renamed element-directories 2021-01-18 05:33:35 +01:00
artgg7300
7fe26b5d1c translated hungarian element names 2021-01-17 19:33:39 +01:00
pavelfric
f726397038 Updated Czech translations of elements. 2021-01-17 18:06:28 +01:00
pavelfric
c78685e95f Updated Czech translations of elements. 2021-01-17 18:01:21 +01:00
pavelfric
ef5b17be6e Updated Czech translations of elements. 2021-01-17 09:32:54 +01:00
pavelfric
47d5862ab0 Updated Czech translations of elements. 2021-01-17 08:57:18 +01:00
pavelfric
30b733febe Updated Czech translations of elements. 2021-01-16 23:37:21 +01:00
pavelfric
61d7eb966c Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2021-01-16 22:17:35 +01:00
pavelfric
838003a25c Updated Czech translations of elements. 2021-01-16 22:16:51 +01:00
gleissonjoaquim3
753de5445b Added PT_BR translations of qet_directory 2021-01-16 21:57:22 +01:00
pavelfric
37fed57470 Updated Czech translations of elements. 2021-01-16 10:29:05 +01:00
pavelfric
bc2e91a271 Updated Czech translations of elements. 2021-01-16 10:16:26 +01:00
pavelfric
46b262243f Updated Czech translations of elements. 2021-01-15 18:57:08 +01:00
pavelfric
9281230ed7 Updated Czech translations of elements. 2021-01-15 18:45:19 +01:00
artgg7300
8111508090 translated hungarian element names 2021-01-14 20:40:34 +01:00
artgg7300
0deb58a3ff translated hungarian element names 2021-01-14 18:01:16 +01:00
pavelfric
4c356cd67a Updated Czech translations of elements. 2021-01-14 10:03:26 +01:00
pavelfric
c6af279b36 Updated Czech translations of group name. 2021-01-13 21:55:56 +01:00
pavelfric
e0353d0657 Update of Czech translation.Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2021-01-13 21:33:55 +01:00
pavelfric
6fcb0fec08 Updated Czech translations of elements. 2021-01-13 21:25:24 +01:00
artgg7300
3c26b1dfdb updated hungarian element names 2021-01-13 20:36:44 +01:00
pavelfric
d783ec66f5 Updated Czech translations of elements. 2021-01-13 20:11:20 +01:00
artgg7300
02b51ee4fa second attempt to commit translated hungarian element names 2021-01-13 06:10:39 +01:00
pavelfric
cf4d0dd2eb Updated Czech translations of elements. 2021-01-12 19:23:21 +01:00
Laurent Trinques
e8c2c29617 Revert "translated element names on hungarian lang"
This reverts commit 5f7f00f7ae.
2021-01-12 10:31:14 +01:00
artgg7300
ee7004a7d1 Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2021-01-11 21:45:34 +01:00
pavelfric
2c046975f3 Updated Czech translations of elements. 2021-01-11 21:39:27 +01:00
artgg7300
5f7f00f7ae translated element names on hungarian lang 2021-01-11 21:37:38 +01:00
pavelfric
577a7564dc Updated Czech translations of elements. 2021-01-10 20:21:45 +01:00
pavelfric
f54cd3ef7f Updated Czech translations of elements. 2021-01-10 18:24:57 +01:00
pavelfric
d7fdf188bf Updated Czech translations of elements. 2021-01-10 14:28:45 +01:00
Laurent Trinques
147137b24b Add new symbols, thanks gabor 2021-01-10 11:36:58 +01:00
joshua
4f455a5328 General configuration page : set 'appearance' as default tab 2021-01-08 18:26:55 +01:00
gleissonjoaquim3
a0b5feba08 Minor fixes in PT_BR translation 2021-01-08 05:55:34 +01:00
pavelfric
8c729b4732 Updated Czech translations of elements. 2021-01-07 21:29:20 +01:00
joshua
0a616088ea Dynamic text field editor : move kcolorbutton from ui file to cpp file
Kcolorbutton is not available in Qt6 for now.
We move it from the ui file to the cpp file for choose at compilation if
qet must use kcolorbutton or not.
2021-01-07 18:56:25 +01:00
pavelfric
58b7097748 Updated Czech translations of elements. 2021-01-06 20:35:44 +01:00
pavelfric
966a08f50f Updated Czech translations of elements. 2021-01-05 22:14:49 +01:00
Simon De Backer
2000b6cd2b Update Cmake and disable fail to compile if it uses deprecated APIs. 2021-01-04 20:38:57 +01:00
Simon De Backer
d3093f495b Revert "Mod DynamicTextFieldEditor"
This reverts commit f6d777e2f7.

it is preferable to keep the gui in the ui file
QT6 will have to wait.
2021-01-04 20:37:17 +01:00
pavelfric
55dfec41c3 Updated Czech translations of elements. 2021-01-04 18:25:24 +01:00
joshua
34baceb8da Fix bug 175
When use a "dark" Qt theme, some part of element are drawn white/gray
instead of black.
2021-01-03 23:30:48 +01:00
pavelfric
ade79b467a Updated Czech translations of elements. 2021-01-03 22:52:18 +01:00
plc-user
948915a47e further bug-fixing 2021-01-03 21:38:59 +01:00
plc-user
ba693420f3 some new elements 2021-01-03 15:22:54 +01:00
plc-user
63b43421a7 some bugfixing and optimizing of elements 2021-01-03 15:22:54 +01:00
joshua
0a8376c189 Fix bug 220
see https://qelectrotech.org/bugtracker/view.php?id=220
2021-01-02 20:11:47 +01:00
Simon De Backer
bf9123f9b5 Fix xml in Element (Catch from QElectroTech_Element_Updater)
I don't know how this could have happened, but it happened.
2021-01-01 15:28:41 +01:00
Laurent Trinques
20f9475a6e Update symbols 2021-01-01 14:42:46 +01:00
pavelfric
1badeceed4 Updated Czech translations of elements. 2021-01-01 13:41:50 +01:00
Laurent Trinques
344d898461 Add symbols 2021-01-01 13:13:44 +01:00
pavelfric
5730559ed0 Updated Czech elements translations. 2020-12-31 14:19:52 +01:00
plc-user
74342cb00d added manufacturer- and designation-info also to front-views 2020-12-22 09:53:32 +01:00
plc-user
c5fd14794f re-organized directory, added manufacturer- and designation-info and added some new elements 2020-12-22 09:53:32 +01:00
sdeffaux
401a5010be reorganized folder 2020-12-21 11:23:16 +01:00
sdeffaux
c8adffb696 Add symbols 2020-12-21 11:23:16 +01:00
Simon De Backer
0cc3099908 Mod TextEditor
the ui file is written in the TextEditor class
    Add switch for KF5 (QT6)
2020-12-18 17:39:00 +01:00
Simon De Backer
2e543dd1f7 Add create translation .ts file on Cmake 2020-12-18 17:05:41 +01:00
joshua
af3772b95a Element view : fix drag view 2020-12-17 23:39:35 +01:00
joshua
546db38683 Fix fail to build 2020-12-17 23:39:04 +01:00
Simon De Backer
404ae4fffc Add Cmake ui files in sdk 2020-12-17 21:43:23 +01:00
Simon De Backer
f6d777e2f7 Mod DynamicTextFieldEditor
the ui file is written in the Dynamic Text Field Editor class
Add switch for KF5 (QT6)
2020-12-17 21:42:18 +01:00
Simon De Backer
cb37c1c2fe Add switch for KF5 (QT6) and Mod Cmake
if we want to test QET on QT6, KF5 must be removed from the code,
this switch is for that,

this is for testing only
2020-12-16 23:06:08 +01:00
Simon De Backer
13db08ad56 Mod hoto_update_cmake_message 2020-12-15 21:30:25 +01:00
Simon De Backer
7fc9d06eef Fix Cmake translation files dir 2020-12-14 21:30:40 +01:00
Simon De Backer
842b39d68b Fix som Cmake PATH 2020-12-13 20:57:10 +01:00
Simon De Backer
8fb1cd0fa7 Add __FILE__ __LINE__ __FUNCTION__ to failed to load desired_language
qInstallMessageHandler(myMessageOutput);// for debugging
is only called later,so we have to get the info manually
2020-12-13 16:26:33 +01:00
Simon De Backer
2fc7f594cc Add Cmake files 2020-12-13 15:44:01 +01:00
Simon De Backer
c46caaf6e4 Fix Cmake dubbe
see cmake/define_definitions.cmake
2020-12-13 00:47:09 +01:00
Simon De Backer
c88d1ef6bb Refactoring Cmake
cleaning up the Cmake code
2020-12-13 00:40:43 +01:00
Simon De Backer
d2fb0d8ad1 Fix stop the run autotests of kcoreaddons
see
https://invent.kde.org/frameworks/kcoreaddons/-/blob/master/CMakeLists.txt#L98

issue:
CMake Error at /usr/share/ECM/modules/ECMAddTests.cmake:89 (add_executable):
  Cannot find source file:
see
https://qelectrotech.org/forum/viewtopic.php?pid=13929#p13929
2020-12-11 23:57:17 +01:00
Simon De Backer
0207390ced Revert "Remove all qm files"
This reverts commit c2acbc88ed.

i will have to find another way for cmake
2020-12-11 23:43:15 +01:00
Simon De Backer
ce5cc25186 Fix stop the run autotests of kcoreaddons
see
https://invent.kde.org/frameworks/kcoreaddons/-/blob/master/CMakeLists.txt#L98

issue:
CMake Error at /usr/share/ECM/modules/ECMAddTests.cmake:89 (add_executable):
  Cannot find source file:
see
https://qelectrotech.org/forum/viewtopic.php?pid=13929#p13929
2020-12-11 22:41:30 +01:00
Simon De Backer
74b112a4bb Mod KF5 v5.76.0 => v5.70.0
see https://qelectrotech.org/forum/viewtopic.php?pid=13924#p13924
2020-12-11 18:05:21 +01:00
Simon De Backer
c2acbc88ed Remove all qm files
why:
they are created at compile time,
but the existing ones in src dir prevent the ones created in the buid dir
=> no qm files are shipped
2020-12-11 17:41:10 +01:00
Simon De Backer
6ec9a04fda Fix translation in Cmake 2020-12-11 17:29:05 +01:00
Simon De Backer
35ad994471 Mod more Cmake 2020-12-11 16:17:15 +01:00
Simon De Backer
83d802adf7 Mod Cmake first working build 2020-12-11 14:55:11 +01:00
Simon De Backer
aacbe57d51 Mod Pro file to close the gap with Cmake 2020-12-11 08:08:12 +01:00
Simon De Backer
62b71c0ba5 Fix more Cmake + Mod pragma message 2020-12-11 00:45:43 +01:00
Simon De Backer
eb49977c75 Fix som Cmake (add_definitions)
add_definitions(-DGIT_COMMIT_SHA=${GIT_COMMIT_SHA})
-DGIT_COMMIT_SHA=GIT_COMMIT_SHA
2020-12-11 00:16:49 +01:00
Simon De Backer
6da9c58458 Wip Fix preprocessor on Cmake 2020-12-10 21:19:45 +01:00
Simon De Backer
234f468f15 Fix GIT_COMMIT_SHA in Cmake 2020-12-10 21:18:42 +01:00
Simon De Backer
ed938c82cd Mod Cmake 2020-12-10 19:03:36 +01:00
Simon De Backer
6aa30d5f57 Add QPointF code did not build 2020-12-10 18:52:20 +01:00
Simon De Backer
d15443cf93 Wip Fix preprocessor on Cmake 2020-12-10 18:49:35 +01:00
Simon De Backer
3fe0adc66e QT6 QChar and int build error remove code for QT 6 or later!
this will have to be restored later.
2020-12-10 16:12:04 +01:00
Simon De Backer
d0c129478e Mod Cmake en preprocessor 2020-12-10 00:08:26 +01:00
Simon De Backer
4de9c1d922 Add Test google mock
for imitating QET on tests (a file, a netwerk link, ...)
2020-12-09 10:48:38 +01:00
Simon De Backer
d89d1088a3 Cmake for UI files auto link
this is one of the errors:
the ui files must be linked and changed to h files
so the h files found in the code by preprocessor
2020-12-09 10:40:12 +01:00
Simon De Backer
6556fbaf38 Add QT test to tests 2020-12-08 21:00:43 +01:00
Simon De Backer
c83388c1d5 Add Test files 2020-12-08 20:44:50 +01:00
Simon De Backer
10c4c3d528 Wip Fix preprocessor on Cmake 2020-12-08 19:57:35 +01:00
Simon De Backer
1871b7ad12 Add more Cmake 2020-12-08 15:20:48 +01:00
Simon De Backer
6cd6efaca9 Add Catch2 and Google Test on Cmake
ToDo:
- Add compiling QElectroTech on Cmake (help needed)
- more Tests?
   - Qt Test
   - Boost Test

to test
run qtcreator
File >  open => CMakeLists.txt
2020-12-08 12:18:20 +01:00
plc-user
b70775bc84 added elements to WAGO and corrected typo 2020-12-07 10:15:17 +01:00
Simon De Backer
cffec76018 Fix warning: implicit conversion from 'int' to 'float'
changes value from 2147483647 to 2147483648
/* The largest number rand will return (same as INT_MAX).  */
#define	RAND_MAX	2147483647

(static_cast<float>(quint32) / int * 8)
why cast an int to a float to then divide by an int?

just divide the int by an int.
2020-12-05 08:24:35 +01:00
Lars Biskupek
ebe22f1131 Update qet_de.ts
Translation string for "Tension / Protocole" set from unfinished to translated.
2020-12-05 03:56:55 +01:00
Lars Biskupek
f3888be8a6 Updated somne elements I created earlier 2020-12-05 03:56:55 +01:00
Simon De Backer
53aaa03967 fix QT DEPRECATED VERSION 5.15.2 and QT6
-QPrinter
2020-12-04 22:46:11 +01:00
Claveau Joshua
b22741732b Minor fix : folio-report information 'tension_protocol' isn't displayed
When a folio report have a text item witch must display the information
'tension protocol' the text is empty.
Replace the string 'tension/protocol' by 'tension_protocol' in
QETInformation namespace.
Move the static QStrings of the namespace QETInformation from
qetinformation.cpp to qetinformation.h to be use everywhere in the code.
2020-12-04 21:07:42 +01:00
Simon De Backer
77e6248ac9 fix QT DEPRECATED VERSION 5.15.2 and QT6
-QPrinter
2020-12-04 18:15:37 +01:00
Simon De Backer
ccd76f902d fix QT DEPRECATED VERSION 5.15.2
-Qt::MidButton
2020-12-04 18:13:48 +01:00
Lars Biskupek
945b690430 Update of German Language File 2020-12-03 18:02:15 +01:00
Claveau Joshua
0f86685ebe Remove duplicated elements 2020-12-02 20:04:01 +01:00
Claveau Joshua
862f311f5a Remove duplicated elements 2020-12-02 19:07:58 +01:00
Claveau Joshua
abc6b35d4c Remove duplicated elements 2020-12-02 18:57:08 +01:00
Claveau Joshua
ada563719b Minor fix 2020-12-02 18:47:28 +01:00
Laurent Trinques
ed455609d5 Add new symbols, thanks Mario 2020-12-02 14:27:27 +01:00
Laurent Trinques
2f004c271f Update displayed version to release candidate 2020-12-01 15:45:48 +01:00
gleissonjoaquim3
bafe7a39db Fixed spelling error on Translation PT_BR 2020-12-01 07:44:47 +01:00
gleissonjoaquim3
0b1e012a32 Updated translation PT_BR 2020-12-01 07:44:47 +01:00
Claveau Joshua
e0a03e7353 Remove duplicated elements 2020-11-29 12:49:04 +01:00
Claveau Joshua
68215d099c Remove duplicated elements 2020-11-29 12:37:56 +01:00
Claveau Joshua
3b472591b6 Remove duplicated elements 2020-11-29 11:59:20 +01:00
Claveau Joshua
d3cb7ef08c Remove duplicated elements 2020-11-29 11:51:16 +01:00
Claveau Joshua
049848737b Remove duplicated elements 2020-11-29 11:44:02 +01:00
Claveau Joshua
d3348e25be Remove duplicated elements 2020-11-29 11:06:06 +01:00
Claveau Joshua
764cdfea53 Remove duplicated elements 2020-11-29 11:00:04 +01:00
Claveau Joshua
b149e3e6ca Remove duplicated element 2020-11-29 10:55:36 +01:00
Claveau Joshua
7313cdfa9e Remove duplicated elements (hager)
All elements are duplicated and standardised
2020-11-29 10:47:58 +01:00
Claveau Joshua
fd92c1ce92 Remove duplicated elements. 2020-11-28 17:20:33 +01:00
Ole Carlsen
0ac96eecfc Danish update color scheme 2020-11-22 14:29:20 +01:00
Lars Biskupek
d02b88488a German translation updated
Two new strings in qet_de.ts translated.
qet_de.qm generated.
2020-11-22 13:39:49 +01:00
Ole Carlsen
87956d8d42 Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2020-11-22 12:22:52 +01:00
Ole Carlsen
ab1027eb5d Danish translation 2020-11-22 12:20:58 +01:00
Claveau Joshua
aa858ba32d project database : minor 2020-11-22 12:16:17 +01:00
Claveau Joshua
a303a38d0d ProjectDatabase improvement
Use transaction / commit when several elements was changed instead of
update one by one each element.
2020-11-22 11:31:43 +01:00
artgg7300
51bae7cdf1 translated hungarian files 2020-11-22 07:58:18 +01:00
dlee99
05dad2c8d8 modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2020-11-21 20:08:57 +01:00
Laurent Trinques
b457b98b22 Update *TS file 2020-11-21 11:35:08 +01:00
Claveau Joshua
8fec6dabef Dynamic element text item new feature
Add feature keep visual rotation.
When parent is rotated, the text rotation is changed to keep the same
visual rotation.
2020-11-20 20:52:19 +01:00
plc-user
f7e12e5e87 modified / added german translations and added some Elements 2020-11-20 14:56:00 +01:00
plc-user
689799ea24 modified / added german translations and added some Elements 2020-11-20 14:56:00 +01:00
Claveau Joshua
380de0b4c3 Search and replace widget : minor improvement
Fix 1 : when widget is reloaded the categories is not checked, but the
child items is. Now  all category is checked when reloaded.
Fix 2 : the folio number displayed in the widget is wrong (start at 0
instead of 1)
2020-11-17 22:25:01 +01:00
plc-user
3633123d17 changed/added some translations in qet_directory - files and elements 2020-11-17 21:43:10 +01:00
Lars Biskupek
66d45cc835 German language files updated
Translation of new items added
2020-11-17 21:41:31 +01:00
dlee99
56710ef25c modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2020-11-17 21:19:15 +01:00
aitolos
77479dc949 Greek lang update 2020-11-17 17:43:34 +02:00
artgg7300
529c6a721a updated hungarian files 2020-11-17 05:32:27 +01:00
Laurent Trinques
fd3d2dfb90 Update *TS files 2020-11-16 21:59:28 +01:00
Lars Biskupek
d1aba1118b Update of language files DE, EN, IT
Update of german language file and some minor changes on the english language file.
Update of italian language to solve issue #0000193 on Bugtracker, issued by rpaolo538.
2020-11-16 10:10:27 +01:00
Simon De Backer
c4fe1fe3da Merge branch 'master' of ssh://debacker@git.tuxfamily.org/gitroot/qet/qet.git 2020-11-15 20:47:09 +01:00
Simon De Backer
c167015b22 Add Todo for qet_tb_generator 2020-11-15 20:46:37 +01:00
plc-user
48e597663e adjusting/correcting some item-numbers and adding some elements 2020-11-15 20:15:28 +01:00
plc-user
bd26e4bb9c adjusting/correcting some item-numbers and adding some elements 2020-11-15 20:15:28 +01:00
Simon De Backer
f7a445c0a7 Add Todo for DXF to GET-2020 2020-11-15 18:29:19 +01:00
Claveau Joshua
bb32c30004 Search and replace widget improvement
Add a popup menu to select the elements, conductors and texts of the
current selected diagram in the tree widget.
2020-11-15 17:19:42 +01:00
Claveau Joshua
79fa9c8ec5 improve qetinformation file 2020-11-15 12:19:37 +01:00
Claveau Joshua
a73d50d7d0 Fix wrong text 2020-11-15 11:49:24 +01:00
Claveau Joshua
af7d1df5ab Replace function by another one.
Replace function QETApp::elementInfoKeys() and
QETApp::elementInfoToVar(const QString &info) by function provided by
QETInformation.
2020-11-14 19:09:40 +01:00
Simon De Backer
c87fe8df2f Merge branch 'dev_submodule'
this sets the stage for submodules
submodules are not used at this time
2020-11-13 18:59:36 +01:00
Simon De Backer
f613f7fcdc Mod git pull
this works for git pull since Git 2.15
2020-11-13 18:51:30 +01:00
Laurent Trinques
20911f215b Update de translations, thanks Lars 2020-11-13 08:30:27 +01:00
Laurent Trinques
b557aa0e98 Add and refresh Wago WAGO_Kontakttechnik directory, thanks Plc-user 2020-11-12 19:06:22 +01:00
Laurent Trinques
6b89349240 Minor: move lt4301tadac.elmt to pro-face directory 2020-11-12 13:29:04 +01:00
Laurent Trinques
6b54e45e3a Add Pro face element, thanks Fury 2020-11-12 09:33:13 +01:00
Laurent Trinques
fec3c70739 Add new Legrand Optimum & Netatmo element, thanks Arnaud 2020-11-11 10:12:14 +01:00
Ole Carlsen
a028724773 Danish update 2020-11-09 20:51:43 +01:00
Claveau Joshua
49b2e4ad0a Replace function by another one
Replace QETApp::diagramInfoKeys() by QETInformation::diagramInfoKeys()
and QETApp::diagramTranslatedInfoKey(str) by
QETInformation::translatedInfoKey(str)
2020-11-08 20:23:16 +01:00
Claveau Joshua
81efc5181b Minor replace function by another one
Replace QETApp::conductorInfoKeys() and
QETApp::conductorTranslatedInfoKey(const QString &key) by
QETInformation::conductorInfoKeys() and
QETInformation::translatedInfoKey
2020-11-08 19:44:21 +01:00
Claveau Joshua
6f60156e00 Change function QETApp::elementTranslatedInfoKey
Use the function QETInformation::translatedInfoKey(const QString &info)
instead of QETApp::elementTranslatedInfoKey(const QString &info).

The final goal is to remove all information from the QETApp and use
instea QETInformation who is dedicated to this
2020-11-08 19:16:02 +01:00
Claveau Joshua
7882c5734a Minor : fix little regression about folio report and displayed information 2020-11-08 19:05:11 +01:00
Simon De Backer
0bfbc37bc9 Add git submodule instruction 2020-11-07 22:38:28 +01:00
Simon De Backer
e3b98001f3 Fix indentation restored 2020-11-07 22:19:54 +01:00
Simon De Backer
d1c969b723 Purge old comment 2020-11-07 22:18:53 +01:00
Simon De Backer
acf9c17969 Add packaging script's
info of packaging_script Debian, Ubuntu, Windows
https://qelectrotech.org/wiki_new/doc/packaging_debian#packaging_script_debian_ubuntu_windows

Laurent,
can you check the scripts if they work now,
I'll then change them to scripts that can handle git Submodules
2020-11-07 18:38:35 +01:00
artgg7300
862dbede24 updated hungarian files 2020-11-07 09:56:33 +01:00
dlee99
be3421f8c9 modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2020-11-06 20:08:46 +01:00
Laurent Trinques
4ad4e75132 Update TS files and update it translation, thanks Marco 2020-11-06 08:01:14 +01:00
pavelfric
d2c4bf4ec7 Updated Czech translation. 2020-11-02 22:05:38 +01:00
pavelfric
a97ee8ddba Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2020-11-02 22:04:40 +01:00
Claveau Joshua
ca0dcc9b7b Fix crash 2020-11-02 19:31:52 +01:00
Claveau Joshua
62333506f1 Improve update of the project database 2020-11-02 19:13:56 +01:00
Ole Carlsen
98de247a4d Minor danish translation update 2020-11-02 18:47:53 +01:00
Claveau Joshua
a0efad18ab Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet into master 2020-11-01 21:28:06 +01:00
Claveau Joshua
b514c39883 Improve update of the project database 2020-11-01 21:27:40 +01:00
Simon De Backer
859bf7f645 Mod clazy checks range-loop
you're using C++11 range-loops with non-const Qt containers
(potential detach).

adding missing &
2020-11-01 19:10:30 +01:00
Simon De Backer
1b10fe3b7f Mod container-anti-pattern
Finds when temporary containers are being created needlessly.
These cases are usually easy to fix by using iterators,
avoiding memory allocations.

And mod to return on first true

can we test if the Elements collection reload faster or not?
2020-11-01 18:44:14 +01:00
Simon De Backer
41c7cde8ca Mod overlapping comparisons
warning: overlapping comparisons always evaluate to true

valid for a project made before 0.7
probably it will be better to delete the code completely.
2020-11-01 18:11:55 +01:00
Simon De Backer
69adb10bcc Add clang-format file (WIP) 2020-11-01 16:57:19 +01:00
pavelfric
239a7daf7f Updated Czech translation. 2020-11-01 15:20:39 +01:00
pavelfric
f73f71c0aa Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2020-11-01 15:16:13 +01:00
Laurent Trinques
23764c0e11 Update be-nl translations, thanks Ronny 2020-11-01 11:40:17 +01:00
Laurent Trinques
beec556a55 Update qet_en.qm 2020-11-01 07:10:46 +01:00
M. Buijs
3a0da97878 Update qet_en.ts
The first letter of the word needs to be in upper case to align with the rest of the menu.
2020-11-01 07:09:11 +01:00
pavelfric
2afac1e56d Updated Czech translation. 2020-10-31 22:20:13 +01:00
Claveau Joshua
72271cfc69 Improve format of save date
3 formats : local, eu (dd mm yyyy) and us (yyyy mm dd)
2020-10-31 14:22:06 +01:00
Simon De Backer
24c930d727 Mod raw Pointer to QScopedPointer
Clang-Tidy and Clazy said
"drag" leaks memory
2020-10-30 21:07:12 +01:00
Simon De Backer
87845ef0ee Add failed to load message of languages on log file
compiler complained about non return value of
bool QTranslator::load
2020-10-29 20:41:24 +01:00
Ole Carlsen
8c51725c71 Danish translation update 2020-10-29 17:19:29 +01:00
Laurent Trinques
dbf4315deb Update de translation, thanks Lars 2020-10-29 02:10:05 +01:00
Laurent Trinques
099dc614bd Update en qm 2020-10-28 10:57:12 +01:00
M. Buijs
96450ce19f Update qet_en.ts
Small language updates
2020-10-27 23:56:20 +01:00
dlee99
1d606c574b modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2020-10-27 21:46:54 +01:00
Claveau Joshua
8ba982f6cc improve code readability 2020-10-27 21:05:29 +01:00
Claveau Joshua
329ceb4594 Bug fix : directory of embedded element collection is not translated
Bug introduced at commit 995066916b
2020-10-27 20:49:16 +01:00
Laurent Trinques
50de125787 Update en translations 2020-10-27 12:07:44 +01:00
M. Buijs
2839a4009c Update qet_en.ts
Added missing translation
2020-10-27 12:07:01 +01:00
Simon De Backer
6bfb2b95d2 QT6: QStringref replaced to QStringView in QT6
as a result this additional instruction is required
2020-10-26 23:01:45 +01:00
sdeffaux
0dba97ef6a Add symbols and fix bux 193 2020-10-26 21:23:33 +01:00
Simon De Backer
c5c3dfb07b Mod Maximum Size of configureQET widget 2020-10-25 12:24:43 +01:00
sdeffaux
1c91a6300a Add symbols 2020-10-24 20:31:45 +02:00
Claveau Joshua
b1eb59f3ea Improve previous comit 2020-10-22 21:07:41 +02:00
Laurent Trinques
cb29a4d383 Fix date on summary pages 2020-10-22 18:28:52 +02:00
artgg7300
077c4f578a translated hungarian files 2020-10-21 18:24:05 +02:00
Martin Marmsoler
b32a295b0c fix issue when creating xml document 2020-10-20 12:01:55 +02:00
Martin Marmsoler
6251862f7a default color was wrong 2020-10-20 08:54:56 +02:00
Martin Marmsoler
793770a72a initialize TerminalData with nullpoint to not having an invalid value 2020-10-20 08:54:56 +02:00
Martin Marmsoler
aba16dc936 remove not needed variable 2020-10-20 08:54:56 +02:00
Martin Marmsoler
e5b8ba7e22 fix problems in partrectangle 2020-10-20 08:54:56 +02:00
Simon De Backer
dad32d5897 Add destructor to Machine_info class to fix segfault 2020-10-20 08:54:56 +02:00
Martin Marmsoler
9658a88c18 fix compile issues 2020-10-20 08:54:56 +02:00
Martin Marmsoler
12e301b887 replace 4 spaces by a tab 2020-10-20 08:54:56 +02:00
Martin Marmsoler
f3097fc537 rebase XMLProperties_New (c0d9bf9) to master 2020-10-20 08:54:14 +02:00
Martin Marmsoler
73b394527d replace tabs by 4 spaces 2020-10-20 08:53:43 +02:00
aitolos
752f31513c Update Greek Lang 2020-10-19 18:29:29 +03:00
aitolos
756fc845a5 Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2020-10-19 18:14:08 +03:00
aitolos
9d89719c21 Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2020-10-19 18:12:26 +03:00
aitolos
785c5884e8 Update Greek Lang 2020-10-19 18:11:32 +03:00
Laurent Trinques
87425d70ce Update * TS files 2020-10-19 14:21:02 +02:00
Laurent Trinques
9c267d673d Fix %{saveddate} titleblock variable and
add new %{saveddate-eu} variable dd-MM-yyyy date format
2020-10-19 14:09:26 +02:00
Claveau Joshua
69f775aa0f Minor fix : can't move diagram to top from element panel widget 2020-10-18 11:50:04 +02:00
Ole Carlsen
2619d96998 Danish translation updated 2020-10-18 11:03:34 +02:00
Claveau Joshua
74ee2fd82c minor 2020-10-18 10:49:45 +02:00
Claveau Joshua
ec0b92ec1d Fix : Filling color is not apply to polyline. 2020-10-18 10:45:05 +02:00
artgg7300
a65675b53e translated hungarian files 2020-10-15 20:17:03 +02:00
Laurent Trinques
c39ef0a999 Update en fr translation 2020-10-15 18:54:08 +02:00
dlee99
ff84a71d97 modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2020-10-14 23:15:59 +02:00
Laurent Trinques
434c3dfbfb Update TS files 2020-10-14 21:00:33 +02:00
Laurent Trinques
096f8f58e1 Updatre de translation, thanks Lars 2020-10-14 20:58:35 +02:00
Simon De Backer
364012848c Fix code style 2020-10-13 17:44:08 +02:00
Simon De Backer
106b17cf2f QT6: QMutex::RecursionMode are obsolete
The default is QMutex::NonRecursive.
https://doc-snapshots.qt.io/qt6-dev/qmutex-obsolete.html
2020-10-13 17:43:26 +02:00
Claveau Joshua
d3da5a98a5 Minor : disable button for QPageSetupDialog on windows 2020-10-12 21:20:40 +02:00
Claveau Joshua
9b0e659300 Remove unused class 2020-10-12 21:02:48 +02:00
pavelfric
30f8989e3d Updated Czech translation 2020-10-11 21:56:53 +02:00
Claveau Joshua
e878082b79 Fix bug 203
https://qelectrotech.org/bugtracker/view.php?id=203
Take advantage of this bugfix, to recode the widget with Qt designer.
2020-10-10 16:58:02 +02:00
Claveau Joshua
419585f97e Add new QAction : export to pdf 2020-10-10 14:37:23 +02:00
Claveau Joshua
44e945489a project print window : minor gui improvement 2020-10-10 12:12:50 +02:00
Claveau Joshua
b45c6b453e Minor fix : QetGraphicsTableItem keep his size when model is reseted or when open from xml. 2020-10-10 11:18:21 +02:00
Claveau Joshua
5d47ecd8f6 Fix : can't open print dialog on windows 2020-10-09 19:25:41 +02:00
Remi Collet
639ccb25e2 use pkgconfig for sqlite3 2020-10-09 08:37:27 +02:00
Simon De Backer
746c5a81e3 Merge branch 'master' of ssh://debacker@git.tuxfamily.org/gitroot/qet/qet.git into master 2020-10-08 16:17:15 +02:00
Simon De Backer
4e44b4bcd4 QT6: Fix : dragging view don't work 2020-10-08 16:16:59 +02:00
dlee99
04125dcc55 modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2020-10-06 23:32:40 +02:00
artgg7300
d6f08696bc translated hungarian files 2020-10-06 06:19:03 +02:00
Claveau Joshua
9193e1c39b Fix : dragging view don't work 2020-10-04 16:03:09 +02:00
David Varley
941aaf7087 Fix build for Qt < 5.10 2020-10-04 20:51:07 +11:00
Simon De Backer
f5d2fc3916 Merge branch 'QT6' into master
initial release to Qt6

TODO:
 -remove KCoreAddons
 -remove KWidgetsAddons

* QT6: (24 commits)
  QT6: No Qt::AA_EnableHighDpiScaling in QT6
  QT6: TeDo mod QList for DeleteQGraphicsItemCommand
  QT6: Todo Fix QtConcurrent (remove KCoreAddons?)
  QT6: Todo QVariant::setValue
  QT6: std::min needs further tweaking
  QPrinting class needs further tweaking
  QT6: QStyleOptionGraphicsItem
  Add QActionGroup
  QT6: QStyleOptionGraphicsItem
  QT6: QLibraryInfo
  Totest QRegularExpression ok?
  QT6: QStyleOptionGraphicsItem
  QT6: QMouseEvent
  QT6: QDropEvent
  QT6: Fix deprecated QRegExp
  QT6: hooks added
  QT6: Mod unused function put in comments
  Add missing include QActionGroup
  QT6: set C++17
  QT6: diagramitemweight set val to Font::Weight
  ...
2020-10-03 16:18:03 +02:00
Simon De Backer
9f3c173b9f QT6: No Qt::AA_EnableHighDpiScaling in QT6 2020-10-03 16:08:55 +02:00
Simon De Backer
9a915c2ad0 QT6: TeDo mod QList for DeleteQGraphicsItemCommand 2020-10-03 16:07:55 +02:00
Simon De Backer
694cbfb1b7 QT6: Todo Fix QtConcurrent (remove KCoreAddons?) 2020-10-03 16:04:54 +02:00
Simon De Backer
f69e3a3fa7 QT6: Todo QVariant::setValue 2020-10-03 16:02:35 +02:00
Simon De Backer
8a5ba90d01 QT6: std::min needs further tweaking 2020-10-03 16:00:24 +02:00
Simon De Backer
32605e1377 QPrinting class needs further tweaking 2020-10-03 15:58:09 +02:00
Simon De Backer
0ab1b322d6 QT6: QStyleOptionGraphicsItem 2020-10-03 15:56:11 +02:00
Simon De Backer
a7920ea5fc Add QActionGroup 2020-10-03 15:54:38 +02:00
Simon De Backer
937a6d740b QT6: QStyleOptionGraphicsItem 2020-10-03 15:54:02 +02:00
Simon De Backer
a0b95ee944 QT6: QLibraryInfo 2020-10-03 15:51:53 +02:00
Simon De Backer
ad0df66ab1 Totest QRegularExpression ok? 2020-10-03 15:51:09 +02:00
Simon De Backer
c1e93fc442 QT6: QStyleOptionGraphicsItem 2020-10-03 15:48:40 +02:00
Simon De Backer
2e2a652343 QT6: QMouseEvent 2020-10-03 15:45:43 +02:00
Simon De Backer
074e2c8b2d QT6: QDropEvent 2020-10-03 15:42:58 +02:00
Simon De Backer
9034d8d791 QT6: Fix deprecated QRegExp 2020-10-03 15:40:32 +02:00
Simon De Backer
0b5091b606 QT6: hooks added 2020-10-03 12:04:35 +02:00
Simon De Backer
b339dc2812 QT6: Mod unused function put in comments 2020-10-03 12:03:44 +02:00
Simon De Backer
ce11610d1d Add missing include QActionGroup 2020-10-03 11:57:55 +02:00
Simon De Backer
10cc3cdbb7 QT6: set C++17 2020-10-03 11:57:55 +02:00
Simon De Backer
184560cc5d QT6: diagramitemweight set val to Font::Weight 2020-10-03 11:57:55 +02:00
Simon De Backer
0e10b4adfa QT6: QTextStream::setCodec use QTextStream::setEncoding 2020-10-03 11:57:54 +02:00
Simon De Backer
caac531de1 QT6: Mod QLibraryInfo::location use QLibraryInfo::path 2020-10-03 11:57:54 +02:00
Simon De Backer
bc0cb6b1b3 QT6: Mod Qt::MidButton Use Qt::MiddleButton 2020-10-03 11:57:54 +02:00
Simon De Backer
4f929ef3c9 QT6: Use the QByteArrayView overload. 2020-10-03 11:57:54 +02:00
Laurent Trinques
3b71cb7dfe Revert "macOS : disable project database export"
This reverts commit fbe1c05c7d.
2020-10-03 07:06:05 +02:00
Laurent Trinques
fbe1c05c7d macOS : disable project database export 2020-10-03 06:39:33 +02:00
Claveau Joshua
6437bf212a Add macro to disable/enable project database export 2020-10-02 20:09:03 +02:00
Claveau Joshua
aa9266ab64 Minor : use Diagram::showMe() method instead of emit several signal to do the same thing 2020-10-02 19:41:17 +02:00
Claveau Joshua
8507040aa2 Improve how element editor is opened to edit an element in a diagram.
Before this commit :
ElementPropertiesWidget emit a signal of Diagram to edit an element, and
the signal goes up from Diagram -> DiagramView -> ProjectView ->
QetDiagramEditor and QetDiagramEditor call a static function.
Now :
ElementPropertiesWidget call the static function itself and that all.
All unnecessary signals are removed.
2020-10-02 19:28:52 +02:00
Claveau Joshua
e263264752 Minor : revamp code about shortcut for edit conductor color 2020-10-02 18:57:11 +02:00
Claveau Joshua
7038e6f796 Clean diagram view code 2020-10-02 18:38:24 +02:00
Claveau Joshua
e0201a8027 Remove old Backward compatibility: prior to version 0.3 2020-10-02 17:39:07 +02:00
Ole Carlsen
cbdbdd0ec6 Updated Danish translation 2020-10-02 16:37:17 +02:00
Claveau Joshua
9dda3e5997 Fix fail to build on windows 2020-10-01 19:29:09 +02:00
Laurent Trinques
94e29ef749 Fix installation-paths 2020-10-01 08:10:50 +02:00
Claveau Joshua
add11e7c7a Print preview dialog : Add selection by date.
Add two news option for select diagrams to print :
select "from the date :" and select "at the date".
2020-09-30 21:29:17 +02:00
Laurent Trinques
930bb70f99 Update *TS files 2020-09-30 13:14:13 +02:00
Laurent Trinques
78ecc53b89 Minor 2020-09-30 13:09:56 +02:00
Laurent Trinques
6eec588eb9 Fix typo 2020-09-30 13:04:45 +02:00
Laurent Trinques
1e0ca043e7 Fix typo in comments 2020-09-30 12:58:14 +02:00
Laurent Trinques
191eabd0a2 Flatak build: Fix the installation paths 2020-09-30 06:07:03 +02:00
Claveau Joshua
18f536d801 Revamp the print preview window 2020-09-29 22:54:09 +02:00
Ole Carlsen
7f698bd826 Danish translation updated 2020-09-28 20:33:39 +02:00
Maximilian Federle
0907830d67 snap: Fix whitespace in snapcraft.yaml 2020-09-27 12:44:08 +02:00
Laurent Trinques
35fb45c280 Flatpak refresh 0001-build-Fix-the-installation-paths.patch 2020-09-26 22:54:51 +02:00
Laurent Trinques
ea5ba0ecc8 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 for Snap package
see :
https://snapcraft.io/qelectrotech/builds/1126332
2020-09-26 22:19:40 +02:00
Simon De Backer
f77255c762 Add position mouse cursor in DiagramView 2020-09-25 22:06:11 +02:00
Simon De Backer
546433cac2 WIP: Add Kabel to qet 2020-09-24 22:39:48 +02:00
Simon De Backer
30b8205f82 Mod some qWarning add QObject::tr 2020-09-24 22:39:11 +02:00
Simon De Backer
3b9ba6a261 WIP: Add Kabel to qet 2020-09-24 18:53:00 +02:00
Simon De Backer
36dbe65457 Add TODO compile var + Fix doxygen issue
You can make your code warn on compile time for the TODO's
In order to do so, uncomment the following line. in pro file
DEFINES += TODO_LIST
2020-09-24 17:01:33 +02:00
Laurent Trinques
65ba816859 Try to fix Snap package with sqite3 new depend 2020-09-24 12:19:30 +02:00
Simon De Backer
bfd487effe Fix QRegularExpression pattern 2020-09-23 23:11:33 +02:00
Simon De Backer
d9f38f8a5d Fix QRegularExpression
-add isValid
-add debug
2020-09-23 22:50:41 +02:00
Simon De Backer
2fe53ba6e8 Fix QRegularExpression
-add isValid
-add debug
2020-09-23 22:19:13 +02:00
Simon De Backer
b5ae1237e3 Fix QRegularExpression
-add isValid
-add debug
2020-09-23 21:36:48 +02:00
Simon De Backer
e0c8dd9585 Fix Revert deprecated QRegExp
Use QRegularExpression instead.

https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users
This function was introduced in Qt 5

see https://qelectrotech.org/forum/viewtopic.php?pid=13406#p13406
2020-09-23 19:03:13 +02:00
artgg7300
86f7f98031 Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2020-09-23 17:53:01 +02:00
artgg7300
c829a9eb2d updated hungarian files 2020-09-23 17:39:39 +02:00
Laurent Trinques
1cf48f62e9 Fix commit "Change the way how the database is exported to file" :
produce a fail to build on OSX
2020-09-23 11:25:46 +02:00
David Varley
6a47fcddc9 Merge branch 'dxf' 2020-09-23 07:50:42 +10:00
Simon De Backer
77321f6b70 Revert "Fix deprecated QRegExp"
This reverts commit 0a46b83dca.
see https://qelectrotech.org/forum/viewtopic.php?pid=13378#p13378
2020-09-22 21:12:10 +02:00
David Varley
45137987ab DXF - remove a couple of debug messages 2020-09-22 19:47:02 +10:00
David Varley
2d6bef71ae DXF - Add some color 2020-09-22 19:41:47 +10:00
David Varley
bcc5846662 DXF - Cleaning up scaling 2020-09-22 12:16:32 +10:00
Simon De Backer
2a69e540d6 Fix Qt 6 definition of macro ‘Q_DECLARE_MOVABLE_CONTAINER’
adding #include <QHash>

+ code fail to compile if it uses deprecated APIs.
=> see .pro file
2020-09-21 21:19:50 +02:00
Simon De Backer
c958d54d01 Fix Qt 6 deprecated QDockWidget::AllDockWidgetFeatures
(Deprecated) The dock widget can be closed, moved, and floated.
Since new features might be added in future releases,
the look and behavior of dock widgets might change if you use this flag.
Please specify individual flags instead.
2020-09-21 21:16:05 +02:00
Simon De Backer
a917399950 Fix Qt 6 deprecated QComboBox::AdjustToMinimumContentsLength
Use
- QComboBox::AdjustToContents
- QComboBox::AdjustToContentsOnFirstShow
instead.
2020-09-21 20:42:40 +02:00
Simon De Backer
f671a63366 Fix Qt 6 deprecated QVBoxLayout::setMargin
Use QVBoxLayout::setContentsMargins instead.
2020-09-21 20:37:10 +02:00
Simon De Backer
c7ffae7918 Fix Qt 6 deprecated Qt::SystemLocaleShortDate
The format options
Qt::SystemLocaleDate, Qt::SystemLocaleShortDate
and Qt::SystemLocaleLongDate
shall be removed in Qt 6.
	Their use should be replaced with
QLocale::system().toString(date, QLocale::ShortFormat)
or
QLocale::system().toString(date, QLocale::LongFormat).
2020-09-21 20:23:20 +02:00
Laurent Trinques
f21cdb4040 Update de translation, thanks Lars 2020-09-21 07:11:42 +02:00
Claveau Joshua
89f9f47174 Remove unused code 2020-09-20 11:40:18 +02:00
Simon De Backer
24d4885093 Fix deprecated QRegExp
Use QRegularExpression instead.

https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users

This function was introduced in Qt 5
2020-09-19 01:13:18 +02:00
Simon De Backer
b7c8ae88e2 Fix code style 2020-09-19 01:13:13 +02:00
Simon De Backer
176dcd376b Fix deprecated QRegExp
Use QRegularExpression instead.

https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users

This function was introduced in Qt 5
2020-09-19 01:13:09 +02:00
Simon De Backer
813014ec33 Fix deprecated QRegExp
Use QRegularExpression instead.

https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users

This function was introduced in Qt 5
2020-09-19 01:13:01 +02:00
Simon De Backer
4c54335301 Fix deprecated QRegExp
Use QRegularExpression instead.

https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users

This function was introduced in Qt 5
2020-09-19 01:12:54 +02:00
Simon De Backer
3eca82baad Fix deprecated QRegExp
Use QRegularExpression instead.

https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users

This function was introduced in Qt 5
2020-09-19 01:12:46 +02:00
Simon De Backer
93055c6a96 Fix deprecated QRegExp
Use QRegularExpression instead.

https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users

This function was introduced in Qt 5
2020-09-19 01:12:38 +02:00
Simon De Backer
7fb4033ece Fix deprecated QRegExp
Use QRegularExpression instead.

https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users

This function was introduced in Qt 5
2020-09-19 01:12:29 +02:00
Simon De Backer
0b3238aac0 Fix deprecated QRegExp
Use QRegularExpression instead.

https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users

This function was introduced in Qt 5
2020-09-19 01:12:20 +02:00
Simon De Backer
859f6dd06d Fix deprecated QRegExp
Use QRegularExpression instead.

https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users

This function was introduced in Qt 5
2020-09-19 01:12:13 +02:00
Simon De Backer
432e80cecb Fix deprecated QRegExp
Use QRegularExpression instead.

https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users

This function was introduced in Qt 5
2020-09-19 01:12:05 +02:00
Simon De Backer
46e96f0a67 Fix deprecated QRegExp
Use QRegularExpression instead.

https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users

This function was introduced in Qt 5
2020-09-19 01:11:54 +02:00
Simon De Backer
0ee8f4187b Fix deprecated QRegExp
Use QRegularExpression instead.

https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users

This function was introduced in Qt 5
2020-09-19 01:11:46 +02:00
Simon De Backer
402d2fbf4a Fix deprecated QRegExp
Use QRegularExpression instead.

https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users

This function was introduced in Qt 5
2020-09-19 01:11:37 +02:00
Simon De Backer
271fd096e2 Fix deprecated QRegExp
Use QRegularExpression instead.

https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users

This function was introduced in Qt 5
2020-09-19 01:11:28 +02:00
Simon De Backer
c5be1a98ba Fix deprecated QRegExp
Use QRegularExpression instead.

https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users

This function was introduced in Qt 5
2020-09-19 01:11:17 +02:00
Simon De Backer
0a46b83dca Fix deprecated QRegExp
Use QRegularExpression instead.

https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users

This function was introduced in Qt 5
2020-09-19 01:11:08 +02:00
Simon De Backer
c7f138a0e3 Fix deprecated QRegExp
Use QRegularExpression instead.

https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users

This function was introduced in Qt 5
2020-09-19 01:10:54 +02:00
Claveau Joshua
215ddbd878 Minor : minimize code 2020-09-18 11:48:11 +02:00
David Varley
4d7ece07ab DXF - Simplifying, WIP 2020-09-17 21:45:14 +10:00
Claveau Joshua
139241e773 Change the way how the database is exported to file
The export of internal database to file is now do by sqlite3 native
function instead of a dirty home made function.
For the moment, the export to file function is unavailable on macOSX (we
need some help to add sqlite3 lib on macOSX)
2020-09-16 21:28:47 +02:00
David Varley
07df62e362 DXF - Fix single shape rectangle scaling 2020-09-14 12:29:36 +10:00
David Varley
a68386c028 Merge branch 'cborn' of https://github.com/C-Born-Software/qelectrotech-source-mirror into cborn 2020-09-14 11:45:52 +10:00
Claveau Joshua
8e82dee8f0 Minor 2020-09-13 15:39:20 +02:00
Claveau Joshua
529027a350 Fix bug N°201: Line changes in the drawing area are not reflexted in the information area 2020-09-13 15:11:45 +02:00
Claveau Joshua
726b300999 Fix bug N°202 : Wrong bounding rect for primitive arc.
https://qelectrotech.org/bugtracker/view.php?id=202
2020-09-11 19:11:14 +02:00
Simon De Backer
989cd93a14 Remove old orientation for element Attribute in XML 2020-09-11 06:56:01 +02:00
David Varley
6b1d51bab8 DXF - Add Polylines, use for conductors and rectangles 2020-09-11 11:22:08 +10:00
David Varley
046d7c6b59 DXF - Add terminals to plot (optional) 2020-09-10 18:35:22 +10:00
David Varley
cd7f7eccec Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2020-09-10 00:18:39 +10:00
David Varley
45fb97f410 Start cborn branch - disable annoying startup warning 2020-09-10 00:16:03 +10:00
David Varley
d5d8181332 DXF - fine tune text item locations 2020-09-10 00:12:45 +10:00
Simon De Backer
0310cd2610 Revert "Add user warning on startup"
This reverts commit 87c957a062.
2020-09-08 17:53:37 +02:00
David Varley
713d467fe4 Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2020-09-08 22:10:31 +10:00
David Varley
cc8d0da0ac DXF - Fix conductor number positioning, add junction dots 2020-09-08 21:44:58 +10:00
dlee99
c0ced6dc56 Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet into master 2020-09-07 23:02:22 +02:00
dlee99
288c89daa7 modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2020-09-07 23:00:49 +02:00
Simon De Backer
dce83f480c Add name to Terminal
now it is possible to enter the terminal name
2020-09-07 22:35:49 +02:00
Simon De Backer
5d92393ee7 Wrap code for better readability 2020-09-07 22:03:40 +02:00
Simon De Backer
8ee38fab9e Fix Coding convention
Please download and use
https://qelectrotech.org/wiki_new/_media/doc/qtcreator-qet-style.xml
when you write code in Qt
2020-09-07 21:41:45 +02:00
David Varley
babf3d2cf2 Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2020-09-07 22:14:07 +10:00
Laurent Trinques
82c8fb2d01 Update en fr translation 2020-09-07 10:51:56 +02:00
David Varley
68b4705630 Tidy up som comments 2020-09-07 16:27:59 +10:00
David Varley
d062175da7 Add tables to dxf export 2020-09-07 16:16:33 +10:00
Laurent Trinques
561209bc94 Update *TS files 2020-09-06 23:54:59 +02:00
Simon De Backer
87808df6c3 Moved message to QString 2020-09-05 20:09:08 +02:00
Simon De Backer
87c957a062 Add user warning on startup
notify the user of the use of dev software

ToDo: the text still needs to be adjusted
2020-09-05 00:27:24 +02:00
Simon De Backer
610a44c7cd Removed some Q_UNUSED 2020-09-04 23:19:59 +02:00
Simon De Backer
1bc2536c06 Add documentation 2020-09-04 21:13:10 +02:00
Simon De Backer
1528e1ebe2 Add build git commit sha in log file 2020-09-04 21:10:43 +02:00
David Varley
f8611c1b6e DXF Border Numbering - fix offset 2020-09-04 22:41:59 +10:00
David Varley
71d7f8bbe6 Fix some DXF issues 2020-09-04 16:06:06 +10:00
Ole Carlsen
ec464282f3 Updated Danish translation 2020-09-02 08:48:56 +02:00
Simon De Backer
81da7c6713 Fix dubbel // on log file dir 2020-08-31 22:26:03 +02:00
Simon De Backer
a4654dc6c2 remove old orientation for element Attribute in XML and code 2020-08-31 21:36:03 +02:00
Simon De Backer
504a061e71 Add loading time of collections inf to log 2020-08-31 21:22:26 +02:00
Simon De Backer
51c4b16836 Add log file's viewer in AboutQETDialog for user 2020-08-31 21:21:17 +02:00
Claveau Joshua
4a8e07b227 Fix csv export 2020-08-31 20:29:50 +02:00
sdeffaux
db4e8e3f5e add symbols 2020-08-30 19:00:31 +02:00
Laurent Trinques
6274f65455 AboutQETDialog : add Authors 2020-08-29 23:45:25 +02:00
Simon De Backer
00eb139f73 This property is obsolete. 2020-08-29 19:34:45 +02:00
Simon De Backer
62d370c99a Wrap code for better readability 2020-08-29 19:21:51 +02:00
Simon De Backer
cb0c0f8778 Fix Margin voor windows OS 2020-08-29 19:20:44 +02:00
Simon De Backer
f4550ab3b4 Wrap code for better readability 2020-08-28 18:32:24 +02:00
Simon De Backer
d8cbcf3b54 Restore add_new_diagram_button 2020-08-27 17:06:47 +02:00
Simon De Backer
63ad341b33 Fix add header file 2020-08-27 16:31:39 +02:00
Laurent Trinques
bd62f8768e ProjectView add arrows key for quickly navigate in projects
disable momentary "add diagram" button
2020-08-27 14:24:02 +02:00
Laurent Trinques
d9fde9a3e4 Doxyfile restore QCH 2020-08-26 11:01:58 +02:00
Laurent Trinques
f4c5087dc0 Restore opening of projects on the first folio 2020-08-26 02:38:25 +02:00
Laurent Trinques
0959330adf CSV export : Add "conductor_color & conductor_section" to
projectDataBase
2020-08-26 02:12:00 +02:00
Simon De Backer
4763eb92ec Update Doxyfile
bron See
https://qelectrotech.org/forum/viewtopic.php?pid=12901#p12901

run
doxygen Doxyfile
in project dir or met Qt
2020-08-25 21:12:47 +02:00
Simon De Backer
9e4af439ef Wrap code for better readability 2020-08-25 20:52:49 +02:00
Simon De Backer
dfadcb5523 Small change to TRANSLATIONS 2020-08-24 22:22:56 +02:00
Simon De Backer
995066916b Decreases the number of declaring variables
for improve readability
2020-08-24 22:10:58 +02:00
Simon De Backer
debca09d5c Translate documentation + Fix indentation 2020-08-24 22:02:22 +02:00
Simon De Backer
9dad8a5d01 Fix Bug Fill the combo box "element information" was not called
a typo it happens :)
See commit
216374d27c
2020-08-23 17:47:53 +02:00
artgg7300
347de4bcd3 updated hungarian files 2020-08-23 16:17:41 +02:00
Claveau Joshua
7960697b9e Remove unused class 2020-08-21 14:39:35 +02:00
Claveau Joshua
0e6b385be2 Write backup improvement.
Remove the waitForFinished function to truly use the multi-threading.
2020-08-21 00:25:20 +02:00
Simon De Backer
4b4732a0a8 Fix doxygen issue 2020-08-20 22:35:25 +02:00
Simon De Backer
331918d143 Wrap code for better readability 2020-08-20 21:58:23 +02:00
Simon De Backer
0c00d83b27 Fix some doxygen issues 2020-08-20 21:57:35 +02:00
Laurent Trinques
8626ca5d1b Minor fix 2020-08-20 19:45:20 +02:00
Laurent Trinques
e05754da29 Machine_info : improve code 2020-08-20 19:34:07 +02:00
Laurent Trinques
b4f733a5e5 Machine_info : add Windows RAM Available 2020-08-20 18:09:37 +02:00
Simon De Backer
9352905335 Remove some code not in a class or in a function (Q_OS_WIN) 2020-08-20 17:50:29 +02:00
Simon De Backer
88686b3cbf Wrap code for better readability 2020-08-20 17:45:24 +02:00
Simon De Backer
d1c91a7fc2 Fix some doxygen issues 2020-08-20 17:44:59 +02:00
Laurent Trinques
f24f04084c Machine_info : add Windows RAM informations 2020-08-20 06:05:55 +02:00
Simon De Backer
e3093bd06c Fix doxygen issue, Mod to and from Settings
what does this code do?
2020-08-19 21:29:18 +02:00
Simon De Backer
cdb2e7b523 Wrap code for better readability 2020-08-19 21:27:14 +02:00
Simon De Backer
666f20856e Fix some doxygen issues 2020-08-19 21:26:36 +02:00
Simon De Backer
f5725531c2 Fix some doxygen issues 2020-08-19 17:31:02 +02:00
Simon De Backer
5dd57cf003 Wrap code for better readability 2020-08-19 17:30:18 +02:00
Simon De Backer
566747eb2b Improve code style, Wrap code for better readability 2020-08-18 21:29:12 +02:00
Simon De Backer
8e956df8d8 Fix some doxygen issues 2020-08-18 21:28:52 +02:00
Simon De Backer
ef15013715 Add QElectroTech Version in log file 2020-08-18 21:24:22 +02:00
sdeffaux
20896de561 Update hag_cds765f.elmt 2020-08-18 20:47:57 +02:00
sdeffaux
8cdcb59da2 add symbols 2020-08-18 20:47:57 +02:00
sdeffaux
35f206bc7e Add symbols Hager et Legrand 2020-08-18 20:47:57 +02:00
Simon De Backer
99abc165d6 Wrap code for better readability 2020-08-18 20:08:32 +02:00
Simon De Backer
790cdc5229 Fix some doxygen issues (~100) 2020-08-18 20:07:55 +02:00
Simon De Backer
b5f212418c Improve code style, Wrap code for better readability 2020-08-17 21:24:46 +02:00
Simon De Backer
b28ca0361d Fix some doxygen issues 2020-08-17 21:24:20 +02:00
Simon De Backer
2482a0bd4c Fix log files in wrong dir
when arguments are used,
the log file change from dir,
result 2 log files,
and 1 log file is not deleted by
void delete_old_log_files(int days)
2020-08-17 19:12:52 +02:00
Claveau Joshua
319188e010 Export to csv improvement
Export to csv doesn't use is own datase, but the project database
instead.
2020-08-17 16:42:07 +02:00
Laurent Trinques
bc0fecea6c Merge branch 'C-Born-Software-dxf' into master 2020-08-17 10:23:29 +02:00
David Varley
a4c829fbcd Merge branch 'master' into dxf 2020-08-17 16:02:06 +10:00
David Varley
73dd1e8299 Merge branch 'master' of https://github.com/qelectrotech/qelectrotech-source-mirror 2020-08-17 15:53:19 +10:00
David Varley
430ec27f36 Fix dxf export of autosize text cells in titleblock 2020-08-17 15:38:24 +10:00
David Varley
0cb98b2ee1 Adjust alignment of titleblock text in DXF export 2020-08-17 09:13:19 +10:00
Simon De Backer
41cef49453 Improve code style, Wrap code for better readability 2020-08-16 14:26:40 +02:00
Simon De Backer
c4bf492616 Improve code style 2020-08-16 14:26:04 +02:00
Simon De Backer
bc176da88d Improve code style, Wrap code for better readability 2020-08-16 14:25:48 +02:00
Simon De Backer
e55d336dc1 Improve code style 2020-08-16 14:25:31 +02:00
Simon De Backer
6c806d151d Improve code style 2020-08-16 14:25:14 +02:00
Simon De Backer
5e3e3aa4bd Improve code style, Wrap code for better readability, Mod doc 2020-08-16 14:24:51 +02:00
Simon De Backer
3b3ce2cb7c Improve code style, Wrap code for better readability 2020-08-16 14:24:12 +02:00
Simon De Backer
928b56f2bf Improve code style, Wrap code for better readability 2020-08-16 14:23:59 +02:00
Simon De Backer
8144e9b21b Wrap code for better readability 2020-08-16 14:23:42 +02:00
Simon De Backer
8a484ef901 Improve code style 2020-08-16 14:23:25 +02:00
Simon De Backer
574609abf5 Improve code style 2020-08-16 14:22:54 +02:00
Simon De Backer
76d16ab600 Improve code style, Wrap code for better readability 2020-08-16 14:22:36 +02:00
Simon De Backer
60a5a83320 Improve code style, Wrap code for better readability 2020-08-16 14:22:21 +02:00
Simon De Backer
e9fcd385d5 Improve code style, Wrap code for better readability 2020-08-16 14:22:12 +02:00
Simon De Backer
4ed33109f4 Improve code style, Wrap code for better readability 2020-08-16 14:21:55 +02:00
Simon De Backer
a83ee76f39 Fix Copyright indentation 2020-08-16 14:19:38 +02:00
Simon De Backer
3783a6a543 Fix warning 'setParts' is not marked 'override' 2020-08-16 14:07:46 +02:00
Laurent Trinques
070cc2e4ac Typo 2020-08-16 12:34:49 +02:00
Yuki Atoh
012d969d92 Fix Japanese 2020-08-16 12:23:41 +02:00
Yuki Atoh
e22c618152 Add Japanese translations for IEC 60617 2020-08-16 12:23:41 +02:00
Yuki Atoh
93929399b6 Add Japanese translations of qet_directory 2020-08-16 12:23:41 +02:00
David Varley
ea9a230844 Fix dxf export for border 2020-08-16 12:22:36 +02:00
Simon De Backer
d4ee161c07 Mod doc set style de same 2020-08-16 11:19:36 +02:00
Simon De Backer
90417ae509 Fix Copyright indentation 2020-08-16 09:40:14 +02:00
David Varley
2b396960d9 Merge branch 'master' of https://github.com/qelectrotech/qelectrotech-source-mirror 2020-08-16 15:57:55 +10:00
David Varley
ddc2afa427 Fix dxf export for border 2020-08-16 15:39:20 +10:00
Simon De Backer
5832e365e9 Fix log file Dir 2020-08-15 21:40:07 +02:00
Laurent Trinques
dff825810c Update *TS files 2020-08-15 18:35:27 +02:00
Laurent Trinques
12ddd3256e Update translations_stat.pl script 2020-08-15 15:10:06 +02:00
Laurent Trinques
7aaf0c0e58 Fix typo 2020-08-15 15:03:47 +02:00
David Varley
ceb2868b02 Fix dxf export for copied conductors 2020-08-15 14:15:57 +02:00
David Varley
02afb6c003 Fix dxf export for copied conductors 2020-08-15 22:00:14 +10:00
Laurent Trinques
6916736708 Merge branch 'yukia10-l10n_jp' into master 2020-08-15 13:52:01 +02:00
Yuki Atoh
4c51448c45 Merge branch 'l10n_jp' of https://github.com/yukia10/qelectrotech-source-mirror into l10n_jp 2020-08-15 18:42:16 +09:00
Yuki Atoh
770161ac57 Initial Japanese translation 2020-08-15 18:39:41 +09:00
sdeffaux
fa8917875b Add symbols 2020-08-15 08:37:06 +02:00
Yuki Atoh
295e285067 Initial Japanese translation 2020-08-15 14:17:29 +09:00
Simon De Backer
574f5b94b0 Update Copyright date 2020-08-14 22:48:44 +02:00
Simon De Backer
70d024fe79 Update Copyright date 2020-08-14 22:00:42 +02:00
Simon De Backer
de8ccc543d Fix no line number in debug 2020-08-14 18:35:53 +02:00
Simon De Backer
274108d509 Mod debuger to 7 days logs in .qet dir
the user can now read the log files
and/or send them to us for further investigation
2020-08-14 18:31:38 +02:00
Simon De Backer
d556206998 Fix to RAM Total info 2020-08-14 17:03:58 +02:00
Simon De Backer
84a2a25fa8 Mod get Screen info
get cpu info should not collect screen info
2020-08-14 17:03:08 +02:00
Laurent Trinques
6f82ac1df1 Mod Machine_info
Forgot QProcess::close()
2020-08-14 12:57:15 +02:00
Laurent Trinques
7616d11e9d Mod Machine_info
Improve GPU RAM
2020-08-14 12:55:04 +02:00
Laurent Trinques
9486deb3de Mod Machine_info
Add macOS RAM available
2020-08-14 12:51:50 +02:00
damianCaceres
e09bfa18b9 ElementEditor: partdynamictextfield.cpp code style fixes indentation 2020-08-14 01:37:41 +02:00
damianCaceres
fc4625fc0f ElementEditor: partdynamictextfield.cpp code style 2020-08-14 01:37:41 +02:00
damianCaceres
943aa469c6 ElementEditor: partdynamictextfield.h code style 2020-08-14 01:37:41 +02:00
damianCaceres
ba1242d5bb ElementEditor: parttext.cpp code style 2020-08-14 01:37:41 +02:00
damianCaceres
9bc6f7fa94 ElementEditor: parttext.h code style 2020-08-14 01:37:41 +02:00
damianCaceres
3b4237f21f ElementEditor: partterminal.cpp code style 2020-08-14 01:37:41 +02:00
damianCaceres
ac5ec020a6 ElementEditor: partterminal.h code style 2020-08-14 01:37:41 +02:00
damianCaceres
0bae33e3f5 ElementEditor: ~TerminalEditor() suppress extra semicolon 2020-08-14 01:37:41 +02:00
Simon De Backer
e5b7aacea6 Add LibraryInfo to debuger 2020-08-14 00:36:59 +02:00
Simon De Backer
5ca7ff177b Merge branch 'master'
# Conflicts:
#	sources/machine_info.cpp
2020-08-13 22:56:40 +02:00
Simon De Backer
d5b7414b36 Mod Machine_info
add send_info_to_debug
Mod get data PC
send to debuger on startup
2020-08-13 22:50:58 +02:00
Laurent Trinques
34259a4749 Typo 2020-08-13 21:32:51 +02:00
Laurent Trinques
4d61166864 Restore Simmon previous commit 2020-08-13 21:31:33 +02:00
Laurent Trinques
d46d6709f3 Machine info :
remove braces
2020-08-13 21:13:12 +02:00
Simon De Backer
da4e31dfcb Fix warning Wdeprecated
warning:
‘void QProcess::start(const QString&, QIODevice::OpenMode)’ is deprecated
"Use QProcess::start(const QString &program,
                     const QStringList &arguments,
                     OpenMode mode = ReadWrite) instead"
2020-08-13 20:37:07 +02:00
Simon De Backer
21b7aa059a rap code for better readability 2020-08-13 17:58:56 +02:00
Laurent Trinques
43a531fd2d Typo 2020-08-13 17:18:28 +02:00
Laurent Trinques
c0d51ef445 Machine info :
Add Windows GPU RAM informations
2020-08-13 17:10:42 +02:00
Laurent Trinques
f0b475bd77 Machine info :
add Windows CPU & GPU informations
2020-08-13 17:05:46 +02:00
sdeffaux
984d9bc5de Update symbols 2020-08-13 09:22:02 +02:00
Simon De Backer
288737af0d Add Debugging Techniques 2020-08-12 23:54:09 +02:00
Simon De Backer
b0df6d3101 Remove code minium QT_VERSION 5.9 2020-08-12 23:53:52 +02:00
Simon De Backer
11a90d2f69 Remove code minium QT_VERSION 5.9 2020-08-12 22:04:46 +02:00
Simon De Backer
69ff437368 Mod doc, Improve code style 2020-08-12 21:59:00 +02:00
Simon De Backer
87db0e2020 Wrap code for better readability 2020-08-12 19:33:29 +02:00
Claveau Joshua
044c5310f5 minor 2020-08-12 15:48:37 +02:00
Claveau Joshua
86766a9090 Element editor : a copied/pasted terminal part have a new uuid. 2020-08-12 15:45:48 +02:00
Simon De Backer
1805ef300e Add compiler message @TODO 2020-08-10 21:16:52 +02:00
Simon De Backer
e4033dd93c Wrap code for better readability + Mod doc 2020-08-10 21:13:31 +02:00
Simon De Backer
53d89ce4f7 Add documentation 2020-08-10 21:08:52 +02:00
Simon De Backer
7834d6fb84 Mod doc, Improve code style 2020-08-08 23:58:17 +02:00
Laurent Trinques
d9ec9bf274 Update Changelog 2020-08-08 15:53:01 +02:00
Laurent Trinques
66eaf52002 Update Changelog 2020-08-08 15:35:51 +02:00
Laurent Trinques
2e3e65df5a Update Changelog : WIP : you can add what i forgot 2020-08-08 15:08:23 +02:00
Laurent Trinques
b8daec441f Fix bug 199:
ElementEditor parText changes in the drawing area are not reflexted in
the information area
2020-08-07 15:32:24 +02:00
Simon De Backer
06dc1570fc Test writeToFile on a other Thread
to improve this for windows performance
2020-08-06 22:19:44 +02:00
Laurent Trinques
0ce001ea6e Fix bug 198
Text input loose the focus after each single letter
2020-08-06 13:20:33 +02:00
damianCaceres
fa719cf8ff ElementEditor: qetelementeditor fixes wrong braces introduced in previous commit 2020-08-06 11:08:08 +02:00
damianCaceres
0507336622 ElementEditor: qtelementeditor.cpp improve code style 2020-08-06 11:08:08 +02:00
damianCaceres
3d1e30b24e ElementEditor: qtelementeditor.h indentation 2020-08-06 11:08:08 +02:00
damianCaceres
b3a74a8315 ElementEditor: texteditor.cpp surround arrows and more braces 2020-08-06 11:08:08 +02:00
damianCaceres
216374d27c ElementEditor: dynamictextfieldeditor.cpp improve code style 2020-08-06 11:08:08 +02:00
damianCaceres
ce523b71e2 ElementEditor: dynamictextfieldeditor.h improve code style 2020-08-06 11:08:08 +02:00
damianCaceres
bb84bb2098 ElementEditor: texteditor.cpp improve code style 2020-08-06 11:08:08 +02:00
damianCaceres
23c43e72b5 ElementEditor: texteditor.h improve code style 2020-08-06 11:08:08 +02:00
damianCaceres
b53c083d0a ElementEditor: terminaleditor.cpp indentation, alignment and braces 2020-08-04 21:16:58 +02:00
damianCaceres
45edc34269 ElementEditor: terminaleditor.h indentation and alignment 2020-08-04 21:16:58 +02:00
damianCaceres
f8240558a0 ElementEditor: in PolygonEditor::setPart remove redundant calls to StyleEditor::setPart 2020-08-04 11:18:20 +02:00
damianCaceres
dd70637408 ElementEditor: in RectangleEditor::setPart remove redundant calls to StyleEditor::setPart 2020-08-04 11:18:20 +02:00
damianCaceres
45d1b489c4 ElementEditor: in ArcEditor::setPart remove redundant calls to StyleEditor::setPart 2020-08-04 11:18:20 +02:00
damianCaceres
72918a31db ElementEditor: in EllipseEditor::setPart remove redundant calls to StyleEditor::setPart 2020-08-04 11:18:20 +02:00
damianCaceres
9d772b4091 ElementEditor: in LineEditor::setPart remove redundant calls to StyleEditor::setPart 2020-08-04 11:18:20 +02:00
damianCaceres
dd257c48d9 ElementEditor: always clear m_cep_list in StyleEditor::setPart bugfix 0197 2020-08-03 16:07:31 +02:00
Claveau Joshua
78992ee762 Fix backup file on windows
For unknown reason KautoSaveFile don't write the file on Windows if file
is open in another part of the code.
No error is returned and use the method :
qint64 QIODevice::write(const QByteArray &byteArray) return the good
number of bytes written but the real file stay empty.
Probably the problem don't come from KautoSaveFile but QFileDevice or
QIODevice on windows.

The fix consist to open the file just before write on it and close it
just after.
2020-08-02 22:24:46 +02:00
Simon De Backer
7a04788d54 Mod code to drop 2 inden
- if (isReadOnly()) return;
- if (dc.items(DiagramContent::All).isEmpty())
2020-08-02 20:52:52 +02:00
Simon De Backer
fa1abbd38d Wrap code for better readability + Mod doc 2020-08-02 20:29:20 +02:00
Simon De Backer
effc86e72c Translate documentation + Fix indentation 2020-08-02 20:29:06 +02:00
Simon De Backer
d4d364cfde Fix wrap code for better readability 2020-08-02 19:36:12 +02:00
Claveau Joshua
1fc893157d Minor fix
Fix : During the opening of a project, if the project contain a
nomenclature, the dialog used to inform user that the table is too small
is displayed
2020-08-02 18:20:30 +02:00
Simon De Backer
494a5f1df2 Mod Coding conventions + Wrap code
Wrap code for better readability
2020-08-02 17:38:21 +02:00
Simon De Backer
900b7e22aa Mod CONTRIBUTING.md
add info Interactive Staging
2020-08-02 16:27:23 +02:00
Simon De Backer
4751934d68 New Signal Slot Syntax 2020-08-02 15:23:38 +02:00
Simon De Backer
510aa74266 Wrap code for better readability + Mod doc 2020-08-02 15:14:16 +02:00
Simon De Backer
e938673872 Add documentation 2020-08-02 15:09:21 +02:00
Simon De Backer
2a53f09a37 Translate documentation + Fix indentation 2020-08-02 12:09:08 +02:00
Laurent Trinques
6bece6fa84 Update Ru translation, thanks Aleksander 2020-07-29 21:31:55 +02:00
Simon De Backer
1372d1c8ba Wrap code for better readability + Mod doc 2020-07-28 20:57:02 +02:00
Simon De Backer
70e54bc9b2 Translate documentation + Fix indentation 2020-07-28 20:56:41 +02:00
sdeffaux
e6eeef5cf5 update symbols 2020-07-27 21:33:58 +02:00
dlee99
96acd6ff95 modified: lang/qet_nl.qm
modified:   lang/qet_nl.ts
2020-07-26 23:22:49 +02:00
Laurent Trinques
9cdc023f31 Pugixml XML parser
Update to upstream master
2020-07-26 16:14:31 +02:00
pavelfric
a2eb92803a Updated Czech translation 2020-07-26 13:13:23 +02:00
Simon De Backer
655e608268 Doxygen using dashes to create lists of items. 2020-07-26 11:55:51 +02:00
Simon De Backer
c401e93125 Wrap code for better readability + Mod doc 2020-07-26 11:36:27 +02:00
Simon De Backer
4d57e7fbfb Mod get elementInfo from elementInfoKeys 2020-07-26 11:16:12 +02:00
Simon De Backer
0c62bf2b3b Translate documentation + Fix indentation
- Mod doc set style de same
- Fix indentation code
2020-07-26 10:33:15 +02:00
Simon De Backer
1f78196fa6 Fix widget size 2020-07-25 22:00:19 +02:00
Simon De Backer
49cca54adc Wrap code for better readability 2020-07-24 22:44:32 +02:00
Simon De Backer
c0df06c2ee Mod doc set style de same 2020-07-24 22:44:10 +02:00
Simon De Backer
d087a8be66 Moved compilation_info to class Machine_info
This is preparation for making a dev log file
2020-07-23 21:57:30 +02:00
Simon De Backer
55beaa9be9 Mod ScrollArea on demand
QScrollArea is not asked if the screen is big enough.
2020-07-23 17:24:10 +02:00
Simon De Backer
c5eb5af47d Fix name to clarify value is int 2020-07-23 17:05:48 +02:00
Simon De Backer
90e283902e This adds ScrollArea to config dialog
Not everything is visible with low resolution screens.
https://qelectrotech.org/bugtracker/view.php?id=195
2020-07-23 16:55:42 +02:00
Simon De Backer
7420eeb60d Mod name to clarify value is int 2020-07-23 16:49:31 +02:00
Simon De Backer
698db4e5c0 Add Copyright to machine_info class 2020-07-22 21:16:38 +02:00
Simon De Backer
6b95c6bf6f Add QScrollArea to configdialog and resize to max_screen 2020-07-22 21:03:54 +02:00
Claveau Joshua
2b754cffb4 AddTableDialog : fix minor bug 2020-07-21 22:56:31 +02:00
Simon De Backer
03425bcb5b Add gui resize depending on screen size
Init of request
https://qelectrotech.org/bugtracker/view.php?id=195
This is a start will have to be adjusted further.
2020-07-21 20:29:05 +02:00
Laurent Trinques
3a08e60856 aboutqetdialog.cpp minor 2020-07-21 16:01:28 +02:00
Laurent Trinques
e03e36fb2c AboutQETDialog add Linux RAM Total and MemAvailable 2020-07-21 15:58:35 +02:00
Laurent Trinques
8f5e759528 AboutQETDialog add Linux RAM 2020-07-21 14:45:41 +02:00
Laurent Trinques
bddf10588f AboutQETDialog add macOS cpuinfo 'model name' 2020-07-21 14:12:06 +02:00
Laurent Trinques
a33ae2bb13 AboutQETDialog add Linux gpu info 'model name' 2020-07-21 13:44:45 +02:00
Laurent Trinques
bd93e62341 AboutQETDialog add Linux cpuinfo 'model name' 2020-07-21 13:05:08 +02:00
Simon De Backer
119e12b1cf Add Screen info user 2020-07-20 22:41:27 +02:00
Claveau Joshua
f242e1bccc graphics table properties editor : minor
Add label to inform users that the number of row is less than the number
of information to display.
2020-07-20 20:29:13 +02:00
Claveau Joshua
709280e3c1 QetGraphicsTableItem : add dialog to inform user
When user edit the query of an existing table/s if the content to
display is bigger than the content who can be displayed by the table/s a
dialog is opened for inform user of the current situation.
2020-07-20 19:38:52 +02:00
Simon De Backer
3b14946421 Add compiler message @TODO + Mod doc set style de same 2020-07-19 22:19:21 +02:00
Simon De Backer
280e4605e8 Mod doc set style de same 2020-07-19 22:08:41 +02:00
Simon De Backer
fe4552200b Add compiler message @TODO 2020-07-19 22:06:42 +02:00
Simon De Backer
d3b237d06c Mod documentation + wrap code for better readability 2020-07-19 20:28:56 +02:00
Simon De Backer
26fd1a497c Add ignore lines to .gitignore
if doxygen Doxyfile is run all file's of folder doc are added
Qt user file should not see either
2020-07-19 20:24:37 +02:00
Simon De Backer
bbd3085b8d Fix indentation code + Mod doc 2020-07-19 20:06:22 +02:00
Simon De Backer
1251d7d9b0 Fix indentation code + Mod doc 2020-07-19 20:05:58 +02:00
Simon De Backer
2229a1938d Add documentation 2020-07-19 20:05:13 +02:00
Simon De Backer
ffcdccb469 Mod doc set style de same 2020-07-19 18:40:41 +02:00
Simon De Backer
5df6d7f403 Wrap code for better readability 2020-07-19 18:40:41 +02:00
Simon De Backer
4cd69a2450 Mod doc set style de same 2020-07-19 18:40:41 +02:00
Simon De Backer
102629b86f Mod doc set style de same + wrap code for better readability 2020-07-19 18:40:41 +02:00
Simon De Backer
7ddae811a5 Fix Wdeprecated-declarations QProcess::startDetached
QProcess::startDetached(const QString&)’ is deprecated
Use
QProcess::startDetached(const QString &program,
			const QStringList &arguments)
instead
2020-07-19 18:30:28 +02:00
Simon De Backer
cecacfc769 Fix compiler warining non-virtual destructor
ref:
https://stackoverflow.com/questions/38407723/how-to-delete-an-object-of-derived-class-that-has-no-dstructor
2020-07-19 15:48:46 +02:00
9202 changed files with 404381 additions and 733310 deletions

67
.clang-format Normal file
View File

@@ -0,0 +1,67 @@
---
BasedOnStyle: LLVM
AlignAfterOpenBracket: AlwaysBreak
AlignConsecutiveMacros: 'true'
AlignConsecutiveAssignments: 'true'
AlignConsecutiveDeclarations: 'true'
AlignEscapedNewlines: Right
AlignOperands: 'true'
AlignTrailingComments: 'true'
AllowAllArgumentsOnNextLine: 'false'
AllowAllConstructorInitializersOnNextLine: 'true'
AllowAllParametersOfDeclarationOnNextLine: 'true'
AllowShortBlocksOnASingleLine: 'true'
AllowShortCaseLabelsOnASingleLine: 'true'
AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: Always
AllowShortLambdasOnASingleLine: All
AllowShortLoopsOnASingleLine: 'true'
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: 'true'
AlwaysBreakTemplateDeclarations: 'Yes'
BinPackArguments: 'false'
BinPackParameters: 'false'
BreakAfterJavaFieldAnnotations: 'true'
BreakBeforeBinaryOperators: NonAssignment
BreakBeforeBraces: Allman
BreakBeforeTernaryOperators: 'false'
BreakConstructorInitializers: AfterColon
BreakInheritanceList: AfterColon
BreakStringLiterals: 'true'
ColumnLimit: '80'
CompactNamespaces: 'false'
ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
Cpp11BracedListStyle: 'true'
FixNamespaceComments: 'true'
IncludeBlocks: Regroup
IndentCaseLabels: 'false'
IndentPPDirectives: AfterHash
IndentWidth: '4'
JavaScriptWrapImports: 'true'
Language: Cpp
MaxEmptyLinesToKeep: '1'
NamespaceIndentation: All
PointerAlignment: Left
ReflowComments: 'true'
SortIncludes: 'true'
SortUsingDeclarations: 'true'
SpaceAfterCStyleCast: 'true'
SpaceAfterLogicalNot: 'true'
SpaceAfterTemplateKeyword: 'true'
SpaceBeforeAssignmentOperators: 'true'
SpaceBeforeCpp11BracedList: 'true'
SpaceBeforeCtorInitializerColon: 'true'
SpaceBeforeInheritanceColon: 'true'
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: 'true'
SpaceInEmptyParentheses: 'false'
SpacesInAngles: 'false'
SpacesInCStyleCastParentheses: 'false'
SpacesInContainerLiterals: 'false'
SpacesInParentheses: 'false'
SpacesInSquareBrackets: 'false'
Standard: Cpp11
TabWidth: '4'
UseTab: Always
...

22
.github/workflows/publish-edge-snap.yml vendored Normal file
View File

@@ -0,0 +1,22 @@
name: Publish Edge Snap
on:
push:
branches:
- master
jobs:
publish_amd64:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Checkout submodules
run: git submodule update --init --recursive
- uses: snapcore/action-build@v1
id: build
- uses: snapcore/action-publish@v1
env:
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
with:
snap: ${{ steps.build.outputs.snap }}
release: stable

5
.gitignore vendored
View File

@@ -1,2 +1,7 @@
*.snap
.flatpak-builder
# Qt build output
*.user
# doxygen Doxyfile output
doc/
QElectroTech.tag

10
.gitmodules vendored Normal file
View File

@@ -0,0 +1,10 @@
[submodule "pugixml"]
path = pugixml
url = https://github.com/zeux/pugixml.git
[submodule "SingleApplication"]
path = SingleApplication
url = https://github.com/itay-grudev/SingleApplication.git
[submodule "elements"]
path = elements
url = https://github.com/qelectrotech/qelectrotech-elements.git

154
CMakeLists.txt Normal file
View File

@@ -0,0 +1,154 @@
# Copyright 2006 The QElectroTech Team
# This file is part of QElectroTech.
#
# QElectroTech is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# QElectroTech is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
include(cmake/hoto_update_cmake_message.cmake)
cmake_minimum_required(VERSION 3.14...3.19 FATAL_ERROR)
project(qelectrotech
VERSION 0.9.0
DESCRIPTION "QET is a CAD/CAE editor focusing on schematics drawing features."
HOMEPAGE_URL "https://qelectrotech.org/"
LANGUAGES CXX)
include(cmake/copyright_message.cmake)
set(QET_DIR ${PROJECT_SOURCE_DIR})
# Add sub directories
option(PACKAGE_TESTS "Build the tests" ON)
if(PACKAGE_TESTS)
message("Add sub directory tests")
add_subdirectory(tests)
endif()
include(cmake/paths_compilation_installation.cmake)
include(cmake/start_options.cmake)
include(cmake/developer_options.cmake)
include(cmake/git_update_submodules.cmake)
include(cmake/git_last_commit_sha.cmake)
include(cmake/fetch_kdeaddons.cmake)
include(cmake/fetch_singleapplication.cmake)
include(cmake/fetch_pugixml.cmake)
include(cmake/qet_compilation_vars.cmake)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
SET(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(
QT
NAMES
Qt6
Qt5
COMPONENTS
${QET_COMPONENTS}
REQUIRED
)
find_package(
Qt${QT_VERSION_MAJOR}
COMPONENTS
${QET_COMPONENTS}
REQUIRED)
set(CMAKE_AUTOUIC_SEARCH_PATHS ${QET_DIR}/sources/ui)
qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${QET_DIR}/lang")
qt5_add_translation(QM_FILES ${TS_FILES})
# als laatse
include(cmake/define_definitions.cmake)
add_executable(
${PROJECT_NAME}
${QET_RES_FILES}
${QET_SRC_FILES}
${QM_FILES}
${QET_DIR}/qelectrotech.qrc
)
target_link_libraries(
${PROJECT_NAME}
PUBLIC
PRIVATE
pugixml::pugixml
SingleApplication::SingleApplication
${KF5_PRIVATE_LIBRARIES}
${QET_PRIVATE_LIBRARIES}
)
target_include_directories(
${PROJECT_NAME}
PRIVATE
${QET_DIR}/sources/titleblock
${QET_DIR}/sources/ui
${QET_DIR}/sources/qetgraphicsitem
${QET_DIR}/sources/qetgraphicsitem/ViewItem
${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui
${QET_DIR}/sources/richtext
${QET_DIR}/sources/factory
${QET_DIR}/sources/properties
${QET_DIR}/sources/dvevent
${QET_DIR}/sources/editor
${QET_DIR}/sources/editor/esevent
${QET_DIR}/sources/editor/graphicspart
${QET_DIR}/sources/editor/ui
${QET_DIR}/sources/editor/UndoCommand
${QET_DIR}/sources/undocommand
${QET_DIR}/sources/diagramevent
${QET_DIR}/sources/ElementsCollection
${QET_DIR}/sources/ElementsCollection/ui
${QET_DIR}/sources/autoNum
${QET_DIR}/sources/autoNum/ui
${QET_DIR}/sources/ui/configpage
${QET_DIR}/sources/SearchAndReplace
${QET_DIR}/sources/SearchAndReplace/ui
${QET_DIR}/sources/NameList
${QET_DIR}/sources/NameList/ui
${QET_DIR}/sources/utils
${QET_DIR}/pugixml/src
${QET_DIR}/sources/dataBase
${QET_DIR}/sources/dataBase/ui
${QET_DIR}/sources/factory/ui
${QET_DIR}/sources/print
)
install(TARGETS ${PROJECT_NAME})
if (NOT MINGW)
install(DIRECTORY ico/breeze-icons/16x16 DESTINATION ${QET_ICONS_PATH})
install(DIRECTORY ico/breeze-icons/22x22 DESTINATION ${QET_ICONS_PATH})
install(DIRECTORY ico/breeze-icons/32x32 DESTINATION ${QET_ICONS_PATH})
install(DIRECTORY ico/breeze-icons/48x48 DESTINATION ${QET_ICONS_PATH})
install(DIRECTORY ico/breeze-icons/64x64 DESTINATION ${QET_ICONS_PATH})
install(DIRECTORY ico/breeze-icons/128x128 DESTINATION ${QET_ICONS_PATH})
install(DIRECTORY ico/breeze-icons/256x256 DESTINATION ${QET_ICONS_PATH})
install(DIRECTORY elements DESTINATION share/qelectrotech)
install(DIRECTORY examples DESTINATION share/qelectrotech)
install(DIRECTORY titleblocks DESTINATION share/qelectrotech)
install(FILES LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog DESTINATION share/doc/qelectrotech)
install(FILES misc/org.qelectrotech.qelectrotech.desktop DESTINATION share/applications)
install(FILES misc/qelectrotech.xml DESTINATION share/mime/packages)
install(FILES misc/qelectrotech.appdata.xml DESTINATION ${QET_APPDATA_PATH})
install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH})
endif()

View File

@@ -1,27 +1,121 @@
# How to contribute
I'm really glad you're reading this, because we need volunteer developers to help this project come to fruition.
I'm really glad you're reading this,
because we need volunteer developers to help
this project come to fruition.
Here are some important resources:
* [wiki](https://qelectrotech.org/wiki_new/doc/qt_creator#on_ajoute_le_style_de_code_qet)Qet code style
* [Qet code style](https://qelectrotech.org/wiki_new/doc/qt_creator#on_ajoute_le_style_de_code_qet)
* [git Documentation](https://git-scm.com/doc)
## Testing
## Submitting changes
Always write a clear log message for your commits. One-line messages are fine for small changes, but bigger changes should look like this:
Always write a clear log message for your commits.
One-line messages are fine for small changes,
but bigger changes should look like this:
$ git commit -m "A brief summary of the commit
>
> A paragraph describing what changed and its impact."
* It is always appropriate to keep the commits small.
* For major changes it is recommended to use branches.
### Interactive Staging
https://git-scm.com/book/en/v2/Git-Tools-Interactive-Staging
issue: you have modified a class but you want to write it in 2 commits
´git add -p´ or ´git add -i´
/qet> git add -i
staged unstaged path
1: unchanged +1/-1 sources/diagram.cpp
*** Commands ***
1: status 2: update 3: revert 4: add untracked
5: patch 6: diff 7: quit 8: help
What now> 5
staged unstaged path
1: unchanged +1/-1 sources/diagram.cpp
Patch update>> 1
staged unstaged path
* 1: unchanged +1/-1 sources/diagram.cpp
Patch update>>
diff --git a/sources/diagram.cpp b/sources/diagram.cpp
index bffca653f..9bd2280f7 100644
--- a/sources/diagram.cpp
+++ b/sources/diagram.cpp
@@ -103,9 +103,9 @@ Diagram::Diagram(QETProject *project) :
connect(&border_and_titleblock,
&BorderTitleBlock::titleBlockFolioChanged,
this, &Diagram::updateLabels);
- connect(this, &Diagram::diagramActivated,
+ foo(do_a);
- adjust(diagramActivated);
+ bar(do_c);
adjustSceneRect();
}
(1/1) Stage this hunk [y,n,q,a,d,s,e,?]? s
Split into 2 hunks.
@@ -103,5 +103,5 @@
connect(&border_and_titleblock,
&BorderTitleBlock::titleBlockFolioChanged,
this, &Diagram::updateLabels);
- connect(this, &Diagram::diagramActivated,
+ foo(do_a);
(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]? y
@@ -107,5 +107,5 @@
this, &Diagram::loadElmtFolioSeq);
- adjust(diagramActivated);
+ bar(do_c);
adjustSceneRect();
}
(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]? n
*** Commands ***
1: status 2: update 3: revert 4: add untracked
5: patch 6: diff 7: quit 8: help
What now>What now>7
Bye.
git commit -m "Mod Signal Slot to funsion"
## Coding conventions
Start reading our code and you'll get the hang of it. We optimize for readability:
* We indent using tab, see https://qelectrotech.org/wiki_new/doc/qt_creator#on_ajoute_le_style_de_code_qet
Start reading our code and you'll get the hang of it.
We optimize for readability:
* We use tabs to indent, and interpret tabs as taking up to 8 spaces.
see https://qelectrotech.org/wiki_new/doc/qt_creator#on_ajoute_le_style_de_code_qet
* We try to keep to at most 80 characters per line.
* Try to make your code understandable.
You may put comments in, but comments invariably tend to stale out when
the code they were describing changes.
Often splitting a function into two
makes the intention of the code much clearer.
Thanks,
QElectroTech

203
ChangeLog
View File

@@ -1,19 +1,147 @@
====== ChangeLog from 0.8 to 0.9 ======
*Diagram editor :
Improved QElectroTech speed (launch qet, open project, function)
A drop-down list has been added to the toolbar to change the size of the resize handles.
*Element Editor:
The "keep visual rotation" property of element texts is editable from the element editor.
Thanks to the work of antonioaja it is now possible to import a dxf directly from the element editor in a completely transparent way for the user.
In the background QElectroTech uses the dxf2elmt software. https://qelectrotech.org/forum/viewtopic.php?id=2265 https://github.com/antonioaja/dxf2elmt
Improved responsiveness when multiple shapes are selected or deleted, especially when working on a large converted DXF element.
https://qelectrotech.org/forum/viewtopic.php?pid=16612#p16612
*Other:
Add a "side project" tab in the "about" window.
In the general QElectroTech configuration, a drop down list allows to choose the scaling method for hdpi screens.
Allow open polygons (i.e. polylines) when saving in dxf format.
https://qelectrotech.org/forum/viewtopic.php?pid=16611#p16611
Added 'Other' option for slave device contact type.
https://github.com/qelectrotech/qelectrotech-source-mirror/pull/222
https://qelectrotech.org/forum/viewtopic.php?id=2264
*Logs:
Added a QElapsedTimer to calculate the time used to reload the item collection.
Improved QElapsedTimer to calculate the time used to reload the item collection in seconds instead of ms.
Added Linux pc.gpu.RAM information, but requires mesa-utils dependency on the Linux OS.
Added information about mounted disk volumes.
Added CPU architecture for which Qt was compiled in the aboutqetdialog widget and in the logs.
Added MSVC support to MachineInfo.
Added RAM information on Windows of available RAM.
Added QElectroTech version to the log file.
* Elements collection :
Improve collection 8274 elements in 1097 categories (i.e. 9371 files).
* macOS :
Fix sqlite3 database export on macOS, now I use macports with Digikam scripts instead off Homebrew Package Manager.
See: https://invent.kde.org/graphics/digikam/-/tree/master/project/bundles/macports
*Bug fix:
see: https://git.tuxfamily.org/qet/qet.git/log/?h=0.8.1
====== ChangeLog from 0.7 to 0.8 ======
* Element editor :
* with Ctrl key you can moving by keyboard primitives selected by 0.1 point instead by 1 points, added the same feature for moving the selected aera.
* Improve polygon widget editor on elements editor.
* Moving the main QET repository SVN trunk to GIT.
* Add a mirror of the main QET repository, which is synced to hosted at tuxfamily.org to Github.
* Doxyfile update add QCH file for doxygen-generated docs using qhelpgenerator and then import them into Qt Creator.
* Improve portability of Doxyfile (Simon).
* Fix deprecated warnings (Simon).
* Wrap code for better readability (Simon, Damian).
* Elements collection :
Improve collection 7378 elements in 1092 categories
Thanks Sebastien, Dinozzo, Simon, Rafał, Arnaud, Bisku, Fernando, Riesermauf, Alexis, david, Plc-user, Christophe, Michele, Galexis, Jevgenijs, Gabor,
Benoit Michel, Franck, Ludovic, Cyrille, ossau2mation, Mitzot, Edgar, Nuri, Friskolon, Baboune41, Wiktor, shateks, Dik, Shateks, Marcin
* Diagram editor :
* User can choose now folio list emplacement in project by select position number in settings :
1 for the first position
2 for the second position
etc
0 for always at the end of project
Because index folio is 0 and not 1 we apply -1 in formula to not complicate your life..
* The export of the nomenclature to csv file has been completely rewritten :
It is now possible to choose which information to export as well as the order in which it should be displayed.
An option allows filtering by type of element: all, terminal block, button / switch.
Another option allows to display or not the column headers in the csv file.
With these options, it is possible to create a nomenclature, an order list, but also for printing labels: list of terminals and list of buttons / switches.
It is possible to save / load a configuration easily.
Finally, the work being done by an SQLite database, a text field allows the user to create his own SQL query.
* Add Conductors numbering to csv file.
* Add new summary table.
* add BOM creation dialog :
nomenclature is now integrated into the project (accompanied by several parameters in order to be customizable).
Tables can have a name.
Tables an be added to any folio.
Font margin and alignment (right center left) separately adjustable for headers and table cells.
Position size and number of lines is adjustable.
Possibility of linking several tables together, especially when the entire nomenclature cannot be contained in a folio.
Automatic adjustment of the size of the table in relation to the folio.
Option to apply the geometry of an array to all the array linked to it, so that everything is homogeneous.
Save / load table configuration and content to make creation faster.
Option to automatically adjust the table to the folio.
Option to automatically add new tables in new folios if the nomenclature cannot be contained in 1 to N folios / tables.
* Table content:
Fully customizable, you display what you want or want (info to display in the desired order, filter on type of element, filter on content of the info "contains, not contains, not empty etc ..." ).
The content being generated from a sqlite database, you can write your own request.
* Loading of element collections is now faster (thanks to the pugixml parser)
* The loading of collections of elements no longer freezes QElectroTech.
* The appearance and disappearance of the search / replace menu is animated.
* Fix wrong position of slave xref after open a saved project
* Add font color of the conductors (Simon).
* Add section and color properties for wires.
* config dialog :
* Add QScrollArea to configdialog and resize to max_screen (Simon).
* Add gui resize depending on screen size (Simon).
* Add Screen info user (Simon).
* Mod ScrollArea on demand (Simon).
* Element editor:
* Polygon editing widget, when you click on a point in the list, the corresponding point changes color in order to better visualize what you are doing.
On this same list, a right click opens a contextual menu allowing to delete the selected point or inserted a point after the selected one.
When holding the ctrl + directional arrow key, the selected parts move by 0.1 instead of 1 point.
* with Ctrl key you can moving by keyboard primitives selected by 0.1 point instead by 1 points, added the same feature for moving the selected aera.
* Added 140 web standard colors In Element editor (Arnaud).
* Add multiedit feature (martin).
* Add terminals uuid for next features (martin).
* Windows :
* Fix bad fonts rendering if Qt version >= 5.13.1.
See : https://bugreports.qt.io/browse/QTBUG-83161
* Fix backup file on windows
For unknown reason KautoSaveFile don't write the file on Windows if file
is open in another part of the code.
No error is returned and use the method :
qint64 QIODevice::write(const QByteArray &byteArray) return the good
number of bytes written but the real file stay empty.
Probably the problem don't come from KautoSaveFile but QFileDevice or
QIODevice on windows.
The fix consist to open the file just before write on it and close it
just after.
* writeToFile on a other Thread to improve this for windows performance (Simon).
* macOS :
@@ -22,46 +150,31 @@ Because index folio is 0 and not 1 we apply -1 in formula to not complicate your
(removed by Qt upstream) https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=commitdiff;h=ea47d152b35158ba07a55d009f57df0e4c2a048f;hp=08cc9b9991ae9ab51bed5b857b6257401401ff6f
* Add Snap packages :
* thanks Max for help.
https://snapcraft.io/qelectrotech
See: https://qelectrotech.org/forum/viewtopic.php?id=1426
* Use kde-neon extension
The kde-neon extension reduces our boilerplate in snapcraft.yaml
and reduces the snap size considerably, as we do not need to ship
any library that is already included in the kde-frameworks-5-core18
snap itself.
* For the Flatpak package : remove the file name extension added
This limits qelectrotech builds to the architectures supported
by kde-frameworks-5-core18, i.e. only amd64.
https://git.tuxfamily.org/qet/qet.git/log/?qt=grep&q=snap
* Add Flatpak packages :
* thanks Mathieu for help.
See: https://github.com/qelectrotech/qelectrotech-source-mirror/pull/18
* remove the file name extension added
automatically to the saved files even if the user sets an unknown file
extension for the program.
https://git.tuxfamily.org/qet/qet.git/log/?qt=grep&q=flatpak

338
ChangeLog.MD Normal file
View File

@@ -0,0 +1,338 @@
# Changelog
## [Unreleased](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/HEAD)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.9...HEAD)
**Closed issues:**
- Apple silicon download is not working [\#400](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/400)
- Apple silicon download is not working [\#394](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/394)
- Differenciating connector for proper labeling [\#390](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/390)
- Non-perpendicular connections [\#368](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/368)
- using the wrong Application Data folder on Windows [\#325](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/325)
- Unclear which PPA to use [\#321](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/321)
- missing group functionality [\#318](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/318)
- segfault due to calling method of uninitialized object [\#311](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/311)
- Cannot open qelectrotech.app on macOS Sequoia 15.0 [\#307](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/307)
- Dark Mode [\#301](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/301)
- README 404 Not Found URL: qelectrotech.org/download.html needs to be qelectrotech.org/download.php [\#298](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/298)
- Malware warning when trying to install dev version 0.100 [\#290](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/290)
- The page sorting of folio [\#279](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/279)
- Bad file name for translations [\#278](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/278)
- Error using Portuguese Language [\#274](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/274)
- Uninstaller [\#265](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/265)
- New Maintainer [\#263](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/263)
- crash on export project db \(sqlite\) [\#262](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/262)
- https://qelectrotech.org/ is down for several days now ! [\#261](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/261)
- right click on text crashes app [\#260](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/260)
- broken link on github [\#259](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/259)
- Build on Bullseye 11.5 fails [\#254](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/254)
- Question about ARM target in future release [\#238](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/238)
- Component library disappears completely after reset of program [\#87](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/87)
- Can't change language in portable version [\#75](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/75)
- Transformation Matrix for Element Editor [\#56](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/56)
**Merged pull requests:**
- Fixing translation file list in CMake [\#404](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/404) ([arummler](https://github.com/arummler))
- Update dependencies to fix compilation errors [\#403](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/403) ([arummler](https://github.com/arummler))
- Minor corrections to prevent crashes [\#401](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/401) ([Evilscrack](https://github.com/Evilscrack))
- Correct compositeText alignment on copying [\#399](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/399) ([ChuckNr11](https://github.com/ChuckNr11))
- Better handling of conductors when moving [\#398](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/398) ([ChuckNr11](https://github.com/ChuckNr11))
- A few small improvements [\#395](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/395) ([ChuckNr11](https://github.com/ChuckNr11))
- qet\_de updated [\#388](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/388) ([Bisku](https://github.com/Bisku))
- only calculate grid-point-size, when min != max [\#387](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/387) ([plc-user](https://github.com/plc-user))
- Mouse hover text for dynamic text items [\#386](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/386) ([elevatormind](https://github.com/elevatormind))
- improvement: adjust size of grid-dots with zoom-factor [\#384](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/384) ([plc-user](https://github.com/plc-user))
- adjust zoom-factor to use cosmetic-line and fixed comments [\#383](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/383) ([plc-user](https://github.com/plc-user))
- element-editor: fix jumping positions when rotate, mirror or flip [\#382](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/382) ([plc-user](https://github.com/plc-user))
- unify some more code for Qt5 & Qt6 \(and more\) [\#379](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/379) ([plc-user](https://github.com/plc-user))
- same simplifications as in \#376 "use the same code for Qt5 & Qt6" [\#377](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/377) ([plc-user](https://github.com/plc-user))
- simplify and use the same code for Qt5 & Qt6 [\#376](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/376) ([plc-user](https://github.com/plc-user))
- bordertitleblock: use same code for Qt5 & Qt6 for "numbering" rows [\#375](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/375) ([plc-user](https://github.com/plc-user))
- some minor changes [\#374](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/374) ([plc-user](https://github.com/plc-user))
- implement setting of point-size of grids [\#372](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/372) ([plc-user](https://github.com/plc-user))
- some small changes for selective move [\#370](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/370) ([plc-user](https://github.com/plc-user))
- Added slovak translation to org.qelectrotech.qelectrotech.desktop [\#369](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/369) ([prescott66](https://github.com/prescott66))
- unify calls to "setRotation" for element-primitives again [\#367](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/367) ([plc-user](https://github.com/plc-user))
- Added option to only move dynamic texts [\#365](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/365) ([scorpio810](https://github.com/scorpio810))
- New variables for conductor text formulas [\#364](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/364) ([scorpio810](https://github.com/scorpio810))
- Fix typo widht to width [\#362](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/362) ([pkess](https://github.com/pkess))
- element-editor: add mirror and flip for "text" [\#361](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/361) ([plc-user](https://github.com/plc-user))
- Add Swedish translation [\#360](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/360) ([scorpio810](https://github.com/scorpio810))
- German text for launcher and debian package code style [\#359](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/359) ([pkess](https://github.com/pkess))
- some more rotation, mirror and flip [\#358](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/358) ([plc-user](https://github.com/plc-user))
- BugFix: Flip and Mirror of terminals [\#357](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/357) ([plc-user](https://github.com/plc-user))
- element-editor: fix rotation and more [\#356](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/356) ([plc-user](https://github.com/plc-user))
- minor: mostly typos [\#355](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/355) ([plc-user](https://github.com/plc-user))
- a few translated shortcuts were still there ... fixed! [\#354](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/354) ([plc-user](https://github.com/plc-user))
- FIX: some shortcuts do not work with language set to local [\#353](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/353) ([plc-user](https://github.com/plc-user))
- fix movement of element, when origin is outside of graphics [\#352](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/352) ([plc-user](https://github.com/plc-user))
- FIX copy-and-paste in element-editor: set paste-position to meaningful values [\#351](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/351) ([plc-user](https://github.com/plc-user))
- some cleaning for element-file [\#350](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/350) ([plc-user](https://github.com/plc-user))
- fix: properties in project-file [\#348](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/348) ([plc-user](https://github.com/plc-user))
- translation: update German and English [\#347](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/347) ([plc-user](https://github.com/plc-user))
- export: set maximum width / height according limitations in QPainter [\#346](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/346) ([plc-user](https://github.com/plc-user))
- export: set maximum width / height according specifications of export-type [\#345](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/345) ([plc-user](https://github.com/plc-user))
- some clean-up for element-file and in code [\#344](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/344) ([plc-user](https://github.com/plc-user))
- minor: typos, comments, whitespace, translation [\#343](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/343) ([plc-user](https://github.com/plc-user))
- Sort names in element-file by language-code [\#342](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/342) ([plc-user](https://github.com/plc-user))
- more precise Log-Text for search of "qet\_tb\_generator" [\#341](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/341) ([plc-user](https://github.com/plc-user))
- machine\_info: add entry for QETApp::configDir\(\) also for win [\#340](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/340) ([plc-user](https://github.com/plc-user))
- remove dead code \(local variables that were never used\) [\#339](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/339) ([plc-user](https://github.com/plc-user))
- minor changes [\#338](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/338) ([plc-user](https://github.com/plc-user))
- Update of qet\_de [\#337](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/337) ([Bisku](https://github.com/Bisku))
- rewrite code for executing “qet\_tb\_generator” plugin [\#335](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/335) ([plc-user](https://github.com/plc-user))
- build-aux/snap/snapcraft.yaml: python3.8 -\> 3.10 [\#334](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/334) ([zultron](https://github.com/zultron))
- corrected a few places where QETApp::documentDir\(\) should also be used [\#333](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/333) ([plc-user](https://github.com/plc-user))
- add commandline-parameter "--data-dir" [\#332](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/332) ([plc-user](https://github.com/plc-user))
- machine\_info: fix element-count and make static text a bit shorter [\#331](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/331) ([plc-user](https://github.com/plc-user))
- formatting / whitespace - unify declarations [\#330](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/330) ([plc-user](https://github.com/plc-user))
- Set default-location for projects to documents-dir. [\#329](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/329) ([plc-user](https://github.com/plc-user))
- machine\_info.cpp: add explaining text for directory-list [\#328](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/328) ([plc-user](https://github.com/plc-user))
- set config- and data-dir to system-specific paths [\#327](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/327) ([plc-user](https://github.com/plc-user))
- Update qet\_cs.ts [\#326](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/326) ([pafri](https://github.com/pafri))
- update German translation [\#324](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/324) ([plc-user](https://github.com/plc-user))
- fix copyright-year [\#323](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/323) ([plc-user](https://github.com/plc-user))
- PT-BR language update [\#322](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/322) ([gleissonjoaquim3](https://github.com/gleissonjoaquim3))
- Fix: Only scroll diagram-view, when moved text leaves visible area [\#320](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/320) ([plc-user](https://github.com/plc-user))
- Change Sorting of ElementInfo ComboBox [\#319](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/319) ([ChuckNr11](https://github.com/ChuckNr11))
- Revert "ElementEditor elmt\_info\_cb sorting changed" [\#317](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/317) ([scorpio810](https://github.com/scorpio810))
- Fix typo and some whitespace [\#316](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/316) ([plc-user](https://github.com/plc-user))
- Fix missing company-titleblocks in properties-dialog [\#315](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/315) ([plc-user](https://github.com/plc-user))
- ElementEditor elmt\_info\_cb sorting changed [\#314](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/314) ([ChuckNr11](https://github.com/ChuckNr11))
- fix typos and whitespace [\#313](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/313) ([plc-user](https://github.com/plc-user))
- Force light mode in collections like projects [\#312](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/312) ([Arusekk](https://github.com/Arusekk))
- About QET: improvements in usability [\#310](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/310) ([plc-user](https://github.com/plc-user))
- use MessageBox to inform user about additional info when importing scaled element [\#308](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/308) ([plc-user](https://github.com/plc-user))
- make text for missing software "dxf2elmt" translatable [\#304](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/304) ([plc-user](https://github.com/plc-user))
- QET\_ElementScaler: fix error for Qt 5.9 and added mirroring [\#303](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/303) ([plc-user](https://github.com/plc-user))
- integrate "QET\_ElementScaler" as external software [\#302](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/302) ([plc-user](https://github.com/plc-user))
- move code into else-clause to avoid possible crashes [\#300](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/300) ([plc-user](https://github.com/plc-user))
- add terminal-names to connection in qet-file [\#297](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/297) ([plc-user](https://github.com/plc-user))
- fix: editing SpinBoxes with keyboard lose focus [\#296](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/296) ([plc-user](https://github.com/plc-user))
- Spanish lang update [\#295](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/295) ([joseyspain](https://github.com/joseyspain))
- More spanish translations.Josey [\#294](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/294) ([joseyspain](https://github.com/joseyspain))
- update German and English translations [\#293](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/293) ([plc-user](https://github.com/plc-user))
- hide SVG background checkbox in print preferences [\#292](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/292) ([plc-user](https://github.com/plc-user))
- fixed indentations of the remaining \*.cpp/\*.h files [\#291](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/291) ([plc-user](https://github.com/plc-user))
- correct more indentations / whitespace [\#289](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/289) ([plc-user](https://github.com/plc-user))
- update German and English translations [\#288](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/288) ([plc-user](https://github.com/plc-user))
- some minor changes [\#286](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/286) ([plc-user](https://github.com/plc-user))
- correct comments [\#285](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/285) ([plc-user](https://github.com/plc-user))
- FIX SegFault: Disable menu-entry for DB-export when no project loaded [\#284](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/284) ([plc-user](https://github.com/plc-user))
- changed some remaining "pt\_br" to "pt\_BR" [\#282](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/282) ([plc-user](https://github.com/plc-user))
- add option "transparent background" in SVG-export [\#281](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/281) ([plc-user](https://github.com/plc-user))
- Fix sizes [\#280](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/280) ([plc-user](https://github.com/plc-user))
- added folder "company-titleblocks" \(incl. language-files\) [\#277](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/277) ([plc-user](https://github.com/plc-user))
- update translations: de, en, nl [\#276](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/276) ([plc-user](https://github.com/plc-user))
- fix: set default "company-element-dir" [\#275](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/275) ([plc-user](https://github.com/plc-user))
- Fix Cmake build [\#273](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/273) ([De-Backer](https://github.com/De-Backer))
- added "company-collection" as second user-collection [\#272](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/272) ([plc-user](https://github.com/plc-user))
- corrected german texts for "line-style" [\#269](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/269) ([plc-user](https://github.com/plc-user))
- Too many parts [\#268](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/268) ([scorpio810](https://github.com/scorpio810))
- Merge Terminal strip to master [\#267](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/267) ([scorpio810](https://github.com/scorpio810))
- Terminal strip [\#266](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/266) ([scorpio810](https://github.com/scorpio810))
- Added new symbols [\#264](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/264) ([kamikazzyyyy](https://github.com/kamikazzyyyy))
## [0.9](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.9) (2023-01-03)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.9-dev-2022/12/30...0.9)
## [0.9-dev-2022/12/30](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.9-dev-2022/12/30) (2022-12-30)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.9-dev-2022/08/15...0.9-dev-2022/12/30)
## [0.9-dev-2022/08/15](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.9-dev-2022/08/15) (2022-08-13)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/9-dev-2022/04/22...0.9-dev-2022/08/15)
**Closed issues:**
- Polylines always closed on dxf export [\#228](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/228)
- Refreshing after making changes to elements [\#168](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/168)
## [9-dev-2022/04/22](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/9-dev-2022/04/22) (2022-04-09)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/9-dev-2021/09/09...9-dev-2022/04/22)
**Closed issues:**
- File dialog should enforce suffix [\#206](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/206)
- snap: Update stable release to core20 & introduce branch for stable releases [\#201](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/201)
- Can we submit Flatpak to Flathub? [\#143](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/143)
## [9-dev-2021/09/09](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/9-dev-2021/09/09) (2021-09-08)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/9-dev-2021/06/28...9-dev-2021/09/09)
## [9-dev-2021/06/28](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/9-dev-2021/06/28) (2021-07-06)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/9-dev-2021/05/09...9-dev-2021/06/28)
## [9-dev-2021/05/09](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/9-dev-2021/05/09) (2021-05-09)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.9-dev-2021/05...9-dev-2021/05/09)
## [0.9-dev-2021/05](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.9-dev-2021/05) (2021-04-30)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.8.0...0.9-dev-2021/05)
**Merged pull requests:**
- Rewrite how Properties are stored in the Project file [\#144](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/144) ([Murmele](https://github.com/Murmele))
- Xml properties rebase2 [\#80](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/80) ([Murmele](https://github.com/Murmele))
## [0.8.0](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.8.0) (2021-02-21)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.9-dev...0.8.0)
## [0.9-dev](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.9-dev) (2021-02-21)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.8.rc...0.9-dev)
**Closed issues:**
- QET font [\#110](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/110)
## [0.8.rc](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.8.rc) (2020-12-01)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.8-dev...0.8.rc)
**Closed issues:**
- overlapping comparisons always evaluate to true [\#78](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/78)
- New snap break HiDPI [\#41](https://github.com/qelectrotech/qelectrotech-source-mirror/issues/41)
## [0.8-dev](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.8-dev) (2019-08-06)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.7.0...0.8-dev)
## [0.7.0](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.7.0) (2019-07-17)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.2a...0.7.0)
## [0.2a](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.2a) (2019-06-26)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.2b...0.2a)
## [0.2b](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.2b) (2019-06-26)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.2rc1...0.2b)
## [0.2rc1](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.2rc1) (2019-06-26)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.2rc2...0.2rc1)
## [0.2rc2](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.2rc2) (2019-06-26)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.2...0.2rc2)
## [0.2](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.2) (2019-06-26)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.3a...0.2)
## [0.3a](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.3a) (2019-06-26)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.11...0.3a)
## [0.11](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.11) (2019-06-26)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.21...0.11)
## [0.21](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.21) (2019-06-26)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.22...0.21)
## [0.22](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.22) (2019-06-26)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.70rc2...0.22)
## [0.70rc2](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.70rc2) (2019-06-25)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.70rc1...0.70rc2)
## [0.70rc1](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.70rc1) (2019-04-12)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.61...0.70rc1)
## [0.61](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.61) (2018-08-23)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.6...0.61)
## [0.6](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.6) (2018-03-06)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.6rc4...0.6)
## [0.6rc4](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.6rc4) (2018-01-12)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.6rc3...0.6rc4)
## [0.6rc3](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.6rc3) (2017-09-20)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.6rc2...0.6rc3)
## [0.6rc2](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.6rc2) (2017-06-13)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.6rc1...0.6rc2)
## [0.6rc1](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.6rc1) (2017-04-23)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.5...0.6rc1)
## [0.5](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.5) (2015-11-27)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.5rc1...0.5)
## [0.5rc1](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.5rc1) (2015-10-30)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.5b...0.5rc1)
## [0.5b](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.5b) (2015-10-04)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.4...0.5b)
## [0.4](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.4) (2015-02-20)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.4rc2...0.4)
## [0.4rc2](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.4rc2) (2014-12-27)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.4rc1...0.4rc2)
## [0.4rc1](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.4rc1) (2014-11-10)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.4b...0.4rc1)
## [0.4b](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.4b) (2014-11-02)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.3...0.4b)
## [0.3](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.3) (2013-09-28)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.3rc...0.3)
## [0.3rc](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.3rc) (2013-09-10)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.3b...0.3rc)
## [0.3b](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.3b) (2013-06-18)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.1...0.3b)
## [0.1](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.1) (2008-03-08)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.1rc1...0.1)
## [0.1rc1](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.1rc1) (2008-03-02)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/0.1b...0.1rc1)
## [0.1b](https://github.com/qelectrotech/qelectrotech-source-mirror/tree/0.1b) (2007-12-23)
[Full Changelog](https://github.com/qelectrotech/qelectrotech-source-mirror/compare/5cadf173c7b73460b62409c81568fc8999177d52...0.1b)
\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

2852
Doxyfile

File diff suppressed because it is too large Load Diff

View File

@@ -4,6 +4,10 @@ without any warranty of fitness for your purpose or working.
The usage, the modification and the integration of the elements into electric
diagrams is allowed without any condition, whatever the final license of the
diagrams is.
Permission is not granted to use this software or any of the associated files
as sample data for the purposes of building machine learning models.
If you redistribute all or a part of the QElectroTech collection, with or
without any modification, out of an electric diagram, you must respect the
conditions of the CC-BY license:
@@ -19,6 +23,9 @@ fonctionne.
L'utilisation, la modification et l'intégration des éléments dans des schémas
électriques est autorisée sans condition, quelle que soit la licence finale des
schémas.
L'autorisation n'est pas accordée pour utiliser ce logiciel ou l'un des fichiers associés
comme exemples de données aux fins de création de modèles dapprentissage automatique.
Si vous redistribuez tout ou partie de la collection QElectroTech, avec ou sans
modification, en dehors d'un schéma électrique, vous devrez respecter les
conditions de la licence CC-BY :
@@ -27,6 +34,26 @@ disponible en ligne http://creativecommons.org/licenses/by/3.0/ ou par
courrier postal à Creative Commons, 171 Second Street, Suite 300, San Francisco,
California 94105, USA.
[de]
Die mit QElectroTech zur Verfügung gestellte Sammlung von Elementen wird ohne
Gewährleistung der Eignung für einen bestimmten Zweck oder der Funktions-
fähigkeit zur Verfügung gestellt.
Die Verwendung, Modifikation und Integration der Elemente in elektrische
Schaltpläne ist uneingeschränkt erlaubt, unabhängig von der endgültigen Lizenz
der Schaltpläne.
Es ist nicht gestattet, diese Software oder eine der zugehörigen Dateien
als Beispieldaten für die Erstellung von Modellen für maschinelles Lernen
zu verwenden.
Wenn Sie die gesamte QElectroTech-Sammlung oder Teile davon, mit oder ohne
Modifikationen, aus einem Schaltplan weitergeben, müssen Sie die Bedingungen
der CC-BY-Lizenz einhalten.
Dieses Werk steht unter einer Creative Commons Attribution 3.0 Lizenz.
Eine Kopie dieser Lizenz finden Sie unter:
http://creativecommons.org/licenses/by/3.0/
oder senden Sie einen Brief an:
Creative Commons, 171 Second Street, Suite 300,
San Francisco, Kalifornien, 94105, USA.
[ru]
Коллекция элементов, поставляемая вместе с QElectroTech, поставляется "как есть"
и без каких-либо гарантий пригодности для той или иной цели или работы.
@@ -136,7 +163,6 @@ http://creativecommons.org/licenses/by/3.0/ ή στείλτε μια επιστ
Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
[nl]
De elementen collectie voorzien, samen met QElectroTech wordt geleverd als en
zonder enige garantie van geschiktheid voor uw doel of werk.
Het gebruik, de wijziging en de integratie van de elementen in elektrische
@@ -151,8 +177,7 @@ http://creativecommons.org/licenses/by/3.0/ of stuur een brief naar Creative
Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
[be]
De elementen collectie welke samen met QElectroTech wordt geleverd zonder enige garantie
De elementen collectie welke samen met QElectroTech wordt geleverd zonder enige garantie
of deze geschikt zijn voor uw doel of de werking.
Het gebruik, wijzigen en integratie van de elementen in uw elektrische
schema's wordt toegestaan zonder enige voorwaarden, ongeacht wat de uiteindelijke
@@ -175,3 +200,15 @@ Dette værk er licenseret under Creative Commons Attribution 3.0 License.
For at se en kopi af denne licens, besøg
http://creativecommons.org/licenses/by/3.0/ or send a letter to Creative
Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
[ja]
QElectroTech と一緒に提供される要素コレクションは現状のまま提供され、
あなたの目的や作業に適合することを保証するものではありません。
回路図での要素の利用、変更、統合は、回路図の最終的なライセンスに関わらず
無条件で許可されます。
回路図とは別に QElectroTech コレクションの全部または一部を
変更の有無に関わらず再配布する場合は CC-BY ライセンスを尊重しなければなりません:
この作品は Creative Commons Attribution 3.0 の下でライセンスされます。
ライセンスのコピーを見るには http://creativecommons.org/licenses/by/3.0/ にアクセスするか、
「Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.」に
手紙を送ってください。

22
INSTALL
View File

@@ -20,6 +20,17 @@ $ make
# umask 0022
# make install
[de]
Abhängigkeiten:
libQt5 (Pakete libqt5*)
cupsys-bsd zum Drucken
Kompilieren:
$ qmake (qmake-qt5 für Debian-basierende Systeme)
$ make
# umask 0022
# make install
[ru]
Зависимости:
libQt5 (пакет libqt5*)
@@ -140,3 +151,14 @@ $ qmake (qmake-qt5 for Debian baserede systemer)
$ make
# umask 0022
# make install
[ja]
必要条件 :
libQt5 (パッケージ libqt5* を参照)
cupsys-bsd 印刷用
コンパイルの方法 :
$ qmake (Debian ベースのシステムでは qmake-qt5)
$ make
# umask 0022
# make install

View File

@@ -7,6 +7,7 @@
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your

6
README
View File

@@ -8,7 +8,7 @@ QET utilise le format XML pour ses éléments et ses schémas et inclut un édit
[de]
QElectroTech ist eine Qt5 Software, um Schaltpläne zu erstellen.
QET benutzt das XML Format für seine Bauteile und seine Projekte, und beinhaltet einen Schaltplaneditor, einen Bauteileditor sowie einen Zeichnungskopfeditor.
QET benutzt das XML Format für seine Bauteile und seine Projekte, und beinhaltet einen Schaltplaneditor, einen Bauteileditor sowie einen Schriftfeldeditor.
[ru]
@@ -50,3 +50,7 @@ QET gebruikt XML voor de elementen en schema's en omvat een schematische editor,
[da]
QElectroTech er et Qt5 program til at redigere elektriske diagrammer.
Det bruger XML filer for symboler og diagrammer og inkluderer diagram, symbol og titelblok redigering.
[ja]
QElectroTech は電気回路図を作成する Qt5 アプリケーションです。
QET は要素と回路図に XML 形式を利用し、回路図エディタ、要素エディタ、表題欄エディタを含みます。

105
README.md
View File

@@ -15,24 +15,27 @@ The main goal of the developers is to provide a libre, easy to use and effective
### Version
The current stable version is 0.70 and was released on 2019.07.13.
Once it has been officialy released, the stable version is always frozen and is no longer developed.
The current stable version is 0.90 and was released on 2023.01.06.
Once it has been officially released, the stable version is always frozen and is no longer developed.
New functionalities, bug and issue fixings are further made in the development version (currently 0.8), which can also be [downloaded](https://qelectrotech.org/download.html).
New functionalities, bug and issue fixings are further made in the development version (currently 0.100), which can also be [downloaded](https://qelectrotech.org/download.php).
Users who want to test and take benefits from the last software implementations should use the development version. But... use it at your own risk, since things are sometimes broken or only partialy implemented until they are done!
Users who want to test and take benefits from the last software implementations should use the development version. But... use it at your own risk, since things are sometimes broken or only partially implemented until they are done!
### License
The software is licensed under [GNU/GPL](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html).
You are free to use, copy, modify and redistribute it under the terms of the license.
Like many other open source softwares, QElectroTech is provided as it is, without any warranty.
Like many other open source software, QElectroTech is provided as is, without any warranty.
### Development / technical choices
The development follows the classical way of free and open source software: the source code, written by a community of users, is freely accessible.
* Get sources and sub-modules
```txt
git clone --recursive https://github.com/qelectrotech/qelectrotech-source-mirror.git
```
Here are the technical choices made for the software development:
@@ -40,11 +43,13 @@ Here are the technical choices made for the software development:
* Libraries: Qt 5.x
* [KF5 Framework](https://github.com/KDE)
[Cmake](https://cmake.org/install/)
[kcoreaddons](https://github.com/KDE/kcoreaddons)
[kwidgetsaddons](https://github.com/KDE/kwidgetsaddons).
[kcoreaddons](https://github.com/KDE/kcoreaddons/tree/kf5)
[kwidgetsaddons](https://github.com/KDE/kwidgetsaddons/tree/kf5).
* Coding language: [C++](https://en.wikipedia.org/wiki/C%2B%2B)
* GUI translations: [Qt Linguist](http://doc.qt.io/qt-5/qtlinguist-index.html)
* Version control: [GIT](https://git.tuxfamily.org/qet/qet.git/)
* Version control: [GIT](https://github.com/qelectrotech/qelectrotech-source-mirror.git)
* Doxygen documentation :[Doxygen](https://download.qelectrotech.org/qet/doxygen/html/)
* QtCreator qch doxygen :[QElectroTech.qch](https://download.qelectrotech.org/qet/doxygen/)
* File format for projects, elements and titleblocks: [XML](http://www.w3schools.com/xml/xml_whatis.asp)
* Main development platform: [GNU/Linux](http://getgnulinux.org/en/linux/)
* Targeted platforms: Windows, GNU/Linux, Mac OS X, BSDs
@@ -72,12 +77,12 @@ Take advantage of the modern GUI
Toolbars and panels can be enabled/disabled, moved and displayed the way you want to work.
Panels can be stacked on each other (as tabs) or docked on the sides (as docks) or completely separated from the main window (as windows).
The GUI can fit to small or big screens, and even to multi-display configurations.
![](https://download.tuxfamily.org/qet/images-features/0030.png "GUI overview")
![](https://download.qelectrotech.org/qet/images-features/0030.png "GUI overview")
The GUI of QElectroTech is translated in 19 languages.
The GUI of QElectroTech is translated in 25 languages.
You only need to restart the application for the new selected language to take effect.
![](https://download.tuxfamily.org/qet/images-features/0040.png "Lang menu")
![](https://download.qelectrotech.org/qet/images-features/0040.png "Lang menu")
Create technical documentation in professional quality
@@ -86,56 +91,56 @@ You can set vertical and horizontal headers (printed rulers) individually on and
Titlebocks can be created and edited with the embedded titleblock editor to perfectly suit your needs.
Custom variables can be defined to display the informations you wish in the titleblock.
![](https://download.tuxfamily.org/qet/images-features/0055.png "Titleblock editor")
![](https://download.qelectrotech.org/qet/images-features/0055.png "Titleblock editor")
With only 2 mouse clicks you can add a full automatic generated table of content.
Changes in the documentation are updated on the fly.
![](https://download.tuxfamily.org/qet/images-features/0060.png "Table of content")
![](https://download.qelectrotech.org/qet/images-features/0060.png "Table of content")
Choose from more than 7.000 symbols...
Choose from more than 8.200 symbols...
The embedded QET collection contains a rich library of electric, logic, pneumatic, hydraulic and fluid symbols.
The library grows at every new release thanks to an active user community.
![](https://download.tuxfamily.org/qet/images-features/0070.png "Collections")
![](https://download.qelectrotech.org/qet/images-features/0070.png "Collections")
...or create your own collection
The embedded element editor is a nice tool to create your own elements (symbols or anything else).
Your own elements are stored in the user collection.
![](https://download.tuxfamily.org/qet/images-features/0080.png "Element editor")
![](https://download.qelectrotech.org/qet/images-features/0080.png "Element editor")
Quickly find what you need
All collections can quickly be searched with the integrated search engine.
Furthermore, the search request can be restricted to the folder of your choice.
![](https://download.tuxfamily.org/qet/images-features/0090.png "Search engine")
![](https://download.qelectrotech.org/qet/images-features/0090.png "Search engine")
Easily draw complex schematics
To add an element on the drawing area, it only needs a drag & drop from the collection panel.
![](https://download.tuxfamily.org/qet/images-features/0102.png "Drag and drop")
![](https://download.qelectrotech.org/qet/images-features/0102.png "Drag and drop")
Elements are automatically connected if they are aligned, or connected from point to point by pulling a conductor with the mouse.
![](https://download.tuxfamily.org/qet/images-features/0105.png "Conductor connections")
![](https://download.qelectrotech.org/qet/images-features/0105.png "Conductor connections")
The path of every conductor can be modified by moving its handles with the mouse.
![](https://download.tuxfamily.org/qet/images-features/0107.png "Conductor handles")
![](https://download.qelectrotech.org/qet/images-features/0107.png "Conductor handles")
And of course, you can accurately zoom with the mouse wheel over the drawing area to catch the smallest details.
Link elements together to create cross references
Several types of element can be linked together to display a cross reference text.
All types of cross references are automatically updated on the fly, you don't need to think about them if you make changes.
![](https://download.tuxfamily.org/qet/images-features/0112.png "Cross ref elements")
![](https://download.qelectrotech.org/qet/images-features/0112.png "Cross ref elements")
To speed up your work, linkable elements are easily searched and shown.
![](https://download.tuxfamily.org/qet/images-features/0115.png "Cross ref search")
![](https://download.qelectrotech.org/qet/images-features/0115.png "Cross ref search")
Export informations to a parts list
Informations of all elements in the project can be exported to a .csv file that can be read and edited by any spreadsheet application.
![](https://download.tuxfamily.org/qet/images-features/0122.png "Element informations")
![](https://download.qelectrotech.org/qet/images-features/0122.png "Element informations")
This way, you can make your own parts list or bill of material using the full power of a spreadsheet program.
![](https://download.tuxfamily.org/qet/images-features/0125.png "Spreadsheet")
![](https://download.qelectrotech.org/qet/images-features/0125.png "Spreadsheet")
Print to pdf and/or export your work to images
Your whole documentation or only selected parts of it can be printed to a real printer or to a pdf file.
@@ -153,6 +158,52 @@ Alternatively, you can export to vector (svg) or pixel (png, jpg, bmp) format im
* conductors num can be exported to csv file.
* ***
Nomenclature
A new nomenclature tool appears in the menu: project -> Add a nomenclature.
The nomenclature is presented in the form of a configurable table separated into two parts: the display (the form) and the content (the background).
- Display: the size and position of the table, the margins between text and the table cell, the alignment of the text in the cells and the font. The configuration of the table headers and the table itself are separate.
- Content: the information to display in the table and the order in which it should be displayed.
![](https://download.qelectrotech.org/qet/images_depeche_linuxfr/08/dialogue_nomenclature.png "nomenclature dialogue")
In order to speed up the establishment of a nomenclature, it is possible to export / import the display and content configurations separately. This is the "Configuration" part that can be seen in the photos above.
Behind the scenes, an SQLite database does the work, so setting up the content is nothing more or less than an SQL query created using a dialog (screenshot by right).
The SQL query is configured as follows (from top to bottom in the screenshot):
- “Available information”: the information to display;
- "Filter": filter the information (is not empty, is empty, contains, does not contain, is equal to, is not equal to) only one filter can be applied per information, it is not possible combine several;
- "Type of elements": allows you to filter on what type of element you want to obtain information.
At the bottom, a checkmark "SQL query" allows you to edit a personalized query, if the basic options are not sufficient.
When a nomenclature is too large to be contained in a single folio, it is possible to separate it on several folios, the tables of each folio are then linked together. When creating a nomenclature, this option is activated by default, which has the effect of adding the necessary number of folios, adding a table in each of them and linking them together.
Finally two buttons are available in the property panel:
- "Fit the table to the folio": positions and adjusts the size and determines the number of rows in the table in relation to the folio;
- "Apply geometry to all tables linked to this one": applies the three properties mentioned above to all linked tables in order to save time and maintain aesthetic consistency.
And to finish a table
![](https://download.qelectrotech.org/qet/images_depeche_linuxfr/08/tableau.png "table")
Summary
The old summary has been completely removed from the code in order to make room for the new one which is exactly the same as the nomenclature (a large amount of the code is common), with the exception of the SQL query (and its dialog to configure it) which offers specific information for editing a summary.
Export of the internal database
The database used by the nomenclature and the summary can be exported in a “.sqlite” file.
Currently this is irrelevant, as the function was created during development for debugging purposes, we left it.
Note that the database will become increasingly important in the future of Qet.
Export of the wiring list
In order to be able to use the wiring number printers more easily, the names of conductors can be exported in CSV format, the export respects the quantity of conductors in order to print the right quantity of numbers, for example a potential numbered 240 composed of 3 wires will give 6 × 240 (2 numbers per wire × 3 wires) in the CSV.
### Story
The QElectroTech project was founded in 2007 by two french students, Xavier and Benoit.
@@ -172,7 +223,7 @@ Nowadays, QET is not only used by many individuals, teachers and students but al
If you love QElectroTech, you can help developers to buy new hardware to test
and implement new features. Thanks in advance for your generous donations.
For more information, look at [Paypal](https://www.paypal.com/donate/?token=rqf80cP0Ck1F2jn4Y46G7tIPv9bq7x0crXkwt3GZ6OZYG6ihJYi8lZxmmQ8itsFwMUdd1G&country.x=GB&locale.x=GB)
or at [leetchi.com](https://www.leetchi.com/c/qelectroteck)
For more information, look at [Paypal](https://www.paypal.com/donate/?cmd=_s-xclick&hosted_button_id=ZZHC9D7C3MDPC&ssrt=1694606609672)

1
SingleApplication Submodule

Submodule SingleApplication added at cbe496bc01

View File

@@ -1,228 +0,0 @@
Changelog
=========
__3.0.18__
----------
* Fallback to standard QApplication class on iOS and Android systems where
the library is not supported.
* Added Build CI tests to verify the library builds successfully on Linux, Windows and MacOS across multiple Qt versions.
_Anton Filimonov_
__3.0.17__
----------
* Fixed compilation warning/error caused by `geteuid()` on unix based systems.
_Iakov Kirilenko_
* Added CMake support
_Hennadii Chernyshchyk_
__3.0.16__
----------
* Use geteuid and getpwuid to get username on Unix, fallback to environment variable.
_Jonas Kvinge_
__3.0.15__
----------
* Bug Fix: sendMessage() might return false even though data was actually written.
_Jonas Kvinge_
__3.0.14__
----------
* Fixed uninitialised variables in the `SingleApplicationPrivate` constructor.
__3.0.13a__
----------
* Process socket events asynchronously
* Fix undefined variable error on Windows
_Francis Giraldeau_
__3.0.12a__
----------
* Removed signal handling.
__3.0.11a__
----------
* Fixed bug where the message sent by the second process was not received
correctly when the message is sent immediately following a connection.
_Francis Giraldeau_
* Refactored code and implemented shared memory block consistency checks
via `qChecksum()` (CRC-16).
* Explicit `qWarning` and `qCritical` when the library is unable to initialise
correctly.
__3.0.10__
----------
* Removed C style casts and eliminated all clang warnings. Fixed `instanceId`
reading from only one byte in the message deserialization. Cleaned up
serialization code using `QDataStream`. Changed connection type to use
`quint8 enum` rather than `char`.
* Renamed `SingleAppConnectionType` to `ConnectionType`. Added initialization
values to all `ConnectionType` enum cases.
_Jedidiah Buck McCready_
__3.0.9__
---------
* Added SingleApplicationPrivate::primaryPid() as a solution to allow
bringing the primary window of an application to the foreground on
Windows.
_Eelco van Dam from Peacs BV_
__3.0.8__
---------
* Bug fix - changed QApplication::instance() to QCoreApplication::instance()
_Evgeniy Bazhenov_
__3.0.7a__
----------
* Fixed compilation error with Mingw32 in MXE thanks to Vitaly Tonkacheyev.
* Removed QMutex used for thread safe behaviour. The implementation now uses
QCoreApplication::instance() to get an instance to SingleApplication for
memory deallocation.
__3.0.6a__
----------
* Reverted GetUserName API usage on Windows. Fixed bug with missing library.
* Fixed bug in the Calculator example, preventing it's window to be raised
on Windows.
Special thanks to Charles Gunawan.
__3.0.5a__
----------
* Fixed a memory leak in the SingleApplicationPrivate destructor.
_Sergei Moiseev_
__3.0.4a__
----------
* Fixed shadow and uninitialised variable warnings.
_Paul Walmsley_
__3.0.3a__
----------
* Removed Microsoft Windows specific code for getting username due to
multiple problems and compiler differences on Windows platforms. On
Windows the shared memory block in User mode now includes the user's
home path (which contains the user's username).
* Explicitly getting absolute path of the user's home directory as on Unix
a relative path (`~`) may be returned.
__3.0.2a__
----------
* Fixed bug on Windows when username containing wide characters causes the
library to crash.
_Le Liu_
__3.0.1a__
----------
* Allows the application path and version to be excluded from the server name
hash. The following flags were added for this purpose:
* `SingleApplication::Mode::ExcludeAppVersion`
* `SingleApplication::Mode::ExcludeAppPath`
* Allow a non elevated process to connect to a local server created by an
elevated process run by the same user on Windows
* Fixes a problem with upper case letters in paths on Windows
_Le Liu_
__v3.0a__
---------
* Deprecated secondary instances count.
* Added a sendMessage() method to send a message to the primary instance.
* Added a receivedMessage() signal, emitted when a message is received from a
secondary instance.
* The SingleApplication constructor's third parameter is now a bool
specifying if the current instance should be allowed to run as a secondary
instance if there is already a primary instance.
* The SingleApplication constructor accept a fourth parameter specifying if
the SingleApplication block should be User-wide or System-wide.
* SingleApplication no longer relies on `applicationName` and
`organizationName` to be set. It instead concatenates all of the following
data and computes a `SHA256` hash which is used as the key of the
`QSharedMemory` block and the `QLocalServer`. Since at least
`applicationFilePath` is always present there is no need to explicitly set
any of the following prior to initialising `SingleApplication`.
* `QCoreApplication::applicationName`
* `QCoreApplication::applicationVersion`
* `QCoreApplication::applicationFilePath`
* `QCoreApplication::organizationName`
* `QCoreApplication::organizationDomain`
* User name or home directory path if in User mode
* The primary instance is no longer notified when a secondary instance had
been started by default. A `Mode` flag for this feature exists.
* Added `instanceNumber()` which represents a unique identifier for each
secondary instance started. When called from the primary instance will
return `0`.
__v2.4__
--------
* Stability improvements
* Support for secondary instances.
* The library now recovers safely after the primary process has crashed
and the shared memory had not been deleted.
__v2.3__
--------
* Improved pimpl design and inheritance safety.
_Vladislav Pyatnichenko_
__v2.2__
--------
* The `QAPPLICATION_CLASS` macro can now be defined in the file including the
Single Application header or with a `DEFINES+=` statement in the project file.
__v2.1__
--------
* A race condition can no longer occur when starting two processes nearly
simultaneously.
Fix issue [#3](https://github.com/itay-grudev/SingleApplication/issues/3)
__v2.0__
--------
* SingleApplication is now being passed a reference to `argc` instead of a
copy.
Fix issue [#1](https://github.com/itay-grudev/SingleApplication/issues/1)
* Improved documentation.

View File

@@ -1,43 +0,0 @@
cmake_minimum_required(VERSION 3.1.0)
project(SingleApplication)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
# SingleApplication base class
set(QAPPLICATION_CLASS QCoreApplication CACHE STRING "Inheritance class for SingleApplication")
set_property(CACHE QAPPLICATION_CLASS PROPERTY STRINGS QApplication QGuiApplication QCoreApplication)
# Libary target
add_library(${PROJECT_NAME} STATIC
singleapplication.cpp
singleapplication_p.cpp
)
# Find dependencies
find_package(Qt5Network)
if(QAPPLICATION_CLASS STREQUAL QApplication)
find_package(Qt5 COMPONENTS Widgets REQUIRED)
elseif(QAPPLICATION_CLASS STREQUAL QGuiApplication)
find_package(Qt5 COMPONENTS Gui REQUIRED)
else()
find_package(Qt5 COMPONENTS Core REQUIRED)
endif()
add_compile_definitions(QAPPLICATION_CLASS=${QAPPLICATION_CLASS})
# Link dependencies
target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Network)
if(QAPPLICATION_CLASS STREQUAL QApplication)
target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets)
elseif(QAPPLICATION_CLASS STREQUAL QGuiApplication)
target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Gui)
else()
target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Core)
endif()
if(WIN32)
target_link_libraries(${PROJECT_NAME} PRIVATE advapi32)
endif()
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

View File

@@ -1,24 +0,0 @@
The MIT License (MIT)
Copyright (c) Itay Grudev 2015 - 2016
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
Note: Some of the examples include code not distributed under the terms of the
MIT License.

View File

@@ -1,277 +0,0 @@
SingleApplication
=================
This is a replacement of the QtSingleApplication for `Qt5`.
Keeps the Primary Instance of your Application and kills each subsequent
instances. It can (if enabled) spawn secondary (non-related to the primary)
instances and can send data to the primary instance from secondary instances.
Usage
-----
The `SingleApplication` class inherits from whatever `Q[Core|Gui]Application`
class you specify via the `QAPPLICATION_CLASS` macro (`QCoreApplication` is the
default). Further usage is similar to the use of the `Q[Core|Gui]Application`
classes.
The library sets up a `QLocalServer` and a `QSharedMemory` block. The first
instance of your Application is your Primary Instance. It would check if the
shared memory block exists and if not it will start a `QLocalServer` and listen
for connections. Each subsequent instance of your application would check if the
shared memory block exists and if it does, it will connect to the QLocalServer
to notify the primary instance that a new instance had been started, after which
it would terminate with status code `0`. In the Primary Instance
`SingleApplication` would emit the `instanceStarted()` signal upon detecting
that a new instance had been started.
The library uses `stdlib` to terminate the program with the `exit()` function.
You can use the library as if you use any other `QCoreApplication` derived
class:
```cpp
#include <QApplication>
#include <SingleApplication.h>
int main( int argc, char* argv[] )
{
SingleApplication app( argc, argv );
return app.exec();
}
```
To include the library files I would recommend that you add it as a git
submodule to your project and include it's contents with a `.pri` file. Here is
how:
```bash
git submodule add git@github.com:itay-grudev/SingleApplication.git singleapplication
```
**Qmake:**
Then include the `singleapplication.pri` file in your `.pro` project file.
```qmake
include(singleapplication/singleapplication.pri)
DEFINES += QAPPLICATION_CLASS=QApplication
```
**CMake:**
Then include the subdirectory in your `CMakeLists.txt` project file.
```cmake
set(QAPPLICATION_CLASS QApplication CACHE STRING "Inheritance class for SingleApplication")
add_subdirectory(src/third-party/singleapplication)
```
Also don't forget to specify which `QCoreApplication` class your app is using if it
is not `QCoreApplication` as in examples above.
The `Instance Started` signal
------------------------
The SingleApplication class implements a `instanceStarted()` signal. You can
bind to that signal to raise your application's window when a new instance had
been started, for example.
```cpp
// window is a QWindow instance
QObject::connect(
&app,
&SingleApplication::instanceStarted,
&window,
&QWindow::raise
);
```
Using `SingleApplication::instance()` is a neat way to get the
`SingleApplication` instance for binding to it's signals anywhere in your
program.
__Note:__ On Windows the ability to bring the application windows to the
foreground is restricted. See [Windows specific implementations](Windows.md)
for a workaround and an example implementation.
Secondary Instances
-------------------
If you want to be able to launch additional Secondary Instances (not related to
your Primary Instance) you have to enable that with the third parameter of the
`SingleApplication` constructor. The default is `false` meaning no Secondary
Instances. Here is an example of how you would start a Secondary Instance send
a message with the command line arguments to the primary instance and then shut
down.
```cpp
int main(int argc, char *argv[])
{
SingleApplication app( argc, argv, true );
if( app.isSecondary() ) {
app.sendMessage( app.arguments().join(' ')).toUtf8() );
app.exit( 0 );
}
return app.exec();
}
```
*__Note:__ A secondary instance won't cause the emission of the
`instanceStarted()` signal by default. See `SingleApplication::Mode` for more
details.*
You can check whether your instance is a primary or secondary with the following
methods:
```cpp
app.isPrimary();
// or
app.isSecondary();
```
*__Note:__ If your Primary Instance is terminated a newly launched instance
will replace the Primary one even if the Secondary flag has been set.*
API
---
### Members
```cpp
SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 100 )
```
Depending on whether `allowSecondary` is set, this constructor may terminate
your app if there is already a primary instance running. Additional `Options`
can be specified to set whether the SingleApplication block should work
user-wide or system-wide. Additionally the `Mode::SecondaryNotification` may be
used to notify the primary instance whenever a secondary instance had been
started (disabled by default). `timeout` specifies the maximum time in
milliseconds to wait for blocking operations.
*__Note:__ `argc` and `argv` may be changed as Qt removes arguments that it
recognizes.*
*__Note:__ `Mode::SecondaryNotification` only works if set on both the primary
and the secondary instance.*
*__Note:__ Operating system can restrict the shared memory blocks to the same
user, in which case the User/System modes will have no effect and the block will
be user wide.*
---
```cpp
bool SingleApplication::sendMessage( QByteArray message, int timeout = 100 )
```
Sends `message` to the Primary Instance. Uses `timeout` as a the maximum timeout
in milliseconds for blocking functions
---
```cpp
bool SingleApplication::isPrimary()
```
Returns if the instance is the primary instance.
---
```cpp
bool SingleApplication::isSecondary()
```
Returns if the instance is a secondary instance.
---
```cpp
quint32 SingleApplication::instanceId()
```
Returns a unique identifier for the current instance.
---
```cpp
qint64 SingleApplication::primaryPid()
```
Returns the process ID (PID) of the primary instance.
### Signals
```cpp
void SingleApplication::instanceStarted()
```
Triggered whenever a new instance had been started, except for secondary
instances if the `Mode::SecondaryNotification` flag is not specified.
---
```cpp
void SingleApplication::receivedMessage( quint32 instanceId, QByteArray message )
```
Triggered whenever there is a message received from a secondary instance.
---
### Flags
```cpp
enum SingleApplication::Mode
```
* `Mode::User` - The SingleApplication block should apply user wide. This adds
user specific data to the key used for the shared memory and server name.
This is the default functionality.
* `Mode::System` The SingleApplication block applies system-wide.
* `Mode::SecondaryNotification` Whether to trigger `instanceStarted()` even
whenever secondary instances are started.
* `Mode::ExcludeAppPath` Excludes the application path from the server name
(and memory block) hash.
* `Mode::ExcludeAppVersion` Excludes the application version from the server
name (and memory block) hash.
*__Note:__ `Mode::SecondaryNotification` only works if set on both the primary
and the secondary instance.*
*__Note:__ Operating system can restrict the shared memory blocks to the same
user, in which case the User/System modes will have no effect and the block will
be user wide.*
---
Versioning
----------
Each major version introduces either very significant changes or is not
backwards compatible with the previous version. Minor versions only add
additional features, bug fixes or performance improvements and are backwards
compatible with the previous release. See [`CHANGELOG.md`](CHANGELOG.md) for
more details.
Implementation
--------------
The library is implemented with a QSharedMemory block which is thread safe and
guarantees a race condition will not occur. It also uses a QLocalSocket to
notify the main process that a new instance had been spawned and thus invoke the
`instanceStarted()` signal and for messaging the primary instance.
Additionally the library can recover from being forcefully killed on *nix
systems and will reset the memory block given that there are no other
instances running.
License
-------
This library and it's supporting documentation are released under
`The MIT License (MIT)` with the exception of the Qt calculator examples which
is distributed under the BSD license.

View File

@@ -1,46 +0,0 @@
Windows Specific Implementations
================================
Setting the foreground window
-----------------------------
In the `instanceStarted()` example in the `README` we demonstrated how an
application can bring it's primary instance window whenever a second copy
of the application is started.
On Windows the ability to bring the application windows to the foreground is
restricted, see [`AllowSetForegroundWindow()`][AllowSetForegroundWindow] for more
details.
The background process (the primary instance) can bring its windows to the
foreground if it is allowed by the current foreground process (the secondary
instance). To bypass this `SingleApplication` must be initialized with the
`allowSecondary` parameter set to `true` and the `options` parameter must
include `Mode::SecondaryNotification`, See `SingleApplication::Mode` for more
details.
Here is an example:
```cpp
if( app.isSecondary() ) {
// This API requires LIBS += User32.lib to be added to the project
AllowSetForegroundWindow( DWORD( app.primaryPid() ) );
}
if( app.isPrimary() ) {
QObject::connect(
&app,
&SingleApplication::instanceStarted,
this,
&App::instanceStarted
);
}
```
```cpp
void App::instanceStarted() {
QApplication::setActiveWindow( [window/widget to set to the foreground] );
}
```
[AllowSetForegroundWindow]: https://msdn.microsoft.com/en-us/library/windows/desktop/ms632668.aspx

View File

@@ -1,5 +0,0 @@
# Single Application implementation
include(../../singleapplication.pri)
DEFINES += QAPPLICATION_CLASS=QCoreApplication
SOURCES += main.cpp

View File

@@ -1,9 +0,0 @@
#include <singleapplication.h>
int main(int argc, char *argv[])
{
// Allow secondary instances
SingleApplication app( argc, argv );
return app.exec();
}

View File

@@ -1,73 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** BSD License Usage
** Alternatively, you may use this file under the terms of the BSD license
** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QtWidgets>
#include "button.h"
//! [0]
Button::Button(const QString &text, QWidget *parent)
: QToolButton(parent)
{
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
setText(text);
}
//! [0]
//! [1]
QSize Button::sizeHint() const
//! [1] //! [2]
{
QSize size = QToolButton::sizeHint();
size.rheight() += 20;
size.rwidth() = qMax(size.width(), size.height());
return size;
}
//! [2]

View File

@@ -1,68 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** BSD License Usage
** Alternatively, you may use this file under the terms of the BSD license
** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef BUTTON_H
#define BUTTON_H
#include <QToolButton>
//! [0]
class Button : public QToolButton
{
Q_OBJECT
public:
explicit Button(const QString &text, QWidget *parent = 0);
QSize sizeHint() const Q_DECL_OVERRIDE;
};
//! [0]
#endif

View File

@@ -1,406 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** BSD License Usage
** Alternatively, you may use this file under the terms of the BSD license
** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QtWidgets>
#include <cmath>
#include "button.h"
#include "calculator.h"
//! [0]
Calculator::Calculator(QWidget *parent)
: QWidget(parent)
{
sumInMemory = 0.0;
sumSoFar = 0.0;
factorSoFar = 0.0;
waitingForOperand = true;
//! [0]
//! [1]
display = new QLineEdit("0");
//! [1] //! [2]
display->setReadOnly(true);
display->setAlignment(Qt::AlignRight);
display->setMaxLength(15);
QFont font = display->font();
font.setPointSize(font.pointSize() + 8);
display->setFont(font);
//! [2]
//! [4]
for (int i = 0; i < NumDigitButtons; ++i) {
digitButtons[i] = createButton(QString::number(i), SLOT(digitClicked()));
}
Button *pointButton = createButton(tr("."), SLOT(pointClicked()));
Button *changeSignButton = createButton(tr("\302\261"), SLOT(changeSignClicked()));
Button *backspaceButton = createButton(tr("Backspace"), SLOT(backspaceClicked()));
Button *clearButton = createButton(tr("Clear"), SLOT(clear()));
Button *clearAllButton = createButton(tr("Clear All"), SLOT(clearAll()));
Button *clearMemoryButton = createButton(tr("MC"), SLOT(clearMemory()));
Button *readMemoryButton = createButton(tr("MR"), SLOT(readMemory()));
Button *setMemoryButton = createButton(tr("MS"), SLOT(setMemory()));
Button *addToMemoryButton = createButton(tr("M+"), SLOT(addToMemory()));
Button *divisionButton = createButton(tr("\303\267"), SLOT(multiplicativeOperatorClicked()));
Button *timesButton = createButton(tr("\303\227"), SLOT(multiplicativeOperatorClicked()));
Button *minusButton = createButton(tr("-"), SLOT(additiveOperatorClicked()));
Button *plusButton = createButton(tr("+"), SLOT(additiveOperatorClicked()));
Button *squareRootButton = createButton(tr("Sqrt"), SLOT(unaryOperatorClicked()));
Button *powerButton = createButton(tr("x\302\262"), SLOT(unaryOperatorClicked()));
Button *reciprocalButton = createButton(tr("1/x"), SLOT(unaryOperatorClicked()));
Button *equalButton = createButton(tr("="), SLOT(equalClicked()));
//! [4]
//! [5]
QGridLayout *mainLayout = new QGridLayout;
//! [5] //! [6]
mainLayout->setSizeConstraint(QLayout::SetFixedSize);
mainLayout->addWidget(display, 0, 0, 1, 6);
mainLayout->addWidget(backspaceButton, 1, 0, 1, 2);
mainLayout->addWidget(clearButton, 1, 2, 1, 2);
mainLayout->addWidget(clearAllButton, 1, 4, 1, 2);
mainLayout->addWidget(clearMemoryButton, 2, 0);
mainLayout->addWidget(readMemoryButton, 3, 0);
mainLayout->addWidget(setMemoryButton, 4, 0);
mainLayout->addWidget(addToMemoryButton, 5, 0);
for (int i = 1; i < NumDigitButtons; ++i) {
int row = ((9 - i) / 3) + 2;
int column = ((i - 1) % 3) + 1;
mainLayout->addWidget(digitButtons[i], row, column);
}
mainLayout->addWidget(digitButtons[0], 5, 1);
mainLayout->addWidget(pointButton, 5, 2);
mainLayout->addWidget(changeSignButton, 5, 3);
mainLayout->addWidget(divisionButton, 2, 4);
mainLayout->addWidget(timesButton, 3, 4);
mainLayout->addWidget(minusButton, 4, 4);
mainLayout->addWidget(plusButton, 5, 4);
mainLayout->addWidget(squareRootButton, 2, 5);
mainLayout->addWidget(powerButton, 3, 5);
mainLayout->addWidget(reciprocalButton, 4, 5);
mainLayout->addWidget(equalButton, 5, 5);
setLayout(mainLayout);
setWindowTitle(tr("Calculator"));
}
//! [6]
//! [7]
void Calculator::digitClicked()
{
Button *clickedButton = qobject_cast<Button *>(sender());
int digitValue = clickedButton->text().toInt();
if (display->text() == "0" && digitValue == 0.0)
return;
if (waitingForOperand) {
display->clear();
waitingForOperand = false;
}
display->setText(display->text() + QString::number(digitValue));
}
//! [7]
//! [8]
void Calculator::unaryOperatorClicked()
//! [8] //! [9]
{
Button *clickedButton = qobject_cast<Button *>(sender());
QString clickedOperator = clickedButton->text();
double operand = display->text().toDouble();
double result = 0.0;
if (clickedOperator == tr("Sqrt")) {
if (operand < 0.0) {
abortOperation();
return;
}
result = std::sqrt(operand);
} else if (clickedOperator == tr("x\302\262")) {
result = std::pow(operand, 2.0);
} else if (clickedOperator == tr("1/x")) {
if (operand == 0.0) {
abortOperation();
return;
}
result = 1.0 / operand;
}
display->setText(QString::number(result));
waitingForOperand = true;
}
//! [9]
//! [10]
void Calculator::additiveOperatorClicked()
//! [10] //! [11]
{
Button *clickedButton = qobject_cast<Button *>(sender());
QString clickedOperator = clickedButton->text();
double operand = display->text().toDouble();
//! [11] //! [12]
if (!pendingMultiplicativeOperator.isEmpty()) {
//! [12] //! [13]
if (!calculate(operand, pendingMultiplicativeOperator)) {
abortOperation();
return;
}
display->setText(QString::number(factorSoFar));
operand = factorSoFar;
factorSoFar = 0.0;
pendingMultiplicativeOperator.clear();
}
//! [13] //! [14]
if (!pendingAdditiveOperator.isEmpty()) {
//! [14] //! [15]
if (!calculate(operand, pendingAdditiveOperator)) {
abortOperation();
return;
}
display->setText(QString::number(sumSoFar));
} else {
sumSoFar = operand;
}
//! [15] //! [16]
pendingAdditiveOperator = clickedOperator;
//! [16] //! [17]
waitingForOperand = true;
}
//! [17]
//! [18]
void Calculator::multiplicativeOperatorClicked()
{
Button *clickedButton = qobject_cast<Button *>(sender());
QString clickedOperator = clickedButton->text();
double operand = display->text().toDouble();
if (!pendingMultiplicativeOperator.isEmpty()) {
if (!calculate(operand, pendingMultiplicativeOperator)) {
abortOperation();
return;
}
display->setText(QString::number(factorSoFar));
} else {
factorSoFar = operand;
}
pendingMultiplicativeOperator = clickedOperator;
waitingForOperand = true;
}
//! [18]
//! [20]
void Calculator::equalClicked()
{
double operand = display->text().toDouble();
if (!pendingMultiplicativeOperator.isEmpty()) {
if (!calculate(operand, pendingMultiplicativeOperator)) {
abortOperation();
return;
}
operand = factorSoFar;
factorSoFar = 0.0;
pendingMultiplicativeOperator.clear();
}
if (!pendingAdditiveOperator.isEmpty()) {
if (!calculate(operand, pendingAdditiveOperator)) {
abortOperation();
return;
}
pendingAdditiveOperator.clear();
} else {
sumSoFar = operand;
}
display->setText(QString::number(sumSoFar));
sumSoFar = 0.0;
waitingForOperand = true;
}
//! [20]
//! [22]
void Calculator::pointClicked()
{
if (waitingForOperand)
display->setText("0");
if (!display->text().contains('.'))
display->setText(display->text() + tr("."));
waitingForOperand = false;
}
//! [22]
//! [24]
void Calculator::changeSignClicked()
{
QString text = display->text();
double value = text.toDouble();
if (value > 0.0) {
text.prepend(tr("-"));
} else if (value < 0.0) {
text.remove(0, 1);
}
display->setText(text);
}
//! [24]
//! [26]
void Calculator::backspaceClicked()
{
if (waitingForOperand)
return;
QString text = display->text();
text.chop(1);
if (text.isEmpty()) {
text = "0";
waitingForOperand = true;
}
display->setText(text);
}
//! [26]
//! [28]
void Calculator::clear()
{
if (waitingForOperand)
return;
display->setText("0");
waitingForOperand = true;
}
//! [28]
//! [30]
void Calculator::clearAll()
{
sumSoFar = 0.0;
factorSoFar = 0.0;
pendingAdditiveOperator.clear();
pendingMultiplicativeOperator.clear();
display->setText("0");
waitingForOperand = true;
}
//! [30]
//! [32]
void Calculator::clearMemory()
{
sumInMemory = 0.0;
}
void Calculator::readMemory()
{
display->setText(QString::number(sumInMemory));
waitingForOperand = true;
}
void Calculator::setMemory()
{
equalClicked();
sumInMemory = display->text().toDouble();
}
void Calculator::addToMemory()
{
equalClicked();
sumInMemory += display->text().toDouble();
}
//! [32]
//! [34]
Button *Calculator::createButton(const QString &text, const char *member)
{
Button *button = new Button(text);
connect(button, SIGNAL(clicked()), this, member);
return button;
}
//! [34]
//! [36]
void Calculator::abortOperation()
{
clearAll();
display->setText(tr("####"));
}
//! [36]
//! [38]
bool Calculator::calculate(double rightOperand, const QString &pendingOperator)
{
if (pendingOperator == tr("+")) {
sumSoFar += rightOperand;
} else if (pendingOperator == tr("-")) {
sumSoFar -= rightOperand;
} else if (pendingOperator == tr("\303\227")) {
factorSoFar *= rightOperand;
} else if (pendingOperator == tr("\303\267")) {
if (rightOperand == 0.0)
return false;
factorSoFar /= rightOperand;
}
return true;
}
//! [38]

View File

@@ -1,117 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** BSD License Usage
** Alternatively, you may use this file under the terms of the BSD license
** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef CALCULATOR_H
#define CALCULATOR_H
#include <QWidget>
QT_BEGIN_NAMESPACE
class QLineEdit;
QT_END_NAMESPACE
class Button;
//! [0]
class Calculator : public QWidget
{
Q_OBJECT
public:
Calculator(QWidget *parent = 0);
private slots:
void digitClicked();
void unaryOperatorClicked();
void additiveOperatorClicked();
void multiplicativeOperatorClicked();
void equalClicked();
void pointClicked();
void changeSignClicked();
void backspaceClicked();
void clear();
void clearAll();
void clearMemory();
void readMemory();
void setMemory();
void addToMemory();
//! [0]
//! [1]
private:
//! [1] //! [2]
Button *createButton(const QString &text, const char *member);
void abortOperation();
bool calculate(double rightOperand, const QString &pendingOperator);
//! [2]
//! [3]
double sumInMemory;
//! [3] //! [4]
double sumSoFar;
//! [4] //! [5]
double factorSoFar;
//! [5] //! [6]
QString pendingAdditiveOperator;
//! [6] //! [7]
QString pendingMultiplicativeOperator;
//! [7] //! [8]
bool waitingForOperand;
//! [8]
//! [9]
QLineEdit *display;
//! [9] //! [10]
enum { NumDigitButtons = 10 };
Button *digitButtons[NumDigitButtons];
};
//! [10]
#endif

View File

@@ -1,11 +0,0 @@
QT += widgets
HEADERS = button.h \
calculator.h
SOURCES = button.cpp \
calculator.cpp \
main.cpp
# Single Application implementation
include(../../singleapplication.pri)
DEFINES += QAPPLICATION_CLASS=QApplication

View File

@@ -1,71 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** BSD License Usage
** Alternatively, you may use this file under the terms of the BSD license
** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QApplication>
#include <singleapplication.h>
#include "calculator.h"
int main(int argc, char *argv[])
{
SingleApplication app(argc, argv);
Calculator calc;
QObject::connect( &app, &SingleApplication::instanceStarted, [ &calc ]() {
calc.raise();
calc.activateWindow();
});
calc.show();
return app.exec();
}

View File

@@ -1,25 +0,0 @@
#include <singleapplication.h>
#include "messagereceiver.h"
int main(int argc, char *argv[])
{
// Allow secondary instances
SingleApplication app( argc, argv, true );
MessageReceiver msgReceiver;
// If this is a secondary instance
if( app.isSecondary() ) {
app.sendMessage( app.arguments().join(' ').toUtf8() );
return 0;
} else {
QObject::connect(
&app,
&SingleApplication::receivedMessage,
&msgReceiver,
&MessageReceiver::receivedMessage
);
}
return app.exec();
}

View File

@@ -1,12 +0,0 @@
#include <QDebug>
#include "messagereceiver.h"
MessageReceiver::MessageReceiver(QObject *parent) : QObject(parent)
{
}
void MessageReceiver::receivedMessage(int instanceId, QByteArray message)
{
qDebug() << "Received message from instance: " << instanceId;
qDebug() << "Message Text: " << message;
}

View File

@@ -1,15 +0,0 @@
#ifndef MESSAGERECEIVER_H
#define MESSAGERECEIVER_H
#include <QObject>
class MessageReceiver : public QObject
{
Q_OBJECT
public:
explicit MessageReceiver(QObject *parent = 0);
public slots:
void receivedMessage( int instanceId, QByteArray message );
};
#endif // MESSAGERECEIVER_H

View File

@@ -1,9 +0,0 @@
# Single Application implementation
include(../../singleapplication.pri)
DEFINES += QAPPLICATION_CLASS=QCoreApplication
SOURCES += main.cpp \
messagereceiver.cpp
HEADERS += \
messagereceiver.h

View File

@@ -1,189 +0,0 @@
// The MIT License (MIT)
//
// Copyright (c) Itay Grudev 2015 - 2018
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include <QtCore/QTime>
#include <QtCore/QThread>
#include <QtCore/QDateTime>
#include <QtCore/QByteArray>
#include <QtCore/QSharedMemory>
#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) // ### Qt 6: remove
#else
#include <QRandomGenerator>
#endif
#include "singleapplication.h"
#include "singleapplication_p.h"
/**
* @brief Constructor. Checks and fires up LocalServer or closes the program
* if another instance already exists
* @param argc
* @param argv
* @param {bool} allowSecondaryInstances
*/
SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary, Options options, int timeout )
: app_t( argc, argv ), d_ptr( new SingleApplicationPrivate( this ) )
{
Q_D(SingleApplication);
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
// On Android and iOS since the library is not supported fallback to
// standard QApplication behaviour by simply returning at this point.
qWarning() << "SingleApplication is not supported on Android and iOS systems.";
return;
#endif
// Store the current mode of the program
d->options = options;
// Generating an application ID used for identifying the shared memory
// block and QLocalServer
d->genBlockServerName();
#ifdef Q_OS_UNIX
// By explicitly attaching it and then deleting it we make sure that the
// memory is deleted even after the process has crashed on Unix.
d->memory = new QSharedMemory( d->blockServerName );
d->memory->attach();
delete d->memory;
#endif
// Guarantee thread safe behaviour with a shared memory block.
d->memory = new QSharedMemory( d->blockServerName );
// Create a shared memory block
if( d->memory->create( sizeof( InstancesInfo ) ) ) {
// Initialize the shared memory block
d->memory->lock();
d->initializeMemoryBlock();
d->memory->unlock();
} else {
// Attempt to attach to the memory segment
if( ! d->memory->attach() ) {
qCritical() << "SingleApplication: Unable to attach to shared memory block.";
qCritical() << d->memory->errorString();
delete d;
::exit( EXIT_FAILURE );
}
}
InstancesInfo* inst = static_cast<InstancesInfo*>( d->memory->data() );
QElapsedTimer time;
time.start();
// Make sure the shared memory block is initialised and in consistent state
while( true ) {
d->memory->lock();
if( d->blockChecksum() == inst->checksum ) break;
if( time.elapsed() > 5000 ) {
qWarning() << "SingleApplication: Shared memory block has been in an inconsistent state from more than 5s. Assuming primary instance failure.";
d->initializeMemoryBlock();
}
d->memory->unlock();
// Random sleep here limits the probability of a collision between two racing apps
#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) // ### Qt 6: remove
qsrand( QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max() );
QThread::sleep( 8 + static_cast <unsigned long>( static_cast <float>( qrand() ) / RAND_MAX * 10 ) );
#else
quint32 value = QRandomGenerator::global()->generate();
QThread::sleep( 8 + static_cast <unsigned long>( static_cast <float>( value ) / RAND_MAX * 10 ) );
#endif
}
if( inst->primary == false) {
d->startPrimary();
d->memory->unlock();
return;
}
// Check if another instance can be started
if( allowSecondary ) {
inst->secondary += 1;
inst->checksum = d->blockChecksum();
d->instanceNumber = inst->secondary;
d->startSecondary();
if( d->options & Mode::SecondaryNotification ) {
d->connectToPrimary( timeout, SingleApplicationPrivate::SecondaryInstance );
}
d->memory->unlock();
return;
}
d->memory->unlock();
d->connectToPrimary( timeout, SingleApplicationPrivate::NewInstance );
delete d;
::exit( EXIT_SUCCESS );
}
/**
* @brief Destructor
*/
SingleApplication::~SingleApplication()
{
Q_D(SingleApplication);
delete d;
}
bool SingleApplication::isPrimary()
{
Q_D(SingleApplication);
return d->server != nullptr;
}
bool SingleApplication::isSecondary()
{
Q_D(SingleApplication);
return d->server == nullptr;
}
quint32 SingleApplication::instanceId()
{
Q_D(SingleApplication);
return d->instanceNumber;
}
qint64 SingleApplication::primaryPid()
{
Q_D(SingleApplication);
return d->primaryPid();
}
bool SingleApplication::sendMessage( QByteArray message, int timeout )
{
Q_D(SingleApplication);
// Nobody to connect to
if( isPrimary() ) return false;
// Make sure the socket is connected
d->connectToPrimary( timeout, SingleApplicationPrivate::Reconnect );
d->socket->write( message );
bool dataWritten = d->socket->waitForBytesWritten( timeout );
d->socket->flush();
return dataWritten;
}

View File

@@ -1,136 +0,0 @@
// The MIT License (MIT)
//
// Copyright (c) Itay Grudev 2015 - 2018
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#ifndef SINGLE_APPLICATION_H
#define SINGLE_APPLICATION_H
#include <QtCore/QtGlobal>
#include <QtNetwork/QLocalSocket>
#include <QElapsedTimer>
#ifndef QAPPLICATION_CLASS
#define QAPPLICATION_CLASS QCoreApplication
#endif
#include QT_STRINGIFY(QAPPLICATION_CLASS)
class SingleApplicationPrivate;
/**
* @brief The SingleApplication class handles multiple instances of the same
* Application
* @see QCoreApplication
*/
class SingleApplication : public QAPPLICATION_CLASS
{
Q_OBJECT
typedef QAPPLICATION_CLASS app_t;
public:
/**
* @brief Mode of operation of SingleApplication.
* Whether the block should be user-wide or system-wide and whether the
* primary instance should be notified when a secondary instance had been
* started.
* @note Operating system can restrict the shared memory blocks to the same
* user, in which case the User/System modes will have no effect and the
* block will be user wide.
* @enum
*/
enum Mode {
User = 1 << 0,
System = 1 << 1,
SecondaryNotification = 1 << 2,
ExcludeAppVersion = 1 << 3,
ExcludeAppPath = 1 << 4
};
Q_DECLARE_FLAGS(Options, Mode)
/**
* @brief Intitializes a SingleApplication instance with argc command line
* arguments in argv
* @arg {int &} argc - Number of arguments in argv
* @arg {const char *[]} argv - Supplied command line arguments
* @arg {bool} allowSecondary - Whether to start the instance as secondary
* if there is already a primary instance.
* @arg {Mode} mode - Whether for the SingleApplication block to be applied
* User wide or System wide.
* @arg {int} timeout - Timeout to wait in milliseconds.
* @note argc and argv may be changed as Qt removes arguments that it
* recognizes
* @note Mode::SecondaryNotification only works if set on both the primary
* instance and the secondary instance.
* @note The timeout is just a hint for the maximum time of blocking
* operations. It does not guarantee that the SingleApplication
* initialisation will be completed in given time, though is a good hint.
* Usually 4*timeout would be the worst case (fail) scenario.
* @see See the corresponding QAPPLICATION_CLASS constructor for reference
*/
explicit SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000 );
~SingleApplication();
/**
* @brief Returns if the instance is the primary instance
* @returns {bool}
*/
bool isPrimary();
/**
* @brief Returns if the instance is a secondary instance
* @returns {bool}
*/
bool isSecondary();
/**
* @brief Returns a unique identifier for the current instance
* @returns {qint32}
*/
quint32 instanceId();
/**
* @brief Returns the process ID (PID) of the primary instance
* @returns {qint64}
*/
qint64 primaryPid();
/**
* @brief Sends a message to the primary instance. Returns true on success.
* @param {int} timeout - Timeout for connecting
* @returns {bool}
* @note sendMessage() will return false if invoked from the primary
* instance.
*/
bool sendMessage( QByteArray message, int timeout = 100 );
Q_SIGNALS:
void instanceStarted();
void receivedMessage( quint32 instanceId, QByteArray message );
private:
SingleApplicationPrivate *d_ptr;
Q_DECLARE_PRIVATE(SingleApplication)
};
Q_DECLARE_OPERATORS_FOR_FLAGS(SingleApplication::Options)
#endif // SINGLE_APPLICATION_H

View File

@@ -1,19 +0,0 @@
QT += core network
CONFIG += c++11
HEADERS += $$PWD/singleapplication.h \
$$PWD/singleapplication_p.h
SOURCES += $$PWD/singleapplication.cpp \
$$PWD/singleapplication_p.cpp
INCLUDEPATH += $$PWD
win32 {
msvc:LIBS += Advapi32.lib
gcc:LIBS += -ladvapi32
}
DISTFILES += \
$$PWD/README.md \
$$PWD/CHANGELOG.md \
$$PWD/Windows.md

View File

@@ -1,405 +0,0 @@
// The MIT License (MIT)
//
// Copyright (c) Itay Grudev 2015 - 2018
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
//
// W A R N I N G !!!
// -----------------
//
// This file is not part of the SingleApplication API. It is used purely as an
// implementation detail. This header file may change from version to
// version without notice, or may even be removed.
//
#include <cstdlib>
#include <cstddef>
#include <QtCore/QDir>
#include <QtCore/QByteArray>
#include <QtCore/QDataStream>
#include <QtCore/QCryptographicHash>
#include <QtNetwork/QLocalServer>
#include <QtNetwork/QLocalSocket>
#include "singleapplication.h"
#include "singleapplication_p.h"
#ifdef Q_OS_UNIX
#include <unistd.h>
#include <sys/types.h>
#include <pwd.h>
#endif
#ifdef Q_OS_WIN
#include <windows.h>
#include <lmcons.h>
#endif
SingleApplicationPrivate::SingleApplicationPrivate( SingleApplication *q_ptr )
: q_ptr( q_ptr )
{
server = nullptr;
socket = nullptr;
memory = nullptr;
instanceNumber = -1;
}
SingleApplicationPrivate::~SingleApplicationPrivate()
{
if( socket != nullptr ) {
socket->close();
delete socket;
}
memory->lock();
InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
if( server != nullptr ) {
server->close();
delete server;
inst->primary = false;
inst->primaryPid = -1;
inst->checksum = blockChecksum();
}
memory->unlock();
delete memory;
}
void SingleApplicationPrivate::genBlockServerName()
{
QCryptographicHash appData( QCryptographicHash::Sha256 );
appData.addData( "SingleApplication", 17 );
appData.addData( SingleApplication::app_t::applicationName().toUtf8() );
appData.addData( SingleApplication::app_t::organizationName().toUtf8() );
appData.addData( SingleApplication::app_t::organizationDomain().toUtf8() );
if( ! (options & SingleApplication::Mode::ExcludeAppVersion) ) {
appData.addData( SingleApplication::app_t::applicationVersion().toUtf8() );
}
if( ! (options & SingleApplication::Mode::ExcludeAppPath) ) {
#ifdef Q_OS_WIN
appData.addData( SingleApplication::app_t::applicationFilePath().toLower().toUtf8() );
#else
appData.addData( SingleApplication::app_t::applicationFilePath().toUtf8() );
#endif
}
// User level block requires a user specific data in the hash
if( options & SingleApplication::Mode::User ) {
#ifdef Q_OS_WIN
wchar_t username [ UNLEN + 1 ];
// Specifies size of the buffer on input
DWORD usernameLength = UNLEN + 1;
if( GetUserNameW( username, &usernameLength ) ) {
appData.addData( QString::fromWCharArray(username).toUtf8() );
} else {
appData.addData( qgetenv("USERNAME") );
}
#endif
#ifdef Q_OS_UNIX
QByteArray username;
uid_t uid = geteuid();
struct passwd *pw = getpwuid(uid);
if( pw ) {
username = pw->pw_name;
}
if( username.isEmpty() ) {
username = qgetenv("USER");
}
appData.addData(username);
#endif
}
// Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with
// server naming requirements.
blockServerName = appData.result().toBase64().replace("/", "_");
}
void SingleApplicationPrivate::initializeMemoryBlock()
{
InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
inst->primary = false;
inst->secondary = 0;
inst->primaryPid = -1;
inst->checksum = blockChecksum();
}
void SingleApplicationPrivate::startPrimary()
{
Q_Q(SingleApplication);
// Successful creation means that no main process exists
// So we start a QLocalServer to listen for connections
QLocalServer::removeServer( blockServerName );
server = new QLocalServer();
// Restrict access to the socket according to the
// SingleApplication::Mode::User flag on User level or no restrictions
if( options & SingleApplication::Mode::User ) {
server->setSocketOptions( QLocalServer::UserAccessOption );
} else {
server->setSocketOptions( QLocalServer::WorldAccessOption );
}
server->listen( blockServerName );
QObject::connect(
server,
&QLocalServer::newConnection,
this,
&SingleApplicationPrivate::slotConnectionEstablished
);
// Reset the number of connections
InstancesInfo* inst = static_cast <InstancesInfo*>( memory->data() );
inst->primary = true;
inst->primaryPid = q->applicationPid();
inst->checksum = blockChecksum();
instanceNumber = 0;
}
void SingleApplicationPrivate::startSecondary()
{
}
void SingleApplicationPrivate::connectToPrimary( int msecs, ConnectionType connectionType )
{
// Connect to the Local Server of the Primary Instance if not already
// connected.
if( socket == nullptr ) {
socket = new QLocalSocket();
}
// If already connected - we are done;
if( socket->state() == QLocalSocket::ConnectedState )
return;
// If not connect
if( socket->state() == QLocalSocket::UnconnectedState ||
socket->state() == QLocalSocket::ClosingState ) {
socket->connectToServer( blockServerName );
}
// Wait for being connected
if( socket->state() == QLocalSocket::ConnectingState ) {
socket->waitForConnected( msecs );
}
// Initialisation message according to the SingleApplication protocol
if( socket->state() == QLocalSocket::ConnectedState ) {
// Notify the parent that a new instance had been started;
QByteArray initMsg;
QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
writeStream.setVersion(QDataStream::Qt_5_6);
#endif
writeStream << blockServerName.toLatin1();
writeStream << static_cast<quint8>(connectionType);
writeStream << instanceNumber;
quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
writeStream << checksum;
// The header indicates the message length that follows
QByteArray header;
QDataStream headerStream(&header, QIODevice::WriteOnly);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
headerStream.setVersion(QDataStream::Qt_5_6);
#endif
headerStream << static_cast <quint64>( initMsg.length() );
socket->write( header );
socket->write( initMsg );
socket->flush();
socket->waitForBytesWritten( msecs );
}
}
quint16 SingleApplicationPrivate::blockChecksum()
{
return qChecksum(
static_cast <const char *>( memory->data() ),
offsetof( InstancesInfo, checksum )
);
}
qint64 SingleApplicationPrivate::primaryPid()
{
qint64 pid;
memory->lock();
InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
pid = inst->primaryPid;
memory->unlock();
return pid;
}
/**
* @brief Executed when a connection has been made to the LocalServer
*/
void SingleApplicationPrivate::slotConnectionEstablished()
{
QLocalSocket *nextConnSocket = server->nextPendingConnection();
connectionMap.insert(nextConnSocket, ConnectionInfo());
QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose,
[nextConnSocket, this]() {
auto &info = connectionMap[nextConnSocket];
Q_EMIT this->slotClientConnectionClosed( nextConnSocket, info.instanceId );
}
);
QObject::connect(nextConnSocket, &QLocalSocket::disconnected,
[nextConnSocket, this](){
connectionMap.remove(nextConnSocket);
nextConnSocket->deleteLater();
}
);
QObject::connect(nextConnSocket, &QLocalSocket::readyRead,
[nextConnSocket, this]() {
auto &info = connectionMap[nextConnSocket];
switch(info.stage) {
case StageHeader:
readInitMessageHeader(nextConnSocket);
break;
case StageBody:
readInitMessageBody(nextConnSocket);
break;
case StageConnected:
Q_EMIT this->slotDataAvailable( nextConnSocket, info.instanceId );
break;
default:
break;
};
}
);
}
void SingleApplicationPrivate::readInitMessageHeader( QLocalSocket *sock )
{
if (!connectionMap.contains( sock )) {
return;
}
if( sock->bytesAvailable() < ( qint64 )sizeof( quint64 ) ) {
return;
}
QDataStream headerStream( sock );
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
headerStream.setVersion( QDataStream::Qt_5_6 );
#endif
// Read the header to know the message length
quint64 msgLen = 0;
headerStream >> msgLen;
ConnectionInfo &info = connectionMap[sock];
info.stage = StageBody;
info.msgLen = msgLen;
if ( sock->bytesAvailable() >= (qint64) msgLen ) {
readInitMessageBody( sock );
}
}
void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
{
Q_Q(SingleApplication);
if (!connectionMap.contains( sock )) {
return;
}
ConnectionInfo &info = connectionMap[sock];
if( sock->bytesAvailable() < ( qint64 )info.msgLen ) {
return;
}
// Read the message body
QByteArray msgBytes = sock->read(info.msgLen);
QDataStream readStream(msgBytes);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
readStream.setVersion( QDataStream::Qt_5_6 );
#endif
// server name
QByteArray latin1Name;
readStream >> latin1Name;
// connection type
ConnectionType connectionType = InvalidConnection;
quint8 connTypeVal = InvalidConnection;
readStream >> connTypeVal;
connectionType = static_cast <ConnectionType>( connTypeVal );
// instance id
quint32 instanceId = 0;
readStream >> instanceId;
// checksum
quint16 msgChecksum = 0;
readStream >> msgChecksum;
const quint16 actualChecksum = qChecksum( msgBytes.constData(), static_cast<quint32>( msgBytes.length() - sizeof( quint16 ) ) );
bool isValid = readStream.status() == QDataStream::Ok &&
QLatin1String(latin1Name) == blockServerName &&
msgChecksum == actualChecksum;
if( !isValid ) {
sock->close();
return;
}
info.instanceId = instanceId;
info.stage = StageConnected;
if( connectionType == NewInstance ||
( connectionType == SecondaryInstance &&
options & SingleApplication::Mode::SecondaryNotification ) )
{
Q_EMIT q->instanceStarted();
}
if (sock->bytesAvailable() > 0) {
Q_EMIT this->slotDataAvailable( sock, instanceId );
}
}
void SingleApplicationPrivate::slotDataAvailable( QLocalSocket *dataSocket, quint32 instanceId )
{
Q_Q(SingleApplication);
Q_EMIT q->receivedMessage( instanceId, dataSocket->readAll() );
}
void SingleApplicationPrivate::slotClientConnectionClosed( QLocalSocket *closedSocket, quint32 instanceId )
{
if( closedSocket->bytesAvailable() > 0 )
Q_EMIT slotDataAvailable( closedSocket, instanceId );
}

View File

@@ -1,99 +0,0 @@
// The MIT License (MIT)
//
// Copyright (c) Itay Grudev 2015 - 2016
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
//
// W A R N I N G !!!
// -----------------
//
// This file is not part of the SingleApplication API. It is used purely as an
// implementation detail. This header file may change from version to
// version without notice, or may even be removed.
//
#ifndef SINGLEAPPLICATION_P_H
#define SINGLEAPPLICATION_P_H
#include <QtCore/QSharedMemory>
#include <QtNetwork/QLocalServer>
#include <QtNetwork/QLocalSocket>
#include "singleapplication.h"
struct InstancesInfo {
bool primary;
quint32 secondary;
qint64 primaryPid;
quint16 checksum;
};
struct ConnectionInfo {
explicit ConnectionInfo() :
msgLen(0), instanceId(0), stage(0) {}
qint64 msgLen;
quint32 instanceId;
quint8 stage;
};
class SingleApplicationPrivate : public QObject {
Q_OBJECT
public:
enum ConnectionType : quint8 {
InvalidConnection = 0,
NewInstance = 1,
SecondaryInstance = 2,
Reconnect = 3
};
enum ConnectionStage : quint8 {
StageHeader = 0,
StageBody = 1,
StageConnected = 2,
};
Q_DECLARE_PUBLIC(SingleApplication)
SingleApplicationPrivate( SingleApplication *q_ptr );
~SingleApplicationPrivate();
void genBlockServerName();
void initializeMemoryBlock();
void startPrimary();
void startSecondary();
void connectToPrimary(int msecs, ConnectionType connectionType );
quint16 blockChecksum();
qint64 primaryPid();
void readInitMessageHeader(QLocalSocket *socket);
void readInitMessageBody(QLocalSocket *socket);
SingleApplication *q_ptr;
QSharedMemory *memory;
QLocalSocket *socket;
QLocalServer *server;
quint32 instanceNumber;
QString blockServerName;
SingleApplication::Options options;
QMap<QLocalSocket*, ConnectionInfo> connectionMap;
public Q_SLOTS:
void slotConnectionEstablished();
void slotDataAvailable( QLocalSocket*, quint32 );
void slotClientConnectionClosed( QLocalSocket*, quint32 );
};
#endif // SINGLEAPPLICATION_P_H

View File

@@ -1,26 +1,73 @@
{
"id": "org.qelectrotech.QElectroTech",
"base-version": "5.15-23.08",
"runtime": "org.kde.Platform",
"runtime-version": "5.14",
"runtime-version": "5.15-23.08",
"sdk": "org.kde.Sdk",
"command": "qelectrotech",
"rename-desktop-file": "qelectrotech.desktop",
"rename-desktop-file": "org.qelectrotech.qelectrotech.desktop",
"rename-appdata-file": "qelectrotech.appdata.xml",
"rename-icon": "qelectrotech",
"copy-icon": true,
"finish-args": [
"--socket=wayland",
"--socket=x11",
"--socket=fallback-x11",
"--device=dri",
"--share=ipc",
"--share=network",
"--socket=cups",
"--filesystem=host"
],
"modules": [
{
"name": "tkinter",
"buildsystem": "simple",
"build-commands": [
"pip3 install --prefix=${FLATPAK_DEST} ."
],
"sources": [
{
"type": "git",
"url": "https://github.com/iwalton3/tkinter-standalone",
"commit": "23c793bad2429f4a81eee9f50e2d07ae845b7785"
}
],
"modules": [
{
"name": "tcl",
"sources": [
{
"type": "archive",
"url": "https://sourceforge.net/projects/tcl/files/Tcl/8.6.11/tcl8.6.11-src.tar.gz",
"sha256": "8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258"
}
],
"subdir": "unix",
"post-install": [
"chmod +w ${FLATPAK_DEST}/lib/libtcl8.6.so"
]
},
{
"name": "tk",
"sources": [
{
"type": "archive",
"url": "https://sourceforge.net/projects/tcl/files/Tcl/8.6.11/tk8.6.11-src.tar.gz",
"sha256": "5228a8187a7f70fa0791ef0f975270f068ba9557f57456f51eb02d9d4ea31282"
}
],
"subdir": "unix",
"post-install": [
"chmod +w ${FLATPAK_DEST}/lib/libtk8.6.so"
]
}
]
},
{
"name": "qelectrotech",
"buildsystem": "qmake",
"post-install": [
"mv /app/share/mime/packages/qelectrotech.xml /app/share/mime/packages/org.qelectrotech.QElectroTech.xml"
"mv ${FLATPAK_DEST}/share/mime/packages/qelectrotech.xml ${FLATPAK_DEST}/share/mime/packages/org.qelectrotech.QElectroTech.xml"
],
"sources": [
{
@@ -32,6 +79,34 @@
"path": "patches/0001-build-Fix-the-installation-paths.patch"
}
]
}
},
{
"name": "python3-PySimpleGUI",
"buildsystem": "simple",
"build-commands": [
"pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} PySimpleGUI"
],
"sources": [
{
"type": "file",
"url": "https://files.pythonhosted.org/packages/d0/c3/c1ce811a1e48d5e0f2df0b393ff189fae4842ec840bb6e4db79c8da55e74/PySimpleGUI-4.41.2.tar.gz",
"sha256": "cf42d9f61f28c8e790a9c031ce900a9cee5fd2f950da2f055ed36bbc487dcf11"
}
]
},
{
"name": "python3-qet-tb-generator",
"buildsystem": "simple",
"build-commands": [
"pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} qet-tb-generator"
],
"sources": [
{
"type": "file",
"url": "https://files.pythonhosted.org/packages/70/aa/ebde0dddfbde799a4e8cf0564e52f95089105a7f562739ee1d16ff5a495a/qet_tb_generator-1.3.1.tar.gz",
"sha256": "52c9836387d54bc30ea29272068ec156fc65c3905e0cb863afd9418abc3c0907"
}
]
}
]
}

View File

@@ -1,44 +1,40 @@
From 579ee22f1d2bef560ec90d324a0e476b81faf495 Mon Sep 17 00:00:00 2001
From: Mathieu Bridon <mathieu@hashbang.fr>
Date: Tue, 7 Jan 2020 14:39:08 +0100
From 14f0685ddcf3a7d64bb85a3e9a9ac97c369bb508 Mon Sep 17 00:00:00 2001
From: Laurent Trinques <scorpio@qelectrotech.org>
Date: Sat, 26 Sep 2020 22:52:52 +0200
Subject: [PATCH] build: Fix the installation paths
---
qelectrotech.pro | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
qelectrotech.pro | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/qelectrotech.pro b/qelectrotech.pro
index 07e51fb..2a86b91 100644
index 7baddbb08..5dcda04b6 100644
--- a/qelectrotech.pro
+++ b/qelectrotech.pro
@@ -5,20 +5,20 @@
@@ -5,18 +5,18 @@
# Chemins utilises pour la compilation et l'installation de QET
unix {
# Chemins UNIX
- COMPIL_PREFIX = '/usr/local/'
- INSTALL_PREFIX = '/usr/local/'
+ COMPIL_PREFIX = '/app/'
+ INSTALL_PREFIX = '/app/'
QET_BINARY_PATH = 'bin/'
QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/'
QET_COMMON_TBT_PATH = 'share/qelectrotech/titleblocks/'
QET_LANG_PATH = 'share/qelectrotech/lang/'
QET_EXAMPLES_PATH = 'share/qelectrotech/examples/'
- QET_LICENSE_PATH = 'doc/qelectrotech/'
- QET_MIME_XML_PATH = '../share/mime/application/'
- QET_MIME_DESKTOP_PATH = '../share/mimelnk/application/'
- QET_MIME_PACKAGE_PATH = '../share/mime/packages/'
+ QET_LICENSE_PATH = 'share/doc/qelectrotech/'
+ QET_MIME_XML_PATH = 'share/mime/application/'
+ QET_MIME_DESKTOP_PATH = 'share/mimelnk/application/'
+ QET_MIME_PACKAGE_PATH = 'share/mime/packages/'
QET_DESKTOP_PATH = 'share/applications/'
QET_ICONS_PATH = 'share/icons/hicolor/'
- QET_MAN_PATH = 'man/'
+ QET_MAN_PATH = 'share/man/'
QET_APPDATA_PATH = 'share/appdata'
# Chemins UNIX
- COMPIL_PREFIX = '/usr/local/'
- INSTALL_PREFIX = '/usr/local/'
+ COMPIL_PREFIX = '/app/'
+ INSTALL_PREFIX = '/app/'
QET_BINARY_PATH = 'bin/'
QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/'
QET_COMMON_TBT_PATH = 'share/qelectrotech/titleblocks/'
QET_LANG_PATH = 'share/qelectrotech/lang/'
QET_EXAMPLES_PATH = 'share/qelectrotech/examples/'
- QET_LICENSE_PATH = 'doc/qelectrotech/'
- QET_MIME_PACKAGE_PATH = '../share/mime/packages/'
+ QET_LICENSE_PATH = 'share/doc/qelectrotech/'
+ QET_MIME_PACKAGE_PATH = 'share/mime/packages/'
QET_DESKTOP_PATH = 'share/applications/'
QET_ICONS_PATH = 'share/icons/hicolor/'
- QET_MAN_PATH = 'man/'
+ QET_MAN_PATH = 'share/man/'
QET_APPDATA_PATH = 'share/appdata'
}
win32 {
--
2.24.1
2.35.1

View File

@@ -36,3 +36,6 @@ Elementen collectie voor QElectroTech.
[da]
Symbol samling for QElectroTech.
[ja]
QElectroTech の要素コレクション。

20
build-aux/snap/local/launchers/qelectrotech-launch Executable file → Normal file
View File

@@ -1,15 +1,5 @@
#!/bin/sh
# a KDE session forces the KDE Plasma platformtheme which is incompatible with QET
# unset the ENV vars in that case to prevent loading of the theme
if [ ! -z "$KDE_FULL_SESSION" ]; then
unset KDE_FULL_SESSION
fi
if echo "$XDG_CURRENT_DESKTOP" | grep -q KDE; then
unset XDG_CURRENT_DESKTOP
fi
# migrate .qet directory from SNAP_USER_DATA to SNAP_USER_COMMON
from="$SNAP_USER_DATA/.qet"
to="$SNAP_USER_COMMON/.qet"
@@ -19,16 +9,6 @@ if [ ! -d "$to" ] && [ -d "$from" ]; then
cp -av "$from/." "$to"
fi
# link DXFtoQET so that QET finds it
mkdir -p "$HOME/.qet"
ln -snf "$SNAP/bin/DXFtoQET" "$HOME/.qet/DXFtoQET"
# start desktop portal. Open & save dialogs might fail if it is not running
dbus-send --print-reply \
--dest=org.freedesktop.DBus \
/org/freedesktop/DBus \
org.freedesktop.DBus.StartServiceByName \
string:org.freedesktop.portal.Desktop \
uint32:0
exec "${@}"

View File

@@ -1,6 +1,6 @@
name: qelectrotech
title: QElectroTech
base: core18
base: core22
adopt-info: qelectrotech
license: GPL-2.0
summary: Electrical diagram editor
@@ -10,45 +10,39 @@ description: |
grade: stable
confinement: strict
compression: lzo
architectures:
- build-on: amd64
run-on: amd64
build-for: amd64
- build-on: arm64
build-for: arm64
layout:
/usr/local/share/qelectrotech:
symlink: $SNAP/usr/local/share/qelectrotech
/usr/share/libdrm/amdgpu.ids:
symlink: $SNAP/kf5/usr/share/libdrm/amdgpu.ids
apps:
qelectrotech:
command: usr/local/bin/qelectrotech
command-chain:
- bin/qelectrotech-launch
desktop: usr/local/share/applications/qelectrotech.desktop
extensions: [kde-neon]
plugs: &plugs [opengl, unity7, home, removable-media, gsettings, network, cups-control]
common-id: qelectrotech.desktop
extensions:
- kde-neon
plugs: &plugs [opengl, unity7, home, removable-media, gsettings, network, cups-control, wayland, x11]
environment: &env
__EGL_VENDOR_LIBRARY_DIRS: $SNAP/kf5/usr/share/glvnd/egl_vendor.d:$SNAP/usr/share/glvnd/egl_vendor.d
TCL_LIBRARY: $SNAP/usr/share/tcltk/tcl8.6
QT_QPA_PLATFORMTHEME: gtk3
QT_AUTO_SCREEN_SCALE_FACTOR: 1
HOME: $SNAP_USER_COMMON
PYTHONPATH: $SNAP:$SNAP/lib/python3.6/site-packages:$SNAP/usr/lib/python3.6:$SNAP/usr/lib/python3.6/lib-dynload
PYTHONPATH: $SNAP:$SNAP/lib/python3.10/site-packages:$SNAP/usr/lib/python3.10:$SNAP/usr/lib/python3.10/lib-dynload
qet-tb-generator:
command: bin/qelectrotech-launch $SNAP/bin/qet_tb_generator
extensions: [kde-neon]
command: bin/qet_tb_generator
extensions:
- kde-neon
plugs: *plugs
environment: *env
dxf-to-qet:
command: bin/DXFtoQET
extensions: [kde-neon]
plugs: *plugs
environment: *env
parts:
launchers:
plugin: dump
@@ -58,8 +52,8 @@ parts:
qet-tb-generator:
plugin: python
python-version: python3
source: https://github.com/qelectrotech/qet_tb_generator.git
source: https://github.com/raulroda/qet_tb_generator-plugin.git
python-packages: [PySimpleGUI]
stage-packages:
- python3-lxml
- python3-tk
@@ -68,55 +62,50 @@ parts:
kde-sdk-setup:
plugin: nil
build-snaps:
- kde-frameworks-5-core18-sdk
- kf5-5-110-qt-5-15-11-core22-sdk
build-packages:
- g++
- mesa-common-dev
- libglvnd-dev
- rsync
override-build: |
rsync -a --ignore-existing /snap/kde-frameworks-5-core18-sdk/current/ /
dxf-to-qet:
after: [kde-sdk-setup]
plugin: nil
source: https://github.com/qelectrotech/DXFtoQET-2020.git
override-build: |
qmake "$SNAPCRAFT_PART_SRC/DXFtoQET.pro"
make -j$(nproc)
mkdir -p "$SNAPCRAFT_PART_INSTALL/bin"
cp DXFtoQET "$SNAPCRAFT_PART_INSTALL/bin/"
rsync -a --ignore-existing /snap/kf5-5-110-qt-5-15-11-core22-sdk/current/ /
qelectrotech:
after: [kde-sdk-setup]
plugin: nil
source: .
stage-packages: [ git, sqlite3, xdg-user-dirs ]
build-packages:
- git
override-pull: |
snapcraftctl pull
snap_version=$(git describe --dirty)
modified_displayed_version=$snap_version".snap"
sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h
snapcraftctl set-version "$snap_version"
- libsqlite3-dev
override-build: |
qmake "$SNAPCRAFT_PART_SRC/qelectrotech.pro"
make -j$(nproc)
make install INSTALL_ROOT="$SNAPCRAFT_PART_INSTALL"
displayed_version=$(cat sources/qetversion.cpp | grep "return QVersionNumber{"| head -n 1| awk -F "{" '{ print $2 }' | awk -F "}" '{ print $1 }' | sed -e 's/,/./g' -e 's/ //g')
snap_version="${displayed_version}-g$(git rev-parse --short=8 HEAD)"
modified_displayed_version="${snap_version}.snap"
sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h
craftctl set version="$snap_version"
qmake "$CRAFT_PART_SRC/qelectrotech.pro"
make -j${CRAFT_PARALLEL_BUILD_COUNT}
make install INSTALL_ROOT="$CRAFT_PART_INSTALL"
override-stage: |
snapcraftctl stage
craftctl default
# patch desktop file with correct icon path
SED_CMD="sed -i -E s|^Icon=(.*)|Icon=\${SNAP}/usr/local/share/icons/hicolor/128x128/apps/\1.png|g"
$SED_CMD usr/local/share/applications/qelectrotech.desktop
$SED_CMD usr/local/share/applications/org.qelectrotech.qelectrotech.desktop
cleanup:
after: [qelectrotech, dxf-to-qet, qet-tb-generator]
after: [qelectrotech, qet-tb-generator]
plugin: nil
build-snaps: [core18, kde-frameworks-5-core18]
build-snaps: [kf5-5-110-qt-5-15-11-core22]
override-prime: |
# Remove all files from snap that are already included in the base snap or in
# any connected content snaps
set -eux
for snap in "core18" "kde-frameworks-5-core18"; do # List all content-snaps and base snaps you're using here
cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
for snap in "kf5-5-110-qt-5-15-11-core22"; do # List all content-snaps you're using here
cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$CRAFT_PRIME/{}" "$CRAFT_PRIME/usr/{}" \;
done
for cruft in bug lintian man; do
rm -rf $CRAFT_PRIME/usr/share/$cruft
done
find $CRAFT_PRIME/usr/share/doc/ -type f -not -name 'copyright' -delete
find $CRAFT_PRIME/usr/share -type d -empty -delete

7
build-aux/windows/Lancer QET.bat Normal file → Executable file
View File

@@ -5,7 +5,10 @@ set current_dir=%~dp0
cd /d %current_dir%
rem lance QElectroTech
rem Sans option --config-dir, la configuration de QElectroTech ainsi que la
rem collection d'elements perso seront dans "%APPDATA%\qet"
rem Sans option --config-dir, la configuration de QElectroTech seront dans
rem "C:/Users/<USER>/AppData/Local/QElectroTech/QElectroTech"
rem Sans l'option --data-dir, les données utilisateur (elements, titleblocks,
rem log, ...) de QElectroTech sont stockées dans
rem "C:/Users/<USER>/AppData/Roaming/QElectroTech/QElectroTech"
set command=bin\qelectrotech.exe --common-elements-dir=elements/ --common-tbt-dir=titleblocks/ --lang-dir=lang/ -style windowsvista %*
@start %command%

View File

@@ -1,391 +0,0 @@
; this file is part of installer for QElectroTech
; Copyright (C)2015 QElectroTech Team <scorpio@qelectrotech.org>
;
; This program is free software; you can redistribute it and/or
; modify it under the terms of the GNU General Public License
; as published by the Free Software Foundation; either
; version 2 of the License, or (at your option) any later version.
;
; This program is distributed in the hope that it will be useful,
; but WITHOUT ANY WARRANTY; without even the implied warranty of
; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
; GNU General Public License for more details.
;
; You should have received a copy of the GNU General Public License
; along with this program; if not, write to the Free Software
; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
; WebSite : http://qelectrotech.org/
;--------------------------------
;Include Modern UI
!include "MUI2.nsh"
!include "FileFunc.nsh"
!insertmacro Locate
!include FileFunc.nsh
!insertmacro GetParameters
!insertmacro GetOptions
; MUI Settings
;--------------------------------
;General
; General Product Description Definitions
!define SOFT_NAME "QElectroTech"
!define SOFT_VERSION "0.5-dev+4113"
!define SOFT_WEB_SITE "http://qelectrotech.org/"
!define SOFT_BUILD "1"
SetCompressor /final /solid lzma
CRCCheck force
XPStyle on
BrandingText "${SOFT_NAME}-${SOFT_VERSION}-${SOFT_BUILD}" ; Shows in the Bottom Left of the installer
;Name and file
Name "${SOFT_NAME} ${SOFT_VERSION}"
OutFile "Installer_${SOFT_NAME}-${SOFT_VERSION}-${SOFT_BUILD}.exe"
;Default installation folder
InstallDir "$PROGRAMFILES\${SOFT_NAME}"
;Get installation folder from registry if available
InstallDirRegKey HKCU "Software\${SOFT_NAME}" ""
;Request application privileges for Windows Vista
; we request for admin because we write stuff into the registry
RequestExecutionLevel admin
;--------------------------------
;Interface Settings
!define MUI_ABORTWARNING
!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\XPUI-install.ico"
!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\XPUI-uninstall.ico"
!define MUI_WELCOMEFINISHPAGE_BITMAP ".\images\wizard.bmp"
!define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
!define MUI_HEADERIMAGE
!define MUI_HEADERIMAGE_BITMAP ".\images\header.bmp" ; optional
;--------------------------------
;Language Selection Dialog Settings
;Remember the installer language
!define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
!define MUI_LANGDLL_REGISTRY_KEY "Software\${SOFT_NAME}"
!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
;--------------------------------
;Pages
!define MUI_COMPONENTSPAGE_SMALLDESC
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE "files\LICENSE"
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
; Finish page and checkbox to run QElectroTech
!define MUI_FINISHPAGE_RUN "$INSTDIR\Lancer QET.bat"
!define MUI_FINISHPAGE_RUN_NOTCHECKED
!define MUI_FINISHPAGE_RUN_TEXT "$(Check)"
!insertmacro MUI_PAGE_FINISH
;--------------------------------
;Languages
;Since NSIS 2.26, the language selection dialog of Modern UI hides languages unsupported by the user's selected codepage by default.
;To revert to the old behavior and display all languages, no matter what the user will see when they're selected, use MUI_LANGDLL_ALLLANGUAGES.
!define MUI_LANGDLL_ALLLANGUAGES
; For consistency, we limit the installer to languages supported by QElectroTech itself
!insertmacro MUI_LANGUAGE "English" ;first language is the default language
!insertmacro MUI_LANGUAGE "French"
!insertmacro MUI_LANGUAGE "Spanish"
!insertmacro MUI_LANGUAGE "Russian"
!insertmacro MUI_LANGUAGE "Portuguese"
!insertmacro MUI_LANGUAGE "Czech"
!insertmacro MUI_LANGUAGE "Polish"
!insertmacro MUI_LANGUAGE "Greek"
!insertmacro MUI_LANGUAGE "Arabic"
!insertmacro MUI_LANGUAGE "German"
!insertmacro MUI_LANGUAGE "Italian"
!insertmacro MUI_LANGUAGE "Romanian"
!insertmacro MUI_LANGUAGE "Catalan"
!insertmacro MUI_LANGUAGE "Croatian"
!insertmacro MUI_LANGUAGE "Dutch"
!insertmacro MUI_LANGUAGE "Dutch_Belgium"
!insertmacro MUI_LANGUAGE "Danish"
!insertmacro MUI_RESERVEFILE_LANGDLL
!include lang_extra.nsh
!include lang_extra_fr.nsh
SetOverwrite on
Section "Main Program"
SectionIn RO ; Read only, always installed
Setoutpath "$INSTDIR\bin\"
File "./files/bin/${SOFT_NAME}.exe"
Setoutpath "$INSTDIR"
File "./files/ChangeLog"
File "./files/CREDIT"
File "./files/ELEMENTS.LICENSE"
File "./files/LICENSE"
File "./files/qet_uninstall_file_associations.reg"
File "./files/README"
File "./files/register_filetypes.bat"
File "Lancer QET.bat"
SetOutPath "$INSTDIR"
File /r "./files/ico"
SectionEnd
;---------------------------
SetOverwrite on
SubSection "$(Elements)" SEC01
SetOverwrite on
Section "$(Electric)"
SetOutPath "$INSTDIR\elements"
File /r "./files/elements/10_electric"
SectionEnd
SetOverwrite on
Section "$(Logic)"
SetOutPath "$INSTDIR\elements"
File /r "./files/elements/20_logic"
SectionEnd
SetOverwrite on
Section "$(Hydraulic)"
SetOutPath "$INSTDIR\elements"
File /r "./files/elements/30_hydraulic"
SectionEnd
SetOverwrite on
Section "$(Pneumatic)"
SetOutPath "$INSTDIR\elements"
File /r "./files/elements/50_pneumatic"
SectionEnd
;---------------------------------
SubSection "$(Energy)"
SetOverwrite on
Section "$(water)"
SetOutPath "$INSTDIR\elements\60_energy"
File /r "./files/elements/60_energy/11_water"
File /r "./files/elements/60_energy/"
SectionEnd
SetOverwrite on
Section "$(Refrigeration)"
SetOutPath "$INSTDIR\elements\60_energy"
File /r "./files/elements/60_energy/21_refrigeration"
File /r "./files/elements/60_energy/"
SectionEnd
SetOverwrite on
Section "$(Solar_thermal)"
SetOutPath "$INSTDIR\elements\60_energy"
File /r "./files/elements/60_energy/31_solar_thermal"
File /r "./files/elements/60_energy/"
SectionEnd
SubSectionEnd
SubSectionEnd
;-------------------------------
SetOverwrite on
Section "$(Lang)" SEC02
SetOutPath "$INSTDIR\lang"
File "./files/lang/*.qm"
SectionEnd
SetOverwrite on
Section "$(Titleblocks)" SEC03
SetOutPath "$INSTDIR"
File /r "./files/titleblocks"
SectionEnd
SetOverwrite on
Section "$(Examples)" SEC04
SetOutPath "$INSTDIR"
File /r "./files/examples"
SectionEnd
;--------------------------------
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SEC01} $(var1)
!insertmacro MUI_DESCRIPTION_TEXT ${SEC02} $(var2)
!insertmacro MUI_DESCRIPTION_TEXT ${SEC03} $(var3)
!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} $(var4)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
;--------------------------------
;Installer Sections
Section ""
SetOutPath "$INSTDIR"
;Store installation folder
WriteRegStr HKCU "Software\${SOFT_NAME}" "" $INSTDIR
; write uninstall strings
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" "DisplayName" "${SOFT_NAME} (remove only)"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
;Create uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"
; get the final path for the icons and the launch script
Var /GLOBAL final_qet_exe
Var /GLOBAL final_project_ico
Var /GLOBAL final_element_ico
Var /GLOBAL final_titleblock_ico
StrCpy $final_qet_exe "$INSTDIR\Lancer QET.bat"
StrCpy $final_project_ico "$INSTDIR\\ico\application-x-qet-project.ico"
StrCpy $final_element_ico "$INSTDIR\\ico\application-x-qet-element.ico"
StrCpy $final_titleblock_ico "$INSTDIR\\ico\application-x-qet-titleblock.ico"
; write file associations registry keys
WriteRegStr HKEY_CLASSES_ROOT "Applications\qelectrotech.exe\shell\open\command" "" "$\"$final_qet_exe$\" $\"%1$\""
WriteRegStr HKEY_CLASSES_ROOT ".qet" "" "qet_diagram_file"
WriteRegStr HKEY_CLASSES_ROOT "qet_diagram_file" "" "Sch<EFBFBD>ma QET"
WriteRegDWORD HKEY_CLASSES_ROOT "qet_diagram_file" "EditFlags" 0x00000000
WriteRegDWORD HKEY_CLASSES_ROOT "qet_diagram_file" "BrowserFlags" 0x00000008
WriteRegStr HKEY_CLASSES_ROOT "qet_diagram_file\DefaultIcon" "" "$final_project_ico"
WriteRegStr HKEY_CLASSES_ROOT "qet_diagram_file\shell\open\command" "" "$\"$final_qet_exe$\" $\"%1$\""
WriteRegStr HKEY_CLASSES_ROOT ".elmt" "" "qet_element_file"
WriteRegStr HKEY_CLASSES_ROOT "qet_element_file" "" "<EFBFBD>l<EFBFBD>ment QET"
WriteRegDWORD HKEY_CLASSES_ROOT "qet_element_file" "EditFlags" 0x00000000
WriteRegDWORD HKEY_CLASSES_ROOT "qet_element_file" "BrowserFlags" 0x00000008
WriteRegStr HKEY_CLASSES_ROOT "qet_element_file\DefaultIcon" "" "$final_element_ico"
WriteRegStr HKEY_CLASSES_ROOT "qet_element_file\shell\open\command" "" "$\"$final_qet_exe$\" $\"%1$\""
WriteRegStr HKEY_CLASSES_ROOT ".titleblock" "" "qet_titleblock_file"
WriteRegStr HKEY_CLASSES_ROOT "qet_titleblock_file" "" "Titleblock QET"
WriteRegDWORD HKEY_CLASSES_ROOT "qet_titleblock_file" "EditFlags" 0x00000000
WriteRegDWORD HKEY_CLASSES_ROOT "qet_titleblock_file" "BrowserFlags" 0x00000008
WriteRegStr HKEY_CLASSES_ROOT "qet_titleblock_file\DefaultIcon" "" "$final_titleblock_ico"
WriteRegStr HKEY_CLASSES_ROOT "qet_titleblock_file\shell\open\command" "" "$\"$final_qet_exe$\" $\"%1$\""
SetShellVarContext all ; all users
; shortcuts in the start menu
CreateDirectory "$SMPROGRAMS\${SOFT_NAME}"
CreateDirectory "$SMPROGRAMS\${SOFT_NAME}\Manual"
CreateDirectory "$SMPROGRAMS\${SOFT_NAME}\Upgrade"
CreateShortCut "$SMPROGRAMS\${SOFT_NAME}\QElectroTech.lnk" "$INSTDIR\Lancer QET.bat" 0 "$INSTDIR\\ico\qelectrotech.ico"
CreateShortCut "$SMPROGRAMS\${SOFT_NAME}\Uninstall QElectroTech.lnk" "$INSTDIR\Uninstall.exe"
; shortcut on the desktop
CreateShortCut "$DESKTOP\QElectroTech.lnk" "$INSTDIR\Lancer QET.bat" 0 "$INSTDIR\ico\qelectrotech.ico"
WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_English.url" "InternetShortcut" "URL" "https://download.tuxfamily.org/qet/manual_0.7/build/index.html"
WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_Russian.url" "InternetShortcut" "URL" "https://download.tuxfamily.org/qet/joshua/html/QET_ru.html"
WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Upgrade\Download.url" "InternetShortcut" "URL" "https://download.tuxfamily.org/qet/builds/nightly/"
WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Donate.url" "InternetShortcut" "URL" "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZZHC9D7C3MDPC"
;changing $INSTDIR\elements\ *.elmt to read-only attribute
${Locate} "$INSTDIR\elements\" "/L=FD /M=*.elmt" "LocateCallback"
IfErrors 0 +2
;MessageBox MB_OK "Error"
SectionEnd
Function LocateCallback
SetFileAttributes $R9 FILE_ATTRIBUTE_READONLY
Push $0
FunctionEnd
;--------------------------------
;Installer Functions
Function .onInit
!insertmacro MUI_LANGDLL_DISPLAY
;Auto-uninstall old before installing new
ReadRegStr $R0 HKLM \
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" \
"UninstallString"
StrCmp $R0 "" done
MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
"$(installed)" \
IDOK uninst
Abort
;Run the uninstaller
uninst:
ClearErrors
ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file
IfErrors no_remove_uninstaller done
;You can either use Delete /REBOOTOK in the uninstaller or add some code
;here to remove the uninstaller. Use a registry key to check
;whether the user has chosen to uninstall. If you are using an uninstaller
;components page, make sure all sections are uninstalled.
no_remove_uninstaller:
done:
FunctionEnd
;--------------------------------
;Descriptions
;USE A LANGUAGE STRING IF YOU WANT YOUR DESCRIPTIONS TO BE LANGAUGE SPECIFIC
;Assign descriptions to sections
;!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
;!insertmacro MUI_DESCRIPTION_TEXT ${CopyFiles} "CopyFiles"
;!insertmacro MUI_FUNCTION_DESCRIPTION_END
;--------------------------------
;Uninstaller Section
Section "Uninstall"
SetShellVarContext all ; all users
; remove start menu shortcuts
RMDir /r "$SMPROGRAMS\${SOFT_NAME}"
; remove shortcut on the desktop
Delete "$DESKTOP\QElectroTech.lnk"
; remove the application files
Delete "$INSTDIR\*.*"
RMDir /r "$INSTDIR"
;remove installation registry keys
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}"
DeleteRegKey /ifempty HKCU "Software\${SOFT_NAME}"
; remove file associations registry keys
DeleteRegKey HKEY_CLASSES_ROOT "Applications\qelectrotech.exe"
DeleteRegKey HKEY_CLASSES_ROOT ".qet"
DeleteRegKey HKEY_CLASSES_ROOT "qet_diagram_file"
DeleteRegKey HKEY_CLASSES_ROOT ".elmt"
DeleteRegKey HKEY_CLASSES_ROOT "qet_element_file"
DeleteRegKey HKEY_CLASSES_ROOT ".titleblock"
DeleteRegKey HKEY_CLASSES_ROOT "qet_titleblock_file"
IfFileExists "$INSTDIR" 0 NoErrorMsg
;MessageBox MB_OK "Note: $INSTDIR could not be removed!" IDOK 0 ; skipped if file doesn't exist
NoErrorMsg:
SectionEnd
;--------------------------------
;Uninstaller Functions
Function un.onInit
!insertmacro MUI_UNGETLANGUAGE
FunctionEnd

View File

@@ -125,6 +125,7 @@
!insertmacro MUI_LANGUAGE "Dutch"
!insertmacro MUI_LANGUAGE "Dutch_Belgium"
!insertmacro MUI_LANGUAGE "Danish"
!insertmacro MUI_LANGUAGE "Swedish"
!insertmacro MUI_RESERVEFILE_LANGDLL
!include lang_extra.nsh
@@ -266,13 +267,13 @@ Section ""
; write file associations registry keys
WriteRegStr HKEY_CLASSES_ROOT "Applications\qelectrotech.exe\shell\open\command" "" "$\"$final_qet_exe$\" $\"%1$\""
WriteRegStr HKEY_CLASSES_ROOT ".qet" "" "qet_diagram_file"
WriteRegStr HKEY_CLASSES_ROOT "qet_diagram_file" "" "Sch<EFBFBD>ma QET"
WriteRegStr HKEY_CLASSES_ROOT "qet_diagram_file" "" "Diagram QET"
WriteRegDWORD HKEY_CLASSES_ROOT "qet_diagram_file" "EditFlags" 0x00000000
WriteRegDWORD HKEY_CLASSES_ROOT "qet_diagram_file" "BrowserFlags" 0x00000008
WriteRegStr HKEY_CLASSES_ROOT "qet_diagram_file\DefaultIcon" "" "$final_project_ico"
WriteRegStr HKEY_CLASSES_ROOT "qet_diagram_file\shell\open\command" "" "$\"$final_qet_exe$\" $\"%1$\""
WriteRegStr HKEY_CLASSES_ROOT ".elmt" "" "qet_element_file"
WriteRegStr HKEY_CLASSES_ROOT "qet_element_file" "" "<EFBFBD>l<EFBFBD>ment QET"
WriteRegStr HKEY_CLASSES_ROOT "qet_element_file" "" "Element QET"
WriteRegDWORD HKEY_CLASSES_ROOT "qet_element_file" "EditFlags" 0x00000000
WriteRegDWORD HKEY_CLASSES_ROOT "qet_element_file" "BrowserFlags" 0x00000008
WriteRegStr HKEY_CLASSES_ROOT "qet_element_file\DefaultIcon" "" "$final_element_ico"
@@ -295,9 +296,9 @@ Section ""
; shortcut on the desktop
CreateShortCut "$DESKTOP\QElectroTech.lnk" "$INSTDIR\Lancer QET.bat" 0 "$INSTDIR\ico\qelectrotech.ico"
WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_English.url" "InternetShortcut" "URL" "https://download.tuxfamily.org/qet/manual_0.7/build/index.html"
WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_Russian.url" "InternetShortcut" "URL" "https://download.tuxfamily.org/qet/joshua/html/QET_ru.html"
WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Upgrade\Download.url" "InternetShortcut" "URL" "https://download.tuxfamily.org/qet/builds/nightly/"
WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_English.url" "InternetShortcut" "URL" "https://download.qelectrotech.org/qet/manual_0.7/build/index.html"
WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Manual\Manual_Russian.url" "InternetShortcut" "URL" "https://download.qelectrotech.org/qet/joshua/html/QET_ru.html"
WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Upgrade\Download.url" "InternetShortcut" "URL" "https://download.qelectrotech.org/qet/builds/nightly/"
WriteINIStr "$SMPROGRAMS\${SOFT_NAME}\Donate.url" "InternetShortcut" "URL" "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZZHC9D7C3MDPC"
;changing $INSTDIR\elements\ *.elmt to read-only attribute

View File

@@ -104,7 +104,7 @@
LangString installed ${LANG_GERMAN} "${SOFT_NAME} ist bereits installiert. $\n$\nKlicken Sie auf `OK`, um die alte Version zu deinstallieren, oder auf `Abbrechen`, um das Upgrade abzubrechen."
LangString wrongArch ${LANG_GERMAN} "Dieses Programm läuft ausschließlich unter Windows 64 Bits."
LangString wrongArch ${LANG_GERMAN} "Dieses Programm läuft ausschließlich unter Windows 64 Bit."
LangString Elements ${LANG_GERMAN} "Bauteile"
LangString Electric ${LANG_GERMAN} "Elektrik"
LangString Logic ${LANG_GERMAN} "Logik"
@@ -115,13 +115,13 @@
LangString Refrigeration ${LANG_GERMAN} "Kältetechnik"
LangString Solar_thermal ${LANG_GERMAN} "Solar-Wärmetechnik"
LangString Lang ${LANG_GERMAN} "Sprachen"
LangString Titleblocks ${LANG_GERMAN} "Zeichnungsköpfe"
LangString Titleblocks ${LANG_GERMAN} "Schriftfelder"
LangString Examples ${LANG_GERMAN} "Beispiele"
LangString Check ${LANG_GERMAN} "Check to start ${SOFT_NAME}"
LangString var1 ${LANG_GERMAN} "Elements of the official collection"
LangString var2 ${LANG_GERMAN} "languagues files"
LangString var3 ${LANG_GERMAN} "Examples of cartridges"
LangString var4 ${LANG_GERMAN} "Examples of diagrams"
LangString Check ${LANG_GERMAN} "Ankreuzen zum Starten von ${SOFT_NAME}"
LangString var1 ${LANG_GERMAN} "Elemente der offiziellen Sammlung"
LangString var2 ${LANG_GERMAN} "Sprachdateien"
LangString var3 ${LANG_GERMAN} "Schriftfeld-Beispiele"
LangString var4 ${LANG_GERMAN} "Schaltplan-Beispiele"
LangString installed ${LANG_RUSSIAN} "${SOFT_NAME} уже установлен. $\n$\nДля удаления предыдущей версии нажмите `OK` или `Cancel` для отмены обновления."

View File

@@ -0,0 +1,34 @@
# Copyright 2006 The QElectroTech Team
# This file is part of QElectroTech.
#
# QElectroTech is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# QElectroTech is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
message(
"_____________________________________________________________________"
"\nCopyright 2006 The QElectroTech Team"
"\nThis file is part of QElectroTech."
"\n\nQElectroTech is free software: you can redistribute it and/or modify"
"\nit under the terms of the GNU General Public License as published by"
"\nthe Free Software Foundation, either version 2 of the License, or"
"\n(at your option) any later version."
"\nQElectroTech is distributed in the hope that it will be useful,"
"\nbut WITHOUT ANY WARRANTY; without even the implied warranty of"
"\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the"
"\nGNU General Public License for more details."
"\n\nYou should have received a copy of the GNU General Public License"
"\nalong with QElectroTech. If not, see <http://www.gnu.org/licenses/>.\n"
"_____________________________________________________________________")

View File

@@ -0,0 +1,71 @@
# Copyright 2006 The QElectroTech Team
# This file is part of QElectroTech.
#
# QElectroTech is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# QElectroTech is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
# Paths used for compilation and installation of QET
message(" - define_definitions")
message("Paths used for compilation and installation of QET")
message("--------------------------------------------------")
message("COMPIL_PREFIX " ${COMPIL_PREFIX})
message("INSTALL_PREFIX " ${INSTALL_PREFIX})
message("QET_BINARY_PATH " ${QET_BINARY_PATH})
if(${QET_COMMON_COLLECTION_PATH} STRGREATER "")
message("QET_COMMON_COLLECTION_PATH " ${INSTALL_PREFIX}${QET_COMMON_COLLECTION_PATH})
add_definitions(-DQET_COMMON_COLLECTION_PATH=${INSTALL_PREFIX}${QET_COMMON_COLLECTION_PATH})
endif()
if(${QET_COMMON_TBT_PATH} STRGREATER "")
message("QET_COMMON_TBT_PATH " ${INSTALL_PREFIX}${QET_COMMON_TBT_PATH})
add_definitions(-DQET_COMMON_TBT_PATH=${INSTALL_PREFIX}${QET_COMMON_TBT_PATH})
endif()
if(${QET_LANG_PATH_RELATIVE_TO_BINARY_PATH})
add_definitions(-DQET_LANG_PATH_RELATIVE_TO_BINARY_PATH)
endif()
if(${QET_LANG_PATH} STRGREATER "")
message("QET_LANG_PATH " ${INSTALL_PREFIX}${QET_LANG_PATH})
add_definitions(-DQET_LANG_PATH=${INSTALL_PREFIX}${QET_LANG_PATH})
endif()
if (NOT MINGW)
if(${QET_EXAMPLES_PATH} STRGREATER "")
message("QET_EXAMPLES_PATH " ${INSTALL_PREFIX}${QET_EXAMPLES_PATH})
add_definitions(-DQET_EXAMPLES_PATH=${INSTALL_PREFIX}${QET_EXAMPLES_PATH})
endif()
endif()
message("QET_LICENSE_PATH " ${QET_LICENSE_PATH})
message("QET_MIME_PACKAGE_PATH " ${QET_MIME_PACKAGE_PATH})
message("QET_DESKTOP_PATH " ${QET_DESKTOP_PATH})
message("QET_ICONS_PATH " ${QET_ICONS_PATH})
message("QET_MAN_PATH " ${QET_MAN_PATH})
message("QET_APPDATA_PATH " ${QET_APPDATA_PATH})
message("ICON " ${ICON})
message("--------------------------------------------------")
message("PROJECT_NAME :" ${PROJECT_NAME})
message("PROJECT_VERSION :" ${PROJECT_VERSION})
message("PROJECT_DESCRIPTION :" ${PROJECT_DESCRIPTION})
message("PROJECT_HOMEPAGE_URL :" ${PROJECT_HOMEPAGE_URL})
message("PROJECT_SOURCE_DIR :" ${PROJECT_SOURCE_DIR})
message("QET_DIR :" ${QET_DIR})
message("GIT_COMMIT_SHA :" ${GIT_COMMIT_SHA})
if(BUILD_WITH_KF5)
message("KF5_GIT_TAG :" ${KF5_GIT_TAG})
else()
add_definitions(-DBUILD_WITHOUT_KF5)
endif()
message("QET_COMPONENTS :" ${QET_COMPONENTS})
message("QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR})

View File

@@ -0,0 +1,35 @@
# Copyright 2006 The QElectroTech Team
# This file is part of QElectroTech.
#
# QElectroTech is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# QElectroTech is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
message(" - developer_options")
# warn on *any* usage of deprecated APIs
add_definitions(-DQT_DEPRECATED_WARNINGS)
# You can make your code fail to compile if it uses deprecated APIs.
# In order to do so, uncomment the following line.
# disables all the APIs deprecated before Qt 6.0.0
#add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
# to enable function names and line numbers even for release builds
add_definitions(-DQT_MESSAGELOGCONTEXT)
# You can make your code warn on compile time for the TODO's
# In order to do so, uncomment the following line.
#add_definitions(-DTODO_LIST)
# Build with KF5
option(BUILD_WITH_KF5 "Build with KF5" ON)

View File

@@ -0,0 +1,67 @@
# Copyright 2006 The QElectroTech Team
# This file is part of QElectroTech.
#
# QElectroTech is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# QElectroTech is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
message(" - fetch_kdeaddons")
if(DEFINED BUILD_WITH_KF5)
Include(FetchContent)
option(BUILD_KF5 "Build KF5 libraries, use system ones otherwise" YES)
if(BUILD_KF5)
if(NOT DEFINED KF5_GIT_TAG)
#https://qelectrotech.org/forum/viewtopic.php?pid=13924#p13924
set(KF5_GIT_TAG v5.77.0)
endif()
# Fix stop the run autotests of kcoreaddons
# see
# https://invent.kde.org/frameworks/kcoreaddons/-/blob/master/CMakeLists.txt#L98
# issue:
# CMake Error at /usr/share/ECM/modules/ECMAddTests.cmake:89 (add_executable):
# Cannot find source file:
# see
# https://qelectrotech.org/forum/viewtopic.php?pid=13929#p13929
set(KDE_SKIP_TEST_SETTINGS "TRUE")
set(BUILD_TESTING "0")
FetchContent_Declare(
ecm
GIT_REPOSITORY https://invent.kde.org/frameworks/extra-cmake-modules.git
GIT_TAG ${KF5_GIT_TAG})
FetchContent_MakeAvailable(ecm)
FetchContent_Declare(
kcoreaddons
GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git
GIT_TAG ${KF5_GIT_TAG})
FetchContent_MakeAvailable(kcoreaddons)
FetchContent_Declare(
kwidgetsaddons
GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git
GIT_TAG ${KF5_GIT_TAG})
FetchContent_MakeAvailable(kwidgetsaddons)
else()
find_package(KF5CoreAddons REQUIRED)
find_package(KF5WidgetsAddons REQUIRED)
endif()
set(KF5_PRIVATE_LIBRARIES
KF5::WidgetsAddons
KF5::CoreAddons
)
endif()

33
cmake/fetch_pugixml.cmake Normal file
View File

@@ -0,0 +1,33 @@
# Copyright 2006 The QElectroTech Team
# This file is part of QElectroTech.
#
# QElectroTech is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# QElectroTech is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
message(" - fetch_pugixml")
Include(FetchContent)
option(BUILD_PUGIXML "Build pugixml library, use system one otherwise" YES)
if(BUILD_PUGIXML)
FetchContent_Declare(
pugixml
GIT_REPOSITORY https://github.com/zeux/pugixml.git
GIT_TAG v1.11.4)
FetchContent_MakeAvailable(pugixml)
else()
find_package(pugixml REQUIRED)
endif()

View File

@@ -0,0 +1,31 @@
# Copyright 2006 The QElectroTech Team
# This file is part of QElectroTech.
#
# QElectroTech is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# QElectroTech is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
message(" - fetch_singleapplication")
# https://github.com/itay-grudev/SingleApplication/issues/18
#qmake
#DEFINES += QAPPLICATION_CLASS=QGuiApplication
set(QAPPLICATION_CLASS QApplication)
Include(FetchContent)
FetchContent_Declare(
SingleApplication
GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git
GIT_TAG v3.2.0)
FetchContent_MakeAvailable(SingleApplication)

View File

@@ -0,0 +1,41 @@
# Copyright 2006 The QElectroTech Team
# This file is part of QElectroTech.
#
# QElectroTech is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# QElectroTech is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
message(" - git_last_commit_sha")
find_package(Git QUIET)
if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
#get GIT COMMIT SHA
execute_process(
COMMAND ${GIT_EXECUTABLE} -C ${QET_DIR} rev-parse --verify HEAD
OUTPUT_VARIABLE GIT_COMMIT_SHA
RESULT_VARIABLE GIT_COMMIT_RESULT)
# This strips terminating newline in the variable
string(REGEX REPLACE "\n$" "" GIT_COMMIT_SHA "${GIT_COMMIT_SHA}")
if(NOT GIT_COMMIT_RESULT EQUAL "0")
message(
FATAL_ERROR
"git rev-parse --verify HEAD failed with "
${GIT_COMMIT_RESULT}
", please check")
endif()
endif()
# This adds to definitions => .cpp
add_definitions(-DGIT_COMMIT_SHA="${GIT_COMMIT_SHA}")

View File

@@ -0,0 +1,35 @@
# Copyright 2006 The QElectroTech Team
# This file is part of QElectroTech.
#
# QElectroTech is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# QElectroTech is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
message(" - git_update_submodules")
find_package(Git QUIET)
if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
# updates all git submodules
execute_process(
COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
RESULT_VARIABLE GIT_SUBMOD_RESULT)
if(NOT GIT_SUBMOD_RESULT EQUAL "0")
message(
FATAL_ERROR
"git submodule update --init failed with "
${GIT_SUBMOD_RESULT}
", please checkout submodules")
endif()
endif()

View File

@@ -0,0 +1,25 @@
# Copyright 2006 The QElectroTech Team
# This file is part of QElectroTech.
#
# QElectroTech is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# QElectroTech is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
if(${CMAKE_VERSION} VERSION_LESS 3.14)
message(
"_____________________________________________________________________")
message("to update Cmake on linux:")
message("https://github.com/Kitware/CMake/")
message("linux => cmake-3.19.1-Linux-x86_64.sh")
message(" sudo ./cmake.sh --prefix=/usr/local/ --exclude-subdir")
message("windows good luck :)")
endif()

View File

@@ -0,0 +1,65 @@
# Copyright 2006 The QElectroTech Team
# This file is part of QElectroTech.
#
# QElectroTech is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# QElectroTech is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
# Paths used for compilation and installation of QET
message(" - paths_compilation_installation")
if(UNIX AND NOT APPLE)
# for Linux, BSD, Solaris, Minix
set(COMPIL_PREFIX "/usr/local/")
set(INSTALL_PREFIX "/usr/local/")
set(QET_BINARY_PATH "bin/")
set(QET_COMMON_COLLECTION_PATH "share/qelectrotech/elements/")
set(QET_COMMON_TBT_PATH "share/qelectrotech/titleblocks/")
set(QET_LANG_PATH "share/qelectrotech/lang/")
set(QET_EXAMPLES_PATH "share/qelectrotech/examples/")
set(QET_LICENSE_PATH "doc/qelectrotech/")
set(QET_MIME_PACKAGE_PATH "../share/mime/packages/")
set(QET_DESKTOP_PATH "share/applications/")
set(QET_ICONS_PATH "share/icons/hicolor/")
set(QET_MAN_PATH "man/")
set(QET_APPDATA_PATH "share/appdata")
endif()
if(APPLE)
# for MacOS X or iOS, watchOS, tvOS (since 3.10.3)
set(COMPIL_PREFIX "./")
set(INSTALL_PREFIX "/usr/local/")
set(QET_BINARY_PATH "bin/")
set(QET_COMMON_COLLECTION_PATH "../Resources/elements/")
set(QET_COMMON_TBT_PATH "../Resources/titleblocks/")
set(QET_LANG_PATH "../Resources/lang/")
set(QET_EXAMPLES_PATH "share/qelectrotech/examples/")
set(QET_LICENSE_PATH "doc/qelectrotech/")
set(QET_DESKTOP_PATH "share/applications/")
set(QET_ICONS_PATH "share/icons/hicolor/")
set(QET_MAN_PATH "man/")
set(ICON "ico/mac_icon/qelectrotech.icns")
endif()
if(WIN32)
# for Windows operating system in general
set(COMPIL_PREFIX "./")
set(INSTALL_PREFIX "./")
set(QET_BINARY_PATH "./")
set(QET_COMMON_COLLECTION_PATH "elements/")
set(QET_COMMON_TBT_PATH "titleblocks/")
set(QET_LANG_PATH "l10n/")
set(QET_LICENSE_PATH "./")
# Liste des ressources Windows
#RC_FILE = qelectrotech.rc
endif()

View File

@@ -0,0 +1,744 @@
# Copyright 2006 The QElectroTech Team
# This file is part of QElectroTech.
#
# QElectroTech is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# QElectroTech is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
message(" - qet_compilation_vars")
set(QET_COMPONENTS
LinguistTools
PrintSupport
Xml
Svg
Sql
Network
Widgets
Concurrent)
set(QET_PRIVATE_LIBRARIES
Qt::PrintSupport
Qt::Gui
Qt::Xml
Qt::Svg
Qt::Sql
Qt::Network
Qt::Widgets
Qt::Concurrent
)
set(QET_RES_FILES
${QET_DIR}/sources/autoNum/ui/autonumberingdockwidget.ui
${QET_DIR}/sources/autoNum/ui/autonumberingmanagementw.ui
${QET_DIR}/sources/autoNum/ui/folioautonumbering.ui
${QET_DIR}/sources/autoNum/ui/formulaautonumberingw.ui
${QET_DIR}/sources/autoNum/ui/numparteditorw.ui
${QET_DIR}/sources/autoNum/ui/selectautonumw.ui
${QET_DIR}/sources/dataBase/ui/elementquerywidget.ui
${QET_DIR}/sources/dataBase/ui/summaryquerywidget.ui
${QET_DIR}/sources/editor/ui/dynamictextfieldeditor.ui
${QET_DIR}/sources/editor/ui/elementpropertieseditorwidget.ui
${QET_DIR}/sources/editor/ui/ellipseeditor.ui
${QET_DIR}/sources/editor/ui/lineeditor.ui
${QET_DIR}/sources/editor/ui/polygoneditor.ui
${QET_DIR}/sources/editor/ui/rectangleeditor.ui
${QET_DIR}/sources/editor/ui/qetelementeditor.ui
${QET_DIR}/sources/editor/ui/terminaleditor.ui
${QET_DIR}/sources/ElementsCollection/ui/renamedialog.ui
${QET_DIR}/sources/factory/ui/addtabledialog.ui
${QET_DIR}/sources/NameList/ui/namelistdialog.ui
${QET_DIR}/sources/NameList/ui/namelistwidget.ui
${QET_DIR}/sources/print/projectprintwindow.ui
${QET_DIR}/sources/PropertiesEditor/propertieseditordockwidget.ui
${QET_DIR}/sources/richtext/addlinkdialog.ui
${QET_DIR}/sources/SearchAndReplace/ui/replaceadvanceddialog.ui
${QET_DIR}/sources/SearchAndReplace/ui/replaceconductordialog.ui
${QET_DIR}/sources/SearchAndReplace/ui/replaceelementdialog.ui
${QET_DIR}/sources/SearchAndReplace/ui/replacefoliowidget.ui
${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.ui
${QET_DIR}/sources/TerminalStrip/ui/addterminalstripitemdialog.ui
${QET_DIR}/sources/TerminalStrip/ui/freeterminaleditor.ui
${QET_DIR}/sources/TerminalStrip/ui/terminalstripcreatordialog.ui
${QET_DIR}/sources/TerminalStrip/ui/terminalstripeditor.ui
${QET_DIR}/sources/TerminalStrip/ui/terminalstripeditorwindow.ui
${QET_DIR}/sources/TerminalStrip/ui/terminalstriplayouteditor.ui
${QET_DIR}/sources/TerminalStrip/ui/terminalstriptreedockwidget.ui
${QET_DIR}/sources/ui/aboutqetdialog.ui
${QET_DIR}/sources/ui/alignmenttextdialog.ui
${QET_DIR}/sources/ui/bomexportdialog.ui
${QET_DIR}/sources/ui/borderpropertieswidget.ui
${QET_DIR}/sources/ui/compositetexteditdialog.ui
${QET_DIR}/sources/ui/conductorpropertiesdialog.ui
${QET_DIR}/sources/ui/conductorpropertieswidget.ui
${QET_DIR}/sources/ui/configsaveloaderwidget.ui
${QET_DIR}/sources/ui/diagramcontextwidget.ui
${QET_DIR}/sources/ui/diagrameditorhandlersizewidget.ui
${QET_DIR}/sources/ui/diagramselection.ui
${QET_DIR}/sources/ui/dialogwaiting.ui
${QET_DIR}/sources/ui/dynamicelementtextitemeditor.ui
${QET_DIR}/sources/ui/elementinfopartwidget.ui
${QET_DIR}/sources/ui/elementinfowidget.ui
${QET_DIR}/sources/ui/formulaassistantdialog.ui
${QET_DIR}/sources/ui/imagepropertieswidget.ui
${QET_DIR}/sources/ui/importelementdialog.ui
${QET_DIR}/sources/ui/importelementtextpatterndialog.ui
${QET_DIR}/sources/ui/linksingleelementwidget.ui
${QET_DIR}/sources/ui/marginseditdialog.ui
${QET_DIR}/sources/ui/masterpropertieswidget.ui
${QET_DIR}/sources/ui/multipastedialog.ui
${QET_DIR}/sources/ui/potentialselectordialog.ui
${QET_DIR}/sources/ui/reportpropertiewidget.ui
${QET_DIR}/sources/ui/shapegraphicsitempropertieswidget.ui
${QET_DIR}/sources/ui/thirdpartybinaryinstalldialog.ui
${QET_DIR}/sources/ui/titleblockpropertieswidget.ui
${QET_DIR}/sources/ui/xrefpropertieswidget.ui
${QET_DIR}/sources/ui/configpage/generalconfigurationpage.ui
)
set(QET_SRC_FILES
${QET_DIR}/sources/borderproperties.cpp
${QET_DIR}/sources/borderproperties.h
${QET_DIR}/sources/bordertitleblock.cpp
${QET_DIR}/sources/bordertitleblock.h
${QET_DIR}/sources/conductorautonumerotation.cpp
${QET_DIR}/sources/conductorautonumerotation.h
${QET_DIR}/sources/conductornumexport.cpp
${QET_DIR}/sources/conductornumexport.h
${QET_DIR}/sources/conductorprofile.cpp
${QET_DIR}/sources/conductorprofile.h
${QET_DIR}/sources/conductorproperties.cpp
${QET_DIR}/sources/conductorproperties.h
${QET_DIR}/sources/conductorsegment.cpp
${QET_DIR}/sources/conductorsegment.h
${QET_DIR}/sources/conductorsegmentprofile.h
${QET_DIR}/sources/configdialog.cpp
${QET_DIR}/sources/configdialog.h
${QET_DIR}/sources/createdxf.cpp
${QET_DIR}/sources/createdxf.h
${QET_DIR}/sources/diagramcommands.cpp
${QET_DIR}/sources/diagramcommands.h
${QET_DIR}/sources/diagramcontent.cpp
${QET_DIR}/sources/diagramcontent.h
${QET_DIR}/sources/diagramcontext.cpp
${QET_DIR}/sources/diagramcontext.h
${QET_DIR}/sources/diagram.cpp
${QET_DIR}/sources/diagram.h
${QET_DIR}/sources/diagramposition.cpp
${QET_DIR}/sources/diagramposition.h
${QET_DIR}/sources/diagramview.cpp
${QET_DIR}/sources/diagramview.h
${QET_DIR}/sources/elementdialog.cpp
${QET_DIR}/sources/elementdialog.h
${QET_DIR}/sources/elementprovider.cpp
${QET_DIR}/sources/elementprovider.h
${QET_DIR}/sources/elementscategoryeditor.cpp
${QET_DIR}/sources/elementscategoryeditor.h
${QET_DIR}/sources/elementscollectioncache.cpp
${QET_DIR}/sources/elementscollectioncache.h
${QET_DIR}/sources/elementsmover.cpp
${QET_DIR}/sources/elementsmover.h
${QET_DIR}/sources/elementspanel.cpp
${QET_DIR}/sources/elementspanel.h
${QET_DIR}/sources/elementspanelwidget.cpp
${QET_DIR}/sources/elementspanelwidget.h
${QET_DIR}/sources/elementtextpattern.cpp
${QET_DIR}/sources/elementtextpattern.h
${QET_DIR}/sources/elementtextsmover.cpp
${QET_DIR}/sources/elementtextsmover.h
${QET_DIR}/sources/exportdialog.cpp
${QET_DIR}/sources/exportdialog.h
${QET_DIR}/sources/exportproperties.cpp
${QET_DIR}/sources/exportproperties.h
${QET_DIR}/sources/exportpropertieswidget.cpp
${QET_DIR}/sources/exportpropertieswidget.h
${QET_DIR}/sources/genericpanel.cpp
${QET_DIR}/sources/genericpanel.h
${QET_DIR}/sources/machine_info.cpp
${QET_DIR}/sources/machine_info.h
${QET_DIR}/sources/main.cpp
${QET_DIR}/sources/newelementwizard.cpp
${QET_DIR}/sources/newelementwizard.h
${QET_DIR}/sources/projectview.cpp
${QET_DIR}/sources/projectview.h
${QET_DIR}/sources/qetapp.cpp
${QET_DIR}/sources/qetapp.h
${QET_DIR}/sources/qetarguments.cpp
${QET_DIR}/sources/qetarguments.h
${QET_DIR}/sources/qet.cpp
${QET_DIR}/sources/qetdiagrameditor.cpp
${QET_DIR}/sources/qetdiagrameditor.h
${QET_DIR}/sources/qet.h
${QET_DIR}/sources/qeticons.cpp
${QET_DIR}/sources/qeticons.h
${QET_DIR}/sources/qetinformation.cpp
${QET_DIR}/sources/qetinformation.h
${QET_DIR}/sources/qetmainwindow.cpp
${QET_DIR}/sources/qetmainwindow.h
${QET_DIR}/sources/qetmessagebox.cpp
${QET_DIR}/sources/qetmessagebox.h
${QET_DIR}/sources/qetproject.cpp
${QET_DIR}/sources/qetproject.h
${QET_DIR}/sources/qetregexpvalidator.cpp
${QET_DIR}/sources/qetregexpvalidator.h
${QET_DIR}/sources/qetresult.cpp
${QET_DIR}/sources/qetresult.h
${QET_DIR}/sources/qetxml.cpp
${QET_DIR}/sources/qetxml.h
${QET_DIR}/sources/qetversion.cpp
${QET_DIR}/sources/qetversion.h
${QET_DIR}/sources/qfilenameedit.cpp
${QET_DIR}/sources/qfilenameedit.h
${QET_DIR}/sources/qgimanager.cpp
${QET_DIR}/sources/qgimanager.h
${QET_DIR}/sources/qtextorientationspinboxwidget.cpp
${QET_DIR}/sources/qtextorientationspinboxwidget.h
${QET_DIR}/sources/qtextorientationwidget.cpp
${QET_DIR}/sources/qtextorientationwidget.h
${QET_DIR}/sources/recentfiles.cpp
${QET_DIR}/sources/recentfiles.h
${QET_DIR}/sources/titleblockcell.cpp
${QET_DIR}/sources/titleblockcell.h
${QET_DIR}/sources/titleblockproperties.cpp
${QET_DIR}/sources/titleblockproperties.h
${QET_DIR}/sources/titleblocktemplate.cpp
${QET_DIR}/sources/titleblocktemplate.h
${QET_DIR}/sources/titleblocktemplaterenderer.cpp
${QET_DIR}/sources/titleblocktemplaterenderer.h
${QET_DIR}/sources/autoNum/assignvariables.cpp
${QET_DIR}/sources/autoNum/assignvariables.h
${QET_DIR}/sources/autoNum/numerotationcontextcommands.cpp
${QET_DIR}/sources/autoNum/numerotationcontextcommands.h
${QET_DIR}/sources/autoNum/numerotationcontext.cpp
${QET_DIR}/sources/autoNum/numerotationcontext.h
${QET_DIR}/sources/autoNum/ui/autonumberingdockwidget.cpp
${QET_DIR}/sources/autoNum/ui/autonumberingdockwidget.h
${QET_DIR}/sources/autoNum/ui/autonumberingmanagementw.cpp
${QET_DIR}/sources/autoNum/ui/autonumberingmanagementw.h
${QET_DIR}/sources/autoNum/ui/folioautonumbering.cpp
${QET_DIR}/sources/autoNum/ui/folioautonumbering.h
${QET_DIR}/sources/autoNum/ui/formulaautonumberingw.cpp
${QET_DIR}/sources/autoNum/ui/formulaautonumberingw.h
${QET_DIR}/sources/autoNum/ui/numparteditorw.cpp
${QET_DIR}/sources/autoNum/ui/numparteditorw.h
${QET_DIR}/sources/autoNum/ui/selectautonumw.cpp
${QET_DIR}/sources/autoNum/ui/selectautonumw.h
${QET_DIR}/sources/dataBase/projectdatabase.cpp
${QET_DIR}/sources/dataBase/projectdatabase.h
${QET_DIR}/sources/dataBase/ui/elementquerywidget.cpp
${QET_DIR}/sources/dataBase/ui/elementquerywidget.h
${QET_DIR}/sources/dataBase/ui/summaryquerywidget.cpp
${QET_DIR}/sources/dataBase/ui/summaryquerywidget.h
${QET_DIR}/sources/diagramevent/diagrameventaddelement.cpp
${QET_DIR}/sources/diagramevent/diagrameventaddelement.h
${QET_DIR}/sources/diagramevent/diagrameventaddimage.cpp
${QET_DIR}/sources/diagramevent/diagrameventaddimage.h
${QET_DIR}/sources/diagramevent/diagrameventaddshape.cpp
${QET_DIR}/sources/diagramevent/diagrameventaddshape.h
${QET_DIR}/sources/diagramevent/diagrameventaddtext.cpp
${QET_DIR}/sources/diagramevent/diagrameventaddtext.h
${QET_DIR}/sources/diagramevent/diagrameventinterface.cpp
${QET_DIR}/sources/diagramevent/diagrameventinterface.h
${QET_DIR}/sources/dvevent/dveventinterface.cpp
${QET_DIR}/sources/dvevent/dveventinterface.h
${QET_DIR}/sources/dxf/dxftoelmt.cpp
${QET_DIR}/sources/dxf/dxftoelmt.h
${QET_DIR}/sources/qet_elementscaler/qet_elementscaler.cpp
${QET_DIR}/sources/qet_elementscaler/qet_elementscaler.h
${QET_DIR}/sources/editor/arceditor.cpp
${QET_DIR}/sources/editor/arceditor.h
${QET_DIR}/sources/editor/editorcommands.cpp
${QET_DIR}/sources/editor/editorcommands.h
${QET_DIR}/sources/editor/elementcontent.h
${QET_DIR}/sources/editor/elementitemeditor.cpp
${QET_DIR}/sources/editor/elementitemeditor.h
${QET_DIR}/sources/editor/elementprimitivedecorator.cpp
${QET_DIR}/sources/editor/elementprimitivedecorator.h
${QET_DIR}/sources/editor/elementscene.cpp
${QET_DIR}/sources/editor/elementscene.h
${QET_DIR}/sources/editor/elementview.cpp
${QET_DIR}/sources/editor/elementview.h
${QET_DIR}/sources/editor/styleeditor.cpp
${QET_DIR}/sources/editor/styleeditor.h
${QET_DIR}/sources/editor/esevent/eseventaddarc.cpp
${QET_DIR}/sources/editor/esevent/eseventaddarc.h
${QET_DIR}/sources/editor/esevent/eseventadddynamictextfield.cpp
${QET_DIR}/sources/editor/esevent/eseventadddynamictextfield.h
${QET_DIR}/sources/editor/esevent/eseventaddellipse.cpp
${QET_DIR}/sources/editor/esevent/eseventaddellipse.h
${QET_DIR}/sources/editor/esevent/eseventaddline.cpp
${QET_DIR}/sources/editor/esevent/eseventaddline.h
${QET_DIR}/sources/editor/esevent/eseventaddpolygon.cpp
${QET_DIR}/sources/editor/esevent/eseventaddpolygon.h
${QET_DIR}/sources/editor/esevent/eseventaddrect.cpp
${QET_DIR}/sources/editor/esevent/eseventaddrect.h
${QET_DIR}/sources/editor/esevent/eseventaddterminal.cpp
${QET_DIR}/sources/editor/esevent/eseventaddterminal.h
${QET_DIR}/sources/editor/esevent/eseventaddtext.cpp
${QET_DIR}/sources/editor/esevent/eseventaddtext.h
${QET_DIR}/sources/editor/esevent/eseventinterface.cpp
${QET_DIR}/sources/editor/esevent/eseventinterface.h
${QET_DIR}/sources/editor/graphicspart/abstractpartellipse.cpp
${QET_DIR}/sources/editor/graphicspart/abstractpartellipse.h
${QET_DIR}/sources/editor/graphicspart/customelementgraphicpart.cpp
${QET_DIR}/sources/editor/graphicspart/customelementgraphicpart.h
${QET_DIR}/sources/editor/graphicspart/customelementpart.cpp
${QET_DIR}/sources/editor/graphicspart/customelementpart.h
${QET_DIR}/sources/editor/graphicspart/partarc.cpp
${QET_DIR}/sources/editor/graphicspart/partarc.h
${QET_DIR}/sources/editor/graphicspart/partdynamictextfield.cpp
${QET_DIR}/sources/editor/graphicspart/partdynamictextfield.h
${QET_DIR}/sources/editor/graphicspart/partellipse.cpp
${QET_DIR}/sources/editor/graphicspart/partellipse.h
${QET_DIR}/sources/editor/graphicspart/partline.cpp
${QET_DIR}/sources/editor/graphicspart/partline.h
${QET_DIR}/sources/editor/graphicspart/partpolygon.cpp
${QET_DIR}/sources/editor/graphicspart/partpolygon.h
${QET_DIR}/sources/editor/graphicspart/partrectangle.cpp
${QET_DIR}/sources/editor/graphicspart/partrectangle.h
${QET_DIR}/sources/editor/graphicspart/partterminal.cpp
${QET_DIR}/sources/editor/graphicspart/partterminal.h
${QET_DIR}/sources/editor/graphicspart/parttext.cpp
${QET_DIR}/sources/editor/graphicspart/parttext.h
${QET_DIR}/sources/editor/ui/dynamictextfieldeditor.cpp
${QET_DIR}/sources/editor/ui/dynamictextfieldeditor.h
${QET_DIR}/sources/editor/ui/elementpropertieseditorwidget.cpp
${QET_DIR}/sources/editor/ui/elementpropertieseditorwidget.h
${QET_DIR}/sources/editor/ui/ellipseeditor.cpp
${QET_DIR}/sources/editor/ui/ellipseeditor.h
${QET_DIR}/sources/editor/ui/lineeditor.cpp
${QET_DIR}/sources/editor/ui/lineeditor.h
${QET_DIR}/sources/editor/ui/polygoneditor.cpp
${QET_DIR}/sources/editor/ui/polygoneditor.h
${QET_DIR}/sources/editor/ui/rectangleeditor.cpp
${QET_DIR}/sources/editor/ui/rectangleeditor.h
${QET_DIR}/sources/editor/ui/terminaleditor.cpp
${QET_DIR}/sources/editor/ui/terminaleditor.h
${QET_DIR}/sources/editor/ui/texteditor.cpp
${QET_DIR}/sources/editor/ui/texteditor.h
${QET_DIR}/sources/editor/ui/qetelementeditor.h
${QET_DIR}/sources/editor/ui/qetelementeditor.cpp
${QET_DIR}/sources/editor/UndoCommand/pastepartscommand.cpp
${QET_DIR}/sources/editor/UndoCommand/pastepartscommand.h
${QET_DIR}/sources/editor/UndoCommand/openelmtcommand.cpp
${QET_DIR}/sources/editor/UndoCommand/openelmtcommand.h
${QET_DIR}/sources/editor/UndoCommand/deletepartscommand.cpp
${QET_DIR}/sources/editor/UndoCommand/deletepartscommand.h
${QET_DIR}/sources/editor/UndoCommand/addpartcommand.cpp
${QET_DIR}/sources/editor/UndoCommand/addpartcommand.h
${QET_DIR}/sources/ElementsCollection/elementcollectionhandler.cpp
${QET_DIR}/sources/ElementsCollection/elementcollectionhandler.h
${QET_DIR}/sources/ElementsCollection/elementcollectionitem.cpp
${QET_DIR}/sources/ElementsCollection/elementcollectionitem.h
${QET_DIR}/sources/ElementsCollection/elementscollectionmodel.cpp
${QET_DIR}/sources/ElementsCollection/elementscollectionmodel.h
${QET_DIR}/sources/ElementsCollection/elementscollectionwidget.cpp
${QET_DIR}/sources/ElementsCollection/elementscollectionwidget.h
${QET_DIR}/sources/ElementsCollection/elementslocation.cpp
${QET_DIR}/sources/ElementsCollection/elementslocation.h
${QET_DIR}/sources/ElementsCollection/elementstreeview.cpp
${QET_DIR}/sources/ElementsCollection/elementstreeview.h
${QET_DIR}/sources/ElementsCollection/fileelementcollectionitem.cpp
${QET_DIR}/sources/ElementsCollection/fileelementcollectionitem.h
${QET_DIR}/sources/ElementsCollection/xmlelementcollection.cpp
${QET_DIR}/sources/ElementsCollection/xmlelementcollection.h
${QET_DIR}/sources/ElementsCollection/xmlprojectelementcollectionitem.cpp
${QET_DIR}/sources/ElementsCollection/xmlprojectelementcollectionitem.h
${QET_DIR}/sources/ElementsCollection/ui/renamedialog.cpp
${QET_DIR}/sources/ElementsCollection/ui/renamedialog.h
${QET_DIR}/sources/factory/elementfactory.cpp
${QET_DIR}/sources/factory/elementfactory.h
${QET_DIR}/sources/factory/elementpicturefactory.cpp
${QET_DIR}/sources/factory/elementpicturefactory.h
${QET_DIR}/sources/factory/propertieseditorfactory.cpp
${QET_DIR}/sources/factory/propertieseditorfactory.h
${QET_DIR}/sources/factory/qetgraphicstablefactory.cpp
${QET_DIR}/sources/factory/qetgraphicstablefactory.h
${QET_DIR}/sources/factory/ui/addtabledialog.cpp
${QET_DIR}/sources/factory/ui/addtabledialog.h
${QET_DIR}/sources/NameList/nameslist.cpp
${QET_DIR}/sources/NameList/nameslist.h
${QET_DIR}/sources/NameList/ui/namelistdialog.cpp
${QET_DIR}/sources/NameList/ui/namelistdialog.h
${QET_DIR}/sources/NameList/ui/namelistwidget.cpp
${QET_DIR}/sources/NameList/ui/namelistwidget.h
${QET_DIR}/sources/print/projectprintwindow.cpp
${QET_DIR}/sources/print/projectprintwindow.h
${QET_DIR}/sources/project/projectpropertieshandler.cpp
${QET_DIR}/sources/project/projectpropertieshandler.h
${QET_DIR}/sources/properties/elementdata.cpp
${QET_DIR}/sources/properties/elementdata.h
${QET_DIR}/sources/properties/propertiesinterface.cpp
${QET_DIR}/sources/properties/propertiesinterface.h
${QET_DIR}/sources/properties/reportproperties.cpp
${QET_DIR}/sources/properties/reportproperties.h
${QET_DIR}/sources/properties/terminaldata.cpp
${QET_DIR}/sources/properties/terminaldata.h
${QET_DIR}/sources/properties/xrefproperties.cpp
${QET_DIR}/sources/properties/xrefproperties.h
${QET_DIR}/sources/properties/userproperties.cpp
${QET_DIR}/sources/properties/userproperties.h
${QET_DIR}/sources/PropertiesEditor/propertieseditordialog.h
${QET_DIR}/sources/PropertiesEditor/propertieseditordockwidget.cpp
${QET_DIR}/sources/PropertiesEditor/propertieseditordockwidget.h
${QET_DIR}/sources/PropertiesEditor/propertieseditorwidget.cpp
${QET_DIR}/sources/PropertiesEditor/propertieseditorwidget.h
${QET_DIR}/pugixml/src/pugiconfig.hpp
${QET_DIR}/pugixml/src/pugixml.cpp
${QET_DIR}/pugixml/src/pugixml.hpp
${QET_DIR}/sources/qetgraphicsitem/conductor.cpp
${QET_DIR}/sources/qetgraphicsitem/conductor.h
${QET_DIR}/sources/qetgraphicsitem/conductortextitem.cpp
${QET_DIR}/sources/qetgraphicsitem/conductortextitem.h
${QET_DIR}/sources/qetgraphicsitem/crossrefitem.cpp
${QET_DIR}/sources/qetgraphicsitem/crossrefitem.h
${QET_DIR}/sources/qetgraphicsitem/diagramimageitem.cpp
${QET_DIR}/sources/qetgraphicsitem/diagramimageitem.h
${QET_DIR}/sources/qetgraphicsitem/diagramtextitem.cpp
${QET_DIR}/sources/qetgraphicsitem/diagramtextitem.h
${QET_DIR}/sources/qetgraphicsitem/dynamicelementtextitem.cpp
${QET_DIR}/sources/qetgraphicsitem/dynamicelementtextitem.h
${QET_DIR}/sources/qetgraphicsitem/element.cpp
${QET_DIR}/sources/qetgraphicsitem/element.h
${QET_DIR}/sources/qetgraphicsitem/elementtextitemgroup.cpp
${QET_DIR}/sources/qetgraphicsitem/elementtextitemgroup.h
${QET_DIR}/sources/qetgraphicsitem/independenttextitem.cpp
${QET_DIR}/sources/qetgraphicsitem/independenttextitem.h
${QET_DIR}/sources/qetgraphicsitem/masterelement.cpp
${QET_DIR}/sources/qetgraphicsitem/masterelement.h
${QET_DIR}/sources/qetgraphicsitem/qetgraphicsitem.cpp
${QET_DIR}/sources/qetgraphicsitem/qetgraphicsitem.h
${QET_DIR}/sources/qetgraphicsitem/qetshapeitem.cpp
${QET_DIR}/sources/qetgraphicsitem/qetshapeitem.h
${QET_DIR}/sources/qetgraphicsitem/qgraphicsitemutility.cpp
${QET_DIR}/sources/qetgraphicsitem/qgraphicsitemutility.h
${QET_DIR}/sources/qetgraphicsitem/reportelement.cpp
${QET_DIR}/sources/qetgraphicsitem/reportelement.h
${QET_DIR}/sources/qetgraphicsitem/simpleelement.cpp
${QET_DIR}/sources/qetgraphicsitem/simpleelement.h
${QET_DIR}/sources/qetgraphicsitem/slaveelement.cpp
${QET_DIR}/sources/qetgraphicsitem/slaveelement.h
${QET_DIR}/sources/qetgraphicsitem/terminal.cpp
${QET_DIR}/sources/qetgraphicsitem/terminalelement.cpp
${QET_DIR}/sources/qetgraphicsitem/terminalelement.h
${QET_DIR}/sources/qetgraphicsitem/terminal.h
${QET_DIR}/sources/qetgraphicsitem/ViewItem/projectdbmodel.cpp
${QET_DIR}/sources/qetgraphicsitem/ViewItem/projectdbmodel.h
${QET_DIR}/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.cpp
${QET_DIR}/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.h
${QET_DIR}/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp
${QET_DIR}/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.h
${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.cpp
${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.h
${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.cpp
${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.h
${QET_DIR}/sources/QetGraphicsItemModeler/qetgraphicshandleritem.cpp
${QET_DIR}/sources/QetGraphicsItemModeler/qetgraphicshandleritem.h
${QET_DIR}/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.cpp
${QET_DIR}/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.h
${QET_DIR}/sources/QPropertyUndoCommand/qpropertyundocommand.cpp
${QET_DIR}/sources/QPropertyUndoCommand/qpropertyundocommand.h
${QET_DIR}/sources/QWidgetAnimation/qwidgetanimation.cpp
${QET_DIR}/sources/QWidgetAnimation/qwidgetanimation.h
${QET_DIR}/sources/richtext/richtexteditor.cpp
${QET_DIR}/sources/richtext/richtexteditor_p.h
${QET_DIR}/sources/richtext/ui_addlinkdialog.h
${QET_DIR}/sources/SearchAndReplace/searchandreplaceworker.cpp
${QET_DIR}/sources/SearchAndReplace/searchandreplaceworker.h
${QET_DIR}/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp
${QET_DIR}/sources/SearchAndReplace/ui/replaceadvanceddialog.h
${QET_DIR}/sources/SearchAndReplace/ui/replaceconductordialog.cpp
${QET_DIR}/sources/SearchAndReplace/ui/replaceconductordialog.h
${QET_DIR}/sources/SearchAndReplace/ui/replaceelementdialog.cpp
${QET_DIR}/sources/SearchAndReplace/ui/replaceelementdialog.h
${QET_DIR}/sources/SearchAndReplace/ui/replacefoliowidget.cpp
${QET_DIR}/sources/SearchAndReplace/ui/replacefoliowidget.h
${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.cpp
${QET_DIR}/sources/SearchAndReplace/ui/searchandreplacewidget.h
${QET_DIR}/sources/titleblock/dimension.cpp
${QET_DIR}/sources/titleblock/dimension.h
${QET_DIR}/sources/titleblock/dimensionwidget.cpp
${QET_DIR}/sources/titleblock/dimensionwidget.h
${QET_DIR}/sources/titleblock/gridlayoutanimation.cpp
${QET_DIR}/sources/titleblock/gridlayoutanimation.h
${QET_DIR}/sources/titleblock/helpercell.cpp
${QET_DIR}/sources/titleblock/helpercell.h
${QET_DIR}/sources/titleblock/integrationmovetemplateshandler.cpp
${QET_DIR}/sources/titleblock/integrationmovetemplateshandler.h
${QET_DIR}/sources/titleblock/movetemplateshandler.h
${QET_DIR}/sources/titleblock/qettemplateeditor.cpp
${QET_DIR}/sources/titleblock/qettemplateeditor.h
${QET_DIR}/sources/titleblock/splittedhelpercell.cpp
${QET_DIR}/sources/titleblock/splittedhelpercell.h
${QET_DIR}/sources/titleblock/templatecellsset.cpp
${QET_DIR}/sources/titleblock/templatecellsset.h
${QET_DIR}/sources/titleblock/templatecellwidget.cpp
${QET_DIR}/sources/titleblock/templatecellwidget.h
${QET_DIR}/sources/titleblock/templatecommands.cpp
${QET_DIR}/sources/titleblock/templatecommands.h
${QET_DIR}/sources/titleblock/templatedeleter.cpp
${QET_DIR}/sources/titleblock/templatedeleter.h
${QET_DIR}/sources/titleblock/templatelocationchooser.cpp
${QET_DIR}/sources/titleblock/templatelocationchooser.h
${QET_DIR}/sources/titleblock/templatelocation.cpp
${QET_DIR}/sources/titleblock/templatelocation.h
${QET_DIR}/sources/titleblock/templatelocationsaver.cpp
${QET_DIR}/sources/titleblock/templatelocationsaver.h
${QET_DIR}/sources/titleblock/templatelogomanager.cpp
${QET_DIR}/sources/titleblock/templatelogomanager.h
${QET_DIR}/sources/titleblock/templatescollection.cpp
${QET_DIR}/sources/titleblock/templatescollection.h
${QET_DIR}/sources/titleblock/templateview.cpp
${QET_DIR}/sources/titleblock/templateview.h
${QET_DIR}/sources/titleblock/templatevisualcell.cpp
${QET_DIR}/sources/titleblock/templatevisualcell.h
${QET_DIR}/sources/TerminalStrip/physicalterminal.cpp
${QET_DIR}/sources/TerminalStrip/physicalterminal.h
${QET_DIR}/sources/TerminalStrip/realterminal.cpp
${QET_DIR}/sources/TerminalStrip/realterminal.h
${QET_DIR}/sources/TerminalStrip/terminalstripbridge.cpp
${QET_DIR}/sources/TerminalStrip/terminalstripbridge.h
${QET_DIR}/sources/TerminalStrip/terminalstrip.cpp
${QET_DIR}/sources/TerminalStrip/terminalstrip.h
${QET_DIR}/sources/TerminalStrip/terminalstripdata.cpp
${QET_DIR}/sources/TerminalStrip/terminalstripdata.h
${QET_DIR}/sources/TerminalStrip/ui/addterminalstripitemdialog.cpp
${QET_DIR}/sources/TerminalStrip/ui/addterminalstripitemdialog.h
${QET_DIR}/sources/TerminalStrip/ui/freeterminaleditor.cpp
${QET_DIR}/sources/TerminalStrip/ui/freeterminaleditor.h
${QET_DIR}/sources/TerminalStrip/ui/freeterminalmodel.cpp
${QET_DIR}/sources/TerminalStrip/ui/freeterminalmodel.h
${QET_DIR}/sources/TerminalStrip/ui/terminalstripcreatordialog.cpp
${QET_DIR}/sources/TerminalStrip/ui/terminalstripcreatordialog.h
${QET_DIR}/sources/TerminalStrip/ui/terminalstripeditor.cpp
${QET_DIR}/sources/TerminalStrip/ui/terminalstripeditor.h
${QET_DIR}/sources/TerminalStrip/ui/terminalstripeditorwindow.cpp
${QET_DIR}/sources/TerminalStrip/ui/terminalstripeditorwindow.h
${QET_DIR}/sources/TerminalStrip/ui/terminalstriplayouteditor.cpp
${QET_DIR}/sources/TerminalStrip/ui/terminalstriplayouteditor.h
${QET_DIR}/sources/TerminalStrip/ui/terminalstripmodel.cpp
${QET_DIR}/sources/TerminalStrip/ui/terminalstripmodel.h
${QET_DIR}/sources/TerminalStrip/ui/terminalstriptreedockwidget.cpp
${QET_DIR}/sources/TerminalStrip/ui/terminalstriptreedockwidget.h
${QET_DIR}/sources/TerminalStrip/ui/ConfigPage/terminalstripprojectconfigpage.cpp
${QET_DIR}/sources/TerminalStrip/ui/ConfigPage/terminalstripprojectconfigpage.h
${QET_DIR}/sources/TerminalStrip/UndoCommand/addterminalstripcommand.cpp
${QET_DIR}/sources/TerminalStrip/UndoCommand/addterminalstripcommand.h
${QET_DIR}/sources/TerminalStrip/UndoCommand/addterminaltostripcommand.cpp
${QET_DIR}/sources/TerminalStrip/UndoCommand/addterminaltostripcommand.h
${QET_DIR}/sources/TerminalStrip/UndoCommand/bridgeterminalscommand.cpp
${QET_DIR}/sources/TerminalStrip/UndoCommand/bridgeterminalscommand.h
${QET_DIR}/sources/TerminalStrip/UndoCommand/changeterminallevel.cpp
${QET_DIR}/sources/TerminalStrip/UndoCommand/changeterminallevel.h
${QET_DIR}/sources/TerminalStrip/UndoCommand/changeterminalstripcolor.cpp
${QET_DIR}/sources/TerminalStrip/UndoCommand/changeterminalstripcolor.h
${QET_DIR}/sources/TerminalStrip/UndoCommand/changeterminalstripdata.cpp
${QET_DIR}/sources/TerminalStrip/UndoCommand/changeterminalstripdata.h
${QET_DIR}/sources/TerminalStrip/UndoCommand/groupterminalscommand.cpp
${QET_DIR}/sources/TerminalStrip/UndoCommand/groupterminalscommand.h
${QET_DIR}/sources/TerminalStrip/UndoCommand/sortterminalstripcommand.cpp
${QET_DIR}/sources/TerminalStrip/UndoCommand/sortterminalstripcommand.h
${QET_DIR}/sources/TerminalStrip/GraphicsItem/demoterminalstrip.cpp
${QET_DIR}/sources/TerminalStrip/GraphicsItem/demoterminalstrip.h
${QET_DIR}/sources/TerminalStrip/GraphicsItem/terminalstripitem.cpp
${QET_DIR}/sources/TerminalStrip/GraphicsItem/terminalstripitem.h
${QET_DIR}/sources/TerminalStrip/GraphicsItem/trueterminalstrip.cpp
${QET_DIR}/sources/TerminalStrip/GraphicsItem/trueterminalstrip.h
${QET_DIR}/sources/TerminalStrip/GraphicsItem/terminalstripdrawer.cpp
${QET_DIR}/sources/TerminalStrip/GraphicsItem/terminalstripdrawer.h
${QET_DIR}/sources/TerminalStrip/GraphicsItem/properties/terminalstriplayoutpattern.cpp
${QET_DIR}/sources/TerminalStrip/GraphicsItem/properties/terminalstriplayoutpattern.h
${QET_DIR}/sources/TerminalStrip/GraphicsItem/properties/terminalstriplayoutshandler.cpp
${QET_DIR}/sources/TerminalStrip/GraphicsItem/properties/terminalstriplayoutshandler.h
${QET_DIR}/sources/ui/aboutqetdialog.cpp
${QET_DIR}/sources/ui/aboutqetdialog.h
${QET_DIR}/sources/ui/abstractelementpropertieseditorwidget.cpp
${QET_DIR}/sources/ui/abstractelementpropertieseditorwidget.h
${QET_DIR}/sources/ui/alignmenttextdialog.cpp
${QET_DIR}/sources/ui/alignmenttextdialog.h
${QET_DIR}/sources/ui/bomexportdialog.cpp
${QET_DIR}/sources/ui/bomexportdialog.h
${QET_DIR}/sources/ui/borderpropertieswidget.cpp
${QET_DIR}/sources/ui/borderpropertieswidget.h
${QET_DIR}/sources/ui/compositetexteditdialog.cpp
${QET_DIR}/sources/ui/compositetexteditdialog.h
${QET_DIR}/sources/ui/conductorpropertiesdialog.cpp
${QET_DIR}/sources/ui/conductorpropertiesdialog.h
${QET_DIR}/sources/ui/conductorpropertieswidget.cpp
${QET_DIR}/sources/ui/conductorpropertieswidget.h
${QET_DIR}/sources/ui/configsaveloaderwidget.cpp
${QET_DIR}/sources/ui/configsaveloaderwidget.h
${QET_DIR}/sources/ui/diagramcontextwidget.cpp
${QET_DIR}/sources/ui/diagramcontextwidget.h
${QET_DIR}/sources/ui/diagrameditorhandlersizewidget.cpp
${QET_DIR}/sources/ui/diagrameditorhandlersizewidget.h
${QET_DIR}/sources/ui/diagrampropertiesdialog.cpp
${QET_DIR}/sources/ui/diagrampropertiesdialog.h
${QET_DIR}/sources/ui/diagrampropertieseditordockwidget.cpp
${QET_DIR}/sources/ui/diagrampropertieseditordockwidget.h
${QET_DIR}/sources/ui/diagramselection.cpp
${QET_DIR}/sources/ui/diagramselection.h
${QET_DIR}/sources/ui/dialogwaiting.cpp
${QET_DIR}/sources/ui/dialogwaiting.h
${QET_DIR}/sources/ui/dynamicelementtextitemeditor.cpp
${QET_DIR}/sources/ui/dynamicelementtextitemeditor.h
${QET_DIR}/sources/ui/dynamicelementtextmodel.cpp
${QET_DIR}/sources/ui/dynamicelementtextmodel.h
${QET_DIR}/sources/ui/elementinfopartwidget.cpp
${QET_DIR}/sources/ui/elementinfopartwidget.h
${QET_DIR}/sources/ui/elementinfowidget.cpp
${QET_DIR}/sources/ui/elementinfowidget.h
${QET_DIR}/sources/ui/elementpropertieswidget.cpp
${QET_DIR}/sources/ui/elementpropertieswidget.h
${QET_DIR}/sources/ui/formulaassistantdialog.cpp
${QET_DIR}/sources/ui/formulaassistantdialog.h
${QET_DIR}/sources/ui/imagepropertieswidget.cpp
${QET_DIR}/sources/ui/imagepropertieswidget.h
${QET_DIR}/sources/ui/importelementdialog.cpp
${QET_DIR}/sources/ui/importelementdialog.h
${QET_DIR}/sources/ui/importelementtextpatterndialog.cpp
${QET_DIR}/sources/ui/importelementtextpatterndialog.h
${QET_DIR}/sources/ui/inditextpropertieswidget.cpp
${QET_DIR}/sources/ui/inditextpropertieswidget.h
${QET_DIR}/sources/ui/linksingleelementwidget.cpp
${QET_DIR}/sources/ui/linksingleelementwidget.h
${QET_DIR}/sources/ui/marginseditdialog.cpp
${QET_DIR}/sources/ui/marginseditdialog.h
${QET_DIR}/sources/ui/masterpropertieswidget.cpp
${QET_DIR}/sources/ui/masterpropertieswidget.h
${QET_DIR}/sources/ui/multipastedialog.cpp
${QET_DIR}/sources/ui/multipastedialog.h
${QET_DIR}/sources/ui/potentialselectordialog.cpp
${QET_DIR}/sources/ui/potentialselectordialog.h
${QET_DIR}/sources/ui/projectpropertiesdialog.cpp
${QET_DIR}/sources/ui/projectpropertiesdialog.h
${QET_DIR}/sources/ui/reportpropertiewidget.cpp
${QET_DIR}/sources/ui/reportpropertiewidget.h
${QET_DIR}/sources/ui/shapegraphicsitempropertieswidget.cpp
${QET_DIR}/sources/ui/shapegraphicsitempropertieswidget.h
${QET_DIR}/sources/ui/thirdpartybinaryinstalldialog.cpp
${QET_DIR}/sources/ui/thirdpartybinaryinstalldialog.h
${QET_DIR}/sources/ui/titleblockpropertieswidget.cpp
${QET_DIR}/sources/ui/titleblockpropertieswidget.h
${QET_DIR}/sources/ui/xrefpropertieswidget.cpp
${QET_DIR}/sources/ui/xrefpropertieswidget.h
${QET_DIR}/sources/ui/configpage/configpage.h
${QET_DIR}/sources/ui/configpage/configpages.cpp
${QET_DIR}/sources/ui/configpage/configpages.h
${QET_DIR}/sources/ui/configpage/generalconfigurationpage.cpp
${QET_DIR}/sources/ui/configpage/generalconfigurationpage.h
${QET_DIR}/sources/ui/configpage/projectconfigpages.cpp
${QET_DIR}/sources/ui/configpage/projectconfigpages.h
${QET_DIR}/sources/undocommand/addelementtextcommand.cpp
${QET_DIR}/sources/undocommand/addelementtextcommand.h
${QET_DIR}/sources/undocommand/addgraphicsobjectcommand.cpp
${QET_DIR}/sources/undocommand/addgraphicsobjectcommand.h
${QET_DIR}/sources/undocommand/changeelementdatacommand.cpp
${QET_DIR}/sources/undocommand/changeelementdatacommand.h
${QET_DIR}/sources/undocommand/changeelementinformationcommand.cpp
${QET_DIR}/sources/undocommand/changeelementinformationcommand.h
${QET_DIR}/sources/undocommand/changetitleblockcommand.cpp
${QET_DIR}/sources/undocommand/changetitleblockcommand.h
${QET_DIR}/sources/undocommand/deleteqgraphicsitemcommand.cpp
${QET_DIR}/sources/undocommand/deleteqgraphicsitemcommand.h
${QET_DIR}/sources/undocommand/itemmodelcommand.cpp
${QET_DIR}/sources/undocommand/itemmodelcommand.h
${QET_DIR}/sources/undocommand/linkelementcommand.cpp
${QET_DIR}/sources/undocommand/linkelementcommand.h
${QET_DIR}/sources/undocommand/rotateselectioncommand.cpp
${QET_DIR}/sources/undocommand/rotateselectioncommand.h
${QET_DIR}/sources/undocommand/rotatetextscommand.cpp
${QET_DIR}/sources/undocommand/rotatetextscommand.h
${QET_DIR}/sources/undocommand/movegraphicsitemcommand.cpp
${QET_DIR}/sources/undocommand/movegraphicsitemcommand.h
${QET_DIR}/sources/utils/conductorcreator.cpp
${QET_DIR}/sources/utils/conductorcreator.h
${QET_DIR}/sources/utils/macosxopenevent.cpp
${QET_DIR}/sources/utils/macosxopenevent.h
${QET_DIR}/sources/utils/qetsettings.cpp
${QET_DIR}/sources/utils/qetsettings.h
${QET_DIR}/sources/utils/qetutils.cpp
${QET_DIR}/sources/utils/qetutils.h
${QET_DIR}/sources/xml/terminalstripitemxml.cpp
${QET_DIR}/sources/xml/terminalstripitemxml.h
)
set(TS_FILES
${QET_DIR}/lang/qet_ar.ts
${QET_DIR}/lang/qet_ca.ts
${QET_DIR}/lang/qet_cs.ts
${QET_DIR}/lang/qet_da.ts
${QET_DIR}/lang/qet_de.ts
${QET_DIR}/lang/qet_el.ts
${QET_DIR}/lang/qet_en.ts
${QET_DIR}/lang/qet_es.ts
${QET_DIR}/lang/qet_fi.ts
${QET_DIR}/lang/qet_fr.ts
${QET_DIR}/lang/qet_hr.ts
${QET_DIR}/lang/qet_hu.ts
${QET_DIR}/lang/qet_it.ts
${QET_DIR}/lang/qet_ja.ts
${QET_DIR}/lang/qet_mn.ts
${QET_DIR}/lang/qet_nb.ts
${QET_DIR}/lang/qet_nl.ts
${QET_DIR}/lang/qet_nl_BE.ts
${QET_DIR}/lang/qet_no.ts
${QET_DIR}/lang/qet_pl.ts
${QET_DIR}/lang/qet_pt.ts
${QET_DIR}/lang/qet_pt_BR.ts
${QET_DIR}/lang/qet_ro.ts
${QET_DIR}/lang/qet_rs.ts
${QET_DIR}/lang/qet_ru.ts
${QET_DIR}/lang/qet_sk.ts
${QET_DIR}/lang/qet_sl.ts
${QET_DIR}/lang/qet_sr.ts
${QET_DIR}/lang/qet_sv.ts
${QET_DIR}/lang/qet_tr.ts
${QET_DIR}/lang/qet_uk.ts
${QET_DIR}/lang/qet_zh.ts
)

32
cmake/start_options.cmake Normal file
View File

@@ -0,0 +1,32 @@
# Copyright 2006 The QElectroTech Team
# This file is part of QElectroTech.
#
# QElectroTech is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# QElectroTech is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
message(" - start_options")
# Comment the line below to deactivate the --common-elements-dir option
add_definitions(-DQET_ALLOW_OVERRIDE_CED_OPTION)
# Comment the line below to disable the --common-tbt-dir option
add_definitions(-DQET_ALLOW_OVERRIDE_CTBTD_OPTION)
# Comment the line below to deactivate the --config-dir option
add_definitions(-DQET_ALLOW_OVERRIDE_CD_OPTION)
# Comment the line below to deactivate the --data-dir option
add_definitions(-DQET_ALLOW_OVERRIDE_DD_OPTION)
#comment the line below to disable the project database export
#add_definitions(-DQET_EXPORT_PROJECT_DB) #error Todo

View File

@@ -11,6 +11,7 @@ DiagramImageItem + 1007
QetShapItem + 1008
crossRefItem + 1009
DynamiqueElementTextItem + 1010
TerminalStripItem +1011
ElementPrimitiveDecorator + 2200
###ELEMENT EDITOR###

1
elements Submodule

Submodule elements added at 9f20b039b7

View File

@@ -1,24 +0,0 @@
<definition width="70" version="0.3" hotspot_x="49" hotspot_y="15" height="30" type="element" ic="true" orientation="dyyy"
link_type="previous_report">
<uuid uuid="{F549BEFB-F0CF-44ED-A948-F6F796BFB421}"/><names>
<name lang="ru">Предыдущая страница</name>
<name lang="ar">الصفحة السابقة</name>
<name lang="de">Vorherige Folie</name>
<name lang="el">Προηγούμενη σελίδα</name>
<name lang="en">Coming arrow</name>
<name lang="it">Foglio precedente</name>
<name lang="fr">Folio précédent</name>
<name lang="pl">Wejście adresowe</name>
<name lang="es">folio anterior</name>
<name lang="cs">Předchozí list</name>
<name lang="nl">Referentie Vorig</name>
</names>
<informations>Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<polygon x4="-1" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" closed="false" y1="-4" x1="-1" y2="4" x2="-1" y3="0" x3="9" y4="-4"/>
<line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="9" y2="0" x2="12"/>
<input x="-44" y="0" size="9" rotate="true" text="/"/>
<terminal x="13" y="0" nameHidden="0" number="" name="" orientation="e"/>
</description>
</definition>

View File

@@ -1,24 +0,0 @@
<definition width="40" version="0.3" hotspot_x="18" hotspot_y="15" height="30" type="element" ic="true" orientation="dyyy"
link_type="next_report">
<uuid uuid="{717352A1-F3C7-49C7-9A06-51620AB5CA00}"/><names>
<name lang="ru">Следующая страница</name>
<name lang="ar">الصفحة التالية</name>
<name lang="de">Nächste Folie</name>
<name lang="el">Επόμενη σελίδα</name>
<name lang="en">Going arrow</name>
<name lang="it">Foglio successivo</name>
<name lang="fr">Folio suivant</name>
<name lang="pl">Wyjście adresowe</name>
<name lang="es">Folio siguiente</name>
<name lang="cs">Další list</name>
<name lang="nl">Referentie volgend</name>
</names>
<informations>Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<polygon x4="-9" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" closed="false" y1="-4" x1="-9" y2="4" x2="-9" y3="0" x3="2" y4="-4"/>
<line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-9" y2="0" x2="-12"/>
<input x="6" y="0" size="9" rotate="true" text="/"/>
<terminal x="-13" y="0" nameHidden="0" number="" name="" orientation="w"/>
</description>
</definition>

View File

@@ -1,16 +0,0 @@
<qet-directory>
<names>
<name lang="ru">Точки разрыва</name>
<name lang="ar">إحالات</name>
<name lang="cs">Výstupy</name>
<name lang="de">Folienverweise</name>
<name lang="el">Αναφορές σελίδας</name>
<name lang="en">Folio referencing</name>
<name lang="fr">Reports de folio</name>
<name lang="it">Riferimenti</name>
<name lang="pl">Odsyłacze</name>
<name lang="es">Referencias</name>
<name lang="nl">Referenties</name>
<name lang="da">Ark henvisninger</name>
</names>
</qet-directory>

View File

@@ -1,37 +0,0 @@
<definition type="element" orientation="dyyy" height="80" hotspot_y="40" version="0.70" width="50" hotspot_x="23" link_type="simple">
<uuid uuid="{65b9e889-c2eb-4d85-aa9e-c1dff55678f5}"/>
<names>
<name lang="en">Three-pole source + PEN</name>
<name lang="el">Τριφασικό + PEN</name>
<name lang="es">Fuente tripolar + PEN</name>
<name lang="nl">driefasen + aardenul</name>
<name lang="pl">Linia trójfazowa (PEN)</name>
<name lang="it">Sorgente tripolare + PEN</name>
<name lang="de">Drehstrom + PEN</name>
<name lang="ru">Трёхполюсный + PEN</name>
<name lang="fr">Source tripolaire + PEN</name>
<name lang="ar">مصدر ثلاثي القطبيّة + PEN</name>
<name lang="cs">3 fáze + PEN pravý</name>
</names>
<elementInformations/>
<informations>Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<dynamic_text z="1" Valignment="AlignTop" x="-7" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" uuid="{7c68cf51-b979-4e89-97b2-a93b5ad61f95}" y="-60.45" Halignment="AlignLeft" frame="false" text_width="-1">
<text></text>
<info_name>label</info_name>
</dynamic_text>
<text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="33" text="PEN" color="#000000"/>
<text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="13" text="L3" color="#000000"/>
<text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-7" text="L2" color="#000000"/>
<text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-27" text="L1" color="#000000"/>
<line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-30" end1="none" y1="-30" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
<line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-10" end1="none" y1="-10" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
<line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="10" end1="none" y1="10" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
<line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-14" y2="30" end1="none" y1="30" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
<terminal orientation="w" x="-15" y="-30"/>
<terminal orientation="w" x="-15" y="-10"/>
<terminal orientation="w" x="-15" y="30"/>
<terminal orientation="w" x="-15" y="10"/>
</description>
</definition>

View File

@@ -1,40 +0,0 @@
<definition type="element" orientation="dyyy" height="100" hotspot_y="40" version="0.70" width="40" hotspot_x="20" link_type="simple">
<uuid uuid="{b4b70d3d-8784-4323-b17b-d8ff3677cdc1}"/>
<names>
<name lang="en">Three-pole source + PEN</name>
<name lang="el">Τριφασικό + PEN</name>
<name lang="es">Fuente tripolar + PEN</name>
<name lang="nl">driefasen + aardenul</name>
<name lang="pl">Linia trójfazowa (PEN)</name>
<name lang="it">Sorgente tripolare + PEN</name>
<name lang="de">Drehstrom + PEN</name>
<name lang="ru">Трёхполюсный + PEN</name>
<name lang="fr">Source tripolaire + PEN</name>
<name lang="ar">مصدر ثلاثي القطبيّة + PEN</name>
<name lang="cs">3 fáze + N+PE pravý</name>
</names>
<elementInformations/>
<informations>Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<dynamic_text z="1" Valignment="AlignTop" x="-7" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" uuid="{1955f25e-b33b-4106-8b36-46862006122c}" y="-60.45" Halignment="AlignLeft" frame="false" text_width="-1">
<text></text>
<info_name>label</info_name>
</dynamic_text>
<text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="53" text="PE" color="#000000"/>
<text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="33" text="N" color="#000000"/>
<line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="50" end1="none" y1="50" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
<text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="13" text="L3" color="#000000"/>
<text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-7" text="L2" color="#000000"/>
<text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-27" text="L1" color="#000000"/>
<line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-30" end1="none" y1="-30" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
<line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-10" end1="none" y1="-10" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
<line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="10" end1="none" y1="10" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
<line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="30" end1="none" y1="30" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
<terminal orientation="w" x="-15" y="50"/>
<terminal orientation="w" x="-15" y="-30"/>
<terminal orientation="w" x="-15" y="-10"/>
<terminal orientation="w" x="-15" y="30"/>
<terminal orientation="w" x="-15" y="10"/>
</description>
</definition>

View File

@@ -1,42 +0,0 @@
<definition height="50" width="30" link_type="terminal" hotspot_x="16" version="0.80" orientation="dyyy" type="element" hotspot_y="29">
<uuid uuid="{a98ac40d-9055-4b9b-88ab-cffe6b08ed37}"/>
<names>
<name lang="ro">Masă</name>
<name lang="pt">Massa</name>
<name lang="cs">Kostra</name>
<name lang="it">Massa</name>
<name lang="nl">Massa</name>
<name lang="el">Γείωση</name>
<name lang="ru">Шасси</name>
<name lang="de">Masse</name>
<name lang="en">Ground</name>
<name lang="pl">Masa</name>
<name lang="es">Masa</name>
<name lang="ar">هيكل معدني</name>
<name lang="fr">Masse</name>
</names>
<elementInformations>
<elementInformation name="comment" show="1"></elementInformation>
<elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
<elementInformation name="manufacturer_reference" show="1"></elementInformation>
<elementInformation name="description" show="1"></elementInformation>
<elementInformation name="manufacturer" show="1"></elementInformation>
<elementInformation name="designation" show="1"></elementInformation>
<elementInformation name="quantity" show="1"></elementInformation>
<elementInformation name="unity" show="1"></elementInformation>
<elementInformation name="supplier" show="1"></elementInformation>
<elementInformation name="plant" show="1"></elementInformation>
<elementInformation name="label" show="1"></elementInformation>
</elementInformations>
<informations>titus&#xd;
titus0818@yahoo.com</informations>
<description>
<line y1="-16" x1="0" style="line-style:normal;line-weight:hight;filling:none;color:black" end2="none" y2="13" length2="1.5" length1="1.5" x2="0" end1="none" antialias="false"/>
<line y1="14" x1="-13.6493" style="line-style:normal;line-weight:hight;filling:none;color:black" end2="none" y2="14" length2="1.5" length1="1.5" x2="12.62" end1="none" antialias="false"/>
<dynamic_text uuid="{7f02ce13-533d-4501-980d-6cb67bd1110d}" Halignment="AlignLeft" frame="false" x="8" Valignment="AlignTop" text_from="ElementInfo" y="-9" font="Sans Serif,9,-1,5,50,0,0,0,0,0" z="3" rotation="0" text_width="-1">
<text></text>
<info_name>label</info_name>
</dynamic_text>
<terminal x="0" y="-20" orientation="n"/>
</description>
</definition>

View File

@@ -1,30 +0,0 @@
<definition width="20" link_type="simple" version="0.5" hotspot_x="9" orientation="dyyy" height="30" hotspot_y="20" type="element">
<uuid uuid="{5983fe6f-de69-4368-a387-a6ce3b9c2951}"/>
<names>
<name lang="pt">Massa</name>
<name lang="es">Masa</name>
<name lang="nl">Massa</name>
<name lang="el">Σασί</name>
<name lang="de">Masse</name>
<name lang="cs">Kostra</name>
<name lang="pl">Masa</name>
<name lang="it">Massa</name>
<name lang="ar">هيكل معدني</name>
<name lang="en">Chassis</name>
<name lang="fr">Masse</name>
<name lang="ru">Шасси</name>
</names>
<informations>Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<input x="3" y="-12.45" tagg="label" size="9" rotate="true" text="_"/>
<line antialias="false" length1="1.5" x2="5" end2="none" x1="7.5" end1="none" y2="3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0.5"/>
<line antialias="false" length1="1.5" x2="1.5" end2="none" x1="-1" end1="none" y2="0.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3"/>
<line antialias="false" length1="1.5" x2="-4.5" end2="none" x1="-7" end1="none" y2="0.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3"/>
<line antialias="false" length1="1.5" x2="4.5" end2="none" x1="2" end1="none" y2="0.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3"/>
<line antialias="false" length1="1.5" x2="-1.5" end2="none" x1="-4" end1="none" y2="0.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3"/>
<line antialias="false" length1="1.5" x2="8" end2="none" x1="-7" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
<line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
<terminal x="0" y="-11" orientation="n"/>
</description>
</definition>

View File

@@ -1,15 +0,0 @@
<qet-directory>
<names>
<name lang="ru">Подвод питания, сеть</name>
<name lang="en">Network sources</name>
<name lang="fr">Sources réseau</name>
<name lang="it">Alimentazione da rete</name>
<name lang="pl">Sieć elektroenergetyczna</name>
<name lang="de">Netzquellen</name>
<name lang="el">Παροχές δικτύου</name>
<name lang="nl">Netvoedingen</name>
<name lang="cs">Síťové zdroje</name>
<name lang="es">Fuentes de red</name>
<name lang="da">Netværkskilder</name>
</names>
</qet-directory>

View File

@@ -1,30 +0,0 @@
<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="60" hotspot_y="30" type="element">
<uuid uuid="{35f2834a-308b-4e79-bc2a-1c00486b24e7}"/>
<names>
<name lang="es">Fuente unipolo + PE +N</name>
<name lang="nl">1 fase + aarde + nul</name>
<name lang="el">Μονοφασικό +N +PE</name>
<name lang="de">Wechselstrom + PE +N</name>
<name lang="cs">1 fáze + PE +N</name>
<name lang="pl">Linia jednofazowa (trójprzewodowa)</name>
<name lang="it">Sorgente unipolare + PE +N</name>
<name lang="ar">مصدر وحيد القطبية + أرضي PE + محايد N</name>
<name lang="en">Single-pole source + PE +N</name>
<name lang="fr">Source unipolaire + PE +N</name>
<name lang="ru">Однополюсный + PE +N</name>
</names>
<informations>Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<input x="-12" y="-34.45" tagg="label" size="9" rotate="true" text="_"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
<text x="-12" y="23" size="5" text="PE"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
<text x="-12" y="3" size="5" text="N"/>
<text x="-12" y="-17" size="5" text="L"/>
<terminal x="10" y="0" orientation="e"/>
<terminal x="10" y="20" orientation="e"/>
<terminal x="10" y="-20" orientation="e"/>
</description>
</definition>

View File

@@ -1,27 +0,0 @@
<definition width="40" link_type="simple" version="0.5" hotspot_x="22" orientation="dyyy" height="40" hotspot_y="20" type="element">
<uuid uuid="{fd042050-e73b-4f95-b4c1-834aa403b07a}"/>
<names>
<name lang="es">Fuente unipolo + PEN</name>
<name lang="nl">1 fase + aardenul</name>
<name lang="el">Μονοφασικό +PEN</name>
<name lang="de">Wechselstrom + PEN</name>
<name lang="cs">1 fáze + PEN</name>
<name lang="pl">Linia jednofazowa (TN-C)</name>
<name lang="it">Sorgente unipolare + PEN</name>
<name lang="ar">مصدر وحيد القطبية +PEN</name>
<name lang="en">Single-pole source +PEN</name>
<name lang="fr">Source unipolaire + PEN</name>
<name lang="ru">Однополюсный + PEN</name>
</names>
<informations>Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<input x="-7" y="-23.45" tagg="label" size="9" rotate="true" text="_"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
<text x="-16" y="12" size="5" text="PEN"/>
<text x="-15" y="-7" size="5" text="L"/>
<terminal x="10" y="-10" orientation="e"/>
<terminal x="10" y="10" orientation="e"/>
</description>
</definition>

View File

@@ -1,28 +0,0 @@
<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="40" hotspot_y="20" type="element">
<uuid uuid="{457a0c01-871c-40fd-83d7-14033333fb95}"/>
<names>
<name lang="pt">Fonte unipolar + neutro</name>
<name lang="es">Fuente unipolo + neutro</name>
<name lang="nl">Wisselspanning L + nul N</name>
<name lang="el">Μονοφασικό + Ουδέτερος</name>
<name lang="de">Wechselstrom L + N</name>
<name lang="cs">Jednopólový zdroj + nulový</name>
<name lang="pl">Linia jednofazowa (dwuprzewodowa)</name>
<name lang="it">Sorgente unipolare + neutro</name>
<name lang="ar">مصدر وحيد القطبية + محايد N</name>
<name lang="en">Single-pole source + neutral</name>
<name lang="fr">Source unipolaire + neutre</name>
<name lang="ru">Однополюсный + нейтраль</name>
</names>
<informations>Author: The QElectroTech team&#xd;
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<input x="-5" y="-25.45" tagg="label" size="9" rotate="true" text="_"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
<text x="-12" y="13" size="5" text="N"/>
<text x="-12" y="-7" size="5" text="L"/>
<terminal x="10" y="-10" orientation="e"/>
<terminal x="10" y="10" orientation="e"/>
</description>
</definition>

View File

@@ -1,31 +0,0 @@
<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="60" hotspot_y="30" type="element">
<uuid uuid="{03b9e482-cb45-4bee-8030-96b93624fc60}"/>
<names>
<name lang="pt">Fonte tripolar</name>
<name lang="es">Fuente tripolar</name>
<name lang="nl">3fasen</name>
<name lang="el">Τριφασικό</name>
<name lang="de">Drehstrom</name>
<name lang="cs">Třípólový zdroj</name>
<name lang="pl">Linia trójfazowa (trójprzewodowa)</name>
<name lang="it">Sorgente tripolare</name>
<name lang="ar">مصدر ثلاثي القطبيّة</name>
<name lang="en">Three-pole source</name>
<name lang="fr">Source tripolaire</name>
<name lang="ru">Трёхполюсный</name>
</names>
<informations>Author: The QElectroTech team&#xd;
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<input x="-2" y="-34.45" tagg="label" size="9" rotate="true" text="_"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
<text x="-12" y="23" size="5" text="L3"/>
<text x="-12" y="3" size="5" text="L2"/>
<text x="-12" y="-17" size="5" text="L1"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
<terminal x="10" y="-20" orientation="e"/>
<terminal x="10" y="0" orientation="e"/>
<terminal x="10" y="20" orientation="e"/>
</description>
</definition>

View File

@@ -1,36 +0,0 @@
<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="100" hotspot_y="50" type="element">
<uuid uuid="{0e017749-6c0f-44c0-8726-6804be8bbee7}"/>
<names>
<name lang="es">Fuente tripolar + PE +N</name>
<name lang="nl">driefase + aarde + nul</name>
<name lang="el">Τριφασικό +N +PE</name>
<name lang="de">Drehstrom + PE +N</name>
<name lang="cs">3 fáze + PE +N</name>
<name lang="pl">Linia trójfazowa (pięcioprzewodowa)</name>
<name lang="it">Sorgente tripolare +PE + N</name>
<name lang="ar">مصدر ثلاثي القطبية + PE + N</name>
<name lang="en">Three-pole source + PE +N</name>
<name lang="fr">Source tripolaire + PE +N</name>
<name lang="ru">Трёхполюсный + PE +N</name>
</names>
<informations>Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<input x="3" y="-59.45" tagg="label" size="9" rotate="true" text="_"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
<text x="-12" y="43" size="5" text="PE"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
<text x="-12" y="23" size="5" text="N"/>
<text x="-12" y="3" size="5" text="L3"/>
<text x="-12" y="-17" size="5" text="L2"/>
<text x="-12" y="-37" size="5" text="L1"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40"/>
<terminal x="10" y="-20" orientation="e"/>
<terminal x="10" y="-40" orientation="e"/>
<terminal x="10" y="0" orientation="e"/>
<terminal x="10" y="20" orientation="e"/>
<terminal x="10" y="40" orientation="e"/>
</description>
</definition>

View File

@@ -1,33 +0,0 @@
<definition width="40" link_type="simple" version="0.5" hotspot_x="23" orientation="dyyy" height="80" hotspot_y="41" type="element">
<uuid uuid="{c0913e95-3b3c-4dc2-a74d-bc73ded78c32}"/>
<names>
<name lang="es">Fuente tripolar + PEN</name>
<name lang="nl">driefasen + aardenul</name>
<name lang="el">Τριφασικό + PEN</name>
<name lang="de">Drehstrom + PEN</name>
<name lang="cs">3 fáze + PEN</name>
<name lang="pl">Linia trójfazowa (PEN)</name>
<name lang="it">Sorgente tripolare + PEN</name>
<name lang="ar">مصدر ثلاثي القطبيّة + PEN</name>
<name lang="en">Three-pole source + PEN</name>
<name lang="fr">Source tripolaire + PEN</name>
<name lang="ru">Трёхполюсный + PEN</name>
</names>
<informations>Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<input x="-7" y="-49.45" tagg="label" size="9" rotate="true" text="_"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
<text x="-18" y="32" size="5" text="PEN"/>
<text x="-18" y="12" size="5" text="L3"/>
<text x="-18" y="-8" size="5" text="L2"/>
<text x="-18" y="-28" size="5" text="L1"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
<terminal x="10" y="-30" orientation="e"/>
<terminal x="10" y="-10" orientation="e"/>
<terminal x="10" y="10" orientation="e"/>
<terminal x="10" y="30" orientation="e"/>
</description>
</definition>

View File

@@ -1,34 +0,0 @@
<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="80" hotspot_y="40" type="element">
<uuid uuid="{8bfb1790-0735-47d5-88a2-8b4d91aba2f1}"/>
<names>
<name lang="pt">Fonte tripolar + neutro</name>
<name lang="es">Fuente tripolar + neutro</name>
<name lang="nl">Driefasen + nul</name>
<name lang="el">Τριφασικό + Ουδέτερος</name>
<name lang="de">Dreiphasig + Neutral</name>
<name lang="cs">Třípólový zdroj + nulový</name>
<name lang="pl">Linia trójfazowa (czteroprzewodowa)</name>
<name lang="it">Sorgente tripolare + neutro</name>
<name lang="ar">مصدر ثلاثي القطبيّة + محايد</name>
<name lang="en">Three-pole source + neutral</name>
<name lang="fr">Source tripolaire + neutre</name>
<name lang="ru">Трёхполюсный + нейтраль</name>
</names>
<informations>Author: The QElectroTech team&#xd;
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<input x="-7" y="-44.45" tagg="label" size="9" rotate="true" text="_"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
<text x="-12" y="33" size="5" text="N"/>
<text x="-12" y="13" size="5" text="L3"/>
<text x="-12" y="-7" size="5" text="L2"/>
<text x="-12" y="-27" size="5" text="L1"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
<terminal x="10" y="10" orientation="e"/>
<terminal x="10" y="30" orientation="e"/>
<terminal x="10" y="-30" orientation="e"/>
<terminal x="10" y="-10" orientation="e"/>
</description>
</definition>

View File

@@ -1,25 +0,0 @@
<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="20" hotspot_y="10" type="element">
<uuid uuid="{b5ad2e41-804d-4745-99be-e8951cffdf98}"/>
<names>
<name lang="pt">Fonte de neutro</name>
<name lang="es">Fuente neutro</name>
<name lang="nl">Nul voeding</name>
<name lang="el">Ουδέτερος</name>
<name lang="de">Neutralleiter</name>
<name lang="cs">Nulový zdroj</name>
<name lang="pl">Przewód neutralny</name>
<name lang="it">Sorgente neutro</name>
<name lang="ar">مصدر محايد</name>
<name lang="en">Neutral source</name>
<name lang="fr">Source neutre</name>
<name lang="ru">Нейтраль</name>
</names>
<informations>Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
<input x="-5" y="-14.45" tagg="label" size="9" rotate="true" text="_"/>
<text x="-12" y="3" size="5" text="N"/>
<terminal x="10" y="0" orientation="e"/>
</description>
</definition>

View File

@@ -1,25 +0,0 @@
<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="20" hotspot_y="10" type="element">
<uuid uuid="{7693c5e0-762b-4309-8d97-cb74619f9efd}"/>
<names>
<name lang="pt">Fonte de fase</name>
<name lang="es">Fuente fase</name>
<name lang="nl">Fase</name>
<name lang="el">Φάση</name>
<name lang="de">Phase</name>
<name lang="cs">Fázový zdroj</name>
<name lang="pl">Przewód liniowy</name>
<name lang="it">Sorgente fase</name>
<name lang="ar">مصدر وجه</name>
<name lang="en">Phase source</name>
<name lang="fr">Source phase</name>
<name lang="ru">Фаза</name>
</names>
<informations>Author: The QElectroTech team&#xd;
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<input x="-6" y="-14.45" tagg="label" size="9" rotate="true" text="_"/>
<line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
<text x="-12" y="3" size="5" text="L"/>
<terminal x="10" y="0" orientation="e"/>
</description>
</definition>

View File

@@ -1,48 +0,0 @@
<definition width="70" link_type="simple" version="0.5" hotspot_x="34" orientation="dyyy" height="100" hotspot_y="40" type="element">
<uuid uuid="{4b9794cf-e7c0-4f59-aa0a-bb1fce4dfe48}"/>
<names>
<name lang="es">Punto de distribución TN-C > TN-S</name>
<name lang="nl">Net TN-C > TN-S</name>
<name lang="de">Netz TNC > TNS</name>
<name lang="cs">Bod rozdělení TN-C > TN-S</name>
<name lang="pl">Linia trójfazowa (TN-C-S)</name>
<name lang="it">Punto di distribuzione TN-C</name>
<name lang="ar">نقطة توزيع TN-C &lt; TN-S </name>
<name lang="en">Distribution point TN-C >TN-S</name>
<name lang="fr">Point de distribution TN-C >TN-S</name>
<name lang="ru">Распределительный пункт TN-C >TN-S</name>
</names>
<informations>Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<line antialias="false" length1="1.5" x2="28" end2="none" x1="24" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
<input x="-17" y="-49.45" tagg="label" size="9" rotate="true" text="_"/>
<line antialias="false" length1="1.5" x2="28" end2="none" x1="24" end1="none" y2="50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50"/>
<line antialias="false" length1="1.5" x2="28" end2="none" x1="24" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
<line antialias="false" length1="1.5" x2="28" end2="none" x1="24" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
<line antialias="false" length1="1.5" x2="28" end2="none" x1="24" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
<line antialias="false" length1="1.5" x2="-4" end2="none" x1="-6" end1="none" y2="54" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="54"/>
<line antialias="false" length1="1.5" x2="-2" end2="none" x1="-8" end1="none" y2="52" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="52"/>
<line antialias="false" length1="1.5" x2="0" end2="none" x1="-10" end1="none" y2="50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50"/>
<text x="13" y="53" size="5" text="PE"/>
<text x="13" y="33" size="5" text="N"/>
<text x="13" y="13" size="5" text="L3"/>
<text x="13" y="-7" size="5" text="L2"/>
<text x="13" y="-27" size="5" text="L1"/>
<line antialias="false" length1="1.5" x2="12" end2="none" x1="-13" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
<line antialias="false" length1="1.5" x2="12" end2="none" x1="7" end1="none" y2="50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50"/>
<line antialias="false" length1="1.5" x2="12" end2="none" x1="-13" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
<line antialias="false" length1="1.5" x2="12" end2="none" x1="-13" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
<text x="-30" y="33" size="5" text="PEN"/>
<text x="-30" y="13" size="5" text="L3"/>
<text x="-30" y="-7" size="5" text="L2"/>
<text x="-30" y="-27" size="5" text="L1"/>
<line antialias="false" length1="1.5" x2="12" end2="none" x1="-13" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
<polygon antialias="true" x2="-5" x1="7" x3="-5" y2="30" y3="49" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50"/>
<terminal x="30" y="-10" orientation="e"/>
<terminal x="30" y="10" orientation="e"/>
<terminal x="30" y="30" orientation="e"/>
<terminal x="30" y="50" orientation="e"/>
<terminal x="30" y="-30" orientation="e"/>
</description>
</definition>

View File

@@ -1,43 +0,0 @@
<definition height="30" width="20" link_type="terminal" hotspot_x="10" version="0.80" orientation="dyyy" type="element" hotspot_y="19">
<uuid uuid="{e4e753a8-9fde-4e8e-9256-0cf99d67e3de}"/>
<names>
<name lang="pt">Terra</name>
<name lang="cs">Země</name>
<name lang="it">Terra</name>
<name lang="el">Γείωση</name>
<name lang="nl">Aarde</name>
<name lang="ru">Земля</name>
<name lang="de">Erde</name>
<name lang="en">Ground</name>
<name lang="pl">Uziemienie</name>
<name lang="es">Tierra</name>
<name lang="ar">تأريض</name>
<name lang="fr">Terre</name>
</names>
<elementInformations>
<elementInformation name="comment" show="1"></elementInformation>
<elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
<elementInformation name="manufacturer_reference" show="1"></elementInformation>
<elementInformation name="description" show="1"></elementInformation>
<elementInformation name="manufacturer" show="1"></elementInformation>
<elementInformation name="designation" show="1"></elementInformation>
<elementInformation name="quantity" show="1"></elementInformation>
<elementInformation name="unity" show="1"></elementInformation>
<elementInformation name="supplier" show="1"></elementInformation>
<elementInformation name="plant" show="1"></elementInformation>
<elementInformation name="label" show="1"></elementInformation>
</elementInformations>
<informations>Author: The QElectroTech team&#xd;
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<dynamic_text uuid="{0af57a27-1887-4576-8b51-200ca996e582}" Halignment="AlignLeft" frame="false" x="2" Valignment="AlignTop" text_from="ElementInfo" y="-22.5" font="Sans Serif,9,-1,5,50,0,0,0,0,0" z="1" rotation="0" text_width="-1">
<text></text>
<info_name>label</info_name>
</dynamic_text>
<line y1="4" x1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" y2="4" length2="1.5" length1="1.5" x2="3" end1="none" antialias="false"/>
<line y1="2" x1="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" y2="2" length2="1.5" length1="1.5" x2="5" end1="none" antialias="false"/>
<line y1="0" x1="-7" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" y2="0" length2="1.5" length1="1.5" x2="7" end1="none" antialias="false"/>
<line y1="-10" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" y2="0" length2="1.5" length1="1.5" x2="0" end1="none" antialias="false"/>
<terminal x="0" y="-11" orientation="n"/>
</description>
</definition>

View File

@@ -1,15 +0,0 @@
<definition width="20" height="20" hotspot_y="9" type="element" orientation="dyyy" link_type="simple" hotspot_x="9" version="0.60">
<uuid uuid="{079913f8-18b5-4524-84bd-aadf75dfefbf}"/>
<names>
<name lang="cs">Bod</name>
</names>
<informations></informations>
<description>
<circle diameter="4" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-2" x="-2"/>
<input rotate="true" text=" " tagg="label" size="9" y="-3" x="-11"/>
<terminal orientation="e" y="0" x="2"/>
<terminal orientation="w" y="0" x="-2"/>
<terminal orientation="s" y="2" x="0"/>
<terminal orientation="n" y="-2" x="0"/>
</description>
</definition>

View File

@@ -1,25 +0,0 @@
<definition hotspot_x="11" hotspot_y="4" version="0.70" type="element" height="20" orientation="dyyy" link_type="terminal" width="30">
<uuid uuid="{141e7e1e-4f7f-456d-9f04-52c32109b969}"/>
<names>
<name lang="en">Combine</name>
<name lang="fr">Jonction</name>
<name lang="es">Unión</name>
<name lang="it">Collegamento</name>
<name lang="pl">Połączenie 1</name>
<name lang="ar">وصلة</name>
<name lang="ru">Соединение</name>
<name lang="cs">Spoj</name>
</names>
<elementInformations/>
<informations></informations>
<description>
<line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="false" x1="7" length1="1.5" x2="1" y2="0" length2="1.5" end1="none"/>
<dynamic_text text_from="UserText" y="8.5" uuid="{43af2b14-2822-4ba2-988b-bda2005f69fd}" x="2" frame="false" z="2" rotation="0" text_width="-1" font_size="1">
<text>_</text>
</dynamic_text>
<line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" antialias="false" x1="0" length1="1.5" x2="6" y2="0" length2="1.5" end1="none"/>
<terminal y="0" x="-4" orientation="w"/>
<terminal y="10" x="0" orientation="s"/>
<terminal y="0" x="10" orientation="e"/>
</description>
</definition>

View File

@@ -1,22 +0,0 @@
<definition hotspot_y="7" width="20" orientation="dyyy" type="element" height="20" version="0.70" hotspot_x="11" link_type="terminal">
<uuid uuid="{2d505b61-db0f-4784-9b9c-189366058272}"/>
<names>
<name lang="es">Esquina</name>
<name lang="en">Corner</name>
<name lang="cs">Roh</name>
<name lang="fr">Coin</name>
<name lang="ru">Угол</name>
<name lang="pl">Narożnik</name>
<name lang="ar">ركن</name>
<name lang="it">Angolo</name>
</names>
<elementInformations/>
<informations></informations>
<description>
<dynamic_text rotation="0" x="-0.5" y="-5.45" uuid="{9b8dd22d-096a-4989-b6f7-1de9e0339f53}" font_size="1" z="1" frame="false" text_from="UserText" text_width="-1">
<text>_</text>
</dynamic_text>
<terminal x="0" y="4" orientation="s"/>
<terminal x="-4" y="0" orientation="w"/>
</description>
</definition>

View File

@@ -1,25 +0,0 @@
<definition height="20" link_type="terminal" hotspot_x="9" width="20" orientation="dyyy" hotspot_y="9" version="0.70" type="element">
<uuid uuid="{8c0d3e9c-dc37-41d7-bfd5-fe4dbf8dc4fb}"/>
<names>
<name lang="ru">Пересечение</name>
<name lang="cs">Kříž</name>
<name lang="pl">Połączenie 2</name>
<name lang="it">Croce</name>
<name lang="es">Cruzar</name>
<name lang="en">Cross</name>
<name lang="ar">صليب</name>
<name lang="fr">Croix</name>
</names>
<elementInformations/>
<informations></informations>
<description>
<circle y="-1" style="line-style:normal;line-weight:normal;filling:black;color:black" x="-1" antialias="true" diameter="2"/>
<dynamic_text uuid="{fc5c039b-1fca-40d9-a6ff-a9e1775de38b}" text_width="-1" frame="false" y="-9.45" font_size="1" x="-0.5" z="2" rotation="0" text_from="UserText">
<text>_</text>
</dynamic_text>
<terminal y="0" orientation="e" x="4"/>
<terminal y="4" orientation="s" x="0"/>
<terminal y="-4" orientation="n" x="0"/>
<terminal y="0" orientation="w" x="-4"/>
</description>
</definition>

View File

@@ -1,23 +0,0 @@
<definition width="10" hotspot_y="14" hotspot_x="5" height="30" link_type="terminal" orientation="dyyy" version="0.70" type="element">
<uuid uuid="{b5abb4c2-455d-45ff-95f2-328521f4e2e1}"/>
<names>
<name lang="en">Jump</name>
<name lang="fr">Saut</name>
<name lang="ar">قفز</name>
<name lang="cs">Skok</name>
<name lang="it">Salto</name>
<name lang="pl">Brak połączenia</name>
<name lang="ru">Перемычка</name>
<name lang="es">Puente</name>
</names>
<elementInformations/>
<informations></informations>
<description>
<arc x="-3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" width="6" start="90" y="-3" height="6" angle="-180"/>
<dynamic_text font_size="1" x="1.5" text_from="UserText" z="2" y="-11.45" rotation="0" uuid="{1a3e4d91-15cc-424b-99d0-25930d779fb6}" frame="false" text_width="-1">
<text>_</text>
</dynamic_text>
<terminal x="0" y="-7" orientation="n"/>
<terminal x="0" y="7" orientation="s"/>
</description>
</definition>

View File

@@ -1,19 +0,0 @@
<definition version="0.70" height="30" type="element" width="30" hotspot_x="14" link_type="simple" hotspot_y="12" orientation="dyyy">
<uuid uuid="{3015326e-2599-495e-8ef0-c12ff5313dd0}"/>
<names>
<name lang="cs">Všestranný spoj</name>
</names>
<elementInformations/>
<informations></informations>
<description>
<polygon x6="6" x2="-5" x8="6" y5="5" y2="0" closed="false" x10="0" x3="0" x7="10" y7="0" y4="10" y11="-5" antialias="false" x9="0" x11="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x5="0" y9="5" y10="-5" y1="0" y6="0" x4="0" x1="-10" y8="0" y3="5"/>
<dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-13" text_from="ElementInfo" y="-12" z="2" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{14c0b70c-c028-49ef-bf72-3c3c9cd64669}" Halignment="AlignLeft">
<text></text>
<info_name>label</info_name>
</dynamic_text>
<terminal x="0" y="-5" orientation="n"/>
<terminal x="0" y="10" orientation="s"/>
<terminal x="-10" y="0" orientation="w"/>
<terminal x="10" y="0" orientation="e"/>
</description>
</definition>

View File

@@ -1,17 +0,0 @@
<definition type="element" hotspot_x="35" orientation="dyyy" version="0.80" width="70" height="80" hotspot_y="46" link_type="simple">
<uuid uuid="{e5a46987-e259-4ca4-9e40-eedc3652f738}"/>
<names>
<name lang="cs">Pokus</name>
</names>
<elementInformations/>
<informations></informations>
<description>
<rect width="60" x="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" height="65" rx="0" y="-35" antialias="false" ry="0"/>
<dynamic_text z="3" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" Valignment="AlignTop" uuid="{cec75afa-b854-41b8-aed8-6edba82c76ff}" text_from="ElementInfo" x="-45" text_width="-1" y="-20" frame="false" rotation="0" Halignment="AlignLeft">
<text></text>
<info_name>label</info_name>
</dynamic_text>
<terminal orientation="n" x="20" y="-40"/>
<terminal orientation="n" x="-20" y="-40"/>
</description>
</definition>

View File

@@ -1,15 +0,0 @@
<qet-directory>
<names>
<name lang="ru">Соединения</name>
<name lang="de">Verbindungen</name>
<name lang="en">Connections</name>
<name lang="fr">Connections</name>
<name lang="it">Collegamenti</name>
<name lang="pl">Połączenia</name>
<name lang="cs">Spojení</name>
<name lang="el">Ενώσεις</name>
<name lang="nl">Verbindingen</name>
<name lang="es">Conexiones</name>
<name lang="da">Forbindelser</name>
</names>
</qet-directory>

View File

@@ -1,25 +0,0 @@
<definition type="element" height="20" width="30" orientation="dyyy" version="0.70" hotspot_y="4" link_type="terminal" hotspot_x="17">
<uuid uuid="{709e6400-adc2-4faf-ba46-aa513d1dcaf1}"/>
<names>
<name lang="fr">Epissure</name>
<name lang="pl">Połączenie 3</name>
<name lang="cs">Spojka</name>
<name lang="en">Splice</name>
<name lang="it">Spaziatura</name>
<name lang="ru">Сращивание</name>
<name lang="es">Empalme</name>
</names>
<elementInformations/>
<informations></informations>
<description>
<dynamic_text text_width="-1" x="1.5" rotation="0" frame="false" uuid="{b653b162-d4c8-4660-a5ca-e6ca05a56de9}" font_size="1" z="1" text_from="ElementInfo" y="-1.45">
<text></text>
<info_name>label</info_name>
</dynamic_text>
<line x2="-6" antialias="false" x1="0" end2="none" y2="0" end1="none" length2="1.5" length1="1.5" y1="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<line x2="-5" antialias="false" x1="1" end2="none" y2="0" end1="none" length2="1.5" length1="1.5" y1="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<terminal x="0" orientation="s" y="10"/>
<terminal x="-10" orientation="w" y="0"/>
<terminal x="4" orientation="e" y="0"/>
</description>
</definition>

View File

@@ -1,25 +0,0 @@
<definition hotspot_y="4" height="20" hotspot_x="17" type="element" width="30" link_type="terminal" orientation="dyyy" version="0.70">
<uuid uuid="{9e88368e-1b20-4a56-8941-5d17a4cce2d4}"/>
<names>
<name lang="cs">Levé spojení</name>
<name lang="ru">Справа налево</name>
<name lang="fr">Liaison gauche</name>
<name lang="en">Thru left</name>
<name lang="ar">ربط يسار</name>
<name lang="it">Collegamento sinistro</name>
<name lang="pl">Połączenie 4</name>
<name lang="es">A la izquierda</name>
</names>
<elementInformations/>
<informations></informations>
<description>
<dynamic_text font_size="1" rotation="0" uuid="{5ff9bef8-b6a8-4cf8-ba82-4dabe7b1820f}" text_width="-1" frame="false" text_from="UserText" z="1" x="1.5" y="-1.45">
<text>_</text>
</dynamic_text>
<line x1="0" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" y2="0" end1="none" antialias="false" x2="-6"/>
<line x1="0" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" y2="5" end1="none" antialias="false" x2="0"/>
<terminal x="4" orientation="e" y="0"/>
<terminal x="-10" orientation="w" y="0"/>
<terminal x="0" orientation="s" y="10"/>
</description>
</definition>

View File

@@ -1,26 +0,0 @@
<definition link_type="terminal" width="30" hotspot_x="14" orientation="dyyy" height="20" version="0.70" hotspot_y="4" type="element">
<uuid uuid="{6e40fff3-691c-4622-b9aa-4ff930a5b981}"/>
<names>
<name lang="en">Thru right</name>
<name lang="ru">Слева направо</name>
<name lang="cs">Pravé spojení</name>
<name lang="fr">Liaison droite</name>
<name lang="it">Collegamento destro</name>
<name lang="es">A la derecha</name>
<name lang="ar">ربط يمين</name>
<name lang="pl">Połączenie 5</name>
</names>
<elementInformations/>
<informations></informations>
<description>
<dynamic_text text_width="-1" y="-0.45" rotation="0" uuid="{ab829572-e7d6-4e5c-9c6e-a0852fea788e}" x="5.5" frame="false" text_from="UserText" font_size="1" z="1">
<text>_</text>
</dynamic_text>
<line antialias="false" x1="0" y1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end2="none" end1="none" y2="0" length2="1.5" x2="-6"/>
<line antialias="false" x1="0" y1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end2="none" end1="none" y2="5" length2="1.5" x2="0"/>
<line antialias="false" x1="6" y1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end2="none" end1="none" y2="6" length2="1.5" x2="0"/>
<terminal orientation="s" y="10" x="0"/>
<terminal orientation="w" y="0" x="-10"/>
<terminal orientation="e" y="0" x="10"/>
</description>
</definition>

View File

@@ -1,25 +0,0 @@
<definition width="120" version="0.3" hotspot_x="71" hotspot_y="10" height="40" type="element" orientation="dyyy">
<names>
<name lang="ar">كايبل طورين + تأريض</name>
<name lang="de">Kabel 3G</name>
<name lang="ru">Кабель 2 жилы + PE</name>
<name lang="it">Cavo 2 fasi + terra</name>
<name lang="fr">Cable 2 phases+terre</name>
<name lang="pl">Oznaczenie przewodu czterożyłowego</name>
<name lang="es">Cable 2 fases+tierra</name>
<name lang="cs">Označení drátového propojení - 2 fáze + země</name>
</names>
<informations>Author: The QElectroTech team&#xd;
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<text x="12" y="9" size="4" text="2"/>
<line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="26.95" y2="11.95" x2="30.95"/>
<line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="8" y2="12" x2="12"/>
<text x="30.5" y="8.55" size="4" text="GNYE"/>
<input x="-68" y="17" size="3" rotate="true" text="210007&#xa;4G1,5 mm²&#xa; 4m"/>
<line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-39.9373" y2="10" x2="37.932"/>
<line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="-32" y2="12" x2="-28"/>
<text x="-28" y="9" size="4" text="1"/>
<input x="-61" y="1" size="5" rotate="true" text="+"/>
</description>
</definition>

View File

@@ -1,27 +0,0 @@
<definition width="120" version="0.3" hotspot_x="70" hotspot_y="10" height="40" type="element" orientation="dyyy">
<names>
<name lang="ar">كايبل ثلاثي الطور + تأريض</name>
<name lang="de">Kabel 4G</name>
<name lang="ru">Кабель 3 жилы + PE</name>
<name lang="it">Cavo 3 fasi + terra</name>
<name lang="fr">Cable 3 phases+terre</name>
<name lang="pl">Oznaczenie przewodu czterożyłowego</name>
<name lang="es">Cable 3 fases+tierra</name>
<name lang="cs">Označení drátového propojení - 3 fáze + země</name>
</names>
<informations>Author: The QElectroTech team&#xd;
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="-12.05" y2="11.95" x2="-8.05"/>
<text x="-9" y="9" size="4" text="2"/>
<text x="12" y="9" size="4" text="3"/>
<line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="26.95" y2="11.95" x2="30.95"/>
<line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="8" y2="12" x2="12"/>
<text x="32" y="9" size="4" text="GNYE"/>
<input x="-68" y="17" size="3" rotate="true" text="210007&#xa;4G1,5 mm²&#xa; 4m"/>
<line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-39.9373" y2="10" x2="37.932"/>
<line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="-32" y2="12" x2="-28"/>
<text x="-28" y="9" size="4" text="1"/>
<input x="-61" y="1" size="5" rotate="true" text="+"/>
</description>
</definition>

View File

@@ -1,25 +0,0 @@
<definition width="100" version="0.3" hotspot_x="60" hotspot_y="10" height="40" type="element" orientation="dyyy">
<names>
<name lang="ar">كايبل بطورين و تأريض</name>
<name lang="de">Kabel 3G</name>
<name lang="ru">Кабель 2 жилы + PE</name>
<name lang="it">Cavo 2 fasi + terra</name>
<name lang="fr">Cable 2 phases+terre</name>
<name lang="pl">Oznaczenie przewodu czterożyłowego</name>
<name lang="es">Cable 2 fases+tierra</name>
<name lang="cs">Označení drátového propojení - 2 fáze + země</name>
</names>
<informations>Author: The QElectroTech team&#xd;
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="17.95" y2="11.95" x2="21.95"/>
<text x="2" y="9" size="4" text="2"/>
<text x="23" y="9" size="4" text="GNYE"/>
<input x="-58" y="17" size="3" rotate="true" text="210007&#xa;4G1,5 mm²&#xa; 4m"/>
<line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="-2.05" y2="11.95" x2="1.95"/>
<line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-30.2509" y2="10" x2="27.2717"/>
<line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="-22" y2="12" x2="-18"/>
<text x="-18" y="9" size="4" text="1"/>
<input x="-51" y="1" size="5" rotate="true" text="+"/>
</description>
</definition>

View File

@@ -1,24 +0,0 @@
<definition width="130" version="0.3" hotspot_x="88" hotspot_y="18" height="40" type="element" orientation="dyyy">
<names>
<name lang="ar">كايبل رباعي النواة</name>
<name lang="It">Cavo ? 4G</name>
<name lang="fr">Cable 4G</name>
<name lang="pl">Przewód czterożyłowy</name>
<name lang="es">Cable 4G</name>
</names>
<informations>Author: The QElectroTech team&#xd;
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="-33.05" y2="11.95" x2="-29.05"/>
<line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="-13.05" y2="11.95" x2="-9.05"/>
<text x="31" y="9" size="4" text="3"/>
<line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="27" y2="12" x2="31"/>
<text x="-10" y="9" size="4" text="1"/>
<text x="11" y="9" size="4" text="2"/>
<line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="7" y2="12" x2="11"/>
<input x="-82" y="2.5" size="6" rotate="true" text="type?&#xa;4G_ mm²"/>
<line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-31" y2="10" x2="29"/>
<text x="-31" y="9" size="4" text="GNYE"/>
<input x="-62" y="1" size="5" rotate="true" text=""/>
</description>
</definition>

View File

@@ -1,26 +0,0 @@
<definition hotspot_y="3" orientation="dyyy" version="0.51" hotspot_x="47" link_type="simple" width="100" type="element" height="20">
<uuid uuid="{9923c1a5-b49a-4243-923e-cde9d916ea2b}"/>
<names>
<name lang="fr">Cable 5G</name>
<name lang="it">Cavo Type 5G</name>
<name lang="es">Cable 5G</name>
<name lang="pl">Przewód pięciożyłowy</name>
</names>
<informations>Author: The QElectroTech team&#xd;
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<line end1="none" x1="-42.05" y1="7.95" x2="-38.05" length1="1.5" y2="11.95" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<line end1="none" x1="-22.05" y1="7.95" x2="-18.05" length1="1.5" y2="11.95" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<text text="2" size="4" y="9" x="22"/>
<line end1="none" x1="18" y1="8" x2="22" length1="1.5" y2="12" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<text text="BL" size="4" y="9" x="-19"/>
<text text="1" size="4" y="9" x="2"/>
<line end1="none" x1="37.95" y1="7.95" x2="41.95" length1="1.5" y2="11.95" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<line end1="none" x1="-2" y1="8" x2="2" length1="1.5" y2="12" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<text text="3" size="4" y="9" x="43"/>
<input text="Type?&#xa;5G_ mm²" size="6" rotate="true" y="2" x="-85" tagg="label"/>
<line end1="none" x1="-40" y1="10" x2="40" length1="1.5" y2="10" antialias="false" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<text text="GNYE" size="4" y="9" x="-40"/>
<input text="" size="5" rotate="true" y="1" x="-71" tagg="none"/>
</description>
</definition>

View File

@@ -1,22 +0,0 @@
<definition hotspot_y="3" orientation="dyyy" version="0.51" hotspot_x="29" link_type="simple" width="60" type="element" height="20">
<uuid uuid="{5f981421-4c54-4cd5-929e-7f77dab94fef}"/>
<names>
<name lang="It">Cavo ? 3G</name>
<name lang="fr">Cable 3G</name>
<name lang="es">Cable 3G</name>
<name lang="pl">Przewód trójżyłowy</name>
</names>
<informations>Author: The QElectroTech team&#xd;
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<line end1="none" x1="-23.05" y1="7.95" x2="-19.05" length1="1.5" y2="11.95" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<line end1="none" x1="-3.05" y1="7.95" x2="0.95" length1="1.5" y2="11.95" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<text text="1" size="4" y="9" x="0"/>
<text text="2" size="4" y="9" x="21"/>
<line end1="none" x1="17" y1="8" x2="21" length1="1.5" y2="12" antialias="true" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input text="type?&#xa;3G_ mm²" size="6" rotate="true" y="2.5" x="-72" tagg="label"/>
<line end1="none" x1="-21" y1="10" x2="20" length1="1.5" y2="10" antialias="false" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<text text="GNYE" size="4" y="9" x="-21"/>
<input text="" size="5" rotate="true" y="1" x="-52" tagg="none"/>
</description>
</definition>

View File

@@ -1,25 +0,0 @@
<definition width="70" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="20" hotspot_y="9" type="element">
<uuid uuid="{4b9a04b1-0d35-4d54-b5cb-b573ed3a9b0d}"/>
<names>
<name lang="de">Kabel 3x</name>
<name lang="cs">Označení drátového propojení 3 vodiče</name>
<name lang="pl">Oznaczenie przewodu trójżyłowego</name>
<name lang="it">Cavo a 3 conduttori</name>
<name lang="en">Cable 3 wires</name>
<name lang="es">Cable 3 alambres</name>
<name lang="fr">Cable 3 brins</name>
<name lang="ru">Кабель 3 жилы</name>
</names>
<informations></informations>
<description>
<line antialias="false" length1="1.5" x2="50" end2="none" x1="-10" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
<input x="-36" y="-6" tagg="label" size="7" rotate="true" text="-W?"/>
<input x="-56" y="4.5" tagg="none" size="5" rotate="true" text="ÖLFLEX 100"/>
<terminal x="0" y="-5" orientation="n"/>
<terminal x="20" y="-5" orientation="n"/>
<terminal x="40" y="-5" orientation="n"/>
<terminal x="0" y="5" orientation="s"/>
<terminal x="20" y="5" orientation="s"/>
<terminal x="40" y="5" orientation="s"/>
</description>
</definition>

View File

@@ -1,23 +0,0 @@
<definition width="60" link_type="simple" version="0.5" hotspot_x="21" orientation="dyyy" height="10" hotspot_y="-6" type="element">
<uuid uuid="{822e6fc1-0104-4d3a-ba3c-995c24c79cf2}"/>
<names>
<name lang="nl">Scherm</name>
<name lang="el">Πλέγμα</name>
<name lang="de">Schirm</name>
<name lang="cs">Obrazovka</name>
<name lang="pl">Ekran 3</name>
<name lang="it">Schermo</name>
<name lang="ar">شاشة</name>
<name lang="en">Screen</name>
<name lang="es">Pantalla</name>
<name lang="fr">Ecran</name>
<name lang="ru">Экран</name>
</names>
<informations>Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
<description>
<ellipse width="50" x="-15" antialias="true" y="7.5" height="5" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
<input x="-9" y="-2.45" tagg="label" size="9" rotate="true" text="_"/>
<terminal x="-15" y="10" orientation="w"/>
</description>
</definition>

View File

@@ -1,21 +0,0 @@
<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="20" hotspot_y="9" type="element">
<uuid uuid="{6ac285f9-6492-40cb-be58-9ba565ea1921}"/>
<names>
<name lang="de">Kabelader</name>
<name lang="cs">Vedení kabelu</name>
<name lang="pl">Połączenie przewodu</name>
<name lang="it">Conduttore di un cavo</name>
<name lang="en">Wire of cable</name>
<name lang="es">Alambre del cable</name>
<name lang="fr">Fil de cable</name>
<name lang="ru">Жила кабеля</name>
</names>
<informations></informations>
<description>
<line antialias="false" length1="1.5" x2="9.82672" end2="none" x1="-9.76313" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
<input x="1" y="-11.5" tagg="label" size="9" rotate="true" text="_"/>
<line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="4.11304" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.10435"/>
<terminal x="0" y="5" orientation="s"/>
<terminal x="0" y="-5" orientation="n"/>
</description>
</definition>

View File

@@ -1,20 +0,0 @@
<definition width="20" link_type="simple" version="0.5" hotspot_x="10" orientation="dyyy" height="20" hotspot_y="9" type="element">
<uuid uuid="{374ed6b3-7329-4cad-ac8c-200b17508460}"/>
<names>
<name lang="de">Verdrahtung</name>
<name lang="cs">Drátové propojení</name>
<name lang="pl">Oznaczenie przewodu</name>
<name lang="it">Conduttura</name>
<name lang="en">Wiring</name>
<name lang="es">Alambrado</name>
<name lang="fr">Filerie</name>
</names>
<informations></informations>
<description>
<line antialias="false" length1="1.5" x2="-5" end2="none" x1="5" end1="none" y2="5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5"/>
<input x="0" y="-2.5" tagg="label" size="9" rotate="true" text="_"/>
<line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5"/>
<terminal x="0" y="-5" orientation="n"/>
<terminal x="0" y="5" orientation="s"/>
</description>
</definition>

Some files were not shown because too many files have changed in this diff Show More