feedc0de/scheincommander
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app binary renamed to scheincommander

Browse Source
This commit is contained in:
0xFEEDC0DE64
2023-02-21 20:28:53 +01:00
parent 77d269013d
commit 0fc128b369
22 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.16)
project(lightcontrol VERSION 0.1 LANGUAGES CXX)
project(scheincommander VERSION 0.9 LANGUAGES CXX)
set(CMAKE_AUTOMOC ON)
#set(CMAKE_CXX_STANDARD 23)
@ -10,7 +10,7 @@ add_compile_options(-std=c++2b)
find_package(Qt6 6.2 REQUIRED COMPONENTS SerialPort Quick)
qt_add_executable(applightcontrol
qt_add_executable(appscheincommander
main.cpp
devicetypesmodel.h devicetypesmodel.cpp
dmxcontroller.h dmxcontroller.cpp
@ -24,8 +24,8 @@ qt_add_executable(applightcontrol
projectloader.h projectloader.cpp
)
qt_add_qml_module(applightcontrol
URI lightcontrol
qt_add_qml_module(appscheincommander
URI scheincommander
VERSION 1.0
RESOURCES
icons/movinghead.png
@ -55,7 +55,9 @@ qt_add_qml_module(applightcontrol
AnimatedStackView.qml
)
set_target_properties(applightcontrol PROPERTIES
add_definitions(-DCMAKE_PROJECT_VERSION=${CMAKE_PROJECT_VERSION})
set_target_properties(appscheincommander PROPERTIES
MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
@ -63,12 +65,12 @@ set_target_properties(applightcontrol PROPERTIES
WIN32_EXECUTABLE TRUE
)
target_link_libraries(applightcontrol
target_link_libraries(appscheincommander
PRIVATE
Qt6::SerialPort
Qt6::Quick
)
install(TARGETS applightcontrol
install(TARGETS appscheincommander
BUNDLE DESTINATION .
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
DeviceTypeRegisterTypesModel.qml
View File

@ -1,6 +1,6 @@
import QtQuick
import lightcontrol
import scheincommander
ListModel {
ListElement { text: qsTr('Dummy'); value: DeviceTypeRegisterType.Dummy }

2
DeviceTypesSettingsPage.qml
View File

@ -3,7 +3,7 @@ import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import lightcontrol
import scheincommander
ColumnLayout {
Label {

2
DevicesSettingsPage.qml
View File

@ -3,7 +3,7 @@ import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import lightcontrol
import scheincommander
ColumnLayout {
Label {

2
HomePage.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Controls.Material
import QtQuick.Layouts
import lightcontrol
import scheincommander
Item {
id: homePage

2
IconsModel.qml
View File

@ -2,6 +2,6 @@ import QtQuick
import Qt.labs.folderlistmodel 2.4
FolderListModel {
folder: "qrc:/lightcontrol/icons/"
folder: "qrc:/scheincommander/icons/"
showDirs: false
}

2
LampRegistersPanel.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Controls.Material
import QtQuick.Layouts
import lightcontrol
import scheincommander
Flickable {
id: lampRegistersPanel

2
LightControlWindow.qml
View File

@ -14,7 +14,7 @@ ApplicationWindow {
FontLoader {
id: materialIcons
source: "qrc:/lightcontrol/ui-icons/MaterialIcons-Regular.ttf"
source: "qrc:/scheincommander/ui-icons/MaterialIcons-Regular.ttf"
}
ColumnLayout {

2
LightSliderPane.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Controls.Material
import QtQuick.Layouts
import lightcontrol
import scheincommander
Pane {
property variant light

2
README.md
View File

@ -8,5 +8,5 @@ mkdir build
cd build
cmake ..
make -j4096
./applightcontrol
./appscheincommander
```

2
RegisterGroupsSettingsPage.qml
View File

@ -3,7 +3,7 @@ import QtQuick.Controls
import QtQuick.Controls.Material
import QtQuick.Layouts
import lightcontrol
import scheincommander
ColumnLayout {
property bool needsRegler: true

2
RegistersSettingsItem.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Controls.Material
import QtQuick.Layouts
import lightcontrol 1.0
import scheincommander 1.0
Pane {
property alias deviceTypeId: model.deviceTypeId

2
deviceregistervaluehelper.cpp
View File

@ -142,7 +142,7 @@ void DeviceRegisterValueHelper::sliderStatesChanged()
namespace {
void registrierDenShit()
{
qmlRegisterType<DeviceRegisterValueHelper>("lightcontrol", 1, 0, "DeviceRegisterValueHelper");
qmlRegisterType<DeviceRegisterValueHelper>("scheincommander", 1, 0, "DeviceRegisterValueHelper");
}
}
Q_COREAPP_STARTUP_FUNCTION(registrierDenShit)

2
devicesmodel.cpp
View File

@ -464,7 +464,7 @@ void DevicesModel::otherDevicePositionChanged(int row, const QVector3D &position
namespace {
void registrierDenShit()
{
qmlRegisterType<DevicesModel>("lightcontrol", 1, 0, "DevicesModel");
qmlRegisterType<DevicesModel>("scheincommander", 1, 0, "DevicesModel");
}
}
Q_COREAPP_STARTUP_FUNCTION(registrierDenShit)

2
devicetyperegistersmodel.cpp
View File

@ -450,7 +450,7 @@ void DeviceTypeRegistersModel::otherDeviceTypeRegisterTypeChanged(const DeviceTy
namespace {
void registrierDenShit()
{
qmlRegisterType<DeviceTypeRegistersModel>("lightcontrol", 1, 0, "DeviceTypeRegistersModel");
qmlRegisterType<DeviceTypeRegistersModel>("scheincommander", 1, 0, "DeviceTypeRegistersModel");
}
}
Q_COREAPP_STARTUP_FUNCTION(registrierDenShit)

2
devicetypesmodel.cpp
View File

@ -383,7 +383,7 @@ void DeviceTypesModel::otherDeviceTypeIconNameChanged(int row, const QString &na
namespace {
void registrierDenShit()
{
qmlRegisterType<DeviceTypesModel>("lightcontrol", 1, 0, "DeviceTypesModel");
qmlRegisterType<DeviceTypesModel>("scheincommander", 1, 0, "DeviceTypesModel");
}
}
Q_COREAPP_STARTUP_FUNCTION(registrierDenShit)

3
dmxcontroller.cpp
View File

@ -130,7 +130,8 @@ DmxController::DmxController(QObject *parent) :
{
}
bool DmxController::loadProject(QString name) {
bool DmxController::loadProject(QString name)
{
QFile readJsonFile(name);
if (!readJsonFile.exists())
{

1
dmxcontroller.h
View File

@ -18,6 +18,7 @@ public:
bool loadProject(QString name);
bool saveProject(QString name);
bool start();
Q_INVOKABLE void setRegisterGroupSlider(int registerGroupId, quint8 value);

2
lightproject.cpp
View File

@ -6,7 +6,7 @@
namespace {
void registrierDenShit()
{
qmlRegisterUncreatableMetaObject(hilfe::staticMetaObject, "lightcontrol", 1, 0, "DeviceTypeRegisterType", "lass es du depp");
qmlRegisterUncreatableMetaObject(hilfe::staticMetaObject, "scheincommander", 1, 0, "DeviceTypeRegisterType", "lass es du depp");
}
}
Q_COREAPP_STARTUP_FUNCTION(registrierDenShit)

9
main.cpp
View File

@ -5,6 +5,8 @@
#include <QDebug>
#include "dmxcontroller.h"
#define STR(x) #x
int main(int argc, char *argv[])
{
qSetMessagePattern(QStringLiteral("%{time dd.MM.yyyy HH:mm:ss.zzz} "
@ -20,6 +22,11 @@ int main(int argc, char *argv[])
qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard"));
QCoreApplication::setOrganizationDomain("com.büro");
QCoreApplication::setOrganizationName("büro");
QCoreApplication::setApplicationName("scheincommander");
QCoreApplication::setApplicationVersion(STR(CMAKE_PROJECT_VERSION));
QGuiApplication app{argc, argv};
QCommandLineParser parser;
@ -49,7 +56,7 @@ int main(int argc, char *argv[])
engine.rootContext()->setContextProperty("__controller", &controller);
engine.rootContext()->setContextProperty("__windowed", windowed);
const QUrl url{u"qrc:/lightcontrol/main.qml"_qs};
const QUrl url{u"qrc:/scheincommander/main.qml"_qs};
QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
&app, [url](QObject *obj, const QUrl &objUrl) {
if (!obj && url == objUrl)

2
registergroupmodel.cpp
View File

@ -212,7 +212,7 @@ void RegisterGroupModel::setPattern(int n, int k, DeviceTypeRegisterType registe
namespace {
void registrierDenShit()
{
qmlRegisterType<RegisterGroupModel>("lightcontrol", 1, 0, "RegisterGroupModel");
qmlRegisterType<RegisterGroupModel>("scheincommander", 1, 0, "RegisterGroupModel");
}
}
Q_COREAPP_STARTUP_FUNCTION(registrierDenShit)

2
registergroupsmodel.cpp
View File

@ -347,7 +347,7 @@ void RegisterGroupsModel::otherRegisterGroupNameChanged(int row, const QString &
namespace {
void registrierDenShit()
{
qmlRegisterType<RegisterGroupsModel>("lightcontrol", 1, 0, "RegisterGroupsModel");
qmlRegisterType<RegisterGroupsModel>("scheincommander", 1, 0, "RegisterGroupsModel");
}
}
Q_COREAPP_STARTUP_FUNCTION(registrierDenShit)