sirens 0.0.1 → 0.1.1

data/lib/components/widgets/checkbox.rb

@@ -1,10 +1,10 @@
 module Sirens
     class Checkbox < PrimitiveComponent
         ##
-        # Returns a CheckButtonView.
+        # Returns a CheckboxView.
         #
         def create_view()
-            CheckButtonView.new(on_toggled: proc{ |state:| on_toggled(state: state) })
+            CheckboxView.new(on_toggled: proc{ |state:| on_toggled(state: state) })
         end
 
         ##

data/lib/components/widgets/input_text.rb

@@ -4,7 +4,7 @@ module Sirens
         # Returns a TextView.
         #
         def create_view()
-            EntryView.new
+            InputTextView.new
         end
 
         ##

data/lib/components/widgets/tree_choice.rb

@@ -43,10 +43,7 @@ module Sirens
         # Syncs the ui from the model.
         #
        def sync_ui_from_model()
-            return if view.nil?
-
-            view.clear_items
-            view.add_items(parent_iter: nil, items: model.tree.roots, index: 0)
+            view.set_roots(model.tree.roots)
         end
 
         # Events
@@ -68,14 +65,10 @@ module Sirens
 
             indices_path = model.path_of(selection_hierarchy)
 
-            while_updating_view do
-                view.set_selection_indices(indices_path)
-            end
+            view.set_selection_indices(indices_path)
         end
 
         def on_selection_changed(selection_items:, selection_paths:)
-            return if is_updating_view?
-
             model.set_selection_from_path(path: selection_paths.first) unless model.nil?
         end
     end

data/lib/{components/widgets → components_builder}/column_props.rb

@@ -4,7 +4,15 @@ module Sirens
             @props = props
         end
 
-         attr_reader :props
+        attr_reader :props
+
+        def has_image_block?()
+            @props.key?(:get_image_block)
+        end
+
+        def has_text_block?()
+            @props.key?(:get_text_block)
+        end
 
         def fetch(key, absent_value)
             @props.fetch(key, absent_value)
@@ -15,9 +23,13 @@ module Sirens
         end
 
         def display_text_of(item)
-            return item.to_s if ! @props.key?(:get_text_block)
+            return item.to_s if ! has_text_block?
 
             @props[:get_text_block].call(item)
         end
+
+        def display_image_of(item)
+            @props[:get_image_block].call(item)
+        end
     end
 end

data/lib/components_builder/layout_builder.rb

