Replace usages of label with para, WIP new Editor (v3)

Gemfile.lock

@@ -1,21 +1,18 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    cyberarm_engine (0.24.1)
+    cyberarm_engine (0.24.4)
-      excon (~> 0.88)
       gosu (~> 1.1)
-      gosu_more_drawables (~> 0.3)
-    excon (0.109.0)
     gosu (1.4.6)
-    gosu_more_drawables (0.3.1)
     ocran (1.3.15)
 
 PLATFORMS
   x64-mingw-ucrt
+  x86_64-linux
 
 DEPENDENCIES
   cyberarm_engine
   ocran
 
 BUNDLED WITH
-   2.5.3
+   2.5.14

lib/dialog.rb

@@ -11,7 +11,7 @@ module TAC
         @titlebar = flow(width: 1.0, height: 36) do
           background [TAC::Palette::TIMECRAFTERS_PRIMARY, TAC::Palette::TIMECRAFTERS_SECONDARY]
 
-          label @title, text_size: THEME_SUBHEADING_TEXT_SIZE, font: TAC::THEME_BOLD_FONT, fill: true, text_align: :center, text_border: true, text_border_color: 0xaa_222222, text_border_size: 1
+          para @title, text_size: THEME_SUBHEADING_TEXT_SIZE, font: TAC::THEME_BOLD_FONT, fill: true, text_align: :center, text_border: true, text_border_color: 0xaa_222222, text_border_size: 1
 
           button get_image("#{TAC::MEDIA_PATH}/icons/cross.png"), image_height: 1.0, **THEME_DANGER_BUTTON do
             close

lib/dialogs/action_dialog.rb

@@ -4,15 +4,15 @@ module TAC
       def build
         background Gosu::Color::GRAY
 
-        label "Name", width: 1.0, text_align: :center
+        para "Name", width: 1.0, text_align: :center
-        @name_error = label "Error", color: TAC::Palette::TACNET_CONNECTION_ERROR
+        @name_error = para "Error", color: TAC::Palette::TACNET_CONNECTION_ERROR
         @name_error.hide
         @name = edit_line @options[:action] ? @options[:action].name : "", filter: method(:name_filter), width: 1.0, autofocus: true, focus: true
         @name.subscribe(:changed) do |sender, value|
           valid?
         end
 
-        label "Comment", width: 1.0, text_align: :center
+        para "Comment", width: 1.0, text_align: :center
         @comment = edit_line @options[:action] ? @options[:action].comment : "", width: 1.0
 
         flow width: 1.0, margin_top: THEME_DIALOG_BUTTON_PADDING do

lib/dialogs/alert_dialog.rb

@@ -3,7 +3,7 @@ module TAC
     class AlertDialog < Dialog
       def build
         background Gosu::Color::GRAY
-        label @options[:message]
+        para @options[:message]
 
         button "Close", width: 1.0, margin_top: THEME_DIALOG_BUTTON_PADDING do
           try_commit

lib/dialogs/confirm_dialog.rb

@@ -11,7 +11,7 @@ module TAC
         @titlebar.style.default[:background] = [ color, darken(color, 50) ]
 
         background Gosu::Color::GRAY
-        label @options[:message]
+        para @options[:message]
 
         flow width: 1.0, margin_top: THEME_DIALOG_BUTTON_PADDING do
           button "Cancel", width: 0.5 do

lib/dialogs/name_prompt_dialog.rb

@@ -5,8 +5,8 @@ module TAC
 
       def build
         background Gosu::Color::GRAY
-        label "Name", width: 1.0, text_align: :center
+        para "Name", width: 1.0, text_align: :center
-        @name_error = label "", color: TAC::Palette::TACNET_CONNECTION_ERROR
+        @name_error = para "", color: TAC::Palette::TACNET_CONNECTION_ERROR
         @name_error.hide
         @name = edit_line @options[:renaming] ? @options[:renaming].name : "", filter: method(:name_filter), width: 1.0, autofocus: true, focus: true
 

lib/dialogs/tacnet_dialog.rb

@@ -6,7 +6,7 @@ module TAC
         @titlebar.style.default[:background] = [ Palette::TACNET_PRIMARY, Palette::TACNET_SECONDARY ]
 
         background Gosu::Color::GRAY
-        label @options[:message], width: 1.0
+        para @options[:message], width: 1.0
 
         @sound = Gosu::Sample.new("#{TAC::MEDIA_PATH}/error_alarm.ogg").play(1, 1, true)
 

lib/dialogs/tacnet_status_dialog.rb

@@ -3,7 +3,7 @@ module TAC
     class TACNETStatusDialog < Dialog
       def build
         background Gosu::Color::GRAY
-        @message_label = label CyberarmEngine::Window.instance.backend.tacnet.full_status
+        @message_label = para CyberarmEngine::Window.instance.backend.tacnet.full_status
 
         button "Close", width: 1.0, margin_top: THEME_DIALOG_BUTTON_PADDING do
           try_commit

lib/dialogs/variable_dialog.rb

@@ -6,16 +6,16 @@ module TAC
 
         @type = @options[:variable].type if @options[:variable]
 
-        label "Name", width: 1.0, text_align: :center
+        para "Name", width: 1.0, text_align: :center
-        @name_error = label "Error", color: TAC::Palette::TACNET_CONNECTION_ERROR
+        @name_error = para "Error", color: TAC::Palette::TACNET_CONNECTION_ERROR
         @name_error.hide
         @name = edit_line @options[:variable] ? @options[:variable].name : "", filter: method(:name_filter), width: 1.0, autofocus: true, focus: true
         @name.subscribe(:changed) do |sender, value|
           valid?
         end
 
-        label "Type", width: 1.0, text_align: :center
+        para "Type", width: 1.0, text_align: :center
-        @type_error = label "Error", color: TAC::Palette::TACNET_CONNECTION_ERROR
+        @type_error = para "Error", color: TAC::Palette::TACNET_CONNECTION_ERROR
         @type_error.hide
 
         @var_type = list_box items: [:float, :double, :integer, :long, :string, :boolean], choose: @type ? @type : :double, width: 1.0 do |item|
@@ -35,8 +35,8 @@ module TAC
         @type ||= @var_type.value.to_sym
 
         @value_container = stack width: 1.0 do
-          label "Value", width: 1.0, text_align: :center
+          para "Value", width: 1.0, text_align: :center
-          @value_error = label "Error", color: TAC::Palette::TACNET_CONNECTION_ERROR
+          @value_error = para "Error", color: TAC::Palette::TACNET_CONNECTION_ERROR
           @value_error.hide
           @value = edit_line @options[:variable] ? @options[:variable].value : "", width: 1.0
           @value_boolean = check_box "Boolean", checked: @options[:variable] ? @options[:variable].value == "true" : false

lib/game_clock/view.rb

@@ -95,13 +95,13 @@ module TAC
             background @menu_background
 
             flow(width: 1.0) do
-              label "♫ Now playing:"
+              para "♫ Now playing:"
-              @current_song_label = label "♫ ♫ ♫"
+              @current_song_label = para "♫ ♫ ♫"
             end
 
             flow(width: 1.0) do
-              label "Volume:"
+              para "Volume:"
-              @current_volume_label = label "100%"
+              @current_volume_label = para "100%"
             end
 
             flow(width: 1.0) do

lib/pages/configurations.rb

@@ -27,8 +27,8 @@ module TAC
 
         status_bar.clear do
           flow(width: 1.0, max_width: 720, h_align: :center) do
-            label "Current Configuration: "
+            para "Current Configuration: "
-            @config_label = label window.backend.settings.config
+            @config_label = para window.backend.settings.config
           end
         end
 

lib/pages/editor.rb

@@ -30,13 +30,13 @@ module TAC
 
         status_bar.clear do
           flow(width: 0.3333) do
-            label "Active group:", margin_right: 20
+            para "Active group:", margin_right: 20
-            @active_group_label = label ""
+            @active_group_label = para ""
           end
 
           flow(width: 0.3333) do
-            label "Active action:", margin_right: 20
+            para "Active action:", margin_right: 20
-            @active_action_label = label ""
+            @active_action_label = para ""
           end
         end
 
@@ -44,7 +44,7 @@ module TAC
           flow(width: 1.0, height: 1.0) do
             stack fill: true, height: 1.0, padding_left: 2, padding_right: 2, border_thickness_right: 1, border_color: Gosu::Color::BLACK do
               @groups_menu = flow(width: 1.0, height: 36) do
-                label "Groups", text_size: THEME_SUBHEADING_TEXT_SIZE, fill: true, text_align: :center
+                para "Groups", text_size: THEME_SUBHEADING_TEXT_SIZE, fill: true, text_align: :center
 
                 button get_image("#{TAC::MEDIA_PATH}/icons/plus.png"), image_width: THEME_ICON_SIZE, tip: "Add group" do
                   push_state(TAC::Dialog::NamePromptDialog, title: "Create Group", list: window.backend.config.groups, callback_method: method(:create_group))
@@ -117,7 +117,7 @@ module TAC
 
             stack fill: true, height: 1.0, padding_left: 2, padding_right: 2, border_thickness_right: 1, border_color: Gosu::Color::BLACK do
               @actions_menu = flow(width: 1.0, height: 36) do
-                label "Actions", text_size: THEME_SUBHEADING_TEXT_SIZE, fill: true, text_align: :center
+                para "Actions", text_size: THEME_SUBHEADING_TEXT_SIZE, fill: true, text_align: :center
 
                 # TODO: Implement this
                 # button get_image("#{TAC::MEDIA_PATH}/icons/barsHorizontal.png"), image_width: THEME_ICON_SIZE, tip: "Auto renumber engine actions", margin_right: 16, enabled: false do
@@ -221,7 +221,7 @@ module TAC
 
             stack fill: true, height: 1.0, padding_left: 2, padding_right: 2 do
               @variables_menu = flow(width: 1.0, height: 36) do
-                label "Variables", text_size: THEME_SUBHEADING_TEXT_SIZE, fill: true, text_align: :center
+                para "Variables", text_size: THEME_SUBHEADING_TEXT_SIZE, fill: true, text_align: :center
                 button get_image("#{TAC::MEDIA_PATH}/icons/plus.png"), image_width: THEME_ICON_SIZE, tip: "Add variable" do
                   if @active_action
                     push_state(TAC::Dialog::VariableDialog, title: "Create Variable", list: @active_action.variables, callback_method: method(:create_variable))
@@ -325,7 +325,7 @@ module TAC
         window.backend.config_changed!
 
         group_container = find_element_by_tag(@groups_list, old_name)
-        label = find_element_by_tag(group_container, "label")
+        para = find_element_by_tag(group_container, "label")
 
         label.value = name
 
@@ -382,7 +382,7 @@ module TAC
         window.backend.config_changed!
 
         action_container = find_element_by_tag(@actions_list, old_name)
-        label = find_element_by_tag(action_container, "label")
+        para = find_element_by_tag(action_container, "label")
         comment_container = find_element_by_tag(action_container, "comment_container")
         comment_label = find_element_by_tag(action_container, "comment")
 
@@ -454,7 +454,7 @@ module TAC
         window.backend.config_changed!
 
         variable_container = find_element_by_tag(@variables_list, old_name)
-        label = find_element_by_tag(variable_container, "label")
+        para = find_element_by_tag(variable_container, "label")
         type  = find_element_by_tag(variable_container, "type")
         value = find_element_by_tag(variable_container, "value")
 

lib/pages/home.rb

@@ -6,33 +6,33 @@ module TAC
 
         body.clear do
           stack(width: 1.0, height: 1.0) do
-            label TAC::NAME, width: 1.0, text_size: 48, text_align: :center
+            para TAC::NAME, width: 1.0, text_size: 48, text_align: :center
 
             stack(width: 1.0, height: 8) do
               background 0xff_006000
             end
 
             if window.backend.settings.config.empty?
-              label "TODO: Introduction"
+              para "TODO: Introduction"
-              label "Get Started", text_size: 28
+              para "Get Started", text_size: 28
               button "1. Create a configuration" do
                 page(TAC::Pages::Configurations)
               end
-              label "2. Add a group"
+              para "2. Add a group"
-              label "3. Add an action"
+              para "3. Add an action"
-              label "4. Add a variable"
+              para "4. Add a variable"
-              label "5. Profit?"
+              para "5. Profit?"
             else
-              label "Display config stats or something?"
+              para "Display config stats or something?"
 
               config = window.backend.config
               groups = config.groups
               actions = config.groups.map { |g| g.actions }.flatten
               variables = actions.map { |a| a.variables }.flatten
 
-              label "Total groups: #{groups.size}"
+              para "Total groups: #{groups.size}"
-              label "Total actions: #{actions.size}"
+              para "Total actions: #{actions.size}"
-              label "Total variables: #{variables.size}"
+              para "Total variables: #{variables.size}"
             end
 
             stack(width: 1.0, fill: true, scroll: true, margin_top: 32) do

