チェンジセット 3464

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

changed correct namespace and update project files, Controller should use spark's Panel class

ファイル:

凡例:

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

  • as3/gunyarapaint/branches/gunyarapaint/air/.project

    r3462 r3464  
    1 <?xml version="1.0" encoding="UTF-8" standalone="no"?> 
     1<?xml version="1.0" encoding="UTF-8"?> 
    22<projectDescription> 
    33        <name>air</name> 
    4         <comment/> 
     4        <comment></comment> 
    55        <projects> 
     6                <project>framework</project> 
    67        </projects> 
    78        <buildSpec> 
    …… 
    2324        </natures> 
    2425</projectDescription> 
    25  

  • as3/gunyarapaint/branches/gunyarapaint/air/src/ApplicationDelegate-app.xml

    r3255 r3464  
    44        <filename>ApplicationDelegate</filename> 
    55        <name>ApplicationDelegate</name> 
    6         <version>v1</version> 
     6        <version>0.0.1</version> 
    77        <initialWindow> 
    88                <content></content> 
     9                <title>ぐにゃらペインター</title> 
     10                <systemChrome>standard</systemChrome> 
     11                <minimizable>true</minimizable> 
     12                <maximizable>true</maximizable> 
     13                <resizable>true</resizable> 
    914                <width>960</width> 
    1015                <height>720</height> 

  • as3/gunyarapaint/branches/gunyarapaint/air/src/ApplicationDelegate.mxml

    r3462 r3464  
    66    xmlns:my="org.libspark.gunyarapaint.components.halo.*" 
    77    preinitialize="init()" width="960" height="720" 
    8     implements="org.libspark.gunyarapaint.components.IDelegate" 
    9     xmlns:components="org.libspark.gunyarapaint.components.*"> 
     8    implements="org.libspark.gunyarapaint.framework.components.IDelegate" 
     9    xmlns:components="org.libspark.gunyarapaint.framework.components.*"> 
    1010    <!-- 
    1111    layout="absolute" 
    …… 
    8282    <components:UtilitiesController id="utilitiesController" x="677.95" y="9.8" delegate="{this}"/> 
    8383    <components:BrushesController id="brushesController" x="9.95" y="237.2" delegate="{this}"/> 
    84     <components:CanvasController id="canvasController" x="230" y="209" width="400" height="400" borderColor="#000000" borderWeight="1" delegate="{this}"/> 
     84    <components:CanvasController id="canvasController" x="230" y="209" width="400" height="400" delegate="{this}"/> 
    8585    <components:LayersController x="804.2" y="237.65" id="layers" delegate="{this}"/> 
    8686    <s:Label text="ver.2009090902" right="10" bottom="10" alpha="0.5"/> 

  • as3/gunyarapaint/branches/gunyarapaint/air/src/PlayerDelegate-app.xml

    r3255 r3464  
    11<?xml version="1.0" encoding="utf-8" standalone="no"?> 
    22<application xmlns="http://ns.adobe.com/air/application/1.5.2"> 
    3         <id>org.libspark.hkrn.painter</id> 
    4         <filename>Player</filename> 
    5         <name>Player</name> 
     3        <id>org.libspark.gunyarapaint.PlayerDelegate</id> 
     4        <filename>PlayerDelegate</filename> 
     5        <name>PlayerDelegate</name> 
    66        <version>0.0.1</version> 
    77        <initialWindow> 
    8                 <content>[This value will be overwritten by Flash Builder in the output app.xml]</content> 
    9                 <title>Player</title> 
     8                <content></content> 
     9                <title>ぐにゃらペイントプレイヤー</title> 
    1010                <systemChrome>standard</systemChrome> 
    1111                <minimizable>true</minimizable> 

  • as3/gunyarapaint/branches/gunyarapaint/air/src/org/libspark/gunyarapaint/framework/components/BrushesController.mxml

    r3270 r3464  
    11<?xml version="1.0" encoding="utf-8"?> 
    2 <s:Border 
     2<s:Panel 
    33    xmlns:fx="http://ns.adobe.com/mxml/2009"  
    44    xmlns:s="library://ns.adobe.com/flex/spark"  
    55    xmlns:mx="library://ns.adobe.com/flex/halo" 
    6     borderColor="#000000" 
    7     borderWeight="1" 
    8     width="160" height="450" initialize="init(event)" currentState="default"> 
     6    width="160" height="450" initialize="init(event)" currentState="default" title="パレット"> 
    97    <fx:Script> 
    108        <![CDATA[ 
    …… 
    1513            import mx.events.FlexEvent; 
    1614             
    17             import org.libspark.gunyarapaint.modules.CircleModule; 
    18             import org.libspark.gunyarapaint.modules.DropperModule; 
    19             import org.libspark.gunyarapaint.modules.EraserModule; 
    20             import org.libspark.gunyarapaint.modules.FloodFillModule; 
    21             import org.libspark.gunyarapaint.modules.FreeHandModule; 
    22             import org.libspark.gunyarapaint.modules.HandToolModule; 
    23             import org.libspark.gunyarapaint.modules.LineModule; 
    24             import org.libspark.gunyarapaint.modules.PixelModule; 
     15            import org.libspark.gunyarapaint.framework.modules.CircleModule; 
     16            import org.libspark.gunyarapaint.framework.modules.DropperModule; 
     17            import org.libspark.gunyarapaint.framework.modules.EraserModule; 
     18            import org.libspark.gunyarapaint.framework.modules.FloodFillModule; 
     19            import org.libspark.gunyarapaint.framework.modules.FreeHandModule; 
     20            import org.libspark.gunyarapaint.framework.modules.HandToolModule; 
     21            import org.libspark.gunyarapaint.framework.modules.LineModule; 
     22            import org.libspark.gunyarapaint.framework.modules.PixelModule; 
    2523             
    2624            import spark.components.HSlider; 
    …… 
    293291    </s:DropDownList> 
    294292    <s:DropDownList id="blendModeComboBox" x="10" y="391" width="138" dataProvider="{ApplicationDelegate(parentDocument).allBlendModes}" selectedIndex="0" enabled.floodfill="false" change.eraser="selectBlendMode(event)" change.floodfill="selectBlendMode(event)" enabled.pixel="false" enabled.hand="false" change.default="selectBlendMode(event)" enabled.dropper="false" toolTip="下の画像に対するブレンドモードを設定します"/> 
    295 </s:Border> 
     293</s:Panel> 

  • as3/gunyarapaint/branches/gunyarapaint/air/src/org/libspark/gunyarapaint/framework/components/CanvasController.mxml

    r3270 r3464  
    11<?xml version="1.0" encoding="utf-8"?> 
    2 <s:Border xmlns:fx="http://ns.adobe.com/mxml/2009"  
     2<s:Panel xmlns:fx="http://ns.adobe.com/mxml/2009"  
    33         xmlns:s="library://ns.adobe.com/flex/spark"  
    44         xmlns:mx="library://ns.adobe.com/flex/halo" 
    5          xmlns:components="org.libspark.gunyarapaint.components.*" 
    6          initialize="init(event)"> 
     5         xmlns:components="org.libspark.gunyarapaint.framework.components.*" 
     6         initialize="init(event)" title="キャンバス"> 
    77    <fx:Script> 
    88        <![CDATA[ 
    …… 
    1111            import mx.events.FlexEvent; 
    1212             
    13             import org.libspark.gunyarapaint.AuxBitmap; 
    14             import org.libspark.gunyarapaint.Recorder; 
    15             import org.libspark.gunyarapaint.TransparentBitmap; 
     13            import org.libspark.gunyarapaint.framework.AuxBitmap; 
     14            import org.libspark.gunyarapaint.framework.Recorder; 
     15            import org.libspark.gunyarapaint.framework.TransparentBitmap; 
    1616             
    1717            import spark.core.SpriteVisualElement; 
    …… 
    8282    <s:HScrollBar y="{height - 2}" width="{width - 1}" /> 
    8383    <s:VScrollBar x="{width - 2}" height="{height - 1}" /> 
    84 </s:Border> 
     84</s:Panel> 

  • as3/gunyarapaint/branches/gunyarapaint/air/src/org/libspark/gunyarapaint/framework/components/DrawableCanvas.mxml

    r3255 r3464  
    1111            import flash.events.MouseEvent; 
    1212             
    13             import org.libspark.gunyarapaint.Recorder; 
    14             import org.libspark.gunyarapaint.modules.EllipseModule; 
    15             import org.libspark.gunyarapaint.modules.IDrawable; 
     13            import org.libspark.gunyarapaint.framework.Recorder; 
     14            import org.libspark.gunyarapaint.framework.modules.EllipseModule; 
     15            import org.libspark.gunyarapaint.framework.modules.IDrawable; 
    1616             
    1717            import spark.core.SpriteVisualElement; 

  • as3/gunyarapaint/branches/gunyarapaint/air/src/org/libspark/gunyarapaint/framework/components/FormController.mxml

    r3255 r3464  
    11<?xml version="1.0" encoding="utf-8"?> 
    2 <s:Border 
     2<s:Panel 
    33    xmlns:fx="http://ns.adobe.com/mxml/2009" 
    44    xmlns:s="library://ns.adobe.com/flex/spark" 
    55    xmlns:mx="library://ns.adobe.com/flex/halo" 
    6     borderColor="#000000" borderWeight="1" 
    7     width="550" height="170"> 
     6    width="550" height="170" title="投稿フォーム"> 
    87    <s:Label x="25" y="7" text="投稿者名"/> 
    98    <s:TextInput id="fromTextInput" x="86" y="8" maxChars="32" fontSize="14" focusThickness="0"/> 
    …… 
    1615        <s:text></s:text> 
    1716    </s:TextArea> 
    18 </s:Border> 
     17</s:Panel> 

  • as3/gunyarapaint/branches/gunyarapaint/air/src/org/libspark/gunyarapaint/framework/components/LayersController.mxml

    r3270 r3464  
    11<?xml version="1.0" encoding="utf-8"?> 
    2 <s:Border  
     2<s:Panel  
    33    xmlns:fx="http://ns.adobe.com/mxml/2009"  
    44    xmlns:s="library://ns.adobe.com/flex/spark"  
    55    xmlns:mx="library://ns.adobe.com/flex/halo" 
    66    width="144" height="320" 
    7     borderColor="#000000" borderWeight="1" 
    8     xmlns:g="org.libspark.gunyarapaint.components.*"> 
     7    xmlns:g="org.libspark.gunyarapaint.framework.components.*" title="レイヤー"> 
    98    <fx:Script> 
    109        <![CDATA[ 
    …… 
    1413            import mx.events.DragEvent; 
    1514             
    16             import org.libspark.gunyarapaint.LayerBitmapCollection; 
     15            import org.libspark.gunyarapaint.framework.LayerBitmapCollection; 
    1716             
    1817            import spark.components.HSlider; 
    …… 
    7776    <g:LayerDataGrid id="layerDataGrid" x="9" y="50" width="124" height="200" editable="true" sortableColumns="false" dragMoveEnabled="true" dragEnabled="true" dropEnabled="true" click="selectLayer(event)"> 
    7877        <g:columns> 
    79             <mx:DataGridColumn editable="false" headerText="目" dataField="showCheck" itemRenderer="org.libspark.gunyarapaint.components.CheckBoxEditor" rendererIsEditor="true" width="20"/> 
    80             <mx:DataGridColumn editable="false" headerText="ロ" dataField="lockCheck" itemRenderer="org.libspark.gunyarapaint.components.CheckBoxEditor" rendererIsEditor="true" width="20"/> 
    81             <!--mx:DataGridColumn headerText="マ" dataField="maskCheck" itemRenderer="CheckBoxEditor" rendererIsEditor="true" width="20"/--> 
     78            <mx:DataGridColumn editable="false" headerText="目" dataField="showCheck" itemRenderer="org.libspark.gunyarapaint.framework.components.CheckBoxEditor" rendererIsEditor="true" width="20"/> 
     79            <mx:DataGridColumn editable="false" headerText="ロ" dataField="lockCheck" itemRenderer="org.libspark.gunyarapaint.framework.components.CheckBoxEditor" rendererIsEditor="true" width="20"/> 
     80            <!--<mx:DataGridColumn headerText="マ" dataField="maskCheck" itemRenderer="CheckBoxEditor" rendererIsEditor="true" width="20" />--> 
    8281            <mx:DataGridColumn editable="true" headerText="レイヤ名" dataField="name"/> 
    8382        </g:columns> 
    …… 
    9089    <s:Label x="10" y="34" text="透"/> 
    9190    <s:HSlider id="alphaSlider" x="30" y="34" width="102" minimum="0.05" maximum="1" snapInterval="0.05" value="1" change="setLayerAlpha(event)" toolTip="現在のレイヤーに対する不透明度を設定します"/> 
    92 </s:Border> 
     91</s:Panel> 

  • as3/gunyarapaint/branches/gunyarapaint/air/src/org/libspark/gunyarapaint/framework/components/UtilitiesController.mxml

    r3270 r3464  
    11<?xml version="1.0" encoding="utf-8"?> 
    2 <s:Border  
     2<s:Panel  
    33    xmlns:fx="http://ns.adobe.com/mxml/2009"  
    44    xmlns:s="library://ns.adobe.com/flex/spark"  
    55    xmlns:mx="library://ns.adobe.com/flex/halo" 
    6     borderColor="#000000" borderWeight="1" 
    7     width="270" height="200"> 
     6    width="270" height="200" title="補助設定"> 
    87    <fx:Script> 
    98        <![CDATA[ 
    …… 
    1312            import mx.collections.IList; 
    1413             
    15             import org.libspark.gunyarapaint.AuxBitmap; 
     14            import org.libspark.gunyarapaint.framework.AuxBitmap; 
    1615             
    1716            import spark.events.IndexChangeEvent; 
    …… 
    112111        </s:ArrayCollection> 
    113112    </s:DropDownList> 
    114 </s:Border> 
     113</s:Panel>