Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
6fc44b33 by wurstsalat at 2022-10-07T12:16:36+02:00
imprv: Features dialog: Simplify statements on Windows
- - - - -
1 changed file:
- gajim/gtk/features.py
Changes:
=====================================
gajim/gtk/features.py
=====================================
@@ -87,6 +87,10 @@ def _add_feature(self, feature: Feature) -> None:
self.feature_listbox.add(item)
def _get_features(self) -> list[Feature]:
+ tray_icon_available = bool(
+ sys.platform == 'win32' or
+ app.is_installed('APPINDICATOR') or
+ app.is_installed('AYATANA_APPINDICATOR'))
av_available = app.is_installed('AV') and sys.platform != 'win32'
notification_sounds_available: bool = (
app.is_installed('GSOUND') or sys.platform in ('win32', 'darwin'))
@@ -97,13 +101,11 @@ def _get_features(self) -> list[Feature]:
auto_status_enabled = bool(any(auto_status))
return [
- Feature(_('App Indicator Icon'),
- app.is_installed('APPINDICATOR') or
- app.is_installed('AYATANA_APPINDICATOR'),
- _('Enables Gajim to provide a system notification area '
- 'icon'),
+ Feature(_('Notification Area Icon'),
+ tray_icon_available,
+ _('Enables Gajim to provide a notification area icon'),
_('Requires: libappindicator3'),
- _('Feature not available under Windows'),
+ _('No additional requirements'),
None),
Feature(_('Audio / Video'),
av_available,
@@ -111,11 +113,11 @@ def _get_features(self) -> list[Feature]:
_('Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, '
'gstreamer1.0-plugins-base, gstreamer1.0-plugins-ugly, '
'gstreamer1.0-libav, and gstreamer1.0-gtk3'),
- _('Feature not available under Windows'),
+ _('Feature not available on Windows'),
None),
Feature(_('Automatic Status'),
self._idle_available(),
- _("Enables Gajim to measure your computer's idle time in "
+ _('Enables Gajim to measure your computer’s idle time in '
'order to set your Status automatically'),
_('Requires: libxss'),
_('No additional requirements'),
@@ -131,22 +133,21 @@ def _get_features(self) -> list[Feature]:
_('Enables Gajim to store Passwords securely instead of '
'storing them in plaintext'),
_('Requires: gnome-keyring or kwallet'),
- _('Windows Credential Vault is used for secure password '
- 'storage'),
+ _('No additional requirements'),
app.settings.get('use_keyring')),
Feature(_('Spell Checker'),
app.is_installed('GSPELL'),
_('Enables Gajim to spell check your messages while '
'composing'),
_('Requires: Gspell'),
- _('Requires: Gspell'),
+ _('No additional requirements'),
spell_check_enabled),
Feature(_('UPnP-IGD Port Forwarding'),
app.is_installed('UPNP'),
_('Enables Gajim to request your router to forward ports '
'for file transfers'),
_('Requires: gir1.2-gupnpigd-1.0'),
- _('Feature not available under Windows'),
+ _('Feature not available on Windows'),
None)
]
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/6fc44b33203ac562a3b368a3e4f44b19623075c1
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/6fc44b33203ac562a3b368a3e4f44b19623075c1
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
