Kalakoi/GDevelop
1
0
Fork 0
mirror of https://github.com/4ian/GDevelop.git synced 2025-10-15 10:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move InstancesFullEditor to SceneEditor

Browse Source
This commit is contained in:
Florian Rival
2018-04-22 09:28:34 +01:00
parent a53de69c4e
commit 956656236b
8 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
newIDE/app/src/InstancesEditor/index.js
View File

@@ -113,7 +113,7 @@ export default class InstancesEditorContainer extends Component {
});
this.pixiContainer.addChild(this.grid.getPixiObject());
// TODO: This should probably be moved up in the InstancesFullEditor component.
// TODO: This should probably be moved up in the SceneEditor component.
this.keyboardShortcuts = new KeyboardShortcuts({
onDelete: this.props.onDeleteSelection,
onMove: this.moveSelection,

6
newIDE/app/src/MainFrame/Editors/ExternalLayoutEditor.js
View File

@@ -1,7 +1,7 @@
// @flow
import * as React from 'react';
import RaisedButton from 'material-ui/RaisedButton';
import InstancesFullEditor from '../../SceneEditor/InstancesFullEditor';
import SceneEditor from '../../SceneEditor';
import { serializeToJSObject } from '../../Utils/Serializer';
import PlaceholderMessage from '../../UI/PlaceholderMessage';
import BaseEditor from './BaseEditor';
@@ -15,7 +15,7 @@ const styles = {
};
export default class ExternalLayoutEditor extends BaseEditor {
editor: ?typeof InstancesFullEditor;
editor: ?typeof SceneEditor;
state = {
layoutChooserOpen: false,
};
@@ -89,7 +89,7 @@ export default class ExternalLayoutEditor extends BaseEditor {
return (
<div style={styles.container}>
{layout && (
<InstancesFullEditor
<SceneEditor
{...this.props}
ref={editor => (this.editor = editor)}
project={project}

8
newIDE/app/src/MainFrame/Editors/SceneEditor.js
View File

@@ -1,12 +1,12 @@
// @flow
import * as React from 'react';
import InstancesFullEditor from '../../SceneEditor/InstancesFullEditor';
import SceneEditor from '../../SceneEditor';
import { serializeToJSObject } from '../../Utils/Serializer';
import BaseEditor from './BaseEditor';
import { type PreviewOptions } from '../../Export/PreviewLauncher.flow';
export default class SceneEditor extends BaseEditor {
editor: ?typeof InstancesFullEditor;
export default class SceneEditorContainer extends BaseEditor {
editor: ?typeof SceneEditor;
updateToolbar() {
if (this.editor) this.editor.updateToolbar();
@@ -39,7 +39,7 @@ export default class SceneEditor extends BaseEditor {
}
return (
<InstancesFullEditor
<SceneEditor
{...this.props}
ref={editor => (this.editor = editor)}
project={project}

0
newIDE/app/src/SceneEditor/InstancesFullEditor/InstancesSelection.js → newIDE/app/src/SceneEditor/InstancesSelection.js
View File

10
newIDE/app/src/SceneEditor/InstancesFullEditor/ScenePropertiesDialog.js → newIDE/app/src/SceneEditor/ScenePropertiesDialog.js
View File

@@ -2,11 +2,11 @@ import React, { Component } from 'react';
import FlatButton from 'material-ui/FlatButton';
import TextField from 'material-ui/TextField';
import RaisedButton from 'material-ui/RaisedButton';
import Dialog from '../../UI/Dialog';
import ColorField from '../../UI/ColorField';
import EmptyMessage from '../../UI/EmptyMessage';
import PropertiesEditor from '../../PropertiesEditor';
import propertiesMapToSchema from '../../PropertiesEditor/PropertiesMapToSchema';
import Dialog from '../UI/Dialog';
import ColorField from '../UI/ColorField';
import EmptyMessage from '../UI/EmptyMessage';
import PropertiesEditor from '../PropertiesEditor';
import propertiesMapToSchema from '../PropertiesEditor/PropertiesMapToSchema';
import some from 'lodash/some';
export default class ScenePropertiesDialog extends Component {

2
newIDE/app/src/SceneEditor/InstancesFullEditor/SetupGridDialog.js → newIDE/app/src/SceneEditor/SetupGridDialog.js
View File

@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import FlatButton from 'material-ui/FlatButton';
import TextField from 'material-ui/TextField';
import Dialog from '../../UI/Dialog';
import Dialog from '../UI/Dialog';
export default class SetupGridDialog extends Component {
constructor(props) {

6
newIDE/app/src/SceneEditor/InstancesFullEditor/Toolbar.js → newIDE/app/src/SceneEditor/Toolbar.js
View File

@@ -1,9 +1,9 @@
import React, { PureComponent } from 'react';
import { translate } from 'react-i18next';
import { ToolbarGroup } from 'material-ui/Toolbar';
import ToolbarSeparator from '../../UI/ToolbarSeparator';
import ToolbarIcon from '../../UI/ToolbarIcon';
import IconMenu from '../../UI/Menu/IconMenu';
import ToolbarSeparator from '../UI/ToolbarSeparator';
import ToolbarIcon from '../UI/ToolbarIcon';
import IconMenu from '../UI/Menu/IconMenu';
export class Toolbar extends PureComponent {
render() {

42
newIDE/app/src/SceneEditor/InstancesFullEditor/index.js → newIDE/app/src/SceneEditor/index.js
View File

@@ -1,16 +1,16 @@
import React, { Component } from 'react';
import ObjectsList from '../../ObjectsList';
import ObjectsGroupsList from '../../ObjectsGroupsList';
import ObjectsRenderingService from '../../ObjectsRendering/ObjectsRenderingService';
import InstancesEditor from '../../InstancesEditor';
import InstancePropertiesEditor from '../../InstancesEditor/InstancePropertiesEditor';
import InstancesList from '../../InstancesEditor/InstancesList';
import LayersList from '../../LayersList';
import LayerRemoveDialog from '../../LayersList/LayerRemoveDialog';
import VariablesEditorDialog from '../../VariablesList/VariablesEditorDialog';
import ObjectEditorDialog from '../../ObjectEditor/ObjectEditorDialog';
import ObjectsGroupEditorDialog from '../../ObjectsGroupEditor/ObjectsGroupEditorDialog';
import ObjectsList from '../ObjectsList';
import ObjectsGroupsList from '../ObjectsGroupsList';
import ObjectsRenderingService from '../ObjectsRendering/ObjectsRenderingService';
import InstancesEditor from '../InstancesEditor';
import InstancePropertiesEditor from '../InstancesEditor/InstancePropertiesEditor';
import InstancesList from '../InstancesEditor/InstancesList';
import LayersList from '../LayersList';
import LayerRemoveDialog from '../LayersList/LayerRemoveDialog';
import VariablesEditorDialog from '../VariablesList/VariablesEditorDialog';
import ObjectEditorDialog from '../ObjectEditor/ObjectEditorDialog';
import ObjectsGroupEditorDialog from '../ObjectsGroupEditor/ObjectsGroupEditorDialog';
import InstancesSelection from './InstancesSelection';
import SetupGridDialog from './SetupGridDialog';
import ScenePropertiesDialog from './ScenePropertiesDialog';
@@ -18,18 +18,18 @@ import Toolbar from './Toolbar';
import {
serializeToJSObject,
unserializeFromJSObject,
} from '../../Utils/Serializer';
import Clipboard from '../../Utils/Clipboard';
import { passFullSize } from '../../UI/FullSizeMeasurer';
import { addScrollbars } from '../../InstancesEditor/ScrollbarContainer';
} from '../Utils/Serializer';
import Clipboard from '../Utils/Clipboard';
import { passFullSize } from '../UI/FullSizeMeasurer';
import { addScrollbars } from '../InstancesEditor/ScrollbarContainer';
import Drawer from 'material-ui/Drawer';
import IconButton from 'material-ui/IconButton';
import NavigationClose from 'material-ui/svg-icons/navigation/close';
import EditorMosaic, { MosaicWindow } from '../../UI/EditorMosaic';
import EditorBar from '../../UI/EditorBar';
import InfoBar from '../../UI/Messages/InfoBar';
import ContextMenu from '../../UI/Menu/ContextMenu';
import EditorMosaic, { MosaicWindow } from '../UI/EditorMosaic';
import EditorBar from '../UI/EditorBar';
import InfoBar from '../UI/Messages/InfoBar';
import ContextMenu from '../UI/Menu/ContextMenu';
import {
undo,
redo,
@@ -37,7 +37,7 @@ import {
canRedo,
getHistoryInitialState,
saveToHistory,
} from '../../Utils/History';
} from '../Utils/History';
const gd = global.gd;
const INSTANCES_CLIPBOARD_KIND = 'Instances';
@@ -55,7 +55,7 @@ const styles = {
},
};
export default class InstancesFullEditor extends Component {
export default class SceneEditor extends Component {
static defaultProps = {
showObjectsList: true,
setToolbar: () => {},