Error crash fix by patrickjquinn · Pull Request #46 · patrickjquinn/Marathon-Shell

patrickjquinn · 2026-01-18T08:40:52Z

okay this started as an attempt to try and fix some crashing and incorrectly wired up DBus services that the shell was exposing to apps.

It has turned into a substantial series of fixes including, but not limited to:

Continue removal core services from QML to C++ to align with suggestions made by Deepak (ongoing work, apps TBD).
Fixes to the 'test app' which was previously broken (The test app can now trigger notifications, calls, alarms etc etc again).
Consolidation of helpers to singletons (for things that are frequently accessed globally).
Linting and formatting.
Refactor of project structure to group C++ services logically by purpose.
OOBE improvements for on-boarding (you can now set scale for the display when you're onboarding).
Removal of bad patterns (too many 'what' comments, not enough 'why').
Other misc improvements for issues I ran into while testing.
Some basic unit testing.

…akeManager` calls in test pages.

Move shell C++ services, managers, models, controllers, and components into scoped directories and update build wiring/includes to match the new layout.

Remove QML service singletons and update shell UI, stores, and keyboard components to use the C++ managers and service APIs.

Update MarathonUI QML components and build configuration to match current layouts, styling, and lint expectations.

Update Marathon services managers to align APIs and cleanup related call history, contacts, SMS, and media handling.

Update marathon-keyboard QML and engine bindings for safer layout sizing, input context handling, and haptic calls.

Update app QML and supporting C++ to use revised service APIs, improve bindings, and resolve runtime/lint issues across bundled apps.

Tighten Marathon core app metadata, scanning, and verification helpers to support updated app behaviors.

Add calendar manager support and expand shell IPC clients, with related runner wiring and tool entrypoint adjustments.

Tighten QML lint configuration and build/run defaults to match the current project layout.

Add scripts to build QML dependency stubs and strip comments for linting.

Replace the QML SessionStore with a C++ QML_SINGLETON and update shell components to import MarathonOS.Shell for session state access.

Ensure SessionStore is registered from C++ and reset on startup so the lock flow initializes consistently.

Accept conversation taps with missing ids and guard unread badges to avoid runtime errors in test notifications.

Replace QML system stores with C++ singletons, wire them in main, and update build sources so store logic lives in C++.

Import the shell module where needed and route app restore through UIStore to keep app window state consistent.

Register system store clients as module singletons and align navigation signals so apps can access shell state without QML errors.

Replace QML router, surface registry, language, predictors, dictionary, and autocorrect with C++ singletons and update the keyboard integration.

Replace the QML keyboard settings singleton with a C++ store and wire the settings page to use it directly.

Centralize search focus and keyboard visibility to ensure the quick search overlay brings up input immediately.

Replace the QML input context with a C++ QML element and drop unused keyboard performance singleton QML.

Replace the QML calendar store with a C++ backing store that proxies CalendarManager and keeps the app state in C++.

Drop unused keyboard performance and data singleton QML files to keep the module UI-only.

Register the InputContext QML type explicitly and refresh its input mode when focus changes.

Delete the CalendarWorker.js file and update CMakeLists.txt to exclude it from the build, streamlining the project by removing unused QML services.

…ates Add a MouseArea to the MarathonOOBE component to improve user interaction by accepting all mouse events. Update icon names from "check-circle" to "circle-check" for consistency and adjust sizes accordingly.

Introduce a new scale page in the MarathonOOBE component, allowing users to select their preferred display size with adjustable text and UI element scaling. This enhancement improves accessibility and user experience by providing multiple scaling options.

Copilot

Pull request overview

This PR addresses critical crash fixes and implements a comprehensive refactoring of the Marathon OS shell architecture. The changes focus on migrating core services from QML to C++ for improved performance and stability, consolidating project structure, and fixing broken functionality in the test application.

Changes:

Migrated multiple core services (state management, notifications, telephony, search) from QML to C++ singletons
Restructured C++ source files into logical directories (services, managers, controllers, components, models)
Fixed test application service integration with proper availability checks
Removed unnecessary comments and improved code maintainability
Added basic unit testing infrastructure and QML linting improvements

Reviewed changes

Copilot reviewed 186 out of 432 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
shell/CMakeLists.txt	Reorganized source files into logical directories and added new C++ service implementations
scripts/strip_comments.py	Added utility script for removing code comments during cleanup
scripts/build_qml_dependencies.py	Added script to generate QML module dependency metadata for linting
run.sh	Added QML import path environment variable for shell modules
marathon-ui/Theme/*.qml	Removed explanatory comments from theme configuration files
marathon-ui/Navigation/*.qml	Cleaned up navigation component comments
marathon-ui/Modals/*.qml	Removed implementation comments from modal components and added open/close aliases
marathon-ui/Effects/*.qml	Updated PropertyChanges syntax and removed comments from effects
marathon-ui/Core/*.qml	Cleaned up core UI component comments
marathon-ui/Controls/*.qml	Fixed MRadioGroup selection logic and removed comments
marathon-ui/Containers/*.qml	Removed implementation comments from container components
marathon-ui/CMakeLists.txt	Added QML type generation and linting infrastructure
marathon-services/src/.h/.cpp	Removed implementation comments from service headers and implementations
marathon-keyboard/src/.h/.cpp	Removed documentation comments from keyboard IME implementation
marathon-keyboard/qml/*/.qml	Removed comments from keyboard layouts and components, deleted QML-based Dictionary and AutoCorrect
marathon-core/src/.h/.cpp	Removed comments from app management infrastructure
diagnostics.qml	Removed section header comments
cmake/QMLLint.cmake	Added import paths for shell QML modules in linting
apps/test/*/.qml	Fixed service availability checks and updated to use C++ service APIs
apps/terminal/*/.qml	Fixed import ordering and removed comments from terminal components
apps/template/*/.qml	Fixed import ordering in template app
apps/store/*/.qml	Updated to use MarathonUI components and fixed import ordering
apps/settings/src/KeyboardSettingsStore.*	Migrated keyboard settings from QML singleton to C++ implementation
apps/settings/pages/NotificationsPage.qml	Fixed import ordering
apps/settings/manifest.json	Added network permission

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-18T08:55:59Z

+    src/managers/sensormanagercpp.cpp
+    src/managers/settingsmanager.h
+    src/managers/settingsmanager.cpp
+    src/managers/platform.h


The file 'platform.h' is listed but 'platformcpp.h' is also present on the next line. This appears to be inconsistent naming - either both should include 'cpp' suffix or neither should.

Copilot · 2026-01-18T08:56:00Z

+                rippleCircle.width: Math.max(root.width, root.height) * MMotion.rippleMaxRadius
+                rippleCircle.height: Math.max(root.width, root.height) * MMotion.rippleMaxRadius


The calculation Math.max(root.width, root.height) * MMotion.rippleMaxRadius is duplicated. Consider storing this value in a local variable to avoid redundant computation.

Copilot · 2026-01-18T08:56:00Z

    property int selectedIndex: -1
    property alias options: optionsRepeater.model
-    property alias spacing: root.spacing
+    property int spacingValue: MSpacing.sm


The property name 'spacingValue' is redundant since 'spacing' already implies it's a value. Consider keeping the original 'spacing' alias pattern or renaming to something more descriptive if the alias was causing issues.

Copilot · 2026-01-18T08:56:00Z

-import QtQuick
 import MarathonApp.Terminal
-import QtQuick.Layouts
 import MarathonApp.Terminal


Duplicate import statement for 'MarathonApp.Terminal'. Remove one of the duplicate lines.

Suggested change

import MarathonApp.Terminal

Copilot · 2026-01-18T08:56:00Z

-import QtQuick
 import MarathonApp.Terminal
-import QtQuick.Layouts
 import MarathonApp.Terminal


Duplicate import statement for 'MarathonApp.Terminal'. Remove one of the duplicate lines.

Suggested change

import MarathonApp.Terminal

Copilot · 2026-01-18T08:56:01Z

-import QtQuick
 import MarathonApp.Terminal
-import QtQuick.Layouts
 import MarathonApp.Terminal


Duplicate import statement for 'MarathonApp.Terminal'. Remove one of the duplicate lines.

Suggested change

import MarathonApp.Terminal

Copilot · 2026-01-18T08:56:01Z

+    onCurrentTabIndexChanged: {
+        Qt.callLater(() => {
+            var tab = tabs[currentTabIndex];
+            if (tab && tab.session && terminalApp.Window.window && terminalApp.Window.window.active)


The property access terminalApp.Window.window is repeated. Consider caching this in a local variable for better readability and performance.

Suggested change

if (tab && tab.session && terminalApp.Window.window && terminalApp.Window.window.active)

var appWindow = terminalApp.Window.window;

if (tab && tab.session && appWindow && appWindow.active)

Copilot · 2026-01-18T08:56:01Z

        width: 100
-        color: MTheme.onSurfaceVariant
+        variant: "small"
+        color: MColors.textSecondary


Color properties should be set on MLabel using the 'variant' property rather than directly setting the 'color' property, to maintain consistent theming patterns.

Remove redundant import statements in TerminalSession, TerminalTabButton, and VirtualKeyRow components. Update focus handling logic in TerminalApp to enhance clarity and maintainability.

patrickjquinn added 27 commits January 15, 2026 09:27

feat: Improve Wayland shell surface robustness and add conditional `W…

bc71048

…akeManager` calls in test pages.

refactor: group shell sources by domain

79e4dd2

Move shell C++ services, managers, models, controllers, and components into scoped directories and update build wiring/includes to match the new layout.

refactor(shell): align QML with C++ services

ac007a8

Remove QML service singletons and update shell UI, stores, and keyboard components to use the C++ managers and service APIs.

chore(ui): refine MarathonUI components and lint setup

2657d3a

Update MarathonUI QML components and build configuration to match current layouts, styling, and lint expectations.

refactor(services): sync telephony, contacts, and media helpers

8ad2f79

Update Marathon services managers to align APIs and cleanup related call history, contacts, SMS, and media handling.

refactor(keyboard): tighten layouts and input handling

1a0c19b

Update marathon-keyboard QML and engine bindings for safer layout sizing, input context handling, and haptic calls.

refactor(apps): align app UIs with updated services

0b3b521

Update app QML and supporting C++ to use revised service APIs, improve bindings, and resolve runtime/lint issues across bundled apps.

refactor(core): adjust app registry and scanning metadata

d42b5ca

Tighten Marathon core app metadata, scanning, and verification helpers to support updated app behaviors.

feat(app-runner): add calendar manager and IPC updates

4764ed4

Add calendar manager support and expand shell IPC clients, with related runner wiring and tool entrypoint adjustments.

chore(build): update lint plumbing and run script

ed8d4b9

Tighten QML lint configuration and build/run defaults to match the current project layout.

chore(scripts): add QML build helpers

ff05e41

Add scripts to build QML dependency stubs and strip comments for linting.

feat(shell): move SessionStore to C++ singleton

5cb6311

Replace the QML SessionStore with a C++ QML_SINGLETON and update shell components to import MarathonOS.Shell for session state access.

fix(shell): restore SessionStore singleton wiring

4d7898a

Ensure SessionStore is registered from C++ and reset on startup so the lock flow initializes consistently.

fix(messages): handle conversation taps and ids

412ebbd

Accept conversation taps with missing ids and guard unread badges to avoid runtime errors in test notifications.

feat(shell): move core stores to C++

93561ec

Replace QML system stores with C++ singletons, wire them in main, and update build sources so store logic lives in C++.

fix(shell): wire QML to C++ stores

516e746

Import the shell module where needed and route app restore through UIStore to keep app window state consistent.

fix(app-runner): expose shell store proxies

0e4b8d4

Register system store clients as module singletons and align navigation signals so apps can access shell state without QML errors.

feat(shell): move keyboard and core singletons to C++

ee93d36

Replace QML router, surface registry, language, predictors, dictionary, and autocorrect with C++ singletons and update the keyboard integration.

feat(settings): move keyboard settings store to C++

fe6d69b

Replace the QML keyboard settings singleton with a C++ store and wire the settings page to use it directly.

fix(shell): focus search input reliably

969e897

Centralize search focus and keyboard visibility to ensure the quick search overlay brings up input immediately.

feat(shell): move InputContext to C++

d2ee1b0

Replace the QML input context with a C++ QML element and drop unused keyboard performance singleton QML.

feat(calendar): move calendar storage to C++

d12c2d8

Replace the QML calendar store with a C++ backing store that proxies CalendarManager and keeps the app state in C++.

chore(marathon-keyboard): remove unused QML data files

ea17db4

Drop unused keyboard performance and data singleton QML files to keep the module UI-only.

fix(shell): register InputContext and track hints

f16e839

Register the InputContext QML type explicitly and refresh its input mode when focus changes.

refactor(shell): remove CalendarWorker QML service

91e4c79

Delete the CalendarWorker.js file and update CMakeLists.txt to exclude it from the build, streamlining the project by removing unused QML services.

patrickjquinn requested a review from Copilot January 18, 2026 08:54

Copilot AI reviewed Jan 18, 2026

View reviewed changes

refactor(terminal): clean up imports and improve focus handling

556dae8

Remove redundant import statements in TerminalSession, TerminalTabButton, and VirtualKeyRow components. Update focus handling logic in TerminalApp to enhance clarity and maintainability.

patrickjquinn merged commit 685ed9e into main Jan 18, 2026
1 check passed

patrickjquinn deleted the error-crash-fix branch September 3, 2026 11:53

Navigation Menu

Repository navigation

Error crash fix - #46

Error crash fix#46
patrickjquinn merged 28 commits into
mainfrom
error-crash-fix

patrickjquinn commented Jan 18, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Jan 18, 2026

Uh oh!

Copilot AI Jan 18, 2026

Uh oh!

Copilot AI Jan 18, 2026

Uh oh!

Copilot AI Jan 18, 2026

Uh oh!

Copilot AI Jan 18, 2026

Uh oh!

Copilot AI Jan 18, 2026

Uh oh!

Copilot AI Jan 18, 2026

Uh oh!

Copilot AI Jan 18, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		rippleCircle.width: Math.max(root.width, root.height) * MMotion.rippleMaxRadius
		rippleCircle.height: Math.max(root.width, root.height) * MMotion.rippleMaxRadius

	if (tab && tab.session && terminalApp.Window.window && terminalApp.Window.window.active)
	var appWindow = terminalApp.Window.window;
	if (tab && tab.session && appWindow && appWindow.active)

Conversation

patrickjquinn commented Jan 18, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants