Moving views to content instad of controls

This commit is contained in:
Digital Artifex
2026-08-18 18:21:45 -04:00
parent 45f293a349
commit ac65bbb3ab
21 changed files with 444 additions and 375 deletions
+14 -4
View File
@@ -18,10 +18,20 @@ qt6_add_qml_module(KomplexHubContent
"pages/UserProfilePage.qml"
"pages/WallpaperSettingsPage.qml"
"pages/VideoSearchPage.qml"
QML_FILES pages/FeaturedVideosPage.qml
QML_FILES pages/FeaturedPacksPage.qml
QML_FILES pages/FeaturedImagesPage.qml
QML_FILES pages/NewestPacksPage.qml
"pages/FeaturedVideosPage.qml"
"pages/FeaturedPacksPage.qml"
"pages/FeaturedImagesPage.qml"
"pages/NewestPacksPage.qml"
"views/CompletedView.qml"
"views/DownloadView.qml"
"views/ErrorView.qml"
"views/ImageView.qml"
"views/PackView.qml"
"views/VideoView.qml"
RESOURCES views/CMakeLists.txt
RESOURCES pages/CMakeLists.txt
)
add_subdirectory(pages)
add_subdirectory(views)
+7 -7
View File
@@ -81,7 +81,7 @@ Rectangle {
height: 64
width: 100
text: "Home"
text: qsTr("Home")
icon.height: 32
icon.width: 32
@@ -109,7 +109,7 @@ Rectangle {
height: 64
width: 100
text: "Images"
text: qsTr("Images")
icon.height: 32
icon.width: 32
@@ -132,7 +132,7 @@ Rectangle {
height: 64
width: 100
text: "Videos"
text: qsTr("Videos")
icon.height: 32
icon.width: 32
@@ -155,7 +155,7 @@ Rectangle {
height: 64
width: 100
text: "Live"
text: qsTr("Komplex")
icon.height: 32
icon.width: 32
@@ -178,7 +178,7 @@ Rectangle {
height: 64
width: 100
text: "Installed"
text: qsTr("Installed")
icon.height: 32
icon.width: 32
@@ -207,7 +207,7 @@ Rectangle {
height: 64
width: 100
text: "Settings"
text: qsTr("Settings")
icon.height: 32
icon.width: 32
@@ -369,7 +369,7 @@ Rectangle {
function isSearchPage()
{
return (
return(
pageLoader.item instanceof ImageSearchPage ||
pageLoader.item instanceof LiveSearchPage ||
pageLoader.item instanceof VideoSearchPage
+20
View File
@@ -0,0 +1,20 @@
qt_add_library(KomplexHubPages STATIC)
qt6_add_qml_module(KomplexHubPages
URI "KomplexHub.Pages"
VERSION 1.0
RESOURCE_PREFIX "/qt/qml"
QML_FILES
"HomePage.qml"
"ImageSearchPage.qml"
"InstalledWallpaperPage.qml"
"LiveSearchPage.qml"
"LoginPage.qml"
"SettingsPage.qml"
"UserProfilePage.qml"
"WallpaperSettingsPage.qml"
"VideoSearchPage.qml"
"FeaturedVideosPage.qml"
"FeaturedPacksPage.qml"
"FeaturedImagesPage.qml"
"NewestPacksPage.qml"
)
@@ -6,6 +6,8 @@ import KomplexHub
import KomplexHub.Controls
import KomplexHub.Kero
import KomplexHub.Plugin
import KomplexHub.Views
import KomplexHub.Pages
Rectangle
{
@@ -6,6 +6,8 @@ import KomplexHub
import KomplexHub.Controls
import KomplexHub.Kero
import KomplexHub.Plugin
import KomplexHub.Views
import KomplexHub.Pages
Rectangle
{
@@ -6,6 +6,8 @@ import KomplexHub
import KomplexHub.Controls
import KomplexHub.Kero
import KomplexHub.Plugin
import KomplexHub.Views
import KomplexHub.Pages
Rectangle
{
+26 -16
View File
@@ -7,6 +7,7 @@ import KomplexHub
import KomplexHub.Controls
import KomplexHub.Kero
import KomplexHub.Plugin
import KomplexHubContent
Item
{
@@ -111,7 +112,7 @@ Item
color: palette.text
font.pixelSize: Constants.h2Font.pixelSize
font.bold: true
text: qsTr("Featured Live Wallpapers")
text: qsTr("Featured Komplex Wallpapers")
verticalAlignment: Qt.AlignVCenter
}
@@ -198,7 +199,7 @@ Item
SearchResultItem
{
anchors.fill: parent
title: parent.author
author: parent.author
description: parent.description
thumbnail: parent.thumbnail
uuid: parent.uuid
@@ -220,13 +221,13 @@ Item
}
}
VerticalSpacer{ height: Constants.largeMargin; width: Constants.largeMargin }
VerticalSpacer { height: Constants.largeMargin; width: Constants.largeMargin }
}
}
}
}
VerticalSpacer{ height: Constants.largeMargin; width: Constants.largeMargin }
VerticalSpacer { height: Constants.largeMargin; width: Constants.largeMargin }
Rectangle
{
@@ -257,8 +258,8 @@ Item
anchors.left: parent.left
anchors.right: parent.right
anchors.margins: Constants.largeMargin
height: childrenRect.height
height: childrenRect.height
color: palette.window
Column
@@ -363,7 +364,7 @@ Item
SearchResultItem
{
anchors.fill: parent
title: parent.author
author: parent.author
thumbnail: parent.thumbnail
uuid: parent.uuid
pexels: true
@@ -388,7 +389,6 @@ Item
VerticalSpacer{ height: Constants.largeMargin; width: Constants.largeMargin }
}
}
Component.onCompleted: () =>
@@ -422,7 +422,8 @@ Item
opacity: 0
visible: opacity > 0.01
Behavior on opacity {
Behavior on opacity
{
NumberAnimation
{
duration: 250
@@ -437,7 +438,8 @@ Item
opacity: 0
visible: opacity > 0.01
Behavior on opacity {
Behavior on opacity
{
NumberAnimation
{
duration: 250
@@ -452,7 +454,8 @@ Item
opacity: 0
visible: opacity > 0.01
Behavior on opacity {
Behavior on opacity
{
NumberAnimation
{
duration: 250
@@ -460,7 +463,8 @@ Item
}
}
Behavior on opacity {
Behavior on opacity
{
NumberAnimation
{
duration: 250
@@ -478,7 +482,8 @@ Item
anchors.fill: parent
opacity: 0
Behavior on opacity {
Behavior on opacity
{
NumberAnimation
{
duration: 250
@@ -548,8 +553,10 @@ Item
}
}
states: [
State {
states:
[
State
{
name: "loading"
when: homePageRoot.loading
@@ -571,7 +578,8 @@ Item
opacity: 0
}
},
State {
State
{
name: "idle"
when: !popup && !loading
@@ -606,7 +614,8 @@ Item
}
]
transitions: [
transitions:
[
Transition
{
from: "loading"
@@ -692,6 +701,7 @@ Item
viewMoreWallpaperPopup.authorId = packsModel.data(packsModel.index(index,0), NewestPacksModel.AuthorIdRole)
viewMoreWallpaperPopup.description = packsModel.data(packsModel.index(index,0), NewestPacksModel.DescriptionRole)
viewMoreWallpaperPopup.thumbnail = packsModel.data(packsModel.index(index,0), NewestPacksModel.ThumbnailRole)
viewMoreWallpaperPopup.name = packsModel.data(packsModel.index(index,0), NewestPacksModel.NameRole)
viewMoreWallpaperPopup.opacity = 1
popupContainer.opacity = 1
pageArea.opacity = 0
@@ -6,6 +6,8 @@ import KomplexHub
import KomplexHub.Controls
import KomplexHub.Kero
import KomplexHub.Plugin
import KomplexHub.Views
import KomplexHub.Pages
Item
{
@@ -2,10 +2,13 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Dialogs
import KomplexHub
import KomplexHub.Controls
import KomplexHub.Kero
import KomplexHub.Plugin
import KomplexHub.Views
import KomplexHub.Pages
Rectangle {
id: root
@@ -1,9 +1,12 @@
import QtQuick
import QtQuick.Controls
import KomplexHub
import KomplexHub.Controls
import KomplexHub.Kero
import KomplexHub.Plugin
import KomplexHub.Views
import KomplexHub.Pages
Item
{
+5
View File
@@ -1,8 +1,13 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import KomplexHub
import KomplexHub.Controls
import KomplexHub.Kero
import KomplexHub.Plugin
import KomplexHub.Views
import KomplexHub.Pages
Item {
id: loginFormRoot
@@ -6,6 +6,8 @@ import KomplexHub
import KomplexHub.Controls
import KomplexHub.Kero
import KomplexHub.Plugin
import KomplexHub.Views
import KomplexHub.Pages
Rectangle
{
+5
View File
@@ -1,8 +1,13 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import KomplexHub
import KomplexHub.Controls
import KomplexHub.Kero
import KomplexHub.Plugin
import KomplexHub.Views
import KomplexHub.Pages
Item {
readonly property bool searchable: false
@@ -1,7 +1,13 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import KomplexHub
import KomplexHub.Controls
import KomplexHub.Kero
import KomplexHub.Plugin
import KomplexHub.Views
import KomplexHub.Pages
Item {
id: root
@@ -6,6 +6,8 @@ import KomplexHub
import KomplexHub.Controls
import KomplexHub.Kero
import KomplexHub.Plugin
import KomplexHub.Views
import KomplexHub.Pages
Item
{
@@ -31,9 +31,12 @@ import QtQuick.Layouts
//import org.kde.plasma.core as PlasmaCore
import QtCore
import Qt.labs.folderlistmodel 2.15
import KomplexHub
import KomplexHub.Controls
import KomplexHub.Plugin
import KomplexHub.Views
import KomplexHub.Pages
//import com.github.digitalartifex.komplex 1.0 as Komplex
+13
View File
@@ -0,0 +1,13 @@
qt_add_library(KomplexHubViews STATIC)
qt6_add_qml_module(KomplexHubViews
URI "KomplexHub.Views"
VERSION 1.0
RESOURCE_PREFIX "/qt/qml"
QML_FILES
"CompletedView.qml"
"DownloadView.qml"
"ErrorView.qml"
"ImageView.qml"
"PackView.qml"
"VideoView.qml"
)