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

add progressbar in profile window. For #1840

Browse source
This commit is contained in:
Yann Leboulanger 2006-09-19 07:52:40 +00:00
parent 050afed553
commit b5c4edb60a
3 changed files with 197 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

274
data/glade/profile_window.glade
View file

@ -1828,159 +1828,187 @@
</child> </child>
<child> <child>
<widget class="GtkHButtonBox" id="information_hbuttonbox"> <widget class="GtkHBox" id="hbox2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property> <property name="homogeneous">False</property>
<property name="spacing">12</property> <property name="spacing">0</property>
<child> <child>
<widget class="GtkButton" id="publish_button"> <widget class="GtkProgressBar" id="progressbar">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_default">True</property> <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
<property name="can_focus">True</property> <property name="fraction">0</property>
<property name="relief">GTK_RELIEF_NORMAL</property> <property name="pulse_step">0.10000000149</property>
<property name="focus_on_click">True</property> <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<signal name="clicked" handler="on_publish_button_clicked"/>
<child>
<widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<property name="top_padding">0</property>
<property name="bottom_padding">0</property>
<property name="left_padding">0</property>
<property name="right_padding">0</property>
<child>
<widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
<widget class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="stock">gtk-go-up</property>
<property name="icon_size">4</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes">_Publish</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
</child>
</widget>
</child>
</widget> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child> </child>
<child> <child>
<widget class="GtkButton" id="retrieve_button"> <widget class="GtkHButtonBox" id="information_hbuttonbox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_default">True</property> <property name="layout_style">GTK_BUTTONBOX_END</property>
<property name="can_focus">True</property> <property name="spacing">12</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_retrieve_button_clicked"/>
<child> <child>
<widget class="GtkAlignment" id="alignment2"> <widget class="GtkButton" id="publish_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0</property> <property name="can_default">True</property>
<property name="yalign">0</property> <property name="can_focus">True</property>
<property name="xscale">0</property> <property name="relief">GTK_RELIEF_NORMAL</property>
<property name="yscale">0</property> <property name="focus_on_click">True</property>
<property name="top_padding">0</property> <signal name="clicked" handler="on_publish_button_clicked"/>
<property name="bottom_padding">0</property>
<property name="left_padding">0</property>
<property name="right_padding">0</property>
<child> <child>
<widget class="GtkHBox" id="hbox2"> <widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property> <property name="xalign">0</property>
<property name="spacing">2</property> <property name="yalign">0</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<property name="top_padding">0</property>
<property name="bottom_padding">0</property>
<property name="left_padding">0</property>
<property name="right_padding">0</property>
<child> <child>
<widget class="GtkImage" id="image2"> <widget class="GtkHBox" id="hbox1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-go-down</property> <property name="homogeneous">False</property>
<property name="icon_size">4</property> <property name="spacing">2</property>
<property name="xalign">0</property>
<property name="yalign">0</property> <child>
<property name="xpad">0</property> <widget class="GtkImage" id="image1">
<property name="ypad">0</property> <property name="visible">True</property>
<property name="stock">gtk-go-up</property>
<property name="icon_size">4</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes">_Publish</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child> </child>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkButton" id="retrieve_button">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_retrieve_button_clicked"/>
<child>
<widget class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<property name="top_padding">0</property>
<property name="bottom_padding">0</property>
<property name="left_padding">0</property>
<property name="right_padding">0</property>
<child> <child>
<widget class="GtkLabel" id="label2"> <widget class="GtkHBox" id="hbox2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">_Retrieve</property> <property name="homogeneous">False</property>
<property name="use_underline">True</property> <property name="spacing">2</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <child>
<property name="wrap">False</property> <widget class="GtkImage" id="image2">
<property name="selectable">False</property> <property name="visible">True</property>
<property name="xalign">0</property> <property name="stock">gtk-go-down</property>
<property name="yalign">0.5</property> <property name="icon_size">4</property>
<property name="xpad">0</property> <property name="xalign">0</property>
<property name="ypad">0</property> <property name="yalign">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> <property name="xpad">0</property>
<property name="width_chars">-1</property> <property name="ypad">0</property>
<property name="single_line_mode">False</property> </widget>
<property name="angle">0</property> <packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="label" translatable="yes">_Retrieve</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child> </child>
</widget> </widget>
</child> </child>
</widget> </widget>
</child> </child>
</widget> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child> </child>
</widget> </widget>
<packing> <packing>

