From d484c23d9a4a4a8863dc225df68a8aa7aaf4d21c Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sun, 23 Sep 2018 19:53:22 +0200 Subject: timeline stuff working --- .../modules/pix2pixhd/views/sequence.editor.js | 66 +++++++++++++--------- 1 file changed, 40 insertions(+), 26 deletions(-) (limited to 'app/client/modules/pix2pixhd/views/sequence.editor.js') diff --git a/app/client/modules/pix2pixhd/views/sequence.editor.js b/app/client/modules/pix2pixhd/views/sequence.editor.js index 3bf2d63..06f3889 100644 --- a/app/client/modules/pix2pixhd/views/sequence.editor.js +++ b/app/client/modules/pix2pixhd/views/sequence.editor.js @@ -5,7 +5,7 @@ import { Route, Link } from 'react-router-dom' import util from '../../../util' -import { FileViewer, Timeline, Param, Button } from '../../../common' +import { FileViewer, Timeline, Param, Button, Group, TextInput } from '../../../common' import actions from '../../../actions' @@ -13,6 +13,7 @@ const initialState = { dir: '/', cursor: null, selection: null, + title: null, } /* @@ -64,6 +65,7 @@ class SequenceEditor extends Component { console.log(checkpoint) this.setState({ ...initialState, + title: checkpoint.name + '_v_' + Date.now() }) } @@ -77,35 +79,47 @@ class SequenceEditor extends Component { render() { const { app, checkpoint } = this.props - const { cursor, selection } = this.state + const { cursor, selection, title } = this.state const path = "sequences/" + checkpoint.name return ( -
- - - {selection && selection.start && - - } - {selection && selection.end && - - } - {selection && -
- {selection.end.i - selection.start.i}{' frames'} - {util.frameTimestamp(selection.end.i - selection.start.i)} - +
+ {selection + ?
+ + + {selection.end.i - selection.start.i}{' frames'} + + + {util.frameTimestamp(selection.end.i - selection.start.i)} + + this.setState({ title })} + /> + +
+ :
Please select some frames
} +
+
+ + {selection && selection.start && + + } + {selection && selection.end && + + } +
+ +
) } -- cgit v1.2.3-70-g09d2