mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-11 14:44:15 +02:00
Kellermorph
69eb071f45
Upstream moved 56 commits ahead of the last merge. Six files conflicted,
all of them files where upstream's French -> English tr() translation wave
touched lines we had also touched with the cable feature. Resolution rule
applied everywhere: take upstream's English source strings, keep our cable
additions.
Resolved:
- sources/ui/xrefpropertieswidget.ui : kept our structure (m_labels_gb
pulled out of the display group, m_slave_row, the m_font_pb "Police..."
button of the cable cross-reference) and mechanically applied upstream's
20 English string replacements on top of it.
- sources/ui/xrefpropertieswidget.cpp : our version plus upstream's 7
translated combo entries; the tr("Cable") item we add for the cable
cross-reference type stays.
- sources/autoNum/ui/numparteditorw.cpp : upstream's English part names
("number format 1", "Sheet no.", "Plant", "Location", ...) for the
number-format list, with our comment explaining why type 3 (cable) takes
the conductor kinds of variable.
- sources/ui/configpage/configpages.cpp : upstream's English tab titles
(Conductors / Elements / Sheets) plus our Cables tab.
- sources/ui/configpage/projectconfigpages.cpp : upstream's "Sheets" tab
title plus our Cables tab block (single-rule SelectAutonumW(3)).
- sources/qetdiagrameditor.cpp : union of both sides - upstream's new
"Add a generic device" action (icon, status tip, data id) and its
English menu names ("File"/"Edit"/"Project"/"Display"), together with our
cable action, the Numbering and Lists menus, the cable list actions and
the CSV export in the Project menu.
Kept French: our own cable tr() source strings stay French for now. That
is the smaller change and the translation pass can follow separately.
Verified: full build 1065/1065, ctest 91/92 (only the pre-existing
headless tst_menubarkeyboard fails: no window manager, so Alt+F and F10
cannot open a menu bar), smoke start exit 124, no conflict marker left in
the tree.
Icons
QElectroTech loads most icons by name from an icon theme, for example
QIcon::fromTheme("document-save"). An icon theme is a folder of icons
sorted by size, with an index.theme file that lists the sizes. QET
has two themes, qet for light windows and qet-dark for dark ones.
misc/make_icon_themes.py builds both from the source folders below.
| Folder | Contents | Source | Built by a script | License |
|---|---|---|---|---|
qet/traced/ |
QET's icons as SVG, at 16 and 22 px, with smooth versions for larger sizes | Traced from QET's former PNG icons, or drawn by contributors | No | GPL-2.0-or-later |
qet/scalable/ |
QET's SVG icons drawn on a 24 px canvas; 16/ holds 16 px versions |
Drawn by contributors | No | GPL-2.0-or-later |
qet/pages/ |
Settings page icons | Drawn by contributors | No | GPL-2.0-or-later |
breeze/ |
KDE Breeze icons, in folders by pixel size | KDE Breeze | misc/import_breeze_icons.py |
LGPL-3.0-or-later |
breeze/added/ |
16 px versions of Breeze icons that Breeze lacks or draws in another style | Drawn by contributors in the Breeze style | No | LGPL-3.0-or-later |
flags/ |
Language flags | Damien Sorel's flag pack | No | Public domain |
colors/ |
Color swatches for the element editor | Contributed in 2020 | No | GPL-2.0-or-later |
themes/ |
The qet and qet-dark themes; generated/ holds intermediate files |
Built from the folders above | misc/make_icon_themes.py |
Same as the source file |
breeze-icons/ |
App and file-type icons in the Breeze style | Nuri | No | CC-BY-ND-3.0 |
256x256/ |
QET logo for windows, the tray and the About menu; app icon | Nuri | No | CC-BY-ND-3.0 |
mac_icon/, windows_icon/ |
App and file-type icons for macOS and Windows | Nuri | No | CC-BY-ND-3.0 |
splash.png |
Splash screen | Nuri | No | CC-BY-ND-3.0 |
icon-themes.qrc lists the theme files for the Qt resource system and
is written by misc/make_icon_themes.py. Do not edit it by hand.
copyright is the Debian copyright file for the whole project. It
holds the full license and credit for each icon.
Adding an icon
- Put the SVG in
qet/scalable/and add it toSVGSinmisc/make_icon_themes.py. For a Breeze icon, add its name toBREEZEthere instead and runmisc/import_breeze_icons.py. - Run
python3 misc/make_icon_themes.py. - Load it with
QIcon::fromTheme("<name>"). - Credit it in
copyright.