diff -Nru qcad-3.22.1+git6992-53c1229ac/debian/changelog qcad-3.22.1+git7032-e0f58b0a4/debian/changelog --- qcad-3.22.1+git6992-53c1229ac/debian/changelog 2019-07-01 07:40:39.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/debian/changelog 2019-07-15 19:44:17.000000000 +0000 @@ -1,8 +1,55 @@ -qcad (3.22.1+git6992-53c1229ac-1ppa1~cosmic1) cosmic; urgency=medium +qcad (3.22.1+git7032-e0f58b0a4-1ppa1~cosmic1) cosmic; urgency=medium * Automated backport upload; no source changes. - -- Alexander Pozdnyakov Mon, 01 Jul 2019 10:40:39 +0300 + -- Alexander Pozdnyakov Mon, 15 Jul 2019 22:44:17 +0300 + +qcad (3.22.1+git7032-e0f58b0a4-1) unstable; urgency=medium + + * Compile + * URL: https://github.com/qcad/qcad.git + * Branch: master + * Commit: e0f58b0a44da6a9245ab3003db10e11740e5e185 + * Date: 1563056775 + * git changelog: + * e0f58b0a4 - port to Qt 4 + * a500e96c9 - update dark mode detection + * 915bdc891 - update dark mode detection + * f18002645 - link in Foundation framework on macOS + * e1d86c104 - update dark mode detection + * 4f58bb01c - set version to 3.22.1.6 + * ebbe6d992 - add experimental windows dark theme detection + * f2d5be574 - update dark mode support + * 508ed7704 - change entity count brackets in property editor + * ac72bf41f - set version to 3.22.1.5 + * 17f23d5d1 - update dark mode + * a7bcf7413 - update script bindings + * cdc5a7ff4 - add getInstance + * 594cc1567 - update dark mode support + * aaf3632fa - potential fix for multiple screens with different + device pixel ratios + * 8aecfa61a - fix polyline orientation with arcs, clean up + * 51fee2f39 - update translations + * e6711f829 - set version to 3.22.1.4 + * 7dc26d314 - update + * f0682eaf2 - update translations + * 3038004e6 - Translated using Weblate (Chinese (Traditional)) + * c407596ae - Translated using Weblate (Chinese (Traditional)) + * 54c7667d0 - update + * 9bbf2ddaa - Translated using Weblate (Chinese (Traditional)) + * 751cb580a - Translated using Weblate (Chinese (Traditional)) + * e849fcc74 - update translations + * c8cfb7086 - Translated using Weblate (Chinese (Traditional)) + * 95841aa69 - update translations + * c73f33dc0 - Translated using Weblate (Slovak) + * 5a231a576 - Translated using Weblate (Chinese (Traditional)) + * e4a24e1d2 - Translated using Weblate (Slovak) + * ec4d2cca0 - Translated using Weblate (Chinese (Traditional)) + * 7e1ce4fc0 - fix plugin loading order + * dacdb9c66 - update + * 9be0f5ee4 - update + + -- Alexander Pozdnyakov Sun, 14 Jul 2019 01:56:00 +0300 qcad (3.22.1+git6992-53c1229ac-1) unstable; urgency=medium diff -Nru qcad-3.22.1+git6992-53c1229ac/scripts/Draw/Text/TextDialog/TextDialog.js qcad-3.22.1+git7032-e0f58b0a4/scripts/Draw/Text/TextDialog/TextDialog.js --- qcad-3.22.1+git6992-53c1229ac/scripts/Draw/Text/TextDialog/TextDialog.js 2019-06-29 11:21:29.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/scripts/Draw/Text/TextDialog/TextDialog.js 2019-07-13 22:55:12.000000000 +0000 @@ -128,6 +128,13 @@ this.sourceEdit = this.dialog.findChild("Source"); this.tabWidget = this.dialog.findChild("TabWidget"); + // brighter background of text area in dark mode: + if (RSettings.hasDarkGuiBackground()) { + var p = this.textEdit.palette; + p.setColor(QPalette.Active, QPalette.Base, new QColor(Qt.gray)); + this.textEdit.palette = p; + } + // main font combo box: var comboMainFont = this.dialog.findChild("MainFont"); var comboFont = this.dialog.findChild("Font"); @@ -927,11 +934,13 @@ * Called when user changes the current color or the color under the cursor changed. */ TextDialog.prototype.colorChanged = function(c) { - // make sure that very bright text is readable: - if (c.lightness()>240) { - var p = this.textEdit.palette; - p.setColor(QPalette.Active, QPalette.Base, new QColor(Qt.lightGray)); - this.textEdit.palette = p; + if (!RSettings.hasDarkGuiBackground()) { + // make sure that very bright text is readable: + if (c.lightness()>240) { + var p = this.textEdit.palette; + p.setColor(QPalette.Active, QPalette.Base, new QColor(Qt.lightGray)); + this.textEdit.palette = p; + } } var pix = new QPixmap(16, 16); diff -Nru qcad-3.22.1+git6992-53c1229ac/scripts/EAction.js qcad-3.22.1+git7032-e0f58b0a4/scripts/EAction.js --- qcad-3.22.1+git6992-53c1229ac/scripts/EAction.js 2019-06-29 11:21:29.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/scripts/EAction.js 2019-07-13 22:55:11.000000000 +0000 @@ -1091,17 +1091,35 @@ if (isNull(tb)) { tb = new QToolBar(title); + + // style tool buttons in options toolbar: if (RSettings.isQt(5)) { if (!RSettings.hasCustomStyleSheet()) { - // Mac OS X: remove border around tool buttons: - tb.setStyleSheet( - "QToolButton {" + - " border: 1px solid transparent;" + - "} " + - "QToolButton:checked { " + - " border:1px solid #7f7f7f; " + - " background: qlineargradient(x1:0 y1:0, x2:0 y2:1 stop:0 #c0c0c0, stop:0.1 #8a8a8a stop:0.2 #a3a3a3 stop:1 transparent); " + - "}"); + if (RSettings.hasDarkGuiBackground()) { + tb.setStyleSheet( + "QToolButton {" + // make sure unchecked button renders with same size as checked + // prevents things from moving around when checking / unchecking + + " border: 1px solid transparent;" + + "} " + + "QToolButton:checked { " + + " border-top: 1px solid #161616;" + + " border-left: 1px solid #161616;" + + " border-bottom: 1px solid #777777;" + + " border-right: 1px solid #777777;" + + " background-color: #222222;" + + "}"); + } + else { + tb.setStyleSheet( + "QToolButton {" + + " border: 1px solid transparent;" + + "} " + + "QToolButton:checked { " + + " border:1px solid #7f7f7f; " + + " background: qlineargradient(x1:0 y1:0, x2:0 y2:1 stop:0 #c0c0c0, stop:0.1 #8a8a8a stop:0.2 #a3a3a3 stop:1 transparent); " + + "}"); + } } } tb.objectName = objectName; diff -Nru qcad-3.22.1+git6992-53c1229ac/scripts/File/PrintPreview/PrintPreview.js qcad-3.22.1+git7032-e0f58b0a4/scripts/File/PrintPreview/PrintPreview.js --- qcad-3.22.1+git6992-53c1229ac/scripts/File/PrintPreview/PrintPreview.js 2019-06-29 11:21:29.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/scripts/File/PrintPreview/PrintPreview.js 2019-07-13 22:55:12.000000000 +0000 @@ -507,9 +507,24 @@ return; } + var colBg; + var colShadow; + var colBorder; + + if (RSettings.hasDarkGuiBackground()) { + colBg = "#888888"; + colShadow = "#333333"; + colBorder = "black"; + } + else { + colBg = "lightgray"; + colShadow = "gray"; + colBorder = "#c8c8c8"; + } + path = new RPainterPath(); path.setPen(new QPen(Qt.NoPen)); - path.setBrush(new QBrush(new QColor("lightgray"))); + path.setBrush(new QBrush(new QColor(colBg))); path.addRect(new QRectF(-1.0e8, -1.0e8, 2.0e8, 2.0e8)); this.view.addToBackground(path); @@ -519,7 +534,7 @@ for (i = 0; i < pages.length; ++i) { path = new RPainterPath(); path.setPen(new QPen(Qt.NoPen)); - path.setBrush(new QBrush(new QColor("gray"))); + path.setBrush(new QBrush(new QColor(colShadow))); this.drawShadow(path, pages[i]); this.view.addToBackground(path); } @@ -538,7 +553,7 @@ // paper border for (i = 0; i < pages.length; ++i) { path = new RPainterPath(); - path.setPen(new QPen(new QColor(0xc8, 0xc8, 0xc8))); + path.setPen(new QPen(new QColor(colBorder))); path.setBrush(new QBrush(Qt.NoBrush)); this.drawPaper(path, pages[i]); this.view.addToBackground(path); diff -Nru qcad-3.22.1+git6992-53c1229ac/scripts/Misc/MiscDevelopment/EcmaScriptShell/EcmaScriptShell.js qcad-3.22.1+git7032-e0f58b0a4/scripts/Misc/MiscDevelopment/EcmaScriptShell/EcmaScriptShell.js --- qcad-3.22.1+git6992-53c1229ac/scripts/Misc/MiscDevelopment/EcmaScriptShell/EcmaScriptShell.js 2019-06-29 11:21:30.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/scripts/Misc/MiscDevelopment/EcmaScriptShell/EcmaScriptShell.js 2019-07-13 22:55:12.000000000 +0000 @@ -113,6 +113,19 @@ } var formWidget = WidgetFactory.createWidget(basePath, "EcmaScriptShell.ui"); + + var frame = formWidget.findChild("Frame"); + var p = frame.palette; + if (!RSettings.hasDarkGuiBackground()) { + // white background of command line label: + p.setColor(QPalette.Active, QPalette.Window, new QColor(Qt.white)); + } + else { + p.setColor(QPalette.Active, QPalette.Window, new QColor("#1e1e1e")); + } + frame.palette = p; + frame.autoFillBackground = true; + var teHistory = formWidget.findChild("History"); var leCommand = formWidget.findChild("CommandEdit"); leCommand.setHistory(RSettings.getStringListValue("EcmaScriptShell/History", [])); diff -Nru qcad-3.22.1+git6992-53c1229ac/scripts/Misc/MiscDevelopment/EcmaScriptShell/EcmaScriptShell.ui qcad-3.22.1+git7032-e0f58b0a4/scripts/Misc/MiscDevelopment/EcmaScriptShell/EcmaScriptShell.ui --- qcad-3.22.1+git6992-53c1229ac/scripts/Misc/MiscDevelopment/EcmaScriptShell/EcmaScriptShell.ui 2019-06-29 11:21:30.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/scripts/Misc/MiscDevelopment/EcmaScriptShell/EcmaScriptShell.ui 2019-07-13 22:55:12.000000000 +0000 @@ -30,74 +30,7 @@ 0 - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - true - + QFrame::StyledPanel diff -Nru qcad-3.22.1+git6992-53c1229ac/scripts/Misc/MiscDraw/Cross/Cross-inverse.svg qcad-3.22.1+git7032-e0f58b0a4/scripts/Misc/MiscDraw/Cross/Cross-inverse.svg --- qcad-3.22.1+git6992-53c1229ac/scripts/Misc/MiscDraw/Cross/Cross-inverse.svg 2019-06-29 11:21:30.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/scripts/Misc/MiscDraw/Cross/Cross-inverse.svg 2019-07-13 22:55:12.000000000 +0000 @@ -1 +1,71 @@ - + + + + + + image/svg+xml + + + + + + + + + + + + + diff -Nru qcad-3.22.1+git6992-53c1229ac/scripts/Misc/MiscDraw/Cross/Cross.svg qcad-3.22.1+git7032-e0f58b0a4/scripts/Misc/MiscDraw/Cross/Cross.svg --- qcad-3.22.1+git6992-53c1229ac/scripts/Misc/MiscDraw/Cross/Cross.svg 2019-06-29 11:21:30.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/scripts/Misc/MiscDraw/Cross/Cross.svg 2019-07-13 22:55:12.000000000 +0000 @@ -1 +1,70 @@ - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + + diff -Nru qcad-3.22.1+git6992-53c1229ac/scripts/Widgets/CadToolBar/CadToolBar.js qcad-3.22.1+git7032-e0f58b0a4/scripts/Widgets/CadToolBar/CadToolBar.js --- qcad-3.22.1+git6992-53c1229ac/scripts/Widgets/CadToolBar/CadToolBar.js 2019-06-29 11:21:29.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/scripts/Widgets/CadToolBar/CadToolBar.js 2019-07-13 22:55:12.000000000 +0000 @@ -228,17 +228,43 @@ if (RSettings.isQt(5)) { // tool bar buttons under Qt 5 have no border: if (!RSettings.hasCustomStyleSheet()) { - toolBar.styleSheet = - "QToolButton {" - + " border: 1px solid #969696;" - + " background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f8f8f8, stop: 0.2 #e3e3e3, stop: 1 #f9f9f9);" - + "}" - + "QToolButton:checked {" - + " background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b7b7b7, stop: 0.8 #cfcfcf, stop: 1 #d1d1d1);" - + "}" - + "QToolButton:pressed {" - + " background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #a4a4a4, stop: 0.8 #b3b3b3, stop: 1 #b5b5b5);" - + "}"; + if (RSettings.hasDarkGuiBackground()) { + toolBar.styleSheet = + "QToolButton {" + + " border-top: 1px solid #777777;" + + " border-left: 1px solid #777777;" + + " border-bottom: 1px solid #161616;" + + " border-right: 1px solid #161616;" + + " background-color: #555555;" + + "}" + + "QToolButton:checked {" + + " border-top: 1px solid #161616;" + + " border-left: 1px solid #161616;" + + " border-bottom: 1px solid #777777;" + + " border-right: 1px solid #777777;" + + " background-color: #222222;" + + "}" + + "QToolButton:pressed {" + + " border-top: 1px solid #161616;" + + " border-left: 1px solid #161616;" + + " border-bottom: 1px solid #777777;" + + " border-right: 1px solid #777777;" + + " background-color: #606060;" + + "}"; + } + else { + toolBar.styleSheet = + "QToolButton {" + + " border: 1px solid #969696;" + + " background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f8f8f8, stop: 0.2 #e3e3e3, stop: 1 #f9f9f9);" + + "}" + + "QToolButton:checked {" + + " background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b7b7b7, stop: 0.8 #cfcfcf, stop: 1 #d1d1d1);" + + "}" + + "QToolButton:pressed {" + + " background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #a4a4a4, stop: 0.8 #b3b3b3, stop: 1 #b5b5b5);" + + "}"; + } } } diff -Nru qcad-3.22.1+git6992-53c1229ac/scripts/Widgets/CommandLine/CommandLine.js qcad-3.22.1+git7032-e0f58b0a4/scripts/Widgets/CommandLine/CommandLine.js --- qcad-3.22.1+git6992-53c1229ac/scripts/Widgets/CommandLine/CommandLine.js 2019-06-29 11:21:29.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/scripts/Widgets/CommandLine/CommandLine.js 2019-07-13 22:55:12.000000000 +0000 @@ -69,6 +69,19 @@ var e; var formWidget = WidgetFactory.createWidget(basePath, "CommandLine.ui"); + var frame = formWidget.findChild("Frame"); + + var p = frame.palette; + if (!RSettings.hasDarkGuiBackground()) { + // white background of command line label: + p.setColor(QPalette.Active, QPalette.Window, new QColor(Qt.white)); + } + else { + p.setColor(QPalette.Active, QPalette.Window, new QColor("#1e1e1e")); + } + frame.palette = p; + frame.autoFillBackground = true; + var teHistory = formWidget.findChild("History"); var leCommand = formWidget.findChild("CommandEdit"); WidgetFactory.initLineEditInfoTools(leCommand); diff -Nru qcad-3.22.1+git6992-53c1229ac/scripts/Widgets/CommandLine/CommandLine.ui qcad-3.22.1+git7032-e0f58b0a4/scripts/Widgets/CommandLine/CommandLine.ui --- qcad-3.22.1+git6992-53c1229ac/scripts/Widgets/CommandLine/CommandLine.ui 2019-06-29 11:21:29.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/scripts/Widgets/CommandLine/CommandLine.ui 2019-07-13 22:55:12.000000000 +0000 @@ -36,79 +36,15 @@ 0 - + 16 16 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - true + false QFrame::StyledPanel diff -Nru qcad-3.22.1+git6992-53c1229ac/scripts/Widgets/OptionsToolBar/OptionsToolBar.js qcad-3.22.1+git7032-e0f58b0a4/scripts/Widgets/OptionsToolBar/OptionsToolBar.js --- qcad-3.22.1+git6992-53c1229ac/scripts/Widgets/OptionsToolBar/OptionsToolBar.js 2019-06-29 11:21:29.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/scripts/Widgets/OptionsToolBar/OptionsToolBar.js 2019-07-13 22:55:12.000000000 +0000 @@ -91,22 +91,41 @@ iconLabel.alignment = Qt.AlignCenter; iconLabel.setContentsMargins(6, 0, 6, 0); + // style of laber with current tool icon: if (!RSettings.hasCustomStyleSheet()) { var w = optionsToolBar.iconSize.width() < 20 ? 1 : 2; - iconLabel.styleSheet = - "QLabel {" - + "border-radius: %1px; ".arg(w*3) - + "background-color: " - + " qlineargradient(spread:pad, " - + " x1: 0, y1: 0, " - + " x2: 0, y2: 1, " - + " stop: 0 rgba(255,255,255,0), " - + " stop: 0.5 rgba(255,255,255,192), " - + " stop: 1 rgba(255,255,255,0) " - + " ); " - + "border: %1px solid #8f8f8f;".arg(w) - + "margin: %1px %1px %1px %1px;".arg(w) - + "}"; + if (RSettings.hasDarkGuiBackground()) { + iconLabel.styleSheet = + "QLabel {" + + "border-radius: %1px; ".arg(w*3) + + "background-color: " + + " qlineargradient(spread:pad, " + + " x1: 0, y1: 0, " + + " x2: 0, y2: 1, " + + " stop: 0 #555555, " + + " stop: 0.5 #606060, " + + " stop: 1 #555555" + + " ); " + + "border: %1px solid #a0a0a0;".arg(w) + + "margin: %1px %1px %1px %1px;".arg(w) + + "}"; + } + else { + iconLabel.styleSheet = + "QLabel {" + + "border-radius: %1px; ".arg(w*3) + + "background-color: " + + " qlineargradient(spread:pad, " + + " x1: 0, y1: 0, " + + " x2: 0, y2: 1, " + + " stop: 0 rgba(255,255,255,0), " + + " stop: 0.5 rgba(255,255,255,192), " + + " stop: 1 rgba(255,255,255,0) " + + " ); " + + "border: %1px solid #8f8f8f;".arg(w) + + "margin: %1px %1px %1px %1px;".arg(w) + + "}"; + } } // avoid empty label after startup, before initializing new document: diff -Nru qcad-3.22.1+git6992-53c1229ac/scripts/Widgets/PropertyEditor/PropertyEditor.js qcad-3.22.1+git7032-e0f58b0a4/scripts/Widgets/PropertyEditor/PropertyEditor.js --- qcad-3.22.1+git6992-53c1229ac/scripts/Widgets/PropertyEditor/PropertyEditor.js 2019-06-29 11:21:29.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/scripts/Widgets/PropertyEditor/PropertyEditor.js 2019-07-13 22:55:12.000000000 +0000 @@ -732,7 +732,7 @@ totalCount += typeCount; //qDebug("type: ", type, " / count: ", typeCount); - selectionCombo.addItem(entityTypeToString(type) + " (" + typeCount + ")", type); + selectionCombo.addItem(entityTypeToString(type) + " [" + typeCount + "]", type); } if (types.length!==1) { // TODO: add at 0 if 'no selection' item present at 0: diff -Nru qcad-3.22.1+git6992-53c1229ac/shared.rc qcad-3.22.1+git7032-e0f58b0a4/shared.rc --- qcad-3.22.1+git6992-53c1229ac/shared.rc 2019-06-29 11:21:30.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/shared.rc 2019-07-13 22:55:09.000000000 +0000 @@ -14,7 +14,7 @@ #define VER_COMPANYNAME_STR "RibbonSoft, GmbH" #define VER_FILEDESCRIPTION_STR "QCAD" #define VER_INTERNALNAME_STR "QCAD" -#define VER_LEGALCOPYRIGHT_STR "Copyright (c) 2018 RibbonSoft, GmbH" +#define VER_LEGALCOPYRIGHT_STR "Copyright (c) 2019 RibbonSoft, GmbH" #define VER_LEGALTRADEMARKS1_STR "All Rights Reserved" #define VER_LEGALTRADEMARKS2_STR VER_LEGALTRADEMARKS1_STR #define VER_PRODUCTNAME_STR "QCAD" diff -Nru qcad-3.22.1+git6992-53c1229ac/src/core/core.pro qcad-3.22.1+git7032-e0f58b0a4/src/core/core.pro --- qcad-3.22.1+git6992-53c1229ac/src/core/core.pro 2019-06-29 11:21:31.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/core/core.pro 2019-07-13 22:55:15.000000000 +0000 @@ -274,6 +274,11 @@ math/RVector.h \ math/RXLine.h +macx { + OBJECTIVE_SOURCES += $$PWD/detectmacdarkmode.mm + OBJECTIVE_HEADERS += $$PWD/detectmacdarkmode.h +} + TEMPLATE = lib r_static_libs { @@ -298,7 +303,7 @@ } macx { - QMAKE_LFLAGS += -framework ApplicationServices + QMAKE_LFLAGS += -framework ApplicationServices -framework Foundation } linux-g++* { diff -Nru qcad-3.22.1+git6992-53c1229ac/src/core/detectmacdarkmode.h qcad-3.22.1+git7032-e0f58b0a4/src/core/detectmacdarkmode.h --- qcad-3.22.1+git6992-53c1229ac/src/core/detectmacdarkmode.h 1970-01-01 00:00:00.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/core/detectmacdarkmode.h 2019-07-13 22:55:15.000000000 +0000 @@ -0,0 +1,6 @@ +#ifndef DETECTMACDARKMODE_H_ +#define DETECTMACDARKMODE_H_ + +bool isMacDarkMode(); + +#endif diff -Nru qcad-3.22.1+git6992-53c1229ac/src/core/detectmacdarkmode.mm qcad-3.22.1+git7032-e0f58b0a4/src/core/detectmacdarkmode.mm --- qcad-3.22.1+git6992-53c1229ac/src/core/detectmacdarkmode.mm 1970-01-01 00:00:00.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/core/detectmacdarkmode.mm 2019-07-13 22:55:15.000000000 +0000 @@ -0,0 +1,37 @@ +#include "detectmacdarkmode.h" +#include + +#import + +bool isMacDarkMode() { + NSNumber* plistRequiresAquaAppearance = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSRequiresAquaSystemAppearance"]; + if (plistRequiresAquaAppearance!=nil) { + // value found in plist file: + bool darkMode = ![plistRequiresAquaAppearance boolValue]; + if (darkMode) { + // dark mode enabled if system is in dark mode + // use system setting + qDebug() << "dark mode on in plist file: use system setting"; + } + else { + // dark mode explicitely disabled in plist file: + qDebug() << "dark mode off in plist file"; + return false; + } + } + else { + // no value in plist file + // use system setting + qDebug() << "no dark mode value in plist file: use system setting"; + } + + // no value in plist or dark mode enabled in plist: + // detect OS dark mode: + NSString* style = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"]; + if (style==nil) { + qDebug() << "style is nil: no dark mode"; + return false; + } + qDebug() << "style not nil: got dark mode"; + return true; +} diff -Nru qcad-3.22.1+git6992-53c1229ac/src/core/math/RPolyline.cpp qcad-3.22.1+git7032-e0f58b0a4/src/core/math/RPolyline.cpp --- qcad-3.22.1+git6992-53c1229ac/src/core/math/RPolyline.cpp 2019-06-29 11:21:31.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/core/math/RPolyline.cpp 2019-07-13 22:55:15.000000000 +0000 @@ -807,18 +807,16 @@ return RS::Any; } - RPolyline pl = convertArcToLineSegments(16); - RVector minV = RVector::invalid; QSharedPointer shapeBefore; QSharedPointer shapeAfter; QSharedPointer shape; - QSharedPointer previousShape = pl.getSegmentAt(pl.countSegments()-1); + QSharedPointer previousShape = getSegmentAt(countSegments()-1); // find minimum vertex (lower left corner): - QList > segments = pl.getExploded(); + QList > segments = getExploded(); for (int i=0; i arcBefore = shapeBefore.dynamicCast(); if (!arcBefore.isNull()) { l = arcBefore->getLength(); - list = arcBefore->getPointsWithDistanceToEnd(l/10, RS::FromStart); + list = arcBefore->getPointsWithDistanceToEnd(l/10, RS::FromEnd); if (!list.isEmpty()) { p = list[0]; shapeBefore = QSharedPointer(new RLine(p, arcBefore->getEndPoint())); @@ -853,7 +851,7 @@ QSharedPointer arcAfter = shapeAfter.dynamicCast(); if (!arcAfter.isNull()) { l = arcAfter->getLength(); - list = arcAfter->getPointsWithDistanceToEnd(l/10, RS::FromEnd); + list = arcAfter->getPointsWithDistanceToEnd(l/10, RS::FromStart); if (!list.isEmpty()) { p = list[0]; shapeAfter = QSharedPointer(new RLine(arcAfter->getStartPoint(), p)); @@ -1426,61 +1424,6 @@ ret = polylineProxy->getArea(*this, 0.01); } return ret; - - /* - * \author Robert S. - - // fails for certain cases - // see FS#1756 - Faults with the area of Polylines with arcs - RPolyline closedCopy = *this; - if (!closedCopy.isGeometricallyClosed()) { - closedCopy.setClosed(true); - } - - // polygonal area (all segments treated as lines): - QList pts = closedCopy.getVertices(); - double area = 0; - int nPts = closedCopy.countVertices(); - int j = nPts - 1; - RVector p1; - RVector p2; - - for (int i=0; i shape = closedCopy.getSegmentAt(i); - QSharedPointer arc = shape.dynamicCast(); - if (!arc.isNull()) { - double chordArea = arc->getChordArea(); - - if (arc->isReversed()==plReversed) { - // arc has same orientation as polyline: add - area = area + chordArea; - } - else { - // arc has opposite orientation of polyline: subtract - area = area - chordArea; - } - } - } - } - } - - area = fabs(area); - //qDebug() << "error: " << fabs(area - control); - return area; - */ } double RPolyline::getLength() const { diff -Nru qcad-3.22.1+git6992-53c1229ac/src/core/RDocumentInterface.cpp qcad-3.22.1+git7032-e0f58b0a4/src/core/RDocumentInterface.cpp --- qcad-3.22.1+git6992-53c1229ac/src/core/RDocumentInterface.cpp 2019-06-29 11:21:31.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/core/RDocumentInterface.cpp 2019-07-13 22:55:14.000000000 +0000 @@ -1688,9 +1688,11 @@ QSet entityIds; if (box.c2.x cps = list[i].getControlPoints(); - // very rare splines of degree >=4: + // very rare splines of degree >= 4: if ((cps.size()>=5 && degree==cps.size()-1)) { QList > segments = spline.getExploded(16); for (int k=0; k #if QT_VERSION >= 0x050000 +# include # include #else # include @@ -39,6 +40,10 @@ #include "RSettings.h" #include "RVersion.h" +#ifdef Q_OS_MAC +#include "detectmacdarkmode.h" +#endif + bool RSettings::noWrite = false; QVariantMap RSettings::cache; @@ -125,6 +130,10 @@ */ double RSettings::getDevicePixelRatio() { #if QT_VERSION >= 0x050000 + QWindow* window = QGuiApplication::focusWindow(); + if (window!=NULL) { + return window->devicePixelRatio(); + } return qApp->devicePixelRatio(); #else return 1.0; @@ -970,22 +979,31 @@ bool RSettings::hasDarkGuiBackground() { if (darkGuiBackground==-1) { -// // find out what color is used for QFrames (this might originate from a CSS stylesheet): -// QFrame* w = new QFrame(); -// w->resize(1,1); -//#if QT_VERSION >= 0x050000 -// QPixmap pixmap = w->grab(QRect(0, 0, 1, 1)); -//#else -// QPixmap pixmap = QPixmap::grabWidget(w, QRect(0, 0, 1, 1)); -//#endif -// delete w; -// QImage img = pixmap.toImage(); -// darkGuiBackground = QColor(img.pixel(0,0)).value()<128; + // detect dark QCAD theme: if (qApp->styleSheet().contains("IconPostfix:inverse", Qt::CaseInsensitive)) { darkGuiBackground = 1; } else { +#ifdef Q_OS_MAC + // detect macOS dark mode: + if (isMacDarkMode()) { + darkGuiBackground = 1; + } + else { + darkGuiBackground = 0; + } + // TODO: support Windows Dark Theme: +//#elif Q_OS_WINDOWS +// QSettings settings("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",QSettings::NativeFormat); +// if (settings.value("AppsUseLightTheme")==0){ +// darkGuiBackground = 1; +// } +// else { +// darkGuiBackground = 0; +// } +#else darkGuiBackground = 0; +#endif } } return darkGuiBackground==1; diff -Nru qcad-3.22.1+git6992-53c1229ac/src/core/RVersion.h qcad-3.22.1+git7032-e0f58b0a4/src/core/RVersion.h --- qcad-3.22.1+git6992-53c1229ac/src/core/RVersion.h 2019-06-29 11:21:31.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/core/RVersion.h 2019-07-13 22:55:14.000000000 +0000 @@ -25,11 +25,11 @@ * x.x.x for releases * x.x.x.x for snapshots only */ -#define R_QCAD_VERSION_STRING "3.22.1.3" +#define R_QCAD_VERSION_STRING "3.22.1.6" #define R_QCAD_VERSION_MAJOR 3 #define R_QCAD_VERSION_MINOR 22 #define R_QCAD_VERSION_REV 1 -#define R_QCAD_VERSION_BUILD 3 +#define R_QCAD_VERSION_BUILD 6 #endif diff -Nru qcad-3.22.1+git6992-53c1229ac/src/gui/RGraphicsViewImage.cpp qcad-3.22.1+git7032-e0f58b0a4/src/gui/RGraphicsViewImage.cpp --- qcad-3.22.1+git6992-53c1229ac/src/gui/RGraphicsViewImage.cpp 2019-06-29 11:21:31.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/gui/RGraphicsViewImage.cpp 2019-07-13 22:55:15.000000000 +0000 @@ -701,6 +701,7 @@ RVector c2 = mapFromView(RVector(r.right()+1,r.top()-1), 1e300); RBox queryBox(c1, c2); + // TODO: paint in N threads using N painters to N bitmaps and combine: paintEntities(painter, queryBox); // paint selected entities on top: diff -Nru qcad-3.22.1+git6992-53c1229ac/src/gui/RMathLineEdit.cpp qcad-3.22.1+git7032-e0f58b0a4/src/gui/RMathLineEdit.cpp --- qcad-3.22.1+git6992-53c1229ac/src/gui/RMathLineEdit.cpp 2019-06-29 11:21:31.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/gui/RMathLineEdit.cpp 2019-07-13 22:55:15.000000000 +0000 @@ -39,6 +39,7 @@ noResultInToolTip(false) { oriPalette = palette(); + slotTextChanged(text()); originalToolTip = QString(); QLineEdit::setToolTip(""); @@ -246,8 +247,10 @@ // p.setColor(QPalette::Text, QColor(Qt::white)); // } // else { - p.setColor(QPalette::Text, QColor(Qt::black)); + //p.setColor(QPalette::Text, QColor(Qt::black)); // } + p.setColor(QPalette::Text, getNormalTextColor()); + //qDebug() << "windowText:" << oriPalette.windowText().color(); setPalette(p); } @@ -279,9 +282,18 @@ ); } +QColor RMathLineEdit::getNormalTextColor() const { + if (isEnabled()) { + return oriPalette.color(QPalette::Normal, QPalette::WindowText); + } + else { + return oriPalette.color(QPalette::Disabled, QPalette::WindowText); + } +} + void RMathLineEdit::setTextColor(bool error) { QPalette p = palette(); - p.setColor(QPalette::Text, QColor(error ? Qt::red : Qt::black)); + p.setColor(QPalette::Text, QColor(error ? Qt::red : getNormalTextColor())); setPalette(p); QWidget* parent = parentWidget(); diff -Nru qcad-3.22.1+git6992-53c1229ac/src/gui/RMathLineEdit.h qcad-3.22.1+git7032-e0f58b0a4/src/gui/RMathLineEdit.h --- qcad-3.22.1+git6992-53c1229ac/src/gui/RMathLineEdit.h 2019-06-29 11:21:31.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/gui/RMathLineEdit.h 2019-07-13 22:55:15.000000000 +0000 @@ -74,6 +74,7 @@ void setToolTip(const QString& toolTip); + QColor getNormalTextColor() const; void setTextColor(bool error); /* diff -Nru qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaMathLineEdit.cpp qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaMathLineEdit.cpp --- qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaMathLineEdit.cpp 2019-06-29 11:21:32.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaMathLineEdit.cpp 2019-07-13 22:55:15.000000000 +0000 @@ -85,6 +85,8 @@ REcmaHelper::registerFunction(&engine, proto, setToolTip, "setToolTip"); + REcmaHelper::registerFunction(&engine, proto, getNormalTextColor, "getNormalTextColor"); + REcmaHelper::registerFunction(&engine, proto, setTextColor, "setTextColor"); REcmaHelper::registerFunction(&engine, proto, slotTextChanged, "slotTextChanged"); @@ -849,6 +851,55 @@ return result; } QScriptValue + REcmaMathLineEdit::getNormalTextColor + (QScriptContext* context, QScriptEngine* engine) + + { + //REcmaHelper::functionStart("REcmaMathLineEdit::getNormalTextColor", context, engine); + //qDebug() << "ECMAScript WRAPPER: REcmaMathLineEdit::getNormalTextColor"; + //QCoreApplication::processEvents(); + + QScriptValue result = engine->undefinedValue(); + + // public function: can be called from ECMA wrapper of ECMA shell: + RMathLineEdit* self = + getSelf("getNormalTextColor", context); + + + //Q_ASSERT(self!=NULL); + if (self==NULL) { + return REcmaHelper::throwError("self is NULL", context); + } + + + if( context->argumentCount() == + 0 + ){ + // prepare arguments: + + // end of arguments + + // call C++ function: + // return type 'QColor' + QColor cppResult = + + self->getNormalTextColor(); + // return type: QColor + // not standard type nor reference + result = qScriptValueFromValue(engine, cppResult); + + } else + + + + { + return REcmaHelper::throwError("Wrong number/types of arguments for RMathLineEdit.getNormalTextColor().", + context); + } + //REcmaHelper::functionEnd("REcmaMathLineEdit::getNormalTextColor", context, engine); + return result; + } + QScriptValue REcmaMathLineEdit::setTextColor (QScriptContext* context, QScriptEngine* engine) diff -Nru qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaMathLineEdit.h qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaMathLineEdit.h --- qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaMathLineEdit.h 2019-06-29 11:21:32.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaMathLineEdit.h 2019-07-13 22:55:15.000000000 +0000 @@ -81,6 +81,9 @@ setToolTip (QScriptContext* context, QScriptEngine* engine) ;static QScriptValue + getNormalTextColor + (QScriptContext* context, QScriptEngine* engine) + ;static QScriptValue setTextColor (QScriptContext* context, QScriptEngine* engine) ;static QScriptValue diff -Nru qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaPolyline.cpp qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaPolyline.cpp --- qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaPolyline.cpp 2019-06-29 11:21:32.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaPolyline.cpp 2019-07-13 22:55:15.000000000 +0000 @@ -318,6 +318,8 @@ REcmaHelper::registerFunction(&engine, proto, modifyPolylineCorner, "modifyPolylineCorner"); + REcmaHelper::registerFunction(&engine, proto, isConcave, "isConcave"); + REcmaHelper::registerFunction(&engine, proto, getConvexVertices, "getConvexVertices"); REcmaHelper::registerFunction(&engine, proto, getConcaveVertices, "getConcaveVertices"); @@ -10122,6 +10124,55 @@ return result; } QScriptValue + REcmaPolyline::isConcave + (QScriptContext* context, QScriptEngine* engine) + + { + //REcmaHelper::functionStart("REcmaPolyline::isConcave", context, engine); + //qDebug() << "ECMAScript WRAPPER: REcmaPolyline::isConcave"; + //QCoreApplication::processEvents(); + + QScriptValue result = engine->undefinedValue(); + + // public function: can be called from ECMA wrapper of ECMA shell: + RPolyline* self = + getSelf("isConcave", context); + + + //Q_ASSERT(self!=NULL); + if (self==NULL) { + return REcmaHelper::throwError("self is NULL", context); + } + + + if( context->argumentCount() == + 0 + ){ + // prepare arguments: + + // end of arguments + + // call C++ function: + // return type 'bool' + bool cppResult = + + self->isConcave(); + // return type: bool + // standard Type + result = QScriptValue(cppResult); + + } else + + + + { + return REcmaHelper::throwError("Wrong number/types of arguments for RPolyline.isConcave().", + context); + } + //REcmaHelper::functionEnd("REcmaPolyline::isConcave", context, engine); + return result; + } + QScriptValue REcmaPolyline::getConvexVertices (QScriptContext* context, QScriptEngine* engine) diff -Nru qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaPolyline.h qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaPolyline.h --- qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaPolyline.h 2019-06-29 11:21:32.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaPolyline.h 2019-07-13 22:55:15.000000000 +0000 @@ -412,6 +412,9 @@ modifyPolylineCorner (QScriptContext* context, QScriptEngine* engine) ;static QScriptValue + isConcave + (QScriptContext* context, QScriptEngine* engine) + ;static QScriptValue getConvexVertices (QScriptContext* context, QScriptEngine* engine) ;static QScriptValue diff -Nru qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaPropertyEditor.cpp qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaPropertyEditor.cpp --- qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaPropertyEditor.cpp 2019-06-29 11:21:32.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaPropertyEditor.cpp 2019-07-13 22:55:15.000000000 +0000 @@ -121,6 +121,8 @@ // static methods: + REcmaHelper::registerFunction(&engine, &ctor, getInstance, "getInstance"); + REcmaHelper::registerFunction(&engine, &ctor, checkType, "checkType"); @@ -243,6 +245,45 @@ // public methods: QScriptValue + REcmaPropertyEditor::getInstance + (QScriptContext* context, QScriptEngine* engine) + + { + //REcmaHelper::functionStart("REcmaPropertyEditor::getInstance", context, engine); + //qDebug() << "ECMAScript WRAPPER: REcmaPropertyEditor::getInstance"; + //QCoreApplication::processEvents(); + + QScriptValue result = engine->undefinedValue(); + + + if( context->argumentCount() == + 0 + ){ + // prepare arguments: + + // end of arguments + + // call C++ function: + // return type 'RPropertyEditor *' + RPropertyEditor * cppResult = + RPropertyEditor:: + getInstance(); + // return type: RPropertyEditor * + // not standard type nor reference + result = qScriptValueFromValue(engine, cppResult); + + } else + + + + { + return REcmaHelper::throwError("Wrong number/types of arguments for RPropertyEditor.getInstance().", + context); + } + //REcmaHelper::functionEnd("REcmaPropertyEditor::getInstance", context, engine); + return result; + } + QScriptValue REcmaPropertyEditor::updateFromDocument (QScriptContext* context, QScriptEngine* engine) diff -Nru qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaPropertyEditor.h qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaPropertyEditor.h --- qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaPropertyEditor.h 2019-06-29 11:21:32.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaPropertyEditor.h 2019-07-13 22:55:15.000000000 +0000 @@ -55,6 +55,9 @@ // public methods: static QScriptValue + getInstance + (QScriptContext* context, QScriptEngine* engine) + ;static QScriptValue updateFromDocument (QScriptContext* context, QScriptEngine* engine) ;static QScriptValue diff -Nru qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaSharedPointerPolyline.cpp qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaSharedPointerPolyline.cpp --- qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaSharedPointerPolyline.cpp 2019-06-29 11:21:32.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaSharedPointerPolyline.cpp 2019-07-13 22:55:15.000000000 +0000 @@ -320,6 +320,8 @@ REcmaHelper::registerFunction(&engine, proto, modifyPolylineCorner, "modifyPolylineCorner"); + REcmaHelper::registerFunction(&engine, proto, isConcave, "isConcave"); + REcmaHelper::registerFunction(&engine, proto, getConvexVertices, "getConvexVertices"); REcmaHelper::registerFunction(&engine, proto, getConcaveVertices, "getConcaveVertices"); @@ -10119,6 +10121,55 @@ return result; } QScriptValue + REcmaSharedPointerPolyline::isConcave + (QScriptContext* context, QScriptEngine* engine) + + { + //REcmaHelper::functionStart("REcmaSharedPointerPolyline::isConcave", context, engine); + //qDebug() << "ECMAScript WRAPPER: REcmaSharedPointerPolyline::isConcave"; + //QCoreApplication::processEvents(); + + QScriptValue result = engine->undefinedValue(); + + // public function: can be called from ECMA wrapper of ECMA shell: + RPolyline* self = + getSelf("isConcave", context); + + + //Q_ASSERT(self!=NULL); + if (self==NULL) { + return REcmaHelper::throwError("self is NULL", context); + } + + + if( context->argumentCount() == + 0 + ){ + // prepare arguments: + + // end of arguments + + // call C++ function: + // return type 'bool' + bool cppResult = + + self->isConcave(); + // return type: bool + // standard Type + result = QScriptValue(cppResult); + + } else + + + + { + return REcmaHelper::throwError("Wrong number/types of arguments for RPolyline.isConcave().", + context); + } + //REcmaHelper::functionEnd("REcmaSharedPointerPolyline::isConcave", context, engine); + return result; + } + QScriptValue REcmaSharedPointerPolyline::getConvexVertices (QScriptContext* context, QScriptEngine* engine) diff -Nru qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaSharedPointerPolyline.h qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaSharedPointerPolyline.h --- qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaSharedPointerPolyline.h 2019-06-29 11:21:32.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaSharedPointerPolyline.h 2019-07-13 22:55:15.000000000 +0000 @@ -414,6 +414,9 @@ modifyPolylineCorner (QScriptContext* context, QScriptEngine* engine) ;static QScriptValue + isConcave + (QScriptContext* context, QScriptEngine* engine) + ;static QScriptValue getConvexVertices (QScriptContext* context, QScriptEngine* engine) ;static QScriptValue diff -Nru qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaShellPropertyEditor.cpp qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaShellPropertyEditor.cpp --- qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaShellPropertyEditor.cpp 2019-06-29 11:21:32.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaShellPropertyEditor.cpp 2019-07-13 22:55:15.000000000 +0000 @@ -84,6 +84,72 @@ + RPropertyEditor * REcmaShellPropertyEditor::getInstance( + + ) { + QScriptEngine* engine = __qtscript_self.engine(); + //REcmaHelper::shellFunctionStart("REcmaShellPropertyEditor::getInstance", engine); + QScriptValue _q_function = __qtscript_self.property("getInstance"); + + + + if (!_q_function.isFunction() || + QTSCRIPT_IS_GENERATED_FUNCTION(_q_function) || + QTSCRIPT_IS_FUNCTION_IN_CALL(_q_function) + + /* function might have more arguments than expected: + || _q_function.property("length").toInt32()!=0*/ + /*|| (__qtscript_self.propertyFlags("atEnd") & QScriptValue::QObjectMember)*/ + ) { + //QString cppSig = "RPropertyEditor::getInstance"; + + // re-enable recursion for calls from C++ into ECMAScript functions + // leave it marked as generated though if appropriate: + + quint32 prev = _q_function.data().toUInt32(); + //if (cppSig!="RGraphicsViewQt::event") { + _q_function.setData(QScriptValue(engine, prev & 0xFFFF0000)); + //} + RPropertyEditor * ret = + RPropertyEditor::getInstance( + + ); + + // block recursion again: + _q_function.setData(QScriptValue(engine, prev)); + + //REcmaHelper::shellFunctionEnd("REcmaShellPropertyEditor::getInstance", engine); + + + return ret; + + } + // prevent recursion if script implementation calls base implementation + // mark function as 'in call': + quint32 prev = _q_function.data().toUInt32(); + _q_function.setData(QScriptValue(engine, uint(prev | 0x0000B000))); + RPropertyEditor * res; + + res = qscriptvalue_cast< + RPropertyEditor * + >( + + _q_function.call(__qtscript_self) + + ) + + ; + _q_function.setData(QScriptValue(engine, prev)); + + //REcmaHelper::shellFunctionEnd("REcmaShellPropertyEditor::getInstance", engine); + + + return res; + + } + + + void REcmaShellPropertyEditor::updateFromDocument( RDocument * document, bool onlyChanges, RS::EntityType filter, bool manual, bool showOnRequest ) { diff -Nru qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaShellPropertyEditor.h qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaShellPropertyEditor.h --- qcad-3.22.1+git6992-53c1229ac/src/scripting/ecmaapi/generated/REcmaShellPropertyEditor.h 2019-06-29 11:21:32.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/src/scripting/ecmaapi/generated/REcmaShellPropertyEditor.h 2019-07-13 22:55:15.000000000 +0000 @@ -39,6 +39,12 @@ + RPropertyEditor * getInstance( + + ); + + + void updateFromDocument( RDocument * document, bool onlyChanges, RS::EntityType filter = RS :: EntityUnknown, bool manual diff -Nru qcad-3.22.1+git6992-53c1229ac/support/ecmagenerator/src/srcml/RMathLineEdit.srcml qcad-3.22.1+git7032-e0f58b0a4/support/ecmagenerator/src/srcml/RMathLineEdit.srcml --- qcad-3.22.1+git6992-53c1229ac/support/ecmagenerator/src/srcml/RMathLineEdit.srcml 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/support/ecmagenerator/src/srcml/RMathLineEdit.srcml 2019-07-13 22:55:16.000000000 +0000 @@ -75,6 +75,7 @@ void setToolTip(const QString& toolTip); + QColor getNormalTextColor() const; void setTextColor(bool error); /* diff -Nru qcad-3.22.1+git6992-53c1229ac/support/ecmagenerator/src/srcml/RPolyline.srcml qcad-3.22.1+git7032-e0f58b0a4/support/ecmagenerator/src/srcml/RPolyline.srcml --- qcad-3.22.1+git6992-53c1229ac/support/ecmagenerator/src/srcml/RPolyline.srcml 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/support/ecmagenerator/src/srcml/RPolyline.srcml 2019-07-13 22:55:16.000000000 +0000 @@ -243,6 +243,7 @@ const RShape& trimmedShape2, RS::Ending ending2, int segmentIndex2, const RShape* cornerShape = NULL) const; + bool isConcave() const; QList<RVector> getConvexVertices(bool convex = true) const; QList<RVector> getConcaveVertices() const; diff -Nru qcad-3.22.1+git6992-53c1229ac/support/ecmagenerator/src/srcml/RPropertyEditor.srcml qcad-3.22.1+git7032-e0f58b0a4/support/ecmagenerator/src/srcml/RPropertyEditor.srcml --- qcad-3.22.1+git6992-53c1229ac/support/ecmagenerator/src/srcml/RPropertyEditor.srcml 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/support/ecmagenerator/src/srcml/RPropertyEditor.srcml 2019-07-13 22:55:16.000000000 +0000 @@ -52,6 +52,8 @@ RPropertyEditor(); virtual ~RPropertyEditor(); + static RPropertyEditor* getInstance(); + // from RPropertyListener interface: virtual void updateFromDocument(RDocument* document, bool onlyChanges, RS::EntityType filter = RS::EntityUnknown, bool manual = false, bool showOnRequest = false); virtual void updateFromObject(RObject* object, RDocument* document = NULL); @@ -116,6 +118,8 @@ bool updatesDisabled; RS::EntityType entityTypeFilter; + + static RPropertyEditor* instance; }; Q_DECLARE_METATYPE(RPropertyEditor*) diff -Nru qcad-3.22.1+git6992-53c1229ac/support/ecmagenerator/src/srcml/RVersion.srcml qcad-3.22.1+git7032-e0f58b0a4/support/ecmagenerator/src/srcml/RVersion.srcml --- qcad-3.22.1+git6992-53c1229ac/support/ecmagenerator/src/srcml/RVersion.srcml 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/support/ecmagenerator/src/srcml/RVersion.srcml 2019-07-13 22:55:16.000000000 +0000 @@ -26,12 +26,12 @@ * x.x.x for releases * x.x.x.x for snapshots only */ -#define R_QCAD_VERSION_STRING "3.22.1.2" +#define R_QCAD_VERSION_STRING "3.22.1.4" #define R_QCAD_VERSION_MAJOR 3 #define R_QCAD_VERSION_MINOR 22 #define R_QCAD_VERSION_REV 1 -#define R_QCAD_VERSION_BUILD 2 +#define R_QCAD_VERSION_BUILD 4 #endif diff -Nru qcad-3.22.1+git6992-53c1229ac/support/ecmagenerator/src/xml/RMathLineEdit.xml qcad-3.22.1+git7032-e0f58b0a4/support/ecmagenerator/src/xml/RMathLineEdit.xml --- qcad-3.22.1+git6992-53c1229ac/support/ecmagenerator/src/xml/RMathLineEdit.xml 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/support/ecmagenerator/src/xml/RMathLineEdit.xml 2019-07-13 22:55:17.000000000 +0000 @@ -73,6 +73,11 @@ isConst="true" /> + + + diff -Nru qcad-3.22.1+git6992-53c1229ac/support/ecmagenerator/src/xml/RPolyline.xml qcad-3.22.1+git7032-e0f58b0a4/support/ecmagenerator/src/xml/RPolyline.xml --- qcad-3.22.1+git6992-53c1229ac/support/ecmagenerator/src/xml/RPolyline.xml 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/support/ecmagenerator/src/xml/RPolyline.xml 2019-07-13 22:55:17.000000000 +0000 @@ -967,6 +967,10 @@ hasDefault="true" default="NULL" isConst="true" /> + + + diff -Nru qcad-3.22.1+git6992-53c1229ac/support/ecmagenerator/src/xml/RPropertyEditor.xml qcad-3.22.1+git7032-e0f58b0a4/support/ecmagenerator/src/xml/RPropertyEditor.xml --- qcad-3.22.1+git6992-53c1229ac/support/ecmagenerator/src/xml/RPropertyEditor.xml 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/support/ecmagenerator/src/xml/RPropertyEditor.xml 2019-07-13 22:55:17.000000000 +0000 @@ -10,6 +10,12 @@ + + + Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/qcadcore_sk.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/qcadcore_sk.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/qcadcore_sk.ts qcad-3.22.1+git7032-e0f58b0a4/ts/qcadcore_sk.ts --- qcad-3.22.1+git6992-53c1229ac/ts/qcadcore_sk.ts 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/qcadcore_sk.ts 2019-07-13 22:55:17.000000000 +0000 @@ -474,7 +474,7 @@ Selected - + Vybrané Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/qcadcore_zh_TW.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/qcadcore_zh_TW.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/qcadcore_zh_TW.ts qcad-3.22.1+git7032-e0f58b0a4/ts/qcadcore_zh_TW.ts --- qcad-3.22.1+git6992-53c1229ac/ts/qcadcore_zh_TW.ts 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/qcadcore_zh_TW.ts 2019-07-13 22:55:17.000000000 +0000 @@ -21,7 +21,7 @@ Mile - + 英哩 @@ -41,12 +41,12 @@ Kilometer - + 公里 Microinch - + 微英寸 @@ -56,37 +56,37 @@ Yard - + 碼 Angstrom - + 埃 Nanometer - + 奈米 Micron - + 微米 Decimeter - + 公寸 Decameter - + 公寸 Hectometer - + 公引 @@ -534,7 +534,7 @@ Text Position - + 文字位置 Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/qcadentity_zh_TW.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/qcadentity_zh_TW.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/qcadentity_zh_TW.ts qcad-3.22.1+git7032-e0f58b0a4/ts/qcadentity_zh_TW.ts --- qcad-3.22.1+git6992-53c1229ac/ts/qcadentity_zh_TW.ts 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/qcadentity_zh_TW.ts 2019-07-13 22:55:17.000000000 +0000 @@ -209,7 +209,7 @@ Start Angle - + 初始角度 @@ -227,7 +227,7 @@ Diameter - + 直徑 @@ -250,7 +250,7 @@ Total Length - + 總長 @@ -268,7 +268,7 @@ Total Area - + 總面積 @@ -296,7 +296,7 @@ Dimension Line - + 尺寸線 @@ -400,23 +400,23 @@ Label - + 標註 Tolerance - + 公差 Upper Limit - + 上限 Lower Limit - + 下限 @@ -430,7 +430,7 @@ Text Position - + 文字位置 @@ -450,7 +450,7 @@ Extension Line Length - + 延伸線長度 @@ -477,7 +477,7 @@ Block Name - + 圖塊名稱 @@ -616,12 +616,12 @@ Width Factor - + width factor Height Factor - + 高度係數 @@ -641,7 +641,7 @@ Arrow - + 箭頭 Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/qcadgui_zh_TW.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/qcadgui_zh_TW.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/qcadgui_zh_TW.ts qcad-3.22.1+git7032-e0f58b0a4/ts/qcadgui_zh_TW.ts --- qcad-3.22.1+git6992-53c1229ac/ts/qcadgui_zh_TW.ts 2019-06-29 11:21:34.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/qcadgui_zh_TW.ts 2019-07-13 22:55:17.000000000 +0000 @@ -14,7 +14,7 @@ Grid - + 網格 Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_cs.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_cs.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_cs.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_cs.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_cs.ts 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_cs.ts 2019-07-13 22:55:17.000000000 +0000 @@ -2679,6 +2679,7 @@ + Dialog Dialog @@ -2758,6 +2759,36 @@ Cancel Storno + + + Reference layer (specifies center) + + + + + Scale: + Měřítko: + + + + 0.01 + 0.01 + + + + 297 + 297 + + + + 210 + 210 + + + + Pagesize: + + DimAligned @@ -3604,6 +3635,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate 1 entity duplicated @@ -8090,6 +8129,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -8122,6 +8169,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -8674,6 +8729,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -9058,6 +9121,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -9107,6 +9178,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -10170,6 +10269,136 @@ + SelectWidget + + + *VARIES* + *RŮZNÉ* + + + + : + : + + + + No Selection + Žádný výběr + + + + Geometry + + + + + Custom + Vlastní + + + + All + Vše + + + + Left + + + + + Center + Střed + + + + Right + + + + + Aligned + Zarovnané + + + + + Middle + + + + + Fit + Přizpůsobit + + + + Top + + + + + Base + Základna + + + + Bottom + + + + + Auto + Auto + + + + Yes + Ano + + + + No + Ne + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + + + + + General + Všeobecné + + + SelectionDisplay Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_de.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_de.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_de.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_de.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_de.ts 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_de.ts 2019-07-13 22:55:17.000000000 +0000 @@ -3110,6 +3110,7 @@ + Dialog Dialog @@ -3189,6 +3190,36 @@ Cancel Abbrechen + + + Reference layer (specifies center) + + + + + Scale: + Skalierung: + + + + 0.01 + 0.01 + + + + 297 + 297 + + + + 210 + 210 + + + + Pagesize: + + DimAligned @@ -4137,6 +4168,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -9938,6 +9977,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -9970,6 +10017,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -10790,6 +10845,14 @@ + PredefSelectionDialog + + + Select Predef + + + + Preferences &Window @@ -11299,6 +11362,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -11360,6 +11431,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -12617,6 +12716,136 @@ + SelectWidget + + + *VARIES* + *VARIIERT* + + + + : + : + + + + No Selection + Keine Selektion + + + + Geometry + Geometrie + + + + Custom + Benutzerdefiniert + + + + All + Alle + + + + Left + Links + + + + Center + + + + + Right + Rechts + + + + Aligned + Ausgerichtet + + + + + Middle + + + + + Fit + Anpassen + + + + Top + Oben + + + + Base + Basis + + + + Bottom + Unten + + + + Auto + + + + + Yes + Ja + + + + No + Nein + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + Typ: + + + + General + Allgemein + + + SelectionDisplay No selected entities. Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_en.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_en.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_en.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_en.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_en.ts 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_en.ts 2019-07-13 22:55:17.000000000 +0000 @@ -2686,6 +2686,7 @@ + Dialog Dialog @@ -2765,6 +2766,36 @@ Cancel Cancel + + + Reference layer (specifies center) + + + + + Scale: + Scale: + + + + 0.01 + 0.01 + + + + 297 + 297 + + + + 210 + 210 + + + + Pagesize: + + DimAligned @@ -3610,6 +3641,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -8166,6 +8205,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -8198,6 +8245,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -8756,6 +8811,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -9136,6 +9199,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -9185,6 +9256,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -10260,6 +10359,136 @@ + SelectWidget + + + *VARIES* + *VARIES* + + + + : + : + + + + No Selection + No Selection + + + + Geometry + + + + + Custom + Custom + + + + All + All + + + + Left + Left + + + + Center + Center + + + + Right + Right + + + + Aligned + Aligned + + + + + Middle + Middle + + + + Fit + Fit + + + + Top + Top + + + + Base + Base + + + + Bottom + Bottom + + + + Auto + Auto + + + + Yes + Yes + + + + No + No + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + + + + + General + General + + + SelectionDisplay Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_es.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_es.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_es.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_es.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_es.ts 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_es.ts 2019-07-13 22:55:17.000000000 +0000 @@ -3017,6 +3017,7 @@ + Dialog Dialog @@ -3108,6 +3109,36 @@ Cancel Cancelar + + + Reference layer (specifies center) + + + + + Scale: + Escala: + + + + 0.01 + 0.01 + + + + 297 + 297 + + + + 210 + 210 + + + + Pagesize: + + DimAligned @@ -4051,6 +4082,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -9639,6 +9678,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -9671,6 +9718,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -10357,6 +10412,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -10869,6 +10932,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -10930,6 +11001,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -12273,6 +12372,136 @@ + SelectWidget + + + *VARIES* + *VARIA* + + + + : + : + + + + No Selection + Seleccin nula + + + + Geometry + Geometría + + + + Custom + Personalizado + + + + All + Todo + + + + Left + Izquierda + + + + Center + Centro + + + + Right + Derecha + + + + Aligned + Alineado + + + + + Middle + + + + + Fit + + + + + Top + Parte superior + + + + Base + Base + + + + Bottom + Parte inferior + + + + Auto + Auto + + + + Yes + Sí + + + + No + No + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + Tipo: + + + + General + General + + + SelectionDisplay No selected entities. Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_fi.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_fi.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_fi.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_fi.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_fi.ts 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_fi.ts 2019-07-13 22:55:17.000000000 +0000 @@ -2710,6 +2710,7 @@ + Dialog Kyselyikkuna @@ -2789,6 +2790,36 @@ Cancel Peruuta + + + Reference layer (specifies center) + + + + + Scale: + + + + + 0.01 + 0.01 + + + + 297 + 297 + + + + 210 + 210 + + + + Pagesize: + + DimAligned @@ -3693,6 +3724,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -8314,6 +8353,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -8346,6 +8393,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -8904,6 +8959,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -9300,6 +9363,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -9353,6 +9424,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -10428,6 +10527,136 @@ + SelectWidget + + + *VARIES* + *VAIHTELEVA* + + + + : + : + + + + No Selection + Ei valintaa + + + + Geometry + Geometria + + + + Custom + Muokattu + + + + All + Kaikki + + + + Left + + + + + Center + + + + + Right + + + + + Aligned + Tasattu + + + + + Middle + + + + + Fit + Sovita + + + + Top + + + + + Base + Perus + + + + Bottom + + + + + Auto + Automaattinen + + + + Yes + Kyllä + + + + No + Ei + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + + + + + General + Yleistä + + + SelectionDisplay No selected entities. Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_fr.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_fr.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_fr.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_fr.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_fr.ts 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_fr.ts 2019-07-13 22:55:17.000000000 +0000 @@ -3025,6 +3025,7 @@ + Dialog Dialogue @@ -3117,6 +3118,36 @@ Cancel Annuler + + + Reference layer (specifies center) + + + + + Scale: + Echelle : + + + + 0.01 + 0.01 + + + + 297 + 297 + + + + 210 + 210 + + + + Pagesize: + + DimAligned @@ -4061,6 +4092,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -9662,6 +9701,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -9694,6 +9741,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -10378,6 +10433,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -10888,6 +10951,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -10949,6 +11020,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -12253,6 +12352,136 @@ + SelectWidget + + + *VARIES* + *VARIABLE* + + + + : + : + + + + No Selection + Aucune sélection + + + + Geometry + Géométrie + + + + Custom + Personnalisé + + + + All + Tous + + + + Left + Gauche + + + + Center + + + + + Right + Droite + + + + Aligned + Alignée + + + + + Middle + Milieu + + + + Fit + + + + + Top + En haut + + + + Base + Base + + + + Bottom + En bas + + + + Auto + Auto + + + + Yes + Oui + + + + No + Non + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + Type : + + + + General + Générale + + + SelectionDisplay No selected entities. Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_hr.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_hr.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_hr.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_hr.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_hr.ts 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_hr.ts 2019-07-13 22:55:17.000000000 +0000 @@ -2621,6 +2621,7 @@ + Dialog @@ -2700,6 +2701,36 @@ Cancel + + + Reference layer (specifies center) + + + + + Scale: + Mjerilo: + + + + 0.01 + + + + + 297 + + + + + 210 + + + + + Pagesize: + + DimAligned @@ -3540,6 +3571,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -7973,6 +8012,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -8005,6 +8052,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -8549,6 +8604,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -8925,6 +8988,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -8974,6 +9045,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -9968,6 +10067,136 @@ + + SelectWidget + + + *VARIES* + + + + + : + + + + + No Selection + + + + + Geometry + + + + + Custom + + + + + All + + + + + Left + + + + + Center + Centar + + + + Right + + + + + Aligned + + + + + + Middle + Sredina + + + + Fit + + + + + Top + + + + + Base + + + + + Bottom + + + + + Auto + + + + + Yes + + + + + No + + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + + + + + General + + + SelectionDisplay Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_hu.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_hu.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_hu.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_hu.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_hu.ts 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_hu.ts 2019-07-13 22:55:17.000000000 +0000 @@ -2608,6 +2608,7 @@ + Dialog @@ -2687,6 +2688,36 @@ Cancel + + + Reference layer (specifies center) + + + + + Scale: + Arány: + + + + 0.01 + + + + + 297 + + + + + 210 + + + + + Pagesize: + + DimAligned @@ -3513,6 +3544,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -7900,6 +7939,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -7932,6 +7979,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -8472,6 +8527,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -8848,6 +8911,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -8897,6 +8968,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -9887,6 +9986,136 @@ + + SelectWidget + + + *VARIES* + + + + + : + + + + + No Selection + + + + + Geometry + + + + + Custom + + + + + All + + + + + Left + + + + + Center + Közép + + + + Right + + + + + Aligned + + + + + + Middle + + + + + Fit + + + + + Top + + + + + Base + + + + + Bottom + + + + + Auto + + + + + Yes + + + + + No + + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + + + + + General + + + SelectionDisplay Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_it.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_it.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_it.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_it.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_it.ts 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_it.ts 2019-07-13 22:55:17.000000000 +0000 @@ -3004,6 +3004,7 @@ + Dialog Dialogo @@ -3083,6 +3084,36 @@ Cancel Annulla + + + Reference layer (specifies center) + + + + + Scale: + Scala: + + + + 0.01 + 0.01 + + + + 297 + 297 + + + + 210 + 210 + + + + Pagesize: + + DimAligned @@ -4025,6 +4056,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -9507,6 +9546,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -9539,6 +9586,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -10222,6 +10277,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -10717,6 +10780,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -10778,6 +10849,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -12112,6 +12211,136 @@ + SelectWidget + + + *VARIES* + *VARIE* + + + + : + : + + + + No Selection + Nessuna selezione + + + + Geometry + Geometria + + + + Custom + Personalizzato + + + + All + Tutto + + + + Left + Sinistra + + + + Center + Centro + + + + Right + Destra + + + + Aligned + Allineato + + + + + Middle + Medio + + + + Fit + + + + + Top + Sopra + + + + Base + Base + + + + Bottom + Sotto + + + + Auto + Auto + + + + Yes + Si + + + + No + No + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + Tipo: + + + + General + Generale + + + SelectionDisplay No selected entities. Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_ja.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_ja.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_ja.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_ja.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_ja.ts 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_ja.ts 2019-07-13 22:55:17.000000000 +0000 @@ -2758,6 +2758,7 @@ + Dialog ダイアログ @@ -2837,6 +2838,36 @@ Cancel キャンセル + + + Reference layer (specifies center) + + + + + Scale: + 縮尺: + + + + 0.01 + 0.01 + + + + 297 + 297 + + + + 210 + 210 + + + + Pagesize: + + DimAligned @@ -3744,6 +3775,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -8576,6 +8615,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -8608,6 +8655,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -9220,6 +9275,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -9620,6 +9683,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -9673,6 +9744,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -10784,6 +10883,136 @@ + SelectWidget + + + *VARIES* + *VARIES* + + + + : + : + + + + No Selection + 選択なし + + + + Geometry + ジオメトリ + + + + Custom + カスタム + + + + All + 全て + + + + Left + 左 + + + + Center + + + + + Right + 右 + + + + Aligned + 揃える + + + + + Middle + + + + + Fit + フィット + + + + Top + 上 + + + + Base + ベース + + + + Bottom + 下 + + + + Auto + 自動 + + + + Yes + はい + + + + No + いいえ + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + + + + + General + + + + SelectionDisplay No selected entities. diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_lt.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_lt.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_lt.ts 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_lt.ts 2019-07-13 22:55:17.000000000 +0000 @@ -2558,6 +2558,7 @@ + Dialog @@ -2637,6 +2638,36 @@ Cancel + + + Reference layer (specifies center) + + + + + Scale: + + + + + 0.01 + + + + + 297 + + + + + 210 + + + + + Pagesize: + + DimAligned @@ -3465,6 +3496,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -7815,6 +7854,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -7847,6 +7894,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -8383,6 +8438,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -8759,6 +8822,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -8808,6 +8879,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -9798,6 +9897,136 @@ + + SelectWidget + + + *VARIES* + + + + + : + + + + + No Selection + + + + + Geometry + + + + + Custom + + + + + All + + + + + Left + + + + + Center + + + + + Right + + + + + Aligned + + + + + + Middle + + + + + Fit + + + + + Top + + + + + Base + + + + + Bottom + + + + + Auto + + + + + Yes + + + + + No + + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + + + + + General + + + SelectionDisplay Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_nl.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_nl.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_nl.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_nl.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_nl.ts 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_nl.ts 2019-07-13 22:55:17.000000000 +0000 @@ -2728,6 +2728,7 @@ + Dialog Dialoog @@ -2807,6 +2808,36 @@ Cancel Annuleer + + + Reference layer (specifies center) + + + + + Scale: + Schaal: + + + + 0.01 + 0.01 + + + + 297 + 297 + + + + 210 + 210 + + + + Pagesize: + + DimAligned @@ -3660,6 +3691,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -8300,6 +8339,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -8332,6 +8379,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -8890,6 +8945,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -9274,6 +9337,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -9331,6 +9402,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -10410,6 +10509,136 @@ + SelectWidget + + + *VARIES* + *VARIEERT* + + + + : + : + + + + No Selection + Geen selectie + + + + Geometry + + + + + Custom + Gebruiker gedefinieerd + + + + All + Alle + + + + Left + Links + + + + Center + Middelpunt + + + + Right + Rechts + + + + Aligned + Uitgelijnd + + + + + Middle + + + + + Fit + Passen + + + + Top + + + + + Base + Basis + + + + Bottom + Onderkant + + + + Auto + + + + + Yes + Ja + + + + No + Nee + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + + + + + General + Algemeen + + + SelectionDisplay Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_pl.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_pl.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_pl.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_pl.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_pl.ts 2019-06-29 11:21:34.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_pl.ts 2019-07-13 22:55:17.000000000 +0000 @@ -3296,6 +3296,7 @@ + Dialog --exact match-- --file: designer_pl.ts-- @@ -3414,6 +3415,36 @@ &Anuluj Anuluj + + + Reference layer (specifies center) + + + + + Scale: + Skala: + + + + 0.01 + 0.01 + + + + 297 + 297 + + + + 210 + 210 + + + + Pagesize: + + DimAligned @@ -4508,6 +4539,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -10425,6 +10464,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -10457,6 +10504,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -11236,6 +11291,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -11881,6 +11944,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -11943,6 +12014,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -13314,6 +13413,136 @@ + SelectWidget + + + *VARIES* + *RÓŻNE* + + + + : + : + + + + No Selection + Brak zaznaczenia + + + + Geometry + Geometria + + + + Custom + Dostosowany + + + + All + Wszystkie + + + + Left + + + + + Center + + + + + Right + + + + + Aligned + + + + + + Middle + + + + + Fit + + + + + Top + + + + + Base + Podstawa + + + + Bottom + + + + + Auto + Automatycznie + + + + Yes + Tak + + + + No + Nie + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + Typ: + + + + General + + + + SelectionDisplay No selected entities. diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts.pro qcad-3.22.1+git7032-e0f58b0a4/ts/scripts.pro --- qcad-3.22.1+git6992-53c1229ac/ts/scripts.pro 2019-06-29 11:21:33.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts.pro 2019-07-13 22:55:17.000000000 +0000 @@ -799,6 +799,17 @@ ../scripts/Modify/TrimBoth/Tests/TrimBothTest04.js \ ../scripts/Modify/TrimBoth/TrimBoth.js \ ../scripts/Modify/TrimBoth/TrimBothInit.js \ +../scripts/MyTools/ActivateLayerConfig/ActivateLayerConfig.js \ +../scripts/MyTools/ActivatePredef/ActivatePredef.js \ +../scripts/MyTools/DupRemover/DupRemover.js \ +../scripts/MyTools/ListActiveLayers/ListActiveLayers.js \ +../scripts/MyTools/ListLayerConfigs/ListLayerConfigs.js \ +../scripts/MyTools/MultiPrintToPdf/MultiPrintToPdf.js \ +../scripts/MyTools/MyTools.js \ +../scripts/MyTools/PredefTools.js \ +../scripts/MyTools/QuickPrintToPdf/QuickPrintToPdf.js \ +../scripts/MyTools/Reconcile/Reconcile.js \ +../scripts/MyTools/SelectWidget/SelectWidget.js \ ../scripts/Navigation/DefaultNavigation/DefaultNavigation.js \ ../scripts/Projection/IsometricProjection/IsoProject/IsoProject.js \ ../scripts/Projection/IsometricProjection/IsoProject/IsoProjectInit.js \ @@ -1141,6 +1152,9 @@ ../scripts/Modify/Translate/TranslateDialog.ui \ ../scripts/Modify/TranslateRotate/TranslateRotate.ui \ ../scripts/Modify/TranslateRotate/TranslateRotateDialog.ui \ +../scripts/MyTools/PredefSelectDialog.ui \ +../scripts/MyTools/QuickPrintToPdf/QPTPDialog.ui \ +../scripts/MyTools/SelectWidget/SelectWidget.ui \ ../scripts/Navigation/DefaultNavigation/PreferencesPage.ui \ ../scripts/Projection/IsometricProjection/IsoProject/IsoProject.ui \ ../scripts/Select/SelectContour/SelectContour.ui \ Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_pt.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_pt.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_pt.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_pt.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_pt.ts 2019-06-29 11:21:34.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_pt.ts 2019-07-13 22:55:17.000000000 +0000 @@ -3494,6 +3494,7 @@ + Dialog --exact match-- --file: qcadguiqt_pt.ts-- @@ -3613,6 +3614,36 @@ &Cancelar Cancele + + + Reference layer (specifies center) + + + + + Scale: + + + + + 0.01 + 0.01 + + + + 297 + 297 + + + + 210 + 210 + + + + Pagesize: + + DimAligned @@ -4771,6 +4802,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -11070,6 +11109,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -11102,6 +11149,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -11973,6 +12028,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -12625,6 +12688,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -12689,6 +12760,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -14211,6 +14310,136 @@ + SelectWidget + + + *VARIES* + *VARIA* + + + + : + : + + + + No Selection + Nenhuma Seleção + + + + Geometry + Geometria + + + + Custom + Personalizado + + + + All + Todos + + + + Left + Esquerda + + + + Center + Centro + + + + Right + Direita + + + + Aligned + Alinhado + + + + + Middle + Meio + + + + Fit + + + + + Top + + + + + Base + Base + + + + Bottom + + + + + Auto + + + + + Yes + Sim + + + + No + Não + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + Tipo: + + + + General + Geral + + + SelectionDisplay No selected entities. Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_ru.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_ru.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_ru.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_ru.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_ru.ts 2019-06-29 11:21:34.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_ru.ts 2019-07-13 22:55:17.000000000 +0000 @@ -2712,6 +2712,7 @@ + Dialog Диалог @@ -2791,6 +2792,36 @@ Cancel Отменить + + + Reference layer (specifies center) + + + + + Scale: + Масштаб: + + + + 0.01 + 0.01 + + + + 297 + 297 + + + + 210 + 210 + + + + Pagesize: + + DimAligned @@ -3641,6 +3672,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -8271,6 +8310,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -8303,6 +8350,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -8855,6 +8910,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -9243,6 +9306,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -9296,6 +9367,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -10375,6 +10474,136 @@ + SelectWidget + + + *VARIES* + *ВАРЬИРОВАНИЕ* + + + + : + : + + + + No Selection + Ничего не выделено + + + + Geometry + + + + + Custom + Пользовательский + + + + All + Все + + + + Left + Слева + + + + Center + Центр + + + + Right + Справа + + + + Aligned + Выровненный + + + + + Middle + Середина + + + + Fit + Заполнить + + + + Top + + + + + Base + Основа + + + + Bottom + + + + + Auto + Автоматический + + + + Yes + Да + + + + No + Нет + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + + + + + General + Основное + + + SelectionDisplay Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_sk.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_sk.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_sk.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_sk.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_sk.ts 2019-06-29 11:21:34.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_sk.ts 2019-07-13 22:55:17.000000000 +0000 @@ -251,7 +251,7 @@ about:blank - about:blank + about:blank @@ -1664,7 +1664,7 @@ about:blank - about:blank + about:blank @@ -2309,7 +2309,7 @@ : - : + : @@ -2662,7 +2662,7 @@ Editing block "%1"<br>Choose <i>Block > Return to Main Drawing</i> when done - Úprava bloku "%1"<br>Vybrať <i>Blok > Návrat ku kresleniu </i> keď bude hotové + Úprava bloku "%1"<br>Vybrať <i>Blok > Návrat ku kresleniu</i> keď bude hotová Editing block '%1'<br>Choose <i>Block > Return to Main Drawing</i> when done @@ -2730,7 +2730,7 @@ &Deselect Layer Entities - + &Zrušiť výber prvkov vrstvy @@ -2750,6 +2750,7 @@ + Dialog Dialóg @@ -2829,6 +2830,36 @@ Cancel Zrušiť + + + Reference layer (specifies center) + + + + + Scale: + Mierka: + + + + 0.01 + Rozostup medzi písmenami {0.01?} + + + + 297 + Rozostup medzi písmenami {297?} + + + + 210 + Rozostup medzi písmenami {210?} + + + + Pagesize: + + DimAligned @@ -2985,7 +3016,7 @@ Label position of %n dimension(s) was reset. Pozícia textu %n kóty(kót) bola resetovaná. - + Pozícia textu %n kót bola resetovaná. @@ -3706,6 +3737,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -3724,8 +3763,8 @@ %n entity/ies duplicated - %n duplicitný (-é) prvok (-y) - + %n duplicitný(-ých) prvok(-ov) + %n duplicitné prvky @@ -3746,7 +3785,7 @@ Done - Hotovo + Hotovo @@ -3884,7 +3923,7 @@ <html><head/><body><p>You are about to enable the ECMAScript Shell.</p><p>Through the ECMAScript Shell you can <span style=" color:#ff0000;">modify your drawings</span> but also <span style=" color:#ff0000;">delete files</span> or <span style=" color:#ff0000;">crash the application</span> which can lead to <span style=" color:#ff0000;">data loss</span>.</p><p>For inexperienced programmers, it is recommended to limit the use of the ECMAScript shell to the <a href="http://www.qcad.org/doc/qcad/latest/developer/group__ecma__simple.html"><span style=" text-decoration: underline; color:#0000ff;">QCAD Simple API</span></a> which is considered to be 'safe' to use.</p></body></html> - ECMAScript + <html><head/><body><p>Chystáte sa povoliť prostredie ECMAScript.</p><p>Prostredníctvom ECMAScript môžete<span style=" color:#ff0000;">upraviť svoje výkresy</span>, ale ak <span style=" color:#ff0000;">vymažete súbory</span>, alebo <span style=" color:#ff0000;">aplikácia padne</span>, môže to viesť k <span style=" color:#ff0000;">strate dát</span>.</p><p>For inexperienced programmers, it is recommended to limit the use of the ECMAScript shell to the <a href="http://www.qcad.org/doc/qcad/latest/developer/group__ecma__simple.html"><span style=" text-decoration: underline; color:#0000ff;">QCAD Simple API</span></a> which is considered to be 'safe' to use.</p></body></html> @@ -4316,7 +4355,7 @@ You can use <i>Edit > Undo</i> to restore the line entity. - Môžete použiť <i> Upraviť> Späť </ i> a obnoviť čiaru. + Môžete použiť <i> Upraviť> Späť </i> a obnoviť čiaru. @@ -4352,7 +4391,7 @@ ExDumpPolyline &Dump Polyline - &Dump polyline (krivka) + &Vyhodiť krivku @@ -4604,7 +4643,7 @@ Transaction affected %n object(s). - Transakcia ovplyvnila %n objekt (-y). + Transakcia ovplyvnila %n objekt(-y). @@ -6414,7 +6453,7 @@ Cannot import file from URL: - Nie je možné importovať súbor z URL: + Nie je možné importovať súbor z URL: @@ -8339,7 +8378,7 @@ Leetro MOL Import... - Leetro MOL Import... + Leetro MOL Import... @@ -8364,6 +8403,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -8396,6 +8443,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -8960,6 +9015,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -9356,6 +9419,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -9409,6 +9480,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -10218,7 +10317,7 @@ SelectByHandle Object selected: - Vybraný prvok: + Vybraný prvok: @@ -10227,7 +10326,7 @@ Object is not an entity: - Hodnota nie je prvok: + Hodnota nie je prvok: @@ -10376,7 +10475,7 @@ &Select Layer Entities - + &Vybrať prvky vrstvy @@ -10488,6 +10587,136 @@ + SelectWidget + + + *VARIES* + *Rôzne* + + + + : + : + + + + No Selection + Nič nie je vybraté + + + + Geometry + Geometria + + + + Custom + Vlastné + + + + All + Všetko + + + + Left + + + + + Center + + + + + Right + + + + + Aligned + Zarovnané + + + + + Middle + + + + + Fit + Prispôsobiť + + + + Top + + + + + Base + Základ + + + + Bottom + + + + + Auto + + + + + Yes + Áno + + + + No + Nie + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + + + + + General + Všeobecné + + + SelectionDisplay @@ -10507,7 +10736,7 @@ %n Entities on Layer '%1' %n prvky na vrstve '%1' - + %n prvky na vrstve '%1' @@ -10521,7 +10750,7 @@ %n Entities on Layer "%1" %n prvky na vrstve "%1" - + %n prvky na vrstve "%1" @@ -10530,7 +10759,7 @@ %n Entities %n prvky - + %n prvky @@ -10544,7 +10773,7 @@ %n Layers %n vrstvy - + %n vrstvy Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_sl.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_sl.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_sl.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_sl.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_sl.ts 2019-06-29 11:21:34.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_sl.ts 2019-07-13 22:55:17.000000000 +0000 @@ -2762,6 +2762,7 @@ + Dialog Dialog @@ -2841,6 +2842,36 @@ Cancel Prekliči + + + Reference layer (specifies center) + + + + + Scale: + + + + + 0.01 + 0.01 + + + + 297 + 297 + + + + 210 + 210 + + + + Pagesize: + + DimAligned @@ -3747,6 +3778,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -8668,6 +8707,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -8700,6 +8747,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -9290,6 +9345,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -9722,6 +9785,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -9775,6 +9846,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -10858,6 +10957,136 @@ + SelectWidget + + + *VARIES* + *RAZLIČNO* + + + + : + : + + + + No Selection + Ni izbrano + + + + Geometry + Geometrija + + + + Custom + + + + + All + Vse + + + + Left + Levo + + + + Center + + + + + Right + Desno + + + + Aligned + Poravnano + + + + + Middle + + + + + Fit + Prilagodi + + + + Top + + + + + Base + + + + + Bottom + + + + + Auto + Samodejno + + + + Yes + Da + + + + No + Ne + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + + + + + General + Splošno + + + SelectionDisplay No selected entities. Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_sv.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_sv.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_sv.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_sv.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_sv.ts 2019-06-29 11:21:34.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_sv.ts 2019-07-13 22:55:17.000000000 +0000 @@ -2603,6 +2603,7 @@ + Dialog @@ -2682,6 +2683,36 @@ Cancel Avbryt + + + Reference layer (specifies center) + + + + + Scale: + Skala: + + + + 0.01 + + + + + 297 + + + + + 210 + + + + + Pagesize: + + DimAligned @@ -3517,6 +3548,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -7949,6 +7988,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -7981,6 +8028,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -8523,6 +8578,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -8899,6 +8962,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -8948,6 +9019,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -9942,6 +10041,136 @@ + + SelectWidget + + + *VARIES* + + + + + : + + + + + No Selection + + + + + Geometry + + + + + Custom + + + + + All + + + + + Left + + + + + Center + Mittpunkt + + + + Right + + + + + Aligned + + + + + + Middle + Mitten + + + + Fit + + + + + Top + Överst + + + + Base + + + + + Bottom + + + + + Auto + + + + + Yes + + + + + No + + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + + + + + General + + + SelectionDisplay diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_th.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_th.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_th.ts 2019-06-29 11:21:34.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_th.ts 2019-07-13 22:55:17.000000000 +0000 @@ -2556,6 +2556,7 @@ + Dialog @@ -2635,6 +2636,36 @@ Cancel + + + Reference layer (specifies center) + + + + + Scale: + + + + + 0.01 + + + + + 297 + + + + + 210 + + + + + Pagesize: + + DimAligned @@ -3461,6 +3492,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -7807,6 +7846,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -7839,6 +7886,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -8371,6 +8426,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -8747,6 +8810,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -8796,6 +8867,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -9786,6 +9885,136 @@ + + SelectWidget + + + *VARIES* + + + + + : + + + + + No Selection + + + + + Geometry + + + + + Custom + + + + + All + + + + + Left + + + + + Center + + + + + Right + + + + + Aligned + + + + + + Middle + + + + + Fit + + + + + Top + + + + + Base + + + + + Bottom + + + + + Auto + + + + + Yes + + + + + No + + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + + + + + General + + + SelectionDisplay Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_tr.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_tr.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_tr.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_tr.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_tr.ts 2019-06-29 11:21:34.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_tr.ts 2019-07-13 22:55:17.000000000 +0000 @@ -2649,6 +2649,7 @@ Dialog + Dialog Diyalog @@ -2733,6 +2734,36 @@ Character Map + + + Reference layer (specifies center) + + + + + Scale: + Ölçek: + + + + 0.01 + + + + + 297 + + + + + 210 + + + + + Pagesize: + + DimAligned @@ -3579,6 +3610,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -8010,6 +8049,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -8042,6 +8089,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -8582,6 +8637,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -8962,6 +9025,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -9011,6 +9082,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -10030,6 +10129,136 @@ + SelectWidget + + + *VARIES* + + + + + : + : + + + + No Selection + Seçim Yok + + + + Geometry + + + + + Custom + + + + + All + Tümü + + + + Left + Sol + + + + Center + Merkez + + + + Right + Sağ + + + + Aligned + + + + + + Middle + Orta + + + + Fit + + + + + Top + Üst + + + + Base + + + + + Bottom + Alt + + + + Auto + Oto + + + + Yes + Evet + + + + No + Hayır + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + + + + + General + Genel + + + SelectionDisplay Binary files /tmp/tmp4rlSTt/k7MHAzmyeU/qcad-3.22.1+git6992-53c1229ac/ts/scripts_zh_CN.qm and /tmp/tmp4rlSTt/e1BzQWLkjb/qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_zh_CN.qm differ diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_zh_CN.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_zh_CN.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_zh_CN.ts 2019-06-29 11:21:34.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_zh_CN.ts 2019-07-13 22:55:17.000000000 +0000 @@ -2627,6 +2627,7 @@ + Dialog @@ -2706,6 +2707,36 @@ Cancel + + + Reference layer (specifies center) + + + + + Scale: + + + + + 0.01 + + + + + 297 + + + + + 210 + + + + + Pagesize: + + DimAligned @@ -3544,6 +3575,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -8003,6 +8042,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -8035,6 +8082,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -8575,6 +8630,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -8951,6 +9014,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -9000,6 +9071,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -9994,6 +10093,136 @@ + + SelectWidget + + + *VARIES* + + + + + : + + + + + No Selection + + + + + Geometry + + + + + Custom + + + + + All + + + + + Left + + + + + Center + 中心 + + + + Right + + + + + Aligned + + + + + + Middle + 中点 + + + + Fit + + + + + Top + + + + + Base + + + + + Bottom + + + + + Auto + 自动 + + + + Yes + + + + + No + + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + + + + + General + + + SelectionDisplay diff -Nru qcad-3.22.1+git6992-53c1229ac/ts/scripts_zh_TW.ts qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_zh_TW.ts --- qcad-3.22.1+git6992-53c1229ac/ts/scripts_zh_TW.ts 2019-06-29 11:21:34.000000000 +0000 +++ qcad-3.22.1+git7032-e0f58b0a4/ts/scripts_zh_TW.ts 2019-07-13 22:55:17.000000000 +0000 @@ -2556,6 +2556,7 @@ + Dialog @@ -2635,6 +2636,36 @@ Cancel + + + Reference layer (specifies center) + + + + + Scale: + + + + + 0.01 + + + + + 297 + + + + + 210 + + + + + Pagesize: + + DimAligned @@ -3461,6 +3492,14 @@ + DupRemover + + + &DupRemover + + + + Duplicate @@ -7807,6 +7846,14 @@ + MultiPrintToPdf + + + Multi-Export to PDF + + + + MyPositionDialog @@ -7839,6 +7886,14 @@ + MyTools + + + My&Tools + + + + MyWidget @@ -8371,6 +8426,14 @@ + PredefSelectionDialog + + + Select Predef + + + + PreferencesDialog @@ -8747,6 +8810,14 @@ + QuickPrintToPdf + + + Multi-Export to PDF + + + + Quit @@ -8796,6 +8867,34 @@ + Reconcile + + + First point to adopt + + + + + Second point to adopt + + + + + First target point + + + + + Second target point + + + + + &Reconcile + + + + Redo @@ -9786,6 +9885,136 @@ + + SelectWidget + + + *VARIES* + + + + + : + + + + + No Selection + + + + + Geometry + + + + + Custom + + + + + All + + + + + Left + + + + + Center + + + + + Right + + + + + Aligned + + + + + + Middle + + + + + Fit + + + + + Top + + + + + Base + + + + + Bottom + + + + + Auto + + + + + Yes + + + + + No + + + + + + Select Widget + + + + + Reduction: + + + + + to + + + + + by + + + + + nearby + + + + + Type: + + + + + General + + + SelectionDisplay