glimmer-dsl-tk 0.0.42 → 0.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbb49ce9e435d0313cdec33a81afec3ad4d7716ee6e8363004651417d3535704
-  data.tar.gz: 9ad46f88ace884c5d670d2449728369af8510b95e24c291a3bda7580cef65820
+  metadata.gz: e07fd35aa994530b829c419c68d6ddb23e443055e374f1777ef78e1b4f3235c2
+  data.tar.gz: d543e113f866f4f28c5093f4d69b86910387bf4630b8ad58e64877f83bd054e4
 SHA512:
-  metadata.gz: d58a0179466efe9991f53eefb23c6dd3749c386230d70722e0a6c3f24c85f2affc361e18c21d65b34b2cb37269dfb8c7ceff9953a1bc5059f1db971051b0c4c8
-  data.tar.gz: bad07c9519d483534306b04be7e4d110fe302c6dc3f03028d85aa5c85fcfe01437c0471d58b49e3db013abc99d6f55535d5aefacc4bdc651df50b30ecda467e0
+  metadata.gz: 99ce3e9598f70e10b3a4ee882f584cbfca9d6f41bce358f71e7028911ad2274788c55428175a1805484dfcd3dc6251da7251d592d0312861bf96872966626ba5
+  data.tar.gz: 96fdf7e866610ced773cdaa62bc097b0eac5845d57691d860053b78b543205e343c00f23a45a0d7e32471d33070b89359a021ccafff71d75ba230bb6f2da3889

data/CHANGELOG.md

@@ -1,10 +1,17 @@
 # Change Log
 
+## 0.0.43
+
+- Modified Hello, Drag and Drop! to include a list
+- Removed the need to require `'glimmer/tk/drag_and_drop_extension'` to do drag and drop; it is automatically included in `require 'glimmer-dsl-tk'` now.
+- Remove 'os' gem due to Tk having the capability to detect the OS it is on using `Tk.windowingsystem` (include Glimmer implementation of `OS` class having `OS.mac?`, `OS.windows?` and `OS.linux?`)
+- Default to 'clam' Tk theme on Linux ('alt' looks a bit too classic with certain widgets)
+
 ## 0.0.42
 
 - Add vertical/horizontal scrollbars to Meta-Sample
 - Keep only vertical scrollbar in Hello, Text!
-- Fix issue with including bwidgets and iwidgets in Windows
+- Fix issue with including bwidgets and iwidgets in Windows (by removing from default requires, leaving to users to require manually when needed only and only systems that support them)
 - Fix Hello, Menu Bar! sample in Windows (by disabling Windows-special System menu, which does not seem to be working in Tk)
 
 ## 0.0.41

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 Tk 0.0.42
+# [<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 Tk 0.0.43
 ## MRI Ruby Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-tk.svg)](http://badge.fury.io/rb/glimmer-dsl-tk)
 [![Ruby](https://github.com/AndyObtiva/glimmer-dsl-tk/actions/workflows/ruby.yml/badge.svg)](https://github.com/AndyObtiva/glimmer-dsl-tk/actions/workflows/ruby.yml)
@@ -181,7 +181,7 @@ gem install glimmer-dsl-tk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-tk', '0.0.42'
+gem 'glimmer-dsl-tk', '0.0.43'
 ```
 
 And, then run:
@@ -2683,27 +2683,31 @@ Glimmer app:
 Glimmer code (from [samples/hello/hello_drag_and_drop.rb](samples/hello/hello_drag_and_drop.rb)):
 
 ```ruby
-require "glimmer-dsl-tk"
-require "glimmer/tk/drag_and_drop_extension"
+require 'glimmer-dsl-tk'
 
 include Glimmer
 
 root {
   title "Hello, Drag and Drop!"
+  
   frame {
     padding 5
+    
     labelframe {
       text "Drag sources"
       padding 5
+      
       label {
-        text "Entry"
         grid :row => 0, :column => 0
+        text "Entry"
       }
+      
       entry {
+        grid :row => 0, :column => 1, :pady => 5, :sticky => "e"
         text "Drag entry text"
         width 30
-        grid :row => 0, :column => 1, :pady => 5, :sticky => "e"
-        on_drag_start { |event|
+        
+        on_drag_start do |event|
           event.data = event.source.textvariable&.value
           event.source.configure(:cursor => "hand2")
           TkLabel.new(event.tooltip) {
@@ -2712,111 +2716,166 @@ root {
             bitmap "warning"
             compound "right"
           }.pack
-        }
-        on_drag_motion { |event|
+        end
+        
+        on_drag_motion do |event|
           if event.drop_accepted
             event.source.configure(:cursor => "hand1")
           else
             event.source.configure(:cursor => "hand2")
           end
           event.tooltip.geometry("+#{event.x_root + 10}+#{event.y_root - 4}")
-        }
+        end
       }
+      
       label {
-        text "Label"
         grid :row => 1, :column => 0
+        text "Label"
       }
+      
       label {
+        grid :row => 1, :column => 1, :pady => 10, :sticky => "e"
         text "Drag label text"
         width 30
-        grid :row => 1, :column => 1, :pady => 10, :sticky => "e"
         drag_source true
       }
+      
       label {
-        text "Combobox"
         grid :row => 2, :column => 0
+        text "Combobox"
       }
+      
       combobox {
+        grid :row => 2, :column => 1, :pady => 5, :sticky => "e"
         text "Spain"
         values %w[USA Canada Mexico Columbia UK Australia Germany Italy Spain]
         width 27
-        grid :row => 2, :column => 1, :pady => 5, :sticky => "e"
-        on_drag_start { |event|
+        
+        on_drag_start do |event|
           event.data = event.source.textvariable&.value
-        }
+        end
       }
+      
       label {
-        text "Button"
         grid :row => 3, :column => 0
+        text 'List'
+      }
+      
+      country_list = list {
+        grid :row => 3, :column => 1, :pady => 5, :sticky => "e"
+        selectmode 'browse'
+        items %w[USA Canada Mexico]
+        selection 'Canada'
+        height 3
+        
+        on_drag_start do |event|
+          event.data = event.source.selection.to_a.first.text
+        end
+      }
+      
+      label {
+        grid :row => 4, :column => 0
+        text "Button"
       }
+      
       button {
+        grid :row => 4, :column => 1, :pady => 5, :sticky => "w"
         text "Drag it"
-        grid :row => 3, :column => 1, :pady => 5, :sticky => "w"
         drag_source true
       }
     }
 
     labelframe {
-      text "Drop targets"
       grid :sticky => "nsew", :pady => 15
+      text "Drop targets"
       padding 5
+      
       label {
-        text "Entry"
         grid :row => 0, :column => 0
+        text "Entry"
       }
+      
       entry {
-        width 30
         grid :row => 0, :column => 1, :pady => 5, :sticky => "e"
+        width 30
+        
         on_drop { |event|
           event.target.textvariable.value = event.data
         }
       }
+      
       label {
-        text "Label"
         grid :row => 1, :column => 0
+        text "Label"
       }
+      
       label {
-        width 30
         grid :row => 1, :column => 1, :pady => 10, :sticky => "e"
+        width 30
         borderwidth 2
         relief "solid"
-        on_drop { |event|
+        
+        on_drop do |event|
           event.target.textvariable.value = event.data
-        }
+        end
       }
+      
       label {
-        text "Combobox"
         grid :row => 2, :column => 0
+        text "Combobox"
       }
+      
       combobox {
-        width 27
         grid :row => 2, :column => 1, :pady => 5, :sticky => "e"
-        on_drop { |event|
+        width 27
+        
+        on_drop do |event|
           event.target.textvariable.value = event.data
-        }
+        end
+      }
+      
+      label {
+        grid :row => 3, :column => 0
+        text 'List'
+      }
+      
+      list {
+        grid :row => 3, :column => 1, :pady => 5, :sticky => "e"
+        selectmode 'browse'
+        height 3
+        
+        on_drop do |event|
+          event.target.insert('', 'end', :text => event.data)
+        end
       }
+      
       label {
+        grid :row => 4, :column => 0
         text "Button"
-        grid :row => 3, :column => 0
       }
+      
       button {
+        grid :row => 4, :column => 1, :pady => 5, :sticky => "w"
         text "Drop here"
-        grid :row => 3, :column => 1, :pady => 5, :sticky => "w"
-        on_drop { |event|
+        
+        on_drop do |event|
           event.target.text = event.data
-        }
+        end
       }
+      
       label {
+        grid :row => 5, :column => 0
         text "Checkbutton"
-        grid :row => 4, :column => 0
       }
+      
       checkbutton {
+        grid :row => 5, :column => 1, :pady => 5, :sticky => "w"
         text "Drop here to destroy a widget\n(except button)"
-        grid :row => 4, :column => 1, :pady => 5, :sticky => "w"
-        on_drop { |event|
+        
+        on_drop do |event|
           event.target.text = event.data
           event.source.destroy unless event.source.is_a? Tk::Button
-        }
+        end
       }
     }
   }

data/VERSION

@@ -1 +1 @@
-0.0.42
+0.0.43

data/lib/glimmer/tk/widget_proxy.rb

@@ -49,10 +49,10 @@ module Glimmer
           # TODO consider exposing this via Glimmer::Config
           potential_tk_widget_class_names = [
             "::Tk::Tile::#{tk_widget_class_basename}",
-            "::Tk::BWidget::#{tk_widget_class_basename}",
-            "::Tk::Iwidgets::#{tk_widget_class_basename}",
             "::Tk#{tk_widget_class_basename}",
             "::Tk::#{tk_widget_class_basename}",
+            "::Tk::BWidget::#{tk_widget_class_basename}",
+            "::Tk::Iwidgets::#{tk_widget_class_basename}",
             "::Glimmer::Tk::#{tk_widget_class_basename}Proxy",
           ]
           tk_widget_class = nil

data/lib/glimmer-dsl-tk.rb

@@ -39,6 +39,7 @@ require 'delegate'
 # require 'ext/glimmer/config'
 # require 'ext/glimmer'
 require 'glimmer/dsl/tk/dsl'
+require 'glimmer/tk/drag_and_drop_extension'
 
 Glimmer::Config.loop_max_count = -1
 
@@ -48,7 +49,7 @@ Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
   result ||= method == 'load_iseq'
 end
 
-Tk::Tile::Style.theme_use 'alt' if OS.linux?
+Tk::Tile::Style.theme_use 'clam' if OS.linux?
 
 ::TkOption.add '*tearOff', 0
 

data/lib/os.rb

@@ -0,0 +1,36 @@
+# Copyright (c) 2020-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.
+
+class OS
+  class << self
+    def mac?
+      Tk.windowingsystem == 'aqua'
+    end
+    
+    def windows?
+      Tk.windowingsystem == 'win32'
+    end
+    
+    def linux?
+      Tk.windowingsystem == 'x11'
+    end
+  end
+end

data/samples/hello/hello_drag_and_drop.rb

@@ -19,27 +19,31 @@
 # 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-dsl-tk"
-require "glimmer/tk/drag_and_drop_extension"
+require 'glimmer-dsl-tk'
 
 include Glimmer
 
 root {
   title "Hello, Drag and Drop!"
+  
   frame {
     padding 5
+    
     labelframe {
       text "Drag sources"
       padding 5
+      
       label {
-        text "Entry"
         grid :row => 0, :column => 0
+        text "Entry"
       }
+      
       entry {
+        grid :row => 0, :column => 1, :pady => 5, :sticky => "e"
         text "Drag entry text"
         width 30
-        grid :row => 0, :column => 1, :pady => 5, :sticky => "e"
-        on_drag_start { |event|
+        
+        on_drag_start do |event|
           event.data = event.source.textvariable&.value
           event.source.configure(:cursor => "hand2")
           TkLabel.new(event.tooltip) {
@@ -48,111 +52,166 @@ root {
             bitmap "warning"
             compound "right"
           }.pack
-        }
-        on_drag_motion { |event|
+        end
+        
+        on_drag_motion do |event|
           if event.drop_accepted
             event.source.configure(:cursor => "hand1")
           else
             event.source.configure(:cursor => "hand2")
           end
           event.tooltip.geometry("+#{event.x_root + 10}+#{event.y_root - 4}")
-        }
+        end
       }
+      
       label {
-        text "Label"
         grid :row => 1, :column => 0
+        text "Label"
       }
+      
       label {
+        grid :row => 1, :column => 1, :pady => 10, :sticky => "e"
         text "Drag label text"
         width 30
-        grid :row => 1, :column => 1, :pady => 10, :sticky => "e"
         drag_source true
       }
+      
       label {
-        text "Combobox"
         grid :row => 2, :column => 0
+        text "Combobox"
       }
+      
       combobox {
+        grid :row => 2, :column => 1, :pady => 5, :sticky => "e"
         text "Spain"
         values %w[USA Canada Mexico Columbia UK Australia Germany Italy Spain]
         width 27
-        grid :row => 2, :column => 1, :pady => 5, :sticky => "e"
-        on_drag_start { |event|
+        
+        on_drag_start do |event|
           event.data = event.source.textvariable&.value
-        }
+        end
       }
+      
       label {
-        text "Button"
         grid :row => 3, :column => 0
+        text 'List'
+      }
+      
+      country_list = list {
+        grid :row => 3, :column => 1, :pady => 5, :sticky => "e"
+        selectmode 'browse'
+        items %w[USA Canada Mexico]
+        selection 'Canada'
+        height 3
+        
+        on_drag_start do |event|
+          event.data = event.source.selection.to_a.first.text
+        end
+      }
+      
+      label {
+        grid :row => 4, :column => 0
+        text "Button"
       }
+      
       button {
+        grid :row => 4, :column => 1, :pady => 5, :sticky => "w"
         text "Drag it"
-        grid :row => 3, :column => 1, :pady => 5, :sticky => "w"
         drag_source true
       }
     }
 
     labelframe {
-      text "Drop targets"
       grid :sticky => "nsew", :pady => 15
+      text "Drop targets"
       padding 5
+      
       label {
-        text "Entry"
         grid :row => 0, :column => 0
+        text "Entry"
       }
+      
       entry {
-        width 30
         grid :row => 0, :column => 1, :pady => 5, :sticky => "e"
+        width 30
+        
         on_drop { |event|
           event.target.textvariable.value = event.data
         }
       }
+      
       label {
-        text "Label"
         grid :row => 1, :column => 0
+        text "Label"
       }
+      
       label {
-        width 30
         grid :row => 1, :column => 1, :pady => 10, :sticky => "e"
+        width 30
         borderwidth 2
         relief "solid"
-        on_drop { |event|
+        
+        on_drop do |event|
           event.target.textvariable.value = event.data
-        }
+        end
       }
+      
       label {
-        text "Combobox"
         grid :row => 2, :column => 0
+        text "Combobox"
       }
+      
       combobox {
-        width 27
         grid :row => 2, :column => 1, :pady => 5, :sticky => "e"
-        on_drop { |event|
+        width 27
+        
+        on_drop do |event|
           event.target.textvariable.value = event.data
-        }
+        end
       }
+      
       label {
-        text "Button"
         grid :row => 3, :column => 0
+        text 'List'
+      }
+      
+      list {
+        grid :row => 3, :column => 1, :pady => 5, :sticky => "e"
+        selectmode 'browse'
+        height 3
+        
+        on_drop do |event|
+          event.target.insert('', 'end', :text => event.data)
+        end
+      }
+      
+      label {
+        grid :row => 4, :column => 0
+        text "Button"
       }
+      
       button {
+        grid :row => 4, :column => 1, :pady => 5, :sticky => "w"
         text "Drop here"
-        grid :row => 3, :column => 1, :pady => 5, :sticky => "w"
-        on_drop { |event|
+        
+        on_drop do |event|
           event.target.text = event.data
-        }
+        end
       }
+      
       label {
+        grid :row => 5, :column => 0
         text "Checkbutton"
-        grid :row => 4, :column => 0
       }
+      
       checkbutton {
+        grid :row => 5, :column => 1, :pady => 5, :sticky => "w"
         text "Drop here to destroy a widget\n(except button)"
-        grid :row => 4, :column => 1, :pady => 5, :sticky => "w"
-        on_drop { |event|
+        
+        on_drop do |event|
           event.target.text = event.data
           event.source.destroy unless event.source.is_a? Tk::Button
-        }
+        end
       }
     }
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-tk
 version: !ruby/object:Gem::Version
-  version: 0.0.42
+  version: 0.0.43
 platform: ruby
 authors:
 - AndyMaleh
@@ -38,26 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.1
-- !ruby/object:Gem::Dependency
-  name: os
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: tk
   requirement: !ruby/object:Gem::Requirement
@@ -246,6 +226,7 @@ files:
 - lib/glimmer/tk/treeview_proxy.rb
 - lib/glimmer/tk/variable_owner.rb
 - lib/glimmer/tk/widget_proxy.rb
+- lib/os.rb
 - samples/elaborate/meta_sample.rb
 - samples/hello/hello_built_in_dialog.rb
 - samples/hello/hello_button.rb