Commits

commits@gajim.org

17632 discussions

gajim-plugins: JuickPlugin.UrlImagePreviewPlugin. support latest...
by Gajim Plugins 17 Sep '13

17 Sep '13

changeset 76201ae6c611 in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=76201ae6c611 description: JuickPlugin.UrlImagePreviewPlugin. support latest gajim diffstat: juick/plugin.py | 31 ++++++++++++++++++------------- url_image_preview/url_image_preview.py | 2 +- 2 файлов изменено, 19 вставок(+), 14 удалений(-) различия (91 строк): diff -r 3c625f96aafb -r 76201ae6c611 juick/plugin.py --- a/juick/plugin.py Mon Sep 16 21:46:41 2013 +0400 +++ b/juick/plugin.py Tue Sep 17 12:51:59 2013 +0400 @@ -378,32 +378,36 @@ if not pixbuf: self.textview.plugin_modified = True return - end_iter = buffer_.get_iter_at_mark(mark) - anchor = buffer_.create_child_anchor(end_iter) - img = TextViewImage(anchor, nick) - img.set_from_pixbuf(pixbuf) - img.show() - self.textview.tv.add_child_at_anchor(img, anchor) + gobject.idle_add(self.set_avatar, mark, nick, pixbuf) self.textview.plugin_modified = True return else: # nick not in the db gobject.idle_add(self.get_new_avatar, mark, nick) + self.textview.plugin_modified = True return if gajim.interface.juick_pic_re.match(special_text) and \ self.plugin.config['SHOW_PREVIEW']: # show pics preview buffer_, iter_, tag = self.get_iter_and_tag('url') - mark = buffer_.create_mark(None, iter__, True) - buffer_.insert_with_tags(iter__, special_text, tag) + mark = buffer_.create_mark(None, buffer_.get_end_iter(), True) uid = special_text.split('/')[-1] url = "http://i.juick.com/photos-512/%s" % uid gajim.thread_interface(self.insert_pic_preview, [mark, special_text, - url]) + url, tag]) self.textview.plugin_modified = True return - def insert_pic_preview(self, mark, special_text, url): + def set_avatar(self, mark, nick, pixbuf): + buffer_ = mark.get_buffer() + end_iter = buffer_.get_iter_at_mark(mark) + anchor = buffer_.create_child_anchor(end_iter) + img = TextViewImage(anchor, nick) + img.set_from_pixbuf(pixbuf) + img.show() + self.textview.tv.add_child_at_anchor(img, anchor) + + def insert_pic_preview(self, mark, special_text, url, tag): pixbuf = self.get_pixbuf_from_url( url, self.plugin.config[ 'PREVIEW_SIZE']) if pixbuf: @@ -415,6 +419,9 @@ img.set_from_pixbuf(pixbuf) img.show() self.textview.tv.add_child_at_anchor(img, anchor) + buffer_ = mark.get_buffer() + end_iter = buffer_.get_iter_at_mark(mark) + buffer_.insert_with_tags(end_iter, special_text, tag) def get_iter_and_tag(self, tag_name): buffer_ = self.textview.tv.get_buffer() @@ -430,17 +437,15 @@ _id = str(j[0]['uid']) except urllib2.HTTPError, e: return + pixbuf = self.get_avatar(_id, nick) buffer_ = mark.get_buffer() end_iter = buffer_.get_iter_at_mark(mark) - pixbuf = self.get_avatar(_id, nick) anchor = buffer_.create_child_anchor(end_iter) img = TextViewImage(anchor, nick) img.set_from_pixbuf(pixbuf) img.show() self.textview.tv.add_child_at_anchor(img, anchor) - - def get_avatar(self, uid, nick, need_check=None): # search avatar in cache or download from juick.com pic = uid + '.png' diff -r 3c625f96aafb -r 76201ae6c611 url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Mon Sep 16 21:46:41 2013 +0400 +++ b/url_image_preview/url_image_preview.py Tue Sep 17 12:51:59 2013 +0400 @@ -50,7 +50,7 @@ iter_=None) def print_special_text1(self, chat_control, special_text, other_tags=None, - graphics=True): + graphics=True, iter_=None): for control in self.controls: if control.chat_control == chat_control: control.disconnect_from_chat_control()

