Changeset 8700 for branches/gajim_0.11.1/src

Timestamp:

09/03/07 11:20:04 (15 months ago)

Author:

asterix

Message:

rename gtk+ theme to default theme fixes #2794

Location:

branches/gajim_0.11.1/src

Files:

• common/config.py (modified) (2 diffs)
• common/defs.py (modified) (1 diff)
• common/optparser.py (modified) (4 diffs)
• gajim.py (modified) (1 diff)

branches/gajim_0.11.1/src/common/config.py

@@ -82 +82 @@
                 'urlmsgcolor': [ opt_color, '#0000ff', '', True ],
                 'collapsed_rows': [ opt_str, '', _('List (space separated) of rows (accounts and groups) that are collapsed.'), True ],
-                'roster_theme': [ opt_str, 'gtk+', '', True ],
+                'roster_theme': [ opt_str, _('default'), '', True ],
                 'saveposition': [ opt_bool, True ],
                 'mergeaccounts': [ opt_bool, False, '', True ],
@@ -384 +384 @@
         themes_default = {
                 # sorted alphanum
-                'gtk+': [ '', '', '', 'B', '', '','', 'I', '', '', '', '', '','', '',
-                        'B' ],
+                _('default'): [ '', '', '', 'B', '', '','', 'I', '', '', '', '', '','',
+                        '', 'B' ],
 
                 _('green'): [ '', '#94aa8c', '', 'B', '#0000ff', '#eff3e7',

branches/gajim_0.11.1/src/common/defs.py

@@ -3 +3 @@
 datadir = '../'
 
-version = '0.11.1'
+version = '0.11.1.4'
 
 import sys, os.path

branches/gajim_0.11.1/src/common/optparser.py

@@ -152 +152 @@
                 if old < [0, 11, 0, 1] and new >= [0, 11, 0, 1]:
                         self.update_config_to_01101()
+                if old < [0, 11, 0, 2] and new >= [0, 11, 0, 2]:
+                        self.update_config_to_01102()
+                if old < [0, 11, 1, 1] and new >= [0, 11, 1, 1]:
+                        self.update_config_to_01111()
+                if old < [0, 11, 1, 2] and new >= [0, 11, 1, 2]:
+                        self.update_config_to_01112()
+                if old < [0, 11, 1, 3] and new >= [0, 11, 1, 3]:
+                        self.update_config_to_01113()
+                if old < [0, 11, 1, 4] and new >= [0, 11, 1, 4]:
+                        self.update_config_to_01114()
 
                 gajim.logger.init_vars()
@@ -177 +187 @@
                         'contactfontattrs', 'bannertextcolor', 'bannerbgcolor', 'bannerfont', 
                         'bannerfontattrs']
-                for theme_name in (_('grocery'), _('gtk+')):
+                for theme_name in (_('grocery'), _('default')):
                         if theme_name not in gajim.config.get_per('themes'):
                                 gajim.config.add_per('themes', theme_name)
@@ -208 +218 @@
         def assert_unread_msgs_table_exists(self):
                 '''create table unread_messages if there is no such table'''
-                #FIXME see #2812
                 back = os.getcwd()
                 os.chdir(logger.LOG_DB_FOLDER)
@@ -376 +385 @@
                                 self.old_values['before_time'], self.old_values['after_time']))
                 gajim.config.set('version', '0.11.0.1')
+
+        def update_config_to_01102(self):
+                '''fill time_stamp from before_time and after_time'''
+                if self.old_values.has_key('ft_override_host_to_send'):
+                        gajim.config.set('ft_add_hosts_to_send',
+                                self.old_values['ft_override_host_to_send'])
+                gajim.config.set('version', '0.11.0.2')
+        
+        def update_config_to_01111(self):
+                '''always_hide_chatbuttons -> compact_view'''
+                if self.old_values.has_key('always_hide_groupchat_buttons') and \
+                self.old_values.has_key('always_hide_chat_buttons'):
+                        gajim.config.set('compact_view', self.old_values['always_hide_groupchat_buttons'] and \
+                        self.old_values['always_hide_chat_buttons'])
+                gajim.config.set('version', '0.11.1.1')
+
+        def update_config_to_01112(self):
+                '''gtk+ theme is renamed to default'''
+                if self.old_values.has_key('roster_theme') and \
+                self.old_values['roster_theme'] == 'gtk+':
+                        gajim.config.set('roster_theme', _('default'))
+                gajim.config.set('version', '0.11.1.2')
+
+        def update_config_to_01113(self):
+                # copy&pasted from update_config_to_01013
+                back = os.getcwd()
+                os.chdir(logger.LOG_DB_FOLDER)
+                con = sqlite.connect(logger.LOG_DB_FILE)
+                os.chdir(back)
+                cur = con.cursor()
+                try:
+                        cur.executescript(
+                                '''
+                                CREATE TABLE caps_cache (
+                                        node TEXT,
+                                        ver TEXT,
+                                        ext TEXT,
+                                        data BLOB
+                                );
+                                '''
+                        )
+                        con.commit()
+                except sqlite.OperationalError, e:
+                        pass
+                con.close()
+                gajim.config.set('version', '0.11.1.3')
+
+        def update_config_to_01114(self):
+                # add default theme if it doesn't exist
+                d = ['accounttextcolor', 'accountbgcolor', 'accountfont',
+                        'accountfontattrs', 'grouptextcolor', 'groupbgcolor', 'groupfont',
+                        'groupfontattrs', 'contacttextcolor', 'contactbgcolor', 'contactfont',
+                        'contactfontattrs', 'bannertextcolor', 'bannerbgcolor', 'bannerfont', 
+                        'bannerfontattrs']
+                theme_name = _('default')
+                if theme_name not in gajim.config.get_per('themes'):
+                        gajim.config.add_per('themes', theme_name)
+                        if gajim.config.get_per('themes', 'gtk+'):
+                                # copy from old gtk+ theme
+                                for o in d:
+                                        val = gajim.config.get_per('themes', 'gtk+', o)
+                                        gajim.config.set_per('themes', theme_name, o, val)
+                                gajim.config.del_per('themes', 'gtk+')
+                        else:
+                                # copy from default theme
+                                theme = gajim.config.themes_default[theme_name]
+                                for o in d:
+                                        gajim.config.set_per('themes', theme_name, o, theme[d.index(o)])
+                gajim.config.set('version', '0.11.1.4')

branches/gajim_0.11.1/src/gajim.py

@@ -2060 +2060 @@
                 theme = gajim.config.get('roster_theme')
                 if not theme in gajim.config.get_per('themes'):
-                        gajim.config.set('roster_theme', 'gtk+')
+                        gajim.config.set('roster_theme', _('default'))
                 if len(gajim.config.get_per('themes')) == 0:
                         d = ['accounttextcolor', 'accountbgcolor', 'accountfont',