lib/pages/presets.rb

@@ -201,7 +201,7 @@ module TAC
         window.backend.config_changed!
 
         group_container = find_element_by_tag(@group_presets, old_name)
-        label = find_element_by_tag(group_container, "label")
+        para = find_element_by_tag(group_container, "label")
 
         label.value = name
 
@@ -233,7 +233,7 @@ module TAC
         window.backend.config_changed!
 
         action_container = find_element_by_tag(@action_presets, old_name)
-        label = find_element_by_tag(action_container, "label")
+        para = find_element_by_tag(action_container, "label")
         comment_container = find_element_by_tag(action_container, "comment_container")
         comment_label = find_element_by_tag(action_container, "comment")
 

lib/pages/simulator.rb

@@ -29,7 +29,7 @@ module TAC
         end
 
         status_bar.clear do
-          @simulation_status = label ""
+          @simulation_status = para ""
         end
 
         body.clear do

lib/pages/tacnet.rb

@@ -6,9 +6,9 @@ module TAC
 
         menu_bar.clear do
           @connect_menu = flow(width: 1.0, height: 1.0) do
-            label "Hostname", text_size: 28
+            para "Hostname", text_size: 28
             hostname = edit_line window.backend.settings.hostname, width: 0.33, height: 1.0, text_size: 28
-            label "Port", text_size: 28
+            para "Port", text_size: 28
             port = edit_line window.backend.settings.port, width: 0.33, height: 1.0, text_size: 28
             button "Connect", height: 1.0, text_size: 28 do
               if hostname.value != window.backend.settings.hostname || port.value.to_i != window.backend.settings.port
@@ -31,11 +31,11 @@ module TAC
 
         status_bar.clear do
           @tacnet_icon = image "#{TAC::MEDIA_PATH}/icons/signal3.png", height: 26
-          @status_label = label "TACNET: Not Connected", text_size: 26
+          @status_label = para "TACNET: Not Connected", text_size: 26
         end
 
         body.clear do
-          @full_status_label = label ""
+          @full_status_label = para ""
         end
       end
 

lib/states/editor.rb

@@ -36,7 +36,7 @@ class Editor < CyberarmEngine::GuiState
     @header_bar = flow(width: 1.0, height: 36) do
       background 0xff_006000
 
-      @header_bar_label = label TAC::NAME, fill: true, text_align: :center, text_size: 32, font: TAC::THEME_BOLD_FONT, margin_left: BORDERLESS ? 36 * 3 : 0
+      @header_bar_label = para TAC::NAME, fill: true, text_align: :center, text_size: 32, font: TAC::THEME_BOLD_FONT, margin_left: BORDERLESS ? 36 * 3 : 0
 
       @window_controls = flow(width: 36 * 3, height: 1.0) do
         button get_image("#{TAC::MEDIA_PATH}/icons/minus.png"), tip: "Minimize", image_height: 1.0 do
@@ -62,7 +62,7 @@ class Editor < CyberarmEngine::GuiState
         end
 
         button get_image("#{TAC::MEDIA_PATH}/icons/menuList.png"), margin: 4, tip: "Editor", image_width: 1.0 do
-          page(TAC::Pages::Editor)
+          page(TAC::Pages::EditorV3)
         end
 
         @tacnet_button = button get_image("#{TAC::MEDIA_PATH}/icons/signal3.png"), margin: 4, tip: "TACNET", image_width: 1.0 do
@@ -107,7 +107,7 @@ class Editor < CyberarmEngine::GuiState
         end
       end
 
-      @content = stack(width: window.width - @navigation.style.width, height: 1.0) do
+      @content = stack(fill: true, height: 1.0) do
         @chrome = stack(width: 1.0, height: 96) do
           @menu_bar = flow(width: 1.0, height: 48, padding: 8) do
             background 0xff_008000
@@ -233,4 +233,4 @@ class Editor < CyberarmEngine::GuiState
       TAC::Pages::Search
     ].include?(klass)
   end
-end
+end

timecrafters_configuration_tool.rb

@@ -20,7 +20,7 @@ require_relative "lib/states/boot"
 require_relative "lib/states/editor"
 require_relative "lib/page"
 require_relative "lib/pages/home"
-require_relative "lib/pages/editor"
+require_relative "lib/pages/editor_v3"
 require_relative "lib/pages/tacnet"
 require_relative "lib/pages/simulator"
 require_relative "lib/pages/configurations"