チェンジセット 3270

コミット日時:

2009/12/31 10:39:39 (3 年前)

コミッタ:

hkrn

ログメッセージ:

Added CanvasController? class and tooltips

ファイル:

• as3/gunyarapaint/branches/gunyarapaint/src/org/libspark/gunyarapaint/components/BrushesController.mxml (更新) (7 diffs)
• as3/gunyarapaint/branches/gunyarapaint/src/org/libspark/gunyarapaint/components/CanvasController.mxml (追加)
• as3/gunyarapaint/branches/gunyarapaint/src/org/libspark/gunyarapaint/components/IDelegate.as (更新) (1 diff)
• as3/gunyarapaint/branches/gunyarapaint/src/org/libspark/gunyarapaint/components/LayersController.mxml (更新) (1 diff)
• as3/gunyarapaint/branches/gunyarapaint/src/org/libspark/gunyarapaint/components/UtilitiesController.mxml (更新) (7 diffs)

as3/gunyarapaint/branches/gunyarapaint/src/org/libspark/gunyarapaint/components/BrushesController.mxml

@@ -9 +9 @@
-    <fx:Script>
-        <![CDATA[
+            import flash.events.Event;
-            import flash.events.MouseEvent;
-            
@@ -64 +65 @@
-                item.setStyle("borderColor", 0x000000);
-                currentPalette = item;
-
+color = 
-                setColRGBSlider(item.getStyle("backgroundColor"));
-            }
@@ -126 +127 @@
-            private function selectDropper(event:MouseEvent):void
-            {
-delegate.module = new DropperModule(delegate.recorder
+switchToggleState(event, DropperModule, "dropper"
-            }
-            
-            private function selectHandTool(event:MouseEvent):void
-            {
-delegate.module = new HandToolModule(delegate.recorder
+switchToggleState(event, HandToolModule, "hand"
-            }
-            
-            private function selectEraser(event:MouseEvent):void
-            {
-delegate.module = new EraserModule(delegate.recorder
+switchToggleState(event, EraserModule, "eraser"
-            }
-            
-            private function selectPixel(event:MouseEvent):void
-            {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        ]]>
@@ -147 +165 @@
-    <s:states>
-        <s:State name="default"/>
-aw
+opp
-        <s:State name="eraser"/>
-        <s:State name="floodfill"/>
@@ -173 +191 @@
-    <!-- thickness -->
-    <s:Label x="14" y="28" text="太" width="14" height="11"/>
-
-drawer="false" enabled.floodfill="false" click.eraser="{thickness = 1}" click.drawer="{thickness = 1}" enabled.pixel="false" enabled.hand="false" click.default="{thickness = 1}
-drawer="false" enabled.floodfill="false" click.eraser="{thickness = 3}" click.drawer="{thickness = 3}" enabled.pixel="false" enabled.hand="false" click.default="{thickness = 3}
-drawer="false" enabled.floodfill="false" click.eraser="{thickness = 10}" click.drawer="{thickness = 10}" enabled.pixel="false" enabled.hand="false" click.default="{thickness = 10}
-drawer="false" enabled.floodfill="false" click.eraser="{thickness = 20}" click.drawer="{thickness = 20}" enabled.pixel="false" enabled.hand="false" click.default="{thickness = 20}
-drawer="false" enabled.floodfill="false" click.eraser="{thickness = 30}" click.drawer="{thickness = 30}" enabled.pixel="false" enabled.hand="false" click.default="{thickness = 30}
+ toolTip="辺の太さを変更します"
+floodfill="false" click.eraser="{thickness = 1}" enabled.pixel="false" enabled.hand="false" click.default="{thickness = 1}" enabled.dropper="false
+floodfill="false" click.eraser="{thickness = 3}" enabled.pixel="false" enabled.hand="false" click.default="{thickness = 3}" enabled.dropper="false
+floodfill="false" click.eraser="{thickness = 10}" enabled.pixel="false" enabled.hand="false" click.default="{thickness = 10}" enabled.dropper="false
+floodfill="false" click.eraser="{thickness = 20}" enabled.pixel="false" enabled.hand="false" click.default="{thickness = 20}" enabled.dropper="false
+floodfill="false" click.eraser="{thickness = 30}" enabled.pixel="false" enabled.hand="false" click.default="{thickness = 30}" enabled.dropper="false
-    
-    <!-- color palette -->
@@ -244 +262 @@
-    <s:ToggleButton id="handtoolButton" x="31" y="260" icon="@Embed(source='res/icon_hand_open.png')" width="22" click="selectHandTool(event)"/>
-    -->
-
-
+
+
+
+
-    
-    <!-- alpha -->
-    <s:Label x="10" y="288" text="透"/>
-    <s:Label x="26" y="289" text="{alphaSlider.value}" textAlign="right" width="28" enabled="false" fontSize="8"/>
-
+ toolTip="不透明度を変更します"
-    
-    <!-- rgb -->
-    <s:Label x="10" y="304" text="R"/>
-    <s:Label x="26" y="305" text="{colRSlider.value}" width="28" textAlign="right" enabled="false" fontSize="8"/>
-
+ toolTip="赤色(R)の濃さを設定します"
-    <s:Label x="10" y="319" text="G"/>
-    <s:Label x="26" y="322" text="{colGSlider.value}" width="28" textAlign="right" enabled="false" fontSize="8"/>
-
+ toolTip="緑色(G)の濃さを設定します"
-    <s:Label x="10" y="334" text="B"/>
-    <s:Label x="26" y="340" text="{colBSlider.value}" width="28" textAlign="right" enabled="false" fontSize="8"/>
-
+ toolTip="青色(B)の濃さを設定します"
-    
-    <!-- line method/blend mode -->
-enabled.drawer="false" change.eraser="selectPen(event)" change.floodfill="selectPen(event)" enabled.pixel="false" enabled.hand="false" change.default="selectPen(event)
+change.eraser="selectPen(event)" change.floodfill="selectPen(event)" enabled.pixel="false" enabled.hand="false" change.default="selectPen(event)" enabled.dropper="false" toolTip="ペンの形状を設定します
-        <s:ArrayCollection>
-            <fx:Object label="手描き" data="hand" />
@@ -272 +292 @@
-        </s:ArrayCollection>
-    </s:DropDownList>
-enabled.drawer="false" change.eraser="selectBlendMode(event)" change.floodfill="selectBlendMode(event)" enabled.pixel="false" enabled.hand="false" change.default="selectBlendMode(event)
+change.eraser="selectBlendMode(event)" change.floodfill="selectBlendMode(event)" enabled.pixel="false" enabled.hand="false" change.default="selectBlendMode(event)" enabled.dropper="false" toolTip="下の画像に対するブレンドモードを設定します
-</s:Border>

as3/gunyarapaint/branches/gunyarapaint/src/org/libspark/gunyarapaint/components/IDelegate.as

@@ -11 +11 @@
-        function get recorder():Recorder;
-        function get supportedBlendModes():ArrayCollection;
+        function get canvas():CanvasController;
-        function set module(value:IDrawable):void;
-    }

as3/gunyarapaint/branches/gunyarapaint/src/org/libspark/gunyarapaint/components/LayersController.mxml

@@ -83 +83 @@
-        </g:columns>
-    </g:LayerDataGrid>
-
-
-
-
-
+ toolTip="レイヤーを新しく作成します"
+ toolTip="現在のレイヤーを複製して追加します"
+ toolTip="現在のレイヤーを削除します"
+ toolTip="直下のレイヤーを統合してひとつのレイヤーにします"
+ toolTip="現在のレイヤーに対するブレンドモードを設定します"
-    <s:Label x="10" y="34" text="透"/>
-
+ toolTip="現在のレイヤーに対する不透明度を設定します"
-</s:Border>

as3/gunyarapaint/branches/gunyarapaint/src/org/libspark/gunyarapaint/components/UtilitiesController.mxml

@@ -13 +13 @@
-            import mx.collections.IList;
-            
+            import org.libspark.gunyarapaint.AuxBitmap;
+            
-            import spark.events.IndexChangeEvent;
-            
@@ -20 +22 @@
-            {
-                var degree:Number = HSlider(event.target).value;
-ApplicationDelegate(parentDocument).drawableCanvas.rotation = degree
+IDelegate(parentDocument).canvas.rotate(degree)
-            }
-            
@@ -47 +49 @@
-                var list:IList = DropDownList(event.target).dataProvider;
-                var type:String = String(list.getItemAt(event.newIndex).data);
-ApplicationDelegate(parentDocument).auxCanvas.divideT
+IDelegate(parentDocument).canvas.aux.t
-            }
-            
@@ -68 +70 @@
-                var stepper:NumericStepper = NumericStepper(event.target);
-                var length:uint = uint(stepper.value);
-ApplicationDelegate(parentDocument).auxCanvas
+IDelegate(parentDocument).canvas.aux
-            }
-            
-otected
+ivate
-            {
-Canvas = ApplicationDelegate(parentDocument).auxCanvas
+Bitmap = ApplicationDelegate(parentDocument).canvas.aux
-                aux.boxVisible = !aux.boxVisible;
-            }
-            
-otected
+ivate
-            {
-Canvas = ApplicationDelegate(parentDocument).auxCanvas
+Bitmap = ApplicationDelegate(parentDocument).canvas.aux
-                aux.skewVisible = !aux.skewVisible;
-            }
@@ -86 +88 @@
-    <s:Button id="rotateResetButton" y="63" label="角度" width="40" height="20" x="10" fontSize="10" click="{canvasRotate.value = 0}"/>
-    <s:Button id="zoomResetButton" y="92" label="拡大" width="40" height="20" x="10" fontSize="10" click="{canvasZoom.value = 1}"/>
-
-
+ toolTip="現在のキャンバスを回転させます"
+ toolTip="現在のキャンバスを拡大または縮小させます"
-    <s:TextInput id="canvasRotateValue" y="65" width="32" height="17" fontSize="8" textAlign="right" text="{canvasRotate.value}" restrict="0-9" maxChars="4" x="197"/>
-    <s:Label y="65" text="度" x="232"/>
@@ -93 +95 @@
-    <s:Label y="93" text="倍" x="232"/>
-    <s:Label y="10" text="補助線"  x="10"/>
-
+ toolTip="「分割」にした場合は分割数、「px単位」にした場合ピクセル数を設定します"
-    <s:CheckBox id="auxBoxCheckBox" y="10" label="縦横" fontSize="9" height="18" x="187" click="setVisibleAuxBox(event)"/>
-    <s:CheckBox id="auxSkewCheckBox" y="26" label="斜め" fontSize="9" height="18" x="187" click="setVisibleAuxSkew(event)"/>
@@ -106 +108 @@
-    <s:DropDownList y="10" id="auxTypeComboBox" width="70" fontSize="10" height="18" selectedIndex="0" x="113" change="setAuxType(event)">
-        <s:ArrayCollection>
-Canvas.DIVIDE_BY_
-Canvas.DIVIDE_BY_
+Bitmap.
+Bitmap.
-        </s:ArrayCollection>
-    </s:DropDownList>