Merge pull request #300 from ioriayane/Release/v0.40.0

Release/v0.40.0

.github/workflows/dev.yml

@@ -13,35 +13,37 @@ jobs:
       - name: Install dependencies (linux)
         run: sudo apt install ninja-build
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: '5.15.2'
+          # version: '6.2.*'
           host: 'linux'
           target: 'desktop'
           arch: 'gcc_64'
           modules: 'qtwebglplugin'
+          # modules: 'qt5compat qtwebsockets qthttpserver'
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Setup
         run: |
           qmake --version
-          cp app/qtquick/encryption_seed_template.h app/qtquick/encryption_seed.h
+          cp lib/tools/encryption_seed_template.h lib/tools/encryption_seed.h
           python -m pip install --upgrade pip jinja2
       - name: Check style
         uses: pre-commit/action@v3.0.1
         with:
           extra_args: --all-files
-      - name: Build
-        run: scripts/build.sh linux ${Qt5_DIR}/bin
       - name: Build httpserver
         run: |
           mkdir 3rdparty/build-qthttpserver
           cd 3rdparty/build-qthttpserver
           qmake CONFIG+=debug_and_release ../qthttpserver/qthttpserver.pro
           make -j4 && make install
+      - name: Build
+        run: scripts/build.sh linux ${QT_ROOT_DIR}/bin
       - name: Unit test
         env:
           TZ: "Asia/Tokyo"
-        run: scripts/unittest.sh linux ${Qt5_DIR}/bin
+        run: scripts/unittest.sh linux ${QT_ROOT_DIR}/bin

README.md

@@ -54,7 +54,7 @@ REM checkout repo
 >cd Hagoromo
 >git submodule update -i
 REM copy and edit encryption seed
->copy app\qtquick\encryption_seed_template.h app\qtquick\encryption_seed.h
+>copy lib\tools\encryption_seed_template.h lib\tools\encryption_seed.h
 REM build Hagoromo
 >.\scripts\build.bat path\to\Qt\5.15.2\msvc2019_64\bin
 REM Execute
@@ -73,8 +73,8 @@ $ git submodule update -i
 # setup dependent modules
 $ sudo apt-get install zlib1g-dev
 # copy and edit encryption seed
-$ cp app/qtquick/encryption_seed_template.h app/qtquick/encryption_seed.h
-$ vi app/qtquick/encryption_seed.h
+$ cp lib/tools/encryption_seed_template.h lib/tools/encryption_seed.h
+$ vi lib/tools/encryption_seed.h
 # build Hagoromo
 $ ./scripts/build.sh linux path/to/Qt/5.15.2/gcc_64/bin
 # exec hagoromo
@@ -91,8 +91,8 @@ $ git clone git@github.com:ioriayane/Hagoromo.git
 $ cd Hagoromo
 $ git submodule update -i
 # copy and edit encryption seed
-$ cp app/qtquick/encryption_seed_template.h app/qtquick/encryption_seed.h
-$ vi app/qtquick/encryption_seed.h
+$ cp lib/tools/encryption_seed_template.h lib/tools/encryption_seed.h
+$ vi lib/tools/encryption_seed.h
 # build Hagoromo
 $ ./scripts/build.sh mac path/to/Qt/5.15.2/gcc_64/bin
 # exec hagoromo
@@ -208,7 +208,7 @@ REM checkout repo
 >cd Hangoromo
 >git submodule update -i
 REM copy and edit encryption seed
->copy app\qtquick\encryption_seed_template.h app\qtquick\encryption_seed.h
+>copy lib\tools\encryption_seed_template.h lib\tools\encryption_seed.h
 REM build Hagoromo
 >.\scripts\build.bat path\to\Qt\5.15.2\msvc2019_64\bin
 REM Execute
@@ -227,8 +227,8 @@ $ git submodule update -i
 # setup dependent modules
 $ sudo apt-get install zlib1g-dev
 # copy and edit encryption seed
-$ cp app/qtquick/encryption_seed_template.h app/qtquick/encryption_seed.h
-$ vi app/qtquick/encryption_seed.h
+$ cp lib/tools/encryption_seed_template.h lib/tools/encryption_seed.h
+$ vi lib/tools/encryption_seed.h
 # build Hagoromo
 $ ./scripts/build.sh linux path/to/Qt/5.15.2/gcc_64/bin
 # exec hagoromo
@@ -245,8 +245,8 @@ $ git clone git@github.com:ioriayane/Hagoromo.git
 $ cd Hagoromo
 $ git submodule update -i
 # copy and edit encryption seed
-$ cp app/qtquick/encryption_seed_template.h app/qtquick/encryption_seed.h
-$ vi app/qtquick/encryption_seed.h
+$ cp lib/tools/encryption_seed_template.h lib/tools/encryption_seed.h
+$ vi lib/tools/encryption_seed.h
 # build Hagoromo
 $ ./scripts/build.sh mac path/to/Qt/5.15.2/gcc_64/bin
 # exec hagoromo

app/app.pro

@@ -21,6 +21,7 @@ QML_FILES = \
     qml/controls/CalendarPicker.qml \
     qml/controls/ClickableFrame.qml \
     qml/controls/ComboBoxEx.qml \
+    qml/controls/DragAndDropArea.qml \
     qml/controls/IconButton.qml \
     qml/controls/IconLabelFrame.qml \
     qml/controls/ImageWithIndicator.qml \

app/deps.pri

@@ -6,6 +6,7 @@ else:unix: LIBS += -L$$OUT_PWD/../lib/ -llib
 
 INCLUDEPATH += $$PWD/../lib
 DEPENDPATH += $$PWD/../lib
+RESOURCES += $$PWD/../lib/lib.qrc
 
 win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../lib/release/liblib.a
 else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../lib/debug/liblib.a