10
src/gajim.py
View file

@ -1009,7 +1009,7 @@ class Interface:
return return
# Add it to roster # Add it to roster
contact = gajim.contacts.create_contact(jid = jid, name = name, contact = gajim.contacts.create_contact(jid = jid, name = name,
groups = groups, show = 'offline', sub = sub, ask = ask) groups = groups, show = 'offline', sub = sub, ask = ask)
gajim.contacts.add_contact(account, contact) gajim.contacts.add_contact(account, contact)
self.roster.add_contact_to_roster(jid, account) self.roster.add_contact_to_roster(jid, account)
else: else:
@ -1327,7 +1327,9 @@ class Interface:
self.instances[account]['xml_console'].print_stanza(stanza, 'outgoing') self.instances[account]['xml_console'].print_stanza(stanza, 'outgoing')
def handle_event_vcard_published(self, account, array): def handle_event_vcard_published(self, account, array):
dialogs.InformationDialog(_('vCard publication succeeded'), _('Your personal information has been published successfully.')) if self.instances[account].has_key('profile'):
win = self.instances[account]['profile']
win.vcard_published()
for gc_control in self.msg_win_mgr.get_controls(message_control.TYPE_GC): for gc_control in self.msg_win_mgr.get_controls(message_control.TYPE_GC):
if gc_control.account == account: if gc_control.account == account:
show = gajim.SHOW_LIST[gajim.connections[account].connected] show = gajim.SHOW_LIST[gajim.connections[account].connected]
@ -1336,7 +1338,9 @@ class Interface:
gc_control.room_jid, show, status) gc_control.room_jid, show, status)
def handle_event_vcard_not_published(self, account, array): def handle_event_vcard_not_published(self, account, array):
dialogs.InformationDialog(_('vCard publication failed'), _('There was an error while publishing your personal information, try again later.')) if self.instances[account].has_key('profile'):
win = self.instances[account]['profile']
win.vcard_not_published()
def handle_event_signed_in(self, account, empty): def handle_event_signed_in(self, account, empty):
'''SIGNED_IN event is emitted when we sign in, so handle it''' '''SIGNED_IN event is emitted when we sign in, so handle it'''

40
src/profile_window.py
View file

