Philipp Hörist pushed to branch master at gajim / gajim
Commits:
c861b4cf by Philipp Hörist at 2024-07-07T08:44:53+02:00
cq: Preferences: Remove obsolete code
- - - - -
92ddcc86 by Philipp Hörist at 2024-07-07T11:40:03+02:00
imprv: Proxies: Add option to ignore system proxies
- - - - -
5 changed files:
- gajim/common/helpers.py
- gajim/data/gui/account_wizard.ui
- gajim/gtk/account_wizard.py
- gajim/gtk/accounts.py
- gajim/gtk/preferences.py
Changes:
=====================================
gajim/common/helpers.py
=====================================
@@ -709,6 +709,12 @@ def get_account_proxy(account: str, fallback=True) ->
ProxyData | None:
def get_proxy(proxy_name: str) -> ProxyData | None:
+ if proxy_name == 'no-proxy':
+ return ProxyData(type='direct',
+ host='',
+ username=None,
+ password=None)
+
try:
settings = app.settings.get_proxy_settings(proxy_name)
except ValueError:
=====================================
gajim/data/gui/account_wizard.ui
=====================================
@@ -187,7 +187,7 @@
<child>
<object class="GtkCellRendererText"/>
<attributes>
- <attribute name="text">0</attribute>
+ <attribute name="text">1</attribute>
</attributes>
</child>
</object>
=====================================
gajim/gtk/account_wizard.py
=====================================
@@ -829,12 +829,13 @@ def _on_proxy_manager(_button: Gtk.Button) -> None:
app.app.activate_action('manage-proxies', None)
def update_proxy_list(self) -> None:
- model = Gtk.ListStore(str)
+ model = Gtk.ListStore(str, str)
self._ui.proxies_combobox.set_model(model)
+ model.append(['', _('System')])
+ model.append(['no-proxy', _('No Proxy')])
proxies = app.settings.get_proxies()
- proxies.insert(0, _('No Proxy'))
for proxy in proxies:
- model.append([proxy])
+ model.append([proxy, proxy])
self._ui.proxies_combobox.set_active(0)
def get_proxy(self) -> str:
=====================================
gajim/gtk/accounts.py
=====================================
@@ -1005,7 +1005,9 @@ def __init__(self, account: str) -> None:
@staticmethod
def _get_proxies() -> dict[str, str]:
- return {proxy: proxy for proxy in app.settings.get_proxies()}
+ proxies = {proxy: proxy for proxy in app.settings.get_proxies()}
+ proxies['no-proxy'] = _('No Proxy')
+ return proxies
@staticmethod
def _on_proxy_edit(*args: Any) -> None:
=====================================
gajim/gtk/preferences.py
=====================================
@@ -41,9 +41,6 @@
from gajim.gtk.util import open_window
from gajim.gtk.video_preview import VideoPreview
-# if app.is_installed('GSPELL'):
-# from gi.repository import Gspell # pylint: disable=ungrouped-imports
-
log = logging.getLogger('gajim.gtk.preferences')
@@ -920,7 +917,9 @@ def __init__(self, pref_window: Preferences) -> None:
@staticmethod
def _get_proxies() -> dict[str, str]:
- return {proxy: proxy for proxy in app.settings.get_proxies()}
+ proxies = {proxy: proxy for proxy in app.settings.get_proxies()}
+ proxies['no-proxy'] = _('No Proxy')
+ return proxies
@staticmethod
def _on_proxy_edit(*args: Any) -> None:
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/a33786b54f7e3a10f3ac6d46e21b4aa6631a6405...92ddcc8664d23fd81bc0e69bbf8d8c5f4d5868dd
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/a33786b54f7e3a10f3ac6d46e21b4aa6631a6405...92ddcc8664d23fd81bc0e69bbf8d8c5f4d5868dd
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]
