wxruby3 0.9.1 → 0.9.3

data/samples/widgets/datepick.rb

@@ -0,0 +1,215 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+#
+# Adapted for wxRuby from wxWidgets widgets sample
+# Copyright (c) 2001 Vadim Zeitlin
+
+require 'date'
+
+module Widgets
+
+  module DatePicker
+
+    class DatePickerPage < Widgets::Page
+
+      module ID
+        include Wx::IDHelper
+
+        Reset = self.next_id(Widgets::Frame::ID::Last)
+        Set = self.next_id
+        SetRange = self.next_id
+        SetNullText = self.next_id
+        Picker = self.next_id
+      end
+
+      def initialize(book, images)
+        super(book, images, :datepick)
+      end
+
+      Info = Widgets::PageInfo.new(self, 'DatePicker',
+                                   if Wx::PLATFORM == 'WXMSW'
+                                     Widgets::NATIVE_CTRLS
+                                   else
+                                     Widgets::GENERIC_CTRLS
+                                   end | Widgets::PICKER_CTRLS)
+
+      def get_widget
+        @datePicker
+      end
+      def recreate_widget
+        create_date_picker
+      end
+  
+      # lazy creation of the content
+      def create_content
+        sizerTop = Wx::HBoxSizer.new
+    
+        # left pane: style
+        sizerLeft = Wx::VBoxSizer.new
+    
+        kinds = [ '&Default', '&Spin', 'Drop do&wn' ]
+        @radioKind = Wx::RadioBox.new(self, Wx::ID_ANY, '&Kind',
+                                      choices: kinds,
+                                      major_dimension: 1, 
+                                      style: Wx::RA_SPECIFY_COLS)
+        sizerLeft.add(@radioKind, Wx::SizerFlags.new.expand.border)
+    
+        sizerStyle = Wx::StaticBoxSizer.new(Wx::VERTICAL, self, '&Style')
+        sizerStyleBox = sizerStyle.get_static_box
+    
+        @chkStyleCentury = create_check_box_and_add_to_sizer(sizerStyle, 'Show &century', Wx::ID_ANY, sizerStyleBox)
+        @chkStyleAllowNone = create_check_box_and_add_to_sizer(sizerStyle, 'Allow &no value', Wx::ID_ANY, sizerStyleBox)
+    
+        sizerLeft.add(sizerStyle, Wx::SizerFlags.new.expand.border)
+    
+        sizerLeft.add(Wx::Button.new(self, ID::Reset, '&Recreate'),
+                      Wx::SizerFlags.new.centre.border)
+    
+    
+        # middle pane: operations
+        sizerMiddle = Wx::VBoxSizer.new
+        szr, @textCur = create_sizer_with_text_and_button(ID::Set,
+                                                          '&Set date',
+                                                          Wx::ID_ANY)
+        sizerMiddle.add(szr, Wx::SizerFlags.new.expand.border)
+    
+        @textCur.set_min_size(Wx::Size.new(get_text_extent('  9999-99-99  ').x, -1))
+    
+        sizerMiddle.add_spacer(10)
+
+        szr, @textMin = create_sizer_with_text_and_label('&Min date', Wx::ID_ANY)
+        sizerMiddle.add(szr, Wx::SizerFlags.new.expand.border)
+        szr, @textMax = create_sizer_with_text_and_label('Ma&x date', Wx::ID_ANY)
+        sizerMiddle.add(szr, Wx::SizerFlags.new.expand.border)
+        sizerMiddle.add(Wx::Button.new(self, ID::SetRange, 'Set &range'),
+                        Wx::SizerFlags.new.centre.border)
+    
+        sizerMiddle.add_spacer(10)
+
+        szr, @textNull = create_sizer_with_text_and_label('&Null text', Wx::ID_ANY)
+        sizerMiddle.add(szr, Wx::SizerFlags.new.expand.border)
+    
+        sizerMiddle.add(Wx::Button.new(self, ID::SetNullText, 'Set &null text'),
+                        Wx::SizerFlags.new.centre.border)
+    
+    
+        # right pane: control itself
+        sizerRight = Wx::HBoxSizer.new
+    
+        @datePicker = Wx::DatePickerCtrl.new(self, ID::Picker)
+    
+        sizerRight.add(0, 0, 1, Wx::CENTRE)
+        sizerRight.add(@datePicker, 1, Wx::CENTRE)
+        sizerRight.add(0, 0, 1, Wx::CENTRE)
+        @sizerDatePicker = sizerRight # save it to modify it later
+    
+        # the 3 panes panes compose the window
+        sizerTop.add(sizerLeft, 0, (Wx::ALL & ~Wx::LEFT), 10)
+        sizerTop.add(sizerMiddle, 0, (Wx::TOP | Wx::BOTTOM), 10)
+        sizerTop.add(sizerRight, 1, Wx::GROW | (Wx::ALL & ~Wx::RIGHT), 10)
+    
+        # final initializations
+        @chkStyleCentury.set_value(true)
+        reset
+    
+        set_sizer(sizerTop)
+
+        # connect event handlers
+        evt_button(ID::Reset, :on_button_reset)
+        evt_button(ID::Set, :on_button_set)
+        evt_button(ID::SetRange, :on_button_set_range)
+        evt_button(ID::SetNullText, :on_button_set_null_text)
+    
+        evt_date_changed(Wx::ID_ANY, :on_date_changed)
+      end
+  
+      protected
+
+      # event handlers
+      def on_date_changed(event)
+        sdt1 = event.get_date.to_date.iso8601
+        sdt2 = @datePicker.value.to_date.iso8601
+        Wx.log_message("Date changed, now is #{sdt1} (control value is #{sdt2}).")
+      end
+  
+      def on_button_set(event)
+        dt = ::Date.parse(@textCur.value) rescue nil
+        if dt
+          @datePicker.set_value(dt)
+        else
+          Wx.log_error('Invalid date')
+        end
+      end
+
+      def on_button_set_range(event)
+        dt1  = ::Date.parse(@textMin.value) rescue nil
+        dt2  = ::Date.parse(@textMax.value) rescue nil
+        return if dt1.nil? || dt2.nil?
+
+        @datePicker.set_range(dt1, dt2)
+
+        dt1, dt2 = @datePicker.get_range
+        if dt1.nil? || dt2.nil?
+          Wx.log_message('No range set')
+        else
+          @textMin.set_value(dt1.to_date.iso8601)
+          @textMax.set_value(dt2.to_date.iso8601)
+
+          Wx.log_message('Date picker range updated')
+        end
+      end
+
+      def on_button_set_null_text(event)
+        @datePicker.set_null_text(@textNull.value)
+      end
+
+      def on_button_reset(event)
+        reset
+
+        create_date_picker
+      end
+  
+      # reset the date picker parameters
+      def reset
+        today = Time.now
+
+        @datePicker.set_value(today)
+        @textCur.set_value(today.to_date.iso8601)
+      end
+  
+      # (re)create the date picker
+      def create_date_picker
+        value = @datePicker.value
+
+        @sizerDatePicker.get_item_count.times { @sizerDatePicker.remove(0) }
+    
+        @datePicker.destroy
+    
+        style = get_attrs.default_flags
+        case @radioKind.selection
+        when 0
+          style = Wx::DP_DEFAULT
+        when 1
+          style = Wx::DP_SPIN
+        when 2
+          style = Wx::DP_DROPDOWN
+        end
+
+        style |= Wx::DP_SHOWCENTURY if @chkStyleCentury.value
+        style |= Wx::DP_ALLOWNONE if @chkStyleAllowNone.value
+
+        @datePicker = Wx::DatePickerCtrl.new(self, ID::Picker, value,
+                                             style: style)
+    
+        @sizerDatePicker.add(0, 0, 1, Wx::CENTRE)
+        @sizerDatePicker.add(@datePicker, 1, Wx::CENTRE)
+        @sizerDatePicker.add(0, 0, 1, Wx::CENTRE)
+        @sizerDatePicker.layout
+      end
+      
+    end
+
+  end
+
+end

