glimmer-dsl-libui 0.9.0 → 0.9.2

data/lib/glimmer/rake_task/scaffold.rb

@@ -94,9 +94,6 @@ module Glimmer
           # Mac
           .DS_Store
           
-          # Warbler
-          Jars.lock
-          
           # Gladiator (Glimmer Editor)
           .gladiator
           .gladiator-scratchpad
@@ -104,7 +101,6 @@ module Glimmer
           # Glimmer
           /dist/
           /packages/
-          /vendor/jars/
         MULTI_LINE_STRING
     
         GEMFILE_PREFIX = <<~MULTI_LINE_STRING
@@ -116,19 +112,17 @@ module Glimmer
         MULTI_LINE_STRING
         GEMFILE_APP_MIDFIX = <<~MULTI_LINE_STRING
         
-          gem 'glimmer-dsl-swt', '~> #{VERSION}'
+          gem 'glimmer-dsl-libui', '~> #{VERSION}'
         MULTI_LINE_STRING
         GEMFILE_GEM_MIDFIX = <<~MULTI_LINE_STRING
         
-          gem 'glimmer-dsl-swt', '~> #{VERSION.split('.')[0...2].join('.')}'
+          gem 'glimmer-dsl-libui', '~> #{VERSION.split('.')[0...2].join('.')}'
         MULTI_LINE_STRING
         GEMFILE_SUFFIX = <<~MULTI_LINE_STRING
         
           group :development do
-            gem 'jar-dependencies', '0.4.1'
             gem 'rspec', '~> 3.5.0'
             gem 'juwelier', '2.4.9'
-            gem 'warbler', '2.0.5'
             gem 'simplecov', '>= 0'
           end
         MULTI_LINE_STRING
@@ -139,13 +133,13 @@ module Glimmer
           common_app(app_name)
         end
         
-        def common_app(app_name, shell_type = :app, shell_options = {})
+        def common_app(app_name, window_type = :app, window_options = {})
           gem_name = file_name(app_name)
           gem_summary = human_name(app_name)
           return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
-          system "jruby -S gem install bundler --no-document" if OS.windows? # resolves freezing issue with warbler and bundler 2.2.29 included in JRuby
-          system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exist?
-          system "jruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
+#           system "ruby -S gem install bundler --no-document" if OS.windows? # resolves freezing issue with warbler and bundler 2.2.29 included in JRuby
+          system "ruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exist?
+          system "ruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
           return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? || `git config --get user.name`.strip.empty?
           cd gem_name
           rm_rf 'lib'
@@ -154,13 +148,13 @@ module Glimmer
           write '.ruby-gemset', app_name
           write 'VERSION', '1.0.0'
           write 'LICENSE.txt', "Copyright (c) #{Time.now.year} #{app_name}"
-          write 'Gemfile', gemfile(shell_type)
+          write 'Gemfile', gemfile(window_type)
           write 'Rakefile', gem_rakefile(app_name, nil, gem_name)
           mkdir 'app'
           write "app/#{file_name(app_name)}.rb", app_main_file(app_name)
           mkdir_p "app/#{file_name(app_name)}/model"
           mkdir_p "app/#{file_name(app_name)}/view"
-          custom_shell('AppView', current_dir_name, shell_type)
+          custom_window(class_name(app_name), current_dir_name, window_type, custom_window_class_name: 'Application')
             
           mkdir_p 'icons/windows'
           icon_file = "icons/windows/#{human_name(app_name)}.ico"
@@ -189,31 +183,29 @@ module Glimmer
             system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n rspec --init\n'"
           end
           write 'spec/spec_helper.rb', spec_helper_file
-          if OS.mac?
-            system "bash -c '#{RVM_FUNCTION}\n cd .\n JRUBY_OPTS=\"$JRUBY_OPTS -J-XstartOnFirstThread\" glimmer run\n'"
-          elsif OS.linux?
+          if OS.mac? || OS.linux?
             system "bash -c '#{RVM_FUNCTION}\n cd .\n glimmer run\n'"
           else
             system "glimmer run"
           end
         end
     
