Skip to content

Commit dd99453

Browse files
committed
#171 MovieClipへの変換処理の追加準備
1 parent d104623 commit dd99453

18 files changed

Lines changed: 221 additions & 58 deletions

‎index.html‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,44 +1107,47 @@
11071107

11081108
<!-- menus -->
11091109

1110-
<!-- change-movie-clip -->
1111-
<div id="change-movie-clip" class="none">
1112-
<div class="change-movie-clip-title">
1110+
<!-- convert-movie-clip -->
1111+
<div id="convert-movie-clip" class="none">
1112+
<div class="convert-movie-clip-title">
11131113
<span class="language" data-text="{{MovieClipに変換}}">MovieClipに変換</span>
11141114
</div>
1115-
<div class="change-movie-clip-container">
1116-
<div class="change-movie-clip-name">
1115+
<div class="convert-movie-clip-container">
1116+
<div class="convert-movie-clip-name">
11171117
<span class="language" data-text="{{名前}}">名前</span>
11181118
</div>
1119-
<div class="change-movie-clip-body">
1120-
<input type="text" id="change-movie-clip-input" value="" autocomplete="off" tabindex="-1">
1119+
<div class="convert-movie-clip-body">
1120+
<input type="text" id="convert-movie-clip-input" value="" autocomplete="off" tabindex="-1">
11211121
</div>
11221122
</div>
1123-
<div class="change-movie-clip-container">
1124-
<div class="change-movie-clip-name">
1123+
<div class="convert-movie-clip-container">
1124+
<div class="convert-movie-clip-name">
11251125
<span class="language" data-text="{{基準点}}">基準点</span>
11261126
</div>
1127-
<div class="change-movie-clip-body">
1128-
<div class="change-movie-clip-reference-point">
1129-
<div class="change-movie-clip-box-child" data-position="top-left" data-detail="{{左上}}"></div>
1130-
<div class="change-movie-clip-box-child" data-position="top-center" data-detail="{{中央上}}"></div>
1131-
<div class="change-movie-clip-box-child" data-position="top-right" data-detail="{{右上}}"></div>
1132-
</div>
1133-
<div class="change-movie-clip-reference-point">
1134-
<div class="change-movie-clip-box-child" data-position="middle-left" data-detail="{{中央左}}"></div>
1135-
<div class="change-movie-clip-box-child" data-position="middle-center" data-detail="{{中央}}"></div>
1136-
<div class="change-movie-clip-box-child" data-position="middle-right" data-detail="{{中央右}}"></div>
1137-
</div>
1138-
<div class="change-movie-clip-reference-point">
1139-
<div class="change-movie-clip-box-child" data-position="bottom-left" data-detail="{{左下}}"></div>
1140-
<div class="change-movie-clip-box-child" data-position="bottom-center" data-detail="{{中央下}}"></div>
1141-
<div class="change-movie-clip-box-child" data-position="bottom-right" data-detail="{{右下}}"></div>
1127+
<div class="convert-movie-clip-body">
1128+
<div class="convert-movie-clip-reference-point">
1129+
<div class="convert-movie-clip-box-child" data-position="top-left" data-detail="{{左上}}"></div>
1130+
<div class="convert-movie-clip-box-child" data-position="top-center" data-detail="{{中央上}}"></div>
1131+
<div class="convert-movie-clip-box-child" data-position="top-right" data-detail="{{右上}}"></div>
1132+
</div>
1133+
<div class="convert-movie-clip-reference-point">
1134+
<div class="convert-movie-clip-box-child" data-position="middle-left" data-detail="{{中央左}}"></div>
1135+
<div class="convert-movie-clip-box-child" data-position="middle-center" data-detail="{{中央}}"></div>
1136+
<div class="convert-movie-clip-box-child" data-position="middle-right" data-detail="{{中央右}}"></div>
1137+
</div>
1138+
<div class="convert-movie-clip-reference-point">
1139+
<div class="convert-movie-clip-box-child" data-position="bottom-left" data-detail="{{左下}}"></div>
1140+
<div class="convert-movie-clip-box-child" data-position="bottom-center" data-detail="{{中央下}}"></div>
1141+
<div class="convert-movie-clip-box-child" data-position="bottom-right" data-detail="{{右下}}"></div>
11421142
</div>
11431143
</div>
11441144
</div>
1145-
<div class="change-movie-clip-container change-movie-clip-box">
1146-
<div class="button" id="change-movie-clip-button">
1145+
<div class="convert-movie-clip-container convert-movie-clip-box">
1146+
<div class="button" id="convert-movie-clip-button">
11471147
<span class="language" data-text="{{変換}}">変換</span>
1148+
</div>
1149+
<div class="button" id="convert-cancel-button">
1150+
<span class="language" data-text="{{キャンセル}}">キャンセル</span>
11481151
</div>
11491152
</div>
11501153
</div>
@@ -1231,7 +1234,7 @@
12311234
<div id="screen-delete-tween-curve-pointer" class="screen-menu-bottom"><span class="language" data-text="{{カーブポインターの削除}}" data-shortcut-key="pShiftCtrl" data-shortcut-text="Ctrl + Shift + P">カーブポインターの削除</span></div>
12321235
<p></p>
12331236
<span class="screen-menu-title language" data-text="{{変換}}">変換</span>
1234-
<div id="screen-change-movie-clip" class="screen-menu-bottom"><i></i><span class="language" data-text="{{MovieClipに変換}}" data-shortcut-key="mShift" data-shortcut-text="Shift + M">MovieClipに変換</span></div>
1237+
<div id="screen-convert-movie-clip" class="screen-menu-bottom"><i></i><span class="language" data-text="{{MovieClipに変換}}" data-shortcut-key="mShift" data-shortcut-text="Shift + M">MovieClipに変換</span></div>
12351238
<p></p>
12361239
<div id="screen-preview" class="screen-menu-bottom"><i></i><span class="language" data-text="{{プレビュー}}" data-shortcut-key="EnterCtrl" data-shortcut-text="Ctrl + Enter">Preview</span></div>
12371240
<p></p>
@@ -1936,7 +1939,7 @@
19361939
<div id="shortcut-pShiftCtrl" class="command" data-default-key="pShiftCtrl" data-default-text="Ctrl + Shift + P">Ctrl + Shift + P</div>
19371940
</div>
19381941
<div class="shortcut-item">
1939-
<i class="screen-change-movie-clip"></i>
1942+
<i class="screen-convert-movie-clip"></i>
19401943
<div class="description">
19411944
<span class="language" data-text="{{MovieClipに変換}}">MovieClipに変換</span>
19421945
</div>
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#change-movie-clip
1+
#convert-movie-clip
22
{
33
display : flex;
44
flex-direction : column;
@@ -16,7 +16,7 @@
1616
border-radius : 4px;
1717
box-shadow : 0 0 5px rgba(245, 245, 245, 0.25);
1818

19-
.change-movie-clip-title
19+
.convert-movie-clip-title
2020
{
2121
height : 30px;
2222
display : flex;
@@ -26,7 +26,7 @@
2626
margin-bottom : 12px;
2727
}
2828

29-
.change-movie-clip-container
29+
.convert-movie-clip-container
3030
{
3131
display : flex;
3232
align-items : center;
@@ -43,20 +43,20 @@
4343
}
4444
}
4545