@ -60,12 +60,15 @@ class ProfileWindow:
def __init__(self, account): def __init__(self, account):
self.xml = gtkgui_helpers.get_glade('profile_window.glade') self.xml = gtkgui_helpers.get_glade('profile_window.glade')
self.window = self.xml.get_widget('profile_window') self.window = self.xml.get_widget('profile_window')
self.progressbar = self.xml.get_widget('progressbar')
self.account = account self.account = account
self.jid = gajim.get_jid_from_account(account) self.jid = gajim.get_jid_from_account(account)
self.avatar_mime_type = None self.avatar_mime_type = None
self.avatar_encoded = None self.avatar_encoded = None
self.update_progressbar_timeout_id = gobject.timeout_add(100,
self.update_progressbar)
# Create Image for avatar button # Create Image for avatar button
image = gtk.Image() image = gtk.Image()
@ -73,6 +76,10 @@ class ProfileWindow:
self.xml.signal_autoconnect(self) self.xml.signal_autoconnect(self)
self.window.show_all() self.window.show_all()
def update_progressbar(self):
self.progressbar.pulse()
return True # loop forever
def on_profile_window_destroy(self, widget): def on_profile_window_destroy(self, widget):
del gajim.interface.instances[self.account]['profile'] del gajim.interface.instances[self.account]['profile']
@ -203,6 +210,12 @@ class ProfileWindow:
vcard[i], 0) vcard[i], 0)
else: else:
self.set_value(i + '_entry', vcard[i]) self.set_value(i + '_entry', vcard[i])
if self.update_progressbar_timeout_id is not None:
gobject.source_remove(self.update_progressbar_timeout_id)
# redraw progressbar after avatar is set so that windows is already
# resized. Else progressbar is not correctly redrawn
gobject.idle_add(self.progressbar.set_fraction, 0)
self.update_progressbar_timeout_id = None
def add_to_vcard(self, vcard, entry, txt): def add_to_vcard(self, vcard, entry, txt):
'''Add an information to the vCard dictionary''' '''Add an information to the vCard dictionary'''
@ -260,6 +273,9 @@ class ProfileWindow:
return vcard return vcard
def on_publish_button_clicked(self, widget): def on_publish_button_clicked(self, widget):
if self.update_progressbar_timeout_id:
# Operation in progress
return
if gajim.connections[self.account].connected < 2: if gajim.connections[self.account].connected < 2:
dialogs.ErrorDialog(_('You are not connected to the server'), dialogs.ErrorDialog(_('You are not connected to the server'),
_('Without a connection you can not publish your contact ' _('Without a connection you can not publish your contact '
@ -273,8 +289,28 @@ class ProfileWindow:
nick = gajim.config.get_per('accounts', self.account, 'name') nick = gajim.config.get_per('accounts', self.account, 'name')
gajim.nicks[self.account] = nick gajim.nicks[self.account] = nick
gajim.connections[self.account].send_vcard(vcard) gajim.connections[self.account].send_vcard(vcard)
self.update_progressbar_timeout_id = gobject.timeout_add(100,
self.update_progressbar)
def vcard_published(self):
if self.update_progressbar_timeout_id is not None:
gobject.source_remove(self.update_progressbar_timeout_id)
self.progressbar.set_fraction(0)
self.update_progressbar_timeout_id = None
def vcard_not_published(self):
if self.update_progressbar_timeout_id is not None:
gobject.source_remove(self.update_progressbar_timeout_id)
self.progressbar.set_fraction(0)
self.update_progressbar_timeout_id = None
dialogs.InformationDialog(_('vCard publication failed'),
_('There was an error while publishing your personal information, '
'try again later.'))
def on_retrieve_button_clicked(self, widget): def on_retrieve_button_clicked(self, widget):
if self.update_progressbar_timeout_id:
# Operation in progress
return
entries = ['FN', 'NICKNAME', 'BDAY', 'EMAIL_HOME_USERID', 'URL', entries = ['FN', 'NICKNAME', 'BDAY', 'EMAIL_HOME_USERID', 'URL',
'TEL_HOME_NUMBER', 'N_FAMILY', 'N_GIVEN', 'N_MIDDLE', 'N_PREFIX', 'TEL_HOME_NUMBER', 'N_FAMILY', 'N_GIVEN', 'N_MIDDLE', 'N_PREFIX',
'N_SUFFIX', 'ADR_HOME_STREET', 'ADR_HOME_EXTADR', 'ADR_HOME_LOCALITY', 'N_SUFFIX', 'ADR_HOME_STREET', 'ADR_HOME_EXTADR', 'ADR_HOME_LOCALITY',
@ -294,4 +330,6 @@ class ProfileWindow:
gajim.connections[self.account].request_vcard(self.jid) gajim.connections[self.account].request_vcard(self.jid)
else: else:
dialogs.ErrorDialog(_('You are not connected to the server'), dialogs.ErrorDialog(_('You are not connected to the server'),
_('Without a connection, you can not get your contact information.')) _('Without a connection, you can not get your contact information.'))
self.update_progressbar_timeout_id = gobject.timeout_add(100,
self.update_progressbar)