mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-01-09 23:39:58 +01:00
Compare commits
38 Commits
a9632600b6
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5e41ec415e | ||
|
|
fa6e3d31eb | ||
|
|
47d391c26b | ||
|
|
033c92257e | ||
|
|
2b18d93d43 | ||
|
|
36463542ab | ||
|
|
152b20899c | ||
|
|
765f0087fc | ||
|
|
42037f7f9a | ||
|
|
7df37ab9b5 | ||
|
|
f47143dd6f | ||
|
|
0d5373d640 | ||
|
|
506565489f | ||
|
|
8a2e0a585c | ||
|
|
40744ba41a | ||
|
|
94269afc76 | ||
|
|
73e673ef8a | ||
|
|
fb41b50e37 | ||
|
|
2ebc3a6054 | ||
|
|
bb74f822d7 | ||
|
|
70dbc9cbad | ||
|
|
bd5f4f4f96 | ||
|
|
179a9db0cb | ||
|
|
34ee4ebf49 | ||
|
|
da661b0d4f | ||
|
|
1625692ddd | ||
|
|
4fc2ce8d9e | ||
|
|
0663aa55e8 | ||
|
|
67185f173e | ||
|
|
2c5e5c6b78 | ||
|
|
689b101c55 | ||
|
|
3aa760e3cd | ||
|
|
82f3167d40 | ||
|
|
5b2c861d02 | ||
|
|
ca8f4650a3 | ||
|
|
e7f55ee843 | ||
|
|
cdc747548d | ||
|
|
6038db5c40 |
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
||||
*.qch filter=lfs diff=lfs merge=lfs -text
|
||||
68
.github/workflows/auto-doxygen.yml
vendored
Normal file
68
.github/workflows/auto-doxygen.yml
vendored
Normal file
@@ -0,0 +1,68 @@
|
||||
name: Auto-build doxygen docs
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
|
||||
|
||||
|
||||
jobs:
|
||||
doxygen:
|
||||
permissions:
|
||||
contents: write
|
||||
runs-on: ubuntu-24.04
|
||||
if: github.ref == 'refs/heads/master'
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: 'recursive'
|
||||
show-progress: ''
|
||||
- name: Setup and run doxygen
|
||||
run: 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
|
||||
4
.gitignore
vendored
4
.gitignore
vendored
@@ -3,5 +3,7 @@
|
||||
# Qt build output
|
||||
*.user
|
||||
# doxygen Doxyfile output
|
||||
doc/
|
||||
doc/*
|
||||
!doc/QElectroTech.qch
|
||||
QElectroTech.tag
|
||||
!doc/doc-utils
|
||||
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -8,3 +8,6 @@
|
||||
path = elements
|
||||
url = https://github.com/qelectrotech/qelectrotech-elements.git
|
||||
|
||||
[submodule "doxygen-awesome-css"]
|
||||
path = doxygen-awesome-css
|
||||
url = https://github.com/jothepro/doxygen-awesome-css.git
|
||||
|
||||
125
ChangeLog
125
ChangeLog
@@ -1,3 +1,128 @@
|
||||
# QElectroTech - CHANGELOG
|
||||
|
||||
## Version 0.100
|
||||
|
||||
_Compiled from provided commit logs and contributor notes._
|
||||
|
||||
## Overview
|
||||
|
||||
This release (v0.100) collects a large set of new features, UI and editor improvements, element and symbol updates, build and packaging fixes, dependency upgrades, translations, and a broad set of bug fixes and stability improvements. It is intended as a stable, feature-rich stepping stone toward the next major workflows for symbol editing, terminal/strip handling and export improvements.
|
||||
|
||||
## Highlights / Key Features
|
||||
|
||||
- **Terminal Strip / Terminal Strip Editor**
|
||||
- New TerminalStripItem type and related editor workflow added.
|
||||
- Support for drawing and displaying terminal bridges and links in the editor.
|
||||
- Full editor support (layout preview, save/load into .qet files) and undo support for terminal strip operations.
|
||||
- **New Example Projects**
|
||||
- Several new example projects included, notably photovoltaic (PV) examples to help users getting started with PV designs.
|
||||
- **Improved Export / Print Handling**
|
||||
- Export limits adjusted and better handling of QPainter/printing boundaries to avoid export artefacts and out-of-range errors.
|
||||
- Export dialog updated to allow larger pixel limits where appropriate.
|
||||
- **Element & Symbol Additions**
|
||||
- New elements and symbols added (including vendor-specific elements and additional sensors/Arduino components).
|
||||
- Improvements to element import & metadata handling.
|
||||
- **Packaging & Multi-arch Support**
|
||||
- Updated packaging scripts for AppImage, Flatpak, Snap and macOS deployment. Improved aarch64/arm64 support.
|
||||
|
||||
## Detailed Changes
|
||||
|
||||
### Editor & UX
|
||||
|
||||
- Better handling for **rotation, flip and mirror** operations in the element editor:
|
||||
- Primitives and text rotation behavior improved.
|
||||
- Finer rotation increments and predictable text orientation after flips/rotations.
|
||||
- **Wiring and conductor behavior**:
|
||||
- More robust creation and movement of wires and conductor bundles.
|
||||
- Improved text attachment and positioning for wires and improved stability while editing complex conductor networks.
|
||||
- **TerminalStrip editor**: see Highlights - includes drawing, preview, layout editing, persistent storage in the project file and undo support.
|
||||
- **Element Editor & Symbol Trim/Sort**:
|
||||
- Improved trimming/normalization of element metadata.
|
||||
- Better sorting and error handling for element imports (DXF and other formats).
|
||||
- Small UI improvements: About dialog updates, autosave spinbox ranges, improved tooltips and mouse-hover help for dynamic texts.
|
||||
|
||||
### New & Updated Elements
|
||||
|
||||
- New elements added for industrial and automation workflows (including Siemens-related elements, logic elements, sensors and Arduino components).
|
||||
- Symbol library additions and cleanup; improved defaults for newly added symbols.
|
||||
- Element meta-data cleanup: article numbers, descriptions, and manufacturer fields were normalized and trimmed on import.
|
||||
|
||||
### Export / Printing / PDF
|
||||
|
||||
- Adjusted internal export limits to avoid hitting QPainter size restrictions; users can now export larger, high-resolution images/prints in more cases.
|
||||
- Better handling of page sizes and printer-related geometry using QRectF improvements.
|
||||
- PDF export improvements to increase reliability of exported vector content.
|
||||
|
||||
### Build, Dependencies, Packaging
|
||||
|
||||
- Upgrades of core test and build dependencies:
|
||||
- Catch2 upgraded to v2.13.10.
|
||||
- googletest upgraded to v1.17.0.
|
||||
- CMake fixes and i18n handling corrected for nl_BE and other locales.
|
||||
- Packaging scripts updated across platforms (AppImage/Flatpak/Snap/macOS deploy) including fixes for aarch64/arm64.
|
||||
- Submodule updates (e.g., qelectrotech-elements, pugixml, SingleApplication) synchronized where needed.
|
||||
|
||||
### Internationalization & Translations
|
||||
|
||||
- Large translation updates across many languages: German (DE), French (FR), Dutch (NL, including nl_BE), Swedish (SV), Italian (IT), Polish (PL), Portuguese-BR (PT-BR), Serbian (SR), Chinese (Simplified) and others.
|
||||
- Fixes and corrections for many UI strings and localized resources.
|
||||
|
||||
### Tests, QA & Logging
|
||||
|
||||
- Improved logging and machine/config-path reporting; Git revision display refined to only show a revision when available.
|
||||
- Unit test updates and fixes to align with updated testing frameworks.
|
||||
|
||||
## Bug Fixes (selected)
|
||||
|
||||
- Fixed crashes and various null pointer access issues discovered by static and dynamic testing.
|
||||
- Resolved multiple reported bugs that caused build failures on some platforms (FTBFS fixes for macOS and others).
|
||||
- Fixed issues with automatic conductor/strand numbering in several edge cases (referenced Bug 293 in the commit logs).
|
||||
- Resolved text/summary headline issues in the German-language summary generator.
|
||||
- Fixes for a number of visually incorrect renderings and layout corner-cases during element transformation (rotate/flip/mirror).
|
||||
- Fixed issues that affected export sizes and caused export artifacts (referenced fixes for bug IDs around #329/#330 in commit notes).
|
||||
|
||||
## Developer & Contributor Notes
|
||||
|
||||
- Reworked parts of the codebase to use QRectF consistently for better compatibility with QPrinter and export pipelines.
|
||||
- Code-style cleanups and comment improvements applied throughout the project.
|
||||
- Expanded test coverage and dependency refresh to keep CI builds stable.
|
||||
|
||||
## Contributors (selected)
|
||||
|
||||
Thanks to the many contributors who made this release possible. Selected contributors mentioned in the commit logs include:
|
||||
|
||||
- Laurent Trinques
|
||||
- joshua
|
||||
- plc-user
|
||||
- Achim
|
||||
- Pascal Sander
|
||||
- Andre Rummler
|
||||
- Magnus Hellströmer
|
||||
- Martin Marmsoler
|
||||
- Remi Collet
|
||||
|
||||
(See the full commit history for the complete contributor list.)
|
||||
|
||||
## Upgrade / Migration Notes
|
||||
|
||||
- No database or project file format breaking changes were reported in the provided logs. As always, back up projects before opening them with a new version.
|
||||
- If you rely on custom element libraries or third-party submodules, verify submodule synchronization after upgrading.
|
||||
- If you are using custom packaging pipelines, review the updated packaging scripts for any changes required by new dependency versions, especially on aarch64/arm64.
|
||||
|
||||
## Known Issues & Limitations
|
||||
|
||||
- Some very large exports may still be limited by platform-specific rendering restrictions; the export dialog now allows larger pixel limits but extreme sizes may still hit system-level limits.
|
||||
- If you use niche element-import workflows (DXF → element import), occasionally metadata normalization may alter whitespace/trim rules - verify newly imported elements in the element editor.
|
||||
|
||||
## How to get help / report bugs
|
||||
|
||||
- Use the project issue tracker (see repository) to report regressions or new bugs with detailed reproduction steps and example .qet files where possible.
|
||||
- Include the output of Help → About (application version and Git revision) when reporting build/packaging issues.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
====== ChangeLog from 0.8 to 0.9 ======
|
||||
|
||||
|
||||
|
||||
2535
Doxyfile.bak
Normal file
2535
Doxyfile.bak
Normal file
File diff suppressed because it is too large
Load Diff
3
doc/QElectroTech.qch
Normal file
3
doc/QElectroTech.qch
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:56debcb415a5c3662b26ff8765daed9cd53a4c00f0b679a50160ac20d690fcfb
|
||||
size 528789504
|
||||
1841
doc/doc-utils/delete_me.css
Normal file
1841
doc/doc-utils/delete_me.css
Normal file
File diff suppressed because it is too large
Load Diff
18
doc/doc-utils/delete_me.html
Normal file
18
doc/doc-utils/delete_me.html
Normal file
@@ -0,0 +1,18 @@
|
||||
<!-- HTML footer for doxygen 1.12.0-->
|
||||
<!-- start footer part -->
|
||||
<!--BEGIN GENERATE_TREEVIEW-->
|
||||
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
|
||||
<ul>
|
||||
$navpath
|
||||
<li class="footer">$generatedby <a href="https://www.doxygen.org/index.html"><img class="footer" src="$relpath^doxygen.svg" width="104" height="31" alt="doxygen"/></a> $doxygenversion </li>
|
||||
</ul>
|
||||
</div>
|
||||
<!--END GENERATE_TREEVIEW-->
|
||||
<!--BEGIN !GENERATE_TREEVIEW-->
|
||||
<hr class="footer"/><address class="footer"><small>
|
||||
$generatedby <a href="https://www.doxygen.org/index.html"><img class="footer" src="$relpath^doxygen.svg" width="104" height="31" alt="doxygen"/></a> $doxygenversion
|
||||
</small></address>
|
||||
</div><!-- doc-content -->
|
||||
<!--END !GENERATE_TREEVIEW-->
|
||||
</body>
|
||||
</html>
|
||||
88
doc/doc-utils/header.html
Normal file
88
doc/doc-utils/header.html
Normal file
@@ -0,0 +1,88 @@
|
||||
<!-- HTML header for doxygen 1.12.0-->
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" lang="$langISO">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
|
||||
<meta name="generator" content="Doxygen $doxygenversion"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1"/>
|
||||
<!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
|
||||
<!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
|
||||
<!--BEGIN PROJECT_ICON-->
|
||||
<link rel="icon" href="$relpath^$projecticon" type="image/x-icon" />
|
||||
<!--END PROJECT_ICON-->
|
||||
<link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
|
||||
<!--BEGIN DISABLE_INDEX-->
|
||||
<!--BEGIN FULL_SIDEBAR-->
|
||||
<script type="text/javascript">var page_layout=1;</script>
|
||||
<!--END FULL_SIDEBAR-->
|
||||
<!--END DISABLE_INDEX-->
|
||||
<script type="text/javascript" src="$relpath^jquery.js"></script>
|
||||
<script type="text/javascript" src="$relpath^dynsections.js"></script>
|
||||
<!--BEGIN COPY_CLIPBOARD-->
|
||||
<script type="text/javascript" src="$relpath^clipboard.js"></script>
|
||||
<!--END COPY_CLIPBOARD-->
|
||||
$treeview
|
||||
$search
|
||||
$mathjax
|
||||
$darkmode
|
||||
<link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
|
||||
$extrastylesheet
|
||||
<script type="text/javascript" src="$relpath^doxygen-awesome-darkmode-toggle.js"></script>
|
||||
<script type="text/javascript">
|
||||
DoxygenAwesomeDarkModeToggle.init()
|
||||
</script>
|
||||
<script type="text/javascript" src="$relpath^doxygen-awesome-fragment-copy-button.js"></script>
|
||||
<script type="text/javascript">
|
||||
DoxygenAwesomeFragmentCopyButton.init()
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<!--BEGIN DISABLE_INDEX-->
|
||||
<!--BEGIN FULL_SIDEBAR-->
|
||||
<div id="side-nav" class="ui-resizable side-nav-resizable"><!-- do not remove this div, it is closed by doxygen! -->
|
||||
<!--END FULL_SIDEBAR-->
|
||||
<!--END DISABLE_INDEX-->
|
||||
|
||||
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
|
||||
|
||||
<!--BEGIN TITLEAREA-->
|
||||
<div id="titlearea">
|
||||
<table cellspacing="0" cellpadding="0">
|
||||
<tbody>
|
||||
<tr id="projectrow">
|
||||
<!--BEGIN PROJECT_LOGO-->
|
||||
<td id="projectlogo"><img alt="Logo" src="$relpath^$projectlogo"$logosize/></td>
|
||||
<!--END PROJECT_LOGO-->
|
||||
<!--BEGIN PROJECT_NAME-->
|
||||
<td id="projectalign">
|
||||
<div id="projectname">$projectname<!--BEGIN PROJECT_NUMBER--><span id="projectnumber"> $projectnumber</span><!--END PROJECT_NUMBER-->
|
||||
</div>
|
||||
<!--BEGIN PROJECT_BRIEF--><div id="projectbrief">$projectbrief</div><!--END PROJECT_BRIEF-->
|
||||
</td>
|
||||
<!--END PROJECT_NAME-->
|
||||
<!--BEGIN !PROJECT_NAME-->
|
||||
<!--BEGIN PROJECT_BRIEF-->
|
||||
<td>
|
||||
<div id="projectbrief">$projectbrief</div>
|
||||
</td>
|
||||
<!--END PROJECT_BRIEF-->
|
||||
<!--END !PROJECT_NAME-->
|
||||
<!--BEGIN DISABLE_INDEX-->
|
||||
<!--BEGIN SEARCHENGINE-->
|
||||
<!--BEGIN !FULL_SIDEBAR-->
|
||||
<td>$searchbox</td>
|
||||
<!--END !FULL_SIDEBAR-->
|
||||
<!--END SEARCHENGINE-->
|
||||
<!--END DISABLE_INDEX-->
|
||||
</tr>
|
||||
<!--BEGIN SEARCHENGINE-->
|
||||
<!--BEGIN FULL_SIDEBAR-->
|
||||
<tr><td colspan="2">$searchbox</td></tr>
|
||||
<!--END FULL_SIDEBAR-->
|
||||
<!--END SEARCHENGINE-->
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<!--END TITLEAREA-->
|
||||
<!-- end header part -->
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 43 KiB |
Binary file not shown.
1
doxygen-awesome-css
Submodule
1
doxygen-awesome-css
Submodule
Submodule doxygen-awesome-css added at 568f56cde6
2
elements
2
elements
Submodule elements updated: 6e1e2471fe...3b12bc579b
BIN
lang/qet_ca.qm
BIN
lang/qet_ca.qm
Binary file not shown.
134
lang/qet_ca.ts
134
lang/qet_ca.ts
@@ -890,7 +890,7 @@ Nota: Aquestes opcions NO permeten ni bloquegen les numeracions automàtiques, n
|
||||
<message>
|
||||
<location filename="../sources/ui/conductorpropertieswidget.ui" line="391"/>
|
||||
<source>phase</source>
|
||||
<translation>fase</translation>
|
||||
<translation>Fase</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/conductorpropertieswidget.cpp" line="234"/>
|
||||
@@ -913,12 +913,12 @@ Nota: Aquestes opcions NO permeten ni bloquegen les numeracions automàtiques, n
|
||||
<message>
|
||||
<location filename="../sources/ui/conductorpropertieswidget.ui" line="377"/>
|
||||
<source>terre</source>
|
||||
<translation>terra</translation>
|
||||
<translation>Terra</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/conductorpropertieswidget.ui" line="363"/>
|
||||
<source>neutre</source>
|
||||
<translation>neutre</translation>
|
||||
<translation>Neutre</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/conductorpropertieswidget.ui" line="14"/>
|
||||
@@ -954,12 +954,12 @@ Nota: Aquestes opcions NO permeten ni bloquegen les numeracions automàtiques, n
|
||||
<message>
|
||||
<location filename="../sources/ui/conductorpropertieswidget.ui" line="171"/>
|
||||
<source>Vertical à gauche</source>
|
||||
<translation>Vertical esquerra</translation>
|
||||
<translation>Vertical a l'esquerra</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/conductorpropertieswidget.ui" line="176"/>
|
||||
<source>Vertical à droite</source>
|
||||
<translation>Vertical dreta</translation>
|
||||
<translation>Vertical a la dreta</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
|
||||
@@ -1447,7 +1447,7 @@ Nota: Aquestes opcions NO permeten ni bloquegen les numeracions automàtiques, n
|
||||
<message>
|
||||
<location filename="../sources/ui/dynamicelementtextmodel.cpp" line="345"/>
|
||||
<source>Conserver la rotation visuel</source>
|
||||
<translation>Mantenir la rotació visual</translation>
|
||||
<translation>Manté la rotació visual</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/dynamicelementtextmodel.cpp" line="359"/>
|
||||
@@ -1544,7 +1544,7 @@ Nota: Aquestes opcions NO permeten ni bloquegen les numeracions automàtiques, n
|
||||
<message>
|
||||
<location filename="../sources/ui/dynamicelementtextmodel.cpp" line="837"/>
|
||||
<source>Maintenir en bas de page</source>
|
||||
<translation>Mantenir al final de la pàgina</translation>
|
||||
<translation>Manté al final de la pàgina</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/dynamicelementtextmodel.cpp" line="1143"/>
|
||||
@@ -1593,7 +1593,7 @@ Nota: Aquestes opcions NO permeten ni bloquegen les numeracions automàtiques, n
|
||||
<message>
|
||||
<location filename="../sources/editor/ui/dynamictextfieldeditor.ui" line="72"/>
|
||||
<source>Conserver la rotation visuel</source>
|
||||
<translation>Mantenir la rotació visual</translation>
|
||||
<translation>Manté la rotació visual</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/editor/ui/dynamictextfieldeditor.ui" line="115"/>
|
||||
@@ -2726,7 +2726,7 @@ S'eliminaran tots els elements i carpetes contingudes en aquesta carpeta.</
|
||||
<message>
|
||||
<location filename="../sources/elementspanelwidget.cpp" line="63"/>
|
||||
<source>Abaisser ce folio</source>
|
||||
<translation>Retrocedir la posició del full</translation>
|
||||
<translation>Retrocedeix la posició del full</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/elementspanelwidget.cpp" line="64"/>
|
||||
@@ -2746,12 +2746,12 @@ S'eliminaran tots els elements i carpetes contingudes en aquesta carpeta.</
|
||||
<message>
|
||||
<location filename="../sources/elementspanelwidget.cpp" line="67"/>
|
||||
<source>Abaisser ce folio x10</source>
|
||||
<translation>Retrocedir 10 posicions el full</translation>
|
||||
<translation>Retrocedeix 10 posicions el full</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/elementspanelwidget.cpp" line="68"/>
|
||||
<source>Abaisser ce folio x100</source>
|
||||
<translation>Retrocedir 100 posicions el full</translation>
|
||||
<translation>Retrocedeix 100 posicions el full</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/elementspanelwidget.cpp" line="88"/>
|
||||
@@ -3130,7 +3130,7 @@ Si el número definit al camp Valor té menys dígits que el tipus escollit, ani
|
||||
<message>
|
||||
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="72"/>
|
||||
<source>Insert Formula Here e.g.: %prefix%l%c</source>
|
||||
<translation>Inserir Fórmula Aquí, per exemple: %prefix%l%c</translation>
|
||||
<translation>Insereix la fórmula aquí, per exemple: %prefix%l%c</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="101"/>
|
||||
@@ -3308,22 +3308,22 @@ Les entrades de text i nombres també
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="65"/>
|
||||
<source>Utiliser des fen&êtres (appliqué au prochain lancement de QElectroTech)</source>
|
||||
<translation>Utilitza fine&stres (aplicat al proper llançament de QElectroTech)</translation>
|
||||
<translation>Utilitza fine&stres (s'aplicarà al proper llançament de QElectroTech)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="72"/>
|
||||
<source>Utiliser des onglets (appliqué au prochain lance&ment de QElectroTech)</source>
|
||||
<translation>Utilitza pestanyes (aplicat al proper llança&ment de QElectroTech)</translation>
|
||||
<translation>Utilitza pestanyes (s'aplicarà al proper llança&ment de QElectroTech)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="101"/>
|
||||
<source>Méthode de mise à l'echelle des écrans à haute densité de pixels (hdpi) (appliqué au prochain lancement de QElectroTech) :</source>
|
||||
<translation>Mètode d'escalat de pantalla d'alta densitat de píxels (HDPI) (aplicat al proper llançament de QElectroTech):</translation>
|
||||
<translation>Mètode d'escalat de pantalla d'alta densitat de píxels (HDPI) (s'aplicarà al proper llançament de QElectroTech):</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="147"/>
|
||||
<source>Sauvegarde automatique des projets (appliqué au prochain lancement de QElectroTech)</source>
|
||||
<translation>Desament automàtic del projecte (aplicat al proper llançament de QElectroTech)</translation>
|
||||
<translation>Desament automàtic del projecte (s'aplicarà al proper llançament de QElectroTech)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="161"/>
|
||||
@@ -3345,7 +3345,7 @@ Les entrades de text i nombres també
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="181"/>
|
||||
<source>Utiliser les numéros de folio à la place de leur position dans le projet</source>
|
||||
<translation>Utilitzeu els números de full en lloc de la seva posició en el projecte</translation>
|
||||
<translation>Utilitza els números de full en lloc de la seva posició en el projecte</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="209"/>
|
||||
@@ -3360,7 +3360,7 @@ Les entrades de text i nombres també
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="227"/>
|
||||
<source>Répertoire de la collection commune</source>
|
||||
<translation>Directori de col·leccions comuns</translation>
|
||||
<translation>Directori de la col·lecció compartida</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="235"/>
|
||||
@@ -3383,22 +3383,22 @@ Les entrades de text i nombres també
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="248"/>
|
||||
<source>Répertoire de la collection company</source>
|
||||
<translation>Directori de la col·lecció d'empreses</translation>
|
||||
<translation>Directori de la col·lecció d'empresa</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="269"/>
|
||||
<source>Répertoire des cartouches company</source>
|
||||
<translation>Directori de caixetins d'empresa</translation>
|
||||
<translation>Directori dels caixetins d'empresa</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="290"/>
|
||||
<source>Répertoire de la collection utilisateur</source>
|
||||
<translation>Directori de col·lecció d'usuaris</translation>
|
||||
<translation>Directori de la col·lecció d'usuari</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="311"/>
|
||||
<source>Répertoire des cartouches utilisateur</source>
|
||||
<translation>Directori de caixetins d'usuari</translation>
|
||||
<translation>Directori dels caixetins d'usuari</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="332"/>
|
||||
@@ -3425,7 +3425,7 @@ Podeu especificar el valor per defecte d'aquest camp per als elements que c
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="395"/>
|
||||
<source>Appliqué au prochain lancement de QElectroTech</source>
|
||||
<translation>Aplicat al proper llançament de QElectroTech</translation>
|
||||
<translation>S'aplicarà al proper llançament de QElectroTech</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="429"/>
|
||||
@@ -3479,17 +3479,17 @@ Podeu especificar el valor per defecte d'aquest camp per als elements que c
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="618"/>
|
||||
<source>Grille + Clavier</source>
|
||||
<translation>Quadrícula + Teclat</translation>
|
||||
<translation>Graella i teclat</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="624"/>
|
||||
<source>Grille : 1 - 30</source>
|
||||
<translation>Quadrícula: 1 - 30</translation>
|
||||
<translation>Graella de l'editor d'esquemes</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="658"/>
|
||||
<source>DiagramEditor yGrid</source>
|
||||
<translation>Editor de diagrames yQuadrícula</translation>
|
||||
<translation>Distància entre punts en vertical : 1-30</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="665"/>
|
||||
@@ -3499,37 +3499,37 @@ Podeu especificar el valor per defecte d'aquest camp per als elements que c
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="691"/>
|
||||
<source>DiagramEditor xGrid</source>
|
||||
<translation>Editor de diagrames xQuadrícula</translation>
|
||||
<translation>Distància entre punts en horitzontal : 1-30</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="714"/>
|
||||
<source>Déplacement au clavier : 1 - 30</source>
|
||||
<translation>Moviment del teclat: 1 - 30</translation>
|
||||
<translation>Desplaçament per la graella de l'editor d'esquemes utilitzant el teclat</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="764"/>
|
||||
<source>DiagramEditor (touche : gauche / droite) xGrid</source>
|
||||
<translation>Editor de diagrames (tecla: esquerra / dreta) xQuadrícula</translation>
|
||||
<translation>Distància desplaçada amb les tecles esquerra i dreta en horitzontal : 1-30</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="771"/>
|
||||
<source>DiagramEditor (touche : haut / bas) yGrid</source>
|
||||
<translation>Editor de diagrames (tecla: amunt / avall) yQuadrícula</translation>
|
||||
<translation>Distància desplaçada amb les tecles amunt i avall en vertical : 1-30</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="794"/>
|
||||
<source>Déplacement au clavier avec la touche ALT : 1 - 9</source>
|
||||
<translation>Moviment del teclat amb la tecla ALT: 1 - 9</translation>
|
||||
<translation>Desplaçament per la graella de l'editor d'esquemes utilitzant el teclat amb la tecla ALT</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="800"/>
|
||||
<source>DiagramEditor (touche : gauche / droite ) xGrid</source>
|
||||
<translation>Editor de diagrames (tecla: esquerra / dreta) xQuadrícula</translation>
|
||||
<translation>Distància desplaçada amb les tecles esquerra i dreta en horitzontal : 1-9</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="829"/>
|
||||
<source>DiagramEditor (touche : haut / bas) yGrid</source>
|
||||
<translation>Editor de diagrames (tecla: amunt / avall) yQuadrícula</translation>
|
||||
<translation>Distància desplaçada amb les tecles amunt i avall en vertical : 1-9</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="888"/>
|
||||
@@ -3544,17 +3544,17 @@ Podeu especificar el valor per defecte d'aquest camp per als elements que c
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="154"/>
|
||||
<source>Ne pas conserver les labels des éléments lors des copier coller</source>
|
||||
<translation>No conservar les etiquetes dels elements després de copiar i enganxar</translation>
|
||||
<translation>No conservis les etiquetes dels elements després de copia i enganxa</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.ui" line="51"/>
|
||||
<source>Autoriser le dézoom au delà du folio</source>
|
||||
<translation>Permetre allunyar més enllà de la mida del full</translation>
|
||||
<translation>Permet allunyar més enllà de la mida del full</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="45"/>
|
||||
<source>Arrondi supérieur pour 0.5 et plus</source>
|
||||
<translation>Arrodoneix cap amunt per 0,5 i més</translation>
|
||||
<translation>Arrodoneix cap amunt per 0,5 o més</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="46"/>
|
||||
@@ -3569,7 +3569,7 @@ Podeu especificar el valor per defecte d'aquest camp per als elements que c
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="48"/>
|
||||
<source>Arrondi supérieur pour 0.75 et plus</source>
|
||||
<translation>Arrodoneix cap amunt per 0,75 i més</translation>
|
||||
<translation>Arrodoneix cap amunt per 0,75 o més</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="49"/>
|
||||
@@ -3720,27 +3720,27 @@ Podeu especificar el valor per defecte d'aquest camp per als elements que c
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="439"/>
|
||||
<source>Chemin de la collection commune</source>
|
||||
<translation>Ruta de col·lecció comuna</translation>
|
||||
<translation>Ruta de la col·lecció compartida</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="453"/>
|
||||
<source>Chemin de la collection company</source>
|
||||
<translation>Ruta de col·lecció d'empresa</translation>
|
||||
<translation>Ruta de la col·lecció d'empresa</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="467"/>
|
||||
<source>Chemin de la collection utilisateur</source>
|
||||
<translation>Ruta de col·lecció d'usuaris</translation>
|
||||
<translation>Ruta de la col·lecció d'usuari</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="481"/>
|
||||
<source>Chemin des cartouches company</source>
|
||||
<translation>Ruta de caixetins d'empresa</translation>
|
||||
<translation>Ruta dels caixetins d'empresa</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="495"/>
|
||||
<source>Chemin des cartouches utilisateur</source>
|
||||
<translation>Ruta de caixetins d'usuaris</translation>
|
||||
<translation>Ruta dels caixetins d'usuaris</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/configpage/generalconfigurationpage.cpp" line="524"/>
|
||||
@@ -5516,7 +5516,7 @@ Vol desar els canvis?</translation>
|
||||
<location filename="../sources/projectview.cpp" line="384"/>
|
||||
<source>Supprimer le folio ?</source>
|
||||
<comment>message box title</comment>
|
||||
<translation>Suprimir el full?</translation>
|
||||
<translation>Suprimeix el full?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/projectview.cpp" line="385"/>
|
||||
@@ -6149,7 +6149,7 @@ Opcions disponibles:
|
||||
<message>
|
||||
<location filename="../sources/qetdiagrameditor.cpp" line="616"/>
|
||||
<source>Désélectionner tout</source>
|
||||
<translation>Desselecciona</translation>
|
||||
<translation>Desselecciona-ho tot</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetdiagrameditor.cpp" line="617"/>
|
||||
@@ -6159,7 +6159,7 @@ Opcions disponibles:
|
||||
<message>
|
||||
<location filename="../sources/qetdiagrameditor.cpp" line="668"/>
|
||||
<source>Ajouter un plan de bornes</source>
|
||||
<translation>Afegiu un pla de borns</translation>
|
||||
<translation>Afegeix un pla de borns</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetdiagrameditor.cpp" line="670"/>
|
||||
@@ -6199,7 +6199,7 @@ Opcions disponibles:
|
||||
<message>
|
||||
<location filename="../sources/qetdiagrameditor.cpp" line="702"/>
|
||||
<source>Chercher/remplacer</source>
|
||||
<translation>Cerca/substitueix</translation>
|
||||
<translation>Cerca i reemplaça</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetdiagrameditor.cpp" line="761"/>
|
||||
@@ -6527,7 +6527,7 @@ Opcions disponibles:
|
||||
<location filename="../sources/qetdiagrameditor.cpp" line="350"/>
|
||||
<source>Création automatique de conducteur(s)</source>
|
||||
<comment>Tool tip of auto conductor</comment>
|
||||
<translation>Creació automàtica de conductor(s)</translation>
|
||||
<translation>Creació automàtica de conductors</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetdiagrameditor.cpp" line="159"/>
|
||||
@@ -7485,7 +7485,7 @@ Les condicions requerides no són vàlides</translation>
|
||||
<message>
|
||||
<location filename="../sources/qetmainwindow.cpp" line="216"/>
|
||||
<source>Sortir du &mode plein écran</source>
|
||||
<translation>Sortir de &pantalla completa</translation>
|
||||
<translation>Surt de &pantalla completa</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetmainwindow.cpp" line="218"/>
|
||||
@@ -8127,7 +8127,7 @@ Què voleu fer?</translation>
|
||||
<message>
|
||||
<location filename="../sources/exportdialog.cpp" line="1041"/>
|
||||
<source>Conserver les proportions</source>
|
||||
<translation>Mantenir les proporcions</translation>
|
||||
<translation>Manté les proporcions</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/exportdialog.cpp" line="1045"/>
|
||||
@@ -9284,27 +9284,27 @@ Voleu substituir-la?</translation>
|
||||
<message>
|
||||
<location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="56"/>
|
||||
<source>Chercher/remplacer les propriétés de folio</source>
|
||||
<translation>Cerca/Substitueix les propietats del full</translation>
|
||||
<translation>Cerca i reemplaça les propietats del full</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="120"/>
|
||||
<source>Chercher/remplacer les propriétés d'éléments.</source>
|
||||
<translation>Cerca/Substitueix les propietats dels elements.</translation>
|
||||
<translation>Cerca i reemplaça les propietats dels elements.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="173"/>
|
||||
<source>Chercher/remplacer des textes independants</source>
|
||||
<translation>Cercar/substituir textos independents</translation>
|
||||
<translation>Cerca i reemplaça textos independents</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="213"/>
|
||||
<source>Chercher/remplacer les propriétés de conducteurs.</source>
|
||||
<translation>Cerca/substitueix les propietats dels conductors.</translation>
|
||||
<translation>Cerca i reemplaça les propietats dels conductors.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/SearchAndReplace/searchandreplaceworker.cpp" line="300"/>
|
||||
<source>Rechercher / remplacer avancé</source>
|
||||
<translation>Cerca/substitueix avançat</translation>
|
||||
<translation>Cerca i reemplaça avançat</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/TerminalStrip/GraphicsItem/properties/terminalstriplayoutshandler.cpp" line="26"/>
|
||||
@@ -9370,7 +9370,7 @@ Voleu substituir-la?</translation>
|
||||
<message>
|
||||
<location filename="../sources/undocommand/addelementtextcommand.cpp" line="283"/>
|
||||
<source>Insérer un texte d'élément dans un groupe de textes</source>
|
||||
<translation>Inserir text d'element en un grup de text</translation>
|
||||
<translation>Insereix text d'element en un grup de text</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/undocommand/addelementtextcommand.cpp" line="343"/>
|
||||
@@ -9545,7 +9545,7 @@ Afegiu una taula nova o ajusteu la taula existent per mostrar la quantitat compl
|
||||
<message>
|
||||
<location filename="../sources/qetgraphicsitem/qetshapeitem.cpp" line="667"/>
|
||||
<source>Ajouter un point à un polygone</source>
|
||||
<translation>Afegir un punt a un polígon</translation>
|
||||
<translation>Afegeix un punt a un polígon</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetgraphicsitem/qetshapeitem.cpp" line="701"/>
|
||||
@@ -9986,7 +9986,7 @@ Afegiu una taula nova o ajusteu la taula existent per mostrar la quantitat compl
|
||||
<message>
|
||||
<location filename="../sources/SearchAndReplace/ui/replacefoliowidget.ui" line="150"/>
|
||||
<source>Pas de date</source>
|
||||
<translation>No hi cap data</translation>
|
||||
<translation>Sense data</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/SearchAndReplace/ui/replacefoliowidget.ui" line="157"/>
|
||||
@@ -10077,7 +10077,7 @@ Créer votre propre texte en vous aidant des variables suivantes :
|
||||
%LM : la localisation
|
||||
%l : le numéro de ligne
|
||||
%c : le numéro de colonne</source>
|
||||
<translation>Podeu definir una etiqueta personalitzada per als informes de foli.
|
||||
<translation>Podeu definir una etiqueta personalitzada per als informes de full.
|
||||
Creeu el vostre propi text utilitzant les variables següents:
|
||||
%f: la posició del full al projecte
|
||||
%F: el número de full
|
||||
@@ -10318,7 +10318,7 @@ Creeu el vostre propi text utilitzant les variables següents:
|
||||
<message>
|
||||
<location filename="../sources/autoNum/ui/selectautonumw.ui" line="133"/>
|
||||
<source><html><head/><body><p>Supprimer une variable de numérotation</p></body></html></source>
|
||||
<translation><html><head/><body><p>Suprimir una variable de numeració</p></body></html></translation>
|
||||
<translation><html><head/><body><p>Suprimeix una variable de numeració</p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/autoNum/ui/selectautonumw.ui" line="150"/>
|
||||
@@ -13419,7 +13419,7 @@ Les autres champs ne sont pas utilisés.</source>
|
||||
<message>
|
||||
<location filename="../sources/ui/titleblockpropertieswidget.ui" line="288"/>
|
||||
<source>Pas de date</source>
|
||||
<translation>No hi cap data</translation>
|
||||
<translation>Sense data</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/titleblockpropertieswidget.ui" line="295"/>
|
||||
@@ -13709,7 +13709,7 @@ associar el nom "volta" amb el valor "1745" substituirà %{v
|
||||
<location filename="../sources/titleblock/templatedeleter.cpp" line="61"/>
|
||||
<source>Supprimer le modèle de cartouche ?</source>
|
||||
<comment>message box title</comment>
|
||||
<translation>Suprimir el model de caixetí?</translation>
|
||||
<translation>Suprimeix el model de caixetí?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/titleblock/templatedeleter.cpp" line="63"/>
|
||||
@@ -13943,13 +13943,13 @@ associar el nom "volta" amb el valor "1745" substituirà %{v
|
||||
<location filename="../sources/titleblock/templateview.cpp" line="583"/>
|
||||
<source>Supprimer cette colonne</source>
|
||||
<comment>context menu</comment>
|
||||
<translation>Suprimir aquesta columna</translation>
|
||||
<translation>Suprimeix aquesta columna</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/titleblock/templateview.cpp" line="584"/>
|
||||
<source>Supprimer cette ligne</source>
|
||||
<comment>context menu</comment>
|
||||
<translation>Suprimir aquesta línia</translation>
|
||||
<translation>Suprimeix aquesta línia</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/titleblock/templateview.cpp" line="585"/>
|
||||
@@ -14056,7 +14056,7 @@ Longitud màxima : %2px
|
||||
<message>
|
||||
<location filename="../sources/ui/xrefpropertieswidget.ui" line="56"/>
|
||||
<source>XRef Vertical Offset:</source>
|
||||
<translation>Desplaçament vertical de la XRef :</translation>
|
||||
<translation>Desplaçament vertical de la referència creuada :</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/xrefpropertieswidget.ui" line="63"/>
|
||||
@@ -14071,12 +14071,12 @@ Longitud màxima : %2px
|
||||
<message>
|
||||
<location filename="../sources/ui/xrefpropertieswidget.ui" line="69"/>
|
||||
<source>Default - Fit to XRef height</source>
|
||||
<translation>Per defecte - Ajusta a l'alçada de la XRef</translation>
|
||||
<translation>Per defecte - Ajusta a l'alçada de la referència creuada</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/xrefpropertieswidget.ui" line="98"/>
|
||||
<source>XRef slave position</source>
|
||||
<translation>Posició de l'esclau XRef</translation>
|
||||
<translation>Posició de l'esclau de la referència creuada</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/xrefpropertieswidget.ui" line="114"/>
|
||||
@@ -14086,7 +14086,7 @@ Longitud màxima : %2px
|
||||
<message>
|
||||
<location filename="../sources/ui/xrefpropertieswidget.ui" line="121"/>
|
||||
<source>Afficher en croix</source>
|
||||
<translation>Mostra len creu</translation>
|
||||
<translation>Mostra en creu</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/ui/xrefpropertieswidget.ui" line="134"/>
|
||||
|
||||
@@ -35,7 +35,7 @@ ConfigDialog::ConfigDialog(QWidget *parent) : QDialog(parent) {
|
||||
// liste des pages
|
||||
pages_list = new QListWidget();
|
||||
pages_list -> setViewMode(QListView::IconMode);
|
||||
if(MachineInfo::instance()->i_max_screen_height()<1000){
|
||||
if(MachineInfo::instance()->i_max_screen_height() <= 1080){
|
||||
pages_list -> setIconSize(QSize(64, 64));
|
||||
} else {
|
||||
pages_list -> setIconSize(QSize(128, 128));
|
||||
@@ -69,7 +69,7 @@ ConfigDialog::ConfigDialog(QWidget *parent) : QDialog(parent) {
|
||||
|
||||
// Add a layout for QDialog
|
||||
QVBoxLayout *dialog_layout = new QVBoxLayout(this);
|
||||
dialog_layout->addWidget(scroll); // add scroll to the QDialog's layout
|
||||
dialog_layout -> addWidget(scroll); // add scroll to the QDialog's layout
|
||||
dialog_layout -> addWidget(buttons);
|
||||
setLayout(dialog_layout);
|
||||
|
||||
@@ -79,9 +79,11 @@ ConfigDialog::ConfigDialog(QWidget *parent) : QDialog(parent) {
|
||||
connect(pages_list, SIGNAL(currentRowChanged(int)),
|
||||
pages_widget, SLOT(setCurrentIndex(int)));
|
||||
|
||||
setMaximumSize(MachineInfo::instance()->i_max_screen_width(),
|
||||
MachineInfo::instance()->i_max_screen_height());
|
||||
resize(1400,1000);
|
||||
// set maximum a bit smaller than available size = (screen-size - Task-Bar):
|
||||
setMaximumSize((int)(0.94 * MachineInfo::instance()->i_max_available_width()),
|
||||
(int)(0.94 * MachineInfo::instance()->i_max_available_height()));
|
||||
resize(std::min(1400,maximumWidth()),
|
||||
std::min(1000,maximumHeight()));
|
||||
|
||||
#ifdef Q_OS_MACOS
|
||||
if (parent) {
|
||||
|
||||
@@ -107,7 +107,7 @@ bool dxf2ElmtIsPresent(bool install_dialog, QWidget *parent)
|
||||
"Veuillez télécharger celui-ci en suivant le lien ci dessous et le dézipper dans le dossier d'installation")};
|
||||
|
||||
ThirdPartyBinaryInstallDialog dialog_(string_,
|
||||
QStringLiteral("https://github.com/antonioaja/dxf2elmt/releases"),
|
||||
QStringLiteral("https://github.com/Vadoola/dxf2elmt/releases/tag/v0.5.1"),
|
||||
dxf2ElmtDirPath(),
|
||||
parent);
|
||||
dialog_.exec();
|
||||
|
||||
@@ -446,6 +446,22 @@ int32_t MachineInfo::i_max_screen_height() {
|
||||
return pc.screen.Max_height;
|
||||
}
|
||||
|
||||
/**
|
||||
@brief MachineInfo::i_max_available_width
|
||||
@return max available width
|
||||
*/
|
||||
int32_t MachineInfo::i_max_available_width() {
|
||||
return QGuiApplication::primaryScreen()->availableSize().width();
|
||||
}
|
||||
|
||||
/**
|
||||
@brief MachineInfo::i_max_available_height
|
||||
@return max available height
|
||||
*/
|
||||
int32_t MachineInfo::i_max_available_height() {
|
||||
return QGuiApplication::primaryScreen()->availableSize().height();
|
||||
}
|
||||
|
||||
/**
|
||||
@brief MachineInfo::compilation_info
|
||||
@return compilation_info
|
||||
|
||||
@@ -57,6 +57,8 @@ class MachineInfo
|
||||
|
||||
int32_t i_max_screen_width();
|
||||
int32_t i_max_screen_height();
|
||||
int32_t i_max_available_width();
|
||||
int32_t i_max_available_height();
|
||||
QString compilation_info();
|
||||
void send_info_to_debug();
|
||||
|
||||
|
||||
@@ -1261,6 +1261,7 @@ QFont QETApp::diagramTextsFont(qreal size)
|
||||
QFont diagram_texts_font = QFont(diagram_texts_family);
|
||||
diagram_texts_font.setPointSizeF(diagram_texts_size);
|
||||
diagram_texts_font.setWeight(diagram_texts_item_weight);
|
||||
diagram_texts_font.setStyleHint(QFont::SansSerif);
|
||||
diagram_texts_font.setStyleName(diagram_texts_item_style);
|
||||
if (diagram_texts_size <= 4.0) {
|
||||
diagram_texts_font.setWeight(QFont::Light);
|
||||
@@ -1294,6 +1295,7 @@ QFont QETApp::diagramTextsItemFont(qreal size)
|
||||
QFont diagram_texts_item_font = QFont(diagram_texts_item_family);
|
||||
diagram_texts_item_font.setPointSizeF(diagram_texts_item_size);
|
||||
diagram_texts_item_font.setWeight(diagram_texts_item_weight);
|
||||
diagram_texts_item_font.setStyleHint(QFont::SansSerif);
|
||||
diagram_texts_item_font.setStyleName(diagram_texts_item_style);
|
||||
if (diagram_texts_item_size <= 4.0) {
|
||||
diagram_texts_item_font.setWeight(QFont::Light);
|
||||
@@ -1934,7 +1936,10 @@ void QETApp::configureQET()
|
||||
// associe le dialogue a un eventuel widget parent
|
||||
if (parent_widget) {
|
||||
cd.setParent(parent_widget, cd.windowFlags());
|
||||
cd.setMaximumSize(parent_widget->size());
|
||||
cd.setMaximumWidth(std::min(parent_widget->width(),
|
||||
(int)(0.94 * MachineInfo::instance()->i_max_available_width())));
|
||||
cd.setMaximumHeight(std::min(parent_widget->height(),
|
||||
(int)(0.94 * MachineInfo::instance()->i_max_available_height())));
|
||||
}
|
||||
|
||||
// display the dialog then avoid linking it to any parent widget
|
||||
|
||||
@@ -178,7 +178,7 @@ void AboutQETDialog::setAnnexProject()
|
||||
addLibrary(ui->m_annex_project_label, tr("Générateur d'élément lambda", "Lambda element generator"),
|
||||
"https://github.com/asnigma/qet_gen_element");
|
||||
addLibrary(ui->m_annex_project_label, tr("Convertisseur d'élément DXF", "Dxf2elmt"),
|
||||
"https://github.com/antonioaja/dxf2elmt");
|
||||
"https://github.com/Vadoola/dxf2elmt");
|
||||
addLibrary(ui->m_annex_project_label, tr("Outil de traduction d'éléments", "Qet_translate"),
|
||||
"https://qelectrotech.org/forum/viewtopic.php?pid=16027#p16027");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user