Philipp Hörist pushed to branch master at gajim / gajim

Commits: eb86de45 by Daniel Brötzmann at 2020-07-03T22:41:06+02:00 Preferences: Fix tooltip string for auto copy

- - - - - ccb2676b by Daniel Brötzmann at 2020-07-03T22:41:06+02:00 MessageWindow: Fix deprecated properties, don’t expand label

- - - - -

2 changed files:

- gajim/data/gui/message_window.ui - gajim/data/gui/preferences_window.ui

Changes:

===================================== gajim/data/gui/message_window.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.36.0 --> <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkEventBox" id="chat_tab_ebox"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -17,7 +17,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="stock">gtk-missing-image</property> </object> <packing> <property name="expand">False</property> @@ -30,8 +29,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="margin_left">3</property> - <property name="hexpand">True</property> + <property name="margin_start">3</property> <property name="use_markup">True</property> <property name="ellipsize">end</property> <property name="single_line_mode">True</property> @@ -48,17 +46,16 @@ </child> <child> <object class="GtkButton" id="tab_close_button"> - <property name="use_action_appearance">False</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="relief">none</property> <child> - <object class="GtkImage" id="image1329"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-close</property> + <property name="icon_name">window-close</property> <property name="icon_size">1</property> </object> </child> @@ -78,9 +75,6 @@ <property name="default_width">480</property> <property name="default_height">440</property> <property name="show_menubar">False</property> - <child type="titlebar"> - <placeholder/> - </child> <child> <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> @@ -88,5 +82,8 @@ <property name="scrollable">True</property> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> </object> </interface>

===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -585,7 +585,7 @@ <property name="label" translatable="yes">Enable auto copy</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If enabled, selecting Text will be copied to the clipboard, otherwise you can copy text with CTRL + SHIFT + C</property> + <property name="tooltip_text" translatable="yes">If enabled, selected text will automatically be copied to the clipboard, otherwise you can copy text with CTRL + SHIFT + C</property> <property name="halign">start</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property>

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/67f854f95dc1a102bec5d46e652298b2...