diff --git a/FicheJDR.pro b/FicheJDR.pro index 5d0f7c1..6639e05 100644 --- a/FicheJDR.pro +++ b/FicheJDR.pro @@ -27,3 +27,6 @@ FORMS += \ qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target + +RESOURCES += \ + data.qrc diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/QObject.2F9576522E30C123.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/QObject.2F9576522E30C123.idx new file mode 100644 index 0000000..76b836a Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/QObject.2F9576522E30C123.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/QPlainTextEdit.31ADA8E7F564A29F.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/QPlainTextEdit.31ADA8E7F564A29F.idx new file mode 100644 index 0000000..925310f Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/QPlainTextEdit.31ADA8E7F564A29F.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/QRect.B81C78AA08A94D30.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/QRect.B81C78AA08A94D30.idx new file mode 100644 index 0000000..9d7e780 Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/QRect.B81C78AA08A94D30.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/QSize.B5C3AF016F4C77AF.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/QSize.B5C3AF016F4C77AF.idx new file mode 100644 index 0000000..0827d3c Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/QSize.B5C3AF016F4C77AF.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/QSizeF.60126F71BC8C110B.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/QSizeF.60126F71BC8C110B.idx new file mode 100644 index 0000000..8261862 Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/QSizeF.60126F71BC8C110B.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/QTransform.DD00118B8CBD09C3.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/QTransform.DD00118B8CBD09C3.idx new file mode 100644 index 0000000..a4b48a3 Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/QTransform.DD00118B8CBD09C3.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/character.h.A7CC38751E8E8AEF.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/character.h.A7CC38751E8E8AEF.idx index 19f9d3d..51f3408 100644 Binary files a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/character.h.A7CC38751E8E8AEF.idx and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/character.h.A7CC38751E8E8AEF.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/main.cpp.22D986ED057C3D91.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/main.cpp.22D986ED057C3D91.idx index 617009c..322764d 100644 Binary files a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/main.cpp.22D986ED057C3D91.idx and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/main.cpp.22D986ED057C3D91.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.2A4AD3FFCE72E917.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.2A4AD3FFCE72E917.idx index 8952232..17726c9 100644 Binary files a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.2A4AD3FFCE72E917.idx and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.2A4AD3FFCE72E917.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.h.DF3B3D8668DB37C8.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.h.DF3B3D8668DB37C8.idx index 9b9cbdc..12cf38b 100644 Binary files a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.h.DF3B3D8668DB37C8.idx and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.h.DF3B3D8668DB37C8.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/notepad.cpp.F1E6942CA3E3079E.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/notepad.cpp.F1E6942CA3E3079E.idx index b0f578e..d823198 100644 Binary files a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/notepad.cpp.F1E6942CA3E3079E.idx and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/notepad.cpp.F1E6942CA3E3079E.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/notepad.h.330AB84A347CDD30.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/notepad.h.330AB84A347CDD30.idx index 995b90a..3e7f049 100644 Binary files a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/notepad.h.330AB84A347CDD30.idx and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/notepad.h.330AB84A347CDD30.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qabstractscrollarea.h.7257541B3873E010.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qabstractscrollarea.h.7257541B3873E010.idx new file mode 100644 index 0000000..2907144 Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qabstractscrollarea.h.7257541B3873E010.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qabstracttextdocumentlayout.h.D347B7DB55601BBA.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qabstracttextdocumentlayout.h.D347B7DB55601BBA.idx new file mode 100644 index 0000000..53b3e17 Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qabstracttextdocumentlayout.h.D347B7DB55601BBA.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qevent.h.CEBB37409D5065FE.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qevent.h.CEBB37409D5065FE.idx new file mode 100644 index 0000000..aa722c9 Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qevent.h.CEBB37409D5065FE.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qeventpoint.h.E8157CBFE1B23825.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qeventpoint.h.E8157CBFE1B23825.idx new file mode 100644 index 0000000..88f92c3 Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qeventpoint.h.E8157CBFE1B23825.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qfontdatabase.h.BE5A1B3A18CECC70.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qfontdatabase.h.BE5A1B3A18CECC70.idx new file mode 100644 index 0000000..3f80e55 Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qfontdatabase.h.BE5A1B3A18CECC70.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qglyphrun.h.A9D93B849ADE08CC.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qglyphrun.h.A9D93B849ADE08CC.idx new file mode 100644 index 0000000..5c0bb52 Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qglyphrun.h.A9D93B849ADE08CC.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qinputdevice.h.95F76AB7AD2D7B82.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qinputdevice.h.95F76AB7AD2D7B82.idx new file mode 100644 index 0000000..fe8d70b Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qinputdevice.h.95F76AB7AD2D7B82.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qplaintextedit.h.5FD7795FC6B84C6D.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qplaintextedit.h.5FD7795FC6B84C6D.idx new file mode 100644 index 0000000..9cc4351 Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qplaintextedit.h.5FD7795FC6B84C6D.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qpointingdevice.h.688591B6369D6A42.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qpointingdevice.h.688591B6369D6A42.idx new file mode 100644 index 0000000..9554ec3 Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qpointingdevice.h.688591B6369D6A42.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qrawfont.h.2D5E79358FB52AF9.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qrawfont.h.2D5E79358FB52AF9.idx new file mode 100644 index 0000000..3ff8a57 Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qrawfont.h.2D5E79358FB52AF9.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qscreen.h.2660A2B42199AD4C.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qscreen.h.2660A2B42199AD4C.idx new file mode 100644 index 0000000..7107086 Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qscreen.h.2660A2B42199AD4C.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qscreen_platform.h.D0C99A81CC5BE7B7.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qscreen_platform.h.D0C99A81CC5BE7B7.idx new file mode 100644 index 0000000..177d017 Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qscreen_platform.h.D0C99A81CC5BE7B7.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qtextedit.h.099540076FB53E88.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qtextedit.h.099540076FB53E88.idx new file mode 100644 index 0000000..5aac9f5 Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qtextedit.h.099540076FB53E88.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qtextlayout.h.9DB3DD10C65B2B74.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qtextlayout.h.9DB3DD10C65B2B74.idx new file mode 100644 index 0000000..b494272 Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qtextlayout.h.9DB3DD10C65B2B74.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qvector2d.h.9F3B2858B12B1264.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qvector2d.h.9F3B2858B12B1264.idx new file mode 100644 index 0000000..76640cb Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qvector2d.h.9F3B2858B12B1264.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qvectornd.h.F4D68D3E5A86B82C.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qvectornd.h.F4D68D3E5A86B82C.idx new file mode 100644 index 0000000..61562e8 Binary files /dev/null and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/qvectornd.h.F4D68D3E5A86B82C.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/ui_mainwindow.h.EFECBBF5C95CDB15.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/ui_mainwindow.h.EFECBBF5C95CDB15.idx index 8e9e900..2ab00c6 100644 Binary files a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/ui_mainwindow.h.EFECBBF5C95CDB15.idx and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/ui_mainwindow.h.EFECBBF5C95CDB15.idx differ diff --git a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/ui_notepad.h.DFD52ACE000A91D4.idx b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/ui_notepad.h.DFD52ACE000A91D4.idx index 28fd688..2a89dd2 100644 Binary files a/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/ui_notepad.h.DFD52ACE000A91D4.idx and b/FicheJDR/build/Desktop_Qt_6_9_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/ui_notepad.h.DFD52ACE000A91D4.idx differ diff --git a/Gitea repo - Raccourci.lnk b/Gitea repo - Raccourci.lnk new file mode 100644 index 0000000..028ef49 Binary files /dev/null and b/Gitea repo - Raccourci.lnk differ diff --git a/character.cpp b/character.cpp index df4e2de..6ff5851 100644 --- a/character.cpp +++ b/character.cpp @@ -1,5 +1,5 @@ #include "character.h" -#include + #include #include #include @@ -35,6 +35,8 @@ Character::Character(QFile *file){ taille = json["taille"].toDouble(); vie = json["vie"].toInt(); image = json["image"].toString(); + texteBlocNote = json["blocNote"].toString(); + texteBackPack = json["backPack"].toString(); QJsonArray skillArray = json["skills"].toArray(); for (int i = 0; i < skillArray.size(); ++i) { diff --git a/character.h b/character.h index d78925a..6e07a8f 100644 --- a/character.h +++ b/character.h @@ -15,11 +15,13 @@ private: int niveau; QString sexe; float taille; + int vie; + QString image; + QString texteBlocNote; + QString texteBackPack; QList skills; QList skillsMod; QList stats; - int vie; - QString image; public: Character(); @@ -33,10 +35,27 @@ public: int getNiveau(){return niveau;} QString getSexe(){return sexe;} float getTaille(){return taille;} + int getVie(){return vie;} + QString getTexteBlocNote(){return texteBlocNote;} + QString getTexteBackPack(){return texteBackPack;} QList getSkills(){return skills;} QList getSkillsMod(){return skillsMod;} QList getStats(){return stats;} - int getVie(){return vie;} + + void setImage(QString i){image = i;} + void setNom(QString n){nom = n;} + void setAge(int a){age = a;} + void setRace(QString r){race = r;} + void setClasse(QString c){classe = c;} + void setNiveau(int n){niveau = n;} + void setSexe(QString s){sexe = s;} + void setTaille(float t){taille = t;} + void setVie(int v){vie = v;} + void setTexteBlocNote(QString bN){texteBlocNote = bN;} + void setTexteBackPack(QString bP){texteBackPack = bP;} + void setSkills(QList sk){skills = sk;} + void setSkillsMod(QList skM){skillsMod = skM;} + void setStats(QList st){stats = st;} }; diff --git a/data.qrc b/data.qrc new file mode 100644 index 0000000..72d15c3 --- /dev/null +++ b/data.qrc @@ -0,0 +1,27 @@ + + + data/images/add.png + data/images/bold.png + data/images/copy.png + data/images/create.png + data/images/cut.png + data/images/edit_redo.png + data/images/edit_undo.png + data/images/exit.png + data/images/font.png + data/images/font-color.png + data/images/font-size.png + data/images/info.png + data/images/italic.png + data/images/logo.png + data/images/new.png + data/images/open.png + data/images/overline.png + data/images/paste.png + data/images/pencil.png + data/images/print.png + data/images/save.png + data/images/save_as.png + data/images/underline.png + + diff --git a/data/a.txt b/data/a.txt new file mode 100644 index 0000000..595ce79 --- /dev/null +++ b/data/a.txt @@ -0,0 +1,49 @@ +{ + "age": 0, + "backPack": "", + "blocNote": "dghdgdgfgd", + "classe": "", + "image": "data/images/logo.png", + "name": "", + "niveau": 0, + "race": "", + "sexe": "", + "skills": [ + 0, + 0, + 0, + 0, + 0, + 0 + ], + "skillsMod": [ + 0, + 0, + 0, + 0, + 0, + 0 + ], + "stats": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ], + "taille": 0, + "vie": 6619181 +} diff --git a/data/b.txt b/data/b.txt new file mode 100644 index 0000000..0af3034 --- /dev/null +++ b/data/b.txt @@ -0,0 +1,49 @@ +{ + "age": 0, + "backPack": "", + "blocNote": "ssd", + "classe": "", + "image": "data/images/logo.png", + "name": "", + "niveau": 0, + "race": "", + "sexe": "", + "skills": [ + 0, + 0, + 0, + 0, + 0, + 0 + ], + "skillsMod": [ + 0, + 0, + 0, + 0, + 0, + 0 + ], + "stats": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ], + "taille": 0, + "vie": 6619181 +} diff --git a/data/p1.txt b/data/p1.txt deleted file mode 100644 index 4444dcd..0000000 --- a/data/p1.txt +++ /dev/null @@ -1,14 +0,0 @@ -{ - name : "ujunb", - age : 12, - race : "zifzi", - classe : "uhuh", - niveau : 2, - sexe : "H", - taille : 1.2, - vie : 2, - image : "data/images/logo.png", - skills : [1,1,1,1,1,1], - skillsMod : [1,1,1,1,1,1], - stats : [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1] -} \ No newline at end of file diff --git a/data/test.txt b/data/test.txt new file mode 100644 index 0000000..bd8649b --- /dev/null +++ b/data/test.txt @@ -0,0 +1,49 @@ +{ + "age": 0, + "backPack": "", + "blocNote": "sfsfsffsd", + "classe": "", + "image": "data/images/logo.png", + "name": "Gio", + "niveau": 0, + "race": "", + "sexe": "", + "skills": [ + 0, + 0, + 0, + 0, + 0, + 0 + ], + "skillsMod": [ + 0, + 0, + 0, + 0, + 0, + 0 + ], + "stats": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ], + "taille": 0, + "vie": 0 +} diff --git a/main.cpp b/main.cpp index c2e199a..917b83b 100644 --- a/main.cpp +++ b/main.cpp @@ -8,6 +8,8 @@ int main(int argc, char *argv[]) MainWindow w; w.show(); return a.exec(); + + //Il faut mettre à jour les fonctions de save, et de lad et de création pour les nouveaux attributs } diff --git a/mainwindow.cpp b/mainwindow.cpp index 36cddd8..67f395d 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -6,6 +6,8 @@ #include #include #include +#include +#include using namespace std; @@ -14,6 +16,8 @@ MainWindow::MainWindow(QWidget *parent) , ui(new Ui::MainWindow) { ui->setupUi(this); + notePad = new NotePad(); + connect(notePad, &NotePad::demandeSauvegarde, this, &MainWindow::recevoirSauvegarde); Character* c = new Character(); currentCharacter = c; characters.append(c); @@ -55,39 +59,10 @@ void MainWindow::loadNewCharacter(){ } void MainWindow::createNewCharacter(Character* p) { + notePad->setTexte(p->getTexteBlocNote()); currentCharacter = p; characters.append(p); - - ui->nomLineEdit->setText(p->getNom()); - ui->ageLineEdit->setText(QString::number(p->getAge())); - ui->raceLineEdit->setText(p->getRace()); - ui->classeLineEdit->setText(p->getClasse()); - ui->niveauLineEdit->setText(QString::number(p->getNiveau())); - ui->sexeLineEdit->setText(p->getSexe()); - ui->tailleLineEdit->setText(QString::number(p->getTaille())); - - ui->charismeSpinBox->setValue(p->getSkills()[0]); - ui->dexteriteSpinBox->setValue(p->getSkills()[1]); - ui->enduranceSpinBox->setValue(p->getSkills()[2]); - ui->forceSpinBox->setValue(p->getSkills()[3]); - ui->intelligenceSpinBox->setValue(p->getSkills()[4]); - ui->sagesseSpinBox->setValue(p->getSkills()[5]); - - ui->modCharismeSpinBox->setValue(p->getSkillsMod()[0]); - ui->modDexteriteSpinBox->setValue(p->getSkillsMod()[1]); - ui->modEnduranceSpinBox->setValue(p->getSkillsMod()[2]); - ui->modForceSpinBox->setValue(p->getSkillsMod()[3]); - ui->modIntelligenceSpinBox->setValue(p->getSkillsMod()[4]); - ui->modSagesseSpinBox->setValue(p->getSkillsMod()[5]); - - for (int i = 0; i < p->getStats().size(); ++i) { - QString spinBoxName = QString("spinBox%1").arg(i+1); - QSpinBox* spinBox = this->findChild(spinBoxName); - if (spinBox) { - spinBox->setValue(p->getStats()[i]); - } - } - loadImage(p->getImage()); + setUi(p); } @@ -114,7 +89,7 @@ void MainWindow::loadImage(QString fileName) { } } -void MainWindow::exportJson(){ +void MainWindow::saveJson(){ QString fileName; if (currentFile.isEmpty()) { fileName = QFileDialog::getSaveFileName(this, "Save"); @@ -127,49 +102,47 @@ void MainWindow::exportJson(){ QMessageBox::warning(this, "Warning", "Cannot save file: " + file.errorString()); return; } - setWindowTitle(fileName); if(edition){ - //appelle a funct qui prend val ui pour mettre dans c + getUi(); } - //Prend de c pour mettre dans json + notePad->getUi(); + currentCharacter->setTexteBlocNote(notePad->getTexte()); QJsonObject json; - /* - json["name"] = ui->titleEdit->text(); - json["city"] =ui->locEdit->text(); - json["departement"] = ui->depSpin->text(); - json["difficulty"] = ui->diffSpin->value(); - json["duration"] = ui->durationSpin->value(); - json["length"] = ui->lengthSpin->value(); - json["image"] = ui->imagePath->text(); + json["name"] = currentCharacter->getNom(); + json["age"] = currentCharacter->getAge(); + json["race"] = currentCharacter->getRace(); + json["classe"] = currentCharacter->getClasse(); + json["niveau"] = currentCharacter->getNiveau(); + json["sexe"] = currentCharacter->getSexe(); + json["taille"] = currentCharacter->getTaille(); + json["vie"] = currentCharacter->getVie(); + json["image"] = currentCharacter->getImage(); + json["blocNote"] = currentCharacter->getTexteBlocNote(); + json["backPack"] = currentCharacter->getTexteBackPack(); - QJsonArray steps; - int cpt=0; - for(Step step: currentPath->getStep()){ - cpt++; - QJsonObject stepObject; - stepObject["numero"] = cpt; - stepObject["title"] = step.getTitle(); - stepObject["GPS"] = step.toGPSFormat(); - stepObject["reponse"] = step.getResponse(); - QJsonArray dialogues; - for(int i=0; igetSkills().size(); i++){ + skillsArray.append(QJsonValue(currentCharacter->getSkills()[i])); } - json["steps"] = steps; + json["skills"] = skillsArray; + QJsonArray skillsModArray; + for(int i=0; igetSkillsMod().size(); i++){ + skillsModArray.append(QJsonValue(currentCharacter->getSkillsMod()[i])); + } + json["skillsMod"] = skillsModArray; + QJsonArray statsArray; + for(int i=0; igetStats().size(); i++){ + statsArray.append(QJsonValue(currentCharacter->getStats()[i])); + } + json["stats"] = statsArray; + QJsonDocument doc(json); file.write(doc.toJson()); - */ file.close(); } -void MainWindow::exportJsonAs(){ +void MainWindow::saveAsJson(){ QString fileName = QFileDialog::getSaveFileName(this, "Save as"); QFile file(fileName); @@ -181,45 +154,123 @@ void MainWindow::exportJsonAs(){ currentFile = fileName; if(edition){ - //appelle a funct qui prend val ui pour mettre dans c + getUi(); } - //Prend de c pour mettre dans json + notePad->getUi(); + currentCharacter->setTexteBlocNote(notePad->getTexte()); QJsonObject json; - /* - json["name"] = ui->titleEdit->text(); - json["city"] =ui->locEdit->text(); - json["departement"] = ui->depSpin->text(); - json["difficulty"] = ui->diffSpin->value(); - json["duration"] = ui->durationSpin->value(); - json["length"] = ui->lengthSpin->value(); - json["image"] = ui->imagePath->text(); + json["name"] = currentCharacter->getNom(); + json["age"] = currentCharacter->getAge(); + json["race"] = currentCharacter->getRace(); + json["classe"] = currentCharacter->getClasse(); + json["niveau"] = currentCharacter->getNiveau(); + json["sexe"] = currentCharacter->getSexe(); + json["taille"] = currentCharacter->getTaille(); + json["vie"] = currentCharacter->getVie(); + json["image"] = currentCharacter->getImage(); + json["blocNote"] = currentCharacter->getTexteBlocNote(); + json["backPack"] = currentCharacter->getTexteBackPack(); - QJsonArray steps; - int cpt=0; - for(Step step: currentPath->getStep()){ - cpt++; - QJsonObject stepObject; - stepObject["numero"] = cpt; - stepObject["title"] = step.getTitle(); - stepObject["GPS"] = step.toGPSFormat(); - stepObject["reponse"] = step.getResponse(); - QJsonArray dialogues; - for(int i=0; igetSkills().size(); i++){ + skillsArray.append(QJsonValue(currentCharacter->getSkills()[i])); } - json["steps"] = steps; + json["skills"] = skillsArray; + QJsonArray skillsModArray; + for(int i=0; igetSkillsMod().size(); i++){ + skillsModArray.append(QJsonValue(currentCharacter->getSkillsMod()[i])); + } + json["skillsMod"] = skillsModArray; + QJsonArray statsArray; + for(int i=0; igetStats().size(); i++){ + statsArray.append(QJsonValue(currentCharacter->getStats()[i])); + } + json["stats"] = statsArray; + QJsonDocument doc(json); file.write(doc.toJson()); - */ file.close(); } + +void MainWindow::getUi(){ + currentCharacter->setNom(ui->nomLineEdit->text()); + currentCharacter->setAge(ui->ageLineEdit->text().toInt()); + currentCharacter->setRace(ui->raceLineEdit->text()); + currentCharacter->setClasse(ui->classeLineEdit->text()); + currentCharacter->setNiveau(ui->niveauLineEdit->text().toInt()); + currentCharacter->setSexe(ui->sexeLineEdit->text()); + currentCharacter->setTaille(ui->tailleLineEdit->text().toFloat()); + + QList skills; + skills.append(ui->charismeSpinBox->value()); + skills.append(ui->dexteriteSpinBox->value()); + skills.append(ui->enduranceSpinBox->value()); + skills.append(ui->forceSpinBox->value()); + skills.append(ui->intelligenceSpinBox->value()); + skills.append(ui->sagesseSpinBox->value()); + skills.append(ui->pvSpinBox->value()); + currentCharacter->setSkills(skills); + QList skillsMod; + skillsMod.append(ui->modCharismeSpinBox->value()); + skillsMod.append(ui->modDexteriteSpinBox->value()); + skillsMod.append(ui->modEnduranceSpinBox->value()); + skillsMod.append(ui->modForceSpinBox->value()); + skillsMod.append(ui->modIntelligenceSpinBox->value()); + skillsMod.append(ui->modSagesseSpinBox->value()); + currentCharacter->setSkills(skillsMod); + QList stats; + for (int i = 0; i < currentCharacter->getStats().size(); ++i) { + QString spinBoxName = QString("spinBox%1").arg(i+1); + QSpinBox* spinBox = this->findChild(spinBoxName); + if (spinBox) { + stats.append(spinBox->value()); + } + } + currentCharacter->setStats(stats); + //currentCharacter->setImage(); +} + + + + +void MainWindow::setUi(Character* p){ + ui->nomLineEdit->setText(p->getNom()); + ui->ageLineEdit->setText(QString::number(p->getAge())); + ui->raceLineEdit->setText(p->getRace()); + ui->classeLineEdit->setText(p->getClasse()); + ui->niveauLineEdit->setText(QString::number(p->getNiveau())); + ui->sexeLineEdit->setText(p->getSexe()); + ui->tailleLineEdit->setText(QString::number(p->getTaille())); + + ui->charismeSpinBox->setValue(p->getSkills()[0]); + ui->dexteriteSpinBox->setValue(p->getSkills()[1]); + ui->enduranceSpinBox->setValue(p->getSkills()[2]); + ui->forceSpinBox->setValue(p->getSkills()[3]); + ui->intelligenceSpinBox->setValue(p->getSkills()[4]); + ui->sagesseSpinBox->setValue(p->getSkills()[5]); + ui->pvSpinBox->setValue(p->getVie()); + + ui->modCharismeSpinBox->setValue(p->getSkillsMod()[0]); + ui->modDexteriteSpinBox->setValue(p->getSkillsMod()[1]); + ui->modEnduranceSpinBox->setValue(p->getSkillsMod()[2]); + ui->modForceSpinBox->setValue(p->getSkillsMod()[3]); + ui->modIntelligenceSpinBox->setValue(p->getSkillsMod()[4]); + ui->modSagesseSpinBox->setValue(p->getSkillsMod()[5]); + + for (int i = 0; i < p->getStats().size(); ++i) { + QString spinBoxName = QString("spinBox%1").arg(i+1); + QSpinBox* spinBox = this->findChild(spinBoxName); + if (spinBox) { + spinBox->setValue(p->getStats()[i]); + } + } + loadImage(p->getImage()); +} + + + + void MainWindow::on_actionEditer_triggered(){ if(edition){ //Mode edition @@ -231,14 +282,20 @@ void MainWindow::on_actionEditer_triggered(){ void MainWindow::on_actionBlocNote_triggered(){ - notePad = new NotePad(); this->notePad->show(); } +void MainWindow::recevoirSauvegarde(QString contenu){ + currentCharacter->setTexteBlocNote(contenu); + saveJson(); +} + + + void MainWindow::on_actionOuvrir_une_fiche_triggered(){this->loadNewCharacter();} void MainWindow::on_actionNouvelle_fiche_triggered(){this->createNewCharacter(new Character());} -void MainWindow::on_actionSauvegarder_triggered(){this->exportJson();} -void MainWindow::on_actionEnregistrer_sous_triggered(){this->exportJsonAs();} +void MainWindow::on_actionSauvegarder_triggered(){this->saveJson();} +void MainWindow::on_actionEnregistrer_sous_triggered(){this->saveAsJson();} void MainWindow::on_actionFermer_triggered(){QApplication::quit();} diff --git a/mainwindow.h b/mainwindow.h index c01de30..26a2cc0 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -23,8 +23,10 @@ public: void loadImage(QString fileName); void createNewCharacter(Character* p); void loadNewCharacter(); - void exportJson(); - void exportJsonAs(); + void saveJson(); + void saveAsJson(); + void getUi(); + void setUi(Character* p); private slots: void on_actionEditer_triggered(); @@ -32,16 +34,16 @@ private slots: void on_actionOuvrir_une_fiche_triggered(); void on_actionNouvelle_fiche_triggered(); void on_actionSauvegarder_triggered(); - void on_actionEnregistrer_sous_triggered(); - void on_actionFermer_triggered(); + void recevoirSauvegarde(QString contenu); + private: Ui::MainWindow *ui; NotePad *notePad; - bool edition = false; + bool edition = true; bool backPack = false; QString currentFile; QList characters; diff --git a/mainwindow.ui b/mainwindow.ui index 1d3d7a3..6fcc61c 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -1004,20 +1004,7 @@ - - - Edition - - - - - - - - - - @@ -1037,45 +1024,32 @@ Ouvrir une fiche + + Ctrl+O + Enregistrer + + Ctrl+S + Enregistrer sous + + Ctrl+Shift+S + Fermer - - - - Copier - - - - - Coller - - - - - Couper - - - - - Retour arrière - - - - - Retour avant + + Ctrl+Q @@ -1104,6 +1078,9 @@ Nouvelle fiche + + Ctrl+N + diff --git a/notepad.cpp b/notepad.cpp index 7d426c3..cfcdba3 100644 --- a/notepad.cpp +++ b/notepad.cpp @@ -1,6 +1,10 @@ #include "notepad.h" #include "ui_notepad.h" +#include +#include +#include + using namespace std; NotePad::NotePad(QWidget *parent) @@ -13,3 +17,124 @@ NotePad::NotePad(QWidget *parent) NotePad::~NotePad(){ } + +void NotePad::on_actionFontSize_triggered(){ + QWidget *focused = QApplication::focusWidget(); + QPlainTextEdit* plainTextEdit = qobject_cast(focused); + + if (plainTextEdit) { + QTextCursor cursor = plainTextEdit->textCursor(); + bool ok; + int size = QInputDialog::getInt(this, "Taille de la police", "Entrez la taille de la police:", cursor.charFormat().font().pointSize(), 1, 100, 1, &ok); + + if (ok) { + QTextCharFormat format; + QFont font = cursor.charFormat().font(); + font.setPointSize(size); + format.setFont(font); + plainTextEdit->mergeCurrentCharFormat(format); + } + } +} + + +void NotePad::on_actionFontColor_triggered(){ + QWidget *focused = QApplication::focusWidget(); + QPlainTextEdit* plainTextEdit = qobject_cast(focused); + + if (plainTextEdit) { + QColor color = QColorDialog::getColor(Qt::black, this, "Choisir une couleur"); + QTextCursor cursor = plainTextEdit->textCursor(); + if (color.isValid()) { + QTextCharFormat format; + format.setForeground(color); + plainTextEdit->mergeCurrentCharFormat(format); + } + } +} + + +void NotePad::on_actionFont_triggered(){ + QWidget *focused = QApplication::focusWidget(); + QPlainTextEdit* plainTextEdit = qobject_cast(focused); + + if (plainTextEdit) { + QTextCursor cursor = plainTextEdit->textCursor(); + bool ok; + QFont font = QFontDialog::getFont(&ok, cursor.charFormat().font(), this, "Choisir une police"); + if (ok) { + QTextCharFormat format; + format.setFont(font); + plainTextEdit->mergeCurrentCharFormat(format); + } + } +} + + +void NotePad::on_actionBold_triggered(){ + QWidget *focused = QApplication::focusWidget(); + QPlainTextEdit* plainTextEdit = qobject_cast(focused); + + if (plainTextEdit) { + QTextCursor cursor = plainTextEdit->textCursor(); + QTextCharFormat format; + QFont font = cursor.charFormat().font(); + font.setBold(!font.bold()); + format.setFont(font); + plainTextEdit->mergeCurrentCharFormat(format); + } +} + + +void NotePad::on_actionItalic_triggered(){ + QWidget *focused = QApplication::focusWidget(); + QPlainTextEdit* plainTextEdit = qobject_cast(focused); + + if (plainTextEdit) { + QTextCursor cursor = plainTextEdit->textCursor(); + QTextCharFormat format; + QFont font = cursor.charFormat().font(); + font.setItalic(!font.italic()); + format.setFont(font); + plainTextEdit->mergeCurrentCharFormat(format); + } +} + + +void NotePad::on_actionOverline_triggered(){ + QWidget *focused = QApplication::focusWidget(); + QPlainTextEdit* plainTextEdit = qobject_cast(focused); + + if (plainTextEdit) { + QTextCursor cursor = plainTextEdit->textCursor(); + QTextCharFormat format; + QFont font = cursor.charFormat().font(); + font.setOverline(!font.overline()); + format.setFont(font); + plainTextEdit->mergeCurrentCharFormat(format); + } +} + + +void NotePad::on_actionUnderline_triggered(){ + QWidget *focused = QApplication::focusWidget(); + QPlainTextEdit* plainTextEdit = qobject_cast(focused); + + if (plainTextEdit) { + QTextCursor cursor = plainTextEdit->textCursor(); + QTextCharFormat format; + QFont font = cursor.charFormat().font(); + font.setUnderline(!font.underline()); + format.setFont(font); + plainTextEdit->mergeCurrentCharFormat(format); + } +} + +void NotePad::setTexte(QString t){ + texte = t; + setUi(t); +} +void NotePad::setUi(QString t){ui->plainTextEdit->setPlainText(t);} +void NotePad::getUi(){texte = ui->plainTextEdit->toPlainText();} +void NotePad::on_actionSauvegarder_triggered(){emit demandeSauvegarde(ui->plainTextEdit->toPlainText());} + diff --git a/notepad.h b/notepad.h index f5df4aa..aac8698 100644 --- a/notepad.h +++ b/notepad.h @@ -17,8 +17,27 @@ public: NotePad(QWidget *parent = nullptr); ~NotePad(); + void getUi(); + void setUi(QString t); + QString getTexte(){return texte;} + void setTexte(QString t); + +private slots: + void on_actionFontSize_triggered(); + void on_actionFontColor_triggered(); + void on_actionFont_triggered(); + void on_actionBold_triggered(); + void on_actionItalic_triggered(); + void on_actionOverline_triggered(); + void on_actionUnderline_triggered(); + void on_actionSauvegarder_triggered(); + +signals: + void demandeSauvegarde(QString contenu); + private: Ui::NotePad *ui; + QString texte; }; #endif // NOTEPAD_H diff --git a/notepad.ui b/notepad.ui index c6ba7ce..5cf47c2 100644 --- a/notepad.ui +++ b/notepad.ui @@ -13,7 +13,18 @@ MainWindow - + + + + + 0 + 0 + 800 + 600 + + + + @@ -25,7 +36,140 @@ + + + toolBar + + + TopToolBarArea + + + false + + + + + + + + + + + + + + + :/data/images/data/images/font-size.png:/data/images/data/images/font-size.png + + + FontSize + + + QAction::MenuRole::NoRole + + + + + + :/data/images/data/images/font-color.png:/data/images/data/images/font-color.png + + + FontColor + + + QAction::MenuRole::NoRole + + + + + + :/data/images/data/images/font.png:/data/images/data/images/font.png + + + Font + + + QAction::MenuRole::NoRole + + + + + + :/data/images/data/images/bold.png:/data/images/data/images/bold.png + + + Bold + + + Ctrl+B + + + QAction::MenuRole::NoRole + + + + + + :/data/images/data/images/italic.png:/data/images/data/images/italic.png + + + Italic + + + Ctrl+I + + + QAction::MenuRole::NoRole + + + + + + :/data/images/data/images/overline.png:/data/images/data/images/overline.png + + + Overline + + + Ctrl+O + + + QAction::MenuRole::NoRole + + + + + + :/data/images/data/images/underline.png:/data/images/data/images/underline.png + + + Underline + + + Ctrl+U + + + QAction::MenuRole::NoRole + + + + + + :/data/images/data/images/save.png:/data/images/data/images/save.png + + + Sauvegarder + + + Ctrl+S + + + QAction::MenuRole::NoRole + + - + + +