glimmer-cs-gladiator 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b1fe5cc493fe6df44d316fe7e4fc9e19eb6e0f463724e5bbf1254fb35379463
-  data.tar.gz: eb399a865ec9e5ab6f4f269cf8c318f8931eda1e014ea557516cc30a979bb249
+  metadata.gz: 5de57f9122b239134e9567e99976ed7c5e859edf89a91f72f15f257597ee0815
+  data.tar.gz: 99414159618bea5a0a99fd37772424b452f26471ca6e5dd791ff0ce26135646c
 SHA512:
-  metadata.gz: 2c20d228ba4421dc54f55206a9c75418c0fe6f1369f27984864c3b22620b42880670d9da3416d5db65e0d3a8028521bddd4f07747fd6cf9fb3a61aec23f617e1
-  data.tar.gz: 30bec26afe87951052c68b1bf2d6a1e4475d715d9de37664bdb3ecc36584ae363bb941152da4f268db8a119360c165e202ba36b998c6c6feb3df9bbf487ddcac
+  metadata.gz: 6e7d7c9cca67e351dbf169d785c6ef927bcd911f03a5b4505fdd2973c9b9291b1a72f8475dceeae592bb3d56de85a65f96b9f1cb96575dc91768d13b46f52749
+  data.tar.gz: 35c3dc09a4f5d0e29d8e52dd0cbae1ffc879f6d7cd3d5ec0cc2cbabde3475f3898a959c34d7adf60789c9a8c8fa6e2e5ebcfefe9e5e1db8ba0e7281b268ef572

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.5.1 - [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.5.2 - [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-dsl-swt#custom-shell-gem)
 [![Gem Version](https://badge.fury.io/rb/glimmer-cs-gladiator.svg)](http://badge.fury.io/rb/glimmer-cs-gladiator)
 
@@ -103,7 +103,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '~> 0.5.1'
+gem 'glimmer-cs-gladiator', '~> 0.5.2'
 ```
 
 Run:

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/glimmer-cs-gladiator.rb

@@ -23,7 +23,7 @@ module Glimmer
         args = SWTProxy.constantify_args(args)
         @swt_layout = self.class.swt_layout_class_for(underscored_layout_name).new(*args)
         @widget_proxy.swt_widget.setLayout(@swt_layout)
-      end    
+      end
     end
   end
 end

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

@@ -1,6 +1,6 @@
 module Glimmer
   class Gladiator
-    class Command    
+    class Command
       class << self
         include Glimmer
         
@@ -10,10 +10,10 @@ module Glimmer
         
         def command_history_for(file)
           # keeping a first command to make redo support work by remembering next command after undoing all
-          command_history[file] ||= [Command.new(file)] 
+          command_history[file] ||= [Command.new(file)]
         end
         
-        def do(file, method = nil, command: nil)        
+        def do(file, method = nil, command: nil)
           command ||= Command.new(file, method)
           command_history_for(file)&.last&.next_command = command
           command.do
@@ -21,7 +21,7 @@ module Glimmer
         end
         
         def undo(file)
-          return if command_history_for(file).size <= 1        
+          return if command_history_for(file).size <= 1
           command = command_history_for(file).pop
           command&.undo
         end

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

@@ -48,6 +48,14 @@ module Glimmer
         is_local_dir ? path : @display_path = @path.sub(project_dir.path, '').sub(/^\//, '')
       end
       
+      def name=(the_name)
+        self.display_path = display_path.sub(/#{Regexp.escape(@name)}$/, the_name)
+        @name = the_name
+        new_path = ::File.expand_path(display_path)
+        FileUtils.mv(path, new_path)
+        self.path = display_path
+      end
+  
       def children
         @children ||= retrieve_children
       end

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

@@ -51,7 +51,7 @@ module Glimmer
       end
       
       def scratchpad?
-        path.empty?
+        path.to_s.empty?
       end
 
       def backup_properties
@@ -98,6 +98,15 @@ module Glimmer
         self.selection = Point.new(caret_position, caret_position + value.to_i)
       end
 
+      def name=(the_name)
+        new_path = path.sub(/#{Regexp.escape(@name)}$/, the_name) unless scratchpad?
+        @name = the_name
+        if !scratchpad? && ::File.exist?(path)
+          FileUtils.mv(path, new_path)
+          self.path = new_path
+        end
+      end
+      
       def dirty_content=(the_content)
         @dirty_content = the_content
         notify_observers(:content)

data/lib/views/glimmer/gladiator.rb

@@ -23,7 +23,7 @@ module Glimmer
       attr_accessor :drag_and_drop
       attr_accessor :drag
     end
-
+    
     ## Add options like the following to configure CustomShell by outside consumers
     #
     # options :title, :background_color
@@ -42,9 +42,8 @@ module Glimmer
     #
     #
     before_body {
-      Thread.new {
-        project_dir #pre-initialize directory
-      }
+      # TODO consider doing loading project files after displaying the GUI instead of holding it up before
+      project_dir #pre-initialize directory
       at_exit do
         project_dir.selected_child&.write_raw_dirty_content
       end
@@ -582,8 +581,12 @@ module Glimmer
       end
     end
 
+    def find_tab_item(file_path)
+      @current_tab_folder.swt_widget.getItems.detect { |ti| ti.getData('file_path') == file_path }
+    end
+
     def selected_tab_item
-      @current_tab_folder.swt_widget.getItems.detect { |ti| ti.getData('file_path') == project_dir.selected_child&.path }
+      find_tab_item(project_dir.selected_child&.path)
     end
 
     def other_tab_items
@@ -615,19 +618,15 @@ module Glimmer
       @file_tree.swt_widget.showItem(parent_tree_item)
       parent_tree_item.setExpanded(true)
       # TODO close text editor tab
-#       if file.is_a?(::File)
-        # close tab
-#       end
+      found_tab_item = find_tab_item(file.path)
+      if found_tab_item
+        project_dir.selected_child_path_history.delete(found_tab_item.getData('file_path'))
+        found_tab_item.getData('proxy')&.dispose
+      end
     rescue => e
       puts e.full_message
     end
 
-    def rename_selected_tree_item
-      project_dir.pause_refresh
-      tree_item = @file_tree.swt_widget.getSelection.first
-      rename_tree_item(tree_item)
-    end
-
     def add_new_directory_to_selected_tree_item
       project_dir.pause_refresh
       tree_item = @file_tree.swt_widget.getSelection.first
@@ -642,7 +641,7 @@ module Glimmer
       project_dir.refresh(async: false, force: true)
       new_tree_item = @file_tree.depth_first_search {|ti| ti.getData.path == new_directory_path}.first
       @file_tree.swt_widget.showItem(new_tree_item)
-      rename_tree_item(new_tree_item, true)
+      rename_tree_item(new_tree_item)
     end
 
     def add_new_file_to_selected_tree_item
@@ -662,14 +661,37 @@ module Glimmer
       rename_tree_item(new_tree_item, true)
     end
 
-    def rename_tree_item(tree_item, open_afterwards = false)
+    def rename_selected_tree_item
+      project_dir.pause_refresh
+      tree_item = @file_tree.swt_widget.getSelection.first
+      rename_tree_item(tree_item)
+    end
+
+    def rename_tree_item(tree_item, new_file = false)
+      original_file = tree_item.getData
+      current_file = project_dir.selected_child_path == original_file.path
+      found_tab_item = find_tab_item(original_file.path)
+      found_text_editor = found_tab_item&.getData('text_editor')
       @file_tree.edit_tree_item(
         tree_item,
         after_write: -> (edited_tree_item) {
           file = edited_tree_item.getData
           file_path = file.path
-          # TODO rename file in tab title
-          project_dir.selected_child_path = file_path if open_afterwards
+          file.name
+          if new_file
+            project_dir.selected_child_path = file_path
+          else
+            found_text_editor&.file = file
+            found_tab_item&.setData('file', file)
+            found_tab_item&.setData('file_path', file.path)
+            found_tab_item&.setText(file.name)
+            body_root.pack_same_size
+            if current_file
+              project_dir.selected_child_path = file_path
+            else
+              selected_tab_item&.getData('text_editor')&.text_widget&.setFocus
+            end
+          end
           project_dir.resume_refresh
         },
         after_cancel: -> {

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

@@ -26,12 +26,13 @@ module Glimmer
             font name: 'Consolas', height: OS.mac? ? 15 : 12
             background color(:widget_background)
             foreground rgb(0, 0, 250)
-            text bind(file, 'line_numbers_content')
-            top_pixel bind(file, 'top_pixel', read_only: true)
+            text bind(self, 'file.line_numbers_content')
+            top_pixel bind(self, 'file.top_pixel', read_only: true)
             top_margin 5
             right_margin 5
             bottom_margin 5
             left_margin 5
+            editable false
             on_focus_gained {
               @text&.swt_widget.setFocus
             }
@@ -47,10 +48,10 @@ module Glimmer
             layout_data :fill, :fill, true, true
             font name: 'Consolas', height: OS.mac? ? 15 : 12
             foreground rgb(75, 75, 75)
-            text bind(file, :content)
+            text bind(self, 'file.content')
             focus true
-            selection bind(file, :selection)
-            top_pixel bind(file, 'top_pixel')
+            selection bind(self, 'file.selection')
+            top_pixel bind(self, 'file.top_pixel')
             drop_target(DND::DROP_COPY) {
               transfer [TextTransfer.getInstance].to_java(Transfer)
               on_drag_enter { |event|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-01 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement