glimmer-dsl-tk 0.0.38 → 0.0.42

data/samples/hello/hello_menu_bar.rb

@@ -25,7 +25,7 @@ include Glimmer
 
 COLORS = [:white, :red, :yellow, :green, :blue, :magenta, :gray, :black]
 
-Tk::Tile::Style.theme_use "classic" # this enables setting background on label just for demo purposes
+Tk::Tile::Style.theme_use 'classic' if OS.mac? # this enables setting background on label just for demo purposes
 
 root { |r|
   title 'Hello, Menu Bar!'
@@ -38,51 +38,87 @@ root { |r|
   }
   
   menu {
+    # Mac-specific application menu (right next to the Apple menu)
+    if OS.mac?
+      menu(:application) {
+        menu_item(:about, label: 'About My Application') {
+          accelerator 'Command+A'
+          
+          on('command') do
+            message_box(parent: r, title: 'About', message: 'About my application.')
+          end
+        }
+        
+        menu_item(:preferences) {
+          on('command') do
+            message_box(parent: r, title: 'Preferences', message: 'Preferences of my application.')
+          end
+        }
+        
+        # If not defined, application simply quits upon selecting Quit menu item
+        menu_item(:quit) {
+          on('command') do
+            message_box(parent: r, title: 'Quit', message: 'Quitting my application...')
+            exit(0)
+          end
+        }
+      }
+    end
+    
     menu(label: 'File', underline: 0) {
       menu_item(label: 'New', underline: 0) {
-        accelerator 'Command+N'
+        accelerator OS.mac? ? 'Command+N' : 'Control+N'
 
         on('command') do
           message_box(parent: r, title: 'New', message: 'New file created.')
         end
       }
+      
       menu_item(label: 'Open...', underline: 0) {
-        accelerator 'Command+O'
+        accelerator OS.mac? ? 'Command+O' : 'Control+O'
 
         on('command') do
           message_box(parent: r, title: 'Open', message: 'Opening File...')
         end
       }
+      
       menu(label: 'Open Recent', underline: 5) {
         menu_item(label: 'File 1') {
           on('command') do
             message_box(parent: r, title: 'File 1', message: 'File 1 Contents')
           end
         }
+        
         menu_item(label: 'File 2') {
           on('command') do
             message_box(parent: r, title: 'File 2', message: 'File 2 Contents')
           end
         }
       }
+      
       menu_item(:separator)
+      
       menu_item(label: 'Exit', underline: 1) {
         on('command') do
           exit(0)
         end
       }
     }
+    
     menu(label: 'Edit', underline: 0) {
       menu_item(label: 'Cut', underline: 2) {
-        accelerator 'Command+X'
+        accelerator OS.mac? ? 'Command+X' : 'Control+X'
       }
+      
       menu_item(label: 'Copy', underline: 0) {
-        accelerator 'Command+C'
+        accelerator OS.mac? ? 'Command+C' : 'Control+C'
       }
+      
       menu_item(label: 'Paste', underline: 0) {
-        accelerator 'Command+V'
+        accelerator OS.mac? ? 'Command+V' : 'Control+V'
       }
     }
+    
     menu(label: 'Options', underline: 0) {
       menu_item(:checkbutton, label: 'Enabled', underline: 0) {
         on('command') do
@@ -90,7 +126,8 @@ root { |r|
           @select_multiple_menu.children.each { |menu_item| menu_item.state = menu_item.state == 'disabled' ? 'normal' : 'disabled' }
         end
       }
-      @select_one_menu = menu(label: 'Select One', underline: 0) {
+      
+      @select_one_menu = menu(label: 'Select One', underline: 7) {
         menu_item(:radiobutton, label: 'Option 1') {
           state 'disabled'
         }
@@ -101,7 +138,8 @@ root { |r|
           state 'disabled'
         }
       }
-      @select_multiple_menu = menu(label: 'Select Multiple', underline: 0) {
+      
+      @select_multiple_menu = menu(label: 'Select Multiple', underline: 7) {
         menu_item(:checkbutton, label: 'Option 4') {
           state 'disabled'
         }
@@ -113,7 +151,27 @@ root { |r|
         }
       }
     }
-    menu(label: 'Format', underline: 0) {
+    
+    menu(label: 'Language', underline: 3) {
+      ['denmark', 'finland', 'france', 'germany', 'italy', 'mexico', 'netherlands', 'norway', 'usa'].each do |image_name|
+        menu_item(:radiobutton, label: image_name.capitalize) {
+          selection image_name == 'usa'
+          image File.expand_path("images/#{image_name}.png", __dir__)
+        }
+      end
+    }
+    
+    menu(label: 'Country', underline: 0) {
+      ['denmark', 'finland', 'france', 'germany', 'italy', 'mexico', 'netherlands', 'norway', 'usa'].each do |image_name|
+        menu_item(:radiobutton, label: image_name.capitalize) {
+          selection image_name == 'usa'
+          image File.expand_path("images/#{image_name}.png", __dir__)
+          compound 'left'
+        }
+      end
+    }
+    
+    menu(label: 'Format', underline: 3) {
       menu(label: 'Background Color', underline: 0) {
         COLORS.each { |color_style|
           menu_item(:radiobutton, label: color_style.to_s.split('_').map(&:capitalize).join(' ')) {
@@ -123,6 +181,7 @@ root { |r|
           }
         }
       }
+      
       menu(label: 'Foreground Color', underline: 11) {
         COLORS.each { |color_style|
           menu_item(:radiobutton, label: color_style.to_s.split('_').map(&:capitalize).join(' ')) {
@@ -133,46 +192,64 @@ root { |r|
         }
       }
     }
+    
     menu(label: 'View', underline: 0) {
       menu_item(:radiobutton, label: 'Small', underline: 0) {
-        accelerator 'Command+S'
+        accelerator OS.mac? ? 'Command+S' : 'Control+S'
         
         on('command') do
           @label.font = {size: 25}
         end
       }
+      
       menu_item(:radiobutton, label: 'Medium', underline: 0) {
-        accelerator 'Command+M'
+        accelerator OS.mac? ? 'Command+M' : 'Control+M'
         selection true
 
         on('command') do
           @label.font = {size: 50}
         end
       }
+      
       menu_item(:radiobutton, label: 'Large', underline: 0) {
-        accelerator 'Command+L'
+        accelerator OS.mac? ? 'Command+L' : 'Control+L'
         
         on('command') do
           @label.font = {size: 75}
         end
       }
     }
+    
+    # Mac-specific window menu (containing zooming/resizing menu items)
+    menu(label: 'Window', underline: 0) if OS.mac?
+    
     menu(label: 'Help', underline: 0) {
+      if OS.mac?
+        menu_item(:help) {
+          on('command') do
+            message_box(parent: r, title: 'Help', message: 'Help for my application.')
+          end
+        }
+      end
+      
       menu_item(label: 'Manual', underline: 0) {
-        accelerator 'Command+Shift+M'
+        accelerator OS.mac? ? 'Command+Shift+M' : 'Control+U'
 
         on('command') do
           message_box(parent: r, title: 'Manual', message: 'Manual Contents')
         end
       }
+      
       menu_item(label: 'Tutorial', underline: 0) {
-        accelerator 'Command+Shift+T'
+        accelerator OS.mac? ? 'Command+Shift+T' : 'Control+T'
 
         on('command') do
           message_box(parent: r, title: 'Tutorial', message: 'Tutorial Contents')
         end
       }
+      
       menu_item(:separator)
+      
       menu_item(label: 'Report an Issue...', underline: 0) {
         on('command') do
           message_box(parent: r, title: 'Report an Issue', message: 'Reporting an issue...')

data/{lib/glimmer/tk/commandable.rb → samples/hello/hello_scrollbar.rb}

@@ -19,24 +19,48 @@
 # 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/tk/widget_proxy'
+require 'glimmer-dsl-tk'
 
-module Glimmer
-  module Tk
-    # Represents widgets that can invoke a command
-    module Commandable
-      def command_block=(proc)
-        tk.command(proc)
-      end
+include Glimmer
+
+root {
+  title 'Hello, Scrollbar!'
+  width 400
+  height 500
+  
+  notebook {
+    grid sticky: 'nsew'
+    
+    frame(text: 'Scrollable List') {
+      @list = list {
+        grid sticky: 'nsew', row: 0, column: 0, row_weight: 1, column_weight: 1
+        items 40.times.map {|n| "Item #{n + 1} of a very long list" }
+      }
+      
+      @scrollbar = scrollbar {
+        grid row: 0, column: 1
+        # orient 'vertical' # default
+      }
+      @list.yscrollbar @scrollbar
+    }
+    
+    frame(text: 'Scrollable Text') {
+      @text = text {
+        grid sticky: 'nsew', row: 0, column: 0, row_weight: 1, column_weight: 1
+        value ("This is a random sample of text that will repeat over and over and over"*2 + "\n")*40
+      }
       
-      def handle_listener(listener_name, &listener)
-        case listener_name.to_s.downcase
-        when 'command'
-          command(listener)
-        else
-          super
-        end
-      end
-    end
-  end
-end
+      @yscrollbar = scrollbar {
+        grid row: 0, column: 1
+        # orient 'vertical' # default
+      }
+      @text.yscrollbar @yscrollbar
+       
+      @xscrollbar = scrollbar {
+        grid row: 1, column: 0, column_span: 2, row_weight: 0
+        orient 'horizontal'
+      }
+      @text.xscrollbar @xscrollbar
+    }
+  }
+}.open

data/samples/hello/hello_scrollbar_frame.rb

@@ -0,0 +1,77 @@
+# 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.
+
+require 'glimmer-dsl-tk'
+
+include Glimmer
+
+root {
+  title 'Hello, Scrollbar Frame!'
+  width 400
+  height 400
+  
+  notebook {
+    grid sticky: 'nsew'
+    
+    frame(text: 'X/Y Scroll') {
+      scrollbar_frame {
+        30.times do |row|
+          10.times do |column|
+            button {
+              grid row: row, column: column, row_weight: 0, column_weight: 0
+              text "Row #{row} | Column #{column}"
+            }
+          end
+        end
+      }
+    }
+    
+    frame(text: 'Y Scroll') {
+      scrollbar_frame {
+        xscrollbar false
+        
+        30.times do |row|
+          2.times do |column|
+            button {
+              grid row: row, column: column, row_weight: 0, column_weight: 0
+              text "Row #{row} | Column #{column}"
+            }
+          end
+        end
+      }
+    }
+    
+    frame(text: 'X Scroll') {
+      scrollbar_frame {
+        yscrollbar false
+        
+        13.times do |row|
+          10.times do |column|
+            button {
+              grid row: row, column: column, row_weight: 0, column_weight: 0
+              text "Row #{row} | Column #{column}"
+            }
+          end
+        end
+      }
+    }
+  }
+}.open

data/samples/hello/hello_text.rb

@@ -105,32 +105,32 @@ class HelloText
       height 800
       
       frame {
-        grid row: 0, column: 0
+        grid row: 0, column: 0, column_span: 2
         
         column_index = -1
         
         combobox { |cb|
           grid row: 1, column: column_index += 1, column_weight: 1
           readonly true
-          text <=> [self, :font_family, after_write: ->(value) { @text.toggle_selection_font_format('family', value == FONT_FAMILY_PROMPT ? 'Courier New' : value, focus: 100) }]
+          text <=> [self, :font_family, after_write: ->(value) { @text.toggle_selection_font_format('family', value == FONT_FAMILY_PROMPT ? 'Courier New' : value, focus: OS.mac? ? 100 : true) }]
         }
         
         combobox {
           grid row: 1, column: column_index += 1, column_weight: 1
           readonly true
-          text <=> [self, :font_size, after_write: ->(value) { @text.toggle_selection_font_format('size', value == FONT_SIZE_PROMPT ? 13 : value, focus: 100) }]
+          text <=> [self, :font_size, after_write: ->(value) { @text.toggle_selection_font_format('size', value == FONT_SIZE_PROMPT ? 13 : value, focus: OS.mac? ? 100 : true) }]
         }
         
         combobox {
           grid row: 1, column: column_index += 1, column_weight: 1
           readonly true
-          text <=> [self, :foreground, after_write: ->(value) { @text.add_selection_format('foreground', value == FOREGROUND_PROMPT ? 'black' : value, focus: 100) }]
+          text <=> [self, :foreground, after_write: ->(value) { @text.add_selection_format('foreground', value == FOREGROUND_PROMPT ? 'black' : value, focus: OS.mac? ? 100 : true) }]
         }
         
         combobox {
           grid row: 1, column: column_index += 1, column_weight: 1
           readonly true
-          text <=> [self, :background, after_write: ->(value) { @text.add_selection_format('background', value == BACKGROUND_PROMPT ? 'white' : value, focus: 100) }]
+          text <=> [self, :background, after_write: ->(value) { @text.add_selection_format('background', value == BACKGROUND_PROMPT ? 'white' : value, focus: OS.mac? ? 100 : true) }]
         }
         
         separator {
@@ -303,6 +303,11 @@ class HelloText
           show_find_dialog if (event.keysym == 'f') && ((OS.mac? && event.state == 8) || (!OS.mac? && event.state == 4))
         end
       }
+      
+      @yscrollbar = scrollbar {
+        grid row: 1, column: 1
+      }
+      @text.yscrollbar @yscrollbar
     }
     @root.open
   end

data/samples/hello/hello_toplevel.rb

@@ -74,7 +74,7 @@ root { |root_window|
           
         frame {
           label {
-            text "This is a transparent window\nYou can hit ESCAPE to close."
+            text "This is a transparent window\n(Varies per platform)\nYou can hit ESCAPE to close."
             anchor 'center'
           }
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-tk
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.0.42
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -226,10 +226,8 @@ files:
 - lib/glimmer/dsl/tk/root_expression.rb
 - lib/glimmer/dsl/tk/shine_data_binding_expression.rb
 - lib/glimmer/dsl/tk/widget_expression.rb
-- lib/glimmer/tk/button_proxy.rb
 - lib/glimmer/tk/checkbutton_proxy.rb
 - lib/glimmer/tk/combobox_proxy.rb
-- lib/glimmer/tk/commandable.rb
 - lib/glimmer/tk/drag_and_drop_extension.rb
 - lib/glimmer/tk/entry_proxy.rb
 - lib/glimmer/tk/frame_proxy.rb
@@ -240,6 +238,7 @@ files:
 - lib/glimmer/tk/notebook_proxy.rb
 - lib/glimmer/tk/radiobutton_proxy.rb
 - lib/glimmer/tk/root_proxy.rb
+- lib/glimmer/tk/scrollbar_frame_proxy.rb
 - lib/glimmer/tk/spinbox_proxy.rb
 - lib/glimmer/tk/text_proxy.rb
 - lib/glimmer/tk/text_variable_owner.rb
@@ -265,6 +264,8 @@ files:
 - samples/hello/hello_notebook.rb
 - samples/hello/hello_radiobutton.rb
 - samples/hello/hello_root.rb
+- samples/hello/hello_scrollbar.rb
+- samples/hello/hello_scrollbar_frame.rb
 - samples/hello/hello_separator.rb
 - samples/hello/hello_spinbox.rb
 - samples/hello/hello_text.rb
@@ -309,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.31
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for Tk

data/lib/glimmer/tk/button_proxy.rb

@@ -1,34 +0,0 @@
-# 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.
-
-require 'glimmer/tk/widget_proxy'
-require 'glimmer/tk/commandable'
-
-module Glimmer
-  module Tk
-    # Proxy for Tk::Tile::Button
-    #
-    # Follows the Proxy Design Pattern
-    class ButtonProxy < WidgetProxy
-      include Commandable
-    end
-  end
-end