Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop/snipe 25 #2440

Merged
merged 98 commits into from
Nov 30, 2024
Merged

Develop/snipe 25 #2440

merged 98 commits into from
Nov 30, 2024

Conversation

Johnson-zs
Copy link
Contributor

No description provided.

Johnson-zs and others added 30 commits November 30, 2024 09:16
Merge menus with the same name

Log: [Customize menu] Customize menu merging
Task: https://pms.uniontech.com/task-view-363005.html
[ulnfs] add to ulnfs

Log: [ulnfs] add dlnfs to ulnfs

Task: https://pms.uniontech.com/task-view-359649.html
Migrate filename from dlnfs to ulnfs.

Log: migrate filename from dlnfs to ulnfs
Task: https://pms.uniontech.com/task-view-359649.html
Window layout adjusted to left/right layout

Log: window layout
1. fix sidebar sise changed when resize window
2. change detailspace layout

Log: window layout to detailspace
1.refactor titlebar layout
2.move tabbar from workspace to titlebar
3.update ui style of some components

Log: as title
Impl sidebar show animation

Log: Sidebar show animation
iconArea adapts to compact mode

Log: iconArea adapts to compact mode
1.do not response close event when close button hidden in tab.
2.set fixed height of top titlebar after size mode changed.
3.remove same item in titlebar menu
4.sync workspace anim with window anim
5.auto play tabbar anim when remove one tab
6.set placeholder of titlebar

Log: fix tab close issue
- Rename signal 'aboutPlaySplitterAnimation' to 'aboutToPlaySplitterAnimation'
- Improve error handling in TitleBarHelper::createSettingsMenu

log:
1.file address breadcrumbs implementation
2.file address bar interaction
3.address bar drop-down box directory folder preview

Log: refactor crumbbar UI
- Implemented resizeEvent to handle sidebar visibility based on window size.
- Added updateSideBarState and updateSideBarVisibility methods to manage sidebar state.
- Introduced showSideBar and hideSideBar methods for better encapsulation of sidebar visibility logic.
- Adjusted splitter position handling to account for sidebar visibility.
- Updated minimum window width to ensure proper layout with sidebar.

This commit enhances the FileManagerWindow by dynamically managing the visibility of the sidebar based on the window size. It ensures that the sidebar behaves correctly when the window is resized, improving the overall user experience.

log:
…gerWindow

- Added animation handling for sidebar visibility in the FileManagerWindow.
- Implemented isAnimationEnabled() to check if animations are enabled.
- Refactored animation setup and connection of animation signals for better clarity.
- Introduced handleWindowResize() to adjust window size based on sidebar expansion.
- Improved sidebar visibility management with new properties and signals.
- Updated sidebar animation configuration with customizable duration and easing curve.

This commit improves the user experience by providing smooth animations for the sidebar in the FileManagerWindow. It ensures that the sidebar behaves correctly during window resizing and enhances the overall responsiveness of the UI.

log:
- Simplified sidebar visibility logic by removing redundant checks.
- Changed `sideBarVisible` to `sideBarAutoVisible` for better clarity.
- Enhanced `setSplitterPosition` method to streamline splitter size adjustments.
- Updated `animateSplitter` to correctly handle animation states.
- Improved `updateSideBarVisibility` to dynamically show/hide the sidebar based on available space.
- Added checks in `showSideBar` and `hideSideBar` to prevent unnecessary visibility changes.
- Adjusted window state saving logic to account for sidebar width.

This commit refines the sidebar management in the FileManagerWindow, ensuring smoother visibility transitions and better handling of window resizing. The changes enhance the overall user experience by providing a more responsive and intuitive interface.

log:
get appid of desktopfile by Dtk core func.

Log: fix am appid issue
Bug: https://pms.uniontech.com/bug-view-280301.html
Added new toolbar sorting options panel

Log: add sort by ui
1.set index >= 0 when remove tab.
2.only allow drag tab when tabs count > 1.

Log: fix tab issue
1.remove search func from addressbar
2.add new search edit in titlebar
3.reimpl layout

Log: refactor addressbar
Breadcrumb adaptation hidden function

Log: breadcrumbs exist in hidden folders after hiding
New toolbar view options panel

Log: add view options UI
The default spacing between buttons is not 0, resulting in incorrect width calculation.

Log: sort by button truncated
1.Adjust the minimum width of breadcrumb button to 200
2.Display ellipsis in the middle of breadcrumb button text

Log: adjust breadcrumb button UI
Activation status not saved

Log: breadcrumb button settings activation failed
Breadcrumb drop-down menu gradient display text

Log: adjust breadcrumb drop-down menu UI
1.focus issue
2.layout issue in show window

Log: fix search editor issue
1.add more icon size level
2.add item width property

Log: add view item size range
Lighto-Ku and others added 16 commits November 30, 2024 09:24
- Add additional check for local device files during info creation
- Update file attributes immediately for local devices when not previously updated
- Prevent redundant updates by setting updateOnce flag

Log: update info attributes when refresh
Bug: https://pms.uniontech.com/bug-view-273683.html
- Move icon size constants (min/max/step) to dfm_global_defines.h
- Remove duplicate icon size constants from viewoptionswidget.cpp
- Add slider configuration support in settings
- Replace icon size combobox with slider in workspace settings
- Update icon size list generation to use global constants

This change improves code maintainability by centralizing icon size
constants and provides a more intuitive slider control for icon size
settings.

Log: unify icon size constants and add slider config
- Add text index service to dde-file-manager services
- Install text index dbus service file
- Install user json config for text index service

Log: init text index service
- Change target_include_directories visibility to PRIVATE
- Add task manager integration for index operations
- Implement core index service methods
- Add proper signal connections for index operations
- Replace placeholder methods with actual implementations

Log:
- Add proper type registration for IndexTask::Type
- Change task progress type from int to qint64
- Move indexStorePath to global namespace
- Add SPDX license headers
- Improve thread safety with std::atomic_bool
- Add comprehensive logging
- Fix include paths and CMake configuration
- Add fulltext search source files to build

Summary:
This commit focuses on improving the robustness and maintainability of the text
index service, particularly around type safety and thread handling. It also
standardizes the codebase with proper licensing and logging while fixing various
build-related issues.

Log: index for full text
- Extract common directory traversal logic into traverseDirectoryCommon
- Add isSupportedFile helper function for file type checking
- Move directory traversal utilities to separate module
- Improve path validation and directory filtering
- Add visited directory tracking to prevent loops
- Enhance error handling and cleanup in index operations
- Clean up file path handling with QDir::cleanPath

This commit significantly improves the robustness and maintainability of the text
index service by refactoring the directory traversal logic. It introduces better
separation of concerns, adds safeguards against directory loops, and improves
path handling throughout the codebase.

Log:
* replace FinallyUtil with ScopeGuard for RAII resource management
* add ScopeGuard class to handle resource cleanup
* use ScopeGuard for DIR* and Lucene reader/writer cleanup
* ensure exception safety and proper resource release
* remove dependency on dfm-base library

Log: The commit improves code safety and reduces external dependencies while maintaining all existing functionality.
* replace atomic_bool with TaskState class for better state management
* use QAtomicInteger for thread-safe state control
* remove unnecessary mutex and use atomic operations
* fix task stop response delay issue
* optimize code structure and readability

Log: The commit improves task control reliability and responsiveness while maintaining thread safety.
* add QT_DEBUG guard for verbose debug output
* improve debug message format for file operations
* optimize file traversal process
* remove redundant debug output
* improve code readability and maintainability

Log: The commit improves debug output control and code readability while maintaining core functionality.
* fix task state transition logic to avoid infinite loop
* ensure task stops after completion without auto-restart
* add detailed debug logs with [TextIndex] prefix
* ensure service auto-start before DBus connection
* improve error handling and state transition logging

Log: The commit fixes the task state management to properly handle task completion and avoid unnecessary task restarts.
- Add TextIndex DBus interface to search plugin
- Add service activation check in TextIndexController
- Fix task progress reporting and cleanup in TaskManager
- Optimize index update process with better interruption handling

Log: This commit implements the TextIndex DBus interface integration and improves
the service activation mechanism for better reliability.
- Remove local index creation logic from FullTextSearcher
- Add TextIndexClient integration for index operations
- Implement async task handling with proper state management
- Add service status checking and error handling
- Clean up deprecated code and unused functions

This change moves the full-text search index management from local
implementation to the new DBus service, improving reliability and
maintainability of the search functionality.

Log:
- Remove TextIndex DBus service auto-activation config
- Change service policy from OnDemand to Resident mode
- Remove idle timeout and policy path configurations
- Clean up related installation files

This change ensures TextIndex service stays resident instead of
being activated on-demand, which resolves service activation
timing issues.

Log:
- Add index status file to track last successful update time
- Implement status file management for root directory tasks
- Add status clearing on task failure or new root index
- Add debug instructions for service debugging
- Comment out invalid index deletion temporarily

This change adds persistence to track indexing status, which helps
maintain index consistency and enables better recovery from failures.

Log: text index
- Add missing SPDX license headers to TextIndexClient files
- Update 3rdparty dependency paths in dep5 file
- Move fulltext and fsearch libraries to root 3rdparty directory
- Fix copyright information formatting

This change standardizes license headers and reorganizes 3rdparty
dependency locations for better project structure.

Log: License
as title

Log: update translations
Copy link

github-actions bot commented Nov 30, 2024

CLA Assistant Lite bot:

如果你是以企业贡献者的身份进行提交,请联系我们签署企业贡献者许可协议
If you submit as corporate contributor, please contact us to sign our Corporate Contributor License Agreement

感谢您的提交,我们非常感谢。 像许多开源项目一样,在接受您的贡献之前,我们要求您签署我们的个人贡献者许可协议。 您只需发布与以下格式相同的评论即可签署个人贡献者许可协议
Thank you for your submission, we really appreciate it. Like many open-source projects, we ask that you all sign our Individual Contributor License Agreement before we can accept your contribution. You can sign the Individual Contributor License Agreement by just posting a Pull Request Comment same as the below format.


I have read the CLA Document and I hereby sign the CLA.

1 out of 2 committers have signed the CLA.
@rb-union
@dengzhongyuan365-dev
You can retrigger this bot by commenting recheck in this Pull Request

Copy link

  • 检测到debian目录文件有变更: debian/dde-file-manager-services-plugins.install,debian/rules

Copy link

TAG Bot

TAG: 6.5.11
EXISTED: no
DISTRIBUTION: unstable

Copy link

  • 敏感词检查失败, 检测到2个文件存在敏感词
详情
{
    "src/apps/dde-file-manager/main.cpp": [
        {
            "line": "    a.setApplicationAcknowledgementPage(\"https://www.deepin.org/acknowledgments/\" + qApp->applicationName());",
            "line_number": 325,
            "rule": "S35",
            "reason": "Url link | e56e98a089"
        }
    ],
    "src/plugins/daemon/daemonplugin-vault/vaultcontrol.cpp": [
        {
            "line": "        const QString &passwd = passwordFromKeyring();",
            "line_number": 101,
            "rule": "S28",
            "reason": "Suspicious password declaration | bbb03f3741"
        }
    ]
}

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Clauszy, Johnson-zs

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@Johnson-zs
Copy link
Contributor Author

/forcemerge

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Nov 30, 2024

This pr force merged! (status: blocked)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants