kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-11 14:44:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge upstream/master: translation wave plus generic device

Browse Source 
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.
This commit is contained in:
Kellermorph
2026-10-09 20:44:58 +02:00
parent d55a3c7881 5f6e74918e
commit 69eb071f45
437 changed files with 233166 additions and 197854 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/autoNum/ui/numparteditorw.cpp
+58 -58
View File
@@ -134,12 +134,12 @@ void NumPartEditorW::setVisibleItems()
QStringList items;
if (m_edited_type == 2)
{
items << tr("Chiffre 1")
<< tr("Chiffre 01")
<< tr("Chiffre 001")
<< tr("Cyclique (modulo)")
<< tr("Alphabétique")
<< tr("Texte");
items << tr("number format 1")
<< tr("number format 01")
<< tr("number format 001")
<< tr("Cyclic (modulo)")
<< tr("Alphabetical")
<< tr("Text");
}
else if (m_edited_type == 1 || m_edited_type == 3)
{
@@ -147,34 +147,34 @@ void NumPartEditorW::setVisibleItems()
//conductor is, so it takes the same kinds of variable and
//none of the ones an element has and a cable has not (its
//line, its column, its prefix).
items << tr("Chiffre 1")
<< tr("Chiffre 1 - Folio")
<< tr("Chiffre 01")
<< tr("Chiffre 01 - Folio")
<< tr("Chiffre 001")
<< tr("Chiffre 001 - Folio")
<< tr("Cyclique (modulo)")
<< tr("Alphabétique")
<< tr("Texte")
<< tr("N° folio")
<< tr("Folio")
<< tr("Installation")
<< tr("Locmach");
items << tr("number format 1")
<< tr("number format 1 - Sheet")
<< tr("number format 01")
<< tr("number format 01 - Sheet")
<< tr("number format 001")
<< tr("number format 001 - Sheet")
<< tr("Cyclic (modulo)")
<< tr("Alphabetical")
<< tr("Text")
<< tr("Sheet no.")
<< tr("Sheet")
<< tr("Plant")
<< tr("Location");
}
else
items << tr("Chiffre 1")
<< tr("Chiffre 1 - Folio")
<< tr("Chiffre 01")
<< tr("Chiffre 01 - Folio")
<< tr("Chiffre 001")
<< tr("Chiffre 001 - Folio")
<< tr("Cyclique (modulo)")
<< tr("Alphabétique")
<< tr("Texte")
<< tr("N° folio")
<< tr("Folio")
<< tr("Installation")
<< tr("Locmach")
items << tr("number format 1")
<< tr("number format 1 - Sheet")
<< tr("number format 01")
<< tr("number format 01 - Sheet")
<< tr("number format 001")
<< tr("number format 001 - Sheet")
<< tr("Cyclic (modulo)")
<< tr("Alphabetical")
<< tr("Text")
<< tr("Sheet no.")
<< tr("Sheet")
<< tr("Plant")
<< tr("Location")
<< tr("Element Line")
<< tr("Element Column")
<< tr("Element Prefix");
@@ -289,27 +289,27 @@ bool NumPartEditorW::isValid()
Action when user change the type comboBox
*/
void NumPartEditorW::on_type_cb_activated(int) {
if (ui->type_cb->currentText() == tr("Chiffre 1"))
if (ui->type_cb->currentText() == tr("number format 1"))
setType(unit);
else if (ui->type_cb->currentText() == tr("Chiffre 1 - Folio"))
else if (ui->type_cb->currentText() == tr("number format 1 - Sheet"))
setType(unitfolio);
else if (ui->type_cb->currentText() == tr("Chiffre 01"))
else if (ui->type_cb->currentText() == tr("number format 01"))
setType(ten);
else if (ui->type_cb->currentText() == tr("Chiffre 01 - Folio"))
else if (ui->type_cb->currentText() == tr("number format 01 - Sheet"))
setType(tenfolio);
else if (ui->type_cb->currentText() == tr("Chiffre 001"))
else if (ui->type_cb->currentText() == tr("number format 001"))
setType(hundred);
else if (ui->type_cb->currentText() == tr("Chiffre 001 - Folio"))
else if (ui->type_cb->currentText() == tr("number format 001 - Sheet"))
setType(hundredfolio);
else if (ui->type_cb->currentText() == tr("Texte"))
else if (ui->type_cb->currentText() == tr("Text"))
setType(string);
else if (ui->type_cb->currentText() == tr("N° folio"))
else if (ui->type_cb->currentText() == tr("Sheet no."))
setType(idfolio);
else if (ui->type_cb->currentText() == tr("Folio"))
else if (ui->type_cb->currentText() == tr("Sheet"))
setType(folio);
else if (ui->type_cb->currentText() == tr("Installation"))
else if (ui->type_cb->currentText() == tr("Plant"))
setType(plant);
else if (ui->type_cb->currentText() == tr("Locmach"))
else if (ui->type_cb->currentText() == tr("Location"))
setType(locmach);
else if (ui->type_cb->currentText() == tr("Element Line"))
setType(elementline);
@@ -317,9 +317,9 @@ void NumPartEditorW::on_type_cb_activated(int) {
setType(elementcolumn);
else if (ui->type_cb->currentText() == tr("Element Prefix"))
setType(elementprefix);
else if (ui->type_cb->currentText() == tr("Cyclique (modulo)"))
else if (ui->type_cb->currentText() == tr("Cyclic (modulo)"))
setType(wrap);
else if (ui->type_cb->currentText() == tr("Alphabétique"))
else if (ui->type_cb->currentText() == tr("Alphabetical"))
setType(alpha);
emit changed();
}
@@ -481,29 +481,29 @@ void NumPartEditorW::setType(NumPartEditorW::type t, bool fnum) {
void NumPartEditorW::setCurrentIndex(NumPartEditorW::type t) {
int i=-1;
if (t == unit)
i = ui->type_cb->findText(tr("Chiffre 1"));
i = ui->type_cb->findText(tr("number format 1"));
else if (t == unitfolio)
i = ui->type_cb->findText(tr("Chiffre 1 - Folio"));
i = ui->type_cb->findText(tr("number format 1 - Sheet"));
else if (t == ten)
i = ui->type_cb->findText(tr("Chiffre 01"));
i = ui->type_cb->findText(tr("number format 01"));
else if (t == tenfolio)
i = ui->type_cb->findText(tr("Chiffre 01 - Folio"));
i = ui->type_cb->findText(tr("number format 01 - Sheet"));
else if (t == hundred)
i = ui->type_cb->findText(tr("Chiffre 001"));
i = ui->type_cb->findText(tr("number format 001"));
else if (t == hundredfolio)
i = ui->type_cb->findText(tr("Chiffre 001 - Folio"));
i = ui->type_cb->findText(tr("number format 001 - Sheet"));
else if (t == alpha)
i = ui->type_cb->findText(tr("Alphabétique"));
i = ui->type_cb->findText(tr("Alphabetical"));
else if (t == string)
i = ui->type_cb->findText(tr("Texte"));
i = ui->type_cb->findText(tr("Text"));
else if (t == idfolio)
i = ui->type_cb->findText(tr("N° folio"));
i = ui->type_cb->findText(tr("Sheet no."));
else if (t == folio)
i = ui->type_cb->findText(tr("Folio"));
i = ui->type_cb->findText(tr("Sheet"));
else if (t == plant)
i = ui->type_cb->findText(tr("Installation"));
i = ui->type_cb->findText(tr("Plant"));
else if (t == locmach)
i = ui->type_cb->findText(tr("Locmach"));
i = ui->type_cb->findText(tr("Location"));
else if (t == elementline)
i = ui->type_cb->findText(tr("Element Line"));
else if (t == elementcolumn)
@@ -511,6 +511,6 @@ void NumPartEditorW::setCurrentIndex(NumPartEditorW::type t) {
else if (t == elementprefix)
i = ui->type_cb->findText(tr("Element Prefix"));
else if (t == wrap)
i = ui->type_cb->findText(tr("Cyclique (modulo)"));
i = ui->type_cb->findText(tr("Cyclic (modulo)"));
ui->type_cb->setCurrentIndex(i);
}