-        def custom_shell(custom_shell_name, namespace, shell_type = nil, shell_options = {})
+        def custom_window(custom_window_name, namespace, window_type = nil, window_options = {})
           namespace ||= current_dir_name
           root_dir = File.exist?('app') ? 'app' : 'lib'
           parent_dir = "#{root_dir}/#{file_name(namespace)}/view"
-          return puts("The file '#{parent_dir}/#{file_name(custom_shell_name)}.rb' already exists. Please either remove or pick a different name.") if File.exist?("#{parent_dir}/#{file_name(custom_shell_name)}.rb")
+          return puts("The file '#{parent_dir}/#{file_name(custom_window_name)}.rb' already exists. Please either remove or pick a different name.") if File.exist?("#{parent_dir}/#{file_name(custom_window_name)}.rb")
           mkdir_p parent_dir unless File.exist?(parent_dir)
-          write "#{parent_dir}/#{file_name(custom_shell_name)}.rb", custom_shell_file(custom_shell_name, namespace, shell_type, shell_options)
+          write "#{parent_dir}/#{file_name(custom_window_name)}.rb", custom_window_file(custom_window_name, namespace, window_type, window_options)
         end
     
-        def custom_widget(custom_widget_name, namespace)
+        def custom_control(custom_control_name, namespace)
           namespace ||= current_dir_name
           root_dir = File.exist?('app') ? 'app' : 'lib'
           parent_dir = "#{root_dir}/#{file_name(namespace)}/view"
-          return puts("The file '#{parent_dir}/#{file_name(custom_widget_name)}.rb' already exists. Please either remove or pick a different name.") if File.exist?("#{parent_dir}/#{file_name(custom_widget_name)}.rb")
+          return puts("The file '#{parent_dir}/#{file_name(custom_control_name)}.rb' already exists. Please either remove or pick a different name.") if File.exist?("#{parent_dir}/#{file_name(custom_control_name)}.rb")
           mkdir_p parent_dir unless File.exist?(parent_dir)
-          write "#{parent_dir}/#{file_name(custom_widget_name)}.rb", custom_widget_file(custom_widget_name, namespace)
+          write "#{parent_dir}/#{file_name(custom_control_name)}.rb", custom_control_file(custom_control_name, namespace)
         end
     
         def custom_shape(custom_shape_name, namespace)
@@ -225,13 +217,13 @@ module Glimmer
           write "#{parent_dir}/#{file_name(custom_shape_name)}.rb", custom_shape_file(custom_shape_name, namespace)
         end
     
-        def custom_shell_gem(custom_shell_name, namespace)
-          gem_name = "glimmer-cs-#{compact_name(custom_shell_name)}"
-          gem_summary = "#{human_name(custom_shell_name)} - Glimmer Custom Shell"
+        def custom_window_gem(custom_window_name, namespace)
+          gem_name = "glimmer-cs-#{compact_name(custom_window_name)}"
+          gem_summary = "#{human_name(custom_window_name)} - Glimmer Custom Window"
           begin
-            custom_shell_keyword = dsl_widget_name(custom_shell_name)
-            MAIN_OBJECT.method(custom_shell_keyword)
-            return puts("CustomShell keyword `#{custom_shell_keyword}` is unavailable (occupied by a built-in Ruby method)! Please pick a different name.")
+            custom_window_keyword = dsl_control_name(custom_window_name)
+            MAIN_OBJECT.method(custom_window_keyword)
+            return puts("CustomWindow keyword `#{custom_window_keyword}` is unavailable (occupied by a built-in Ruby method)! Please pick a different name.")
           rescue NameError
             # No Op (keyword is not taken by a built in Ruby method)
           end
@@ -239,13 +231,13 @@ module Glimmer
             gem_name += "-#{compact_name(namespace)}"
             gem_summary += " (#{human_name(namespace)})"
           else
