Commits

commits@gajim.org

17632 discussions

gajim: Store optional fields correctly in Bookmarks
by Gajim 10 Oct '16

10 Oct '16

changeset c9ab416e87df in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c9ab416e87df description: Store optional fields correctly in Bookmarks diffstat: src/common/connection.py | 27 +++++++++++++--------- src/common/connection_handlers_events.py | 37 ++++++++++++++++++++----------- 2 files changed, 40 insertions(+), 24 deletions(-) diffs (126 lines): diff -r f196f08e65f9 -r c9ab416e87df src/common/connection.py --- a/src/common/connection.py Mon Oct 10 15:22:51 2016 +0200 +++ b/src/common/connection.py Mon Oct 10 19:10:18 2016 +0200 @@ -2474,7 +2474,8 @@ """ if not gajim.account_is_connected(self.name): return - if self.pubsub_supported and storage_type != 'xml': + if self.pubsub_supported and self.pubsub_publish_options_supported \ + and storage_type != 'xml': self.send_pb_retrieve('', 'storage:bookmarks') # some server (ejabberd) are so slow to answer that we request via XML # if we don't get answer in the next 30 seconds @@ -2489,15 +2490,17 @@ storage_type can be set to 'pubsub' or 'xml' so store in only one method else it will be stored on both """ + NS_GAJIM_BM = 'xmpp:gajim.org/bookmarks' if not gajim.account_is_connected(self.name): return iq = nbxmpp.Node(tag='storage', attrs={'xmlns': 'storage:bookmarks'}) for bm in self.bookmarks: - iq2 = iq.addChild(name = "conference") + iq2 = iq.addChild(name="conference") iq2.setAttr('jid', bm['jid']) iq2.setAttr('autojoin', bm['autojoin']) - iq2.setAttr('minimize', bm['minimize']) iq2.setAttr('name', bm['name']) + iq2.setTag('minimize', namespace=NS_GAJIM_BM). \ + setData(bm['minimize']) # Only add optional elements if not empty # Note: need to handle both None and '' as empty # thus shouldn't use "is not None" @@ -2506,21 +2509,23 @@ if bm.get('password', None): iq2.setTagData('password', bm['password']) if bm.get('print_status', None): - iq2.setTagData('print_status', bm['print_status']) + iq2.setTag('print_status', namespace=NS_GAJIM_BM). \ + setData(bm['print_status']) - if self.pubsub_supported and self.pubsub_publish_options_supported and \ - storage_type != 'xml': + if self.pubsub_supported and self.pubsub_publish_options_supported and\ + storage_type != 'xml': options = nbxmpp.Node(nbxmpp.NS_DATA + ' x', - attrs={'type': 'submit'}) - f = options.addChild('field', attrs={'var': 'FORM_TYPE', - 'type': 'hidden'}) + attrs={'type': 'submit'}) + f = options.addChild('field', + attrs={'var': 'FORM_TYPE', 'type': 'hidden'}) f.setTagData('value', nbxmpp.NS_PUBSUB_PUBLISH_OPTIONS) - f = options.addChild('field', attrs={'var': 'pubsub#persist_items'}) + f = options.addChild('field', + attrs={'var': 'pubsub#persist_items'}) f.setTagData('value', 'true') f = options.addChild('field', attrs={'var': 'pubsub#access_model'}) f.setTagData('value', 'whitelist') self.send_pb_publish('', 'storage:bookmarks', iq, 'current', - options=options) + options=options) if storage_type != 'pubsub': iqA = nbxmpp.Iq(typ='set') iqB = iqA.addChild(name='query', namespace=nbxmpp.NS_PRIVATE) diff -r f196f08e65f9 -r c9ab416e87df src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Oct 10 15:22:51 2016 +0200 +++ b/src/common/connection_handlers_events.py Mon Oct 10 19:10:18 2016 +0200 @@ -499,33 +499,44 @@ self.namespace = self.storage_node.getNamespace() return True + class BookmarksHelper: def parse_bookmarks(self): self.bookmarks = [] + NS_GAJIM_BM = 'xmpp:gajim.org/bookmarks' confs = self.storage_node.getTags('conference') for conf in confs: autojoin_val = conf.getAttr('autojoin') - if autojoin_val is None: # not there (it's optional) + if not autojoin_val: # not there (it's optional) autojoin_val = False - minimize_val = conf.getAttr('minimize') - if minimize_val is None: # not there (it's optional) - minimize_val = False - print_status = conf.getTagData('print_status') + minimize_val = conf.getTag('minimize', namespace=NS_GAJIM_BM) + if not minimize_val: # not there, try old Gajim behaviour + minimize_val = conf.getAttr('minimize') + if not minimize_val: # not there (it's optional) + minimize_val = False + else: + minimize_val = minimize_val.getData() + + print_status = conf.getTag('print_status', namespace=NS_GAJIM_BM) if not print_status: print_status = conf.getTagData('show_status') + else: + print_status = print_status.getData() + try: jid = helpers.parse_jid(conf.getAttr('jid')) except helpers.InvalidFormat: - log.warning('Invalid JID: %s, ignoring it' % conf.getAttr('jid')) + log.warning('Invalid JID: %s, ignoring it' + % conf.getAttr('jid')) continue + bm = {'name': conf.getAttr('name'), - 'jid': jid, - 'autojoin': autojoin_val, - 'minimize': minimize_val, - 'password': conf.getTagData('password'), - 'nick': conf.getTagData('nick'), - 'print_status': print_status} - + 'jid': jid, + 'autojoin': autojoin_val, + 'minimize': minimize_val, + 'password': conf.getTagData('password'), + 'nick': conf.getTagData('nick'), + 'print_status': print_status} bm_jids = [b['jid'] for b in self.bookmarks] if bm['jid'] not in bm_jids:

