Mercurial > libervia-backend
annotate frontends/src/primitivus/chat.py @ 588:beaf6bec2fcd
Remove every old-style class.
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> |
|---|---|
| date | Fri, 18 Jan 2013 17:55:35 +0100 |
| parents | 952322b1d490 |
| children | c123dddaea6b |
| rev | line source |
|---|---|
|
119
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
1 #!/usr/bin/python |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
2 # -*- coding: utf-8 -*- |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
3 |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
4 """ |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
5 Primitivus: a SAT frontend |
| 572 | 6 Copyright (C) 2009, 2010, 2011, 2012, 2013 Jérôme Poisson (goffi@goffi.org) |
|
119
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
7 |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
8 This program is free software: you can redistribute it and/or modify |
|
480
2a072735e459
Licence modification: the full project is now under AGPL v3+ instead of GPL v3+
Goffi <goffi@goffi.org>
parents:
459
diff
changeset
|
9 it under the terms of the GNU Affero General Public License as published by |
|
119
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
10 the Free Software Foundation, either version 3 of the License, or |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
11 (at your option) any later version. |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
12 |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
13 This program is distributed in the hope that it will be useful, |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
14 but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
480
2a072735e459
Licence modification: the full project is now under AGPL v3+ instead of GPL v3+
Goffi <goffi@goffi.org>
parents:
459
diff
changeset
|
16 GNU Affero General Public License for more details. |
|
119
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
17 |
|
480
2a072735e459
Licence modification: the full project is now under AGPL v3+ instead of GPL v3+
Goffi <goffi@goffi.org>
parents:
459
diff
changeset
|
18 You should have received a copy of the GNU Affero General Public License |
|
119
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
19 along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
20 """ |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
21 |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
22 import urwid |
|
222
3198bfd66daa
primitivus: refactoring to use urwid-satext which is now a separate project
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
23 from urwid_satext import sat_widgets |
|
225
fd9b7834d98a
distutils installation script, draft
Goffi <goffi@goffi.org>
parents:
223
diff
changeset
|
24 from urwid_satext.files_management import FileDialog |
|
fd9b7834d98a
distutils installation script, draft
Goffi <goffi@goffi.org>
parents:
223
diff
changeset
|
25 from sat_frontends.quick_frontend.quick_chat import QuickChat |
|
fd9b7834d98a
distutils installation script, draft
Goffi <goffi@goffi.org>
parents:
223
diff
changeset
|
26 from sat_frontends.primitivus.card_game import CardGame |
|
511
62f7f2403093
Primitivus: present contacts in groups chat can now be clicked
Goffi <goffi@goffi.org>
parents:
510
diff
changeset
|
27 from sat_frontends.quick_frontend.quick_utils import escapePrivate, unescapePrivate |
| 124 | 28 import time |
|
225
fd9b7834d98a
distutils installation script, draft
Goffi <goffi@goffi.org>
parents:
223
diff
changeset
|
29 from sat.tools.jid import JID |
| 124 | 30 |
| 31 | |
| 32 class ChatText(urwid.FlowWidget): | |
| 33 """Manage the printing of chat message""" | |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
34 |
|
531
3bd8f84f920d
primitivus: fixed info messages timestamp
Goffi <goffi@goffi.org>
parents:
521
diff
changeset
|
35 def __init__(self, parent, timestamp, nick, my_mess, message, align='left', is_info=False): |
| 124 | 36 self.parent = parent |
| 37 self.timestamp = time.localtime(timestamp) | |
|
190
31632472e857
quick_frontend, wix, primitivus: informations in chat window
Goffi <goffi@goffi.org>
parents:
181
diff
changeset
|
38 self.nick = nick |
|
31632472e857
quick_frontend, wix, primitivus: informations in chat window
Goffi <goffi@goffi.org>
parents:
181
diff
changeset
|
39 self.my_mess = my_mess |
| 124 | 40 self.message = unicode(message) |
| 41 self.align = align | |
|
531
3bd8f84f920d
primitivus: fixed info messages timestamp
Goffi <goffi@goffi.org>
parents:
521
diff
changeset
|
42 self.is_info = is_info |
| 124 | 43 |
| 44 def selectable(self): | |
| 45 return True | |
|
119
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
46 |
| 124 | 47 def keypress(self, size, key): |
| 48 return key | |
| 49 | |
| 50 def rows(self,size,focus=False): | |
| 51 return self.display_widget(size, focus).rows(size, focus) | |
| 52 | |
| 53 def render(self, size, focus=False): | |
|
125
8d611eb9ae48
primitivus: contact list enhancement
Goffi <goffi@goffi.org>
parents:
124
diff
changeset
|
54 canvas = urwid.CompositeCanvas(self.display_widget(size, focus).render(size, focus)) |
|
8d611eb9ae48
primitivus: contact list enhancement
Goffi <goffi@goffi.org>
parents:
124
diff
changeset
|
55 if focus: |
|
8d611eb9ae48
primitivus: contact list enhancement
Goffi <goffi@goffi.org>
parents:
124
diff
changeset
|
56 canvas.set_cursor(self.get_cursor_coords(size)) |
|
8d611eb9ae48
primitivus: contact list enhancement
Goffi <goffi@goffi.org>
parents:
124
diff
changeset
|
57 return canvas |
|
8d611eb9ae48
primitivus: contact list enhancement
Goffi <goffi@goffi.org>
parents:
124
diff
changeset
|
58 |
|
8d611eb9ae48
primitivus: contact list enhancement
Goffi <goffi@goffi.org>
parents:
124
diff
changeset
|
59 def get_cursor_coords(self, size): |
|
8d611eb9ae48
primitivus: contact list enhancement
Goffi <goffi@goffi.org>
parents:
124
diff
changeset
|
60 #(maxcol,) = size |
|
8d611eb9ae48
primitivus: contact list enhancement
Goffi <goffi@goffi.org>
parents:
124
diff
changeset
|
61 return 0, 0 |
| 124 | 62 |
| 63 def display_widget(self, size, focus): | |
| 64 render_txt = [] | |
|
531
3bd8f84f920d
primitivus: fixed info messages timestamp
Goffi <goffi@goffi.org>
parents:
521
diff
changeset
|
65 if not self.is_info: |
|
3bd8f84f920d
primitivus: fixed info messages timestamp
Goffi <goffi@goffi.org>
parents:
521
diff
changeset
|
66 if self.parent.show_timestamp: |
|
3bd8f84f920d
primitivus: fixed info messages timestamp
Goffi <goffi@goffi.org>
parents:
521
diff
changeset
|
67 time_format = "%c" if self.timestamp < self.parent.day_change else "%H:%M" #if the message was sent before today, we print the full date |
|
3bd8f84f920d
primitivus: fixed info messages timestamp
Goffi <goffi@goffi.org>
parents:
521
diff
changeset
|
68 render_txt.append(('date',"[%s]" % time.strftime(time_format, self.timestamp).decode('utf-8'))) |
|
3bd8f84f920d
primitivus: fixed info messages timestamp
Goffi <goffi@goffi.org>
parents:
521
diff
changeset
|
69 if self.parent.show_short_nick: |
|
3bd8f84f920d
primitivus: fixed info messages timestamp
Goffi <goffi@goffi.org>
parents:
521
diff
changeset
|
70 render_txt.append(('my_nick' if self.my_mess else 'other_nick',"**" if self.my_mess else "*")) |
|
3bd8f84f920d
primitivus: fixed info messages timestamp
Goffi <goffi@goffi.org>
parents:
521
diff
changeset
|
71 else: |
|
3bd8f84f920d
primitivus: fixed info messages timestamp
Goffi <goffi@goffi.org>
parents:
521
diff
changeset
|
72 render_txt.append(('my_nick' if self.my_mess else 'other_nick',"[%s] " % self.nick)) |
| 124 | 73 render_txt.append(self.message) |
| 74 return urwid.Text(render_txt, align=self.align) | |
|
119
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
75 |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
76 class Chat(urwid.WidgetWrap, QuickChat): |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
77 |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
78 def __init__(self, target, host, type='one2one'): |
| 124 | 79 self.target = target |
|
119
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
80 QuickChat.__init__(self, target, host, type) |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
81 self.content = urwid.SimpleListWalker([]) |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
82 self.text_list = urwid.ListBox(self.content) |
| 124 | 83 self.chat_widget = urwid.Frame(self.text_list) |
|
144
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
84 self.chat_colums = urwid.Columns([('weight', 8, self.chat_widget)]) |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
85 self.chat_colums = urwid.Columns([('weight', 8, self.chat_widget)]) |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
86 self.pile = urwid.Pile([self.chat_colums]) |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
87 urwid.WidgetWrap.__init__(self, self.__getDecoration(self.pile)) |
|
119
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
88 self.setType(type) |
| 124 | 89 self.day_change = time.strptime(time.strftime("%a %b %d 00:00:00 %Y")) #struct_time of day changing time |
| 90 self.show_timestamp = True | |
| 91 self.show_short_nick = False | |
|
130
5a88ad24ccc0
Primitivus: subject in group chat can now be shown in 3 ways: clip, full, or hidden
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
92 self.show_title = 1 #0: clip title; 1: full title; 2: no title |
| 124 | 93 self.subject = None |
| 94 | |
| 95 def keypress(self, size, key): | |
| 96 if key == "meta p": #user wants to (un)hide the presents panel | |
| 97 if self.type == 'group': | |
|
144
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
98 widgets = self.chat_colums.widget_list |
| 124 | 99 if self.present_panel in widgets: |
| 100 self.__removePresentPanel() | |
| 101 else: | |
| 102 self.__appendPresentPanel() | |
| 103 elif key == "meta t": #user wants to (un)hide timestamp | |
| 104 self.show_timestamp = not self.show_timestamp | |
| 105 for wid in self.content: | |
| 106 wid._invalidate() | |
| 107 elif key == "meta n": #user wants to (not) use short nick | |
| 108 self.show_short_nick = not self.show_short_nick | |
| 109 for wid in self.content: | |
| 110 wid._invalidate() | |
| 111 elif key == "meta l": #user wants to (un)hide widget decoration | |
|
222
3198bfd66daa
primitivus: refactoring to use urwid-satext which is now a separate project
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
112 show = not isinstance(self._w, sat_widgets.LabelLine) |
| 124 | 113 self.showDecoration(show) |
| 114 self._invalidate() | |
| 181 | 115 elif key == "meta s": #user wants to (un)hide group's subject or change its apperance |
| 124 | 116 if self.subject: |
|
130
5a88ad24ccc0
Primitivus: subject in group chat can now be shown in 3 ways: clip, full, or hidden
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
117 self.show_title = (self.show_title + 1) % 3 |
|
5a88ad24ccc0
Primitivus: subject in group chat can now be shown in 3 ways: clip, full, or hidden
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
118 if self.show_title == 0: |
|
5a88ad24ccc0
Primitivus: subject in group chat can now be shown in 3 ways: clip, full, or hidden
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
119 self.setSubject(self.subject,'clip') |
|
5a88ad24ccc0
Primitivus: subject in group chat can now be shown in 3 ways: clip, full, or hidden
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
120 elif self.show_title == 1: |
|
5a88ad24ccc0
Primitivus: subject in group chat can now be shown in 3 ways: clip, full, or hidden
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
121 self.setSubject(self.subject,'space') |
|
5a88ad24ccc0
Primitivus: subject in group chat can now be shown in 3 ways: clip, full, or hidden
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
122 elif self.show_title == 2: |
| 124 | 123 self.chat_widget.header = None |
| 124 self._invalidate() | |
| 125 | |
| 126 | |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
127 return super(Chat, self).keypress(size, key) |
|
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
128 |
|
137
227394eb080c
Primitivus: menu are now managed and fully working
Goffi <goffi@goffi.org>
parents:
130
diff
changeset
|
129 def getMenu(self): |
|
227394eb080c
Primitivus: menu are now managed and fully working
Goffi <goffi@goffi.org>
parents:
130
diff
changeset
|
130 """Return Menu bar""" |
|
222
3198bfd66daa
primitivus: refactoring to use urwid-satext which is now a separate project
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
131 menu = sat_widgets.Menu(self.host.loop) |
|
137
227394eb080c
Primitivus: menu are now managed and fully working
Goffi <goffi@goffi.org>
parents:
130
diff
changeset
|
132 if self.type == 'group': |
|
227394eb080c
Primitivus: menu are now managed and fully working
Goffi <goffi@goffi.org>
parents:
130
diff
changeset
|
133 game = _("Game") |
|
227394eb080c
Primitivus: menu are now managed and fully working
Goffi <goffi@goffi.org>
parents:
130
diff
changeset
|
134 menu.addMenu(game, "Tarot", self.onTarotRequest) |
| 176 | 135 elif self.type == 'one2one': |
| 136 menu.addMenu(_("Action"), _("Send file"), self.onSendFileRequest) | |
|
137
227394eb080c
Primitivus: menu are now managed and fully working
Goffi <goffi@goffi.org>
parents:
130
diff
changeset
|
137 return menu |
| 124 | 138 |
|
119
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
139 def setType(self, type): |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
140 QuickChat.setType(self, type) |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
141 if type == 'one2one': |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
142 self.historyPrint(profile=self.host.profile) |
| 124 | 143 elif type == 'group': |
|
144
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
144 if len(self.chat_colums.widget_list) == 1: |
| 124 | 145 present_widget = self.__buildPresentList() |
|
222
3198bfd66daa
primitivus: refactoring to use urwid-satext which is now a separate project
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
146 self.present_panel = sat_widgets.VerticalSeparator(present_widget) |
| 124 | 147 self.__appendPresentPanel() |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
148 |
| 124 | 149 def __getDecoration(self, widget): |
|
510
886754295efe
quick frontend, primitivus, wix: MUC private messages management
Goffi <goffi@goffi.org>
parents:
507
diff
changeset
|
150 return sat_widgets.LabelLine(widget, sat_widgets.SurroundedText(unicode(unescapePrivate(self.target)))) |
| 124 | 151 |
| 152 def showDecoration(self, show=True): | |
|
144
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
153 """Show/Hide the decoration around the chat window""" |
| 124 | 154 if show: |
|
144
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
155 main_widget = self.__getDecoration(self.pile) |
| 124 | 156 else: |
|
144
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
157 main_widget = self.pile |
| 124 | 158 self._w = main_widget |
| 159 | |
|
511
62f7f2403093
Primitivus: present contacts in groups chat can now be clicked
Goffi <goffi@goffi.org>
parents:
510
diff
changeset
|
160 def _presentClicked(self, list_wid, clicked_wid): |
|
62f7f2403093
Primitivus: present contacts in groups chat can now be clicked
Goffi <goffi@goffi.org>
parents:
510
diff
changeset
|
161 assert(self.type == 'group') |
|
62f7f2403093
Primitivus: present contacts in groups chat can now be clicked
Goffi <goffi@goffi.org>
parents:
510
diff
changeset
|
162 nick = clicked_wid.getValue() |
|
62f7f2403093
Primitivus: present contacts in groups chat can now be clicked
Goffi <goffi@goffi.org>
parents:
510
diff
changeset
|
163 if nick == self.getUserNick(): |
|
62f7f2403093
Primitivus: present contacts in groups chat can now be clicked
Goffi <goffi@goffi.org>
parents:
510
diff
changeset
|
164 #We ignore click on our own nick |
|
62f7f2403093
Primitivus: present contacts in groups chat can now be clicked
Goffi <goffi@goffi.org>
parents:
510
diff
changeset
|
165 return |
|
62f7f2403093
Primitivus: present contacts in groups chat can now be clicked
Goffi <goffi@goffi.org>
parents:
510
diff
changeset
|
166 #we have a click on a nick, we add the private conversation to the contact_list |
|
62f7f2403093
Primitivus: present contacts in groups chat can now be clicked
Goffi <goffi@goffi.org>
parents:
510
diff
changeset
|
167 full_jid = JID("%s/%s" % (self.target.short, nick)) |
|
62f7f2403093
Primitivus: present contacts in groups chat can now be clicked
Goffi <goffi@goffi.org>
parents:
510
diff
changeset
|
168 new_jid = escapePrivate(full_jid) |
|
62f7f2403093
Primitivus: present contacts in groups chat can now be clicked
Goffi <goffi@goffi.org>
parents:
510
diff
changeset
|
169 if new_jid not in self.host.contact_list: |
|
62f7f2403093
Primitivus: present contacts in groups chat can now be clicked
Goffi <goffi@goffi.org>
parents:
510
diff
changeset
|
170 self.host.contact_list.add(new_jid) |
|
62f7f2403093
Primitivus: present contacts in groups chat can now be clicked
Goffi <goffi@goffi.org>
parents:
510
diff
changeset
|
171 |
|
62f7f2403093
Primitivus: present contacts in groups chat can now be clicked
Goffi <goffi@goffi.org>
parents:
510
diff
changeset
|
172 #now we select the new window |
|
62f7f2403093
Primitivus: present contacts in groups chat can now be clicked
Goffi <goffi@goffi.org>
parents:
510
diff
changeset
|
173 self.host.contact_list.setFocus(full_jid, True) |
| 124 | 174 |
| 175 def __buildPresentList(self): | |
|
511
62f7f2403093
Primitivus: present contacts in groups chat can now be clicked
Goffi <goffi@goffi.org>
parents:
510
diff
changeset
|
176 self.present_wid = sat_widgets.GenericList([],option_type = sat_widgets.ClickableText, on_click=self._presentClicked) |
| 124 | 177 return self.present_wid |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
178 |
| 124 | 179 def __appendPresentPanel(self): |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
180 self.chat_colums.widget_list.append(self.present_panel) |
|
144
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
181 self.chat_colums.column_types.append(('weight', 2)) |
| 124 | 182 |
| 183 def __removePresentPanel(self): | |
|
144
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
184 self.chat_colums.set_focus(0) #necessary as the focus change to the next object, we can go out of range if we are on the last object of self.chat_colums |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
185 self.chat_colums.widget_list.remove(self.present_panel) |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
186 del self.chat_colums.column_types[-1] |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
187 |
|
144
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
188 def __appendGamePanel(self, widget): |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
189 assert (len(self.pile.widget_list) == 1) |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
190 self.pile.widget_list.insert(0,widget) |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
191 self.pile.item_types.insert(0,('weight', 1)) |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
192 self.pile.widget_list.insert(1,urwid.Filler(urwid.Divider('-'))) |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
193 self.pile.item_types.insert(1,('fixed', 1)) |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
194 self.host.redraw() |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
195 |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
196 def __removeGamePanel(self): |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
197 assert (len(self.pile.widget_list) == 3) |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
198 self.pile.set_focus(0) #necessary as the focus change to the next object, we can go out of range if we are on the last object of self.chat_colums |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
199 del self.pile.widget_list[0] |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
200 del self.pile.item_types[0] |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
201 self.host.redraw() |
| 124 | 202 |
|
130
5a88ad24ccc0
Primitivus: subject in group chat can now be shown in 3 ways: clip, full, or hidden
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
203 def setSubject(self, subject, wrap='space'): |
| 120 | 204 """Set title for a group chat""" |
| 205 QuickChat.setSubject(self, subject) | |
| 124 | 206 self.subject = subject |
|
130
5a88ad24ccc0
Primitivus: subject in group chat can now be shown in 3 ways: clip, full, or hidden
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
207 self.subj_wid = urwid.Text(unicode(subject.replace('\n','|') if wrap == 'clip' else subject ), |
|
5a88ad24ccc0
Primitivus: subject in group chat can now be shown in 3 ways: clip, full, or hidden
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
208 align='left' if wrap=='clip' else 'center',wrap=wrap) |
|
5a88ad24ccc0
Primitivus: subject in group chat can now be shown in 3 ways: clip, full, or hidden
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
209 self.chat_widget.header = urwid.AttrMap(self.subj_wid,'title') |
|
5a88ad24ccc0
Primitivus: subject in group chat can now be shown in 3 ways: clip, full, or hidden
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
210 self.host.redraw() |
| 124 | 211 |
| 212 def setPresents(self, param_nicks): | |
| 213 """Set the users presents in the contact list for a group chat | |
| 214 @param nicks: list of nicknames | |
| 215 """ | |
| 216 nicks = [unicode(nick) for nick in param_nicks] #FIXME: should be done in DBus bridge | |
| 217 nicks.sort() | |
| 218 QuickChat.setPresents(self, nicks) | |
| 219 self.present_wid.changeValues(nicks) | |
| 220 self.host.redraw() | |
| 120 | 221 |
|
507
f98bef71a918
frontends, core, plugin XEP-0045: leave implementation + better nick change
Goffi <goffi@goffi.org>
parents:
501
diff
changeset
|
222 def replaceUser(self, param_nick, show_info=True): |
| 124 | 223 """Add user if it is not in the group list""" |
| 224 nick = unicode(param_nick) #FIXME: should be done in DBus bridge | |
|
507
f98bef71a918
frontends, core, plugin XEP-0045: leave implementation + better nick change
Goffi <goffi@goffi.org>
parents:
501
diff
changeset
|
225 QuickChat.replaceUser(self, nick, show_info) |
| 124 | 226 presents = self.present_wid.getAllValues() |
| 227 if nick not in presents: | |
| 228 presents.append(nick) | |
| 229 presents.sort() | |
| 230 self.present_wid.changeValues(presents) | |
| 231 self.host.redraw() | |
| 232 | |
|
507
f98bef71a918
frontends, core, plugin XEP-0045: leave implementation + better nick change
Goffi <goffi@goffi.org>
parents:
501
diff
changeset
|
233 def removeUser(self, param_nick, show_info=True): |
| 124 | 234 """Remove a user from the group list""" |
| 235 nick = unicode(param_nick) #FIXME: should be done in DBus bridge | |
|
507
f98bef71a918
frontends, core, plugin XEP-0045: leave implementation + better nick change
Goffi <goffi@goffi.org>
parents:
501
diff
changeset
|
236 QuickChat.removeUser(self, nick, show_info) |
| 124 | 237 self.present_wid.deleteValue(nick) |
| 238 self.host.redraw() | |
|
119
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
239 |
|
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
240 def printMessage(self, from_jid, msg, profile, timestamp=""): |
|
153
f197b52796ee
Primitivus: begining of management for actionResult
Goffi <goffi@goffi.org>
parents:
144
diff
changeset
|
241 assert isinstance(from_jid, JID) |
|
190
31632472e857
quick_frontend, wix, primitivus: informations in chat window
Goffi <goffi@goffi.org>
parents:
181
diff
changeset
|
242 try: |
|
31632472e857
quick_frontend, wix, primitivus: informations in chat window
Goffi <goffi@goffi.org>
parents:
181
diff
changeset
|
243 jid,nick,mymess = QuickChat.printMessage(self, from_jid, msg, profile, timestamp) |
|
31632472e857
quick_frontend, wix, primitivus: informations in chat window
Goffi <goffi@goffi.org>
parents:
181
diff
changeset
|
244 except TypeError: |
|
31632472e857
quick_frontend, wix, primitivus: informations in chat window
Goffi <goffi@goffi.org>
parents:
181
diff
changeset
|
245 return |
|
520
4d7248f4c577
primitivus: better chat text insertion in chat window
Goffi <goffi@goffi.org>
parents:
518
diff
changeset
|
246 |
|
4d7248f4c577
primitivus: better chat text insertion in chat window
Goffi <goffi@goffi.org>
parents:
518
diff
changeset
|
247 new_text = ChatText(self, timestamp or None, nick, mymess, msg) |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
248 |
|
520
4d7248f4c577
primitivus: better chat text insertion in chat window
Goffi <goffi@goffi.org>
parents:
518
diff
changeset
|
249 if timestamp and self.content: |
|
4d7248f4c577
primitivus: better chat text insertion in chat window
Goffi <goffi@goffi.org>
parents:
518
diff
changeset
|
250 for idx in range(len(self.content)-1,-1,-1): |
|
4d7248f4c577
primitivus: better chat text insertion in chat window
Goffi <goffi@goffi.org>
parents:
518
diff
changeset
|
251 current_text = self.content[idx] |
|
4d7248f4c577
primitivus: better chat text insertion in chat window
Goffi <goffi@goffi.org>
parents:
518
diff
changeset
|
252 if new_text.timestamp < current_text.timestamp and idx > 0: |
|
4d7248f4c577
primitivus: better chat text insertion in chat window
Goffi <goffi@goffi.org>
parents:
518
diff
changeset
|
253 continue #the new message is older, we need to insert it upper |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
254 |
|
520
4d7248f4c577
primitivus: better chat text insertion in chat window
Goffi <goffi@goffi.org>
parents:
518
diff
changeset
|
255 #we discard double messages, to avoid backlog / history conflict |
|
521
3f8c2a0f20e5
primitivus: fixed double messages discarding
Goffi <goffi@goffi.org>
parents:
520
diff
changeset
|
256 if ((idx and self.content[idx-1].message == msg) or |
|
3f8c2a0f20e5
primitivus: fixed double messages discarding
Goffi <goffi@goffi.org>
parents:
520
diff
changeset
|
257 (self.content[idx].message == msg) or |
|
3f8c2a0f20e5
primitivus: fixed double messages discarding
Goffi <goffi@goffi.org>
parents:
520
diff
changeset
|
258 (idx<len(self.content)-2 and self.content[idx+1].message)): |
|
520
4d7248f4c577
primitivus: better chat text insertion in chat window
Goffi <goffi@goffi.org>
parents:
518
diff
changeset
|
259 return |
|
4d7248f4c577
primitivus: better chat text insertion in chat window
Goffi <goffi@goffi.org>
parents:
518
diff
changeset
|
260 |
|
4d7248f4c577
primitivus: better chat text insertion in chat window
Goffi <goffi@goffi.org>
parents:
518
diff
changeset
|
261 self.content.insert(idx+1, new_text) |
|
4d7248f4c577
primitivus: better chat text insertion in chat window
Goffi <goffi@goffi.org>
parents:
518
diff
changeset
|
262 break |
|
4d7248f4c577
primitivus: better chat text insertion in chat window
Goffi <goffi@goffi.org>
parents:
518
diff
changeset
|
263 else: |
|
4d7248f4c577
primitivus: better chat text insertion in chat window
Goffi <goffi@goffi.org>
parents:
518
diff
changeset
|
264 self.content.append(new_text) |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
265 |
|
430
7c7ec2347b56
primitivus: chat window is not scrolled anymore when user is watching history and a new message is received
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
266 if self.text_list.get_focus()[1] == len(self.content)-2: |
|
7c7ec2347b56
primitivus: chat window is not scrolled anymore when user is watching history and a new message is received
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
267 #we don't change focus if user is not at the bottom |
|
7c7ec2347b56
primitivus: chat window is not scrolled anymore when user is watching history and a new message is received
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
268 #as that mean that he is probably watching discussion history |
|
7c7ec2347b56
primitivus: chat window is not scrolled anymore when user is watching history and a new message is received
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
269 self.text_list.set_focus(len(self.content)-1) |
|
190
31632472e857
quick_frontend, wix, primitivus: informations in chat window
Goffi <goffi@goffi.org>
parents:
181
diff
changeset
|
270 self.host.redraw() |
|
507
f98bef71a918
frontends, core, plugin XEP-0045: leave implementation + better nick change
Goffi <goffi@goffi.org>
parents:
501
diff
changeset
|
271 if not self.host.x_notify.hasFocus(): |
|
380
ede26abf6ca1
primitivus: freedesktop notifications (if available) when somebody is talking to us and we have not focus, or our nick is pinged and we have not focus.
Goffi <goffi@goffi.org>
parents:
325
diff
changeset
|
272 if self.type=="one2one": |
|
507
f98bef71a918
frontends, core, plugin XEP-0045: leave implementation + better nick change
Goffi <goffi@goffi.org>
parents:
501
diff
changeset
|
273 self.host.x_notify.sendNotification(_("Primitivus: %s is talking to you") % from_jid) |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
274 elif self.getUserNick().lower() in msg.lower(): |
|
507
f98bef71a918
frontends, core, plugin XEP-0045: leave implementation + better nick change
Goffi <goffi@goffi.org>
parents:
501
diff
changeset
|
275 self.host.x_notify.sendNotification(_("Primitivus: Somebody pinged your name in %s room") % self.target) |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
276 |
|
531
3bd8f84f920d
primitivus: fixed info messages timestamp
Goffi <goffi@goffi.org>
parents:
521
diff
changeset
|
277 def printInfo(self, msg, type='normal', timestamp=""): |
|
190
31632472e857
quick_frontend, wix, primitivus: informations in chat window
Goffi <goffi@goffi.org>
parents:
181
diff
changeset
|
278 """Print general info |
|
31632472e857
quick_frontend, wix, primitivus: informations in chat window
Goffi <goffi@goffi.org>
parents:
181
diff
changeset
|
279 @param msg: message to print |
|
31632472e857
quick_frontend, wix, primitivus: informations in chat window
Goffi <goffi@goffi.org>
parents:
181
diff
changeset
|
280 @type: one of: |
|
31632472e857
quick_frontend, wix, primitivus: informations in chat window
Goffi <goffi@goffi.org>
parents:
181
diff
changeset
|
281 normal: general info like "toto has joined the room" |
|
31632472e857
quick_frontend, wix, primitivus: informations in chat window
Goffi <goffi@goffi.org>
parents:
181
diff
changeset
|
282 me: "/me" information like "/me clenches his fist" ==> "toto clenches his fist" |
|
31632472e857
quick_frontend, wix, primitivus: informations in chat window
Goffi <goffi@goffi.org>
parents:
181
diff
changeset
|
283 """ |
|
531
3bd8f84f920d
primitivus: fixed info messages timestamp
Goffi <goffi@goffi.org>
parents:
521
diff
changeset
|
284 #FIXME: duplicated code, this must be refactored |
|
3bd8f84f920d
primitivus: fixed info messages timestamp
Goffi <goffi@goffi.org>
parents:
521
diff
changeset
|
285 _widget = ChatText(self, timestamp or None, None, False, msg, is_info=True) |
|
3bd8f84f920d
primitivus: fixed info messages timestamp
Goffi <goffi@goffi.org>
parents:
521
diff
changeset
|
286 self.content.append(_widget) |
|
430
7c7ec2347b56
primitivus: chat window is not scrolled anymore when user is watching history and a new message is received
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
287 if self.text_list.get_focus()[1] == len(self.content)-2: |
|
7c7ec2347b56
primitivus: chat window is not scrolled anymore when user is watching history and a new message is received
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
288 #we don't change focus if user is not at the bottom |
|
7c7ec2347b56
primitivus: chat window is not scrolled anymore when user is watching history and a new message is received
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
289 #as that mean that he is probably watching discussion history |
|
7c7ec2347b56
primitivus: chat window is not scrolled anymore when user is watching history and a new message is received
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
290 self.text_list.set_focus(len(self.content)-1) |
|
119
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
291 self.host.redraw() |
|
507
f98bef71a918
frontends, core, plugin XEP-0045: leave implementation + better nick change
Goffi <goffi@goffi.org>
parents:
501
diff
changeset
|
292 if not self.host.x_notify.hasFocus(): |
|
380
ede26abf6ca1
primitivus: freedesktop notifications (if available) when somebody is talking to us and we have not focus, or our nick is pinged and we have not focus.
Goffi <goffi@goffi.org>
parents:
325
diff
changeset
|
293 if self.type=="one2one": |
|
507
f98bef71a918
frontends, core, plugin XEP-0045: leave implementation + better nick change
Goffi <goffi@goffi.org>
parents:
501
diff
changeset
|
294 self.host.x_notify.sendNotification(_("Primitivus: there is a message about you")) |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
295 elif self.getUserNick().lower() in msg.lower(): |
|
507
f98bef71a918
frontends, core, plugin XEP-0045: leave implementation + better nick change
Goffi <goffi@goffi.org>
parents:
501
diff
changeset
|
296 self.host.x_notify.sendNotification(_("Primitivus: Somebody is talking about you in %s room") % self.target) |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
297 |
|
144
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
298 def startGame(self, game_type, referee, players): |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
299 """Configure the chat window to start a game""" |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
300 if game_type=="Tarot": |
|
501
e9634d2e7b38
core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1:
Goffi <goffi@goffi.org>
parents:
480
diff
changeset
|
301 self.tarot_wid = CardGame(self, referee, players, self.nick) |
|
e9634d2e7b38
core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1:
Goffi <goffi@goffi.org>
parents:
480
diff
changeset
|
302 self.__appendGamePanel(self.tarot_wid) |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
303 |
|
144
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
304 def getGame(self, game_type): |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
305 """Return class managing the game type""" |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
306 #TODO: check that the game is launched, and manage errors |
|
80661755ea8d
Primitivus: Tarot card game implementation
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
307 if game_type=="Tarot": |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
308 return self.tarot_wid |
|
137
227394eb080c
Primitivus: menu are now managed and fully working
Goffi <goffi@goffi.org>
parents:
130
diff
changeset
|
309 |
|
227394eb080c
Primitivus: menu are now managed and fully working
Goffi <goffi@goffi.org>
parents:
130
diff
changeset
|
310 #MENU EVENTS# |
|
227394eb080c
Primitivus: menu are now managed and fully working
Goffi <goffi@goffi.org>
parents:
130
diff
changeset
|
311 def onTarotRequest(self, menu): |
|
227394eb080c
Primitivus: menu are now managed and fully working
Goffi <goffi@goffi.org>
parents:
130
diff
changeset
|
312 if len(self.occupants) != 4: |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
313 self.host.showPopUp(sat_widgets.Alert(_("Can't start game"), _("You need to be exactly 4 peoples in the room to start a Tarot game"), ok_cb=self.host.removePopUp)) |
|
137
227394eb080c
Primitivus: menu are now managed and fully working
Goffi <goffi@goffi.org>
parents:
130
diff
changeset
|
314 else: |
|
227394eb080c
Primitivus: menu are now managed and fully working
Goffi <goffi@goffi.org>
parents:
130
diff
changeset
|
315 self.host.bridge.tarotGameCreate(self.id, list(self.occupants), self.host.profile) |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
316 |
| 176 | 317 def onSendFileRequest(self, menu): |
|
180
fdb961f27ae9
Primitivus: file sending and progress management
Goffi <goffi@goffi.org>
parents:
176
diff
changeset
|
318 dialog = FileDialog(ok_cb=self.onFileSelected, cancel_cb=self.host.removePopUp) |
| 176 | 319 self.host.showPopUp(dialog, 80, 80) |
| 320 | |
|
180
fdb961f27ae9
Primitivus: file sending and progress management
Goffi <goffi@goffi.org>
parents:
176
diff
changeset
|
321 #MISC EVENTS# |
|
fdb961f27ae9
Primitivus: file sending and progress management
Goffi <goffi@goffi.org>
parents:
176
diff
changeset
|
322 def onFileSelected(self, filepath): |
|
fdb961f27ae9
Primitivus: file sending and progress management
Goffi <goffi@goffi.org>
parents:
176
diff
changeset
|
323 self.host.removePopUp() |
|
501
e9634d2e7b38
core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1:
Goffi <goffi@goffi.org>
parents:
480
diff
changeset
|
324 #FIXME: check last_resource: what if self.target.resource exists ? |
|
e9634d2e7b38
core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1:
Goffi <goffi@goffi.org>
parents:
480
diff
changeset
|
325 last_resource = self.host.bridge.getLastResource(unicode(self.target.short), self.host.profile) |
|
e9634d2e7b38
core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1:
Goffi <goffi@goffi.org>
parents:
480
diff
changeset
|
326 if last_resource: |
|
e9634d2e7b38
core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1:
Goffi <goffi@goffi.org>
parents:
480
diff
changeset
|
327 full_jid = JID("%s/%s" % (self.target.short, last_resource)) |
|
e9634d2e7b38
core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1:
Goffi <goffi@goffi.org>
parents:
480
diff
changeset
|
328 else: |
|
e9634d2e7b38
core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1:
Goffi <goffi@goffi.org>
parents:
480
diff
changeset
|
329 full_jid = self.target |
|
542
3eeb6c865e4d
frontends: incoming files transfer management:
Goffi <goffi@goffi.org>
parents:
531
diff
changeset
|
330 progress_id = self.host.bridge.sendFile(full_jid, filepath, {}, self.host.profile) |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
331 self.host.addProgress(progress_id,filepath) |