Daniel Brötzmann pushed to branch master at gajim / gajim

Commits: 502213ac by wurstsalat at 2022-09-11T16:34:43+02:00 imprv: XMLConsole: Use SourceView for XML input

Fixes #11121

- - - - -

3 changed files:

- gajim/data/gui/xml_console.ui - gajim/gtk/builder.pyi - gajim/gtk/xml_console.py

Changes:

===================================== gajim/data/gui/xml_console.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.38.2 --> +<!-- Generated with glade 3.40.0 --> <interface> <requires lib="gtk+" version="3.22"/> <requires lib="gtksourceview" version="4.0"/> @@ -225,9 +225,16 @@ <property name="no-show-all">True</property> <property name="shadow-type">in</property> <child> - <object class="GtkTextView" id="input_entry"> + <object class="GtkSourceView" id="input_entry"> <property name="visible">True</property> <property name="can-focus">True</property> + <property name="left-margin">3</property> + <property name="right-margin">3</property> + <property name="top-margin">3</property> + <property name="bottom-margin">3</property> + <property name="monospace">True</property> + <property name="tab-width">4</property> + <property name="highlight-current-line">True</property> </object> </child> </object>

===================================== gajim/gtk/builder.pyi ===================================== @@ -915,7 +915,7 @@ class XmlConsoleBuilder(Builder): scrolled: Gtk.ScrolledWindow sourceview: GtkSource.View scrolled_input: Gtk.ScrolledWindow - input_entry: Gtk.TextView + input_entry: GtkSource.View actionbar: Gtk.ActionBar paste: Gtk.Button menubutton: Gtk.MenuButton

===================================== gajim/gtk/xml_console.py ===================================== @@ -90,11 +90,13 @@ def __init__(self) -> None: source_manager = GtkSource.LanguageManager.get_default() lang = source_manager.get_language('xml') self._ui.sourceview.get_buffer().set_language(lang) + self._ui.input_entry.get_buffer().set_language(lang)

self._style_scheme_manager = GtkSource.StyleSchemeManager.get_default() style_scheme = self._get_style_scheme() if style_scheme is not None: self._ui.sourceview.get_buffer().set_style_scheme(style_scheme) + self._ui.input_entry.get_buffer().set_style_scheme(style_scheme)

self.show_all()

@@ -125,6 +127,7 @@ def _on_style_changed(self, *args: Any) -> None: style_scheme = self._get_style_scheme() if style_scheme is not None: self._ui.sourceview.get_buffer().set_style_scheme(style_scheme) + self._ui.input_entry.get_buffer().set_style_scheme(style_scheme)

def _on_value_change(self, combo: Gtk.ComboBox) -> None: self._selected_send_account = combo.get_active_id()

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/502213aca86598af08c9b11e66f683eba...