Daniel Brötzmann pushed to branch master at gajim / gajim

Commits:

1 changed file:

Changes:

  • gajim/gtk/features.py
    ... ... @@ -87,6 +87,10 @@ def _add_feature(self, feature: Feature) -> None:
    87 87
             self.feature_listbox.add(item)
    
    88 88
     
    
    89 89
         def _get_features(self) -> list[Feature]:
    
    90
    +        tray_icon_available = bool(
    
    91
    +            sys.platform == 'win32' or
    
    92
    +            app.is_installed('APPINDICATOR') or
    
    93
    +            app.is_installed('AYATANA_APPINDICATOR'))
    
    90 94
             av_available = app.is_installed('AV') and sys.platform != 'win32'
    
    91 95
             notification_sounds_available: bool = (
    
    92 96
                 app.is_installed('GSOUND') or sys.platform in ('win32', 'darwin'))
    
    ... ... @@ -97,13 +101,11 @@ def _get_features(self) -> list[Feature]:
    97 101
             auto_status_enabled = bool(any(auto_status))
    
    98 102
     
    
    99 103
             return [
    
    100
    -            Feature(_('App Indicator Icon'),
    
    101
    -                    app.is_installed('APPINDICATOR') or
    
    102
    -                    app.is_installed('AYATANA_APPINDICATOR'),
    
    103
    -                    _('Enables Gajim to provide a system notification area '
    
    104
    -                      'icon'),
    
    104
    +            Feature(_('Notification Area Icon'),
    
    105
    +                    tray_icon_available,
    
    106
    +                    _('Enables Gajim to provide a notification area icon'),
    
    105 107
                         _('Requires: libappindicator3'),
    
    106
    -                    _('Feature not available under Windows'),
    
    108
    +                    _('No additional requirements'),
    
    107 109
                         None),
    
    108 110
                 Feature(_('Audio / Video'),
    
    109 111
                         av_available,
    
    ... ... @@ -111,11 +113,11 @@ def _get_features(self) -> list[Feature]:
    111 113
                         _('Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, '
    
    112 114
                           'gstreamer1.0-plugins-base, gstreamer1.0-plugins-ugly, '
    
    113 115
                           'gstreamer1.0-libav, and gstreamer1.0-gtk3'),
    
    114
    -                    _('Feature not available under Windows'),
    
    116
    +                    _('Feature not available on Windows'),
    
    115 117
                         None),
    
    116 118
                 Feature(_('Automatic Status'),
    
    117 119
                         self._idle_available(),
    
    118
    -                    _("Enables Gajim to measure your computer's idle time in "
    
    120
    +                    _('Enables Gajim to measure your computer’s idle time in '
    
    119 121
                           'order to set your Status automatically'),
    
    120 122
                         _('Requires: libxss'),
    
    121 123
                         _('No additional requirements'),
    
    ... ... @@ -131,22 +133,21 @@ def _get_features(self) -> list[Feature]:
    131 133
                         _('Enables Gajim to store Passwords securely instead of '
    
    132 134
                           'storing them in plaintext'),
    
    133 135
                         _('Requires: gnome-keyring or kwallet'),
    
    134
    -                    _('Windows Credential Vault is used for secure password '
    
    135
    -                      'storage'),
    
    136
    +                    _('No additional requirements'),
    
    136 137
                         app.settings.get('use_keyring')),
    
    137 138
                 Feature(_('Spell Checker'),
    
    138 139
                         app.is_installed('GSPELL'),
    
    139 140
                         _('Enables Gajim to spell check your messages while '
    
    140 141
                           'composing'),
    
    141 142
                         _('Requires: Gspell'),
    
    142
    -                    _('Requires: Gspell'),
    
    143
    +                    _('No additional requirements'),
    
    143 144
                         spell_check_enabled),
    
    144 145
                 Feature(_('UPnP-IGD Port Forwarding'),
    
    145 146
                         app.is_installed('UPNP'),
    
    146 147
                         _('Enables Gajim to request your router to forward ports '
    
    147 148
                           'for file transfers'),
    
    148 149
                         _('Requires: gir1.2-gupnpigd-1.0'),
    
    149
    -                    _('Feature not available under Windows'),
    
    150
    +                    _('Feature not available on Windows'),
    
    150 151
                         None)
    
    151 152
             ]
    
    152 153