Philipp Hörist pushed to branch master at gajim / gajim

Commits:

14 changed files:

Changes:

  • gajim/common/config.py
    ... ... @@ -65,7 +65,6 @@ class Config:
    65 65
    66 66 
         __options = ({
    67 67 
             # name: [ type, default_value, help_string, restart ]
    68 
    -        'verbose': [opt_bool, False, '', True],
    69 68 
             'autopopup': [opt_bool, False],
    70 69 
             'autopopupaway': [opt_bool, False],
    71 70 
             'sounddnd': [opt_bool, False, _('Play sound even when being busy.')],

  • gajim/common/filetransfer.py
    ... ... @@ -105,3 +105,6 @@ def set_finished(self):
    105 105
    106 106 
         def update_progress(self):
    107 107 
             self.notify('progress')
    108 
    +
    109 
    +    def cancel(self):
    110 
    +        self.notify('cancel')

  • gajim/common/modules/delimiter.py
    ... ... @@ -16,7 +16,6 @@
    16 16
    17 17
    18 18 
     from nbxmpp.errors import is_error
    19 
    -from nbxmpp.modules.util import raise_if_error
    20 19
    21 20 
     from gajim.common.modules.base import BaseModule
    22 21 
     from gajim.common.modules.util import as_task
    ... ... @@ -42,7 +41,10 @@ def get_roster_delimiter(self):
    42 41 
             delimiter = yield self.request_delimiter()
    43 42 
             if is_error(delimiter) or delimiter is None:
    44 43 
                 result = yield self.set_delimiter(self.delimiter)
    45 
    -            raise_if_error(result)
    44 
    +            if is_error(result):
    45 
    +                self._con.connect_machine()
    46 
    +                return
    47 
    +
    46 48 
                 delimiter = self.delimiter
    47 49
    48 50 
             self.delimiter = delimiter

  • gajim/common/setting_values.py
    ... ... @@ -13,7 +13,6 @@ class _ACCOUNT_DEFAULT:
    13 13 
     # pylint: disable=line-too-long
    14 14
    15 15 
     APP_SETTINGS = {
    16 
    -    'verbose': False,
    17 16 
         'autopopup': False,
    18 17 
         'show_notifications': True,
    19 18 
         'autopopupaway': False,

  • gajim/data/icons/hicolor/index.theme
    ... ... @@ -2,1661 +2,74 @@
    2 2 
     Name=Hicolor
    3 3 
     Comment=Fallback icon theme
    4 4 
     Hidden=true
    5 
    -Directories=16x16/actions,16x16/animations,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/emotes,16x16/filesystems,16x16/intl,16x16/mimetypes,16x16/places,16x16/status,16x16/stock/chart,16x16/stock/code,16x16/stock/data,16x16/stock/form,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,22x22/actions,22x22/animations,22x22/apps,22x22/categories,22x22/devices,22x22/emblems,22x22/emotes,22x22/filesystems,22x22/intl,22x22/mimetypes,22x22/places,22x22/status,22x22/stock/chart,22x22/stock/code,22x22/stock/data,22x22/stock/form,22x22/stock/image,22x22/stock/io,22x22/stock/media,22x22/stock/navigation,22x22/stock/net,22x22/stock/object,22x22/stock/table,22x22/stock/text,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/emotes,24x24/filesystems,24x24/intl,24x24/mimetypes,24x24/places,24x24/status,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/form,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/actions,32x32/animations,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/emotes,32x32/filesystems,32x32/intl,32x32/mimetypes,32x32/places,32x32/status,32x32/stock/chart,32x32/stock/code,32x32/stock/data,32x32/stock/form,32x32/stock/image,32x32/stock/io,32x32/stock/media,32x32/stock/navigation,32x32/stock/net,32x32/stock/object,32x32/stock/table,32x32/stock/text,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/emblems,36x36/emotes,36x36/filesystems,36x36/intl,36x36/mimetypes,36x36/places,36x36/status,36x36/stock/chart,36x36/stock/code,36x36/stock/data,36x36/stock/form,36x36/stock/image,36x36/stock/io,36x36/stock/media,36x36/stock/navigation,36x36/stock/net,36x36/stock/object,36x36/stock/table,36x36/stock/text,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/emotes,48x48/filesystems,48x48/intl,48x48/mimetypes,48x48/places,48x48/status,48x48/stock/chart,48x48/stock/code,48x48/stock/data,48x48/stock/form,48x48/stock/image,48x48/stock/io,48x48/stock/media,48x48/stock/navigation,48x48/stock/net,48x48/stock/object,48x48/stock/table,48x48/stock/text,64x64/actions,64x64/animations,64x64/apps,64x64/categories,64x64/devices,64x64/emblems,64x64/emotes,64x64/filesystems,64x64/intl,64x64/mimetypes,64x64/places,64x64/status,64x64/stock/chart,64x64/stock/code,64x64/stock/data,64x64/stock/form,64x64/stock/image,64x64/stock/io,64x64/stock/media,64x64/stock/navigation,64x64/stock/net,64x64/stock/object,64x64/stock/table,64x64/stock/text,72x72/actions,72x72/animations,72x72/apps,72x72/categories,72x72/devices,72x72/emblems,72x72/emotes,72x72/filesystems,72x72/intl,72x72/mimetypes,72x72/places,72x72/status,72x72/stock/chart,72x72/stock/code,72x72/stock/data,72x72/stock/form,72x72/stock/image,72x72/stock/io,72x72/stock/media,72x72/stock/navigation,72x72/stock/net,72x72/stock/object,72x72/stock/table,72x72/stock/text,96x96/actions,96x96/animations,96x96/apps,96x96/categories,96x96/devices,96x96/emblems,96x96/emotes,96x96/filesystems,96x96/intl,96x96/mimetypes,96x96/places,96x96/status,96x96/stock/chart,96x96/stock/code,96x96/stock/data,96x96/stock/form,96x96/stock/image,96x96/stock/io,96x96/stock/media,96x96/stock/navigation,96x96/stock/net,96x96/stock/object,96x96/stock/table,96x96/stock/text,128x128/actions,128x128/animations,128x128/apps,128x128/categories,128x128/devices,128x128/emblems,128x128/emotes,128x128/filesystems,128x128/intl,128x128/mimetypes,128x128/places,128x128/status,128x128/stock/chart,128x128/stock/code,128x128/stock/data,128x128/stock/form,128x128/stock/image,128x128/stock/io,128x128/stock/media,128x128/stock/navigation,128x128/stock/net,128x128/stock/object,128x128/stock/table,128x128/stock/text,192x192/actions,192x192/animations,192x192/apps,192x192/categories,192x192/devices,192x192/emblems,192x192/emotes,192x192/filesystems,192x192/intl,192x192/mimetypes,192x192/places,192x192/status,192x192/stock/chart,192x192/stock/code,192x192/stock/data,192x192/stock/form,192x192/stock/image,192x192/stock/io,192x192/stock/media,192x192/stock/navigation,192x192/stock/net,192x192/stock/object,192x192/stock/table,192x192/stock/text,256x256/actions,256x256/animations,256x256/apps,256x256/categories,256x256/devices,256x256/emblems,256x256/emotes,256x256/filesystems,256x256/intl,256x256/mimetypes,256x256/places,256x256/status,256x256/stock/chart,256x256/stock/code,256x256/stock/data,256x256/stock/form,256x256/stock/image,256x256/stock/io,256x256/stock/media,256x256/stock/navigation,256x256/stock/net,256x256/stock/object,256x256/stock/table,256x256/stock/text,scalable/actions,scalable/animations,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/emotes,scalable/filesystems,scalable/intl,scalable/mimetypes,scalable/places,scalable/status,scalable/stock/chart,scalable/stock/code,scalable/stock/data,scalable/stock/form,scalable/stock/image,scalable/stock/io,scalable/stock/media,scalable/stock/navigation,scalable/stock/net,scalable/stock/object,scalable/stock/table,scalable/stock/text
    6 5
    6 
    +Directories=16x16/actions,16x16/devices,16x16/status,32x32/categories,32x32/devices,32x32/status,48x48/status,96x96/categories,scalable/apps,scalable/categories,scalable/devices,scalable/status
    7 7
    8 
    -[16x16/actions]
    9 
    -Size=16
    10 
    -Context=Actions
    11 
    -Type=Threshold
    12 
    -
    13 
    -[16x16/animations]
    14 
    -Size=16
    15 
    -Context=Animations
    16 
    -Type=Threshold
    17 
    -
    18 
    -[16x16/apps]
    19 
    -Size=16
    20 
    -Context=Applications
    21 
    -Type=Threshold
    22 
    -
    23 
    -[16x16/categories]
    24 
    -Size=16
    25 
    -Context=Categories
    26 
    -Type=Threshold
    27 
    -
    28 
    -[16x16/devices]
    29 
    -Size=16
    30 
    -Context=Devices
    31 
    -Type=Threshold
    32 
    -
    33 
    -[16x16/emblems]
    34 
    -Size=16
    35 
    -Context=Emblems
    36 
    -Type=Threshold
    37 
    -
    38 
    -[16x16/emotes]
    39 
    -Size=16
    40 
    -Context=Emotes
    41 
    -Type=Threshold
    42 
    -
    43 
    -[16x16/filesystems]
    44 
    -Size=16
    45 
    -Context=FileSystems
    46 
    -Type=Threshold
    47 
    -
    48 
    -[16x16/intl]
    49 
    -Size=16
    50 
    -Context=International
    51 
    -Type=Threshold
    52 
    -
    53 
    -[16x16/mimetypes]
    54 
    -Size=16
    55 
    -Context=MimeTypes
    56 
    -Type=Threshold
    57 
    -
    58 
    -[16x16/places]
    59 
    -Size=16
    60 
    -Context=Places
    61 
    -Type=Threshold
    62 
    -
    63 
    -[16x16/status]
    64 
    -Size=16
    65 
    -Context=Status
    66 
    -Type=Threshold
    67 
    -
    68 
    -[16x16/stock/chart]
    69 
    -Size=16
    70 
    -Context=Stock
    71 
    -Type=Threshold
    72 
    -
    73 
    -[16x16/stock/code]
    74 
    -Size=16
    75 
    -Context=Stock
    76 
    -Type=Threshold
    77 
    -
    78 
    -[16x16/stock/data]
    79 
    -Size=16
    80 
    -Context=Stock
    81 
    -Type=Threshold
    82 
    -
    83 
    -[16x16/stock/form]
    84 
    -Size=16
    85 
    -Context=Stock
    86 
    -Type=Threshold
    87 
    -
    88 
    -[16x16/stock/image]
    89 
    -Size=16
    90 
    -Context=Stock
    91 
    -Type=Threshold
    92 
    -
    93 
    -[16x16/stock/io]
    94 
    -Size=16
    95 
    -Context=Stock
    96 
    -Type=Threshold
    97 
    -
    98 
    -[16x16/stock/media]
    99 
    -Size=16
    100 
    -Context=Stock
    101 
    -Type=Threshold
    102 
    -
    103 
    -[16x16/stock/navigation]
    104 
    -Size=16
    105 
    -Context=Stock
    106 
    -Type=Threshold
    107 
    -
    108 
    -[16x16/stock/net]
    109 
    -Size=16
    110 
    -Context=Stock
    111 
    -Type=Threshold
    112 
    -
    113 
    -[16x16/stock/object]
    114 
    -Size=16
    115 
    -Context=Stock
    116 
    -Type=Threshold
    117 
    -
    118 
    -[16x16/stock/table]
    119 
    -Size=16
    120 
    -Context=Stock
    121 
    -Type=Threshold
    122 
    -
    123 
    -[16x16/stock/text]
    124 
    -Size=16
    125 
    -Context=Stock
    126 
    -Type=Threshold
    127 
    -
    128 
    -[22x22/actions]
    129 
    -Size=22
    130 
    -Context=Actions
    131 
    -Type=Threshold
    132 
    -
    133 
    -[22x22/animations]
    134 
    -Size=22
    135 
    -Context=Animations
    136 
    -Type=Threshold
    137 
    -
    138 
    -[22x22/apps]
    139 
    -Size=22
    140 
    -Context=Applications
    141 
    -Type=Threshold
    142 
    -
    143 
    -[22x22/categories]
    144 
    -Size=22
    145 
    -Context=Categories
    146 
    -Type=Threshold
    147 
    -
    148 
    -[22x22/devices]
    149 
    -Size=22
    150 
    -Context=Devices
    151 
    -Type=Threshold
    152 
    -
    153 
    -[22x22/emblems]
    154 
    -Size=22
    155 
    -Context=Emblems
    156 
    -Type=Threshold
    157 
    -
    158 
    -[22x22/emotes]
    159 
    -Size=22
    160 
    -Context=Emotes
    161 
    -Type=Threshold
    162 
    -
    163 
    -[22x22/filesystems]
    164 
    -Size=22
    165 
    -Context=FileSystems
    166 
    -Type=Threshold
    167 
    -
    168 
    -[22x22/intl]
    169 
    -Size=22
    170 
    -Context=International
    171 
    -Type=Threshold
    172 
    -
    173 
    -[22x22/mimetypes]
    174 
    -Size=22
    175 
    -Context=MimeTypes
    176 
    -Type=Threshold
    177 
    -
    178 
    -[22x22/places]
    179 
    -Size=22
    180 
    -Context=Places
    181 
    -Type=Threshold
    182 
    -
    183 
    -[22x22/status]
    184 
    -Size=22
    185 
    -Context=Status
    186 
    -Type=Threshold
    187 
    -
    188 
    -[22x22/stock/chart]
    189 
    -Size=22
    190 
    -Context=Stock
    191 
    -Type=Threshold
    192 
    -
    193 
    -[22x22/stock/code]
    194 
    -Size=22
    195 
    -Context=Stock
    196 
    -Type=Threshold
    197 
    -
    198 
    -[22x22/stock/data]
    199 
    -Size=22
    200 
    -Context=Stock
    201 
    -Type=Threshold
    202 
    -
    203 
    -[22x22/stock/form]
    204 
    -Size=22
    205 
    -Context=Stock
    206 
    -Type=Threshold
    207 
    -
    208 
    -[22x22/stock/image]
    209 
    -Size=22
    210 
    -Context=Stock
    211 
    -Type=Threshold
    212 
    -
    213 
    -[22x22/stock/io]
    214 
    -Size=22
    215 
    -Context=Stock
    216 
    -Type=Threshold
    217 
    -
    218 
    -[22x22/stock/media]
    219 
    -Size=22
    220 
    -Context=Stock
    221 
    -Type=Threshold
    222 
    -
    223 
    -[22x22/stock/navigation]
    224 
    -Size=22
    225 
    -Context=Stock
    226 
    -Type=Threshold
    227 
    -
    228 
    -[22x22/stock/net]
    229 
    -Size=22
    230 
    -Context=Stock
    231 
    -Type=Threshold
    232 
    -
    233 
    -[22x22/stock/object]
    234 
    -Size=22
    235 
    -Context=Stock
    236 
    -Type=Threshold
    237 
    -
    238 
    -[22x22/stock/table]
    239 
    -Size=22
    240 
    -Context=Stock
    241 
    -Type=Threshold
    242 
    -
    243 
    -[22x22/stock/text]
    244 
    -Size=22
    245 
    -Context=Stock
    246 
    -Type=Threshold
    247 
    -
    248 
    -[24x24/actions]
    249 
    -Size=24
    250 
    -Context=Actions
    251 
    -Type=Threshold
    252 
    -
    253 
    -[24x24/animations]
    254 
    -Size=24
    255 
    -Context=Animations
    256 
    -Type=Threshold
    257 
    -
    258 
    -[24x24/apps]
    259 
    -Size=24
    260 
    -Context=Applications
    261 
    -Type=Threshold
    262 
    -
    263 
    -[24x24/categories]
    264 
    -Size=24
    265 
    -Context=Categories
    266 
    -Type=Threshold
    267 
    -
    268 
    -[24x24/devices]
    269 
    -Size=24
    270 
    -Context=Devices
    271 
    -Type=Threshold
    272 
    -
    273 
    -[24x24/emblems]
    274 
    -Size=24
    275 
    -Context=Emblems
    276 
    -Type=Threshold
    277 
    -
    278 
    -[24x24/emotes]
    279 
    -Size=24
    280 
    -Context=Emotes
    281 
    -Type=Threshold
    282 
    -
    283 
    -[24x24/filesystems]
    284 
    -Size=24
    285 
    -Context=FileSystems
    286 
    -Type=Threshold
    287 
    -
    288 
    -[24x24/intl]
    289 
    -Size=24
    290 
    -Context=International
    291 
    -Type=Threshold
    292 
    -
    293 
    -[24x24/mimetypes]
    294 
    -Size=24
    295 
    -Context=MimeTypes
    296 
    -Type=Threshold
    297 
    -
    298 
    -[24x24/places]
    299 
    -Size=24
    300 
    -Context=Places
    301 
    -Type=Threshold
    302 
    -
    303 
    -[24x24/status]
    304 
    -Size=24
    305 
    -Context=Status
    306 
    -Type=Threshold
    307 
    -
    308 
    -[24x24/stock/chart]
    309 
    -Size=24
    310 
    -Context=Stock
    311 
    -Type=Threshold
    312 
    -
    313 
    -[24x24/stock/code]
    314 
    -Size=24
    315 
    -Context=Stock
    316 
    -Type=Threshold
    317 
    -
    318 
    -[24x24/stock/data]
    319 
    -Size=24
    320 
    -Context=Stock
    321 
    -Type=Threshold
    322 
    -
    323 
    -[24x24/stock/form]
    324 
    -Size=24
    325 
    -Context=Stock
    326 
    -Type=Threshold
    327 
    -
    328 
    -[24x24/stock/image]
    329 
    -Size=24
    330 
    -Context=Stock
    331 
    -Type=Threshold
    332 
    -
    333 
    -[24x24/stock/io]
    334 
    -Size=24
    335 
    -Context=Stock
    336 
    -Type=Threshold
    337 
    -
    338 
    -[24x24/stock/media]
    339 
    -Size=24
    340 
    -Context=Stock
    341 
    -Type=Threshold
    342 
    -
    343 
    -[24x24/stock/navigation]
    344 
    -Size=24
    345 
    -Context=Stock
    346 
    -Type=Threshold
    347 
    -
    348 
    -[24x24/stock/net]
    349 
    -Size=24
    350 
    -Context=Stock
    351 
    -Type=Threshold
    352 
    -
    353 
    -[24x24/stock/object]
    354 
    -Size=24
    355 
    -Context=Stock
    356 
    -Type=Threshold
    357 
    -
    358 
    -[24x24/stock/table]
    359 
    -Size=24
    360 
    -Context=Stock
    361 
    -Type=Threshold
    362 
    -
    363 
    -[24x24/stock/text]
    364 
    -Size=24
    365 
    -Context=Stock
    366 
    -Type=Threshold
    367 
    -
    368 
    -[32x32/actions]
    369 
    -Size=32
    370 
    -Context=Actions
    371 
    -Type=Threshold
    372 
    -
    373 
    -[32x32/animations]
    374 
    -Size=32
    375 
    -Context=Animations
    376 
    -Type=Threshold
    377 
    -
    378 
    -[32x32/apps]
    379 
    -Size=32
    380 
    -Context=Applications
    381 
    -Type=Threshold
    382 
    -
    383 
    -[32x32/categories]
    384 
    -Size=32
    385 
    -Context=Categories
    386 
    -Type=Threshold
    387 
    -
    388 
    -[32x32/devices]
    389 
    -Size=32
    390 
    -Context=Devices
    391 
    -Type=Threshold
    392 
    -
    393 
    -[32x32/emblems]
    394 
    -Size=32
    395 
    -Context=Emblems
    396 
    -Type=Threshold
    397 
    -
    398 
    -[32x32/emotes]
    399 
    -Size=32
    400 
    -Context=Emotes
    401 
    -Type=Threshold
    402 
    -
    403 
    -[32x32/filesystems]
    404 
    -Size=32
    405 
    -Context=FileSystems
    406 
    -Type=Threshold
    407 
    -
    408 
    -[32x32/intl]
    409 
    -Size=32
    410 
    -Context=International
    411 
    -Type=Threshold
    412 
    -
    413 
    -[32x32/mimetypes]
    414 
    -Size=32
    415 
    -Context=MimeTypes
    416 
    -Type=Threshold
    417 
    -
    418 
    -[32x32/places]
    419 
    -Size=32
    420 
    -Context=Places
    421 
    -Type=Threshold
    422 
    -
    423 
    -[32x32/status]
    424 
    -Size=32
    425 
    -Context=Status
    426 
    -Type=Threshold
    427 
    -
    428 
    -[32x32/stock/chart]
    429 
    -Size=32
    430 
    -Context=Stock
    431 
    -Type=Threshold
    432 
    -
    433 
    -[32x32/stock/code]
    434 
    -Size=32
    435 
    -Context=Stock
    436 
    -Type=Threshold
    437 
    -
    438 
    -[32x32/stock/data]
    439 
    -Size=32
    440 
    -Context=Stock
    441 
    -Type=Threshold
    442 
    -
    443 
    -[32x32/stock/form]
    444 
    -Size=32
    445 
    -Context=Stock
    446 
    -Type=Threshold
    447 
    -
    448 
    -[32x32/stock/image]
    449 
    -Size=32
    450 
    -Context=Stock
    451 
    -Type=Threshold
    452 
    -
    453 
    -[32x32/stock/io]
    454 
    -Size=32
    455 
    -Context=Stock
    456 
    -Type=Threshold
    457 
    -
    458 
    -[32x32/stock/media]
    459 
    -Size=32
    460 
    -Context=Stock
    461 
    -Type=Threshold
    462 
    -
    463 
    -[32x32/stock/navigation]
    464 
    -Size=32
    465 
    -Context=Stock
    466 
    -Type=Threshold
    467 
    -
    468 
    -[32x32/stock/net]
    469 
    -Size=32
    470 
    -Context=Stock
    471 
    -Type=Threshold
    472 
    -
    473 
    -[32x32/stock/object]
    474 
    -Size=32
    475 
    -Context=Stock
    476 
    -Type=Threshold
    477 
    -
    478 
    -[32x32/stock/table]
    479 
    -Size=32
    480 
    -Context=Stock
    481 
    -Type=Threshold
    482 
    -
    483 
    -[32x32/stock/text]
    484 
    -Size=32
    485 
    -Context=Stock
    486 
    -Type=Threshold
    487 
    -
    488 
    -[36x36/actions]
    489 
    -Size=36
    490 
    -Context=Actions
    491 
    -Type=Threshold
    492 
    -
    493 
    -[36x36/animations]
    494 
    -Size=36
    495 
    -Context=Animations
    496 
    -Type=Threshold
    497 
    -
    498 
    -[36x36/apps]
    499 
    -Size=36
    500 
    -Context=Applications
    501 
    -Type=Threshold
    502 
    -
    503 
    -[36x36/categories]
    504 
    -Size=36
    505 
    -Context=Categories
    506 
    -Type=Threshold
    507 
    -
    508 
    -[36x36/devices]
    509 
    -Size=36
    510 
    -Context=Devices
    511 
    -Type=Threshold
    512 
    -
    513 
    -[36x36/emblems]
    514 
    -Size=36
    515 
    -Context=Emblems
    516 
    -Type=Threshold
    517 
    -
    518 
    -[36x36/emotes]
    519 
    -Size=36
    520 
    -Context=Emotes
    521 
    -Type=Threshold
    522 
    -
    523 
    -[36x36/filesystems]
    524 
    -Size=36
    525 
    -Context=FileSystems
    526 
    -Type=Threshold
    527 
    -
    528 
    -[36x36/intl]
    529 
    -Size=36
    530 
    -Context=International
    531 
    -Type=Threshold
    532 
    -
    533 
    -[36x36/mimetypes]
    534 
    -Size=36
    535 
    -Context=MimeTypes
    536 
    -Type=Threshold
    537 
    -
    538 
    -[36x36/places]
    539 
    -Size=36
    540 
    -Context=Places
    541 
    -Type=Threshold
    542 
    -
    543 
    -[36x36/status]
    544 
    -Size=36
    545 
    -Context=Status
    546 
    -Type=Threshold
    547 
    -
    548 
    -[36x36/stock/chart]
    549 
    -Size=36
    550 
    -Context=Stock
    551 
    -Type=Threshold
    552 
    -
    553 
    -[36x36/stock/code]
    554 
    -Size=36
    555 
    -Context=Stock
    556 
    -Type=Threshold
    557 
    -
    558 
    -[36x36/stock/data]
    559 
    -Size=36
    560 
    -Context=Stock
    561 
    -Type=Threshold
    562 
    -
    563 
    -[36x36/stock/form]
    564 
    -Size=36
    565 
    -Context=Stock
    566 
    -Type=Threshold
    567 
    -
    568 
    -[36x36/stock/image]
    569 
    -Size=36
    570 
    -Context=Stock
    571 
    -Type=Threshold
    572 
    -
    573 
    -[36x36/stock/io]
    574 
    -Size=36
    575 
    -Context=Stock
    576 
    -Type=Threshold
    577 
    -
    578 
    -[36x36/stock/media]
    579 
    -Size=36
    580 
    -Context=Stock
    581 
    -Type=Threshold
    582 
    -
    583 
    -[36x36/stock/navigation]
    584 
    -Size=36
    585 
    -Context=Stock
    586 
    -Type=Threshold
    587 
    -
    588 
    -[36x36/stock/net]
    589 
    -Size=36
    590 
    -Context=Stock
    591 
    -Type=Threshold
    592 
    -
    593 
    -[36x36/stock/object]
    594 
    -Size=36
    595 
    -Context=Stock
    596 
    -Type=Threshold
    597 
    -
    598 
    -[36x36/stock/table]
    599 
    -Size=36
    600 
    -Context=Stock
    601 
    -Type=Threshold
    602 
    -
    603 
    -[36x36/stock/text]
    604 
    -Size=36
    605 
    -Context=Stock
    606 
    -Type=Threshold
    607 
    -
    608 
    -[48x48/actions]
    609 
    -Size=48
    610 
    -Context=Actions
    611 
    -Type=Threshold
    612 
    -
    613 
    -[48x48/animations]
    614 
    -Size=48
    615 
    -Context=Animations
    616 
    -Type=Threshold
    617 
    -
    618 
    -[48x48/apps]
    619 
    -Size=48
    620 
    -Context=Applications
    621 
    -Type=Threshold
    622 
    -
    623 
    -[48x48/categories]
    624 
    -Size=48
    625 
    -Context=Categories
    626 
    -Type=Threshold
    627 
    -
    628 
    -[48x48/devices]
    629 
    -Size=48
    630 
    -Context=Devices
    631 
    -Type=Threshold
    632 
    -
    633 
    -[48x48/emblems]
    634 
    -Size=48
    635 
    -Context=Emblems
    636 
    -Type=Threshold
    637 
    -
    638 
    -[48x48/emotes]
    639 
    -Size=48
    640 
    -Context=Emotes
    641 
    -Type=Threshold
    642 
    -
    643 
    -[48x48/filesystems]
    644 
    -Size=48
    645 
    -Context=FileSystems
    646 
    -Type=Threshold
    647 
    -
    648 
    -[48x48/intl]
    649 
    -Size=48
    650 
    -Context=International
    651 
    -Type=Threshold
    652 
    -
    653 
    -[48x48/mimetypes]
    654 
    -Size=48
    655 
    -Context=MimeTypes
    656 
    -Type=Threshold
    657 
    -
    658 
    -[48x48/places]
    659 
    -Size=48
    660 
    -Context=Places
    661 
    -Type=Threshold
    662 
    -
    663 
    -[48x48/status]
    664 
    -Size=48
    665 
    -Context=Status
    666 
    -Type=Threshold
    667 
    -
    668 
    -[48x48/stock/chart]
    669 
    -Size=48
    670 
    -Context=Stock
    671 
    -Type=Threshold
    672 
    -
    673 
    -[48x48/stock/code]
    674 
    -Size=48
    675 
    -Context=Stock
    676 
    -Type=Threshold
    677 
    -
    678 
    -[48x48/stock/data]
    679 
    -Size=48
    680 
    -Context=Stock
    681 
    -Type=Threshold
    682 
    -
    683 
    -[48x48/stock/form]
    684 
    -Size=48
    685 
    -Context=Stock
    686 
    -Type=Threshold
    687 
    -
    688 
    -[48x48/stock/image]
    689 
    -Size=48
    690 
    -Context=Stock
    691 
    -Type=Threshold
    692 
    -
    693 
    -[48x48/stock/io]
    694 
    -Size=48
    695 
    -Context=Stock
    696 
    -Type=Threshold
    697 
    -
    698 
    -[48x48/stock/media]
    699 
    -Size=48
    700 
    -Context=Stock
    701 
    -Type=Threshold
    702 
    -
    703 
    -[48x48/stock/navigation]
    704 
    -Size=48
    705 
    -Context=Stock
    706 
    -Type=Threshold
    707 
    -
    708 
    -[48x48/stock/net]
    709 
    -Size=48
    710 
    -Context=Stock
    711 
    -Type=Threshold
    712 
    -
    713 
    -[48x48/stock/object]
    714 
    -Size=48
    715 
    -Context=Stock
    716 
    -Type=Threshold
    717 
    -
    718 
    -[48x48/stock/table]
    719 
    -Size=48
    720 
    -Context=Stock
    721 
    -Type=Threshold
    722 
    -
    723 
    -[48x48/stock/text]
    724 
    -Size=48
    725 
    -Context=Stock
    726 
    -Type=Threshold
    727 
    -
    728 
    -[64x64/actions]
    729 
    -Size=64
    730 
    -Context=Actions
    731 
    -Type=Threshold
    732 
    -
    733 
    -[64x64/animations]
    734 
    -Size=64
    735 
    -Context=Animations
    736 
    -Type=Threshold
    737 
    -
    738 
    -[64x64/apps]
    739 
    -Size=64
    740 
    -Context=Applications
    741 
    -Type=Threshold
    742 
    -
    743 
    -[64x64/categories]
    744 
    -Size=64
    745 
    -Context=Categories
    746 
    -Type=Threshold
    747 
    -
    748 
    -[64x64/devices]
    749 
    -Size=64
    750 
    -Context=Devices
    751 
    -Type=Threshold
    752 
    -
    753 
    -[64x64/emblems]
    754 
    -Size=64
    755 
    -Context=Emblems
    756 
    -Type=Threshold
    757 
    -
    758 
    -[64x64/emotes]
    759 
    -Size=64
    760 
    -Context=Emotes
    761 
    -Type=Threshold
    762 
    -
    763 
    -[64x64/filesystems]
    764 
    -Size=64
    765 
    -Context=FileSystems
    766 
    -Type=Threshold
    767 
    -
    768 
    -[64x64/intl]
    769 
    -Size=64
    770 
    -Context=International
    771 
    -Type=Threshold
    772 
    -
    773 
    -[64x64/mimetypes]
    774 
    -Size=64
    775 
    -Context=MimeTypes
    776 
    -Type=Threshold
    777 
    -
    778 
    -[64x64/places]
    779 
    -Size=64
    780 
    -Context=Places
    781 
    -Type=Threshold
    782 
    -
    783 
    -[64x64/status]
    784 
    -Size=64
    785 
    -Context=Status
    786 
    -Type=Threshold
    787 
    -
    788 
    -[64x64/stock/chart]
    789 
    -Size=64
    790 
    -Context=Stock
    791 
    -Type=Threshold
    792 
    -
    793 
    -[64x64/stock/code]
    794 
    -Size=64
    795 
    -Context=Stock
    796 
    -Type=Threshold
    797 
    -
    798 
    -[64x64/stock/data]
    799 
    -Size=64
    800 
    -Context=Stock
    801 
    -Type=Threshold
    802 
    -
    803 
    -[64x64/stock/form]
    804 
    -Size=64
    805 
    -Context=Stock
    806 
    -Type=Threshold
    807 
    -
    808 
    -[64x64/stock/image]
    809 
    -Size=64
    810 
    -Context=Stock
    811 
    -Type=Threshold
    812 
    -
    813 
    -[64x64/stock/io]
    814 
    -Size=64
    815 
    -Context=Stock
    816 
    -Type=Threshold
    817 
    -
    818 
    -[64x64/stock/media]
    819 
    -Size=64
    820 
    -Context=Stock
    821 
    -Type=Threshold
    822 
    -
    823 
    -[64x64/stock/navigation]
    824 
    -Size=64
    825 
    -Context=Stock
    826 
    -Type=Threshold
    827 
    -
    828 
    -[64x64/stock/net]
    829 
    -Size=64
    830 
    -Context=Stock
    831 
    -Type=Threshold
    832 
    -
    833 
    -[64x64/stock/object]
    834 
    -Size=64
    835 
    -Context=Stock
    836 
    -Type=Threshold
    837 
    -
    838 
    -[64x64/stock/table]
    839 
    -Size=64
    840 
    -Context=Stock
    841 
    -Type=Threshold
    842 
    -
    843 
    -[64x64/stock/text]
    844 
    -Size=64
    845 
    -Context=Stock
    846 
    -Type=Threshold
    847 
    -[72x72/actions]
    848 
    -Size=72
    849 
    -Context=Actions
    850 
    -Type=Threshold
    851 
    -
    852 
    -[72x72/animations]
    853 
    -Size=72
    854 
    -Context=Animations
    855 
    -Type=Threshold
    856 
    -
    857 
    -[72x72/apps]
    858 
    -Size=72
    859 
    -Context=Applications
    860 
    -Type=Threshold
    861 
    -
    862 
    -[72x72/categories]
    863 
    -Size=72
    864 
    -Context=Categories
    865 
    -Type=Threshold
    866 
    -
    867 
    -[72x72/devices]
    868 
    -Size=72
    869 
    -Context=Devices
    870 
    -Type=Threshold
    871 
    -
    872 
    -[72x72/emblems]
    873 
    -Size=72
    874 
    -Context=Emblems
    875 
    -Type=Threshold
    876 
    -
    877 
    -[72x72/emotes]
    878 
    -Size=72
    879 
    -Context=Emotes
    880 
    -Type=Threshold
    881 
    -
    882 
    -[72x72/filesystems]
    883 
    -Size=72
    884 
    -Context=FileSystems
    885 
    -Type=Threshold
    886 
    -
    887 
    -[72x72/intl]
    888 
    -Size=72
    889 
    -Context=International
    890 
    -Type=Threshold
    891 
    -
    892 
    -[72x72/mimetypes]
    893 
    -Size=72
    894 
    -Context=MimeTypes
    895 
    -Type=Threshold
    896 
    -
    897 
    -[72x72/places]
    898 
    -Size=72
    899 
    -Context=Places
    900 
    -Type=Threshold
    901 
    -
    902 
    -[72x72/status]
    903 
    -Size=72
    904 
    -Context=Status
    905 
    -Type=Threshold
    906 
    -
    907 
    -[72x72/stock/chart]
    908 
    -Size=72
    909 
    -Context=Stock
    910 
    -Type=Threshold
    911 
    -
    912 
    -[72x72/stock/code]
    913 
    -Size=72
    914 
    -Context=Stock
    915 
    -Type=Threshold
    916 
    -
    917 
    -[72x72/stock/data]
    918 
    -Size=72
    919 
    -Context=Stock
    920 
    -Type=Threshold
    921 
    -
    922 
    -[72x72/stock/form]
    923 
    -Size=72
    924 
    -Context=Stock
    925 
    -Type=Threshold
    926 
    -
    927 
    -[72x72/stock/image]
    928 
    -Size=72
    929 
    -Context=Stock
    930 
    -Type=Threshold
    931 
    -
    932 
    -[72x72/stock/io]
    933 
    -Size=72
    934 
    -Context=Stock
    935 
    -Type=Threshold
    936 
    -
    937 
    -[72x72/stock/media]
    938 
    -Size=72
    939 
    -Context=Stock
    940 
    -Type=Threshold
    941 
    -
    942 
    -[72x72/stock/navigation]
    943 
    -Size=72
    944 
    -Context=Stock
    945 
    -Type=Threshold
    946 
    -
    947 
    -[72x72/stock/net]
    948 
    -Size=72
    949 
    -Context=Stock
    950 
    -Type=Threshold
    951 
    -
    952 
    -[72x72/stock/object]
    953 
    -Size=72
    954 
    -Context=Stock
    955 
    -Type=Threshold
    956 
    -
    957 
    -[72x72/stock/table]
    958 
    -Size=72
    959 
    -Context=Stock
    960 
    -Type=Threshold
    961 
    -
    962 
    -[72x72/stock/text]
    963 
    -Size=72
    964 
    -Context=Stock
    965 
    -Type=Threshold
    966 
    -
    967 
    -[96x96/actions]
    968 
    -Size=96
    969 
    -Context=Actions
    970 
    -Type=Threshold
    971 
    -
    972 
    -[96x96/animations]
    973 
    -Size=96
    974 
    -Context=Animations
    975 
    -Type=Threshold
    976 
    -
    977 
    -[96x96/apps]
    978 
    -Size=96
    979 
    -Context=Applications
    980 
    -Type=Threshold
    981 
    -
    982 
    -[96x96/categories]
    983 
    -Size=96
    984 
    -Context=Categories
    985 
    -Type=Threshold
    986 
    -
    987 
    -[96x96/devices]
    988 
    -Size=96
    989 
    -Context=Devices
    990 
    -Type=Threshold
    991 
    -
    992 
    -[96x96/emblems]
    993 
    -Size=96
    994 
    -Context=Emblems
    995 
    -Type=Threshold
    996 
    -
    997 
    -[96x96/emotes]
    998 
    -Size=96
    999 
    -Context=Emotes
    1000 
    -Type=Threshold
    1001 
    -
    1002 
    -[96x96/filesystems]
    1003 
    -Size=96
    1004 
    -Context=FileSystems
    1005 
    -Type=Threshold
    1006 
    -
    1007 
    -[96x96/intl]
    1008 
    -Size=96
    1009 
    -Context=International
    1010 
    -Type=Threshold
    1011 
    -
    1012 
    -[96x96/mimetypes]
    1013 
    -Size=96
    1014 
    -Context=MimeTypes
    1015 
    -Type=Threshold
    1016 
    -
    1017 
    -[96x96/places]
    1018 
    -Size=96
    1019 
    -Context=Places
    1020 
    -Type=Threshold
    1021 
    -
    1022 
    -[96x96/status]
    1023 
    -Size=96
    1024 
    -Context=Status
    1025 
    -Type=Threshold
    1026 
    -
    1027 
    -[96x96/stock/chart]
    1028 
    -Size=96
    1029 
    -Context=Stock
    1030 
    -Type=Threshold
    1031 
    -
    1032 
    -[96x96/stock/code]
    1033 
    -Size=96
    1034 
    -Context=Stock
    1035 
    -Type=Threshold
    1036 
    -
    1037 
    -[96x96/stock/data]
    1038 
    -Size=96
    1039 
    -Context=Stock
    1040 
    -Type=Threshold
    1041 
    -
    1042 
    -[96x96/stock/form]
    1043 
    -Size=96
    1044 
    -Context=Stock
    1045 
    -Type=Threshold
    1046 
    -
    1047 
    -[96x96/stock/image]
    1048 
    -Size=96
    1049 
    -Context=Stock
    1050 
    -Type=Threshold
    1051 
    -
    1052 
    -[96x96/stock/io]
    1053 
    -Size=96
    1054 
    -Context=Stock
    1055 
    -Type=Threshold
    1056 
    -
    1057 
    -[96x96/stock/media]
    1058 
    -Size=96
    1059 
    -Context=Stock
    1060 
    -Type=Threshold
    1061 
    -
    1062 
    -[96x96/stock/navigation]
    1063 
    -Size=96
    1064 
    -Context=Stock
    1065 
    -Type=Threshold
    1066 
    -
    1067 
    -[96x96/stock/net]
    1068 
    -Size=96
    1069 
    -Context=Stock
    1070 
    -Type=Threshold
    1071 
    -
    1072 
    -[96x96/stock/object]
    1073 
    -Size=96
    1074 
    -Context=Stock
    1075 
    -Type=Threshold
    1076 
    -
    1077 
    -[96x96/stock/table]
    1078 
    -Size=96
    1079 
    -Context=Stock
    1080 
    -Type=Threshold
    1081 
    -
    1082 
    -[96x96/stock/text]
    1083 
    -Size=96
    1084 
    -Context=Stock
    1085 
    -Type=Threshold
    1086 8
    1087 
    -[128x128/actions]
    1088 
    -Size=128
    9 
    +[16x16/actions]
    10 
    +Size=16
    1089 11 
     Context=Actions
    1090 
    -Type=Threshold
    12 
    +Type=Fixed
    1091 13
    1092 
    -[128x128/animations]
    1093 
    -Size=128
    1094 
    -Context=Animations
    1095 
    -Type=Threshold
    1096 
    -
    1097 
    -[128x128/apps]
    1098 
    -Size=128
    1099 
    -Context=Applications
    1100 
    -Type=Threshold
    1101 
    -
    1102 
    -[128x128/categories]
    1103 
    -Size=128
    1104 
    -Context=Categories
    1105 
    -Type=Threshold
    1106 
    -
    1107 
    -[128x128/devices]
    1108 
    -Size=128
    14 
    +[16x16/devices]
    15 
    +Size=16
    1109 16 
     Context=Devices
    1110 
    -Type=Threshold
    1111 
    -
    1112 
    -[128x128/emblems]
    1113 
    -Size=128
    1114 
    -Context=Emblems
    1115 
    -Type=Threshold
    1116 
    -
    1117 
    -[128x128/emotes]
    1118 
    -Size=128
    1119 
    -Context=Emotes
    1120 
    -Type=Threshold
    1121 
    -
    1122 
    -[128x128/filesystems]
    1123 
    -Size=128
    1124 
    -Context=FileSystems
    1125 
    -Type=Threshold
    1126 
    -
    1127 
    -[128x128/intl]
    1128 
    -Size=128
    1129 
    -Context=International
    1130 
    -Type=Threshold
    1131 
    -
    1132 
    -[128x128/mimetypes]
    1133 
    -Size=128
    1134 
    -Context=MimeTypes
    1135 
    -Type=Threshold
    1136 
    -
    1137 
    -[128x128/places]
    1138 
    -Size=128
    1139 
    -Context=Places
    1140 
    -Type=Threshold
    17 
    +Type=Fixed
    1141 18
    1142 
    -[128x128/status]
    1143 
    -Size=128
    19 
    +[16x16/status]
    20 
    +Size=16
    1144 21 
     Context=Status
    1145 
    -Type=Threshold
    1146 
    -
    1147 
    -[128x128/stock/chart]
    1148 
    -Size=128
    1149 
    -Context=Stock
    1150 
    -Type=Threshold
    1151 
    -
    1152 
    -[128x128/stock/code]
    1153 
    -Size=128
    1154 
    -Context=Stock
    1155 
    -Type=Threshold
    1156 
    -
    1157 
    -[128x128/stock/data]
    1158 
    -Size=128
    1159 
    -Context=Stock
    1160 
    -Type=Threshold
    1161 
    -
    1162 
    -[128x128/stock/form]
    1163 
    -Size=128
    1164 
    -Context=Stock
    1165 
    -Type=Threshold
    1166 
    -
    1167 
    -[128x128/stock/image]
    1168 
    -Size=128
    1169 
    -Context=Stock
    1170 
    -Type=Threshold
    1171 
    -
    1172 
    -[128x128/stock/io]
    1173 
    -Size=128
    1174 
    -Context=Stock
    1175 
    -Type=Threshold
    1176 
    -
    1177 
    -[128x128/stock/media]
    1178 
    -Size=128
    1179 
    -Context=Stock
    1180 
    -Type=Threshold
    1181 
    -
    1182 
    -[128x128/stock/navigation]
    1183 
    -Size=128
    1184 
    -Context=Stock
    1185 
    -Type=Threshold
    1186 
    -
    1187 
    -[128x128/stock/net]
    1188 
    -Size=128
    1189 
    -Context=Stock
    1190 
    -Type=Threshold
    1191 
    -
    1192 
    -[128x128/stock/object]
    1193 
    -Size=128
    1194 
    -Context=Stock
    1195 
    -Type=Threshold
    1196 
    -
    1197 
    -[128x128/stock/table]
    1198 
    -Size=128
    1199 
    -Context=Stock
    1200 
    -Type=Threshold
    22 
    +Type=Fixed
    1201 23
    1202 
    -[128x128/stock/text]
    1203 
    -Size=128
    1204 
    -Context=Stock
    1205 
    -Type=Threshold
    1206 
    -
    1207 
    -[192x192/actions]
    1208 
    -Size=192
    1209 
    -Context=Actions
    1210 
    -Type=Threshold
    1211 
    -
    1212 
    -[192x192/animations]
    1213 
    -Size=192
    1214 
    -Context=Animations
    1215 
    -Type=Threshold
    1216 
    -
    1217 
    -[192x192/apps]
    1218 
    -Size=192
    1219 
    -Context=Applications
    1220 
    -Type=Threshold
    1221 
    -
    1222 
    -[192x192/categories]
    1223 
    -Size=192
    24 
    +[32x32/categories]
    25 
    +Size=32
    1224 26 
     Context=Categories
    1225 
    -Type=Threshold
    27 
    +Type=Fixed
    1226 28
    1227 
    -[192x192/devices]
    1228 
    -Size=192
    29 
    +[32x32/devices]
    30 
    +Size=32
    1229 31 
     Context=Devices
    1230 
    -Type=Threshold
    1231 
    -
    1232 
    -[192x192/emblems]
    1233 
    -Size=192
    1234 
    -Context=Emblems
    1235 
    -Type=Threshold
    1236 
    -
    1237 
    -[192x192/emotes]
    1238 
    -Size=192
    1239 
    -Context=Emotes
    1240 
    -Type=Threshold
    1241 
    -
    1242 
    -[192x192/filesystems]
    1243 
    -Size=192
    1244 
    -Context=FileSystems
    1245 
    -Type=Threshold
    1246 
    -
    1247 
    -[192x192/intl]
    1248 
    -Size=192
    1249 
    -Context=International
    1250 
    -Type=Threshold
    1251 
    -
    1252 
    -[192x192/mimetypes]
    1253 
    -Size=192
    1254 
    -Context=MimeTypes
    1255 
    -Type=Threshold
    32 
    +Type=Fixed
    1256 33
    1257 
    -[192x192/places]
    1258 
    -Size=192
    1259 
    -Context=Places
    1260 
    -Type=Threshold
    1261 
    -
    1262 
    -[192x192/status]
    1263 
    -Size=192
    34 
    +[32x32/status]
    35 
    +Size=32
    1264 36 
     Context=Status
    1265 
    -Type=Threshold
    1266 
    -
    1267 
    -[192x192/stock/chart]
    1268 
    -Size=192
    1269 
    -Context=Stock
    1270 
    -Type=Threshold
    1271 
    -
    1272 
    -[192x192/stock/code]
    1273 
    -Size=192
    1274 
    -Context=Stock
    1275 
    -Type=Threshold
    1276 
    -
    1277 
    -[192x192/stock/data]
    1278 
    -Size=192
    1279 
    -Context=Stock
    1280 
    -Type=Threshold
    1281 
    -
    1282 
    -[192x192/stock/form]
    1283 
    -Size=192
    1284 
    -Context=Stock
    1285 
    -Type=Threshold
    1286 
    -
    1287 
    -[192x192/stock/image]
    1288 
    -Size=192
    1289 
    -Context=Stock
    1290 
    -Type=Threshold
    1291 
    -
    1292 
    -[192x192/stock/io]
    1293 
    -Size=192
    1294 
    -Context=Stock
    1295 
    -Type=Threshold
    1296 
    -
    1297 
    -[192x192/stock/media]
    1298 
    -Size=192
    1299 
    -Context=Stock
    1300 
    -Type=Threshold
    1301 
    -
    1302 
    -[192x192/stock/navigation]
    1303 
    -Size=192
    1304 
    -Context=Stock
    1305 
    -Type=Threshold
    1306 
    -
    1307 
    -[192x192/stock/net]
    1308 
    -Size=192
    1309 
    -Context=Stock
    1310 
    -Type=Threshold
    1311 
    -
    1312 
    -[192x192/stock/object]
    1313 
    -Size=192
    1314 
    -Context=Stock
    1315 
    -Type=Threshold
    1316 
    -
    1317 
    -[192x192/stock/table]
    1318 
    -Size=192
    1319 
    -Context=Stock
    1320 
    -Type=Threshold
    1321 
    -
    1322 
    -[192x192/stock/text]
    1323 
    -Size=192
    1324 
    -Context=Stock
    1325 
    -Type=Threshold
    1326 
    -
    1327 
    -[256x256/actions]
    1328 
    -MinSize=64
    1329 
    -Size=256
    1330 
    -MaxSize=256
    1331 
    -Context=Actions
    1332 
    -Type=Scalable
    1333 
    -
    1334 
    -[256x256/animations]
    1335 
    -MinSize=64
    1336 
    -Size=256
    1337 
    -MaxSize=256
    1338 
    -Context=Animations
    1339 
    -Type=Scalable
    1340 
    -
    1341 
    -[256x256/apps]
    1342 
    -MinSize=64
    1343 
    -Size=256
    1344 
    -MaxSize=256
    1345 
    -Context=Applications
    1346 
    -Type=Scalable
    1347 
    -
    1348 
    -[256x256/categories]
    1349 
    -MinSize=64
    1350 
    -Size=256
    1351 
    -MaxSize=256
    1352 
    -Context=Categories
    1353 
    -Type=Scalable
    1354 
    -
    1355 
    -[256x256/devices]
    1356 
    -MinSize=64
    1357 
    -Size=256
    1358 
    -MaxSize=256
    1359 
    -Context=Devices
    1360 
    -Type=Scalable
    1361 
    -
    1362 
    -[256x256/emblems]
    1363 
    -MinSize=64
    1364 
    -Size=256
    1365 
    -MaxSize=256
    1366 
    -Context=Emblems
    1367 
    -Type=Scalable
    1368 
    -
    1369 
    -[256x256/emotes]
    1370 
    -MinSize=64
    1371 
    -Size=256
    1372 
    -MaxSize=256
    1373 
    -Context=Emotes
    1374 
    -Type=Scalable
    1375 
    -
    1376 
    -[256x256/filesystems]
    1377 
    -MinSize=64
    1378 
    -Size=256
    1379 
    -MaxSize=256
    1380 
    -Context=FileSystems
    1381 
    -Type=Scalable
    1382 
    -
    1383 
    -[256x256/intl]
    1384 
    -MinSize=64
    1385 
    -Size=256
    1386 
    -MaxSize=256
    1387 
    -Context=International
    1388 
    -Type=Scalable
    1389 
    -
    1390 
    -[256x256/mimetypes]
    1391 
    -MinSize=64
    1392 
    -Size=256
    1393 
    -MaxSize=256
    1394 
    -Context=MimeTypes
    1395 
    -Type=Scalable
    1396 
    -
    1397 
    -[256x256/places]
    1398 
    -MinSize=64
    1399 
    -Size=256
    1400 
    -MaxSize=256
    1401 
    -Context=Places
    1402 
    -Type=Scalable
    37 
    +Type=Fixed
    1403 38
    1404 
    -[256x256/status]
    1405 
    -MinSize=64
    1406 
    -Size=256
    1407 
    -MaxSize=256
    39 
    +[48x48/status]
    40 
    +Size=48
    1408 41 
     Context=Status
    1409 
    -Type=Scalable
    1410 
    -
    1411 
    -[256x256/stock/chart]
    1412 
    -MinSize=64
    1413 
    -Size=256
    1414 
    -MaxSize=256
    1415 
    -Context=Stock
    1416 
    -Type=Scalable
    1417 
    -
    1418 
    -[256x256/stock/code]
    1419 
    -MinSize=64
    1420 
    -Size=256
    1421 
    -MaxSize=256
    1422 
    -Context=Stock
    1423 
    -Type=Scalable
    1424 
    -
    1425 
    -[256x256/stock/data]
    1426 
    -MinSize=64
    1427 
    -Size=256
    1428 
    -MaxSize=256
    1429 
    -Context=Stock
    1430 
    -Type=Scalable
    1431 
    -
    1432 
    -[256x256/stock/form]
    1433 
    -MinSize=64
    1434 
    -Size=256
    1435 
    -MaxSize=256
    1436 
    -Context=Stock
    1437 
    -Type=Scalable
    1438 
    -
    1439 
    -[256x256/stock/image]
    1440 
    -MinSize=64
    1441 
    -Size=256
    1442 
    -MaxSize=256
    1443 
    -Context=Stock
    1444 
    -Type=Scalable
    1445 
    -
    1446 
    -[256x256/stock/io]
    1447 
    -MinSize=64
    1448 
    -Size=256
    1449 
    -MaxSize=256
    1450 
    -Context=Stock
    1451 
    -Type=Scalable
    1452 
    -
    1453 
    -[256x256/stock/media]
    1454 
    -MinSize=64
    1455 
    -Size=256
    1456 
    -MaxSize=256
    1457 
    -Context=Stock
    1458 
    -Type=Scalable
    1459 
    -
    1460 
    -[256x256/stock/navigation]
    1461 
    -MinSize=64
    1462 
    -Size=256
    1463 
    -MaxSize=256
    1464 
    -Context=Stock
    1465 
    -Type=Scalable
    42 
    +Type=Fixed
    1466 43
    1467 
    -[256x256/stock/net]
    1468 
    -MinSize=64
    1469 
    -Size=256
    1470 
    -MaxSize=256
    1471 
    -Context=Stock
    1472 
    -Type=Scalable
    1473 
    -
    1474 
    -[256x256/stock/object]
    1475 
    -MinSize=64
    1476 
    -Size=256
    1477 
    -MaxSize=256
    1478 
    -Context=Stock
    1479 
    -Type=Scalable
    1480 
    -
    1481 
    -[256x256/stock/table]
    1482 
    -MinSize=64
    1483 
    -Size=256
    1484 
    -MaxSize=256
    1485 
    -Context=Stock
    1486 
    -Type=Scalable
    1487 
    -
    1488 
    -[256x256/stock/text]
    1489 
    -MinSize=64
    1490 
    -Size=256
    1491 
    -MaxSize=256
    1492 
    -Context=Stock
    1493 
    -Type=Scalable
    1494 
    -
    1495 
    -[scalable/actions]
    1496 
    -MinSize=1
    1497 
    -Size=128
    1498 
    -MaxSize=256
    1499 
    -Context=Actions
    1500 
    -Type=Scalable
    1501 
    -
    1502 
    -[scalable/animations]
    1503 
    -MinSize=1
    1504 
    -Size=128
    1505 
    -MaxSize=256
    1506 
    -Context=Animations
    1507 
    -Type=Scalable
    44 
    +[96x96/categories]
    45 
    +Size=96
    46 
    +Context=Categories
    47 
    +Type=Fixed
    1508 48
    1509 49 
     [scalable/apps]
    1510 
    -MinSize=1
    1511 50 
     Size=128
    51 
    +MinSize=16
    1512 52 
     MaxSize=256
    1513 53 
     Context=Applications
    1514 54 
     Type=Scalable
    1515 55
    1516 56 
     [scalable/categories]
    1517 
    -MinSize=1
    1518 57 
     Size=128
    58 
    +MinSize=16
    1519 59 
     MaxSize=256
    1520 60 
     Context=Categories
    1521 61 
     Type=Scalable
    1522 62
    1523 63 
     [scalable/devices]
    1524 
    -MinSize=1
    1525 64 
     Size=128
    65 
    +MinSize=16
    1526 66 
     MaxSize=256
    1527 67 
     Context=Devices
    1528 68 
     Type=Scalable
    1529 69
    1530 
    -[scalable/emblems]
    1531 
    -MinSize=1
    1532 
    -Size=128
    1533 
    -MaxSize=256
    1534 
    -Context=Emblems
    1535 
    -Type=Scalable
    1536 
    -
    1537 
    -[scalable/emotes]
    1538 
    -MinSize=1
    1539 
    -Size=128
    1540 
    -MaxSize=256
    1541 
    -Context=Emotes
    1542 
    -Type=Scalable
    1543 
    -
    1544 
    -[scalable/filesystems]
    1545 
    -MinSize=1
    1546 
    -Size=128
    1547 
    -MaxSize=256
    1548 
    -Context=FileSystems
    1549 
    -Type=Scalable
    1550 
    -
    1551 
    -[scalable/intl]
    1552 
    -MinSize=1
    1553 
    -Size=128
    1554 
    -MaxSize=256
    1555 
    -Context=International
    1556 
    -Type=Scalable
    1557 
    -
    1558 
    -[scalable/mimetypes]
    1559 
    -MinSize=1
    1560 
    -Size=128
    1561 
    -MaxSize=256
    1562 
    -Context=MimeTypes
    1563 
    -Type=Scalable
    1564 
    -
    1565 
    -[scalable/places]
    1566 
    -MinSize=1
    1567 
    -Size=128
    1568 
    -MaxSize=256
    1569 
    -Context=Places
    1570 
    -Type=Scalable
    1571 
    -
    1572 70 
     [scalable/status]
    1573 
    -MinSize=1
    1574 71 
     Size=128
    72 
    +MinSize=16
    1575 73 
     MaxSize=256
    1576 74 
     Context=Status
    1577 75 
     Type=Scalable
    1578 
    -
    1579 
    -[scalable/stock/chart]
    1580 
    -MinSize=1
    1581 
    -Size=128
    1582 
    -MaxSize=256
    1583 
    -Context=Stock
    1584 
    -Type=Scalable
    1585 
    -
    1586 
    -[scalable/stock/code]
    1587 
    -MinSize=1
    1588 
    -Size=128
    1589 
    -MaxSize=256
    1590 
    -Context=Stock
    1591 
    -Type=Scalable
    1592 
    -
    1593 
    -[scalable/stock/data]
    1594 
    -MinSize=1
    1595 
    -Size=128
    1596 
    -MaxSize=256
    1597 
    -Context=Stock
    1598 
    -Type=Scalable
    1599 
    -
    1600 
    -[scalable/stock/form]
    1601 
    -MinSize=1
    1602 
    -Size=128
    1603 
    -MaxSize=256
    1604 
    -Context=Stock
    1605 
    -Type=Scalable
    1606 
    -
    1607 
    -[scalable/stock/image]
    1608 
    -MinSize=1
    1609 
    -Size=128
    1610 
    -MaxSize=256
    1611 
    -Context=Stock
    1612 
    -Type=Scalable
    1613 
    -
    1614 
    -[scalable/stock/io]
    1615 
    -MinSize=1
    1616 
    -Size=128
    1617 
    -MaxSize=256
    1618 
    -Context=Stock
    1619 
    -Type=Scalable
    1620 
    -
    1621 
    -[scalable/stock/media]
    1622 
    -MinSize=1
    1623 
    -Size=128
    1624 
    -MaxSize=256
    1625 
    -Context=Stock
    1626 
    -Type=Scalable
    1627 
    -
    1628 
    -[scalable/stock/navigation]
    1629 
    -MinSize=1
    1630 
    -Size=128
    1631 
    -MaxSize=256
    1632 
    -Context=Stock
    1633 
    -Type=Scalable
    1634 
    -
    1635 
    -[scalable/stock/net]
    1636 
    -MinSize=1
    1637 
    -Size=128
    1638 
    -MaxSize=256
    1639 
    -Context=Stock
    1640 
    -Type=Scalable
    1641 
    -
    1642 
    -[scalable/stock/object]
    1643 
    -MinSize=1
    1644 
    -Size=128
    1645 
    -MaxSize=256
    1646 
    -Context=Stock
    1647 
    -Type=Scalable
    1648 
    -
    1649 
    -[scalable/stock/table]
    1650 
    -MinSize=1
    1651 
    -Size=128
    1652 
    -MaxSize=256
    1653 
    -Context=Stock
    1654 
    -Type=Scalable
    1655 
    -
    1656 
    -[scalable/stock/text]
    1657 
    -MinSize=1
    1658 
    -Size=128
    1659 
    -MaxSize=256
    1660 
    -Context=Stock
    1661 
    -Type=Scalable
    1662 
    -

  • gajim/data/icons/hicolor/symbolic/apps/org.gajim.Gajim-symbolic.svg → gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim-symbolic.svg

  • gajim/gtk/accounts.py
    ... ... @@ -787,7 +787,7 @@ def __init__(self, account):
    787 787 
                 Setting(SettingKind.POPOVER, _('Proxy'),
    788 788 
                         SettingType.ACCOUNT_CONFIG, 'proxy', name='proxy',
    789 789 
                         props={'entries': self._get_proxies(),
    790 
    -                           'default-text': _('No Proxy'),
    790 
    +                           'default-text': _('System'),
    791 791 
                                'button-icon-name': 'preferences-system-symbolic',
    792 792 
                                'button-callback': self._on_proxy_edit}),
    793 793

  • gajim/gtk/filetransfer_progress.py
    ... ... @@ -58,8 +58,11 @@ def __init__(self, transfer):
    58 58 
             self._ui.connect_signals(self)
    59 59
    60 60 
         def _on_transfer_state_change(self, transfer, _signal_name, state):
    61 
    +        if self._destroyed:
    62 
    +            return
    63 
    +
    61 64 
             if state.is_error:
    62 
    -            ErrorDialog(_('Upload Failed'),
    65 
    +            ErrorDialog(_('Error'),
    63 66 
                             transfer.error_text,
    64 67 
                             transient_for=app.interface.roster.window)
    65 68 
                 self.destroy()
    ... ... @@ -80,12 +83,12 @@ def _on_cancel_button_clicked(self, _widget):
    80 83 
             self.destroy()
    81 84
    82 85 
         def _on_destroy(self, *args):
    86 
    +        self._destroyed = True
    87 
    +
    83 88 
             if self._transfer.state.is_active:
    84 
    -            client = app.get_client(self._transfer.account)
    85 
    -            client.get_module('HTTPUpload').cancel_transfer(self._transfer)
    89 
    +            self._transfer.cancel()
    86 90
    87 91 
             self._transfer = None
    88 
    -        self._destroyed = True
    89 92 
             if self._pulse is not None:
    90 93 
                 GLib.source_remove(self._pulse)
    91 94

  • gajim/gtk/preferences.py
    ... ... @@ -983,7 +983,7 @@ def __init__(self, pref_window):
    983 983 
                         'global_proxy',
    984 984 
                         name='global_proxy',
    985 985 
                         props={'entries': self._get_proxies(),
    986 
    -                           'default-text': _('No Proxy'),
    986 
    +                           'default-text': _('System'),
    987 987 
                                'button-icon-name': 'preferences-system-symbolic',
    988 988 
                                'button-callback': self._on_proxy_edit}),
    989 989

  • gajim/gtk/profile.py
    ... ... @@ -36,7 +36,7 @@
    36 36 
         'title': Q_('?profile:Title'),
    37 37 
         'role': Q_('?profile:Role'),
    38 38 
         'url': _('URL'),
    39 
    -    'key': Q_('?profile:Key'),
    39 
    +    'key': Q_('?profile:Public Encryption Key'),
    40 40 
     }
    41 41
    42 42

  • gajim/gtk/vcard_grid.py
    ... ... @@ -43,7 +43,7 @@
    43 43 
         'org': _('Organisation'),
    44 44 
         'note': Q_('?profile:Note'),
    45 45 
         'url': _('URL'),
    46 
    -    'key': Q_('?profile:Key'),
    46 
    +    'key': Q_('?profile:Public Encryption Key'),
    47 47 
     }
    48 48
    49 49

  • gajim/gui_interface.py
    ... ... @@ -73,7 +73,6 @@
    73 73 
     from gajim.common import socks5
    74 74 
     from gajim.common import helpers
    75 75 
     from gajim.common import passwords
    76 
    -from gajim.common import logging_helpers
    77 76 
     from gajim.common.helpers import ask_for_status_message
    78 77 
     from gajim.common.helpers import get_group_chat_nick
    79 78 
     from gajim.common.structs import MUCData
    ... ... @@ -879,6 +878,7 @@ def _send_httpupload(self, chat_control, path):
    879 878 
                     None, dialog_name='open-file-error2', args=error))
    880 879 
                 return
    881 880
    881 
    +        transfer.connect('cancel', self._on_cancel_upload)
    882 882 
             transfer.connect('state-changed',
    883 883 
                              self._on_http_upload_state_changed)
    884 884 
             FileTransferProgress(transfer)
    ... ... @@ -902,6 +902,11 @@ def _on_http_upload_state_changed(transfer, _signal_name, state):
    902 902 
                 client = app.get_client(transfer.account)
    903 903 
                 client.send_message(message)
    904 904
    905 
    +    @staticmethod
    906 
    +    def _on_cancel_upload(transfer, _signal_name):
    907 
    +        client = app.get_client(transfer.account)
    908 
    +        client.get_module('HTTPUpload').cancel_transfer(transfer)
    909 
    +
    905 910 
         @staticmethod
    906 911 
         def handle_event_metacontacts(obj):
    907 912 
             app.contacts.define_metacontacts(obj.conn.name, obj.meta_list)
    ... ... @@ -2125,9 +2130,6 @@ def __init__(self):
    2125 2130 
             app.load_css_config()
    2126 2131
    2127 2132 
             app.storage.archive.reset_shown_unread_messages()
    2128 
    -        # override logging settings from config (don't take care of '-q' option)
    2129 
    -        if app.settings.get('verbose'):
    2130 
    -            logging_helpers.set_verbose()
    2131 2133
    2132 2134 
             for account in app.settings.get_accounts():
    2133 2135 
                 if app.settings.get_account_setting(account, 'is_zeroconf'):

  • gajim/history_manager.py
    ... ... @@ -46,6 +46,7 @@
    46 46 
     from gi.repository import Gio
    47 47 
     from gi.repository import Pango
    48 48
    49 
    +import gajim.gui
    49 50 
     from gajim.common import app
    50 51 
     from gajim.common import configpaths
    51 52 
     from gajim.common.i18n import _
    ... ... @@ -54,6 +55,8 @@
    54 55 
     from gajim.common.const import JIDConstant
    55 56 
     from gajim.common.const import KindConstant
    56 57 
     from gajim.common.const import ShowConstant
    58 
    +from gajim.common.settings import Settings
    59 
    +
    57 60
    58 61 
     def is_standalone():
    59 62 
         # Determine if we are in standalone mode
    ... ... @@ -64,7 +67,15 @@ def is_standalone():
    64 67 
         return False
    65 68
    66 69
    70 
    +def init_gtk():
    71 
    +    gajim.gui.init('gtk')
    72 
    +    from gajim.gui import exception
    73 
    +    exception.init()
    74 
    +
    75 
    +
    67 76 
     if is_standalone():
    77 
    +    init_gtk()
    78 
    +
    68 79 
         try:
    69 80 
             shortargs = 'hvsc:l:p:'
    70 81 
             longargs = 'help verbose separate config-path= loglevel= profile='
    ... ... @@ -86,6 +97,8 @@ def is_standalone():
    86 97 
                 configpaths.set_config_root(a)
    87 98
    88 99 
         configpaths.init()
    100 
    +    app.settings = Settings()
    101 
    +    app.settings.init()
    89 102 
         app.load_css_config()
    90 103
    91 104 
     from gajim.common import helpers

  • setup.py
    ... ... @@ -191,8 +191,8 @@ def run(self):
    191 191 
     data_files_app_icon = [
    192 192 
         ("share/icons/hicolor/scalable/apps",
    193 193 
          ["gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim.svg"]),
    194 
    -    ("share/icons/hicolor/symbolic/apps",
    195 
    -     ["gajim/data/icons/hicolor/symbolic/apps/org.gajim.Gajim-symbolic.svg"])
    194 
    +    ("share/icons/hicolor/scalable/apps",
    195 
    +     ["gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim-symbolic.svg"])
    196 196 
     ]
    197 197
    198 198 
     data_files = data_files_app_icon

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. If you'd like to receive fewer emails, you can adjust your notification settings.