data/samples/widgets/dirctrl.rb

@@ -0,0 +1,265 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+#
+# Adapted for wxRuby from wxWidgets widgets sample
+# Copyright (c) 2001 Vadim Zeitlin
+
+require 'date'
+
+module Widgets
+
+  module DirCtrl
+
+    class DirCtrlPage < Widgets::Page
+
+      module ID
+        include Wx::IDHelper
+
+        Reset = self.next_id(Widgets::Frame::ID::Last)
+        SetPath = self.next_id
+        DirCtrl = self.next_id
+
+        STD_PATH_UNKNOWN = 0
+        STD_PATH_CONFIG = 1
+        STD_PATH_DATA = 2
+        STD_PATH_DOCUMENTS = 3
+        STD_PATH_LOCAL_DATA = 4
+        STD_PATH_PLUGINS = 5
+        STD_PATH_RESOURCES = 6
+        STD_PATH_USER_CONFIG = 7
+        STD_PATH_USER_DATA = 8
+        STD_PATH_USER_LOCAL_DATA = 9
+        STD_PATH_MAX = 10
+      end
+
+      STD_PATHS = [
+          '&none',
+          '&config',
+          '&data',
+          '&documents',
+          '&local data',
+          '&plugins',
+          '&resources',
+          '&user config',
+          '&user data',
+          '&user local data'
+      ]
+
+      def initialize(book, images)
+        super(book, images, :dirctrl)
+
+        @dirCtrl = nil
+      end
+
+      Info = Widgets::PageInfo.new(self, 'DirCtrl', Widgets::GENERIC_CTRLS)
+
+      def get_widget
+        @dirCtrl
+      end
+      def recreate_widget
+        create_dir_ctrl
+      end
+  
+      # lazy creation of the content
+      def create_content
+        sizerTop = Wx::HBoxSizer.new
+    
+        # left pane
+        sizerLeft = Wx::StaticBoxSizer.new(Wx::VERTICAL, self, 'Dir control details')
+        sizerLeftBox = sizerLeft.get_static_box
+    
+        szr, @path = create_sizer_with_text_and_button(ID::SetPath ,'Set &path', Wx::ID_ANY, sizerLeftBox)
+        sizerLeft.add(szr, 0, Wx::ALL | Wx::ALIGN_RIGHT , 5 )
+    
+        sizerFlags = Wx::StaticBoxSizer.new(Wx::VERTICAL, sizerLeftBox, '&Flags')
+        sizerFlagsBox = sizerFlags.get_static_box
+    
+        @chkDirOnly = create_check_box_and_add_to_sizer(sizerFlags, 'Wx::DIRCTRL_DIR_ONLY', Wx::ID_ANY, sizerFlagsBox)
+        @chk3D      = create_check_box_and_add_to_sizer(sizerFlags, 'Wx::DIRCTRL_3D_INTERNAL', Wx::ID_ANY, sizerFlagsBox)
+        @chkFirst   = create_check_box_and_add_to_sizer(sizerFlags, 'Wx::DIRCTRL_SELECT_FIRST', Wx::ID_ANY, sizerFlagsBox)
+        @chkFilters = create_check_box_and_add_to_sizer(sizerFlags, 'Wx::DIRCTRL_SHOW_FILTERS', Wx::ID_ANY, sizerFlagsBox)
+        @chkLabels  = create_check_box_and_add_to_sizer(sizerFlags, 'Wx::DIRCTRL_EDIT_LABELS', Wx::ID_ANY, sizerFlagsBox)
+        @chkMulti   = create_check_box_and_add_to_sizer(sizerFlags, 'Wx::DIRCTRL_MULTIPLE', Wx::ID_ANY, sizerFlagsBox)
+        sizerLeft.add(sizerFlags, Wx::SizerFlags.new.expand.border)
+    
+        sizerFilters = Wx::StaticBoxSizer.new(Wx::VERTICAL, sizerLeftBox, '&Filters')
+        sizerFiltersBox = sizerFilters.get_static_box
+
+        @fltr = []
+        @fltr << create_check_box_and_add_to_sizer(
+          sizerFilters,
+          "all files (#{Wx::FILE_SELECTOR_DEFAULT_WILDCARD_STR})|#{Wx::FILE_SELECTOR_DEFAULT_WILDCARD_STR}",
+          Wx::ID_ANY, sizerFiltersBox)
+        @fltr << create_check_box_and_add_to_sizer(sizerFilters, 'Ruby files (*.rb *.rbw)|*.rb;*.rbw', Wx::ID_ANY, sizerFiltersBox)
+        @fltr << create_check_box_and_add_to_sizer(sizerFilters, 'PNG images (*.png)|*.png', Wx::ID_ANY, sizerFiltersBox)
+        sizerLeft.add(sizerFilters, Wx::SizerFlags.new.expand.border)
+    
+        btn = Wx::Button.new(sizerFiltersBox, ID::Reset, '&Reset')
+        sizerLeft.add(btn, 0, Wx::ALIGN_CENTRE_HORIZONTAL | Wx::ALL, 15)
+    
+        # middle pane
+        @radioStdPath = Wx::RadioBox.new(self, Wx::ID_ANY, 'Standard path',
+                                         choices: STD_PATHS,
+                                         major_dimension: 1)
+    
+        # right pane
+        @dirCtrl = Wx::GenericDirCtrl.new(
+            self,
+            ID::DirCtrl,
+            Wx::DIR_DIALOG_DEFAULT_FOLDER_STR,
+            style: 0)
+    
+        # the 3 panes panes compose the window
+        sizerTop.add(sizerLeft, 0, (Wx::ALL & ~Wx::LEFT), 10)
+        sizerTop.add(@radioStdPath, 0, Wx::GROW | Wx::ALL , 10)
+        sizerTop.add(@dirCtrl, 1, Wx::GROW | (Wx::ALL & ~Wx::RIGHT), 10)
+    
+        set_sizer(sizerTop)
+    
+        # final initializations
+        reset
+
+        # connect event handlers
+        evt_button(ID::Reset, :on_button_reset)
+        evt_button(ID::SetPath, :on_button_set_path)
+        evt_checkbox(Wx::ID_ANY, :on_check_box)
+        evt_radiobox(Wx::ID_ANY, :on_radio_box)
+        evt_dirctrl_selectionchanged(ID::DirCtrl, :on_sel_changed)
+        evt_dirctrl_fileactivated(ID::DirCtrl, :on_file_activated)
+      end
+  
+      protected
+      
+      # event handlers
+      def on_button_set_path(event)
+        @dirCtrl.set_path(@path.value)
+      end
+
+      def on_button_reset(event)
+        reset
+
+        create_dir_ctrl
+      end
+
+      def on_check_box(event)
+        create_dir_ctrl
+      end
+
+      def on_radio_box(event)
+        Wx.get_app.set_app_name('widgets')
+        stdp = Wx::StandardPaths.get
+
+        case @radioStdPath.selection
+        when ID::STD_PATH_CONFIG
+          @dirCtrl.path = path = stdp.get_config_dir
+        when ID::STD_PATH_DATA
+          @dirCtrl.path = path = stdp.get_data_dir
+        when ID::STD_PATH_DOCUMENTS
+          @dirCtrl.path = path = stdp.get_documents_dir
+        when ID::STD_PATH_LOCAL_DATA
+          @dirCtrl.path = path = stdp.get_local_data_dir
+        when ID::STD_PATH_PLUGINS
+          @dirCtrl.path = path = stdp.get_plugins_dir
+        when ID::STD_PATH_RESOURCES
+          @dirCtrl.path = path = stdp.get_resources_dir
+        when ID::STD_PATH_USER_CONFIG
+          @dirCtrl.path = path = stdp.get_user_config_dir
+        when ID::STD_PATH_USER_DATA
+          @dirCtrl.path = path = stdp.get_user_data_dir
+        when ID::STD_PATH_USER_LOCAL_DATA
+          @dirCtrl.path = path = stdp.get_user_local_data_dir
+        else
+          #when ID::STD_PATH_UNKNOWN
+          #when ID::STD_PATH_MAX
+          # leave path
+          path = @dirCtrl.path
+        end
+
+        # Notice that we must use wxFileName comparison instead of simple wxString
+        # comparison as the paths returned may differ by case only.
+        unless File.identical?(File.expand_path(@dirCtrl.path), File.expand_path(path))
+          Wx.log_message("Failed to go to \"#{path}\", the current path is \"#{@dirCtrl.path}\".")
+        end
+      end
+
+      def on_sel_changed(event)
+        if @dirCtrl
+          Wx.log_message("Selection changed to \"%s\"",
+                         @dirCtrl.path(event.item))
+        end
+
+        event.skip
+      end
+
+      def on_file_activated(event)
+        if @dirCtrl
+          Wx.log_message("File activated \"%s\"",
+                         @dirCtrl.path(event.item))
+        end
+
+        event.skip
+      end
+  
+      # reset the control parameters
+      def reset
+        @path.clear
+    
+        @chkDirOnly.set_value(false)
+        @chk3D.set_value(false)
+        @chkFirst.set_value(false)
+        @chkFilters.set_value(false)
+        @chkLabels.set_value(false)
+        @chkMulti.set_value(false)
+    
+        @radioStdPath.set_selection(0)
+
+        @fltr.each { |f| f.value = false }
+
+        create_dir_ctrl(true)
+      end
+  
+      # (re)create the @dirCtrl
+      def create_dir_ctrl(defaultPath = false)
+        Wx::WindowUpdateLocker.update(self) do
+    
+          style = get_attrs.default_flags
+          style |= Wx::DIRCTRL_DIR_ONLY if @chkDirOnly.is_checked
+          style |= Wx::DIRCTRL_3D_INTERNAL if @chk3D.is_checked
+          style |= Wx::DIRCTRL_SELECT_FIRST if @chkFirst.is_checked
+          style |= Wx::DIRCTRL_SHOW_FILTERS if @chkFilters.is_checked
+          style |= Wx::DIRCTRL_EDIT_LABELS if @chkLabels.is_checked
+          style |= Wx::DIRCTRL_MULTIPLE if @chkMulti.is_checked
+
+          dirCtrl = Wx::GenericDirCtrl.new(self,
+                                           ID::DirCtrl,
+                                           defaultPath ? Wx::DIR_DIALOG_DEFAULT_FOLDER_STR : @dirCtrl.get_path,
+                                           style: style)
+
+          filter = @fltr.inject('') do |s, f|
+            if f.checked?
+              s << '|' unless s.empty?
+              s << f.label
+            end
+            s
+          end
+          dirCtrl.set_filter(filter)
+      
+          # update sizer's child window
+          get_sizer.replace(@dirCtrl, dirCtrl, true)
+      
+          # update our pointer
+          @dirCtrl.destroy
+          @dirCtrl = dirCtrl
+      
+          # re-layout the sizer
+          get_sizer.layout
+                    
+        end
+      end
+      
+    end
+
+  end
+
+end

data/samples/widgets/dirpicker.rb

@@ -0,0 +1,158 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+#
+# Adapted for wxRuby from wxWidgets widgets sample
+# Copyright (c) 2001 Vadim Zeitlin
+
+require 'date'
+
+module Widgets
+
+  module DirPicker
+
+    class DirPickerPage < Widgets::Page
+
+      module ID
+        include Wx::IDHelper
+
+        Reset = self.next_id(Widgets::Frame::ID::Last)
+        Dir = self.next_id
+        SetDir = self.next_id
+      end
+
+      def initialize(book, images)
+        super(book, images, :dirpicker)
+
+        @dirPicker = nil
+      end
+
+      Info = Widgets::PageInfo.new(self, 'DirPicker',
+                                   if Wx::PLATFORM == 'WXGTK'
+                                     Widgets::NATIVE_CTRLS
+                                   else
+                                     Widgets::GENERIC_CTRLS
+                                   end | Widgets::PICKER_CTRLS)
+
+      def get_widget
+        @dirPicker
+      end
+      def recreate_widget
+        recreate_picker
+      end
+  
+      # lazy creation of the content
+      def create_content
+        # left pane
+        sizerLeft = Wx::VBoxSizer.new
+    
+        sizerStyle = Wx::StaticBoxSizer.new(Wx::VERTICAL, self, '&DirPicker style')
+        sizerStyleBox = sizerStyle.get_static_box
+    
+        @chkDirTextCtrl = create_check_box_and_add_to_sizer(sizerStyle, 'With textctrl', Wx::ID_ANY, sizerStyleBox)
+        @chkDirMustExist = create_check_box_and_add_to_sizer(sizerStyle, 'Dir must exist', Wx::ID_ANY, sizerStyleBox)
+        @chkDirChangeDir = create_check_box_and_add_to_sizer(sizerStyle, 'Change working dir', Wx::ID_ANY, sizerStyleBox)
+        @chkSmall = create_check_box_and_add_to_sizer(sizerStyle, '&Small version', Wx::ID_ANY, sizerStyleBox)
+        sizerLeft.add(sizerStyle, 0, Wx::ALL|Wx::GROW, 5)
+
+        szr, @textInitialDir = create_sizer_with_text_and_button(ID::SetDir,
+                                                                 '&Initial directory',
+                                                                 Wx::ID_ANY)
+        sizerLeft.add(szr, Wx::SizerFlags.new.expand.border)
+    
+        sizerLeft.add_spacer(10)
+    
+        sizerLeft.add(Wx::Button.new(self, ID::Reset, '&Reset'),
+                      0, Wx::ALIGN_CENTRE_HORIZONTAL | Wx::ALL, 15)
+    
+        reset    # set checkboxes state
+    
+        # create pickers
+        create_picker
+    
+        # right pane
+        @sizer = Wx::VBoxSizer.new
+        @sizer.add(1, 1, 1, Wx::GROW | Wx::ALL, 5) # spacer
+        @sizer.add(@dirPicker, 0, Wx::EXPAND | Wx::ALL, 5)
+        @sizer.add(1, 1, 1, Wx::GROW | Wx::ALL, 5) # spacer
+    
+        # global pane
+        sz = Wx::HBoxSizer.new
+        sz.add(sizerLeft, 0, Wx::GROW|Wx::ALL, 5)
+        sz.add(@sizer, 1, Wx::GROW|Wx::ALL, 5)
+    
+        set_sizer(sz)
+
+        # connect event handlers
+        evt_button(ID::Reset, :on_button_reset)
+        evt_button(ID::SetDir, :on_button_set_dir)
+    
+        evt_dirpicker_changed(ID::Dir, :on_dir_change)
+    
+        evt_checkbox(Wx::ID_ANY, :on_check_box)
+      end
+  
+      protected
+  
+      # called only once at first construction
+      def create_picker
+        @dirPicker.destroy if @dirPicker
+    
+        style = get_attrs.default_flags
+
+        style |= Wx::DIRP_USE_TEXTCTRL if @chkDirTextCtrl.value
+        style |= Wx::DIRP_DIR_MUST_EXIST if @chkDirMustExist.value
+        style |= Wx::DIRP_CHANGE_DIR if @chkDirChangeDir.value
+        style |= Wx::DIRP_SMALL if @chkSmall.value
+            
+    
+        @dirPicker = Wx::DirPickerCtrl.new(self, ID::Dir,
+                                           Wx.get_home_dir,
+                                           'Hello!',
+                                           style: style)
+      end
+  
+      # called to recreate an existing control
+      def recreate_picker
+        @sizer.remove(1)
+        create_picker
+        @sizer.insert(1, @dirPicker, 0, Wx::EXPAND|Wx::ALL, 5)
+
+        @sizer.layout
+      end
+  
+      # restore the checkboxes state to the initial values
+      def reset
+        @chkDirTextCtrl.set_value(Wx::DIRP_DEFAULT_STYLE.allbits?(Wx::DIRP_USE_TEXTCTRL))
+        @chkDirMustExist.set_value(Wx::DIRP_DEFAULT_STYLE.allbits?(Wx::DIRP_DIR_MUST_EXIST))
+        @chkDirChangeDir.set_value(Wx::DIRP_DEFAULT_STYLE.allbits?(Wx::DIRP_CHANGE_DIR))
+        @chkSmall.set_value(Wx::FLP_DEFAULT_STYLE.allbits?(Wx::DIRP_SMALL))
+      end
+      
+      def on_dir_change(event)
+        Wx.log_message("The directory changed to '#{event.path}' ! The current working directory is '#{Dir.getwd}'")
+      end
+
+      def on_check_box(event)
+        if (event.event_object == @chkDirTextCtrl ||
+            event.event_object == @chkDirChangeDir ||
+            event.event_object == @chkDirMustExist ||
+            event.event_object == @chkSmall)
+          recreate_picker
+        end
+      end
+
+      def on_button_reset(_ev)
+        reset
+        recreate_picker
+      end
+
+      def on_button_set_dir(_ev)
+        @dirPicker.set_initial_directory(@textInitialDir.value)
+      end
+      
+    end
+
+  end
+
+end