- Status: open --> rejected
Andrey Zabolotnyi wants to merge 20 commits from /u/andyz/dxf2gcode/ to develop, 2019-04-27
This patch addresses one of the nuisances encountered during submission of translations: the <location> tags in .ts files will change every time you modify a source file, this almost always leads to merge conflicts.</location>
Removing the <location> tags will keep the differences small and contain only the actual translation text. Still, it's possible to re-generate <location> tags by running make_tr.py -k (or --keep-ln), this is useful for translators. The complete translation procedure is described in README.txt in the new "Translations" section.</location></location>
Also, this patch adds a small dxf2gcode.pro file which can be used to work on the project in Qt Designer.
Also, added a Makefile for easier execution of everyday tasks. 'make prepare' or just 'make' will prepare the project to run, 'make clean' will clear autogenerated files.
| Commit | Date | |
|---|---|---|
| 2019-04-27 09:33:10 | Tree | |
|
[82a6ff]
by
Last versions of qt designer will add "&" to menu items. This broke the respective translations in .ts files, fortunately, the translation were saved. This commit adds "&" to German and French translations. |
2019-04-27 09:15:11 | Tree |
|
[7f8d7c]
by
* make_tr.py by default will remove <location> tags from generated .ts files. This was a constant source of merge conflicts in Git. Use the --keep-ln switch to keep <location> tags (if you're going to do translation work) but remove them afterwards (by running make_tr.py without this option). |
2019-04-27 08:57:21 | Tree |
|
[4cf8f0]
by
* Fixed measuring units detection from DXF file |
2019-04-25 07:23:43 | Tree |
| 2019-04-23 21:13:55 | Tree | |
| 2019-04-21 21:17:15 | Tree | |
|
[c270e3]
by
* Some clarifications in comments for SPLINE shapes |
2019-04-21 12:01:08 | Tree |
| 2019-04-19 21:34:28 | Tree | |
| 2019-04-18 21:18:31 | Tree | |
| 2019-04-21 21:17:15 | Tree | |
|
[b8707d]
by
Additional optimization after TSP that will choose the closest point on next shape, when moving from shape to shape. |
2019-04-21 21:14:48 | Tree |
| 2019-04-21 12:05:58 | Tree | |
|
[18455d]
by
Enhanced keyboard modificator handling on the 3d canvas. |
2019-04-21 12:02:52 | Tree |
|
[a5f40f]
by
* Some clarifications in comments for SPLINE shapes |
2019-04-21 12:01:08 | Tree |
|
[cb61b5]
by
Fix for "automatic cutter compensation" toggle off. Previously it didn't remove the offset outline. |
2019-04-20 23:25:16 | Tree |
|
[b944a5]
by
The 16x selection speedup had a bug that the layer/entity outlines wouldn't get selected (or rather would be unselected in callback). |
2019-04-20 22:52:31 | Tree |
| 2019-04-20 12:30:13 | Tree | |
|
[e703b1]
by
Approximatively 16x treeview selection speedup, especially noticeable on large DXF files (e.g a test DXF with 560 shapes selection time reduced from 32.317 to 2.051 seconds) |
2019-04-20 11:48:05 | Tree |
| 2019-04-19 21:34:28 | Tree | |
| 2019-04-18 21:18:31 | Tree |