1 0

gajim: typo
by Gajim 17 Sep '13

17 Sep '13

changeset e465c8ca7a57 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=e465c8ca7a57 description: typo diffstat: src/common/connection.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (12 строк): diff -r 39450b24e373 -r e465c8ca7a57 src/common/connection.py --- a/src/common/connection.py Tue Sep 17 12:24:28 2013 +0400 +++ b/src/common/connection.py Tue Sep 17 12:41:32 2013 +0400 @@ -1769,7 +1769,7 @@ gajim.nec.push_incoming_event(InformationEvent(None, conn=self, level='error', pri_txt=_('Invisibility not supported'), sec_txt=_('Account %s doesn\'t support invisibility.') % \ - self.name))) + self.name)) return # If we are already connected, and privacy rules are supported, send # offline presence first as it's required by XEP-0126

1 0

gajim: Typo. Fixes #7479
by Gajim 17 Sep '13

17 Sep '13

changeset 39450b24e373 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=39450b24e373 description: Typo. Fixes #7479 diffstat: src/common/connection.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (12 строк): diff -r dcf6d08b40cb -r 39450b24e373 src/common/connection.py --- a/src/common/connection.py Mon Sep 16 21:14:31 2013 +0400 +++ b/src/common/connection.py Tue Sep 17 12:24:28 2013 +0400 @@ -1767,7 +1767,7 @@ gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show=gajim.SHOW_LIST[self.connected])) gajim.nec.push_incoming_event(InformationEvent(None, conn=self, - level='error', pri_txt=_('Invisibility not supported', + level='error', pri_txt=_('Invisibility not supported'), sec_txt=_('Account %s doesn\'t support invisibility.') % \ self.name))) return

1 0

gajim-plugins: JuickPlugin.UrlImagePreviewPlugin.UrlShortenerPlu...
by Gajim Plugins 16 Sep '13

16 Sep '13

