Fix skin

GIBIS-UNIFESP · Jul 13, 2022 · d22165f · d22165f
1 parent 37bd63e
commit d22165f
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 18 deletions.
diff --git a/app/element/clock.cpp b/app/element/clock.cpp
@@ -140,7 +140,12 @@ QString Clock::genericProperties()
 
 void Clock::setSkin(const bool defaultSkin, const QString &fileName)
 {
+    if (defaultSkin) {
+        m_alternativeSkins = m_defaultSkins;
+    } else {
+        m_alternativeSkins[static_cast<int>(m_isOn)] = fileName;
+    }
+
     m_usingDefaultSkin = defaultSkin;
-    m_alternativeSkins[static_cast<int>(m_isOn)] = fileName;
     setPixmap(static_cast<int>(m_isOn));
 }
diff --git a/app/element/inputbutton.cpp b/app/element/inputbutton.cpp
@@ -103,7 +103,12 @@ void InputButton::setOn(const bool value, const int port)
 
 void InputButton::setSkin(const bool defaultSkin, const QString &fileName)
 {
+    if (defaultSkin) {
+        m_alternativeSkins = m_defaultSkins;
+    } else {
+        m_alternativeSkins[static_cast<int>(m_isOn)] = fileName;
+    }
+
     m_usingDefaultSkin = defaultSkin;
-    m_alternativeSkins[static_cast<int>(m_isOn)] = fileName;
     setPixmap(static_cast<int>(m_isOn));
 }
diff --git a/app/element/inputrotary.cpp b/app/element/inputrotary.cpp
@@ -244,8 +244,14 @@ void InputRotary::load(QDataStream &stream, QMap<quint64, QNEPort *> &portMap, c
 
 void InputRotary::setSkin(const bool defaultSkin, const QString &fileName)
 {
+    if (defaultSkin) {
+        m_alternativeSkins = m_defaultSkins;
+    } else {
+        m_alternativeSkins[0] = fileName;
+    }
+
     m_usingDefaultSkin = defaultSkin;
-    m_alternativeSkins[0] = fileName;
+    setPixmap(0);
 }
 
 int InputRotary::outputSize() const

diff --git a/app/element/inputswitch.cpp b/app/element/inputswitch.cpp
@@ -95,7 +95,12 @@ void InputSwitch::load(QDataStream &stream, QMap<quint64, QNEPort *> &portMap, c
 
 void InputSwitch::setSkin(const bool defaultSkin, const QString &fileName)
 {
+    if (defaultSkin) {
+        m_alternativeSkins = m_defaultSkins;
+    } else {
+        m_alternativeSkins[static_cast<int>(m_isOn)] = fileName;
+    }
+
     m_usingDefaultSkin = defaultSkin;
-    m_alternativeSkins[static_cast<int>(m_isOn)] = fileName;
     setPixmap(static_cast<int>(m_isOn));
 }
diff --git a/app/graphicelement.cpp b/app/graphicelement.cpp
@@ -159,9 +159,9 @@ void GraphicElement::save(QDataStream &stream) const
     }
 
     /* <\Version2.7> */
-    stream << static_cast<quint64>(m_defaultSkins.size());
+    stream << static_cast<quint64>(m_alternativeSkins.size());
 
-    for (const QString &skinName : m_defaultSkins) {
+    for (const auto &skinName : m_alternativeSkins) {
         stream << skinName;
     }
 
@@ -387,6 +387,8 @@ void GraphicElement::loadPixmapSkinNames(QDataStream &stream, const double versi
             loadPixmapSkinName(stream, static_cast<int>(skin));
         }
 
+        m_usingDefaultSkin = (m_defaultSkins == m_alternativeSkins);
+
         refresh();
     }
 }
@@ -396,21 +398,12 @@ void GraphicElement::loadPixmapSkinName(QDataStream &stream, const int skin)
     QString name;
     stream >> name;
 
-    if (skin >= m_defaultSkins.size()) {
+    if (skin >= m_alternativeSkins.size()) {
         qCDebug(zero) << tr("Could not load some of the skins.");
     }
 
     if (!name.startsWith(":/")) {
-        QDir dir(QFileInfo(GlobalProperties::currentFile).absoluteDir());
-        QString fileName(QFileInfo(name).fileName());
-        QFileInfo fileInfo(dir, fileName);
-        qCDebug(zero) << tr("Skin fileName:") << fileInfo.absoluteFilePath();
-
-        if (!fileInfo.isFile()) {
-            qCDebug(zero) << tr("Could not load some of the skins.");
-        }
-
-        m_defaultSkins[skin] = fileInfo.absoluteFilePath();
+        m_alternativeSkins[skin] = name;
     }
 }
 
@@ -516,8 +509,13 @@ qreal GraphicElement::rotation() const
 
 void GraphicElement::setSkin(const bool defaultSkin, const QString &fileName)
 {
+    if (defaultSkin) {
+        m_alternativeSkins = m_defaultSkins;
+    } else {
+        m_alternativeSkins[0] = fileName;
+    }
+
     m_usingDefaultSkin = defaultSkin;
-    m_alternativeSkins.first() = fileName;
     setPixmap(0);
 }