glimmer-cs-gladiator 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8a4a941695d12f14347c9892758f974e5909455a73020eee8d635c4c38e86a3
-  data.tar.gz: 929ff0b362ca29394e80f918b65fbdb911892449d9876a4eca14a7ec4c01b8df
+  metadata.gz: 1d7db15419bc0913d01e3e15634e12833a1f36a7fc3160e2a7835ab6560832af
+  data.tar.gz: 6e55a2c18985603a0b6438198fad5959bcea27b65a8e43b8a810fd42ec5fda76
 SHA512:
-  metadata.gz: 993c7ae4684351d97b8b583cf5f59aef4a6d2aec5a68d8c121b6a95bc4e2ee035d6d21f677c8cd79febd5b4379e81808f4b0b977a1aadb388ddba4ab74694b4b
-  data.tar.gz: 32d823df2493950f822fdcfceb28fc5d2b6998152ab233dd0e8668f013d0bd5301dd6ec220d4719bd88683f53bbbd33ddbdceac03bb8d1f02fa77bee2cc432b6
+  metadata.gz: bae9a2b2eb76cf9ca64ec0d76216fa8aa7c12e97805dbfee42dace54deceedba6eeb1579b65cbdb7c1ad595a44e5768ac372619db804f5fbc240ee52afbecb4d
+  data.tar.gz: 56186b8a8d31dc8974ff4f35afd4f7a37d4932cea6b1c4517832ae760ec1f6c5d0092c6048a5f333bf1e438bd514ccd2db3a6ca0ac45d35a519d35194861c251

data/README.md

@@ -1,4 +1,4 @@
-# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.2.3 - [Ugliest Text Editor Ever](https://www.reddit.com/r/ruby/comments/hgve8k/gladiator_glimmer_editor_ugliest_text_editor_ever/)
+# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.2.4 - [Ugliest Text Editor Ever](https://www.reddit.com/r/ruby/comments/hgve8k/gladiator_glimmer_editor_ugliest_text_editor_ever/)
 ## [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 /> Glimmer Custom Shell](https://github.com/AndyObtiva/glimmer#custom-shell-gem)
 [![Gem Version](https://badge.fury.io/rb/glimmer-cs-gladiator.svg)](http://badge.fury.io/rb/glimmer-cs-gladiator)
 
@@ -7,7 +7,7 @@
 Gladiator (short for Glimmer Editor) is a [Glimmer](https://github.com/AndyObtiva/glimmer) sample project under on-going development that demonstrates how to build a text editor in [Glimmer](https://github.com/AndyObtiva/glimmer) (Ruby Desktop Development GUI Library).
 It is not intended to be a full-fledged editor by any means, yet mostly a fun educational exercise in using [Glimmer](https://github.com/AndyObtiva/glimmer).
 Gladiator is also a personal tool for shaping an editor exactly the way I like, with all the keyboard shortcuts I prefer. 
-I leave building truly professional text editors to software tooling experts who would hopefully use [Glimmer](https://github.com/AndyObtiva/glimmer) one day. Otherwise, I have been happily using Gladiator to develop all my [open-source projects](https://github.com/AndyObtiva) since May 2020.
+I leave building truly professional text editors to software tooling experts who would hopefully use [Glimmer](https://github.com/AndyObtiva/glimmer) one day. Otherwise, I have been happily using Gladiator to develop all my [open-source projects](https://github.com/AndyObtiva) since May of 2020.
 
 ## Features
 
@@ -33,9 +33,9 @@ Gladiator currently supports the following text editing features (including keyb
 
 ## Platforms
 
-- Mac: Gladiator works best on the Mac.
-- Windows: Gladiator works well on Windows.
-- Linux: Gladiator works with handicaps on Linux (performing text editing operations causes scroll jitter)
+- Mac: Gladiator works best on the Mac. This is the platform it is most used on and receives the most maintenance for.
+- Windows: Gladiator works OK on Windows, but has some annoying bugs.
+- Linux: Gladiator works with very bad handicaps on Linux (performing text editing operations causes scroll jitter)
 
 ## Pre-requisites
 
@@ -73,6 +73,12 @@ You may run the `gladiator` command to bring up the text editor in the project d
 gladiator
 ```
 
+On Windows, you may need to run with extra memory via this command instead:
+
+```
+gladiator -J-Xmx3000M
+```
+
 If you are in a different directory from the project you would like to edit, then pass its path as an argument:
 
 ```
@@ -93,7 +99,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '~> 0.2.3'
+gem 'glimmer-cs-gladiator', '~> 0.2.4'
 ```
 
 Run:

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/models/glimmer/gladiator/dir.rb

@@ -26,18 +26,26 @@ module Glimmer
         end        
       end
   
-      attr_accessor :selected_child, :filter, :children, :filtered_path_options, :filtered_path, :path, :display_path
-      attr_reader :name, :parent
+      attr_accessor :selected_child, :filter, :children, :filtered_path_options, :filtered_path, :display_path
+      attr_reader :name, :parent, :path, :is_local_dir
       attr_writer :all_children
   
       def initialize(path, is_local_dir = false)
-        @display_path = path
-        @path = ::File.expand_path(@display_path)
+        @is_local_dir = is_local_dir
+        self.path = ::File.expand_path(path)
         @name = ::File.basename(::File.expand_path(path))
-        @display_path = @path.sub(Dir.local_dir.path, '').sub(/^\//, '') unless is_local_dir
         self.filtered_path_options = []
       end
 
+      def path=(the_path)
+        @path = the_path
+        generate_display_path
+      end
+      
+      def generate_display_path
+        is_local_dir ? path : @display_path = @path.sub(Dir.local_dir.path, '').sub(/^\//, '')
+      end
+      
       def name=(the_name)
         self.display_path = display_path.sub(/#{Regexp.escape(@name)}$/, the_name)
         @name = the_name

data/lib/models/glimmer/gladiator/file.rb

@@ -5,16 +5,14 @@ module Glimmer
     class File
       include Glimmer
   
-      attr_accessor :dirty_content, :line_numbers_content, :selection, :selection_count, :line_number, :find_text, :replace_text, :top_index, :path, :display_path, :case_sensitive
-      attr_reader :name
+      attr_accessor :dirty_content, :line_numbers_content, :selection, :selection_count, :line_number, :find_text, :replace_text, :top_index, :display_path, :case_sensitive
+      attr_reader :name, :path
   
       def initialize(path)
         raise "Not a file path: #{path}" unless ::File.file?(path)
         @command_history = []
-        @display_path = path
         @name = ::File.basename(path)
-        @path = ::File.expand_path(path)
-        @display_path = @path.sub(Dir.local_dir.path, '').sub(/^\//, '')
+        self.path = ::File.expand_path(path)
         @top_index = 0
         @selection_count = 0
         @selection = Point.new(0, 0 + @selection_count)
@@ -43,6 +41,15 @@ module Glimmer
         end
       end
       
+      def path=(the_path)
+        @path = the_path
+        generate_display_path
+      end
+      
+      def generate_display_path
+        @display_path = @path.sub(Dir.local_dir.path, '').sub(/^\//, '')      
+      end
+      
       # to use for widget data-binding
       def content=(value)
         Command.do(self) # record a native (OS-widget) operation
@@ -67,11 +74,12 @@ module Glimmer
       end
       
       def name=(the_name)
-        self.display_path = display_path.sub(/#{Regexp.escape(@name)}$/, the_name)
+        new_path = path.sub(/#{Regexp.escape(@name)}$/, the_name)
         @name = the_name
-        new_path = ::File.expand_path(display_path)
-        FileUtils.mv(path, new_path)
-        self.path = new_path
+        if ::File.exists?(path)
+          FileUtils.mv(path, new_path)
+          self.path = new_path
+        end
       end
       
       def dirty_content=(the_content)

data/lib/views/glimmer/gladiator.rb

@@ -516,9 +516,16 @@ module Glimmer
         config_yaml = ::File.read(@config_file_path)
         return if config_yaml.to_s.strip.empty?
         @config = YAML.load(config_yaml)
-        @config[:open_file_paths].to_a.each do |file_path|
+        open_file_paths1 = @config[:open_file_paths1] || @config[:open_file_paths]
+        open_file_paths2 = @config[:open_file_paths2]
+        open_file_paths1.to_a.each do |file_path|
           Dir.local_dir.selected_child_path = file_path
         end
+        Gladiator.drag = true
+        open_file_paths2.to_a.each do |file_path|
+          Dir.local_dir.selected_child_path = file_path
+        end
+        Gladiator.drag = false
         Dir.local_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path]
         Dir.local_dir.selected_child&.caret_position  = Dir.local_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
         Dir.local_dir.selected_child&.top_index = @config[:top_index].to_i if @config[:top_index]
@@ -536,6 +543,10 @@ module Glimmer
       return unless @loaded_config
       child = Dir.local_dir.selected_child
       return if child.nil?
+      tab_folder1 = @tab_folder1 || @tab_folder
+      tab_folder2 = @tab_folder2
+      open_file_paths1 = tab_folder1&.swt_widget&.items&.to_a.map {|i| i.get_data('file_path')}
+      open_file_paths2 = tab_folder2&.swt_widget&.items&.to_a.map {|i| i.get_data('file_path')}
       @config = {
         selected_child_path: child.path,
         caret_position: child.caret_position,
@@ -544,7 +555,8 @@ module Glimmer
         shell_height: swt_widget&.getBounds&.height,
         shell_x: swt_widget&.getBounds&.x,
         shell_y: swt_widget&.getBounds&.y,
-        open_file_paths: Dir.local_dir.selected_child_path_history,
+        open_file_paths1: open_file_paths1,
+        open_file_paths2: open_file_paths2,
       }
       config_yaml = YAML.dump(@config)
       ::File.write(@config_file_path, config_yaml) unless config_yaml.to_s.empty?
@@ -644,6 +656,7 @@ module Glimmer
       end
       new_file_path = ::File.expand_path(::File.join(directory_path, 'new_file'))
       FileUtils.touch(new_file_path)
+      # TODO look into refreshing only the parent directory to avoid slowdown
       Dir.local_dir.refresh(async: false, force: true)
       new_tree_item = @tree.depth_first_search {|ti| ti.getData.path == new_file_path}.first
       @tree.swt_widget.showItem(new_tree_item)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement