mirror of
https://github.com/TimeCrafters/timecrafters_configuration_tool_desktop.git
synced 2025-12-16 13:52:34 +00:00
Compare commits
4 Commits
v0.4.0_bet
...
v0.4.2_bet
| Author | SHA1 | Date | |
|---|---|---|---|
| a34d4bbeb2 | |||
| e915cbb72f | |||
| 34c607d1a1 | |||
| 9d75d2c09b |
@@ -19,7 +19,7 @@ module TAC
|
|||||||
@type_error.hide
|
@type_error.hide
|
||||||
|
|
||||||
@var_type = list_box items: [:float, :double, :integer, :long, :string, :boolean], choose: @type ? @type : :double, width: 1.0 do |item|
|
@var_type = list_box items: [:float, :double, :integer, :long, :string, :boolean], choose: @type ? @type : :double, width: 1.0 do |item|
|
||||||
@type = item.value.to_sym
|
@type = item.to_sym
|
||||||
|
|
||||||
if @type == :boolean
|
if @type == :boolean
|
||||||
@value.hide
|
@value.hide
|
||||||
@@ -84,18 +84,12 @@ module TAC
|
|||||||
@name_error.value = "Error: Name cannot be blank or only whitespace."
|
@name_error.value = "Error: Name cannot be blank or only whitespace."
|
||||||
@name_error.show
|
@name_error.show
|
||||||
valid = false
|
valid = false
|
||||||
else
|
|
||||||
@name_error.value = ""
|
|
||||||
@name_error.hide
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if not @type
|
if not @type
|
||||||
@type_error.value = "Error: Type not set."
|
@type_error.value = "Error: Type not set."
|
||||||
@type_error.show
|
@type_error.show
|
||||||
valid = false
|
valid = false
|
||||||
else
|
|
||||||
@type_error.value = ""
|
|
||||||
@type_error.hide
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if [:integer, :float, :double, :long].include?(@type)
|
if [:integer, :float, :double, :long].include?(@type)
|
||||||
@@ -121,14 +115,11 @@ module TAC
|
|||||||
@value_error.show
|
@value_error.show
|
||||||
valid = false
|
valid = false
|
||||||
end
|
end
|
||||||
else
|
|
||||||
@value_error.value = ""
|
|
||||||
@value_error.hide
|
|
||||||
end
|
end
|
||||||
|
|
||||||
elsif @type == :string
|
elsif @type == :string
|
||||||
if @value.value.strip.empty?
|
if @value.value.strip.empty?
|
||||||
@value_error.value = "Error: Value cannot be blank or only whitespace."
|
@value_error.value = "Error: Value cannot be blank or only whitespace."
|
||||||
@value_error.show
|
@value_error.show
|
||||||
valid = false
|
valid = false
|
||||||
end
|
end
|
||||||
@@ -141,6 +132,13 @@ module TAC
|
|||||||
valid = false
|
valid = false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if valid
|
||||||
|
@value_error.value = ""
|
||||||
|
@value_error.hide
|
||||||
|
@type_error.value = ""
|
||||||
|
@type_error.hide
|
||||||
|
end
|
||||||
|
|
||||||
return valid
|
return valid
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -172,14 +172,11 @@ class Editor < CyberarmEngine::GuiState
|
|||||||
@status_bar.clear
|
@status_bar.clear
|
||||||
@body.clear
|
@body.clear
|
||||||
|
|
||||||
if window.backend.settings.config.empty?
|
if window.backend.settings.config.empty? && page_requires_configuration?(klass)
|
||||||
if [TAC::Pages::Home, TAC::Pages::TACNET, TAC::Pages::Simulator, TAC::Pages::Configurations].include?(klass)
|
push_state(TAC::Dialog::AlertDialog, title: "No Config Loaded", message: "A config must be loaded.")
|
||||||
else
|
page(TAC::Pages::Configurations)
|
||||||
push_state(TAC::Dialog::AlertDialog, title: "No Config Loaded", message: "A config must be loaded.")
|
|
||||||
page(TAC::Pages::Configurations)
|
|
||||||
|
|
||||||
return
|
return
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
@page.blur if @page
|
@page.blur if @page
|
||||||
@@ -191,4 +188,12 @@ class Editor < CyberarmEngine::GuiState
|
|||||||
@page.setup
|
@page.setup
|
||||||
@page.focus
|
@page.focus
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def page_requires_configuration?(klass)
|
||||||
|
[
|
||||||
|
TAC::Pages::Editor,
|
||||||
|
TAC::Pages::Presets,
|
||||||
|
TAC::Pages::Search
|
||||||
|
].include?(klass)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
module TAC
|
module TAC
|
||||||
NAME = "TimeCrafters Configuration Tool"
|
NAME = "TimeCrafters Configuration Tool"
|
||||||
VERSION = "0.4.0"
|
VERSION = "0.4.2"
|
||||||
RELEASE_NAME = "Beta"
|
RELEASE_NAME = "Beta"
|
||||||
end
|
end
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
begin
|
begin
|
||||||
|
raise LoadError if defined?(Ocra)
|
||||||
require_relative "../cyberarm_engine/lib/cyberarm_engine"
|
require_relative "../cyberarm_engine/lib/cyberarm_engine"
|
||||||
rescue LoadError
|
rescue LoadError
|
||||||
require "cyberarm_engine"
|
require "cyberarm_engine"
|
||||||
|
|||||||
Reference in New Issue
Block a user