diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt index 0d05501..3bd6f2e 100644 --- a/native/CMakeLists.txt +++ b/native/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) -project(Qt6-Quick-Example VERSION 0.1 LANGUAGES CXX) +project(Alisa VERSION 0.1 LANGUAGES CXX) set(CMAKE_AUTOMOC ON) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -8,12 +8,12 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(Qt6 6.2 REQUIRED COMPONENTS Quick Multimedia) -qt_add_executable(appQt6-Quick-Example +qt_add_executable(alisa main.cpp ) -qt_add_qml_module(appQt6-Quick-Example - URI Qt6-Quick-Example +qt_add_qml_module(alisa + URI Alisa VERSION 1.0 QML_FILES Main.qml QML_FILES AudioInfoBox.qml @@ -35,23 +35,20 @@ qt_add_qml_module(appQt6-Quick-Example Assets/Audio/test.mp4 ) -# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1. -# If you are developing for iOS or macOS you should consider setting an -# explicit, fixed bundle identifier manually though. -set_target_properties(appQt6-Quick-Example PROPERTIES -# MACOSX_BUNDLE_GUI_IDENTIFIER com.example.appQt6-Quick-Example +set_target_properties(alisa PROPERTIES + MACOSX_BUNDLE_GUI_IDENTIFIER ninja.missing.alisa MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} MACOSX_BUNDLE TRUE WIN32_EXECUTABLE TRUE ) -target_link_libraries(appQt6-Quick-Example +target_link_libraries(alisa PRIVATE Qt6::Quick Qt6::Multimedia ) include(GNUInstallDirs) -install(TARGETS appQt6-Quick-Example +install(TARGETS alisa BUNDLE DESTINATION . LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} diff --git a/native/Main.qml b/native/Main.qml index 6c32632..53c5690 100644 --- a/native/Main.qml +++ b/native/Main.qml @@ -96,7 +96,7 @@ Window { songIndex: 3 title: "Free Test Data" authorName: "5MB AVI" - videoSource: "qrc:/Qt6-Quick-Example/Assets/Videos/Free_Test_Data_5MB_AVI.avi" + videoSource: "qrc:/Alisa/Assets/Videos/Free_Test_Data_5MB_AVI.avi" } } diff --git a/native/main.cpp b/native/main.cpp index fd719b3..f5c3230 100644 --- a/native/main.cpp +++ b/native/main.cpp @@ -7,10 +7,10 @@ int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); - app.setWindowIcon(QIcon(":/Qt6-Quick-Example/Assets/Icons/Jukebox.ico")); + app.setWindowIcon(QIcon(":/Alisa/Assets/Icons/Jukebox.ico")); QQmlApplicationEngine engine; - const QUrl url(u"qrc:/Qt6-Quick-Example/Main.qml"_qs); + const QUrl url(u"qrc:/Alisa/Main.qml"_qs); QObject::connect(&engine, &QQmlApplicationEngine::objectCreated, &app, [url](QObject *obj, const QUrl &objUrl) { if (!obj && url == objUrl) diff --git a/nix/native.nix b/nix/native.nix index 8067dd1..44ebf94 100644 --- a/nix/native.nix +++ b/nix/native.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { maintainers = with lib.maintainers; [ jopejoe1 ]; - mainProgram = "license-tool"; + mainProgram = "alisa"; platforms = lib.platforms.all; }; } diff --git a/web/components.d.ts b/web/components.d.ts index b533d17..75d3ece 100644 --- a/web/components.d.ts +++ b/web/components.d.ts @@ -7,10 +7,6 @@ export {} declare module 'vue' { export interface GlobalComponents { - ActionToolbar: typeof import('./src/components/actionToolbar.vue')['default'] - CategoryContainer: typeof import('./src/components/CategoryContainer.vue')['default'] - HeaderBar: typeof import('./src/components/HeaderBar.vue')['default'] - ListViewElement: typeof import('./src/components/ListViewElement.vue')['default'] LoginPage: typeof import('./src/components/loginPage.vue')['default'] } } diff --git a/web/src/components/HeaderBar.vue b/web/src/components/HeaderBar.vue index 52aad9a..ebe11b2 100644 --- a/web/src/components/HeaderBar.vue +++ b/web/src/components/HeaderBar.vue @@ -5,7 +5,7 @@ dark prominent > - + Vuetify - - - - +