チェンジセット 2857

コミット日時:

2009/07/01 03:15:39 (9 ヶ月前)

コミッタ:

tasuku

ログメッセージ:

* pikokakiko: OffGao?さんの修正点を取り込む。undo/redo/font/pause。サンプルURLの変更は認めない。

ファイル:

• as3/gunyarapaint/trunk/ChangeLog (更新) (1 diff)
• as3/gunyarapaint/trunk/picokakiko/src/picokakiko.as (更新) (10 diffs)
• as3/gunyarapaint/trunk/picokakiko/src/picokakiko.mxml (更新) (1 diff)
• as3/gunyarapaint/trunk/picokakiko/src/picoplayer.mxml (更新) (1 diff)
• as3/gunyarapaint/trunk/picokakiko/src/picosetting.mxml (追加)

as3/gunyarapaint/trunk/ChangeLog

@@ -2 +2 @@
-
-  * gunyarapaint: ��̒��S�_������o�X�����Ƃ����B�����Əd�����ȁ[�B
+  * pikokakiko: OffGao����C���_��荞�ށBundo/redo/font/pause�B�T���v��URL�̕ύX�͔F�߂Ȃ��B
-
-2009-06-08  Tasuku SUENAGA <a at razil.jp>

as3/gunyarapaint/trunk/picokakiko/src/picokakiko.as

@@ -1 @@
-
+
-
-import mx.controls.Alert;
@@ -6 +6 @@
-import mx.utils.StringUtil;
-import mx.events.ResizeEvent;
+import mx.managers.PopUpManager;
+import mx.core.IFlexDisplayObject;
+import flash.events.KeyboardEvent;
+import flash.net.SharedObject;
-
-import org.libspark.nicopedia.Com;
+
+import picosetting;
-
-private var mmlId:uint;
@@ -16 +22 @@
-private var m_timer:Timer;
-
+private const UNDO_MAX:int = 64;
+private var mmlUndoBuffer:Vector.<String> = new Vector.<String>(UNDO_MAX);
+private var undoCount:int = 0;
+private var changeCount:int = 0;
+
+private var setting_window:picosetting = new picosetting();
+
+private var local:SharedObject;
+
-public function init():void {
+  // for test
+  //parameters['mmlUrl'] = 'http://dic.nicovideo.jp/mml/714';
-  if (parameters['mmlUrl']) {
-    var url:String = parameters['mmlUrl'];
@@ -40 +57 @@
-  this.addEventListener(ResizeEvent.RESIZE, appResizeHandler);
-
+  //アンドゥバッファのクリア
+  var i:int;
+  for (i = 0; i < UNDO_MAX ; i++) {
+    mmlUndoBuffer[i] = "";
+  }
+
+  //フォント設定の読み込み
+  local = SharedObject.getLocal("picosetting");
+  if (!local.data.fontname) {
+    local.data.fontname = mml.getStyle("fontFamily");
+  }
+  if (!local.data.fontsize) {
+    local.data.fontsize = mml.getStyle("fontSize");
+  }
+  mml.setStyle("fontFamily",local.data.fontname);
+  mml.setStyle("fontSize",local.data.fontsize);
+  
+  updateUndoRedoButton();
+  
-  playButton.addEventListener(FlexEvent.BUTTON_DOWN, playButtonHandler);
-  stopButton.addEventListener(FlexEvent.BUTTON_DOWN, stopButtonHandler);
+  pauseButton.addEventListener(FlexEvent.BUTTON_DOWN, pauseButtonHandler);
+  undoButton.addEventListener(FlexEvent.BUTTON_DOWN, undoButtonHandler);
+  redoButton.addEventListener(FlexEvent.BUTTON_DOWN, redoButtonHandler);
+  fontButton.addEventListener(FlexEvent.BUTTON_DOWN, fontButtonHandler);
-  postPicoButton.addEventListener(FlexEvent.BUTTON_DOWN, postPicoButtonHandler);
-}
@@ -48 +88 @@
-  mml_warnings.text = mml_player.getWarnings();
-  stopButton.enabled = true;
+  pauseButton.enabled = true;
-  played = true;
-}
@@ -54 +95 @@
-  playButton.enabled = true;
-  stopButton.enabled = false;
+  pauseButton.enabled = false;
-  m_timer.reset();
-}
@@ -59 +101 @@
-private function mmlChangeHandler(e:Event):void {
-  played = false;
+  if (stopButton.enabled) {
+    this.stopButtonHandler(e);
+  }
+
+  var i:int;
+  var j:int;
+  if (undoCount != 0) {
+    for (i = 0; i < UNDO_MAX-undoCount ; i++) {
+      mmlUndoBuffer[i] = mmlUndoBuffer[i + undoCount];
+    }
+    for (j = i-1; i < UNDO_MAX ; i++) {
+      mmlUndoBuffer[i] = mmlUndoBuffer[j];
+    }
+  undoCount = 0;
+  }
+  for (i = UNDO_MAX-2; i >= 0 ; i--) {
+    mmlUndoBuffer[i + 1] = mmlUndoBuffer[i];
+  }
+  mmlUndoBuffer[0] = mml.text;
+  changeCount++;
+  if (changeCount >= UNDO_MAX) changeCount = UNDO_MAX-1;
+  
+  updateUndoRedoButton();
+  /*TEST
+  mml_warnings.text = changeCount+"\n";
+    for (i = 0; i < UNDO_MAX ; i++) {
+      mml_warnings.text += mmlUndoBuffer[i]+"\n";
+    }
+  */
+}
+
+private function mmlKeyDownHandler(e:KeyboardEvent):void
+{
+  if (e.ctrlKey)
+  {
+    if (e.keyCode == 90)// Z
+    {
+    if (e.shiftKey) {
+      mmlRedo();
+      }else {
+      mmlUndo();
+    }
+    }  
+  }
+  if (e.keyCode == 113)// F2
+  {
+  mmlUndo();
+  }  
+  if (e.keyCode == 114)// F3
+  {
+  mmlRedo();
+  }  
-}
-
@@ -65 +159 @@
-  mml.enabled = true;
-  playButton.enabled = true;
+  var i:int;
+  for (i = 0; i < UNDO_MAX ; i++) {
+    mmlUndoBuffer[i] = mml.text;
+  }
-}
-
@@ -81 +179 @@
-}
-
+private function mmlUndo():void {
+  if(changeCount >0){
+      undoCount++; changeCount--;
+      mml.text = mmlUndoBuffer[undoCount];
+  }
+  updateUndoRedoButton();
+    played = false;
+}
+
+private function mmlRedo():void {
+  undoCount--;
+  if (undoCount < 0) undoCount = 0;
+  else {
+    changeCount++;
+    mml.text = mmlUndoBuffer[undoCount];
+  }
+  updateUndoRedoButton();
+    played = false;
+}
+
+private function updateUndoRedoButton():void {
+  if (undoCount == 0) {
+    redoButton.enabled = false;
+  }else {
+    redoButton.enabled = true;
+  }
+  if (changeCount == 0) {
+    undoButton.enabled = false;
+  }else {
+    undoButton.enabled = true;
+  }
+}
+
-private function playButtonHandler(evt:Event):void {
+  m_timer.reset();
+  mml_player.stop();
+  mml_player.play(mml.text);
+  pauseButton.label = '一時停止';    
+}
+
+private function pauseButtonHandler(evt:Event):void {
-  if (mml_player.isPlaying()) {
-    mml_player.pause();
-layButton.label = 'ピコ再生
+auseButton.label = 'ピコ再開
-    m_timer.stop();
-  } else {
-    if (mml_player.isPaused()) {
-      m_timer.start();
-    }
-    mml_player.play(mml.text);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -99 +262 @@
-  mml_player.stop();
-  stopButton.enabled = false;
-
+
+
-}
-

as3/gunyarapaint/trunk/picokakiko/src/picokakiko.mxml

@@ -16 +16 @@
-  </mx:RegExpValidator>
-  <mx:VBox width="100%" height="100%">
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      </mx:TextArea>
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      <mx:TextInput id="titleTextInput" x="61" y="123" maxChars="64" fontSize="14" width="355"/>
-
-
-
-
+
+
+
-    <mx:VDividedBox x="10" y="153" width="100%" height="100%">
-      <mx:HBox width="100%" height="80%">
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-      </mx:HBox>
-      <mx:HBox width="100%" height="20%">
-  
-  <mx:Label text="ピコ警告
-  
-  
+
+<mx:Label text="ピコ警告" textAlign="right" width="50
+
+
-      </mx:HBox>
-    </mx:VDividedBox>
+    </mx:HBox>
+  </mx:VDividedBox>
-    <mx:Canvas>
-
-
+
+
+
-      <mx:HSlider
-        id="hSlider" minimum="0" maximum="127" value="100"
-          
-          
-          change="mml_player.setMasterVolume(hSlider.value);" x="203
-160" y="8" text="ピコ
+
+
+change="mml_player.setMasterVolume(hSlider.value);" x="248
+225" y="8" text="
-      <mx:Label x="512" y="33" text="Powered by FlMML"/>
-      <mx:Button id="postPicoButton" x="512" y="6" label="ピコカキコする！" enabled="false" fillAlphas="[1.0, 1.0]" fillColors="[#FFFFFF, #FF9999]"/>
-      <flmml:FlMML id="mml_player"/>
-37
-529
+41
+701
-    </mx:Canvas>
-  </mx:VBox>

as3/gunyarapaint/trunk/picokakiko/src/picoplayer.mxml

@@ -155 +155 @@
-  <mx:HSlider
-    id="volumeHSlider" minimum="0" maximum="127" value="100"
-          
-          
-          
+
+
+
-</mx:Application>