Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-client-qt
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

300ac17d

Commit 300ac17d authored 2 years ago by Sébastien Blin

Downloads
- Patches
- Plain Diff

contactmodel: rework ban status

And do not ban contact when removing conversation.

Change-Id: Ia76c76b265dd2a9d7d3cc8e2f869bf74fd3cbe63

parent c73d7da1

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

src/app/constant/JamiStrings.qml 1 addition, 0 deletions

src/app/constant/JamiStrings.qml
src/app/conversationlistmodel.cpp 1 addition, 1 deletion

src/app/conversationlistmodel.cpp
src/app/conversationlistmodelbase.cpp 5 additions, 0 deletions

src/app/conversationlistmodelbase.cpp
src/app/currentconversation.cpp 1 addition, 0 deletions

src/app/currentconversation.cpp
src/app/currentconversation.h 1 addition, 0 deletions

src/app/currentconversation.h
src/app/mainview/components/ChatView.qml 3 additions, 1 deletion

src/app/mainview/components/ChatView.qml
src/app/mainview/components/ChatViewHeader.qml 4 additions, 2 deletions

src/app/mainview/components/ChatViewHeader.qml
src/app/mainview/components/ConversationListView.qml 2 additions, 0 deletions

src/app/mainview/components/ConversationListView.qml
src/app/mainview/components/ConversationSmartListContextMenu.qml 13 additions, 3 deletions

.../mainview/components/ConversationSmartListContextMenu.qml
src/app/mainview/components/SmartListItemDelegate.qml 11 additions, 0 deletions

src/app/mainview/components/SmartListItemDelegate.qml
src/app/messagesadapter.cpp 13 additions, 0 deletions

src/app/messagesadapter.cpp
src/app/messagesadapter.h 1 addition, 0 deletions

src/app/messagesadapter.h
src/libclient/contactmodel.cpp 13 additions, 2 deletions

src/libclient/contactmodel.cpp
src/libclient/conversationmodel.cpp 22 additions, 16 deletions

src/libclient/conversationmodel.cpp

with 91 additions and 25 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment