Changeset 205

Show
Ignore:
Timestamp:
04/26/08 12:40:00 (9 months ago)
Author:
tal
Message:
Vanilla Cleanup Phase 3:

frameAdjustments and allFrameAdjustments are now public.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • packages/vanilla/trunk/Lib/vanilla/vanillaBase.py

    r199 r205  
    88class VanillaBaseObject(object): 
    99     
    10     _frameAdjustments = None 
     10    frameAdjustments = None 
    1111 
    1212    def __setattr__(self, attr, value): 
    …… 
    2929 
    3030    def _testForDeprecatedAttributes(self): 
    31         pass 
     31        from warnings import warn 
     32        if hasattr(self, "_frameAdjustments"): 
     33            warn(DeprecationWarning("The _frameAdjustments attribute is deprecated. Use the frameAdjustments attribute.")) 
     34            self.frameAdjustments = self._frameAdjustments 
     35        if hasattr(self, "_allFrameAdjustments"): 
     36            warn(DeprecationWarning("The _allFrameAdjustments attribute is deprecated. Use the allFrameAdjustments attribute.")) 
     37            self.allFrameAdjustments = self._allFrameAdjustments 
    3238 
    3339    def _setCallback(self, callback): 
    …… 
    6975            sizeStyle = None 
    7076        # 
    71         adjustments = self._frameAdjustments 
     77        adjustments = self.frameAdjustments 
    7278        if adjustments: 
    7379            if sizeStyle is None: 

  • packages/vanilla/trunk/Lib/vanilla/vanillaBox.py

    r200 r205  
    2626    """ 
    2727     
    28     _allFrameAdjustments = { 
     28    allFrameAdjustments = { 
    2929        # Box does not have sizeStyle, but the 
    3030        # adjustment is differeent based on the 
    …… 
    6666                title = 'None' 
    6767            boxType = 'Box-' + title 
    68             self._frameAdjustments = self._allFrameAdjustments[boxType] 
     68            self.frameAdjustments = self.allFrameAdjustments[boxType] 
    6969        return super(Box, self)._adjustPosSize(frame) 
    7070 

  • packages/vanilla/trunk/Lib/vanilla/vanillaButton.py

    r200 r205  
    5151    nsButtonType = NSMomentaryPushInButton 
    5252 
    53     _frameAdjustments = { 
     53    frameAdjustments = { 
    5454        'mini': (-1, -2, 2, 2), 
    5555        'small': (-5, -7, 10, 11), 
    …… 
    152152     
    153153    nsBezelStyle = NSShadowlessSquareBezelStyle 
    154     _frameAdjustments = None 
     154    frameAdjustments = None 
    155155     
    156156    def __init__(self, posSize, title, callback=None, sizeStyle="regular"): 
    …… 
    201201    """ 
    202202     
    203     _frameAdjustments = None 
     203    frameAdjustments = None 
    204204     
    205205    def __init__(self, posSize, 
    …… 
    305305 
    306306    nsBezelStyle = NSHelpButtonBezelStyle 
    307     _frameAdjustments = { 
     307    frameAdjustments = { 
    308308        'regular': (0, -3, 0, 3), 
    309309        } 

  • packages/vanilla/trunk/Lib/vanilla/vanillaCheckBox.py

    r199 r205  
    1414 
    1515    nsButtonType = NSSwitchButton 
    16     _frameAdjustments = { 
     16    frameAdjustments = { 
    1717        'mini': (-4, -4, 6, 8), 
    1818        'small': (-3, -2, 5, 4), 
    …… 
    5151     
    5252    nsButtonType = NSSwitchButton 
    53     _frameAdjustments = { 
     53    frameAdjustments = { 
    5454        'regular': (-2, -3, 4, 4), 
    5555        'small': (-3, -7, 5, 4), 
    …… 
    7171     
    7272    nsBezelStyle = NSShadowlessSquareBezelStyle 
    73     _frameAdjustments = None 
     73    frameAdjustments = None 
    7474     
    7575    def __init__(self, posSize, title, callback, sizeStyle): 
    …… 
    8787    # and to handle the alignment. 
    8888     
    89     _allFrameAdjustments = { 
     89    allFrameAdjustments = { 
    9090        'mini': (0, -4, 0, 8), 
    9191        'small': (0, -2, 0, 4), 
    …… 
    110110        left, top, width, height = posSize 
    111111        # 
    112         self._frameAdjustments = self._allFrameAdjustments[sizeStyle] 
     112        self.frameAdjustments = self.allFrameAdjustments[sizeStyle] 
    113113        # 
    114114        buttonWidth, buttonHeight = buttonSizes[sizeStyle] 
    115         buttonLeft, buttonTop = self._frameAdjustments[:2] 
     115        buttonLeft, buttonTop = self.frameAdjustments[:2] 
    116116        buttonLeft= abs(buttonLeft) 
    117117        buttonTop = abs(buttonTop) 

  • packages/vanilla/trunk/Lib/vanilla/vanillaComboBox.py

    r200 r205  
    2828    nsComboBoxClass = NSComboBox 
    2929 
    30     _frameAdjustments = { 
     30    frameAdjustments = { 
    3131        'mini': (0, -4, 1, 5), 
    3232        'small': (0, -4, 3, 5), 

  • packages/vanilla/trunk/Lib/vanilla/vanillaPopUpButton.py

    r200 r205  
    2828    nsPopUpButtonClass = NSPopUpButton 
    2929 
    30     _frameAdjustments = { 
     30    frameAdjustments = { 
    3131        'mini': (-1, 0, 3, 0), 
    3232        'small': (-3, -4, 6, 5), 

  • packages/vanilla/trunk/Lib/vanilla/vanillaProgressBar.py

    r200 r205  
    3131    nsProgressIndicatorClass = NSProgressIndicator 
    3232 
    33     _allFrameAdjustments = { 
     33    allFrameAdjustments = { 
    3434        'small': (-1, -0, 2, 0), 
    3535        'regular': (-2, -0, 4, 0), 
    …… 
    5656        """ 
    5757        self._setupView(self.nsProgressIndicatorClass, posSize) 
    58         self._frameAdjustments = self._allFrameAdjustments[sizeStyle] 
     58        self.frameAdjustments = self.allFrameAdjustments[sizeStyle] 
    5959        self._nsObject.setControlSize_(_sizeStyleMap[sizeStyle]) 
    6060        self._nsObject.setMinValue_(minValue) 

  • packages/vanilla/trunk/Lib/vanilla/vanillaSegmentedButton.py

    r200 r205  
    1414    nsSegmentedControlClass = NSSegmentedControl 
    1515 
    16     _frameAdjustments = { 
     16    frameAdjustments = { 
    1717        "mini": (0, -1, 0, 1), #15 
    1818        "small": (-2, -4, 2, 5), #20 

  • packages/vanilla/trunk/Lib/vanilla/vanillaSlider.py

    r200 r205  
    3535    nsSliderClass = NSSlider 
    3636 
    37     _allFrameAdjustments = { 
     37    allFrameAdjustments = { 
    3838        'H-Slider-Above': { 
    3939            'mini': (0, 0, 0, 0), 
    …… 
    155155                    tickPos = 'Above' 
    156156        sliderType = prefix + 'Slider-' + tickPos 
    157         self._frameAdjustments = self._allFrameAdjustments[sliderType] 
     157        self.frameAdjustments = self.allFrameAdjustments[sliderType] 
    158158        # now let the super class do the work 
    159159        return super(Slider, self)._adjustPosSize(frame) 

  • packages/vanilla/trunk/Lib/vanilla/vanillaTabs.py

    r203 r205  
    6060    vanillaTabViewItemClass = VanillaTabItem 
    6161 
    62     _allFrameAdjustments = { 
     62    allFrameAdjustments = { 
    6363        # The sizeStyle will be part of the 
    6464        # className used for the lookup here. 
    …… 
    109109        sizeStyle = _reverseSizeStyleMap[self._nsObject.controlSize()] 
    110110        tabsType = 'Tabs-' + sizeStyle 
    111         self._frameAdjustments = self._allFrameAdjustments[tabsType] 
     111        self.frameAdjustments = self.allFrameAdjustments[tabsType] 
    112112        return super(Tabs, self)._adjustPosSize(frame) 
    113113