changeset 3c625f96aafb in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=3c625f96aafb description: JuickPlugin.UrlImagePreviewPlugin.UrlShortenerPlugin support latest gajim diffstat: juick/manifest.ini | 3 ++- juick/plugin.py | 21 ++++++++++++--------- url_image_preview/manifest.ini | 3 ++- url_image_preview/url_image_preview.py | 9 ++++++--- url_shortener/manifest.ini | 3 ++- url_shortener/url_shortener.py | 8 +++++--- 6 файлов изменено, 29 вставок(+), 18 удалений(-) различия (170 строк): diff -r a3d4f980696b -r 3c625f96aafb juick/manifest.ini --- a/juick/manifest.ini Mon Sep 16 15:04:37 2013 +0400 +++ b/juick/manifest.ini Mon Sep 16 21:46:41 2013 +0400 @@ -1,10 +1,11 @@ [info] name: Juick short_name: Juick -version: 0.9.5 +version: 0.9.6 description: Clickable Juick links , Juick nicks, preview Juick picturs. The key combination alt + up in the textbox allow insert the number of last message (comment or topic). authors: Denis Fomin <fominde(a)gmail.com> evgen <drujebober(a)gmail.com> homepage: http://trac-plugins.gajim.org/wiki/JuickPlugin +min_gajim_version: 0.16 max_gajim_version: 0.16.9 diff -r a3d4f980696b -r 3c625f96aafb juick/plugin.py --- a/juick/plugin.py Mon Sep 16 15:04:37 2013 +0400 +++ b/juick/plugin.py Mon Sep 16 21:46:41 2013 +0400 @@ -88,14 +88,16 @@ if self.conn: self.conn.close() - def print_special_text(self, tv, special_text, other_tags, graphics=True): + def print_special_text(self, tv, special_text, other_tags, graphics=True, + iter_=None): for control in self.controls: if control.chat_control.conv_textview != tv: continue - control.print_special_text(special_text, other_tags, graphics=True) + control.print_special_text(special_text, other_tags, graphics, + iter_) def print_special_text1(self, chat_control, special_text, other_tags=None, - graphics=True): + graphics=True, iter_=None): for control in self.controls: if control.chat_control == chat_control: control.disconnect_from_chat_control() @@ -327,20 +329,21 @@ if kind == 'juick_nick': self.on_insert(widget, 'PM %s' % word.rstrip(':')) - def print_special_text(self, special_text, other_tags, graphics=True): + def print_special_text(self, special_text, other_tags, graphics=True, + iter__=None): if gajim.interface.sharp_slash_re.match(special_text): # insert post num #123456// buffer_, iter_, tag = self.get_iter_and_tag('sharp_slash') - buffer_.insert_with_tags(iter_, special_text, tag) + buffer_.insert_with_tags(iter__, special_text, tag) self.last_juick_num = special_text self.textview.plugin_modified = True return if gajim.interface.juick_nick_re.match(special_text): # insert juick nick @nickname//// buffer_, iter_, tag = self.get_iter_and_tag('juick_nick') - mark = buffer_.create_mark(None, iter_, True) + mark = buffer_.create_mark(None, iter__, True) nick = special_text[1:].rstrip(':') - buffer_.insert_with_tags(iter_, special_text, tag) + buffer_.insert_with_tags(iter__, special_text, tag) # insert avatars if not self.plugin.config['SHOW_AVATARS']: self.textview.plugin_modified = True @@ -391,8 +394,8 @@ self.plugin.config['SHOW_PREVIEW']: # show pics preview buffer_, iter_, tag = self.get_iter_and_tag('url') - mark = buffer_.create_mark(None, iter_, True) - buffer_.insert_with_tags(iter_, special_text, tag) + mark = buffer_.create_mark(None, iter__, True) + buffer_.insert_with_tags(iter__, special_text, tag) uid = special_text.split('/')[-1] url = "http://i.juick.com/photos-512/%s" % uid gajim.thread_interface(self.insert_pic_preview, [mark, special_text, diff -r a3d4f980696b -r 3c625f96aafb url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Mon Sep 16 15:04:37 2013 +0400 +++ b/url_image_preview/manifest.ini Mon Sep 16 21:46:41 2013 +0400 @@ -1,10 +1,11 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.5.3 +version: 0.5.4 description: Url image preview in chatbox. Based on patch in <a href="http://trac.gajim.org/attachment/ticket/5300">ticket #5300</a>. authors = Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> homepage = http://trac-plugins.gajim.org/wiki/UrlImagePreviewPlugin +min_gajim_version: 0.16 max_gajim_version: 0.16.9 diff -r a3d4f980696b -r 3c625f96aafb url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Mon Sep 16 15:04:37 2013 +0400 +++ b/url_image_preview/url_image_preview.py Mon Sep 16 21:46:41 2013 +0400 @@ -41,11 +41,13 @@ control.disconnect_from_chat_control() self.controls = [] - def print_special_text(self, tv, special_text, other_tags, graphics=True): + def print_special_text(self, tv, special_text, other_tags, graphics=True, + iter_=None): for control in self.controls: if control.chat_control.conv_textview != tv: continue - control.print_special_text(special_text, other_tags, graphics=True) + control.print_special_text(special_text, other_tags, graphics=True, + iter_=None) def print_special_text1(self, chat_control, special_text, other_tags=None, graphics=True): @@ -60,7 +62,8 @@ self.chat_control = chat_control self.textview = self.chat_control.conv_textview - def print_special_text(self, special_text, other_tags, graphics=True): + def print_special_text(self, special_text, other_tags, graphics=True, + iter_=None): if not gajim.interface.basic_pattern_re.match(special_text): return # remove qip bbcode diff -r a3d4f980696b -r 3c625f96aafb url_shortener/manifest.ini --- a/url_shortener/manifest.ini Mon Sep 16 15:04:37 2013 +0400 +++ b/url_shortener/manifest.ini Mon Sep 16 21:46:41 2013 +0400 @@ -1,7 +1,7 @@ [info] name: Url Shortener short_name: url_shortener -version: 0.3.4 +version: 0.3.5 description: Plugin that allows users to shorten a long URL in messages. For example, you can turn this link: <a href="http://maps.google.com/maps?f=d&saddr=New+York+Penn+Station&daddr=9…">http://maps.google.com/maps?f=d&saddr=New+York+Penn+Station&daddr=9…</a> @@ -9,4 +9,5 @@ <a href="http://bit.ly/CUjV">http://bit.ly/CUjV</a> authors: Denis Fomin <fominde(a)gmail.com> homepage: http://trac-plugins.gajim.org/wiki/UrlShortenerPlugin +min_gajim_version: 0.16 max_gajim_version: 0.16.9 diff -r a3d4f980696b -r 3c625f96aafb url_shortener/url_shortener.py --- a/url_shortener/url_shortener.py Mon Sep 16 15:04:37 2013 +0400 +++ b/url_shortener/url_shortener.py Mon Sep 16 21:46:41 2013 +0400 @@ -79,14 +79,15 @@ control.disconnect_from_chat_control() self.controls = [] - def print_special_text(self, tv, special_text, other_tags, graphics=True): + def print_special_text(self, tv, special_text, other_tags, graphics=True, + iter_=None): for control in self.controls: if control.chat_control.conv_textview != tv: continue control.print_special_text(special_text, other_tags, graphics=True) def print_special_text1(self, chat_control, special_text, other_tags=None, - graphics=True): + graphics=True, iter_=None): for control in self.controls: if control.chat_control == chat_control: control.disconnect_from_chat_control() @@ -103,7 +104,8 @@ self.on_textview_motion_notify_event) self.chat_control.handlers[self.id_] = self.textview.tv - def print_special_text(self, special_text, other_tags, graphics=True): + def print_special_text(self, special_text, other_tags, graphics=True, + iter_=None): if not self.plugin.active: return is_xhtml_link = None

1 0

gajim: Add iter to print_special_text gui_extension_point
by Gajim 16 Sep '13

16 Sep '13

changeset dcf6d08b40cb in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=dcf6d08b40cb description: Add iter to print_special_text gui_extension_point diffstat: src/conversation_textview.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (12 строк): diff -r f0bc333e577e -r dcf6d08b40cb src/conversation_textview.py --- a/src/conversation_textview.py Sun Sep 15 11:15:29 2013 +0200 +++ b/src/conversation_textview.py Mon Sep 16 21:14:31 2013 +0400 @@ -1094,7 +1094,7 @@ # PluginSystem: adding GUI extension point for ConversationTextview self.plugin_modified = False gajim.plugin_manager.gui_extension_point('print_special_text', self, - special_text, other_tags, graphics) + special_text, other_tags, graphics, iter_) if self.plugin_modified: return

1 0

gajim: apply modification to markedmsgcolor immediatly. Fixes #7436
by Gajim 16 Sep '13

16 Sep '13

changeset 7667dcdbbdd1 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7667dcdbbdd1 description: apply modification to markedmsgcolor immediatly. Fixes #7436 diffstat: src/conversation_textview.py | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diffs (28 lines): diff -r 32f72fc3a7cc -r 7667dcdbbdd1 src/conversation_textview.py --- a/src/conversation_textview.py Sun Sep 15 11:15:29 2013 +0200 +++ b/src/conversation_textview.py Mon Sep 16 16:48:07 2013 +0200 @@ -278,10 +278,10 @@ tag = buffer_.create_tag(tagname) tag.set_property('foreground', color) - tag = buffer_.create_tag('marked') + self.tagMarked = buffer_.create_tag('marked') color = gajim.config.get('markedmsgcolor') - tag.set_property('foreground', color) - tag.set_property('weight', pango.WEIGHT_BOLD) + self.tagMarked.set_property('foreground', color) + self.tagMarked.set_property('weight', pango.WEIGHT_BOLD) tag = buffer_.create_tag('time_sometimes') tag.set_property('foreground', 'darkgrey') @@ -341,7 +341,9 @@ self.tagIn.set_property('foreground', gajim.config.get('inmsgcolor')) self.tagOut.set_property('foreground', gajim.config.get('outmsgcolor')) self.tagStatus.set_property('foreground', - gajim.config.get('statusmsgcolor')) + gajim.config.get('statusmsgcolor')) + self.tagMarked.set_property('foreground', + gajim.config.get('markedmsgcolor')) color = gajim.config.get('urlmsgcolor') self.tv.tagURL.set_property('foreground', color) self.tv.tagMail.set_property('foreground', color)

1 0

gajim-plugins: ThemeSwitcherPlugin. Fix fill liststore
by Gajim Plugins 16 Sep '13

16 Sep '13

changeset a3d4f980696b in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=a3d4f980696b description: ThemeSwitcherPlugin. Fix fill liststore diffstat: theme_switcher/config_dialog.ui | 1 - theme_switcher/theme_switcher.py | 17 +++++++++++------ 2 файлов изменено, 11 вставок(+), 7 удалений(-) различия (53 строк): diff -r bc488e4cdc02 -r a3d4f980696b theme_switcher/config_dialog.ui --- a/theme_switcher/config_dialog.ui Mon Sep 16 14:23:34 2013 +0400 +++ b/theme_switcher/config_dialog.ui Mon Sep 16 15:04:37 2013 +0400 @@ -27,7 +27,6 @@ <child> <object class="GtkComboBox" id="theme_combobox"> <property name="visible">True</property> - <signal name="changed" handler="on_theme_combobox_changed"/> </object> <packing> <property name="position">1</property> diff -r bc488e4cdc02 -r a3d4f980696b theme_switcher/theme_switcher.py --- a/theme_switcher/theme_switcher.py Mon Sep 16 14:23:34 2013 +0400 +++ b/theme_switcher/theme_switcher.py Mon Sep 16 15:04:37 2013 +0400 @@ -42,12 +42,13 @@ self.child.pack_start(hbox) self.xml.connect_signals(self) - self.preset_combo = self.xml.get_object('theme_combobox') - self.preset_liststore = gtk.ListStore(str) - self.preset_combo.set_model(self.preset_liststore) + theme_combo = self.xml.get_object('theme_combobox') + self.theme_liststore = gtk.ListStore(str) + theme_combo.set_model(self.theme_liststore) cellrenderer = gtk.CellRendererText() - self.preset_combo.pack_start(cellrenderer, True) - self.preset_combo.add_attribute(cellrenderer, 'text', 0) + theme_combo.pack_start(cellrenderer, True) + theme_combo.add_attribute(cellrenderer, 'text', 0) + self._id = theme_combo.connect('changed', self.on_theme_combobox_changed) @log_calls('ThemeSwitcherPluginConfigDialog') def on_run(self): @@ -55,6 +56,10 @@ from os.path import join theme_d = gtk.rc_get_theme_dir() theme_names = [] + theme_combo = self.xml.get_object('theme_combobox') + theme_combo.handler_block(self._id) + self.theme_liststore.clear() + theme_combo.handler_unblock(self._id) for theme in listdir(theme_d): try: if "gtk-2.0" in listdir(join(theme_d, theme)): @@ -64,7 +69,7 @@ theme_names = sorted(theme_names) for name in theme_names: - self.preset_liststore.append((name,)) + self.theme_liststore.append((name,)) def on_reset_theme_button_clicked(self, widget): settings = gtk.settings_get_default()

1 0

