copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update some colors. Fixes #5321

This commit is contained in:
Yann Leboulanger 2009-10-13 20:05:45 +02:00
parent d7a780e60a
commit 166a70b48e
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1,5 +1,5 @@
AC_INIT([Gajim - A Jabber Instant Messager], AC_INIT([Gajim - A Jabber Instant Messager],
[0.12.5.4-dev],[http://trac.gajim.org/],[gajim]) [0.12.5.5-dev],[http://trac.gajim.org/],[gajim])
AC_PREREQ([2.59]) AC_PREREQ([2.59])
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)

4
src/common/config.py
View File

@ -93,8 +93,8 @@ class Config:
'inmsgcolor': [ opt_color, '#a40000', _('Incoming nickname color.'), True ], 'inmsgcolor': [ opt_color, '#a40000', _('Incoming nickname color.'), True ],
'outmsgcolor': [ opt_color, '#3465a4', _('Outgoing nickname color.'), True ], 'outmsgcolor': [ opt_color, '#3465a4', _('Outgoing nickname color.'), True ],
'inmsgtxtcolor': [ opt_color, '', _('Incoming text color.'), True ], 'inmsgtxtcolor': [ opt_color, '', _('Incoming text color.'), True ],
'outmsgtxtcolor': [ opt_color, '#a2a2a2', _('Outgoing text color.'), True ], 'outmsgtxtcolor': [ opt_color, '#555753', _('Outgoing text color.'), True ],
'statusmsgcolor': [ opt_color, '#73d216', _('Status message text color.'), True ], 'statusmsgcolor': [ opt_color, '#4e9a06', _('Status message text color.'), True ],
'markedmsgcolor': [ opt_color, '#ff8080', '', True ], 'markedmsgcolor': [ opt_color, '#ff8080', '', True ],
'urlmsgcolor': [ opt_color, '#204a87', '', True ], 'urlmsgcolor': [ opt_color, '#204a87', '', True ],
'inmsgfont': [ opt_str, '', _('Incoming nickname font.'), True ], 'inmsgfont': [ opt_str, '', _('Incoming nickname font.'), True ],

2
src/common/defs.py
View File

@ -27,7 +27,7 @@ docdir = '../'
datadir = '../' datadir = '../'
localedir = '../po' localedir = '../po'
version = '0.12.5.4-dev' version = '0.12.5.5-dev'
import sys, os.path import sys, os.path
for base in ('.', 'common'): for base in ('.', 'common'):

12
src/common/optparser.py
View File

@ -208,6 +208,8 @@ class OptionsParser:
self.update_config_to_01253() self.update_config_to_01253()
if old < [0, 12, 5, 4] and new >= [0, 12, 5, 4]: if old < [0, 12, 5, 4] and new >= [0, 12, 5, 4]:
self.update_config_to_01254() self.update_config_to_01254()
if old < [0, 12, 5, 5] and new >= [0, 12, 5, 5]:
self.update_config_to_01255()
gajim.logger.init_vars() gajim.logger.init_vars()
gajim.config.set('version', new_version) gajim.config.set('version', new_version)
@ -764,4 +766,14 @@ class OptionsParser:
gajim.config.set(c, vals[c][1]) gajim.config.set(c, vals[c][1])
gajim.config.set('version', '0.12.5.4') gajim.config.set('version', '0.12.5.4')
def update_config_to_01254(self):
vals = {'statusmsgcolor': ['#73d216', '#4e9a06'],
'outmsgtxtcolor': ['#a2a2a2', '#555753']}
for c in vals:
val = self.old_values[c]
if val == vals[c][0]:
# We didn't change default value, so update it with new default
gajim.config.set(c, vals[c][1])
gajim.config.set('version', '0.12.5.5')
# vim: se ts=3: # vim: se ts=3: