libervia-web: browser_side/panels.py comparison

comparison browser_side/panels.py @ 83:68d360caeecb

New widget system: first draft - adaptation of Adrien's design - widgets are now based on a flextable - widgets now use a base class LiberviaWidget (the name is to avoid confustion with pyjamas' widgets) - widgets have a title, and setting/close buttons

author	Goffi <goffi@goffi.org>
date	Sun, 26 Jun 2011 03:04:17 +0200
parents	12680e220b35
children	8f35e9970e7f

comparison

equal deleted inserted replaced

-:bd575203d456
+:68d360caeecb
 from pyjamas.ui.VerticalPanel import VerticalPanel
 from pyjamas.ui.HorizontalPanel import HorizontalPanel
 from pyjamas.ui.ScrollPanel import ScrollPanel
 from pyjamas.ui.TabPanel import TabPanel
 from pyjamas.ui.HTMLPanel import HTMLPanel
+from pyjamas.ui.FlexTable import FlexTable
 from pyjamas.ui.Grid import Grid
 from pyjamas.ui.TextArea import TextArea
 from pyjamas.ui.Label import Label
+from pyjamas.ui.Button import Button
 from pyjamas.ui.HTML import HTML
+from pyjamas.ui.Image import Image
 from pyjamas.ui.DropWidget import DropWidget
 from pyjamas.ui.ClickListener import ClickHandler
 from pyjamas.ui.KeyboardListener import KEY_ENTER
+from pyjamas.ui import HasAlignment
 from pyjamas.Timer import Timer
 from pyjamas import Window
 from pyjamas import DOM
 from card_game import CardPanel
 from menu import Menu
 class DropCell(DropWidget):
 """Cell in the middle grid which replace itself with the dropped widget on DnD"""
 def __init__(self):
 DropWidget.__init__(self)
+self.setStyleName('dropCell')
 def onDragEnter(self, event):
 self.addStyleName('dragover')
 DOM.eventPreventDefault(event)
 for panel in _unempty_panels:
 td_elt = panel.getElement().parentNode
 DOM.setStyleAttribute(td_elt, "width", "%s%%" % _width)
 #FIXME: delete object ? Check the right way with pyjamas
+class LiberviaWidget(DropCell, VerticalPanel):
+"""Libervia's widget which can replace itself with a dropped widget on DnD"""
+def __init__(self, title=''):
+VerticalPanel.__init__(self)
+DropCell.__init__(self)
+self.title_id = HTMLPanel.createUniqueId()
+self.setting_button_id = HTMLPanel.createUniqueId()
+self.close_button_id = HTMLPanel.createUniqueId()
+header = AbsolutePanel()
+self.title = Label(title)
+self.title.setStyleName('widgetHeader_title')
+header.add(self.title)
+#header.setCellVerticalAlignment(self.title, HasAlignment.ALIGN_MIDDLE)
+#header.setCellWidth(self.title, '100%')
+button_group_wrapper = SimplePanel()
+button_group_wrapper.setStyleName('widgetHeader_buttonsWrapper')
+button_group = HorizontalPanel()
+button_group.setStyleName('widgetHeader_buttonGroup')
+setting_button = Image("media/icons/misc/settings.png")
+setting_button.setStyleName('widgetHeader_settingButton')
+close_button = Image("media/icons/misc/close.png")
+close_button.setStyleName('widgetHeader_closeButton')
+button_group.add(setting_button)
+button_group.add(close_button)
+button_group_wrapper.setWidget(button_group)
+header.add(button_group_wrapper)
+self.add(header)
+header.addStyleName('widgetHeader')
+self.setSize('100%', '100%')
+self.addStyleName('widget')
+def setTitle(self, text):
+"""change the title in the header of the widget
+@param text: text of the new title"""
+self.title.setText(text)
+def setWidget(self, widget, scrollable=True):
+"""Set the widget that will be in the body of the LiberviaWidget
+@param widget: widget to put in the body
+@param scrollable: if true, the widget will be in a ScrollPanelWrapper"""
+if scrollable:
+_scrollpanelwrapper = ScrollPanelWrapper()
+_scrollpanelwrapper.setStyleName('widgetBody')
+_scrollpanelwrapper.setWidget(widget)
+body_wid = _scrollpanelwrapper
+else:
+body_wid = widget
+self.add(body_wid)
+self.setCellHeight(body_wid, '100%')
 class ScrollPanelWrapper(SimplePanel):
 """Scroll Panel like component, wich use the full available space
 to work around percent size issue, it use some of the ideas found
 here: http://code.google.com/p/google-web-toolkit/issues/detail?id=316
 specially in code given at comment #46, thanks to Stefan Bachert"""
 """Empty dropable panel"""
 def __init__(self, host):
 SimplePanel.__init__(self)
 self.host = host
-_panel = HTMLPanel("")
+self.setSize('100%','100%')
-self.add(_panel)
-self.setHeight('100%')
 DropCell.__init__(self)
+self.setWidget(HTML('&nbsp;'))
 class UniBoxPanel(SimplePanel):
 """Panel containing the UniBox"""
 def __init__(self, host):
 #AutoCompleteTextBox.__init__(self)
 self._popup = None
 self._timer = Timer(notify=self._timeCb)
 self.host = host
 self.setStyleName('uniBox')
+self.addKeyboardListener(self)
 def addKey(self, key):
 return
 #self.getCompletionItems().completions.append(key)
 self._timeCb(None) #we remove the popup
 self.showWarning(_target)
 self._timer.schedule(2000)
-if keycode == KEY_ENTER and not self.visible:
+#if keycode == KEY_ENTER and not self.visible:
+if keycode == KEY_ENTER:
 if _txt:
 if _txt.startswith('@'):
 self.host.bridge.call('sendMblog', None, self.getText())
 elif self.host.selected == None:
 self.host.bridge.call('setStatus', None, _txt)
 "body": html_sanitize(mblog_entry.content)}
 )
 panel.setStyleName('microblogEntry')
 self.add(panel)
-class MicroblogPanel(DropCell, ScrollPanelWrapper):
+class MicroblogPanel(LiberviaWidget):
-def __init__(self,host, title='&nbsp;', accept_all=False):
+def __init__(self, host, title='', accept_all=False):
 """Panel used to show microblog
 @param title: title of the panel
 @param accept_all: if true, show every message, without filtering jids"""
-ScrollPanelWrapper.__init__(self)
+LiberviaWidget.__init__(self, title)
-DropCell.__init__(self)
+#ScrollPanelWrapper.__init__(self)
+#DropCell.__init__(self)
 self.host = host
 self.accept_all = accept_all
-title=html_sanitize(title)
 self.accepted_groups = []
 self.entries = {}
-_class = ['mb_panel_header']
-if title == '&nbsp;':
-_class.append('empty_header')
 self.vpanel = VerticalPanel()
-self.vpanel.add(HTMLPanel("<div class='%s'>%s</div>" % (','.join(_class),title)))
+self.vpanel.setStyleName('microblogPanel')
-self.vpanel.setWidth('100%')
-self.setStyleName('microblogPanel')
 self.setWidget(self.vpanel)
 def addEntry(self, mblog_entry):
 """Add an entry to the panel
 @param text: main text of the entry
 @param date: when the entry was written"""
 if mblog_entry.id in self.entries:
 return
 _entry = MicroblogEntry(mblog_entry)
 self.entries[mblog_entry.id] = _entry
-self.vpanel.insert(_entry,1)
+self.vpanel.insert(_entry,0)
 def setAcceptedGroup(self, group):
 """Set the group which can be displayed in this panel
 @param group: string of the group, or list of string
 """
 """Return class managing the game type"""
 #TODO: check that the game is launched, and manage errors
 if game_type=="Tarot":
 return self.tarot_panel
+class WidgetsPanel(SimplePanel):
+def __init__(self):
+SimplePanel.__init__(self)
+self.flextable = FlexTable()
+self.flextable.setSize('100%','100%')
+self.add(self.flextable)
+self.setStyleName('widgetsPanel')
+def addWidget(self, wid):
+"""Add a widget to a new cell"""
+row = max(0, self.flextable.getRowCount()-1)
+try:
+col = self.flextable.getCellCount(0)
+except AttributeError:
+col = 0
+print "putting widget %s at %d, %d" % (wid, row, col)
+self.flextable.setWidget(row, col, wid)
 class MainDiscussionPanel(HorizontalPanel):
 def __init__(self, host):
 self.host=host
 HorizontalPanel.__init__(self)
 self._left = self.host.contact_panel
-self._right = Grid(1,3)
+self._right = WidgetsPanel()
 self._right.setWidth('100%')
 self._right.setHeight('100%')
 self.add(self._left)
-self.setCellWidth(self._left, "15%")
+#self.setCellWidth(self._left, "15%")
 self.add(self._right)
-self.setCellWidth(self._right, "85%")
+#self.setCellWidth(self._right, "85%")
+self.setCellWidth(self._right, "100%")
+def addWidget(self, wid):
+"""Add a widget to the WidgetsPanel"""
+print "main addWidget", wid
+self._right.addWidget(wid)
 def changePanel(self, idx, panel):
-self._right.setWidget(0,idx,panel)
+pass
-self._right.getCellFormatter().setWidth(0, idx, '5%' if isinstance(panel, EmptyPanel) else '90%')
+#self._right.setWidget(0,idx,panel)
+#self._right.getCellFormatter().setWidth(0, idx, '5%' if isinstance(panel, EmptyPanel) else '90%')
 class MainTabPanel(TabPanel):
 def __init__(self, host):
 TabPanel.__init__(self)

Mercurial > libervia-web

comparison browser_side/panels.py @ 83:68d360caeecb