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

Value map combobox filter #5192

Merged
merged 7 commits into from Apr 22, 2024
Merged

Value map combobox filter #5192

merged 7 commits into from Apr 22, 2024

Conversation

domi4484
Copy link
Member

@domi4484 domi4484 commented Apr 17, 2024

Make value map widget searchable

Screen_Recording_20240419_071603.mp4

@qfield-fairy
Copy link
Collaborator

qfield-fairy commented Apr 17, 2024

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clang-tidy made some suggestions

src/core/valuemapmodelbase.cpp Show resolved Hide resolved
src/core/valuemapmodelbase.cpp Outdated Show resolved Hide resolved
src/core/valuemapmodelbase.cpp Show resolved Hide resolved
src/core/valuemapmodelbase.cpp Show resolved Hide resolved
src/core/valuemapmodelbase.cpp Show resolved Hide resolved
src/core/valuemapmodelbase.cpp Outdated Show resolved Hide resolved
src/core/valuemapmodelbase.cpp Show resolved Hide resolved
src/core/valuemapmodelbase.cpp Show resolved Hide resolved
src/core/valuemapmodelbase.cpp Show resolved Hide resolved
src/core/valuemapmodelbase.cpp Show resolved Hide resolved
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clang-tidy made some suggestions

src/core/valuemapmodel.cpp Show resolved Hide resolved
src/core/valuemapmodel.cpp Show resolved Hide resolved
src/core/valuemapmodelbase.cpp Show resolved Hide resolved
src/core/valuemapmodelbase.cpp Show resolved Hide resolved
src/core/valuemapmodelbase.cpp Show resolved Hide resolved
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clang-tidy made some suggestions

src/core/valuemapmodel.cpp Outdated Show resolved Hide resolved
src/core/valuemapmodel.cpp Outdated Show resolved Hide resolved
@domi4484 domi4484 marked this pull request as ready for review April 19, 2024 05:19
src/qml/RelationCombobox.qml Show resolved Hide resolved
}
}

Popup {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a lot of code duplication between that and the relation combobox. Could we try and generalize that into a reusable item for both the RelationCombobox and this value map editor widget?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I'll look how far is feasible. I was scared about breaking something

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@domi4484 , shall we merge this PR now, and you can try to de-duplication code in a follow up PR?

Copy link
Member

@nirvn nirvn Apr 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@domi4484 , oh actually im this will need a rebase. PageHeader is no more, say hello to QfPageHeader :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes lets merge it

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nirvn Ill rebase!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nirvn done

src/core/valuemapmodelbase.cpp Outdated Show resolved Hide resolved
src/core/valuemapmodel.h Show resolved Hide resolved
src/core/valuemapmodelbase.h Outdated Show resolved Hide resolved
src/core/valuemapmodelbase.h Outdated Show resolved Hide resolved
@nirvn nirvn merged commit 29a72a2 into master Apr 22, 2024
23 checks passed
@nirvn nirvn deleted the comboFilter branch April 22, 2024 14:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants