GtkSimpleLayout 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63da04a080c9692caa7a4d73c64cd039cc925767c056668fdd44d1054ccec355
-  data.tar.gz: 4f784f8a7c76dee45b23c50e020f88d06a52a928a79903bb3351bf4a0d5fcc25
+  metadata.gz: b44cf7d7f21d27bd3f547c892caa0f06bc69e74d1ce95b8124bfc9670010561e
+  data.tar.gz: f4d0ac95c666ebc40fe3110f19acd3ea27c9733e32035a5bf2cdce8b1e7b25db
 SHA512:
-  metadata.gz: 820c45c85a73d4f0972ac2c5aa893edc001c1cccba316b1b39f6cb8d7bfd523b924b43bf4f78a734ee9ad839f4a47fe1b462ef14665f67ccad3d9390a9147a4b
-  data.tar.gz: efc1b63c51fcd7f2126bbfc64fd9e5e07f4329a8608aa5873fbfd2733787cd1a88f4871cecb277a6bfd364cc0922d14f794d009d4401372b4e6fdde89b954054
+  metadata.gz: 5e4f694291ac3410341d7ce2fe77d29c3f744e108d07b55d0233d6627de0b3c35d4dc37a2036c57364934fe136397add63a5f6a1b342ff1053c5ed6221b0a8db
+  data.tar.gz: b3fe6690ae04f128c7a4beccb70d7547b5dc7214c998261c178a9bedb6f44eaca045fb2176117f081957e840d1b1bc0090fd41479ddf0822f4fa941411efb8ce

data/example/auto_event_map.rb

@@ -15,7 +15,7 @@ class MyWin < Gtk::Window
   def initialize
     super
     @click_count = 0
-    my_layout
+    add my_layout()
 
     register_auto_events()  # enable the auto event map
 

data/example/basic.rb

@@ -5,7 +5,7 @@ class MyWin < Gtk::Window
   include SimpleLayout::Base
   def initialize
     super
-    my_layout
+    add my_layout()
     signal_connect('destroy') do
       Gtk.main_quit
     end

data/example/calculator.rb

@@ -6,30 +6,30 @@ class MyWin < Gtk::Window
   
   def initialize
     super
-    my_layout
+    add my_layout()
     signal_connect('destroy') do
       Gtk.main_quit
     end
   end
 
   def my_layout
-    _box :vertical do
+    _vbox do
       with_attr :border_width => 3 do
-        _box :horizontal do
+        _hbox do
           _entry :id => :ent_input, :layout => [true, true, 5]
         end
-        _box :horizontal do
+        _hbox do
           _frame do
             _label 'M', :set_size_request => [20, 20]
           end
-          _button_box :horizontal do
+          _hbutton_box do
             _button 'Backspace'
             _button 'CE'
             _button 'C'
           end
         end
-        _box :horizontal do
-          _button_box :vertical do
+        _hbox do
+          _vbutton_box do
             _button 'MC'
             _button 'MR'
             _button 'MS'
@@ -44,12 +44,12 @@ class MyWin < Gtk::Window
   end
 
   def number_and_operators_layout
-    _box :vertical do
+    _vbox do
       [ ['7', '8', '9', '/', 'sqt'],
         ['4', '5', '6', '*', '%'],
         ['1', '2', '3', '-', '1/x'],
         ['0', '+/-', '.', '+', '=']].each do |cols|
-        _box :horizontal, :layout => [true, true] do
+        _hbox :layout => [true, true] do
           cols.each do |txt|
             _button txt, :id => txt.to_sym, :set_size_request => [30, 30], :layout => [true, true]
           end

data/example/composit.rb

@@ -0,0 +1,28 @@
+require 'gtk3'
+require 'simple_layout'
+
+class MyWin < Gtk::Window
+  include SimpleLayout::Base
+  def initialize
+    super
+    add my_layout()
+    signal_connect('destroy') do
+      Gtk.main_quit
+    end
+  end
+
+  def my_layout
+    _vbox_in_hbox inner_layout: [padding: 10] do
+      with_attr :border_width => 5 do
+        _frame layout: [padding: 10] do
+          _label_in_vbox 'Label 1', inner_layout: [padding: 10]
+        end
+        _button 'Button 1'
+        _entry_in_vbox :id => :ent_input
+      end
+    end
+  end
+end
+
+MyWin.new.show_all
+Gtk.main

data/example/expose_components.rb

@@ -13,7 +13,7 @@ class MyWin < Gtk::Window
 
   def initialize
     super
-    my_layout
+    add my_layout()
 
     expose_components()
     # after call expose_components(), btn_a and btn_b become available

data/example/group.rb

@@ -41,7 +41,7 @@ class MyWin < Gtk::Window
     super
     @count_a = 0
     @count_b = 0
-    my_layout
+    add my_layout()
 
     register_auto_events()
 

data/example/hello_world.rb

@@ -5,7 +5,7 @@ class MyWin < Gtk::Window
   include SimpleLayout::Base
   def initialize
     super
-    my_layout
+    add my_layout()
     signal_connect('destroy') do
       Gtk.main_quit
     end

data/example/menu.rb

@@ -5,7 +5,7 @@ class MyWin < Gtk::Window
   include SimpleLayout::Base
   def initialize
     super
-    my_layout
+    add my_layout()
     signal_connect('destroy') do
       Gtk.main_quit
     end

data/example/multiple_layouts.rb

@@ -0,0 +1,59 @@
+require 'gtk3'
+require 'simple_layout'
+
+class MyWin < Gtk::Window
+  include SimpleLayout::Base
+  def initialize
+    super
+    vbox = Gtk::Box.new(:vertical, 5)
+    vbox.pack_start(Gtk::Label.new('Multiple Layouts'), expand: false, fill: false, padding: 10)
+    vbox.pack_start(my_layout1(), expand: true, fill: true, padding: 0)
+    vbox.pack_start(my_layout2(), expand: true, fill: true, padding: 0)
+    add vbox
+
+    register_auto_events()  # enable the auto event map
+    expose_components()     # expose the components to the methods access
+
+    signal_connect('destroy') do
+      Gtk.main_quit
+    end
+  end
+
+  def btn_a1_on_clicked(w)
+    @btn_a1_click_count ||= 0
+    @btn_a1_click_count += 1
+    lbl_a.text = "Button A1 clicked #{@btn_a1_click_count}"
+  end
+
+  def btn_b2_on_clicked(w)
+    @btn_b2_click_count ||= 0
+    @btn_b2_click_count += 1
+    lbl_b.text = "Button B2 clicked #{@btn_b2_click_count}"
+  end
+
+
+  def my_layout1
+    _frame 'layout 1', border_width: 5 do
+      _box :horizontal do
+        _label 'Label A', id: :lbl_a
+        _button 'Button A, fixed'
+        _button "Button A1, I'm flexiable", layout: [padding: 15], id: :btn_a1
+        _button 'Button A2, fixed, at the end', layout: [:end, false, false] 
+      end
+    end
+  end
+
+  def my_layout2
+    _frame 'layout 2', border_width: 5 do
+      _box :vertical do
+        _label 'Label B', id: :lbl_b
+        _button 'Button B, fixed'
+        _button "Button B1, I'm flexiable", layout: [padding: 15]
+        _button 'Button B2, fixed, at the end', layout: [:end, false, false], id: :btn_b2
+      end
+    end
+  end  
+end
+
+MyWin.new.show_all
+Gtk.main

data/example/serial_port_setup.rb

@@ -28,7 +28,7 @@ class MyWin < Gtk::Window
 	def initialize
 		super
 
-		my_layout
+		add my_layout()
 
 		register_auto_events()
     expose_components()

data/example/with_attr.rb

@@ -5,7 +5,7 @@ class MyWin < Gtk::Window
   include SimpleLayout::Base
   def initialize
     super
-    my_layout
+    add my_layout()
     signal_connect('destroy') do
       Gtk.main_quit
     end

data/lib/simple_layout.rb

@@ -42,8 +42,9 @@ module SimpleLayout
         '_toggle_button' => Gtk::ToggleButton,
         '_link_button' => Gtk::LinkButton,
         '_entry' => Gtk::Entry,
-        '_hscale' => Gtk::HScale,
-        '_vscale' => Gtk::VScale,
+        '_scale' => Gtk::Scale,
+        '_hscale' => [Gtk::Scale, :horizontal],
+        '_vscale' => [Gtk::Scale, :vertical],
         '_spin_button' => Gtk::SpinButton,
         '_text_view' => Gtk::TextView,
         '_tree_view' => Gtk::TreeView,
@@ -73,18 +74,25 @@ module SimpleLayout
         '_alignment' => Gtk::Alignment,
         '_aspect_frame' => Gtk::AspectFrame,
         '_box' => Gtk::Box,
+        '_vbox' => [Gtk::Box, :vertical],
+        '_hbox' => [Gtk::Box, :horizontal],
         '_button_box' => Gtk::ButtonBox,
-        '_hpaned' => Gtk::HPaned,
-        '_vpaned' => Gtk::VPaned,
+        '_vbutton_box' => [Gtk::ButtonBox, :vertical],
+        '_hbutton_box' => [Gtk::ButtonBox, :horizontal],
+        '_paned' => Gtk::Paned,
+        '_hpaned' => [Gtk::Paned, :horizontal],
+        '_vpaned' => [Gtk::Paned, :vertical],
         '_layout' => Gtk::Layout,
         '_notebook' => Gtk::Notebook,
         '_table' => Gtk::Table,
         '_expander' => Gtk::Expander,
         '_frame' => Gtk::Frame,
-        '_hseparator' => Gtk::HSeparator,
-        '_vseparator' => Gtk::VSeparator,
-        '_hscrollbar' => Gtk::HScrollbar,
-        '_vscrollbar' => Gtk::VScrollbar,
+        '_separator' => Gtk::Separator,
+        '_hseparator' => [Gtk::Separator, :horizontal],
+        '_vseparator' => [Gtk::Separator, :vertical],
+        '_scrollbar' => Gtk::Scrollbar,
+        '_hscrollbar' => [Gtk::Scrollbar, :horizontal],
+        '_vscrollbar' => [Gtk::Scrollbar, :vertical],
         '_scrolled_window' => Gtk::ScrolledWindow,
         '_arrow' => Gtk::Arrow,
         '_calendar' => Gtk::Calendar,
@@ -339,13 +347,12 @@ module SimpleLayout
 
       add_singleton_event_map(w) # so that you can use: w.on_clicked{|*args| ... }
 
-      # there are some special options: :id, :gid, :layout, :keep_top_container
+      # there are some special options: :id, :gid, :layout
       # :id is the name of the component, :gid is the group name of the component, if :gid is not given, use :id as group name
-      # :layout is the layout options for the component, :keep_top_container is to keep the top container
+      # :layout is the layout options for the component
       name = options.delete(:id)
       group_name = options.delete(:gid) || name
       layout_opt = options.delete(:layout)
-      keep_top_cnt = options.delete(:keep_top_container)
       accel_group = options.delete(:accel_group)
       accel = options.delete(:accel)
 
@@ -406,10 +413,9 @@ module SimpleLayout
       if @containers.size > 0
         add_component(insp_evb || w, parent, layout_opt) # add myself to parent
       else
-        add_component(insp_evb || w, self, layout_opt) unless keep_top_cnt # add top container to host
         @components[:self] = self  # add host as ':self'
       end
-      w
+      insp_evb || w
     end
 
     private
@@ -540,9 +546,15 @@ module SimpleLayout
     end
 
     # create a new UI component (container or widget)
-    def create_component(component_class, args, block)
+    def create_component(class_desc, args, block)
       @common_attribute ||= []
       options = {}
+      if class_desc.is_a?(Array) # for virtual widget that use existing widget with specific args, e.g [Gtk::Box, :vertical]
+        component_class = class_desc[0]
+        args = class_desc[1..-1] + args
+      else
+        component_class = class_desc
+      end
       options = args.pop if args.last.is_a?(Hash)
       options.merge! @common_attribute.last if @common_attribute.last
 
@@ -573,34 +585,34 @@ module SimpleLayout
       end
     end
 
-    # alias_method :simple_layout_method_missing_alias, :method_missing
-    # def method_missing(sym, *args, &block)
-    #   if sym.to_s =~ /^(.+)_in_(.+)$/
-    #     maps = self.class.layout_class_maps
-    #     inner, outter = $1, $2
-    #     if maps[inner] && maps[outter]
-    #       if args.last.is_a?(Hash)
-    #         options = {}
-    #         options = args.pop if args.last.is_a?(Hash)
-    #         # default args pass to inner component, execpt:
-    #         #  :layout pass to outter :layout
-    #         #  :inner_layout pass to inner :layout
-    #         #  :outter_args pass to outter args
-    #         outter_args, outter_layout_opt, options[:layout] =
-    #           options.delete(:outter_args), options.delete(:layout), options.delete(:inner_layout)
-    #         outter_args = (outter_args ? [outter_args] : []) unless outter_args.is_a?(Array)
-    #         outter_args << {} unless outter_args.last.is_a?(Hash)
-    #         outter_args.last[:layout] ||= outter_layout_opt
-    #         args.push options # push back inner options
-    #       end
-    #       inner_proc = Proc.new do
-    #         create_component(maps[inner], args, block)
-    #       end
-    #       return create_component(maps[outter], outter_args || [], inner_proc)
-    #     end
-    #   end
-    #   simple_layout_method_missing_alias(sym, *args, &block)
-    # end
+    alias_method :simple_layout_method_missing_alias, :method_missing
+    def method_missing(sym, *args, &block)
+      if sym.to_s =~ /^(.+)_in(_.+)$/
+        maps = self.class.layout_class_maps
+        inner, outter = $1, $2
+        if maps[inner] && maps[outter]
+          if args.last.is_a?(Hash)
+            options = {}
+            options = args.pop if args.last.is_a?(Hash)
+            # default args pass to inner component, execpt:
+            #  :layout pass to outter :layout
+            #  :inner_layout pass to inner :layout
+            #  :outter_args pass to outter args
+            outter_args, outter_layout_opt, options[:layout] =
+              options.delete(:outter_args), options.delete(:layout), options.delete(:inner_layout)
+            outter_args = (outter_args ? [outter_args] : []) unless outter_args.is_a?(Array)
+            outter_args << {} unless outter_args.last.is_a?(Hash)
+            outter_args.last[:layout] ||= outter_layout_opt
+            args.push options # push back inner options
+          end
+          inner_proc = Proc.new do
+            create_component(maps[inner], args, block)
+          end
+          return create_component(maps[outter], outter_args || [], inner_proc)
+        end
+      end
+      simple_layout_method_missing_alias(sym, *args, &block)
+    end
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: GtkSimpleLayout
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ricky Zheng
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-08 00:00:00.000000000 Z
+date: 2024-09-14 00:00:00.000000000 Z
 dependencies: []
 description: A simple builder style layout helper for Ruby GTK3, it helps you to build
   ruby GTK3 UI codes in a much more readable way. It also includes a UI inspector
@@ -26,10 +26,12 @@ files:
 - example/auto_event_map.rb
 - example/basic.rb
 - example/calculator.rb
+- example/composit.rb
 - example/expose_components.rb
 - example/group.rb
 - example/hello_world.rb
 - example/menu.rb
+- example/multiple_layouts.rb
 - example/serial_port_setup.rb
 - example/with_attr.rb
 - lib/simple_layout.rb