46-
.change-movie-clip-name
46+
.convert-movie-clip-name
4747
{
4848
width : 120px;
4949
display : flex;
5050
justify-content : center;
5151
align-items : center;
5252
}
5353

54-
.change-movie-clip-body
54+
.convert-movie-clip-body
5555
{
5656
margin : 3px;
5757
}
5858

59-
.change-movie-clip-reference-point
59+
.convert-movie-clip-reference-point
6060
{
6161
height : 14px;
6262
display : flex;
@@ -69,7 +69,7 @@
6969
}
7070
}
7171

72-
.change-movie-clip-box-child
72+
.convert-movie-clip-box-child
7373
{
7474
width : 10px;
7575
height : 10px;
@@ -83,7 +83,7 @@
8383
}
8484
}
8585

86-
.change-movie-clip-box
86+
.convert-movie-clip-box
8787
{
8888
justify-content : center;
8989
}

‎src/css/screen-menu.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
}
9090
}
9191

92-
#screen-change-movie-clip
92+
#screen-convert-movie-clip
9393
{
9494
i
9595
{

‎src/css/shortcut-setting-menu.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@
456456
background-position : center center;
457457
}
458458

459-
.screen-change-movie-clip
459+
.screen-convert-movie-clip
460460
{
461461
background-image : url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 24 24"><path fill="gainsboro" d="M18.546 3h-13.069l-5.477 8.986v9.014h24v-9.014l-5.454-8.986zm-11.946 2h10.82l4.249 7h-19.335l4.266-7zm-4.6 14v-5h20v5h-20zm3-8l.607-1h12.787l.606 1h-14zm12.787-2h-11.573l.607-1h10.359l.607 1zm-1.214-2h-9.145l.607-1h7.931l.607 1z"/></svg>');
462462
background-repeat : no-repeat;

‎src/css/style.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@use "timeline";
88
@use "controller";
99
@use "advertisement";
10-
@use "change-movie-clip";
10+
@use "convert-movie-clip";
1111
@use "confirm-modal";
1212
@use "screen-menu";
1313
@use "screen-order-menu";

‎src/js/config/ConvertMovieClipConfig.ts‎

Whitespace-only changes.

‎src/js/config/MenuConfig.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,3 +141,12 @@ export const $CONFIRM_MODAL_NAME: string = "confirm-modal";
141141
* @constant
142142
*/
143143
export const $SCENE_LIST_MENU_NAME: string = "scene-name-menu";
144+
145+
/**
146+
* @description MovieClip変換モーダルの名前
147+
* Convert MovieClip Modal Name
148+
*
149+
* @type {string}
150+
* @constant
151+
*/
152+
export const $CONVERT_MOVIE_CLIP_MODAL_NAME: string = "convert-movie-clip";

‎src/js/config/ScreenConfig.ts‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ export const $SCREEN_DELETE_TWEEN_CURVE_POINTER_ID: string = "screen-delete-twee
248248
* @type {string}
249249
* @constant
250250
*/
251-
export const $SCREEN_CHANGE_MOVIE_CLIP_ID: string = "screen-change-movie-clip";
251+
export const $SCREEN_CONVERT_MOVIE_CLIP_ID: string = "screen-convert-movie-clip";
252252

253253
/**
254254
* @description スクリーンのプレビュー用ElementのID
@@ -257,4 +257,13 @@ export const $SCREEN_CHANGE_MOVIE_CLIP_ID: string = "screen-change-movie-clip";
257257
* @type {string}
258258
* @constant
259259
*/
260-
export const $SCREEN_PREVIEW_ID: string = "screen-preview";
260+
export const $SCREEN_PREVIEW_ID: string = "screen-preview";
261+
262+
/**
263+
* @description スクリーンの定規用ElementのID
264+
* ID of the Element for ruler of the screen
265+
*
266+
* @type {string}
267+
* @constant
268+
*/
269+
export const $SCREEN_RULER_ID: string = "screen-ruler";
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export const execute = (): void =>
2+
{
3+
// todo
4+
};

‎src/js/menu/application/Initialize.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { ScriptEditorModal } from "../domain/model/ScriptEditorModal";
1515
import { BillingModal } from "../domain/model/BillingModal";
1616
import { ConfirmModal } from "../domain/model/ConfirmModal";
1717
import { SceneListMenu } from "../domain/model/SceneListMenu";
18+
import { ConvertMovieClipModal } from "../domain/model/ConvertMovieClipModal";
1819

1920
/**
2021
* @description 起動対象のToolクラスの配列
@@ -38,7 +39,8 @@ const menus: Array<new () => BaseMenu> = [
3839
ScriptEditorModal,
3940
BillingModal,
4041
ConfirmModal,
41-
SceneListMenu
42+
SceneListMenu,
43+
ConvertMovieClipModal
4244
];
4345

4446
/**

0 commit comments

Comments
 (0)