glimmer-dsl-libui 0.4.4 → 0.4.8

data/examples/timer.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'glimmer-dsl-libui'
 
 class Timer
@@ -9,9 +7,12 @@ class Timer
   MINUTE_MAX = 59
   HOUR_MAX = 23
   
+  attr_accessor :hour, :min, :sec, :started, :played
+  
   def initialize
     @pid = nil
     @alarm_file = File.expand_path('../sounds/AlanWalker-Faded.mid', __dir__)
+    @hour = @min = @sec = 0
     at_exit { stop_alarm }
     setup_timer
     create_gui
@@ -41,31 +42,29 @@ class Timer
     unless @setup_timer
       Glimmer::LibUI.timer(1) do
         if @started
-          seconds = @sec_spinbox.value
-          minutes = @min_spinbox.value
-          hours = @hour_spinbox.value
+          seconds = @sec
+          minutes = @min
+          hours = @hour
           if seconds > 0
-            @sec_spinbox.value = seconds -= 1
+            self.sec = seconds -= 1
           end
           if seconds == 0
             if minutes > 0
-              @min_spinbox.value = minutes -= 1
-              @sec_spinbox.value = seconds = SECOND_MAX
+              self.min = minutes -= 1
+              self.sec = seconds = SECOND_MAX
             end
             if minutes == 0
               if hours > 0
-                @hour_spinbox.value = hours -= 1
-                @min_spinbox.value = minutes = MINUTE_MAX
-                @sec_spinbox.value = seconds = SECOND_MAX
+                self.hour = hours -= 1
+                self.min = minutes = MINUTE_MAX
+                self.sec = seconds = SECOND_MAX
               end
               if hours == 0 && minutes == 0 && seconds == 0
-                @start_button.enabled = true
-                @stop_button.enabled = false
-                @started = false
+                self.started = false
                 unless @played
                   play_alarm
                   msg_box('Alarm', 'Countdown Is Finished!')
-                  @played = true
+                  self.played = true
                 end
               end
             end
@@ -83,42 +82,40 @@ class Timer
       group('Countdown') {
         vertical_box {
           horizontal_box {
-            @hour_spinbox = spinbox(0, HOUR_MAX) {
+            spinbox(0, HOUR_MAX) {
               stretchy false
-              value 0
+              value <=> [self, :hour]
             }
             label(':') {
               stretchy false
             }
-            @min_spinbox = spinbox(0, MINUTE_MAX) {
+            spinbox(0, MINUTE_MAX) {
               stretchy false
-              value 0
+              value <=> [self, :min]
             }
             label(':') {
               stretchy false
             }
-            @sec_spinbox = spinbox(0, SECOND_MAX) {
+            spinbox(0, SECOND_MAX) {
               stretchy false
-              value 0
+              value <=> [self, :sec]
             }
           }
           horizontal_box {
-            @start_button = button('Start') {
+            button('Start') {
+              enabled <= [self, :started, on_read: :!]
+              
               on_clicked do
-                @start_button.enabled = false
-                @stop_button.enabled = true
-                @started = true
-                @played = false
+                self.started = true
+                self.played = false
               end
             }
             
-            @stop_button = button('Stop') {
-              enabled false
+            button('Stop') {
+              enabled <= [self, :started]
               
               on_clicked do
-                @start_button.enabled = true
-                @stop_button.enabled = false
-                @started = false
+                self.started = false
               end
             }
           }

data/examples/timer2.rb

@@ -0,0 +1,129 @@
+require 'glimmer-dsl-libui'
+
+class Timer
+  include Glimmer
+  
+  SECOND_MAX = 59
+  MINUTE_MAX = 59
+  HOUR_MAX = 23
+  
+  def initialize
+    @pid = nil
+    @alarm_file = File.expand_path('../sounds/AlanWalker-Faded.mid', __dir__)
+    at_exit { stop_alarm }
+    setup_timer
+    create_gui
+  end
+
+  def stop_alarm
+    if @pid
+      Process.kill(:SIGKILL, @pid) if @th.alive?
+      @pid = nil
+    end
+  end
+
+  def play_alarm
+    stop_alarm
+    if @pid.nil?
+      begin
+        @pid = spawn "timidity -G 0.0-10.0 #{@alarm_file}"
+        @th = Process.detach @pid
+      rescue Errno::ENOENT
+        warn 'Timidty++ not found. Please install Timidity++.'
+        warn 'https://sourceforge.net/projects/timidity/'
+      end
+    end
+  end
+
+  def setup_timer
+    unless @setup_timer
+      Glimmer::LibUI.timer(1) do
+        if @started
+          seconds = @sec_spinbox.value
+          minutes = @min_spinbox.value
+          hours = @hour_spinbox.value
+          if seconds > 0
+            @sec_spinbox.value = seconds -= 1
+          end
+          if seconds == 0
+            if minutes > 0
+              @min_spinbox.value = minutes -= 1
+              @sec_spinbox.value = seconds = SECOND_MAX
+            end
+            if minutes == 0
+              if hours > 0
+                @hour_spinbox.value = hours -= 1
+                @min_spinbox.value = minutes = MINUTE_MAX
+                @sec_spinbox.value = seconds = SECOND_MAX
+              end
+              if hours == 0 && minutes == 0 && seconds == 0
+                @start_button.enabled = true
+                @stop_button.enabled = false
+                @started = false
+                unless @played
+                  play_alarm
+                  msg_box('Alarm', 'Countdown Is Finished!')
+                  @played = true
+                end
+              end
+            end
+          end
+        end
+      end
+      @setup_timer = true
+    end
+  end
+
+  def create_gui
+    window('Timer') {
+      margined true
+      
+      group('Countdown') {
+        vertical_box {
+          horizontal_box {
+            @hour_spinbox = spinbox(0, HOUR_MAX) {
+              stretchy false
+              value 0
+            }
+            label(':') {
+              stretchy false
+            }
+            @min_spinbox = spinbox(0, MINUTE_MAX) {
+              stretchy false
+              value 0
+            }
+            label(':') {
+              stretchy false
+            }
+            @sec_spinbox = spinbox(0, SECOND_MAX) {
+              stretchy false
+              value 0
+            }
+          }
+          horizontal_box {
+            @start_button = button('Start') {
+              on_clicked do
+                @start_button.enabled = false
+                @stop_button.enabled = true
+                @started = true
+                @played = false
+              end
+            }
+            
+            @stop_button = button('Stop') {
+              enabled false
+              
+              on_clicked do
+                @start_button.enabled = true
+                @stop_button.enabled = false
+                @started = false
+              end
+            }
+          }
+        }
+      }
+    }.show
+  end
+end
+
+Timer.new

data/lib/glimmer/libui/control_proxy/checkbox_proxy.rb

@@ -29,6 +29,11 @@ module Glimmer
       # Follows the Proxy Design Pattern
       class CheckboxProxy < ControlProxy
         DEFAULT_TEXT = ''
+      
+        def data_bind(property, model_binding)
+          super
+          handle_listener('on_toggled') { model_binding.call(checked) } if property == 'checked'
+        end
         
         private
         

data/lib/glimmer/libui/control_proxy/color_button_proxy.rb

@@ -113,6 +113,11 @@ module Glimmer
           Fiddle.free @alpha unless @alpha.nil?
           super
         end
+        
+        def data_bind(property, model_binding)
+          super
+          handle_listener('on_changed') { model_binding.call(color) } if property == 'color'
+        end
       end
     end
   end

data/lib/glimmer/libui/control_proxy/combobox_proxy.rb

@@ -54,8 +54,24 @@ module Glimmer
         alias set_items items
         alias items= items
         
-        def selected_item
-          items[selected]
+        def selected_item(value = nil)
+          if value.nil?
+            items[selected]
+          else
+            self.selected = items.index(value)
+          end
+        end
+        alias set_selected_item selected_item
+        alias selected_item= selected_item
+        
+        def data_bind(property, model_binding)
+          super # model to view data-binding
+          case property
+          when 'selected'
+            handle_listener('on_selected') { model_binding.call(selected) }
+          when 'selected_item'
+            handle_listener('on_selected') { model_binding.call(selected_item) }
+          end
         end
       end
     end

data/lib/glimmer/libui/control_proxy/date_time_picker_proxy.rb

@@ -64,6 +64,11 @@ module Glimmer
           Fiddle.free @time unless @time.nil?
           super
         end
+        
+        def data_bind(property, model_binding)
+          super
+          handle_listener('on_changed') { model_binding.call(time) } if property == 'time'
+        end
       end
     end
   end

data/lib/glimmer/libui/control_proxy/editable_combobox_proxy.rb

@@ -39,6 +39,11 @@ module Glimmer
         end
         alias set_items items
         alias items= items
+        
+        def data_bind(property, model_binding)
+          super
+          handle_listener('on_changed') { model_binding.call(text) } if property == 'text'
+        end
       end
     end
   end

data/lib/glimmer/libui/control_proxy/font_button_proxy.rb

@@ -64,6 +64,10 @@ module Glimmer
           ::LibUI.free_font_button_font(@font_descriptor) unless @font_descriptor.nil?
           super
         end
+        
+        def data_bind(property, model_binding)
+          handle_listener('on_changed') { model_binding.call(font) } if property == 'font'
+        end
       end
     end
   end

data/lib/glimmer/libui/control_proxy/menu_item_proxy/check_menu_item_proxy.rb

@@ -29,6 +29,11 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class CheckMenuItemProxy < MenuItemProxy
+          def data_bind(property, model_binding)
+            super
+            handle_listener('on_clicked') { model_binding.call(checked) } if property == 'checked'
+          end
+        
           private
           
           def build_control

data/lib/glimmer/libui/control_proxy/menu_item_proxy/radio_menu_item_proxy.rb

@@ -29,15 +29,23 @@ module Glimmer
         #
         # Follows the Proxy Design Pattern
         class RadioMenuItemProxy < MenuItemProxy
+          def initialize(keyword, parent, args, &block)
+            @last_checked = nil
+            super
+          end
+        
           def checked(value = nil)
-            if !value.nil?
-              if Glimmer::LibUI.integer_to_boolean(value) != checked?
-                super
+            if value.nil?
+              super()
+            else
+              super
+              if Glimmer::LibUI.integer_to_boolean(value, allow_nil: false) != Glimmer::LibUI.integer_to_boolean(@last_checked, allow_nil: false)
                 if Glimmer::LibUI.integer_to_boolean(value)
                   (@parent_proxy.children - [self]).select {|c| c.is_a?(MenuItemProxy)}.each do |menu_item|
                     menu_item.checked = false
                   end
                 end
+                @last_checked = checked
               end
             end
           end
@@ -48,7 +56,7 @@ module Glimmer
           def handle_listener(listener_name, &listener)
             if listener_name.to_s == 'on_clicked'
               radio_listener = Proc.new do
-                self.checked = true if !checked?
+                self.checked = true
                 listener.call(self)
               end
               super(listener_name, &radio_listener)
@@ -57,6 +65,11 @@ module Glimmer
             end
           end
         
+          def data_bind(property, model_binding)
+            super
+            handle_listener('on_clicked') { model_binding.call(checked) } if property == 'checked'
+          end
+        
           private
           
           def build_control

data/lib/glimmer/libui/control_proxy/radio_buttons_proxy.rb

@@ -39,6 +39,26 @@ module Glimmer
         end
         alias set_items items
         alias items= items
+        
+        def selected_item(value = nil)
+          if value.nil?
+            items[selected]
+          else
+            self.selected = items.index(value) || -1
+          end
+        end
+        alias set_selected_item selected_item
+        alias selected_item= selected_item
+        
+        def data_bind(property, model_binding)
+          super # model to view data-binding
+          case property
+          when 'selected'
+            handle_listener('on_selected') { model_binding.call(selected) }
+          when 'selected_item'
+            handle_listener('on_selected') { model_binding.call(selected_item) }
+          end
+        end
       end
     end
   end

data/lib/glimmer/libui/control_proxy/slider_proxy.rb

@@ -0,0 +1,38 @@
+# Copyright (c) 2021 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 'glimmer/libui/control_proxy'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      # Proxy for LibUI slider objects
+      #
+      # Follows the Proxy Design Pattern
+      class SliderProxy < ControlProxy
+        def data_bind(property, model_binding)
+          super
+          handle_listener('on_changed') { model_binding.call(value) } if property == 'value'
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/control_proxy/spinbox_proxy.rb

@@ -0,0 +1,38 @@
+# Copyright (c) 2021 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 'glimmer/libui/control_proxy'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      # Proxy for LibUI spinbox objects
+      #
+      # Follows the Proxy Design Pattern
+      class SpinboxProxy < ControlProxy
+        def data_bind(property, model_binding)
+          super
+          handle_listener('on_changed') { model_binding.call(value) } if property == 'value'
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/control_proxy.rb

@@ -245,8 +245,8 @@ module Glimmer
           args[0] = Glimmer::LibUI.boolean_to_integer(args.first) if BOOLEAN_PROPERTIES.include?(property) && (args.first.is_a?(TrueClass) || args.first.is_a?(FalseClass))
           args[0] = '' if STRING_PROPERTIES.include?(property) && args.first == nil
           if property.to_s == 'checked'
-            current_value = Glimmer::LibUI.integer_to_boolean(::LibUI.send("#{libui_api_keyword}_checked", @libui))
-            new_value = Glimmer::LibUI.integer_to_boolean(args[0])
+            current_value = Glimmer::LibUI.integer_to_boolean(::LibUI.send("#{libui_api_keyword}_checked", @libui), allow_nil: false)
+            new_value = Glimmer::LibUI.integer_to_boolean(args[0], allow_nil: false)
             ::LibUI.send("#{libui_api_keyword}_set_#{property}", @libui, *args) if new_value != current_value
           else
             ::LibUI.send("#{libui_api_keyword}_set_#{property}", @libui, *args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.8
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-28 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -247,22 +247,28 @@ files:
 - examples/basic_window2.rb
 - examples/button_counter.rb
 - examples/color_button.rb
+- examples/color_button2.rb
 - examples/color_the_circles.rb
 - examples/control_gallery.rb
 - examples/custom_draw_text.rb
 - examples/custom_draw_text2.rb
 - examples/date_time_picker.rb
+- examples/date_time_picker2.rb
 - examples/dynamic_area.rb
 - examples/dynamic_area2.rb
+- examples/dynamic_area3.rb
+- examples/dynamic_area4.rb
 - examples/editable_column_table.rb
 - examples/editable_table.rb
 - examples/font_button.rb
+- examples/font_button2.rb
 - examples/form.rb
 - examples/form2.rb
 - examples/form_table.rb
 - examples/form_table2.rb
 - examples/grid.rb
 - examples/histogram.rb
+- examples/histogram2.rb
 - examples/login.rb
 - examples/login2.rb
 - examples/login3.rb
@@ -272,6 +278,8 @@ files:
 - examples/method_based_custom_keyword.rb
 - examples/method_based_custom_keyword2.rb
 - examples/midi_player.rb
+- examples/midi_player2.rb
+- examples/midi_player3.rb
 - examples/simple_notepad.rb
 - examples/snake.rb
 - examples/snake/model/apple.rb
@@ -289,6 +297,7 @@ files:
 - examples/tic_tac_toe/board.rb
 - examples/tic_tac_toe/cell.rb
 - examples/timer.rb
+- examples/timer2.rb
 - glimmer-dsl-libui.gemspec
 - icons/glimmer.png
 - lib/glimmer-dsl-libui.rb
@@ -366,6 +375,8 @@ files:
 - lib/glimmer/libui/control_proxy/open_type_tag_proxy.rb
 - lib/glimmer/libui/control_proxy/path_proxy.rb
 - lib/glimmer/libui/control_proxy/radio_buttons_proxy.rb
+- lib/glimmer/libui/control_proxy/slider_proxy.rb
+- lib/glimmer/libui/control_proxy/spinbox_proxy.rb
 - lib/glimmer/libui/control_proxy/tab_item_proxy.rb
 - lib/glimmer/libui/control_proxy/table_proxy.rb
 - lib/glimmer/libui/control_proxy/text_proxy.rb