Commit ea7dbf1a authored by Carl Schwan's avatar Carl Schwan 🚴
Browse files

Use traditional KDE folder structure

Put code in src and qml in src/content
parent be9cb5e1
......@@ -28,4 +28,4 @@ set(DefaultPermissions
WORLD_READ WORLD_EXECUTE
)
add_subdirectory(KDEInitialSystemSetup)
add_subdirectory(src)
<RCC>
<qresource prefix="/">
<file>Main.qml</file>
<file>MobileMain.qml</file>
<!-- User Details Page-->
<file>pages/user/Page.qml</file>
<!-- Locale/Welcome Page-->
<file>pages/locale/Page.qml</file>
<!-- Ready Page-->
<file>pages/ready/Page.qml</file>
<file>pages/ready/yay.svg</file>
</qresource>
</RCC>
set(SOURCES
Sources/Main.cpp
Sources/Settings.cpp
Sources/KISS.cpp
Resources/Resources.qrc
main.cpp
settings.cpp
kiss.cpp
resources.qrc
)
qt5_add_dbus_interface(SOURCES
DBusProtocols/org.freedesktop.Accounts.Service.xml
AccountsService
dbus/org.freedesktop.Accounts.Service.xml
AccountsService
)
qt5_add_dbus_interface(SOURCES
DBusProtocols/org.freedesktop.Accounts.User.xml
User
dbus/org.freedesktop.Accounts.User.xml
User
)
add_executable(org.kde.initialsystemsetup ${SOURCES})
......
......@@ -21,7 +21,7 @@ ApplicationWindow {
}
oldPage = currentPage
staccy.currentItem.apply()
staccy.replace(`qrc:/pages/${KISS.pages[currentPage]}/Page.qml`)
staccy.replace(`qrc:${KISS.pages[currentPage]}.qml`)
}
Rectangle {
......@@ -88,7 +88,7 @@ ApplicationWindow {
clip: true
initialItem: `pages/${KISS.pages[0]}/Page.qml`
initialItem: `${KISS.pages[0]}.qml`
property real aniFrom: (staccy.mirrored ? -1 : 1) * staccy.width
property real aniTo: (staccy.mirrored ? -1 : 1) * -staccy.width
......
......@@ -21,7 +21,7 @@ ApplicationWindow {
}
oldPage = currentPage
staccy.currentItem.apply()
staccy.replace(`qrc:/pages/${KISS.pages[currentPage]}/Page.qml`)
staccy.replace(`qrc:${KISS.pages[currentPage]}.qml`)
}
Rectangle {
......@@ -121,7 +121,7 @@ ApplicationWindow {
clip: true
initialItem: `pages/${KISS.pages[0]}/Page.qml`
initialItem: `${KISS.pages[0]}.qml`
property real aniFrom: (staccy.mirrored ? -1 : 1) * staccy.width
property real aniTo: (staccy.mirrored ? -1 : 1) * -staccy.width
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment