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


Commits:
fbd10cb0 by wurstsalat at 2024-10-29T22:33:46+01:00
refactor: Adhoc: Set pixel-size for default page icon

- - - - -
da55f059 by wurstsalat at 2024-10-29T22:53:06+01:00
refactor: ServiceDiscovery: Fix server combobox; fix icon sizes

- - - - -


4 changed files:

- gajim/data/gui/service_discovery_window.ui
- gajim/gtk/assistant.py
- gajim/gtk/builder.pyi
- gajim/gtk/discovery.py


Changes:

=====================================
gajim/data/gui/service_discovery_window.ui
=====================================
@@ -10,7 +10,9 @@
       <object class="GtkBox">
         <property name="spacing">12</property>
         <child>
-          <object class="GtkImage" id="banner_agent_icon"/>
+          <object class="GtkImage" id="banner_agent_icon">
+            <property name="pixel-size">32</property>
+          </object>
         </child>
         <child>
           <object class="GtkBox">
@@ -46,7 +48,6 @@
           <object class="GtkLabel">
             <property name="label" translatable="1">_Address</property>
             <property name="use_underline">1</property>
-            <property 
name="mnemonic_widget">address_comboboxtext_entry</property>
             <style>
               <class name="dim-label"/>
             </style>
@@ -57,12 +58,6 @@
             <property name="hexpand">1</property>
             <property name="valign">center</property>
             <property name="has_entry">1</property>
-            <property name="child">
-              <object class="GtkEntry" id="address_comboboxtext_entry">
-                <property name="visible">0</property>
-                <property name="focusable">1</property>
-              </object>
-            </property>
           </object>
         </child>
         <child>


=====================================
gajim/gtk/assistant.py
=====================================
@@ -249,6 +249,7 @@ def __init__(self, icon_name: str, icon_css_class: str) -> 
None:
         self._heading.set_justify(Gtk.Justification.CENTER)
 
         icon = Gtk.Image.new_from_icon_name(icon_name)
+        icon.set_pixel_size(64)
         icon.get_style_context().add_class(icon_css_class)
 
         self._label = Gtk.Label()


=====================================
gajim/gtk/builder.pyi
=====================================
@@ -938,7 +938,6 @@ class ServiceDiscoveryWindowBuilder(Builder):
     banner_agent_subheader: Gtk.Label
     address_box: Gtk.Box
     address_comboboxtext: Gtk.ComboBoxText
-    address_comboboxtext_entry: Gtk.Entry
     browse_button: Gtk.Button
     services_progressbar: Gtk.ProgressBar
     services_scrollwin: Gtk.ScrolledWindow


=====================================
gajim/gtk/discovery.py
=====================================
@@ -741,7 +741,9 @@ def _on_close_request(self, _widget: Gtk.ApplicationWindow) 
-> int:
     def _on_address_comboboxtext_changed(self, widget):
         if self.address_comboboxtext.get_active() != -1:
             # User selected one of the entries so do auto-visit
-            jid = self._ui.address_comboboxtext_entry.get_text()
+            entry = self._ui.address_comboboxtext.get_child()
+            assert isinstance(entry, Gtk.Entry)
+            jid = entry.get_text()
             try:
                 jid = parse_jid(jid)
             except InvalidFormat as s:
@@ -750,7 +752,9 @@ def _on_address_comboboxtext_changed(self, widget):
             self.travel(jid, None)
 
     def _on_go_button_clicked(self, widget):
-        jid = self._ui.address_comboboxtext_entry.get_text()
+        entry = self._ui.address_comboboxtext.get_child()
+        assert isinstance(entry, Gtk.Entry)
+        jid = entry.get_text()
         try:
             jid = parse_jid(jid)
         except InvalidFormat as s:
@@ -1166,6 +1170,7 @@ def _pixbuf_renderer_data_func(self, col, cell, model, 
iter_, data=None):
         jid = model.get_value(iter_, 0)
         if jid:
             icon_name = model.get_value(iter_, 2)
+            cell.set_property('icon-size', Gtk.IconSize.LARGE)
             cell.set_property('visible', True)
             cell.set_property('icon_name', icon_name)
         else:



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/compare/2ab20eaaa8fea2f4d8201396a7dfc6f5d2de1777...da55f059df9579a9b5e3a13440d7c95056202d0f

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/compare/2ab20eaaa8fea2f4d8201396a7dfc6f5d2de1777...da55f059df9579a9b5e3a13440d7c95056202d0f
You're receiving this email because of your account on dev.gajim.org.


_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to