mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-09-24 10:44:13 +02:00
Compare commits
170 Commits
ef1fbd79b4
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
| c85276f61b | |||
| f3a31c291f | |||
| a06220e8dc | |||
| 79990e40ee | |||
| e1e7ea4888 | |||
| 54b8fe5df4 | |||
| be0d214b75 | |||
| 2f988e6e2c | |||
| 9786006ca4 | |||
| 91e8956734 | |||
| 6fad3390df | |||
| 231ab990c3 | |||
| f10275cb22 | |||
| 3d0e7a27a3 | |||
| f14278324c | |||
| d5318eb7b4 | |||
| f10ef3ded7 | |||
| 6f7ea63589 | |||
| 9a6029a2bb | |||
| bc0ca56c7e | |||
| 1d4c0326d4 | |||
| d889a384aa | |||
| 3457a88e81 | |||
| 4e361f93fe | |||
| 6a8838e719 | |||
| 774f803626 | |||
| 5b0785fcce | |||
| ed0f800ab5 | |||
| de9b3eae06 | |||
| 032f2249a3 | |||
| 1890cee801 | |||
| 3eea3059bf | |||
| 6d8459d647 | |||
| 28acbadaf0 | |||
| 4456d08b91 | |||
| aae7a8bde3 | |||
| 4bcf5834e4 | |||
| f6889af99c | |||
| 9e5af6440b | |||
| b97bccecd3 | |||
| 14cf3e403f | |||
| 1f0ed43006 | |||
| fc2a200ca2 | |||
| ccf96e0537 | |||
| fa213d90d9 | |||
| 84add7b3ef | |||
| 36fb048a80 | |||
| a7ae17a1b4 | |||
| a1675d7dea | |||
| 13a37e1f59 | |||
| 6fc7e4a090 | |||
| 08b83f23e3 | |||
| 3fa5e0a475 | |||
| 8334a9a27f | |||
| 4a636b14e3 | |||
| f777be05b4 | |||
| 8ee3f90047 | |||
| 41e1e8172c | |||
| 1212f48c6d | |||
| e01f46c5b0 | |||
| 3cec02b3f3 | |||
| a2e384761c | |||
| 4283ddad10 | |||
| 1046b97080 | |||
| a766f9a975 | |||
| 68503e2a7d | |||
| 3b05f5cf13 | |||
| 2906a48aab | |||
| a542b911e9 | |||
| 9cee71bde2 | |||
| 687837d7a3 | |||
| ea1f65107e | |||
| 6380e2a46b | |||
| 219273a8e5 | |||
| 8a2d31d835 | |||
| a8f883601d | |||
| cd27912605 | |||
| f087820757 | |||
| 2772b690e8 | |||
| 279b001a16 | |||
| 59cc758b7f | |||
| 0c958d3b66 | |||
| 528d33792d | |||
| fc41cf9f5d | |||
| 7f04bc1572 | |||
| 27bbf51024 | |||
| 65299e1178 | |||
| 8e2a29deaf | |||
| 5b739c3338 | |||
| a1e4e153ae | |||
| 56f60be60a | |||
| 852f581206 | |||
| 3b626a7d1a | |||
| 069a75d44b | |||
| e1f887a036 | |||
| c5edd0a54b | |||
| 3a13287ba9 | |||
| 24776bfcf6 | |||
| 3202c145e8 | |||
| 4888ae87f3 | |||
| 59344eb565 | |||
| 5d033bf1b2 | |||
| 8985babfe7 | |||
| 29d16c3337 | |||
| 61f5e5e502 | |||
| 77bc9ed8e4 | |||
| 9b26d5dc6a | |||
| b76d8ce8a1 | |||
| d7052e396b | |||
| e123c55754 | |||
| 268aba60eb | |||
| 313f9533a8 | |||
| 3d1cb671c1 | |||
| c0fc093b4e | |||
| 46c35d2297 | |||
| 2adc58c1c0 | |||
| 82262c5980 | |||
| 6dcb6a2a8f | |||
| c740cdf1ac | |||
| 78caeaec48 | |||
| aab0a18506 | |||
| ebab58e4b3 | |||
| 45ca53c7a8 | |||
| 2efce1752d | |||
| 27dea3ffab | |||
| c256e2dd1a | |||
| 8e3a7a6ab6 | |||
| 740271c993 | |||
| 1bec2700bd | |||
| 268e9c7bd9 | |||
| 264a0f677f | |||
| 9ccfb5e116 | |||
| 04463f0954 | |||
| 3245919c19 | |||
| 55ad2eccbf | |||
| 8b2548d601 | |||
| c3aeb0bf83 | |||
| 16d89f64fd | |||
| ac78c51b70 | |||
| 2e27f77b28 | |||
| 83fb525e27 | |||
| d1808c7a89 | |||
| 4e4f029d2d | |||
| 242f134e0f | |||
| 2dc88df29c | |||
| fd8135264f | |||
| 827cd2a91e | |||
| cdd25189b5 | |||
| f1313f5895 | |||
| 75fafd5acc | |||
| 3394c1246c | |||
| 3e34a6d55f | |||
| 50792ba1ad | |||
| 6404612014 | |||
| eaf15faaa3 | |||
| b8c9e670c4 | |||
| 85dc638a42 | |||
| dfe56cddbd | |||
| 3f397f5f78 | |||
| 7ec13cbc1a | |||
| 7fa1ff35b8 | |||
| 7e3420b1a5 | |||
| 183035d5ac | |||
| eb4109bb11 | |||
| 717bf57677 | |||
| 861e5de25e | |||
| bf7bff595e | |||
| 3c1fb2fe72 | |||
| 95d0e523fe | |||
| 81449faffd |
@@ -1 +0,0 @@
|
||||
*.qch filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
name: Auto-build doxygen docs
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- '**'
|
||||
|
||||
|
||||
|
||||
jobs:
|
||||
doxygen:
|
||||
permissions:
|
||||
contents: write
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: 'recursive'
|
||||
show-progress: ''
|
||||
- name: Setup and run doxygen
|
||||
run: sudo apt update && sudo apt install doxygen graphviz qhelpgenerator-qt5 -y
|
||||
- name: Set up Git LFS
|
||||
run: |
|
||||
git lfs install
|
||||
git lfs track "*.qch"
|
||||
- name: Run doxygen
|
||||
run: doxygen Doxyfile
|
||||
- name: Create Pull Request
|
||||
uses: peter-evans/create-pull-request@v8
|
||||
with:
|
||||
token: ${{ secrets.MR_TOKEN }}
|
||||
commit-message: update QCH file
|
||||
committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
||||
title: Update QCH Help file
|
||||
body: |
|
||||
- Updating QT Help file following commit ${{ github.sha }}.
|
||||
- Auto-generated by [create-pull-request][1]
|
||||
|
||||
[1]: https://github.com/peter-evans/create-pull-request
|
||||
branch: update-qch
|
||||
labels: |
|
||||
qch
|
||||
cicd
|
||||
delete-branch: true
|
||||
add-paths: doc/*.qch
|
||||
- uses: actions/upload-pages-artifact@v3
|
||||
with:
|
||||
path: ${{ github.workspace }}/doc/html/
|
||||
deploy:
|
||||
# Add a dependency to the build job
|
||||
needs: doxygen
|
||||
|
||||
# Grant GITHUB_TOKEN the permissions required to make a Pages deployment
|
||||
permissions:
|
||||
pages: write # to deploy to Pages
|
||||
id-token: write # to verify the deployment originates from an appropriate source
|
||||
|
||||
# Deploy to the github-pages environment
|
||||
environment:
|
||||
name: github-pages
|
||||
url: ${{ steps.deployment.outputs.page_url }}
|
||||
|
||||
# Specify runner + deployment step
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Deploy to GitHub Pages
|
||||
id: deployment
|
||||
uses: actions/deploy-pages@v4 # or specific "vX.X.X" version tag for this action
|
||||
@@ -28,7 +28,7 @@ jobs:
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||
ca-certificates build-essential cmake ninja-build git pkg-config \
|
||||
qt6-base-dev qt6-base-private-dev qt6-tools-dev qt6-tools-dev-tools \
|
||||
libqt6svg6-dev libqt6sql6-sqlite libsqlite3-dev libcups2-dev \
|
||||
libqt6svg6-dev libqt6sql6-sqlite libcups2-dev libsqlite3-dev \
|
||||
libxkbcommon-x11-0 \
|
||||
xvfb openbox xdotool x11-utils
|
||||
# extra-cmake-modules and the KF6 libraries are installed rather than
|
||||
@@ -53,7 +53,9 @@ jobs:
|
||||
git config --global --add safe.directory "$GITHUB_WORKSPACE"
|
||||
cmake -B build -G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=Debug \
|
||||
-DQT_VERSION_MAJOR=6
|
||||
-DQT_VERSION_MAJOR=6 \
|
||||
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
|
||||
-DQET_EXPORT_PROJECT_DB=ON
|
||||
|
||||
- name: Build
|
||||
run: cmake --build build --parallel $(nproc)
|
||||
|
||||
@@ -59,17 +59,41 @@ jobs:
|
||||
|
||||
# ----------------------------------------------------------------
|
||||
# 2. Download the portable artifact for this flavor
|
||||
#
|
||||
# Wrapped in nick-fields/retry: actions/download-artifact@v8 has
|
||||
# shown repeated "Artifact download failed after 5 retries"
|
||||
# failures on this cross-workflow download (via run-id) — not a
|
||||
# real content/digest problem, just flaky Azure blob delivery.
|
||||
# Two separate occurrences observed within days of each other
|
||||
# (different artifact IDs/digests, same failure signature), each
|
||||
# one enough to fail build-msi outright and block the rest of the
|
||||
# pipeline. Retrying the whole download 3x is cheap insurance.
|
||||
# Switched to `gh run download` here because nick-fields/retry
|
||||
# can only retry a shell command, not re-invoke a `uses:` step.
|
||||
# ----------------------------------------------------------------
|
||||
- name: Download portable artifact
|
||||
uses: actions/download-artifact@v8
|
||||
uses: nick-fields/retry@v3
|
||||
with:
|
||||
name: ${{ matrix.portable_artifact }}
|
||||
path: artifact\files
|
||||
# workflow_run => use the triggering run's ID
|
||||
# workflow_dispatch => use input run_id if provided, otherwise current run
|
||||
run-id: ${{ github.event.workflow_run.id || github.event.inputs.run_id || github.run_id }}
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
repository: ${{ github.repository }}
|
||||
timeout_minutes: 10
|
||||
max_attempts: 3
|
||||
retry_wait_seconds: 30
|
||||
shell: pwsh
|
||||
command: |
|
||||
if (Test-Path "artifact\files") { Remove-Item -Recurse -Force "artifact\files" }
|
||||
New-Item -ItemType Directory -Force -Path "artifact\files" | Out-Null
|
||||
|
||||
$runId = "${{ github.event.workflow_run.id || github.event.inputs.run_id || github.run_id }}"
|
||||
gh run download $runId `
|
||||
--repo "${{ github.repository }}" `
|
||||
--name "${{ matrix.portable_artifact }}" `
|
||||
--dir "artifact\files"
|
||||
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
Write-Error "gh run download failed (exit $LASTEXITCODE)"
|
||||
exit $LASTEXITCODE
|
||||
}
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
# ----------------------------------------------------------------
|
||||
# 3. Extract version
|
||||
@@ -336,7 +360,13 @@ jobs:
|
||||
if-no-files-found: error
|
||||
|
||||
- name: Delete old nightly .msi asset
|
||||
if: always()
|
||||
# Only run if a new MSI actually exists in dist/ — otherwise the old
|
||||
# (still working) nightly .msi would be deleted without anything to
|
||||
# replace it, leaving the nightly release with no MSI at all until
|
||||
# the next successful build (see windows-msi-pipeline notes,
|
||||
# run 35694391567: an upstream artifact-download failure meant
|
||||
# dist\*.msi never existed for that run).
|
||||
if: always() && hashFiles('dist/*.msi') != ''
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
REPO: ${{ github.repository }}
|
||||
@@ -381,7 +411,20 @@ jobs:
|
||||
deploy-pages:
|
||||
needs: build-msi
|
||||
runs-on: ubuntu-latest
|
||||
if: always() && needs.build-msi.result == 'success'
|
||||
# Regenerate the page whenever the MSI job actually ran (success OR
|
||||
# packaging/signing failure) — not only on full success.
|
||||
# generate-page.py queries the published assets on the "nightly"
|
||||
# release itself (line 407: `gh release view nightly --json assets`),
|
||||
# so it already handles a missing MSI natively (empty MSI_NAME -> no
|
||||
# MSI button on the page). The page only needs the exe/zip already
|
||||
# published by windows-build.yml, independent of the MSI's fate.
|
||||
# Only "skipped"/"cancelled" are excluded: if build-msi never ran at
|
||||
# all (e.g. Windows Build itself failed), there is nothing new to
|
||||
# publish and regenerating the page would be pointless.
|
||||
if: >
|
||||
always() &&
|
||||
needs.build-msi.result != 'skipped' &&
|
||||
needs.build-msi.result != 'cancelled'
|
||||
permissions:
|
||||
contents: write
|
||||
pages: write
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
*.snap
|
||||
.flatpak-builder
|
||||
__pycache__/
|
||||
*.pyc
|
||||
# Qt build output
|
||||
*.user
|
||||
# doxygen Doxyfile output
|
||||
|
||||
+3
-2
@@ -113,7 +113,9 @@ if(Backtrace_FOUND)
|
||||
include_directories(${Backtrace_INCLUDE_DIRS})
|
||||
add_compile_definitions(QET_CRASH_BACKTRACE)
|
||||
else()
|
||||
message(STATUS "backtrace() not available: crash dumps will carry the log ring without a backtrace")
|
||||
message(STATUS
|
||||
"backtrace() not available: crash dumps will carry the log ring "
|
||||
"without a backtrace")
|
||||
endif()
|
||||
|
||||
find_package(SQLite3 REQUIRED)
|
||||
@@ -316,7 +318,6 @@ target_include_directories(
|
||||
${QET_DIR}/sources/NameList
|
||||
${QET_DIR}/sources/NameList/ui
|
||||
${QET_DIR}/sources/utils
|
||||
${QET_DIR}/pugixml/src
|
||||
${QET_DIR}/sources/dataBase
|
||||
${QET_DIR}/sources/dataBase/ui
|
||||
${QET_DIR}/sources/factory/ui
|
||||
|
||||
+16
@@ -271,6 +271,22 @@ mkdir build && cd build
|
||||
cmake .. -G Ninja -DBUILD_WITH_KF=OFF -DCMAKE_BUILD_TYPE=Release
|
||||
cmake --build .
|
||||
```
|
||||
|
||||
If `libbacktrace` is installed in your MSYS2 environment, pass the following
|
||||
cached CMake variables when configuring. They are only necessary in that
|
||||
case, because `FindBacktrace` needs them to locate the library:
|
||||
|
||||
```sh
|
||||
cmake .. -G Ninja -DBUILD_WITH_KF=OFF -DCMAKE_BUILD_TYPE=Release \
|
||||
-DBacktrace_INCLUDE_DIR=/c/msys64/clang64/include \
|
||||
-DBacktrace_LIBRARY=/c/msys64/clang64/lib/libbacktrace.a
|
||||
```
|
||||
|
||||
`Backtrace_INCLUDE_DIR` must point to the directory containing `backtrace.h`,
|
||||
and `Backtrace_LIBRARY` to the `libbacktrace.a` file. The paths above are the
|
||||
usual locations for the MSYS2 `clang64` environment; adjust them if your
|
||||
installation uses a different prefix.
|
||||
|
||||
(KF6 isn't packaged in MSYS2 either, hence `-DBUILD_WITH_KF=OFF` again.)
|
||||
|
||||
Using the Qt Online Installer's bundled MinGW kit instead: point
|
||||
|
||||
@@ -23,8 +23,31 @@ if(BUILD_WITH_KF)
|
||||
|
||||
if(BUILD_KF)
|
||||
|
||||
if(NOT DEFINED KF_GIT_TAG)
|
||||
# this is a more or less random version, taken as an conservative approach
|
||||
# v6.10.0 is a more or less random version, taken as an conservative
|
||||
# approach. Pinned to the commits v6.10.0 points at, not to the tags
|
||||
# themselves; see the note in fetch_pugixml.cmake. Each module lives in its
|
||||
# own repository, so the same v6.10.0 release is a different commit in
|
||||
# each.
|
||||
#
|
||||
# KDE uses annotated tags, so "git ls-remote <repo> 'refs/tags/v6.10.0*'"
|
||||
# prints two hashes per module: refs/tags/v6.10.0 is the tag object (the
|
||||
# tagger, the date and the tag message) and refs/tags/v6.10.0^{} is the
|
||||
# commit that object points at. The hashes below are the "^{}" ones, i.e.
|
||||
# the commits. Lightweight tags, such as pugixml's v1.15 and
|
||||
# SingleApplication's v3.2.0, have no tag object and print only the
|
||||
# commit line.
|
||||
set(KF_ECM_GIT_COMMIT 7dd28cc56c339c3f8fb356f7c53c0e8f61433d81) # v6.10.0
|
||||
set(KF_KCOREADDONS_GIT_COMMIT c569f974dab24b4784ad186a3db4b76b2fa36612) # v6.10.0
|
||||
set(KF_KWIDGETSADDONS_GIT_COMMIT 1abbed8a280d6626c59fb197f2c4667d2b1e7445) # v6.10.0
|
||||
|
||||
if(DEFINED KF_GIT_TAG)
|
||||
# Explicit override: -DKF_GIT_TAG=<ref> selects one ref for all three
|
||||
# modules, unpinned, exactly as it did before.
|
||||
set(KF_ECM_GIT_COMMIT ${KF_GIT_TAG})
|
||||
set(KF_KCOREADDONS_GIT_COMMIT ${KF_GIT_TAG})
|
||||
set(KF_KWIDGETSADDONS_GIT_COMMIT ${KF_GIT_TAG})
|
||||
else()
|
||||
# Keep KF_GIT_TAG defined: define_definitions.cmake reports it.
|
||||
set(KF_GIT_TAG v6.10.0)
|
||||
endif()
|
||||
# using a function in order to limit the scope of the variables
|
||||
@@ -53,19 +76,19 @@ if(BUILD_WITH_KF)
|
||||
FetchContent_Declare(
|
||||
ecm
|
||||
GIT_REPOSITORY https://invent.kde.org/frameworks/extra-cmake-modules.git
|
||||
GIT_TAG ${KF_GIT_TAG})
|
||||
GIT_TAG ${KF_ECM_GIT_COMMIT})
|
||||
FetchContent_MakeAvailable(ecm)
|
||||
|
||||
FetchContent_Declare(
|
||||
kcoreaddons
|
||||
GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git
|
||||
GIT_TAG ${KF_GIT_TAG})
|
||||
GIT_TAG ${KF_KCOREADDONS_GIT_COMMIT})
|
||||
FetchContent_MakeAvailable(kcoreaddons)
|
||||
|
||||
FetchContent_Declare(
|
||||
kwidgetsaddons
|
||||
GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git
|
||||
GIT_TAG ${KF_GIT_TAG})
|
||||
GIT_TAG ${KF_KWIDGETSADDONS_GIT_COMMIT})
|
||||
FetchContent_MakeAvailable(kwidgetsaddons)
|
||||
endfunction()
|
||||
qet_make_kf_available()
|
||||
|
||||
@@ -22,10 +22,51 @@ option(BUILD_PUGIXML "Build pugixml library, use system one otherwise" YES)
|
||||
|
||||
if(BUILD_PUGIXML)
|
||||
|
||||
# Pinned to the commit v1.15 points at, not to the tag itself.
|
||||
#
|
||||
# A git tag is only a named pointer to a commit, and anyone with push access
|
||||
# to the upstream repository can move it (git push --force) to any other
|
||||
# commit. FetchContent fetches whatever the tag points at when the build
|
||||
# runs, so if a maintainer account or CI token is compromised, the attacker
|
||||
# can retarget a well-known release tag to malicious code: every fresh build
|
||||
# of QElectroTech then compiles it, while nothing changes in this repository
|
||||
# and the tag name still looks correct. A commit hash cannot be moved, because
|
||||
# it is derived from the content: different code always has a different hash.
|
||||
#
|
||||
# This attack has been used in the wild:
|
||||
# - March 2025, tj-actions/changed-files (CVE-2025-30066): tags v1 through
|
||||
# v45.0.7 were retargeted to a commit that dumped CI secrets into build
|
||||
# logs, affecting more than 23,000 repositories.
|
||||
# - March 2026, aquasecurity/trivy-action (CVE-2026-33634): 76 of 77
|
||||
# version tags were force-pushed to a credential stealer and stayed
|
||||
# malicious for about 12 hours.
|
||||
# Both were GitHub Actions rather than CMake dependencies, but the mechanism
|
||||
# is the same one FetchContent relies on here: resolving a git tag at build
|
||||
# time.
|
||||
#
|
||||
# To upgrade, look up the commit the new tag points at with
|
||||
# git ls-remote <repo> 'refs/tags/<tag>*', check that it is the release you
|
||||
# expect, and update both the hash and the trailing tag comment.
|
||||
#
|
||||
# How many lines that prints depends on which of the two kinds of tag
|
||||
# upstream created:
|
||||
# - A lightweight tag is nothing but a ref pointing straight at the commit,
|
||||
# so ls-remote prints a single line, "refs/tags/<tag>", and its hash is
|
||||
# the commit to pin. pugixml tags this way, which is why the v1.15 hash
|
||||
# below is what "git ls-remote ... refs/tags/v1.15" reports directly;
|
||||
# SingleApplication (v3.2.0) does the same.
|
||||
# - An annotated tag is a git object in its own right, carrying a tagger,
|
||||
# a date, a message and optionally a GPG signature, and pointing at the
|
||||
# commit. ls-remote then prints two lines: "refs/tags/<tag>" is the tag
|
||||
# object and "refs/tags/<tag>^{}" is that object dereferenced, i.e. the
|
||||
# commit. The KDE Frameworks modules tag this way, so for them it is the
|
||||
# "^{}" hash that belongs in the pin; the other hash identifies the tag
|
||||
# object itself, which is not the source revision and changes whenever
|
||||
# upstream re-creates the tag, even over the very same commit.
|
||||
FetchContent_Declare(
|
||||
pugixml
|
||||
GIT_REPOSITORY https://github.com/zeux/pugixml.git
|
||||
GIT_TAG v1.15)
|
||||
GIT_TAG ee86beb30e4973f5feffe3ce63bfa4fbadf72f38) # v1.15
|
||||
set(PUGIXML_INSTALL OFF CACHE INTERNAL "")
|
||||
FetchContent_MakeAvailable(pugixml)
|
||||
else()
|
||||
|
||||
@@ -31,9 +31,15 @@ if(EXISTS "${CMAKE_SOURCE_DIR}/SingleApplication/CMakeLists.txt")
|
||||
set(FETCHCONTENT_SOURCE_DIR_SINGLEAPPLICATION "${CMAKE_SOURCE_DIR}/SingleApplication")
|
||||
endif()
|
||||
|
||||
# Pinned to the commit v3.2.0 points at, not to the tag itself; see the note in
|
||||
# fetch_pugixml.cmake. v3.2.0 is a lightweight tag, a ref pointing straight at
|
||||
# the commit, so "git ls-remote <repo> refs/tags/v3.2.0" prints that commit and
|
||||
# nothing else. An annotated tag, as KDE uses in fetch_kdeaddons.cmake, would
|
||||
# print the tag object under refs/tags/v3.2.0 as well, with the commit on the
|
||||
# refs/tags/v3.2.0^{} line.
|
||||
FetchContent_Declare(
|
||||
SingleApplication
|
||||
GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git
|
||||
GIT_TAG v3.2.0)
|
||||
GIT_TAG aede311d28d20179216c5419b581087be2a8409f) # v3.2.0
|
||||
set(QT_DEFAULT_MAJOR_VERSION 6)
|
||||
FetchContent_MakeAvailable(SingleApplication)
|
||||
|
||||
@@ -62,7 +62,9 @@ if(WIN32)
|
||||
# puts the .qm files (see build-aux/windows/QElectroTech.wxs and the
|
||||
# windows-build workflow), and what the shortcuts pass as --lang-dir.
|
||||
set(QET_LANG_PATH "lang/")
|
||||
set(QET_EXAMPLES_PATH "examples/")
|
||||
set(QET_LICENSE_PATH "./")
|
||||
set(QET_ICONS_PATH "icons/hicolor/")
|
||||
# Liste des ressources Windows
|
||||
#RC_FILE = qelectrotech.rc
|
||||
endif()
|
||||
|
||||
@@ -248,6 +248,8 @@ set(QET_SRC_FILES
|
||||
${QET_DIR}/sources/qet.h
|
||||
${QET_DIR}/sources/qeticons.cpp
|
||||
${QET_DIR}/sources/qeticons.h
|
||||
${QET_DIR}/sources/palettegraphicsview.cpp
|
||||
${QET_DIR}/sources/palettegraphicsview.h
|
||||
${QET_DIR}/sources/qetpalette.cpp
|
||||
${QET_DIR}/sources/qetpalette.h
|
||||
${QET_DIR}/sources/qetstyle.cpp
|
||||
@@ -310,6 +312,8 @@ set(QET_SRC_FILES
|
||||
|
||||
${QET_DIR}/sources/dataBase/projectdatabase.cpp
|
||||
${QET_DIR}/sources/dataBase/projectdatabase.h
|
||||
${QET_DIR}/sources/dataBase/sqlreadonly.cpp
|
||||
${QET_DIR}/sources/dataBase/sqlreadonly.h
|
||||
|
||||
${QET_DIR}/sources/dataBase/ui/elementquerywidget.cpp
|
||||
${QET_DIR}/sources/dataBase/ui/elementquerywidget.h
|
||||
@@ -505,10 +509,6 @@ set(QET_SRC_FILES
|
||||
${QET_DIR}/sources/PropertiesEditor/propertieseditorwidget.cpp
|
||||
${QET_DIR}/sources/PropertiesEditor/propertieseditorwidget.h
|
||||
|
||||
${QET_DIR}/pugixml/src/pugiconfig.hpp
|
||||
${QET_DIR}/pugixml/src/pugixml.cpp
|
||||
${QET_DIR}/pugixml/src/pugixml.hpp
|
||||
|
||||
${QET_DIR}/sources/qetgraphicsitem/conductor.cpp
|
||||
${QET_DIR}/sources/qetgraphicsitem/conductor.h
|
||||
${QET_DIR}/sources/qetgraphicsitem/conductortextitem.cpp
|
||||
@@ -705,6 +705,8 @@ set(QET_SRC_FILES
|
||||
${QET_DIR}/sources/ui/conductorpropertiesdialog.h
|
||||
${QET_DIR}/sources/ui/conductorcolortoolbutton.cpp
|
||||
${QET_DIR}/sources/ui/conductorcolortoolbutton.h
|
||||
${QET_DIR}/sources/ui/diagrambgcolorbutton.cpp
|
||||
${QET_DIR}/sources/ui/diagrambgcolorbutton.h
|
||||
${QET_DIR}/sources/ui/conductorpropertieswidget.cpp
|
||||
${QET_DIR}/sources/ui/conductorpropertieswidget.h
|
||||
${QET_DIR}/sources/ui/configsaveloaderwidget.cpp
|
||||
@@ -721,6 +723,8 @@ set(QET_SRC_FILES
|
||||
${QET_DIR}/sources/ui/backupdialog.h
|
||||
${QET_DIR}/sources/ui/dialogwaiting.cpp
|
||||
${QET_DIR}/sources/ui/dialogwaiting.h
|
||||
${QET_DIR}/sources/ui/duplicateoffsetdialog.cpp
|
||||
${QET_DIR}/sources/ui/duplicateoffsetdialog.h
|
||||
${QET_DIR}/sources/ui/dynamicelementtextitemeditor.cpp
|
||||
${QET_DIR}/sources/ui/dynamicelementtextitemeditor.h
|
||||
${QET_DIR}/sources/ui/dynamicelementtextmodel.cpp
|
||||
|
||||
+1
-1
Submodule elements updated: 60eacc28a6...08e438a919
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
@@ -0,0 +1,29 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
|
||||
<!-- keyboard body with a lighter top edge -->
|
||||
<rect x="6" y="30" width="116" height="68" rx="8" fill="#31363b"/>
|
||||
<rect x="6" y="30" width="116" height="34" rx="8" fill="#4d4d4d"/>
|
||||
<rect x="6" y="46" width="116" height="18" fill="#31363b"/>
|
||||
<!-- key rows -->
|
||||
<g fill="#eff0f1">
|
||||
<rect x="14" y="38" width="8" height="8" rx="1.5"/><rect x="24" y="38" width="8" height="8" rx="1.5"/>
|
||||
<rect x="34" y="38" width="8" height="8" rx="1.5"/><rect x="44" y="38" width="8" height="8" rx="1.5"/>
|
||||
<rect x="54" y="38" width="8" height="8" rx="1.5"/><rect x="64" y="38" width="8" height="8" rx="1.5"/>
|
||||
<rect x="74" y="38" width="8" height="8" rx="1.5"/><rect x="84" y="38" width="8" height="8" rx="1.5"/>
|
||||
<rect x="94" y="38" width="8" height="8" rx="1.5"/><rect x="104" y="38" width="10" height="8" rx="1.5"/>
|
||||
<rect x="14" y="50" width="12" height="8" rx="1.5"/><rect x="28" y="50" width="8" height="8" rx="1.5"/>
|
||||
<rect x="38" y="50" width="8" height="8" rx="1.5"/><rect x="48" y="50" width="8" height="8" rx="1.5"/>
|
||||
<rect x="58" y="50" width="8" height="8" rx="1.5"/><rect x="68" y="50" width="8" height="8" rx="1.5"/>
|
||||
<rect x="78" y="50" width="8" height="8" rx="1.5"/><rect x="88" y="50" width="8" height="8" rx="1.5"/>
|
||||
<rect x="98" y="50" width="16" height="8" rx="1.5"/>
|
||||
<rect x="14" y="62" width="16" height="8" rx="1.5"/><rect x="32" y="62" width="8" height="8" rx="1.5"/>
|
||||
<rect x="42" y="62" width="8" height="8" rx="1.5"/><rect x="52" y="62" width="8" height="8" rx="1.5"/>
|
||||
<rect x="62" y="62" width="8" height="8" rx="1.5"/><rect x="72" y="62" width="8" height="8" rx="1.5"/>
|
||||
<rect x="82" y="62" width="8" height="8" rx="1.5"/><rect x="92" y="62" width="22" height="8" rx="1.5"/>
|
||||
<rect x="14" y="74" width="10" height="8" rx="1.5"/><rect x="26" y="74" width="10" height="8" rx="1.5"/>
|
||||
<rect x="38" y="74" width="52" height="8" rx="1.5"/>
|
||||
<rect x="92" y="74" width="10" height="8" rx="1.5"/><rect x="104" y="74" width="10" height="8" rx="1.5"/>
|
||||
</g>
|
||||
<!-- the two keys of a shortcut, pressed -->
|
||||
<rect x="14" y="62" width="16" height="8" rx="1.5" fill="#3daee9"/>
|
||||
<rect x="42" y="62" width="8" height="8" rx="1.5" fill="#3daee9"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
@@ -0,0 +1,48 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
|
||||
<!-- DIN rail -->
|
||||
<rect x="6" y="86" width="116" height="18" rx="3" fill="#7f8c8d"/>
|
||||
<rect x="6" y="92" width="116" height="6" fill="#4d4d4d"/>
|
||||
<!-- six terminal blocks: L, L, N, PE, L, spare -->
|
||||
<g fill="#eff0f1">
|
||||
<rect x="12" y="26" width="16" height="66" rx="2"/>
|
||||
<rect x="30" y="26" width="16" height="66" rx="2"/>
|
||||
<rect x="48" y="26" width="16" height="66" rx="2"/>
|
||||
<rect x="66" y="26" width="16" height="66" rx="2"/>
|
||||
<rect x="84" y="26" width="16" height="66" rx="2"/>
|
||||
<rect x="102" y="26" width="16" height="66" rx="2"/>
|
||||
</g>
|
||||
<!-- right-hand shading of each block -->
|
||||
<g fill="#bdc3c7">
|
||||
<rect x="24" y="28" width="4" height="62"/>
|
||||
<rect x="42" y="28" width="4" height="62"/>
|
||||
<rect x="60" y="28" width="4" height="62"/>
|
||||
<rect x="78" y="28" width="4" height="62"/>
|
||||
<rect x="96" y="28" width="4" height="62"/>
|
||||
<rect x="114" y="28" width="4" height="62"/>
|
||||
</g>
|
||||
<!-- colored marker bands -->
|
||||
<rect x="12" y="26" width="16" height="10" rx="2" fill="#7f8c8d"/>
|
||||
<rect x="30" y="26" width="16" height="10" rx="2" fill="#7f8c8d"/>
|
||||
<rect x="48" y="26" width="16" height="10" rx="2" fill="#3daee9"/>
|
||||
<rect x="66" y="26" width="16" height="10" rx="2" fill="#27ae60"/>
|
||||
<rect x="70" y="26" width="8" height="10" fill="#fdbc4b"/>
|
||||
<rect x="84" y="26" width="16" height="10" rx="2" fill="#7f8c8d"/>
|
||||
<rect x="102" y="26" width="16" height="10" rx="2" fill="#da4453"/>
|
||||
<!-- screws -->
|
||||
<g fill="#31363b">
|
||||
<circle cx="20" cy="50" r="4.5"/><circle cx="20" cy="74" r="4.5"/>
|
||||
<circle cx="38" cy="50" r="4.5"/><circle cx="38" cy="74" r="4.5"/>
|
||||
<circle cx="56" cy="50" r="4.5"/><circle cx="56" cy="74" r="4.5"/>
|
||||
<circle cx="74" cy="50" r="4.5"/><circle cx="74" cy="74" r="4.5"/>
|
||||
<circle cx="92" cy="50" r="4.5"/><circle cx="92" cy="74" r="4.5"/>
|
||||
<circle cx="110" cy="50" r="4.5"/><circle cx="110" cy="74" r="4.5"/>
|
||||
</g>
|
||||
<g fill="#eff0f1">
|
||||
<rect x="16" y="49" width="8" height="2"/><rect x="16" y="73" width="8" height="2"/>
|
||||
<rect x="34" y="49" width="8" height="2"/><rect x="34" y="73" width="8" height="2"/>
|
||||
<rect x="52" y="49" width="8" height="2"/><rect x="52" y="73" width="8" height="2"/>
|
||||
<rect x="70" y="49" width="8" height="2"/><rect x="70" y="73" width="8" height="2"/>
|
||||
<rect x="88" y="49" width="8" height="2"/><rect x="88" y="73" width="8" height="2"/>
|
||||
<rect x="106" y="49" width="8" height="2"/><rect x="106" y="73" width="8" height="2"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.5 KiB |
@@ -216,6 +216,7 @@ Clarification:
|
||||
ico/128x128/diagram.png by the QElectroTech team (License CC BY-ND 3.0)
|
||||
ico/128x128/document-export.png by the QElectroTech team (License CC BY-ND 3.0)
|
||||
ico/128x128/project.png by the QElectroTech team (License CC BY-ND 3.0)
|
||||
ico/128x128/terminalstrip.png and configure-shortcuts.png by Jeff Patterson from the QElectroTech team (License CC BY-ND 3.0), rendered from the .svg files beside them
|
||||
ico/scalable/pdf-import.svg by Jeff Patterson from the QElectroTech team (License CC BY-ND 3.0), laid out like ico/22x22/insert-image.png
|
||||
ico/scalable/diagram.svg, folio-new.svg, folio-delete.svg, folio-properties.svg, label.svg by Jeff Patterson from the QElectroTech team (License CC BY-ND 3.0), the folio icons redrawn in the same style
|
||||
ico/256x256/* by Nuri from the QElectroTech team (License CC BY-ND 3.0)
|
||||
|
||||
@@ -259,12 +259,14 @@
|
||||
<file alias="themes/qet/48x48/user-away-extended.png">48x48/user-away-extended.png</file>
|
||||
<file alias="themes/qet/48x48/user-away.png">48x48/user-away.png</file>
|
||||
<file alias="themes/qet/48x48/view-pim-journal.png">48x48/view-pim-journal.png</file>
|
||||
<file alias="themes/qet/128x128/configure-shortcuts.png">128x128/configure-shortcuts.png</file>
|
||||
<file alias="themes/qet/128x128/diagram.png">128x128/diagram.png</file>
|
||||
<file alias="themes/qet/128x128/document-export.png">128x128/document-export.png</file>
|
||||
<file alias="themes/qet/128x128/plasmagik.png">128x128/plasmagik.png</file>
|
||||
<file alias="themes/qet/128x128/printer.png">128x128/printer.png</file>
|
||||
<file alias="themes/qet/128x128/project.png">128x128/project.png</file>
|
||||
<file alias="themes/qet/128x128/settings.png">128x128/settings.png</file>
|
||||
<file alias="themes/qet/128x128/terminalstrip.png">128x128/terminalstrip.png</file>
|
||||
<file alias="themes/qet/scalable/diagram.svg">scalable/diagram.svg</file>
|
||||
<file alias="themes/qet/scalable/folio-delete.svg">scalable/folio-delete.svg</file>
|
||||
<file alias="themes/qet/scalable/folio-new.svg">scalable/folio-new.svg</file>
|
||||
@@ -469,5 +471,7 @@
|
||||
<file>themes/qet-dark/scalable/ellipse-to-bezier.svg</file>
|
||||
<file>themes/qet-dark/scalable/rect-to-bezier.svg</file>
|
||||
<file>themes/qet-dark/scalable/rect-to-polyline.svg</file>
|
||||
<file alias="themes/qet-dark/128x128/document-export.png">128x128/document-export.png</file>
|
||||
<file alias="themes/qet-dark/128x128/printer.png">128x128/printer.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,222 @@
|
||||
<!DOCTYPE QPH>
|
||||
<QPH sourcelanguage="fr_FR" language="ca">
|
||||
<phrase>
|
||||
<source>Réf. croisée</source>
|
||||
<target>Ref. creuada</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>armoire</source>
|
||||
<target>armari</target>
|
||||
<definition>cabinet / enclosure</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>bobine</source>
|
||||
<target>bobina</target>
|
||||
<definition>coil</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>borne</source>
|
||||
<target>born</target>
|
||||
<definition>terminal - a connection point on a symbol</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>bornier</source>
|
||||
<target>bornes</target>
|
||||
<definition>terminal strip</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>cable</source>
|
||||
<target>cable</target>
|
||||
<definition>cable</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>calibre</source>
|
||||
<target>calibre</target>
|
||||
<definition>rating - the current rating of a device</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>cartouche</source>
|
||||
<target>cartutx</target>
|
||||
<definition>title block - the framed information panel</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>champ de texte</source>
|
||||
<target>camp de text</target>
|
||||
<definition>text field</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>collection</source>
|
||||
<target>col·lecció</target>
|
||||
<definition>collection - the symbol library</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>conducteur</source>
|
||||
<target>conductor</target>
|
||||
<definition>conductor - the drawn wire between terminals</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>contact</source>
|
||||
<target>contacte</target>
|
||||
<definition>contact</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>contacteur</source>
|
||||
<target>contactor</target>
|
||||
<definition>contactor</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>courant</source>
|
||||
<target>corrent</target>
|
||||
<definition>current</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>disjoncteur</source>
|
||||
<target>disjuntor</target>
|
||||
<definition>circuit breaker</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>dossier</source>
|
||||
<target>carpeta</target>
|
||||
<definition>folder</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>element</source>
|
||||
<target>element</target>
|
||||
<definition>element - a symbol placed on a sheet</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>esclave</source>
|
||||
<target>esclau</target>
|
||||
<definition>slave - the contact block belonging to a master</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>fil</source>
|
||||
<target>fil</target>
|
||||
<definition>wire</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>folio</source>
|
||||
<target>plec</target>
|
||||
<definition>sheet - one drawing of a set</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>fusible</source>
|
||||
<target>fusible</target>
|
||||
<definition>fuse</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>grille</source>
|
||||
<target>graella</target>
|
||||
<definition>grid</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>interrupteur</source>
|
||||
<target>interruptor</target>
|
||||
<definition>switch</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>maitre</source>
|
||||
<target>mestre</target>
|
||||
<definition>master - the element a cross-reference points from</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>modele</source>
|
||||
<target>plantilla</target>
|
||||
<definition>template</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>moteur</source>
|
||||
<target>motor</target>
|
||||
<definition>motor</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>neutre</source>
|
||||
<target>neutre</target>
|
||||
<definition>neutral</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>nomenclature</source>
|
||||
<target>nomenclatura</target>
|
||||
<definition>parts list / bill of materials</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>numerotation</source>
|
||||
<target>numeració</target>
|
||||
<definition>numbering - automatic wire and part numbering</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>phase</source>
|
||||
<target>fase</target>
|
||||
<definition>phase</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>potentiel</source>
|
||||
<target>potencial</target>
|
||||
<definition>potential - conductors electrically joined as one node</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>projet</source>
|
||||
<target>projecte</target>
|
||||
<definition>project - the .qet file holding the sheets</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>puissance</source>
|
||||
<target>potència</target>
|
||||
<definition>power</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>relais</source>
|
||||
<target>relé</target>
|
||||
<definition>relay</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>renvoi de folio</source>
|
||||
<target>referència de plec</target>
|
||||
<definition>sheet cross-reference</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>repere</source>
|
||||
<target>referència</target>
|
||||
<definition>designation - the identifying mark on a part</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>report de folio</source>
|
||||
<target>remissió de plec</target>
|
||||
<definition>sheet cross-reference (the arrow symbol)</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>schema</source>
|
||||
<target>esquema</target>
|
||||
<definition>diagram</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>section</source>
|
||||
<target>secció</target>
|
||||
<definition>cross-section - conductor size in mm2</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>sommaire</source>
|
||||
<target>sumari</target>
|
||||
<definition>summary / table of contents</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>tension</source>
|
||||
<target>tensió</target>
|
||||
<definition>voltage</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>terre</source>
|
||||
<target>terra</target>
|
||||
<definition>earth / ground</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>texte</source>
|
||||
<target>text</target>
|
||||
<definition>text</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>transformateur</source>
|
||||
<target>transformador</target>
|
||||
<definition>transformer</definition>
|
||||
</phrase>
|
||||
</QPH>
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -100,4 +100,8 @@
|
||||
<source>traduction</source>
|
||||
<target>Übersetzung</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier le nom de la borne</source>
|
||||
<target>Klemmenname ändern</target>
|
||||
</phrase>
|
||||
</QPH>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,918 @@
|
||||
<!DOCTYPE QPH>
|
||||
<QPH sourcelanguage="fr_FR" language="en">
|
||||
<phrase>
|
||||
<source>Blue : Blue</source>
|
||||
<target>Blue : Blue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Blue : CornflowerBlue</source>
|
||||
<target>Blue : CornflowerBlue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Blue : DarkBlue</source>
|
||||
<target>Blue : DarkBlue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Blue : DeepSkyBlue</source>
|
||||
<target>Blue : DeepSkyBlue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Blue : DodgerBlue</source>
|
||||
<target>Blue : DodgerBlue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Blue : LightBlue</source>
|
||||
<target>Blue : LightBlue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Blue : LightSkyBlue</source>
|
||||
<target>Blue : LightSkyBlue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Blue : LightSteelBlue</source>
|
||||
<target>Blue : LightSteelBlue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Blue : MediumBlue</source>
|
||||
<target>Blue : MediumBlue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Blue : MidnightBlue</source>
|
||||
<target>Blue : MidnightBlue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Blue : Navy</source>
|
||||
<target>Blue : Navy</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Blue : PowderBlue</source>
|
||||
<target>Blue : PowderBlue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Blue : RoyalBlue</source>
|
||||
<target>Blue : RoyalBlue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Blue : SkyBlue</source>
|
||||
<target>Blue : SkyBlue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Blue : SteelBlue</source>
|
||||
<target>Blue : SteelBlue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Brown : Bisque</source>
|
||||
<target>Brown : Bisque</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Brown : BlanchedAlmond</source>
|
||||
<target>Brown : BlanchedAlmond</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Brown : Brown</source>
|
||||
<target>Brown : Brown</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Brown : Burlywood</source>
|
||||
<target>Brown : Burlywood</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Brown : Chocolate</source>
|
||||
<target>Brown : Chocolate</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Brown : Cornsilk</source>
|
||||
<target>Brown : Cornsilk</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Brown : DarkGoldenrod</source>
|
||||
<target>Brown : DarkGoldenrod</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Brown : Goldenrod</source>
|
||||
<target>Brown : Goldenrod</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Brown : Maroon</source>
|
||||
<target>Brown : Maroon</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Brown : NavajoWhite</source>
|
||||
<target>Brown : NavajoWhite</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Brown : Peru</source>
|
||||
<target>Brown : Peru</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Brown : RosyBrown</source>
|
||||
<target>Brown : RosyBrown</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Brown : SaddleBrown</source>
|
||||
<target>Brown : SaddleBrown</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Brown : SandyBrown</source>
|
||||
<target>Brown : SandyBrown</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Brown : Sienna</source>
|
||||
<target>Brown : Sienna</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Brown : Tan</source>
|
||||
<target>Brown : Tan</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Brown : Wheat</source>
|
||||
<target>Brown : Wheat</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cyan : Aqua</source>
|
||||
<target>Cyan : Aqua</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cyan : Aquamarine</source>
|
||||
<target>Cyan : Aquamarine</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cyan : CadetBlue</source>
|
||||
<target>Cyan : CadetBlue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cyan : Cyan</source>
|
||||
<target>Cyan : Cyan</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cyan : DarkCyan</source>
|
||||
<target>Cyan : DarkCyan</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cyan : DarkTurquoise</source>
|
||||
<target>Cyan : DarkTurquoise</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cyan : LightCyan</source>
|
||||
<target>Cyan : LightCyan</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cyan : LightSeaGreen</source>
|
||||
<target>Cyan : LightSeaGreen</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cyan : MediumTurquoise</source>
|
||||
<target>Cyan : MediumTurquoise</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cyan : PaleTurquoise</source>
|
||||
<target>Cyan : PaleTurquoise</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cyan : Teal</source>
|
||||
<target>Cyan : Teal</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cyan : Turquoise</source>
|
||||
<target>Cyan : Turquoise</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Gray : Black</source>
|
||||
<target>Gray : Black</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Gray : DarkGray</source>
|
||||
<target>Gray : DarkGray</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Gray : DarkSlateGray</source>
|
||||
<target>Gray : DarkSlateGray</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Gray : DimGray</source>
|
||||
<target>Gray : DimGray</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Gray : Gainsboro</source>
|
||||
<target>Gray : Gainsboro</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Gray : Gray</source>
|
||||
<target>Gray : Gray</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Gray : LightGray</source>
|
||||
<target>Gray : LightGray</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Gray : LightSlateGray</source>
|
||||
<target>Gray : LightSlateGray</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Gray : Silver</source>
|
||||
<target>Gray : Silver</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Gray : SlateGray</source>
|
||||
<target>Gray : SlateGray</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : Chartreuse</source>
|
||||
<target>Green : Chartreuse</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : DarkGreen</source>
|
||||
<target>Green : DarkGreen</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : DarkOliveGreen</source>
|
||||
<target>Green : DarkOliveGreen</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : DarkSeaGreen</source>
|
||||
<target>Green : DarkSeaGreen</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : ForestGreen</source>
|
||||
<target>Green : ForestGreen</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : Green</source>
|
||||
<target>Green : Green</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : GreenYellow</source>
|
||||
<target>Green : GreenYellow</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : LawnGreen</source>
|
||||
<target>Green : LawnGreen</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : LightGreen</source>
|
||||
<target>Green : LightGreen</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : Lime</source>
|
||||
<target>Green : Lime</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : LimeGreen</source>
|
||||
<target>Green : LimeGreen</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : MediumAquamarine</source>
|
||||
<target>Green : MediumAquamarine</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : MediumSeaGreen</source>
|
||||
<target>Green : MediumSeaGreen</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : MediumSpringGreen</source>
|
||||
<target>Green : MediumSpringGreen</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : Olive</source>
|
||||
<target>Green : Olive</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : OliveDrab</source>
|
||||
<target>Green : OliveDrab</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : PaleGreen</source>
|
||||
<target>Green : PaleGreen</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : SeaGreen</source>
|
||||
<target>Green : SeaGreen</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : SpringGreen</source>
|
||||
<target>Green : SpringGreen</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Green : YellowGreen</source>
|
||||
<target>Green : YellowGreen</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Orange : Coral</source>
|
||||
<target>Orange : Coral</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Orange : DarkOrange</source>
|
||||
<target>Orange : DarkOrange</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Orange : Orange</source>
|
||||
<target>Orange : Orange</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Orange : OrangeRed</source>
|
||||
<target>Orange : OrangeRed</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Orange : Tomato</source>
|
||||
<target>Orange : Tomato</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Pink : DeepPink</source>
|
||||
<target>Pink: DeepPink</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Pink : HotPink</source>
|
||||
<target>Pink: HotPink</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Pink : LightPink</source>
|
||||
<target>Pink: LightPink</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Pink : MediumVioletRed</source>
|
||||
<target>Pink: MediumVioletRed</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Pink : PaleVioletRed</source>
|
||||
<target>Pink: PaleVioletRed</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Pink : Pink</source>
|
||||
<target>Pink: Pink</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Purple : BlueViolet</source>
|
||||
<target>Purple : BlueViolet</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Purple : DarkMagenta</source>
|
||||
<target>Purple : DarkMagenta</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Purple : DarkOrchid</source>
|
||||
<target>Purple : DarkOrchid</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Purple : DarkSlateBlue</source>
|
||||
<target>Purple : DarkSlateBlue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Purple : DarkViolet</source>
|
||||
<target>Purple : DarkViolet</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Purple : Fuchsia</source>
|
||||
<target>Purple : Fuchsia</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Purple : Indigo</source>
|
||||
<target>Purple : Indigo</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Purple : Lavender</source>
|
||||
<target>Purple : Lavender</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Purple : Magenta</source>
|
||||
<target>Purple : Magenta</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Purple : MediumOrchid</source>
|
||||
<target>Purple : MediumOrchid</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Purple : MediumPurple</source>
|
||||
<target>Purple : MediumPurple</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Purple : MediumSlateBlue</source>
|
||||
<target>Purple : MediumSlateBlue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Purple : Orchid</source>
|
||||
<target>Purple : Orchid</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Purple : Plum</source>
|
||||
<target>Purple : Plum</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Purple : Purple</source>
|
||||
<target>Purple : Purple</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Purple : SlateBlue</source>
|
||||
<target>Purple : SlateBlue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Purple : Thistle</source>
|
||||
<target>Purple : Thistle</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Purple : Violet</source>
|
||||
<target>Purple : Violet</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Red : Crimson</source>
|
||||
<target>Red : Crimson</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Red : DarkRed</source>
|
||||
<target>Red : DarkRed</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Red : DarkSalmon</source>
|
||||
<target>Red: DarkSalmon</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Red : Firebrick</source>
|
||||
<target>Red : Firebrick</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Red : IndianRed</source>
|
||||
<target>Red: IndianRed</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Red : LightCoral</source>
|
||||
<target>Red: LightCoral</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Red : LightSalmon</source>
|
||||
<target>Red: LightSalmon</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Red : Red</source>
|
||||
<target>Red : Red</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Red : Salmon</source>
|
||||
<target>Red: Salmon</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>White : AliceBlue</source>
|
||||
<target>White : AliceBlue</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>White : AntiqueWhite</source>
|
||||
<target>White : AntiqueWhite</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>White : Azure</source>
|
||||
<target>White : Azure</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>White : Beige</source>
|
||||
<target>White : Beige</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>White : FloralWhite</source>
|
||||
<target>White : FloralWhite</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>White : GhostWhite</source>
|
||||
<target>White : GhostWhite</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>White : Honeydew</source>
|
||||
<target>White : Honeydew</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>White : Ivory</source>
|
||||
<target>White : Ivory</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>White : LavenderBlush</source>
|
||||
<target>White : LavenderBlush</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>White : Linen</source>
|
||||
<target>White : Linen</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>White : MintCream</source>
|
||||
<target>White : MintCream</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>White : MistyRose</source>
|
||||
<target>White : MistyRose</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>White : OldLace</source>
|
||||
<target>White : OldLace</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>White : Seashell</source>
|
||||
<target>White : Seashell</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>White : Snow</source>
|
||||
<target>White : Snow</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>White : White</source>
|
||||
<target>White : White</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>White : WhiteSmoke</source>
|
||||
<target>White : WhiteSmoke</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Yellow : DarkKhaki</source>
|
||||
<target>Yellow : DarkKhaki</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Yellow : Gold</source>
|
||||
<target>Yellow : Gold</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Yellow : Khaki</source>
|
||||
<target>Yellow : Khaki</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Yellow : LemonChiffon</source>
|
||||
<target>Yellow : LemonChiffon</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Yellow : LightGoldenrodYellow</source>
|
||||
<target>Yellow : LightGoldenrodYellow</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Yellow : LightYellow</source>
|
||||
<target>Yellow : LightYellow</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Yellow : Moccasin</source>
|
||||
<target>Yellow : Moccasin</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Yellow : PaleGoldenrod</source>
|
||||
<target>Yellow : PaleGoldenrod</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Yellow : PapayaWhip</source>
|
||||
<target>Yellow : PapayaWhip</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Yellow : PeachPuff</source>
|
||||
<target>Yellow : PeachPuff</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Yellow : Yellow</source>
|
||||
<target>Yellow : Yellow</target>
|
||||
<definition>element part filling</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>armoire</source>
|
||||
<target>cabinet</target>
|
||||
<definition>cabinet / enclosure</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>bobine</source>
|
||||
<target>coil</target>
|
||||
<definition>coil</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>borne</source>
|
||||
<target>terminal</target>
|
||||
<definition>terminal - a connection point on a symbol</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>bornier</source>
|
||||
<target>terminal strip</target>
|
||||
<definition>terminal strip</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>cable</source>
|
||||
<target>cable</target>
|
||||
<definition>cable</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>calibre</source>
|
||||
<target>rating</target>
|
||||
<definition>rating - the current rating of a device</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>cartouche</source>
|
||||
<target>title block</target>
|
||||
<definition>title block - the framed information panel</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>champ de texte</source>
|
||||
<target>text field</target>
|
||||
<definition>text field</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>collection</source>
|
||||
<target>collection</target>
|
||||
<definition>collection - the symbol library</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>conducteur</source>
|
||||
<target>conductor</target>
|
||||
<definition>conductor - the drawn wire between terminals</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>contact</source>
|
||||
<target>contact</target>
|
||||
<definition>contact</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>contacteur</source>
|
||||
<target>contactor</target>
|
||||
<definition>contactor</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>courant</source>
|
||||
<target>current</target>
|
||||
<definition>current</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>disjoncteur</source>
|
||||
<target>circuit breaker</target>
|
||||
<definition>circuit breaker</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>dossier</source>
|
||||
<target>folder</target>
|
||||
<definition>folder</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>element</source>
|
||||
<target>element</target>
|
||||
<definition>element - a symbol placed on a sheet</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>esclave</source>
|
||||
<target>slave</target>
|
||||
<definition>slave - the contact block belonging to a master</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>fil</source>
|
||||
<target>wire</target>
|
||||
<definition>wire</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>folio</source>
|
||||
<target>sheet</target>
|
||||
<definition>sheet - one drawing of a set</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>fusible</source>
|
||||
<target>fuse</target>
|
||||
<definition>fuse</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>grille</source>
|
||||
<target>grid</target>
|
||||
<definition>grid</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>interrupteur</source>
|
||||
<target>switch</target>
|
||||
<definition>switch</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>maitre</source>
|
||||
<target>master</target>
|
||||
<definition>master - the element a cross-reference points from</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>modele</source>
|
||||
<target>template</target>
|
||||
<definition>template</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>moteur</source>
|
||||
<target>motor</target>
|
||||
<definition>motor</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>neutre</source>
|
||||
<target>neutral</target>
|
||||
<definition>neutral</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>nomenclature</source>
|
||||
<target>parts list</target>
|
||||
<definition>parts list / bill of materials</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>numerotation</source>
|
||||
<target>numbering</target>
|
||||
<definition>numbering - automatic wire and part numbering</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>phase</source>
|
||||
<target>phase</target>
|
||||
<definition>phase</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>potentiel</source>
|
||||
<target>potential</target>
|
||||
<definition>potential - conductors electrically joined as one node</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>projet</source>
|
||||
<target>project</target>
|
||||
<definition>project - the .qet file holding the sheets</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>puissance</source>
|
||||
<target>power</target>
|
||||
<definition>power</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>relais</source>
|
||||
<target>relay</target>
|
||||
<definition>relay</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>renvoi de folio</source>
|
||||
<target>sheet cross-reference</target>
|
||||
<definition>sheet cross-reference</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>repere</source>
|
||||
<target>designation</target>
|
||||
<definition>designation - the identifying mark on a part</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>report de folio</source>
|
||||
<target>sheet cross-reference</target>
|
||||
<definition>sheet cross-reference (the arrow symbol)</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>schema</source>
|
||||
<target>diagram</target>
|
||||
<definition>diagram</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>section</source>
|
||||
<target>cross-section</target>
|
||||
<definition>cross-section - conductor size in mm2</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>sommaire</source>
|
||||
<target>summary</target>
|
||||
<definition>summary / table of contents</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>tension</source>
|
||||
<target>voltage</target>
|
||||
<definition>voltage</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>terre</source>
|
||||
<target>earth</target>
|
||||
<definition>earth / ground</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>texte</source>
|
||||
<target>text</target>
|
||||
<definition>text</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>transformateur</source>
|
||||
<target>transformer</target>
|
||||
<definition>transformer</definition>
|
||||
</phrase>
|
||||
</QPH>
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,941 @@
|
||||
<!DOCTYPE QPH>
|
||||
<QPH sourcelanguage="fr_FR" language="nl_BE">
|
||||
<phrase>
|
||||
<source> Contacts : NO : %1, NC : %2, inverseurs : %3, autres : %4
|
||||
</source>
|
||||
<target>Contacten: NO: %1, NC: %2, wisselcontacten: %3, andere: %4
|
||||
</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> Contacts : NO : %1/%2, NC : %3/%4, inverseurs : %5/%6, autres : %7/%8
|
||||
</source>
|
||||
<target>Contacten: NO: %1/%2, NC: %3/%4, wisselcontacten: %5/%6, andere: %7/%8
|
||||
</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> %</source>
|
||||
<target>%</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> (Ctrl pendant le glissement = position libre, sans accrochage à la grille)</source>
|
||||
<target>(Ctrl tijdens het slepen = vrije positie, zonder vastklikken aan het raster)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> -- %1 : mode %2</source>
|
||||
<target>-- %1 : modus %2</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> ; point rouge : glisser pour repositionner le centre de rotation</source>
|
||||
<target>; rood punt: slepen om het draaipunt te verplaatsen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> ; point turquoise : arc</source>
|
||||
<target>; turquoise punt: boog</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> ; un bord : inclinaison</source>
|
||||
<target>; een rand: kanteling</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> °</source>
|
||||
<target>°</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> — Cliquer : mode %1</source>
|
||||
<target>— Klikken: modus %1</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>, Alt = créer des poignées</source>
|
||||
<target>, Alt = handgrepen creëren</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>, Alt = détacher en polyligne</source>
|
||||
<target>, Alt = losmaken als polylijn</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Ajoute une courbe de Bézier sur le folio actuel</source>
|
||||
<target>Voegt een Béziercurve toe op het huidige blad</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Ajouter la borne %1</source>
|
||||
<target>Klem %1 toevoegen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Ajouter un point à une courbe</source>
|
||||
<target>Een punt aan een curve toevoegen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Ajouter une courbe</source>
|
||||
<target>Een curve toevoegen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Angle</source>
|
||||
<target>Hoek</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Anguleux</source>
|
||||
<target>Hoekig</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Aperçu</source>
|
||||
<target>Voorbeeld</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Arrondir les coins d'%1</source>
|
||||
<target>Hoeken van %1 afronden</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Borne 1</source>
|
||||
<target>Klem 1</target>
|
||||
<definition>column title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Borne 2</source>
|
||||
<target>Klem 2</target>
|
||||
<definition>column title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Catégorie</source>
|
||||
<target>Categorie</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Ce format ne prend pas en charge la transparence : l'image sera enregistrée telle qu'elle était avant l'application de la couleur transparente. Continuer ?</source>
|
||||
<target>Dit formaat ondersteunt geen transparantie: de afbeelding wordt opgeslagen zoals ze was vóór het toepassen van de transparante kleur. Doorgaan?</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Champ de texte</source>
|
||||
<target>Tekstveld</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Clic : positionner à la taille d'origine. Cliquer-glisser : positionner et redimensionner. Clic droit : pivoter de 90°. Ctrl+molette : ajuster la taille.</source>
|
||||
<target>Klik: op oorspronkelijke grootte plaatsen. Klikken en slepen: plaatsen en formaat wijzigen. Rechtsklik: 90° draaien. Ctrl+muiswiel: formaat aanpassen.</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Clic gauche : point suivant ; double-clic ou Entrée : terminer ; clic droit : annuler le dernier point</source>
|
||||
<target>Linkerklik: volgend punt; dubbelklik of Enter: beëindigen; rechtsklik: laatste punt annuleren</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Clic gauche : positionner le coin opposé (Maj = carré, Ctrl = depuis le centre + position libre, Ctrl+Maj = carré centré) ; clic droit : annuler</source>
|
||||
<target>Linkerklik: tegenoverliggende hoek plaatsen (Shift = vierkant, Ctrl = vanuit het midden + vrije positie, Ctrl+Shift = gecentreerd vierkant); rechtsklik: annuleren</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Clic gauche : positionner le coin opposé (Maj = cercle, Ctrl = depuis le centre + position libre, Ctrl+Maj = cercle centré) ; clic droit : annuler</source>
|
||||
<target>Linkerklik: tegenoverliggende hoek plaatsen (Shift = cirkel, Ctrl = vanuit het midden + vrije positie, Ctrl+Shift = gecentreerde cirkel); rechtsklik: annuleren</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Clic gauche : positionner le point de départ (Ctrl = position libre)</source>
|
||||
<target>Linkerklik: startpunt plaatsen (Ctrl = vrije positie)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Clic gauche : positionner le point final (Ctrl = position libre) ; clic droit : annuler</source>
|
||||
<target>Linkerklik: eindpunt plaatsen (Ctrl = vrije positie); rechtsklik: annuleren</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Clic gauche : positionner le premier coin (Ctrl = point central, position libre)</source>
|
||||
<target>Linkerklik: eerste hoek plaatsen (Ctrl = middelpunt, vrije positie)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Clic gauche : positionner le premier point (Ctrl = position libre)</source>
|
||||
<target>Linkerklik: eerste punt plaatsen (Ctrl = vrije positie)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Clic: point anguleux. Cliquer-glisser: point courbe. Clic sur le premier point: fermer. Échap/Entrée: terminer. Clic droit: annuler le dernier point.</source>
|
||||
<target>Klik: hoekpunt. Klikken en slepen: curvepunt. Klik op het eerste punt: sluiten. Esc/Enter: beëindigen. Rechtsklik: laatste punt annuleren.</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cliquer</source>
|
||||
<target>Klikken</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cliquer : mode %1</source>
|
||||
<target>Klikken: modus %1</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cliquez pour choisir une couleur</source>
|
||||
<target>Klik om een kleur te kiezen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cliquez sur l'image pour ajouter une couleur. Ajustez la tolérance de chaque couleur avec son curseur, ou cliquez sur × pour la retirer.</source>
|
||||
<target>Klik op de afbeelding om een kleur toe te voegen. Pas de tolerantie van elke kleur aan met de schuifregelaar, of klik op × om ze te verwijderen.</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cliquez sur l'image pour choisir une couleur</source>
|
||||
<target>Klik op de afbeelding om een kleur te kiezen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Coins arrondis</source>
|
||||
<target>Afgeronde hoeken</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Composant 1</source>
|
||||
<target>Component 1</target>
|
||||
<definition>column title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Composant 2</source>
|
||||
<target>Component 2</target>
|
||||
<definition>column title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Convertir %1 en courbe de Bézier</source>
|
||||
<target>%1 omzetten naar Béziercurve</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Convertir %1 en polyligne</source>
|
||||
<target>%1 omzetten naar polylijn</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Convertir en courbe de Bézier</source>
|
||||
<target>Omzetten naar Béziercurve</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Convertir en polyligne</source>
|
||||
<target>Omzetten naar polylijn</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Couleur transparente</source>
|
||||
<target>Transparante kleur</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Couleur transparente...</source>
|
||||
<target>Transparante kleur...</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Courant nominal</source>
|
||||
<target>Nominale stroom</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Deplacer le centre de rotation</source>
|
||||
<target>Draaipunt verplaatsen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Description</source>
|
||||
<target>Beschrijving</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Distance in pixels between the label and the slave cross reference</source>
|
||||
<target>Afstand in pixels tussen het label en de slave-kruisverwijzing</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Distance label - slave :</source>
|
||||
<target>Afstand label - slave:</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Définir une couleur transparente</source>
|
||||
<target>Een transparante kleur instellen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Déformer une courbe</source>
|
||||
<target>Een curve vervormen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Déplacer le centre de rotation d'une image</source>
|
||||
<target>Het draaipunt van een afbeelding verplaatsen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Déverrouillé : largeur et hauteur peuvent être modifiées indépendamment. Cliquer pour verrouiller.</source>
|
||||
<target>Ontgrendeld: breedte en hoogte kunnen onafhankelijk worden gewijzigd. Klik om te vergrendelen.</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Enregistrer l'image d'origine sous...</source>
|
||||
<target>Oorspronkelijke afbeelding opslaan als...</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Enregistrer l'image sous...</source>
|
||||
<target>Afbeelding opslaan als...</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Erreur</source>
|
||||
<target>Fout</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Exclure de la nomenclature</source>
|
||||
<target>Uitsluiten van de stuklijst</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Faire pivoter %1</source>
|
||||
<target>%1 roteren</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Faire pivoter une image</source>
|
||||
<target>Een afbeelding draaien</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Faites glisser les poignées, ou l'intérieur du cadre, pour ajuster la zone à conserver.</source>
|
||||
<target>Sleep de handgrepen, of het binnenste van het kader, om het te behouden gebied aan te passen.</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Fil</source>
|
||||
<target>Draad</target>
|
||||
<definition>column title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Folio</source>
|
||||
<target>Blad</target>
|
||||
<definition>column title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Forme fermée</source>
|
||||
<target>Gesloten vorm</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser %1 : rotation (Maj = 15°)</source>
|
||||
<target>Sleep %1: rotatie (Shift = 15°)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : ajuster l'arc (Ctrl = position libre, Maj = 15°)</source>
|
||||
<target>Slepen: de boog aanpassen (Ctrl = vrije positie, Shift = 15°)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : arrondir les coins (Ctrl = position libre)</source>
|
||||
<target>Slepen: hoeken afronden (Ctrl = vrije positie)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : déformer la courbe (Ctrl = position libre, Alt = briser la tangente)</source>
|
||||
<target>Slepen: de curve vervormen (Ctrl = vrije positie, Alt = de raaklijn breken)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : déplacer ce point</source>
|
||||
<target>Slepen: dit punt verplaatsen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : déplacer le centre de rotation</source>
|
||||
<target>Slepen: draaipunt verplaatsen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : déplacer le point (Ctrl = position libre</source>
|
||||
<target>Slepen: het punt verplaatsen (Ctrl = vrije positie</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : inclinaison (Ctrl = position libre, Maj = 15°)</source>
|
||||
<target>Slepen: kanteling (Ctrl = vrije positie, Shift = 15°)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : incliner (Maj = par pas de 15°)</source>
|
||||
<target>Slepen: kantelen (Shift = stappen van 15°)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : pivoter (Maj = par pas de 15°)</source>
|
||||
<target>Slepen: draaien (Shift = stappen van 15°)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : redimensionner (Ctrl = depuis le centre + position libre, Maj = proportions</source>
|
||||
<target>Slepen: formaat wijzigen (Ctrl = vanuit het midden + vrije positie, Shift = verhoudingen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : redimensionner (Maj = conserver les proportions, Ctrl = depuis le centre)</source>
|
||||
<target>Slepen: formaat wijzigen (Shift = verhoudingen behouden, Ctrl = vanuit het midden)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : repositionner le centre de rotation (Ctrl = position libre)</source>
|
||||
<target>Slepen: het draaipunt verplaatsen (Ctrl = vrije positie)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : rotation (Ctrl = position libre, Maj = 15°)</source>
|
||||
<target>Slepen: rotatie (Ctrl = vrije positie, Shift = 15°)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser le point violet : arrondir les coins</source>
|
||||
<target>Sleep het paarse punt: hoeken afronden</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser un coin : pivoter (Maj = par pas de 15°) ; glisser un bord : incliner (Maj = par pas de 15°) ; point rouge : déplacer le centre de rotation</source>
|
||||
<target>Sleep een hoek: draaien (Shift = stappen van 15°); sleep een rand: kantelen (Shift = stappen van 15°); rood punt: draaipunt verplaatsen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser un coin/bord : redimensionner (Ctrl = depuis le centre, Maj = conserver les proportions)</source>
|
||||
<target>Sleep een hoek/rand: formaat wijzigen (Ctrl = vanuit het midden, Shift = verhoudingen behouden)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser un coin/bord : redimensionner (Ctrl = depuis le centre, Maj = proportions, Alt = détacher en polyligne)</source>
|
||||
<target>Sleep een hoek/rand: formaat wijzigen (Ctrl = vanuit het midden, Shift = verhoudingen, Alt = losmaken als polylijn)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser un point : le déplacer</source>
|
||||
<target>Sleep een punt: het verplaatsen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser une extrémité : la déplacer</source>
|
||||
<target>Sleep een uiteinde: het verplaatsen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser une poignée ou la courbe : déformer (Alt = briser la tangente) ; Alt+glisser un point anguleux : créer des poignées ; clic droit : menu du nœud le plus proche</source>
|
||||
<target>Sleep een handgreep of de curve: vervormen (Alt = de raaklijn breken); Alt+sleep een hoekpunt: handgrepen creëren; rechtsklik: menu van het dichtstbijzijnde knooppunt</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Géométrie</source>
|
||||
<target>Geometrie</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Hauteur</source>
|
||||
<target>Hoogte</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Image BMP (*.bmp)</source>
|
||||
<target>BMP-afbeelding (*.bmp)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Image Files (*.png *.jpg *.jpeg *.bmp *.svg)</source>
|
||||
<target>Afbeeldingsbestanden (*.png *.jpg *.jpeg *.bmp *.svg)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Image JPEG (*.jpg *.jpeg)</source>
|
||||
<target>JPEG-afbeelding (*.jpg *.jpeg)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Image PNG (*.png)</source>
|
||||
<target>PNG-afbeelding (*.png)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Image source</source>
|
||||
<target>Bronafbeelding</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Image SVG (*.svg)</source>
|
||||
<target>SVG-afbeelding (*.svg)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Images non incluses dans l'export DXF</source>
|
||||
<target>Afbeeldingen niet inbegrepen in de DXF-export</target>
|
||||
<definition>message box title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Impossible d'enregistrer l'image à cet emplacement.</source>
|
||||
<target>Kan de afbeelding niet op die locatie opslaan.</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Impossible d'enregistrer la nomenclature dans %1.
|
||||
%2</source>
|
||||
<target>Kan de stuklijst niet opslaan in %1.
|
||||
%2</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Impossible de charger l'image.</source>
|
||||
<target>Kan de afbeelding niet laden.</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Inclinaison X</source>
|
||||
<target>Kanteling X</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Inclinaison Y</source>
|
||||
<target>Kanteling Y</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Incliner %1</source>
|
||||
<target>%1 kantelen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Incliner une image</source>
|
||||
<target>Een afbeelding kantelen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>La limite fixée pour cet élément maître est atteinte (Limite: %1).
|
||||
|
||||
Voulez-vous tout de même lier ce contact esclave ?</source>
|
||||
<target>De limiet voor dit hoofdelement is bereikt (Limiet: %1).
|
||||
|
||||
Wilt u dit hulpcontact toch koppelen?</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Largeur</source>
|
||||
<target>Breedte</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Le format DXF utilisé ici (AC1006) ne permet pas d'inclure d'image. Les images seront représentées uniquement par un rectangle de contour (position, taille, rotation et inclinaison conservées), sans le contenu de l'image.</source>
|
||||
<target>Het hier gebruikte DXF-formaat (AC1006) laat niet toe afbeeldingen op te nemen. Afbeeldingen worden enkel voorgesteld door een omtrekrechthoek (positie, grootte, rotatie en kanteling behouden), zonder de inhoud van de afbeelding.</target>
|
||||
<definition>message box content</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Lisse</source>
|
||||
<target>Vloeiend</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Liste de câblage</source>
|
||||
<target>Bekabelingslijst</target>
|
||||
<definition>window title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Liste de câblage (base de données)</source>
|
||||
<target>Bekabelingslijst (database)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Localisation :</source>
|
||||
<target>Locatie:</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Longueur</source>
|
||||
<target>Lengte</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>margin: 5px; font-weight: bold;</source>
|
||||
<target>margin: 5px; font-weight: bold;</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>max:</source>
|
||||
<target>max:</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>min:</source>
|
||||
<target>min:</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Miroir horizontal</source>
|
||||
<target>Horizontaal spiegelen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Miroir horizontal d'une image</source>
|
||||
<target>Horizontaal spiegelen van een afbeelding</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Miroir horizontal de %1</source>
|
||||
<target>Horizontaal spiegelen van %1</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Miroir impossible : inclinaison trop extrême pour cette forme</source>
|
||||
<target>Spiegelen onmogelijk: kanteling te extreem voor deze vorm</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Miroir vertical</source>
|
||||
<target>Verticaal spiegelen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Miroir vertical d'une image</source>
|
||||
<target>Verticaal spiegelen van een afbeelding</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Miroir vertical de %1</source>
|
||||
<target>Verticaal spiegelen van %1</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier l'angle d'un arc</source>
|
||||
<target>Hoek van een boog wijzigen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier l'angle d'une forme</source>
|
||||
<target>Hoek van een vorm wijzigen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier l'angle d'une image</source>
|
||||
<target>De hoek van een afbeelding wijzigen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier l'inclinaison d'une image</source>
|
||||
<target>De kanteling van een afbeelding wijzigen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier la courbure d'%1</source>
|
||||
<target>Kromming van %1 wijzigen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier la forme d'%1</source>
|
||||
<target>Vorm van %1 wijzigen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier la hauteur d'une image</source>
|
||||
<target>De hoogte van een afbeelding wijzigen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier la largeur d'une image</source>
|
||||
<target>De breedte van een afbeelding wijzigen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier la longueur d'une ligne</source>
|
||||
<target>Lengte van een lijn wijzigen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier la taille d'une forme</source>
|
||||
<target>Grootte van een vorm wijzigen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier le type d'un nœud</source>
|
||||
<target>Het type van een knooppunt wijzigen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier une image</source>
|
||||
<target>Een afbeelding wijzigen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modèle</source>
|
||||
<target>Model</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Nombre maximum de contacts esclaves définis : non défini
|
||||
</source>
|
||||
<target>Maximumaantal gedefinieerde hulpcontacten: niet gedefinieerd
|
||||
</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Notes</source>
|
||||
<target>Notities</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Nœud le plus proche</source>
|
||||
<target>Dichtstbijzijnde knooppunt</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>pivoter/incliner</source>
|
||||
<target>draaien/kantelen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Ponter des bornes entre-elles</source>
|
||||
<target>Klemmen onderling doorverbinden</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Rayon X</source>
|
||||
<target>Straal X</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Rayon Y</source>
|
||||
<target>Straal Y</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>redimensionner</source>
|
||||
<target>formaat wijzigen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Redimensionner %1</source>
|
||||
<target>%1 vergroten/verkleinen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Redimensionner une image</source>
|
||||
<target>Formaat van een afbeelding wijzigen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Remplacer l'image...</source>
|
||||
<target>Afbeelding vervangen...</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Remplacer une image</source>
|
||||
<target>Een afbeelding vervangen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Restaurer les proportions</source>
|
||||
<target>Verhoudingen herstellen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Restaurer les proportions d'une image</source>
|
||||
<target>De verhoudingen van een afbeelding herstellen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Retirer cette couleur</source>
|
||||
<target>Deze kleur verwijderen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Revenir à l'image complète, sans rognage</source>
|
||||
<target>Terug naar de volledige afbeelding, zonder bijsnijden</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>rgb(%1, %2, %3)</source>
|
||||
<target>rgb(%1, %2, %3)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Rogner l'image</source>
|
||||
<target>Afbeelding bijsnijden</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Rogner une image</source>
|
||||
<target>Een afbeelding bijsnijden</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Rogner...</source>
|
||||
<target>Bijsnijden...</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Rotation/Inclinaison</source>
|
||||
<target>Rotatie/kanteling</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Réinitialiser</source>
|
||||
<target>Herinitialiseren</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Selectionner une image...</source>
|
||||
<target>Een afbeelding selecteren...</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Supprimer le nœud le plus proche</source>
|
||||
<target>Het dichtstbijzijnde knooppunt verwijderen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Supprimer un point d'une courbe</source>
|
||||
<target>Een punt van een curve verwijderen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Symétrique</source>
|
||||
<target>Symmetrisch</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Séparation de potentiel</source>
|
||||
<target>Potentiaalscheiding</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Taille</source>
|
||||
<target>Grootte</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Tension nominale</source>
|
||||
<target>Nominale spanning</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Tolérance pour cette couleur</source>
|
||||
<target>Tolerantie voor deze kleur</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Tous les fichiers (*)</source>
|
||||
<target>Alle bestanden (*)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Transformer %1</source>
|
||||
<target>%1 omvormen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Transparence non conservée</source>
|
||||
<target>Transparantie niet behouden</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>un arc</source>
|
||||
<target>een boog</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>un coin</source>
|
||||
<target>een hoek</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>un point</source>
|
||||
<target>een punt</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>une courbe</source>
|
||||
<target>een curve</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>une extrémité</source>
|
||||
<target>een uiteinde</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>une image</source>
|
||||
<target>een afbeelding</target>
|
||||
<definition>part of a sentence listing the content of a diagram</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Verrouiller la numérotation automatique</source>
|
||||
<target>Automatische nummering vergrendelen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Verrouiller la position</source>
|
||||
<target>Positie vergrendelen</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Verrouillé : modifier la largeur ou la hauteur ajuste l'autre pour conserver les proportions. Cliquer pour déverrouiller.</source>
|
||||
<target>Vergrendeld: het wijzigen van de breedte of hoogte past de andere aan om de verhoudingen te behouden. Klik om te ontgrendelen.</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Échec de l'enregistrement</source>
|
||||
<target>Opslaan mislukt</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Édition des nœuds</source>
|
||||
<target>Knooppunten bewerken</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>armoire</source>
|
||||
<target>kast</target>
|
||||
<definition>cabinet / enclosure</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>bobine</source>
|
||||
<target>spoel</target>
|
||||
<definition>coil</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>borne</source>
|
||||
<target>klem</target>
|
||||
<definition>terminal - a connection point on a symbol</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>bornier</source>
|
||||
<target>klemmenstrook</target>
|
||||
<definition>terminal strip</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>cable</source>
|
||||
<target>kabel</target>
|
||||
<definition>cable</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>calibre</source>
|
||||
<target>kaliber</target>
|
||||
<definition>rating - the current rating of a device</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>cartouche</source>
|
||||
<target>titelblok</target>
|
||||
<definition>title block - the framed information panel</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>collection</source>
|
||||
<target>collectie</target>
|
||||
<definition>collection - the symbol library</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>conducteur</source>
|
||||
<target>geleider</target>
|
||||
<definition>conductor - the drawn wire between terminals</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>contact</source>
|
||||
<target>contact</target>
|
||||
<definition>contact</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>contacteur</source>
|
||||
<target>contacteur</target>
|
||||
<definition>contactor</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>courant</source>
|
||||
<target>stroom</target>
|
||||
<definition>current</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>disjoncteur</source>
|
||||
<target>automaat</target>
|
||||
<definition>circuit breaker</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>dossier</source>
|
||||
<target>map</target>
|
||||
<definition>folder</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>element</source>
|
||||
<target>element</target>
|
||||
<definition>element - a symbol placed on a sheet</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>esclave</source>
|
||||
<target>hulpcontact</target>
|
||||
<definition>slave - the contact block belonging to a master</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>fusible</source>
|
||||
<target>zekering</target>
|
||||
<definition>fuse</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>grille</source>
|
||||
<target>raster</target>
|
||||
<definition>grid</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>interrupteur</source>
|
||||
<target>schakelaar</target>
|
||||
<definition>switch</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>maitre</source>
|
||||
<target>hoofd</target>
|
||||
<definition>master - the element a cross-reference points from</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>modele</source>
|
||||
<target>sjabloon</target>
|
||||
<definition>template</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>moteur</source>
|
||||
<target>motor</target>
|
||||
<definition>motor</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>neutre</source>
|
||||
<target>nul</target>
|
||||
<definition>neutral</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>nomenclature</source>
|
||||
<target>stuklijst</target>
|
||||
<definition>parts list / bill of materials</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>numerotation</source>
|
||||
<target>nummering</target>
|
||||
<definition>numbering - automatic wire and part numbering</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>phase</source>
|
||||
<target>fase</target>
|
||||
<definition>phase</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>potentiel</source>
|
||||
<target>potentiaal</target>
|
||||
<definition>potential - conductors electrically joined as one node</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>projet</source>
|
||||
<target>project</target>
|
||||
<definition>project - the .qet file holding the sheets</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>puissance</source>
|
||||
<target>vermogen</target>
|
||||
<definition>power</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>relais</source>
|
||||
<target>relais</target>
|
||||
<definition>relay</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>renvoi de folio</source>
|
||||
<target>bladverwijzing</target>
|
||||
<definition>sheet cross-reference</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>repere</source>
|
||||
<target>aanduiding</target>
|
||||
<definition>designation - the identifying mark on a part</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>report de folio</source>
|
||||
<target>bladverwijzing</target>
|
||||
<definition>sheet cross-reference (the arrow symbol)</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>schema</source>
|
||||
<target>schema</target>
|
||||
<definition>diagram</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>section</source>
|
||||
<target>doorsnede</target>
|
||||
<definition>cross-section - conductor size in mm2</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>sommaire</source>
|
||||
<target>inhoudstafel</target>
|
||||
<definition>summary / table of contents</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>tension</source>
|
||||
<target>spanning</target>
|
||||
<definition>voltage</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>terre</source>
|
||||
<target>aarde</target>
|
||||
<definition>earth / ground</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>texte</source>
|
||||
<target>tekst</target>
|
||||
<definition>text</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>transformateur</source>
|
||||
<target>transformator</target>
|
||||
<definition>transformer</definition>
|
||||
</phrase>
|
||||
</QPH>
|
||||
@@ -0,0 +1,218 @@
|
||||
<!DOCTYPE QPH>
|
||||
<QPH sourcelanguage="fr_FR" language="pl">
|
||||
<phrase>
|
||||
<source>armoire</source>
|
||||
<target>Szafa</target>
|
||||
<definition>cabinet / enclosure</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>bobine</source>
|
||||
<target>Cewka</target>
|
||||
<definition>coil</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>borne</source>
|
||||
<target>Zacisk</target>
|
||||
<definition>terminal - a connection point on a symbol</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>bornier</source>
|
||||
<target>Listwa zaciskowa</target>
|
||||
<definition>terminal strip</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>cable</source>
|
||||
<target>Kabel</target>
|
||||
<definition>cable</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>calibre</source>
|
||||
<target>Prąd znamionowy</target>
|
||||
<definition>rating - the current rating of a device</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>cartouche</source>
|
||||
<target>Tabliczka rysunkowa</target>
|
||||
<definition>title block - the framed information panel</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>champ de texte</source>
|
||||
<target>Pole tekstowe</target>
|
||||
<definition>text field</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>collection</source>
|
||||
<target>Biblioteka</target>
|
||||
<definition>collection - the symbol library</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>conducteur</source>
|
||||
<target>Przewód</target>
|
||||
<definition>conductor - the drawn wire between terminals</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>contact</source>
|
||||
<target>Styk</target>
|
||||
<definition>contact</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>contacteur</source>
|
||||
<target>Stycznik</target>
|
||||
<definition>contactor</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>courant</source>
|
||||
<target>Prąd</target>
|
||||
<definition>current</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>disjoncteur</source>
|
||||
<target>Wyłącznik nadprądowy</target>
|
||||
<definition>circuit breaker</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>dossier</source>
|
||||
<target>Folder</target>
|
||||
<definition>folder</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>element</source>
|
||||
<target>Element</target>
|
||||
<definition>element - a symbol placed on a sheet</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>esclave</source>
|
||||
<target>Element podrzędny</target>
|
||||
<definition>slave - the contact block belonging to a master</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>fil</source>
|
||||
<target>Przewód</target>
|
||||
<definition>wire</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>folio</source>
|
||||
<target>Arkusz</target>
|
||||
<definition>sheet - one drawing of a set</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>fusible</source>
|
||||
<target>Bezpiecznik</target>
|
||||
<definition>fuse</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>grille</source>
|
||||
<target>Siatka</target>
|
||||
<definition>grid</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>interrupteur</source>
|
||||
<target>Wyłącznik</target>
|
||||
<definition>switch</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>maitre</source>
|
||||
<target>Element główny</target>
|
||||
<definition>master - the element a cross-reference points from</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>modele</source>
|
||||
<target>Szablon</target>
|
||||
<definition>template</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>moteur</source>
|
||||
<target>Silnik</target>
|
||||
<definition>motor</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>neutre</source>
|
||||
<target>Neutralny</target>
|
||||
<definition>neutral</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>nomenclature</source>
|
||||
<target>Zestawienie materiałów</target>
|
||||
<definition>parts list / bill of materials</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>numerotation</source>
|
||||
<target>Numeracja</target>
|
||||
<definition>numbering - automatic wire and part numbering</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>phase</source>
|
||||
<target>Faza</target>
|
||||
<definition>phase</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>potentiel</source>
|
||||
<target>Potencjał</target>
|
||||
<definition>potential - conductors electrically joined as one node</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>projet</source>
|
||||
<target>Projekt</target>
|
||||
<definition>project - the .qet file holding the sheets</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>puissance</source>
|
||||
<target>Moc</target>
|
||||
<definition>power</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>relais</source>
|
||||
<target>Przekaźnik</target>
|
||||
<definition>relay</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>renvoi de folio</source>
|
||||
<target>Odnośnik do arkusza</target>
|
||||
<definition>sheet cross-reference</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>repere</source>
|
||||
<target>Oznaczenie</target>
|
||||
<definition>designation - the identifying mark on a part</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>report de folio</source>
|
||||
<target>Odnośnik do arkusza</target>
|
||||
<definition>sheet cross-reference (the arrow symbol)</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>schema</source>
|
||||
<target>Schemat</target>
|
||||
<definition>diagram</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>section</source>
|
||||
<target>Przekrój</target>
|
||||
<definition>cross-section - conductor size in mm2</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>sommaire</source>
|
||||
<target>Spis treści</target>
|
||||
<definition>summary / table of contents</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>tension</source>
|
||||
<target>Napięcie</target>
|
||||
<definition>voltage</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>terre</source>
|
||||
<target>Uziemienie</target>
|
||||
<definition>earth / ground</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>texte</source>
|
||||
<target>Tekst</target>
|
||||
<definition>text</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>transformateur</source>
|
||||
<target>Transformator</target>
|
||||
<definition>transformer</definition>
|
||||
</phrase>
|
||||
</QPH>
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,465 @@
|
||||
<!DOCTYPE QPH>
|
||||
<QPH sourcelanguage="fr_FR" language="pt_BR">
|
||||
<phrase>
|
||||
<source> Contacts : NO : %1, NC : %2, inverseurs : %3, autres : %4
|
||||
</source>
|
||||
<target>Contatos: NA: %1, NF: %2, reversíveis: %3, outros: %4
|
||||
</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> Contacts : NO : %1/%2, NC : %3/%4, inverseurs : %5/%6, autres : %7/%8
|
||||
</source>
|
||||
<target>Contatos: NA: %1/%2, NF: %3/%4, reversíveis: %5/%6, outros: %7/%8
|
||||
</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Aperçu</source>
|
||||
<target>Pré-visualização</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Arrondir les coins d'%1</source>
|
||||
<target>Arredondar os cantos de %1</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Borne 1</source>
|
||||
<target>Borne 1</target>
|
||||
<definition>column title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Borne 2</source>
|
||||
<target>Borne 2</target>
|
||||
<definition>column title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Catégorie</source>
|
||||
<target>Categoria</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Ce format ne prend pas en charge la transparence : l'image sera enregistrée telle qu'elle était avant l'application de la couleur transparente. Continuer ?</source>
|
||||
<target>Este formato não suporta transparência: a imagem será salva como estava antes da aplicação da cor transparente. Continuar?</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Champ de texte</source>
|
||||
<target>Campo de texto</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Composant 1</source>
|
||||
<target>Componente 1</target>
|
||||
<definition>column title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Composant 2</source>
|
||||
<target>Componente 2</target>
|
||||
<definition>column title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Convertir %1 en courbe de Bézier</source>
|
||||
<target>Converter %1 em curva de Bézier</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Convertir en courbe de Bézier</source>
|
||||
<target>Converter em curva de Bézier</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Courant nominal</source>
|
||||
<target>Corrente nominal</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Distance in pixels between the label and the slave cross reference</source>
|
||||
<target>Distância em pixels entre o rótulo e a referência cruzada do escravo</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Distance label - slave :</source>
|
||||
<target>Distância do rótulo - escravo:</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Enregistrer l'image d'origine sous...</source>
|
||||
<target>Salvar a imagem original como...</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Enregistrer l'image sous...</source>
|
||||
<target>Salvar a imagem como...</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Erreur</source>
|
||||
<target>Erro</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Exclure de la nomenclature</source>
|
||||
<target>Excluir da lista de materiais</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Faire pivoter %1</source>
|
||||
<target>Girar %1</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Faire pivoter une image</source>
|
||||
<target>Girar uma imagem</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Fil</source>
|
||||
<target>Fio</target>
|
||||
<definition>column title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Folio</source>
|
||||
<target>Folha</target>
|
||||
<definition>column title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Hauteur</source>
|
||||
<target>Altura</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Image BMP (*.bmp)</source>
|
||||
<target>Imagem BMP (*.bmp)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Image JPEG (*.jpg *.jpeg)</source>
|
||||
<target>Imagem JPEG (*.jpg *.jpeg)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Image PNG (*.png)</source>
|
||||
<target>Imagem PNG (*.png)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Image SVG (*.svg)</source>
|
||||
<target>Imagem SVG (*.svg)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Images non incluses dans l'export DXF</source>
|
||||
<target>Imagens não incluídas na exportação DXF</target>
|
||||
<definition>message box title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Impossible d'enregistrer l'image à cet emplacement.</source>
|
||||
<target>Não foi possível salvar a imagem neste local.</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Impossible d'enregistrer la nomenclature dans %1.
|
||||
%2</source>
|
||||
<target>Não foi possível salvar a lista de materiais em %1.
|
||||
%2</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Impossible de charger l'image.</source>
|
||||
<target>Não foi possível carregar a imagem.</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Incliner %1</source>
|
||||
<target>Inclinar %1</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Incliner une image</source>
|
||||
<target>Inclinar uma imagem</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>La limite fixée pour cet élément maître est atteinte (Limite: %1).
|
||||
|
||||
Voulez-vous tout de même lier ce contact esclave ?</source>
|
||||
<target>O limite definido para este elemento mestre foi atingido (Limite: %1).
|
||||
|
||||
Deseja vincular este contato escravo mesmo assim?</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Largeur</source>
|
||||
<target>Largura</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Le format DXF utilisé ici (AC1006) ne permet pas d'inclure d'image. Les images seront représentées uniquement par un rectangle de contour (position, taille, rotation et inclinaison conservées), sans le contenu de l'image.</source>
|
||||
<target>O formato DXF usado aqui (AC1006) não permite incluir imagens. As imagens serão representadas apenas por um retângulo de contorno (posição, tamanho, rotação e inclinação preservados), sem o conteúdo da imagem.</target>
|
||||
<definition>message box content</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Liste de câblage</source>
|
||||
<target>Lista de cabeamento</target>
|
||||
<definition>window title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Liste de câblage (base de données)</source>
|
||||
<target>Lista de cabeamento (banco de dados)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>margin: 5px; font-weight: bold;</source>
|
||||
<target>margin: 5px; font-weight: bold;</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier l'angle d'un arc</source>
|
||||
<target>Modificar o ângulo de um arco</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier la courbure d'%1</source>
|
||||
<target>Modificar a curvatura de %1</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier la forme d'%1</source>
|
||||
<target>Modificar a forma de %1</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modèle</source>
|
||||
<target>Modelo</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Nombre maximum de contacts esclaves définis : non défini
|
||||
</source>
|
||||
<target>Número máximo de contatos escravos definidos: não definido
|
||||
</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Notes</source>
|
||||
<target>Observações</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Redimensionner %1</source>
|
||||
<target>Redimensionar %1</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Redimensionner une image</source>
|
||||
<target>Redimensionar uma imagem</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Réinitialiser</source>
|
||||
<target>Redefinir</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Selectionner une image...</source>
|
||||
<target>Selecionar uma imagem...</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Séparation de potentiel</source>
|
||||
<target>Separação de potencial</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Taille</source>
|
||||
<target>Tamanho</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Tension nominale</source>
|
||||
<target>Tensão nominal</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Tous les fichiers (*)</source>
|
||||
<target>Todos os arquivos (*)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Transparence non conservée</source>
|
||||
<target>Transparência não preservada</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>une image</source>
|
||||
<target>uma imagem</target>
|
||||
<definition>part of a sentence listing the content of a diagram</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Verrouiller la numérotation automatique</source>
|
||||
<target>Bloquear a numeração automática</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Verrouiller la position</source>
|
||||
<target>Bloquear a posição</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Échec de l'enregistrement</source>
|
||||
<target>Falha ao salvar</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>armoire</source>
|
||||
<target>armário</target>
|
||||
<definition>cabinet / enclosure</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>bobine</source>
|
||||
<target>bobina</target>
|
||||
<definition>coil</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>borne</source>
|
||||
<target>borne</target>
|
||||
<definition>terminal - a connection point on a symbol</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>bornier</source>
|
||||
<target>borneira</target>
|
||||
<definition>terminal strip</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>cable</source>
|
||||
<target>cabo</target>
|
||||
<definition>cable</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>calibre</source>
|
||||
<target>calibre</target>
|
||||
<definition>rating - the current rating of a device</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>cartouche</source>
|
||||
<target>bloco de título</target>
|
||||
<definition>title block - the framed information panel</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>collection</source>
|
||||
<target>coleção</target>
|
||||
<definition>collection - the symbol library</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>conducteur</source>
|
||||
<target>condutor</target>
|
||||
<definition>conductor - the drawn wire between terminals</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>contact</source>
|
||||
<target>contato</target>
|
||||
<definition>contact</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>contacteur</source>
|
||||
<target>contator</target>
|
||||
<definition>contactor</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>courant</source>
|
||||
<target>corrente</target>
|
||||
<definition>current</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>disjoncteur</source>
|
||||
<target>disjuntor</target>
|
||||
<definition>circuit breaker</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>dossier</source>
|
||||
<target>pasta</target>
|
||||
<definition>folder</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>element</source>
|
||||
<target>elemento</target>
|
||||
<definition>element - a symbol placed on a sheet</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>esclave</source>
|
||||
<target>escravo</target>
|
||||
<definition>slave - the contact block belonging to a master</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>fusible</source>
|
||||
<target>fusível</target>
|
||||
<definition>fuse</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>grille</source>
|
||||
<target>grade</target>
|
||||
<definition>grid</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>interrupteur</source>
|
||||
<target>interruptor</target>
|
||||
<definition>switch</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>maitre</source>
|
||||
<target>mestre</target>
|
||||
<definition>master - the element a cross-reference points from</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>modele</source>
|
||||
<target>modelo</target>
|
||||
<definition>template</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>moteur</source>
|
||||
<target>motor</target>
|
||||
<definition>motor</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>neutre</source>
|
||||
<target>neutro</target>
|
||||
<definition>neutral</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>nomenclature</source>
|
||||
<target>lista de materiais</target>
|
||||
<definition>parts list / bill of materials</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>numerotation</source>
|
||||
<target>numeração</target>
|
||||
<definition>numbering - automatic wire and part numbering</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>phase</source>
|
||||
<target>fase</target>
|
||||
<definition>phase</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>potentiel</source>
|
||||
<target>potencial</target>
|
||||
<definition>potential - conductors electrically joined as one node</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>projet</source>
|
||||
<target>projeto</target>
|
||||
<definition>project - the .qet file holding the sheets</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>puissance</source>
|
||||
<target>potência</target>
|
||||
<definition>power</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>relais</source>
|
||||
<target>relé</target>
|
||||
<definition>relay</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>renvoi de folio</source>
|
||||
<target>referência de folha</target>
|
||||
<definition>sheet cross-reference</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>repere</source>
|
||||
<target>designação</target>
|
||||
<definition>designation - the identifying mark on a part</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>report de folio</source>
|
||||
<target>remissão de folha</target>
|
||||
<definition>sheet cross-reference (the arrow symbol)</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>schema</source>
|
||||
<target>diagrama</target>
|
||||
<definition>diagram</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>section</source>
|
||||
<target>seção</target>
|
||||
<definition>cross-section - conductor size in mm2</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>sommaire</source>
|
||||
<target>sumário</target>
|
||||
<definition>summary / table of contents</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>tension</source>
|
||||
<target>tensão</target>
|
||||
<definition>voltage</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>terre</source>
|
||||
<target>terra</target>
|
||||
<definition>earth / ground</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>texte</source>
|
||||
<target>texto</target>
|
||||
<definition>text</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>transformateur</source>
|
||||
<target>transformador</target>
|
||||
<definition>transformer</definition>
|
||||
</phrase>
|
||||
</QPH>
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,917 @@
|
||||
<!DOCTYPE QPH>
|
||||
<QPH sourcelanguage="fr_FR" language="zh">
|
||||
<phrase>
|
||||
<source> Contacts : NO : %1, NC : %2, inverseurs : %3, autres : %4
|
||||
</source>
|
||||
<target>触点:常开:%1,常闭:%2,转换:%3,其他:%4
|
||||
</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> Contacts : NO : %1/%2, NC : %3/%4, inverseurs : %5/%6, autres : %7/%8
|
||||
</source>
|
||||
<target>触点:常开:%1/%2,常闭:%3/%4,转换:%5/%6,其他:%7/%8
|
||||
</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> %</source>
|
||||
<target>%</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> (Ctrl pendant le glissement = position libre, sans accrochage à la grille)</source>
|
||||
<target>(拖动时按 Ctrl = 自由位置,不吸附到网格)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> -- %1 : mode %2</source>
|
||||
<target>-- %1:%2 模式</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> ; point rouge : glisser pour repositionner le centre de rotation</source>
|
||||
<target>;红点:拖动以重新定位旋转中心</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> ; point turquoise : arc</source>
|
||||
<target>;青色点:圆弧</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> ; un bord : inclinaison</source>
|
||||
<target>;边:倾斜</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> °</source>
|
||||
<target>°</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source> — Cliquer : mode %1</source>
|
||||
<target>— 单击:%1 模式</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>, Alt = créer des poignées</source>
|
||||
<target>,Alt = 创建控制柄</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>, Alt = détacher en polyligne</source>
|
||||
<target>,Alt = 分离为多段线</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Ajoute une courbe de Bézier sur le folio actuel</source>
|
||||
<target>在当前图纸上添加贝塞尔曲线</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Ajouter un point à une courbe</source>
|
||||
<target>向曲线添加点</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Ajouter une courbe</source>
|
||||
<target>添加曲线</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Angle</source>
|
||||
<target>角度</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Anguleux</source>
|
||||
<target>角点</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Aperçu</source>
|
||||
<target>预览</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Arrondir les coins d'%1</source>
|
||||
<target>将%1的角变圆</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Borne 1</source>
|
||||
<target>端子1</target>
|
||||
<definition>column title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Borne 2</source>
|
||||
<target>端子2</target>
|
||||
<definition>column title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Catégorie</source>
|
||||
<target>类别</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Ce format ne prend pas en charge la transparence : l'image sera enregistrée telle qu'elle était avant l'application de la couleur transparente. Continuer ?</source>
|
||||
<target>此格式不支持透明度:图像将按应用透明色之前的状态保存。是否继续?</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Champ de texte</source>
|
||||
<target>文本字段</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Clic : positionner à la taille d'origine. Cliquer-glisser : positionner et redimensionner. Clic droit : pivoter de 90°. Ctrl+molette : ajuster la taille.</source>
|
||||
<target>单击:按原始尺寸放置。单击拖动:放置并调整大小。右键:旋转 90°。Ctrl+滚轮:调整大小。</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Clic gauche : point suivant ; double-clic ou Entrée : terminer ; clic droit : annuler le dernier point</source>
|
||||
<target>左键单击:下一个点;双击或 Enter:结束;右键单击:撤销上一个点</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Clic gauche : positionner le coin opposé (Maj = carré, Ctrl = depuis le centre + position libre, Ctrl+Maj = carré centré) ; clic droit : annuler</source>
|
||||
<target>左键单击:放置对角(Shift = 正方形,Ctrl = 从中心 + 自由位置,Ctrl+Shift = 居中正方形);右键单击:取消</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Clic gauche : positionner le coin opposé (Maj = cercle, Ctrl = depuis le centre + position libre, Ctrl+Maj = cercle centré) ; clic droit : annuler</source>
|
||||
<target>左键单击:放置对角(Shift = 圆形,Ctrl = 从中心 + 自由位置,Ctrl+Shift = 居中圆形);右键单击:取消</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Clic gauche : positionner le point de départ (Ctrl = position libre)</source>
|
||||
<target>左键单击:放置起点(Ctrl = 自由位置)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Clic gauche : positionner le point final (Ctrl = position libre) ; clic droit : annuler</source>
|
||||
<target>左键单击:放置终点(Ctrl = 自由位置);右键单击:取消</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Clic gauche : positionner le premier coin (Ctrl = point central, position libre)</source>
|
||||
<target>左键单击:放置第一个角(Ctrl = 中心点,自由位置)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Clic gauche : positionner le premier point (Ctrl = position libre)</source>
|
||||
<target>左键单击:放置第一个点(Ctrl = 自由位置)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Clic: point anguleux. Cliquer-glisser: point courbe. Clic sur le premier point: fermer. Échap/Entrée: terminer. Clic droit: annuler le dernier point.</source>
|
||||
<target>单击:角点。单击拖动:曲线点。单击第一个点:闭合。Esc/Enter:结束。右键:撤销上一个点。</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cliquer</source>
|
||||
<target>单击</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cliquer : mode %1</source>
|
||||
<target>单击:%1 模式</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cliquez pour choisir une couleur</source>
|
||||
<target>点击选择颜色</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cliquez sur l'image pour ajouter une couleur. Ajustez la tolérance de chaque couleur avec son curseur, ou cliquez sur × pour la retirer.</source>
|
||||
<target>单击图像以添加颜色。使用滑块调整每种颜色的容差,或单击 × 将其移除。</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Cliquez sur l'image pour choisir une couleur</source>
|
||||
<target>单击图像选择颜色</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Coins arrondis</source>
|
||||
<target>圆角</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Composant 1</source>
|
||||
<target>元件1</target>
|
||||
<definition>column title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Composant 2</source>
|
||||
<target>元件2</target>
|
||||
<definition>column title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Convertir %1 en courbe de Bézier</source>
|
||||
<target>将 %1 转换为贝塞尔曲线</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Convertir %1 en polyligne</source>
|
||||
<target>将 %1 转换为多段线</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Convertir en courbe de Bézier</source>
|
||||
<target>转换为贝塞尔曲线</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Convertir en polyligne</source>
|
||||
<target>转换为多段线</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Couleur transparente</source>
|
||||
<target>透明色</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Couleur transparente...</source>
|
||||
<target>透明色...</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Courant nominal</source>
|
||||
<target>额定电流</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Deplacer le centre de rotation</source>
|
||||
<target>移动旋转中心</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Distance in pixels between the label and the slave cross reference</source>
|
||||
<target>标签与从站交叉引用之间的像素距离</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Distance label - slave :</source>
|
||||
<target>标签距离 - 从站:</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Définir une couleur transparente</source>
|
||||
<target>设置透明色</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Déformer une courbe</source>
|
||||
<target>变形曲线</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Déplacer le centre de rotation d'une image</source>
|
||||
<target>移动图像的旋转中心</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Déverrouillé : largeur et hauteur peuvent être modifiées indépendamment. Cliquer pour verrouiller.</source>
|
||||
<target>已解锁:宽度和高度可独立修改。单击锁定。</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Enregistrer l'image d'origine sous...</source>
|
||||
<target>原始图像另存为...</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Enregistrer l'image sous...</source>
|
||||
<target>图像另存为...</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Erreur</source>
|
||||
<target>错误</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Exclure de la nomenclature</source>
|
||||
<target>从物料清单中排除</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Faire pivoter %1</source>
|
||||
<target>旋转 %1</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Faire pivoter une image</source>
|
||||
<target>旋转图像</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Faites glisser les poignées, ou l'intérieur du cadre, pour ajuster la zone à conserver.</source>
|
||||
<target>拖动控制柄或框内区域,调整要保留的区域。</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Fil</source>
|
||||
<target>导线</target>
|
||||
<definition>column title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Folio</source>
|
||||
<target>图页</target>
|
||||
<definition>column title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Forme fermée</source>
|
||||
<target>闭合形状</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser %1 : rotation (Maj = 15°)</source>
|
||||
<target>拖动 %1:旋转(Shift = 15°)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : ajuster l'arc (Ctrl = position libre, Maj = 15°)</source>
|
||||
<target>拖动:调整圆弧(Ctrl = 自由位置,Shift = 15°)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : arrondir les coins (Ctrl = position libre)</source>
|
||||
<target>拖动:圆角(Ctrl = 自由位置)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : déformer la courbe (Ctrl = position libre, Alt = briser la tangente)</source>
|
||||
<target>拖动:变形曲线(Ctrl = 自由位置,Alt = 断开切线)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : déplacer ce point</source>
|
||||
<target>拖动:移动此点</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : déplacer le centre de rotation</source>
|
||||
<target>拖动:移动旋转中心</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : déplacer le point (Ctrl = position libre</source>
|
||||
<target>拖动:移动点(Ctrl = 自由位置</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : inclinaison (Ctrl = position libre, Maj = 15°)</source>
|
||||
<target>拖动:倾斜(Ctrl = 自由位置,Shift = 15°)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : incliner (Maj = par pas de 15°)</source>
|
||||
<target>拖动:倾斜(Shift = 以 15° 为步长)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : pivoter (Maj = par pas de 15°)</source>
|
||||
<target>拖动:旋转(Shift = 以 15° 为步长)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : redimensionner (Ctrl = depuis le centre + position libre, Maj = proportions</source>
|
||||
<target>拖动:调整大小(Ctrl = 从中心 + 自由位置,Shift = 比例</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : redimensionner (Maj = conserver les proportions, Ctrl = depuis le centre)</source>
|
||||
<target>拖动:调整大小(Shift = 保持比例,Ctrl = 从中心)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : repositionner le centre de rotation (Ctrl = position libre)</source>
|
||||
<target>拖动:重新定位旋转中心(Ctrl = 自由位置)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser : rotation (Ctrl = position libre, Maj = 15°)</source>
|
||||
<target>拖动:旋转(Ctrl = 自由位置,Shift = 15°)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser le point violet : arrondir les coins</source>
|
||||
<target>拖动紫色点:圆角</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser un coin : pivoter (Maj = par pas de 15°) ; glisser un bord : incliner (Maj = par pas de 15°) ; point rouge : déplacer le centre de rotation</source>
|
||||
<target>拖动角:旋转(Shift = 以 15° 为步长);拖动边:倾斜(Shift = 以 15° 为步长);红点:移动旋转中心</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser un coin/bord : redimensionner (Ctrl = depuis le centre, Maj = conserver les proportions)</source>
|
||||
<target>拖动角/边:调整大小(Ctrl = 从中心,Shift = 保持比例)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser un coin/bord : redimensionner (Ctrl = depuis le centre, Maj = proportions, Alt = détacher en polyligne)</source>
|
||||
<target>拖动角/边:调整大小(Ctrl = 从中心,Shift = 比例,Alt = 分离为多段线)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser un point : le déplacer</source>
|
||||
<target>拖动点:移动它</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser une extrémité : la déplacer</source>
|
||||
<target>拖动端点:移动它</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Glisser une poignée ou la courbe : déformer (Alt = briser la tangente) ; Alt+glisser un point anguleux : créer des poignées ; clic droit : menu du nœud le plus proche</source>
|
||||
<target>拖动控制柄或曲线:变形(Alt = 断开切线);Alt+拖动角点:创建控制柄;右键单击:最近节点菜单</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Géométrie</source>
|
||||
<target>几何</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Hauteur</source>
|
||||
<target>高度</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Image BMP (*.bmp)</source>
|
||||
<target>BMP 图像 (*.bmp)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Image Files (*.png *.jpg *.jpeg *.bmp *.svg)</source>
|
||||
<target>图像文件 (*.png *.jpg *.jpeg *.bmp *.svg)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Image JPEG (*.jpg *.jpeg)</source>
|
||||
<target>JPEG 图像 (*.jpg *.jpeg)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Image PNG (*.png)</source>
|
||||
<target>PNG 图像 (*.png)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Image source</source>
|
||||
<target>源图像</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Image SVG (*.svg)</source>
|
||||
<target>SVG 图像 (*.svg)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Images non incluses dans l'export DXF</source>
|
||||
<target>图像未包含在 DXF 导出中</target>
|
||||
<definition>message box title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Impossible d'enregistrer l'image à cet emplacement.</source>
|
||||
<target>无法将图像保存到该位置。</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Impossible d'enregistrer la nomenclature dans %1.
|
||||
%2</source>
|
||||
<target>无法将物料清单保存到 %1。
|
||||
%2</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Impossible de charger l'image.</source>
|
||||
<target>无法加载图像。</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Inclinaison X</source>
|
||||
<target>X 倾斜</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Inclinaison Y</source>
|
||||
<target>Y 倾斜</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Incliner %1</source>
|
||||
<target>倾斜 %1</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Incliner une image</source>
|
||||
<target>倾斜图像</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>La limite fixée pour cet élément maître est atteinte (Limite: %1).
|
||||
|
||||
Voulez-vous tout de même lier ce contact esclave ?</source>
|
||||
<target>已达到此主元件的限制(限制:%1)。
|
||||
|
||||
是否仍要链接此从属触点?</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Largeur</source>
|
||||
<target>宽度</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Le format DXF utilisé ici (AC1006) ne permet pas d'inclure d'image. Les images seront représentées uniquement par un rectangle de contour (position, taille, rotation et inclinaison conservées), sans le contenu de l'image.</source>
|
||||
<target>此处使用的 DXF 格式 (AC1006) 无法包含图像。图像将仅以轮廓矩形表示(保留位置、大小、旋转和倾斜),不包含图像内容。</target>
|
||||
<definition>message box content</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Lisse</source>
|
||||
<target>平滑</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Liste de câblage</source>
|
||||
<target>接线列表</target>
|
||||
<definition>window title</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Liste de câblage (base de données)</source>
|
||||
<target>接线列表(数据库)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Longueur</source>
|
||||
<target>长度</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>margin: 5px; font-weight: bold;</source>
|
||||
<target>margin: 5px; font-weight: bold;</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Miroir horizontal</source>
|
||||
<target>水平镜像</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Miroir horizontal d'une image</source>
|
||||
<target>图像水平镜像</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Miroir horizontal de %1</source>
|
||||
<target>%1 的水平镜像</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Miroir impossible : inclinaison trop extrême pour cette forme</source>
|
||||
<target>无法镜像:此形状的倾斜过于极端</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Miroir vertical</source>
|
||||
<target>垂直镜像</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Miroir vertical d'une image</source>
|
||||
<target>图像垂直镜像</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Miroir vertical de %1</source>
|
||||
<target>%1 的垂直镜像</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier l'angle d'un arc</source>
|
||||
<target>修改弧的角度</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier l'angle d'une forme</source>
|
||||
<target>修改形状角度</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier l'angle d'une image</source>
|
||||
<target>修改图像角度</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier l'inclinaison d'une image</source>
|
||||
<target>修改图像倾斜</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier la courbure d'%1</source>
|
||||
<target>修改%1的曲率</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier la forme d'%1</source>
|
||||
<target>修改%1的形状</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier la hauteur d'une image</source>
|
||||
<target>修改图像高度</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier la largeur d'une image</source>
|
||||
<target>修改图像宽度</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier la longueur d'une ligne</source>
|
||||
<target>修改线条长度</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier la taille d'une forme</source>
|
||||
<target>修改形状大小</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier le type d'un nœud</source>
|
||||
<target>修改节点类型</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modifier une image</source>
|
||||
<target>修改图像</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Modèle</source>
|
||||
<target>型号</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Nombre maximum de contacts esclaves définis : non défini
|
||||
</source>
|
||||
<target>已定义的从属触点最大数量:未定义
|
||||
</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Notes</source>
|
||||
<target>备注</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Nœud le plus proche</source>
|
||||
<target>最近节点</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>pivoter/incliner</source>
|
||||
<target>旋转/倾斜</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Rayon X</source>
|
||||
<target>X半径</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Rayon Y</source>
|
||||
<target>Y半径</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>redimensionner</source>
|
||||
<target>调整大小</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Redimensionner %1</source>
|
||||
<target>调整 %1 大小</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Redimensionner une image</source>
|
||||
<target>调整图像大小</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Remplacer l'image...</source>
|
||||
<target>替换图像...</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Remplacer une image</source>
|
||||
<target>替换图像</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Restaurer les proportions</source>
|
||||
<target>恢复比例</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Restaurer les proportions d'une image</source>
|
||||
<target>恢复图像比例</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Retirer cette couleur</source>
|
||||
<target>移除此颜色</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Revenir à l'image complète, sans rognage</source>
|
||||
<target>恢复为完整图像,不裁剪</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>rgb(%1, %2, %3)</source>
|
||||
<target>rgb(%1, %2, %3)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Rogner l'image</source>
|
||||
<target>裁剪图像</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Rogner une image</source>
|
||||
<target>裁剪图像</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Rogner...</source>
|
||||
<target>裁剪...</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Rotation/Inclinaison</source>
|
||||
<target>旋转/倾斜</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Réinitialiser</source>
|
||||
<target>重置</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Selectionner une image...</source>
|
||||
<target>选择图像...</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Supprimer le nœud le plus proche</source>
|
||||
<target>删除最近节点</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Supprimer un point d'une courbe</source>
|
||||
<target>从曲线删除点</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Symétrique</source>
|
||||
<target>对称</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Séparation de potentiel</source>
|
||||
<target>电位分隔</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Taille</source>
|
||||
<target>大小</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Tension nominale</source>
|
||||
<target>额定电压</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Tolérance pour cette couleur</source>
|
||||
<target>此颜色的容差</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Tous les fichiers (*)</source>
|
||||
<target>所有文件 (*)</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Transformer %1</source>
|
||||
<target>变换 %1</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Transparence non conservée</source>
|
||||
<target>不保留透明度</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>un arc</source>
|
||||
<target>一段弧</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>un coin</source>
|
||||
<target>一个角</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>un point</source>
|
||||
<target>一个点</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>une courbe</source>
|
||||
<target>一条曲线</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>une extrémité</source>
|
||||
<target>一个端点</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>une image</source>
|
||||
<target>一张图像</target>
|
||||
<definition>part of a sentence listing the content of a diagram</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Verrouiller la numérotation automatique</source>
|
||||
<target>锁定自动编号</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Verrouiller la position</source>
|
||||
<target>锁定位置</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Verrouillé : modifier la largeur ou la hauteur ajuste l'autre pour conserver les proportions. Cliquer pour déverrouiller.</source>
|
||||
<target>已锁定:修改宽度或高度会调整另一个以保持比例。单击解锁。</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Échec de l'enregistrement</source>
|
||||
<target>保存失败</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>Édition des nœuds</source>
|
||||
<target>节点编辑</target>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>armoire</source>
|
||||
<target>机柜</target>
|
||||
<definition>cabinet / enclosure</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>bobine</source>
|
||||
<target>线圈</target>
|
||||
<definition>coil</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>borne</source>
|
||||
<target>端子</target>
|
||||
<definition>terminal - a connection point on a symbol</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>bornier</source>
|
||||
<target>端子排</target>
|
||||
<definition>terminal strip</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>cable</source>
|
||||
<target>电缆</target>
|
||||
<definition>cable</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>calibre</source>
|
||||
<target>额定值</target>
|
||||
<definition>rating - the current rating of a device</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>cartouche</source>
|
||||
<target>标题栏</target>
|
||||
<definition>title block - the framed information panel</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>collection</source>
|
||||
<target>符号库</target>
|
||||
<definition>collection - the symbol library</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>conducteur</source>
|
||||
<target>导线</target>
|
||||
<definition>conductor - the drawn wire between terminals</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>contact</source>
|
||||
<target>触点</target>
|
||||
<definition>contact</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>contacteur</source>
|
||||
<target>接触器</target>
|
||||
<definition>contactor</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>courant</source>
|
||||
<target>电流</target>
|
||||
<definition>current</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>disjoncteur</source>
|
||||
<target>断路器</target>
|
||||
<definition>circuit breaker</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>dossier</source>
|
||||
<target>文件夹</target>
|
||||
<definition>folder</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>element</source>
|
||||
<target>元件</target>
|
||||
<definition>element - a symbol placed on a sheet</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>esclave</source>
|
||||
<target>从</target>
|
||||
<definition>slave - the contact block belonging to a master</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>fusible</source>
|
||||
<target>熔断器</target>
|
||||
<definition>fuse</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>grille</source>
|
||||
<target>网格</target>
|
||||
<definition>grid</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>interrupteur</source>
|
||||
<target>开关</target>
|
||||
<definition>switch</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>maitre</source>
|
||||
<target>主</target>
|
||||
<definition>master - the element a cross-reference points from</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>modele</source>
|
||||
<target>模板</target>
|
||||
<definition>template</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>moteur</source>
|
||||
<target>电动机</target>
|
||||
<definition>motor</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>neutre</source>
|
||||
<target>中性线</target>
|
||||
<definition>neutral</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>nomenclature</source>
|
||||
<target>物料清单</target>
|
||||
<definition>parts list / bill of materials</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>numerotation</source>
|
||||
<target>编号</target>
|
||||
<definition>numbering - automatic wire and part numbering</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>phase</source>
|
||||
<target>相</target>
|
||||
<definition>phase</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>potentiel</source>
|
||||
<target>电位</target>
|
||||
<definition>potential - conductors electrically joined as one node</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>projet</source>
|
||||
<target>项目</target>
|
||||
<definition>project - the .qet file holding the sheets</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>puissance</source>
|
||||
<target>功率</target>
|
||||
<definition>power</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>relais</source>
|
||||
<target>继电器</target>
|
||||
<definition>relay</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>renvoi de folio</source>
|
||||
<target>图纸交叉引用</target>
|
||||
<definition>sheet cross-reference</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>repere</source>
|
||||
<target>标识</target>
|
||||
<definition>designation - the identifying mark on a part</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>report de folio</source>
|
||||
<target>图纸交叉引用</target>
|
||||
<definition>sheet cross-reference (the arrow symbol)</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>schema</source>
|
||||
<target>原理图</target>
|
||||
<definition>diagram</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>section</source>
|
||||
<target>截面积</target>
|
||||
<definition>cross-section - conductor size in mm2</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>sommaire</source>
|
||||
<target>目录</target>
|
||||
<definition>summary / table of contents</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>tension</source>
|
||||
<target>电压</target>
|
||||
<definition>voltage</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>terre</source>
|
||||
<target>接地</target>
|
||||
<definition>earth / ground</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>texte</source>
|
||||
<target>文本</target>
|
||||
<definition>text</definition>
|
||||
</phrase>
|
||||
<phrase>
|
||||
<source>transformateur</source>
|
||||
<target>变压器</target>
|
||||
<definition>transformer</definition>
|
||||
</phrase>
|
||||
</QPH>
|
||||
@@ -34,6 +34,16 @@ expects, so QIcon::fromTheme("name") finds them. The dark theme only holds
|
||||
the icons that need a dark variant: black line art. Colored icons are not
|
||||
touched; the dark theme inherits them from the light one.
|
||||
|
||||
Qt inherits by name, not by size: once a name has any file in the dark
|
||||
theme, the parent theme is never consulted for that name, and a size the
|
||||
dark theme lacks is served by scaling the nearest dark file. An icon that
|
||||
is line art at 22 pixels and colored at 128 (the printer) would then come
|
||||
out as the 22 pixel copy scaled up on a dark palette. So for every name
|
||||
the dark theme holds, the .qrc also aliases the light files of the sizes
|
||||
the dark theme does not have, when they read on the dark window (3:1,
|
||||
measured as tests/qttest/tst_qeticons.cpp does); a light file that does
|
||||
not is left out, and Qt scales the nearest dark copy as before.
|
||||
|
||||
An icon counts as line art when fewer than 20% of its visible pixels are
|
||||
saturated. Its dark copy keeps hue and alpha and inverts lightness, scaled
|
||||
so pure black becomes (220, 220, 220), the dark palette's text color.
|
||||
@@ -101,6 +111,8 @@ WHITE_LIGHTNESS = 0.85 # a visible pixel this light counts as white
|
||||
WHITE_FRACTION = 0.30 # at or above this an icon is "light art"
|
||||
INK = 220 / 255.0 # lightness of pure black after inversion
|
||||
SVG_INK = "#dcdcdc"
|
||||
DARK_WINDOW = (53, 53, 53) # QET::Palette::fusionDark() window color
|
||||
DARK_RATIO = 3.0 # what tst_qeticons requires of a dark theme file
|
||||
|
||||
|
||||
def visible_pixels(image):
|
||||
@@ -131,6 +143,28 @@ def has_light_fill(image):
|
||||
return white / len(pixels) >= WHITE_FRACTION
|
||||
|
||||
|
||||
def relative_luminance(rgb):
|
||||
def linear(c):
|
||||
c /= 255.0
|
||||
return c / 12.92 if c <= 0.03928 else ((c + 0.055) / 1.055) ** 2.4
|
||||
r, g, b = rgb
|
||||
return 0.2126 * linear(r) + 0.7152 * linear(g) + 0.0722 * linear(b)
|
||||
|
||||
|
||||
def reads_on_dark(image):
|
||||
"""True when the icon's mean visible color reaches DARK_RATIO against
|
||||
the dark window, the test tst_qeticons applies to every dark file."""
|
||||
pixels = visible_pixels(image)
|
||||
if not pixels:
|
||||
return False
|
||||
n = len(pixels)
|
||||
mean = (sum(p[0] for p in pixels) // n, sum(p[1] for p in pixels) // n,
|
||||
sum(p[2] for p in pixels) // n)
|
||||
lighter, darker = sorted((relative_luminance(mean), relative_luminance(DARK_WINDOW)),
|
||||
reverse=True)
|
||||
return (lighter + 0.05) / (darker + 0.05) >= DARK_RATIO
|
||||
|
||||
|
||||
def invert_lightness(image):
|
||||
"""Invert lightness, keeping hue, saturation and alpha.
|
||||
|
||||
@@ -240,6 +274,20 @@ def main():
|
||||
changed += write_if_changed(target, text)
|
||||
dark.append(f"themes/qet-dark/scalable/{name}")
|
||||
|
||||
# Complete each dark name with the light files of its other sizes
|
||||
# that read on a dark window (see the module docstring): aliases, no
|
||||
# copies.
|
||||
dark_sizes = {}
|
||||
for path in dark:
|
||||
size, name = path.split("/")[2:]
|
||||
dark_sizes.setdefault(name, set()).add(size)
|
||||
dark_aliases = []
|
||||
for alias, source in light:
|
||||
size, name = alias.split("/")[2:]
|
||||
if name in dark_sizes and size not in dark_sizes[name] \
|
||||
and reads_on_dark(Image.open(ICO / source).convert("RGBA")):
|
||||
dark_aliases.append((f"themes/qet-dark/{size}/{name}", source))
|
||||
|
||||
# Drop dark files from an earlier run that are no longer generated, so
|
||||
# a reclassified icon falls back to the light theme instead of keeping
|
||||
# a stale copy.
|
||||
@@ -264,6 +312,8 @@ def main():
|
||||
qrc.append(f' <file alias="{alias}">{source}</file>')
|
||||
for path in dark:
|
||||
qrc.append(f" <file>{path}</file>")
|
||||
for alias, source in dark_aliases:
|
||||
qrc.append(f' <file alias="{alias}">{source}</file>')
|
||||
qrc += [" </qresource>", "</RCC>", ""]
|
||||
changed += write_if_changed(QRC, "\n".join(qrc))
|
||||
|
||||
|
||||
@@ -0,0 +1,349 @@
|
||||
# qet-mcp — a Model Context Protocol server for QElectroTech projects
|
||||
|
||||
A small stdio MCP server that lets an AI assistant read and verify
|
||||
QElectroTech projects: what is in a project, what an edit actually
|
||||
changed, and what a whole corpus of projects contains.
|
||||
|
||||
It has **no third-party dependencies** — Python 3.9+ and the standard
|
||||
library only. The MCP SDK is not required.
|
||||
|
||||
## Why
|
||||
|
||||
Verifying a change by screenshot is unreliable, and this tool exists
|
||||
because that unreliability produced two wrong conclusions in one review
|
||||
session:
|
||||
|
||||
- A drag of a multi-element selection *looked* like it had left the
|
||||
symbols behind and detached their labels. Diffing the saved file showed
|
||||
all four elements had moved by an identical `(0, -80)` and **no label
|
||||
had moved at all**. A bug report was one step away from being filed.
|
||||
- An "Apply" button *looked* like it did nothing. It was disabled,
|
||||
because a required field was empty.
|
||||
|
||||
Both times the pixels misled and the model told the truth. So the tools
|
||||
here read the model.
|
||||
|
||||
## Tools
|
||||
|
||||
| Tool | What it answers |
|
||||
|---|---|
|
||||
| `qet_project_info` | title, format version, folios, element and conductor counts |
|
||||
| `qet_elements` | placed elements: uuid, type, position, label, information bag |
|
||||
| `qet_conductors` | conductors and their documentation fields; filter by attribute |
|
||||
| `qet_diff` | **what an edit actually changed** — element moves, adds, removes, relabels; conductor changes; and folio fields, texts, shapes, images, symbol text fields and terminal strips |
|
||||
| `qet_scan` | sweep a directory of projects, counting nodes carrying an attribute |
|
||||
| `qet_element_info` | a `.elmt`: translated names, terminals, info fields, part counts |
|
||||
| `qet_export` | run a headless export (pdf, png, svg, bom, cables, wires, wiring, nets, links, info) |
|
||||
| `qet_edit` | **change a project** — place, move, rotate, label, wire, number, cross-reference, add text, shapes and images, restyle a symbol's text fields, delete; then diff the result |
|
||||
| `qet_element_build` | **author a `.elmt`** — draw a new symbol, with terminals to wire it by |
|
||||
| `qet_project_new` | **start from nothing** — an empty project with a title and folios |
|
||||
| `qet_element_search` | **find a symbol** in a collection by name (any language), type or terminal count |
|
||||
| `qet_check` | **design-rule checks** — duplicate labels, unlabelled masters, unnumbered conductors, empty folios |
|
||||
| `qet_query` | **ask the project database** — read-only SQL over the views and tables |
|
||||
|
||||
`qet_export` and `qet_edit` launch QElectroTech. Everything else parses the
|
||||
file directly, which is faster, needs no display, and cannot be confused by
|
||||
a dialog.
|
||||
|
||||
## Running it
|
||||
|
||||
```bash
|
||||
# list the tools and exit
|
||||
misc/qet-mcp/qet_mcp.py --list
|
||||
|
||||
# speak MCP on stdin/stdout
|
||||
misc/qet-mcp/qet_mcp.py
|
||||
```
|
||||
|
||||
Register it with an MCP client, for example:
|
||||
|
||||
```json
|
||||
{
|
||||
"mcpServers": {
|
||||
"qet": {
|
||||
"command": "python3",
|
||||
"args": ["/path/to/qelectrotech/misc/qet-mcp/qet_mcp.py"],
|
||||
"env": {
|
||||
"QET_MCP_WORKSPACE": "/home/you/drawings",
|
||||
"QET_ENABLE_SCRIPTING": "1"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
## Five tools need scripting switched on
|
||||
|
||||
A QElectroTech with JavaScript scripting switched off refuses `--run`, and
|
||||
off is the default from
|
||||
[#984](https://github.com/qelectrotech/qelectrotech-source-mirror/pull/984)
|
||||
onwards. Five tools here drive it that way and stop working until it is
|
||||
turned on:
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| need `QET_ENABLE_SCRIPTING=1` | `qet_query`, `qet_continuity`, `qet_check`, `qet_project_new`, `qet_edit` |
|
||||
| unaffected | everything else — they read the `.qet` directly, or, in `qet_export`'s case, use a plain CLI flag |
|
||||
|
||||
The variable goes in the environment this server is started in, which for an
|
||||
MCP client is the `env` block above; the server passes its environment
|
||||
straight through to QElectroTech. It does not set the variable itself, on
|
||||
purpose — a switch a program turns on for itself is not a switch. Whoever
|
||||
configured this server and pointed it at a QElectroTech binary made that
|
||||
choice, and their interactive QElectroTech keeps whatever its own setting
|
||||
says.
|
||||
|
||||
Without it, those five come back `"ok": false` with a `hint` naming the
|
||||
variable. Older builds, from before the setting existed, need nothing.
|
||||
|
||||
## What the server is allowed to touch
|
||||
|
||||
Every path in a tool call is chosen by the model, so without a policy this
|
||||
server would be a read/write primitive for anything the operating system
|
||||
lets the process reach: read any project on the disk, export one somewhere
|
||||
else, overwrite an unrelated file, embed an arbitrary local image or PDF.
|
||||
|
||||
So **data paths are confined to a workspace**:
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| `QET_MCP_WORKSPACE` | the directories tool calls may read and write, separated by `:` (`;` on Windows) |
|
||||
| unset | the directory the server was started in |
|
||||
| `QET_MCP_ALLOW_ANY_PATH=1` | turns the check off entirely |
|
||||
|
||||
Set the workspace to the folder your drawings live in. A path outside it is
|
||||
refused with an error naming what was allowed; symlinks are resolved first,
|
||||
so a link planted inside the workspace is judged by where it points.
|
||||
|
||||
Two arguments are deliberately **not** confined: `binary` (the
|
||||
`qelectrotech` executable) and `elements_dir` (the element collection).
|
||||
Those are configuration, chosen once by whoever runs the server, and both
|
||||
normally live in `/usr` or a build tree — outside any sensible workspace.
|
||||
Confining them would reject the ordinary case while stopping nothing.
|
||||
|
||||
`QET_MCP_ALLOW_ANY_PATH=1` is equivalent to granting the client local
|
||||
filesystem access with this process's privileges. It exists so that is a
|
||||
deliberate choice rather than the default.
|
||||
|
||||
**Nothing is overwritten unasked.** `qet_export`, `qet_edit`,
|
||||
`qet_project_new` and `qet_element_build` refuse an `output` that already
|
||||
exists unless the call passes `"overwrite": true`. Replacing a file is the
|
||||
one step this server cannot undo, so it is the one step it will not take on
|
||||
its own.
|
||||
|
||||
The confinement is applied where tool arguments enter the server, not inside
|
||||
each tool. Importing `qet_mcp` and calling `tool_export()` from your own
|
||||
Python is not confined and is not meant to be — that is your code calling a
|
||||
library, and you already chose the paths.
|
||||
|
||||
## Worked examples
|
||||
|
||||
**What did that edit change?**
|
||||
|
||||
```json
|
||||
{"name": "qet_diff", "arguments": {"before": "a.qet", "after": "b.qet"}}
|
||||
```
|
||||
|
||||
```json
|
||||
"elements": { "moved_count": 4,
|
||||
"distinct_move_deltas": [[0.0, -80.0]],
|
||||
"relabelled": [], "info_changed": [] }
|
||||
```
|
||||
|
||||
Four elements moved by one uniform delta; nothing was relabelled. That is
|
||||
the answer a screenshot gave wrongly.
|
||||
|
||||
**Draw something, and check it landed**
|
||||
|
||||
```json
|
||||
{"name": "qet_edit", "arguments": {
|
||||
"binary": "/path/to/qelectrotech",
|
||||
"project": "in.qet", "output": "out.qet",
|
||||
"elements_dir": "/path/to/qelectrotech/elements",
|
||||
"operations": [
|
||||
{"op": "add_folio", "id": "f"},
|
||||
{"op": "set_folio_title", "folio": "$f", "title": "Starter"},
|
||||
{"op": "add_element", "id": "k1", "folio": "$f", "path": "common://.../coil.elmt", "x": 100, "y": 100},
|
||||
{"op": "add_element", "id": "k2", "folio": "$f", "path": "common://.../coil.elmt", "x": 320, "y": 100},
|
||||
{"op": "add_conductor", "folio": "$f", "from": "$k1", "from_terminal": 0, "to": "$k2", "to_terminal": 0},
|
||||
{"op": "set_conductor", "folio": "$f", "element": "$k1", "terminal": 0, "property": "num", "value": "W7"},
|
||||
{"op": "set_label", "folio": "$f", "element": "$k1", "label": "KM1"}
|
||||
]}}
|
||||
```
|
||||
|
||||
An op that creates something takes an `"id"`; later ops name it as `"$id"`.
|
||||
Terminals are addressed by index — top to bottom, then left to right, **not**
|
||||
the order the `.elmt` lists them. `qet_element_info` and `qet_element_search`
|
||||
both report that index order. The answer carries a per-operation result
|
||||
*and* a `qet_diff`, because "addConductor → true" says the call was
|
||||
accepted, not that the file came out right:
|
||||
|
||||
```json
|
||||
"diff": {"elements": {"before": 11, "after": 13, "added": ["{0aa3…}", "{6f63…}"]},
|
||||
"conductors": {"before": 47, "after": 48, "added": ["4:{0aa3…}/{2904…}--{6f63…}/{2904…}"],
|
||||
"removed": []}}
|
||||
```
|
||||
|
||||
**Draw a symbol that does not exist yet**
|
||||
|
||||
```json
|
||||
{"name": "qet_element_build", "arguments": {
|
||||
"output": "/path/to/collection/99_custom/my_resistor.elmt",
|
||||
"names": {"en": "Test resistor", "fr": "Résistance de test"},
|
||||
"parts": [
|
||||
{"type": "rect", "x": -10, "y": -20, "width": 20, "height": 40},
|
||||
{"type": "line", "x1": 0, "y1": -30, "x2": 0, "y2": -20},
|
||||
{"type": "line", "x1": 0, "y1": 20, "x2": 0, "y2": 30},
|
||||
{"type": "text", "x": 14, "y": -4, "text": "R"}
|
||||
],
|
||||
"terminals": [{"x": 0, "y": -30, "orientation": "n", "name": "1"},
|
||||
{"x": 0, "y": 30, "orientation": "s", "name": "2"}]}}
|
||||
```
|
||||
|
||||
Then place it with `qet_edit` like any catalogue element. Unlike a
|
||||
project, a `.elmt` is not rewritten by QElectroTech on a round trip, so
|
||||
generating one here is safe in a way that generating a `.qet` would not
|
||||
be — there is no `toXml()` waiting to drop what this writer did not know
|
||||
to emit.
|
||||
|
||||
**Ask a question the XML cannot answer**
|
||||
|
||||
```json
|
||||
{"name": "qet_query", "arguments": {
|
||||
"binary": "/path/to/qelectrotech", "project": "industrial.qet",
|
||||
"sql": "SELECT label, COUNT(*) AS n FROM element_nomenclature_view WHERE label <> '' GROUP BY label HAVING n > 1 ORDER BY n DESC"}}
|
||||
```
|
||||
|
||||
```json
|
||||
"rows": [{"label": "V6", "n": 7}, {"label": "V5", "n": 6}, {"label": "V4", "n": 6}]
|
||||
```
|
||||
|
||||
Duplicate element labels in a shipped example — a design-rule question,
|
||||
answered by the database that already knew it.
|
||||
|
||||
**How much of a corpus uses a field?**
|
||||
|
||||
```json
|
||||
{"name": "qet_scan",
|
||||
"arguments": {"directory": "examples", "tag": "conductor", "attribute": "cable"}}
|
||||
```
|
||||
|
||||
```json
|
||||
{ "files": 24, "total": 3190, "non_empty": 0, "distinct_values": [] }
|
||||
```
|
||||
|
||||
Across the shipped examples: 3190 conductors, not one with a cable value.
|
||||
|
||||
## Testing
|
||||
|
||||
```bash
|
||||
python3 test_qet_mcp.py # unit + protocol, no QElectroTech needed
|
||||
QET_BINARY=/path/to/qelectrotech \
|
||||
QET_ELEMENTS=/path/to/qelectrotech/elements \
|
||||
QET_EXAMPLES=/path/to/qelectrotech/examples \
|
||||
QET_ENABLE_SCRIPTING=1 \
|
||||
python3 test_qet_mcp.py # everything
|
||||
```
|
||||
|
||||
`QET_ENABLE_SCRIPTING=1` matters from #984 onwards: without it the
|
||||
integration tests that drive QElectroTech through a script all fail, and
|
||||
they fail as "the edit did nothing" rather than as "scripting is off", which
|
||||
reads like a regression in the thing under test.
|
||||
|
||||
176 tests in three layers: unit (validation, script generation, the terminal
|
||||
order rule, the diff, the part schema), the real stdio transport, and
|
||||
integration against a built QElectroTech. Several exist because the
|
||||
behaviour they pin was once wrong and looked right, and say so in their
|
||||
docstrings. To check the suite itself rather than trust it, each of those
|
||||
bugs was reintroduced in turn and the suite confirmed to fail: ten in the
|
||||
Python, plus the hang guard on `addConductor` and the database refresh in
|
||||
`ConductorCreator` in the C++.
|
||||
|
||||
## Notes and limits
|
||||
|
||||
- **The project database is reachable now, through `qet_query`.** It was
|
||||
not when this server was written, which is why every other structural
|
||||
tool here re-derives its answer from the XML. Prefer the views —
|
||||
`element_nomenclature_view`, `project_summary_view`, `wiring_list_view`
|
||||
— which exist to be queried; the underlying tables are how the cache is
|
||||
arranged today and a column may move. Call `qet_query` with no `sql` to
|
||||
list both. Only `SELECT` and `WITH` are accepted, which is the rule
|
||||
QElectroTech applies to its own custom-query box, not one invented here.
|
||||
An empty result and a failed query are told apart: `row_count` 0 with no
|
||||
`error` means nothing matched, and a typo'd column name says so.
|
||||
- **`qet_export` isolates its launch.** SingleApplication keys its socket
|
||||
on `applicationFilePath()`, so a second launch of the same binary path
|
||||
forwards its request to an already-running instance and returns *that*
|
||||
process's answer with no error. The tool copies the binary to a unique
|
||||
temporary path, gives it a private `HOME`, and runs it on the offscreen
|
||||
platform. A symlink would not work: `applicationFilePath()` resolves it
|
||||
back to the real path.
|
||||
- **The CLI matches its flags exactly.** `--export-bom out.csv` is the
|
||||
supported form; `--export-bom=out.csv` is not recognised as an export
|
||||
at all, so the application starts its interface instead and a headless
|
||||
run hangs. The tool uses the positional form.
|
||||
- **Conductor identity is the hard part of `qet_diff`.** A conductor names
|
||||
its ends with `terminal1`/`terminal2`, and the project format has two
|
||||
schemes: folio-scoped integer ids in older files, terminal-definition
|
||||
uuids plus `element1`/`element2` in newer ones. The integer ids are
|
||||
**renumbered on every save**, so keying on them — which this tool did at
|
||||
first — made all 47 conductors of an untouched folio read as removed and
|
||||
re-added the moment the other side had been through QElectroTech, which
|
||||
is exactly what `qet_edit` produces. They are now keyed by owning element
|
||||
uuid plus terminal, which is stable across a save: measured at 0 colliding
|
||||
keys over 3190 conductors in the 24 shipped examples, and 0 churn on a
|
||||
no-op edit. Where an element predates persisted uuids the end cannot be
|
||||
resolved and keeps a `#`-marked unstable key; the diff then reports
|
||||
`unstable_keys` and says so rather than pretending to be comparable.
|
||||
- **Texts, shapes and images have no uuid**, so `qet_diff` cannot say "the same
|
||||
text, edited": an edited text reads as the old one removed and a new one
|
||||
added, both shown. Shapes and images are keyed by position, so a restyle
|
||||
or rescale *is* reported as a change to that item, but a move reads as a
|
||||
removal plus an addition. The folio `version` attribute is left out of the
|
||||
comparison on purpose: QElectroTech rewrites it on every save, and
|
||||
including it made every folio of any re-saved project look edited.
|
||||
- **Elements** written before persisted uuids fall back to a positional key,
|
||||
which makes a move in such a file read as a remove plus an add.
|
||||
- **`qet_edit` needs a build whose scripting API carries the drawing verbs.**
|
||||
Against an older one it reports exactly which methods are missing and
|
||||
changes nothing. `addElement` and the move/delete verbs shipped with the
|
||||
scripting API; `addConductor`, `rotateElement`, `setElementLabel`,
|
||||
`setElementInfo` and `setFolioTitle` are newer.
|
||||
- **`elements_dir` is not optional for `common://` paths.** The sandboxed
|
||||
run has its own empty HOME, so QElectroTech falls back to the compiled-in
|
||||
collection path, which on a machine that never ran `make install` does not
|
||||
exist. The only symptom is `addElement` reporting that a file plainly
|
||||
present "does not resolve to an element". An absolute `.elmt` path works
|
||||
without it.
|
||||
- **`set_conductor` changes the whole potential, not one segment.** That is
|
||||
what the application does — a wire number describes a potential — so name
|
||||
a terminal carrying exactly one conductor and the change reaches every
|
||||
conductor electrically joined to it. A terminal several conductors meet
|
||||
at names none of them and is refused, so address a potential from one of
|
||||
its leaves. Property names are the file's own, so `qet_conductors` reads
|
||||
back exactly what was set.
|
||||
- **`link_elements` takes a folio for each end**, because a master and its
|
||||
slave are normally on different folios. Whether a pair may be linked is
|
||||
decided by QElectroTech's own `isLinkable()`, so a script cannot make a
|
||||
link the GUI would refuse.
|
||||
- **An element must live inside a collection to be placeable.** This is
|
||||
not about the path syntax: an absolute `.elmt` path works, but only if
|
||||
the file sits under a directory QElectroTech knows as a collection.
|
||||
Write it under the tree you pass as `elements_dir` and `qet_edit` can
|
||||
place it, by absolute path or as `common://…`; write it anywhere else
|
||||
and `add_element` reports only "does not resolve to an element".
|
||||
- **`qet_element_build` computes the `.elmt` size header, and checks it.**
|
||||
`width`/`height`/`hotspot_x`/`hotspot_y` relate to the drawing by a
|
||||
containment constraint, not a formula — the declared box runs from
|
||||
`(-hotspot_x, -hotspot_y)` to `(width - hotspot_x, height - hotspot_y)`
|
||||
and the drawing must fit inside it. The shipped collection shows authors
|
||||
picking their own margins (one element pads 2 units left and 3 right,
|
||||
another 8 and 2), so there is no convention to copy, only an invariant
|
||||
to satisfy. A drawing that escaped its box is the classic way a
|
||||
hand-written element renders clipped in the collection panel while
|
||||
looking fine in XML.
|
||||
- **QElectroTech interrupts a script at 30 s** of its own accord, separately
|
||||
from this tool's `timeout`. A very long operation list will hit that
|
||||
first.
|
||||
- **`qet_edit` never writes the input.** It saves to a separate file and
|
||||
diffs the two, so the original is always the thing the diff is against.
|
||||
@@ -0,0 +1,44 @@
|
||||
<definition version="0.100.0" type="element" link_type="master" width="40" height="60" hotspot_x="17" hotspot_y="32">
|
||||
<uuid uuid="{6d3714f6-a0e1-71b3-e4bd-5a35d4cbbec1}"/>
|
||||
<names>
|
||||
<name lang="ar">ملف KA بمحتفظ مغناطيسي</name>
|
||||
<name lang="ca">Bobina</name>
|
||||
<name lang="cs">Bistabilní remanentní relé</name>
|
||||
<name lang="de">Remanenzrelais</name>
|
||||
<name lang="el">Πηνίο με μανδάλωση</name>
|
||||
<name lang="en">Coil</name>
|
||||
<name lang="es">Bobina KA de remanencia</name>
|
||||
<name lang="fr">Bobine KA à rémanence</name>
|
||||
<name lang="hu">Tekercs</name>
|
||||
<name lang="it">Bobina</name>
|
||||
<name lang="nl">spoel remanent</name>
|
||||
<name lang="nl_BE">Spoel KA remanent</name>
|
||||
<name lang="pl">Cewka przekaźnika remanencyjnego</name>
|
||||
<name lang="pt_BR">Bobina</name>
|
||||
<name lang="ru">Обмотка</name>
|
||||
<name lang="zh">剩磁保持线圈</name>
|
||||
</names>
|
||||
<kindInformations>
|
||||
<kindInformation name="type">plc</kindInformation>
|
||||
</kindInformations>
|
||||
<informations>Author: The QElectroTech team
|
||||
License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
|
||||
<description>
|
||||
<rect x="14" y="-8" width="6" height="16" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
|
||||
<line x1="0" y1="-20" x2="0" y2="-8" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
|
||||
<dynamic_text x="2" y="11.33" z="5" text_width="-1" Halignment="AlignLeft" Valignment="AlignTop" frame="false" rotation="0" keep_visual_rotation="false" text_from="UserText" uuid="{647e33ed-520b-4d80-bbc4-7b31177b8f26}" font="Liberation Sans,4,-1,5,25,0,0,0,0,0,Regular">
|
||||
<text>A2</text>
|
||||
</dynamic_text>
|
||||
<dynamic_text x="2" y="-24.67" z="6" text_width="-1" Halignment="AlignLeft" Valignment="AlignTop" frame="false" rotation="0" keep_visual_rotation="false" text_from="UserText" uuid="{fb1f8de9-70c0-4801-8dc7-12e6bf88d8f5}" font="Liberation Sans,4,-1,5,25,0,0,0,0,0,Regular">
|
||||
<text>A1</text>
|
||||
</dynamic_text>
|
||||
<line x1="0" y1="8" x2="0" y2="20" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
|
||||
<dynamic_text x="30" y="-9.17" z="8" text_width="-1" Halignment="AlignLeft" Valignment="AlignTop" frame="false" rotation="0" keep_visual_rotation="false" text_from="ElementInfo" uuid="{b7fccfc3-05f1-459c-9766-f49a481bd0ff}" font="Liberation Sans,9,-1,5,50,0,0,0,0,0,Regular">
|
||||
<text></text>
|
||||
<info_name>label</info_name>
|
||||
</dynamic_text>
|
||||
<polygon x1="-14" y1="-8" x2="14" y2="-8" x3="20" y3="8" x4="-14" y4="8" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
|
||||
<terminal uuid="{6a87c921-6f5d-4f5c-8673-228a6d13c5c8}" name="A2" x="0" y="20" orientation="s" type="Generic"/>
|
||||
<terminal uuid="{2904e5fa-6bbe-4127-acdd-f92feadd6ece}" name="A1" x="0" y="-20" orientation="n" type="Generic"/>
|
||||
</description>
|
||||
</definition>
|
||||
@@ -0,0 +1,16 @@
|
||||
<definition version="0.100.0" type="element" link_type="slave" width="20" height="60" hotspot_x="9" hotspot_y="30">
|
||||
<uuid uuid="{94d56f06-6814-5561-9148-2da3a9c4f900}"/>
|
||||
<names>
|
||||
<name lang="en">PLC Slave Test</name>
|
||||
</names>
|
||||
<kindInformations>
|
||||
<kindInformation name="type">plc</kindInformation>
|
||||
<kindInformation name="state">NO</kindInformation>
|
||||
<kindInformation name="number">1</kindInformation>
|
||||
</kindInformations>
|
||||
<description>
|
||||
<rect x="0" y="-8" width="6" height="16" rx="0" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
|
||||
<terminal uuid="{6a87c921-6f5d-4f5c-8673-228a6d13c500}" name="1" x="0" y="20" orientation="s" type="Generic"/>
|
||||
<terminal uuid="{2904e5fa-6bbe-4127-acdd-f92feadd6e00}" name="2" x="0" y="-20" orientation="n" type="Generic"/>
|
||||
</description>
|
||||
</definition>
|
||||
Executable
+2773
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -49,6 +49,14 @@ ElementsCollectionModel::ElementsCollectionModel(QObject *parent) :
|
||||
*/
|
||||
ElementsCollectionModel::~ElementsCollectionModel()
|
||||
{
|
||||
// Without cancel(), the wait below runs the whole queued
|
||||
// QtConcurrent::map() to completion, so closing this dialog on a
|
||||
// large collection blocks until every remaining item has been
|
||||
// processed -- a visible hang on the button pressed precisely to
|
||||
// stop the work. cancel() drops the not-yet-started items so the
|
||||
// wait that follows (still needed, so an in-flight item can't
|
||||
// dereference this object after it's gone) is short.
|
||||
m_future.cancel();
|
||||
m_future.waitForFinished();
|
||||
}
|
||||
|
||||
@@ -431,7 +439,7 @@ void ElementsCollectionModel::addLocation(const ElementsLocation& location)
|
||||
collection_name);
|
||||
}
|
||||
}
|
||||
// ANPASSUNG: Makros und Custom Collection werden hier behandelt!
|
||||
// Macros and Custom Collection are handled here
|
||||
else if (location.isCustomCollection() || location.isMacrosCollection()) {
|
||||
QList <ElementCollectionItem *> child_list;
|
||||
|
||||
@@ -647,7 +655,7 @@ QModelIndex ElementsCollectionModel::indexFromLocation(
|
||||
if (eci->type() == FileElementCollectionItem::Type) {
|
||||
if (FileElementCollectionItem *feci = static_cast<FileElementCollectionItem *>(eci)) {
|
||||
|
||||
// ANPASSUNG: Makro-Prüfung hinzugefügt, damit das Modell den Pfad im Baum findet!
|
||||
// Macro check added so the model finds the path in the tree
|
||||
if ( (location.isCommonCollection() && feci->isCommonCollection()) ||
|
||||
(location.isCompanyCollection() && feci->isCompanyCollection()) ||
|
||||
(location.isMacrosCollection() && feci->isMacrosCollection()) ||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include "../NameList/nameslist.h"
|
||||
#include "../diagramcontext.h"
|
||||
#include "pugixml/src/pugixml.hpp"
|
||||
#include "pugixml.hpp"
|
||||
|
||||
#include <QIcon>
|
||||
#include <QString>
|
||||
|
||||
@@ -162,7 +162,7 @@ QString FileElementCollectionItem::localName()
|
||||
else if (m_path == QETApp::customElementsDirN())
|
||||
setText(QObject::tr("Collection utilisateur"));
|
||||
else if (m_path == macrosPath)
|
||||
setText(QObject::tr("Makros"));
|
||||
setText(QObject::tr("Macros"));
|
||||
else
|
||||
setText(QObject::tr("Collection inconnue"));
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
*/
|
||||
#ifndef NAMES_LIST_H
|
||||
#define NAMES_LIST_H
|
||||
#include "pugixml/src/pugixml.hpp"
|
||||
#include "pugixml.hpp"
|
||||
|
||||
#include <QtXml>
|
||||
/**
|
||||
|
||||
@@ -35,13 +35,17 @@ AddTerminalToStripCommand::AddTerminalToStripCommand(QSharedPointer<RealTerminal
|
||||
const auto t_label = terminal->label();
|
||||
const auto ts_name = strip->name();
|
||||
|
||||
const auto str_1 = t_label.isEmpty() ? QObject::tr("Ajouter une borne") :
|
||||
QObject::tr("Ajouter la borne %1").arg(t_label);
|
||||
|
||||
const auto str_2 = ts_name.isEmpty() ? QObject::tr("à un groupe de bornes") :
|
||||
QObject::tr("au groupe de bornes %1").arg(ts_name);
|
||||
|
||||
setText(str_1 % " " % str_2);
|
||||
QString text;
|
||||
if (ts_name.isEmpty()) {
|
||||
text = t_label.isEmpty()
|
||||
? QObject::tr("Ajouter une borne à un groupe de bornes")
|
||||
: QObject::tr("Ajouter la borne %1 à un groupe de bornes").arg(t_label);
|
||||
} else {
|
||||
text = t_label.isEmpty()
|
||||
? QObject::tr("Ajouter une borne au groupe de bornes %1").arg(ts_name)
|
||||
: QObject::tr("Ajouter la borne %1 au groupe de bornes %2").arg(t_label, ts_name);
|
||||
}
|
||||
setText(text);
|
||||
}
|
||||
|
||||
AddTerminalToStripCommand::AddTerminalToStripCommand(QVector<QSharedPointer<RealTerminal>> terminals, TerminalStrip *strip, QUndoCommand *parent) :
|
||||
@@ -50,14 +54,11 @@ AddTerminalToStripCommand::AddTerminalToStripCommand(QVector<QSharedPointer<Real
|
||||
m_new_strip{strip}
|
||||
{
|
||||
const auto ts_name = strip->name();
|
||||
const auto count = m_terminal.size();
|
||||
|
||||
const auto str_1 = m_terminal.size() > 1 ? QObject::tr("Ajouter %1 bornes").arg(m_terminal.size()) :
|
||||
QObject::tr("Ajouter une borne");
|
||||
|
||||
const auto str_2 = ts_name.isEmpty() ? QObject::tr("à un groupe de bornes") :
|
||||
QObject::tr("au groupe de bornes %1").arg(ts_name);
|
||||
|
||||
setText(str_1 % " " % str_2);
|
||||
setText(ts_name.isEmpty()
|
||||
? QObject::tr("Ajouter %n borne(s) à un groupe de bornes", "", count)
|
||||
: QObject::tr("Ajouter %n borne(s) au groupe de bornes %1", "", count).arg(ts_name));
|
||||
}
|
||||
|
||||
|
||||
@@ -137,13 +138,11 @@ void RemoveTerminalFromStripCommand::redo()
|
||||
void RemoveTerminalFromStripCommand::setCommandTitle()
|
||||
{
|
||||
const auto strip_name = m_strip->name();
|
||||
const auto count = m_terminals.size();
|
||||
|
||||
const auto str_1 = m_terminals.size()>1 ? QObject::tr("Enlever %1 bornes").arg(m_terminals.size()):
|
||||
QObject::tr("Enlever une borne");
|
||||
|
||||
const auto str_2 = strip_name.isEmpty() ? QObject::tr("d'un groupe de bornes") :
|
||||
QObject::tr("du groupe de bornes %1").arg(strip_name);
|
||||
setText(str_1 % " " % str_2);
|
||||
setText(strip_name.isEmpty()
|
||||
? QObject::tr("Enlever %n borne(s) d'un groupe de bornes", "", count)
|
||||
: QObject::tr("Enlever %n borne(s) du groupe de bornes %1", "", count).arg(strip_name));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -166,19 +165,30 @@ MoveTerminalCommand::MoveTerminalCommand(QSharedPointer<PhysicalTerminal> termin
|
||||
t_label.append(", ");
|
||||
t_label.append(real_t->label());
|
||||
}
|
||||
const auto strip_name = old_strip->name();
|
||||
const auto new_strip_name = new_strip->name();
|
||||
|
||||
auto strip_name = old_strip->name();
|
||||
auto new_strip_name = new_strip->name();
|
||||
|
||||
auto str_1 = t_label.isEmpty() ? QObject::tr("Déplacer une borne") :
|
||||
QObject::tr("Déplacer la borne %1").arg(t_label);
|
||||
|
||||
auto str_2 = strip_name.isEmpty() ? QObject::tr(" d'un groupe de bornes") :
|
||||
QObject::tr(" du groupe de bornes %1").arg(strip_name);
|
||||
|
||||
auto str_3 = new_strip_name.isEmpty() ? QObject::tr("vers un groupe de bornes") :
|
||||
QObject::tr("vers le groupe de bornes %1").arg(new_strip_name);
|
||||
setText(str_1 % " " % str_2 % " " % str_3);
|
||||
QString text;
|
||||
if (t_label.isEmpty()) {
|
||||
if (strip_name.isEmpty() && new_strip_name.isEmpty())
|
||||
text = QObject::tr("Déplacer une borne d'un groupe de bornes vers un autre groupe de bornes");
|
||||
else if (strip_name.isEmpty())
|
||||
text = QObject::tr("Déplacer une borne d'un groupe de bornes vers le groupe de bornes %1").arg(new_strip_name);
|
||||
else if (new_strip_name.isEmpty())
|
||||
text = QObject::tr("Déplacer une borne du groupe de bornes %1 vers un autre groupe de bornes").arg(strip_name);
|
||||
else
|
||||
text = QObject::tr("Déplacer une borne du groupe de bornes %1 vers le groupe de bornes %2").arg(strip_name, new_strip_name);
|
||||
} else {
|
||||
if (strip_name.isEmpty() && new_strip_name.isEmpty())
|
||||
text = QObject::tr("Déplacer la borne %1 d'un groupe de bornes vers un autre groupe de bornes").arg(t_label);
|
||||
else if (strip_name.isEmpty())
|
||||
text = QObject::tr("Déplacer la borne %1 d'un groupe de bornes vers le groupe de bornes %2").arg(t_label, new_strip_name);
|
||||
else if (new_strip_name.isEmpty())
|
||||
text = QObject::tr("Déplacer la borne %1 du groupe de bornes %2 vers un autre groupe de bornes").arg(t_label, strip_name);
|
||||
else
|
||||
text = QObject::tr("Déplacer la borne %1 du groupe de bornes %2 vers le groupe de bornes %3").arg(t_label, strip_name, new_strip_name);
|
||||
}
|
||||
setText(text);
|
||||
}
|
||||
|
||||
MoveTerminalCommand::MoveTerminalCommand(QVector<QSharedPointer<PhysicalTerminal>> terminals, TerminalStrip *old_strip,
|
||||
@@ -191,17 +201,18 @@ MoveTerminalCommand::MoveTerminalCommand(QVector<QSharedPointer<PhysicalTerminal
|
||||
{
|
||||
const auto strip_name = old_strip->name();
|
||||
const auto new_strip_name = new_strip->name();
|
||||
const auto count = m_terminal.size();
|
||||
|
||||
const auto str_1 = m_terminal.size() > 1 ? QObject::tr("Déplacer des bornes") :
|
||||
QObject::tr("Déplacer une borne");
|
||||
|
||||
const auto str_2 = strip_name.isEmpty() ? QObject::tr(" d'un groupe de bornes") :
|
||||
QObject::tr(" du groupe de bornes %1").arg(strip_name);
|
||||
|
||||
const auto str_3 = new_strip_name.isEmpty() ? QObject::tr("vers un groupe de bornes") :
|
||||
QObject::tr("vers le groupe de bornes %1").arg(new_strip_name);
|
||||
|
||||
setText(str_1 % " " % str_2 % " " % str_3);
|
||||
QString text;
|
||||
if (strip_name.isEmpty() && new_strip_name.isEmpty())
|
||||
text = QObject::tr("Déplacer %n borne(s) d'un groupe de bornes vers un autre groupe de bornes", "", count);
|
||||
else if (strip_name.isEmpty())
|
||||
text = QObject::tr("Déplacer %n borne(s) d'un groupe de bornes vers le groupe de bornes %1", "", count).arg(new_strip_name);
|
||||
else if (new_strip_name.isEmpty())
|
||||
text = QObject::tr("Déplacer %n borne(s) du groupe de bornes %1 vers un autre groupe de bornes", "", count).arg(strip_name);
|
||||
else
|
||||
text = QObject::tr("Déplacer %n borne(s) du groupe de bornes %1 vers le groupe de bornes %2", "", count).arg(strip_name, new_strip_name);
|
||||
setText(text);
|
||||
}
|
||||
|
||||
void MoveTerminalCommand::undo()
|
||||
|
||||
@@ -275,3 +275,80 @@ QString NumerotationContext::formatValue(const QStringList &item)
|
||||
return QString("%1").arg(value.toInt(), 3, 10, QChar('0'));
|
||||
return QString::number(value.toInt());
|
||||
}
|
||||
|
||||
/**
|
||||
@brief NumerotationContext::saveToSettings
|
||||
Save a hash of named NumerotationContexts to QSettings.
|
||||
@param contexts : the named rules to save
|
||||
@param currentRule : the name of the currently active rule
|
||||
@param settings : QSettings instance
|
||||
@param prefix : settings key prefix (e.g. "autonum/conductor")
|
||||
*/
|
||||
void NumerotationContext::saveToSettings(
|
||||
const QHash<QString, NumerotationContext> &contexts,
|
||||
const QString ¤tRule,
|
||||
QSettings &settings,
|
||||
const QString &prefix)
|
||||
{
|
||||
settings.setValue(prefix + "/current", currentRule);
|
||||
|
||||
// Clear stale array entries before writing (beginWriteArray does not
|
||||
// remove entries beyond the new size).
|
||||
settings.remove(prefix + "/rules");
|
||||
|
||||
QStringList names = contexts.keys();
|
||||
settings.beginWriteArray(prefix + "/rules", names.size());
|
||||
for (int i = 0; i < names.size(); ++i) {
|
||||
settings.setArrayIndex(i);
|
||||
const QString &name = names.at(i);
|
||||
const NumerotationContext &nc = contexts.value(name);
|
||||
|
||||
settings.setValue("name", name);
|
||||
|
||||
// Serialize context to XML string
|
||||
QDomDocument doc;
|
||||
NumerotationContext nc_copy = nc;
|
||||
QDomElement root = nc_copy.toXml(doc, "context");
|
||||
doc.appendChild(root);
|
||||
settings.setValue("xml", doc.toString());
|
||||
}
|
||||
settings.endArray();
|
||||
}
|
||||
|
||||
/**
|
||||
@brief NumerotationContext::loadFromSettings
|
||||
Load named NumerotationContexts from QSettings.
|
||||
@param settings : QSettings instance
|
||||
@param prefix : settings key prefix (e.g. "autonum/conductor")
|
||||
@return pair of (hash of named rules, name of current rule)
|
||||
*/
|
||||
QPair<QHash<QString, NumerotationContext>, QString> NumerotationContext::loadFromSettings(
|
||||
QSettings &settings,
|
||||
const QString &prefix)
|
||||
{
|
||||
QPair<QHash<QString, NumerotationContext>, QString> result;
|
||||
QHash<QString, NumerotationContext> &contexts = result.first;
|
||||
QString ¤tRule = result.second;
|
||||
|
||||
currentRule = settings.value(prefix + "/current").toString();
|
||||
|
||||
int size = settings.beginReadArray(prefix + "/rules");
|
||||
for (int i = 0; i < size; ++i) {
|
||||
settings.setArrayIndex(i);
|
||||
QString name = settings.value("name").toString();
|
||||
QString xmlStr = settings.value("xml").toString();
|
||||
|
||||
if (name.isEmpty() || xmlStr.isEmpty()) continue;
|
||||
|
||||
QDomDocument doc;
|
||||
if (!doc.setContent(xmlStr)) continue;
|
||||
|
||||
QDomElement root = doc.documentElement();
|
||||
NumerotationContext nc;
|
||||
nc.fromXml(root);
|
||||
contexts.insert(name, nc);
|
||||
}
|
||||
settings.endArray();
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -21,6 +21,8 @@
|
||||
#include <QStringList>
|
||||
#include <QVariant>
|
||||
#include <QDomElement>
|
||||
#include <QHash>
|
||||
#include <QSettings>
|
||||
|
||||
/**
|
||||
This class represents a numerotation context, i.e. the data (type, value, increase)
|
||||
@@ -60,6 +62,14 @@ class NumerotationContext
|
||||
/// UI preview of a part's value matches what actually gets rendered.
|
||||
static QString formatValue(const QStringList &item);
|
||||
|
||||
static void saveToSettings(const QHash<QString, NumerotationContext> &contexts,
|
||||
const QString ¤tRule,
|
||||
QSettings &settings,
|
||||
const QString &prefix);
|
||||
static QPair<QHash<QString, NumerotationContext>, QString> loadFromSettings(
|
||||
QSettings &settings,
|
||||
const QString &prefix);
|
||||
|
||||
private:
|
||||
QStringList content_;
|
||||
};
|
||||
|
||||
@@ -505,7 +505,10 @@ void BorderTitleBlock::draw(QPainter *painter)
|
||||
{
|
||||
//Set the QPainter
|
||||
painter -> save();
|
||||
QPen pen(Qt::black);
|
||||
//Use a pen color that contrasts with the background
|
||||
QColor border_color = Diagram::background_color.lightness() < 128
|
||||
? QColor(Qt::white) : QColor(Qt::black);
|
||||
QPen pen(border_color);
|
||||
painter -> setPen(pen);
|
||||
painter -> setBrush(Qt::NoBrush);
|
||||
|
||||
@@ -893,10 +896,20 @@ void BorderTitleBlock::updateDiagramContextForTitleBlock(
|
||||
// An empty page-level value means the variable was auto-added to the
|
||||
// folio's Custom tab (#495) but never actually set by the user, so it
|
||||
// must not shadow a real project-level value of the same name (#531).
|
||||
//
|
||||
// That guard has to stop short of removing the key outright, though
|
||||
// (#973). TitleBlockTemplate::interpreteVariables() only replaces a
|
||||
// "%name"/"%{name}" placeholder when "name" is a key in this context at
|
||||
// all -- an unset variable that never makes it in is left as its own
|
||||
// literal placeholder text in the rendered title block, not blank.
|
||||
// So an empty page-level value is skipped only when a real project-level
|
||||
// one is already there to show through; otherwise it still goes in
|
||||
// empty, which is what makes the placeholder resolve to nothing.
|
||||
DiagramContext context = initial_context;
|
||||
foreach (QString key, additional_fields_.keys()) {
|
||||
if (!additional_fields_[key].toString().isEmpty())
|
||||
context.addValue(key, additional_fields_[key]);
|
||||
const QVariant value = additional_fields_[key];
|
||||
if (!value.toString().isEmpty() || !context.contains(key))
|
||||
context.addValue(key, value);
|
||||
}
|
||||
|
||||
// ... overridden by the historical and/or dynamically generated fields
|
||||
|
||||
@@ -499,6 +499,7 @@ void ConductorProperties::applyForEqualAttributes(QList<ConductorProperties> lis
|
||||
horiz_rotate_text = cp.horiz_rotate_text;
|
||||
m_vertical_alignment = cp.m_vertical_alignment;
|
||||
m_horizontal_alignment = cp.m_horizontal_alignment;
|
||||
style = cp.style;
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -555,6 +556,18 @@ void ConductorProperties::applyForEqualAttributes(QList<ConductorProperties> lis
|
||||
m_dash_size = i_value;
|
||||
equal = true;
|
||||
|
||||
//style
|
||||
Qt::PenStyle pen_style;
|
||||
pen_style = clist.first().style;
|
||||
for(ConductorProperties cp : clist)
|
||||
{
|
||||
if (cp.style != pen_style)
|
||||
equal = false;
|
||||
}
|
||||
if (equal)
|
||||
style = pen_style;
|
||||
equal = true;
|
||||
|
||||
//text
|
||||
s_value = clist.first().text;
|
||||
for(ConductorProperties cp : clist)
|
||||
|
||||
@@ -17,6 +17,8 @@
|
||||
*/
|
||||
#include "projectdatabase.h"
|
||||
|
||||
#include "sqlreadonly.h"
|
||||
|
||||
#include "../diagram.h"
|
||||
#include "../diagramposition.h"
|
||||
#include "../elementprovider.h"
|
||||
@@ -28,13 +30,15 @@
|
||||
#include "../qetproject.h"
|
||||
|
||||
#include <QLocale>
|
||||
#include <QFile>
|
||||
#include <QRegularExpression>
|
||||
#include <QSqlError>
|
||||
|
||||
#include <QSqlDriver>
|
||||
#include <QSqlError>
|
||||
#include <sqlite3.h>
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
@brief projectDataBase::projectDataBase
|
||||
Default constructor
|
||||
@@ -208,6 +212,12 @@ bool projectDataBase::isReadOnlySelect(const QString &query, QString *error)
|
||||
*/
|
||||
QSqlQuery projectDataBase::newQuery(const QString &query, QString *error) {
|
||||
QString reason;
|
||||
|
||||
// First gate: which kind of statement is acceptable here at all. A
|
||||
// textual check is the right tool for that and the wrong tool for
|
||||
// anything else -- see isReadOnlySelect()'s own comment. It is what
|
||||
// keeps ATTACH, BEGIN and PRAGMA out, none of which SQLite itself
|
||||
// considers writes.
|
||||
if (!isReadOnlySelect(query, &reason)) {
|
||||
qWarning().noquote() << "projectDataBase::newQuery: rejected query:" << reason << "--" << query;
|
||||
if (error) {
|
||||
@@ -215,6 +225,24 @@ QSqlQuery projectDataBase::newQuery(const QString &query, QString *error) {
|
||||
}
|
||||
return QSqlQuery(m_data_base);
|
||||
}
|
||||
|
||||
// Second gate, and the one that actually enforces read-only: SQLite is
|
||||
// asked about the statement it compiled, instead of the text being read
|
||||
// for clues. The first gate cannot see through a CTE prefix --
|
||||
// "WITH x AS (SELECT 1) DELETE FROM element" starts with WITH, contains
|
||||
// no semicolon, and deletes every row. That matters beyond the
|
||||
// custom-query box, because this path is reachable from a file: a
|
||||
// <graphics_table>'s saved <query> is read straight out of the .qet by
|
||||
// ProjectDBModel::fromXml() and executed by fillValue(), so opening or
|
||||
// exporting a project someone else produced would have been enough.
|
||||
if (!QETSql::isSingleReadOnlyStatement(sqliteHandle(&m_data_base), query, &reason)) {
|
||||
qWarning().noquote() << "projectDataBase::newQuery: rejected query:" << reason << "--" << query;
|
||||
if (error) {
|
||||
*error = reason;
|
||||
}
|
||||
return QSqlQuery(m_data_base);
|
||||
}
|
||||
|
||||
return QSqlQuery(query, m_data_base);
|
||||
}
|
||||
|
||||
@@ -291,10 +319,23 @@ void projectDataBase::addElement(Element *element)
|
||||
void projectDataBase::removeElement(Element *element)
|
||||
{
|
||||
m_content_changed = true;
|
||||
bool changed = false;
|
||||
|
||||
m_remove_element_query.bindValue(":uuid", element->uuid().toString());
|
||||
if(!m_remove_element_query.exec()) {
|
||||
qDebug() << "projectDataBase::removeElement remove error : " << m_remove_element_query.lastError();
|
||||
if (m_remove_element_query.exec()) {
|
||||
changed = true;
|
||||
} else {
|
||||
qDebug() << "projectDataBase::removeElement remove error : " << m_remove_element_query.lastError();
|
||||
}
|
||||
|
||||
m_remove_element_info_query.bindValue(":uuid", element->uuid().toString());
|
||||
if (m_remove_element_info_query.exec()) {
|
||||
changed = true;
|
||||
} else {
|
||||
qDebug() << "projectDataBase::removeElement remove element_info error : " << m_remove_element_info_query.lastError();
|
||||
}
|
||||
|
||||
if (changed) {
|
||||
emit dataBaseUpdated();
|
||||
}
|
||||
}
|
||||
@@ -1131,6 +1172,21 @@ void projectDataBase::prepareQuery()
|
||||
m_remove_element_query = QSqlQuery(m_data_base);
|
||||
m_remove_element_query.prepare(remove_element);
|
||||
|
||||
//REMOVE ELEMENT INFO
|
||||
//element_info has no ON DELETE CASCADE (foreign keys aren't
|
||||
//enforced by this connection), so removeElement() must clear it
|
||||
//explicitly. Without this, the row is orphaned under the removed
|
||||
//element's uuid, and re-adding an element with that same uuid
|
||||
//later -- undo of this same removal, or a redo replaying it --
|
||||
//hits element_info's PRIMARY KEY constraint on element_uuid: the
|
||||
//element re-add succeeds, but its element_info insert silently
|
||||
//fails and is lost. removeDiagram()'s cascade already clears this
|
||||
//table when a whole folio goes, but that does not run for a
|
||||
//single element removed on its own.
|
||||
QString remove_element_info("DELETE FROM element_info WHERE element_uuid=:uuid");
|
||||
m_remove_element_info_query = QSqlQuery(m_data_base);
|
||||
m_remove_element_info_query.prepare(remove_element_info);
|
||||
|
||||
//UPDATE ELEMENT INFO
|
||||
QString update_str("UPDATE element_info SET ");
|
||||
for (auto string : QETInformation::elementInfoKeys()) {
|
||||
@@ -1245,7 +1301,6 @@ void projectDataBase::bindDiagramInfoValues(QSqlQuery &query, Diagram *diagram)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef QET_EXPORT_PROJECT_DB
|
||||
/**
|
||||
@brief projectDataBase::sqliteHandle
|
||||
@param db
|
||||
@@ -1263,6 +1318,7 @@ sqlite3 *projectDataBase::sqliteHandle(QSqlDatabase *db)
|
||||
return handle;
|
||||
}
|
||||
|
||||
#ifdef QET_EXPORT_PROJECT_DB
|
||||
|
||||
/**
|
||||
* @brief projectDataBase::exportDb
|
||||
@@ -1298,27 +1354,19 @@ void projectDataBase::exportDb(projectDataBase *db,
|
||||
return;
|
||||
}
|
||||
|
||||
QString connection_name("export_project_db_" % db->project()->uuid().toString());
|
||||
|
||||
if (true) //Enter in a scope only to nicely use QSqlDatabase::removeDatabase just after the end of the scope
|
||||
{
|
||||
auto file_db = QSqlDatabase::addDatabase("QSQLITE", connection_name);
|
||||
file_db.setDatabaseName(path_);
|
||||
if (!file_db.open()) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto memory_db_handle = sqliteHandle(&db->m_data_base);
|
||||
auto file_db_handle = sqliteHandle(&file_db);
|
||||
|
||||
auto sqlite_backup = sqlite3_backup_init(file_db_handle, "main", memory_db_handle, "main");
|
||||
if (sqlite_backup)
|
||||
{
|
||||
sqlite3_backup_step(sqlite_backup, -1);
|
||||
sqlite3_backup_finish(sqlite_backup);
|
||||
}
|
||||
file_db.close();
|
||||
// VACUUM INTO requires the destination not to exist. QFileDialog may ask
|
||||
// about overwriting, but it does not remove the existing file for us.
|
||||
if (QFile::exists(path_) && !QFile::remove(path_)) {
|
||||
qWarning() << "Unable to replace project database export:" << path_;
|
||||
return;
|
||||
}
|
||||
|
||||
// VACUUM INTO creates a standalone copy of the current database without
|
||||
// requiring access to the SQLite driver's native connection handle.
|
||||
const auto escaped_path = path_.replace("'", "''");
|
||||
QSqlQuery query(db->m_data_base);
|
||||
if (!query.exec("VACUUM INTO '" % escaped_path % "'")) {
|
||||
qWarning() << "Unable to export project database:" << query.lastError().text();
|
||||
}
|
||||
QSqlDatabase::removeDatabase(connection_name);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -29,7 +29,7 @@ class QETProject;
|
||||
class Diagram;
|
||||
class Conductor;
|
||||
class Terminal;
|
||||
class sqlite3;
|
||||
struct sqlite3;
|
||||
|
||||
/**
|
||||
@brief The projectDataBase class
|
||||
@@ -61,6 +61,26 @@ class projectDataBase : public QObject
|
||||
QETProject *project() const;
|
||||
QSqlQuery newQuery(const QString &query = QString(), QString *error = nullptr);
|
||||
static bool isReadOnlySelect(const QString &query, QString *error = nullptr);
|
||||
|
||||
/**
|
||||
The most rows any caller reads out of one query result.
|
||||
|
||||
A SELECT is not bounded by how much data the project holds:
|
||||
SQLite produces rows lazily, so a query that never stops
|
||||
producing them makes the loop that reads them never stop
|
||||
either. A recursive CTE does exactly that in one line, and
|
||||
a <graphics_table>'s <query> is stored in the .qet and run
|
||||
on load -- so the text can arrive from a file rather than
|
||||
from the person at the keyboard, and opening that file is
|
||||
the whole attack.
|
||||
|
||||
100000 is far above any real result: the largest table in
|
||||
the shipped examples is 396 rows. It is a backstop, not a
|
||||
page size -- a caller that hits it has almost certainly
|
||||
been handed something it should not run to completion, and
|
||||
says so rather than truncating quietly.
|
||||
*/
|
||||
static constexpr int MaxResultRows = 100000;
|
||||
QSqlDatabase database() const {return m_data_base;}
|
||||
int excludedConductorCount() const;
|
||||
|
||||
@@ -119,6 +139,7 @@ class projectDataBase : public QObject
|
||||
QSqlQuery m_insert_elements_query,
|
||||
m_insert_element_info_query,
|
||||
m_remove_element_query,
|
||||
m_remove_element_info_query,
|
||||
m_update_element_query,
|
||||
m_insert_diagram_query,
|
||||
m_remove_diagram_query,
|
||||
@@ -135,9 +156,14 @@ class projectDataBase : public QObject
|
||||
m_cascade_remove_conductor_query,
|
||||
m_cascade_remove_element_query;
|
||||
|
||||
public:
|
||||
// Deliberately outside the QET_EXPORT_PROJECT_DB guard below:
|
||||
// newQuery() needs the raw connection to ask SQLite whether a
|
||||
// query only reads, and that check runs in every build.
|
||||
static sqlite3 *sqliteHandle(QSqlDatabase *db);
|
||||
|
||||
#ifdef QET_EXPORT_PROJECT_DB
|
||||
public:
|
||||
static sqlite3 *sqliteHandle(QSqlDatabase *db);
|
||||
static void exportDb(projectDataBase *db,
|
||||
QWidget *parent = nullptr,
|
||||
const QString &caption = QString(),
|
||||
|
||||
@@ -0,0 +1,134 @@
|
||||
/*
|
||||
Copyright 2006-2026 The QElectroTech Team
|
||||
This file is part of QElectroTech.
|
||||
|
||||
QElectroTech is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
QElectroTech is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include "sqlreadonly.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
|
||||
#include <sqlite3.h>
|
||||
|
||||
namespace QETSql {
|
||||
|
||||
/**
|
||||
@brief QETSql::isSingleReadOnlyStatement
|
||||
Ask SQLite itself whether @p query is exactly one statement, and whether
|
||||
that statement only reads.
|
||||
|
||||
Why SQLite is asked rather than the text inspected: a check on the
|
||||
query's first keyword cannot see what the statement actually does.
|
||||
SQLite has allowed a CTE prefix in front of a data-modifying statement
|
||||
since 3.8.3, so
|
||||
|
||||
@code
|
||||
WITH x AS (SELECT 1) DELETE FROM element
|
||||
@endcode
|
||||
|
||||
begins with WITH, contains no semicolon, and deletes every row.
|
||||
sqlite3_stmt_readonly() reports on the statement SQLite compiled, not
|
||||
on how it was spelled, so the same query is correctly refused here
|
||||
while an ordinary WITH ... SELECT still passes.
|
||||
|
||||
The statement is compiled and immediately finalised; sqlite3_prepare_v2()
|
||||
does not run it, so nothing is executed to reach this verdict.
|
||||
|
||||
This is a read-only test, NOT a statement-type allowlist: SQLite
|
||||
considers ATTACH, BEGIN and several PRAGMAs read-only too, because none
|
||||
of them change the contents of the database. Callers that need to
|
||||
restrict which *kind* of statement is acceptable must say so separately
|
||||
-- projectDataBase::newQuery() keeps isReadOnlySelect() in front of this
|
||||
for exactly that reason.
|
||||
|
||||
@param handle the connection the query would run on. A null handle is
|
||||
refused rather than waved through: without it there is nothing to ask,
|
||||
and guessing from the text is the weakness this exists to replace.
|
||||
@param query the raw SQL text
|
||||
@param error set to a human-readable reason when this returns false
|
||||
@return true if @p query is a single, read-only statement
|
||||
*/
|
||||
bool isSingleReadOnlyStatement(sqlite3 *handle, const QString &query, QString *error)
|
||||
{
|
||||
if (error) {
|
||||
error->clear();
|
||||
}
|
||||
|
||||
if (!handle) {
|
||||
if (error) {
|
||||
*error = QCoreApplication::translate("QETSql",
|
||||
"Impossible de vérifier la requête : "
|
||||
"aucune connexion SQLite disponible.");
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
const QByteArray utf8 = query.toUtf8();
|
||||
sqlite3_stmt *statement = nullptr;
|
||||
const char *tail = nullptr;
|
||||
|
||||
if (sqlite3_prepare_v2(handle, utf8.constData(), utf8.size(),
|
||||
&statement, &tail) != SQLITE_OK)
|
||||
{
|
||||
if (error) {
|
||||
*error = QCoreApplication::translate("QETSql",
|
||||
"Requête SQL invalide : %1")
|
||||
.arg(QString::fromUtf8(sqlite3_errmsg(handle)));
|
||||
}
|
||||
sqlite3_finalize(statement);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Whitespace or a bare comment compiles successfully to no statement
|
||||
// at all, and sqlite3_stmt_readonly() must not be handed that.
|
||||
if (!statement) {
|
||||
if (error) {
|
||||
*error = QCoreApplication::translate("QETSql",
|
||||
"La requête ne contient aucune instruction.");
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
const bool read_only = sqlite3_stmt_readonly(statement) != 0;
|
||||
sqlite3_finalize(statement);
|
||||
|
||||
if (!read_only) {
|
||||
if (error) {
|
||||
*error = QCoreApplication::translate("QETSql",
|
||||
"Seules les requêtes en lecture seule sont autorisées : "
|
||||
"cette requête modifierait la base de données.");
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// tail points just past the first statement, semicolon included.
|
||||
// Anything left once semicolons and spacing are stripped is a second
|
||||
// statement -- caught structurally here, where "SELECT ';'" is a
|
||||
// perfectly ordinary query rather than a suspicious string.
|
||||
if (tail) {
|
||||
QString rest = QString::fromUtf8(tail);
|
||||
rest.remove(QLatin1Char(';'));
|
||||
if (!rest.trimmed().isEmpty()) {
|
||||
if (error) {
|
||||
*error = QCoreApplication::translate("QETSql",
|
||||
"Une seule requête est autorisée.");
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace QETSql
|
||||
@@ -0,0 +1,43 @@
|
||||
/*
|
||||
Copyright 2006-2026 The QElectroTech Team
|
||||
This file is part of QElectroTech.
|
||||
|
||||
QElectroTech is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
QElectroTech is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#ifndef SQLREADONLY_H
|
||||
#define SQLREADONLY_H
|
||||
|
||||
#include <QString>
|
||||
|
||||
struct sqlite3;
|
||||
|
||||
/**
|
||||
Deciding whether a piece of SQL only reads.
|
||||
|
||||
Deliberately its own translation unit, depending on nothing but QString
|
||||
and SQLite: it is the enforcement point for every query QElectroTech
|
||||
runs against a project database, including queries that arrive from
|
||||
outside the application (a .qet file's saved report/table query), so it
|
||||
is worth being able to test it in isolation -- see
|
||||
tests/qttest/tst_sqlreadonly.cpp, which links this file and nothing
|
||||
else of QElectroTech.
|
||||
*/
|
||||
namespace QETSql {
|
||||
|
||||
bool isSingleReadOnlyStatement(sqlite3 *handle,
|
||||
const QString &query,
|
||||
QString *error = nullptr);
|
||||
}
|
||||
|
||||
#endif // SQLREADONLY_H
|
||||
+10
-7
@@ -26,6 +26,7 @@
|
||||
#include "diagramposition.h"
|
||||
#include "factory/elementfactory.h"
|
||||
#include "qetapp.h"
|
||||
#include "qetpalette.h"
|
||||
#include "qetgraphicsitem/ViewItem/qetgraphicstableitem.h"
|
||||
#include "qetgraphicsitem/conductor.h"
|
||||
#include "qetgraphicsitem/conductortextitem.h"
|
||||
@@ -283,10 +284,11 @@ void Diagram::drawBackground(QPainter *p, const QRectF &r) {
|
||||
* if background color is black,
|
||||
* then grid spots shall be white,
|
||||
* else they shall be black in color.
|
||||
* A view that shows the sheet with its lightness inverted
|
||||
* gets softer dots, see QET::Palette::gridDotColor.
|
||||
*/
|
||||
QPen pen;
|
||||
Diagram::background_color == Qt::black? pen.setColor(Qt::white)
|
||||
: pen.setColor(Qt::black);
|
||||
pen.setColor(QET::Palette::gridDotColor(Diagram::background_color, m_inverted_lightness));
|
||||
pen.setCosmetic(true);
|
||||
p->setPen(pen);
|
||||
|
||||
@@ -1707,10 +1709,7 @@ bool Diagram::fromXml(QDomElement &document,
|
||||
//Get the top left corner of the rectangle that contain all added items
|
||||
QRectF items_rect;
|
||||
for (auto item : added_items) {
|
||||
items_rect = items_rect.united(
|
||||
item->mapToScene(
|
||||
item->boundingRect()
|
||||
).boundingRect());
|
||||
items_rect = items_rect.united(item->mapToScene(item->boundingRect()).boundingRect());
|
||||
}
|
||||
|
||||
QPointF point_ = items_rect.topLeft();
|
||||
@@ -1718,8 +1717,12 @@ bool Diagram::fromXml(QDomElement &document,
|
||||
position.y() - point_.y()));
|
||||
|
||||
//Translate all added items
|
||||
for (auto qgi : added_items)
|
||||
for (auto qgi : added_items) {
|
||||
qgi->setPos(qgi->pos() += pos_);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
}
|
||||
|
||||
// Load conductor
|
||||
|
||||
@@ -123,6 +123,7 @@ class Diagram : public QGraphicsScene
|
||||
qreal diagram_qet_version_;
|
||||
|
||||
bool draw_grid_;
|
||||
bool m_inverted_lightness = false;
|
||||
bool use_border_;
|
||||
bool draw_guides_;
|
||||
QList<Diagram::Guide> m_guides_list;
|
||||
@@ -222,6 +223,7 @@ class Diagram : public QGraphicsScene
|
||||
ExportProperties applyProperties(const ExportProperties &);
|
||||
void setDisplayGrid(bool);
|
||||
bool displayGrid();
|
||||
void setInvertedLightness(bool);
|
||||
void setDisplayGuides(bool);
|
||||
bool displayGuides();
|
||||
void updateProjectGuides(const QList<GuideProperties> &guides);
|
||||
@@ -355,6 +357,18 @@ inline void Diagram::setDisplayGrid(bool dg) {
|
||||
draw_grid_ = dg;
|
||||
}
|
||||
|
||||
/**
|
||||
@brief Diagram::setInvertedLightness
|
||||
Tell the diagram whether the view painting it will show the result
|
||||
with its lightness inverted (PaletteGraphicsView on a dark palette).
|
||||
drawBackground draws a softer grid in that case. Printing
|
||||
and export never set this.
|
||||
@param inverted
|
||||
*/
|
||||
inline void Diagram::setInvertedLightness(bool inverted) {
|
||||
m_inverted_lightness = inverted;
|
||||
}
|
||||
|
||||
/**
|
||||
@brief Diagram::displayGrid
|
||||
@return draw_grid_ true if the grid is drawn, false otherwise.
|
||||
|
||||
@@ -77,6 +77,23 @@ void PasteDiagramCommand::redo()
|
||||
{
|
||||
first_redo = false;
|
||||
|
||||
//Resolve a linked master/slave pair pasted together (bugtracker
|
||||
//#607) before anything below renews their uuids: at this exact
|
||||
//moment a pasted element's tmp_uuids_link still holds its
|
||||
//source's original partner uuid, which still equals the
|
||||
//not-yet-renewed uuid of that partner's own pasted copy if it
|
||||
//was carried along in the same batch. Scoped to this batch only
|
||||
//(not a project-wide search), so a pair pasted together links to
|
||||
//each other and not to an original element left elsewhere that
|
||||
//happens to still carry that same soon-to-be-replaced uuid. If
|
||||
//only one half of a linked group was pasted, its link entry
|
||||
//simply finds no match here and is dropped -- same "leave it
|
||||
//unlinked" outcome as always.
|
||||
const QList <Element *> elmts_list = content.m_elements;
|
||||
for (Element *e : elmts_list) {
|
||||
e->initLink(elmts_list);
|
||||
}
|
||||
|
||||
//make new uuid for every pasted conductor, because old uuid are
|
||||
//the uuid of the copied conductor
|
||||
const QList <Conductor *> all_pasted_conductors = content.conductors();
|
||||
@@ -85,7 +102,6 @@ void PasteDiagramCommand::redo()
|
||||
}
|
||||
|
||||
//this is the first paste, we do some actions for the new element
|
||||
const QList <Element *> elmts_list = content.m_elements;
|
||||
for (Element *e : elmts_list)
|
||||
{
|
||||
//make new uuid, because old uuid are the uuid of the copied element
|
||||
|
||||
@@ -151,8 +151,8 @@ bool DiagramContext::operator!=(const DiagramContext &dc) const
|
||||
void DiagramContext::toXml(QDomElement &e, const QString &tag_name) const
|
||||
{
|
||||
foreach (QString key, keys()) {
|
||||
if ((tag_name == "elementInformation") &&
|
||||
(m_content[key].toString().trimmed().isEmpty())) {
|
||||
const QString raw = m_content[key].toString();
|
||||
if ((tag_name == "elementInformation") && raw.trimmed().isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
QDomElement property = e.ownerDocument().createElement(tag_name);
|
||||
@@ -161,7 +161,15 @@ void DiagramContext::toXml(QDomElement &e, const QString &tag_name) const
|
||||
property.removeAttribute("name");
|
||||
property.setAttribute("show", m_content_show[key]);
|
||||
property.setAttribute("name", key);
|
||||
QDomText value = e.ownerDocument().createTextNode(m_content[key].toString().trimmed());
|
||||
// Trim stray leading/trailing whitespace around real content, but
|
||||
// not a value that IS whitespace: unconditionally trimming an
|
||||
// all-whitespace string collapses it to "", which is silently
|
||||
// indistinguishable from a value that was never set. A title-block
|
||||
// custom variable set to a single space -- a workaround for #973,
|
||||
// where an unset variable renders as its own literal placeholder --
|
||||
// would otherwise vanish on the very next save.
|
||||
const QString stored = raw.trimmed().isEmpty() ? raw : raw.trimmed();
|
||||
QDomText value = e.ownerDocument().createTextNode(stored);
|
||||
property.appendChild(value);
|
||||
e.appendChild(property);
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
*/
|
||||
#ifndef DIAGRAM_CONTEXT_H
|
||||
#define DIAGRAM_CONTEXT_H
|
||||
#include "pugixml/src/pugixml.hpp"
|
||||
#include "pugixml.hpp"
|
||||
|
||||
#include <QDomElement>
|
||||
#include <QHash>
|
||||
|
||||
@@ -67,7 +67,19 @@ m_preview_item(nullptr)
|
||||
dummy_diagram->setDisplayGrid(false);
|
||||
dummy_diagram->fromXml(diagram_node, QPointF(0, 0), false, nullptr);
|
||||
|
||||
// Compute bounding rect of TOP-LEVEL items only (matching fromXml's added_items logic)
|
||||
// Child items (DynamicElementTextItem, Terminal) are NOT included - they move with parents
|
||||
QRectF top_level_rect;
|
||||
for (auto *item : dummy_diagram->items()) {
|
||||
if (!item->parentItem()) {
|
||||
top_level_rect = top_level_rect.united(
|
||||
item->mapToScene(item->boundingRect()).boundingRect());
|
||||
}
|
||||
}
|
||||
m_items_top_left = top_level_rect.topLeft();
|
||||
|
||||
QRectF scene_rect = dummy_diagram->itemsBoundingRect();
|
||||
|
||||
if (!scene_rect.isEmpty()) {
|
||||
QPixmap pixmap(scene_rect.toAlignedRect().size());
|
||||
pixmap.fill(Qt::transparent);
|
||||
@@ -80,10 +92,11 @@ m_preview_item(nullptr)
|
||||
}
|
||||
}
|
||||
|
||||
if (m_preview_item) {
|
||||
m_preview_item->setPos(Diagram::snapToGrid(pos));
|
||||
m_preview_item->setOpacity(0.6);
|
||||
m_diagram->addItem(m_preview_item);
|
||||
if (m_preview_item) {
|
||||
QPointF snapped = Diagram::snapToGrid(pos);
|
||||
m_preview_item->setPos(snapped);
|
||||
m_preview_item->setOpacity(0.6);
|
||||
m_diagram->addItem(m_preview_item);
|
||||
m_running = true;
|
||||
}
|
||||
|
||||
@@ -117,6 +130,7 @@ void DiagramEventAddMacro::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
|
||||
{
|
||||
if (m_preview_item) {
|
||||
const auto pos_{Diagram::snapToGrid(event->scenePos())};
|
||||
|
||||
m_preview_item->setPos(pos_);
|
||||
|
||||
if (m_status_bar) {
|
||||
@@ -141,7 +155,8 @@ void DiagramEventAddMacro::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
|
||||
emit finish();
|
||||
}
|
||||
else if (event->button() == Qt::LeftButton) {
|
||||
addMacro(Diagram::snapToGrid(event->scenePos()));
|
||||
QPointF snapped = Diagram::snapToGrid(event->scenePos());
|
||||
addMacro(snapped);
|
||||
}
|
||||
}
|
||||
event->setAccepted(true);
|
||||
@@ -238,10 +253,9 @@ void DiagramEventAddMacro::addMacro(QPointF final_pos)
|
||||
|
||||
if (!diagram_node.isNull()) {
|
||||
QDomElement cloned_node = diagram_node.cloneNode(true).toElement();
|
||||
|
||||
DiagramContent pasted_content;
|
||||
|
||||
m_diagram->fromXml(cloned_node, final_pos, false, &pasted_content);
|
||||
m_diagram->fromXml(cloned_node, final_pos + m_items_top_left, false, &pasted_content);
|
||||
m_diagram->refreshContents();
|
||||
|
||||
// Prevent PasteDiagramCommand from erasing labels (BMK)
|
||||
|
||||
@@ -40,6 +40,7 @@ private:
|
||||
QDomDocument m_macro_doc;
|
||||
QGraphicsPixmapItem *m_preview_item;
|
||||
QPointer<QStatusBar> m_status_bar;
|
||||
QPointF m_items_top_left; // top-left of bounding rect of top-level items in the macro (for correct placement offset)
|
||||
};
|
||||
|
||||
#endif // DIAGRAMEVENTADDMACRO_H
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "../qetapp.h"
|
||||
#include "../qetdiagrameditor.h"
|
||||
#include "../qetgraphicsitem/conductor.h"
|
||||
#include "../qetproject.h"
|
||||
|
||||
#include <QSettings>
|
||||
|
||||
@@ -40,6 +41,7 @@
|
||||
DiagramEventAddPaste::DiagramEventAddPaste(Diagram *diagram, const QPointF &start_pos) :
|
||||
DiagramEventInterface(diagram)
|
||||
{
|
||||
Q_UNUSED(start_pos); // items stay at their original XML position
|
||||
//DiagramEventInterface::init() is called by Diagram::setEventInterface
|
||||
//only when it is replacing an earlier interface, so call it here as
|
||||
//DiagramEventAddMacro does.
|
||||
@@ -51,8 +53,25 @@
|
||||
QDomDocument document_xml;
|
||||
if (!document_xml.setContent(clipboard_text)) return;
|
||||
|
||||
//Batch the database work the same way project loading does
|
||||
//(QETProject::readProjectXml): without this, every addItem()
|
||||
//below emits dataBaseUpdated(), which makes each connected
|
||||
//table model re-run its full SQL query -- ~77 queries for a
|
||||
//typical paste, i.e. the multi-second stall on Ctrl+V.
|
||||
auto *db = m_diagram->project() ? m_diagram->project()->dataBase() : nullptr;
|
||||
if (db) {
|
||||
db->blockSignals(true);
|
||||
db->setUpdateBlocked(true);
|
||||
}
|
||||
|
||||
//Load items at their original XML coordinates.
|
||||
m_diagram->fromXml(document_xml, QPointF(), false, &m_content);
|
||||
|
||||
if (db) {
|
||||
db->blockSignals(false);
|
||||
db->setUpdateBlocked(false);
|
||||
db->updateDB();
|
||||
}
|
||||
if (!m_content.count()) return;
|
||||
|
||||
const QList<QGraphicsItem *> movable = m_content.items(MovableItems);
|
||||
@@ -85,33 +104,23 @@
|
||||
};
|
||||
const QPointF grid_origin = snapGrid(top_left);
|
||||
|
||||
//Move the group to the cursor, rather than the cursor to the
|
||||
//group. Both put the copy under the pointer, but warping the
|
||||
//pointer also drags it back to the original's position, so the
|
||||
//copy appears exactly on top of what was copied until the mouse
|
||||
//is moved -- which is the thing pasting under the cursor was
|
||||
//meant to avoid (issue #913). Taking the pointer away from
|
||||
//where the user put it is also its own surprise.
|
||||
m_group_origin = snapGrid(start_pos);
|
||||
const QPointF offset = m_group_origin - grid_origin;
|
||||
|
||||
//Store each item's position after the move. moveTo() applies a
|
||||
//Store each item's original position. moveTo() applies a
|
||||
//grid-snapped delta from the baseline to these, so items
|
||||
//preserve their layout and move in whole grid steps.
|
||||
for (auto *item : movable) {
|
||||
item->setPos(item->pos() + offset);
|
||||
m_relative_pos.insert(item, item->pos());
|
||||
}
|
||||
m_group_origin = grid_origin;
|
||||
|
||||
//The conductors were laid out against the old terminal
|
||||
//The conductors were laid out against the original terminal
|
||||
//positions, so re-route them before anything is drawn.
|
||||
const QList<Conductor *> conductors = m_content.conductors(DiagramContent::AnyConductor);
|
||||
for (auto *conductor : conductors) {
|
||||
conductor->updatePath();
|
||||
}
|
||||
|
||||
//The baseline is known now, so moveTo() does not have to
|
||||
//capture one from the first mouse movement.
|
||||
//The baseline is the group's grid-snapped origin, so moveTo()
|
||||
//does not have to capture one from the first mouse movement.
|
||||
m_initial_cursor = m_group_origin;
|
||||
m_baseline_captured = true;
|
||||
|
||||
@@ -125,6 +134,14 @@
|
||||
if (const auto qde = QETApp::diagramEditorAncestorOf(view)) {
|
||||
m_status_bar = qde->statusBar();
|
||||
}
|
||||
//Warp the cursor to the group's grid-snapped origin so
|
||||
//the actual cursor position matches m_initial_cursor.
|
||||
//Without this the first mouseMoveEvent computes a large
|
||||
//delta (cursor is still at the Ctrl+V press location)
|
||||
//and the items jump on first touch.
|
||||
const QPoint view_pos = view->mapFromScene(m_initial_cursor);
|
||||
const QPoint global_pos = view->viewport()->mapToGlobal(view_pos);
|
||||
QCursor::setPos(global_pos);
|
||||
}
|
||||
}
|
||||
showHint();
|
||||
|
||||
@@ -29,7 +29,14 @@
|
||||
*/
|
||||
DiagramEventAddText::DiagramEventAddText(Diagram *diagram) :
|
||||
DiagramEventInterface(diagram)
|
||||
{}
|
||||
{
|
||||
//The tool is armed from the moment it is attached: the next left
|
||||
//click places a text. DiagramView::keyPressEvent() asks
|
||||
//Diagram::eventInterfaceIsRunning() -- which is isRunning(), i.e.
|
||||
//m_running -- before letting Escape through to the tool, so without
|
||||
//this the view swallows Escape and the tool cannot be cancelled.
|
||||
m_running = true;
|
||||
}
|
||||
|
||||
/**
|
||||
@brief DiagramEventAddText::~DiagramEventAddText
|
||||
@@ -52,6 +59,8 @@ void DiagramEventAddText::mousePressEvent(QGraphicsSceneMouseEvent *event)
|
||||
event->scenePos()));
|
||||
text->setTextInteractionFlags(Qt::TextEditorInteraction);
|
||||
text->setFocus(Qt::MouseFocusReason);
|
||||
//Placed: the tool is done before it announces it.
|
||||
m_running = false;
|
||||
emit finish();
|
||||
event->setAccepted(true);
|
||||
}
|
||||
|
||||
+91
-3
@@ -39,7 +39,9 @@
|
||||
#include "ElementsCollection/xmlelementcollection.h"
|
||||
#include "NameList/nameslist.h"
|
||||
#include "elementdialog.h"
|
||||
#include <QApplication>
|
||||
#include <QDropEvent>
|
||||
#include <QPainter>
|
||||
#include <QPointer>
|
||||
|
||||
/**
|
||||
@@ -48,7 +50,7 @@
|
||||
@param parent Le QWidget parent de cette vue de schema
|
||||
*/
|
||||
DiagramView::DiagramView(Diagram *diagram, QWidget *parent) :
|
||||
QGraphicsView (parent),
|
||||
PaletteGraphicsView (parent),
|
||||
m_diagram (diagram)
|
||||
{
|
||||
grabGesture(Qt::PinchGesture);
|
||||
@@ -443,6 +445,82 @@ void DiagramView::pasteHere()
|
||||
paste(mapToScene(m_paste_here_pos));
|
||||
}
|
||||
|
||||
/**
|
||||
@brief DiagramView::duplicate
|
||||
Copy the current selection and place the copy at @p stepOffset grid
|
||||
steps from it, landing immediately rather than following the cursor
|
||||
like Ctrl+V does (bugtracker #991). @p stepOffset comes from
|
||||
DuplicateOffsetDialog: (1, 0) is one grid step right, (0, -1) is one
|
||||
grid step up, and so on -- QET's own scene axes, X right and Y down.
|
||||
|
||||
No interactive placement step on purpose: the point of a duplicate
|
||||
shortcut is unattended, repeatable stamping (configure the offset
|
||||
once, then tap Ctrl+D to lay out a row), which following the cursor
|
||||
would interrupt on every press. QET already reselects whatever a
|
||||
paste just added (see PasteDiagramCommand::redo()), so the next
|
||||
Ctrl+D naturally continues from the copy just placed, not the
|
||||
original -- a press-and-hold row falls out of that for free, with no
|
||||
special-casing needed here for "keep going from the last one".
|
||||
|
||||
The offset is applied by hand rather than by asking paste()/
|
||||
Diagram::fromXml() to place the copy at a target position. Both of
|
||||
those feed the position through Diagram::snapToGrid(), which reads
|
||||
QApplication::keyboardModifiers() and rounds to the nearest PIXEL
|
||||
instead of the grid whenever Ctrl is held -- and Ctrl is always held
|
||||
here, this action's own shortcut being Ctrl+D. Measured the hard way
|
||||
before settling on this: routing the offset through paste() first
|
||||
produced copies off-grid on both axes, by an amount that tracked the
|
||||
selection's own bounding-box geometry rather than being a fixed
|
||||
error. fromXml() is instead called with no position at all, which
|
||||
leaves every item at its source coordinates (landing the copy
|
||||
exactly on top of the originals -- (0, 0) is not a position, this is
|
||||
"keep the source coordinates"), and the offset is added directly
|
||||
with setPos(). A plain addition cannot be off by a rounding rule
|
||||
that never runs.
|
||||
|
||||
Conductors are not in the translated set: fromXml() itself does not
|
||||
reposition them either -- they are loaded from XML after elements
|
||||
are already in their final place and take their geometry from their
|
||||
terminals, which have already moved with the elements that own
|
||||
them. Likewise dynamic element texts are not translated separately:
|
||||
they are children of their element and move with it under Qt's
|
||||
normal parent-child transform.
|
||||
*/
|
||||
void DiagramView::duplicate(const QPoint &stepOffset)
|
||||
{
|
||||
if (!isInteractive() || m_diagram->isReadOnly()) return;
|
||||
|
||||
const QList<QGraphicsItem *> selection = m_diagram->selectedItems();
|
||||
if (selection.isEmpty()) return;
|
||||
|
||||
QSettings settings;
|
||||
const int x_grid = settings.value(QStringLiteral("diagrameditor/Xgrid"),
|
||||
Diagram::xGrid).toInt();
|
||||
const int y_grid = settings.value(QStringLiteral("diagrameditor/Ygrid"),
|
||||
Diagram::yGrid).toInt();
|
||||
const QPointF offset(stepOffset.x() * x_grid, stepOffset.y() * y_grid);
|
||||
|
||||
// Mirrors copy(), but does not touch the system clipboard: Ctrl+D
|
||||
// should not clobber whatever the user last copied with Ctrl+C.
|
||||
QDomDocument document = m_diagram->toXml(false, true);
|
||||
|
||||
DiagramContent pasted;
|
||||
// No position argument -- see the function comment above for why
|
||||
// the offset is not passed here.
|
||||
m_diagram->fromXml(document, QPointF(), false, &pasted);
|
||||
if (!pasted.count()) return;
|
||||
|
||||
const int movable = DiagramContent::Elements | DiagramContent::TextFields
|
||||
| DiagramContent::Images | DiagramContent::Shapes
|
||||
| DiagramContent::Tables | DiagramContent::TerminalStrip;
|
||||
for (QGraphicsItem *item : pasted.items(movable))
|
||||
item->setPos(item->pos() + offset);
|
||||
|
||||
m_diagram->clearSelection();
|
||||
m_diagram->undoStack().push(new PasteDiagramCommand(m_diagram, pasted));
|
||||
adjustSceneRect();
|
||||
}
|
||||
|
||||
/**
|
||||
Manage the events press click :
|
||||
* click to add an independent text field
|
||||
@@ -1081,6 +1159,16 @@ bool DiagramView::event(QEvent *e) {
|
||||
return(QGraphicsView::event(e));
|
||||
}
|
||||
|
||||
/**
|
||||
@brief DiagramView::paintingInverted
|
||||
Reimplemented from PaletteGraphicsView: tell the diagram it is being
|
||||
drawn for an inverted display, so it softens its grid.
|
||||
*/
|
||||
void DiagramView::paintingInverted(bool inverted)
|
||||
{
|
||||
m_diagram->setInvertedLightness(inverted);
|
||||
}
|
||||
|
||||
/**
|
||||
@brief DiagramView::paintEvent
|
||||
Reimplemented from QGraphicsView
|
||||
@@ -1088,7 +1176,7 @@ bool DiagramView::event(QEvent *e) {
|
||||
*/
|
||||
void DiagramView::paintEvent(QPaintEvent *event)
|
||||
{
|
||||
QGraphicsView::paintEvent(event);
|
||||
PaletteGraphicsView::paintEvent(event);
|
||||
|
||||
if (m_free_rubberbanding && m_free_rubberband.count() >= 3)
|
||||
{
|
||||
@@ -1389,7 +1477,7 @@ void DiagramView::createTemplateFromSelection()
|
||||
|
||||
collection_node.appendChild(collection_elmt);
|
||||
} else {
|
||||
qDebug() << "Warnung: Konnte XML-Definition für" << old_type << "nicht laden.";
|
||||
qDebug() << "Warning: could not load XML definition for" << old_type;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include "titleblock/templatelocation.h"
|
||||
|
||||
#include <QClipboard>
|
||||
#include <QGraphicsView>
|
||||
#include "palettegraphicsview.h"
|
||||
|
||||
class Conductor;
|
||||
class Diagram;
|
||||
@@ -35,7 +35,7 @@ class QGestureEvent;
|
||||
This class provides a widget to render an electric diagram in an editable,
|
||||
interactive way.
|
||||
*/
|
||||
class DiagramView : public QGraphicsView
|
||||
class DiagramView : public PaletteGraphicsView
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
@@ -84,6 +84,7 @@ class DiagramView : public QGraphicsView
|
||||
///Set for one call only, by the Escape handler, to let focus leave the view.
|
||||
bool m_releasing_focus = false;
|
||||
void paintEvent(QPaintEvent *event) override;
|
||||
void paintingInverted(bool inverted) override;
|
||||
void mousePressEvent(QMouseEvent *) override;
|
||||
void mouseMoveEvent(QMouseEvent *) override;
|
||||
void mouseReleaseEvent(QMouseEvent *) override;
|
||||
@@ -136,6 +137,7 @@ class DiagramView : public QGraphicsView
|
||||
void copy();
|
||||
void paste(const QPointF & = QPointF(), QClipboard::Mode = QClipboard::Clipboard);
|
||||
void pasteHere();
|
||||
void duplicate(const QPoint &stepOffset);
|
||||
void adjustSceneRect();
|
||||
void updateWindowTitle();
|
||||
void resetConductors();
|
||||
|
||||
@@ -25,6 +25,8 @@
|
||||
#include "../../qetapp.h"
|
||||
#include "../../qetmainwindow.h"
|
||||
#include "../../recentfiles.h"
|
||||
#include "../../elementscollectioncache.h"
|
||||
#include "../../factory/elementpicturefactory.h"
|
||||
#include "../graphicspart/customelementpart.h"
|
||||
#include "../elementitemeditor.h"
|
||||
#include "../styleeditor.h"
|
||||
@@ -348,6 +350,24 @@ bool QETElementEditor::toLocation(const ElementsLocation &location)
|
||||
tr("Impossible d'enregistrer l'élément", "message box content"));
|
||||
return(false);
|
||||
}
|
||||
|
||||
//setXml() just wrote the new drawing to disk, but the preview shown
|
||||
//in the elements panel comes from two caches keyed by path+uuid that
|
||||
//nothing here has told about the change: ElementPictureFactory's
|
||||
//in-memory picture cache and ElementsCollectionCache's on-disk
|
||||
//SQLite cache (see ElementsLocation::icon()). locationWasSaved()
|
||||
//(elementscollectionwidget.cpp) re-reads the icon right after this
|
||||
//call returns, but both caches still hand back the pre-edit pixmap,
|
||||
//so the panel keeps showing the stale preview until the whole
|
||||
//collection is reloaded. Drop and rebuild them here.
|
||||
ElementPictureFactory::instance()->dropCache(location);
|
||||
if (ElementsCollectionCache *cache = QETApp::collectionCache()) {
|
||||
if (cache->fetchData(location)) {
|
||||
cache->cacheName(location.toString(), location.uuid());
|
||||
cache->cachePixmap(location.toString(), location.uuid());
|
||||
}
|
||||
}
|
||||
|
||||
return(true);
|
||||
}
|
||||
|
||||
|
||||
@@ -674,6 +674,27 @@ void ElementsPanelWidget::duplicateDiagram()
|
||||
bool erase_labels = settings.value(
|
||||
"diagramcommands/erase-label-on-copy", true).toBool();
|
||||
|
||||
// Resolve a linked pair duplicated together against each other
|
||||
// (bugtracker #607) before the loop below renews their uuids or
|
||||
// clears their pending links: at this exact moment a copy's
|
||||
// tmp_uuids_link still holds its source's original partner
|
||||
// uuid, which still equals the not-yet-renewed uuid of that
|
||||
// partner's own copy if both were duplicated together. Scoped
|
||||
// to this diagram's own copies, not a project-wide search, so
|
||||
// this never links back to the source elements the copies were
|
||||
// made from -- if only one half of a linked pair is here, its
|
||||
// link entry simply finds no match and is dropped, same as
|
||||
// clearPendingLinks() used to do unconditionally for every copy.
|
||||
QList<Element *> new_elements;
|
||||
for (QGraphicsItem *item : new_diagram->items()) {
|
||||
if (Element *elmt = dynamic_cast<Element *>(item)) {
|
||||
new_elements << elmt;
|
||||
}
|
||||
}
|
||||
for (Element *elmt : new_elements) {
|
||||
elmt->initLink(new_elements);
|
||||
}
|
||||
|
||||
for (QGraphicsItem *item : new_diagram->items()) {
|
||||
if (Element *elmt = dynamic_cast<Element *>(item)) {
|
||||
// The XML round-trip kept the source elements' uuids. Give the
|
||||
@@ -695,9 +716,9 @@ void ElementsPanelWidget::duplicateDiagram()
|
||||
new_diagram->restoreText(elmt);
|
||||
}
|
||||
|
||||
// Clear pending links so copies don't link back to
|
||||
// the source elements via stale UUIDs.
|
||||
elmt->clearPendingLinks();
|
||||
// initLink() above already cleared tmp_uuids_link for
|
||||
// every copy, matched or not -- nothing left here that
|
||||
// could link back to a stale source uuid.
|
||||
|
||||
// Clean up copied element data:
|
||||
// 1. Slaves always lose label/formula/comment/location
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
#include "QPropertyUndoCommand/qpropertyundocommand.h"
|
||||
#include "diagram.h"
|
||||
#include "qetapp.h"
|
||||
#include "qetgraphicsitem/dynamicelementtextitem.h"
|
||||
#include "qetgraphicsitem/elementtextitemgroup.h"
|
||||
|
||||
@@ -137,25 +138,14 @@ void ElementTextsMover::endMovement()
|
||||
|
||||
QString ElementTextsMover::undoText() const
|
||||
{
|
||||
QString undo_text;
|
||||
|
||||
if(m_text_count == 1)
|
||||
undo_text.append(QObject::tr("Déplacer un texte d'élément"));
|
||||
else if(m_text_count > 1)
|
||||
undo_text.append(QObject::tr("Déplacer %1 textes d'élément").arg(m_items_hash.size()));
|
||||
|
||||
if(m_group_count >= 1)
|
||||
{
|
||||
if(undo_text.isEmpty())
|
||||
undo_text.append(QObject::tr("Déplacer"));
|
||||
else
|
||||
undo_text.append(QObject::tr(" et"));
|
||||
|
||||
if(m_group_count == 1)
|
||||
undo_text.append(QObject::tr(" un groupe de texte"));
|
||||
else
|
||||
undo_text.append(QObject::tr((" %1 groupes de textes")).arg(m_group_count));
|
||||
}
|
||||
|
||||
return undo_text;
|
||||
QStringList parts;
|
||||
if (m_text_count)
|
||||
parts << QObject::tr("%n texte(s) d'élément", "", m_text_count);
|
||||
if (m_group_count)
|
||||
parts << QObject::tr("%n groupe(s) de textes", "", m_group_count);
|
||||
|
||||
if (parts.isEmpty())
|
||||
return QString(); // should never occur
|
||||
|
||||
return QObject::tr("Déplacer %1").arg(QLocale(QETApp::interfaceLanguage()).createSeparatedList(parts));
|
||||
}
|
||||
|
||||
@@ -32,8 +32,14 @@ class QetGraphicsTableFactory
|
||||
|
||||
static void createAndAddNomenclature(Diagram *diagram);
|
||||
static void createAndAddSummary(Diagram *diagram);
|
||||
private:
|
||||
// Public so a caller that has already built and configured an
|
||||
// AddTableDialog itself (never shown or exec'd -- the two
|
||||
// methods above always exec() one, which the scripting API
|
||||
// cannot use headlessly) can create a table from it directly.
|
||||
// create() only reads settings already on the dialog; nothing
|
||||
// about it depends on the dialog having been shown.
|
||||
static void create(Diagram *diagram, AddTableDialog *dialog);
|
||||
private:
|
||||
static QetGraphicsTableItem *newTable(
|
||||
Diagram *diagram,
|
||||
AddTableDialog *dialog,
|
||||
|
||||
@@ -72,6 +72,15 @@ bool AddTableDialog::adjustTableToFolio() const
|
||||
return ui->m_adjust_table_size_cb->isChecked();
|
||||
}
|
||||
|
||||
/**
|
||||
@brief AddTableDialog::setAdjustTableToFolio
|
||||
@param set
|
||||
*/
|
||||
void AddTableDialog::setAdjustTableToFolio(bool set)
|
||||
{
|
||||
ui->m_adjust_table_size_cb->setChecked(set);
|
||||
}
|
||||
|
||||
/**
|
||||
@brief AddTableDialog::addNewTableToNewDiagram
|
||||
@return
|
||||
@@ -81,6 +90,15 @@ bool AddTableDialog::addNewTableToNewDiagram() const
|
||||
return ui->m_add_table_and_folio->isChecked();
|
||||
}
|
||||
|
||||
/**
|
||||
@brief AddTableDialog::setAddNewTableToNewDiagram
|
||||
@param set
|
||||
*/
|
||||
void AddTableDialog::setAddNewTableToNewDiagram(bool set)
|
||||
{
|
||||
ui->m_add_table_and_folio->setChecked(set);
|
||||
}
|
||||
|
||||
/**
|
||||
@brief AddTableDialog::tableName
|
||||
@return
|
||||
@@ -90,6 +108,18 @@ QString AddTableDialog::tableName() const
|
||||
return ui->m_table_name_le->text();
|
||||
}
|
||||
|
||||
/**
|
||||
@brief AddTableDialog::setTableName
|
||||
Set the name field directly, so a caller that builds this dialog to
|
||||
read from (never shows or execs it -- the scripting API's addTable())
|
||||
does not need a name typed by a user who was never there to type one.
|
||||
@param name
|
||||
*/
|
||||
void AddTableDialog::setTableName(const QString &name)
|
||||
{
|
||||
ui->m_table_name_le->setText(name);
|
||||
}
|
||||
|
||||
/**
|
||||
@brief AddTableDialog::headerMargins
|
||||
@return
|
||||
|
||||
@@ -44,9 +44,12 @@ class AddTableDialog : public QDialog
|
||||
|
||||
void setQueryWidget(QWidget *widget);
|
||||
bool adjustTableToFolio() const;
|
||||
void setAdjustTableToFolio(bool set);
|
||||
bool addNewTableToNewDiagram() const;
|
||||
void setAddNewTableToNewDiagram(bool set);
|
||||
|
||||
QString tableName() const;
|
||||
void setTableName(const QString &name);
|
||||
|
||||
QMargins headerMargins() const;
|
||||
Qt::Alignment headerAlignment() const;
|
||||
|
||||
@@ -0,0 +1,237 @@
|
||||
/*
|
||||
Copyright 2006-2026 The QElectroTech Team
|
||||
This file is part of QElectroTech.
|
||||
|
||||
QElectroTech is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
QElectroTech is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include "palettegraphicsview.h"
|
||||
|
||||
#include "qetpalette.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QEvent>
|
||||
#include <QPaintEvent>
|
||||
#include <QStyleHintReturnMask>
|
||||
#include <QStyleOptionRubberBand>
|
||||
#include <QtMath>
|
||||
|
||||
namespace {
|
||||
/**
|
||||
QGraphicsScene::drawItems() is protected, and QGraphicsView::drawItems()
|
||||
hands the scene the viewport only when the painter is on it. The
|
||||
view paints into an image, and still needs the scene to get the
|
||||
viewport: that is what makes the scene record where it painted
|
||||
each item, which is where the item is erased from when it moves.
|
||||
Naming the member through a derived class is the standard way to
|
||||
a pointer to a protected member; a call through it dispatches to
|
||||
the scene's own override, if any.
|
||||
*/
|
||||
struct SceneAccess : QGraphicsScene
|
||||
{
|
||||
using DrawItems = void (QGraphicsScene::*)(QPainter *, int, QGraphicsItem *[],
|
||||
const QStyleOptionGraphicsItem[], QWidget *);
|
||||
static DrawItems drawItemsPointer() { return &SceneAccess::drawItems; }
|
||||
};
|
||||
}
|
||||
|
||||
PaletteGraphicsView::PaletteGraphicsView(QWidget *parent) :
|
||||
QGraphicsView(parent)
|
||||
{
|
||||
qApp->installEventFilter(this);
|
||||
}
|
||||
|
||||
PaletteGraphicsView::PaletteGraphicsView(QGraphicsScene *scene, QWidget *parent) :
|
||||
QGraphicsView(scene, parent)
|
||||
{
|
||||
qApp->installEventFilter(this);
|
||||
}
|
||||
|
||||
/**
|
||||
@brief PaletteGraphicsView::invertsLightness
|
||||
@return true when the scene is shown with its lightness inverted,
|
||||
i.e. when the application palette is dark. The application palette,
|
||||
not the view's own: a style sheet on an ancestor (the folio tab
|
||||
widget has one) makes QStyleSheetStyle pin the palette of every
|
||||
widget under it to the application palette in force when the sheet
|
||||
was applied, so after a live light/dark switch palette() is stale.
|
||||
*/
|
||||
bool PaletteGraphicsView::invertsLightness() const
|
||||
{
|
||||
return QET::Palette::isDark(QApplication::palette());
|
||||
}
|
||||
|
||||
void PaletteGraphicsView::paintingInverted(bool inverted)
|
||||
{
|
||||
Q_UNUSED(inverted)
|
||||
}
|
||||
|
||||
/**
|
||||
@brief PaletteGraphicsView::eventFilter
|
||||
Repaint the whole viewport when the application palette changes. Qt
|
||||
sends that change to the application object and then repaints only
|
||||
the widgets whose own palette changed with it, which under a style
|
||||
sheet is not the case (see invertsLightness()): the scene would then
|
||||
repaint only what it updates itself, and the viewport around the
|
||||
sheet would keep the colors of the previous palette. The filter sits
|
||||
on the application object, the one receiver Qt always notifies.
|
||||
*/
|
||||
bool PaletteGraphicsView::eventFilter(QObject *watched, QEvent *event)
|
||||
{
|
||||
if (watched == qApp && event->type() == QEvent::ApplicationPaletteChange)
|
||||
viewport()->update();
|
||||
return QGraphicsView::eventFilter(watched, event);
|
||||
}
|
||||
|
||||
/**
|
||||
@brief PaletteGraphicsView::paintEvent
|
||||
Paints as QGraphicsView on a light palette, inverted on a dark one.
|
||||
*/
|
||||
void PaletteGraphicsView::paintEvent(QPaintEvent *event)
|
||||
{
|
||||
if (invertsLightness() && !customBackgroundColor())
|
||||
{
|
||||
paintInverted(event);
|
||||
return;
|
||||
}
|
||||
m_buffer = QImage();
|
||||
QGraphicsView::paintEvent(event);
|
||||
}
|
||||
|
||||
/**
|
||||
@brief PaletteGraphicsView::paintInverted
|
||||
Run QGraphicsView::paintEvent() with the drawing hooks redirected to
|
||||
an off-screen image of the viewport, then invert the lightness of the
|
||||
exposed part of that image between the palette's Base and Text colors
|
||||
and blit it to the viewport. Inverting the finished rendering turns
|
||||
the white sheet dark and the black ink light in one pass, and keeps
|
||||
the hue of colored strokes. The image is in viewport coordinates, so
|
||||
the hooks paint with the view's own transform and the scene records
|
||||
the items' places in the viewport, as it does on a light palette.
|
||||
@param event the paint event, for the exposed area
|
||||
*/
|
||||
void PaletteGraphicsView::paintInverted(QPaintEvent *event)
|
||||
{
|
||||
const QRect exposed = event->rect().intersected(viewport()->rect());
|
||||
if (exposed.isEmpty())
|
||||
return;
|
||||
|
||||
const qreal ratio = viewport()->devicePixelRatioF();
|
||||
const QSize size(qCeil(viewport()->width() * ratio), qCeil(viewport()->height() * ratio));
|
||||
if (m_buffer.size() != size || m_buffer.devicePixelRatio() != ratio)
|
||||
{
|
||||
m_buffer = QImage(size, QImage::Format_RGB32);
|
||||
m_buffer.setDevicePixelRatio(ratio);
|
||||
}
|
||||
|
||||
m_buffer_painter.begin(&m_buffer);
|
||||
// The hooks paint only what the scene draws; what they leave blank is
|
||||
// the white sheet, which the inversion turns into the Base color.
|
||||
m_buffer_painter.fillRect(exposed, Qt::white);
|
||||
m_buffer_painter.setClipRect(exposed);
|
||||
m_buffer_painter.setRenderHints(renderHints());
|
||||
m_buffer_painter.setWorldTransform(viewportTransform());
|
||||
|
||||
m_inverting = true;
|
||||
paintingInverted(true);
|
||||
const OptimizationFlags flags = optimizationFlags();
|
||||
setOptimizationFlag(QGraphicsView::IndirectPainting, true);
|
||||
QGraphicsView::paintEvent(event);
|
||||
setOptimizationFlags(flags);
|
||||
paintingInverted(false);
|
||||
m_inverting = false;
|
||||
|
||||
m_buffer_painter.end();
|
||||
blitInverted(exposed);
|
||||
}
|
||||
|
||||
/**
|
||||
@brief PaletteGraphicsView::drawBackground
|
||||
Into the off-screen image while painting inverted, else as
|
||||
QGraphicsView.
|
||||
*/
|
||||
void PaletteGraphicsView::drawBackground(QPainter *painter, const QRectF &rect)
|
||||
{
|
||||
QGraphicsView::drawBackground(m_inverting ? &m_buffer_painter : painter, rect);
|
||||
}
|
||||
|
||||
/**
|
||||
@brief PaletteGraphicsView::drawItems
|
||||
Into the off-screen image while painting inverted, with the viewport
|
||||
as the scene's widget (see SceneAccess), else as QGraphicsView.
|
||||
*/
|
||||
void PaletteGraphicsView::drawItems(QPainter *painter, int count, QGraphicsItem *items[],
|
||||
const QStyleOptionGraphicsItem options[])
|
||||
{
|
||||
if (m_inverting && scene())
|
||||
(scene()->*SceneAccess::drawItemsPointer())(&m_buffer_painter, count, items, options, viewport());
|
||||
else
|
||||
QGraphicsView::drawItems(painter, count, items, options);
|
||||
}
|
||||
|
||||
/**
|
||||
@brief PaletteGraphicsView::drawForeground
|
||||
Into the off-screen image while painting inverted, else as
|
||||
QGraphicsView.
|
||||
*/
|
||||
void PaletteGraphicsView::drawForeground(QPainter *painter, const QRectF &rect)
|
||||
{
|
||||
QGraphicsView::drawForeground(m_inverting ? &m_buffer_painter : painter, rect);
|
||||
}
|
||||
|
||||
/**
|
||||
@brief PaletteGraphicsView::blitInverted
|
||||
Invert the lightness of \a area of the off-screen image and draw it on
|
||||
the viewport, then the selection rubber band on top: the one
|
||||
QGraphicsView::paintEvent() drew went under the blit.
|
||||
@param area the part of the viewport to blit, in viewport coordinates
|
||||
*/
|
||||
void PaletteGraphicsView::blitInverted(const QRect &area)
|
||||
{
|
||||
const qreal ratio = m_buffer.devicePixelRatio();
|
||||
QImage part = m_buffer.copy(QRectF(area.topLeft() * ratio, area.size() * ratio).toAlignedRect());
|
||||
part.setDevicePixelRatio(ratio);
|
||||
// The application palette, for the reason given in invertsLightness().
|
||||
const QPalette application_palette = QApplication::palette();
|
||||
QET::Palette::invertLightness(part, application_palette.color(QPalette::Base),
|
||||
application_palette.color(QPalette::Text));
|
||||
|
||||
QPainter painter(viewport());
|
||||
painter.drawImage(area.topLeft(), part);
|
||||
drawRubberBand(painter);
|
||||
}
|
||||
|
||||
/**
|
||||
@brief PaletteGraphicsView::drawRubberBand
|
||||
Draw the selection rubber band the way QGraphicsView::paintEvent does,
|
||||
after the inversion, in the palette colors.
|
||||
@param painter a painter on the viewport
|
||||
*/
|
||||
void PaletteGraphicsView::drawRubberBand(QPainter &painter)
|
||||
{
|
||||
const QRect band = rubberBandRect();
|
||||
if (band.isNull())
|
||||
return;
|
||||
|
||||
QStyleOptionRubberBand option;
|
||||
option.initFrom(viewport());
|
||||
option.rect = band;
|
||||
option.shape = QRubberBand::Rectangle;
|
||||
|
||||
QStyleHintReturnMask mask;
|
||||
if (viewport()->style()->styleHint(QStyle::SH_RubberBand_Mask, &option,
|
||||
viewport(), &mask))
|
||||
painter.setClipRegion(mask.region, Qt::IntersectClip);
|
||||
viewport()->style()->drawControl(QStyle::CE_RubberBand, &option,
|
||||
&painter, viewport());
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
/*
|
||||
Copyright 2006-2026 The QElectroTech Team
|
||||
This file is part of QElectroTech.
|
||||
|
||||
QElectroTech is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
QElectroTech is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#ifndef PALETTE_GRAPHICS_VIEW_H
|
||||
#define PALETTE_GRAPHICS_VIEW_H
|
||||
|
||||
#include <QGraphicsView>
|
||||
#include <QImage>
|
||||
#include <QPainter>
|
||||
|
||||
/**
|
||||
A QGraphicsView that shows its scene with inverted lightness while the
|
||||
application palette is dark: white becomes the palette's Base color,
|
||||
black its Text color, and colored strokes keep their hue. The scene
|
||||
itself is left as drawn, so printing and exporting it still give black
|
||||
on white. On a light palette the view paints exactly as QGraphicsView
|
||||
does.
|
||||
|
||||
On a dark palette the view still runs QGraphicsView::paintEvent(), with
|
||||
the IndirectPainting flag set for the duration of that call, so that
|
||||
the background, the items and the foreground come through the
|
||||
drawBackground(), drawItems() and drawForeground() hooks. (That flag
|
||||
selects Qt's older item-painting algorithm, which first builds a list
|
||||
of the exposed items and their style options; it is set only while
|
||||
the view paints inverted.) The hooks
|
||||
paint into an off-screen image the size of the viewport, in viewport
|
||||
coordinates; paintEvent() then inverts the lightness of the exposed
|
||||
part of that image and blits it. Going through the real paint event,
|
||||
and handing the scene the viewport when the items are drawn, keeps the
|
||||
view on QGraphicsView's default update path, which erases a moved item
|
||||
where it was last painted, children included, even a child whose
|
||||
geometry is set while its parent is painted (a terminal's help lines).
|
||||
The alternative, rendering with QGraphicsView::render(), needed a
|
||||
receiver on QGraphicsScene::changed() to keep the scene's updates
|
||||
flowing, and that receiver puts the scene on its Qt 4.4 compatibility
|
||||
path, which erases only the moved item's own old rectangle: a moved
|
||||
element then left its terminals' help lines, which span the whole
|
||||
sheet, behind at every step (#954).
|
||||
|
||||
The CacheBackground cache mode is not supported on the inverted path.
|
||||
*/
|
||||
class PaletteGraphicsView : public QGraphicsView
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit PaletteGraphicsView(QWidget *parent = nullptr);
|
||||
explicit PaletteGraphicsView(QGraphicsScene *scene, QWidget *parent = nullptr);
|
||||
|
||||
bool invertsLightness() const;
|
||||
|
||||
static void setCustomBackgroundColor(bool custom) { s_custom_bg = custom; }
|
||||
static bool customBackgroundColor() { return s_custom_bg; }
|
||||
|
||||
protected:
|
||||
bool eventFilter(QObject *watched, QEvent *event) override;
|
||||
void paintEvent(QPaintEvent *event) override;
|
||||
void drawBackground(QPainter *painter, const QRectF &rect) override;
|
||||
void drawItems(QPainter *painter, int count, QGraphicsItem *items[],
|
||||
const QStyleOptionGraphicsItem options[]) override;
|
||||
void drawForeground(QPainter *painter, const QRectF &rect) override;
|
||||
/**
|
||||
Called with true right before the scene is painted for an
|
||||
inverted display and with false right after, so a scene can
|
||||
adapt what it draws (a softer grid, for instance). Does
|
||||
nothing by default.
|
||||
*/
|
||||
virtual void paintingInverted(bool inverted);
|
||||
|
||||
private:
|
||||
void paintInverted(QPaintEvent *event);
|
||||
void blitInverted(const QRect &area);
|
||||
void drawRubberBand(QPainter &painter);
|
||||
|
||||
/// The off-screen image the hooks paint into while m_inverting:
|
||||
/// the viewport's size, in its coordinates. Kept between paints,
|
||||
/// dropped when the view paints on a light palette again.
|
||||
QImage m_buffer;
|
||||
QPainter m_buffer_painter;
|
||||
/// True while paintEvent() paints for an inverted display.
|
||||
bool m_inverting = false;
|
||||
static inline bool s_custom_bg = false;
|
||||
};
|
||||
|
||||
#endif
|
||||
+79
-50
@@ -16,9 +16,11 @@
|
||||
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include "qet.h"
|
||||
#include "qetapp.h"
|
||||
#include "qeticons.h"
|
||||
#include "shortcutmanager.h"
|
||||
|
||||
#include <cmath>
|
||||
#include <limits>
|
||||
#include <QBuffer>
|
||||
#include <QColorDialog>
|
||||
@@ -243,10 +245,33 @@ bool QET::attributeIsAReal(
|
||||
bool ok;
|
||||
qreal tmp = e.attribute(nom_attribut).toDouble(&ok);
|
||||
if (!ok) return(false);
|
||||
// QString::toDouble() sets ok=true for "nan"/"inf"/"-inf" -- these
|
||||
// parse successfully but are not usable coordinates. A non-finite
|
||||
// element/terminal position reaches Conductor::shape() during load
|
||||
// and hangs there at 100% CPU inside QPainterPathStroker::createStroke(),
|
||||
// confirmed with gdb: not a blocked wait, genuine unbounded computation.
|
||||
if (!std::isfinite(tmp)) return(false);
|
||||
if (reel != nullptr) *reel = tmp;
|
||||
return(true);
|
||||
}
|
||||
|
||||
/**
|
||||
@brief QET::infoFlagIsTrue
|
||||
@see the header comment for why this exists rather than a bare
|
||||
== "true" comparison.
|
||||
@param value the raw elementInformations string to test
|
||||
@return true if @p value, trimmed and case-folded, is one of the
|
||||
truthy spellings this codebase already accepts elsewhere
|
||||
*/
|
||||
bool QET::infoFlagIsTrue(const QString &value)
|
||||
{
|
||||
const QString v = value.trimmed().toLower();
|
||||
return v == QLatin1String("true")
|
||||
|| v == QLatin1String("1")
|
||||
|| v == QLatin1String("yes")
|
||||
|| v == QLatin1String("on");
|
||||
}
|
||||
|
||||
/**
|
||||
@brief QET::ElementsAndConductorsSentence
|
||||
Permet de composer rapidement la proposition "x elements et y conducteurs"
|
||||
@@ -271,84 +296,88 @@ QString QET::ElementsAndConductorsSentence(
|
||||
int tables_count,
|
||||
int terminal_strip_count)
|
||||
{
|
||||
QString text;
|
||||
QStringList parts;
|
||||
if (elements_count) {
|
||||
text += QObject::tr(
|
||||
"%n élément(s)",
|
||||
"part of a sentence listing the content of a diagram",
|
||||
elements_count
|
||||
parts.append(
|
||||
QObject::tr(
|
||||
"%n élément(s)",
|
||||
"Sentence fragment used in an automatically generated list of different objects, e.g. objects moved at the same time, which will be combined into a sentence.",
|
||||
elements_count
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
if (conductors_count) {
|
||||
if (!text.isEmpty()) text += ", ";
|
||||
text += QObject::tr(
|
||||
"%n conducteur(s)",
|
||||
"part of a sentence listing the content of a diagram",
|
||||
conductors_count
|
||||
parts.append(
|
||||
QObject::tr(
|
||||
"%n conducteur(s)",
|
||||
"Sentence fragment used in an automatically generated list of different objects, e.g. objects moved at the same time, which will be combined into a sentence.",
|
||||
conductors_count
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
if (texts_count) {
|
||||
if (!text.isEmpty()) text += ", ";
|
||||
text += QObject::tr(
|
||||
"%n champ(s) de texte",
|
||||
"part of a sentence listing the content of a diagram",
|
||||
texts_count
|
||||
parts.append(
|
||||
QObject::tr(
|
||||
"%n champ(s) de texte",
|
||||
"Sentence fragment used in an automatically generated list of different objects, e.g. objects moved at the same time, which will be combined into a sentence.",
|
||||
texts_count
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
if (images_count) {
|
||||
if (!text.isEmpty()) text += ", ";
|
||||
// Qt's %n only selects a grammatical singular/plural form (the
|
||||
// "(s)" convention used by every other count here) -- it never
|
||||
// spells the number out as a word, so getting "une image"
|
||||
// instead of the literal "1 image" for the single-item case
|
||||
// means handling that count outside %n entirely, with its own
|
||||
// fixed string.
|
||||
text += images_count == 1
|
||||
? QObject::tr("une image", "part of a sentence listing the content of a diagram")
|
||||
: QObject::tr(
|
||||
"%n images",
|
||||
"part of a sentence listing the content of a diagram",
|
||||
images_count
|
||||
);
|
||||
parts.append(
|
||||
QObject::tr(
|
||||
"%n image(s)",
|
||||
"Sentence fragment used in an automatically generated list of different objects, e.g. objects moved at the same time, which will be combined into a sentence.",
|
||||
images_count
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
if (shapes_count) {
|
||||
if (!text.isEmpty()) text += ", ";
|
||||
text += QObject::tr(
|
||||
"%n forme(s)",
|
||||
"part of a sentence listing the content of a diagram",
|
||||
shapes_count
|
||||
parts.append(
|
||||
QObject::tr(
|
||||
"%n forme(s)",
|
||||
"Sentence fragment used in an automatically generated list of different objects, e.g. objects moved at the same time, which will be combined into a sentence.",
|
||||
shapes_count
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
if (element_text_count) {
|
||||
if (!text.isEmpty()) text += ", ";
|
||||
text += QObject::tr(
|
||||
"%n texte(s) d'élément",
|
||||
"part of a sentence listing the content of a diagram",
|
||||
element_text_count);
|
||||
parts.append(
|
||||
QObject::tr(
|
||||
"%n texte(s) d'élément",
|
||||
"Sentence fragment used in an automatically generated list of different objects, e.g. objects moved at the same time, which will be combined into a sentence.",
|
||||
element_text_count
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
if (tables_count) {
|
||||
if (!text.isEmpty()) text += ", ";
|
||||
text += QObject::tr(
|
||||
"%n tableau(s)",
|
||||
"part of a sentence listing the content of diagram",
|
||||
tables_count);
|
||||
parts.append(
|
||||
QObject::tr(
|
||||
"%n tableau(s)",
|
||||
"Sentence fragment used in an automatically generated list of different objects, e.g. objects moved at the same time, which will be combined into a sentence.",
|
||||
tables_count
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
if (terminal_strip_count) {
|
||||
if (!text.isEmpty()) text += ", ";
|
||||
text += QObject::tr(
|
||||
"%n plan de bornes",
|
||||
"part of a sentence listing the content of a diagram",
|
||||
terminal_strip_count);
|
||||
parts.append(
|
||||
QObject::tr(
|
||||
"%n plan(s) de bornes",
|
||||
"Sentence fragment used in an automatically generated list of different objects, e.g. objects moved at the same time, which will be combined into a sentence.",
|
||||
terminal_strip_count
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
return(text);
|
||||
return QLocale(QETApp::interfaceLanguage()).createSeparatedList(parts);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -161,6 +161,22 @@ namespace QET {
|
||||
bool orthogonalProjection(const QPointF &, const QLineF &, QPointF * = nullptr);
|
||||
bool attributeIsAnInteger(const QDomElement &, const QString& , int * = nullptr);
|
||||
bool attributeIsAReal(const QDomElement &, const QString& , qreal * = nullptr);
|
||||
/**
|
||||
Whether an elementInformations flag (auto_num_locked,
|
||||
potential_isolating, exclude_from_bom, ...) counts as "on".
|
||||
Case-insensitive and tolerant of surrounding whitespace, and
|
||||
accepts the same set of truthy spellings ("true", "1", "yes",
|
||||
"on") that element_nomenclature_view's SQL predicate for
|
||||
exclude_from_bom already does -- see
|
||||
projectDataBase::createElementNomenclatureView(). These flags
|
||||
are only ever written by this app's own checkboxes as literal
|
||||
"true"/"false" today, but a bare == "true" comparison silently
|
||||
treats anything else -- "True", "TRUE", a trailing space from
|
||||
a hand-edited file, a value some other tool wrote -- as off,
|
||||
with no error and no visible difference from the checkbox
|
||||
being genuinely unticked (discussion #785).
|
||||
*/
|
||||
bool infoFlagIsTrue(const QString &value);
|
||||
QString ElementsAndConductorsSentence(int elements=0,
|
||||
int conductors=0,
|
||||
int indi_texts=0,
|
||||
|
||||
+90
-1
@@ -235,6 +235,8 @@ QString QETApp::loadedQtTranslationFile()
|
||||
*/
|
||||
void QETApp::setLanguage(const QString &desired_language) {
|
||||
QString languages_path = languagesPath();
|
||||
|
||||
m_interface_language = desired_language;
|
||||
|
||||
// load Qt library translations
|
||||
QString qt_l10n_path = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
|
||||
@@ -1808,6 +1810,85 @@ void QETApp::useSystemPalette(bool use) {
|
||||
file.close();
|
||||
}
|
||||
}
|
||||
// Widgets with their own style sheet keep the palette they were
|
||||
// polished with; after a live light/dark switch they would stay in
|
||||
// the old colors (see QET::Palette::refreshStyleSheets).
|
||||
QET::Palette::refreshStyleSheets();
|
||||
}
|
||||
|
||||
/**
|
||||
@brief QETApp::useCustomPalette
|
||||
Apply a user-chosen color as the application-wide palette.
|
||||
Builds a full QPalette from \a color, keeping the system palette
|
||||
as a fallback for roles we don't touch.
|
||||
@param color the user-chosen base color
|
||||
*/
|
||||
void QETApp::useCustomPalette(const QColor &color) {
|
||||
if (!color.isValid())
|
||||
return;
|
||||
|
||||
// Derive readable text colors from the chosen color.
|
||||
const bool dark = color.lightness() < 128;
|
||||
const QColor text = dark ? QColor(220, 220, 220) : QColor(30, 30, 30);
|
||||
const QColor disabled_text = dark ? QColor(175, 175, 175) : QColor(128, 128, 128);
|
||||
|
||||
// Slightly lighter/darker for button and window shading.
|
||||
QColor button = color;
|
||||
button = QColor::fromHslF(color.hslHueF(),
|
||||
color.hslSaturationF(),
|
||||
dark ? qMin(color.lightnessF() + 0.08, 1.0)
|
||||
: qMax(color.lightnessF() - 0.08, 0.0));
|
||||
QColor light = QColor::fromHslF(color.hslHueF(),
|
||||
color.hslSaturationF(),
|
||||
dark ? qMin(color.lightnessF() + 0.15, 1.0)
|
||||
: qMax(color.lightnessF() - 0.15, 0.0));
|
||||
QColor mid = QColor::fromHslF(color.hslHueF(),
|
||||
color.hslSaturationF(),
|
||||
dark ? qMin(color.lightnessF() + 0.04, 1.0)
|
||||
: qMax(color.lightnessF() - 0.04, 0.0));
|
||||
QColor dark_c = QColor::fromHslF(color.hslHueF(),
|
||||
color.hslSaturationF(),
|
||||
dark ? qMin(color.lightnessF() - 0.04, 1.0)
|
||||
: qMax(color.lightnessF() - 0.12, 0.0));
|
||||
QColor shadow = QColor::fromHslF(color.hslHueF(),
|
||||
color.hslSaturationF(),
|
||||
dark ? qMin(color.lightnessF() - 0.10, 1.0)
|
||||
: qMax(color.lightnessF() - 0.20, 0.0));
|
||||
|
||||
QPalette p;
|
||||
// Active and Inactive get the same colors; only Disabled differs.
|
||||
for (auto group : {QPalette::Active, QPalette::Inactive}) {
|
||||
p.setColor(group, QPalette::Window, color);
|
||||
p.setColor(group, QPalette::WindowText, text);
|
||||
p.setColor(group, QPalette::Base, color);
|
||||
p.setColor(group, QPalette::AlternateBase, button);
|
||||
p.setColor(group, QPalette::Text, text);
|
||||
p.setColor(group, QPalette::Button, button);
|
||||
p.setColor(group, QPalette::ButtonText, text);
|
||||
p.setColor(group, QPalette::BrightText, dark ? QColor(255,90,90) : Qt::white);
|
||||
p.setColor(group, QPalette::Highlight, QColor(30, 96, 176));
|
||||
p.setColor(group, QPalette::HighlightedText, Qt::white);
|
||||
p.setColor(group, QPalette::ToolTipBase, button);
|
||||
p.setColor(group, QPalette::ToolTipText, text);
|
||||
p.setColor(group, QPalette::Light, light);
|
||||
p.setColor(group, QPalette::Midlight, mid);
|
||||
p.setColor(group, QPalette::Mid, mid);
|
||||
p.setColor(group, QPalette::Dark, dark_c);
|
||||
p.setColor(group, QPalette::Shadow, shadow);
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
|
||||
p.setColor(group, QPalette::Accent, QColor(30, 96, 176));
|
||||
#endif
|
||||
}
|
||||
p.setColor(QPalette::Disabled, QPalette::WindowText, disabled_text);
|
||||
p.setColor(QPalette::Disabled, QPalette::Text, disabled_text);
|
||||
p.setColor(QPalette::Disabled, QPalette::ButtonText, disabled_text);
|
||||
|
||||
qApp->setPalette(p);
|
||||
qApp->setStyleSheet(QString());
|
||||
|
||||
// Switch icon theme to match light/dark.
|
||||
applyIconTheme(p);
|
||||
QET::Palette::refreshStyleSheets();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2398,7 +2479,13 @@ void QETApp::initStyle()
|
||||
|
||||
//Apply or not the system style
|
||||
QSettings settings;
|
||||
useSystemPalette(settings.value("usesystemcolors", true).toBool());
|
||||
if (settings.value("usesystemcolors", true).toBool()) {
|
||||
useSystemPalette(true);
|
||||
} else if (settings.contains("customapplicationcolor")) {
|
||||
useCustomPalette(QColor(settings.value("customapplicationcolor").toString()));
|
||||
} else {
|
||||
useSystemPalette(false);
|
||||
}
|
||||
|
||||
#if defined(Q_OS_MACOS) && QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
|
||||
// Setting an application palette stops Qt from following the OS
|
||||
@@ -3039,3 +3126,5 @@ int QETApp::projectId(const QETProject *project) {
|
||||
}
|
||||
return(-1);
|
||||
}
|
||||
|
||||
QString QETApp::m_interface_language;
|
||||
|
||||
@@ -68,6 +68,7 @@ class QETApp : public QObject
|
||||
public:
|
||||
static QETApp *instance();
|
||||
void setLanguage(const QString &);
|
||||
static QString interfaceLanguage() { return m_interface_language; }
|
||||
static QString langFromSetting ();
|
||||
void switchLayout(Qt::LayoutDirection);
|
||||
static void printHelp();
|
||||
@@ -246,6 +247,8 @@ class QETApp : public QObject
|
||||
static QString m_user_company_tbt_dir;
|
||||
static QString m_user_custom_tbt_dir;
|
||||
static QString m_user_macros_dir;
|
||||
|
||||
static QString m_interface_language;
|
||||
|
||||
public slots:
|
||||
void systray(QSystemTrayIcon::ActivationReason);
|
||||
@@ -263,6 +266,7 @@ class QETApp : public QObject
|
||||
void setMainWindowVisible(QMainWindow *, bool);
|
||||
void invertMainWindowVisibility(QWidget *);
|
||||
void useSystemPalette(bool);
|
||||
void useCustomPalette(const QColor &color);
|
||||
void quitQET();
|
||||
void checkRemainingWindows();
|
||||
void openFiles(const QETArguments &);
|
||||
|
||||
@@ -51,11 +51,14 @@
|
||||
#include "shortcutmanager.h"
|
||||
#include "ui/bomexportdialog.h"
|
||||
#include "ui/conductorcolortoolbutton.h"
|
||||
#include "ui/diagrambgcolorbutton.h"
|
||||
#include "ui/duplicateoffsetdialog.h"
|
||||
#include "ui/jumptoelementdialog.h"
|
||||
#include "ui/diagrampropertieseditordockwidget.h"
|
||||
#include "ui/backupdialog.h"
|
||||
#include "ui/dialogwaiting.h"
|
||||
#include "undocommand/addelementtextcommand.h"
|
||||
#include "utils/qetsettings.h"
|
||||
#include "utils/qetutils.h"
|
||||
#include "undocommand/rotateselectioncommand.h"
|
||||
#include "undocommand/rotatetextscommand.h"
|
||||
@@ -373,6 +376,46 @@ void QETDiagramEditor::setUpActions()
|
||||
new DiagramEventAddPaste(dv->diagram(), start_pos));
|
||||
});
|
||||
|
||||
//Duplicate: copy the selection and place it at a configured,
|
||||
//grid-step offset immediately -- no interactive follow-the-
|
||||
//cursor step, unlike Ctrl+V above. That is deliberate (#991):
|
||||
//the point of a duplicate shortcut is repeatable, unattended
|
||||
//stamping (configure the offset once, then tap Ctrl+D to lay
|
||||
//out a row), which an interactive placement would interrupt on
|
||||
//every press.
|
||||
m_duplicate = new QAction(QET::Icons::EditCopy, tr("Dupli&quer"), this);
|
||||
ShortcutManager::instance().registerAction(m_duplicate, "diagrameditor.duplicate", tr("Éditeur de schémas"), Qt::CTRL | Qt::Key_D);
|
||||
m_duplicate->setStatusTip(tr("Copie la sélection, décalée de l'espacement configuré", "status bar tip"));
|
||||
connect(m_duplicate, &QAction::triggered, [this]() {
|
||||
auto *dv = currentDiagramView();
|
||||
if (!dv || !dv->diagram()) return;
|
||||
|
||||
//Ask the first time only -- every later press reuses whatever
|
||||
//was confirmed then, so the shortcut can be tapped repeatedly
|
||||
//without an interruption each time. m_configure_duplicate
|
||||
//below is the deliberate way back into this dialog.
|
||||
if (!DuplicateOffsetDialog::hasSavedStepOffset()) {
|
||||
DuplicateOffsetDialog dialog(this);
|
||||
if (dialog.exec() != QDialog::Accepted) return;
|
||||
DuplicateOffsetDialog::saveStepOffset(dialog.stepOffset());
|
||||
}
|
||||
dv->duplicate(DuplicateOffsetDialog::savedStepOffset());
|
||||
});
|
||||
|
||||
//Reopens the dialog above on demand, to change the spacing or
|
||||
//direction a later Ctrl+D should use. Enabled unconditionally
|
||||
//(see slot_updateComplexActions()): it only ever writes a
|
||||
//setting, so it does not need a diagram open or anything
|
||||
//selected the way m_duplicate itself does.
|
||||
m_configure_duplicate = new QAction(tr("Configurer la duplication..."), this);
|
||||
m_configure_duplicate->setStatusTip(tr("Choisir l'espacement et la direction utilisés par Dupliquer", "status bar tip"));
|
||||
connect(m_configure_duplicate, &QAction::triggered, [this]() {
|
||||
DuplicateOffsetDialog dialog(this);
|
||||
if (dialog.exec() == QDialog::Accepted) {
|
||||
DuplicateOffsetDialog::saveStepOffset(dialog.stepOffset());
|
||||
}
|
||||
});
|
||||
|
||||
//Reset conductor path
|
||||
m_conductor_reset = new QAction(QET::Icons::ConductorSettings, tr("Réinitialiser les conducteurs"), this);
|
||||
ShortcutManager::instance().registerAction(m_conductor_reset, "diagrameditor.conductor_reset", tr("Éditeur de schémas"), Qt::CTRL | Qt::Key_K);
|
||||
@@ -413,15 +456,8 @@ void QETDiagramEditor::setUpActions()
|
||||
pv->project()->setAutoBreakConductor(abc);
|
||||
});
|
||||
|
||||
//Switch background color
|
||||
m_grey_background = new QAction (QET::Icons::DiagramBg, tr("Couleur de fond blanc/gris","Tool tip of white/grey background button"), this);
|
||||
m_grey_background -> setStatusTip (tr("Affiche la couleur de fond du folio en blanc ou en gris", "Status tip of white/grey background button"));
|
||||
m_grey_background -> setCheckable (true);
|
||||
connect (m_grey_background, &QAction::triggered, [this](bool checked) {
|
||||
Diagram::background_color = checked ? Qt::darkGray : Qt::white;
|
||||
if (this->currentDiagramView() && this->currentDiagramView()->diagram())
|
||||
this->currentDiagramView()->diagram()->update();
|
||||
});
|
||||
//Diagram background color picker
|
||||
m_background_color_button = new DiagramBgColorToolButton(this, this);
|
||||
|
||||
//Draw or not the background grid
|
||||
m_draw_grid = new QAction ( QET::Icons::Grid, tr("Afficher la grille"), this);
|
||||
@@ -900,6 +936,7 @@ void QETDiagramEditor::setUpToolBar()
|
||||
main_tool_bar -> addAction(m_cut);
|
||||
main_tool_bar -> addAction(m_copy);
|
||||
main_tool_bar -> addAction(m_paste);
|
||||
main_tool_bar -> addAction(m_duplicate);
|
||||
main_tool_bar -> addSeparator();
|
||||
main_tool_bar -> addAction(m_delete_selection);
|
||||
main_tool_bar -> addAction(m_rotate_selection);
|
||||
@@ -912,7 +949,7 @@ void QETDiagramEditor::setUpToolBar()
|
||||
view_tool_bar -> addSeparator();
|
||||
view_tool_bar -> addAction(m_draw_grid);
|
||||
view_tool_bar -> addAction(m_draw_guides);
|
||||
view_tool_bar -> addAction (m_grey_background);
|
||||
view_tool_bar -> addWidget(m_background_color_button);
|
||||
view_tool_bar -> addSeparator();
|
||||
view_tool_bar -> addActions(m_zoom_action_toolBar);
|
||||
|
||||
@@ -991,6 +1028,8 @@ void QETDiagramEditor::setUpMenu()
|
||||
menu_edition -> addAction(m_cut);
|
||||
menu_edition -> addAction(m_copy);
|
||||
menu_edition -> addAction(m_paste);
|
||||
menu_edition -> addAction(m_duplicate);
|
||||
menu_edition -> addAction(m_configure_duplicate);
|
||||
menu_edition -> addSeparator();
|
||||
//The same actions the "Ajouter" toolbar holds. They were toolbar-only,
|
||||
//which left them unreachable for anyone working without a mouse: a
|
||||
@@ -1063,7 +1102,7 @@ void QETDiagramEditor::setUpMenu()
|
||||
menu_affichage -> addSeparator();
|
||||
menu_affichage -> addAction(m_draw_grid);
|
||||
menu_affichage -> addAction(m_draw_guides);
|
||||
menu_affichage -> addAction(m_grey_background);
|
||||
menu_affichage -> addMenu(m_background_color_button->menu());
|
||||
menu_affichage -> addSeparator();
|
||||
menu_affichage -> addActions(m_zoom_actions_group.actions());
|
||||
|
||||
@@ -1880,7 +1919,7 @@ void QETDiagramEditor::slot_updateActions()
|
||||
m_select_actions_group. setEnabled(opened_diagram);
|
||||
m_add_item_actions_group. setEnabled(editable_project);
|
||||
m_row_column_actions_group. setEnabled(editable_project);
|
||||
m_grey_background-> setEnabled(opened_diagram);
|
||||
m_background_color_button-> setEnabled(opened_diagram);
|
||||
m_draw_grid-> setEnabled(opened_diagram);
|
||||
m_draw_guides-> setEnabled(opened_diagram);
|
||||
|
||||
@@ -1953,6 +1992,7 @@ void QETDiagramEditor::slot_updateComplexActions()
|
||||
<< m_find_element
|
||||
<< m_cut
|
||||
<< m_copy
|
||||
<< m_duplicate
|
||||
<< m_delete_selection
|
||||
<< m_rotate_selection
|
||||
<< m_rotate_group_selection
|
||||
@@ -1982,6 +2022,7 @@ void QETDiagramEditor::slot_updateComplexActions()
|
||||
bool deletable_items = dc.hasDeletableItems();
|
||||
m_cut -> setEnabled(!ro && copiable_items);
|
||||
m_copy -> setEnabled(copiable_items);
|
||||
m_duplicate -> setEnabled(!ro && copiable_items);
|
||||
m_delete_selection -> setEnabled(!ro && deletable_items);
|
||||
m_rotate_selection -> setEnabled(!ro && diagram_->canRotateSelection());
|
||||
m_rotate_group_selection -> setEnabled(!ro && diagram_->canRotateSelection());
|
||||
@@ -3128,6 +3169,29 @@ void QETDiagramEditor::slot_runScript() {
|
||||
QETProject *project = currentProject();
|
||||
if (!project) return;
|
||||
|
||||
// Scripting is off until somebody says otherwise, so the first use has
|
||||
// to ask. Asking here rather than greying the action out keeps the
|
||||
// feature discoverable: a disabled menu entry tells a user that
|
||||
// something exists and nothing about how to have it.
|
||||
if (!QetSettings::scriptingEnabled()) {
|
||||
const QMessageBox::StandardButton answer = QET::QetMessageBox::question(
|
||||
this,
|
||||
tr("Exécuter un script"),
|
||||
tr("Les scripts sont désactivés.\n\n"
|
||||
"Un script s'exécute avec vos droits : il peut lire et "
|
||||
"modifier le projet ouvert et écrire des fichiers. "
|
||||
"N'exécutez que des scripts dont vous connaissez "
|
||||
"l'origine.\n\n"
|
||||
"Activer les scripts ? Ce réglage est modifiable dans "
|
||||
"Configurer QElectroTech > Général > Projets."),
|
||||
QMessageBox::Yes | QMessageBox::Cancel,
|
||||
QMessageBox::Cancel);
|
||||
if (answer != QMessageBox::Yes) {
|
||||
return;
|
||||
}
|
||||
QetSettings::setScriptingEnabled(true);
|
||||
}
|
||||
|
||||
const QString script_path = QFileDialog::getOpenFileName(
|
||||
this,
|
||||
tr("Exécuter un script"),
|
||||
|
||||
@@ -34,6 +34,7 @@ class QETResult;
|
||||
class ProjectView;
|
||||
class ConductorColorToolButton;
|
||||
class CustomElement;
|
||||
class DiagramBgColorToolButton;
|
||||
class Diagram;
|
||||
class DiagramView;
|
||||
class Element;
|
||||
@@ -198,9 +199,10 @@ class QETDiagramEditor : public QETMainWindow
|
||||
*undo, ///< Cancel the latest action
|
||||
*redo, ///< Redo the latest cancelled operation
|
||||
*m_paste, ///< Paste clipboard content on the current diagram
|
||||
*m_duplicate, ///< Copy selection, offset by the configured step (#991)
|
||||
*m_configure_duplicate, ///< Reopen the duplicate offset/direction dialog (#991)
|
||||
*m_auto_conductor, ///< Enable/Disable the use of auto conductor
|
||||
*m_auto_break_conductor, ///< Enable/Disable the use of auto break conductor
|
||||
*m_grey_background, ///< Switch the background color in white or grey
|
||||
*m_draw_grid, ///< Switch the background grid display or not
|
||||
*m_draw_guides = nullptr, ///< Switch the custom guides display or not
|
||||
*m_project_edit_properties, ///< Edit the properties of the current project.
|
||||
@@ -240,6 +242,8 @@ class QETDiagramEditor : public QETMainWindow
|
||||
|
||||
///< One-click conductor colour, in the "Schéma" toolbar
|
||||
ConductorColorToolButton *m_conductor_color_button = nullptr;
|
||||
///< Diagram background color picker, in the "Affichage" toolbar
|
||||
DiagramBgColorToolButton *m_background_color_button = nullptr;
|
||||
|
||||
QList <QAction *> m_zoom_action_toolBar; ///Only zoom action must displayed in the toolbar
|
||||
|
||||
|
||||
@@ -379,6 +379,21 @@ void ProjectDBModel::fillValue()
|
||||
|
||||
while (query_.next())
|
||||
{
|
||||
//This query text comes out of the project file, so its result is
|
||||
//not bounded by anything the project actually contains: a
|
||||
//recursive CTE produces rows for as long as anyone reads them.
|
||||
//Without this, opening such a file hangs QElectroTech at 100% CPU
|
||||
//while m_record grows until memory runs out. @see
|
||||
//projectDataBase::MaxResultRows.
|
||||
if (m_record.size() >= projectDataBase::MaxResultRows) {
|
||||
qWarning().noquote()
|
||||
<< "ProjectDBModel: query stopped after"
|
||||
<< projectDataBase::MaxResultRows
|
||||
<< "rows, which is far more than a folio table can show."
|
||||
<< "The table is incomplete. Query:" << m_query;
|
||||
break;
|
||||
}
|
||||
|
||||
QStringList record_;
|
||||
auto i=0;
|
||||
while (query_.value(i).isValid())
|
||||
|
||||
@@ -1310,6 +1310,34 @@ const QList<ConductorSegment *> Conductor::segmentsList() const
|
||||
return(segments_vector);
|
||||
}
|
||||
|
||||
/**
|
||||
@brief Conductor::moveSegment
|
||||
Move one segment of this conductor by (dx, dy), the same primitive
|
||||
handlerMouseMoveEvent()/handlerMouseReleaseEvent() apply on a manual
|
||||
drag -- moveX()/moveY() each silently no-op on the wrong axis or a
|
||||
static (terminal-anchored) segment, so both are always called and
|
||||
whichever applies takes effect. Unlike a drag this commits the whole
|
||||
move as a single undo step.
|
||||
@param index a segmentsList() index
|
||||
@param dx @param dy the movement, in the diagram's own coordinates
|
||||
@return false if index is out of range
|
||||
*/
|
||||
bool Conductor::moveSegment(int index, qreal dx, qreal dy)
|
||||
{
|
||||
const QList<ConductorSegment *> segs = segmentsList();
|
||||
if (index < 0 || index >= segs.count()) return false;
|
||||
|
||||
before_mov_text_pos_ = m_text_item->pos();
|
||||
ConductorSegment *seg = segs.at(index);
|
||||
seg->moveX(dx);
|
||||
seg->moveY(dy);
|
||||
modified_path = true;
|
||||
segmentsToPath();
|
||||
calculateTextItemPosition();
|
||||
saveProfile();
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
@brief Conductor::length
|
||||
@return the length of this conductor
|
||||
|
||||
@@ -114,6 +114,7 @@ class Conductor : public QGraphicsObject
|
||||
public:
|
||||
QVector <QPointF> handlerPoints() const;
|
||||
const QList<ConductorSegment *> segmentsList() const;
|
||||
bool moveSegment(int index, qreal dx, qreal dy);
|
||||
|
||||
void setPropertyToPotential(
|
||||
const ConductorProperties &property,
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
#include "../qetgraphicsitem/terminal.h"
|
||||
#include "../qetinformation.h"
|
||||
#include "../utils/qetutils.h"
|
||||
#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h"
|
||||
#include "crossrefitem.h"
|
||||
#include "element.h"
|
||||
#include "elementtextitemgroup.h"
|
||||
@@ -32,6 +33,7 @@
|
||||
#include <QDomElement>
|
||||
#include <QtCore/qnumeric.h>
|
||||
#include <QGraphicsSceneMouseEvent>
|
||||
#include <QAbstractTextDocumentLayout>
|
||||
|
||||
/**
|
||||
@brief DynamicElementTextItem::DynamicElementTextItem
|
||||
@@ -67,7 +69,9 @@ DynamicElementTextItem::DynamicElementTextItem(Element *parent_element) :
|
||||
}
|
||||
|
||||
DynamicElementTextItem::~DynamicElementTextItem()
|
||||
{}
|
||||
{
|
||||
removeResizeHandles();
|
||||
}
|
||||
|
||||
/**
|
||||
@brief DynamicElementTextItem::textFromMetaEnum
|
||||
@@ -629,7 +633,13 @@ void DynamicElementTextItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
|
||||
int diffx = qRound(current_parent_pos.x() - button_down_parent_pos.x());
|
||||
int diffy = qRound(current_parent_pos.y() - button_down_parent_pos.y());
|
||||
QPointF new_pos = m_initial_position + QPointF(diffx, diffy);
|
||||
setPos(new_pos);
|
||||
//Snap to the grid, Ctrl to place freely -- the same line
|
||||
//ElementTextItemGroup::mouseMoveEvent() and
|
||||
//ElementTextsMover::continueMovement() already use, and
|
||||
//DiagramTextItem::mouseMoveEvent() for independent texts.
|
||||
//Without it this was the only text move in the editor that
|
||||
//ignored the grid.
|
||||
event->modifiers() == Qt::ControlModifier ? setPos(new_pos) : setPos(Diagram::snapToGrid(new_pos));
|
||||
|
||||
if(diagram())
|
||||
diagram()->elementTextsMover().continueMovement(event);
|
||||
@@ -722,7 +732,7 @@ void DynamicElementTextItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
|
||||
void DynamicElementTextItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
|
||||
{
|
||||
DiagramTextItem::paint(painter, option, widget);
|
||||
|
||||
|
||||
if (m_frame)
|
||||
{
|
||||
painter->save();
|
||||
@@ -812,15 +822,41 @@ QVariant DynamicElementTextItem::itemChange(QGraphicsItem::GraphicsItemChange ch
|
||||
updateXref();
|
||||
updateXref();
|
||||
}
|
||||
|
||||
else if (change == QGraphicsItem::ItemSelectedHasChanged)
|
||||
{
|
||||
refreshResizeHandlesVisibility();
|
||||
}
|
||||
else if (change == QGraphicsItem::ItemSceneHasChanged && !scene())
|
||||
{
|
||||
removeResizeHandles();
|
||||
}
|
||||
|
||||
return QGraphicsObject::itemChange(change, value);
|
||||
}
|
||||
|
||||
bool DynamicElementTextItem::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
|
||||
{
|
||||
if (watched == m_left_resize_handle || watched == m_right_resize_handle)
|
||||
{
|
||||
auto *handle = static_cast<QetGraphicsHandlerItem *>(watched);
|
||||
if (event->type() == QEvent::GraphicsSceneMousePress) {
|
||||
handlerMousePressEvent(handle, static_cast<QGraphicsSceneMouseEvent *>(event));
|
||||
return true;
|
||||
}
|
||||
else if (event->type() == QEvent::GraphicsSceneMouseMove) {
|
||||
handlerMouseMoveEvent(handle, static_cast<QGraphicsSceneMouseEvent *>(event));
|
||||
return true;
|
||||
}
|
||||
else if (event->type() == QEvent::GraphicsSceneMouseRelease) {
|
||||
handlerMouseReleaseEvent(handle, static_cast<QGraphicsSceneMouseEvent *>(event));
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
if(watched != m_slave_Xref_item)
|
||||
return false;
|
||||
|
||||
|
||||
if(event->type() == QEvent::GraphicsSceneHoverEnter) {
|
||||
m_slave_Xref_item->setDefaultTextColor(Qt::blue);
|
||||
return true;
|
||||
@@ -833,10 +869,173 @@ bool DynamicElementTextItem::sceneEventFilter(QGraphicsItem *watched, QEvent *ev
|
||||
zoomToLinkedElement();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
@brief DynamicElementTextItem::refreshResizeHandlesVisibility
|
||||
Show the resize handles when this text is selected directly, OR when its
|
||||
parent element is -- which is what an ordinary click without Shift
|
||||
selects (DynamicElementTextItem::mousePressEvent() forwards a plain
|
||||
click to the parent, so dragging a symbol by its label moves the whole
|
||||
symbol; a pre-existing, unrelated behaviour, left untouched here).
|
||||
Without this, the handles were reachable only via Shift+click or a
|
||||
right-click's context menu, neither of which a user reaches for to
|
||||
resize a text field (qelectrotech#591, reported by @arummler).
|
||||
|
||||
Called from itemChange() -- both this item's own ItemSelectedHasChanged,
|
||||
below, and Element::itemChange() on the parent's, which calls this on
|
||||
every one of its texts. Not from paint(): see the comment there for why
|
||||
that crashed.
|
||||
*/
|
||||
void DynamicElementTextItem::refreshResizeHandlesVisibility()
|
||||
{
|
||||
const bool handles_wanted = isSelected() || (m_parent_element && m_parent_element->isSelected());
|
||||
if (handles_wanted && !m_left_resize_handle)
|
||||
addResizeHandles();
|
||||
else if (!handles_wanted && m_left_resize_handle)
|
||||
removeResizeHandles();
|
||||
}
|
||||
|
||||
/**
|
||||
@brief DynamicElementTextItem::addResizeHandles
|
||||
Create and show the two width-resize handles (left/right edge of
|
||||
frameRect()), reusing QetGraphicsHandlerItem the same way QetShapeItem
|
||||
does for its own resize handles.
|
||||
*/
|
||||
void DynamicElementTextItem::addResizeHandles()
|
||||
{
|
||||
if (m_left_resize_handle || !scene())
|
||||
return;
|
||||
|
||||
qreal size = QETUtils::graphicsHandlerSize(this);
|
||||
m_left_resize_handle = new QetGraphicsHandlerItem(size);
|
||||
m_right_resize_handle = new QetGraphicsHandlerItem(size);
|
||||
|
||||
for (QetGraphicsHandlerItem *handle : {m_left_resize_handle, m_right_resize_handle})
|
||||
{
|
||||
//Children of this text, not free scene items: Qt then carries
|
||||
//them along when the parent element moves, rotates or is
|
||||
//zoomed, and repaints their old and new area in the same
|
||||
//update as this text. Moving free items from paint() instead
|
||||
//left green fragments behind (qelectrotech#1002).
|
||||
handle->setParentItem(this);
|
||||
handle->setColor(Qt::darkGreen);
|
||||
handle->installSceneEventFilter(this);
|
||||
}
|
||||
m_resize_handles_con = connect(document()->documentLayout(), &QAbstractTextDocumentLayout::documentSizeChanged,
|
||||
this, &DynamicElementTextItem::updateResizeHandlesPos);
|
||||
|
||||
updateResizeHandlesPos();
|
||||
}
|
||||
|
||||
/**
|
||||
@brief DynamicElementTextItem::removeResizeHandles
|
||||
*/
|
||||
void DynamicElementTextItem::removeResizeHandles()
|
||||
{
|
||||
disconnect(m_resize_handles_con);
|
||||
delete m_left_resize_handle;
|
||||
delete m_right_resize_handle;
|
||||
m_left_resize_handle = nullptr;
|
||||
m_right_resize_handle = nullptr;
|
||||
}
|
||||
|
||||
/**
|
||||
@brief DynamicElementTextItem::updateResizeHandlesPos
|
||||
Keep the two resize handles at the vertical middle of boundingRect()'s
|
||||
left and right edges, in scene coordinates -- called on every paint() so
|
||||
it stays correct across every kind of change that can move this item or
|
||||
change its size (position, rotation, font, text, textWidth...) without
|
||||
needing a dedicated hook for each one.
|
||||
|
||||
Deliberately boundingRect(), not frameRect(): frameRect() is a tight box
|
||||
around the text's own natural (idealWidth()) size, re-centred inside
|
||||
boundingRect() -- it does not grow with textWidth(). Once a text has
|
||||
been widened, that leaves a growing gap between the tight frame and the
|
||||
dashed selection outline QGraphicsView draws at boundingRect(), which is
|
||||
the box a user actually sees and expects a resize handle to sit on
|
||||
(qelectrotech#591, reported by @arummler: "the drag elements should be
|
||||
on the border of the box"). boundingRect() reflects the full
|
||||
textWidth() (it is QGraphicsTextItem's own, driven by the document's
|
||||
laid-out size), so the handles now track the box that is visibly
|
||||
resized rather than the text glyphs inside it.
|
||||
*/
|
||||
void DynamicElementTextItem::updateResizeHandlesPos()
|
||||
{
|
||||
if (!m_left_resize_handle || !m_right_resize_handle)
|
||||
return;
|
||||
|
||||
QRectF br = boundingRect();
|
||||
m_left_resize_handle->setPos(br.left(), br.center().y());
|
||||
m_right_resize_handle->setPos(br.right(), br.center().y());
|
||||
}
|
||||
|
||||
/**
|
||||
@brief DynamicElementTextItem::handlerMousePressEvent
|
||||
@param handle
|
||||
@param event
|
||||
*/
|
||||
void DynamicElementTextItem::handlerMousePressEvent(QetGraphicsHandlerItem *handle, QGraphicsSceneMouseEvent *event)
|
||||
{
|
||||
Q_UNUSED(handle)
|
||||
|
||||
//The actual property value, kept as-is (possibly -1, meaning "auto")
|
||||
//so a later undo restores the exact original state rather than a
|
||||
//synthesized fixed width.
|
||||
m_resize_original_width = textWidth();
|
||||
//A concrete baseline for the live drag's delta math, which can't
|
||||
//start from -1.
|
||||
m_resize_baseline_width = (m_resize_original_width < 0) ? frameRect().width() : m_resize_original_width;
|
||||
m_resize_start_local_x = mapFromScene(event->scenePos()).x();
|
||||
}
|
||||
|
||||
/**
|
||||
@brief DynamicElementTextItem::handlerMouseMoveEvent
|
||||
Live-resize the text while dragging, exactly like the element editor's
|
||||
resize handles live-update geometry during a drag (undo is only pushed
|
||||
on release). The drag delta is resolved in this item's own local
|
||||
coordinates (not scene coordinates) so a rotated text box still resizes
|
||||
along its own baseline.
|
||||
@param handle
|
||||
@param event
|
||||
*/
|
||||
void DynamicElementTextItem::handlerMouseMoveEvent(QetGraphicsHandlerItem *handle, QGraphicsSceneMouseEvent *event)
|
||||
{
|
||||
qreal local_x = mapFromScene(event->scenePos()).x();
|
||||
qreal delta = local_x - m_resize_start_local_x;
|
||||
if (handle == m_left_resize_handle)
|
||||
delta = -delta;
|
||||
|
||||
qreal new_width = qMax(m_resize_baseline_width + delta, qreal(10));
|
||||
setTextWidth(new_width);
|
||||
updateResizeHandlesPos();
|
||||
}
|
||||
|
||||
/**
|
||||
@brief DynamicElementTextItem::handlerMouseReleaseEvent
|
||||
Push the same QPropertyUndoCommand the properties-panel width spinbox
|
||||
already pushes (sources/ui/dynamicelementtextmodel.cpp) -- the value is
|
||||
already applied live from the drag, so this only makes it undoable.
|
||||
@param handle
|
||||
@param event
|
||||
*/
|
||||
void DynamicElementTextItem::handlerMouseReleaseEvent(QetGraphicsHandlerItem *handle, QGraphicsSceneMouseEvent *event)
|
||||
{
|
||||
Q_UNUSED(handle)
|
||||
Q_UNUSED(event)
|
||||
|
||||
qreal new_width = textWidth();
|
||||
if (!qFuzzyCompare(m_resize_original_width, new_width) && m_parent_element && m_parent_element->diagram())
|
||||
{
|
||||
auto *undo = new QPropertyUndoCommand(this, "textWidth", QVariant(m_resize_original_width), QVariant(new_width));
|
||||
undo->setAnimated(true, false);
|
||||
undo->setText(tr("Redimensionner un texte d'élément"));
|
||||
m_parent_element->diagram()->undoStack().push(undo);
|
||||
}
|
||||
}
|
||||
|
||||
void DynamicElementTextItem::elementInfoChanged()
|
||||
{
|
||||
DiagramContext dc;
|
||||
@@ -1129,9 +1328,15 @@ void DynamicElementTextItem::updateLabel()
|
||||
|
||||
|
||||
if(m_text_from == ElementInfo && element) {
|
||||
setPlainText(element->actualLabel());
|
||||
QString new_label = element->actualLabel();
|
||||
if (toPlainText() != new_label) {
|
||||
setPlainText(new_label);
|
||||
}
|
||||
}
|
||||
else if (m_text_from == CompositeText) {
|
||||
// Use actualLabel() to ensure %{label} reflects the current
|
||||
// resolved label (e.g. after a folio/page-number change)
|
||||
dc.addValue(QStringLiteral("label"), element->actualLabel());
|
||||
setPlainText(autonum::AssignVariables::replaceVariable(m_composite_text, dc));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,6 +29,7 @@ class Element;
|
||||
class Conductor;
|
||||
class ElementTextItemGroup;
|
||||
class CrossRefItem;
|
||||
class QetGraphicsHandlerItem;
|
||||
|
||||
/**
|
||||
@brief The DynamicElementTextItem class
|
||||
@@ -120,6 +121,12 @@ class DynamicElementTextItem : public DiagramTextItem
|
||||
void setRotationPointCenter(bool set);
|
||||
bool rotationPointCenter() const;
|
||||
|
||||
//Called by Element::itemChange() when the PARENT's selection
|
||||
//changes, so the parent can keep each of its texts' resize
|
||||
//handles in sync with its own selection state. Public for that;
|
||||
//see the .cpp for why it exists.
|
||||
void refreshResizeHandlesVisibility();
|
||||
|
||||
protected:
|
||||
void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
|
||||
void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
|
||||
@@ -151,6 +158,12 @@ class DynamicElementTextItem : public DiagramTextItem
|
||||
void zoomToLinkedElement();
|
||||
void parentElementRotationChanged();
|
||||
void thisRotationChanged();
|
||||
void addResizeHandles();
|
||||
void removeResizeHandles();
|
||||
void updateResizeHandlesPos();
|
||||
void handlerMousePressEvent(QetGraphicsHandlerItem *handle, QGraphicsSceneMouseEvent *event);
|
||||
void handlerMouseMoveEvent(QetGraphicsHandlerItem *handle, QGraphicsSceneMouseEvent *event);
|
||||
void handlerMouseReleaseEvent(QetGraphicsHandlerItem *handle, QGraphicsSceneMouseEvent *event);
|
||||
|
||||
private:
|
||||
QPointer <Element>
|
||||
@@ -182,6 +195,12 @@ class DynamicElementTextItem : public DiagramTextItem
|
||||
bool m_rotation_point_center = false;
|
||||
qreal m_visual_rotation_ref = 0;
|
||||
bool m_move_parent = true;
|
||||
QetGraphicsHandlerItem *m_left_resize_handle = nullptr;
|
||||
QetGraphicsHandlerItem *m_right_resize_handle = nullptr;
|
||||
qreal m_resize_original_width = -1;
|
||||
qreal m_resize_baseline_width = -1;
|
||||
qreal m_resize_start_local_x = 0;
|
||||
QMetaObject::Connection m_resize_handles_con;
|
||||
};
|
||||
|
||||
#endif // DYNAMICELEMENTTEXTITEM_H
|
||||
|
||||
@@ -39,7 +39,9 @@
|
||||
#include "elementtextitemgroup.h"
|
||||
#include "iostream"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QCollator>
|
||||
#include <QScreen>
|
||||
|
||||
static const QString plcTerminalKeys[] = {
|
||||
QETInformation::ELMT_PLC_T1,
|
||||
@@ -209,6 +211,21 @@ void Element::editProperty()
|
||||
//with the "text" tab of ElementPropertiesWidget,
|
||||
//the ui freeze, until user press escape key
|
||||
dialog.setWindowModality(Qt::WindowModal);
|
||||
|
||||
// A PLC master carries a 6-column IO table: without an explicit
|
||||
// size the dialog falls back to its (cramped) sizeHint, so open it
|
||||
// at three times its natural width instead. The height stays at
|
||||
// the natural one, and the width never exceeds the screen.
|
||||
const ElementData data = elementData();
|
||||
if (data.m_type == ElementData::Master
|
||||
&& data.m_master_type == ElementData::PLC) {
|
||||
const QSize natural = dialog.sizeHint();
|
||||
int width = natural.width() * 3;
|
||||
if (QScreen *screen = QApplication::primaryScreen())
|
||||
width = qMin(width, screen->availableGeometry().width());
|
||||
dialog.resize(width, natural.height());
|
||||
}
|
||||
|
||||
dialog.exec();
|
||||
}
|
||||
}
|
||||
@@ -1369,6 +1386,33 @@ void Element::initLink(QETProject *prj)
|
||||
tmp_uuids_link.clear();
|
||||
}
|
||||
|
||||
/**
|
||||
@brief Element::initLink
|
||||
Overload resolving tmp_uuids_link against @p candidates instead of a
|
||||
project-wide ElementProvider search -- see the header comment for
|
||||
why the search has to be scoped this way right after a paste or
|
||||
folio-duplication XML round-trip, before uuids are renewed.
|
||||
@param candidates the elements to search for a link partner in
|
||||
*/
|
||||
void Element::initLink(const QList<Element *> &candidates)
|
||||
{
|
||||
// if nothing to link return now
|
||||
if (tmp_uuids_link.isEmpty()) return;
|
||||
|
||||
for (int i = 0; i < tmp_uuids_link.size(); ++i) {
|
||||
for (Element *elmt : candidates) {
|
||||
if (elmt->uuid() == tmp_uuids_link[i].uuid) {
|
||||
elmt->linkToElement(this);
|
||||
if (tmp_uuids_link[i].group_index >= 0) {
|
||||
m_group_index_map[elmt] = tmp_uuids_link[i].group_index;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
tmp_uuids_link.clear();
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Element::linkTypeToString
|
||||
* \deprecated use instead ElementData::typeToString
|
||||
@@ -1664,6 +1708,31 @@ void Element::hoverLeaveEvent(QGraphicsSceneHoverEvent *e)
|
||||
update();
|
||||
}
|
||||
|
||||
/**
|
||||
@brief Element::itemChange
|
||||
On ItemSelectedHasChanged, tell each of this element's own dynamic texts
|
||||
to re-check whether its resize handles should be showing --
|
||||
DynamicElementTextItem::refreshResizeHandlesVisibility() shows them when
|
||||
either the text itself or its parent (this) is selected. An ordinary
|
||||
click with no Shift selects the parent, not the text
|
||||
(DynamicElementTextItem::mousePressEvent() forwards it), so without this
|
||||
a plain click on a symbol never showed the resize handles this PR adds
|
||||
to its texts (qelectrotech#591, reported by @arummler) -- only
|
||||
Shift+click or a right-click's context menu did, since those are the
|
||||
paths that leave the text itself selected.
|
||||
*/
|
||||
QVariant Element::itemChange(GraphicsItemChange change, const QVariant &value)
|
||||
{
|
||||
if (change == QGraphicsItem::ItemSelectedHasChanged)
|
||||
{
|
||||
const QList<DynamicElementTextItem *> texts = dynamicTextItems();
|
||||
for (DynamicElementTextItem *deti : texts) {
|
||||
deti->refreshResizeHandlesVisibility();
|
||||
}
|
||||
}
|
||||
return QetGraphicsItem::itemChange(change, value);
|
||||
}
|
||||
|
||||
/**
|
||||
@brief Element::setUpFormula
|
||||
Set up the formula used to create the label of this element
|
||||
|
||||
@@ -207,6 +207,25 @@ class Element : public QetGraphicsItem
|
||||
virtual void unlinkAllElements() {}
|
||||
virtual void unlinkElement(Element *) {}
|
||||
virtual void initLink(QETProject *);
|
||||
/**
|
||||
Resolve tmp_uuids_link against a caller-supplied candidate
|
||||
list instead of a project-wide search (bugtracker #607).
|
||||
Used right after an XML round-trip (paste, folio
|
||||
duplication) and before the pasted/duplicated elements'
|
||||
uuids are renewed: at that moment a copy's tmp_uuids_link
|
||||
still holds its source's original partner uuid, which
|
||||
still matches the not-yet-renewed uuid of that partner's
|
||||
own copy if it was carried along in the same batch.
|
||||
Resolving only within @p candidates -- not the whole
|
||||
project -- is what stops a linked pair pasted together
|
||||
from matching an original element left elsewhere that
|
||||
happens to still carry that same soon-to-be-replaced
|
||||
uuid. If only one half of a linked group is in
|
||||
@p candidates, its entry finds no match and is dropped,
|
||||
same as initLink(QETProject *) leaving an unresolvable
|
||||
link unlinked.
|
||||
*/
|
||||
void initLink(const QList<Element *> &candidates);
|
||||
QList<Element *> linkedElements ();
|
||||
|
||||
int groupIndexForElement(Element *elmt) const;
|
||||
@@ -255,6 +274,7 @@ class Element : public QetGraphicsItem
|
||||
QGraphicsSceneMouseEvent *event) override;
|
||||
void hoverEnterEvent(QGraphicsSceneHoverEvent *) override;
|
||||
void hoverLeaveEvent(QGraphicsSceneHoverEvent *) override;
|
||||
QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
|
||||
|
||||
protected:
|
||||
//ATTRIBUTES related to linked element
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user