1 0

gajim-plugins: Fix url_image_preview for gtk3
by Gajim Plugins 10 Oct '16

10 Oct '16

changeset 1ef6c127f3ab in /home/hg/repos/gajim-plugins author: Linus Heckemann <git(a)sphalerite.org> branches: gtk3 details:gajim-plugins?cmd=changeset;node=1ef6c127f3ab description: Fix url_image_preview for gtk3 diffstat: url_image_preview/manifest.ini | 2 +- url_image_preview/url_image_preview.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diffs (25 lines): diff -r 506034128f9a -r 1ef6c127f3ab url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Thu Oct 06 19:33:44 2016 +0200 +++ b/url_image_preview/manifest.ini Mon Oct 10 14:28:41 2016 +0100 @@ -1,7 +1,7 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.5.3 +version: 0.5.4 description: Url image preview in chatbox. authors = Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> diff -r 506034128f9a -r 1ef6c127f3ab url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Thu Oct 06 19:33:44 2016 +0200 +++ b/url_image_preview/url_image_preview.py Mon Oct 10 14:28:41 2016 +0100 @@ -45,7 +45,8 @@ 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, + additional_data): for control in self.controls: if control.chat_control.conv_textview != tv: continue

1 0

gajim: start running tests
by Gajim 10 Oct '16

10 Oct '16

changeset f196f08e65f9 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f196f08e65f9 description: start running tests diffstat: src/common/contacts.py | 2 +- test/integration/test_roster.py | 2 +- test/lib/__init__.py | 4 ++-- test/runtests.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diffs (47 lines): diff -r 5cc25f8ab431 -r f196f08e65f9 src/common/contacts.py --- a/src/common/contacts.py Mon Oct 10 13:47:56 2016 +0100 +++ b/src/common/contacts.py Mon Oct 10 15:22:51 2016 +0200 @@ -238,7 +238,7 @@ self._metacontact_manager.add_account(account_name) def get_accounts(self): - return self._accounts.keys() + return list(self._accounts.keys()) def remove_account(self, account): del self._accounts[account] diff -r 5cc25f8ab431 -r f196f08e65f9 test/integration/test_roster.py --- a/test/integration/test_roster.py Mon Oct 10 13:47:56 2016 +0100 +++ b/test/integration/test_roster.py Mon Oct 10 15:22:51 2016 +0200 @@ -139,7 +139,7 @@ # Contacts kept their info contact = instances[0] - self.assertEquals(contact.groups, contacts[acc][jid]['groups'], + self.assertEquals(sorted(contact.groups), sorted(contacts[acc][jid]['groups']), msg='Group Missmatch') groups = contacts[acc][jid]['groups'] or ['General',] diff -r 5cc25f8ab431 -r f196f08e65f9 test/lib/__init__.py --- a/test/lib/__init__.py Mon Oct 10 13:47:56 2016 +0100 +++ b/test/lib/__init__.py Mon Oct 10 15:22:51 2016 +0200 @@ -23,8 +23,8 @@ pluginsconfigdir = configdir + '/pluginsconfig' # define _ for i18n -import __builtin__ -__builtin__._ = lambda x: x +import builtins +builtins._ = lambda x: x def setup_env(): # wipe config directory diff -r 5cc25f8ab431 -r f196f08e65f9 test/runtests.py --- a/test/runtests.py Mon Oct 10 13:47:56 2016 +0100 +++ b/test/runtests.py Mon Oct 10 15:22:51 2016 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 '''

