Bugs

Polices manquantes, Progrès de type OU et URL x64 Bêta
Chucky2401 · Aug 23, 2020 · 1f6aaaa · 1f6aaaa
1 parent 0828899
commit 1f6aaaa
Show file tree

Hide file tree

Showing 15 changed files with 60 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,15 @@
 
 Suivis des version
 
-## **V2.0.0b** - *23/08/2020*
+## **V2.0.0 Bêta 2** - *23/08/2020*
+
+### Correction
+
++ Pour les conditions de types *OU* non fait, rien n'était affiché dans la colonne **Progrès Fait**
++ Intégration de la police d'écriture pour **Vos Progrès**
++ Lors de la recherche de mise à jour Bêta, ajout de la bonne URL en 64 bits
+
+## **V2.0.0 Bêta 1** - *22/08/2020*
 
 ### Correction
 

diff --git a/Minecraft_Advancements/Minecraft-Advancements.pro.user b/Minecraft_Advancements/Minecraft-Advancements.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.12.4, 2020-08-22T18:59:07. -->
+<!-- Written by QtCreator 4.12.4, 2020-08-23T08:49:54. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -74,17 +74,17 @@
  <data>
   <variable>ProjectExplorer.Project.Target.0</variable>
   <valuemap type="QVariantMap">
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.15.0 MinGW 64-bit</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.0 MinGW 64-bit</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5150.win64_mingw81_kit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.15.0 MinGW 32-bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.0 MinGW 32-bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5150.win32_mingw81_kit</value>
    <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
     <value type="bool">true</value>
     <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\Projets_Qt\Minecraft-Advancements\build_x64</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/Projets_Qt/Minecraft-Advancements/build_x64</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\Projets_Qt\Minecraft-Advancements\build</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/Projets_Qt/Minecraft-Advancements/build</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -134,8 +134,8 @@
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
     <value type="bool">true</value>
     <value type="int" key="EnableQmlDebugging">2</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\Projets_Qt\Minecraft-Advancements\build_x64</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/Projets_Qt/Minecraft-Advancements/build_x64</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\Projets_Qt\Minecraft-Advancements\build</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/Projets_Qt/Minecraft-Advancements/build</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -185,7 +185,7 @@
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
     <value type="bool">true</value>
     <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:/Projets_Qt/Minecraft-Advancements/build</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\Projets_Qt\Minecraft-Advancements\build</value>
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/Projets_Qt/Minecraft-Advancements/build</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
@@ -320,25 +320,25 @@
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
     <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/Projets_Qt/Minecraft-Advancements/build_x64</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/Projets_Qt/Minecraft-Advancements/build</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>
  </data>
  <data>
   <variable>ProjectExplorer.Project.Target.1</variable>
   <valuemap type="QVariantMap">
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.15.0 MinGW 32-bit</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.0 MinGW 32-bit</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5150.win32_mingw81_kit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.15.0 MinGW 64-bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.0 MinGW 64-bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5150.win64_mingw81_kit</value>
    <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
     <value type="bool">true</value>
     <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\Projets_Qt\Minecraft-Advancements\build</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/Projets_Qt/Minecraft-Advancements/build</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\Projets_Qt\Minecraft-Advancements\build_x64</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/Projets_Qt/Minecraft-Advancements/build_x64</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -388,8 +388,8 @@
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
     <value type="bool">true</value>
     <value type="int" key="EnableQmlDebugging">2</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\Projets_Qt\Minecraft-Advancements\build</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/Projets_Qt/Minecraft-Advancements/build</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\Projets_Qt\Minecraft-Advancements\build_x64</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/Projets_Qt/Minecraft-Advancements/build_x64</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -439,7 +439,7 @@
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
     <value type="bool">true</value>
     <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\Projets_Qt\Minecraft-Advancements\build</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:/Projets_Qt/Minecraft-Advancements/build</value>
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/Projets_Qt/Minecraft-Advancements/build</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
@@ -574,7 +574,7 @@
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
     <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/Projets_Qt/Minecraft-Advancements/build</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/Projets_Qt/Minecraft-Advancements/build_x64</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>

diff --git a/Minecraft_Advancements/files.qrc b/Minecraft_Advancements/files.qrc
@@ -1,5 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>files/minecraft_Advancements.sql</file>
+        <file>files/MINECRAFTER.REG.TTF</file>
     </qresource>
 </RCC>
diff --git a/Minecraft_Advancements/files/MINECRAFTER.REG.TTF b/Minecraft_Advancements/files/MINECRAFTER.REG.TTF
diff --git a/Minecraft_Advancements/frm_principale.cpp b/Minecraft_Advancements/frm_principale.cpp
@@ -89,7 +89,7 @@ FRM_Principale::FRM_Principale(QWidget *parent, bool test)
     m_qs7zBin = "bin/7z.exe";
     m_qp7zProcess = new QProcess(this);
     m_bErreurExtraction = false;
-    m_qsimProgresRealisation = new QStandardItemModel(0,6);
+    //m_qsimProgresRealisation = new QStandardItemModel(0,6);
 
     // Modèles pour la vue
     m_smProgresRealisation = new SqlModel(this);
@@ -153,6 +153,13 @@ FRM_Principale::FRM_Principale(QWidget *parent, bool test)
                                    "    Trouvera 'Partons à l'aventure' et 'Monstres chassés'");
     ui->qcbFiltreTitre->setToolTipDuration(30000);
 
+    // Police spéciale
+    int iFontId = QFontDatabase::addApplicationFont(":/files/MINECRAFTER.REG.TTF");
+    if (iFontId != -1) {
+        QFont qfMinecrafter("Minecrafter");
+        ui->qlVosProgres->setFont(qfMinecrafter);
+    }
+
     ui->qdteFrom->setDateTime(QDateTime(QDate(1970, 01, 01), QTime(0, 0, 0)));
     ui->qdteTo->setDateTime(QDateTime(QDate(2099, 12, 31), QTime(23, 59, 59)));
 
@@ -1488,7 +1495,10 @@ void FRM_Principale::comparerLesProgres(bool checked) {
            "    la.origine"
            "    , la.categorie"
            "    , la.titre"
-           "    , pa.done progres_fait"
+           "    , CASE WHEN pa.done IS NULL"
+           "           THEN 'false'"
+           "           ELSE 'true'"
+           "           END progres_fait"
            "    , la.description"
            "    , la.condition_texte"
            "    , CASE WHEN pa.condition IS NULL"
@@ -2970,7 +2980,7 @@ void FRM_Principale::comparaisonVersion(bool ecrireFichier){
             arguments << "--updater";
             if (param->getMiseAJourBeta()) {
                 arguments << "--addTempRepository";
-                arguments << "https://advancements.blackwizard.fr/repository/beta";
+                arguments << "https://advancements.blackwizard.fr/repository-64/beta";
             }
             qpOutilDeMaintenance->setProgram("maintenancetool.exe");
             qpOutilDeMaintenance->setArguments(arguments);
@@ -3534,7 +3544,7 @@ void FRM_Principale::definirModele() {
         m_smProgresRealisation->setHeaderData(0, Qt::Horizontal, tr("Origine"));
         m_smProgresRealisation->setHeaderData(1, Qt::Horizontal, tr("Catégorie"));
         m_smProgresRealisation->setHeaderData(2, Qt::Horizontal, tr("Progrès"));
-        m_smProgresRealisation->setHeaderData(3, Qt::Horizontal, tr("Progrès Faite"));
+        m_smProgresRealisation->setHeaderData(3, Qt::Horizontal, tr("Progrès Fait"));
         m_smProgresRealisation->setHeaderData(4, Qt::Horizontal, tr("Description"));
         m_smProgresRealisation->setHeaderData(5, Qt::Horizontal, tr("Critère"));
         m_smProgresRealisation->setHeaderData(6, Qt::Horizontal, tr("Critère Fait"));

diff --git a/Minecraft_Advancements/frm_principale.ui b/Minecraft_Advancements/frm_principale.ui
@@ -394,7 +394,7 @@
      </widget>
     </item>
     <item>
-     <widget class="QLabel" name="label_14">
+     <widget class="QLabel" name="qlVosProgres">
       <property name="font">
        <font>
         <family>Minecrafter</family>

diff --git a/build/deploy-b/config/config.xml b/build/deploy-b/config/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>Minecraft Advancements</Name>
-    <Version>2.0</Version>
+    <Version>2.0.1</Version>
     <Title>Minecraft Advancements</Title>
     <Publisher>Black Wizard Company</Publisher>
     <ProductUrl>https://chucky2401.github.io/Minecraft-Advancements/</ProductUrl>

diff --git a/build/deploy-b/packages/com.blackwizard.advancements/data/Minecraft-Advancements.exe b/build/deploy-b/packages/com.blackwizard.advancements/data/Minecraft-Advancements.exe
diff --git a/build/deploy-b/packages/com.blackwizard.advancements/meta/package.xml b/build/deploy-b/packages/com.blackwizard.advancements/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>Minecraft Advancements</DisplayName>
     <Description>Suivis complet des progrès Minecraft Vanilla et Blaze and Cave. Version BÊTA</Description>
-    <Version>2.0</Version>
-    <ReleaseDate>2020-08-22</ReleaseDate>
+    <Version>2.0.1</Version>
+    <ReleaseDate>2020-08-23</ReleaseDate>
     <Name>com.blackwizard.advancements</Name>
     <Licenses>
         <License name="GNU Public License Agreement" file="license.txt" />

diff --git a/build_x64/Makefile.Debug b/build_x64/Makefile.Debug
@@ -147,6 +147,7 @@ compiler_rcc_clean:
 	-$(DEL_FILE) debug\qrc_files.cpp debug\qrc_img.cpp
 debug/qrc_files.cpp: ../Minecraft_Advancements/files.qrc \
 		../../../Qt/5.15.0/mingw81_64/bin/rcc.exe \
+		../Minecraft_Advancements/files/MINECRAFTER.REG.TTF \
 		../Minecraft_Advancements/files/minecraft_Advancements.sql
 	D:\Qt\5.15.0\mingw81_64\bin\rcc.exe -name files ..\Minecraft_Advancements\files.qrc -o debug\qrc_files.cpp
 

diff --git a/build_x64/Makefile.Release b/build_x64/Makefile.Release
@@ -147,6 +147,7 @@ compiler_rcc_clean:
 	-$(DEL_FILE) release\qrc_files.cpp release\qrc_img.cpp
 release/qrc_files.cpp: ../Minecraft_Advancements/files.qrc \
 		../../../Qt/5.15.0/mingw81_64/bin/rcc.exe \
+		../Minecraft_Advancements/files/MINECRAFTER.REG.TTF \
 		../Minecraft_Advancements/files/minecraft_Advancements.sql
 	D:\Qt\5.15.0\mingw81_64\bin\rcc.exe -name files ..\Minecraft_Advancements\files.qrc -o release\qrc_files.cpp
 

diff --git a/build_x64/deploy-b/config/config.xml b/build_x64/deploy-b/config/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>Minecraft Advancements</Name>
-    <Version>2.0</Version>
+    <Version>2.0.1</Version>
     <Title>Minecraft Advancements</Title>
     <Publisher>Black Wizard Company</Publisher>
     <ProductUrl>https://chucky2401.github.io/Minecraft-Advancements/</ProductUrl>

diff --git a/build_x64/deploy-b/packages/com.blackwizard.advancements/data/Minecraft-Advancements.exe b/build_x64/deploy-b/packages/com.blackwizard.advancements/data/Minecraft-Advancements.exe
diff --git a/build_x64/deploy-b/packages/com.blackwizard.advancements/meta/package.xml b/build_x64/deploy-b/packages/com.blackwizard.advancements/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>Minecraft Advancements</DisplayName>
     <Description>Suivis complet des progrès Minecraft Vanilla et Blaze and Cave. Version BÊTA</Description>
-    <Version>2.0</Version>
-    <ReleaseDate>2020-08-22</ReleaseDate>
+    <Version>2.0.1</Version>
+    <ReleaseDate>2020-08-23</ReleaseDate>
     <Name>com.blackwizard.advancements</Name>
     <Licenses>
         <License name="GNU Public License Agreement" file="license.txt" />

diff --git a/build_x64/ui_frm_principale.h b/build_x64/ui_frm_principale.h
@@ -85,7 +85,7 @@ class Ui_FRM_Principale
     QLabel *qlProgresPerso;
     QLabel *qlDernierImportPerso;
     QFrame *line_2;
-    QLabel *label_14;
+    QLabel *qlVosProgres;
     QTableView *tableView;
     QHBoxLayout *horizontalLayout_5;
     QPushButton *qpbReadJSONsVanilla;
@@ -421,16 +421,16 @@ class Ui_FRM_Principale
 
         verticalLayout->addWidget(line_2);
 
-        label_14 = new QLabel(centralwidget);
-        label_14->setObjectName(QString::fromUtf8("label_14"));
+        qlVosProgres = new QLabel(centralwidget);
+        qlVosProgres->setObjectName(QString::fromUtf8("qlVosProgres"));
         QFont font;
         font.setFamily(QString::fromUtf8("Minecrafter"));
         font.setPointSize(10);
-        label_14->setFont(font);
-        label_14->setTextFormat(Qt::RichText);
-        label_14->setScaledContents(false);
+        qlVosProgres->setFont(font);
+        qlVosProgres->setTextFormat(Qt::RichText);
+        qlVosProgres->setScaledContents(false);
 
-        verticalLayout->addWidget(label_14);
+        verticalLayout->addWidget(qlVosProgres);
 
         tableView = new QTableView(centralwidget);
         tableView->setObjectName(QString::fromUtf8("tableView"));
@@ -877,7 +877,7 @@ class Ui_FRM_Principale
         qlFichierProgres->setText(QCoreApplication::translate("FRM_Principale", "Fichier Progr\303\250s", nullptr));
         qlProgresPerso->setText(QCoreApplication::translate("FRM_Principale", "TextLabel", nullptr));
         qlDernierImportPerso->setText(QCoreApplication::translate("FRM_Principale", "TextLabel", nullptr));
-        label_14->setText(QCoreApplication::translate("FRM_Principale", "<html><head/><body><p align=\"center\"><span style=\" font-size:14pt; color:#8bc34a;\">Vos Progres</span></p></body></html>", nullptr));
+        qlVosProgres->setText(QCoreApplication::translate("FRM_Principale", "<html><head/><body><p align=\"center\"><span style=\" font-size:14pt; color:#8bc34a;\">Vos Progres</span></p></body></html>", nullptr));
         qpbReadJSONsVanilla->setText(QCoreApplication::translate("FRM_Principale", "Comparer progr\303\250s Vanilla (seulement)", nullptr));
         qpbReadJSONsBlazeandcave->setText(QCoreApplication::translate("FRM_Principale", "Comparer progr\303\250s BACAP (seulement)", nullptr));
         qpbReadAllJSONs->setText(QCoreApplication::translate("FRM_Principale", "Comparer tous les progr\303\250s", nullptr));