glimmer-dsl-libui 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 748bd2b706f088ec5e69da3567dac4b59085b374507f9e3dd5e4a2b0432895a0
-  data.tar.gz: 8ff551d013d3d7524698c3ceaf7c5176e190e5ff6ca3bb8189de56a90fc2b3a1
+  metadata.gz: b34fe2a7db4662a9588587bd62efa37358ebe3f543d40d771471ff46406767b5
+  data.tar.gz: e743595f9c5f25d54da5ad7abdeb634d074487b9d724ab787b70abad3c4aa7e7
 SHA512:
-  metadata.gz: d2cff96b2dfe600c675feb491e9f396fb436b67430fa72dafd2ae88b69f06027a5cef250d18aa9872ed4329782e6ce7da14d78506e9786b8fc62426c9f985455
-  data.tar.gz: c6b565cf1aba0f603c1233a8411a4ad25f78821f832f0576cf97cad7ebf9b06a0b8f1b3d83200a79da5d998fa5849d10e47b2e9257069dc0fdfe6a1cfdb6b57f
+  metadata.gz: df37167d19bb74775589ab3471578d75d4ff485f5f85076cf986617fa9190adc1075eda7e87c133e15517f907efdcc7b985bc37dcd02cabde382fd11afcf76ae
+  data.tar.gz: a0cc3fae77a4d382035ddeaae2671953283a1bc148f3dcfab89c037eb5ba6bbbc1527579890fde4794cea8ed85ca04b4ef65d23ea482589c6a786581487a301d

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 0.1.11
+
+- New examples/login.rb
+- Amend examples/form_table.rb with use of a `search_entry` to support table filtering
+- Support `password_entry` control
+- Support `search_entry` control
+- Fix issue with setting control `enabled` property
+
 ## 0.1.10
 
 - Upgrade to glimmer 2.2.1

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for LibUI 0.1.10
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for LibUI 0.1.11
 ## Prerequisite-Free Ruby Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-libui.svg)](http://badge.fury.io/rb/glimmer-dsl-libui)
 [![Maintainability](https://api.codeclimate.com/v1/badges/ce2853efdbecf6ebdc73/maintainability)](https://codeclimate.com/github/AndyObtiva/glimmer-dsl-libui/maintainability)
@@ -191,7 +191,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
 
 ## Table of Contents
 
-- [Glimmer DSL for LibUI 0.1.10](#-glimmer-dsl-for-libui-0110)
+- [Glimmer DSL for LibUI 0.1.10](#-glimmer-dsl-for-libui-0111)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
   - [Girb (Glimmer IRB)](#girb-glimmer-irb)
@@ -234,6 +234,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
     - [Area Gallery](#area-gallery)
     - [Histogram](#histogram)
     - [Basic Transform](#basic-transform)
+    - [Login](#login)
   - [Contributing to glimmer-dsl-libui](#contributing-to-glimmer-dsl-libui)
   - [Help](#help)
     - [Issues](#issues)
@@ -429,6 +430,7 @@ Control(Args) | Properties | Listeners
 `msg_box(window = main_window as Glimmer::LibUI::WindowProxy, title as String, description as String)` | None | None
 `msg_box_error(window = main_window as Glimmer::LibUI::WindowProxy, title as String, description as String)` | None | None
 `non_wrapping_multiline_entry` | `read_only` (Boolean), `text` (`String`) | `on_changed`
+`password_entry` | `read_only` (Boolean), `text` (`String`) | `on_changed`
 `path(draw_fill_mode = :winding)` | `fill` (`Hash` of `:r` as `0`-`255`, `:g` as `0`-`255`, `:b` as `0`-`255`, `:a` as `0.0`-`1.0`), `stroke` (`Hash` of `:r` as `0`-`255`, `:g` as `0`-`255`, `:b` as `0`-`255`, `:a` as `0.0`-`1.0`, `:cap` as (`:round`, `:square`, `:flat`), `:join` as (`:miter`, `:round`, `:bevel`), `:thickness` as `Numeric`, `:miter_limit` as `Numeric`, `:dashes` as `Array` of `Numeric` ) | None
 `preferences_menu_item` | None | `on_clicked`
 `progress_bar` | `value` (`Numeric`) | None
@@ -436,6 +438,7 @@ Control(Args) | Properties | Listeners
 `quit_menu_item` | None | `on_clicked`
 `radio_buttons` | `selected` (`Integer`) | `on_selected`
 `rectangle(x as Numeric, y as Numeric, width as Numeric, height as Numeric)` |  `x` (`Numeric`), `y` (`Numeric`), `width` (`Numeric`), `height` (`Numeric`) | None
+`search_entry` | `read_only` (Boolean), `text` (`String`) | `on_changed`
 `slider(min as Numeric, max as Numeric)` | `value` (`Numeric`) | `on_changed`
 `spinbox(min as Numeric, max as Numeric)` | `value` (`Numeric`) | `on_changed`
 `square(x as Numeric, y as Numeric, length as Numeric)` | `x` (`Numeric`), `y` (`Numeric`), `length` (`Numeric`) | None
@@ -445,6 +448,7 @@ Control(Args) | Properties | Listeners
 `text_column(name as String)` | `editable` (Boolean) | None
 `time_picker` | `time` (`Hash` of keys: `sec` as `Integer`, `min` as `Integer`, `hour` as `Integer`) | `on_changed`
 `vertical_box` | `padded` (Boolean) | None
+`vertical_separator` | None | None
 `window(title as String, width as Integer, height as Integer, has_menubar as Boolean)` | `borderless` (Boolean), `content_size` (width `Numeric`, height `Numeric`), `fullscreen` (Boolean), `margined` (Boolean), `title` (`String`) | `on_closing`, `on_content_size_changed`, `on_destroy`
 
 ### Common Control Properties
@@ -2995,15 +2999,19 @@ Mac
 
 ![glimmer-dsl-libui-mac-form-table.png](images/glimmer-dsl-libui-mac-form-table.png)
 ![glimmer-dsl-libui-mac-form-table-contact-entered.png](images/glimmer-dsl-libui-mac-form-table-contact-entered.png)
+![glimmer-dsl-libui-mac-form-table-filtered.png](images/glimmer-dsl-libui-mac-form-table-filtered.png)
 
 Linux
 
 ![glimmer-dsl-libui-linux-form-table.png](images/glimmer-dsl-libui-linux-form-table.png)
 ![glimmer-dsl-libui-linux-form-table-contact-entered.png](images/glimmer-dsl-libui-linux-form-table-contact-entered.png)
+![glimmer-dsl-libui-linux-form-table-filtered.png](images/glimmer-dsl-libui-linux-form-table-filtered.png)
 
 New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
 
 ```ruby
+# frozen_string_literal: true
+
 require 'glimmer-dsl-libui'
 
 include Glimmer
@@ -3049,6 +3057,7 @@ window('Contacts', 600, 600) { |w|
           msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
         else
           data << new_row # automatically inserts a row into the table due to implicit data-binding
+          @unfiltered_data = data.dup
           @name_entry.text = ''
           @email_entry.text = ''
           @phone_entry.text = ''
@@ -3058,6 +3067,25 @@ window('Contacts', 600, 600) { |w|
       end
     }
     
+    search_entry { |se|
+      stretchy false
+      
+      on_changed do
+        filter_value = se.text
+        @unfiltered_data ||= data.dup
+        # Unfilter first to remove any previous filters
+        data.replace(@unfiltered_data) # affects table indirectly through implicit data-binding
+        # Now, apply filter if entered
+        unless filter_value.empty?
+          data.filter! do |row_data| # affects table indirectly through implicit data-binding
+            row_data.any? do |cell|
+              cell.to_s.downcase.include?(filter_value.downcase)
+            end
+          end
+        end
+      end
+    }
+    
     table {
       text_column('Name')
       text_column('Email')
@@ -4384,6 +4412,80 @@ window('Basic Transform', 350, 350) {
 }.show
 ```
 
+### Login
+
+[examples/login.rb](examples/login.rb)
+
+Run with this command from the root of the project if you cloned the project:
+
+```
+ruby -r './lib/glimmer-dsl-libui' examples/login.rb
+```
+
+Run with this command if you installed the [Ruby gem](https://rubygems.org/gems/glimmer-dsl-libui):
+
+```
+ruby -r glimmer-dsl-libui -e "require 'examples/login'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-login.png](images/glimmer-dsl-libui-mac-login.png)
+![glimmer-dsl-libui-mac-login-logged-in.png](images/glimmer-dsl-libui-mac-login-logged-in.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-login.png](images/glimmer-dsl-libui-linux-login.png)
+![glimmer-dsl-libui-linux-login-logged-in.png](images/glimmer-dsl-libui-linux-login-logged-in.png)
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Login') {
+  margined true
+  
+  vertical_box {
+    form {
+      @username_entry = entry {
+        label 'Username:'
+      }
+      
+      @password_entry = password_entry {
+        label 'Password:'
+      }
+    }
+    
+    horizontal_box {
+      @login_button = button('Login') {
+        on_clicked do
+          @username_entry.enabled = false
+          @password_entry.enabled = false
+          @login_button.enabled = false
+          @logout_button.enabled = true
+        end
+      }
+      
+      @logout_button = button('Logout') {
+        enabled false
+        
+        on_clicked do
+          @username_entry.text = ''
+          @password_entry.text = ''
+          @username_entry.enabled = true
+          @password_entry.enabled = true
+          @login_button.enabled = true
+          @logout_button.enabled = false
+        end
+      }
+    }
+  }
+}.show
+```
+
 ## Contributing to glimmer-dsl-libui
 
 -   Check out the latest master to make sure the feature hasn't been

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/examples/control_gallery.rb

@@ -78,7 +78,7 @@ MAIN_WINDOW = window('Control Gallery', 600, 500) {
           date_picker { stretchy false }
 
           time_picker { stretchy false }
-
+          
           date_time_picker { stretchy false }
 
           font_button { stretchy false }

data/examples/form_table.rb

@@ -45,6 +45,7 @@ window('Contacts', 600, 600) { |w|
           msg_box_error(w, 'Validation Error!', 'All fields are required! Please make sure to enter a value for all fields.')
         else
           data << new_row # automatically inserts a row into the table due to implicit data-binding
+          @unfiltered_data = data.dup
           @name_entry.text = ''
           @email_entry.text = ''
           @phone_entry.text = ''
@@ -54,6 +55,25 @@ window('Contacts', 600, 600) { |w|
       end
     }
     
+    search_entry { |se|
+      stretchy false
+      
+      on_changed do
+        filter_value = se.text
+        @unfiltered_data ||= data.dup
+        # Unfilter first to remove any previous filters
+        data.replace(@unfiltered_data) # affects table indirectly through implicit data-binding
+        # Now, apply filter if entered
+        unless filter_value.empty?
+          data.filter! do |row_data| # affects table indirectly through implicit data-binding
+            row_data.any? do |cell|
+              cell.to_s.downcase.include?(filter_value.downcase)
+            end
+          end
+        end
+      end
+    }
+    
     table {
       text_column('Name')
       text_column('Email')

data/examples/login.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Login') {
+  margined true
+  
+  vertical_box {
+    form {
+      @username_entry = entry {
+        label 'Username:'
+      }
+      
+      @password_entry = password_entry {
+        label 'Password:'
+      }
+    }
+    
+    horizontal_box {
+      @login_button = button('Login') {
+        on_clicked do
+          @username_entry.enabled = false
+          @password_entry.enabled = false
+          @login_button.enabled = false
+          @logout_button.enabled = true
+        end
+      }
+      
+      @logout_button = button('Logout') {
+        enabled false
+        
+        on_clicked do
+          @username_entry.text = ''
+          @password_entry.text = ''
+          @username_entry.enabled = true
+          @password_entry.enabled = true
+          @login_button.enabled = true
+          @logout_button.enabled = false
+        end
+      }
+    }
+  }
+}.show

data/lib/glimmer/libui/control_proxy/area_proxy/scrolling_area_proxy.rb

@@ -0,0 +1,40 @@
+# 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/area_proxy'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      class AreaProxy < ControlProxy
+        # Proxy for LibUI scrolling area objects
+        #
+        # Follows the Proxy Design Pattern
+        class ScrollingAreaProxy < AreaProxy
+          def build_control
+            @area_handler = ::LibUI::FFI::AreaHandler.malloc
+            @libui    = ::LibUI.new_scrolling_area(@area_handler, *@args)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -55,6 +55,10 @@ module Glimmer
         
         attr_reader :area_handler
         
+        def libui_api_keyword
+          'area'
+        end
+        
         def post_add_content
           super
           install_listeners
@@ -193,3 +197,5 @@ module Glimmer
     end
   end
 end
+
+Dir[File.expand_path("./#{File.basename(__FILE__, '.rb')}/*.rb", __dir__)].each {|f| require f}

data/lib/glimmer/libui/control_proxy/entry_proxy/password_entry_proxy.rb

@@ -0,0 +1,36 @@
+# 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/entry_proxy'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      class EntryProxy < ControlProxy
+        # Proxy for LibUI password entry objects
+        #
+        # Follows the Proxy Design Pattern
+        class PasswordEntryProxy < EntryProxy
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/control_proxy/entry_proxy/search_entry_proxy.rb

@@ -0,0 +1,36 @@
+# 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/entry_proxy'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      class EntryProxy < ControlProxy
+        # Proxy for LibUI search entry objects
+        #
+        # Follows the Proxy Design Pattern
+        class SearchEntryProxy < EntryProxy
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# 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 entry objects
+      #
+      # Follows the Proxy Design Pattern
+      class EntryProxy < ControlProxy
+        def libui_api_keyword
+          'entry'
+        end
+      end
+    end
+  end
+end
+
+Dir[File.expand_path("./#{File.basename(__FILE__, '.rb')}/*.rb", __dir__)].each {|f| require f}

data/lib/glimmer/libui/control_proxy.rb

@@ -280,6 +280,7 @@ module Glimmer
         if value.nil?
           @enabled
         elsif value != @enabled
+          @enabled = value == 1 || value
           if value == 1 || value
             send_to_libui('enable')
           else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Andy Maleh
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -238,6 +238,7 @@ files:
 - examples/form_table.rb
 - examples/grid.rb
 - examples/histogram.rb
+- examples/login.rb
 - examples/meta_example.rb
 - examples/midi_player.rb
 - examples/simple_notepad.rb
@@ -256,6 +257,7 @@ files:
 - lib/glimmer/libui.rb
 - lib/glimmer/libui/control_proxy.rb
 - lib/glimmer/libui/control_proxy/area_proxy.rb
+- lib/glimmer/libui/control_proxy/area_proxy/scrolling_area_proxy.rb
 - lib/glimmer/libui/control_proxy/box.rb
 - lib/glimmer/libui/control_proxy/box/horizontal_box_proxy.rb
 - lib/glimmer/libui/control_proxy/box/vertical_box_proxy.rb
@@ -278,6 +280,9 @@ files:
 - lib/glimmer/libui/control_proxy/editable_column.rb
 - lib/glimmer/libui/control_proxy/editable_combobox_proxy.rb
 - lib/glimmer/libui/control_proxy/enableable_column.rb
+- lib/glimmer/libui/control_proxy/entry_proxy.rb
+- lib/glimmer/libui/control_proxy/entry_proxy/password_entry_proxy.rb
+- lib/glimmer/libui/control_proxy/entry_proxy/search_entry_proxy.rb
 - lib/glimmer/libui/control_proxy/font_button_proxy.rb
 - lib/glimmer/libui/control_proxy/form_proxy.rb
 - lib/glimmer/libui/control_proxy/grid_proxy.rb