Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] ChatPage: Add ChatFilter
by Daniel Brötzmann 16 May '21

16 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: ec5018d6 by wurstsalat at 2021-05-16T12:53:32+02:00 ChatPage: Add ChatFilter - - - - - 13 changed files: - gajim/data/gui/chat_list_row.ui - gajim/data/gui/chat_paned.ui - + gajim/data/icons/hicolor/16x16/devices/feather-user-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-users-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-user-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-users-symbolic.symbolic.png - + gajim/data/icons/hicolor/scalable/devices/feather-user-symbolic.svg - + gajim/data/icons/hicolor/scalable/devices/feather-users-symbolic.svg - gajim/data/style/gajim.css - gajim/gtk/chat_filter.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_page.py Changes: ===================================== gajim/data/gui/chat_list_row.ui ===================================== @@ -64,7 +64,7 @@ <object class="GtkImage" id="group_chat_indicator"> <property name="can-focus">False</property> <property name="no-show-all">True</property> - <property name="icon-name">system-users-symbolic</property> + <property name="icon-name">feather-users-symbolic</property> <property name="icon_size">1</property> <style> <class name="dim-label"/> ===================================== gajim/data/gui/chat_paned.ui ===================================== @@ -15,8 +15,8 @@ <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> -  - <object class="GtkGrid"> +  + <object class="GtkGrid" id="header_bar"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="row-spacing">3</property> @@ -72,15 +72,13 @@ <object class="GtkSeparator"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="margin-left">6</property> - <property name="margin-right">6</property> <property name="margin-start">6</property> <property name="margin-end">6</property> <property name="margin-top">12</property> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">2</property> + <property name="top-attach">3</property> </packing> </child> <child> @@ -127,9 +125,12 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">1</property> + <property name="top-attach">2</property> </packing> </child> + <child> + <placeholder/> + </child> <style> <class name="chatlist-top-bar"/> </style> ===================================== gajim/data/icons/hicolor/16x16/devices/feather-user-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-user-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-users-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-users-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-user-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-user-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-users-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-users-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/scalable/devices/feather-user-symbolic.svg ===================================== @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="24" + height="24" + viewBox="0 0 24 24" + fill="none" + stroke="currentColor" + stroke-width="2" + stroke-linecap="round" + stroke-linejoin="round" + class="feather feather-user" + version="1.1" + id="svg6" + sodipodi:docname="feather-user-symbolic.svg" + inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)"> + <metadata + id="metadata12"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs10" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="998" + id="namedview8" + showgrid="false" + inkscape:zoom="34.291667" + inkscape:cx="12" + inkscape:cy="12" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg6" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 8 14 C 5.2504209 14 3 16.250421 3 19 L 3 21 A 1 1 0 0 0 4 22 A 1 1 0 0 0 5 21 L 5 19 C 5 17.331301 6.3313011 16 8 16 L 16 16 C 17.668699 16 19 17.331301 19 19 L 19 21 A 1 1 0 0 0 20 22 A 1 1 0 0 0 21 21 L 21 19 C 21 16.250421 18.749579 14 16 14 L 8 14 z " + id="path2" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 12 2 C 9.2504209 2 7 4.2504209 7 7 C 7 9.7495791 9.2504209 12 12 12 C 14.749579 12 17 9.7495791 17 7 C 17 4.2504209 14.749579 2 12 2 z M 12 4 C 13.668699 4 15 5.3313011 15 7 C 15 8.6686989 13.668699 10 12 10 C 10.331301 10 9 8.6686989 9 7 C 9 5.3313011 10.331301 4 12 4 z " + id="circle4" /> +</svg> ===================================== gajim/data/icons/hicolor/scalable/devices/feather-users-symbolic.svg ===================================== @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="24" + height="24" + viewBox="0 0 24 24" + fill="none" + stroke="currentColor" + stroke-width="2" + stroke-linecap="round" + stroke-linejoin="round" + class="feather feather-users" + version="1.1" + id="svg10" + sodipodi:docname="feather-users-symbolic.svg" + inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)"> + <metadata + id="metadata16"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs14" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="998" + id="namedview12" + showgrid="false" + inkscape:zoom="34.291667" + inkscape:cx="12" + inkscape:cy="12" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg10" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 5 14 C 2.2504209 14 1.7763568e-15 16.250421 0 19 L 0 21 A 1 1 0 0 0 1 22 A 1 1 0 0 0 2 21 L 2 19 C 2 17.331301 3.3313011 16 5 16 L 13 16 C 14.668699 16 16 17.331301 16 19 L 16 21 A 1 1 0 0 0 17 22 A 1 1 0 0 0 18 21 L 18 19 C 18 16.250421 15.749579 14 13 14 L 5 14 z " + id="path2" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 9 2 C 6.2504209 2 4 4.2504209 4 7 C 4 9.7495791 6.2504209 12 9 12 C 11.749579 12 14 9.7495791 14 7 C 14 4.2504209 11.749579 2 9 2 z M 9 4 C 10.668699 4 12 5.3313011 12 7 C 12 8.6686989 10.668699 10 9 10 C 7.3313011 10 6 8.6686989 6 7 C 6 5.3313011 7.3313011 4 9 4 z " + id="circle4" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 20 14.130859 A 1 1 0 0 0 19.03125 14.880859 A 1 1 0 0 0 19.75 16.097656 C 21.078577 16.440693 21.998977 17.627852 22 19 L 22 21 A 1 1 0 0 0 23 22 A 1 1 0 0 0 24 21 L 24 19 C 23.998304 16.726383 22.451421 14.730513 20.25 14.162109 A 1 1 0 0 0 20 14.130859 z " + id="path6" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 15.998047 2.1308594 A 1 1 0 0 0 15.03125 2.8828125 A 1 1 0 0 0 15.751953 4.0996094 C 17.32674 4.5028185 18.007812 5.722745 18.007812 7.0058594 C 18.007812 8.2889738 17.32674 9.5089002 15.751953 9.9121094 A 1 1 0 0 0 15.03125 11.128906 A 1 1 0 0 0 16.248047 11.849609 C 18.683717 11.225979 20.007812 9.0843253 20.007812 7.0058594 C 20.007812 4.9273934 18.683717 2.7857396 16.248047 2.1621094 A 1 1 0 0 0 15.998047 2.1308594 z " + id="path8" /> +</svg> ===================================== gajim/data/style/gajim.css ===================================== @@ -263,6 +263,13 @@ padding: 12px; background: transparent; } +.chat-filter-icons { + background: transparent; +} +.chat-filter-icons button { + color: @insensitive_fg_color; +} + .chatlist { background: transparent; } ===================================== gajim/gtk/chat_filter.py ===================================== @@ -26,26 +26,40 @@ class ChatFilter(Gtk.Box): (str, )), } - def __init__(self): + def __init__(self, icons=False): Gtk.Box.__init__(self) self.set_halign(Gtk.Align.CENTER) toolbar = Gtk.Toolbar() + if icons: + toolbar.get_style_context().add_class('chat-filter-icons') all_button = Gtk.RadioToolButton.new_from_widget(None) - all_button.set_label(_('All')) + if icons: + all_button.set_icon_name('feather-home-symbolic') + all_button.set_tooltip_text(_('All')) + else: + all_button.set_label(_('All')) all_button.set_name('all') all_button.connect('clicked', self._on_button_clicked) toolbar.insert(all_button, 1) chats_button = Gtk.RadioToolButton.new_from_widget(all_button) - chats_button.set_label(_('Chats')) + if icons: + chats_button.set_icon_name('feather-user-symbolic') + chats_button.set_tooltip_text(_('Chats')) + else: + chats_button.set_label(_('Chats')) chats_button.set_name('chats') chats_button.connect('clicked', self._on_button_clicked) toolbar.insert(chats_button, 2) group_chats_button = Gtk.RadioToolButton.new_from_widget(all_button) - group_chats_button.set_label(_('Group Chats')) + if icons: + group_chats_button.set_icon_name('feather-users-symbolic') + group_chats_button.set_tooltip_text(_('Group Chats')) + else: + group_chats_button.set_label(_('Group Chats')) group_chats_button.set_name('group_chats') group_chats_button.connect('clicked', self._on_button_clicked) toolbar.insert(group_chats_button, 3) ===================================== gajim/gtk/chat_list.py ===================================== @@ -42,6 +42,7 @@ def __init__(self, workspace_id): EventHelper.__init__(self) self._chats = {} + self._current_filter = 'all' self._current_filter_text = '' self._workspace_id = workspace_id @@ -86,6 +87,13 @@ def _update_timer(self): return True def _filter_func(self, row): + is_groupchat = row.type == 'groupchat' + if self._current_filter == 'chats' and is_groupchat: + return False + + if self._current_filter == 'group_chats' and not is_groupchat: + return False + if not self._current_filter_text: return True text = self._current_filter_text.lower() @@ -145,6 +153,10 @@ def _set_placeholder(self): def _on_start_chat_clicked(_widget): app.app.activate_action('start-chat', GLib.Variant('s', '')) + def set_filter(self, name): + self._current_filter = name + self.invalidate_filter() + def set_filter_text(self, text): self._current_filter_text = text self.invalidate_filter() ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -49,7 +49,7 @@ class ChatListStack(Gtk.Stack): (str, str, str)), } - def __init__(self, search_entry): + def __init__(self, chat_filter, search_entry): Gtk.Stack.__init__(self) self.set_hexpand(True) self.set_vexpand(True) @@ -63,6 +63,7 @@ def __init__(self, search_entry): self.connect('notify::visible-child-name', self._on_visible_child_name) search_entry.connect('search-changed', self._on_search_changed) + chat_filter.connect('filter-changed', self._on_filter_changed) app.window.connect('notify::is-active', self._on_window_active) self._add_actions() @@ -122,6 +123,10 @@ def is_chat_active(self, account, jid): return False return chat.is_active + def _on_filter_changed(self, _filter, name): + chat_list = self.get_visible_child() + chat_list.set_filter(name) + def _on_search_changed(self, search_entry): chat_list = self.get_visible_child() chat_list.set_filter_text(search_entry.get_text()) ===================================== gajim/gtk/chat_page.py ===================================== @@ -22,6 +22,7 @@ from gajim.common.i18n import _ from .util import get_builder +from .chat_filter import ChatFilter from .chat_list_stack import ChatListStack from .chat_stack import ChatStack from .search_view import SearchView @@ -59,7 +60,11 @@ def __init__(self): self._search_revealer.add(self._search_view) self._ui.right_grid_overlay.add_overlay(self._search_revealer) - self._chat_list_stack = ChatListStack(self._ui.search_entry) + self._chat_filter = ChatFilter(icons=True) + self._ui.header_bar.attach(self._chat_filter, 0, 1, 1, 1) + + self._chat_list_stack = ChatListStack( + self._chat_filter, self._ui.search_entry) self._chat_list_stack.connect('chat-selected', self._on_chat_selected) self._chat_list_stack.connect('chat-unselected', self._on_chat_unselected) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ec5018d651419867f56da8523bc381e2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ec5018d651419867f56da8523bc381e2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Remove obsolete settings
by Daniel Brötzmann 16 May '21

16 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: c65abca3 by wurstsalat at 2021-05-16T11:10:09+02:00 Remove obsolete settings - - - - - 4b8462c0 by wurstsalat at 2021-05-16T11:23:45+02:00 Remove obosolete window size settings - - - - - 3 changed files: - gajim/common/config.py - gajim/common/setting_values.py - gajim/gtk/conversation/rows/message.py Changes: ===================================== gajim/common/config.py ===================================== @@ -91,7 +91,6 @@ class Config: 'use_speller': [opt_bool, False, ], 'show_xhtml': [opt_bool, True, ], 'speller_language': [opt_str, '', _('Language used for spell checking.')], - 'print_time': [opt_str, 'always', _('\'always\' - print time for every message.\n\'sometimes\' - print time every print_ichat_every_foo_minutes minute.\n\'never\' - never print time.')], 'emoticons_theme': [opt_str, 'noto-emoticons', '', True], 'ascii_formatting': [opt_bool, True, _('Treat * / _ pairs as possible formatting characters.'), True], @@ -104,31 +103,15 @@ class Config: 'msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide 'msgwin-width': [opt_int, 500], 'msgwin-height': [opt_int, 440], - 'chat-msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide - 'chat-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide - 'chat-msgwin-width': [opt_int, 480], - 'chat-msgwin-height': [opt_int, 440], - 'gc-msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide - 'gc-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide - 'gc-msgwin-width': [opt_int, 600], - 'gc-msgwin-height': [opt_int, 440], - 'pm-msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide - 'pm-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide - 'pm-msgwin-width': [opt_int, 480], - 'pm-msgwin-height': [opt_int, 440], 'save-roster-position': [opt_bool, True, _('If enabled, Gajim will save the contact list window position when hiding it, and restore it when showing the contact list window again.')], 'roster_x-position': [opt_int, 0], 'roster_y-position': [opt_int, 0], 'roster_width': [opt_int, 200], 'roster_height': [opt_int, 400], - 'roster_hpaned_position': [opt_int, 200], 'roster_on_the_right': [opt_bool, False, _('Place the contact list on the right in single window mode'), True], 'latest_disco_addresses': [opt_str, ''], 'time_stamp': [opt_str, '%x | %X ', _('This option lets you customize the timestamp that is printed in conversation. For example \'[%H:%M] \' will show \'[hour:minute] \'. See python doc on strftime for full documentation (https://docs.python.org/3/library/time.html#time.strftime).')], - 'before_nickname': [opt_str, '', _('Characters that are printed before the nickname in conversations.')], - 'after_nickname': [opt_str, ':', _('Characters that are printed after the nickname in conversations.')], 'change_roster_title': [opt_bool, True, _('If enabled, Gajim will add * and [n] in contact list window title.')], - 'restore_lines': [opt_int, 10, _('Number of messages from chat history to be restored when a chat tab/window is reopened.')], 'restore_timeout': [opt_int, -1, _('How far back in time (minutes) chat history is restored. -1 means no limit.')], 'send_on_ctrl_enter': [opt_bool, False, _('Send message on Ctrl+Enter and make a new line with Enter.')], 'last_roster_visible': [opt_bool, True], @@ -139,7 +122,6 @@ class Config: 'always_english_wikipedia': [opt_bool, False], 'always_english_wiktionary': [opt_bool, True], 'remote_control': [opt_bool, False, _('If checked, Gajim can be controlled remotely using gajim-remote.'), True], - 'print_ichat_every_foo_minutes': [opt_int, 5, _('When not printing time for every message (\'print_time\'==sometimes), print it every x minutes.')], 'confirm_paste_image': [opt_bool, True, _('Ask before pasting an image.')], 'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')], 'confirm_close_multiple_tabs': [opt_bool, True, _('Ask before closing tabbed chat window if there are chats that can lose data (chat, private chat, group chat that will not be minimized).')], @@ -185,13 +167,11 @@ class Config: 'hide_chat_banner': [opt_bool, False, _('Hides the banner in a 1:1 chat window.')], 'hide_groupchat_occupants_list': [opt_bool, False, _('Hides the group chat participants list in a group chat window.')], 'chat_merge_consecutive_nickname': [opt_bool, False, _('In a chat, show the nickname at the beginning of a line only when it\'s not the same person talking as in the previous message.')], - 'chat_merge_consecutive_nickname_indent': [opt_str, ' ', _('Indentation when using merge consecutive nickname.')], 'ctrl_tab_go_to_next_composing': [opt_bool, True, _('Ctrl+Tab switches to the next composing tab when there are no tabs with messages pending.')], 'confirm_metacontacts': [opt_str, '', _('Show a confirmation dialog to create metacontacts? Empty string means never show the dialog.')], 'confirm_block': [opt_str, '', _('Show a confirmation dialog to block a contact? Empty string means never show the dialog.')], 'enable_negative_priority': [opt_bool, False, _('If enabled, you will be able to set a negative priority to your account in the Accounts window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server.')], 'show_contacts_number': [opt_bool, True, _('If enabled, Gajim will show both the number of online and total contacts in account rows as well as in group rows.')], - 'scroll_roster_to_last_message': [opt_bool, True, _('If enabled, Gajim will scroll and select the contact who sent you the last message, if the chat window is not already opened.')], 'change_status_window_timeout': [opt_int, 15, _('Time of inactivity needed before the change status window closes down.')], 'max_conversation_lines': [opt_int, 500, _('Maximum number of lines that are printed in conversations. Oldest lines are cleared.')], 'uri_schemes': [opt_str, 'aaa:// aaas:// acap:// cap:// cid: crid:// data: dav: dict:// dns: fax: file:/ ftp:// geo: go: gopher:// h323: http:// https:// iax: icap:// im: imap:// info: ipp:// iris: iris.beep: iris.xpc: iris.xpcs: iris.lwz: ldap:// mid: modem: msrp:// msrps:// mtqp:// mupdate:// news: nfs:// nntp:// opaquelocktoken: pop:// pres: prospero:// rtsp:// service: sip: sips: sms: snmp:// soap.beep:// soap.beeps:// tag: tel: telnet:// tftp:// thismessage:/ tip:// tv: urn:// vemmi:// xmlrpc.beep:// xmlrpc.beeps:// z39.50r:// z39.50s:// about: apt: cvs:// daap:// ed2k:// feed: fish:// git:// iax2: irc:// ircs:// ldaps:// magnet: mms:// rsync:// ssh:// svn:// sftp:// smb:// webcal:// aesgcm://', _('Valid URI schemes. Only schemes in this list will be accepted as \'real\' URI (mailto and xmpp are handled separately).'), True], ===================================== gajim/common/setting_values.py ===================================== @@ -42,7 +42,6 @@ class _ACCOUNT_DEFAULT: 'use_speller': False, 'show_xhtml': True, 'speller_language': '', - 'print_time': 'always', 'emoticons_theme': 'noto-emoticons', 'ascii_formatting': True, 'show_ascii_formatting_chars': True, @@ -53,31 +52,15 @@ class _ACCOUNT_DEFAULT: 'msgwin-y-position': -1, 'msgwin-width': 500, 'msgwin-height': 440, - 'chat-msgwin-x-position': -1, - 'chat-msgwin-y-position': -1, - 'chat-msgwin-width': 480, - 'chat-msgwin-height': 440, - 'gc-msgwin-x-position': -1, - 'gc-msgwin-y-position': -1, - 'gc-msgwin-width': 600, - 'gc-msgwin-height': 440, - 'pm-msgwin-x-position': -1, - 'pm-msgwin-y-position': -1, - 'pm-msgwin-width': 480, - 'pm-msgwin-height': 440, 'save-roster-position': True, 'roster_x-position': 0, 'roster_y-position': 0, 'roster_width': 200, 'roster_height': 400, - 'roster_hpaned_position': 200, 'roster_on_the_right': False, 'latest_disco_addresses': '', 'time_stamp': '%x | %X ', - 'before_nickname': '', - 'after_nickname': ':', 'change_roster_title': True, - 'restore_lines': 10, 'restore_timeout': -1, 'send_on_ctrl_enter': False, 'last_roster_visible': True, @@ -87,7 +70,6 @@ class _ACCOUNT_DEFAULT: 'always_english_wikipedia': False, 'always_english_wiktionary': True, 'remote_control': False, - 'print_ichat_every_foo_minutes': 5, 'confirm_paste_image': True, 'confirm_close_muc': True, 'confirm_close_multiple_tabs': True, @@ -130,14 +112,12 @@ class _ACCOUNT_DEFAULT: 'hide_chat_banner': False, 'hide_groupchat_occupants_list': False, 'chat_merge_consecutive_nickname': False, - 'chat_merge_consecutive_nickname_indent': ' ', 'ctrl_tab_go_to_next_composing': True, 'metacontacts_enabled': True, 'confirm_metacontacts': '', 'confirm_block': '', 'enable_negative_priority': False, 'show_contacts_number': True, - 'scroll_roster_to_last_message': True, 'change_status_window_timeout': 15, 'max_conversation_lines': 500, 'shell_like_completion': False, @@ -397,7 +377,6 @@ class _ACCOUNT_DEFAULT: ADVANCED_SETTINGS = { 'app': { 'allow_hide_roster': _('Allow to hide the contact list window even if the notification area icon is not shown.'), - 'print_time': _('\'always\' - print time for every message.\n\'sometimes\' - print time every print_ichat_every_foo_minutes minute.\n\'never\' - never print time.'), 'ascii_formatting': _('Treat * / _ pairs as possible formatting characters.'), 'show_ascii_formatting_chars': _('If enabled, do not remove */_ . So *abc* will be bold but with * * not removed.'), 'gc_refer_to_nick_char': _('Character to add after nickname when using nickname completion (tab) in group chat.'), @@ -405,10 +384,7 @@ class _ACCOUNT_DEFAULT: 'roster_on_the_right': _('Place the contact list on the right in single window mode'), 'time_stamp': _('This option lets you customize the timestamp that is printed in conversation. For example \'[%H:%M] \' will show \'[hour:minute] \'. See python doc on strftime for full documentation (https://docs.python.org/3/library/time.html#time.strftime).'), 'chat_timestamp_format': 'https://docs.python.org/3/library/time.html#time.strftime', - 'before_nickname': _('Characters that are printed before the nickname in conversations.'), - 'after_nickname': _('Characters that are printed after the nickname in conversations.'), 'change_roster_title': _('If enabled, Gajim will add * and [n] in contact list window title.'), - 'restore_lines': _('Number of messages from chat history to be restored when a chat tab/window is reopened.'), 'restore_timeout': _('How far back in time (minutes) chat history is restored. -1 means no limit.'), 'send_on_ctrl_enter': _('Send message on Ctrl+Enter and make a new line with Enter.'), 'key_up_lines': _('How many lines to store for Ctrl+KeyUP (previously sent messages).'), @@ -417,7 +393,6 @@ class _ACCOUNT_DEFAULT: 'always_english_wikipedia': '', 'always_english_wiktionary': '', 'remote_control': _('If checked, Gajim can be controlled remotely using gajim-remote.'), - 'print_ichat_every_foo_minutes': _('When not printing time for every message (\'print_time\'==sometimes, print it every x minutes.'), 'confirm_paste_image': _('Ask before pasting an image.'), 'confirm_close_muc': _('Ask before closing a group chat tab/window.'), 'confirm_close_multiple_tabs': _('Ask before closing tabbed chat window if there are chats that can lose data (chat, private chat, group chat that will not be minimized).'), @@ -445,13 +420,11 @@ class _ACCOUNT_DEFAULT: 'hide_chat_banner': _('Hides the banner in a 1:1 chat window.'), 'hide_groupchat_occupants_list': _('Hides the group chat participants list in a group chat window.'), 'chat_merge_consecutive_nickname': _('In a chat, show the nickname at the beginning of a line only when it\'s not the same person talking as in the previous message.'), - 'chat_merge_consecutive_nickname_indent': _('Indentation when using merge consecutive nickname.'), 'ctrl_tab_go_to_next_composing': _('Ctrl+Tab switches to the next composing tab when there are no tabs with messages pending.'), 'confirm_metacontacts': _('Show a confirmation dialog to create metacontacts? Empty string means never show the dialog.'), 'confirm_block': _('Show a confirmation dialog to block a contact? Empty string means never show the dialog.'), 'enable_negative_priority': _('If enabled, you will be able to set a negative priority to your account in the Accounts window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server.'), 'show_contacts_number': _('If enabled, Gajim will show both the number of online and total contacts in account rows as well as in group rows.'), - 'scroll_roster_to_last_message': _('If enabled, Gajim will scroll and select the contact who sent you the last message, if the chat window is not already opened.'), 'change_status_window_timeout': _('Time of inactivity needed before the change status window closes down.'), 'max_conversation_lines': _('Maximum number of lines that are printed in conversations. Oldest lines are cleared.'), 'shell_like_completion': _('If enabled, completion in group chats will be like a shell auto-completion.'), ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -84,7 +84,6 @@ def __init__(self, timestamp_label = self.create_timestamp_widget(self.timestamp) timestamp_label.set_margin_start(6) self._meta_box.pack_end(timestamp_label, False, True, 0) - # TODO: implement app.settings.get('print_time') 'always', 'sometimes'? if kind in ('incoming', 'incoming_queue', 'outgoing'): encryption_img = self._get_encryption_image( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bdb1053719f01ff0e42687f0f5d5bcd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bdb1053719f01ff0e42687f0f5d5bcd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Remove obsolete history files and settings
by Daniel Brötzmann 16 May '21

16 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: bdb10537 by wurstsalat at 2021-05-16T10:14:23+02:00 Remove obsolete history files and settings - - - - - 3 changed files: - gajim/common/config.py - gajim/common/setting_values.py - − gajim/data/gui/history_window.ui Changes: ===================================== gajim/common/config.py ===================================== @@ -123,10 +123,6 @@ class Config: 'roster_height': [opt_int, 400], 'roster_hpaned_position': [opt_int, 200], 'roster_on_the_right': [opt_bool, False, _('Place the contact list on the right in single window mode'), True], - 'history_window_width': [opt_int, -1], - 'history_window_height': [opt_int, 450], - 'history_window_x-position': [opt_int, 0], - 'history_window_y-position': [opt_int, 0], 'latest_disco_addresses': [opt_str, ''], 'time_stamp': [opt_str, '%x | %X ', _('This option lets you customize the timestamp that is printed in conversation. For example \'[%H:%M] \' will show \'[hour:minute] \'. See python doc on strftime for full documentation (https://docs.python.org/3/library/time.html#time.strftime).')], 'before_nickname': [opt_str, '', _('Characters that are printed before the nickname in conversations.')], ===================================== gajim/common/setting_values.py ===================================== @@ -72,10 +72,6 @@ class _ACCOUNT_DEFAULT: 'roster_height': 400, 'roster_hpaned_position': 200, 'roster_on_the_right': False, - 'history_window_width': -1, - 'history_window_height': 450, - 'history_window_x-position': 0, - 'history_window_y-position': 0, 'latest_disco_addresses': '', 'time_stamp': '%x | %X ', 'before_nickname': '', ===================================== gajim/data/gui/history_window.ui deleted ===================================== @@ -1,626 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.24"/> - <object class="GtkListStore" id="liststore1"> - <columns> -  - <column type="gchararray"/> -  - <column type="gchararray"/> - </columns> - </object> - <object class="GtkPopoverMenu" id="more_menu"> - <property name="can-focus">False</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-start">12</property> - <property name="margin-end">12</property> - <property name="margin-top">12</property> - <property name="margin-bottom">12</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkCheckButton" id="show_status_checkbutton"> - <property name="label" translatable="yes">Display status changes</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="draw-indicator">True</property> - <signal name="toggled" handler="_on_show_status" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can-focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkModelButton"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="action-name">app.history-manager</property> - <property name="text" translatable="yes">History Manager</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="submenu">main</property> - <property name="position">1</property> - </packing> - </child> - </object> - <object class="GtkListStore" id="search_liststore"> - <columns> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> - </columns> - </object> - <object class="GtkPopover" id="search_menu"> - <property name="can-focus">False</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-start">12</property> - <property name="margin-end">12</property> - <property name="margin-top">12</property> - <property name="margin-bottom">12</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Date</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">start</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkCalendar" id="calendar"> - <property name="width-request">270</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <signal name="day-selected" handler="_on_day_selected" swapped="no"/> - <signal name="month-changed" handler="_on_month_changed" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButtonBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">start</property> - <property name="homogeneous">True</property> - <property name="layout-style">expand</property> - <child> - <object class="GtkButton" id="button_first_day"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_change_date" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">go-first-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="button_previous_day"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_change_date" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">go-previous-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="button_next_day"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_change_date" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">go-next-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="button_last_day"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_change_date" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">go-last-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <style> - <class name="linked-up"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <style> - <class name="linked"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="margin-top">12</property> - <property name="label" translatable="yes">Mode</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="search_complete_history"> - <property name="label" translatable="yes">Search complete history</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="halign">start</property> - <property name="active">True</property> - <property name="draw-indicator">True</property> - <signal name="toggled" handler="_on_search_complete_history" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="search_in_date"> - <property name="label" translatable="yes">Search selected day only</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="halign">start</property> - <property name="draw-indicator">True</property> - <property name="group">search_complete_history</property> - <signal name="toggled" handler="_on_search_in_date" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - </object> - </child> - </object> - <object class="GtkBox" id="history_box"> - <property name="width-request">600</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-start">18</property> - <property name="margin-end">18</property> - <property name="margin-top">18</property> - <property name="margin-bottom">18</property> - <property name="orientation">vertical</property> - <property name="spacing">24</property> - <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="row-spacing">6</property> - <property name="column-spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="label" translatable="yes">Chat</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkSwitch" id="store_history_switch"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="tooltip-text" translatable="yes">Store history for this chat</property> - <property name="valign">center</property> - <signal name="notify::active" handler="_on_log_history" swapped="no"/> - </object> - <packing> - <property name="left-attach">3</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">center</property> - <property name="margin-start">6</property> - <property name="label" translatable="yes">Store History</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="query_combo"> - <property name="width-request">400</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="model">liststore1</property> - <property name="has-entry">True</property> - <property name="entry-text-column">1</property> - <property name="id-column">1</property> - <signal name="changed" handler="_on_query_combo_changed" swapped="no"/> - <child internal-child="entry"> - <object class="GtkEntry" id="query_entry"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <signal name="activate" handler="_on_jid_entry_activate" swapped="no"/> - </object> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child type="center"> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkSearchEntry" id="search_entry"> - <property name="width-request">300</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="primary-icon-name">edit-find-symbolic</property> - <property name="primary-icon-activatable">False</property> - <property name="primary-icon-sensitive">False</property> - <property name="placeholder-text" translatable="yes">Search…</property> - <signal name="activate" handler="_on_search_entry_activate" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="search_menu_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="halign">start</property> - <property name="popover">search_menu</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="date_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-start">3</property> - <property name="margin-end">3</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">pan-down-symbolic</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <style> - <class name="linked"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkMenuButton"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="popover">more_menu</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">view-more-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">1</property> - </packing> - </child> - <style> - <class name="inline-toolbar"/> - <class name="ontop-bar"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkPaned"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkScrolledWindow" id="results_scrolledwindow"> - <property name="can-focus">True</property> - <property name="no-show-all">True</property> - <property name="shadow-type">in</property> - <child> - <object class="GtkTreeView" id="results_treeview"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="model">search_liststore</property> - <property name="hover-expand">True</property> - <signal name="cursor-changed" handler="_on_results_cursor_changed" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> - </child> - <child> - <object class="GtkTreeViewColumn"> - <property name="resizable">True</property> - <property name="title" translatable="yes">Name</property> - <property name="clickable">True</property> - <property name="sort-column-id">1</property> - <child> - <object class="GtkCellRendererText" id="name"> - <property name="ellipsize">end</property> - </object> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn"> - <property name="resizable">True</property> - <property name="title" translatable="yes">Date</property> - <property name="clickable">True</property> - <property name="sort-column-id">2</property> - <child> - <object class="GtkCellRendererText" id="date"> - <property name="ellipsize">end</property> - </object> - <attributes> - <attribute name="text">2</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn"> - <property name="resizable">True</property> - <property name="title" translatable="yes">Message</property> - <child> - <object class="GtkCellRendererText" id="message"> - <property name="ellipsize">end</property> - </object> - <attributes> - <attribute name="text">3</attribute> - </attributes> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="resize">True</property> - <property name="shrink">True</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="shadow-type">etched-in</property> - <property name="min-content-height">200</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="resize">True</property> - <property name="shrink">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> -</interface> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bdb1053719f01ff0e42687f0f5d5bcd8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bdb1053719f01ff0e42687f0f5d5bcd8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Jingle: Fix UnboundLocalError for transports variable
by Daniel Brötzmann 14 May '21

14 May '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e841e9ed by wurstsalat at 2021-05-14T23:32:41+02:00 Jingle: Fix UnboundLocalError for transports variable transport=None is handled in JingleTransportSocks5() Fixes #10545 - - - - - 1 changed file: - gajim/common/modules/jingle.py Changes: ===================================== gajim/common/modules/jingle.py ===================================== @@ -226,10 +226,13 @@ def start_file_transfer(self, jid, file_props, request=False): jingle.session_type_ft = True self._sessions[jingle.sid] = jingle file_props.sid = jingle.sid + if contact.supports(Namespace.JINGLE_BYTESTREAM): transport = JingleTransportSocks5() elif contact.supports(Namespace.JINGLE_IBB): transport = JingleTransportIBB() + else: + transport = None senders = 'initiator' if request: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e841e9ed95e87aba599f86b773b2227a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e841e9ed95e87aba599f86b773b2227a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: PortableInstaller: Add directory cleanup
by Philipp Hörist 14 May '21

14 May '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1f0a3158 by wurstsalat at 2021-05-14T21:37:09+02:00 PortableInstaller: Add directory cleanup - - - - - 20ebd79e by wurstsalat at 2021-05-14T21:37:09+02:00 Uninstaller: Kill gdbus.exe if running - - - - - 055308ec by wurstsalat at 2021-05-14T21:37:09+02:00 Installer: Add Gajim branding text - - - - - 2 changed files: - win/misc/gajim-portable.nsi - win/misc/gajim.nsi Changes: ===================================== win/misc/gajim-portable.nsi ===================================== @@ -2,6 +2,8 @@ Unicode true !include "MUI2.nsh" +!include "LogicLib.nsh" + Name "Gajim" OutFile "Gajim-Portable.exe" @@ -12,6 +14,7 @@ SetCompressorDictSize 32 InstallDir "$PROFILE\Gajim" RequestExecutionLevel user +BrandingText "Gajim Setup" !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico" !define MUI_HEADERIMAGE @@ -51,6 +54,7 @@ LangString NAME_Languages ${LANG_ENGLISH} "Languages" LangString NAME_SecLanguagesOther ${LANG_ENGLISH} "Other" LangString NAME_Themes ${LANG_ENGLISH} "Themes" LangString DESC_SecGajim ${LANG_ENGLISH} "Installs the main Gajim files." +LangString INST_NotEmpty ${LANG_ENGLISH} "It looks like you already installed Gajim in this directory. A cleanup is necessary before installing. Your user data will not be touched. Cleanup now?" ; French @@ -60,6 +64,7 @@ LangString NAME_Languages ${LANG_FRENCH} "Langues" LangString NAME_SecLanguagesOther ${LANG_FRENCH} "Autre" LangString NAME_Themes ${LANG_FRENCH} "Thèmes" LangString DESC_SecGajim ${LANG_FRENCH} "Installer les fichiers principaux de Gajim." +LangString INST_NotEmpty ${LANG_FRENCH} "It looks like you already installed Gajim in this directory. A cleanup is necessary before installing. Your user data will not be touched. Cleanup now?" ; German @@ -69,6 +74,7 @@ LangString NAME_Languages ${LANG_GERMAN} "Sprachen" LangString NAME_SecLanguagesOther ${LANG_GERMAN} "Sonstige" LangString NAME_Themes ${LANG_GERMAN} "Designs" LangString DESC_SecGajim ${LANG_GERMAN} "Installiert die Hauptdateien von Gajim." +LangString INST_NotEmpty ${LANG_GERMAN} "Anscheinend ist Gajim bereits in diesem Verzeichnis installiert. Vor der Installation ist es notwendig das Verzeichnis aufzuräumen. Deine Benutzerdaten bleiben erhalten. Jetzt aufräumen?" ; Italian @@ -78,6 +84,7 @@ LangString NAME_Languages ${LANG_ITALIAN} "Lingue" LangString NAME_SecLanguagesOther ${LANG_ITALIAN} "Altre" LangString NAME_Themes ${LANG_ITALIAN} "Temi" LangString DESC_SecGajim ${LANG_ITALIAN} "Installa i file principali di Gajim." +LangString INST_NotEmpty ${LANG_ITALIAN} "It looks like you already installed Gajim in this directory. A cleanup is necessary before installing. Your user data will not be touched. Cleanup now?" ; Russian @@ -87,6 +94,7 @@ LangString NAME_Languages ${LANG_RUSSIAN} "Языки" LangString NAME_SecLanguagesOther ${LANG_RUSSIAN} "Другое" LangString NAME_Themes ${LANG_RUSSIAN} "Темы" LangString DESC_SecGajim ${LANG_RUSSIAN} "Установка основных файлов Gajim." +LangString INST_NotEmpty ${LANG_RUSSIAN} "It looks like you already installed Gajim in this directory. A cleanup is necessary before installing. Your user data will not be touched. Cleanup now?" ; Hebrew @@ -96,11 +104,24 @@ LangString NAME_Languages ${LANG_HEBREW} "שפות" LangString NAME_SecLanguagesOther ${LANG_HEBREW} "אחרות" LangString NAME_Themes ${LANG_HEBREW} "ערכאות נושא" LangString DESC_SecGajim ${LANG_HEBREW} "מתקין קבצי Gajim עיקריים." +LangString INST_NotEmpty ${LANG_HEBREW} "It looks like you already installed Gajim in this directory. A cleanup is necessary before installing. Your user data will not be touched. Cleanup now?" Section "Gajim" SecGajim SectionIn RO SetOutPath "$INSTDIR" + + ${If} ${FileExists} "$InstDir\bin\Gajim.exe" + MessageBox MB_YESNO $(INST_NotEmpty) IDYES cleanup + Abort + cleanup: + RMDir /r "$InstDir\bin" + RMDir /r "$InstDir\etc" + RMDir /r "$InstDir\lib" + RMDir /r "$InstDir\share" + RMDir /r "$InstDir\ssl" + ${EndIf} + File /r "${ARCH}\*.*" SetOutPath "$INSTDIR\bin" ===================================== win/misc/gajim.nsi ===================================== @@ -2,6 +2,7 @@ Unicode true !include "MUI2.nsh" +!include "LogicLib.nsh" Name "Gajim" OutFile "Gajim.exe" @@ -13,6 +14,7 @@ SetCompressorDictSize 32 InstallDir "$PROGRAMFILES\Gajim" InstallDirRegKey HKCU "Software\Gajim" "" RequestExecutionLevel admin +BrandingText "Gajim Setup" Var StartMenuFolder @@ -210,6 +212,9 @@ Section $(NAME_SecURI) SecURI SectionEnd Section "Uninstall" + + ExecWait "TaskKill /IM gdbus.exe /F" + RMDir /r "$INSTDIR" !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ae5ec7938f3d917855d1485ddc967d0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ae5ec7938f3d917855d1485ddc967d0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ServerInfo: Don’t fail while adding error class
by Philipp Hörist 14 May '21

14 May '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: ae5ec793 by lovetox at 2021-05-14T20:55:43+02:00 ServerInfo: Don’t fail while adding error class Fixes #10559 - - - - - 1 changed file: - gajim/gtk/server_info.py Changes: ===================================== gajim/gtk/server_info.py ===================================== @@ -98,7 +98,8 @@ def _add_connection_info(self): self._ui.connection_type.set_text(address.type.value) if address.type.is_plain: - self._ui.conection_type.get_style_context().add_class('error-color') + self._ui.connection_type.get_style_context().add_class( + 'error-color') # Connection proxy proxy = address.proxy View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ae5ec7938f3d917855d1485ddc967d00… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ae5ec7938f3d917855d1485ddc967d00… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] CodeWidget: Don’t override background color
by Daniel Brötzmann 14 May '21

14 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 86b9f5d5 by wurstsalat at 2021-05-14T17:25:40+02:00 CodeWidget: Don’t override background color - - - - - 1 changed file: - gajim/data/style/gajim.css Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -50,10 +50,10 @@ .merged { padding-top: 1px;} -.conversation-row grid textview { +.conversation-row grid textview:not(.sourceview) { background: transparent; } -.conversation-row grid textview text { +.conversation-row grid textview:not(.sourceview) text { background: transparent; } .conversation-mention-highlight { View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/86b9f5d595efe7a9d527a2c0f0852b3d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/86b9f5d595efe7a9d527a2c0f0852b3d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Annotate the type for Page.__gsignals__ to fix the mypy failure
by Philipp Hörist 14 May '21

14 May '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4cedb943 by Marcin Mielniczuk at 2021-05-14T11:10:51+02:00 Annotate the type for Page.__gsignals__ to fix the mypy failure - - - - - 2 changed files: - gajim/gtk/account_wizard.py - gajim/gtk/assistant.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -12,7 +12,6 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -# type: ignore import logging from gi.repository import Gdk ===================================== gajim/gtk/assistant.py ===================================== @@ -180,7 +180,7 @@ def __on_destroy(self, *args): class Page(Gtk.Box): - __gsignals__ = { + __gsignals__: dict = { 'update-page-complete': (GObject.SignalFlags.RUN_LAST, None, ()), } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4cedb943d5ca8366547c159ea77e7f70… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4cedb943d5ca8366547c159ea77e7f70… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add FileTransferRow and handle HTTP Upload transfers
by Daniel Brötzmann 13 May '21

13 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 5ea6973e by wurstsalat at 2021-05-13T22:30:02+02:00 Add FileTransferRow and handle HTTP Upload transfers - - - - - 7 changed files: - + gajim/data/gui/file_transfer.ui - − gajim/data/gui/filetransfer_progress.ui - gajim/data/style/gajim.css - gajim/gtk/controls/base.py - gajim/gtk/filetransfer_progress.py → gajim/gtk/conversation/rows/file_transfer.py - gajim/gtk/conversation/view.py - gajim/gui_interface.py Changes: ===================================== gajim/data/gui/file_transfer.ui ===================================== @@ -0,0 +1,161 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkBox" id="transfer_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">document-send-symbolic</property> + <property name="icon_size">6</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="transfer_description"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label"><transfer description></property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="file_name"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label"><file name></property> + <property name="ellipsize">middle</property> + <property name="max-width-chars">30</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="file_size"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label"><file size></property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkProgressBar" id="progress_bar"> + <property name="visible">True</property> + <property name="can-focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="transfer_progress"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="label" translatable="yes">Waiting…</property> + <property name="ellipsize">end</property> + <property name="max-width-chars">30</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">Cancel</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="halign">end</property> + <property name="valign">end</property> + <signal name="clicked" handler="_on_cancel_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <style> + <class name="file-transfer"/> + </style> + </object> +</interface> ===================================== gajim/data/gui/filetransfer_progress.ui deleted ===================================== @@ -1,191 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.20"/> - <object class="GtkBox" id="box"> - <property name="width_request">350</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">18</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">document-send-symbolic</property> - <property name="icon_size">6</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">6</property> - <property name="label"><placeholder></property> - <style> - <class name="bold"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="file_name_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label"><file name></property> - <property name="ellipsize">end</property> - <property name="max_width_chars">40</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">6</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <property name="column_homogeneous">True</property> - <child> - <object class="GtkLabel" id="progress_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="speed_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="eta_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Progress</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Speed</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Time remaining</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkProgressBar" id="progressbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">6</property> - <property name="pulse_step">0.10000000149</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label" translatable="yes">_Cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">center</property> - <property name="margin_top">12</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="_on_cancel_button_clicked" swapped="no"/> - <style> - <class name="destructive-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">6</property> - </packing> - </child> - </object> -</interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -111,6 +111,14 @@ padding: 0; } +.file-transfer { + padding: 10px; + margin: 5px; + background-color: @theme_unfocused_base_color; + border: 1px solid @borders; + border-radius: 5px; +} + .link-button { min-height: 0px; } /* Main Window */ ===================================== gajim/gtk/controls/base.py ===================================== @@ -1067,6 +1067,9 @@ def save_message(self, message, msg_type): def add_info_message(self, text): self.conversation_view.add_info_message(text) + def add_file_transfer(self, transfer): + self.conversation_view.add_file_transfer(transfer) + def add_message(self, text, kind, ===================================== gajim/gtk/filetransfer_progress.py → gajim/gtk/conversation/rows/file_transfer.py ===================================== @@ -13,32 +13,33 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import time +from datetime import datetime -from gi.repository import Gtk from gi.repository import GLib +from gi.repository import Gtk from gajim.common import app +from gajim.common.const import AvatarSize from gajim.common.i18n import _ -from .util import get_builder -from .util import EventHelper -from .dialogs import ErrorDialog +from .base import BaseRow + +from ...dialogs import ErrorDialog +from ...util import EventHelper +from ...util import get_builder -class FileTransferProgress(Gtk.ApplicationWindow, EventHelper): - def __init__(self, transfer): - Gtk.ApplicationWindow.__init__(self) +class FileTransferRow(BaseRow, EventHelper): + def __init__(self, account, transfer): + BaseRow.__init__(self, account) EventHelper.__init__(self) - self.set_name('FileTransferProgress') - self.set_application(app.app) - self.set_position(Gtk.WindowPosition.CENTER) - self.set_show_menubar(False) - self.set_title(_('File Transfer')) + + self.type = 'file-transfer' + timestamp = time.time() + self.timestamp = datetime.fromtimestamp(timestamp) + self.db_timestamp = timestamp self._destroyed = False - self._transfer = transfer - self._transfer.connect('state-changed', self._on_transfer_state_change) - self._transfer.connect('progress', self._on_transfer_progress) if app.settings.get('use_kib_mib'): self._units = GLib.FormatSizeFlags.IEC_UNITS @@ -46,17 +47,44 @@ def __init__(self, transfer): self._units = GLib.FormatSizeFlags.DEFAULT self._start_time = time.time() + self._pulse = GLib.timeout_add(100, self._pulse_progressbar) - self._ui = get_builder('filetransfer_progress.ui') - self._ui.file_name_label.set_text(transfer.filename) - self.add(self._ui.box) + self._transfer = transfer + self._transfer.connect('state-changed', self._on_transfer_state_change) + self._transfer.connect('progress', self._on_transfer_progress) - self._pulse = GLib.timeout_add(100, self._pulse_progressbar) - self.show_all() + avatar_placeholder = Gtk.Box() + avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) + self.grid.attach(avatar_placeholder, 0, 0, 1, 1) + + timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget.set_hexpand(True) + timestamp_widget.set_halign(Gtk.Align.END) + timestamp_widget.set_valign(Gtk.Align.START) + self.grid.attach(timestamp_widget, 2, 0, 1, 1) + + self._ui = get_builder('file_transfer.ui') + self.grid.attach(self._ui.transfer_box, 1, 0, 1, 1) + self._ui.file_name.set_text(transfer.filename) self.connect('destroy', self._on_destroy) self._ui.connect_signals(self) + self.show_all() + + def _on_destroy(self, *args): + self._destroyed = True + + if self._transfer.state.is_active: + self._transfer.cancel() + + self._transfer = None + if self._pulse is not None: + GLib.source_remove(self._pulse) + + def _on_cancel_clicked(self, _button): + self.destroy() + def _on_transfer_state_change(self, transfer, _signal_name, state): if self._destroyed: return @@ -64,7 +92,7 @@ def _on_transfer_state_change(self, transfer, _signal_name, state): if state.is_error: ErrorDialog(_('Error'), transfer.error_text, - transient_for=app.interface.roster.window) + transient_for=app.window) self.destroy() if state.is_finished or state.is_cancelled: @@ -73,25 +101,12 @@ def _on_transfer_state_change(self, transfer, _signal_name, state): description = transfer.get_state_description() if description: - self._ui.label.set_text(description) + self._ui.transfer_description.set_text(description) def _pulse_progressbar(self): - self._ui.progressbar.pulse() + self._ui.progress_bar.pulse() return True - def _on_cancel_button_clicked(self, _widget): - self.destroy() - - def _on_destroy(self, *args): - self._destroyed = True - - if self._transfer.state.is_active: - self._transfer.cancel() - - self._transfer = None - if self._pulse is not None: - GLib.source_remove(self._pulse) - def _on_transfer_progress(self, transfer, _signal_name): if self._destroyed: return @@ -100,26 +115,27 @@ def _on_transfer_progress(self, transfer, _signal_name): self._pulse = None time_now = time.time() - bytes_sec = round(transfer.seen / (time_now - self._start_time), 1) - size_progress = GLib.format_size_full(transfer.seen, self._units) size_total = GLib.format_size_full(transfer.size, self._units) - speed = '%s/s' % GLib.format_size_full(bytes_sec, self._units) + self._ui.file_size.set_text(size_total) + + bytes_sec = round(transfer.seen / (time_now - self._start_time), 1) + speed = f'{GLib.format_size_full(bytes_sec, self._units)}/s' + self._ui.transfer_progress.set_tooltip_text(_('Speed: %s') % speed) if bytes_sec == 0: eta = '∞' else: - eta = self._format_eta( - round((transfer.size - transfer.seen) / bytes_sec)) + eta = self._format_eta(round( + (transfer.size - transfer.seen) / bytes_sec)) - self._ui.progress_label.set_text( - _('%(progress)s of %(total)s') % { - 'progress': size_progress, - 'total': size_total}) + progress = float(transfer.seen) / transfer.size + self._ui.transfer_progress.set_text( + _('%(progress)s %% (%(time)s remaining)') % { + 'progress': round(progress * 100), + 'time': eta}) - self._ui.speed_label.set_text(speed) - self._ui.eta_label.set_text(eta) - self._ui.progressbar.set_fraction(float(transfer.seen) / transfer.size) + self._ui.progress_bar.set_fraction(progress) @staticmethod def _format_eta(time_): @@ -129,5 +145,5 @@ def _format_eta(time_): if time_ >= 60: time_ /= 60 times['minutes'] = round(time_ % 60) - - return _('%(minutes)s min %(seconds)s sec') % times + return _('%(minutes)s min %(seconds)s sec') % times + return _('%s sec') % times['seconds'] ===================================== gajim/gtk/conversation/view.py ===================================== @@ -32,6 +32,7 @@ from .conversation.rows.message import MessageRow from .conversation.rows.info import InfoMessage from .conversation.rows.date import DateRow +from .conversation.rows.file_transfer import FileTransferRow from .conversation.rows.muc_subject import MUCSubject from .conversation.rows.muc_join_left import MUCJoinLeft from .conversation.rows.muc_user_status import MUCUserStatus @@ -153,6 +154,10 @@ def add_info_message(self, text): message = InfoMessage(self._account, text) self._insert_message(message) + def add_file_transfer(self, transfer): + transfer_row = FileTransferRow(self._account, transfer) + self._insert_message(transfer_row) + def add_message(self, text, kind, ===================================== gajim/gui_interface.py ===================================== @@ -96,7 +96,6 @@ from gajim.gui.dialogs import PassphraseDialog from gajim.gui.filechoosers import FileChooserDialog from gajim.gui.filetransfer import FileTransfersWindow -from gajim.gui.filetransfer_progress import FileTransferProgress from gajim.gui.roster_item_exchange import RosterItemExchangeWindow from gajim.gui.main import MainWindow from gajim.gui.util import get_show_in_roster @@ -836,16 +835,16 @@ def send_httpupload(self, chat_control, path=None): accept_cb = partial(self.on_file_dialog_ok, chat_control) FileChooserDialog(accept_cb, select_multiple=True, - transient_for=chat_control.parent_win.window) + transient_for=app.window) def on_file_dialog_ok(self, chat_control, paths): for path in paths: self._send_httpupload(chat_control, path) def _send_httpupload(self, chat_control, path): - con = app.connections[chat_control.account] + client = app.get_client(chat_control.account) try: - transfer = con.get_module('HTTPUpload').make_transfer( + transfer = client.get_module('HTTPUpload').make_transfer( path, chat_control.encryption, chat_control.contact, @@ -858,8 +857,8 @@ def _send_httpupload(self, chat_control, path): transfer.connect('cancel', self._on_cancel_upload) transfer.connect('state-changed', self._on_http_upload_state_changed) - FileTransferProgress(transfer) - con.get_module('HTTPUpload').start_transfer(transfer) + chat_control.add_file_transfer(transfer) + client.get_module('HTTPUpload').start_transfer(transfer) def _on_http_upload_state_changed(self, transfer, _signal_name, state): if state.is_finished: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5ea6973e1959a7434f8e5477aa084b24… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5ea6973e1959a7434f8e5477aa084b24… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix CI
by Philipp Hörist 11 May '21

11 May '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: debab37e by lovetox at 2021-05-11T22:38:43+02:00 Fix CI - - - - - 1 changed file: - gajim/gtk/account_wizard.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -12,6 +12,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +# type: ignore import logging from gi.repository import Gdk @@ -50,7 +51,6 @@ from .util import get_builder from .util import open_window - log = logging.getLogger('gajim.gui.account_wizard') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/debab37e3721871b16af6b6edbb86d68… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/debab37e3721871b16af6b6edbb86d68… 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