glimmer-cs-gladiator 0.8.3 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b50517d61cc617ff8301fd56053e04c385e75591a9d4adc7ddf02b9ca6bfb785
-  data.tar.gz: deac989a0cd8086b8c6b3be605606ff96fda4d6ad9a8c8d7fcb4cee6afcde1b5
+  metadata.gz: 05d78a9ecf5d67e3aa15255e0c34c0772c07b875a6f6ffc08c30b06961bbda47
+  data.tar.gz: 51c0ae819c0623ffced64109236b1ce0f3197745e7c49f084ba5ab63e2784cc7
 SHA512:
-  metadata.gz: 79bd7f9c58f721c17168d51b13a58f2f7ac6817110c76e14170cdebae3c22d4adf2b30763ce2cbb04c220300934c30b3dfc8c2e9533520689444c94c537c3e54
-  data.tar.gz: b04a9bd90fe07bd5c64e947089a017b51925707805d6127866cc10cd789c6ac76f4f40f37669033c8deaf375d98072fbb92e419c37429bcdb368e634ce1e2aa5
+  metadata.gz: 02fca47a4008e799265183f2c51e49bab365fc9d42e7a51ea85c70001f26c15ca41c62692b4b90b1f99482c678dc5cf90e883ef561c6e783d9d4b25c6602e3f4
+  data.tar.gz: 7da035e31ca27bcaac5ad9fc71638d9e32e502f3cc7ef73e8948becbd5de4f0036d78cd4bde553be264d171a6703cbcaa27b3baba3770c186442c7325cbe6c6e

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 0.9.1
+
+- Upgrade to glimmer-dsl-swt 4.20.15.4
+- Fix issue with keyboard shortcuts not working in first tab (also fix scroll-jittering when performing CMD+] and CMD+[ in first tab)
+- Change Quit Project keyboard shortcut to ALT+F4
+- In app mode (packaged version), show "Open Project..." shell again after closing last open project
+
+## 0.9.0
+
+- Upgrade to glimmer-dsl-swt 4.19.0.0
+- Updated quit project accelerator (keyboard shortcut) to ALT+F4
+
 ## 0.8.3
 
 - Switch Scratchpad evaling to loading a temporary local file under `project_dir/.gladiator-scratchpad` for a more realistic Ruby running experience

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.8.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.9.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/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)
 
@@ -45,7 +45,7 @@ Gladiator currently supports the following text editing features (including keyb
 ### Navigation Area
 
 - Show current text editor file name
-- Show file navigation stats (Caret Position / Line Position / Selection Count / Top Pixel)
+0- Show file navigation stats (Caret Position / Line Position / Selection Count / Top Pixel)
 - Jump to Line (CMD+L)
 - Find & Replace (CMD+F)
 
@@ -54,7 +54,7 @@ Gladiator currently supports the following text editing features (including keyb
 - File Menu:
   - Open Scratchpad for running arbitrary Ruby/Glimmer code (saves a temporary file to `project_dir/.gladiator-scratchpad`) (CMD+SHIFT+S)
   - Open Project (CMD+O)
-  - Quit Project (CMD+ALT+Q)
+  - Quit Project (ALT+F4)
 - View Menu
   - Split Pane
     - Orientation change to Horizontal/Vertical (CMD+SHIFT+O)
@@ -117,7 +117,7 @@ Gladiator currently supports the following text editing features (including keyb
 
 ## Download
 
-[Download Gladiator 0.8.3 Mac DMG Installer](https://www.dropbox.com/s/suqvzceqj1fxj8o/Gladiator-0.8.3.dmg?dl=1)
+[Download Gladiator 0.9.1 Mac DMG Installer](https://www.dropbox.com/s/s9yp6qtelh85qko/Gladiator-0.9.1.dmg?dl=1)
 
 [Download Gladiator 0.8.3 Windows MSI Installer](https://www.dropbox.com/s/7kcrf7r5p6vxfm7/Gladiator-0.8.3.msi?dl=1)
 
@@ -192,7 +192,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '>= 0.8.3'
+gem 'glimmer-cs-gladiator', '>= 0.9.1'
 ```
 
 Run:
@@ -239,12 +239,12 @@ The signal TERM is in use by the JVM and will not work correctly on this platfor
 ### App Is Not Responding
 
 If you run the `gladiator` command from the root directory or some parent directory to many projects, it assumes that is
-the project directory and attempt to pre-load all files, taking a very long time and not responding for quite a while.
+the project directory and attempts to pre-load all files (just part of Gladiator's architectural design and assumptions for optimizing use per project), taking a very long time and not responding for quite a while.
 
 To avoid this problem, always make sure you are running the `gladiator` command from a single project's directory.
 
 Also, if you encounter this issue with projects that contain a lot of extra files that you do not need to edit, you
-could later open the generate `.gladiator` file at the root of the project directory and add unnecessary subdirectories
+could later open the generated `.gladiator` file at the root of the project directory and add unnecessary subdirectories
 to the `ignore_paths` array.
 
 ## TODO

data/VERSION

@@ -1 +1 @@
-0.8.3
+0.9.1

data/bin/gladiator-setup

@@ -70,7 +70,7 @@ end
 
 puts <<~OUTPUT
   
-  Before using `gladiator`, start a new shell session (open a new terminal tab) or run:
+  Before using `gladiator`, start a new shell session in the same directory (open a new terminal tab and go to the same directory) or run:
   
   source ~/.gladiator_source
   

data/glimmer-cs-gladiator.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-cs-gladiator 0.8.3 ruby lib
+# stub: glimmer-cs-gladiator 0.9.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-cs-gladiator".freeze
-  s.version = "0.8.3"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andy Maleh".freeze]
-  s.date = "2021-03-04"
+  s.date = "2021-09-14"
   s.description = "Gladiator (short for Glimmer Editor) is a Glimmer sample project under on-going development. It is not intended to be a full-fledged editor by any means, yet mostly a fun educational exercise in using Glimmer to build a text editor. Gladiator is also a personal tool for shaping an editor exactly the way I like. I leave building truly professional text editors to software tooling experts who would hopefully use Glimmer one day.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer-cs-gladiator".freeze, "gladiator".freeze, "gladiator-setup".freeze]
@@ -45,31 +45,23 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/AndyObtiva/glimmer-cs-gladiator".freeze
   s.licenses = ["MIT".freeze]
   s.post_install_message = "\nTo make the gladiator command available system-wide (especially with RVM), make sure you run this command with jruby in path: gladiator-setup\n\n".freeze
-  s.rubygems_version = "3.0.6".freeze
+  s.rubygems_version = "3.1.6".freeze
   s.summary = "Gladiator (Glimmer Editor) - Glimmer Custom Shell - Text Editor Built in Ruby".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.4.3", "< 5.0.0.0"])
-      s.add_runtime_dependency(%q<filewatcher>.freeze, ["~> 1.1.1"])
-      s.add_runtime_dependency(%q<clipboard>.freeze, ["~> 1.3.5"])
-      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
-      s.add_development_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
-      s.add_development_dependency(%q<warbler>.freeze, ["= 2.0.5"])
-      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.4.3", "< 5.0.0.0"])
-      s.add_dependency(%q<filewatcher>.freeze, ["~> 1.1.1"])
-      s.add_dependency(%q<clipboard>.freeze, ["~> 1.3.5"])
-      s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
-      s.add_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
-      s.add_dependency(%q<warbler>.freeze, ["= 2.0.5"])
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<glimmer-dsl-swt>.freeze, ["~> 4.20.15.4"])
+    s.add_runtime_dependency(%q<filewatcher>.freeze, ["~> 1.1.1"])
+    s.add_runtime_dependency(%q<clipboard>.freeze, ["~> 1.3.5"])
+    s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
+    s.add_development_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
+    s.add_development_dependency(%q<warbler>.freeze, ["= 2.0.5"])
+    s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
   else
-    s.add_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.4.3", "< 5.0.0.0"])
+    s.add_dependency(%q<glimmer-dsl-swt>.freeze, ["~> 4.20.15.4"])
     s.add_dependency(%q<filewatcher>.freeze, ["~> 1.1.1"])
     s.add_dependency(%q<clipboard>.freeze, ["~> 1.3.5"])
     s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])

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

@@ -522,13 +522,13 @@ module Glimmer
       end
       
       def page_up
-        self.selection_count = 0
         self.line_number = [(self.line_number - 15), 1].max
+        self.selection_count = 0
       end
 
       def page_down
-        self.selection_count = 0
         self.line_number = [(self.line_number + 15), lines.size].min
+        self.selection_count = 0
       end
 
       def home

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

@@ -29,7 +29,6 @@ module Glimmer
       body {
         list(:border, :h_scroll, :v_scroll) {
           selection bind(project_dir, :filtered_path)
-#           visible bind(project_dir, 'filter') {|f| pd swt_widget&.get_shell&.get_data('proxy'); swt_widget&.get_shell&.get_data('proxy')&.pack_same_size; !!f}
           foreground foreground_color
           on_mouse_up {
             project_dir.selected_child_path = swt_widget.getSelection.first

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

@@ -49,7 +49,7 @@ module Glimmer
             menu_item(:separator)
             menu_item {
               text '&Quit Project'
-              accelerator COMMAND_KEY, :alt, :q
+              accelerator :alt, :f4
               on_widget_selected {
                 gladiator.save_config
                 project_dir.selected_child&.write_dirty_content

data/lib/views/glimmer/gladiator.rb

@@ -251,7 +251,7 @@ module Glimmer
     #
     body {
       if app_mode?
-        shell {
+        @@app_mode_shell = shell {
           text 'Gladiator'
           minimum_size 250, 250
           image ICON
@@ -286,6 +286,7 @@ module Glimmer
           
           on_shell_closed {
             project_dir.selected_child&.write_dirty_content
+            save_config
             if @tab_folder2
               current_tab_folder.swt_widget.getItems.each do |tab_item|
                 tab_item.getData('proxy')&.dispose
@@ -295,10 +296,9 @@ module Glimmer
             current_tab_folder.swt_widget.getItems.each do |tab_item|
               tab_item.getData('proxy')&.dispose
             end
+            gladiator_shells = display.shells.select {|s| s.get_data('custom_shell')&.is_a?(Glimmer::Gladiator)}
             body_root.close unless current_tab_folder.swt_widget.getItems.empty?
-          }
-          on_widget_disposed {
-            project_dir.selected_child&.write_dirty_content
+            async_exec { @@app_mode_shell.show } if defined?(@@app_mode_shell) && gladiator_shells.count <= 2
           }
           on_control_resized {
             save_config
@@ -308,6 +308,7 @@ module Glimmer
           }
           on_shell_deactivated {
             project_dir.selected_child&.write_dirty_content
+            save_config
           }
   
           # Menu Bar
@@ -920,7 +921,7 @@ module Glimmer
       async_exec {
         gladiator(project_dir_path: selected_directory) {
           on_swt_show {
-            body_root.close if app_mode?
+            @@app_mode_shell.hide if app_mode?
             @progress_shell.close
             @progress_shell = nil
           }

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.1
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.18.4.3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.0
+        version: 4.20.15.4
   name: glimmer-dsl-swt
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.18.4.3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.0
+        version: 4.20.15.4
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -37,8 +31,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.1
   name: filewatcher
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -51,8 +45,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.5
   name: clipboard
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -65,8 +59,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.0
   name: rspec
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -79,8 +73,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.9
   name: jeweler
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
@@ -93,8 +87,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.5
   name: warbler
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
@@ -107,8 +101,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: simplecov
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -173,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Gladiator (Glimmer Editor) - Glimmer Custom Shell - Text Editor Built in