Commits December 2012

commits@gajim.org

3 participants
51 discussions

gajim: fix typo in nb translation
by Yann Leboulanger 30 Dec '12

30 Dec '12

changeset f007eddf81e9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f007eddf81e9 description: fix typo in nb translation diffstat: po/nb.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b080a751f6a9 -r f007eddf81e9 po/nb.po --- a/po/nb.po Sat Nov 03 12:19:02 2012 +0400 +++ b/po/nb.po Sun Dec 30 19:48:17 2012 +0100 @@ -1806,7 +1806,7 @@ #: ../data/gui/preferences_window.ui.h:29 msgid "Allow sound when I'm _busy" -msgstr "Tillat lys når jeg er _opptatt" +msgstr "Tillat lyd når jeg er _opptatt" #: ../data/gui/preferences_window.ui.h:30 #, fuzzy

1 0

gajim: ability to see out own video in the same time we send it ...
by Yann Leboulanger 30 Dec '12

30 Dec '12

changeset 666f9b2321dc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=666f9b2321dc description: ability to see out own video in the same time we send it and show both outging and incoming videos inside chat control diffstat: data/gui/chat_control.ui | 1154 +++++++++++++++++++------------------ data/gui/preferences_window.ui | 17 +- src/chat_control.py | 19 +- src/common/config.py | 1 + src/common/jingle.py | 8 +- src/common/jingle_rtp.py | 43 +- src/common/multimedia_helpers.py | 2 +- src/config.py | 5 + src/gajim.py | 2 +- 9 files changed, 689 insertions(+), 562 deletions(-) diffs (truncated from 1615 to 300 lines): diff -r 0653d16d8713 -r 666f9b2321dc data/gui/chat_control.ui --- a/data/gui/chat_control.ui Sun Dec 30 18:54:49 2012 +0100 +++ b/data/gui/chat_control.ui Sun Dec 30 18:59:48 2012 +0100 @@ -12,111 +12,171 @@ <property name="orientation">vertical</property> <property name="spacing">1</property> <child> - <object class="GtkVBox" id="vbox2"> + <object class="GtkHPaned" id="hpaned1"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">True</property> <child> - <object class="GtkAlignment" id="alignment"> + <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="left_padding">3</property> - <property name="right_padding">3</property> + <property name="orientation">vertical</property> <child> - <object class="GtkEventBox" id="banner_eventbox"> + <object class="GtkAlignment" id="alignment"> <property name="visible">True</property> + <property name="left_padding">3</property> + <property name="right_padding">3</property> <child> - <object class="GtkHBox" id="hbox3004"> + <object class="GtkEventBox" id="banner_eventbox"> <property name="visible">True</property> <child> - <object class="GtkImage" id="banner_status_image"> + <object class="GtkHBox" id="hbox3004"> <property name="visible">True</property> - <property name="ypad">5</property> - <property name="stock">gtk-missing-image</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="banner_vbox"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="border_width">5</property> - <property name="orientation">vertical</property> <child> - <object class="GtkLabel" id="banner_name_label"> + <object class="GtkImage" id="banner_status_image"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label"><span weight="heavy" size="large">Contact name</span></property> - <property name="use_markup">True</property> + <property name="ypad">5</property> + <property name="stock">gtk-missing-image</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">5</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkLabel" id="banner_label"> + <object class="GtkVBox" id="banner_vbox"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label">label</property> - <property name="use_markup">True</property> - <property name="selectable">True</property> - <signal name="populate_popup" handler="on_banner_label_populate_popup"/> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="spacing">4</property> - <child> - <object class="GtkImage" id="mood_image"> - <property name="no_show_all">True</property> - <property name="stock">None</property> - <property name="icon-size">1</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkImage" id="activity_image"> - <property name="no_show_all">True</property> - <property name="stock">None</property> - <property name="icon-size">1</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="border_width">5</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="banner_name_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label"><span weight="heavy" size="large">Contact name</span></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="banner_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label">label</property> + <property name="use_markup">True</property> + <property name="selectable">True</property> + <signal name="populate_popup" handler="on_banner_label_populate_popup"/> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="position">1</property> </packing> </child> <child> - <object class="GtkImage" id="tune_image"> - <property name="no_show_all">True</property> - <property name="stock">None</property> - <property name="icon-size">1</property> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="spacing">4</property> + <child> + <object class="GtkImage" id="mood_image"> + <property name="no_show_all">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="activity_image"> + <property name="no_show_all">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkImage" id="tune_image"> + <property name="no_show_all">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkEventBox" id="location_eventbox"> + <property name="visible">True</property> + <property name="visible_window">False</property> + <child> + <object class="GtkImage" id="location_image"> + <property name="no_show_all">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkImage" id="audio_banner_image"> + <property name="visible">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkImage" id="video_banner_image"> + <property name="visible">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment3"> + <property name="width_request">11</property> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">6</property> + </packing> + </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkEventBox" id="location_eventbox"> + <object class="GtkEventBox" id="avatar_eventbox"> <property name="visible">True</property> <property name="visible_window">False</property> <child> - <object class="GtkImage" id="location_image"> - <property name="no_show_all">True</property> + <object class="GtkImage" id="avatar_image"> + <property name="visible">True</property> <property name="stock">None</property> - <property name="icon-size">1</property> </object> </child> </object> @@ -126,109 +186,105 @@ <property name="position">3</property> </packing> </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox106"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> + <property name="height_request">60</property> + <property name="can_focus">True</property> + <property name="border_width">3</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <object class="GtkButton" id="authentication_button"> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="no_show_all">True</property> + <property name="relief">none</property> + <property name="focus_on_click">False</property> <child> - <object class="GtkImage" id="audio_banner_image"> - <property name="visible">True</property> - <property name="stock">None</property> + <object class="GtkImage" id="lock_image"> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="stock">gtk-dialog-authentication</property>

1 0

gajim: handle nbxmpp logging with -l option (-l .nbxmpp.client_n...
by Yann Leboulanger 30 Dec '12

30 Dec '12

changeset 0653d16d8713 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0653d16d8713 description: handle nbxmpp logging with -l option (-l .nbxmpp.client_nb=INFO for example) diffstat: src/common/logging_helpers.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (16 lines): diff -r 5e5b49871ae2 -r 0653d16d8713 src/common/logging_helpers.py --- a/src/common/logging_helpers.py Sun Dec 30 16:20:57 2012 +0100 +++ b/src/common/logging_helpers.py Sun Dec 30 18:54:49 2012 +0100 @@ -152,6 +152,12 @@ root_log.addHandler(consoleloghandler) root_log.propagate = False + # handle nbxmpp logs too + root_log = logging.getLogger('nbxmpp') + root_log.setLevel(logging.WARNING) + root_log.addHandler(consoleloghandler) + root_log.propagate = False + def set_loglevels(loglevels_string): parseAndSetLogLevels(loglevels_string)

1 0

gajim: fix order of farstream calls
by Yann Leboulanger 30 Dec '12

30 Dec '12

changeset 5e5b49871ae2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5e5b49871ae2 description: fix order of farstream calls diffstat: src/common/jingle_rtp.py | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diffs (40 lines): diff -r ef9f5c22d2c2 -r 5e5b49871ae2 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Wed Dec 26 18:41:31 2012 -0400 +++ b/src/common/jingle_rtp.py Sun Dec 30 16:20:57 2012 +0100 @@ -177,6 +177,15 @@ elif name == 'farstream-codecs-changed': if self.sent and self.p2psession.get_property('codecs'): self.send_description_info() + if self.transport.remote_candidates: + # those lines MUST be done after we get info on our + # codecs + self.p2pstream.add_remote_candidates( + self.transport.remote_candidates) + self.transport.remote_candidates = [] + self.p2pstream.set_property('direction', + farstream.DIRECTION_BOTH) + elif name == 'farstream-local-candidates-prepared': self.candidates_ready = True if self.is_ready(): @@ -234,11 +243,15 @@ def on_negotiated(self): if self.accepted: - if self.transport.remote_candidates: - self.p2pstream.add_remote_candidates(self.transport.remote_candidates) - self.transport.remote_candidates = [] - # TODO: farstream.DIRECTION_BOTH only if senders='both' - self.p2pstream.set_property('direction', farstream.DIRECTION_BOTH) + if self.p2psession.get_property('codecs'): + # those lines MUST be done after we get info on our codecs + if self.transport.remote_candidates: + self.p2pstream.add_remote_candidates( + self.transport.remote_candidates) + self.transport.remote_candidates = [] + # TODO: farstream.DIRECTION_BOTH only if senders='both' + self.p2pstream.set_property('direction', + farstream.DIRECTION_BOTH) JingleContent.on_negotiated(self) def __on_remote_codecs(self, stanza, content, error, action):

1 0

gajim: missing import
by Yann Leboulanger 28 Dec '12

28 Dec '12

changeset 200dc114404c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=200dc114404c description: missing import diffstat: src/gtkexcepthook.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r b0541ec1916f -r 200dc114404c src/gtkexcepthook.py --- a/src/gtkexcepthook.py Fri Dec 28 21:59:53 2012 +0100 +++ b/src/gtkexcepthook.py Fri Dec 28 22:00:24 2012 +0100 @@ -26,6 +26,7 @@ import threading from gi.repository import Gtk +from gi.repository import Gdk from gi.repository import Pango from common import i18n # installs _() function import dialogs

1 0

gajim: fix features window
by Yann Leboulanger 28 Dec '12

28 Dec '12

changeset b0541ec1916f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b0541ec1916f description: fix features window diffstat: src/features_window.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (29 lines): diff -r d1f06e203e45 -r b0541ec1916f src/features_window.py --- a/src/features_window.py Fri Dec 28 21:59:20 2012 +0100 +++ b/src/features_window.py Fri Dec 28 21:59:53 2012 +0100 @@ -41,7 +41,7 @@ def __init__(self): self.xml = gtkgui_helpers.get_gtk_builder('features_window.ui') self.window = self.xml.get_object('features_window') - self.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(gajim.interface.roster.window) treeview = self.xml.get_object('features_treeview') self.desc_label = self.xml.get_object('feature_desc_label') @@ -117,13 +117,13 @@ treeview.append_column(col) cell = Gtk.CellRendererToggle() cell.set_property('radio', True) - col.pack_start(cell, True, True, 0) - col.set_attributes(cell, active = 1) + col.pack_start(cell, True) + col.add_attribute(cell, 'active', 1) col = Gtk.TreeViewColumn(_('Feature')) treeview.append_column(col) cell = Gtk.CellRendererText() - col.pack_start(cell, True, True, 0) + col.pack_start(cell, True) col.add_attribute(cell, 'text', 0) # Fill model

1 0

gajim: correctly place tooltips
by Yann Leboulanger 28 Dec '12

28 Dec '12

changeset d1f06e203e45 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d1f06e203e45 description: correctly place tooltips diffstat: src/roster_window.py | 2 +- src/tooltips.py | 27 ++++++++------------------- 2 files changed, 9 insertions(+), 20 deletions(-) diffs (65 lines): diff -r 88fd3f2d7b80 -r d1f06e203e45 src/roster_window.py --- a/src/roster_window.py Fri Dec 28 21:58:49 2012 +0100 +++ b/src/roster_window.py Fri Dec 28 21:59:20 2012 +0100 @@ -2045,7 +2045,7 @@ # position of the treeview on the screen position = self.tree.get_window().get_origin() - self.tooltip.show_tooltip(contact, rect.height, position[1] + \ + self.tooltip.show_tooltip(contact, rect.height, position[2] + \ rect.y) else: self.tooltip.hide_tooltip() diff -r 88fd3f2d7b80 -r d1f06e203e45 src/tooltips.py --- a/src/tooltips.py Fri Dec 28 21:58:49 2012 +0100 +++ b/src/tooltips.py Fri Dec 28 21:59:20 2012 +0100 @@ -93,8 +93,7 @@ self.win.set_type_hint(Gdk.WindowTypeHint.TOOLTIP) self.win.set_events(Gdk.EventMask.POINTER_MOTION_MASK) -# self.win.connect_after('draw', self.on_draw) -# self.win.connect('size-request', self.on_size_request) + self.win.connect('size-allocate', self.on_size_allocate) self.win.connect('motion-notify-event', self.motion_notify_event) self.screen = self.win.get_screen() @@ -114,32 +113,22 @@ def motion_notify_event(self, widget, event): self.hide_tooltip() - def on_size_request(self, widget, requisition): - half_width = requisition.width / 2 + 1 + def on_size_allocate(self, widget, rect): + half_width = rect.width / 2 + 1 if self.preferred_position[0] < half_width: self.preferred_position[0] = 0 - elif self.preferred_position[0] + requisition.width > \ - self.screen.get_width() + half_width: - self.preferred_position[0] = self.screen.get_width() - \ - requisition.width + elif self.preferred_position[0] + rect.width > \ + self.screen.get_width() + half_width: + self.preferred_position[0] = self.screen.get_width() - rect.width elif not self.check_last_time: self.preferred_position[0] -= half_width - if self.preferred_position[1] + requisition.height > \ - self.screen.get_height(): + if self.preferred_position[1] + rect.height > self.screen.get_height(): # flip tooltip up - self.preferred_position[1] -= requisition.height + \ - self.widget_height + 8 + self.preferred_position[1] -= rect.height + self.widget_height + 8 if self.preferred_position[1] < 0: self.preferred_position[1] = 0 self.win.move(self.preferred_position[0], self.preferred_position[1]) -# def expose(self, widget, event): -# style = self.win.get_style() -# size = self.win.get_size() -# style.paint_shadow(self.win.window, Gtk.StateType.NORMAL, Gtk.ShadowType.OUT, -# None, self.win, 'tooltip', 0, 0, size[0], size[1]) -# return True - def show_tooltip(self, data, widget_height, widget_y_position): """ Show tooltip on widget

1 0

gajim: update README
by Yann Leboulanger 28 Dec '12

28 Dec '12

changeset 88fd3f2d7b80 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=88fd3f2d7b80 description: update README diffstat: README.html | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (24 lines): diff -r 897914764015 -r 88fd3f2d7b80 README.html --- a/README.html Thu Dec 27 21:58:52 2012 +0100 +++ b/README.html Fri Dec 28 21:58:49 2012 +0100 @@ -14,8 +14,9 @@ <h2>Runtime Requirements</h2> <ul> -<li>python2.5 or higher</li> -<li>pygtk2.22 or higher</li> +<li>python2.7 or higher</li> +<li>python-gi</li> +<li>gir1.2-gtk-3.0</li> <li>python-nbxmpp</li> </ul> @@ -28,7 +29,7 @@ <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li> <li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li> <li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li> -<li>gnome-python-desktop (for GnomeKeyring support as password storage)</li> +<li>gir1.2-gnomekeyring-1.0 for GnomeKeyring support as password storage</li> <li>kwalletcli (for support of KDE Wallet as password storage)</li> <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li> <li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li>

1 0

python-nbxmpp: prefer sha-1
by Jefry Lagrange 27 Dec '12

27 Dec '12

changeset b339386c6111 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=b339386c6111 description: prefer sha-1 diffstat: nbxmpp/protocol.py | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diffs (44 lines): diff -r 5812cedb80f0 -r b339386c6111 nbxmpp/protocol.py --- a/nbxmpp/protocol.py Mon Dec 24 14:55:21 2012 -0400 +++ b/nbxmpp/protocol.py Thu Dec 27 19:17:02 2012 -0400 @@ -1070,34 +1070,30 @@ hash_ = None # file_string can be a string or a file if type(file_string) == str: # if it is a string - if algo == 'md5': + if algo == 'sha-1': + hl = hashlib.sha1() + elif algo == 'md5': hl = hashlib.md5() - elif algo == 'sha-1': - hl = hashlib.sha1() elif algo == 'sha-256': hl = hashlib.sha256() elif algo == 'sha-512': hl = hashlib.sha512() - if hl: hl.update(file_string) hash_ = hl.hexdigest() else: # if it is a file - - if algo == 'md5': + if algo == 'sha-1': + hl = hashlib.sha1() + elif algo == 'md5': hl = hashlib.md5() - elif algo == 'sha-1': - hl = hashlib.sha1() elif algo == 'sha-256': hl = hashlib.sha256() elif algo == 'sha-512': hl = hashlib.sha512() - if hl: for line in file_string: hl.update(line) hash_ = hl.hexdigest() - return hash_ def addHash(self, hash_, algo):

1 0

gajim: more GTK3 fixes
by Yann Leboulanger 27 Dec '12

27 Dec '12

changeset 897914764015 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=897914764015 description: more GTK3 fixes diffstat: data/gui/add_new_contact_window.ui | 103 +++++++++--- data/gui/dubbleinput_dialog.ui | 114 +++++++----- data/gui/esession_info_window.ui | 144 +++++++++------- data/gui/input_dialog.ui | 115 +++++++----- data/gui/input_text_dialog.ui | 116 +++++++----- data/gui/roster_window.ui | 313 +++++++++++++++++++++++------------- src/chat_control.py | 12 +- src/conversation_textview.py | 6 +- src/dialogs.py | 8 +- src/disco.py | 2 +- src/filetransfers_window.py | 4 +- src/groupchat_control.py | 6 +- src/gtkgui_helpers.py | 21 +- src/history_manager.py | 2 +- src/htmltextview.py | 2 +- src/message_window.py | 8 +- src/profile_window.py | 2 +- src/roster_window.py | 20 +- src/statusicon.py | 3 +- src/tooltips.py | 16 +- src/vcard.py | 4 +- 21 files changed, 611 insertions(+), 410 deletions(-) diffs (truncated from 2282 to 300 lines): diff -r fedfe3ab9886 -r 897914764015 data/gui/add_new_contact_window.ui --- a/data/gui/add_new_contact_window.ui Thu Dec 27 00:11:48 2012 +0100 +++ b/data/gui/add_new_contact_window.ui Thu Dec 27 21:58:52 2012 +0100 @@ -1,22 +1,23 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> -  +  <object class="GtkWindow" id="add_new_contact_window"> + <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Add New Contact</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_add_new_contact_window_destroy"/> - <signal name="key_press_event" handler="on_add_new_contact_window_key_press_event"/> + <signal name="destroy" handler="on_add_new_contact_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_add_new_contact_window_key_press_event" swapped="no"/> <child> <object class="GtkVBox" id="vbox8"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="prompt_label"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> @@ -27,10 +28,12 @@ <child> <object class="GtkHBox" id="account_hbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="account_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">A_ccount:</property> <property name="use_underline">True</property> @@ -44,8 +47,9 @@ <child> <object class="GtkComboBox" id="account_combobox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="model">liststore3</property> - <signal name="changed" handler="on_account_combobox_changed"/> + <signal name="changed" handler="on_account_combobox_changed" swapped="no"/> <child> <object class="GtkCellRendererText" id="cellrenderertext3"/> <attributes> @@ -64,16 +68,20 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="protocol_hbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="protocol_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Protocol:</property> <property name="use_underline">True</property> @@ -88,7 +96,8 @@ <child> <object class="GtkComboBox" id="protocol_combobox"> <property name="visible">True</property> - <signal name="changed" handler="on_protocol_combobox_changed"/> + <property name="can_focus">False</property> + <signal name="changed" handler="on_protocol_combobox_changed" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -99,9 +108,10 @@ <child> <object class="GtkComboBox" id="protocol_jid_combobox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="model">liststore2</property> - <signal name="changed" handler="on_protocol_jid_combobox_changed"/> + <signal name="changed" handler="on_protocol_jid_combobox_changed" swapped="no"/> <child> <object class="GtkCellRendererText" id="cellrenderertext2"/> <attributes> @@ -110,17 +120,22 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkTable" id="subscription_table"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="border_width">6</property> <property name="n_rows">3</property> @@ -130,6 +145,7 @@ <child> <object class="GtkLabel" id="uid_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">_User ID:</property> <property name="use_underline">True</property> @@ -137,7 +153,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -145,16 +161,18 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="activates_default">True</property> + <property name="placeholder_text">Type User ID</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="label188"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Nickname:</property> <property name="use_underline">True</property> @@ -164,7 +182,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -172,18 +190,20 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="activates_default">True</property> + <property name="placeholder_text">Type Nickname</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="label223"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Group:</property> <property name="use_underline">True</property> @@ -192,37 +212,48 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <object class="GtkComboBoxEntry" id="group_comboboxentry"> + <object class="GtkComboBoxText" id="group_comboboxentry"> <property name="visible">True</property> - <property name="model">groups_liststore</property> - <property name="text_column">0</property> + <property name="can_focus">False</property> + <property name="has_entry">True</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry"> + <property name="can_focus">True</property> + <property name="placeholder_text">Choose a group of type a new group</property> + </object> + </child> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> <child> <object class="GtkCheckButton" id="auto_authorize_checkbutton"> <property name="label" translatable="yes">A_llow this contact to view my status</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> @@ -238,9 +269,8 @@ <property name="can_focus">True</property> <property name="no_show_all">True</property> <property name="border_width">6</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">etched-in</property> + <property name="min_content_height">5</property> <child> <object class="GtkTextView" id="message_textview"> <property name="visible">True</property> @@ -251,30 +281,39 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">5</property> </packing> </child> <child> <object class="GtkCheckButton" id="save_message_checkbutton"> <property name="label" translatable="yes">_Save subscription message</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">6</property> </packing> </child> <child> <object class="GtkHBox" id="register_hbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label224"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">You have to register with this transport to be able to add a contact from this @@ -283,18 +322,22 @@ <property name="wrap">True</property> </object> <packing>

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2012