[Release] Change the application version to 0.4.0

- Add English plural forms;
- Fix an error causing BoolNode not to be formatted;
- Fix a build error related to the incomplete renaming of
TabbedDocumentInterface.

Signed-off-by: IoeCmcomc <[email protected]>

Author: IoeCmcomc

lib/lib.pro

@@ -46,5 +46,7 @@ SOURCES += \
     nbt-cpp/src/nbt.cpp
 
 INCLUDEPATH += lru-cache/include
+INCLUDEPATH += nbt-cpp/include
+
 
 message($$INCLUDEPATH)

src/MCDatapacker_en_US.ts

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en_US" sourcelanguage="en_US">
+<context>
+    <name>StatusBar</name>
+    <message numerus="yes">
+        <location filename="statusbar.cpp" line="81"/>
+        <source>%n problem(s)</source>
+        <translation>
+            <numerusform>%n problem</numerusform>
+            <numerusform>%n problems</numerusform>
+        </translation>
+    </message>
+</context>
+</TS>

src/MCDatapacker_vi_VN.ts

@@ -2846,115 +2846,115 @@ p, li { white-space: pre-wrap; }
         <translation>Minecraft %1</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="46"/>
+        <location filename="statusbar.cpp" line="49"/>
         <source>Pack format: %1</source>
         <translation>Định dạng gói: %1</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="53"/>
+        <location filename="statusbar.cpp" line="56"/>
         <source>Tab %1 / %2</source>
         <translation>Thẻ %1 / %2</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="77"/>
+        <location filename="statusbar.cpp" line="80"/>
         <source>Line %1, row %2</source>
         <translation>Dòng %1, cột %2</translation>
     </message>
     <message numerus="yes">
-        <location filename="statusbar.cpp" line="78"/>
+        <location filename="statusbar.cpp" line="81"/>
         <source>%n problem(s)</source>
         <translation>
             <numerusform>%n vấn đề</numerusform>
         </translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="94"/>
+        <location filename="statusbar.cpp" line="97"/>
         <source>Zoom: %1%</source>
         <translation>Thu phóng: %1%</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="110"/>
+        <location filename="statusbar.cpp" line="113"/>
         <source>Binary</source>
         <translation>Nhị phân</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="110"/>
+        <location filename="statusbar.cpp" line="113"/>
         <source>Structure</source>
         <translation>Cấu trúc</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="111"/>
+        <location filename="statusbar.cpp" line="114"/>
         <source>Image</source>
         <translation>Ảnh</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="111"/>
+        <location filename="statusbar.cpp" line="114"/>
         <source>Text</source>
         <translation>Văn bản</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="112"/>
+        <location filename="statusbar.cpp" line="115"/>
         <source>Function</source>
         <translation>Hàm</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="112"/>
+        <location filename="statusbar.cpp" line="115"/>
         <source>JSON</source>
         <translation>JSON</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="113"/>
+        <location filename="statusbar.cpp" line="116"/>
         <source>Advancement</source>
         <translation>Tiến trình</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="113"/>
+        <location filename="statusbar.cpp" line="116"/>
         <source>Loot table</source>
         <translation>Bảng lợi phẩm</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="114"/>
+        <location filename="statusbar.cpp" line="117"/>
         <source>Information</source>
         <translation>Thông tin</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="114"/>
+        <location filename="statusbar.cpp" line="117"/>
         <source>Predicate</source>
         <translation>Xác lập</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="115"/>
+        <location filename="statusbar.cpp" line="118"/>
         <source>Recipe</source>
         <translation>Công thức</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="115"/>
+        <location filename="statusbar.cpp" line="118"/>
         <source>Block tag</source>
         <translation>Nhãn khối</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="116"/>
+        <location filename="statusbar.cpp" line="119"/>
         <source>Entity type tag</source>
         <translation>Nhãn loại thực thể</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="116"/>
+        <location filename="statusbar.cpp" line="119"/>
         <source>Fluid tag</source>
         <translation>Nhãn chất lỏng</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="117"/>
+        <location filename="statusbar.cpp" line="120"/>
         <source>Function tag</source>
         <translation>Nhãn hàm</translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="117"/>
+        <location filename="statusbar.cpp" line="120"/>
         <source>Item tag</source>
         <translation>Nhãn vật phẩm</translation>
     </message>
 </context>
 <context>
-    <name>TabbedCodeEditorInterface</name>
+    <name>TabbedDocumentInterface</name>
     <message>
         <location filename="tabbeddocumentinterface.ui" line="54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;No file is opened.&lt;/p&gt;&lt;p&gt;First, open a datapack; then open a file from the left-side tree view.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>

src/main.cpp

@@ -23,7 +23,7 @@ int main(int argc, char *argv[]) {
 
     QCoreApplication::setOrganizationName("IoeCmcomc");
     QCoreApplication::setApplicationName("MCDatapacker");
-    QCoreApplication::setApplicationVersion("0.3.0-beta");
+    QCoreApplication::setApplicationVersion("0.4.0");
     QCommandLineParser parser;
     parser.setApplicationDescription(QCoreApplication::applicationName());
     parser.addHelpOption();

src/parsers/command/visitors/nodeformatter.h

@@ -57,7 +57,12 @@ namespace Command {
             /*m_formatRanges << std::move(range); */
         }
         virtual void visit(BoolNode *node) {
-            auto fmt = defaultFormat(node);
+            /*auto fmt = defaultFormat(node); */
+            QTextCharFormat fmt;
+
+            fmt.setFontWeight(QFont::DemiBold);
+            fmt.setForeground(
+                (node->value()) ? QColor(0, 190, 0) : QColor(190, 0, 0));
 
             QTextLayout::FormatRange range{ node->pos(), node->length(),
                                             std::move(fmt) };

src/settingsdialog.cpp

@@ -59,13 +59,6 @@ void SettingsDialog::setupLanguageSetting() {
         ui->languageCombo->addItem(lang, locale);
     }
 
-
-    ui->languageCombo->addItem(QString("%1 (%2)").arg(
-                                   QLocale::languageToString(QLocale("en_US").
-                                                             language()),
-                                   QLocale("en_US").nativeLanguageName()),
-                               "en_US");
-
     auto curLocale =
         QLocale(qobject_cast<MainWindow*>(parent())->getCurLocale());
     auto currLang = QString("%1 (%2)").arg(

src/src.pro

@@ -212,6 +212,7 @@ FORMS += \
     visualrecipeeditordock.ui
 
 TRANSLATIONS += \
+    MCDatapacker_en_US.ts \
     MCDatapacker_vi_VN.ts
 
 # Default rules for deployment.
@@ -227,7 +228,7 @@ RESOURCES += \
 
 RC_ICONS = ../resource/app/icon/favicon.ico
 
-VERSION = 0.3.0
+VERSION = 0.4.0
 QMAKE_TARGET_COMPANY = IoeCmcomc
 QMAKE_TARGET = MCDatapacker
 QMAKE_TARGET_PRODUCT = MCDatapacker

src/tabbeddocumentinterface.cpp

@@ -1,5 +1,5 @@
 #include "tabbeddocumentinterface.h"
-#include "ui_tabbedcodeeditorinterface.h"
+#include "ui_tabbeddocumentinterface.h"
 
 #include "globalhelpers.h"
 #include "mainwindow.h"
@@ -18,7 +18,7 @@
 
 TabbedDocumentInterface::TabbedDocumentInterface(QWidget *parent) :
     QFrame(parent),
-    ui(new Ui::TabbedCodeEditorInterface) {
+    ui(new Ui::TabbedDocumentInterface) {
     ui->setupUi(this);
 
     ui->tabBar->setTabsClosable(true);
@@ -365,7 +365,7 @@ void TabbedDocumentInterface::onFileRenamed(const QString &path,
                                             const QString &oldName,
                                             const QString &newName) {
 /*
-      qDebug() << "TabbedCodeEditorInterface::onFileRenamed" << oldName <<
+      qDebug() << "TabbedDocumentInterface::onFileRenamed" << oldName <<
           newName << count();
  */
     const QString &&oldpath = path + '/' + oldName;
@@ -592,7 +592,7 @@ void TabbedDocumentInterface::onSwitchPrevFile() {
 }
 
 void TabbedDocumentInterface::onCurTextChanged() {
-    /*qDebug() << "TabbedCodeEditorInterface::onCurTextChanged"; */
+    /*qDebug() << "TabbedDocumentInterface::onCurTextChanged"; */
     if (!hasNoFile() && getCurFile()->data.canConvert<TextFileData>()) {
         auto data =
             qvariant_cast<TextFileData>(getCurFile()->data);
@@ -605,7 +605,7 @@ void TabbedDocumentInterface::onCurTextChanged() {
 }
 
 void TabbedDocumentInterface::onCurTextChangingDone() {
-    /*qDebug() << "TabbedCodeEditorInterface::onCurTextChangingDone"; */
+    /*qDebug() << "TabbedDocumentInterface::onCurTextChangingDone"; */
     if (const auto *curFile = getCurFile(); curFile &&
         curFile->data.canConvert<TextFileData>()) {
         auto data = qvariant_cast<TextFileData>(getCurFile()->data);

src/tabbeddocumentinterface.h

@@ -2,15 +2,14 @@
 #define TABBEDCODEEDITORINTERFACE_H
 
 #include "codeeditor.h"
+#include "imgviewer.h"
 
 #include <QFrame>
 #include <QStackedWidget>
 #include <QTabBar>
 
-class ImgViewer;
-
 namespace Ui {
-    class TabbedCodeEditorInterface;
+    class TabbedDocumentInterface;
 }
 
 class TabbedDocumentInterface : public QFrame
@@ -35,8 +34,8 @@ class TabbedDocumentInterface : public QFrame
     QTabBar *getTabBar() const;
     QStackedWidget *getStackedWidget();
 
-    inline int count() const;
-    inline bool hasNoFile() const;
+    int count() const;
+    bool hasNoFile() const;
     void clear();
     bool hasUnsavedChanges() const;
 
@@ -74,7 +73,7 @@ private /*slots*/ :
     void onCurFileChanged(const QString &path);
 
 private:
-    Ui::TabbedCodeEditorInterface *ui;
+    Ui::TabbedDocumentInterface *ui;
 
     QVector<CodeFile> files;
     int prevIndex                 = -1;

src/tabbeddocumentinterface.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>TabbedCodeEditorInterface</class>
- <widget class="QFrame" name="TabbedCodeEditorInterface">
+ <class>TabbedDocumentInterface</class>
+ <widget class="QFrame" name="TabbedDocumentInterface">
   <property name="geometry">
    <rect>
     <x>0</x>