gajim-plugins: Theme Switcher Plugin. Fixes #72
by Gajim Plugins 16 Sep '13

16 Sep '13

changeset bc488e4cdc02 in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=bc488e4cdc02 description: Theme Switcher Plugin. Fixes #72 diffstat: theme_switcher/__init__.py | 1 + theme_switcher/config_dialog.ui | 85 ++++++++++++++++++++++++++++++++++++++ theme_switcher/manifest.ini | 8 +++ theme_switcher/theme_switcher.png | Bin theme_switcher/theme_switcher.py | 81 ++++++++++++++++++++++++++++++++++++ 5 файлов изменено, 175 вставок(+), 0 удалений(-) различия (193 строк): diff -r 60595dfa0f19 -r bc488e4cdc02 theme_switcher/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/theme_switcher/__init__.py Mon Sep 16 14:23:34 2013 +0400 @@ -0,0 +1,1 @@ +from theme_switcher import ThemeSwitcherPlugin diff -r 60595dfa0f19 -r bc488e4cdc02 theme_switcher/config_dialog.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/theme_switcher/config_dialog.ui Mon Sep 16 14:23:34 2013 +0400 @@ -0,0 +1,85 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> +  + <object class="GtkWindow" id="window1"> + <child> + <object class="GtkVBox" id="vbox2"> + <property name="visible">True</property> + <property name="border_width">9</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <child> + <object class="GtkLabel" id="theme"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Theme:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">7</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="theme_combobox"> + <property name="visible">True</property> + <signal name="changed" handler="on_theme_combobox_changed"/> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="reset_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="xalign">0</property> + <signal name="clicked" handler="on_reset_theme_button_clicked"/> + <child> + <object class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <child> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-revert-to-saved</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label17"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Reset to default</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">7</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + </object> +</interface> diff -r 60595dfa0f19 -r bc488e4cdc02 theme_switcher/manifest.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/theme_switcher/manifest.ini Mon Sep 16 14:23:34 2013 +0400 @@ -0,0 +1,8 @@ +[info] +name: Theme Switcher +short_name: theme_switcher +version: 0.0.1 +description: Change the active GTK+ theme. +authors: Denis Fomin <fominde(a)gmail.com> +homepage: http://trac-plugins.gajim.org/wiki/ThemeSwitcherPlugin +max_gajim_version: 0.16.9 diff -r 60595dfa0f19 -r bc488e4cdc02 theme_switcher/theme_switcher.png Binary file theme_switcher/theme_switcher.png has changed diff -r 60595dfa0f19 -r bc488e4cdc02 theme_switcher/theme_switcher.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/theme_switcher/theme_switcher.py Mon Sep 16 14:23:34 2013 +0400 @@ -0,0 +1,81 @@ +# -*- coding: utf-8 -*- +## + +import gtk + +from plugins.gui import GajimPluginConfigDialog +from plugins import GajimPlugin +from plugins.helpers import log_calls +from common import gajim + + +class ThemeSwitcherPlugin(GajimPlugin): + @log_calls('ThemeSwitcherPlugin') + def init(self): + self.config_dialog = ThemeSwitcherPluginConfigDialog(self) + settings = gtk.settings_get_default() + default_theme = settings.get_property('gtk-theme-name') + self.config['DEFAULT_THEME'] = default_theme + self.theme = default_theme + self.config_default_values = {'THEME': (default_theme, '')} + + @log_calls('ThemeSwitcherPlugin') + def activate(self): + settings = gtk.settings_get_default() + settings.set_property('gtk-theme-name', self.config['THEME']) + + @log_calls('ThemeSwitcherPlugin') + def deactivate(self): + settings = gtk.settings_get_default() + settings.set_property('gtk-theme-name', self.config['DEFAULT_THEME']) + + +class ThemeSwitcherPluginConfigDialog(GajimPluginConfigDialog): + def init(self): + self.GTK_BUILDER_FILE_PATH = self.plugin.local_file_path( + 'config_dialog.ui') + self.xml = gtk.Builder() + self.xml.set_translation_domain('gajim_plugins') + self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH, + ['vbox2']) + hbox = self.xml.get_object('vbox2') + self.child.pack_start(hbox) + self.xml.connect_signals(self) + + self.preset_combo = self.xml.get_object('theme_combobox') + self.preset_liststore = gtk.ListStore(str) + self.preset_combo.set_model(self.preset_liststore) + cellrenderer = gtk.CellRendererText() + self.preset_combo.pack_start(cellrenderer, True) + self.preset_combo.add_attribute(cellrenderer, 'text', 0) + + @log_calls('ThemeSwitcherPluginConfigDialog') + def on_run(self): + from os import listdir + from os.path import join + theme_d = gtk.rc_get_theme_dir() + theme_names = [] + for theme in listdir(theme_d): + try: + if "gtk-2.0" in listdir(join(theme_d, theme)): + theme_names.append(theme) + except: + pass + + theme_names = sorted(theme_names) + for name in theme_names: + self.preset_liststore.append((name,)) + + def on_reset_theme_button_clicked(self, widget): + settings = gtk.settings_get_default() + settings.set_property('gtk-theme-name', + self.plugin.config['DEFAULT_THEME']) + self.plugin.config['THEME'] = self.plugin.config['DEFAULT_THEME'] + + def on_theme_combobox_changed(self, widget): + model = widget.get_model() + active = widget.get_active() + self.theme = model[active][0].decode('utf-8') + settings = gtk.settings_get_default() + settings.set_property('gtk-theme-name', self.theme) + self.plugin.config['THEME'] = self.theme

