glimmer-cs-gladiator 0.8.1 → 0.8.2

data/lib/views/glimmer/gladiator.rb

@@ -31,6 +31,7 @@ require 'views/glimmer/gladiator/file_lookup_list'
 require 'views/glimmer/gladiator/file_explorer_tree'
 require 'views/glimmer/gladiator/gladiator_menu_bar'
 require 'views/glimmer/gladiator/progress_shell'
+require 'views/glimmer/gladiator/file_edit_menu'
 
 Clipboard.implementation = Clipboard::Java
 Clipboard.copy(Clipboard.paste) # pre-initialize library to avoid slowdown during use
@@ -61,6 +62,11 @@ module Glimmer
     # option :height, 240
     option :project_dir_path
     
+    attr_reader :find_text, :filter_text, :line_number_text, :split_orientation, :tab_folder_sash_form, :side_bar_sash_form, :file_area_and_editor_area_sash_form, :file_explorer_expand_item, :file_explorer_expand_item, :file_lookup_expand_item, :file_explorer_expand_item, :file_lookup_expand_item_height, :file_explorer_expand_item_height
+    attr_accessor :current_tab_item, :current_tab_folder, :current_text_editor, :tab_folder1, :tab_folder2, :maximized_pane, :maximized_editor
+    alias maximized_pane? maximized_pane
+    alias maximized_editor? maximized_editor
+
     def project_dir
       @project_dir ||= Dir.new(project_dir_path)
     end
@@ -83,10 +89,9 @@ module Glimmer
       pane_count && pane_count > 1
     end
     
-    attr_reader :find_text, :filter_text, :line_number_text, :split_orientation, :tab_folder_sash_form, :side_bar_sash_form, :file_area_and_editor_area_sash_form, :file_explorer_expand_item, :file_explorer_expand_item, :file_lookup_expand_item, :file_explorer_expand_item, :file_lookup_expand_item_height, :file_explorer_expand_item_height
-    attr_accessor :current_tab_item, :current_tab_folder, :current_text_editor, :tab_folder1, :tab_folder2, :maximized_pane, :maximized_editor
-    alias maximized_pane? maximized_pane
-    alias maximized_editor? maximized_editor
+    def app_mode?
+      project_dir_path == '.' && ENV['APP_MODE'].to_s == 'true' || !::Dir.glob(::File.join(project_dir_path, 'glimmer-cs-gladiator.jar')).empty?
+    end
 
     ## Uncomment before_body block to pre-initialize variables to use in body
     #
@@ -107,25 +112,26 @@ module Glimmer
             display_about_dialog
           }
           on_quit {
-            project_dir.selected_child&.write_dirty_content
-            display.swt_display.shells.each(&:close)
+            display.swt_display.shells.each { |shell|
+              gladiator = shell.get_data('custom_shell')
+              gladiator.project_dir.selected_child&.write_dirty_content
+              shell.close
+            }
           }
           on_swt_keydown { |key_event|
             focused_gladiator = display.focus_control.shell&.get_data('custom_shell')
             focused_gladiator.handle_display_shortcut(key_event) if !focused_gladiator.nil? && key_event.widget.shell == focused_gladiator&.swt_widget
           }
-          on_swt_Close {
-            project_dir.selected_child&.write_dirty_content
-          }
         }
       end
 
       @default_foreground = :dark_blue
       @split_orientation = swt(:horizontal)
-      @config_file_path = ::File.join(project_dir.path, '.gladiator')
-      @config = {}
-      load_config_ignore_paths
-#       project_dir.all_children # pre-caches children
+      unless app_mode?
+        @config_file_path = ::File.join(project_dir.path, '.gladiator')
+        @config = {}
+        load_config_ignore_paths
+      end
     }
 
     ## Uncomment after_body block to setup observers for widgets in body
@@ -204,7 +210,7 @@ module Glimmer
               @current_tab_folder.swt_widget.setSelection(@current_tab_item.swt_tab_item)
               body_root.pack_same_size
             rescue => e
