Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
gajim
gajim
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 196
    • Issues 196
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 20
    • Merge Requests 20
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Incidents
    • Environments
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • gajim
  • gajimgajim
  • Merge Requests
  • !733

Open
Opened Dec 26, 2020 by Daniel Brötzmann@wurstsalatDeveloper
  • Report abuse
Report abuse

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://dev.gajim.org/wurstsalat/gajim.git" "conversation-listbox"
git checkout -b "wurstsalat/gajim-conversation-listbox" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "master"
git merge --no-ff "wurstsalat/gajim-conversation-listbox"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

WIP: New ConversationView

  • Overview 9
  • Commits 1
  • Pipelines 8
  • Changes 13

This is a Gtk.Listbox implementation for Gajim’s message display. Some parts are taken from !678 (credits to @eta), and some ideas originate from @ehuelsmann ’s Wiki page. Since this only modifies displaying mechanics, it should be safe to test (and to switch back afterwards). Gajim’s history view still uses the old ConversationTextview, enabling testers to compare how messages are displayed.

I added TODOs in the code comments at places where either additional work is necessary or where a joint decision has to be taken. Both message timestamp and nickname are formatted via settings (in ACE: before_nickname, after_nickname, and time_stamp). For time_stamp, %H:%M will render similar to what’s shown in the screenshot below.

  • Fixes #9683 (dynamic history loading)
  • Fixes some points mentioned in #9060 (e.g. avatars, text indentation)
  • Adds a ReadMarkerRow showing how far your contact read your messages

Note that plugins (e.g. URL Image Preview, Syntax Highlighter) need to be adapted to this approach, and don’t work yet.

Example screenshot:

Screenshot_20210105_173931

Edited Jan 05, 2021 by Daniel Brötzmann
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: gajim/gajim!733
Source branch: conversation-listbox