Skip to content

Commit 8f6d8b8

Browse files
authored
Merge pull request #4 from CrSjimo/main
Add dev-build workflow
2 parents 70868cd + 4df3d1c commit 8f6d8b8

File tree

63 files changed

+1618
-245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1618
-245
lines changed

.github/workflows/dev-build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
name: Dev Build
22
on:
3-
push:
4-
branches:
5-
- main
6-
paths-ignore:
7-
- 'README.md'
8-
- 'LICENSE'
9-
- 'crowdin.yml'
10-
- '.github/**'
3+
# push:
4+
# branches:
5+
# - main
6+
# paths-ignore:
7+
# - 'README.md'
8+
# - 'LICENSE'
9+
# - 'crowdin.yml'
10+
# - '.github/**'
1111
pull_request:
1212
branches:
1313
- main

.gitmodules

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,10 @@
2525
[submodule "vcpkg"]
2626
path = scripts/vcpkg
2727
url = ../../stdware/vcpkg-overlay.git
28+
29+
[submodule "opendspx"]
30+
path = src/libs/3rdparty/opendspx
31+
url = ../../diffscope/opendspx.git
32+
[submodule "src/libs/3rdparty/opendspx"]
33+
path = src/libs/3rdparty/opendspx
34+
url = https://github.com/diffscope/opendspx.git

scripts/icon-tools/Generate-ICNS.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

scripts/icon-tools/Generate-ICO.ps1

Lines changed: 0 additions & 1 deletion
This file was deleted.

scripts/vcpkg-manifest/vcpkg.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
{
2727
"name": "glib",
2828
"platform": "linux"
29-
}
29+
},
30+
"wolf-midi"
3031
],
3132
"vcpkg-configuration": {
3233
"overlay-ports": [

src/app/config.json.in

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,35 @@
11
{
22
"splashImage": "@APP_CONFIG_SPLASH_IMAGE@",
3-
"splashSize": [600, 336],
3+
"splashSize": [600, 400],
44
"splashSettings": {
55
"texts": {
6+
"appName": {
7+
"pos": [300, 240],
8+
"alignment": 132,
9+
"text": "@APPLICATION_DISPLAY_NAME@",
10+
"fontSize": 40,
11+
"fontColor": "#dadada"
12+
},
13+
"appVersion": {
14+
"pos": [300, 280],
15+
"alignment": 132,
16+
"text": "",
17+
"fontSize": 12,
18+
"fontColor": "#dadada"
19+
},
620
"_status": {
7-
"pos": [84, -49],
8-
"anchor": [1, -1],
21+
"pos": [300, 320],
22+
"alignment": 132,
923
"text": "Loading...",
10-
"fontColor": "#FFFFFF"
24+
"fontsize": 12,
25+
"fontColor": "#dadada"
26+
},
27+
"copyright": {
28+
"pos": [300, 360],
29+
"alignment": 132,
30+
"text": "",
31+
"fontsize": 12,
32+
"fontColor": "#a0dadada"
1133
}
1234
}
1335
}

src/app/main.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <loadapi/initroutine.h>
2323

2424
#include <application_config.h>
25+
#include <application_buildinfo.h>
2526

2627
#ifdef APPLICATION_ENABLE_BREAKPAD
2728
# include <QBreakpadHandler.h>
@@ -72,6 +73,15 @@ class MyLoaderSpec : public Loader::LoaderSpec {
7273
// Do nothing
7374
}
7475

76+
void splashShown(QSplashScreen *screen) override {
77+
QMetaObject::invokeMethod(screen, "setText", QStringLiteral("appVersion"), QApplication::translate("Application", "Version %1").arg(APPLICATION_SEMVER));
78+
QMetaObject::invokeMethod(screen, "setText", QStringLiteral("copyright"), QApplication::translate("Application", "Copyright \u00a9 %1-%2 %3. All rights reserved.").arg(
79+
QLocale().toString(QDate(QStringLiteral(APPLICATION_DEV_START_YEAR).toInt(), 1, 1), "yyyy"),
80+
QLocale().toString(QDate(QStringLiteral(APPLICATION_BUILD_YEAR).toInt(), 1, 1), "yyyy"),
81+
APPLICATION_VENDOR_NAME
82+
));
83+
}
84+
7585
void beforeLoadPlugins() override {
7686
RuntimeInterface::setQmlEngine(engine);
7787
auto settings = RuntimeInterface::settings();

src/app/splash.png

-398 KB
Loading

src/libs/3rdparty/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ if(APPLICATION_INSTALL AND APPLICATION_ENABLE_DEVEL)
44
set(SCOPIC_FLOW_INSTALL ON)
55
set(QACTIONKIT_INSTALL ON)
66
set(TALCS_INSTALL ON)
7+
set(OPENDSPX_INSTALL ON)
78
else()
89
set(CHORUSKIT_INSTALL OFF)
910
set(SVSCRAFT_INSTALL OFF)
1011
set(SCOPIC_FLOW_INSTALL OFF)
1112
set(QACTIONKIT_INSTALL OFF)
1213
set(TALCS_INSTALL OFF)
14+
set(OPENDSPX_INSTALL OFF)
1315
endif()
1416

1517
set(CK_CMAKE_MODULES_DIR ${CMAKE_CURRENT_LIST_DIR}/choruskit/cmake PARENT_SCOPE)
@@ -27,4 +29,6 @@ set(QAK_AEC_EXECUTABLE "$<TARGET_FILE:qak_aec>" PARENT_SCOPE)
2729
set(QAK_AEC_EXECUTABLE "$<TARGET_FILE:qak_aec>")
2830
include("${CMAKE_CURRENT_LIST_DIR}/qactionkit/src/QActionKitMacros.cmake")
2931

30-
add_subdirectory(talcs)
32+
add_subdirectory(talcs)
33+
34+
add_subdirectory(opendspx)

0 commit comments

Comments
 (0)