chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tweaks to the slide class to allow better inheritance

Browse source
This commit is contained in:
Chris Cochrun 2023-01-18 15:58:24 -06:00
parent fd76b1f17c
commit b0f807d3bb
2 changed files with 19 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/cpp/slide.h
View file

@ -11,8 +11,8 @@ class Slide : public QObject
Q_OBJECT
Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
Q_PROPERTY(QString type READ type WRITE setType NOTIFY typeChanged)
Q_PROPERTY(QVariantMap serviceItem READ serviceItem WRITE setServiceItem
NOTIFY serviceItemChanged)
Q_PROPERTY(QVariantMap serviceItemId READ serviceItemId WRITE setServiceItemId
NOTIFY serviceItemIdChanged)
Q_PROPERTY(QString audio READ audio WRITE setAudio NOTIFY audioChanged)
Q_PROPERTY(QString imageBackground READ imageBackground WRITE setImageBackground
NOTIFY imageBackgroundChanged)
@ -25,22 +25,19 @@ class Slide : public QObject
Q_PROPERTY(QString font READ font WRITE setFont NOTIFY fontChanged)
Q_PROPERTY(int fontSize READ fontSize WRITE setFontSize NOTIFY fontSizeChanged)
Q_PROPERTY(int imageCount READ imageCount WRITE setImageCount NOTIFY imageCountChanged)
Q_PROPERTY(int pdfIndex READ pdfIndex WRITE setPdfIndex NOTIFY pdfIndexChanged)
Q_PROPERTY(int slideIndex READ slideIndex WRITE setSlideIndex NOTIFY slideIndexChanged)
Q_PROPERTY(bool isPlaying READ isPlaying NOTIFY isPlayingChanged)
// QML_ELEMENT
public:
explicit Slide(QObject *parent = nullptr);
Slide(const QString &text, const QString &audio, const QString &imageBackground, const QString &videoBackground,
Slide(const QString &text, const QString &audio,
const QString &imageBackground, const QString &videoBackground,
const QString &horizontalTextAlignment, const QString &verticalTextAlignment,
const QString &font, const int &fontSize, const int &imageCount,
const int &pdfIndex, const bool &isPlaying, const QString &type,
const QString &type,
QObject * parent = nullptr);
QString text() const;
QString type() const;
QVariantMap serviceItem() const;
QString audio() const;
QString imageBackground() const;
QString videoBackground() const;
@ -49,13 +46,11 @@ public:
QString font() const;
int fontSize() const;
int imageCount() const;
int pdfIndex() const;
int slideIndex() const;
bool isPlaying() const;
int serviceItemId() const;
Q_INVOKABLE void setText(QString text);
Q_INVOKABLE void setType(QString type);
Q_INVOKABLE void setServiceItem(QVariantMap serviceItem);
Q_INVOKABLE void setServiceItemId(int serviceItemId);
Q_INVOKABLE void setAudio(QString audio);
Q_INVOKABLE void setImageBackground(QString imageBackground);
Q_INVOKABLE void setVideoBackground(QString videoBackground);
@ -64,21 +59,11 @@ public:
Q_INVOKABLE void setFont(QString font);
Q_INVOKABLE void setFontSize(int fontSize);
Q_INVOKABLE void setImageCount(int imageCount);
Q_INVOKABLE void setPdfIndex(int pdfIndex);
Q_INVOKABLE void setSlideIndex(int slideIndex);
Q_INVOKABLE void changeSlide(QVariantMap item);
Q_INVOKABLE void play();
Q_INVOKABLE void pause();
Q_INVOKABLE void playPause();
Q_INVOKABLE bool next(QVariantMap nextItem);
Q_INVOKABLE bool previous(QVariantMap prevItem);
Q_INVOKABLE bool changeSlideIndex(int index);
signals:
Q_INVOKABLE void textChanged(QString text);
Q_INVOKABLE void typeChanged(QString type);
Q_INVOKABLE void serviceItemChanged(QVariantMap serviceItem);
Q_INVOKABLE void serviceItemIdChanged(int serviceItemId);
Q_INVOKABLE void audioChanged(QString audio);
Q_INVOKABLE void imageBackgroundChanged(QString imageBackground);
Q_INVOKABLE void videoBackgroundChanged(QString videoBackground);
@ -87,15 +72,12 @@ signals:
Q_INVOKABLE void fontChanged(QString font);
Q_INVOKABLE void fontSizeChanged(int fontSize);
Q_INVOKABLE void imageCountChanged(int imageCount);
Q_INVOKABLE void pdfIndexChanged(int pdfIndex);
Q_INVOKABLE void slideIndexChanged(int slideIndex);
Q_INVOKABLE void isPlayingChanged(bool isPlaying);
private:
int m_id;
QString m_text;
QString m_type;
QVariantMap m_serviceItem;
int m_serviceItemId;
QString m_audio;
QString m_imageBackground;
QString m_videoBackground;
@ -104,11 +86,6 @@ private:
QString m_font;
int m_fontSize;
int m_imageCount;
int m_pdfIndex;
bool m_isPlaying;
int m_slideIndex;
int m_slideSize;
};
#endif //SLIDE_H