Fix debian/rules bug in aarch64

KangLin · Jun 20, 2024 · 190284b · 190284b
1 parent ec3b9fc
commit 190284b
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 11 deletions.
diff --git a/3th_libs/LunarCalendar b/3th_libs/LunarCalendar
diff --git a/Src/FrmFullScreen.cpp b/Src/FrmFullScreen.cpp
@@ -79,13 +79,15 @@ int CFrmFullScreen::Prompt(const QString szPrompt, int nValue, int nMin, int nMa
 
 int CFrmFullScreen::SetBackgroupImage(const QString szImage)
 {
-    m_bpBackgroup.load(szImage);
+    QImage img(szImage);
+    return SetBackgroupImage(img);
+}
 
+int CFrmFullScreen::SetBackgroupImage(const QImage img)
+{
+    setStyleSheet("");
     QPalette palette;
-    palette.setBrush(QPalette::Window, QBrush(m_bpBackgroup.scaled(this->geometry().size())));
+    palette.setBrush(QPalette::Window, QBrush(img.scaled(this->geometry().size())));
     setPalette(palette);
-
-    setStyleSheet("");
-
     return 0;
 }
diff --git a/Src/FrmFullScreen.h b/Src/FrmFullScreen.h
@@ -22,6 +22,7 @@ class CFrmFullScreen : public QWidget
 
     int Prompt(const QString szPrompt, int nValue = 0, int nMin = 0,  int nMax = 100, bool bInverted = false);
     int SetBackgroupImage(const QString szImage);
+    int SetBackgroupImage(const QImage img);
 
 protected:
     virtual void paintEvent(QPaintEvent *event);

diff --git a/Src/ObjectFactory.h b/Src/ObjectFactory.h
@@ -71,6 +71,14 @@ class CObjectFactory
                 if(b)
                     value = QIcon(p);
             }
+            if("backgroundImage" == szName && value.isValid())
+            {
+                QImage img;
+                QByteArray ba = QByteArray::fromBase64(value.toByteArray());
+                bool b = img.loadFromData(ba);
+                if(b)
+                    value = img;
+            }
             if(value.isValid())
                 pThis->setProperty(szName.toStdString().c_str(), value);
             /*int nIndex = pObj->indexOfProperty(szName.toStdString().c_str());
@@ -117,6 +125,16 @@ class CObjectFactory
                 if(!ba.isEmpty())
                     value = ba.toBase64();
             }
+            if("backgroundImage" == szName && !value.isNull())
+            {
+                QImage img = value.value<QImage>();
+                QByteArray ba;
+                QBuffer buf(&ba);
+                if(buf.open(QIODevice::WriteOnly))
+                    img.save(&buf, "PNG");
+                if(!ba.isEmpty())
+                    value = ba.toBase64();
+            }
             //qDebug() << "property name: " << szName << " value: " << value.toString();
             if(value.isValid())
             {

diff --git a/Src/Task.cpp b/Src/Task.cpp
@@ -216,6 +216,18 @@ QString CTask::szRemaining()
     return tm.toString("HH:mm:ss");
 }
 
+QImage CTask::GetBackground() const
+{
+    return m_imgBackground;
+}
+
+void CTask::SetBackground(const QImage &newImgBackground)
+{
+    if (m_imgBackground == newImgBackground)
+        return;
+    m_imgBackground = newImgBackground;
+}
+
 int CTask::GetPromptInterval() const
 {
     return m_nPromptInterval;

diff --git a/Src/Task.h b/Src/Task.h
@@ -22,6 +22,7 @@ class CTask : public QObject
     Q_PROPERTY(bool end READ End)
     Q_PROPERTY(QString description READ GetDescription)
     Q_PROPERTY(QIcon icon READ GetIcon WRITE SetIcon)
+    Q_PROPERTY(QImage backgroundImage READ GetBackground WRITE SetBackground)
     Q_PROPERTY(QString startSound READ GetStartSound WRITE SetStartSound)
     Q_PROPERTY(QString runSound READ GetRunSound WRITE SetRunSound)
 
@@ -48,6 +49,8 @@ class CTask : public QObject
     Q_INVOKABLE virtual QString GetContent() const;
     Q_INVOKABLE virtual int SetIcon(QIcon icon);
     Q_INVOKABLE QIcon GetIcon();
+    Q_INVOKABLE QImage GetBackground() const;
+    Q_INVOKABLE void SetBackground(const QImage &newImgBackground);
     Q_INVOKABLE virtual int GetInterval() const;
     Q_INVOKABLE virtual int SetInterval(int nInterval);
     Q_INVOKABLE virtual int GetPromptInterval() const;
@@ -58,7 +61,7 @@ class CTask : public QObject
     Q_INVOKABLE virtual QString GetRunSound();
     Q_INVOKABLE virtual int SetSound(const QString &szStartSound = QString(),
                                      const QString &szRunSound = QString());
-    
+
     Q_INVOKABLE virtual int LoadSettings(const QDomElement &e);
     Q_INVOKABLE virtual int SaveSettings(QDomElement &e);
 
@@ -80,6 +83,7 @@ class CTask : public QObject
     virtual bool End();
 
     int Elapsed();
+
 protected Q_SLOTS:
     virtual void slotPrompt();
 
@@ -94,7 +98,6 @@ protected Q_SLOTS:
 protected:
     int Remaining();
     QString szRemaining();
-
     //QTimer m_PromptTimer;
     QTime m_PromptTime;
     int m_nPromptInterval;
@@ -105,11 +108,12 @@ protected Q_SLOTS:
     QString m_szTitle;
     QString m_szContent;
     QIcon m_Icon;
-
+    QImage m_imgBackground;
+
     QElapsedTimer m_Time;
     int m_nInterval;
 
-    int Init();    
+    int Init();
 };
 
 Q_DECLARE_METATYPE(CTask)

diff --git a/debian/rules b/debian/rules
@@ -31,7 +31,8 @@ override_dh_auto_configure:
             -DCMAKE_BUILD_TYPE=Release
 
 override_dh_auto_build:
-	cmake --build $(BUILD_DIR) --config Release --parallel $(if "`cat /proc/cpuinfo |grep 'cpu cores' |wc -l`", `cat /proc/cpuinfo |grep 'cpu cores' |wc -l`, 1)
+	cmake --build $(BUILD_DIR) --config Release \
+	--parallel $(if "`cat /proc/cpuinfo |grep 'processor' |wc -l`", `cat /proc/cpuinfo |grep 'processor' |wc -l`, 1)
 
 override_dh_auto_install:
 	cmake --install $(BUILD_DIR) --config Release \