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

rebase master #1479

Merged
Merged

Conversation

Johnson-zs
Copy link
Contributor

rebase master

@github-actions
Copy link

github-actions bot commented Oct 9, 2023

TAG Bot

TAG: 6.0.31
EXISTED: yes
DISTRIBUTION: unstable

Kakueeen and others added 29 commits October 9, 2023 15:06
Abandoned search missions are not quickly ended

Log: fix bug
Bug: https://pms.uniontech.com/bug-view-215063.html
add handle operation rescults to imitate monitor

Log: as des
Bug: https://pms.uniontech.com/bug-view-215019.html
In some scenarios, the search mune is problematic

Log: fxi issue
Bug: https://pms.uniontech.com/bug-view-214905.html
When initializing the wallpaper window, the screen size is used to scale the wallpaper, but the resolution of the screen changes when generating the wallpaper. Due to the non interruptible process of obtaining wallpaper during the initialization process, the resolution change failed to retrieve the wallpaper again.

Log: 

Bug:https://pms.uniontech.com/bug-view-214485.html

Influence: 壁纸
probe version and parse host by smbclient.

Log: support probe cifs version automatic.

Bug: https://pms.uniontech.com/bug-view-210139.html
the mounted encrypted disk is not shown in dock plugin.
it's ignored because the mount point of encrypted-shell device is empty.

Log: fix issue about dock.

Bug: https://pms.uniontech.com/bug-view-215103.html
the permission combobox's value is not fallbacked when change the
permission failed.

Log: fix issue about property dialog.

Bug: https://pms.uniontech.com/bug-view-215423.html
… or cutting and pasting files from smb server to USB flash drive.

Before copying task, using QProccess to execute lsblk to get the information of USB flash disk is blocked, so the display is blank, the worse the performance of USB flash disk copy speed also shows 0, multi-tasking are blocked at the beginning of the blocking point. Add tips in statistics by product evaluation.

Log: Slow display of folder information when multitasking copying or cutting and pasting files from smb server to USB flash drive.
Bug: https://pms.uniontech.com/bug-view-212257.html
1. the devece name show error in device property dialog, and fix it.
2. adjust the UI

Log: fix issue
Bug: https://pms.uniontech.com/bug-view-214867.html
update the baseline version to 6.0.28

Log: update the baseline version to 6.0.28
Bug: no
when delete file in vault, cursor show wait state

Log: fix issue
Bug: https://pms.uniontech.com/bug-view-213395.html
open symlink dir as admin with dir src path.

Log: fix open symlink dir issue
Bug: https://pms.uniontech.com/bug-view-215467.html
1. the code is useless logic and remove it.
2. it causes the problem that the cursor cannot change.

Log: fix issue
Bug: https://pms.uniontech.com/bug-view-213395.html
…er crashes

While refreshing the thumbnail, the file information object obtained through item has already been destructed

Log: fix bug
Bug: https://pms.uniontech.com/bug-view-215989.html
Under the dual screen, the position displayed of close all dialog is not rihght.

Log: fix issue
Bug: https://pms.uniontech.com/bug-view-216031.html
build version 6.0.29

Log: build version 6.0.29
fileviewmodel、fileitemdata ut

Log: workspace ut
Task: https://pms.uniontech.com/task-view-278215.html
… comparison

Add a configuration policy to enable peripheral block device synchronization for each write, and perform synchronization once for each off-disk USB flash drive write. Otherwise, all files are synchronized only at the end of this task.

Log: Baseline degradation for 1000 file off-disk copy performance comparison
Bug: https://pms.uniontech.com/bug-view-215793.html
Manually update the icon when you receive the asynchronous file information update completion signal.

Log: dde-desktop new file or folder icon display incorrectly
…le, the file is not sorted correctly.

When copying a new file to a peripheral directory, fileinfo does not have the file information. Modify fileinfo to do the sorting after getting the file information.

Log: When the peripheral creates a new file or copies a file, the file is not sorted correctly.
Bug: https://pms.uniontech.com/bug-view-215115.html
the smbclient library is not loaded and then the function is not
resolved. the ASSERT do not work in RELEASE mode.

