mirror of
https://github.com/TimeCrafters/timecrafters_configuration_tool_desktop.git
synced 2025-12-16 05:42:35 +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
|
||||
|
||||
@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
|
||||
@value.hide
|
||||
@@ -84,18 +84,12 @@ module TAC
|
||||
@name_error.value = "Error: Name cannot be blank or only whitespace."
|
||||
@name_error.show
|
||||
valid = false
|
||||
else
|
||||
@name_error.value = ""
|
||||
@name_error.hide
|
||||
end
|
||||
|
||||
if not @type
|
||||
@type_error.value = "Error: Type not set."
|
||||
@type_error.show
|
||||
valid = false
|
||||
else
|
||||
@type_error.value = ""
|
||||
@type_error.hide
|
||||
end
|
||||
|
||||
if [:integer, :float, :double, :long].include?(@type)
|
||||
@@ -121,14 +115,11 @@ module TAC
|
||||
@value_error.show
|
||||
valid = false
|
||||
end
|
||||
else
|
||||
@value_error.value = ""
|
||||
@value_error.hide
|
||||
end
|
||||
|
||||
elsif @type == :string
|
||||
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
|
||||
valid = false
|
||||
end
|
||||
@@ -141,6 +132,13 @@ module TAC
|
||||
valid = false
|
||||
end
|
||||
|
||||
if valid
|
||||
@value_error.value = ""
|
||||
@value_error.hide
|
||||
@type_error.value = ""
|
||||
@type_error.hide
|
||||
end
|
||||
|
||||
return valid
|
||||
end
|
||||
end
|
||||
|
||||
@@ -172,14 +172,11 @@ class Editor < CyberarmEngine::GuiState
|
||||
@status_bar.clear
|
||||
@body.clear
|
||||
|
||||
if window.backend.settings.config.empty?
|
||||
if [TAC::Pages::Home, TAC::Pages::TACNET, TAC::Pages::Simulator, TAC::Pages::Configurations].include?(klass)
|
||||
else
|
||||
push_state(TAC::Dialog::AlertDialog, title: "No Config Loaded", message: "A config must be loaded.")
|
||||
page(TAC::Pages::Configurations)
|
||||
if window.backend.settings.config.empty? && page_requires_configuration?(klass)
|
||||
push_state(TAC::Dialog::AlertDialog, title: "No Config Loaded", message: "A config must be loaded.")
|
||||
page(TAC::Pages::Configurations)
|
||||
|
||||
return
|
||||
end
|
||||
return
|
||||
end
|
||||
|
||||
@page.blur if @page
|
||||
@@ -191,4 +188,12 @@ class Editor < CyberarmEngine::GuiState
|
||||
@page.setup
|
||||
@page.focus
|
||||
end
|
||||
|
||||
def page_requires_configuration?(klass)
|
||||
[
|
||||
TAC::Pages::Editor,
|
||||
TAC::Pages::Presets,
|
||||
TAC::Pages::Search
|
||||
].include?(klass)
|
||||
end
|
||||
end
|
||||
@@ -1,5 +1,5 @@
|
||||
module TAC
|
||||
NAME = "TimeCrafters Configuration Tool"
|
||||
VERSION = "0.4.0"
|
||||
VERSION = "0.4.2"
|
||||
RELEASE_NAME = "Beta"
|
||||
end
|
||||
@@ -1,4 +1,5 @@
|
||||
begin
|
||||
raise LoadError if defined?(Ocra)
|
||||
require_relative "../cyberarm_engine/lib/cyberarm_engine"
|
||||
rescue LoadError
|
||||
require "cyberarm_engine"
|
||||
|
||||
Reference in New Issue
Block a user