tweaks to latest mauikit change. restore calendar

Nitrux · Mar 19, 2024 · 8272456 · 8272456
1 parent abe5e68
commit 8272456
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 19 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -25,9 +25,9 @@ find_package(KF6 ${REQUIRED_KF_VERSION} REQUIRED COMPONENTS
     Config
     Service)
 
-find_package(MauiKit4)
-find_package(MauiMan4)
-find_package(CaskServer)
+find_package(MauiKit4 REQUIRED COMPONENTS Calendar)
+find_package(MauiMan4 REQUIRED)
+find_package(CaskServer REQUIRED)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
@@ -125,6 +125,7 @@ qt_add_qml_module(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
     MauiKit4
+    MauiKit4::Calendar
     MauiMan4
     # CaskLib
     CaskServer::CaskServerLib

diff --git a/src/main.cpp b/src/main.cpp
@@ -43,8 +43,9 @@
 #include <unistd.h>
 
 #include <MauiKit4/Core/mauiapp.h>
-#include <KLocalizedString>
+#include <MauiKit4/Calendar/moduleinfo.h>
 
+#include <KLocalizedString>
 
 //models and controllers by Cask
 #include "code/controllers/zpaces.h"
@@ -261,6 +262,9 @@ int main(int argc, char *argv[])
     about.setOrganizationDomain(CASK_URI);
     about.setProgramLogo(app.windowIcon());
 
+    const auto FBData = MauiKitCalendar::aboutData();
+    about.addComponent(FBData.name(), MauiKitCalendar::buildVersion(), FBData.version(), FBData.webAddress());
+
     KAboutData::setApplicationData(about);
 
     // if(MauiManUtils::isMauiSession())

diff --git a/src/qml/CaskScreen.qml b/src/qml/CaskScreen.qml
@@ -93,7 +93,7 @@ WaylandOutput
     sizeFollowsWindow: true
     availableGeometry : _cask.availableGeometry
 
-    scaleFactor: Cask.MauiMan.screen.scaleFactor
+    // scaleFactor: Cask.MauiMan.screen.scaleFactor
     //    transform: switch(control.orientation)
     //               {
     //               case Qt.PrimaryOrientation: return WaylandOutput.TransformNormal

diff --git a/src/qml/shell/statusbar/items/calendar/CalendarItem.qml b/src/qml/shell/statusbar/items/calendar/CalendarItem.qml
@@ -7,7 +7,7 @@ import org.maui.cask as Cask
 
 import "../../../templates" as Templates
 
-// import org.mauikit.calendar 1.0 as Cal
+import org.mauikit.calendar as Cal
 
 Cask.PanelItem
 {
@@ -71,7 +71,7 @@ Cask.PanelItem
 
             width: parent.width
             height: currentItem.implicitHeight
-/*
+
             initialItem: Cal.DaysGrid
                 {
                     id: _monthGrid
@@ -93,7 +93,7 @@ Cask.PanelItem
                             onClicked: _stack.push(_tasksPageComponent)
                         }
                     }
-                }*/
+                }
 
         }
     }

diff --git a/src/qml/shell/statusbar/items/sliders/volume/DeviceItem.qml b/src/qml/shell/statusbar/items/sliders/volume/DeviceItem.qml
@@ -5,7 +5,6 @@ import QtQuick.Layouts
 
 import org.mauikit.controls as Maui
 
-import org.maui.cask as Cask
 import org.mauicore.audio as MauiCore
 
 import ".."
@@ -14,25 +13,28 @@ import "../../../../templates" as Template
 Template.SliderToggle
 {
     id: control
+
     property string /* "sink" | "sink-input" | "source" | "source-output" */ type
+
     readonly property var currentPort: model.Ports[model.ActivePortIndex]
     readonly property bool muted: model.Muted
     readonly property int activePortIndex: model.ActivePortIndex
-readonly property int percent: (control.volume * 100) / MauiCore.PulseAudio.NormalVolume
+    readonly property int percent: (control.volume * 100) / MauiCore.PulseAudio.NormalVolume
     readonly property bool isPlayback: type.startsWith("sink")
-    slider.iconSource: "audio-volume-high"
 
-    property int volume: model.Volume
+    readonly property int volume: model.Volume
     property bool ignoreValueChange: true
 
     slider.from: MauiCore.PulseAudio.MinimalVolume
     slider.to: MauiCore.PulseAudio.MaximalVolume
     slider.stepSize: slider.to / (slider.to / MauiCore.PulseAudio.NormalVolume * 100.0)
-    visible: model.HasVolume
-    enabled: model.VolumeWritable
+    slider.iconSource: "audio-volume-high"
+
     slider.opacity: model.Muted ? 0.5 : 1
-    //slider.value: 0.5
     slider.animatedRec.width: (slider.handle.x * meter.volume) + Maui.Style.space.medium
+
+    visible: model.HasVolume
+    enabled: model.VolumeWritable
 
     data: [MauiCore.VolumeMonitor
     {

diff --git a/src/qml/shell/templates/SliderTemplate.qml b/src/qml/shell/templates/SliderTemplate.qml
@@ -3,8 +3,6 @@ import QtQuick.Controls
 
 import org.mauikit.controls as Maui
 
-import org.maui.cask as Cask
-
 import Qt5Compat.GraphicalEffects
 
 Slider

diff --git a/src/qml/shell/templates/SliderToggle.qml b/src/qml/shell/templates/SliderToggle.qml
@@ -5,7 +5,7 @@ import QtQuick.Layouts
 AbstractBarToggle
 {
     id: control
-    property alias slider : _slider
+    readonly property alias slider : _slider
 
     bar: SliderTemplate
     {

diff --git a/startcask/cask-session/startup.cpp b/startcask/cask-session/startup.cpp
@@ -284,7 +284,7 @@ void AutoStartAppsJob::start()
 {
     qCDebug(CASK_SESSION);
 
-    QTimer::singleShot(0, this, [=]() {
+    QTimer::singleShot(0, this, [this]() {
         do {
             QString serviceName = m_autoStart.startService();
             if (serviceName.isEmpty()) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,8 +3,6 @@ import QtQuick.Controls @@
     import org.mauikit.controls as Maui
-    import org.maui.cask as Cask
     import Qt5Compat.GraphicalEffects
     Slider
@@ Expand Down @@