fix the soname and if load failed, use default handler.

Log: fix issue about daemon cifs mount.

Bug: https://pms.uniontech.com/bug-view-216189.html
cd src dir when open symlink dir in trash

Log: fix open symlink dir issue
Bug: https://pms.uniontech.com/bug-view-215689.html
Operations Group Policy

Log: Operations Group Policy
Bug: https://pms.uniontech.com/bug-view-215793.html
Root cause:
When sorting, not get the Correct async file attributes.
solved:
when iterator the file info, get and cache the attributes.

Log: fix issue
Bug: https://pms.uniontech.com/bug-view-214339.html
Lighto-Ku and others added 23 commits October 9, 2023 15:08
click one of multi selected items should not show rename editor

Log: fix rename editor issue
Bug: https://pms.uniontech.com/bug-view-219275.html
Use zh_cn for burn files log

Log: audit log
…ed, the link target file cannot be found when previewing it with space.

After reboot, it is not mounted, and when it is mounted again, the desktop does not listen to the protocol device, so it doesn't update the fileinfo. so there is something wrong with the attribute.

Log: After sending a folder to the desktop with smb service mounted, the link target file cannot be found when previewing it with space.
Bug: https://pms.uniontech.com/bug-view-219383.html
…tcut key and an error is reported.

Optical drives are special directories whose parent directories do not have write permissions. Modify only the scheme as file to do judgment.

Log: New files added to the CD-ROM are deleted with a shortcut key and an error is reported.
Bug: https://pms.uniontech.com/bug-view-220917.html
…, it needs to be refreshed before it shows up

In the current interface, safely uninstalled the USB flash drive, did not remove the monitor, used the previous one, and has been using the monitor in the cache since then. This resulted in the files not being monitored.

Log: Creating a wps file in red disk space doesn't show up, it needs to be refreshed before it shows up
Bug: https://pms.uniontech.com/bug-view-221223.html
Managing plugins via dconf

Log: Plugins management

Conflicts:
	src/apps/dde-file-manager-daemon/main.cpp
	src/apps/dde-file-manager-server/main.cpp
	src/apps/dde-file-manager/main.cpp
	src/dfm-framework/lifecycle/private/pluginmanager_p.cpp
as title.
now you can add your custom setting item into setting pane, and you can
customize it's order.

Log: custom setting pane.

Task: https://pms.uniontech.com/task-view-286565.html?onlybody=yes
as title.
and 3rd party entries.

Log: support hide userdirs and 3rd party entries in computer.

Task: https://pms.uniontech.com/task-view-286567.html
as title

Log: remove 3rd setting entry.
as title.

Log: update texts.
Log: update translations for new features.
The url used to query the default view mode is incorrect

Log: fix bug
Bug: https://pms.uniontech.com/bug-view-217717.html
Under wayland, it is necessary to set a parent class to indicate the hierarchical relationship of the window

Log: fix ddailog modal bug in wayland
Bug: https://pms.uniontech.com/bug-view-201353.html
This question was introduced in "93f1347bff6fd0c25d2f4".
The capacity of the optical disc should be available instantly from 'dde-file-manager.dp'.

Log: fix device bug

Bug: https://pms.uniontech.com/bug-view-221921.html
fix elidetextlayout line postion issue, replace linespace with line height in delegate.

Log: fix file name display issue
Bug: https://pms.uniontech.com/bug-view-217693.html
1. Attribute value support selects copy
2. adjust some UI

Log: Add feature of attribute value support selects copy.
as title.

Log: Now you can reverse select your files.

Task: https://pms.uniontech.com/task-view-292113.html
as title.

Log: update translations.
Modify drawing in icon mode, add 3 slots for iconsize

Log: Icon view optimization for dde-file-manager
Task: https://pms.uniontech.com/task-view-292347.html
max-lvs
max-lvs previously approved these changes Oct 9, 2023
Disable some ut that cannot be compiled.

Log: disable some ut
@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

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 Johnson-zs merged commit 62ae44d into linuxdeepin:develop/eagle-23h2 Oct 9, 2023
13 of 14 checks passed
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.