チェンジセット 3578

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

moved the classes under org.libspark.gunyarapaint.controls to org.libspark.gunyarapaint.ui.v1

ファイル:

凡例:

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

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

    r3569 r3578  
    22<mx:Application 
    33    xmlns:mx="http://www.adobe.com/2006/mxml" 
    4     xmlns:gpcontrol="org.libspark.gunyarapaint.controls.*" 
    54    xmlns:ui="org.libspark.gunyarapaint.ui.v1.*" 
    65    layout="absolute" width="100%" height="100%" 
    …… 
    1514    <mx:Script> 
    1615        <![CDATA[ 
    17             import flash.errors.IllegalOperationError; 
    18             import flash.events.Event; 
    19             import flash.events.KeyboardEvent; 
    20             import flash.geom.Matrix; 
    21             import flash.geom.Point; 
    22             import flash.ui.Keyboard; 
    23             import flash.utils.ByteArray; 
    24              
    2516            import mx.controls.Alert; 
    2617            import mx.core.UITextField; 
    2718            import mx.events.FlexEvent; 
    28             import mx.events.ListEvent; 
    29             import mx.events.NumericStepperEvent; 
    30             import mx.events.SliderEvent; 
    3119            import mx.managers.PopUpManager; 
    3220             
    33             import org.libspark.gunyarapaint.controls.MovingCanvasModule; 
    34             import org.libspark.gunyarapaint.controls.GPPasswordWindowControl; 
    3521            import org.libspark.gunyarapaint.framework.LayerBitmapCollection; 
    3622            import org.libspark.gunyarapaint.framework.Painter; 
    …… 
    3824            import org.libspark.gunyarapaint.framework.Recorder; 
    3925            import org.libspark.gunyarapaint.framework.events.CommandEvent; 
    40             import org.libspark.gunyarapaint.framework.events.UndoEvent; 
    4126            import org.libspark.gunyarapaint.framework.modules.CanvasModuleContext; 
    4227            import org.libspark.gunyarapaint.framework.modules.CircleModule; 
    …… 
    4732            import org.libspark.gunyarapaint.framework.modules.LineModule; 
    4833            import org.libspark.gunyarapaint.framework.modules.PixelModule; 
    49             import org.libspark.nicopedia.Com; 
     34            import org.libspark.gunyarapaint.ui.v1.MovableCanvasModule; 
    5035             
    5136            private var m_recorder:Recorder; 
    …… 
    153138            public function resetWindowsPosition():void 
    154139            { 
    155                 canvasWindow.rotate(0); 
    156                 canvasWindow.transform.matrix = new Matrix(1, 0, 0, 1, initCanvasWindow.x, initCanvasWindow.y); 
    157                 penDetailWindow.move(initPenDetailWindowPos.x, initPenDetailWindowPos.y); 
    158                 layerWindow.move(initLayerWindowPos.x, initLayerWindowPos.y); 
     140                canvasController.rotate(0); 
     141                canvasController.transform.matrix = new Matrix(1, 0, 0, 1, initCanvasWindow.x, initCanvasWindow.y); 
     142                penController.move(initPenDetailWindowPos.x, initPenDetailWindowPos.y); 
     143                layerController.move(initLayerWindowPos.x, initLayerWindowPos.y); 
    159144                toolController.move(initToolController.x, initToolController.y); 
    160                 canvasWindow.width = initCanvasWindow.width; 
    161                 canvasWindow.height = initCanvasWindow.height; 
     145                canvasController.width = initCanvasWindow.width; 
     146                canvasController.height = initCanvasWindow.height; 
    162147                toolController.setRotate(0); 
    163148                toolController.setZoom(1); 
    …… 
    224209                /* 
    225210                enabled = false; 
    226                 canvasWindow.enabled = false; 
    227                 penDetailWindow.enabled = false; 
     211                canvasController.enabled = false; 
     212                penController.enabled = false; 
    228213                layerWindow.enabled = false; 
    229214                */ 
    230215                 
    231216                // ポップアップさせて、そいつらの初期位置を覚える 
    232                 PopUpManager.addPopUp(canvasWindow, this); 
    233                 PopUpManager.addPopUp(penDetailWindow, this); 
    234                 PopUpManager.addPopUp(layerWindow, this); 
     217                PopUpManager.addPopUp(canvasController, this); 
     218                PopUpManager.addPopUp(penController, this); 
     219                PopUpManager.addPopUp(layerController, this); 
    235220                PopUpManager.addPopUp(toolController, this); 
    236                 initCanvasWindow = new Rectangle(canvasWindow.x, canvasWindow.y, canvasWindow.width, canvasWindow.height); 
    237                 initPenDetailWindowPos = new Point(penDetailWindow.x, penDetailWindow.y); 
    238                 initLayerWindowPos = new Point(layerWindow.x, layerWindow.y); 
     221                initCanvasWindow = new Rectangle(canvasController.x, canvasController.y, canvasController.width, canvasController.height); 
     222                initPenDetailWindowPos = new Point(penController.x, penController.y); 
     223                initLayerWindowPos = new Point(layerController.x, layerController.y); 
    239224                initToolController = new Point(toolController.x, toolController.y); 
    240225                 
    …… 
    275260                    } 
    276261                } 
    277                 m_context.add(new MovingCanvasModule(m_recorder, canvasWindow)); 
     262                m_context.add(new MovableCanvasModule(m_recorder, canvasController)); 
    278263            } 
    279264             
    …… 
    312297                switch (evt.keyCode) { 
    313298                    case Keyboard.CONTROL: 
    314                         penDetailWindow.pen = DropperModule.DROPPER; 
     299                        penController.pen = DropperModule.DROPPER; 
    315300                        break; 
    316301                    case Keyboard.SHIFT: 
    317302                        break; 
    318303                    case Keyboard.SPACE: 
    319                         penDetailWindow.pen = MovingCanvasModule.MOVING_CANVAS; 
     304                        penController.pen = MovableCanvasModule.MOVABLE_CANVAS; 
    320305                        break; 
    321306                    case 48: // 0 
    …… 
    380365                    case 57: // 9 
    381366                        if (!evt.shiftKey)// 念のため SHIFTキー対応 (テンキーのほうは放置) 
    382                             penDetailWindow.currentThickness = evt.keyCode - 48; 
     367                            penController.currentThickness = evt.keyCode - 48; 
    383368                        break; 
    384369                    case 97: // ten-key 1 
    …… 
    391376                    case 104: // ten-key 8 
    392377                    case 105: // ten-key 9 
    393                         penDetailWindow.currentThickness = evt.keyCode - 96; 
     378                        penController.currentThickness = evt.keyCode - 96; 
    394379                        break; 
    395380                    case 45: // INS 
    …… 
    409394                switch (evt.keyCode) { 
    410395                    case Keyboard.CONTROL: 
    411                         penDetailWindow.reset(); 
     396                        penController.reset(); 
    412397                        break; 
    413398                    case Keyboard.SPACE: 
    414                         penDetailWindow.reset(); 
     399                        penController.reset(); 
    415400                        break; 
    416401                    case 65: // a 
    …… 
    461446    <mx:Image source="@Embed('./gunyara-paint_logo.png')" alpha="0.5" right="10" bottom="10"/> 
    462447    <ui:ToolController id="toolController" left="10" y="10" title="補助ツール" /> 
    463     <gpcontrol:PenDetailWindowControl id="penDetailWindow" x="10" y="218" layout="absolute" title="ペン" height="450" /> 
    464     <gpcontrol:GPCanvasWindowControl id="canvasWindow" x="146" y="218" width="379" height="410" layout="absolute" title="キャンバス" /> 
    465     <gpcontrol:GPLayerWindowControl x="533" y="218" layout="absolute" title="レイヤー" id="layerWindow" height="312" /> 
     448    <ui:PenController id="penController" x="10" y="218" layout="absolute" title="ペン" height="450" /> 
     449    <ui:CanvasController id="canvasController" x="146" y="218" width="379" height="410" layout="absolute" title="キャンバス" /> 
     450    <ui:LayerController x="533" y="218" layout="absolute" title="レイヤー" id="layerController" height="312" /> 
    466451    <mx:Label id="versionLabel" text="ver.2009090902" right="10" bottom="10" alpha="0.5"/> 
    467452</mx:Application> 

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

    r3545 r3578  
    1 package org.libspark.gunyarapaint.controls 
     1package org.libspark.gunyarapaint.ui.v1 
    22{ 
    33    import flash.display.Sprite; 
    …… 
    1515    import org.libspark.gunyarapaint.framework.ui.IApplication; 
    1616     
    17     internal class GPCanvas extends UIComponent 
     17    internal class Canvas extends UIComponent 
    1818    { 
    19         public function GPCanvas() 
     19        public function Canvas() 
    2020        { 
    2121            var app:IApplication = IApplication(Application.application); 

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

    r3545 r3578  
    1 package org.libspark.gunyarapaint.controls 
     1package org.libspark.gunyarapaint.ui.v1 
    22{ 
    33    import flash.events.MouseEvent; 
    …… 
    1616    import mx.events.ScrollEvent; 
    1717     
    18     import org.libspark.gunyarapaint.framework.AuxBitmap; 
     18    import org.libspark.gunyarapaint.controls.ResizableComponent; 
    1919    import org.libspark.gunyarapaint.framework.Pen; 
    2020    import org.libspark.gunyarapaint.framework.ui.IApplication; 
    2121     
    22     public class GPCanvasWindowControl extends TitleWindow 
     22    public class CanvasController extends TitleWindow 
    2323    { 
    24         public function GPCanvasWindowControl() 
     24        public function CanvasController() 
    2525        { 
    2626            m_contentContainer = new Container(); 
    …… 
    136136            m_canvasScale = 1; 
    137137             
    138             m_canvas = new GPCanvas(); 
     138            m_canvas = new Canvas(); 
    139139            m_canvasContainer.addChild(m_canvas); 
    140140            m_contentContainer.addChild(m_canvasContainer); 
    …… 
    251251        private var m_scrollDragStartPoint:Point; 
    252252        private var m_resizable:ResizableComponent; 
    253         private var m_canvas:GPCanvas; 
     253        private var m_canvas:Canvas; 
    254254    } 
    255255} 

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

    r3499 r3578  
    1 package org.libspark.gunyarapaint.controls 
     1package org.libspark.gunyarapaint.ui.v1 
    22{ 
    33    import flash.events.Event; 

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

    r3470 r3578  
    1 package org.libspark.gunyarapaint.controls 
     1package org.libspark.gunyarapaint.ui.v1 
    22{ 
    33    import mx.controls.ComboBox; 

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

    r3470 r3578  
    66    <mx:Script> 
    77        import flash.system.System; 
    8         import org.libspark.gunyarapaint.controls.GPCanvas; 
     8         
     9        import mx.core.Application; 
    910        import mx.managers.PopUpManager; 
    10         import mx.core.Application; 
     11         
     12        import org.libspark.gunyarapaint.ui.v1.Canvas; 
    1113         
    1214        public function set password(s:String):void { 

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

    r3470 r3578  
    1 package org.libspark.gunyarapaint.controls 
     1package org.libspark.gunyarapaint.ui.v1 
    22{ 
    33    import flash.events.MouseEvent; 
    …… 
    55    import mx.controls.DataGrid; 
    66     
    7     public class GPLayerDataGrid extends DataGrid 
     7    public class ExtendedDataGrid extends DataGrid 
    88    { 
    9         public function GPLayerDataGrid() 
     9        public function ExtendedDataGrid() 
    1010        { 
    1111            super(); 

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

    r3566 r3578  
    33                width="144" height="312" 
    44                creationComplete="onCreateComplete()" 
    5                 xmlns:ns1="org.libspark.gunyarapaint.controls.*" 
     5                xmlns:ui="org.libspark.gunyarapaint.ui.v1.*" 
    66                > 
    77    <mx:Script> 
    …… 
    132132        ]]> 
    133133    </mx:Script> 
    134     <ns1:GPLayerDataGrid id="layerDataGrid" x="0" y="43" width="124" height="200" editable="true" sortableColumns="false" dragMoveEnabled="true" dragEnabled="true" dropEnabled="true" 
     134    <ui:ExtendedDataGrid id="layerDataGrid" x="0" y="43" width="124" height="200" editable="true" sortableColumns="false" dragMoveEnabled="true" dragEnabled="true" dropEnabled="true" 
    135135                         itemClick="onClickLayer(event)" dragComplete="onDragComplete(event)"> 
    136         <ns1:columns> 
    137             <mx:DataGridColumn editable="false" headerText="目" dataField="visible" itemRenderer="org.libspark.gunyarapaint.controls.CheckBoxEditor" rendererIsEditor="true" width="20"/> 
    138             <mx:DataGridColumn editable="false" headerText="ロ" dataField="locked" itemRenderer="org.libspark.gunyarapaint.controls.CheckBoxEditor" rendererIsEditor="true" width="20"/> 
     136        <ui:columns> 
     137            <mx:DataGridColumn editable="false" headerText="目" dataField="visible" itemRenderer="org.libspark.gunyarapaint.ui.v1.CheckBoxEditor" rendererIsEditor="true" width="20"/> 
     138            <mx:DataGridColumn editable="false" headerText="ロ" dataField="locked" itemRenderer="org.libspark.gunyarapaint.ui.v1.CheckBoxEditor" rendererIsEditor="true" width="20"/> 
    139139            <!--mx:DataGridColumn headerText="マ" dataField="maskCheck" itemRenderer="org.libspark.gunyarapaint.controls.CheckBoxEditor" rendererIsEditor="true" width="20"/--> 
    140140            <mx:DataGridColumn editable="true" headerText="レイヤ名" dataField="name"/> 
    141         </ns1:columns> 
    142     </ns1:GPLayerDataGrid> 
     141        </ui:columns> 
     142    </ui:ExtendedDataGrid> 
    143143    <mx:Button x="6" y="246" id="newLayerButton" label="新" width="22" paddingLeft="0" paddingRight="0" buttonDown="onCreateLayer(event)"/> 
    144144    <mx:Button x="36" y="246" id="copyLayerButton" label="複" width="22" paddingLeft="0" paddingRight="0" buttonDown="onCopyLayer(event)"/> 

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

    r3544 r3578  
    1 package org.libspark.gunyarapaint.controls 
     1package org.libspark.gunyarapaint.ui.v1 
    22{ 
    33    import flash.geom.Point; 
    …… 
    77    import org.libspark.gunyarapaint.framework.modules.ICanvasModule; 
    88     
    9     public final class MovingCanvasModule extends CanvasModule implements ICanvasModule 
     9    public final class MovableCanvasModule extends CanvasModule implements ICanvasModule 
    1010    { 
    11         public static const MOVING_CANVAS:String = "movingCanvas"; 
     11        public static const MOVABLE_CANVAS:String = "movableCanvas"; 
    1212         
    13         public function MovingCanvasModule(recorder:Recorder, canvas:GPCanvasWindowControl) 
     13        public function MovableCanvasModule(recorder:Recorder, canvas:CanvasController) 
    1414        { 
    1515            m_canvas = canvas; 
    …… 
    4444        public function get name():String 
    4545        { 
    46             return MOVING_CANVAS; 
     46            return MOVABLE_CANVAS; 
    4747        } 
    4848         
    49         private var m_canvas:GPCanvasWindowControl; 
     49        private var m_canvas:CanvasController; 
    5050        private var m_scrollPosition:Point; 
    5151    } 

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

    r3572 r3578  
    3636                } 
    3737                else if (handtoolButton.selected) { 
    38                     currentState = MovingCanvasModule.MOVING_CANVAS; 
     38                    currentState = MovableCanvasModule.MOVABLE_CANVAS; 
    3939                } 
    4040                else if (eraserButton.selected) { 
    …… 
    214214            { 
    215215                if (Button(evt.currentTarget).selected) 
    216                     pen = MovingCanvasModule.MOVING_CANVAS; 
     216                    pen = MovableCanvasModule.MOVABLE_CANVAS; 
    217217                else 
    218218                    setDefaultPen(); 
    …… 
    470470        <!-- tools --> 
    471471        <mx:Button id="colorPickerButton" x="21.5" y="235" label="色選択画面" width="65" paddingLeft="0" paddingRight="0" buttonDown="onClickColorPicker(event)"/> 
    472         <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)"/> 
    473         <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)"/> 
     472        <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)"/> 
     473        <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)"/> 
    474474        <mx:Button id="eraserButton" x="56" y="260" toggle="true" label="消" width="22" paddingLeft="0" paddingRight="0" change="onSelectEraser(event)"/> 
    475475        <mx:Button id="dotButton" x="81" y="260" toggle="true" label="ド" width="22" paddingLeft="0" paddingRight="0" change="onSelectDot(event)"/> 

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

    r3577 r3578  
    44        <![CDATA[ 
    55            import mx.controls.Alert; 
    6             import mx.core.Application;  
     6            import mx.core.Application; 
    77            import mx.events.FlexEvent; 
    88            import mx.events.ListEvent; 
    …… 
    1010            import mx.managers.PopUpManager; 
    1111             
    12             import org.libspark.gunyarapaint.controls.GPPasswordWindowControl; 
     12            import org.libspark.gunyarapaint.framework.Painter; 
     13            import org.libspark.gunyarapaint.framework.Recorder; 
    1314            import org.libspark.gunyarapaint.framework.events.UndoEvent; 
    1415            import org.libspark.gunyarapaint.framework.ui.IApplication; 
    15             import org.libspark.gunyarapaint.framework.Painter; 
    16             import org.libspark.gunyarapaint.framework.Recorder; 
    1716            import org.libspark.nicopedia.Com; 
    1817             
    …… 
    129128            private function passwordButtonHandler(evt:FlexEvent):void 
    130129            { 
    131                 var w:GPPasswordWindowControl = new GPPasswordWindowControl(); 
    132                 PopUpManager.addPopUp(w, this, true); 
     130                var controller:DataController = new DataController(); 
     131                PopUpManager.addPopUp(controller, this, true); 
    133132                // w.password = gpCanvas.logger.password; 
    134133            }