glimmer_metronome 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b133efc5152a4d8ccecbade1d2ac5b63b7c6cb0f70873a1fcbcbbd66d830641f
-  data.tar.gz: bd0219d9dd10a08a75482d87d121d22d72b2dc0dbeac4508986293354c3a55fc
+  metadata.gz: fbbc2fcc503f54f4362ccd9b9be301e883c12d82a7d4bd4d00d4a5f35ffddea2
+  data.tar.gz: 707dc03e16e88003e5a8d7a7735bda7d3613e53da2d58bacc7191c6cccca7394
 SHA512:
-  metadata.gz: d781af7ec5fe81748de32293fbb61de12d51b24cd1c854bdb7696a9ef13666512fa31cb6a2d764266e13d2123940483650ac495b45821d82dae8f6c8ebd7b5b1
-  data.tar.gz: bb2e33215fdeb8401d57486f834db7f4d1b825712b28ddbb1865b405ebb51793f5101bf5199fb5b6f82104c0ea388964d3c8470fddfee0592600b20a1d4d5126
+  metadata.gz: 2180e6cbdfdfcb8c8c78d1dccaee52f25fc61f6154ce4632adf93456a8069a82b27cbd3d0fa9ea97b9337ca3ba7138bfe6974f24c3325c168063ebf063b2955d
+  data.tar.gz: 3526e7715bad57d121554e6bf4936c14cace766f913a1375243e99ff41967cae485f3e8f530f5ce18fb2a0794cf89e0ef6b1b7983bc24ffc34b5d093ce258a41

data/CHANGELOG.md

@@ -1,12 +1,26 @@
 # Change Log
 
+## 1.1.4
+
+- Implement menu actions for play/stop/mute/unmute
+- Upgrade to glimmer-dsl-swt 4.26.0.1
+- Start and Stop menu items supporting accelerators (keyboard shortcuts)
+- Mute and Unmute menu items supporting accelerators (keyboard shortcuts)
+- Beat Count -> Increment/Decrement menu items supporting accelerators (keyboard shortcuts)
+- Tempo -> Increment/Decrement/Increment-by-10/Decrement-by-10 menu items supporting accelerators (keyboard shortcuts)
+
+## 1.1.3
+
+- Fix issue with changing the beat count while the metronome is stopped resulting in starting the metronome while the play button status is stuck as if it is stopped
+
 ## 1.1.2
 
 - ARM64/AARCH64 support via jruby-9.3.3.0 & glimmer-dsl-swt v4.22.2.1
 
 ## 1.1.1
 
-- Menu bar with Help Tips and About
+- Menu bar with Help Tips and Aboute
+
 - Avoid opening audio clip if muted
 - Clean audio clip resources after performing clip.open and clip.start
 

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2022 Andy Maleh
+Copyright (c) 2022-2023 Andy Maleh
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,8 +1,8 @@
-# <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/icons/linux/Glimmer%20Metronome.png" height=85 /> Glimmer Metronome 1.1.2
+# <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/icons/linux/Glimmer%20Metronome.png" height=85 /> Glimmer Metronome 1.1.4
 ## [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 /> Glimmer Application](https://github.com/AndyObtiva/glimmer-dsl-swt)
 [![Gem Version](https://badge.fury.io/rb/glimmer_metronome.svg)](http://badge.fury.io/rb/glimmer_metronome)
 
-<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/icons/linux/Glimmer%20Metronome.png" height=40 /> [Download Glimmer Metronome 1.1.2 DMG for Mac (ARM64 Monterey and Older)](https://www.dropbox.com/s/u365a4an9lo3a88/Glimmer%20Metronome-1.1.2.dmg?dl=1)
+<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/icons/linux/Glimmer%20Metronome.png" height=40 /> [Download Glimmer Metronome 1.1.3 DMG for Mac (ARM64 Ventura and Older)](https://www.dropbox.com/s/pwwpdj3sjggqokz/Glimmer%20Metronome-1.1.3-arm64.dmg?dl=1)
 
 <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/icons/linux/Glimmer%20Metronome.png" height=40 /> [Download Glimmer Metronome 1.1.1 DMG for Mac (x64 Catalina and Older)](https://www.dropbox.com/s/ecwe0ukjldag6hu/Glimmer%20Metronome-1.1.1.dmg?dl=1)
 
@@ -34,14 +34,14 @@ For hardcore music buffs out there who are shocked at my reversal or wrong usage
 
 You may download a pre-packaged version:
 
-<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/icons/linux/Glimmer%20Metronome.png" height=40 /> [Download Glimmer Metronome 1.1.2 DMG for Mac (ARM64 Monterey and Older)](https://www.dropbox.com/s/u365a4an9lo3a88/Glimmer%20Metronome-1.1.2.dmg?dl=1)
+<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/icons/linux/Glimmer%20Metronome.png" height=40 /> [Download Glimmer Metronome 1.1.3 DMG for Mac (ARM64 Ventura and Older)](https://www.dropbox.com/s/pwwpdj3sjggqokz/Glimmer%20Metronome-1.1.3-arm64.dmg?dl=1)
 
 <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/icons/linux/Glimmer%20Metronome.png" height=40 /> [Download Glimmer Metronome 1.1.1 DMG for Mac (x64 Catalina and Older)](https://www.dropbox.com/s/ecwe0ukjldag6hu/Glimmer%20Metronome-1.1.1.dmg?dl=1)
 
 Alternatively, if you are a software engineer and would like to install this application as a [Ruby gem](https://guides.rubygems.org/what-is-a-gem/), you may follow these instructions:
 
 - Ensure you have [Glimmer DSL for SWT 4.22.2.1 prerequisites setup (like JDK and JRuby)](https://github.com/AndyObtiva/glimmer-dsl-swt/tree/v4.22.2.1#pre-requisites).
-- Install gem via `gem install glimmer_metronome -v1.1.2` command
+- Install gem via `gem install glimmer_metronome -v1.1.4` command
 - Run `glimmer_metronome` command to start application
 
 Lastly, you can package a native executable for your specific system (e.g. produce MSI/EXE file on Windows 10 x64) by following these instructions instead:
@@ -74,7 +74,7 @@ Lastly, you can package a native executable for your specific system (e.g. produ
 
 [MIT](LICENSE.txt)
 
-Copyright (c) 2022 Andy Maleh. See [LICENSE.txt](LICENSE.txt) for further details.
+Copyright (c) 2022-2023 Andy Maleh. See [LICENSE.txt](LICENSE.txt) for further details.
 
 --
 

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.4

data/app/glimmer_metronome/model/beat.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Andy Maleh
+# Copyright (c) 2022-2023 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/glimmer_metronome/model/metronome.rb

@@ -0,0 +1,135 @@
+# Copyright (c) 2022-2023 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require_relative 'rhythm'
+
+class GlimmerMetronome
+  module Model
+    class Metronome
+      import 'javax.sound.sampled'
+    
+      FILE_SOUND_METRONOME_UP = File.join(APP_ROOT, 'sounds', 'metronome-up.wav')
+      FILE_SOUND_METRONOME_DOWN = File.join(APP_ROOT, 'sounds', 'metronome-down.wav')
+      
+      attr_reader :rhythm
+      attr_accessor :muted, :stopped
+      alias muted? muted
+      alias stopped? stopped
+      
+      def initialize
+        @rhythm = Model::Rhythm.new
+        @muted = false
+        @stopped = false
+      end
+      
+      def stopped=(value)
+        @stopped = value
+        notify_observers(:playing)
+      end
+      
+      def playing
+        !stopped
+      end
+      alias playing? playing
+      
+      def playing=(value)
+        self.stopped = !value
+      end
+      
+      def play!
+        self.stopped = false
+        @thread ||= Thread.new do
+          @rhythm.beat_count.times.cycle { |n|
+            begin
+              @rhythm.on_beat!(n)
+            rescue => e
+              puts e.full_message
+            end
+            sound_file = @rhythm.beats[n].up? ? FILE_SOUND_METRONOME_UP : FILE_SOUND_METRONOME_DOWN
+            play_sound(sound_file)
+            sleep(60.0/@rhythm.tempo.to_f)
+          }
+        end
+      end
+      
+      def stop!
+        self.stopped = true
+        @thread&.kill # not dangerous in this case and is useful to stop sleep
+        @thread = nil
+        @rhythm.off!
+      end
+      
+      def toggle_playback!
+        if stopped?
+          play!
+        else
+          stop!
+        end
+      end
+      
+      def mute!
+        self.muted = true
+      end
+      
+      def unmute!
+        self.muted = false
+      end
+      
+      def toggle_mute!
+        self.muted = !self.muted
+      end
+      
+      # Play sound with the Java Sound library
+      def play_sound(sound_file)
+        return if muted?
+        begin
+          audio_input = build_audio_input(sound_file)
+          audio_stream = AudioSystem.get_audio_input_stream(audio_input)
+          clip = AudioSystem.clip
+          clip.open(audio_stream)
+          clip.start
+        rescue => e
+          puts e.full_message
+        ensure
+          Thread.new do
+            sleep(0.01) while clip.running?
+            clip.close
+          end
+        end
+      end
+      
+      def build_audio_input(sound_file)
+        # if running from packaged JAR, we get a uri:classloader sound_file
+        if sound_file.start_with?('uri:classloader')
+          jar_file_path = sound_file
+          file_path = jar_file_path.sub(/^uri\:classloader\:/, '').sub(/^\/+/, '')
+          require 'jruby'
+          jcl = JRuby.runtime.jruby_class_loader
+          resource = jcl.get_resource_as_stream(file_path)
+          file_input_stream = resource.to_io.to_input_stream
+          java.io.BufferedInputStream.new(file_input_stream)
+        else
+          java.io.File.new(sound_file)
+        end
+      end
+    end
+  end
+end

data/app/glimmer_metronome/model/rhythm.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Andy Maleh
+# Copyright (c) 2022-2023 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -26,12 +26,19 @@ require_relative 'beat'
 class GlimmerMetronome
   module Model
     class Rhythm
+      BEAT_COUNT_DEFAULT = 4
+      BEAT_COUNT_MINIMUM = 1
+      BEAT_COUNT_MAXIMUM = 64
+      TEMPO_DEFAULT = 120
+      TEMPO_MINIMUM = 30
+      TEMPO_MAXIMUM = 1000
+      
       attr_reader :beat_count
       attr_accessor :beats, :tempo
       
-      def initialize(beat_count)
+      def initialize(beat_count: BEAT_COUNT_DEFAULT, tempo: TEMPO_DEFAULT)
         self.beat_count = beat_count
-        @tempo = 120
+        @tempo = tempo
       end
       
       def beat_count=(value)

data/app/glimmer_metronome/view/app_view.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Andy Maleh
+# Copyright (c) 2022-2023 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -19,42 +19,42 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require_relative '../model/rhythm'
+require_relative '../model/metronome'
+
+require_relative 'metronome_menu_bar'
+require_relative 'metronome_tool_bar'
+require_relative 'metronome_about_dialog'
 
 class GlimmerMetronome
   module View
     class AppView
       include Glimmer::UI::CustomShell
       
-      import 'javax.sound.sampled'
-      
-      FILE_SOUND_METRONOME_UP = File.join(APP_ROOT, 'sounds', 'metronome-up.wav')
-      FILE_SOUND_METRONOME_DOWN = File.join(APP_ROOT, 'sounds', 'metronome-down.wav')
       COLOR_BEAT_UP = :yellow
       COLOR_BEAT_DOWN = :white
           
-      attr_accessor :muted, :stopped
-      alias muted? muted
-      alias stopped? stopped
-          
       before_body do
-        @rhythm = Model::Rhythm.new(4)
+        @metronome = Model::Metronome.new
         
         display {
           on_about do
-            display_about_dialog
+            metronome_about_dialog(owner: body_root).open
           end
           
           on_preferences do
-            display_about_dialog
+            metronome_about_dialog(owner: body_root).open
           end
           
           on_swt_keydown do |event|
-            @rhythm.tap! if event.keyCode == swt(:cr)
+            @metronome.rhythm.tap! if event.keyCode == swt(:cr)
           end
         }
       end
       
+      after_body do
+        observe(@metronome.rhythm, :beat_count) { build_beats }
+      end
+      
       body {
         shell(:no_resize) {
           row_layout(:vertical) {
@@ -65,58 +65,9 @@ class GlimmerMetronome
           text 'Glimmer Metronome'
           background :red
           
-          menu_bar {
-            menu {
-              text '&Help'
-              
-              menu_item {
-                text '&Tips'
-                
-                on_widget_selected do
-                  message_box {
-                    text 'Glimmer Metronome - Tips'
-                    message <<~MULTI_LINE_STRING
-                      Tap ENTER repeatedly to get Tempo calculated automatically
-                      
-                      Click a beat to change it between an Up beat (yellow) and Down beat (white)
-                    MULTI_LINE_STRING
-                  }.open
-                end
-              }
-              
-              menu_item {
-                text '&About'
-                
-                on_widget_selected do
-                  display_about_dialog
-                end
-              }
-            }
-          }
+          metronome_menu_bar(metronome: @metronome)
           
-          tool_bar {
-            tool_item { |ti|
-              image ICON_STOP
-              hot_image ICON_HOT_STOP
-              
-              on_widget_selected do
-                toggle_metronome!
-                ti.image = @stopped ? ICON_PLAY : ICON_STOP
-                ti.hot_image = @stopped ? ICON_HOT_PLAY : ICON_HOT_STOP
-              end
-            }
-            
-            tool_item { |ti|
-              image ICON_SOUND
-              hot_image ICON_HOT_MUTE
-              
-              on_widget_selected do
-                self.muted = !@muted
-                ti.image = @muted ? ICON_MUTE : ICON_SOUND
-                ti.hot_image = @muted ? ICON_HOT_SOUND : ICON_HOT_MUTE
-              end
-            }
-          }
+          metronome_tool_bar(metronome: @metronome)
           
           label {
             text 'Beat Count'
@@ -125,9 +76,9 @@ class GlimmerMetronome
           }
           
           spinner {
-            minimum 1
-            maximum 64
-            selection <=> [@rhythm, :beat_count, after_write: method(:build_beats)]
+            minimum Model::Rhythm::BEAT_COUNT_MINIMUM
+            maximum Model::Rhythm::BEAT_COUNT_MAXIMUM
+            selection <=> [@metronome.rhythm, :beat_count]
             font height: 30
           }
           
@@ -138,18 +89,18 @@ class GlimmerMetronome
           }
           
           spinner {
-            minimum 30
-            maximum 1000
-            selection <=> [@rhythm, :tempo]
+            minimum Model::Rhythm::TEMPO_MINIMUM
+            maximum Model::Rhythm::TEMPO_MAXIMUM
+            selection <=> [@metronome.rhythm, :tempo]
             font height: 30
           }
           
           @beat_container = composite {
-            grid_layout(@rhythm.beat_count, true)
+            grid_layout(@metronome.rhythm.beat_count, true)
             
             background :red
             
-            @beats = @rhythm.beat_count.times.map { |n|
+            @beats = @metronome.rhythm.beat_count.times.map { |n|
               beat(n)
             }
           }
@@ -159,7 +110,7 @@ class GlimmerMetronome
           }
           
           on_widget_disposed {
-            stop_metronome!
+            @metronome.stop!
           }
         }
       }
@@ -174,77 +125,47 @@ class GlimmerMetronome
           background :red
           
           rectangle(0, 0, :default, :default, 36, 36) {
-            background <= [@rhythm, "beats[#{beat_index}].up", on_read: ->(up) { up ? COLOR_BEAT_UP : COLOR_BEAT_DOWN}]
+            background <= [@metronome.rhythm, "beats[#{beat_index}].up", on_read: ->(up) { up ? COLOR_BEAT_UP : COLOR_BEAT_DOWN}]
           }
           polygon(18, 16, 34, 25, 18, 34) {
-            background <= [@rhythm, "beats[#{beat_index}].on", on_read: ->(on) { on ? :black : (@rhythm.beats[beat_index].up? ? COLOR_BEAT_UP : COLOR_BEAT_DOWN)}]
-            background <= [@rhythm, "beats[#{beat_index}].up", on_read: ->(up) { @rhythm.beats[beat_index].on? ? :black : (up ? COLOR_BEAT_UP : COLOR_BEAT_DOWN)}]
+            background <= [@metronome.rhythm, "beats[#{beat_index}].on", on_read: ->(on) { on ? :black : (@metronome.rhythm.beats[beat_index].up? ? COLOR_BEAT_UP : COLOR_BEAT_DOWN)}]
+            background <= [@metronome.rhythm, "beats[#{beat_index}].up", on_read: ->(up) { @metronome.rhythm.beats[beat_index].on? ? :black : (up ? COLOR_BEAT_UP : COLOR_BEAT_DOWN)}]
           }
           
           on_mouse_up do
-            if @rhythm.beats[beat_index].up?
-              @rhythm.beats[beat_index].down!
+            if @metronome.rhythm.beats[beat_index].up?
+              @metronome.rhythm.beats[beat_index].down!
             else
-              @rhythm.beats[beat_index].up!
+              @metronome.rhythm.beats[beat_index].up!
             end
           end
         }
       end
       
-      def start_metronome!
-        self.stopped = false
-        @thread ||= Thread.new do
-          @rhythm.beat_count.times.cycle { |n|
-            begin
-              @rhythm.on_beat!(n)
-            rescue => e
-              puts e.full_message
-            end
-            sound_file = @rhythm.beats[n].up? ? FILE_SOUND_METRONOME_UP : FILE_SOUND_METRONOME_DOWN
-            play_sound(sound_file)
-            sleep(60.0/@rhythm.tempo.to_f)
-          }
-        end
-      end
-      
-      def stop_metronome!
-        self.stopped = true
-        @thread&.kill # not dangerous in this case and is useful to stop sleep
-        @thread = nil
-        @rhythm.off!
-      end
-      
-      def toggle_metronome!
-        if stopped?
-          start_metronome!
-        else
-          stop_metronome!
-        end
-      end
-      
       def build_beats
-        stop_metronome!
-        beat_container_layout_change = @rhythm.beat_count != @beats.count && (@rhythm.beat_count < 9 || @beats.count < 9)
-        if @rhythm.beat_count > @beats.count
+        initially_stopped = @metronome.stopped
+        @metronome.stop! unless initially_stopped
+        beat_container_layout_change = @metronome.rhythm.beat_count != @beats.count && (@metronome.rhythm.beat_count < 9 || @beats.count < 9)
+        if @metronome.rhythm.beat_count > @beats.count
           index_start = @beats.count
           @beat_container.content {
-            @beats += (@rhythm.beat_count - @beats.count).times.map do |n|
+            @beats += (@metronome.rhythm.beat_count - @beats.count).times.map do |n|
               beat(index_start + n)
             end
           }
-        elsif @rhythm.beat_count < @beats.count
-          first_index_to_dispose = -(@beats.count - @rhythm.beat_count)
+        elsif @metronome.rhythm.beat_count < @beats.count
+          first_index_to_dispose = -(@beats.count - @metronome.rhythm.beat_count)
           @beats[first_index_to_dispose..-1].each(&:dispose)
           @beats = @beats[0...first_index_to_dispose]
         end
         update_beat_container_layout if beat_container_layout_change
-        start_metronome!
+        @metronome.play! unless initially_stopped
       end
       
       def update_beat_container_layout
         @beat_container.content {
-          if @rhythm.beat_count < 8
-            grid_layout(@rhythm.beat_count, true)
+          if @metronome.rhythm.beat_count < 8
+            grid_layout(@metronome.rhythm.beat_count, true)
           else
             grid_layout(8, true)
           end
@@ -253,64 +174,6 @@ class GlimmerMetronome
         body_root.pack(true)
         body_root.center_within_display
       end
-      
-      # Play sound with the Java Sound library
-      def play_sound(sound_file)
-        return if @muted
-        begin
-          audio_input = build_audio_input(sound_file)
-          audio_stream = AudioSystem.get_audio_input_stream(audio_input)
-          clip = AudioSystem.clip
-          clip.open(audio_stream)
-          clip.start
-        rescue => e
-          puts e.full_message
-        ensure
-          Thread.new do
-            sleep(0.01) while clip.running?
-            clip.close
-          end
-        end
-      end
-      
-      def build_audio_input(sound_file)
-        # if running from packaged JAR, we get a uri:classloader sound_file
-        if sound_file.start_with?('uri:classloader')
-          jar_file_path = sound_file
-          file_path = jar_file_path.sub(/^uri\:classloader\:/, '').sub(/^\/+/, '')
-          require 'jruby'
-          jcl = JRuby.runtime.jruby_class_loader
-          resource = jcl.get_resource_as_stream(file_path)
-          file_input_stream = resource.to_io.to_input_stream
-          java.io.BufferedInputStream.new(file_input_stream)
-        else
-          java.io.File.new(sound_file)
-        end
-      end
-      
-      def display_about_dialog
-        dialog(body_root) {
-          grid_layout(2, false) {
-            margin_width 15
-            margin_height 15
-          }
-          
-          background :white
-          image ICON
-          text 'About'
-          
-          label {
-            layout_data :center, :center, false, false
-            background :white
-            image ICON, height: 260
-          }
-          label {
-            layout_data :fill, :fill, true, true
-            background :white
-            text "Glimmer Metronome #{VERSION}\n\n#{LICENSE}\n\nGlimmer Metronome icon made by Freepik from www.flaticon.com"
-          }
-        }.open
-      end
     end
   end
 end

data/app/glimmer_metronome/view/metronome_about_dialog.rb

@@ -0,0 +1,54 @@
+# Copyright (c) 2022-2023 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class GlimmerMetronome
+  module View
+    class MetronomeAboutDialog
+      include Glimmer::UI::CustomShell
+      
+      option :owner
+  
+      body {
+        dialog(owner) {
+          grid_layout(2, false) {
+            margin_width 15
+            margin_height 15
+          }
+          
+          background :white
+          image ICON
+          text 'About'
+          
+          label {
+            layout_data :center, :center, false, false
+            background :white
+            image ICON, height: 260
+          }
+          label {
+            layout_data :fill, :fill, true, true
+            background :white
+            text "Glimmer Metronome #{VERSION}\n\n#{LICENSE}\n\nGlimmer Metronome icon made by Freepik from www.flaticon.com"
+          }
+        }
+      }
+    end
+  end
+end

data/app/glimmer_metronome/view/metronome_menu_bar.rb

@@ -0,0 +1,198 @@
+# Copyright (c) 2022-2023 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require_relative 'metronome_about_dialog'
+
+class GlimmerMetronome
+  module View
+    class MetronomeMenuBar
+      include Glimmer::UI::CustomWidget
+      
+      KEY_SHORTCUT = OS.mac? ? :command : :ctrl
+      
+      option :metronome
+  
+      body {
+        menu_bar {
+          menu {
+            text '&Action'
+            
+            menu_item {
+              text '&Stop'
+              enabled <= [metronome, :playing]
+              accelerator KEY_SHORTCUT, :s
+              
+              on_widget_selected do
+                metronome.stop!
+              end
+            }
+            
+            menu_item {
+              text '&Play'
+              enabled <= [metronome, :stopped]
+              accelerator KEY_SHORTCUT, :p
+              
+              on_widget_selected do
+                metronome.play!
+              end
+            }
+            
+            menu_item(:separator)
+            
+            menu_item {
+              text '&Mute'
+              enabled <= [metronome, :muted, on_read: :!]
+              accelerator KEY_SHORTCUT, :m
+              
+              on_widget_selected do
+                metronome.mute!
+              end
+            }
+            
+            menu_item {
+              text '&Unmute'
+              enabled <= [metronome, :muted]
+              accelerator KEY_SHORTCUT, :u
+              
+              on_widget_selected do
+                metronome.unmute!
+              end
+            }
+            
+            menu_item(:separator)
+            
+            menu {
+              text '&Beat Count'
+              
+              menu_item {
+                text '&Increment'
+                enabled <= [metronome.rhythm, :beat_count, on_read: ->(value) { value < Model::Rhythm::BEAT_COUNT_MAXIMUM}]
+                accelerator KEY_SHORTCUT, '='
+                
+                on_widget_selected do
+                  metronome.rhythm.beat_count += 1
+                end
+              }
+              
+              menu_item {
+                text '&Decrement'
+                enabled <= [metronome.rhythm, :beat_count, on_read: ->(value) { value > Model::Rhythm::BEAT_COUNT_MINIMUM}]
+                accelerator KEY_SHORTCUT, '-'
+                
+                on_widget_selected do
+                  metronome.rhythm.beat_count -= 1
+                end
+              }
+            }
+            
+            menu_item(:separator)
+            
+            menu {
+              text '&Tempo'
+              
+              menu_item {
+                text '&Increment'
+                enabled <= [metronome.rhythm, :tempo, on_read: ->(value) { value < Model::Rhythm::TEMPO_MAXIMUM}]
+                accelerator KEY_SHORTCUT, :arrow_up
+                
+                on_widget_selected do
+                  metronome.rhythm.tempo += 1
+                end
+              }
+              
+              menu_item {
+                text '&Decrement'
+                enabled <= [metronome.rhythm, :tempo, on_read: ->(value) { value > Model::Rhythm::TEMPO_MINIMUM}]
+                accelerator KEY_SHORTCUT, :arrow_down
+                
+                on_widget_selected do
+                  metronome.rhythm.tempo -= 1
+                end
+              }
+              
+              menu_item(:separator)
+              
+              menu_item {
+                text 'I&ncrement by 10'
+                enabled <= [metronome.rhythm, :tempo, on_read: ->(value) { value < (Model::Rhythm::TEMPO_MAXIMUM - 9)}]
+                accelerator KEY_SHORTCUT, :shift, :arrow_up
+                
+                on_widget_selected do
+                  metronome.rhythm.tempo += 10
+                end
+              }
+              
+              menu_item {
+                text 'De&crement by 10'
+                enabled <= [metronome.rhythm, :tempo, on_read: ->(value) { value > (Model::Rhythm::TEMPO_MINIMUM + 9)}]
+                accelerator KEY_SHORTCUT, :shift, :arrow_down
+                
+                on_widget_selected do
+                  metronome.rhythm.tempo -= 10
+                end
+              }
+            }
+            
+            menu_item(:separator)
+            
+            menu_item {
+              text 'E&xit'
+              accelerator :alt, :f4
+              
+              on_widget_selected do
+                shell_proxy.close
+              end
+            }
+          }
+          
+          menu {
+            text '&Help'
+            
+            menu_item {
+              text '&Tips'
+              accelerator KEY_SHORTCUT, :t
+              
+              on_widget_selected do
+                message_box {
+                  text 'Glimmer Metronome - Tips'
+                  message <<~MULTI_LINE_STRING
+                    Tap ENTER repeatedly to get Tempo calculated automatically
+                    
+                    Click a beat to change it between an Up beat (yellow) and Down beat (white)
+                  MULTI_LINE_STRING
+                }.open
+              end
+            }
+            
+            menu_item {
+              text '&About'
+              accelerator KEY_SHORTCUT, :a
+              
+              on_widget_selected do
+                metronome_about_dialog(owner: shell_proxy).open
+              end
+            }
+          }
+        }
+      }
+    end
+  end
+end

data/app/glimmer_metronome/view/metronome_tool_bar.rb

@@ -0,0 +1,52 @@
+# Copyright (c) 2022-2023 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class GlimmerMetronome
+  module View
+    class MetronomeToolBar
+      include Glimmer::UI::CustomWidget
+      
+      option :metronome
+  
+      body {
+        tool_bar {
+          tool_item {
+            image <= [metronome, :stopped, on_read: ->(value) { value ? ICON_PLAY : ICON_STOP }]
+            hot_image <= [metronome, :stopped, on_read: ->(value) { value ? ICON_HOT_PLAY : ICON_HOT_STOP }]
+            
+            on_widget_selected do
+              metronome.toggle_playback!
+            end
+          }
+          
+          tool_item {
+            image <= [metronome, :muted, on_read: ->(value) { value ? ICON_MUTE : ICON_SOUND }]
+            hot_image <= [metronome, :muted, on_read: ->(value) { value ? ICON_HOT_SOUND : ICON_HOT_MUTE }]
+            
+            on_widget_selected do
+              metronome.toggle_mute!
+            end
+          }
+        }
+      }
+    end
+  end
+end

data/app/glimmer_metronome.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2022-2023 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 $LOAD_PATH.unshift(File.expand_path('..', __FILE__))
 
 begin

data/bin/glimmer_metronome

@@ -1,5 +1,26 @@
 #!/usr/bin/env jruby
 
+# Copyright (c) 2022-2023 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 runner = File.expand_path('../../app/glimmer_metronome/launch.rb', __FILE__)
 
 # Detect if inside a JAR file or not

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer_metronome
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2023-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.22.2.1
+        version: 4.26.0.1
   name: glimmer-dsl-swt
   prerelease: false
   type: :runtime
@@ -23,21 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.22.2.1
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.3.2
-  name: psych
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.3.2
+        version: 4.26.0.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -112,8 +98,12 @@ files:
 - app/glimmer_metronome.rb
 - app/glimmer_metronome/launch.rb
 - app/glimmer_metronome/model/beat.rb
+- app/glimmer_metronome/model/metronome.rb
 - app/glimmer_metronome/model/rhythm.rb
 - app/glimmer_metronome/view/app_view.rb
+- app/glimmer_metronome/view/metronome_about_dialog.rb
+- app/glimmer_metronome/view/metronome_menu_bar.rb
+- app/glimmer_metronome/view/metronome_tool_bar.rb
 - bin/glimmer_metronome
 - config/warble.rb
 - glimmer_metronome.gemspec
@@ -122,6 +112,7 @@ files:
 - icons/windows/Glimmer Metronome.ico
 - sounds/metronome-down.wav
 - sounds/metronome-up.wav
+- vendor/jars/org/yaml/snakeyaml/1.28/snakeyaml-1.28.jar
 homepage: http://github.com/AndyObtiva/glimmer_metronome
 licenses:
 - MIT