Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim] Pushed new branch filetransfer-page
by Daniel Brötzmann (＠wurstsalat) 02 Nov '22

02 Nov '22

Daniel Brötzmann pushed new branch filetransfer-page at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/filetransfer-page You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] new: CSS: Add generic listbox and dnd-area classes
by Daniel Brötzmann (＠wurstsalat) 02 Nov '22

02 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 3bfb40a4 by wurstsalat at 2022-11-02T23:50:15+01:00 new: CSS: Add generic listbox and dnd-area classes - - - - - 1 changed file: - gajim/data/style/gajim.css Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -151,6 +151,26 @@ .gajim-scrolled { border-color:@unfocused_borders; } +/* ListBox */ +.gajim-listbox { + background: transparent; +} +.gajim-listbox row { + padding: 12px; + border: 1px solid @borders; + border-bottom: 0px; +} +.gajim-listbox row:nth-last-child(2) { + border-bottom: 1px solid @borders; +} + +/* Drag and drop */ +.dnd-area { + border: 2px dashed @theme_selected_bg_color; + border-radius: 6px; + padding: 18px; +} + /* .inline-toolbar linked from top */ .ontop-bar { border-width: 1px; View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3bfb40a4307b335270ad825cfc91da8c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3bfb40a4307b335270ad825cfc91da8c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Preview helpers: Add type annotations
by Daniel Brötzmann (＠wurstsalat) 02 Nov '22

02 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e5d7586b by wurstsalat at 2022-11-02T23:45:51+01:00 cq: Preview helpers: Add type annotations - - - - - 2 changed files: - gajim/common/preview_helpers.py - pyproject.toml Changes: ===================================== gajim/common/preview_helpers.py ===================================== @@ -59,7 +59,7 @@ class Coords(NamedTuple): lon: str -def resize_gif(image: Image.Image, +def resize_gif(image: ImageFile.ImageFile, output_file: BytesIO, resize_to: tuple[int, int]) -> None: frames, result = extract_and_resize_frames(image, resize_to) @@ -73,7 +73,8 @@ def resize_gif(image: Image.Image, loop=1000) -def analyse_image(image: Image.Image) -> tuple[Image.Image, dict[str, Any]]: +def analyse_image(image: ImageFile.ImageFile + ) -> tuple[ImageFile.ImageFile, dict[str, Any]]: ''' Pre-process pass over the image to determine the mode (full or additive). Necessary as assessing single frames isn't reliable. Need to know the mode @@ -101,7 +102,7 @@ def analyse_image(image: Image.Image) -> tuple[Image.Image, dict[str, Any]]: return image, result -def extract_and_resize_frames(image: Image.Image, +def extract_and_resize_frames(image: ImageFile.ImageFile, resize_to: tuple[int, int] ) -> tuple[list[Image.Image], dict[str, Any]]: @@ -111,7 +112,7 @@ def extract_and_resize_frames(image: Image.Image, palette = image.getpalette() last_frame = image.convert('RGBA') - frames = [] + frames: list[Image.Image] = [] try: while True: @@ -120,6 +121,7 @@ def extract_and_resize_frames(image: Image.Image, # If not, we need to apply the global palette to the new frame. if not image.getpalette(): + assert palette is not None image.putpalette(palette) new_frame = Image.new('RGBA', image.size) @@ -224,6 +226,7 @@ def create_thumbnail_with_pil(data: bytes, size: int) -> Optional[bytes]: try: if image.format == 'GIF' and image.n_frames > 1: + assert isinstance(image, ImageFile.ImageFile) resize_gif(image, output_file, (size, size)) else: image.thumbnail((size, size)) @@ -270,7 +273,7 @@ def pixbuf_from_data(data: bytes) -> Optional[GdkPixbuf.Pixbuf]: # Fallback to Pillow input_file = BytesIO(data) image = Image.open(BytesIO(data)).convert('RGBA') - array = GLib.Bytes.new(image.tobytes()) + array = GLib.Bytes.new(image.tobytes()) # type: ignore width, height = image.size pixbuf = GdkPixbuf.Pixbuf.new_from_bytes(array, GdkPixbuf.Colorspace.RGB, ===================================== pyproject.toml ===================================== @@ -49,6 +49,7 @@ include = [ "gajim/common/modules/vcard4.py", "gajim/common/modules/vcard_temp.py", "gajim/common/passwords.py", + "gajim/common/preview_helpers.py", "gajim/common/regex.py", "gajim/common/setting_values.py", "gajim/common/sound.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e5d7586b7f1d975686fa1ef12fb8ae8e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e5d7586b7f1d975686fa1ef12fb8ae8e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] 67 commits: refactor: Remove create_groupchat()
by Daniel Brötzmann (＠wurstsalat) 02 Nov '22

02 Nov '22

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: a954839e by Philipp Hörist at 2022-10-28T23:23:11+02:00 refactor: Remove create_groupchat() - - - - - 9fa15859 by Philipp Hörist at 2022-10-29T11:56:48+02:00 cq: Remove space - - - - - 5dd99a3f by Philipp Hörist at 2022-10-29T12:46:04+02:00 refactor: Move show_add_join_groupchat() to main - - - - - 59ff9cfa by Philipp Hörist at 2022-10-29T13:41:11+02:00 refactor: Config: Disable saving legacy config - - - - - 30e4ac5f by Philipp Hörist at 2022-10-29T13:41:11+02:00 refactor: Move start_chat_from_jid() to main - - - - - ead3290f by Philipp Hörist at 2022-10-29T13:41:11+02:00 refactor: Move change_status() to application - - - - - 7e3ce334 by Philipp Hörist at 2022-10-29T13:49:23+02:00 refactor: Move autoconnect() to application - - - - - 57cb2888 by Philipp Hörist at 2022-10-29T14:30:17+02:00 refactor: Move more init code into application - - - - - 1d1a7c99 by Philipp Hörist at 2022-10-29T14:36:01+02:00 refactor: Remove unused code - - - - - 1095fb32 by Philipp Hörist at 2022-10-29T14:40:06+02:00 refactor: Move init code into application - - - - - f275c18e by Philipp Hörist at 2022-10-29T14:46:11+02:00 refactor: Remove unused code - - - - - ea42cf0f by Philipp Hörist at 2022-10-29T20:28:53+02:00 fix: Remote: Return True for change_status - - - - - a3cd8882 by wurstsalat at 2022-10-30T15:02:41+01:00 fix: AvatarBox: Only react to clicks for GroupchatContacts - - - - - 0c81115f by Philipp Hörist at 2022-10-30T16:50:01+01:00 refactor: Enable message input actions always - - - - - 66481d53 by Philipp Hörist at 2022-10-30T16:50:01+01:00 fix: Enable emoji chooser action This fixes the emoji chooser shortcut - - - - - d47d7cec by Philipp Hörist at 2022-10-30T16:58:26+01:00 cfix: Remove doubled action - - - - - 3664f77b by Philipp Hörist at 2022-10-30T17:15:04+01:00 fix: Make strings translatable - Remove not useful placeholder text in treeview rows - - - - - 7ecb474f by Philipp Hörist at 2022-10-30T17:17:15+01:00 fix: Make string translatable - - - - - 1e9537dc by Philipp Hörist at 2022-10-30T17:25:49+01:00 cfix: Fix typo - - - - - f76bde26 by Philipp Hörist at 2022-10-30T19:30:41+01:00 fix: Plugins: Use correct gettext import - - - - - 48e80218 by Philipp Hörist at 2022-10-30T19:34:29+01:00 cfix: Don’t translate xmpp address not translatable - - - - - cd159c4d by Daniel Brötzmann at 2022-10-30T21:47:22+00:00 feat: Add action to copy multiple messages - - - - - 13c4e456 by Philipp Hörist at 2022-10-31T10:22:45+01:00 refactor: Archive: Remove unnecessary doc string - - - - - 4982798c by Philipp Hörist at 2022-10-31T10:22:45+01:00 refactor: Contacts: Remove pixbuf option from get_avatar() This is only needed once, for notifications. - - - - - 6e459182 by Philipp Hörist at 2022-10-31T11:07:14+01:00 fix: Remote: Make get_status() return correct status when offline - - - - - 4b497df5 by Philipp Hörist at 2022-10-31T11:38:53+01:00 fix: Disable loading of GUPnPIgd library GUPnPIgd uses libsoup3 which is incompatible with Gajims usage of libsoup2. This disables loading until Gajim switches to libsoup3. Fixes #11183 - - - - - 6ca0c6cf by Philipp Hörist at 2022-10-31T11:58:53+01:00 change: Raise nbxmpp version - - - - - 4f803a35 by Weblate at 2022-10-31T12:02:36+01:00 chore: Update translations - - - - - 2de8d949 by Philipp Hörist at 2022-10-31T12:09:16+01:00 release: 1.5.3 - - - - - 98d2d873 by André Apitzsch at 2022-10-31T18:29:25+01:00 cfix: Flatpak: Fix package build With the switch to pyproject.toml build isolation is used by default. As flatpak build runs in offline mode, no dependencies could be downloaded to the isolated environment. That's why build failed. - - - - - e426ed6c by wurstsalat at 2022-11-01T00:27:49+01:00 fix: Don’t fail when trying to reset last message id - - - - - 45e1f810 by wurstsalat at 2022-11-01T20:39:00+01:00 fix: Message selection: Don’t fail hard if log_line_id is None Fixes #11263 - - - - - 8c244751 by wurstsalat at 2022-11-01T20:48:39+01:00 imprv: Add msg_log_id to live message events Improves the situation for #11263 - - - - - ae404955 by wurstsalat at 2022-11-01T20:56:31+01:00 cfix: Always return value for log_message - - - - - 53814974 by wurstsalat at 2022-11-01T21:09:52+01:00 refactor: Move menus for roster view and start chat button - - - - - c7ab8603 by wurstsalat at 2022-11-01T21:59:26+01:00 refactor: Use GTK theme colors for floating overlay box - - - - - 266c1290 by wurstsalat at 2022-11-01T23:44:44+01:00 refactor: CSS: Order classes, reduce redundancy - - - - - c848f2ff by wurstsalat at 2022-11-02T20:52:38+01:00 fix: CSS: Move overriding rules to bottom Fixes #11269 - - - - - a3a6d3ec by wurstsalat at 2022-11-02T21:10:24+01:00 new: CSS: Add general purpose classes - - - - - 755fd601 by wurstsalat at 2022-11-02T21:13:58+01:00 fix: CSS: Fix settings related inconsistencies - - - - - b1dd63eb by lovetox at 2022-11-02T21:22:37+01:00 Omemo Start - - - - - c3c9a837 by wurstsalat at 2022-11-02T21:22:37+01:00 cq: OMEMO: Add type annotations - - - - - d261bdb0 by wurstsalat at 2022-11-02T21:22:37+01:00 cq: OMEMO: Fix linting errors - - - - - e4dd2370 by wurstsalat at 2022-11-02T21:22:37+01:00 cq: Add type stubs for python-qrcode - - - - - 08b849ad by wurstsalat at 2022-11-02T21:22:37+01:00 chore: Adapt dependencies for OMEMO - - - - - 5c6618e2 by wurstsalat at 2022-11-02T21:22:37+01:00 chore: OMEMO: Remove unused methods 'activate' has a replacement in the 'signled-in' event - - - - - 03fdb873 by wurstsalat at 2022-11-02T21:22:37+01:00 new: Add OMEMO_TEMP_DL to caps - - - - - 6d261955 by wurstsalat at 2022-11-02T21:23:25+01:00 new: Add OMEMOTrustManager - - - - - 509aa495 by wurstsalat at 2022-11-02T21:23:26+01:00 new: OMEMO: Add file encryption - - - - - f8cb8752 by Philipp Hörist at 2022-11-02T21:23:26+01:00 chore: Update dependencies - - - - - cb9eae98 by Philipp Hörist at 2022-11-02T21:23:26+01:00 new: Block omemo plugin - - - - - b4043d1a by wurstsalat at 2022-11-02T21:23:26+01:00 chore: OMEMO: Remove obsolete qrcode version check - - - - - 8a30f631 by Philipp Hörist at 2022-11-02T21:23:26+01:00 refactor: Move omemo storage to storage module - - - - - 02c1bc94 by Philipp Hörist at 2022-11-02T21:23:26+01:00 refactor: Move omemo code into common - - - - - 98ea6b2e by Philipp Hörist at 2022-11-02T21:23:26+01:00 cq: Fix linter errors - - - - - ac269afc by wurstsalat at 2022-11-02T21:23:26+01:00 new: OMEMO: Add handling of MucAdded signal - - - - - 1f338d3e by wurstsalat at 2022-11-02T21:23:26+01:00 new: OMEMO: Add EncryptionAnnouncementRow - - - - - 71807e27 by Philipp Hörist at 2022-11-02T21:23:26+01:00 fix: check preconditions - - - - - 17eed921 by Philipp Hörist at 2022-11-02T21:23:26+01:00 refactor: Rename methods - - - - - 19c2497c by Philipp Hörist at 2022-11-02T21:23:27+01:00 cq: Remove blank line - - - - - 53e0ff3b by Philipp Hörist at 2022-11-02T21:23:27+01:00 refactor: Remove unused code - - - - - ec5d8bb3 by Philipp Hörist at 2022-11-02T21:23:27+01:00 refactor: Use send_stanza method - - - - - 5d9bcbc7 by Philipp Hörist at 2022-11-02T21:23:27+01:00 refactor: Remove devices module - - - - - 31eafc40 by Philipp Hörist at 2022-11-02T21:23:27+01:00 cq: Remove unused imports - - - - - b2fd31fc by Philipp Hörist at 2022-11-02T21:23:27+01:00 refactor: Switch to new library - - - - - 5d9119ef by Philipp Hörist at 2022-11-02T21:23:27+01:00 cq: Fix storage annotations - - - - - bc44f1b7 by Philipp Hörist at 2022-11-02T21:23:27+01:00 fix: Fix import - - - - - 30 changed files: - ChangeLog - README.md - data/org.gajim.Gajim.appdata.xml.in - debian/control - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py - gajim/common/app.py - gajim/common/application.py - gajim/common/client.py - gajim/common/config.py - gajim/common/const.py - gajim/common/dbus/remote_control.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/modules/contacts.py - gajim/common/modules/httpupload.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - + gajim/common/modules/omemo.py - gajim/common/modules/util.py - + gajim/common/omemo/__init__.py - + gajim/common/omemo/aes.py - + gajim/common/omemo/state.py - + gajim/common/omemo/util.py - gajim/common/setting_values.py - gajim/common/storage/archive.py - + gajim/common/storage/omemo.py - gajim/data/gui/account_wizard.ui - gajim/data/gui/call_window.ui The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/638808157cc728d4e89282fa182e611… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/638808157cc728d4e89282fa182e611… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: new: CSS: Add general purpose classes
by Daniel Brötzmann (＠wurstsalat) 02 Nov '22

02 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a3a6d3ec by wurstsalat at 2022-11-02T21:10:24+01:00 new: CSS: Add general purpose classes - - - - - 755fd601 by wurstsalat at 2022-11-02T21:13:58+01:00 fix: CSS: Fix settings related inconsistencies - - - - - 1 changed file: - gajim/data/style/gajim.css Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -56,6 +56,7 @@ infobar.error > revealer > box { /* ========================================================================= */ /* Text style */ .bold { font-weight: bold; } +.monospace { font-family: monospace; } .bold16 { font-size: 1.33rem; font-weight: bold; @@ -131,6 +132,7 @@ .pulse-transform { /* General purpose classes ================================================= */ .dialog-margin > box { margin: 18px;} .solid-background { background-color: @theme_base_color; } +.border { border: 1px solid @borders; } .no-border { border: none; } .scrolled-no-border { border: none; } .preview-image { box-shadow: 0px 0px 3px 0px alpha(@theme_text_color, 0.2); } @@ -777,7 +779,7 @@ list.settings > row:not(:last-child) { } list.settings row { min-height: 52px; } list.settings > row > box { - margin: 6px 18px; + margin: 10px 20px 10px 10px; } /* Settings Window */ @@ -910,7 +912,7 @@ #SendFileDialog grid list > row { padding: 10px 20px 10px 10px; } /* AccountsWindow */ .accounts-menu { border-right: 1px solid; border-color: @borders;} .accounts-settings-border {border: 1px solid; border-color: @borders;} -.accounts-settings stack > box { margin:30px; } +.accounts-settings stack > box.settings-page { margin: 30px; } .accounts-label-row { padding-top: 10px; padding-bottom: 10px; View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c848f2fffde74371529f786825f74b7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c848f2fffde74371529f786825f74b7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: CSS: Move overriding rules to bottom
by Daniel Brötzmann (＠wurstsalat) 02 Nov '22

02 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c848f2ff by wurstsalat at 2022-11-02T20:52:38+01:00 fix: CSS: Move overriding rules to bottom Fixes #11269 - - - - - 1 changed file: - gajim/data/style/gajim.css Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -501,24 +501,6 @@ .message-input-focus { /* ConversationView ======================================================== */ -/* Conversation row styles */ -.merged { padding-top: 1px;} -.retracted-message { opacity: 0.4; } -.transparent-selection > selection { - background-color: transparent; - color: @theme_fg_color; -} -@keyframes highlight { - from { background: rgb(140, 160, 180); } - to { background: transparent; } -} -.conversation-search-highlight { - animation-duration: 3s; - animation-timing-function: ease-out; - animation-iteration-count: 1; - animation-name: highlight; -} - /* BaseRow */ .conversation-row { padding: 10px 3px 4px 6px; @@ -558,7 +540,25 @@ .conversation-command-row label { padding: 12px; } -/* Row widgets */ +/* Conversation row styles */ +.merged { padding-top: 1px; } +.retracted-message { opacity: 0.4; } +.transparent-selection > selection { + background-color: transparent; + color: @theme_fg_color; +} +@keyframes highlight { + from { background: rgb(140, 160, 180); } + to { background: transparent; } +} +.conversation-search-highlight { + animation-duration: 3s; + animation-timing-function: ease-out; + animation-iteration-count: 1; + animation-name: highlight; +} + +/* Row widgets ============================================================ */ .conversation-subject-box, .conversation-call-box { border-radius: 6px; View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c848f2fffde74371529f786825f74b75… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c848f2fffde74371529f786825f74b75… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: Use GTK theme colors for floating overlay box
by Daniel Brötzmann (＠wurstsalat) 01 Nov '22

01 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c7ab8603 by wurstsalat at 2022-11-01T21:59:26+01:00 refactor: Use GTK theme colors for floating overlay box - - - - - 266c1290 by wurstsalat at 2022-11-01T23:44:44+01:00 refactor: CSS: Order classes, reduce redundancy - - - - - 12 changed files: - gajim/data/gui/call_window.ui - gajim/data/gui/groupchat_state.ui - gajim/data/gui/main.ui - gajim/data/gui/message_actions_box.ui - gajim/data/style/gajim.css - gajim/gtk/adhoc.py - gajim/gtk/app_side_bar.py - gajim/gtk/chat_stack.py - gajim/gtk/component_search.py - gajim/gtk/conversation/message_selection.py - gajim/gtk/groupchat_join.py - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/data/gui/call_window.ui ===================================== @@ -366,7 +366,7 @@ <property name="icon-name">audio-input-microphone-symbolic</property> <style> <class name="dim-label"/> - <class name="audio-mic-animation"/> + <class name="pulse-transform"/> </style> </object> <packing> ===================================== gajim/data/gui/groupchat_state.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> <object class="GtkStack" id="groupchat_state"> @@ -44,6 +44,9 @@ <property name="position">2</property> </packing> </child> + <style> + <class name="floating-overlay-box"/> + </style> </object> <packing> <property name="name">not-joined</property> @@ -94,6 +97,9 @@ <property name="position">2</property> </packing> </child> + <style> + <class name="floating-overlay-box"/> + </style> </object> <packing> <property name="name">joining</property> @@ -128,14 +134,14 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="floating-overlay-box"/> + </style> </object> <packing> <property name="name">fetching</property> <property name="position">2</property> </packing> </child> - <style> - <class name="groupchat-state"/> - </style> </object> </interface> ===================================== gajim/data/gui/main.ui ===================================== @@ -59,7 +59,7 @@ </packing> </child> <style> - <class name="app-page-box"/> + <class name="app-sidebar"/> </style> </object> <packing> ===================================== gajim/data/gui/message_actions_box.ui ===================================== @@ -24,7 +24,7 @@ </object> </child> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="message-actions-box-button"/> <class name="flat"/> </style> </object> @@ -49,7 +49,7 @@ </object> </child> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="message-actions-box-button"/> </style> </object> <packing> @@ -76,7 +76,7 @@ </object> </child> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="message-actions-box-button"/> </style> </object> <packing> @@ -100,7 +100,7 @@ </object> </child> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="message-actions-box-button"/> </style> </object> <packing> @@ -126,7 +126,7 @@ </object> </child> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="message-actions-box-button"/> </style> </object> <packing> @@ -151,7 +151,7 @@ </object> </child> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="message-actions-box-button"/> </style> </object> <packing> @@ -177,7 +177,7 @@ </object> </child> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="message-actions-box-button"/> </style> </object> <packing> @@ -205,7 +205,7 @@ </object> </child> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="message-actions-box-button"/> </style> </object> <packing> ===================================== gajim/data/style/gajim.css ===================================== @@ -1,175 +1,212 @@ /* Gajim Application CSS File */ -.chatcontrol-actionbar-button { - padding: 0px 5px 0px 5px; - background-color: @theme_base_color; - border: none; -} - -.message-action-box { margin: 8px 13px 8px 8px } - -.no-border { border: none; } -.scrolled-no-border { border: none; } -.no-scroll-indicator undershoot.top, undershoot.bottom { background-image: none; } -.scrollbar-style scrollbar trough {background-color:@theme_base_color; } -.scrollbar-style scrollbar {border:none; } -.one-line-scrollbar scrollbar.vertical slider { min-height: 20px; } - -.dialog-margin > box { margin: 18px;} - -#MessageWindow, #RosterWindow paned { background-color: @theme_base_color; } - -.solid-background { - background-color: @theme_base_color; -} - -#DropArea {background-color: @theme_base_color;} - -.chatcontrol-separator-top {margin-top: 5px;} +/* GTK named colors +Taken from: https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gtk/theme/Adwaita/_color… +@theme_fg_color +@theme_text_color +@theme_bg_color +@theme_base_color +@theme_selected_bg_color +@theme_selected_fg_color +@insensitive_bg_color +@insensitive_fg_color +@insensitive_base_color +@theme_unfocused_fg_color +@theme_unfocused_text_color +@theme_unfocused_bg_color +@theme_unfocused_base_color +@theme_unfocused_selected_bg_color +@theme_unfocused_selected_fg_color +@unfocused_insensitive_color +@borders +@unfocused_borders +@warning_color +@error_color +@success_color +*/ + +/* GTK specific changes =================================================== */ +/* Remove backdrop anomation */ +row:backdrop { transition: none; } +/* Treeview */ +treeview.space { padding: 6px; } +/* GtkLinkButton style */ +button.flat.link { padding: 0; border: 0; } -.chatcontrol-separator {margin-bottom: 5px;} +messagedialog.confirmation-dialog > box { margin-top: 18px; } -.message-input-border { - border: 2px solid @theme_unfocused_bg_color; - border-radius: 4px; +/* InfoBar */ +infobar.info > revealer > box { + color: #3A87AD; + background-color: #D9EDF7; } -.message-input-focus { - border: 2px solid @theme_selected_bg_color; - border-radius: 4px; +infobar.question > revealer > box { + color: #295A72; + background-color: #AFDAF0; } - -.transparent-selection > selection { - background-color: transparent; - color: @theme_fg_color; +infobar.warning > revealer > box { + color: #D06821; + background-color: #FFEBC0; } - -row:backdrop { transition: none; } - -.conversation-row:hover button { - opacity: 1; +infobar.error > revealer > box { + color: #B94A48; + background-color: #F2DEDE; } -.conversation-row { - padding: 10px 3px 4px 6px; - border-radius: 4px; +/* ========================================================================= */ +/* Text style */ +.bold { font-weight: bold; } +.bold16 { + font-size: 1.33rem; + font-weight: bold; } - -.merged { padding-top: 1px;} - -.conversation-row grid textview:not(.sourceview) { - background: transparent; +.bold24 { + font-size: 2.0rem; + font-weight: bold; } -.conversation-row grid textview:not(.sourceview) text { - background: transparent; +.large-header { + font-size: 1.75rem; + font-weight: bold; } -.retracted-message { - opacity: 0.4; +.small-label { + font-size: 90%; } -@keyframes highlight { - from { background: rgb(140, 160, 180); } - to { background: transparent; } +.draft { + font-style: italic; + color: @warning_color; } -.conversation-search-highlight { - animation-duration: 3s; - animation-timing-function: ease-out; - animation-iteration-count: 1; - animation-name: highlight; + +/* General Padding / Margin */ +.margin-right18 { margin-right: 18px; } +.margin-top6 { margin-top: 6px; } +.margin-top12 { margin-top: 12px; } +.margin-3 { margin: 3px; } +.margin-12 { margin: 12px; } +.margin-18 { margin: 18px; } +.padding-6 { margin: 6px; } +.padding-12 { margin: 12px; } +.padding-18 { margin: 18px; } +.padding-left30 { padding-left: 30px; } + +/* Colors */ +.success-color { color: @success_color; } +.error-color { color: @error_color; } +.warning-color { color: @warning_color; } +.selected-color { color: @theme_selected_bg_color; } +.insensitive-fg-color {color: @insensitive_fg_color;} +.encrypted-color { color: rgb(75, 181, 67); } +.unencrypted-color { color: @error_color; } +.receipt-received-color { color: rgb(75, 181, 67); } + +/* Generic animations */ +@keyframes pulse-opacity { + 0% { opacity: 1.0; } + 20% { opacity: 0.7; } + 45% { opacity: 1.0; } } -.conversation-system-row { - padding: 18px; +.pulse-opacity { + animation-name: pulse-opacity; + animation-duration: 2.0s; + animation-timing-function: ease-in-out; + animation-iteration-count: infinite; } -.conversation-date-row { - padding: 12px; +.dnd-target { + animation-name: pulse-opacity; + animation-duration: 1.6s; + animation-timing-function: ease-in-out; + animation-iteration-count: infinite; } -.conversation-command-row label { - font-weight: 600; - border-radius: 6px; - padding: 12px; +@keyframes pulse-transform { + 0% { -gtk-icon-transform: scale(1.0); } + 20% { -gtk-icon-transform: scale(1.1); } + 35% { -gtk-icon-transform: scale(1.0); } } -.conversation-subject-box, -.conversation-call-box { - border-radius: 6px; - padding: 12px; +.pulse-transform { + animation-name: pulse-transform; + animation-duration: 2.0s; + animation-timing-function: ease-in-out; + animation-iteration-count: infinite; } -.conversation-call-box label { - font-size: 90%; + +/* General purpose classes ================================================= */ +.dialog-margin > box { margin: 18px;} +.solid-background { background-color: @theme_base_color; } +.no-border { border: none; } +.scrolled-no-border { border: none; } +.preview-image { box-shadow: 0px 0px 3px 0px alpha(@theme_text_color, 0.2); } + +/* Scrollbars */ +.no-scroll-indicator undershoot.top, undershoot.bottom { background-image: none; } +.scrollbar-style scrollbar trough {background-color:@theme_base_color; } +.scrollbar-style scrollbar {border:none; } +.one-line-scrollbar scrollbar.vertical slider { min-height: 20px; } + +/* Treeview */ +.gajim-treeview { padding: 5px; } +.gajim-treeview check { padding: 0px; } +.gajim-scrolled { + border: 1px solid; + border-color:@unfocused_borders; } -.conversation-meta { - opacity: 0.6; - font-size: 90%; + +/* .inline-toolbar linked from top */ +.ontop-bar { + border-width: 1px; + border-bottom: none; + border-radius: 3px 3px 0 0; + padding: 5px; } -.conversation-read-marker { - color: @insensitive_fg_color; - font-size: 90%; - font-style: italic; + +/* Container with buttons linked from below */ +.linked-up * { + border-top: none; + border-top-left-radius: 0; + border-top-right-radius: 0; } -.conversation-nickname { - font-size: 90%; + +/* Unread counter */ +.unread-counter { + background-color: rgb(22, 100, 169); + color: rgb(242, 242, 242); font-weight: bold; + font-size: 80%; + padding-left: 6px; + padding-right: 6px; + border-radius: 10px; } -.code-widget { - border: 1px solid @borders; - border-radius: 4px; - margin-top: 6px; - margin-bottom: 6px; -} -.code-widget-header { - background-color: alpha(@insensitive_fg_color, 0.4); - padding: 0 6px; - border-top-left-radius: 3px; - border-top-right-radius: 3px; -} -.code-widget-header label { - font-size: 90%; -} -.code-widget-header button { - padding: 0; -} - -.file-transfer { - padding: 10px; - margin: 5px; - background-color: @theme_unfocused_base_color; - border: 1px solid @borders; - border-radius: 5px; +.unread-counter-silent { + background-color: rgb(95, 95, 95); } -.preview-box { - border: 1px solid; - border-color: @borders; +.badge { + color: rgb(242, 242, 242); + padding-left: 6px; + padding-right: 6px; + padding-top: 2px; + padding-bottom: 2px; border-radius: 4px; - padding: 10px; - background-color: @theme_unfocused_base_color; -} -.preview-image-button, -.preview-image-button:hover { - padding: 0px; - border: none; - transition: none; - -gtk-icon-effect: none; - -gtk-icon-shadow: none; - background-image: none; - text-shadow: none; - box-shadow: none; -} -.preview-button { - border: 1px solid @borders; + font-size: 80%; + font-weight: bold; } .link-button { min-height: 0px; } -.avatar-selector { - border: 2px dotted @theme_selected_bg_color; - border-radius: 12px; - padding: 18px; +.floating-overlay-box { + background-color: alpha(shade(@theme_bg_color, 0.3), 0.9); + padding: 12px; + border-radius: 6px; +} +.floating-overlay-box > label, +.floating-overlay-box > spinner { + color: @theme_bg_color; } -/* Main Window */ +/* Main Window ============================================================= */ .mainwindow-grid { background: @theme_base_color; } -/* Generic elements */ +/* Generic sidebar / chatlist elements */ .account-identifier-bar { border-radius: 6px; } @@ -177,32 +214,31 @@ .selection-bar { border-top-right-radius: 6px; border-bottom-right-radius: 6px; } -.small-label { - font-size: 90%; -} -/* ChatList with Workspace and Account sidebars */ +/* AppSidebar, WorkspaceSidebar, AccountSidebar */ .chatlist-left-grid { border-right: 1px solid @unfocused_borders; background: @theme_bg_color; } -.app-sidebar-row { - margin: 2px 0 2px 2px; -} -.app-sidebar-row image { - background: @unfocused_borders; - padding: 4px; -} - -.app-page-box { +/* AppSidebar */ +.app-sidebar { margin-top: 3px; } -.app-page-box > separator { +.app-sidebar > separator { background-color: @unfocused_borders; margin-left: 12px; margin-right: 12px; } +.app-sidebar-item { + margin: 2px 0 2px 2px; +} +.app-sidebar-item image { + background: @unfocused_borders; + padding: 4px; +} + +/* AppPage */ .app-page { padding: 18px; } @@ -210,7 +246,7 @@ .app-message-listbox row { border: 1px solid @borders; } -/* Workspace sidebar */ +/* WorkspaceSidebar */ .workspace-scrolled { background: transparent; } @@ -255,8 +291,11 @@ .workspace-add button { .workspace-avatar { border: 2px solid transparent; } +.dnd-target .workspace-avatar { + border: 2px dashed @theme_selected_bg_color; +} -/* Account sidebar */ +/* AccountSidebar */ .account-sidebar { background: transparent; margin-bottom: 6px; @@ -297,7 +336,7 @@ .account-box > separator { background-color: darker(@theme_bg_color); } -/* Account Page */ +/* AccountPage */ .account-page { background: transparent; } @@ -307,11 +346,13 @@ .account-page-roster { .account-page-box { padding: 18px; } + /* Roster */ .roster treeview { padding: 0 3px; } -/* Notification listbox */ + +/* NotificationManager */ .notification-listbox { background: transparent; } @@ -324,7 +365,7 @@ .notification-listbox row:nth-last-child(2) { border-bottom: 1px solid @borders; } -/*Middle Grid*/ +/* Middle Grid (ChatList and widgets on top) */ .middle-grid > scrolledwindow { background: transparent; } .chatlist-top-bar { @@ -338,6 +379,7 @@ .chat-filter-icons button { color: @insensitive_fg_color; } +/* ChatList */ .chatlist { background: transparent; } @@ -371,6 +413,13 @@ .chatlist-row:selected button { .chatlist-row:selected image { color: @theme_fg_color; } +.dnd-target-chatlist { + animation-name: pulse-opacity; + animation-duration: 2.0s; + animation-timing-function: ease-in-out; + animation-iteration-count: infinite; + border: 2px dashed @theme_selected_bg_color; +} @keyframes composing { 0% { @@ -395,18 +444,6 @@ .chatstate-icon { animation-timing-function: ease-in-out; animation-iteration-count: infinite; } -.unread-counter { - background-color: rgb(22, 100, 169); - color: rgb(242, 242, 242); - font-weight: bold; - font-size: 80%; - padding-left: 6px; - padding-right: 6px; - border-radius: 10px; -} -.unread-counter-silent { - background-color: rgb(95, 95, 95); -} .header-box label { padding: 12px 18px 6px 18px; font-weight: bold; @@ -417,7 +454,7 @@ .header-box-first label { padding: 0px 18px 6px 18px; } -/* Search view */ +/* SearchView */ .search-view { padding: 12px; border-left: 1px solid @borders; @@ -426,85 +463,271 @@ .search-view { .search-view-row-grid textview { background: transparent; } -.search-view-row-grid textview text { - background: transparent; +.search-view-row-grid textview text { + background: transparent; +} +.search-view-row-grid label { + font-size: 90%; +} +.search-view-counter label { + font-style: italic; + color: @insensitive_fg_color; +} +.search-view-header { + padding: 12px 6px 6px 6px; +} +.search-view-header label { + font-size: 90%; + color: @insensitive_fg_color; +} + +/* MessageActionsBox */ +.message-actions-box { margin: 8px 13px 8px 8px } +.message-actions-box-button { + padding: 0px 5px 0px 5px; + background-color: @theme_base_color; + border: none; +} + +/* MessageInputTextView */ +.message-input-border { + border: 2px solid @theme_unfocused_bg_color; + border-radius: 4px; +} +.message-input-focus { + border: 2px solid @theme_selected_bg_color; + border-radius: 4px; +} + +/* ConversationView ======================================================== */ + +/* Conversation row styles */ +.merged { padding-top: 1px;} +.retracted-message { opacity: 0.4; } +.transparent-selection > selection { + background-color: transparent; + color: @theme_fg_color; +} +@keyframes highlight { + from { background: rgb(140, 160, 180); } + to { background: transparent; } +} +.conversation-search-highlight { + animation-duration: 3s; + animation-timing-function: ease-out; + animation-iteration-count: 1; + animation-name: highlight; +} + +/* BaseRow */ +.conversation-row { + padding: 10px 3px 4px 6px; + border-radius: 4px; +} +.conversation-row:hover button { + opacity: 1; +} +.conversation-row grid textview:not(.sourceview), +.conversation-row grid textview:not(.sourceview) text { + background: transparent; +} + +/* FileTransferJingleRow */ +.file-transfer { + padding: 10px; + margin: 5px; + background-color: @theme_unfocused_base_color; + border: 1px solid @borders; + border-radius: 5px; +} + +/* SystemRow */ +.conversation-system-row { + padding: 18px; +} + +/* DateRow */ +.conversation-date-row { + padding: 12px; +} + +/* CommandRow */ +.conversation-command-row label { + font-weight: 600; + border-radius: 6px; + padding: 12px; +} + +/* Row widgets */ +.conversation-subject-box, +.conversation-call-box { + border-radius: 6px; + padding: 12px; +} +.conversation-call-box label { + font-size: 90%; +} + +/* QuoteWidget */ +.conversation-quote { + padding-bottom: 6px; +} +.conversation-quote textview text, +.conversation-quote label { + color: alpha(@theme_text_color, 0.6); +} +.conversation-quote-bar { + background-color: alpha(@theme_text_color, 0.2); +} + +/* CodeWidget */ +.code-widget { + border: 1px solid @borders; + border-radius: 4px; + margin-top: 6px; + margin-bottom: 6px; +} +.code-widget-header { + background-color: alpha(@insensitive_fg_color, 0.4); + padding: 0 6px; + border-top-left-radius: 3px; + border-top-right-radius: 3px; +} +.code-widget-header label { + font-size: 90%; +} +.code-widget-header button { + padding: 0; +} + +/* PreviewWidget */ +.preview-box { + border: 1px solid; + border-color: @borders; + border-radius: 4px; + padding: 10px; + background-color: @theme_unfocused_base_color; +} +.preview-image-button, +.preview-image-button:hover { + padding: 0px; + border: none; + transition: none; + -gtk-icon-effect: none; + -gtk-icon-shadow: none; + background-image: none; + text-shadow: none; + box-shadow: none; +} +.preview-button { + border: 1px solid @borders; } -.search-view-row-grid label { + +/* Conversation meta elements */ +.conversation-meta { + opacity: 0.6; font-size: 90%; } -.search-view-counter label { - font-style: italic; +.conversation-read-marker { color: @insensitive_fg_color; + font-size: 90%; + font-style: italic; } -.search-view-header { - padding: 12px 6px 6px 6px; -} -.search-view-header label { +.conversation-nickname { font-size: 90%; - color: @insensitive_fg_color; + font-weight: bold; } -.resource-selector list row { - padding: 6px; - border-bottom: 1px solid @borders; +/* MoreMenuButton */ +.conversation-more-button { + padding-top: 0px; + padding-bottom:0px; + min-height: 16px; + opacity: 0; + transition: none; + border: none; } - -/* Profile window */ -#NicknameEntry:disabled { - font-size: 2.3rem; - font-weight: bold; +.conversation-more-button:checked { + opacity: 1; + background-image: none; +} +.conversation-more-button:active { + background-image: none; +} +.conversation-more-button:hover { border: none; - padding: 0px 0px 0px 0px; - background-color: @theme_unfocused_bg_color; - color: @theme_fg_color; + transition: none; + -gtk-icon-effect: none; + -gtk-icon-shadow: none; + background-image: none; + text-shadow: none; + box-shadow: none; } -#ProfileWindow grid { padding: 18px; } -#ProfileWindow grid > button { - padding-left: 4px; - padding-right: 4px; -} -#ProfileWindow popover { padding: 6px; } -#ProfileWindow actionbar box { - padding: 0px; +/* Multi-purpose elements / widgets ======================================== */ + +/* ContactFlowBox */ +.contact-flowbox-item { + background-color: alpha(@borders, 0.4); + border-radius: 12px; + padding: 6px; } -#ProfileWindow actionbar button { - margin-top: 12px; +.contact-flowbox-item button { + background: none; + border: 1px solid alpha(@borders, 0.4); } -.profile-scrolled { +.contact-flowbox-item button:hover { border: 1px solid @borders; - border-radius: 4px; } -.profile-scrolled-read textview { - background: transparent; + +/* ResourceSelector */ +.resource-selector list row { + padding: 6px; + border-bottom: 1px solid @borders; } -.profile-scrolled-read textview text { - background: transparent; - color: @theme_text_color; + +/* AvatarSelector */ +.avatar-selector { + border: 2px dotted @theme_selected_bg_color; + border-radius: 12px; + padding: 18px; } -/* Contact Info Window */ -.stack-border { - border: 1px solid; - border-color: @borders; +/* DataFormWidget */ +.field-fixed { font-size: 1.33rem; font-weight: bold; padding-top:5px;} +.data-form-title { font-size: 1.33rem; font-weight: bold; } +.data-form-widget grid { margin: 0px 18px 18px 18px; } +.data-form-widget treeview { padding: 5px; } +.data-form-widget scrolledwindow { border: 1px solid; border-color:@unfocused_borders; } +.data-form-widget textview { padding: 5px; } + +/* Assistant */ +.assistant-grid { padding: 18px; margin: 6px;} +.assistant-grid > box stack { padding: 18px; } + +/* Miscellaneous widgets ================================================== */ + +/* Notification (Windows) */ +#NotificationPopup { + background-color: #333333; + padding: 4px; } -.stack-header { - background-color: @insensitive_bg_color; - border-width: 0 1px 0 1px; - border-style: none solid none solid; - border-color: @borders; - padding: 9px 9px; +#NotificationPopup label { + color: #FFF; } -#ContactNameEntry:disabled { - font-size: 2.0rem; +#NotificationPopup button { + border-width: 0; + background-image: none; + background-color: inherit; + box-shadow: none; + text-shadow: none; + -gtk-icon-shadow: none; +} +#NotificationPopupTitle { font-weight: bold; - border: none; - padding: 0px 0px 0px 0px; - background-color: @insensitive_bg_color; - color: @theme_fg_color; } -/* Emoticon Popover */ +/* Emoticon Popover (ModifierChooser) */ popover#EmoticonPopover button { background: none; border: none; box-shadow:none; padding: 0px;} popover#EmoticonPopover button > label { font-size: 2.0rem; } popover#EmoticonPopover flowboxchild > label { font-size: 2.0rem; } @@ -516,30 +739,7 @@ .emoji-chooser-heading { font-size: 1.15rem; font-weight: bold; padding: 5px;} .emoji-chooser-flowbox { padding-left: 5px; padding-right: 11px; } .emoji-modifier-chooser-flowbox { padding-left: 5px; } -/* HistorySyncAssistant */ -#HistorySyncAssistant notebook { padding: 18px; } -#HistorySyncAssistant progressbar text { color: #000; font-size: 1.6rem; padding: 10px;} -#HistorySyncAssistant list { border: 1px solid; border-color: @borders; } -#HistorySyncAssistant list > row { padding: 10px 30px 10px 30px; } -#HistorySyncAssistant list > row > label { color: @insensitive_fg_color; } -#HistorySyncAssistant list > row.activatable > label { color: @theme_text_color; } -#HistorySyncAssistant list > row.activatable:selected > label { color: @theme_selected_fg_color; } -#FinishedLabel { font-size: 1.2rem; font-weight: bold; } - -/* Server Info */ -#ServerInfo { border: 1px solid; border-color: @borders; } -#ServerInfo > row:first-child { border-top: 1px solid; border-color: @borders; } -#ServerInfo > row { padding: 10px 20px 10px 10px; } -#ServerInfo > label { padding:10px; color: @insensitive_fg_color; font-weight: bold; } -#ServerInfo > row.activatable:active { box-shadow: none; } - -/* Features Info */ -#FeaturesInfoGrid { padding: 6px; } -#FeaturesInfoGrid > list { border: 1px solid; border-color: @borders; } -#FeaturesInfoGrid > list > row:first-child { border-top: 1px solid; border-color: @borders; } -#FeaturesInfoGrid > list > row { padding: 10px 20px 10px 10px; } -#FeaturesInfoGrid > list > label { padding:10px; color: @insensitive_fg_color; font-weight: bold; } -#FeaturesInfoGrid > list > row.activatable:active { box-shadow: none; } +/* Settings widgets ======================================================== */ /* SettingsBox */ .settings-box > row { border-bottom: 1px solid; border-color: @theme_unfocused_bg_color; } @@ -558,7 +758,7 @@ window.settings-dialog list { } /* GenericSetting */ -#SubDescription { color: @insensitive_fg_color; font-size: 90%;} +#SubDescription { color: @insensitive_fg_color; font-size: 90%; } #GenericSettingBox { margin-left: 30px; } #GenericSettingBox > label { padding-right: 3px; } @@ -590,6 +790,27 @@ list.settings-menu row { list.settings-menu row label { padding-left: 12px; } + +popover.combo list { + min-width: 200px; + margin: 12px; +} +popover.combo { padding: 0px; } +popover.combo list { + border-style: none; + background-color: transparent; +} +popover.combo list > row { + padding: 0px 12px 0px 12px; + min-height: 40px; +} +popover.combo list > row:not(:last-child) { border-bottom: 1px solid alpha(#cdc7c2, 0.5); } +popover.combo scrollbar.vertical { padding-top: 2px; padding-bottom: 2px; } +popover.combo scrollbar.vertical { + padding-top: 2px; + padding-bottom: 2px; +} + .settings-stack viewport > box { margin-left: 30px; margin-right: 30px; @@ -601,28 +822,92 @@ .settings-border { border-color: @borders; } -/* InfoBar */ -infobar.info > revealer > box { - color: #3A87AD; - background-color: #D9EDF7; +/* Dialogs ================================================================= */ + +/* ProfileWindow */ +#NicknameEntry:disabled { + font-size: 2.3rem; + font-weight: bold; + border: none; + padding: 0px 0px 0px 0px; + background-color: @theme_unfocused_bg_color; + color: @theme_fg_color; } -infobar.question > revealer > box { - color: #295A72; - background-color: #AFDAF0; + +#ProfileWindow grid { padding: 18px; } +#ProfileWindow grid > button { + padding-left: 4px; + padding-right: 4px; } -infobar.warning > revealer > box { - color: #D06821; - background-color: #FFEBC0; +#ProfileWindow popover { padding: 6px; } +#ProfileWindow actionbar box { + padding: 0px; } -infobar.error > revealer > box { - color: #B94A48; - background-color: #F2DEDE; +#ProfileWindow actionbar button { + margin-top: 12px; +} +.profile-scrolled { + border: 1px solid @borders; + border-radius: 4px; +} +.profile-scrolled-read textview { + background: transparent; +} +.profile-scrolled-read textview text { + background: transparent; + color: @theme_text_color; +} + +/* ContactInfo / GroupchatDetails */ +.stack-border { + border: 1px solid; + border-color: @borders; +} +.stack-header { + background-color: @insensitive_bg_color; + border-width: 0 1px 0 1px; + border-style: none solid none solid; + border-color: @borders; + padding: 9px 9px; +} +#ContactNameEntry:disabled { + font-size: 2.0rem; + font-weight: bold; + border: none; + padding: 0px 0px 0px 0px; + background-color: @insensitive_bg_color; + color: @theme_fg_color; } -/*SendFileDialog*/ +/* HistorySyncAssistant */ +#HistorySyncAssistant notebook { padding: 18px; } +#HistorySyncAssistant progressbar text { color: #000; font-size: 1.6rem; padding: 10px;} +#HistorySyncAssistant list { border: 1px solid; border-color: @borders; } +#HistorySyncAssistant list > row { padding: 10px 30px 10px 30px; } +#HistorySyncAssistant list > row > label { color: @insensitive_fg_color; } +#HistorySyncAssistant list > row.activatable > label { color: @theme_text_color; } +#HistorySyncAssistant list > row.activatable:selected > label { color: @theme_selected_fg_color; } +#FinishedLabel { font-size: 1.2rem; font-weight: bold; } + +/* ServerInfo */ +#ServerInfo { border: 1px solid; border-color: @borders; } +#ServerInfo > row:first-child { border-top: 1px solid; border-color: @borders; } +#ServerInfo > row { padding: 10px 20px 10px 10px; } +#ServerInfo > label { padding:10px; color: @insensitive_fg_color; font-weight: bold; } +#ServerInfo > row.activatable:active { box-shadow: none; } + +/* Features */ +#FeaturesInfoGrid { padding: 6px; } +#FeaturesInfoGrid > list { border: 1px solid; border-color: @borders; } +#FeaturesInfoGrid > list > row:first-child { border-top: 1px solid; border-color: @borders; } +#FeaturesInfoGrid > list > row { padding: 10px 20px 10px 10px; } +#FeaturesInfoGrid > list > label { padding:10px; color: @insensitive_fg_color; font-weight: bold; } +#FeaturesInfoGrid > list > row.activatable:active { box-shadow: none; } + +/* SendFileDialog */ #SendFileDialog grid list > row { padding: 10px 20px 10px 10px; } -/* Accounts Window */ +/* AccountsWindow */ .accounts-menu { border-right: 1px solid; border-color: @borders;} .accounts-settings-border {border: 1px solid; border-color: @borders;} .accounts-settings stack > box { margin:30px; } @@ -631,9 +916,10 @@ .accounts-label-row { padding-bottom: 10px; font-size: 1.6rem; font-weight: bold; - color: @insensitive_fg_color;} + color: @insensitive_fg_color; +} -/* Account Creation */ +/* AccountWizard */ .tls-error-list { border: 1px solid; border-color: @borders; } @@ -645,12 +931,10 @@ .tls-error-list > row:last-child { border-bottom: 0px; } -/* Start Chat Accounts Treeview */ +/* StartChatDialog */ .start-chat-treeview { padding: 5px; } .start-chat-treeview:focus {outline: none; } .start-chat-scrolled { border: 1px solid; border-color:@unfocused_borders; } - -/* StartChatListBox */ .start-chat-row { border-bottom: 1px solid; border-color: @theme_unfocused_bg_color; } .start-chat-row:last-child { border-bottom: 0px; } .start-chat-row.activatable:active { box-shadow: none; } @@ -658,23 +942,11 @@ .start-chat-row { padding: 10px 20px 10px 10px; } .start-chat-row:not(.activatable) label { color: @insensitive_fg_color; } .start-chat-row:focus { outline: none; } -/* ContactFlowBox */ -.contact-flowbox-item { - background-color: alpha(@borders, 0.4); - border-radius: 12px; - padding: 6px; -} -.contact-flowbox-item button { - background: none; - border: 1px solid alpha(@borders, 0.4); -} -.contact-flowbox-item button:hover { - border: 1px solid @borders; -} - /* GroupChatRoster */ -.groupchat-roster { border-left: 1px solid; - border-color: @borders; } +.groupchat-roster { + border-left: 1px solid; + border-color: @borders; +} .groupchat-roster treeview { padding-left: 4px; } /* GroupchatConfig */ @@ -686,58 +958,6 @@ #GroupchatConfig stacksidebar > scrolledwindow { } #GroupchatConfig treeview { padding: 5px; } -.message-selection-box { - background-color: alpha(rgb(70, 70, 70), 0.9); - padding: 12px; - border-radius: 6px; -} -.message-selection-box > label { - color: rgb(230, 230, 230); -} - -.groupchat-state box { - background-color: alpha(rgb(70, 70, 70), 0.9); - padding: 12px; - border-radius: 6px; -} -.groupchat-state box > label { - color: rgb(230, 230, 230); -} -.groupchat-state box > spinner { - color: rgb(230, 230, 230); -} - -/* Popover Treeview */ -.popover_treeview { border-radius: 3px; background-color: @theme_bg_color; } -.popover_treeview { padding: 6px; } -.popover_treeview :hover { background-color: @theme_selected_bg_color; } - -/* .inline-toolbar linked from top */ -.ontop-bar { - border-width: 1px; - border-bottom: none; - border-radius: 3px 3px 0 0; - padding: 5px; -} - -/* Container with buttons linked from below */ -.linked-up * { - border-top: none; - border-top-left-radius: 0; - border-top-right-radius: 0; -} - -/* Highlighted label */ -.tagged { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; - padding: 0 3px; - margin: 0 -3px; - border-radius: 3px; - text-shadow: none; - opacity: 0.95; -} - /* ThemesWindow */ #ThemesWindow grid { padding: 12px; } @@ -751,231 +971,10 @@ .theme_listbox row:hover { background-color: @theme_base_color; } .theme_remove_button { background-color: @theme_base_color; border: none; - background-image: none; } - + background-image: none; +} .theme_remove_button:focus {outline: none;} .theme_popover_listbox { padding: 10px; } .theme_popover_listbox row { padding: 5px; } .theme_popover_listbox row:focus { outline: none; } - - -/* Text style */ - -.bold { font-weight: bold; } -.bold16 { - font-size: 1.33rem; - font-weight: bold; -} -.bold24 { - font-size: 2.0rem; - font-weight: bold; -} -.large-header { - font-size: 1.75rem; - font-weight: bold; -} -.insensitive-fg-color {color: @insensitive_fg_color;} - -.draft { - font-style: italic; - color: @warning_color; -} - -/* Padding/Margins */ -.margin-right18 { margin-right: 18px; } -.margin-top6 { margin-top: 6px; } -.margin-top12 { margin-top: 12px; } -.margin-3 { margin: 3px; } -.margin-12 { margin: 12px; } -.margin-18 { margin: 18px; } -.padding-6 { margin: 6px; } -.padding-12 { margin: 12px; } -.padding-18 { margin: 18px; } -.padding-left30 { padding-left: 30px; } - -/* Treeview */ -treeview.space { padding: 6px; } - -/* GtkLinkButton style */ -button.flat.link { padding: 0; border: 0; } - -/*MessageWindow Notebook*/ -.notebook-tab-label { min-width: 80px; } - -/*Icon colors*/ -.success-color { color: @success_color; } -.error-color { color: @error_color; } -.warning-color { color: @warning_color; } -.selected-color { color: @theme_selected_bg_color; } - -/*Encryption*/ -.encrypted-color { color: rgb(75, 181, 67); } -.unencrypted-color { color: @error_color; } - -/*Receipts*/ -.receipt-received-color { color: rgb(75, 181, 67); } - -/*Dataforms*/ -.field-fixed { font-size: 1.33rem; font-weight: bold; padding-top:5px;} -.data-form-title { font-size: 1.33rem; font-weight: bold; } -.data-form-widget grid { margin: 0px 18px 18px 18px; } -.data-form-widget treeview { padding: 5px; } -.data-form-widget scrolledwindow { border: 1px solid; border-color:@unfocused_borders; } -.data-form-widget textview { padding: 5px; } - -/*Image Preview*/ -.preview-image { box-shadow: 0px 0px 3px 0px alpha(@theme_text_color, 0.2); } - -/* Badge */ -.badge { - color: rgb(242, 242, 242); - padding-left: 6px; - padding-right: 6px; - padding-top: 2px; - padding-bottom: 2px; - border-radius: 4px; - font-size: 80%; - font-weight: bold; -} - -.dnd-target { - animation-name: pulse-opacity; - animation-duration: 2.0s; - animation-timing-function: ease-in-out; - animation-iteration-count: infinite; -} -.dnd-target .workspace-avatar { - border: 2px dashed @theme_selected_bg_color; -} - -.dnd-target-chatlist { - animation-name: pulse-opacity; - animation-duration: 2.0s; - animation-timing-function: ease-in-out; - animation-iteration-count: infinite; - border: 2px dashed @theme_selected_bg_color; -} - -@keyframes pulse-opacity { - 0% { opacity: 1.0; } - 20% { opacity: 0.7; } - 45% { opacity: 1.0; } -} -.pulse-opacity { - animation-name: pulse-opacity; - animation-duration: 2.0s; - animation-timing-function: ease-in-out; - animation-iteration-count: infinite; -} - -@keyframes pulse { - 0% { -gtk-icon-transform: scale(1.0); } - 20% { -gtk-icon-transform: scale(1.1); } - 35% { -gtk-icon-transform: scale(1.0); } -} - -.audio-mic-animation { - animation-name: pulse; - animation-duration: 2.0s; - animation-timing-function: ease-in-out; - animation-iteration-count: infinite; -} - -/* Treeview */ -.adhoc-treeview { padding: 5px; } -.adhoc-scrolled { border: 1px solid; border-color:@unfocused_borders; } - -/* Search Dialog */ -.search-treeview { padding: 5px; } -.search-scrolled { border: 1px solid; border-color:@unfocused_borders; } - -.gajim-treeview { padding: 4px; } -.gajim-treeview check { padding: 0px; } -.gajim-scrolled { border: 1px solid; border-color:@unfocused_borders; } - - -#GroupchatJoin > box {padding: 18px; } - -.assistant-grid { padding: 18px; margin: 6px;} -.assistant-grid > box stack { padding: 18px; } - -/* Windows notification */ -#NotificationPopup { - background-color: #333333; - padding: 4px; -} -#NotificationPopup label { - color: #FFF; -} -#NotificationPopup button { - border-width: 0; - background-image: none; - background-color: inherit; - box-shadow: none; - text-shadow: none; - -gtk-icon-shadow: none; -} -#NotificationPopupTitle { - font-weight: bold; -} - - -popover.combo list { - min-width: 200px; - margin: 12px; -} -popover.combo { padding: 0px; } -popover.combo list { - border-style: none; - background-color: transparent; -} -popover.combo list > row { - padding: 0px 12px 0px 12px; - min-height: 40px; -} -popover.combo list > row:not(:last-child) { border-bottom: 1px solid alpha(#cdc7c2, 0.5); } -popover.combo scrollbar.vertical { padding-top: 2px; padding-bottom: 2px; } -popover.combo scrollbar.vertical { - padding-top: 2px; - padding-bottom: 2px; -} - -messagedialog.confirmation-dialog > box { margin-top: 18px; } - -.conversation-quote { - padding-bottom: 6px; -} -.conversation-quote textview text, -.conversation-quote label { - color: alpha(@theme_text_color, 0.6); -} -.conversation-quote-bar { - background-color: alpha(@theme_text_color, 0.2); -} -.conversation-more-button { - padding-top: 0px; - padding-bottom:0px; - min-height: 16px; - opacity: 0; - transition: none; - border: none;} - -.conversation-more-button:checked { - opacity: 1; - background-image: none; -} - -.conversation-more-button:active { - background-image: none; -} - -.conversation-more-button:hover { - border: none; - transition: none; - -gtk-icon-effect: none; - -gtk-icon-shadow: none; - background-image: none; - text-shadow: none; - box-shadow: none; -} ===================================== gajim/gtk/adhoc.py ===================================== @@ -202,13 +202,13 @@ def __init__(self) -> None: self._commands: dict[str, AdHocCommand] = {} self._scrolled = Gtk.ScrolledWindow() - self._scrolled.get_style_context().add_class('adhoc-scrolled') + self._scrolled.get_style_context().add_class('gajim-scrolled') self._scrolled.set_max_content_height(400) self._scrolled.set_max_content_width(400) self._scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) self._treeview = Gtk.TreeView() - self._treeview.get_style_context().add_class('adhoc-treeview') + self._treeview.get_style_context().add_class('gajim-treeview') self._store = Gtk.ListStore(str, str) self._treeview.set_model(self._store) column = Gtk.TreeViewColumn(_('Commands')) ===================================== gajim/gtk/app_side_bar.py ===================================== @@ -54,7 +54,7 @@ class AppRow(Gtk.ListBoxRow): def __init__(self) -> None: Gtk.ListBoxRow.__init__(self) self.get_style_context().add_class('workspace-sidebar-item') - self.get_style_context().add_class('app-sidebar-row') + self.get_style_context().add_class('app-sidebar-item') self._unread_label = Gtk.Label() self._unread_label.get_style_context().add_class( ===================================== gajim/gtk/chat_stack.py ===================================== @@ -111,7 +111,7 @@ def __init__(self): self._drop_area.set_no_show_all(True) self._drop_area.set_hexpand(True) self._drop_area.set_vexpand(True) - self._drop_area.set_name('DropArea') + self._drop_area.get_style_context().add_class('solid-background') self._drop_area.add(dnd_icon) self._drop_area.add(dnd_label) ===================================== gajim/gtk/component_search.py ===================================== @@ -219,7 +219,7 @@ def __init__(self) -> None: self._scrolled = Gtk.ScrolledWindow() self._scrolled.set_propagate_natural_height(True) - self._scrolled.get_style_context().add_class('search-scrolled') + self._scrolled.get_style_context().add_class('gajim-scrolled') self._scrolled.set_no_show_all(True) self.add(self._label) @@ -273,7 +273,7 @@ def process_result(self, form: Optional[Node]) -> None: self._treeview = Gtk.TreeView() self._treeview.set_hexpand(True) self._treeview.set_vexpand(True) - self._treeview.get_style_context().add_class('search-treeview') + self._treeview.get_style_context().add_class('gajim-treeview') self._treeview.connect('button-press-event', self._on_button_press) for field, counter in zip(form.reported.iter_fields(), ===================================== gajim/gtk/conversation/message_selection.py ===================================== @@ -33,7 +33,7 @@ def __init__(self) -> None: self.set_halign(Gtk.Align.CENTER) self.set_valign(Gtk.Align.END) - self.get_style_context().add_class('message-selection-box') + self.get_style_context().add_class('floating-overlay-box') label = Gtk.Label(label=_('Click messages to select them')) self.attach(label, 0, 0, 2, 1) ===================================== gajim/gtk/groupchat_join.py ===================================== @@ -48,6 +48,7 @@ def __init__(self, account: str, jid: str) -> None: self.set_title(_('Join Group Chat')) self.set_type_hint(Gdk.WindowTypeHint.DIALOG) self.set_default_size(500, 550) + self.get_style_context().add_class('dialog-margin') self._destroyed = False self.account = account ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -68,7 +68,7 @@ def __init__(self) -> None: self._contact: Optional[ChatContactT] = None self._ui = get_builder('message_actions_box.ui') - self.get_style_context().add_class('message-action-box') + self.get_style_context().add_class('message-actions-box') self.attach(self._ui.box, 0, 0, 1, 1) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/53814974db90d1564eb49c41bdd4d02… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/53814974db90d1564eb49c41bdd4d02… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Move menus for roster view and start chat button
by Daniel Brötzmann (＠wurstsalat) 01 Nov '22

01 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 53814974 by wurstsalat at 2022-11-01T21:09:52+01:00 refactor: Move menus for roster view and start chat button - - - - - 3 changed files: - gajim/gtk/account_page.py - gajim/gtk/chat_page.py - gajim/gtk/menus.py Changes: ===================================== gajim/gtk/account_page.py ===================================== @@ -18,7 +18,6 @@ from typing import Union from gi.repository import Gdk -from gi.repository import Gio from gi.repository import GLib from gi.repository import Gtk @@ -33,7 +32,6 @@ from gajim.common.events import UnsubscribedPresenceReceived from gajim.common.events import MucInvitation from gajim.common.events import MucDecline -from gajim.common.i18n import _ from .roster import Roster from .status_message_selector import StatusMessageSelector @@ -42,12 +40,7 @@ from .builder import get_builder from .util import open_window from .util import EventHelper - - -ROSTER_MENU_DICT = { - 'show-offline': _('Show Offline Contacts'), - 'sort-by-show': _('Sort by Status'), -} +from .menus import get_roster_view_menu class AccountPage(Gtk.Box, EventHelper): @@ -81,10 +74,7 @@ def __init__(self, account: str) -> None: self._ui.paned.set_position(app.settings.get('chat_handle_position')) self._ui.paned.connect('button-release-event', self._on_button_release) - roster_menu = Gio.Menu() - for action, label in ROSTER_MENU_DICT.items(): - roster_menu.append(label, f'win.{action}') - self._ui.roster_menu_button.set_menu_model(roster_menu) + self._ui.roster_menu_button.set_menu_model(get_roster_view_menu()) self._ui.edit_profile_button.set_action_name( f'app.{self._account}-profile') ===================================== gajim/gtk/chat_page.py ===================================== @@ -30,13 +30,13 @@ from nbxmpp import JID from gajim.common import app -from gajim.common.i18n import _ from .builder import get_builder from .chat_filter import ChatFilter from .chat_list import ChatList from .chat_list_stack import ChatListStack from .chat_stack import ChatStack +from .menus import get_start_chat_button_menu from .search_view import SearchView if TYPE_CHECKING: @@ -44,12 +44,6 @@ log = logging.getLogger('gajim.gui.chat_page') -START_CHAT_MENU_DICT = { - 'start-chat(["", ""])': _('Start Chat…'), - 'create-groupchat::': _('Create Group Chat…'), - 'add-contact::': _('Add Contact…'), -} - class ChatPage(Gtk.Box): @@ -97,10 +91,8 @@ def __init__(self): self._on_chat_list_changed) self._ui.chat_list_scrolled.add(self._chat_list_stack) - start_chat_menu = Gio.Menu() - for action, label in START_CHAT_MENU_DICT.items(): - start_chat_menu.append(label, f'app.{action}') - self._ui.start_chat_menu_button.set_menu_model(start_chat_menu) + self._ui.start_chat_menu_button.set_menu_model( + get_start_chat_button_menu()) self._ui.paned.set_position(app.settings.get('chat_handle_position')) self._ui.paned.connect('button-release-event', self._on_button_release) ===================================== gajim/gtk/menus.py ===================================== @@ -374,6 +374,15 @@ def get_roster_menu(account: str, jid: str, gateway: bool = False) -> GajimMenu: return GajimMenu.from_list(menuitems) +def get_roster_view_menu() -> GajimMenu: + menuitems: MenuItemListT = [ + (_('Show Offline Contacts'), 'win.show-offline', None), + (_('Sort by Status'), 'win.sort-by-show', None), + ] + + return GajimMenu.from_list(menuitems) + + def get_subscription_menu(account: str, jid: JID) -> GajimMenu: params = AddChatActionParams(account=account, jid=jid, @@ -391,6 +400,16 @@ def get_subscription_menu(account: str, jid: JID) -> GajimMenu: return GajimMenu.from_list(menuitems) +def get_start_chat_button_menu() -> GajimMenu: + menuitems: MenuItemListT = [ + (_('Start Chat…'), 'app.start-chat(["", ""])', None), + (_('Create Group Chat…'), 'app.create-groupchat::', None), + (_('Add Contact…'), 'app.add-contact::', None), + ] + + return GajimMenu.from_list(menuitems) + + def get_start_chat_row_menu(account: str, jid: JID) -> GajimMenu: params = AccountJidParam(account=account, jid=jid) menuitems: MenuItemListT = [ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/53814974db90d1564eb49c41bdd4d025… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/53814974db90d1564eb49c41bdd4d025… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Always return value for log_message
by Daniel Brötzmann (＠wurstsalat) 01 Nov '22

01 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ae404955 by wurstsalat at 2022-11-01T20:56:31+01:00 cfix: Always return value for log_message - - - - - 1 changed file: - gajim/common/modules/message.py Changes: ===================================== gajim/common/modules/message.py ===================================== @@ -379,10 +379,10 @@ def build_message_stanza(self, message: OutgoingMessage) -> nbxmpp.Message: def log_message(self, message: OutgoingMessage) -> Optional[int]: if not message.is_loggable: - return + return None if message.message is None: - return + return None if message.correct_id is not None: app.storage.archive.try_message_correction( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ae404955112eaa2631090ef14bc1a89f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ae404955112eaa2631090ef14bc1a89f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: Message selection: Don’t fail hard if log_line_id is None
by Daniel Brötzmann (＠wurstsalat) 01 Nov '22

01 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 45e1f810 by wurstsalat at 2022-11-01T20:39:00+01:00 fix: Message selection: Don’t fail hard if log_line_id is None Fixes #11263 - - - - - 8c244751 by wurstsalat at 2022-11-01T20:48:39+01:00 imprv: Add msg_log_id to live message events Improves the situation for #11263 - - - - - 5 changed files: - gajim/common/client.py - gajim/common/events.py - gajim/common/modules/message.py - gajim/gtk/control.py - gajim/gtk/conversation/rows/widgets.py Changes: ===================================== gajim/common/client.py ===================================== @@ -494,8 +494,9 @@ def _send_message(self, message: OutgoingMessage) -> None: message.set_sent_timestamp() message.message_id = self.send_stanza(message.stanza) + log_line_id = None if not message.is_groupchat: - self.get_module('Message').log_message(message) + log_line_id = self.get_module('Message').log_message(message) app.ged.raise_event( MessageSent(jid=message.jid, @@ -507,6 +508,7 @@ def _send_message(self, message: OutgoingMessage) -> None: label=message.label, correct_id=message.correct_id, message_id=message.message_id, + msg_log_id=log_line_id, play_sound=message.play_sound)) def _prepare_for_connect(self) -> None: ===================================== gajim/common/events.py ===================================== @@ -162,6 +162,7 @@ class MessageSent(ApplicationEvent): jid: JID message: str message_id: str + msg_log_id: Optional[int] chatstate: Optional[str] timestamp: float additional_data: AdditionalDataDict @@ -394,7 +395,7 @@ class MessageReceived(ApplicationEvent): fjid: str resource: str delayed: Optional[float] - msg_log_id: int + msg_log_id: Optional[int] displaymarking: Optional[Displaymarking] ===================================== gajim/common/modules/message.py ===================================== @@ -197,18 +197,21 @@ def _message_received(self, event_attr.update({ 'room_jid': jid, }) + event = GcMessageReceived(**event_attr) - app.ged.raise_event(event) + # TODO: Some plugins modify msgtxt in the GUI event - self._log_muc_message(event) + msg_log_id = self._log_muc_message(event) + event.msg_log_id = msg_log_id + app.ged.raise_event(event) return - app.ged.raise_event(MessageReceived(**event_attr)) - + event = MessageReceived(**event_attr) if not msgtxt: + app.ged.raise_event(event) return - app.storage.archive.insert_into_logs( + msg_log_id = app.storage.archive.insert_into_logs( self._account, fjid if properties.is_muc_pm else jid, properties.timestamp, @@ -219,6 +222,9 @@ def _message_received(self, stanza_id=stanza_id or message_id, message_id=properties.id) + event.msg_log_id = msg_log_id + app.ged.raise_event(event) + def _message_error_received(self, _con: types.xmppClient, _stanza: nbxmpp.Message, @@ -243,11 +249,11 @@ def _message_error_received(self, message_id=properties.id, error=properties.error)) - def _log_muc_message(self, event: GcMessageReceived) -> None: + def _log_muc_message(self, event: GcMessageReceived) -> Optional[int]: self._check_for_mam_compliance(event.room_jid, event.stanza_id) if event.msgtxt and event.properties.muc_nickname: - app.storage.archive.insert_into_logs( + msg_log_id = app.storage.archive.insert_into_logs( self._account, event.jid, event.properties.timestamp, @@ -257,6 +263,9 @@ def _log_muc_message(self, event: GcMessageReceived) -> None: additional_data=event.additional_data, stanza_id=event.stanza_id, message_id=event.properties.id) + return msg_log_id + + return None def _check_for_mam_compliance(self, room_jid: str, stanza_id: str) -> None: disco_info = app.storage.cache.get_last_disco_info(room_jid) @@ -368,7 +377,7 @@ def build_message_stanza(self, message: OutgoingMessage) -> nbxmpp.Message: return stanza - def log_message(self, message: OutgoingMessage) -> None: + def log_message(self, message: OutgoingMessage) -> Optional[int]: if not message.is_loggable: return @@ -384,9 +393,9 @@ def log_message(self, message: OutgoingMessage) -> None: message.correct_id, KindConstant.CHAT_MSG_SENT, message.timestamp) - return + return None - app.storage.archive.insert_into_logs( + msg_log_id = app.storage.archive.insert_into_logs( self._account, message.jid, message.timestamp, @@ -396,3 +405,4 @@ def log_message(self, message: OutgoingMessage) -> None: additional_data=message.additional_data, message_id=message.message_id, stanza_id=message.message_id) + return msg_log_id ===================================== gajim/gtk/control.py ===================================== @@ -286,6 +286,7 @@ def _on_message_sent(self, event: events.MessageSent) -> None: tim=event.timestamp, displaymarking=displaymarking, message_id=message_id, + msg_log_id=event.msg_log_id, additional_data=event.additional_data) def _on_message_received(self, event: events.MessageReceived) -> None: @@ -367,6 +368,7 @@ def _on_gc_message_received(self, event: events.GcMessageReceived) -> None: displaymarking=event.displaymarking, message_id=event.properties.id, stanza_id=event.stanza_id, + msg_log_id=event.msg_log_id, additional_data=event.additional_data) def _on_message_updated(self, event: events.MessageUpdated) -> None: @@ -1156,6 +1158,7 @@ def add_muc_message(self, displaymarking: Optional[Displaymarking] = None, message_id: Optional[str] = None, stanza_id: Optional[str] = None, + msg_log_id: Optional[int] = None, additional_data: Optional[AdditionalDataDict] = None, ) -> None: @@ -1174,6 +1177,7 @@ def add_muc_message(self, displaymarking=displaymarking, message_id=message_id, stanza_id=stanza_id, + msg_log_id=msg_log_id, additional_data=additional_data) def _on_room_subject(self, ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -176,7 +176,7 @@ def _create_popover(self, def _on_activate_message_selection(self, _button: Gtk.ModelButton) -> None: app.window.activate_action( 'activate-message-selection', - GLib.Variant('u', self._row.log_line_id)) + GLib.Variant('u', self._row.log_line_id or 0)) @staticmethod def _on_closed(popover: Gtk.Popover) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e426ed6c311815f82741cd3a59f8b61… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e426ed6c311815f82741cd3a59f8b61… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits