チェンジセット 3762

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

changed UI, added compatibility settings

ファイル:

凡例:

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

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

    r3760 r3762  
    4040            import org.libspark.gunyarapaint.ui.i18n.GetTextTranslator; 
    4141            import org.libspark.gunyarapaint.ui.v1.CopyrightWindow; 
     42            import org.libspark.gunyarapaint.ui.v1.FileController; 
    4243            import org.libspark.gunyarapaint.ui.v1.IController; 
    4344            import org.libspark.gunyarapaint.ui.v1.MovableCanvasModule; 
    …… 
    456457            } 
    457458             
     459            private function onClickImage():void 
     460            { 
     461                PopUpManager.addPopUp(new CopyrightWindow(), this, true); 
     462            } 
     463             
    458464            private function get isForcusedOnTextField():Boolean 
    459465            { 
    …… 
    461467            } 
    462468             
    463             private function onClickImage():void 
    464             { 
    465                 PopUpManager.addPopUp(new CopyrightWindow(), this, true); 
     469            private function openRecoveryWindow(event:FlexEvent):void 
     470            { 
     471                //var controller:DataController = new DataController(); 
     472                var controller:FileController = new FileController(); 
     473                PopUpManager.addPopUp(controller, this, true); 
    466474            } 
    467475             
    …… 
    480488        ]]> 
    481489    </mx:Script> 
     490    <mx:Button id="windowsResetButton" x="122" y="10" label="{_('Reset all windows position')}" width="104" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17" buttonDown="resetWindowsPosition()"/> 
     491    <mx:Button id="passwordButton" x="10" y="10" label="{_('Recovery center')}" width="104" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17" buttonDown="openRecoveryWindow(event)"/> 
    482492    <mx:Image source="@Embed('../assets/images/gunyara-paint_logo.png')" alpha="0.5" right="10" bottom="10" click="onClickImage()"/> 
    483     <ui:FormController id="formController" title="{_('Post form')}"  x="10" y="10" height="169" width="486"/> 
     493    <ui:FormController id="formController" title="{_('Post form')}"  x="10" y="46"/> 
    484494    <ui:ToolController id="toolController" left="504" y="10" title="{_('Support tools')}" /> 
    485     <ui:PenController id="penController" x="10" y="223" layout="absolute" title="{_('Brushes')}" height="450" /> 
     495    <ui:PenController id="penController" x="10" y="223" layout="absolute" title="{_('Brushes')}"/> 
    486496    <ui:CanvasController id="canvasController" x="146" y="223" width="379" height="410" layout="absolute" title="{_('Canvas')}" /> 
    487     <ui:LayerController x="533" y="223" layout="absolute" title="{_('Layers')}" id="layerController" height="312" /> 
     497    <ui:LayerController x="533" y="223" layout="absolute" title="{_('Layers')}" id="layerController" /> 
    488498    <mx:Label id="versionLabel" text="{Painter.PAINTER_VERSION_STRING}" right="10" bottom="10" alpha="0.5"/> 
    489499</mx:Application> 

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

    r3760 r3762  
    9292        ]]> 
    9393    </mx:Script> 
    94     <mx:Button id="loadButton" x="57" y="25" label="{_('Load')}" click="onLoad()"/> 
    95     <mx:Button id="saveButton" x="52" y="55" label="{_('Save')}" click="onSave()"/> 
     94    <mx:Button id="loadButton" x="25" y="25" label="{_('Load')}" click="onLoad()" width="128"/> 
     95    <mx:Button id="saveButton" x="25" y="55" label="{_('Save')}" click="onSave()" width="128"/> 
    9696</mx:TitleWindow> 

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

    r3759 r3762  
    11<?xml version="1.0" encoding="utf-8"?> 
    22<mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" layout="absolute" 
    3                 width="144" height="312" 
     3                width="144" height="360" 
    44                implements="org.libspark.gunyarapaint.ui.v1.IController" 
    55                xmlns:ui="org.libspark.gunyarapaint.ui.v1.*"> 
    …… 
    1616            import org.libspark.gunyarapaint.framework.LayerBitmap; 
    1717            import org.libspark.gunyarapaint.framework.LayerBitmapCollection; 
     18            import org.libspark.gunyarapaint.framework.Painter; 
    1819            import org.libspark.gunyarapaint.framework.UndoStack; 
    1920            import org.libspark.gunyarapaint.framework.events.UndoEvent; 
    …… 
    192193    <mx:Label x="5" y="23" text="{_('Transparency of the layer')}"/> 
    193194    <mx:HSlider id="alphaSlider" x="18" y="20" width="99" minimum="0.05" maximum="1" snapInterval="0.05" value="1" change="onChangeAlphaSlider(event)"/> 
     195    <mx:Button id="horizontalMirrorButton" label="{_('Mirror horizontally to all layers')}" width="117" height="17" buttonDown="IApplication(Application.application).canvasModule.horizontalMirror(Painter.ALL_LAYERS)" y="273" x="3"/> 
     196    <mx:Button id="verticalMirrorButton" label="{_('Mirror vertically to all layers')}" width="117" height="17" buttonDown="IApplication(Application.application).canvasModule.verticalMirror(Painter.ALL_LAYERS)" x="3" y="295"/> 
    194197</mx:TitleWindow> 

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

    r3759 r3762  
    11<?xml version="1.0" encoding="utf-8"?> 
    2 <mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" layout="absolute" width="300" height="205" 
    3                 implements="org.libspark.gunyarapaint.ui.v1.IController" removedFromStage="onRemove()"> 
     2<mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" layout="absolute" width="298" height="203" 
     3                implements="org.libspark.gunyarapaint.ui.v1.IController"> 
    44    <mx:Script> 
    55        <![CDATA[ 
    …… 
    1313            import org.libspark.gunyarapaint.framework.UndoStack; 
    1414            import org.libspark.gunyarapaint.framework.events.UndoEvent; 
     15            import org.libspark.gunyarapaint.framework.modules.ICanvasModule; 
    1516            import org.libspark.gunyarapaint.framework.ui.IApplication; 
    1617             
    …… 
    6465            } 
    6566             
    66             private function onRemove():void 
    67             { 
    68                 var undo:UndoStack = IApplication(Application.application).undoStack; 
    69                 undo.removeEventListener(UndoEvent.UNDO, onChangeUndo); 
    70                 undo.removeEventListener(UndoEvent.REDO, onChangeUndo); 
    71                 undo.removeEventListener(UndoEvent.PUSH, onChangeUndo); 
    72             } 
    73              
    7467            private function onChangeUndo(event:UndoEvent):void 
    7568            { 
    …… 
    7871                undoButton.label = _("Undo count"); 
    7972                if (undoCount > 0) { 
    80                     undoButton.label += '(' + undoCount + ')'; 
     73                    undoButton.label += " (" + undoCount + ")"; 
    8174                    undoButton.enabled = true; 
    8275                } 
    …… 
    8780                redoButton.label = _("Redo count"); 
    8881                if (redoCount > 0) { 
    89                     redoButton.label += '(' + redoCount + ')'; 
     82                    redoButton.label += " (" + redoCount + ")"; 
    9083                    redoButton.enabled = true; 
    9184                } 
    …… 
    122115            } 
    123116             
    124             private function onChangeAuxBoxVisible(evt:Event):void 
     117            private function onChangeAuxBoxVisible(event:Event):void 
    125118            { 
    126                 Application.application.canvasController.auxBoxVisible = evt.target.selected; 
     119                Application.application.canvasController.auxBoxVisible = event.target.selected; 
    127120            } 
    128121             
    129             private function onChangeAuxSkewVisible(evt:Event):void 
     122            private function onChangeAuxSkewVisible(event:Event):void 
    130123            { 
    131                 Application.application.canvasController.auxSkewVisible = evt.target.selected; 
     124                Application.application.canvasController.auxSkewVisible = event.target.selected; 
    132125            } 
    133126             
    …… 
    148141            } 
    149142             
    150             private function onLoad(evt:FlexEvent):void 
     143            private function onChangeEnableBigPixel(event:Event):void 
    151144            { 
    152                 //var controller:DataController = new DataController(); 
    153                 var controller:FileController = new FileController(); 
    154                 PopUpManager.addPopUp(controller, this, true); 
     145                var module:ICanvasModule = IApplication(Application.application).canvasModule; 
     146                module.setCompatibility(Painter.COMPATIBILITY_BIG_PIXEL, event.target.selected); 
     147            } 
     148             
     149            private function onChangeEnableUndoLayer(event:Event):void 
     150            { 
     151                var module:ICanvasModule = IApplication(Application.application).canvasModule; 
     152                module.setCompatibility(Painter.COMPATIBILITY_UNDO_LAYER, event.target.selected); 
    155153            } 
    156154             
    …… 
    158156        ]]> 
    159157    </mx:Script> 
    160     <mx:Canvas x="10" y="0" height="163" width="260"> 
    161         <mx:Button id="rotateResetButton" y="63" label="{_('Canvas Rotation')}" width="29" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17" right="204" buttonDown="setRotate(0)"/> 
    162         <mx:Button id="zoomResetButton" y="81" label="{_('Canvas Zoom')}" width="29" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17" right="204" buttonDown="setZoom(1)"/> 
    163         <mx:HSlider id="canvasRotate" y="62" width="152" minimum="-180" maximum="180" snapInterval="5" value="0"  right="49" showDataTip="false" change="setRotate(event.value)" thumbDrag="setRotate(event.value)"/> 
    164         <mx:HSlider id="canvasZoom" y="79" width="152" minimum="-4" maximum="32" snapInterval="0.5" value="1"  right="49" showDataTip="false" change="setZoom(event.value)" thumbDrag="setZoom(event.value)"/> 
    165         <mx:TextInput id="canvasRotateValue" y="66" width="32" height="17" right="18" fontSize="8" textAlign="right" text="0" restrict="0-9" maxChars="4" enter="onChangeCanvasRotate(event)"/> 
    166         <mx:Label y="66" text="°" right="0"/> 
    167         <mx:TextInput id="canvasZoomValue" y="83" width="32" height="17" right="18" fontSize="8" textAlign="right" text="100" restrict="0-9" maxChars="6" enter="onChangeCanvasZoom(event)"/> 
    168         <mx:Label y="83" text="%" right="0"/> 
    169         <mx:Label y="4" text="{_('Auxiliary Lines')}" right="199"/> 
    170         <mx:NumericStepper id="additionalNumberStepper" y="4" value="4" minimum="2" maximum="16" stepSize="1" right="143" height="18" fontSize="8" change="onChangeAuxDivideCount(event)"/> 
    171         <mx:CheckBox id="additionalBoxCheckBox" y="2" label="{_('Auxiliary box')}" right="8" fontSize="9" height="18" change="onChangeAuxBoxVisible(event)"/> 
    172         <mx:CheckBox id="additionalSkewCheckBox" y="18" label="{_('Auxiliary skew')}" right="9" fontSize="9" height="18" change="onChangeAuxSkewVisible(event)"/> 
    173         <mx:Button id="undoButton" y="38" label="{_('Undo')}" enabled="false" paddingLeft="3" paddingRight="3" right="89" buttonDown="IApplication(Application.application).canvasModule.undo()"/> 
    174         <mx:Button id="redoButton" y="38" label="{_('Redo')}" enabled="false" paddingLeft="3" paddingRight="3" right="12" buttonDown="IApplication(Application.application).canvasModule.redo()"/> 
    175         <mx:ComboBox y="4" id="additionalTypeComboBox" right="66" width="70" fontSize="8" height="18" selectedIndex="0" change="onChangeAuxType(event)"> 
    176             <mx:ArrayCollection id="auxTypes"> 
    177                 <mx:Object label="{_('Divided by lines')}" data="0" /> 
    178                 <mx:Object label="{_('Divided by pixels')}" data="1" /> 
    179             </mx:ArrayCollection> 
    180         </mx:ComboBox> 
    181         <mx:Button id="windowsResetButton" x="146" y="136" label="{_('Reset all windows position')}" width="104" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17" buttonDown="Application.application.resetWindowsPosition()"/> 
    182         <mx:Button id="horizontalMirrorButton" x="10" y="111" label="{_('Mirror horizontally to all layers')}" width="120" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17" buttonDown="IApplication(Application.application).canvasModule.horizontalMirror(Painter.ALL_LAYERS)"/> 
    183         <mx:Button id="verticalMirrorButton" x="10" y="136" label="{_('Mirror vertically to all layers')}" width="120" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17" buttonDown="IApplication(Application.application).canvasModule.verticalMirror(Painter.ALL_LAYERS)"/> 
    184         <mx:Button id="passwordButton" x="146" y="111" label="{_('Recovery center')}" width="104" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17" buttonDown="onLoad(event)"/> 
    185     </mx:Canvas> 
     158    <mx:TabNavigator width="100%" height="100%" x="0" y="6"> 
     159        <mx:Canvas width="100%" height="100%" label="補助ツール"> 
     160            <mx:Label y="0" text="{_('Auxiliary Lines')}" x="10"/> 
     161            <mx:NumericStepper id="additionalNumberStepper" value="4" minimum="2" maximum="16" stepSize="1" right="174" height="18" fontSize="8" change="onChangeAuxDivideCount(event)" y="0"/> 
     162            <mx:CheckBox id="additionalBoxCheckBox" label="{_('Auxiliary box')}" fontSize="9" height="18" change="onChangeAuxBoxVisible(event)" x="190" y="0"/> 
     163            <mx:CheckBox id="additionalSkewCheckBox" label="{_('Auxiliary skew')}" fontSize="9" height="18" change="onChangeAuxSkewVisible(event)" x="190" y="15"/> 
     164            <mx:Button id="undoButton" y="36" label="{_('Undo')}" enabled="false" buttonDown="IApplication(Application.application).canvasModule.undo()" x="36"/> 
     165            <mx:Button id="redoButton" y="36" label="{_('Redo')}" enabled="false" buttonDown="IApplication(Application.application).canvasModule.redo()" x="136"/> 
     166            <mx:Button id="rotateResetButton" y="88" label="{_('Canvas Rotation')}" width="45" height="17" buttonDown="setRotate(0)" x="15"/> 
     167            <mx:Button id="zoomResetButton" label="{_('Canvas Zoom')}" width="45" height="17" buttonDown="setZoom(1)" x="15" y="66"/> 
     168            <mx:HSlider id="canvasRotate" y="66" width="152" minimum="-180" maximum="180" snapInterval="5" value="0" showDataTip="false" change="setRotate(event.value)" thumbDrag="setRotate(event.value)" x="64"/> 
     169            <mx:HSlider id="canvasZoom" y="87" width="152" minimum="-4" maximum="32" snapInterval="0.5" value="1" showDataTip="false" change="setZoom(event.value)" thumbDrag="setZoom(event.value)" x="64"/> 
     170            <mx:TextInput id="canvasRotateValue" y="66" width="32" height="17" right="28" fontSize="8" textAlign="right" text="0" restrict="0-9" maxChars="4" enter="onChangeCanvasRotate(event)"/> 
     171            <mx:Label y="66" text="°" right="10"/> 
     172            <mx:TextInput id="canvasZoomValue" y="87" width="32" height="17" right="28" fontSize="8" textAlign="right" text="100" restrict="0-9" maxChars="6" enter="onChangeCanvasZoom(event)"/> 
     173            <mx:Label y="87" text="%" right="10"/> 
     174            <mx:ComboBox y="2" id="additionalTypeComboBox" width="70" fontSize="8" height="18" selectedIndex="0" change="onChangeAuxType(event)" x="112"> 
     175                <mx:ArrayCollection id="auxTypes"> 
     176                    <mx:Object label="{_('Divided by lines')}" data="0" /> 
     177                    <mx:Object label="{_('Divided by pixels')}" data="1" /> 
     178                </mx:ArrayCollection> 
     179            </mx:ComboBox> 
     180        </mx:Canvas> 
     181        <mx:Canvas width="100%" height="100%" label="互換性設定"> 
     182            <mx:CheckBox id="enableUndoLayerCheckBox" label="レイヤー作成時アンドゥに入れる" fontSize="9" height="18" change="onChangeEnableUndoLayer(event)" x="10" y="10"/> 
     183            <!-- 
     184            <mx:CheckBox id="enableBigPixelCheckBox" label="太さに合わせたドット打ちを使えるようにする" fontSize="9" height="18" change="onChangeEnableBigPixel(event)" x="10" y="36" selected="true"/> 
     185            --> 
     186        </mx:Canvas> 
     187    </mx:TabNavigator> 
    186188</mx:TitleWindow>