1 0

gajim: set title of fingerprint dialog. Fixes #7239
by Gajim 15 Sep '13

15 Sep '13

changeset a7adb868935e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=a7adb868935e description: set title of fingerprint dialog. Fixes #7239 diffstat: src/dialogs.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 7ea8d7724463 -r a7adb868935e src/dialogs.py --- a/src/dialogs.py Thu Sep 12 17:41:33 2013 +0200 +++ b/src/dialogs.py Fri Sep 13 07:30:09 2013 +0200 @@ -5465,6 +5465,7 @@ YesNoDialog.__init__(self, pritext, sectext=sectext, checktext=checktext, on_response_yes=on_response_yes, on_response_no=on_response_no) + self.set_title(_('SSL Certificate Verification for %s') % account) b = Gtk.Button(_('View cert...')) b.connect('clicked', self.on_cert_clicked) b.show_all() @@ -5472,8 +5473,7 @@ area.pack_start(b, True, True, 0) def on_cert_clicked(self, button): - d = CertificatDialog(self, self.account, self.cert) - d.set_title(_('Certificate')) + CertificatDialog(self, self.account, self.cert) class SSLErrorDialog(ConfirmationDialogDoubleCheck): def __init__(self, account, certificate, pritext, sectext, checktext1,

1 0

gajim: prevent gtk warning
by Gajim 15 Sep '13

15 Sep '13

changeset b7170b76360d in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=b7170b76360d description: prevent gtk warning diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (19 lines): diff -r a7adb868935e -r b7170b76360d src/dialogs.py --- a/src/dialogs.py Fri Sep 13 07:30:09 2013 +0200 +++ b/src/dialogs.py Sun Sep 15 12:11:18 2013 +0200 @@ -5426,7 +5426,6 @@ class CertificatDialog(InformationDialog): def __init__(self, parent, account, cert): - self.set_title(_('Certificate for account %s') % account) issuer = cert.get_issuer() subject = cert.get_subject() InformationDialog.__init__(self, @@ -5455,6 +5454,7 @@ 'io': cert.get_notBefore(), 'eo': cert.get_notAfter(), 'sha1': cert.digest('sha1')}) self.set_transient_for(parent) + self.set_title(_('Certificate for account %s') % account) class CheckFingerprintDialog(YesNoDialog):

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits