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

fix(AttributeEditor): Restore splitter position #59762

Merged
merged 4 commits into from
Dec 19, 2024

Conversation

troopa81
Copy link
Contributor

@troopa81 troopa81 commented Dec 5, 2024

only the conditional formatting was saved and restored.

splitter

Funded by coforet

@troopa81 troopa81 added the GUI/UX Related to QGIS application GUI or User Experience label Dec 5, 2024
@github-actions github-actions bot added this to the 3.42.0 milestone Dec 5, 2024
@troopa81 troopa81 added Bug Either a bug report, or a bug fix. Let's hope for the latter! backport queued_ltr_backports Queued Backports backport release-3_40 labels Dec 5, 2024
Copy link

github-actions bot commented Dec 5, 2024

🪟 Windows Qt6 builds

Download Windows Qt6 builds of this PR for testing.
(Built from commit 64cf3da)

🪟 Windows builds

Download Windows builds of this PR for testing.
Debug symbols for this build are available here.
(Built from commit 64cf3da)

@troopa81 troopa81 force-pushed the restore_attributeeditor_spliiter branch from c42df32 to 64cf3da Compare December 16, 2024 16:44
@troopa81
Copy link
Contributor Author

@nyalldawson @3nids Can we merge?

@nyalldawson
Copy link
Collaborator

Fine for me! I'll let @3nids get the final word in though :)

@troopa81
Copy link
Contributor Author

I treated its comment so I think we're good. I merge it and if there is anything to be modified then I'll push another PR.

@troopa81 troopa81 merged commit 99c3852 into qgis:master Dec 19, 2024
31 checks passed
@qgis-bot
Copy link
Collaborator

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 64cf3da49ad... fix(Settings): Move window state settings in its own group
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging src/gui/attributetable/qgsdualview.cpp
[backport-59762-to-queued_ltr_backports 23c0b76c5b1] fix(AttributeEditor): Restore splitter position
 Author: Julien Cabieces <[email protected]>
 Date: Thu Dec 5 15:28:43 2024 +0100
 1 file changed, 10 insertions(+), 2 deletions(-)
Auto-merging src/gui/attributetable/qgsdualview.cpp
Auto-merging src/gui/attributetable/qgsdualview.h
[backport-59762-to-queued_ltr_backports 09598694374] fix(AttributeEditor) use new settings API
 Author: Julien Cabieces <[email protected]>
 Date: Thu Dec 5 17:01:51 2024 +0100
 2 files changed, 13 insertions(+), 6 deletions(-)
Auto-merging src/gui/attributetable/qgsdualview.cpp
Auto-merging src/gui/attributetable/qgsdualview.h
[backport-59762-to-queued_ltr_backports 30f214f2899] fix(AttributeEdtitor): typo
 Author: Julien Cabieces <[email protected]>
 Date: Mon Dec 9 15:17:41 2024 +0100
 2 files changed, 5 insertions(+), 5 deletions(-)
Auto-merging src/core/settings/qgssettingstree.h
CONFLICT (content): Merge conflict in src/core/settings/qgssettingstree.h
Auto-merging src/gui/attributetable/qgsdualview.cpp

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-queued_ltr_backports queued_ltr_backports
# Navigate to the new working tree
cd .worktrees/backport-queued_ltr_backports
# Create a new branch
git switch --create backport-59762-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 05c9d6c8cd3834c4d5280b780597f1831dcf0b50,b494fc1ec5cda285c5e6fb9e85d449627e8f9839,9921db1e6ff9ad0a7481c66a434c5445fabce1df,64cf3da49ad8c40dd35b8f4d56ec0d2b101144b7
# Push it to GitHub
git push --set-upstream origin backport-59762-to-queued_ltr_backports
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-queued_ltr_backports

Then, create a pull request where the base branch is queued_ltr_backports and the compare/head branch is backport-59762-to-queued_ltr_backports.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Dec 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport queued_ltr_backports Queued Backports backport release-3_40 Bug Either a bug report, or a bug fix. Let's hope for the latter! failed backport The automated backport attempt failed, needs a manual backport GUI/UX Related to QGIS application GUI or User Experience
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants