Changeset 2961

Show
Ignore:
Timestamp:
03/23/07 19:01:51 (2 years ago)
Author:
paul
Message:

Changed name of dabo.dEvents.Event to dabo.dEvents.dEvent, because we refer
to it as dEvent in several comments and it just seems right. Also, I noticed
that the dabo api docs weren't giving documentation on dEvent, which may have
helped John know about the stop() method before now. :)

I don't think we should rename all the events with 'd' prepended, but for
this abstract base class I think it makes sense.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/dabo/dEvents.py

    r2947 r2961  
    66 
    77 
    8 class Event(dObject): 
     8class dEvent(dObject): 
    99    """ Base class for Dabo events. 
    1010     
    …… 
    2727        self._kwargs = kwargs 
    2828        self._continue = True 
    29         self._baseClass = Event 
     29        self._baseClass = dEvent 
    3030         
    3131        self._insertEventData() 
    …… 
    141141         
    142142 
    143 class DataEvent(Event): 
     143class DataEvent(dEvent): 
    144144    def appliesToClass(eventClass, objectClass): 
    145145        return issubclass(objectClass, dabo.biz.dBizobj) 
    …… 
    147147         
    148148         
    149 class EditorEvent(Event): 
     149class EditorEvent(dEvent): 
    150150    def appliesToClass(eventClass, objectClass): 
    151151        return issubclass(objectClass, dabo.ui.dEditor) 
    152152    appliesToClass = classmethod(appliesToClass) 
    153153             
    154 class GridEvent(Event): 
     154class GridEvent(dEvent): 
    155155    def appliesToClass(eventClass, objectClass): 
    156156        return issubclass(objectClass, dabo.ui.dGrid) 
    157157    appliesToClass = classmethod(appliesToClass) 
    158158     
    159 class KeyEvent(Event): 
     159class KeyEvent(dEvent): 
    160160    def appliesToClass(eventClass, objectClass): 
    161161        return issubclass(objectClass, (dabo.ui.dPemMixin, dabo.dApp)) 
    …… 
    163163     
    164164     
    165 class ListEvent(Event): 
     165class ListEvent(dEvent): 
    166166    def appliesToClass(eventClass, objectClass): 
    167167        return issubclass(objectClass, (dabo.ui.dListControl, dabo.ui.dListBox)) 
    …… 
    169169     
    170170 
    171 class MenuEvent(Event): 
     171class MenuEvent(dEvent): 
    172172    def appliesToClass(eventClass, objectClass): 
    173173        return issubclass(objectClass, (dabo.ui.dMenu, dabo.ui.dMenuItem, 
    …… 
    176176     
    177177 
    178 class MouseEvent(Event): 
    179     def appliesToClass(eventClass, objectClass): 
    180         return issubclass(objectClass, dabo.ui.dPemMixin) 
    181     appliesToClass = classmethod(appliesToClass) 
    182      
    183  
    184 class SashEvent(Event): 
     178class MouseEvent(dEvent): 
     179    def appliesToClass(eventClass, objectClass): 
     180        return issubclass(objectClass, dabo.ui.dPemMixin) 
     181    appliesToClass = classmethod(appliesToClass) 
     182     
     183 
     184class SashEvent(dEvent): 
    185185    def appliesToClass(eventClass, objectClass): 
    186186        return issubclass(objectClass, dabo.ui.dSplitter) 
    …… 
    188188 
    189189 
    190 class CalendarEvent(Event): 
     190class CalendarEvent(dEvent): 
    191191    def appliesToClass(eventClass, objectClass): 
    192192        return issubclass(objectClass, dabo.ui.dCalendar) 
    …… 
    194194 
    195195 
    196 class TreeEvent(Event): 
     196class TreeEvent(dEvent): 
    197197    def appliesToClass(eventClass, objectClass): 
    198198        return issubclass(objectClass, dabo.ui.dTreeView) 
    …… 
    200200 
    201201 
    202 class Activate(Event): 
     202class Activate(dEvent): 
    203203    """Occurs when the form or application becomes active.""" 
    204204    def appliesToClass(eventClass, objectClass): 
    …… 
    208208     
    209209 
    210 class Close(Event): 
     210class Close(dEvent): 
    211211    """Occurs when the user closes the form.""" 
    212212    def appliesToClass(eventClass, objectClass): 
    …… 
    216216     
    217217     
    218 class Create(Event): 
     218class Create(dEvent): 
    219219    """Occurs after the control or form is created.""" 
    220220    def appliesToClass(eventClass, objectClass): 
    …… 
    223223     
    224224     
    225 class ChildBorn(Event): 
     225class ChildBorn(dEvent): 
    226226    """Occurs when a child control is created.""" 
    227227    def __init__(self, *args, **kwargs): 
    …… 
    238238 
    239239 
    240 class ContextMenu(Event): 
     240class ContextMenu(dEvent): 
    241241    """Occurs when the user requests a context menu (right-click on Win, 
    242242    control-click on Mac, etc. 
    …… 
    245245     
    246246 
    247 class Deactivate(Event): 
     247class Deactivate(dEvent): 
    248248    """Occurs when another form becomes active.""" 
    249249    def appliesToClass(eventClass, objectClass): 
    …… 
    253253     
    254254 
    255 class Destroy(Event): 
     255class Destroy(dEvent): 
    256256    """Occurs when the control or form is destroyed.""" 
    257257    def appliesToClass(eventClass, objectClass): 
    …… 
    260260     
    261261 
    262 class FontPropertiesChanged(Event): 
     262class FontPropertiesChanged(dEvent): 
    263263    """Occurs when the properties of a dFont have changed.""" 
    264264    def appliesToClass(eventClass, objectClass): 
    …… 
    267267 
    268268 
    269 class Hit(Event): 
     269class Hit(dEvent): 
    270270    """Occurs with the control's default event (button click,  
    271271    listbox pick, checkbox, etc.) 
    …… 
    279279     
    280280 
    281 class Idle(Event): 
     281class Idle(dEvent): 
    282282    """Occurs when the event loop has no active events to process. 
    283283     
    …… 
    291291     
    292292 
    293 class GotFocus(Event): 
     293class GotFocus(dEvent): 
    294294    """Occurs when the control gets the focus.""" 
    295295    def appliesToClass(eventClass, objectClass): 
    …… 
    315315 
    316316     
    317 class LostFocus(Event): 
     317class LostFocus(dEvent): 
    318318    """Occurs when the control loses the focus.""" 
    319319    def appliesToClass(eventClass, objectClass): 
    …… 
    341341 
    342342 
    343 class Move(Event): 
     343class Move(dEvent): 
    344344    """Occurs when the control's position changes.""" 
    345345    def appliesToClass(eventClass, objectClass): 
    …… 
    436436     
    437437     
    438 class Paint(Event): 
     438class Paint(dEvent): 
    439439    """Occurs when it is time to paint the control.""" 
    440440    def appliesToClass(eventClass, objectClass): 
    …… 
    443443     
    444444 
    445 class PageChanged(Event): 
     445class PageChanged(dEvent): 
    446446    """Occurs when a page in a pageframe-like control changes""" 
    447447    def appliesToClass(eventClass, objectClass): 
    …… 
    451451     
    452452 
    453 class PageChanging(Event): 
     453class PageChanging(dEvent): 
    454454    """Occurs when the current page in a pageframe-like control is about to change""" 
    455455    def appliesToClass(eventClass, objectClass): 
    …… 
    459459     
    460460 
    461 class PageEnter(Event): 
     461class PageEnter(dEvent): 
    462462    """Occurs when the page becomes the active page.""" 
    463463    def appliesToClass(eventClass, objectClass): 
    …… 
    466466     
    467467 
    468 class PageLeave(Event): 
     468class PageLeave(dEvent): 
    469469    """Occurs when a different page becomes active.""" 
    470470    def appliesToClass(eventClass, objectClass): 
    …… 
    473473 
    474474 
    475 class Resize(Event): 
     475class Resize(dEvent): 
    476476    """Occurs when the control or form is resized.""" 
    477477    def appliesToClass(eventClass, objectClass): 
    …… 
    480480     
    481481         
    482 class FoldPanelChange(Event): 
     482class FoldPanelChange(dEvent): 
    483483    """Occurs when a panel in a dFoldPanelBar control is hidden or shown.""" 
    484484    def appliesToClass(eventClass, objectClass): 
    …… 
    487487     
    488488         
    489 class FoldPanelCaptionClick(Event): 
     489class FoldPanelCaptionClick(dEvent): 
    490490    """Occurs when the caption bar of a dFoldPanel is clicked.""" 
    491491    def appliesToClass(eventClass, objectClass): 
    …… 
    751751     
    752752 
    753 class ValueChanged(Event): 
     753class ValueChanged(dEvent): 
    754754    """Occurs when the control's value has changed, whether 
    755755    programmatically or interactively. 
    …… 
    760760     
    761761 
    762 class Update(Event): 
     762class Update(dEvent): 
    763763    """Occurs when a container wants its controls to update 
    764764    their properties. 

  • trunk/dabo/lib/eventMixin.py

    r2237 r2961  
    306306        events = [e.__dict__[evt] for evt in dir(e)] 
    307307        for evt in events: 
    308             if type(evt) == type and issubclass(evt, e.Event): 
     308            if type(evt) == type and issubclass(evt, e.dEvent): 
    309309                if evt.appliesToClass(classRef): 
    310310                    validEvents.append(evt) 

  • trunk/dabo/ui/uiwx/__init__.py

    r2951 r2961  
    285285    except AttributeError, e: 
    286286        # Event could be a Dabo event, not a wx event 
    287         if isinstance(evt, dabo.dEvents.Event): 
     287        if isinstance(evt, dabo.dEvents.dEvent): 
    288288            pass 
    289289        else: 
    …… 
    297297    except AttributeError, e: 
    298298        # Event could be a Dabo event, not a wx event 
    299         if isinstance(evt, dabo.dEvents.Event): 
     299        if isinstance(evt, dabo.dEvents.dEvent): 
    300300            pass 
    301301        else: