libervia-web: browser_side/panels.py comparison

comparison browser_side/panels.py @ 62:12e889a683ce SàT v0.2.0

server side: misc stuff: - fixed lot of misuse in callbacks - chat history fixed - a visual indicator now appear when we have message waiting from a contact - fixed About dialog size issue in webkit - fixed Drag'n'Drop for webkit - defaut room to join is now libervia@conference.libervia.org

author	Goffi <goffi@goffi.org>
date	Tue, 31 May 2011 17:06:59 +0200
parents	4fa3d57f72f8
children	9d8e79ac4c9c

comparison

equal deleted inserted replaced

-:80c490e6a1a7
+:12e889a683ce
 _contacts_list = ListBox()
 def updateContactCb(sender):
 _jid = _contacts_list.getValue(_contacts_list.getSelectedIndex())
 self.host.bridge.call('updateContact', None, _jid, '', _dialog.getSelectedGroups())
-print "contactUpdated"
 def onContactChange(_list):
 _jid = _contacts_list.getValue(_contacts_list.getSelectedIndex())
 groups = self.host.contact_panel.getContactGroups(_jid)
 _dialog.setGroupsSelected(groups)
 _dialog.hide()
 _main_panel = VerticalPanel()
 _label = Label("Discussion room:")
 _edit = TextBox()
-_edit.setText('libervia@conference.tazar.int')
+_edit.setText('libervia@conference.libervia.org')
 hpanel = HorizontalPanel()
 hpanel.add(_label)
 hpanel.add(_edit)
 _main_panel.add(hpanel)
 button_panel = HorizontalPanel()
 def __init__(self):
 DropWidget.__init__(self)
 def onDragEnter(self, event):
-print "drag enter"
 self.addStyleName('dragover')
 DOM.eventPreventDefault(event)
 def onDragLeave(self, event):
-print "\ndrag leave"
 if event.clientX <= self.getAbsoluteLeft() or event.clientY <= self.getAbsoluteTop() or\
 event.clientX >= self.getAbsoluteLeft() + self.getOffsetWidth()-1 or event.clientY >= self.getAbsoluteTop() + self.getOffsetHeight()-1:
 #We check that we are inside widget's box, and we don't remove the style in this case because
 #if the mouse is over a widget inside the DropWidget, if will leave the DropWidget, and we
 #don't want that
 row = DOM.getParent(cell)
 return (row.rowIndex, cell.cellIndex)
 def onDrop(self, event):
-print "Empty Panel: onDrop"
 dt = event.dataTransfer
 #'text', 'text/plain', and 'Text' are equivalent.
 try:
-item = dt.getData("text/plain")
+item, item_type = dt.getData("text/plain").split('\n') #Workaround for webkit, only text/plain seems to be managed
-item_type = dt.getData("type")
+if item_type and item_type[-1] == '\0': #Workaround for what looks like a pyjamas bug: the \0 should not be there, and
+item_type = item_type[:-1]          # .strip('\0') and .replace('\0','') don't work. TODO: check this and fill a bug report
+#item_type = dt.getData("type")
 print "message: %s" % item
 print "type: %s" % item_type
 except:
 print "no message found"
 item='&nbsp;'
 _new_panel = MicroblogPanel(self.host, item)
 _new_panel.setAcceptedGroup(item)
 self.host.FillMicroblogPanel(_new_panel)
 elif item_type=="CONTACT":
 _contact = JID(item)
+self.host.contact_panel.setContactMessageWaiting(_contact.bare, False)
 _new_panel = ChatPanel(self.host, _contact)
 _new_panel.historyPrint()
 elif item_type=="CONTACT_TITLE":
 _new_panel = MicroblogPanel(self.host, accept_all=True)
 self.host.FillMicroblogPanel(_new_panel)
 type = "STATUS"
 elif isinstance(self.host.selected, ChatPanel):
 type = "ONE2ONE"
 target = str(self.host.selected.target)
 else:
-print self.host.selected
+print "Unknown selected host:",self.host.selected
 type = "UNKNOWN"
 return (type, target)
 def onKeyPress(self, sender, keycode, modifiers):
 _txt = self.getText()
 def changeStatus(self, new_status):
 self.status = new_status or '&nbsp;'
 self.setHTML(self.__getContent())
-def onClick(self, sender, event):
+def onClick(self, sender):
 #As status is the default target of uniBar, we don't want to select anything if click on it
 self.host.select(None)
 class ChatText(HTMLPanel):
 def doAttachChildren(self):
 #We need to force the use of a panel subclass method here, else
 #the event will not propagate to children
 ScrollPanelWrapper.doAttachChildren(self)
-def onClick(self, sender, event):
+def onClick(self, sender):
 self.host.select(self)
 def setUserNick(self, nick):
 """Set the nick of the user, usefull for e.g. change the color of the user"""
 self.nick = nick
 self.occupants_list.clear()
 for nick in nicks:
 self.occupants_list.addOccupant(nick)
 def userJoined(self, nick, data):
-print "userJoined:", nick, data
 self.occupants_list.addOccupant(nick)
 self.printInfo("=> %s has joined the room" % nick)
 def userLeft(self, nick, data):
-print "userLeft:", nick, data
 self.occupants_list.removeOccupant(nick)
 self.printInfo("<= %s has left the room" % nick)
 def historyPrint(self, size=20):
 """Print the initial history"""
 def getHistoryCB(history):
 stamps=history.keys()
 stamps.sort()
 for stamp in stamps:
 self.printMessage(history[stamp][0], history[stamp][1], stamp)
-self.host.bridge.call('getHistory', getHistoryCB, self.host.whoami.bare, str(self.target), 20)
+self.host.bridge.call('getHistory', getHistoryCB, self.host.whoami.bare, self.target.bare, 20)
 def printInfo(self, msg, type='normal'):
 """Print general info
 @param msg: message to print
 @type: one of:
 self.tabBar.setVisible(False)
 self.addStyleName('mainTabPanel')
 Window.addWindowResizeListener(self)
 def onWindowResized(self, width, height):
-print "onWindowResized"
 tab_panel_elt = self.getElement()
 _elts = doc().getElementsByClassName('gwt-TabBar')
 if not _elts.length:
 print ("ERROR: not TabBar found, it should exist !")
 tab_bar_h = 0

Mercurial > libervia-web

comparison browser_side/panels.py @ 62:12e889a683ce SàT v0.2.0