-            return puts('Namespace is required! Usage: glimmer scaffold:gem:customshell[name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
+            return puts('Namespace is required! Usage: glimmer scaffold:gem:customwindow[name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
             namespace = 'glimmer'
           end
           return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
-          system "jruby -S gem install bundler --no-document" if OS.windows? # resolves freezing issue with warbler and bundler 2.2.29 included in JRuby
-          system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exist?
-          system "jruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
+#           system "ruby -S gem install bundler --no-document" if OS.windows? # resolves freezing issue with warbler and bundler 2.2.29 included in JRuby
+          system "ruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exist?
+          system "ruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
           return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? && `git config --get user.name`.strip.empty?
           cd gem_name
           write '.gitignore', GITIGNORE
@@ -253,15 +245,15 @@ module Glimmer
           write '.ruby-gemset', gem_name
           write 'VERSION', '1.0.0'
           write 'Gemfile', GEM_GEMFILE
-          write 'Rakefile', gem_rakefile(custom_shell_name, namespace, gem_name)
-          append "lib/#{gem_name}.rb", gem_main_file(custom_shell_name, namespace)
-          custom_shell(custom_shell_name, namespace, :gem)
+          write 'Rakefile', gem_rakefile(custom_window_name, namespace, gem_name)
+          append "lib/#{gem_name}.rb", gem_main_file(custom_window_name, namespace)
+          custom_window(custom_window_name, namespace, :gem)
           
           mkdir_p "lib/#{gem_name}"
-          write "lib/#{gem_name}/launch.rb", gem_launch_file(gem_name, custom_shell_name, namespace)
+          write "lib/#{gem_name}/launch.rb", gem_launch_file(gem_name, custom_window_name, namespace)
           mkdir_p 'bin'
-          write "bin/#{file_name(custom_shell_name)}", app_bin_command_file(gem_name, custom_shell_name, namespace)
-          FileUtils.chmod 0755, "bin/#{file_name(custom_shell_name)}"
+          write "bin/#{file_name(custom_window_name)}", app_bin_command_file(gem_name, custom_window_name, namespace)
+          FileUtils.chmod 0755, "bin/#{file_name(custom_window_name)}"
           if OS.windows?
             system "bundle"
             system "rspec --init"
@@ -285,9 +277,7 @@ module Glimmer
           cp File.expand_path('../../../../icons/scaffold_app.png', __FILE__), icon_file
           puts "Created #{current_dir_name}/#{icon_file}"
           
-          if OS.mac?
-            system "bash -c '#{RVM_FUNCTION}\n cd .\n JRUBY_OPTS=\"$JRUBY_OPTS -J-XstartOnFirstThread\" glimmer run\n'"
-          elsif OS.linux?
+          if OS.mac? || OS.linux?
             system "bash -c '#{RVM_FUNCTION}\n cd .\n glimmer run\n'"
           else
             system "glimmer run"
@@ -299,21 +289,21 @@ module Glimmer
           puts 'Run `rake release` to release into rubygems.org once ready.'
         end
     
-        def custom_widget_gem(custom_widget_name, namespace)
-          gem_name = "glimmer-cw-#{compact_name(custom_widget_name)}"
-          gem_summary = "#{human_name(custom_widget_name)} - Glimmer Custom Widget"
+        def custom_control_gem(custom_control_name, namespace)
+          gem_name = "glimmer-cw-#{compact_name(custom_control_name)}"
+          gem_summary = "#{human_name(custom_control_name)} - Glimmer Custom Control"
           if namespace
             gem_name += "-#{compact_name(namespace)}"
             gem_summary += " (#{human_name(namespace)})"
           else
-            return puts('Namespace is required! Usage: glimmer scaffold:custom_widget_gem[custom_widget_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
+            return puts('Namespace is required! Usage: glimmer scaffold:custom_control_gem[custom_control_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
             namespace = 'glimmer'
           end
           
           return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
-          system "jruby -S gem install bundler --no-document" if OS.windows? # resolves freezing issue with warbler and bundler 2.2.29 included in JRuby
-          system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exist?
-          system "jruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
+#           system "ruby -S gem install bundler --no-document" if OS.windows? # resolves freezing issue with warbler and bundler 2.2.29 included in JRuby
+          system "ruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exist?
+          system "ruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
           return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? && `git config --get user.name`.strip.empty?
           cd gem_name
           write '.gitignore', GITIGNORE
@@ -322,8 +312,8 @@ module Glimmer
           write 'VERSION', '1.0.0'
           write 'Gemfile', GEM_GEMFILE
           write 'Rakefile', gem_rakefile
-          append "lib/#{gem_name}.rb", gem_main_file(custom_widget_name, namespace)
-          custom_widget(custom_widget_name, namespace)
+          append "lib/#{gem_name}.rb", gem_main_file(custom_control_name, namespace)
+          custom_control(custom_control_name, namespace)
           if OS.windows?
             system "bundle"
             system "rspec --init"
@@ -350,9 +340,9 @@ module Glimmer
           end
           
           return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
-          system "jruby -S gem install bundler --no-document" if OS.windows? # resolves freezing issue with warbler and bundler 2.2.29 included in JRuby
-          system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exist?
-          system "jruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
+#           system "ruby -S gem install bundler --no-document" if OS.windows? # resolves freezing issue with warbler and bundler 2.2.29 included in JRuby
+          system "ruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exist?
+          system "ruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
           return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? && `git config --get user.name`.strip.empty?
           cd gem_name
           write '.gitignore', GITIGNORE
@@ -406,7 +396,7 @@ module Glimmer
         def file_name(app_name)
           app_name.underscore
         end
-        alias dsl_widget_name file_name
+        alias dsl_control_name file_name
     
         def human_name(app_name)
           app_name.underscore.titlecase
@@ -416,7 +406,7 @@ module Glimmer
           gem_name.underscore.camelcase.downcase
         end
         
-        def gemfile(shell_type)
+        def gemfile(window_type)
           APP_GEMFILE
         end
     
@@ -427,9 +417,9 @@ module Glimmer
             begin
               require 'bundler/setup'
               Bundler.require(:default)
-            rescue
+            rescue StandardError, Gem::LoadError
               # this runs when packaged as a gem (no bundler)
-              require 'glimmer-dsl-swt'
+              require 'glimmer-dsl-libui'
               # add more gems if needed
             end
             
@@ -439,25 +429,23 @@ module Glimmer
               APP_ROOT = File.expand_path('../..', __FILE__)
               VERSION = File.read(File.join(APP_ROOT, 'VERSION'))
               LICENSE = File.read(File.join(APP_ROOT, 'LICENSE.txt'))
-              Display.app_name = '#{human_name(app_name)}'
-              Display.app_version = VERSION
             end
     
-            require '#{file_name(app_name)}/view/app_view'
+            require '#{file_name(app_name)}/view/#{file_name(app_name)}'
           MULTI_LINE_STRING
         end
     
-        def gem_main_file(custom_widget_name, namespace = nil)
-          custom_widget_file_path = ''
-          custom_widget_file_path += "#{file_name(namespace)}/" if namespace
-          custom_widget_file_path += "view"
-          custom_widget_file_path += "/#{file_name(custom_widget_name)}"
+        def gem_main_file(custom_control_name, namespace = nil)
+          custom_control_file_path = ''
+          custom_control_file_path += "#{file_name(namespace)}/" if namespace
+          custom_control_file_path += "view"
+          custom_control_file_path += "/#{file_name(custom_control_name)}"
     
           <<~MULTI_LINE_STRING
             $LOAD_PATH.unshift(File.expand_path('..', __FILE__))
             
-            require 'glimmer-dsl-swt'
-            require '#{custom_widget_file_path}'
+            require 'glimmer-dsl-libui'
+            require '#{custom_control_file_path}'
           MULTI_LINE_STRING
         end
     
@@ -465,67 +453,52 @@ module Glimmer
           <<~MULTI_LINE_STRING
             require_relative '../#{file_name(app_name)}'
             
-            #{class_name(app_name)}::View::AppView.launch
+            #{class_name(app_name)}::View::#{class_name(app_name)}.launch
           MULTI_LINE_STRING
         end
         
-        def app_bin_command_file(app_name_or_gem_name, custom_shell_name=nil, namespace=nil)
-          if custom_shell_name.nil?
+        def app_bin_command_file(app_name_or_gem_name, custom_window_name=nil, namespace=nil)
+          if custom_window_name.nil?
             runner = "File.expand_path('../../app/#{file_name(app_name_or_gem_name)}/launch.rb', __FILE__)"
           else
             runner = "File.expand_path('../../lib/#{app_name_or_gem_name}/launch.rb', __FILE__)"
           end
           <<~MULTI_LINE_STRING
-            #!/usr/bin/env jruby
+            #!/usr/bin/env ruby
             
             runner = #{runner}
             
-            # Detect if inside a JAR file or not
-            if runner.include?('uri:classloader')
-              require runner
-            else
-              require 'glimmer/launcher'
-              
-              launcher = Glimmer::Launcher.new([runner] + ARGV)
-              launcher.launch
-            end
+            require 'glimmer/launcher'
+            
+            launcher = Glimmer::Launcher.new([runner] + ARGV)
+            launcher.launch
           MULTI_LINE_STRING
         end
         
-        def gem_launch_file(gem_name, custom_shell_name, namespace)
+        def gem_launch_file(gem_name, custom_window_name, namespace)
           # TODO change this so that it does not mix Glimmer unto the main object
           <<~MULTI_LINE_STRING
             require_relative '../#{gem_name}'
             
-            #{class_name(namespace)}::View::#{class_name(custom_shell_name)}.launch
+            #{class_name(namespace)}::View::#{class_name(custom_window_name)}.launch
           MULTI_LINE_STRING
         end
     
-        def gem_rakefile(custom_shell_name = nil, namespace = nil, gem_name = nil)
+        def gem_rakefile(custom_window_name = nil, namespace = nil, gem_name = nil)
           rakefile_content = File.read('Rakefile')
           lines = rakefile_content.split("\n")
           require_rake_line_index = lines.index(lines.detect {|l| l.include?("require 'rake'") })
           lines.insert(require_rake_line_index, "require 'glimmer/launcher'")
           gem_files_line_index = lines.index(lines.detect {|l| l.include?('# dependencies defined in Gemfile') })
-          if custom_shell_name
-            lines.insert(gem_files_line_index, "  gem.files = Dir['VERSION', 'LICENSE.txt', 'app/**/*', 'bin/**/*', 'config/**/*', 'db/**/*', 'docs/**/*', 'fonts/**/*', 'icons/**/*', 'images/**/*', 'lib/**/*', 'script/**/*', 'sounds/**/*', 'vendor/**/*', 'videos/**/*']")
-            # the second executable is needed for warbler as it matches the gem name, which is the default expected file (alternatively in the future, we could do away with it and configure warbler to use the other file)
-            lines.insert(gem_files_line_index+1, "  gem.require_paths = ['vendor', 'lib', 'app']")
-            lines.insert(gem_files_line_index+2, "  gem.executables = ['#{file_name(custom_shell_name)}']") if custom_shell_name
+          if custom_window_name
+            lines.insert(gem_files_line_index, "  gem.files = Dir['VERSION', 'LICENSE.txt', 'app/**/*', 'bin/**/*', 'config/**/*', 'db/**/*', 'docs/**/*', 'fonts/**/*', 'icons/**/*', 'images/**/*', 'lib/**/*', 'script/**/*', 'sounds/**/*', 'videos/**/*']")
+            lines.insert(gem_files_line_index+1, "  gem.require_paths = ['lib', 'app']")
+            lines.insert(gem_files_line_index+2, "  gem.executables = ['#{file_name(custom_window_name)}']") if custom_window_name
           else
             lines.insert(gem_files_line_index, "  gem.files = Dir['VERSION', 'LICENSE.txt', 'lib/**/*']")
           end
           lines << "\nrequire 'glimmer/rake_task'\n"
-          file_content = lines.join("\n")
-          if custom_shell_name
-            file_content << <<~MULTI_LINE_STRING
-              Glimmer::RakeTask::Package.jpackage_extra_args =
-                " --name '#{human_name(custom_shell_name)}'" +
-                " --description '#{human_name(custom_shell_name)}'"
-                # You can add more options from https://docs.oracle.com/en/java/javase/16/jpackage/packaging-tool-user-guide.pdf
-            MULTI_LINE_STRING
-          end
-          file_content
+          lines.join("\n")
         end
     
         def spec_helper_file
@@ -538,7 +511,7 @@ module Glimmer
           ]
           configure_block_line_index = lines.index(lines.detect {|l| l.include?('RSpec.configure do') }) + 1
           lines[configure_block_line_index...configure_block_line_index] = [
-            '  # The following ensures rspec tests that instantiate and set Glimmer DSL widgets in @target get cleaned after',
+            '  # The following ensures rspec tests that instantiate and set Glimmer DSL controls in @target get cleaned after',
             '  config.after do',
             '    @target.dispose if @target && @target.respond_to?(:dispose)',
             '    Glimmer::DSL::Engine.reset',
@@ -549,197 +522,184 @@ module Glimmer
           lines.join("\n")
         end
     
-        def custom_shell_file(custom_shell_name, namespace, shell_type, shell_options = {})
+        def custom_window_file(custom_window_name, namespace, window_type, window_options = {})
+          window_options ||= {}
+          window_options[:custom_window_class_name] ||= 'CustomWindow'
           namespace_type = class_name(namespace) == class_name(current_dir_name) ? 'class' : 'module'
     
-          custom_shell_file_content = <<-MULTI_LINE_STRING
+          custom_window_file_content = <<-MULTI_LINE_STRING
 #{namespace_type} #{class_name(namespace)}
   module View
-    class #{class_name(custom_shell_name)}
-      include Glimmer::UI::CustomShell
+    class #{class_name(custom_window_name)}
+      include Glimmer::LibUI::#{window_options[:custom_window_class_name]}
     
           MULTI_LINE_STRING
           
-          if shell_type == :gem
-            custom_shell_file_content += <<-MULTI_LINE_STRING
+          if window_type == :gem
+            custom_window_file_content += <<-MULTI_LINE_STRING
       APP_ROOT = File.expand_path('../../../..', __FILE__)
       VERSION = File.read(File.join(APP_ROOT, 'VERSION'))
       LICENSE = File.read(File.join(APP_ROOT, 'LICENSE.txt'))
-      Display.app_name = '#{human_name(custom_shell_name)}'
-      Display.app_version = VERSION
+            MULTI_LINE_STRING
+          end
           
+          if %i[gem app].include?(window_type)
+            custom_window_file_content += <<-MULTI_LINE_STRING
+      GREETINGS = [
+        'Hello, World!',
+        'Howdy, Partner!'
+      ]
             MULTI_LINE_STRING
           end
           
-          custom_shell_file_content += <<-MULTI_LINE_STRING
-      ## Add options like the following to configure CustomShell by outside consumers
+          custom_window_file_content += <<-MULTI_LINE_STRING
+          
+      ## Add options like the following to configure CustomWindow by outside consumers
       #
       # options :title, :background_color
       # option :width, default: 320
       # option :height, default: 240
-      option :greeting, default: 'Hello, World!'
+          MULTI_LINE_STRING
+      
+          if %i[gem app].include?(window_type)
+            custom_window_file_content += <<-MULTI_LINE_STRING
+      
+      # GREETING Array selected index
+      option :greeting_index, default: 0
+            MULTI_LINE_STRING
+          end
+      
+          custom_window_file_content += <<-MULTI_LINE_STRING
   
-      ## Use before_body block to pre-initialize variables to use in body
-      #
+      ## Use before_body block to pre-initialize variables to use in body and
+      #  to setup application menu
       #
           MULTI_LINE_STRING
           
-          if %i[gem app].include?(shell_type)
-            custom_shell_file_content += <<-MULTI_LINE_STRING
+          if %i[gem app].include?(window_type)
+            custom_window_file_content += <<-MULTI_LINE_STRING
       before_body do
-        @display = display {
-          on_about do
-            display_about_dialog
-          end
+        menu('File') {
+          menu_item('Preferences...') {
+            on_clicked do
+              display_preferences_dialog
+            end
+          }
           
-          on_preferences do
-            display_preferences_dialog
+          # Enables quitting with CMD+Q on Mac with Mac Quit menu item
+          quit_menu_item if OS.mac?
+        }
+        menu('Help') {
+          if OS.mac?
+            about_menu_item {
+              on_clicked do
+                display_about_dialog
+              end
+            }
           end
+          
+          menu_item('About') {
+            on_clicked do
+              display_about_dialog
+            end
+          }
         }
       end
             MULTI_LINE_STRING
           else
-            custom_shell_file_content += <<-MULTI_LINE_STRING
+            custom_window_file_content += <<-MULTI_LINE_STRING
       # before_body do
       #
       # end
             MULTI_LINE_STRING
           end
     
-          custom_shell_file_content += <<-MULTI_LINE_STRING
+          custom_window_file_content += <<-MULTI_LINE_STRING
   
-      ## Use after_body block to setup observers for widgets in body
+      ## Use after_body block to setup observers for controls in body
       #
       # after_body do
       #
       # end
   
-      ## Add widget content inside custom shell body
-      ## Top-most widget must be a shell or another custom shell
+      ## Add control content inside custom window body
+      ## Top-most control must be a window or another custom window
       #
       body {
-        shell {
-          # Replace example content below with custom shell content
-          minimum_size '420, 240'
-          image File.join(APP_ROOT, 'icons', 'windows', "#{human_name(current_dir_name)}.ico") if OS.windows?
-          image File.join(APP_ROOT, 'icons', 'linux', "#{human_name(current_dir_name)}.png") unless OS.windows?
-          text "#{human_name(namespace)}#{' - ' + human_name(custom_shell_name)}"
-          grid_layout
-          label(:center) {
-            text <= [self, :greeting]
-            font height: 40
-            layout_data :fill, :center, true, true
-          }
-          MULTI_LINE_STRING
+        window {
+          # Replace example content below with custom window content
+          content_size 240, 240
+          title '#{human_name(namespace)}'
           
-          if %i[gem app].include?(shell_type)
-            custom_shell_file_content += <<-MULTI_LINE_STRING
+          margined true
           
-          menu_bar {
-            menu {
-              text '&File'
-              
-              menu_item {
-                text '&Preferences...'
-                
-                on_widget_selected do
-                  display_preferences_dialog
-                end
-              }
-            }
-            menu {
-              text '&Help'
-              
-              menu_item {
-                text '&About...'
-                
-                on_widget_selected do
-                  display_about_dialog
-                end
-              }
-            }
+          label {
+            text <= [self, :greeting_index, on_read: -> { greeting }]
           }
-            MULTI_LINE_STRING
-          end
-
-            custom_shell_file_content += <<-MULTI_LINE_STRING
         }
       }
             MULTI_LINE_STRING
           
-          if %i[gem app].include?(shell_type)
-            custom_shell_file_content += <<-MULTI_LINE_STRING
+          if %i[gem app].include?(window_type)
+            custom_window_file_content += <<-MULTI_LINE_STRING
+  
+      def greeting
+        GREETINGS[greeting_index]
+      end
   
       def display_about_dialog
-        message_box(body_root) {
-          text 'About'
-          message "#{human_name(namespace)}#{" - #{human_name(custom_shell_name)}" if shell_type == :gem} \#{VERSION}\\n\\n\#{LICENSE}"
-        }.open
+        message = "#{human_name(namespace)}#{" - #{human_name(custom_window_name)}" if window_type == :gem} \#{VERSION}\\n\\n\#{LICENSE}"
+        msg_box('About', message)
       end
       
             MULTI_LINE_STRING
           end
           
-          if %i[gem app].include?(shell_type)
-            custom_shell_file_content += <<-MULTI_LINE_STRING
+          if %i[gem app].include?(window_type)
+            custom_window_file_content += <<-MULTI_LINE_STRING
       def display_preferences_dialog
-        dialog(swt_widget) {
-          grid_layout {
-            margin_height 5
-            margin_width 5
-          }
+        window {
+          title 'Preferences'
+          content_size 200, 100
           
-          text 'Preferences'
+          margined true
           
-          group {
-            row_layout {
-              type :vertical
-              spacing 10
-            }
+          vertical_box {
+            padded true
             
-            text 'Greeting'
-            font style: :bold
+            label('Greeting:') {
+              stretchy false
+            }
             
-            [
-              'Hello, World!',
-              'Howdy, Partner!'
-            ].each do |greeting_text|
-              button(:radio) {
-                layout_data {
-                  width 160
-                }
-                
-                text greeting_text
-                selection <= [self, :greeting, on_read: ->(g) { g == greeting_text }]
-                
-                on_widget_selected do |event|
-                  self.greeting = event.widget.getText
-                end
-              }
-            end
+            radio_buttons {
+              stretchy false
+              
+              items GREETINGS
+              selected <=> [self, :greeting_index]
+            }
           }
-        }.open
+        }.show
       end
             MULTI_LINE_STRING
           end
           
-          custom_shell_file_content += <<-MULTI_LINE_STRING
+          custom_window_file_content += <<-MULTI_LINE_STRING
     end
   end
 end
           MULTI_LINE_STRING
         end
     
-        def custom_widget_file(custom_widget_name, namespace)
+        def custom_control_file(custom_control_name, namespace)
           namespace_type = class_name(namespace) == class_name(current_dir_name) ? 'class' : 'module'
     
           <<-MULTI_LINE_STRING
 #{namespace_type} #{class_name(namespace)}
   module View
-    class #{class_name(custom_widget_name)}
-      include Glimmer::UI::CustomWidget
+    class #{class_name(custom_control_name)}
+      include Glimmer::LibUI::CustomControl
   
-      ## Add options like the following to configure CustomWidget by outside consumers
+      ## Add options like the following to configure CustomControl by outside consumers
       #
       # options :custom_text, :background_color
       # option :foreground_color, default: :red
@@ -751,21 +711,21 @@ end
       #
       # end
   
-      ## Use after_body block to setup observers for widgets in body
+      ## Use after_body block to setup observers for controls in body
       #
       # after_body do
       #
       # end
   
-      ## Add widget content under custom widget body
+      ## Add control content under custom control body
       ##
-      ## If you want to add a shell as the top-most widget,
-      ## consider creating a custom shell instead
-      ## (Glimmer::UI::CustomShell offers shell convenience methods, like show and hide)
+      ## If you want to add a window as the top-most control,
+      ## consider creating a custom window instead
+      ## (Glimmer::LibUI::CustomWindow offers window convenience methods, like show and hide)
       #
       body {
-        # Replace example content below with custom widget content
-        label(*swt_constants) {
+        # Replace example content below with custom control content
+        label {
           background :red
         }
       }
@@ -783,7 +743,7 @@ end
 #{namespace_type} #{class_name(namespace)}
   module View
     class #{class_name(custom_shape_name)}
-      include Glimmer::UI::CustomShape
+      include Glimmer::LibUI::CustomShape
   
       ## Add options like the following to configure CustomShape by outside consumers
       #