チェンジセット 3628

差分発生行の前後
無視リスト:
コミット日時:
2010/03/28 17:58:20 (3 年前)
コミッタ:
hkrn
ログメッセージ:

should use embed classes in gunyarapaint.mxml and removed unused variables

ファイル:

凡例:

変更無し
追加
削除
更新
コピー
移動

  • as3/gunyarapaint/branches/gunyarapaint/compat/src/gunyarapaint.mxml

    r3625 r3628  
    4444            private var m_windows:Vector.<IController>; 
    4545             
    46             private var basex:uint = 0; 
    47             private var basey:uint = 0; 
    48             private var baseWidth:uint = 0; 
    49             private var baseHeight:uint = 0; 
    50              
    5146            private var oekakiId:uint; 
    5247            private var redirectUrl:String; 
    53              
    54             //private var _logger:GPLogger; 
    5548             
    5649            private const MAX_CANVAS_WIDTH:uint = 500; 
    …… 
    5952            private const MIN_CANVAS_HEIGHT:uint = 16; 
    6053            private const DEBUG:Boolean = true; 
     54             
     55            [Bindable] 
     56            [Embed(source="../assets/images/icon_dropper.png")] 
     57            public var dropperIcon:Class; 
     58             
     59            [Bindable] 
     60            [Embed(source="../assets/images/icon_hand_open.png")] 
     61            public var handOpenIcon:Class; 
    6162             
    6263            public const ALERT_TITLE:String = 'お絵カキコ'; 
    …… 
    484485        <mx:Object label="反転" data="{BlendMode.INVERT}" /> 
    485486    </mx:ArrayCollection> 
    486     <mx:Image source="@Embed('./gunyara-paint_logo.png')" alpha="0.5" right="10" bottom="10"/> 
     487    <mx:Image source="@Embed('../assets/images/gunyara-paint_logo.png')" alpha="0.5" right="10" bottom="10"/> 
    487488    <ui:FormController id="formController" title="投稿フォーム"  x="10" y="10" height="169" width="486"/> 
    488489    <ui:ToolController id="toolController" left="504" y="10" title="補助ツール" /> 

  • as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/ui/v1/Canvas.as

    r3623 r3628  
    119119        private function onModuleChangeAfter(event:CanvasModuleEvent):void 
    120120        { 
    121             var module:ICanvasModule = IApplication(Application.application).canvasModule; 
     121            var app:IApplication = IApplication(Application.application); 
     122            var module:ICanvasModule = app.canvasModule; 
    122123            if (module is MovableCanvasModule) 
    123124                addEventListener(MouseEvent.MOUSE_WHEEL, onMouseWheel); 
    …… 
    125126            switch (module.name) { 
    126127                case DropperModule.DROPPER: 
    127                     CursorManager.setCursor(m_dropperIcon); 
     128                    CursorManager.setCursor(Application.application.dropperIcon); 
    128129                    break; 
    129130                case MovableCanvasModule.MOVABLE_CANVAS: 
    130                     CursorManager..setCursor(m_handOpenIcon); 
     131                    CursorManager..setCursor(Application.application.handOpenIcon); 
    131132                    break; 
    132133            } 
    …… 
    193194        } 
    194195         
    195         [Embed(source="../../../../../../imgs/icon_dropper.png")] 
    196         private var m_dropperIcon:Class; 
    197          
    198         [Embed(source="../../../../../../imgs/icon_hand_open.png")] 
    199         private var m_handOpenIcon:Class; 
    200          
    201196        private var m_auxLine:AuxLineView; 
    202197        private var m_auxPixel:AuxPixelView; 

  • as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/ui/v1/PenController.mxml

    r3624 r3628  
    517517        <!-- tools --> 
    518518        <mx:Button id="colorPickerButton" x="21.5" y="235" label="色選択画面" width="65" paddingLeft="0" paddingRight="0" buttonDown="onClickColorPicker(event)"/> 
    519         <mx:Button id="dropperButton" x="5" y="260" toggle="true" icon="@Embed(source='../../../../../../imgs/icon_dropper.png')" width="22" paddingLeft="0" paddingRight="0" change="onSelectDropper(event)"/> 
    520         <mx:Button id="handtoolButton" x="31" y="260" toggle="true" icon="@Embed(source='../../../../../../imgs/icon_hand_open.png')" width="22" paddingLeft="0" paddingRight="0" change="onSelectHandTool(event)"/> 
     519        <mx:Button id="dropperButton" x="5" y="260" toggle="true" icon="{Application.application.dropperIcon}" width="22" paddingLeft="0" paddingRight="0" change="onSelectDropper(event)"/> 
     520        <mx:Button id="handtoolButton" x="31" y="260" toggle="true" icon="{Application.application.handOpenIcon}" width="22" paddingLeft="0" paddingRight="0" change="onSelectHandTool(event)"/> 
    521521        <mx:Button id="eraserButton" x="56" y="260" toggle="true" label="消" width="22" paddingLeft="0" paddingRight="0" change="onSelectEraser(event)"/> 
    522522        <mx:Button id="dotButton" x="81" y="260" toggle="true" label="ド" width="22" paddingLeft="0" paddingRight="0" change="onSelectDot(event)"/>