Merge branch 'master' into filedialog

.github/workflows/build.yml

@@ -345,7 +345,7 @@ jobs:
         run: |
           set MSYSTEM=MINGW32
           mkdir -p /c/Qt/D2XXSDK
-          wget http://www.ftdichip.com/Drivers/CDM/CDM%20v2.12.36.4%20WHQL%20Certified.zip -O /c/Qt/D2XXSDK/cdm.zip
+          wget https://ftdichip.com/wp-content/uploads/2023/09/CDM-v2.12.36.4-WHQL-Certified.zip -O /c/Qt/D2XXSDK/cdm.zip
           cd /c/Qt/D2XXSDK
           unzip cdm.zip
           cd i386

.gitignore

@@ -50,4 +50,4 @@ coverage/
 .vscode/
 
 # CMake build
-build/
+build*

debian/changelog

@@ -1,9 +1,34 @@
 qlcplus (4.12.8) stable; urgency=low
 
   * engine: fix Chaser random startup (thanks to Dennis Suermann)
+  * Virtual Console/Slider: fix switching from playback to submaster mode
+  * Virtual Console/XY Pad: fix Scene preset controlling wrong channels
   * Plugins/ArtNet: add default standard transmission mode as per protocol specifications
+  * Plugins/ArtNet,E1.31,OSC: add a parameter to wait for interfaces to be ready
   * Plugins/DMX USB: add support for DMXKing MAX products
+  * Fixture Editor: fix aliases not updated when renaming a mode
   * New fixture: Ibiza Mini Moving Star Wash (thanks to Chris Shucksmith)
+  * New fixtures: FOS Technologies IQ Par, IQ 28x12 Wash, Iridium 75W Spot (thanks to Maurizio Aru)
+  * New fixture: Varytec Hero Spot 60 (thanks to Hans-Jürgen Tappe)
+  * New fixture: beamZ BAC503 (thanks to archlinette)
+  * New fixtures: Cameo Flat Pro 7, 12 and 18 (thanks to Janosch Frank)
+  * New fixture: Eurolite LED TMH-X4 (thanks to Tolmino Muccitelli)
+  * New fixtures: Cameo Q-Spot 40 RGBW, Varytec LED PAR 14x8W, Varytec LED Typhoon PAR Outdoor (12x10) (thanks to Jochen Becker)
+  * New fixtures: Audibax Iowa 70, Pro-Lights CromoWash100 (thanks to Cristian)
+  * New fixtures: Showtec Spectral M1000 Q4, Showtec Kanjo Wash RGB (thanks to Michel Sliepenbeek)
+  * New fixtures: Laserworld CS-1000RGB Mk3, Chauvet Gobozap (thanks to Federico)
+  * New fixture: Eurolite LED Bar 2 RGBA 252/10 40° Indoor (thanks to Edgar Aichinger)
+  * New fixture: Rockville Battery Strip 24 (thanks to Ryan Lindsey)
+  * New fixture: beamZ LCB244 (thanks to Bjorn Roesbeke)
+  * New fixture: Involight NL410 (thanks to Vorona)
+  * New fixture: Flash-Butrym LED PAR 64 7x10W RGBW (thanks to Paolo Betti)
+  * New fixture: Eurolite LED KLS-180 (thanks to Claudio Filieri)
+  * New fixture: Shehds LED Flat Par 7x18W RGBWA+UV (thanks to Tiago)
+  * New fixtures: Martin Atomic 3000 LED, Ayrton NandoBeam S3 (thanks to Yestalgia)
+  * New fixture: lightmaXX Vega Arc Pro II MkII (thanks to João Gonçalves)
+  * New fixture: Shehds LED Flat Par 18x18W RGBWA+UV (thanks to Santiago Benejam)
+  * New fixture: Eurolite TMH-15 (thanks to Nicolas Rasor)
+  * New fixtures: Shehds JMS WEBB LED Wash Big Bee Eye 19X40W, LED 230W Beam Moving Head (thanks to István Király,  Feiyu Shehds)
 
  -- Massimo Callegari <massimocallegari@yahoo.it>  Sun, 17 Dec 2023 12:13:14 +0200
 

engine/test/qlci18n/qlci18n_fi_FI.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fi_FI">
+<TS version="2.1" language="fi_FI">
 <context>
     <name>QLCi18n_Test</name>
     <message>

fixtureeditor/fixtureeditor.cpp

@@ -842,6 +842,8 @@ void QLCFixtureEditor::slotEditMode()
     if (mode == NULL)
         return;
 
+    QString origName = mode->name();
+
     EditMode em(this, mode);
     connect(&em, SIGNAL(copyToClipboard(QLCPhysical)),
             this, SLOT(slotCopyPhysicalClipboard(QLCPhysical)));
@@ -851,7 +853,17 @@ void QLCFixtureEditor::slotEditMode()
 
         item = m_modeList->currentItem();
         updateModeItem(mode, item);
+
+        // if mode name has changed, update
+        // all aliases referring to the old name
+        if (mode->name() != origName)
+        {
+            updateAliasModeName(origName, mode->name());
+            refreshAliasTree();
+        }
+
         refreshAliasModes();
+
         setModified();
         m_modeList->header()->resizeSections(QHeaderView::ResizeToContents);
     }
@@ -1067,6 +1079,32 @@ void QLCFixtureEditor::refreshAliasModes()
     refreshAliasModeChannels();
 }
 
+void QLCFixtureEditor::updateAliasModeName(QString oldName, QString newName)
+{
+    QListIterator <QLCChannel*> it(m_fixtureDef->channels());
+    while (it.hasNext() == true)
+    {
+        QLCChannel *channel = it.next();
+        foreach (QLCCapability *cap, channel->capabilities())
+        {
+            if (cap->preset() != QLCCapability::Alias)
+                continue;
+
+            QList<AliasInfo> aliasList = cap->aliasList();
+            for (int i = 0; i < aliasList.count(); i++)
+            {
+                AliasInfo info = aliasList.at(i);
+                if (info.targetMode == oldName)
+                {
+                    info.targetMode = newName;
+                    aliasList.replace(i, info);
+                }
+            }
+            cap->replaceAliases(aliasList);
+        }
+    }
+}
+
 void QLCFixtureEditor::refreshAliasModeChannels()
 {
     m_modeChannels->clear();

fixtureeditor/fixtureeditor.h

@@ -127,6 +127,7 @@ protected slots:
     void slotAddAliasClicked();
     void slotRemoveAliasClicked();
     void refreshAliasModes();
+    void updateAliasModeName(QString oldName, QString newName);
     void refreshAliasModeChannels();
 
 protected:

fixtureeditor/fixtureeditor.ui

@@ -223,7 +223,7 @@
          </item>
          <item>
           <property name="text">
-           <string>LED Bar (Beams)</string>
+           <string notr="true">LED Bar (Beams)</string>
           </property>
           <property name="icon">
            <iconset resource="../ui/src/qlcui.qrc">
@@ -232,7 +232,7 @@
          </item>
          <item>
           <property name="text">
-           <string>LED Bar (Pixels)</string>
+           <string notr="true">LED Bar (Pixels)</string>
           </property>
           <property name="icon">
            <iconset resource="../ui/src/qlcui.qrc">