Commits September 2018

commits@gajim.org

1 participants
100 discussions

[Git][gajim/gajim][master] Preferences: Update layout and some options
by Philipp Hörist 27 Sep '18

27 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 58796d22 by Philipp Hörist at 2018-09-27T19:38:23Z Preferences: Update layout and some options - Add a 'convert ascii emoji' checkbutton - Remove 'Disabled' from Emoji theme - Change the layout of the style tab - - - - - 4 changed files: - gajim/data/gui/preferences_window.ui - gajim/data/style/gajim.css - gajim/gtk/preferences.py - gajim/gui_interface.py Changes: ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -355,75 +355,15 @@ <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkEventBox" id="eventbox5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property> - <child> - <object class="GtkLabel" id="label381"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Emoticons</property> - <property name="use_underline">True</property> - <property name="justify">right</property> - <style> - <class name="dim-label"/> - </style> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label379"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Window behavior</property> - <property name="use_underline">True</property> - <property name="justify">right</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" id="label28"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Show roster on startup</property> - <property name="use_underline">True</property> - <property name="justify">right</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="xhtml_checkbutton"> - <property name="label" translatable="yes">_Ignore rich content in incoming messages</property> - <property name="visible">True</property> + <object class="GtkCheckButton" id="speller_checkbutton"> + <property name="label" translatable="yes">_Highlight misspelled words</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat.</property> <property name="halign">start</property> - <property name="margin_top">18</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_xhtml_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_speller_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="left_attach">0</property> @@ -432,15 +372,14 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="speller_checkbutton"> - <property name="label" translatable="yes">_Highlight misspelled words</property> + <object class="GtkCheckButton" id="positive_184_ack_checkbutton"> + <property name="label" translatable="yes">Notify by icon when your messages are received</property> + <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat.</property> <property name="halign">start</property> - <property name="use_underline">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_speller_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_positive_184_ack_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="left_attach">0</property> @@ -449,14 +388,14 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="positive_184_ack_checkbutton"> - <property name="label" translatable="yes">Notify by icon when your messages are received</property> + <object class="GtkCheckButton" id="show_avatar_in_tabs_checkbutton"> + <property name="label" translatable="yes">Show avatar in chat tabs</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> - <signal name="toggled" handler="on_positive_184_ack_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_show_avatar_in_tabs_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="left_attach">0</property> @@ -465,14 +404,31 @@ </packing> </child> <child> - <object class="GtkComboBox" id="show_roster_on_startup"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Window behavior</property> + <property name="use_underline">True</property> + <property name="justify">right</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="GtkComboBox" id="one_window_type_combobox"> <property name="width_request">50</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="model">liststore7</property> - <signal name="changed" handler="on_show_roster_on_startup_changed" swapped="no"/> + <property name="model">liststore6</property> + <signal name="changed" handler="on_one_window_type_combo_changed" swapped="no"/> <child> - <object class="GtkCellRendererText" id="cellrenderertext7"/> + <object class="GtkCellRendererText" id="cellrenderertext6"/> <attributes> <attribute name="text">0</attribute> </attributes> @@ -480,18 +436,18 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkComboBox" id="one_window_type_combobox"> + <object class="GtkComboBox" id="show_roster_on_startup"> <property name="width_request">50</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="model">liststore6</property> - <signal name="changed" handler="on_one_window_type_combo_changed" swapped="no"/> + <property name="model">liststore7</property> + <signal name="changed" handler="on_show_roster_on_startup_changed" swapped="no"/> <child> - <object class="GtkCellRendererText" id="cellrenderertext6"/> + <object class="GtkCellRendererText" id="cellrenderertext7"/> <attributes> <attribute name="text">0</attribute> </attributes> @@ -503,36 +459,45 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="show_avatar_in_tabs_checkbutton"> - <property name="label" translatable="yes">Show avatar in chat tabs</property> + <object class="GtkLabel"> <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> - <signal name="toggled" handler="on_show_avatar_in_tabs_checkbutton_toggled" swapped="no"/> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Show roster on startup</property> + <property name="use_underline">True</property> + <property name="justify">right</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">6</property> - <property name="width">2</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="emoticons_combobox"> + <object class="GtkCheckButton" id="xhtml_checkbutton"> + <property name="label" translatable="yes">_Ignore rich content in incoming messages</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <signal name="changed" handler="on_emoticons_combobox_changed" swapped="no"/> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property> + <property name="halign">start</property> + <property name="margin_top">18</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_xhtml_checkbutton_toggled" swapped="no"/> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">2</property> </packing> </child> </object> </child> <child type="label"> - <object class="GtkLabel" id="label2"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> @@ -1499,7 +1464,7 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> - <object class="GtkBox" id="vbox58"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_left">18</property> @@ -1509,170 +1474,300 @@ $T will be replaced by auto-not-available timeout</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkFrame" id="frame3"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkGrid" id="grid10"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="margin_top">6</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label249"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">T_heme</property> - <property name="use_underline">True</property> - <property name="justify">right</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="GtkComboBoxText" id="theme_combobox"> - <property name="width_request">200</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="iconset_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <signal name="changed" handler="on_iconset_combobox_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="manage_theme_button"> - <property name="label" translatable="yes">Ma_nage...</property> - <property name="width_request">120</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Configure color and font of the interface</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_manage_theme_button_clicked" swapped="no"/> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="transports_iconsets_checkbutton"> - <property name="label" translatable="yes">Use _transports icons</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, Gajim will use protocol-specific status icons. (e.g. A contact from ICQ will have the equivalent ICQ icon for status online, away, busy, etc...)</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label174"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Status _iconset</property> - <property name="use_underline">True</property> - <property name="justify">right</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">Dark Theme</property> - <property name="use_underline">True</property> - <property name="justify">right</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="dark_theme_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item id="2" translatable="yes">System</item> - <item id="1" translatable="yes">Enabled</item> - <item id="0" translatable="yes">Disabled</item> - </items> - <signal name="changed" handler="on_dark_theme_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Themes</property> + <style> + <class name="bold"/> + </style> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> </child> - <child type="label"> - <object class="GtkLabel" id="label3"> + <child> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes"><b>Themes</b></property> - <property name="use_markup">True</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Theme</property> + <property name="use_underline">True</property> + <property name="justify">right</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="GtkComboBoxText" id="theme_combobox"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="manage_theme_button"> + <property name="label" translatable="yes">Ma_nage...</property> + <property name="width_request">120</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Configure color and font of the interface</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_manage_theme_button_clicked" swapped="no"/> + </object> + <packing> + <property name="left_attach">3</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">Dark Theme</property> + <property name="use_underline">True</property> + <property name="justify">right</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="GtkComboBoxText" id="dark_theme_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item id="2" translatable="yes">System</item> + <item id="1" translatable="yes">Enabled</item> + <item id="0" translatable="yes">Disabled</item> + </items> + <signal name="changed" handler="on_dark_theme_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">2</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">start</property> + <property name="label" translatable="yes">Emojis</property> + <style> + <class name="bold"/> + <class name="margin-top6"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">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">Emoji Theme</property> + <property name="use_underline">True</property> + <property name="justify">right</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="emoticons_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <signal name="changed" handler="on_emoticons_combobox_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">4</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="label" translatable="yes">Icons</property> + <style> + <class name="bold"/> + <class name="margin-top6"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + <property name="width">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">Status iconset</property> + <property name="use_underline">True</property> + <property name="justify">right</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="iconset_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <signal name="changed" handler="on_iconset_combobox_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="transports_iconsets_checkbutton"> + <property name="label" translatable="yes">Use _transports icons</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will use protocol-specific status icons. (e.g. A contact from ICQ will have the equivalent ICQ icon for status online, away, busy, etc...)</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="ascii_emoticons"> + <property name="label" translatable="yes">_Convert ASCII Emojis</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_convert_ascii_toggle" swapped="no"/> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> ===================================== gajim/data/style/gajim.css ===================================== @@ -190,6 +190,7 @@ list.settings > row > box { /* Text style */ +.bold { font-weight: bold; } .bold16 { font-size: 16px; font-weight: bold; } .bold24 { font-size: 24px; font-weight: bold; } .large-header { font-size: 20px; font-weight: bold; } @@ -197,6 +198,9 @@ list.settings > row > box { .status-dnd { color: #e62e00;} .status-online { color: #66bf10;} +/* Padding/Margins */ +.margin-top6 { margin-top: 6px; } + /* Treeview */ treeview.space { padding: 6px; } ===================================== gajim/gtk/preferences.py ===================================== @@ -110,20 +110,6 @@ class Preferences(Gtk.ApplicationWindow): st = app.config.get('sort_by_show_in_muc') self.xml.get_object('sort_by_show_in_muc_checkbutton').set_active(st) - # emoticons - emoticons_combobox = self.xml.get_object('emoticons_combobox') - emoticon_themes = helpers.get_available_emoticon_themes() - - emoticons_combobox.append_text(_('Disabled')) - for theme in emoticon_themes: - emoticons_combobox.append_text(theme) - - config_theme = app.config.get('emoticons_theme') - if config_theme not in emoticon_themes: - config_theme = _('Disabled') - emoticons_combobox.set_id_column(0) - emoticons_combobox.set_active_id(config_theme) - # Set default for single window type choices = c_config.opt_one_window_types type_ = app.config.get('one_message_window') @@ -213,6 +199,21 @@ class Preferences(Gtk.ApplicationWindow): dark_theme_combo = self.xml.get_object('dark_theme_combobox') dark_theme_combo.set_active_id(str(app.config.get('dark_theme'))) + # Emoticons + emoticons_combobox = self.xml.get_object('emoticons_combobox') + emoticon_themes = helpers.get_available_emoticon_themes() + + for theme in emoticon_themes: + emoticons_combobox.append_text(theme) + + config_theme = app.config.get('emoticons_theme') + if config_theme not in emoticon_themes: + config_theme = 'font' + emoticons_combobox.set_id_column(0) + emoticons_combobox.set_active_id(config_theme) + + self.xml.ascii_emoticons.set_active(app.config.get('ascii_emoticons')) + ### Personal Events tab ### # outgoing send chat state notifications st = app.config.get('outgoing_chat_state_notifications') @@ -564,11 +565,7 @@ class Preferences(Gtk.ApplicationWindow): active = widget.get_active() model = widget.get_model() emot_theme = model[active][0] - if emot_theme == _('Disabled'): - app.config.set('emoticons_theme', '') - else: - app.config.set('emoticons_theme', emot_theme) - + app.config.set('emoticons_theme', emot_theme) from gajim.gtk.emoji_chooser import emoji_chooser emoji_chooser.load() self.toggle_emoticons() @@ -657,6 +654,10 @@ class Preferences(Gtk.ApplicationWindow): app.config.set('iconset', icon_string) gtkgui_helpers.reload_jabber_state_images() + def on_convert_ascii_toggle(self, widget): + app.config.set('ascii_emoticons', widget.get_active()) + app.interface.make_regexps() + def on_transports_iconsets_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'use_transports_iconsets') gtkgui_helpers.reload_jabber_state_images() ===================================== gajim/gui_interface.py ===================================== @@ -1819,6 +1819,11 @@ class Interface: # so http://be) will match http://be and http://be)be) will match # http://be)be + self._basic_pattern_re = None + self._emot_and_basic_re = None + self._sth_at_sth_dot_sth_re = None + self._invalid_XML_chars_re = None + legacy_prefixes = r"((?<=$)(www|ftp)\.([A-Za-z0-9\.\-_~:/\?#\[\]@!\$"\ r"&'\($\*\+,;=]|%[A-Fa-f0-9]{2})+(?=\)))"\ r"|((www|ftp)\.([A-Za-z0-9\.\-_~:/\?#\[\]@!\$&'\*\+,;=]"\ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/58796d223e86a3d5e6c362c5c77802a3d4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/58796d223e86a3d5e6c362c5c77802a3d4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add .vscode to .gitignore
by Philipp Hörist 27 Sep '18

27 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 34e93bba by Marcin Mielniczuk at 2018-09-27T12:53:23Z Add .vscode to .gitignore This is where the workspace settings are stored. - - - - - 1 changed file: - .gitignore Changes: ===================================== .gitignore ===================================== @@ -26,6 +26,7 @@ dist/ gajim.egg-info/ src/gtk/ win/_build_root +.vscode syntax: regexp ^config\.* View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/34e93bba1794724d0965d1d7c67af8c3fa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/34e93bba1794724d0965d1d7c67af8c3fa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Move AdvancedConfig to gtk module
by Philipp Hörist 26 Sep '18

26 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6bf94f15 by Philipp Hörist at 2018-09-26T22:03:50Z Move AdvancedConfig to gtk module - - - - - e9e0b7fb by Philipp Hörist at 2018-09-26T22:12:55Z Move AccountsWindow to gtk module - - - - - 6 changed files: - gajim/app_actions.py - gajim/gtk/account_wizard.py - gajim/accounts_window.py → gajim/gtk/accounts.py - gajim/advanced_configuration_window.py → gajim/gtk/advanced_config.py - gajim/gtk/preferences.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -23,10 +23,10 @@ from gajim.common.app import interface from gajim.common.exceptions import GajimGeneralException from gajim import config from gajim import dialogs -from gajim.accounts_window import AccountsWindow -import gajim.plugins.gui from gajim import disco +import gajim.plugins.gui + from gajim.gtk.dialogs import ShortcutsWindow from gajim.gtk.history_sync import HistorySyncAssistant from gajim.gtk.server_info import ServerInfoDialog @@ -43,6 +43,7 @@ from gajim.gtk.bookmarks import ManageBookmarksWindow from gajim.gtk.features import FeaturesDialog from gajim.gtk.account_wizard import AccountCreationWizard from gajim.gtk.history import HistoryWindow +from gajim.gtk.accounts import AccountsWindow # General Actions ===================================== gajim/gtk/account_wizard.py ===================================== @@ -482,7 +482,7 @@ class AccountCreationWizard: GLib.source_remove(self.update_progressbar_timeout_id) def on_advanced_button_clicked(self, widget): - from gajim.accounts_window import AccountsWindow + from gajim.gtk.accounts import AccountsWindow window = app.get_app_window(AccountsWindow) if window is None: window = AccountsWindow() ===================================== gajim/accounts_window.py → gajim/gtk/accounts.py ===================================== @@ -1,18 +1,36 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + from functools import partial -from gi.repository import Gtk, GLib, Gdk +from gi.repository import Gtk +from gi.repository import Gdk +from gi.repository import GLib -from gajim.common import app from gajim import gtkgui_helpers from gajim import gui_menu_builder -from gajim.common import passwords from gajim import config +from gajim.options_dialog import OptionsDialog, OptionsBox + +from gajim.common import app +from gajim.common import passwords from gajim.common import helpers from gajim.common import ged from gajim.common.connection import Connection from gajim.common.zeroconf.connection_zeroconf import ConnectionZeroconf -from gajim.options_dialog import OptionsDialog, OptionsBox from gajim.common.const import Option, OptionKind, OptionType + from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import YesNoDialog ===================================== gajim/advanced_configuration_window.py → gajim/gtk/advanced_config.py ===================================== @@ -22,15 +22,17 @@ from enum import IntEnum, unique from gi.repository import Gtk -from gajim import gtkgui_helpers from gi.repository import GLib from gi.repository import Pango from gajim.common import app +from gajim.gtk.util import get_builder + + @unique class Column(IntEnum): - PREFERENCE_NAME = 0 + NAME = 0 VALUE = 1 TYPE = 2 @@ -64,9 +66,9 @@ def tree_model_pre_order(model, treeiter): yield it -class AdvancedConfigurationWindow: +class AdvancedConfig: def __init__(self, transient): - self.xml = gtkgui_helpers.get_gtk_builder('advanced_configuration_window.ui') + self.xml = get_builder('advanced_configuration_window.ui') self.window = self.xml.get_object('advanced_configuration_window') self.window.set_transient_for(transient) self.entry = self.xml.get_object('advanced_entry') @@ -132,7 +134,7 @@ class AdvancedConfigurationWindow: Check if it's boolean or holds password stuff and if yes make the cellrenderertext not editable, else - it's editable """ - optname = model[iter_][Column.PREFERENCE_NAME] + optname = model[iter_][Column.NAME] opttype = model[iter_][Column.TYPE] if opttype == self.types['boolean'] or optname == 'password': cell.set_property('editable', False) @@ -319,7 +321,7 @@ class AdvancedConfigurationWindow: desc = app.config.get_desc_per(opt_path[2], opt_path[0]) elif len(opt_path) == 1: desc = app.config.get_desc(opt_path[0]) - if search_string in model[it][Column.PREFERENCE_NAME] or (desc and \ + if search_string in model[it][Column.NAME] or (desc and \ search_string in desc.lower()): return True return False ===================================== gajim/gtk/preferences.py ===================================== @@ -25,7 +25,6 @@ from gajim.common import configpaths from gajim.common import config as c_config from gajim.common import idle -from gajim.advanced_configuration_window import AdvancedConfigurationWindow from gajim.chat_control_base import ChatControlBase from gajim.config import ManageProxiesWindow, ManageSoundsWindow from gajim import message_control @@ -35,6 +34,7 @@ from gajim import gtkgui_helpers from gajim.gtk.util import get_builder from gajim.gtk.dialogs import AspellDictError from gajim.gtk.themes import Themes +from gajim.gtk.advanced_config import AdvancedConfig try: from gajim.common.multimedia_helpers import AudioInputManager, AudioOutputManager @@ -1011,8 +1011,7 @@ class Preferences(Gtk.ApplicationWindow): if 'advanced_config' in app.interface.instances: app.interface.instances['advanced_config'].window.present() else: - app.interface.instances['advanced_config'] = \ - AdvancedConfigurationWindow(self) + app.interface.instances['advanced_config'] = AdvancedConfig(self) def on_enable_logging_toggled(self, widget): app.set_win_debug_mode(widget.get_active()) ===================================== gajim/roster_window.py ===================================== @@ -53,7 +53,6 @@ from gajim import cell_renderer_image from gajim import tooltips from gajim import message_control from gajim import adhoc_commands -from gajim.accounts_window import AccountsWindow from gajim.common import app from gajim.common import helpers @@ -81,6 +80,7 @@ from gajim.gtk.bookmarks import ManageBookmarksWindow from gajim.gtk.account_wizard import AccountCreationWizard from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.history import HistoryWindow +from gajim.gtk.accounts import AccountsWindow log = logging.getLogger('gajim.roster') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/075069d37a5eab9ed4988d4f5463ad7c5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/075069d37a5eab9ed4988d4f5463ad7c5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Only use absolute imports from gtk module
by Philipp Hörist 26 Sep '18

26 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f8934751 by Philipp Hörist at 2018-09-26T17:06:47Z Only use absolute imports from gtk module - This reduces import cycles - - - - - 075069d3 by Philipp Hörist at 2018-09-26T18:17:13Z Fix Dark Theme switch - Move css_config to gtk module - Add Combobox for overriding the current session setting - Move theme methods to css_config - - - - - 30 changed files: - gajim/accounts_window.py - gajim/adhoc_commands.py - gajim/app_actions.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/app.py - gajim/common/config.py - gajim/common/connection_handlers_events.py - gajim/config.py - gajim/data/gui/preferences_window.ui - gajim/dialog_messages.py - gajim/dialogs.py - gajim/disco.py - gajim/filetransfers_window.py - gajim/groupchat_control.py - gajim/gtk/__init__.py - gajim/gtk/account_wizard.py - gajim/gtk/add_contact.py - gajim/gtk/bookmarks.py - gajim/gtk/const.py - gajim/common/css_config.py → gajim/gtk/css_config.py - gajim/gtk/dialogs.py - gajim/gtk/history.py - gajim/gtk/join_groupchat.py - gajim/gtk/mam_preferences.py - gajim/gtk/pep_config.py - gajim/gtk/preferences.py - gajim/gtk/privacy_list.py - gajim/gtk/profile.py - − gajim/gtk/shortcuts_window.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b2a7c9495d1a637d34ab9c93bbe3e130c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b2a7c9495d1a637d34ab9c93bbe3e130c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Check if path is None
by Philipp Hörist 24 Sep '18

24 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 429a1767 by Philipp Hörist at 2018-09-24T22:29:05Z Check if path is None - - - - - b2a7c949 by Philipp Hörist at 2018-09-24T22:29:05Z GroupchatControl: Add a is_connected property - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -23,16 +23,23 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Optional + import time import locale import base64 +import logging +from enum import IntEnum, unique +import nbxmpp from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import Pango from gi.repository import GLib from gi.repository import Gio + + from gajim import gtkgui_helpers from gajim import gui_menu_builder from gajim import message_control @@ -44,10 +51,6 @@ from gajim import adhoc_commands from gajim.gtk import AddNewContactWindow from gajim.common.const import AvatarSize from gajim.common.caps_cache import muc_caps_cache -import nbxmpp - -from enum import IntEnum, unique - from gajim.common import events from gajim.common import app from gajim.common import helpers @@ -56,7 +59,6 @@ from gajim.common import ged from gajim.common import i18n from gajim.common import contacts from gajim.common.const import StyleAttr - from gajim.chat_control import ChatControl from gajim.chat_control_base import ChatControlBase from gajim.gtk.filechoosers import AvatarChooserDialog @@ -72,7 +74,6 @@ from gajim.command_system.implementation.hosts import GroupChatCommands from gajim.common.connection_handlers_events import GcMessageOutgoingEvent -import logging log = logging.getLogger('gajim.groupchat_control') @unique @@ -517,7 +518,7 @@ class GroupchatControl(ChatControlBase): self._nec_decrypted_message_received) app.ged.register_event_handler('gc-stanza-message-outgoing', ged.OUT_POSTCORE, self._message_sent) - app.gc_connected[self.account][self.room_jid] = False + self.is_connected = False # disable win, we are not connected yet ChatControlBase.got_disconnected(self) @@ -577,28 +578,27 @@ class GroupchatControl(ChatControlBase): win = self.parent_win.window contact = app.contacts.get_gc_contact( self.account, self.room_jid, self.nick) - online = app.gc_connected[self.account][self.room_jid] con = app.connections[self.account] # Destroy Room win.lookup_action('destroy-' + self.control_id).set_enabled( - online and contact.affiliation == 'owner') + self.is_connected and contact.affiliation == 'owner') # Configure Room win.lookup_action('configure-' + self.control_id).set_enabled( - online and contact.affiliation in ('admin', 'owner')) + self.is_connected and contact.affiliation in ('admin', 'owner')) # Bookmarks con = app.connections[self.account] bookmark_support = con.get_module('Bookmarks').available bookmarked = self.room_jid in con.get_module('Bookmarks').bookmarks win.lookup_action('bookmark-' + self.control_id).set_enabled( - online and bookmark_support and not bookmarked) + self.is_connected and bookmark_support and not bookmarked) # Request Voice role = self.get_role(self.nick) win.lookup_action('request-voice-' + self.control_id).set_enabled( - online and role == 'visitor') + self.is_connected and role == 'visitor') # Change Subject subject = False @@ -606,25 +606,25 @@ class GroupchatControl(ChatControlBase): subject = muc_caps_cache.is_subject_change_allowed( self.room_jid, contact.affiliation) win.lookup_action('change-subject-' + self.control_id).set_enabled( - online and subject) + self.is_connected and subject) # Change Nick win.lookup_action('change-nick-' + self.control_id).set_enabled( - online) + self.is_connected) # Execute command win.lookup_action('execute-command-' + self.control_id).set_enabled( - online) + self.is_connected) # Send file (HTTP File Upload) httpupload = win.lookup_action( 'send-file-httpupload-' + self.control_id) httpupload.set_enabled( - online and con.get_module('HTTPUpload').available) + self.is_connected and con.get_module('HTTPUpload').available) win.lookup_action('send-file-' + self.control_id).set_enabled( httpupload.get_enabled()) - if online and httpupload.get_enabled(): + if self.is_connected and httpupload.get_enabled(): tooltip_text = _('Send File…') else: tooltip_text = _('No File Transfer available') @@ -633,7 +633,7 @@ class GroupchatControl(ChatControlBase): # Upload Avatar vcard_support = muc_caps_cache.supports(self.room_jid, nbxmpp.NS_VCARD) win.lookup_action('upload-avatar-' + self.control_id).set_enabled( - online and vcard_support and contact.affiliation == 'owner') + self.is_connected and vcard_support and contact.affiliation == 'owner') def _connect_window_state_change(self, parent_win): if self._state_change_handler_id is None: @@ -1052,7 +1052,7 @@ class GroupchatControl(ChatControlBase): def get_tab_image(self, count_unread=True): tab_image = None - if app.gc_connected[self.account][self.room_jid]: + if self.is_connected: tab_image = gtkgui_helpers.get_iconset_name_for('muc-active') else: tab_image = gtkgui_helpers.get_iconset_name_for('muc-inactive') @@ -1110,8 +1110,7 @@ class GroupchatControl(ChatControlBase): def _update_banner_state_image(self): banner_status_img = self.xml.get_object('gc_banner_status_image') - if self.room_jid in app.gc_connected[self.account] and \ - app.gc_connected[self.account][self.room_jid]: + if self.is_connected: if self.contact.avatar_sha: surface = app.interface.get_avatar(self.contact.avatar_sha, AvatarSize.ROSTER, @@ -1299,13 +1298,18 @@ class GroupchatControl(ChatControlBase): if contact: app.interface.roster.draw_contact(self.room_jid, self.account) - def get_contact_iter(self, nick): + def get_contact_iter(self, nick: str) -> Optional[Gtk.TreeIter]: try: ref = self._contact_refs[nick] - return self.model.get_iter(ref.get_path()) except KeyError: return None + path = ref.get_path() + if path is None: + return None + return self.model.get_iter(path) + + def print_old_conversation(self, text, contact='', tim=None, xhtml=None, displaymarking=None, msg_stanza_id=None, encrypted=None, additional_data=None): if additional_data is None: @@ -1590,6 +1594,14 @@ class GroupchatControl(ChatControlBase): elif obj.name == 'ping-error': self.print_conversation(_('Error.')) + @property + def is_connected(self) -> bool: + return app.gc_connected[self.account][self.room_jid] + + @is_connected.setter + def is_connected(self, value: bool) -> None: + app.gc_connected[self.account][self.room_jid] = value + def got_connected(self): # Make autorejoin stop. if self.autorejoin: @@ -1602,7 +1614,8 @@ class GroupchatControl(ChatControlBase): con.get_module('MAM').request_archive_on_muc_join( self.room_jid) - app.gc_connected[self.account][self.room_jid] = True + + self.is_connected = True ChatControlBase.got_connected(self) # Sort model and assign it to treeview @@ -1645,7 +1658,7 @@ class GroupchatControl(ChatControlBase): ctrl.parent_win.redraw_tab(ctrl) app.contacts.remove_gc_contact(self.account, gc_contact) - app.gc_connected[self.account][self.room_jid] = False + self.is_connected = False ChatControlBase.got_disconnected(self) # We don't redraw the whole banner here, because only icon change self._update_banner_state_image() @@ -2092,13 +2105,18 @@ class GroupchatControl(ChatControlBase): self.draw_banner_text() return iter_ - def get_role_iter(self, role): + def get_role_iter(self, role: str) -> Optional[Gtk.TreeIter]: try: ref = self._role_refs[role] - return self.model.get_iter(ref.get_path()) except KeyError: return None + path = ref.get_path() + if path is None: + return None + return self.model.get_iter(path) + + def remove_contact(self, nick): """ Remove a user from the contacts_list @@ -2306,8 +2324,7 @@ class GroupchatControl(ChatControlBase): app.ged.remove_event_handler('gc-stanza-message-outgoing', ged.OUT_POSTCORE, self._message_sent) - if self.room_jid in app.gc_connected[self.account] and \ - app.gc_connected[self.account][self.room_jid]: + if self.is_connected: app.connections[self.account].send_gc_status(self.nick, self.room_jid, show='offline', status=status) nick_list = app.contacts.get_nick_list(self.account, self.room_jid) @@ -2345,8 +2362,7 @@ class GroupchatControl(ChatControlBase): excludes = app.config.get('noconfirm_close_muc_rooms').split(' ') # whether to ask for confirmation before closing muc if (app.config.get('confirm_close_muc') or self.room_jid in includes)\ - and app.gc_connected[self.account][self.room_jid] and self.room_jid \ - not in excludes: + and self.is_connected and self.room_jid not in excludes: return False return True @@ -2364,7 +2380,7 @@ class GroupchatControl(ChatControlBase): excludes = app.config.get('noconfirm_close_muc_rooms').split(' ') # whether to ask for confirmation before closing muc if (app.config.get('confirm_close_muc') or self.room_jid in includes)\ - and app.gc_connected[self.account][self.room_jid] and self.room_jid \ + and self.is_connected and self.room_jid \ not in excludes: def on_ok(clicked): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8e0a60911ad2d732faa7de4bcf4a2b85e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8e0a60911ad2d732faa7de4bcf4a2b85e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix displaying HTML content. Fixes #9210
by Yann Leboulanger 24 Sep '18

24 Sep '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 8e0a6091 by Yann Leboulanger at 2018-09-24T07:37:06Z fix displaying HTML content. Fixes #9210 - - - - - 1 changed file: - gajim/conversation_textview.py Changes: ===================================== gajim/conversation_textview.py ===================================== @@ -1275,7 +1275,7 @@ class ConversationTextview(GObject.GObject): if name and (text.startswith('/me ') or text.startswith('/me\n')): xhtml = xhtml.replace('/me', '<i>* %s</i>' % (name,), 1) self.tv.display_html(xhtml, self.tv, self, iter_=iter_) - return + return iter_ except Exception as error: log.debug('Error processing xhtml: %s', error) log.debug('with |%s|', xhtml) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8e0a60911ad2d732faa7de4bcf4a2b85e9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8e0a60911ad2d732faa7de4bcf4a2b85e9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] handle error message from MUC correctly. Fixes #9280
by Yann Leboulanger 23 Sep '18

23 Sep '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 5aa41c7f by Yann Leboulanger at 2018-09-23T20:45:05Z handle error message from MUC correctly. Fixes #9280 - - - - - 2 changed files: - gajim/common/modules/message.py - gajim/common/modules/muc.py Changes: ===================================== gajim/common/modules/message.py ===================================== @@ -82,7 +82,7 @@ class Message: return muc_user = stanza.getTag('x', namespace=nbxmpp.NS_MUC_USER) - if muc_user is not None: + if muc_user is not None and (stanza.getType() != 'error'): if muc_user.getChildren(): # Not a PM, handled by MUC module return @@ -155,8 +155,11 @@ class Message: if gc_control and jid == fjid: if type_ == 'error': - msgtxt = _('error while sending %(message)s ( %(error)s )') % { - 'message': msgtxt, 'error': stanza.getErrorMsg()} + if msgtxt: + msgtxt = _('error while sending %(message)s ( %(error)s )') % { + 'message': msgtxt, 'error': stanza.getErrorMsg()} + else: + msgtxt = _('error: %s') % stanza.getErrorMsg() # TODO: why is this here? if stanza.getTag('html'): stanza.delChild('html') @@ -245,9 +248,12 @@ class Message: if event.mtype == 'error': if not event.msgtxt: event.msgtxt = _('message') - self._con.dispatch_error_message( - event.stanza, event.msgtxt, - event.session, event.fjid, timestamp) + if event.gc_control: + event.gc_control.print_conversation(event.msgtxt) + else: + self._con.dispatch_error_message( + event.stanza, event.msgtxt, + event.session, event.fjid, timestamp) return if event.mtype == 'groupchat': ===================================== gajim/common/modules/muc.py ===================================== @@ -253,6 +253,9 @@ class MUC: if muc_user is None: return + if stanza.getType() == 'error': + return + decline = muc_user.getTag('decline') if decline is not None: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5aa41c7f63356209a43cbef75ccbfbb7fa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5aa41c7f63356209a43cbef75ccbfbb7fa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add annotations
by Philipp Hörist 23 Sep '18

23 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7cacb4c0 by Philipp Hörist at 2018-09-23T13:33:31Z Add annotations - - - - - 2 changed files: - gajim/gtk/util.py - gajim/gtkgui_helpers.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -12,6 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Tuple + import os import sys import logging @@ -22,8 +24,9 @@ from gi.repository import Gtk from gi.repository import GLib from gajim.common import app -from gajim.common import i18n from gajim.common import configpaths +from gajim.common import i18n +from gajim.common.i18n import _ _icon_theme = Gtk.IconTheme.get_default() _icon_theme.append_search_path(configpaths.get('ICONS')) @@ -32,7 +35,7 @@ log = logging.getLogger('gajim.gtk.util') class Builder: - def __init__(self, filename=None, widget=None): + def __init__(self, filename: str, widget: str = None) -> None: self._builder = Gtk.Builder() self._builder.set_translation_domain(i18n.DOMAIN) @@ -42,7 +45,7 @@ class Builder: # This is a workaround for non working translation on Windows tree = ET.parse(file_path) for node in tree.iter(): - if 'translatable' in node.attrib: + if 'translatable' in node.attrib and node.text is not None: node.text = _(node.text) xml_text = ET.tostring(tree.getroot(), encoding='unicode', @@ -68,7 +71,7 @@ class Builder: return self._builder.get_object(name) -def get_builder(file_name, widget=None): +def get_builder(file_name: str, widget: str = None) -> Builder: return Builder(file_name, widget) @@ -86,11 +89,11 @@ def load_icon(icon_name, widget, size=16, pixbuf=False, if pixbuf: return iconinfo.load_icon() return iconinfo.load_surface(None) - except GLib.GError as e: - log.error('Unable to load icon %s: %s', icon_name, str(e)) + except GLib.GError as error: + log.error('Unable to load icon %s: %s', icon_name, str(error)) -def get_iconset_name_for(name): +def get_iconset_name_for(name: str) -> str: if name == 'not in roster': name = 'notinroster' iconset = app.config.get('iconset') @@ -99,46 +102,46 @@ def get_iconset_name_for(name): return '%s-%s' % (iconset, name) -def get_total_screen_geometry(): +def get_total_screen_geometry() -> Tuple[int, int]: screen = Gdk.Screen.get_default() window = Gdk.Screen.get_root_window(screen) - w, h = window.get_width(), window.get_height() - log.debug('Get screen geometry: %s %s', w, h) - return w, h + width, height = window.get_width(), window.get_height() + log.debug('Get screen geometry: %s %s', width, height) + return width, height -def resize_window(window, w, h): +def resize_window(window: Gtk.Window, width: int, height: int) -> None: """ Resize window, but also checks if huge window or negative values """ screen_w, screen_h = get_total_screen_geometry() - if not w or not h: + if not width or not height: return - if w > screen_w: - w = screen_w - if h > screen_h: - h = screen_h - window.resize(abs(w), abs(h)) + if width > screen_w: + width = screen_w + if height > screen_h: + height = screen_h + window.resize(abs(width), abs(height)) -def move_window(window, x, y): +def move_window(window: Gtk.Window, pos_x: int, pos_y: int) -> None: """ Move the window, but also check if out of screen """ screen_w, screen_h = get_total_screen_geometry() - if x < 0: - x = 0 - if y < 0: - y = 0 - w, h = window.get_size() - if x + w > screen_w: - x = screen_w - w - if y + h > screen_h: - y = screen_h - h - window.move(x, y) - - -def get_completion_liststore(entry): + if pos_x < 0: + pos_x = 0 + if pos_y < 0: + pos_y = 0 + width, height = window.get_size() + if pos_x + width > screen_w: + pos_x = screen_w - width + if pos_y + height > screen_h: + pos_y = screen_h - height + window.move(pos_x, pos_y) + + +def get_completion_liststore(entry: Gtk.Entry) -> Gtk.ListStore: """ Create a completion model for entry widget completion list consists of (Pixbuf, Text) rows @@ -159,13 +162,13 @@ def get_completion_liststore(entry): return liststore -def get_cursor(attr): +def get_cursor(attr: str) -> Gdk.Cursor: display = Gdk.Display.get_default() cursor = getattr(Gdk.CursorType, attr) return Gdk.Cursor.new_for_display(display, cursor) -def scroll_to_end(widget): +def scroll_to_end(widget: Gtk.ScrolledWindow) -> bool: """Scrolls to the end of a GtkScrolledWindow. Args: @@ -187,7 +190,7 @@ def scroll_to_end(widget): return False -def at_the_end(widget): +def at_the_end(widget: Gtk.ScrolledWindow) -> bool: """Determines if a Scrollbar in a GtkScrolledWindow is at the end. Args: @@ -213,15 +216,15 @@ def get_image_button(icon_name, tooltip, toggle=False): return button -def python_month(month): +def python_month(month: int) -> int: return month + 1 -def gtk_month(month): +def gtk_month(month: int) -> int: return month - 1 -def convert_rgb_to_hex(rgb_string): +def convert_rgb_to_hex(rgb_string: str) -> str: rgb = Gdk.RGBA() rgb.parse(rgb_string) rgb.to_color() ===================================== gajim/gtkgui_helpers.py ===================================== @@ -132,7 +132,7 @@ def get_gtk_builder(file_name, widget=None): # This is a workaround for non working translation on Windows tree = ET.parse(file_path) for node in tree.iter(): - if 'translatable' in node.attrib: + if 'translatable' in node.attrib and node.text is not None: node.text = _(node.text) xml_text = ET.tostring(tree.getroot(), encoding='unicode', View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7cacb4c09e5d422e9360b3e93ffb0a025f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7cacb4c09e5d422e9360b3e93ffb0a025f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add dark theme switch in preferences
by Philipp Hörist 23 Sep '18

23 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0e0bb9e1 by Philipp Hörist at 2018-09-23T13:00:32Z Add dark theme switch in preferences - - - - - 3 changed files: - gajim/data/gui/preferences_window.ui - gajim/gtk/preferences.py - gajim/gtk/util.py Changes: ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -1508,9 +1508,6 @@ $T will be replaced by auto-not-available timeout</property> <property name="margin_bottom">18</property> <property name="orientation">vertical</property> <property name="spacing">12</property> - <child> - <placeholder/> - </child> <child> <object class="GtkFrame" id="frame3"> <property name="visible">True</property> @@ -1616,6 +1613,28 @@ $T will be replaced by auto-not-available timeout</property> <property name="top_attach">0</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="enable_dark_theme"> + <property name="label" translatable="yes">Enable dark theme</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="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_enable_dark_theme_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> <child> <placeholder/> </child> @@ -1640,9 +1659,6 @@ $T will be replaced by auto-not-available timeout</property> <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">4</property> ===================================== gajim/gtk/preferences.py ===================================== @@ -24,6 +24,8 @@ from gajim.common import helpers from gajim.common import configpaths from gajim.common import config as c_config from gajim.common import idle +from gajim.gtk.util import get_dark_theme +from gajim.gtk.util import set_dark_theme from gajim.gtk.util import get_builder from gajim.gtk import AspellDictError from gajim.gtk.themes import Themes @@ -207,6 +209,9 @@ class Preferences(Gtk.ApplicationWindow): st = app.config.get('use_transports_iconsets') self.xml.get_object('transports_iconsets_checkbutton').set_active(st) + # Dark theme + self.xml.get_object('enable_dark_theme').set_active(get_dark_theme()) + ### Personal Events tab ### # outgoing send chat state notifications st = app.config.get('outgoing_chat_state_notifications') @@ -655,6 +660,9 @@ class Preferences(Gtk.ApplicationWindow): self.on_checkbutton_toggled(widget, 'use_transports_iconsets') gtkgui_helpers.reload_jabber_state_images() + def on_enable_dark_theme_toggled(self, widget): + set_dark_theme(widget.get_active()) + def on_outgoing_chat_states_combobox_changed(self, widget): active = widget.get_active() old_value = app.config.get('outgoing_chat_state_notifications') ===================================== gajim/gtk/util.py ===================================== @@ -230,3 +230,13 @@ def convert_rgb_to_hex(rgb_string): green = int(rgb.green * 255) blue = int(rgb.blue * 255) return '#%02x%02x%02x' % (red, green, blue) + + +def set_dark_theme(enable: bool) -> None: + settings = Gtk.Settings.get_default() + settings.set_property('gtk-application-prefer-dark-theme', enable) + + +def get_dark_theme() -> bool: + settings = Gtk.Settings.get_default() + return settings.get_property('gtk-application-prefer-dark-theme') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0e0bb9e19061d6c1b0be0075249982ec87… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0e0bb9e19061d6c1b0be0075249982ec87… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Windows: Add debug logging switch in preferences
by Philipp Hörist 23 Sep '18

23 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 39f58036 by Philipp Hörist at 2018-09-23T12:41:26Z Windows: Add debug logging switch in preferences If debug logging is enabled verbose output is redirected to a file in the user dir - - - - - 26b81254 by Philipp Hörist at 2018-09-23T12:41:44Z configpaths: Add get_plugin_dirs() method This helps with mypy because otherwise get() has multiple return types This reduces our usage of cast() - - - - - 8 changed files: - gajim/application.py - gajim/common/app.py - gajim/common/configpaths.py - gajim/data/gui/preferences_window.ui - gajim/gtk/preferences.py - gajim/gtkexcepthook.py - gajim/plugins/pluginmanager.py - gajim/plugins/plugins_i18n.py Changes: ===================================== gajim/application.py ===================================== @@ -34,6 +34,8 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import sys +from datetime import datetime +from pathlib import Path from urllib.parse import unquote from gi.repository import GLib, Gio, Gtk @@ -291,7 +293,14 @@ class GajimApplication(Gtk.Application): configpaths.set_config_root(path) configpaths.init() - logging_helpers.init() + + if app.get_win_debug_mode(): + # Redirect has to happen before logging init + self._redirect_output() + logging_helpers.init() + logging_helpers.set_verbose() + else: + logging_helpers.init() if options.contains('quiet'): logging_helpers.set_quiet() @@ -318,6 +327,14 @@ class GajimApplication(Gtk.Application): warnings.showwarning = warn_with_traceback warnings.filterwarnings(action="always") + @staticmethod + def _redirect_output(): + debug_folder = Path(configpaths.get('DEBUG')) + date = datetime.today().strftime('%Y-%m-%d') + filename = '%s-debug.log' % date + fd = open(debug_folder / filename, 'a') + sys.stderr = sys.stdout = fd + def add_actions(self): ''' Build Application Actions ''' from gajim import app_actions ===================================== gajim/common/app.py ===================================== @@ -646,3 +646,19 @@ def get_app_window(cls, account=None): def load_css_config(): global css_config css_config = CSSConfig() + +def set_win_debug_mode(enable: bool) -> None: + debug_folder = Path(configpaths.get('DEBUG')) + debug_enabled = debug_folder / 'debug-enabled' + if enable: + debug_enabled.touch() + else: + if debug_enabled.exists(): + debug_enabled.unlink() + +def get_win_debug_mode() -> bool: + if sys.platform != 'win32': + return False + debug_folder = Path(configpaths.get('DEBUG')) + debug_enabled = debug_folder / 'debug-enabled' + return debug_enabled.exists() ===================================== gajim/common/configpaths.py ===================================== @@ -24,7 +24,6 @@ from typing import List from typing import Generator from typing import Optional # pylint: disable=unused-import from typing import Tuple -from typing import Union import os import sys @@ -37,16 +36,18 @@ from gajim.common.const import PathType, PathLocation from gajim.common.types import PathTuple -def get(key: str) -> Union[str, List[str]]: - if key == 'PLUGINS_DIRS': - if gajim.IS_FLATPAK: - return ['/app/plugins', - _paths['PLUGINS_BASE']] - return [_paths['PLUGINS_BASE'], - _paths['PLUGINS_USER']] +def get(key: str) -> str: return _paths[key] +def get_plugin_dirs() -> List[str]: + if gajim.IS_FLATPAK: + return ['/app/plugins', + _paths['PLUGINS_BASE']] + return [_paths['PLUGINS_BASE'], + _paths['PLUGINS_USER']] + + def get_paths(type_: PathType) -> Generator[str, None, None]: for key, value in _paths.items(): path_type = value[2] @@ -195,6 +196,7 @@ class ConfigPaths: # Data paths ('SECRETS_FILE', 'secrets', PathLocation.DATA, PathType.FILE), ('MY_PEER_CERTS', 'certs', PathLocation.DATA, PathType.FOLDER), + ('DEBUG', 'debug', PathLocation.DATA, PathType.FOLDER), # Config paths ('CONFIG_FILE', 'config', PathLocation.CONFIG, PathType.FILE), ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -1509,6 +1509,7 @@ $T will be replaced by auto-not-available timeout</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> + <placeholder/> </child> <child> <object class="GtkFrame" id="frame3"> @@ -1640,6 +1641,7 @@ $T will be replaced by auto-not-available timeout</property> </packing> </child> <child> + <placeholder/> </child> </object> <packing> @@ -2384,6 +2386,23 @@ to discover one from server.</property> <property name="position">0</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="enable_logging"> + <property name="label" translatable="yes">Enable debug logging</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_enable_logging_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> </child> <child type="label"> ===================================== gajim/gtk/preferences.py ===================================== @@ -13,6 +13,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import os +import sys from gi.repository import Gtk from gi.repository import Gdk @@ -449,6 +450,11 @@ class Preferences(Gtk.ApplicationWindow): else: w.set_active(st) + if sys.platform == 'win32': + w = self.xml.get_object('enable_logging') + w.set_active(app.get_win_debug_mode()) + w.show() + self.xml.connect_signals(self) self.connect('key-press-event', self._on_key_press) @@ -998,3 +1004,6 @@ class Preferences(Gtk.ApplicationWindow): else: app.interface.instances['advanced_config'] = \ AdvancedConfigurationWindow(self) + + def on_enable_logging_toggled(self, widget): + app.set_win_debug_mode(widget.get_active()) ===================================== gajim/gtkexcepthook.py ===================================== @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import cast - import sys import os import traceback @@ -42,7 +40,7 @@ if __name__ == '__main__': glade_file = os.path.join('data', 'gui', 'exception_dialog.ui') else: from gajim.common import configpaths - gui_path = cast(str, configpaths.get('GUI')) + gui_path = configpaths.get('GUI') glade_file = os.path.join(gui_path, 'exception_dialog.ui') ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -107,7 +107,7 @@ class PluginManager(metaclass=Singleton): Registered names with instances of encryption Plugins. ''' - for path in reversed(configpaths.get('PLUGINS_DIRS')): + for path in reversed(configpaths.get_plugin_dirs()): pc = PluginManager.scan_dir_for_plugins(path) self.add_plugins(pc) ===================================== gajim/plugins/plugins_i18n.py ===================================== @@ -14,8 +14,6 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import cast - import os import locale import gettext @@ -23,7 +21,7 @@ import gettext from gajim.common import configpaths APP = 'gajim_plugins' -plugin_user_dir = cast(str, configpaths.get('PLUGINS_USER')) +plugin_user_dir = configpaths.get('PLUGINS_USER') plugins_locale_dir = os.path.join(plugin_user_dir, 'locale') if os.name != 'nt': View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d29f6b2ca92cbd3495cf5c252d310f4fb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d29f6b2ca92cbd3495cf5c252d310f4fb… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2018