1 0

gajim: Fix fuzzy time
by Gajim 10 Oct '16

10 Oct '16

changeset 5cc25f8ab431 in /home/hg/repos/gajim author: Linus Heckemann <git(a)sphalerite.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=5cc25f8ab431 description: Fix fuzzy time diffstat: src/conversation_textview.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r ecce88d89f6c -r 5cc25f8ab431 src/conversation_textview.py --- a/src/conversation_textview.py Sat Oct 08 17:38:10 2016 +0200 +++ b/src/conversation_textview.py Mon Oct 10 13:47:56 2016 +0100 @@ -1323,8 +1323,7 @@ self.last_time_printout = time.mktime(tim) end_iter = buffer_.get_end_iter() if gajim.config.get('print_time_fuzzy') > 0: - ft = self.fc.fuzzy_time(gajim.config.get('print_time_fuzzy'), tim) - tim_format = ft.decode(locale.getpreferredencoding()) + tim_format = self.fc.fuzzy_time(gajim.config.get('print_time_fuzzy'), tim) else: tim_format = self.get_time_to_show(tim, direction_mark) buffer_.insert_with_tags_by_name(end_iter, tim_format + '\n',

1 0

gajim-plugins: Fix leaking cleartext when using XHTML - Fixes #145
by Gajim Plugins 08 Oct '16

08 Oct '16

changeset c7c2e519ed63 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: details:gajim-plugins?cmd=changeset;node=c7c2e519ed63 description: Fix leaking cleartext when using XHTML - Fixes #145 diffstat: gotr/manifest.ini | 2 +- gotr/otrmodule.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diffs (25 lines): diff -r 35d50ee17f89 -r c7c2e519ed63 gotr/manifest.ini --- a/gotr/manifest.ini Sat Oct 08 20:42:16 2016 +0200 +++ b/gotr/manifest.ini Sun Oct 09 00:45:45 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Off-The-Record Encryption short_name: gotr -version: 1.9.4 +version: 1.9.5 description: Provide OTR encryption. Read <a href="https://github.com/python-otr/gajim-otr/wiki">https://github.com/python-otr/gajim-otr/wiki</a> before use. authors: Kjell Braden <afflux.gajim(a)pentabarf.de> homepage: http://gajim-otr.pentabarf.de diff -r 35d50ee17f89 -r c7c2e519ed63 gotr/otrmodule.py --- a/gotr/otrmodule.py Sat Oct 08 20:42:16 2016 +0200 +++ b/gotr/otrmodule.py Sun Oct 09 00:45:45 2016 +0200 @@ -623,7 +623,8 @@ sendMessage(potr.context.FRAGMENT_SEND_ALL_BUT_LAST, xhtml) if xhtml != encrypted_msg.strip(): #.strip() because sendMessage() adds whitespaces encrypted = True - event.msg_iq.setXHTML(encrypted_msg) + event.msg_iq.delChild('html') + event.msg_iq.setBody(encrypted_msg) elif body: body = escape(body).encode('utf8') encrypted_msg = self.us[event.conn.name].\

1 0

gajim-plugins: Fix backtrace when invalid url fragments are enco...
by Gajim Plugins 08 Oct '16

08 Oct '16

changeset 35d50ee17f89 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=35d50ee17f89 description: Fix backtrace when invalid url fragments are encountered... diffstat: url_image_preview/manifest.ini | 2 +- url_image_preview/url_image_preview.py | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diffs (39 lines): diff -r 32f4e9334baf -r 35d50ee17f89 url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Thu Sep 22 18:53:06 2016 +0200 +++ b/url_image_preview/manifest.ini Sat Oct 08 20:42:16 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.9.7 +version: 0.9.8 description: Displays a preview of links to images authors = Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> diff -r 32f4e9334baf -r 35d50ee17f89 url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Thu Sep 22 18:53:06 2016 +0200 +++ b/url_image_preview/url_image_preview.py Sat Oct 08 20:42:16 2016 +0200 @@ -200,13 +200,16 @@ encrypted = False if len(urlparts.fragment): fragment = [] - for i in range(0, len(urlparts.fragment), 2): - fragment.append(chr(int(urlparts.fragment[i:i + 2], 16))) - fragment = ''.join(fragment) - key = fragment[16:] - iv = fragment[:16] - if len(key) == 32 and len(iv) == 16: - encrypted = True + try: + for i in range(0, len(urlparts.fragment), 2): + fragment.append(chr(int(urlparts.fragment[i:i + 2], 16))) + fragment = ''.join(fragment) + key = fragment[16:] + iv = fragment[:16] + if len(key) == 32 and len(iv) == 16: + encrypted = True + except: + pass # file exists but thumbnail got deleted if os.path.exists(filepath) and not os.path.exists(thumbpath):

1 0

gajim: [pitchum] Fix datetime parsing - Fixes #8444
by Gajim 08 Oct '16

08 Oct '16

changeset ecce88d89f6c in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ecce88d89f6c description: [pitchum] Fix datetime parsing - Fixes #8444 diffstat: src/common/helpers.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diffs (18 lines): diff -r 015eb5fa57d9 -r ecce88d89f6c src/common/helpers.py --- a/src/common/helpers.py Wed Oct 05 23:05:34 2016 +0200 +++ b/src/common/helpers.py Sat Oct 08 17:38:10 2016 +0200 @@ -613,8 +613,12 @@ tim = tim.split('.')[0] tim = time.strptime(date + 'T' + tim, '%Y%m%dT%H:%M:%S') if zone: - tim = datetime.datetime.fromtimestamp(time.mktime(t)) - zone = strptime.time(zone, '%H:%M') + zone = zone.replace(':', '') + tim = datetime.datetime.fromtimestamp(time.mktime(tim)) + if len(zone) > 2: + zone = time.strptime(zone, '%H%M') + else: + zone = time.strptime(zone, '%H') zone = datetime.timedelta(hours=zone.tm_hour, minutes=zone.tm_min) tim += zone * sign tim = tim.timetuple()

1 0

gajim: [pitchum] Fix datetime parsing - Fixes #8444
by Gajim 08 Oct '16

08 Oct '16

changeset 81c36bd94098 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=81c36bd94098 description: [pitchum] Fix datetime parsing - Fixes #8444 diffstat: src/common/helpers.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diffs (18 lines): diff -r 2eace08470b1 -r 81c36bd94098 src/common/helpers.py --- a/src/common/helpers.py Mon Oct 03 23:02:23 2016 +0200 +++ b/src/common/helpers.py Sat Oct 08 17:40:39 2016 +0200 @@ -643,8 +643,12 @@ tim = tim.split('.')[0] tim = time.strptime(date + 'T' + tim, '%Y%m%dT%H:%M:%S') if zone: - tim = datetime.datetime.fromtimestamp(time.mktime(t)) - zone = strptime.time(zone, '%H:%M') + zone = zone.replace(':', '') + tim = datetime.datetime.fromtimestamp(time.mktime(tim)) + if len(zone) > 2: + zone = time.strptime(zone, '%H%M') + else: + zone = time.strptime(zone, '%H') zone = datetime.timedelta(hours=zone.tm_hour, minutes=zone.tm_min) tim += zone * sign tim = tim.timetuple()

1 0

gajim-plugins: Add handler back to install button
by Gajim Plugins 06 Oct '16

06 Oct '16

changeset 506034128f9a in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: gtk3 details:gajim-plugins?cmd=changeset;node=506034128f9a description: Add handler back to install button diffstat: plugin_installer/config_dialog.ui | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 662495872f61 -r 506034128f9a plugin_installer/config_dialog.ui --- a/plugin_installer/config_dialog.ui Thu Oct 06 00:06:59 2016 +0200 +++ b/plugin_installer/config_dialog.ui Thu Oct 06 19:33:44 2016 +0200 @@ -269,6 +269,7 @@ <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <signal name="clicked" handler="on_inslall_upgrade_clicked" swapped="no"/> <child> <object class="GtkHBox" id="hbox6"> <property name="visible">True</property>

1 0

gajim-plugins: Harmonize layout of Installed/Available tab
by Gajim Plugins 05 Oct '16

05 Oct '16

changeset 662495872f61 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: gtk3 details:gajim-plugins?cmd=changeset;node=662495872f61 description: Harmonize layout of Installed/Available tab diffstat: plugin_installer/config_dialog.ui | 117 +++++++++++++++++++++------------- plugin_installer/plugin_installer.py | 34 +++++---- 2 files changed, 92 insertions(+), 59 deletions(-) diffs (truncated from 335 to 300 lines): diff -r 2abf9d5ec2bb -r 662495872f61 plugin_installer/config_dialog.ui --- a/plugin_installer/config_dialog.ui Tue Sep 27 00:35:59 2016 +0200 +++ b/plugin_installer/config_dialog.ui Thu Oct 06 00:06:59 2016 +0200 @@ -6,8 +6,7 @@ <property name="can_focus">False</property> <child> <object class="GtkHPaned" id="hpaned2"> - <property name="width_request">1024</property> - <property name="height_request">480</property> + <property name="width_request">800</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="position">340</property> @@ -57,19 +56,22 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox4"> + <object class="GtkBox" id="vbox2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="plugin_name_label1"> + <object class="GtkLabel" id="plugin_name_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label"><empty></property> + <property name="label" translatable="yes">&lt;empty&gt;</property> <property name="selectable">True</property> - <property name="ellipsize">end</property> <property name="xalign">0</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="expand">False</property> @@ -78,15 +80,15 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox8"> + <object class="GtkBox" id="hbox1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label8"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Authors:</property> + <property name="label" translatable="yes">Version:</property> </object> <packing> <property name="expand">False</property> @@ -95,13 +97,11 @@ </packing> </child> <child> - <object class="GtkLabel" id="plugin_authors_label1"> + <object class="GtkLabel" id="plugin_version_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xpad">6</property> <property name="label"><empty></property> <property name="selectable">True</property> - <property name="ellipsize">end</property> <property name="xalign">0</property> </object> <packing> @@ -118,11 +118,53 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox9"> + <object class="GtkBox" id="hbox3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Authors:</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="plugin_authors_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label"><empty></property> + <property name="wrap_mode">word-char</property> + <property name="selectable">True</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="hbox4"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkLabel" id="label9"> + <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Homepage:</property> @@ -134,9 +176,7 @@ </packing> </child> <child> - <object class="GtkLinkButton" id="plugin_homepage_linkbutton1"> - <property name="label">button</property> - <property name="use_action_appearance">False</property> + <object class="GtkLinkButton" id="plugin_homepage_linkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -154,19 +194,20 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox5"> + <object class="GtkBox" id="vbox3"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkHBox" id="hbox10"> + <object class="GtkBox" id="hbox5"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkLabel" id="label10"> + <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Description:</property> @@ -178,18 +219,7 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> + <placeholder/> </child> </object> <packing> @@ -202,6 +232,7 @@ <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="shadow_type">in</property> <child> <placeholder/> </child> @@ -216,7 +247,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -236,11 +267,10 @@ <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="sensitive">False</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="receives_default">True</property> - <signal name="clicked" handler="on_inslall_upgrade_clicked" swapped="no"/> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox6"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -289,13 +319,13 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> </object> <packing> <property name="resize">True</property> - <property name="shrink">True</property> + <property name="shrink">False</property> </packing> </child> </object> @@ -307,15 +337,17 @@ <object class="GtkVBox" id="hbox111"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="spacing">6</property> <child> <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Ftp server:</property> + <property name="label" translatable="yes">FTP Server:</property> <property name="xalign">0</property> </object> <packing> @@ -379,9 +411,6 @@ <property name="position">2</property> </packing> </child> - <child> - <placeholder/> - </child> </object> </child> </object> diff -r 2abf9d5ec2bb -r 662495872f61 plugin_installer/plugin_installer.py --- a/plugin_installer/plugin_installer.py Tue Sep 27 00:35:59 2016 +0200 +++ b/plugin_installer/plugin_installer.py Thu Oct 06 00:06:59 2016 +0200 @@ -203,10 +203,10 @@ self.page_num = self.notebook.append_page(self.hpaned, Gtk.Label.new(_('Available'))) - widgets_to_extract = ('plugin_name_label1', - 'available_treeview', 'progressbar', 'inslall_upgrade_button', - 'plugin_authors_label1', 'plugin_authors_label1', - 'plugin_homepage_linkbutton1') + widgets_to_extract = ( + 'plugin_name_label', 'available_treeview', 'progressbar', + 'inslall_upgrade_button', 'plugin_authors_label', + 'plugin_homepage_linkbutton', 'plugin_version_label') for widget_name in widgets_to_extract: setattr(self, widget_name, self.xml.get_object(widget_name)) @@ -266,6 +266,7 @@ self._clear_available_plugin_info() self.plugin_description_textview = HtmlTextView() + self.plugin_description_textview.set_wrap_mode(Gtk.WrapMode.WORD) sw = self.xml.get_object('scrolledwindow1') sw.add(self.plugin_description_textview) @@ -375,19 +376,21 @@ model, iter = treeview_selection.get_selected() self.xml.get_object('scrolledwindow1').get_children()[0].destroy() self.plugin_description_textview = HtmlTextView() + self.plugin_description_textview.set_wrap_mode(Gtk.WrapMode.WORD) sw = self.xml.get_object('scrolledwindow1') sw.add(self.plugin_description_textview) sw.show_all() if iter: - self.plugin_name_label1.set_text(model.get_value(iter, C_NAME)) - self.plugin_authors_label1.set_text(model.get_value(iter, C_AUTHORS))

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