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

Commits:

3 changed files:

Changes:

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

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

  • gajim/gtk/xml_console.py
    ... ... @@ -90,11 +90,13 @@ def __init__(self) -> None:
    90 90
             source_manager = GtkSource.LanguageManager.get_default()
    
    91 91
             lang = source_manager.get_language('xml')
    
    92 92
             self._ui.sourceview.get_buffer().set_language(lang)
    
    93
    +        self._ui.input_entry.get_buffer().set_language(lang)
    
    93 94
     
    
    94 95
             self._style_scheme_manager = GtkSource.StyleSchemeManager.get_default()
    
    95 96
             style_scheme = self._get_style_scheme()
    
    96 97
             if style_scheme is not None:
    
    97 98
                 self._ui.sourceview.get_buffer().set_style_scheme(style_scheme)
    
    99
    +            self._ui.input_entry.get_buffer().set_style_scheme(style_scheme)
    
    98 100
     
    
    99 101
             self.show_all()
    
    100 102
     
    
    ... ... @@ -125,6 +127,7 @@ def _on_style_changed(self, *args: Any) -> None:
    125 127
             style_scheme = self._get_style_scheme()
    
    126 128
             if style_scheme is not None:
    
    127 129
                 self._ui.sourceview.get_buffer().set_style_scheme(style_scheme)
    
    130
    +            self._ui.input_entry.get_buffer().set_style_scheme(style_scheme)
    
    128 131
     
    
    129 132
         def _on_value_change(self, combo: Gtk.ComboBox) -> None:
    
    130 133
             self._selected_send_account = combo.get_active_id()