mirror of
https://github.com/rojo-rbx/rojo.git
synced 2026-04-26 15:46:28 +00:00
Remove duplicate PluginSettings.StudioProvider (#545)
This commit is contained in:
boatbomber
GitHub
@@ -154,150 +154,146 @@ function App:render()
|
|||||||
value = self.props.plugin,
|
value = self.props.plugin,
|
||||||
}, {
|
}, {
|
||||||
e(Theme.StudioProvider, nil, {
|
e(Theme.StudioProvider, nil, {
|
||||||
e(PluginSettings.StudioProvider, {
|
gui = e(StudioPluginGui, {
|
||||||
plugin = self.props.plugin,
|
id = pluginName,
|
||||||
|
title = pluginName,
|
||||||
|
active = self.state.guiEnabled,
|
||||||
|
|
||||||
|
initDockState = Enum.InitialDockState.Right,
|
||||||
|
initEnabled = false,
|
||||||
|
overridePreviousState = false,
|
||||||
|
floatingSize = Vector2.new(300, 200),
|
||||||
|
minimumSize = Vector2.new(300, 200),
|
||||||
|
|
||||||
|
zIndexBehavior = Enum.ZIndexBehavior.Sibling,
|
||||||
|
|
||||||
|
onInitialState = function(initialState)
|
||||||
|
self:setState({
|
||||||
|
guiEnabled = initialState,
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
|
||||||
|
onClose = function()
|
||||||
|
self:setState({
|
||||||
|
guiEnabled = false,
|
||||||
|
})
|
||||||
|
end,
|
||||||
}, {
|
}, {
|
||||||
gui = e(StudioPluginGui, {
|
NotConnectedPage = createPageElement(AppStatus.NotConnected, {
|
||||||
id = pluginName,
|
host = self.host,
|
||||||
title = pluginName,
|
onHostChange = self.setHost,
|
||||||
active = self.state.guiEnabled,
|
port = self.port,
|
||||||
|
onPortChange = self.setPort,
|
||||||
|
|
||||||
initDockState = Enum.InitialDockState.Right,
|
onConnect = function()
|
||||||
initEnabled = false,
|
self:startSession()
|
||||||
overridePreviousState = false,
|
end,
|
||||||
floatingSize = Vector2.new(300, 200),
|
|
||||||
minimumSize = Vector2.new(300, 200),
|
|
||||||
|
|
||||||
zIndexBehavior = Enum.ZIndexBehavior.Sibling,
|
onNavigateSettings = function()
|
||||||
|
|
||||||
onInitialState = function(initialState)
|
|
||||||
self:setState({
|
self:setState({
|
||||||
guiEnabled = initialState,
|
appStatus = AppStatus.Settings,
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
|
}),
|
||||||
|
|
||||||
|
Connecting = createPageElement(AppStatus.Connecting),
|
||||||
|
|
||||||
|
Connected = createPageElement(AppStatus.Connected, {
|
||||||
|
projectName = self.state.projectName,
|
||||||
|
address = self.state.address,
|
||||||
|
|
||||||
|
onDisconnect = function()
|
||||||
|
self:endSession()
|
||||||
|
end,
|
||||||
|
}),
|
||||||
|
|
||||||
|
Settings = createPageElement(AppStatus.Settings, {
|
||||||
|
onBack = function()
|
||||||
|
self:setState({
|
||||||
|
appStatus = AppStatus.NotConnected,
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
}),
|
||||||
|
|
||||||
|
Error = createPageElement(AppStatus.Error, {
|
||||||
|
errorMessage = self.state.errorMessage,
|
||||||
|
|
||||||
onClose = function()
|
onClose = function()
|
||||||
self:setState({
|
self:setState({
|
||||||
guiEnabled = false,
|
appStatus = AppStatus.NotConnected,
|
||||||
|
toolbarIcon = Assets.Images.PluginButton,
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
}, {
|
|
||||||
NotConnectedPage = createPageElement(AppStatus.NotConnected, {
|
|
||||||
host = self.host,
|
|
||||||
onHostChange = self.setHost,
|
|
||||||
port = self.port,
|
|
||||||
onPortChange = self.setPort,
|
|
||||||
|
|
||||||
onConnect = function()
|
|
||||||
self:startSession()
|
|
||||||
end,
|
|
||||||
|
|
||||||
onNavigateSettings = function()
|
|
||||||
self:setState({
|
|
||||||
appStatus = AppStatus.Settings,
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
}),
|
|
||||||
|
|
||||||
Connecting = createPageElement(AppStatus.Connecting),
|
|
||||||
|
|
||||||
Connected = createPageElement(AppStatus.Connected, {
|
|
||||||
projectName = self.state.projectName,
|
|
||||||
address = self.state.address,
|
|
||||||
|
|
||||||
onDisconnect = function()
|
|
||||||
self:endSession()
|
|
||||||
end,
|
|
||||||
}),
|
|
||||||
|
|
||||||
Settings = createPageElement(AppStatus.Settings, {
|
|
||||||
onBack = function()
|
|
||||||
self:setState({
|
|
||||||
appStatus = AppStatus.NotConnected,
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
}),
|
|
||||||
|
|
||||||
Error = createPageElement(AppStatus.Error, {
|
|
||||||
errorMessage = self.state.errorMessage,
|
|
||||||
|
|
||||||
onClose = function()
|
|
||||||
self:setState({
|
|
||||||
appStatus = AppStatus.NotConnected,
|
|
||||||
toolbarIcon = Assets.Images.PluginButton,
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
}),
|
|
||||||
|
|
||||||
Background = Theme.with(function(theme)
|
|
||||||
return e("Frame", {
|
|
||||||
Size = UDim2.new(1, 0, 1, 0),
|
|
||||||
BackgroundColor3 = theme.BackgroundColor,
|
|
||||||
ZIndex = 0,
|
|
||||||
BorderSizePixel = 0,
|
|
||||||
})
|
|
||||||
end),
|
|
||||||
}),
|
}),
|
||||||
|
|
||||||
toggleAction = e(StudioPluginAction, {
|
Background = Theme.with(function(theme)
|
||||||
name = "RojoConnection",
|
return e("Frame", {
|
||||||
title = "Rojo: Connect/Disconnect",
|
Size = UDim2.new(1, 0, 1, 0),
|
||||||
description = "Toggles the server for a Rojo sync session",
|
BackgroundColor3 = theme.BackgroundColor,
|
||||||
icon = Assets.Images.PluginButton,
|
ZIndex = 0,
|
||||||
bindable = true,
|
BorderSizePixel = 0,
|
||||||
onTriggered = function()
|
|
||||||
if self.serveSession == nil or self.serveSession:getStatus() == ServeSession.Status.NotStarted then
|
|
||||||
self:startSession()
|
|
||||||
elseif self.serveSession ~= nil and self.serveSession:getStatus() == ServeSession.Status.Connected then
|
|
||||||
self:endSession()
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
}),
|
|
||||||
|
|
||||||
connectAction = e(StudioPluginAction, {
|
|
||||||
name = "RojoConnect",
|
|
||||||
title = "Rojo: Connect",
|
|
||||||
description = "Connects the server for a Rojo sync session",
|
|
||||||
icon = Assets.Images.PluginButton,
|
|
||||||
bindable = true,
|
|
||||||
onTriggered = function()
|
|
||||||
if self.serveSession == nil or self.serveSession:getStatus() == ServeSession.Status.NotStarted then
|
|
||||||
self:startSession()
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
}),
|
|
||||||
|
|
||||||
disconnectAction = e(StudioPluginAction, {
|
|
||||||
name = "RojoDisconnect",
|
|
||||||
title = "Rojo: Disconnect",
|
|
||||||
description = "Disconnects the server for a Rojo sync session",
|
|
||||||
icon = Assets.Images.PluginButton,
|
|
||||||
bindable = true,
|
|
||||||
onTriggered = function()
|
|
||||||
if self.serveSession ~= nil and self.serveSession:getStatus() == ServeSession.Status.Connected then
|
|
||||||
self:endSession()
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
}),
|
|
||||||
|
|
||||||
toolbar = e(StudioToolbar, {
|
|
||||||
name = pluginName,
|
|
||||||
}, {
|
|
||||||
button = e(StudioToggleButton, {
|
|
||||||
name = "Rojo",
|
|
||||||
tooltip = "Show or hide the Rojo panel",
|
|
||||||
icon = self.state.toolbarIcon,
|
|
||||||
active = self.state.guiEnabled,
|
|
||||||
enabled = true,
|
|
||||||
onClick = function()
|
|
||||||
self:setState(function(state)
|
|
||||||
return {
|
|
||||||
guiEnabled = not state.guiEnabled,
|
|
||||||
}
|
|
||||||
end)
|
|
||||||
end,
|
|
||||||
})
|
})
|
||||||
}),
|
end),
|
||||||
|
}),
|
||||||
|
|
||||||
|
toggleAction = e(StudioPluginAction, {
|
||||||
|
name = "RojoConnection",
|
||||||
|
title = "Rojo: Connect/Disconnect",
|
||||||
|
description = "Toggles the server for a Rojo sync session",
|
||||||
|
icon = Assets.Images.PluginButton,
|
||||||
|
bindable = true,
|
||||||
|
onTriggered = function()
|
||||||
|
if self.serveSession == nil or self.serveSession:getStatus() == ServeSession.Status.NotStarted then
|
||||||
|
self:startSession()
|
||||||
|
elseif self.serveSession ~= nil and self.serveSession:getStatus() == ServeSession.Status.Connected then
|
||||||
|
self:endSession()
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
}),
|
||||||
|
|
||||||
|
connectAction = e(StudioPluginAction, {
|
||||||
|
name = "RojoConnect",
|
||||||
|
title = "Rojo: Connect",
|
||||||
|
description = "Connects the server for a Rojo sync session",
|
||||||
|
icon = Assets.Images.PluginButton,
|
||||||
|
bindable = true,
|
||||||
|
onTriggered = function()
|
||||||
|
if self.serveSession == nil or self.serveSession:getStatus() == ServeSession.Status.NotStarted then
|
||||||
|
self:startSession()
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
}),
|
||||||
|
|
||||||
|
disconnectAction = e(StudioPluginAction, {
|
||||||
|
name = "RojoDisconnect",
|
||||||
|
title = "Rojo: Disconnect",
|
||||||
|
description = "Disconnects the server for a Rojo sync session",
|
||||||
|
icon = Assets.Images.PluginButton,
|
||||||
|
bindable = true,
|
||||||
|
onTriggered = function()
|
||||||
|
if self.serveSession ~= nil and self.serveSession:getStatus() == ServeSession.Status.Connected then
|
||||||
|
self:endSession()
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
}),
|
||||||
|
|
||||||
|
toolbar = e(StudioToolbar, {
|
||||||
|
name = pluginName,
|
||||||
|
}, {
|
||||||
|
button = e(StudioToggleButton, {
|
||||||
|
name = "Rojo",
|
||||||
|
tooltip = "Show or hide the Rojo panel",
|
||||||
|
icon = self.state.toolbarIcon,
|
||||||
|
active = self.state.guiEnabled,
|
||||||
|
enabled = true,
|
||||||
|
onClick = function()
|
||||||
|
self:setState(function(state)
|
||||||
|
return {
|
||||||
|
guiEnabled = not state.guiEnabled,
|
||||||
|
}
|
||||||
|
end)
|
||||||
|
end,
|
||||||
|
})
|
||||||
}),
|
}),
|
||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
@@ -314,4 +310,4 @@ return function(props)
|
|||||||
return e(App, settingsProps)
|
return e(App, settingsProps)
|
||||||
end),
|
end),
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user