Daniel Brötzmann pushed to branch mainwindow at gajim / gajim
Commits: 41df40f5 by wurstsalat at 2021-09-12T18:01:04+02:00 App menu: Remove 'Show Roster' and 'Show Transports'
- - - - - 5a64bc8f by wurstsalat at 2021-09-12T18:37:22+02:00 Accounts: Add option for publishing current Media Playback
- - - - - 8ae64852 by wurstsalat at 2021-09-12T18:38:57+02:00 Interface: Disable publishing location permanently
- - - - - 1d0a0234 by wurstsalat at 2021-09-12T18:39:17+02:00 Remove obsolete account_context_menu.ui
- - - - -
5 changed files:
- gajim/application.py - − gajim/data/gui/account_context_menu.ui - gajim/data/gui/application_menu.ui - gajim/gtk/accounts.py - gajim/gui_interface.py
Changes:
===================================== gajim/application.py ===================================== @@ -509,7 +509,6 @@ def _set_shortcuts(self): 'app.ipython': ['<Primary><Alt>I'], 'app.start-chat::': ['<Primary>N'], 'app.create-groupchat::': ['<Primary>G'], - 'win.show-roster': ['<Primary>R'], 'win.show-offline': ['<Primary>O'], 'win.show-active': ['<Primary>Y'], 'win.change-nickname': ['<Primary><Shift>N'],
===================================== gajim/data/gui/account_context_menu.ui deleted ===================================== @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> -<interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkMenu" id="account_context_menu"> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="status_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Status</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="pep_menuitem"> - <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">_Personal Events</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separatormenuitem1"> - <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> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="add_contact_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Add Contact...</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="service_discovery_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Discover Services</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="execute_command_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Execute Command...</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="view_server_info_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_View Server Info</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="edit_account_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Modify Account…</property> - <property name="use_underline">True</property> - </object> - </child> - </object> -</interface>
===================================== gajim/data/gui/application_menu.ui ===================================== @@ -38,10 +38,6 @@ <submenu> <attribute name="label" translatable="yes">_View</attribute> <section> - <item> - <attribute name="label" translatable="yes">Show _Contact List</attribute> - <attribute name="action">win.show-roster</attribute> - </item> <item> <attribute name="label" translatable="yes">Show _Offline Contacts</attribute> <attribute name="action">win.show-offline</attribute> @@ -50,10 +46,6 @@ <attribute name="label" translatable="yes">Show _Active Contacts</attribute> <attribute name="action">win.show-active</attribute> </item> - <item> - <attribute name="label" translatable="yes">Show _Transports</attribute> - <attribute name="action">win.show-transports</attribute> - </item> </section> <section> <item>
===================================== gajim/gtk/accounts.py ===================================== @@ -723,6 +723,11 @@ def __init__(self, account): desc=_('Disclose information about the client ' 'and operating system you currently use')),
+ Setting(SettingKind.SWITCH, _('Media Playback'), + SettingType.ACCOUNT_CONFIG, 'publish_tune', + desc=_('Disclose information about media that is ' + 'currently being played on your system.')), + Setting(SettingKind.SWITCH, _('Ignore Unknown Contacts'), SettingType.ACCOUNT_CONFIG, 'ignore_unknown_contacts', desc=_('Ignore everything from contacts not in your '
===================================== gajim/gui_interface.py ===================================== @@ -521,7 +521,8 @@ def handle_event_signed_in(event): # enable location listener if (pep_supported and app.is_installed('GEOCLUE') and app.settings.get_account_setting(account, 'publish_location')): - location.enable() + pass + # location.enable()
if ask_for_status_message(event.conn.status, signin=True): app.window.show_account_page(account)
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e7df467a1174d465b595182f1392693e...