chore: clean up the logic of greeter and lockscreen#735
Open
calsys456 wants to merge 2 commits intolinuxdeepin:masterfrom
Open
chore: clean up the logic of greeter and lockscreen#735calsys456 wants to merge 2 commits intolinuxdeepin:masterfrom
calsys456 wants to merge 2 commits intolinuxdeepin:masterfrom
Conversation
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Sorry @calsys456, you have reached your weekly rate limit of 500000 diff characters.
Please try again later or upgrade to continue using Sourcery
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: calsys456 The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request cleans up and refactors the greeter and lockscreen logic in Treeland, making the code more maintainable and robust. The PR integrates with systemd-logind for lock/unlock signals and centralizes greeter state management in the GreeterProxy singleton.
Changes:
- Refactored GreeterProxy to be a comprehensive singleton managing all greeter/lockscreen state with proper DBus signal listeners for systemd-logind session Lock/Unlock events
- Renamed "logined" to "loggedIn" throughout the codebase for correct English naming
- Removed the QML GreeterModel singleton and simplified QML component structure, eliminating the WallpaperController.ScaleWithoutAnimation state in favor of conditional animation enablement
- Updated SessionModel to track currentIndex as a property instead of lastIndex, simplifying session selection
Reviewed changes
Copilot reviewed 26 out of 26 changed files in this pull request and generated 10 comments.
Show a summary per file
| File | Description |
|---|---|
| src/greeter/greeterproxy.h | Complete rewrite with extensive documentation, new properties (isLocked, failedAttempts, showShutdownView, showAnimation, hasActiveSession), and QDBusContext integration |
| src/greeter/greeterproxy.cpp | Refactored implementation with systemd-logind signal listeners (SessionNew, SessionRemoved, Lock, Unlock), centralizing lock/unlock logic |
| src/greeter/sessionmodel.h | Changed from lastIndex to currentIndex property with setter |
| src/greeter/sessionmodel.cpp | Refactored to use member variables instead of private class, proper currentIndex tracking |
| src/greeter/usermodel.h | Renamed LoginedRole to LoggedInRole, logined() to loggedIn(), updated method signatures |
| src/greeter/usermodel.cpp | Updated role names and method implementations for the loggedIn renaming |
| src/greeter/user.h | Renamed logined() to loggedIn() and setLogined() to setLoggedIn() |
| src/greeter/user.cpp | Updated member variable and method implementations for loggedIn renaming |
| src/seat/helper.h | Added m_greeterProxy and m_sessionModel members, inlined userModel() and added sessionModel() accessor |
| src/seat/helper.cpp | Added GreeterProxy and SessionModel singleton initialization, passed GreeterProxy to LockScreen constructor |
| src/core/lockscreen.h | Added GreeterProxy* parameter to constructor and m_greeterProxy member |
| src/core/lockscreen.cpp | Delegates lock/unlock/shutdown/switchUser to GreeterProxy instead of calling QML methods directly |
| src/wallpaper/wallpapercontroller.h | Removed ScaleWithoutAnimation enum value |
| src/wallpaper/wallpapercontroller.cpp | Removed ScaleWithoutAnimation case from switch statement |
| src/plugins/lockscreen/qml/GreeterModel.qml | Deleted QML singleton, functionality moved to C++ GreeterProxy |
| src/plugins/lockscreen/qml/Greeter.qml | Simplified to use GreeterProxy properties, removed CurrentMode enum and start() function |
| src/plugins/lockscreen/qml/LockView.qml | Listens to GreeterProxy.lockChanged signal, removed old GreeterModel state handling |
| src/plugins/lockscreen/qml/UserInput.qml | Uses GreeterProxy directly instead of GreeterModel.proxy, listens to failedAttemptsChanged |
| src/plugins/lockscreen/qml/UserList.qml | Fixed typo: model.logined to model.loggedIn |
| src/plugins/lockscreen/qml/ShutdownView.qml | Uses GreeterProxy directly, removed intermediate signals |
| src/plugins/lockscreen/qml/SessionList.qml | Uses SessionModel.currentIndex directly instead of GreeterModel.currentSession |
| src/plugins/lockscreen/qml/PowerList.qml | Uses GreeterProxy directly, removed lock signal propagation |
| src/plugins/lockscreen/qml/ControlAction.qml | Uses GreeterProxy.hasActiveSession and SessionModel.currentIndex |
| src/plugins/lockscreen/qml/LoginAnimation.qml | Checks GreeterProxy.showAnimation to conditionally run or skip animations |
| src/core/qml/PrimaryOutput.qml | Removed ScaleWithoutAnimation state, uses Behavior with GreeterProxy.showAnimation |
| src/plugins/lockscreen/CMakeLists.txt | Removed GreeterModel.qml from build files |
This makes the code more clean, clear and robustic.
Use systemd-logind for lock & unlock is much more portable and robustic.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
chore: clean up the logic of greeter and lockscreen
This makes the code more clean, clear and robustic.
feat: listen to the Lock/Unlock signal of org.freedesktop.login1.Session
Use systemd-logind for lock & unlock is much more portable and robustic.
Paired with linuxdeepin/ddm#83