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

[stephan k.] fix so theme names can have space

This commit is contained in:
Nikos Kouremenos 2005-09-01 13:47:50 +00:00
parent b068ca6baa
commit 5bd4ad4da6
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/config.py
View File

@ -450,9 +450,10 @@ class PreferencesWindow:
model = theme_combobox.get_model() model = theme_combobox.get_model()
model.clear() model.clear()
i = 0 i = 0
for t in gajim.config.get_per('themes'): for config_theme in gajim.config.get_per('themes'):
model.append([t]) theme = config_theme.replace('_', ' ')
if gajim.config.get('roster_theme') == t: model.append([theme])
if gajim.config.get('roster_theme') == config_theme:
theme_combobox.set_active(i) theme_combobox.set_active(i)
i += 1 i += 1
self.on_theme_combobox_changed(theme_combobox) self.on_theme_combobox_changed(theme_combobox)
@ -530,9 +531,9 @@ class PreferencesWindow:
def on_theme_combobox_changed(self, widget): def on_theme_combobox_changed(self, widget):
model = widget.get_model() model = widget.get_model()
active = widget.get_active() active = widget.get_active()
theme = model[active][0].decode('utf-8') config_theme = model[active][0].decode('utf-8').replace(' ', '_')
gajim.config.set('roster_theme', theme) gajim.config.set('roster_theme', config_theme)
# begin repainting themed widgets throughout # begin repainting themed widgets throughout
self.plugin.roster.repaint_themed_widgets() self.plugin.roster.repaint_themed_widgets()

29
src/gajim_themes_window.py
View File

@ -83,18 +83,20 @@ class GajimThemesWindow:
new_name = new_name.decode('utf-8') new_name = new_name.decode('utf-8')
if old_name == new_name: if old_name == new_name:
return return
if new_name in gajim.config.get_per('themes'): new_config_name = new_name.replace(' ', '_')
if new_config_name in gajim.config.get_per('themes'):
#ErrorDialog() #ErrorDialog()
return return
gajim.config.add_per('themes', new_name) gajim.config.add_per('themes', new_config_name)
#Copy old theme values #Copy old theme values
old_config_name = old_name.replace(' ', '_')
for option in self.color_widgets.values(): for option in self.color_widgets.values():
gajim.config.set_per('themes', new_name, option, gajim.config.set_per('themes', new_config_name, option,
gajim.config.get_per('themes', old_name, option)) gajim.config.get_per('themes', old_config_name, option))
for option in self.font_widgets.values(): for option in self.font_widgets.values():
gajim.config.set_per('themes', new_name, option, gajim.config.set_per('themes', new_config_name, option,
gajim.config.get_per('themes', old_name, option)) gajim.config.get_per('themes', old_config_name, option))
gajim.config.del_per('themes', old_name) gajim.config.del_per('themes', old_config_name)
model.set_value(iter, 0, new_name) model.set_value(iter, 0, new_name)
self.plugin.windows['preferences'].update_preferences_window() self.plugin.windows['preferences'].update_preferences_window()
@ -103,9 +105,10 @@ class GajimThemesWindow:
self.xml.get_widget('fonts_colors_table').set_sensitive(False) self.xml.get_widget('fonts_colors_table').set_sensitive(False)
model = self.themes_tree.get_model() model = self.themes_tree.get_model()
model.clear() model.clear()
for theme in gajim.config.get_per('themes'): for config_theme in gajim.config.get_per('themes'):
theme = config_theme.replace('_', ' ')
iter = model.append([theme]) iter = model.append([theme])
if gajim.config.get('roster_theme') == theme: if gajim.config.get('roster_theme') == config_theme:
self.themes_tree.get_selection().select_iter(iter) self.themes_tree.get_selection().select_iter(iter)
self.xml.get_widget('remove_button').set_sensitive(True) self.xml.get_widget('remove_button').set_sensitive(True)
self.xml.get_widget('fonts_colors_table').set_sensitive(True) self.xml.get_widget('fonts_colors_table').set_sensitive(True)
@ -117,13 +120,14 @@ class GajimThemesWindow:
self.xml.get_widget('remove_button').set_sensitive(True) self.xml.get_widget('remove_button').set_sensitive(True)
self.xml.get_widget('fonts_colors_table').set_sensitive(True) self.xml.get_widget('fonts_colors_table').set_sensitive(True)
self.current_theme = model.get_value(iter, 0).decode('utf-8') self.current_theme = model.get_value(iter, 0).decode('utf-8')
self.current_theme = self.current_theme.replace(' ', '_')
self.set_widgets(self.current_theme) self.set_widgets(self.current_theme)
def on_add_button_clicked(self, widget): def on_add_button_clicked(self, widget):
model = self.themes_tree.get_model() model = self.themes_tree.get_model()
iter = model.append() iter = model.append()
i = 0 i = 0
while _('theme name') + unicode(i) in gajim.config.get_per('themes'): while _('theme_name') + unicode(i) in gajim.config.get_per('themes'):
i += 1 i += 1
model.set_value(iter, 0, _('theme name') + unicode(i)) model.set_value(iter, 0, _('theme name') + unicode(i))
gajim.config.add_per('themes', _('theme_name') + unicode(i)) gajim.config.add_per('themes', _('theme_name') + unicode(i))
@ -133,8 +137,9 @@ class GajimThemesWindow:
(model, iter) = self.themes_tree.get_selection().get_selected() (model, iter) = self.themes_tree.get_selection().get_selected()
if not iter: if not iter:
return return
name = model.get_value(iter, 0).decode('utf-8') config_name = model.get_value(iter, 0).decode('utf-8')
gajim.config.del_per('themes', name) config_name = config_name.replace(' ', '_')
gajim.config.del_per('themes', config_name)
model.remove(iter) model.remove(iter)
self.plugin.windows['preferences'].update_preferences_window() self.plugin.windows['preferences'].update_preferences_window()