glimmer-dsl-libui 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8be478e9d224fabeac6b2d42b7ccae6f7063491c88b1ea14e90cf1665e379bdf
-  data.tar.gz: b8b9b58fe072ec1973263ae20dbbe5407d7dceb30290420dd6734397cd850918
+  metadata.gz: 19ebb3b2df3f14388664e392c4fbac8b121c6adf5638e78ddf308c7455c76c02
+  data.tar.gz: a631ed4518643c2d05ff39568f3fad815aa8729b01e1ee45ace9162bc9cf93be
 SHA512:
-  metadata.gz: 534bf3ffa94019746c5a1291af5d8a676766221ea299e627cbb38dd1e3814f941688b8cf0182f243b942e73180f2f642c93598ca4d03a3a2df36cc249459316a
-  data.tar.gz: 3d6a77dcaffdedc6149d2efdb05df1e01f6499114054d5d43f83d576abeed0791d7cc6138335087fbfbd4d29bd481b1c016e71fe4c40af963218fd6e5227b3be
+  metadata.gz: 9e0fccb89ce28c472c65cabc9ff1a6044cb19c3277e960e726ea7f642ccc2861f12b6c4ec1d31a562f7d05ce64a92dcb5696a544b9dd4a2ebad25e2cd82dd61b
+  data.tar.gz: 4429a478c94b4105c079ddcda93b247271bae083a5b6c3b91e9c76c895a3273b27fced8d37262555b5139a0a19c98e63224eee3eb9ac44d89d379db151fa72ae

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.0.13
+
+- Support examples/date_time_picker.rb
+- Support `date_time_picker`, `date_picker`, and `time_picker` controls having `time`/`time=`/`set_time` property
+
 ## 0.0.12
 
 - Have examples/meta_example.rb allow code editing to enable experimentation and learning

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.0.12
+# [<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.0.13
 ## 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)
@@ -43,7 +43,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
 
 ## Table of Contents
 