@@ -0,0 +1,215 @@
+module Sirens
+    class LayoutBuilder
+
+        # Initializing
+
+        def initialize(root_component: nil)
+            super()
+
+            @root_component = root_component
+            @built_props = Hash[]
+            @built_components = []
+        end
+
+        # Accessing
+
+        attr_reader :built_props
+        attr_reader :built_components
+
+        # Building
+
+        def render(props: Hash[], &build_block)
+            eval(props: props, &build_block)
+
+            @root_component.add_all_components(built_components)
+
+            self
+        end
+
+        def eval(props: Hash[], &build_block)
+            merge_props(props)
+
+            instance_exec(@root_component, &build_block) unless build_block.nil?
+
+            self
+        end
+
+        def styles(props)
+            merge_props(props)
+        end
+
+        def model(model)
+            merge_props(model: model)
+        end
+
+        def merge_props(props)
+            @built_props.merge!(props)
+        end
+
+        # Containers
+
+        def component(component)
+            @built_components << component
+        end
+
+        def window(props = Hash[], &build_block)
+            LayoutBuilder.new.tap do |builder|
+                builder.eval(props: props, &build_block)
+
+                Window.new(builder.built_props).tap do |window|
+                    window.add_all_components(builder.built_components)
+
+                    @built_components << window
+                end
+            end
+        end
+
+        def horizontal_stack(props = Hash[], &build_block)
+            LayoutBuilder.new.tap do |builder|
+                builder.eval(props: props, &build_block)
+
+                Stack.horizontal(builder.built_props).tap do |stack|
+                    stack.add_all_components(builder.built_components)
+
+                    @built_components << stack
+                end
+            end
+        end
+
+        def vertical_stack(props = Hash[], &build_block)
+            LayoutBuilder.new.tap do |builder|
+                builder.eval(props: props, &build_block)
+
+                Stack.vertical(builder.built_props).tap do |stack|
+                    stack.add_all_components(builder.built_components)
+
+                    @built_components << stack
+                end
+            end
+        end
+
+        def horizontal_splitter(props = Hash[], &build_block)
+            LayoutBuilder.new.tap do |builder|
+                builder.eval(props: props, &build_block)
+
+                Splitter.horizontal(builder.built_props).tap do |splitter|
+                    splitter.add_all_components(builder.built_components)
+
+                    @built_components << splitter
+                end
+            end
+        end
+
+        def vertical_splitter(props = Hash[], &build_block)
+            LayoutBuilder.new.tap do |builder|
+                builder.eval(props: props, &build_block)
+
+                Splitter.vertical(builder.built_props).tap do |splitter|
+                    splitter.add_all_components(builder.built_components)
+
+                    @built_components << splitter
+                end
+            end
+        end
+
+        def tabs(props = Hash[], &build_block)
+            LayoutBuilder.new.tap do |builder|
+                builder.eval(props: props, &build_block)
+
+                Tabs.new(builder.built_props).tap do |tabs|
+                    tabs.add_all_components(builder.built_components)
+
+                    @built_components << tabs
+                end
+            end
+        end
+
+        # Widgets
+
+        def button(props = Hash[], &build_block)
+            LayoutBuilder.new.tap do |builder|
+                builder.eval(props: props, &build_block)
+
+                @built_components << Button.new(builder.built_props)
+            end
+        end
+
+        def checkbox(props = Hash[], &build_block)
+            LayoutBuilder.new.tap do |builder|
+                builder.eval(props: props, &build_block)
+
+                @built_components << Checkbox.new(builder.built_props)
+            end
+        end
+
+        def radio_button(props = Hash[], &build_block)
+            LayoutBuilder.new.tap do |builder|
+                builder.eval(props: props, &build_block)
+
+                @built_components << RadioButton.new(builder.built_props)
+            end
+        end
+
+        def radio_buttons_group(props = Hash[], &build_block)
+            buttons = RadioButtonGroupBuilder.new.render(&build_block)
+
+            @built_components.concat(buttons)
+        end
+
+        def list(props = Hash[], &build_block)
+            columns_builder = ColumnsBuilder.new.render(props, &build_block)
+
+            props[:popup_menu] = columns_builder.popup_menu unless columns_builder.popup_menu.nil?
+
+            List.new(props).tap { |list|
+                list.define_columns(columns_builder.columns)
+
+                @built_components << list
+            }
+        end
+
+        def choices_list(props = Hash[], &build_block)
+            columns_builder = ColumnsBuilder.new.render(props, &build_block)
+
+            props[:popup_menu] = columns_builder.popup_menu unless columns_builder.popup_menu.nil?
+
+            ListChoice.new(props).tap { |list|
+                list.define_columns(columns_builder.columns)
+
+                @built_components << list
+            }
+        end
+
+        def input_text(props = Hash[], &build_block)
+            LayoutBuilder.new.tap do |builder|
+                builder.eval(props: props, &build_block)
+
+                @built_components << InputText.new(builder.built_props)
+            end
+        end
+
+        def text(props = Hash[], &build_block)
+            LayoutBuilder.new.tap do |builder|
+                builder.eval(props: props, &build_block)
+
+                @built_components << Text.new(builder.built_props)
+            end
+        end
+
+        def choices_tree(props = Hash[], &build_block)
+            columns_builder = ColumnsBuilder.new.render(props, &build_block)
+
+            props[:popup_menu] = columns_builder.get_popup_menu unless columns_builder.get_popup_menu.nil?
+
+            TreeChoice.new(props).tap { |tree|
+                tree.define_columns(columns_builder.columns)
+
+                @built_components << tree
+            }
+        end
+
+        def popup_menu(&block)
+            merge_props(popup_menu: block)
+        end
+    end
+end

data/lib/sirens.rb

@@ -1,4 +1,5 @@
 require 'gtk3'
+require 'method_source'
 
 module Sirens
     class << self
@@ -35,7 +36,7 @@ module Sirens
     autoload(:TreeChoiceModel, 'models/tree_choice_model.rb')
 
     # Components
-    autoload(:ComponentBehaviour, 'components/component_behaviour.rb')
+    autoload(:AbstractComponent, 'components/abstract_component.rb')
     autoload(:Component, 'components/component.rb')
     autoload(:PrimitiveComponent, 'components/primitive_component.rb')
     autoload(:Window, 'components/containers/window.rb')
@@ -45,7 +46,6 @@ module Sirens
     autoload(:Button, 'components/widgets/button.rb')
     autoload(:Checkbox, 'components/widgets/checkbox.rb')
     autoload(:RadioButton, 'components/widgets/radio_button.rb')
-    autoload(:ColumnProps, 'components/widgets/column_props.rb')
     autoload(:List, 'components/widgets/list.rb')
     autoload(:ListChoice, 'components/widgets/list_choice.rb')
     autoload(:InputText, 'components/widgets/input_text.rb')
@@ -53,27 +53,34 @@ module Sirens
     autoload(:TreeChoice, 'components/widgets/tree_choice.rb')
 
     # Layouts
-    autoload(:LayoutBuilder, 'layouts/layout_builder.rb')
-    autoload(:ColumnsBuilder, 'layouts/columns_builder.rb')
-    autoload(:RadioButtonGroupBuilder, 'layouts/radio_button_group_builder.rb')
+    autoload(:ColumnProps, 'components_builder/column_props.rb')
+    autoload(:LayoutBuilder, 'components_builder/layout_builder.rb')
+    autoload(:ColumnsBuilder, 'components_builder/columns_builder.rb')
+    autoload(:RadioButtonGroupBuilder, 'components_builder/radio_button_group_builder.rb')
 
     # Views
-    autoload(:View, 'views/view.rb')
+    autoload(:AbstractView, 'views/abstract_view.rb')
+    autoload(:ComponentView, 'views/component_view.rb')
+    autoload(:WidgetView, 'views/widget_view.rb')
     autoload(:MenuView, 'views/menu_view.rb')
     autoload(:WindowView, 'views/window_view.rb')
     autoload(:StackView, 'views/stack_view.rb')
-    autoload(:PanedView, 'views/paned_view.rb')
-    autoload(:NotebookView, 'views/notebook_view.rb')
+    autoload(:SplitterView, 'views/splitter_view.rb')
+    autoload(:TabsView, 'views/tabs_view.rb')
     autoload(:ButtonView, 'views/button_view.rb')
-    autoload(:CheckButtonView, 'views/check_button_view.rb')
+    autoload(:CheckboxView, 'views/checkbox_view.rb')
     autoload(:RadioButtonView, 'views/radio_button_view.rb')
     autoload(:ListView, 'views/list_view.rb')
-    autoload(:EntryView, 'views/entry_view.rb')
+    autoload(:InputTextView, 'views/input_text_view.rb')
     autoload(:TextView, 'views/text_view.rb')
     autoload(:TreeView, 'views/tree_view.rb')
 
-    autoload(:ModuleBrowserModel, 'sirens/models/module_browser_model.rb')
+    # Sirens
+    
+    autoload(:Method, 'sirens/models/method.rb')
+    autoload(:Icons, 'sirens/models/icons.rb')
     autoload(:MethodModel, 'sirens/models/method_model.rb')
+    autoload(:ModuleBrowserModel, 'sirens/models/module_browser_model.rb')
     autoload(:ConstantModel, 'sirens/models/constant_model.rb')
     autoload(:ObjectBrowserModel, 'sirens/models/object_browser_model.rb')
 

data/lib/sirens/browsers/module_browser.rb

@@ -20,7 +20,7 @@ module Sirens
 
         # Building
 
-        def renderWith(layout)
+        def render_with(layout)
             browser_model = model
 
             layout.render do |component|
@@ -39,17 +39,17 @@ module Sirens
 
                             component NamespacesList.new(
                                 model: browser_model.namespaces,
-                                splitter_proportion: 1.0/4.0
+                                splitter_proportion: 1.0/5.0
                             )
 
                             component ModulesList.new(
                                 model: browser_model.modules,
-                                splitter_proportion: 1.0/4.0,
+                                splitter_proportion: 1.0/5.0,
                             )
 
                             component ClassBrowser.new(
                                 model: browser_model,
-                                splitter_proportion: 2.0/4.0
+                                splitter_proportion: 1.0/5.0
                             )
                         end
 

data/lib/sirens/browsers/object_browser.rb

@@ -16,7 +16,7 @@ module Sirens
 
         # Building
 
-        def renderWith(layout)
+        def render_with(layout)
             browser_model = model
 
             layout.render do |component|
@@ -38,6 +38,9 @@ module Sirens
                                 component.browse(object: item.value)
                             }
 
+                            column label: '',
+                                get_image_block: proc{ |inst_var| inst_var.icon }
+
                             column label: 'Instance variables',
                                 get_text_block: proc { |inst_var| inst_var.display_string }
 

data/lib/sirens/components/ancestors_list.rb

@@ -3,7 +3,7 @@ module Sirens
 
         # Building
 
-        def renderWith(layout)
+        def render_with(layout)
 
             layout.render do |component|
                 choices_list do
@@ -13,6 +13,9 @@ module Sirens
                         show_headers: true
                     )
 
+                    column label: '',
+                        get_image_block: proc{ |a_module| Icons.icon_for(a_module) }
+
                     column label: 'Module ancestors',
                         get_text_block: proc{ |a_module| a_module.name }
                 end

data/lib/sirens/components/class_browser.rb

@@ -3,18 +3,18 @@ module Sirens
 
         # Building
 
-        def renderWith(layout)
+        def render_with(layout)
             browser_model = model
 
             layout.render do |component|
                 horizontal_splitter do
                     component AncestorsList.new(
                         model: browser_model.module_ancestors,
-                        splitter_proportion: 1.0/3.0
+                        splitter_proportion: 1.0/2.0
                     )
 
                     tabs do
-                        styles splitter_proportion: 2.0/3.0
+                        styles splitter_proportion: 1.0/2.0
 
                         component MethodsList.new(
                             model: browser_model.methods,
@@ -23,7 +23,8 @@ module Sirens
                             show_public_methods: browser_model.show_public_methods,
                             show_protected_methods: browser_model.show_protected_methods,
                             show_private_methods: browser_model.show_private_methods,
-                            tab_label: 'Methods'
+                            tab_label: 'Methods',
+                            get_method_image_block: proc{ |method| method.icon }
                         )
 
                         component ConstantsList.new(