-              puts e.full_message
+              Glimmer::Config.logger.error {e.full_message}
             end
           end
           @current_text_editor&.text_widget&.setFocus
@@ -235,19 +241,26 @@ module Glimmer
       observe(project_dir, 'selected_child.top_pixel') do
         save_config
       end
-      load_config
+      load_config unless app_mode?
     }
 
     ## Add widget content inside custom shell body
     ## Top-most widget must be a shell or another custom shell
     #
     body {
-      if !::Dir.glob(::File.join(project_dir_path, 'glimmer-cs-gladiator.jar')).empty?
-        shell(:no_trim, :no_background) {
+      if app_mode?
+        shell {
+          text 'Gladiator'
+          minimum_size 250, 250
+          image ICON
           gladiator_menu_bar(gladiator: self, editing: false)
           
-          on_swt_show {
-            open_project
+          button {
+            text 'Open Project...'
+            
+            on_widget_selected {
+              open_project
+            }
           }
         }
       else
@@ -694,8 +707,6 @@ module Glimmer
         @config = YAML.load(config_yaml)
         project_dir.ignore_paths = @config[:ignore_paths] if @config[:ignore_paths]
         project_dir.ignore_paths ||= ['packages', 'tmp']
-      else
-        @loaded_config = true
       end
     end
 
@@ -797,7 +808,7 @@ module Glimmer
       config_yaml = YAML.dump(@config)
       ::File.write(@config_file_path, config_yaml) unless config_yaml.to_s.empty?
     rescue => e
-      puts e.full_message
+      Glimmer::Config.logger.error {e.full_message}
     end
     
     def navigate_to_next_tab_folder
@@ -907,6 +918,7 @@ module Glimmer
       async_exec {
         gladiator(project_dir_path: selected_directory) {
           on_swt_show {
+            body_root.close if app_mode?
             @progress_shell.close
             @progress_shell = nil
           }

data/lib/views/glimmer/gladiator/file_edit_menu.rb

@@ -0,0 +1,67 @@
+module Glimmer
+  class Gladiator
+    class FileEditMenu
+      include Glimmer::UI::CustomWidget
+  
+      # Either receives a gladiator instance for menu bar parent or file instance for text editor parent
+      options :gladiator, :file
+  
+      body {
+        menu { |menu_proxy|
+          text '&Edit' unless menu_proxy.swt_menu_item.nil? # unless used on the text editor directly
+
+          menu_item {
+            text '&Undo'
+            # TODO disable if not undoable
+            
+            on_widget_selected {
+              Command.undo(current_file)
+            }
+          }
+          menu_item {
+            text '&Redo'
+            # TODO disable if not redoable
+            
+            on_widget_selected {
+              Command.redo(current_file)
+            }
+          }
+          menu_item(:separator)
+          menu_item {
+            text 'Cu&t'
+            
+            on_widget_selected {
+              Command.do(current_file, :cut!)
+            }
+          }
+          menu_item {
+            text '&Copy'
+            
+            on_widget_selected {
+              current_file.copy
+            }
+          }
+          menu_item {
+            text '&Paste'
+            
+            on_widget_selected {
+              Command.do(current_file, :paste!)
+            }
+          }
+          menu_item(:separator)
+          menu_item {
+            text 'Select &All'
+            
+            on_widget_selected {
+              current_file.select_all
+            }
+          }
+        }
+      }
+  
+      def current_file
+        file.nil? ? gladiator.project_dir.selected_child : file
+      end
+    end
+  end
+end

data/lib/views/glimmer/gladiator/gladiator_menu_bar.rb

@@ -58,6 +58,7 @@ module Glimmer
             }
           }
           if editing
+            file_edit_menu(gladiator: gladiator)
             menu {
               text '&View'
               menu {
@@ -154,12 +155,8 @@ module Glimmer
                   begin
                     project_dir.selected_child.run
                   rescue Exception => e
-                    dialog {
-                      text 'Run - Ruby - Error Encountered!'
-                      label {
-                        text e.full_message
-                      }
-                    }.open
+                    Glimmer::Config.logger.error {e.full_message}
+                    error_dialog(message: e.full_message).open
                   end
                 }
               }
@@ -182,6 +179,36 @@ module Glimmer
         gladiator.project_dir
       end
       
+      # Method-based error_dialog custom widget
+      def error_dialog(message:)
+        return if message.nil?
+        dialog(gladiator) { |dialog_proxy|
+          row_layout(:vertical) {
+            center true
+          }
+          
+          text 'Error Launching'
+            
+          styled_text(:border, :h_scroll, :v_scroll) {
+            layout_data {
+              width body_root.bounds.width*0.75
+              height body_root.bounds.height*0.75
+            }
+            
+            text message
+            editable false
+            caret nil
+          }
+          
+          button {
+            text 'Close'
+            
+            on_widget_selected {
+              dialog_proxy.close
+            }
+          }
+        }
+      end
     end
     
   end

data/lib/views/glimmer/gladiator/progress_shell.rb

@@ -1,31 +1,29 @@
-module Glimmer
-  class Gladiator
-    class ProgressShell
-      include Glimmer::UI::CustomShell
-  
-      option :gladiator
-      option :progress_text, default: 'Work In Progress'
-  
-      body {
-        shell(gladiator.body_root, :title) {
-          fill_layout(:vertical) {
-            margin_width 15
-            margin_height 15
-            spacing 5
-          }
-          
-          text 'Gladiator'
-          
-          gladiator_menu_bar(gladiator: gladiator, editing: true)
-          
-          label(:center) {
-            text progress_text
-            font height: 20
-          }
-#           @progress_bar = progress_bar(:horizontal, :indeterminate)
-        }
-      }
-  
-    end
-  end
-end
+module Glimmer
+  class Gladiator
+    class ProgressShell
+      include Glimmer::UI::CustomShell
+  
+      option :gladiator
+      option :progress_text, default: 'Work In Progress'
+  
+      body {
+        shell(gladiator.body_root, :title) {
+          fill_layout(:vertical) {
+            margin_width 15
+            margin_height 15
+            spacing 5
+          }
+          
+          text 'Gladiator'
+          
+          label(:center) {
+            text progress_text
+            font height: 20
+          }
+#           @progress_bar = progress_bar(:horizontal, :indeterminate)
+        }
+      }
+  
+    end
+  end
+end

data/lib/views/glimmer/gladiator/text_editor.rb

@@ -71,6 +71,9 @@ module Glimmer
             right_margin 5
             bottom_margin 5
             left_margin 5
+            
+            file_edit_menu(file: file)
+
             drop_target(DND::DROP_COPY) {
               transfer [TextTransfer.getInstance].to_java(Transfer)
               on_drag_enter { |event|
@@ -139,6 +142,12 @@ module Glimmer
             elsif (OS.mac? && key_event.keyCode == swt(:home)) || (!OS.mac? && Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :ctrl) && key_event.keyCode == swt(:end))
               file.end
               key_event.doit = false
+            elsif !OS.mac? && Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :shift) && key_event.keyCode == swt(:home)
+              file.select_to_start_of_line
+              key_event.doit = false
+            elsif !OS.mac? && Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :shift) && key_event.keyCode == swt(:end)
+              file.select_to_end_of_line
+              key_event.doit = false
             elsif (OS.mac? && key_event.stateMask == swt(:ctrl) && extract_char(key_event) == 'a') || (!OS.mac? && key_event.keyCode == swt(:home))
               file.start_of_line
               key_event.doit = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-07 00:00:00.000000000 Z
+date: 2021-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,7 @@ files:
 - lib/models/glimmer/gladiator/dir.rb
 - lib/models/glimmer/gladiator/file.rb
 - lib/views/glimmer/gladiator.rb
+- lib/views/glimmer/gladiator/file_edit_menu.rb
 - lib/views/glimmer/gladiator/file_explorer_tree.rb
 - lib/views/glimmer/gladiator/file_lookup_list.rb
 - lib/views/glimmer/gladiator/gladiator_menu_bar.rb