-- [Glimmer DSL for LibUI 0.0.12](#-glimmer-dsl-for-libui-0012)
+- [Glimmer DSL for LibUI 0.0.13](#-glimmer-dsl-for-libui-0013)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
   - [API](#api)
@@ -65,6 +65,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
     - [Control Gallery](#control-gallery)
     - [Font Button](#font-button)
     - [Color Button](#color-button)
+    - [Date Time Picker](#date-time-picker)
   - [Contributing to glimmer-dsl-libui](#contributing-to-glimmer-dsl-libui)
   - [Help](#help)
     - [Issues](#issues)
@@ -152,7 +153,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.0.12'
+gem 'glimmer-dsl-libui', '~> 0.0.13'
 ```
 
 Add `require 'glimmer-dsl-libui'` at the top, and then `include Glimmer` into the top-level main object for testing or into an actual class for serious usage.
@@ -186,7 +187,7 @@ Any control returned by a [Glimmer GUI DSL](#glimmer-gui-dsl-concepts) keyword d
 Example (you may copy/paste in [`girb`](#girb-glimmer-irb)):
 
 ```ruby
-w = window('hello world', 300, 200, 1)
+w = window('hello world')
 puts w.title # => hello world
 w.title = 'howdy'
 puts w.title # => howdy
@@ -199,7 +200,7 @@ Controls are wrapped as Ruby proxy objects, having a `#libui` method to obtain t
 Example (you may copy/paste in [`girb`](#girb-glimmer-irb)):
 
 ```ruby
-w = window('hello world', 300, 200, 1) # => #<Glimmer::LibUI::WindowProxy:0x00007fde4ea39fb0
+w = window('hello world') # => #<Glimmer::LibUI::WindowProxy:0x00007fde4ea39fb0
 w.libui # => #<Fiddle::Pointer:0x00007fde53997980 ptr=0x00007fde51352a60 size=0 free=0x0000000000000000>
 ```
 
@@ -212,8 +213,8 @@ Control(Args) | Properties | Listeners
 `checkbox(text as String)` | `checked` (Boolean), `text` (`String`) | `on_toggled`
 `combobox` | `items` (`Array` of `String`), `selected` (`Integer`) | `on_selected`
 `color_button` | `color` (Array of `red` as `Float`, `green` as `Float`, `blue` as `Float`, `alpha` as `Float`), `red` as `Float`, `green` as `Float`, `blue` as `Float`, `alpha` as `Float` | `on_changed`
-`date_picker` | `time` (`LibUI::FFI::TM`) | `on_changed`
-`date_time_picker` | `time` (`LibUI::FFI::TM`) | `on_changed`
+`date_picker` | `time` (`Hash` of keys: `sec` as `Integer`, `min` as `Integer`, `hour` as `Integer`, `mday` as `Integer`, `mon` as `Integer`, `year` as `Integer`, `wday` as `Integer`, `yday` as `Integer`, `dst` as Boolean) | `on_changed`
+`date_time_picker` | `time` (`Hash` of keys: `sec` as `Integer`, `min` as `Integer`, `hour` as `Integer`, `mday` as `Integer`, `mon` as `Integer`, `year` as `Integer`, `wday` as `Integer`, `yday` as `Integer`, `dst` as Boolean) | `on_changed`
 `editable_combobox` | `items` (`Array` of `String`), `text` (`String`) | `on_changed`
 `entry` | `read_only` (Boolean), `text` (`String`) | `on_changed`
 `font_button` | `font` [read-only] (`Hash` of keys: `:family`, `:size`, `:weight`, `:italic`, `:stretch`), `family` as `String`, `size` as `Float`, `weight` as `Integer`, `italic` as `Integer`, `stretch` as `Integer` | `on_changed`
@@ -235,7 +236,7 @@ Control(Args) | Properties | Listeners
 `spinbox(min as Numeric, max as Numeric)` | `value` (`Numeric`) | `on_changed`
 `tab` | `margined` (Boolean), `num_pages` (`Integer`) | None
 `tab_item(name as String)` | `index` [read-only] (`Integer`), `margined` (Boolean), `name` [read-only] (`String`) | None
-`time_picker` | `time` (`LibUI::FFI::TM`) | `on_changed`
+`time_picker` | `time` (`Hash` of keys: `sec` as `Integer`, `min` as `Integer`, `hour` as `Integer`, `mday` as `Integer`, `mon` as `Integer`, `year` as `Integer`, `wday` as `Integer`, `yday` as `Integer`, `dst` as Boolean) | `on_changed`
 `vertical_box` | `padded` (Boolean) | 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`
 
@@ -284,6 +285,7 @@ Control(Args) | Properties | Listeners
 - On the Mac, if no `menu` items were added, an automatic `quit_menu_item` is added to enable quitting with CTRL+Q
 - When destroying a control nested under a `horizontal_box` or `vertical_box`, it is automatically deleted from the box's children
 - When destroying a control nested under a `window` or `group`, it is automatically unset as their child to allow successful destruction
+- For `date_time_picker`, `date_picker`, and `time_picker`, make sure `time` hash values for `mon`, `wday`, and `yday` are 1-based instead of [libui](https://github.com/andlabs/libui) original 0-based values, and return `dst` as Boolean instead of `isdst` as `1`/`0`
 
 ### Original API
 
@@ -1465,8 +1467,6 @@ Linux
 New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
 
 ```ruby
-# frozen_string_literal: true
-
 require 'glimmer-dsl-libui'
 
 include Glimmer
@@ -1481,6 +1481,96 @@ window('color button', 230) {
 }.show
 ```
 
+### Date Time Picker
+
+[examples/date_time_picker.rb](examples/date_time_picker.rb)
+
+Run with this command from the root of the project if you cloned the project:
+
+```
+ruby -r './lib/glimmer-dsl-libui' examples/date_time_picker.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/date_time_picker'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-date-time-picker.png](images/glimmer-dsl-libui-mac-date-time-picker.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-date-time-picker.png](images/glimmer-dsl-libui-linux-date-time-picker.png)
+
+[LibUI](https://github.com/kojix2/LibUI) Original Version:
+
+```ruby
+require 'libui'
+
+UI = LibUI
+
+UI.init
+
+vbox = UI.new_vertical_box
+
+date_time_picker = UI.new_date_time_picker
+
+time = UI::FFI::TM.malloc
+
+UI.date_time_picker_on_changed(date_time_picker) do
+  UI.date_time_picker_time(date_time_picker, time)
+  p sec: time.tm_sec,
+    min: time.tm_min,
+    hour: time.tm_hour,
+    mday: time.tm_mday,
+    mon: time.tm_mon,
+    year: time.tm_year,
+    wday: time.tm_wday,
+    yday: time.tm_yday,
+    isdst: time.tm_isdst
+end
+UI.box_append(vbox, date_time_picker, 1)
+
+main_window = UI.new_window('Date Time Pickers', 300, 200, 1)
+UI.window_on_closing(main_window) do
+  puts 'Bye Bye'
+  UI.control_destroy(main_window)
+  UI.quit
+  0
+end
+UI.window_set_child(main_window, vbox)
+UI.control_show(main_window)
+
+UI.main
+UI.quit
+```
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Date Time Pickers', 300, 200) {
+  vertical_box {
+    date_time_picker { |dtp|
+      on_changed do
+        time = dtp.time
+        p time
+      end
+    }
+  }
+  
+  on_closing do
+    puts 'Bye Bye'
+  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.0.12
+0.0.13

data/examples/date_time_picker.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Date Time Pickers', 300, 200) {
+  vertical_box {
+    date_time_picker { |dtp|
+      on_changed do
+        time = dtp.time
+        p time
+      end
+    }
+  }
+  
+  on_closing do
+    puts 'Bye Bye'
+  end
+}.show

data/lib/glimmer/libui/date_picker_proxy.rb

@@ -27,6 +27,13 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class DatePickerProxy < DateTimePickerProxy
+      def time(value = nil)
+        if value.nil?
+          super.slice(:mday, :mon, :year, :wday, :yday)
+        else
+          super
+        end
+      end
     end
   end
 end

data/lib/glimmer/libui/date_time_picker_proxy.rb

@@ -30,6 +30,39 @@ module Glimmer
       def libui_api_keyword
         'date_time_picker'
       end
+      
+      def time(value = nil)
+        @time ||= ::LibUI::FFI::TM.malloc
+        ::LibUI.date_time_picker_time(@libui, @time)
+        if value.nil?
+          {
+            sec: @time.tm_sec,
+            min: @time.tm_min,
+            hour: @time.tm_hour,
+            mday: @time.tm_mday,
+            mon: @time.tm_mon + 1,
+            year: @time.tm_year + 1900,
+            wday: @time.tm_wday + 1,
+            yday: @time.tm_yday + 1,
+            dst: @time.tm_isdst == 1
+          }
+        else
+          @time.tm_sec = value[:sec] unless value[:sec].nil?
+          @time.tm_min = value[:min] unless value[:min].nil?
+          @time.tm_hour = value[:hour] unless value[:hour].nil?
+          @time.tm_mday = value[:mday] unless value[:mday].nil?
+          @time.tm_mon = value[:mon] - 1 unless value[:mon].nil?
+          @time.tm_year = value[:year] - 1900 unless value[:year].nil?
+          ::LibUI.date_time_picker_set_time(@libui, @time)
+        end
+      end
+      alias set_time time
+      alias time= time
+      
+      def destroy
+        Fiddle.free @time unless @time.nil?
+        super
+      end
     end
   end
 end

data/lib/glimmer/libui/time_picker_proxy.rb

@@ -27,6 +27,13 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class TimePickerProxy < DateTimePickerProxy
+      def time(value = nil)
+        if value.nil?
+          super.slice(:sec, :min, :hour)
+        else
+          super
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -186,6 +186,7 @@ files:
 - examples/basic_window2.rb
 - examples/color_button.rb
 - examples/control_gallery.rb
+- examples/date_time_picker.rb
 - examples/font_button.rb
 - examples/meta_example.rb
 - examples/midi_player.rb