September 2008 - macruby-changes - lists.macosforge.org

[613] MacRuby/trunk/lib/hotcocoa/layout_view.rb
by source_changes＠macosforge.org 20 Sep '08

20 Sep '08

Revision: 613 http://trac.macosforge.org/projects/ruby/changeset/613 Author: lsansonetti(a)apple.com Date: 2008-09-19 23:04:43 -0700 (Fri, 19 Sep 2008) Log Message: ----------- consider padding flags when calculating the other dimension expandable size Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/layout_view.rb Modified: MacRuby/trunk/lib/hotcocoa/layout_view.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/layout_view.rb 2008-09-20 03:16:38 UTC (rev 612) +++ MacRuby/trunk/lib/hotcocoa/layout_view.rb 2008-09-20 06:04:43 UTC (rev 613) @@ -390,9 +390,9 @@ if (vertical ? options.expand_width? : options.expand_height?) if vertical - view_frame.size.width = view_size.width - (2 * @margin) + view_frame.size.width = view_size.width - (2 * @margin) - options.right_padding - options.left_padding else - view_frame.size.height = view_size.height - (2 * @margin) + view_frame.size.height = view_size.height - (2 * @margin) - options.top_padding - options.bottom_padding end else case options.align

1 0

[612] MacRuby/trunk/lib/hotcocoa/mappings/xml_parser.rb
by source_changes＠macosforge.org 20 Sep '08

20 Sep '08

Revision: 612 http://trac.macosforge.org/projects/ruby/changeset/612 Author: rich(a)infoether.com Date: 2008-09-19 20:16:38 -0700 (Fri, 19 Sep 2008) Log Message: ----------- add xml_parser mapping Added Paths: ----------- MacRuby/trunk/lib/hotcocoa/mappings/xml_parser.rb Added: MacRuby/trunk/lib/hotcocoa/mappings/xml_parser.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/xml_parser.rb (rev 0) +++ MacRuby/trunk/lib/hotcocoa/mappings/xml_parser.rb 2008-09-20 03:16:38 UTC (rev 612) @@ -0,0 +1,40 @@ +HotCocoa::Mappings.map :xml_parser => :NSXMLParser do + + def alloc_with_options(options) + url = options.delete(:url) + data = options.delete(:data) + if url + url = NSURL.alloc.initWithString(url) if url.is_a?(String) + NSXMLParser.alloc.initWithContentsOfURL(url) + elsif data + NSXMLParser.alloc.initWithData(data) + else + raise "Must provide either :url or :data when constructing an NSXMLParser" + end + end + + delegating "parserDidStartDocument:", :to => :on_start_document + delegating "parserDidEndDocument:", :to => :on_end_document + delegating "parser:didStartElement:namespaceURI:qualifiedName:attributes:", :to => :on_start_element, :parameters => [:didStartElement, :namespaceURI, :qualifiedName, :attributes] + delegating "parser:didEndElement:namespaceURI:qualifiedName:", :to => :on_end_element, :parameters => [:didEndElement, :namespaceURI, :qualifiedName] + delegating "parser:didStartMappingPrefix:toURI:", :to => :on_start_mapping_prefix, :parameters => [:didStartMappingPrefix, :toURI] + delegating "parser:didEndMappingPrefix:", :to => :on_end_mapping_prefix, :parameters => [:didEndMappingPrefix] + + delegating "parser:foundAttributeDeclarationWithName:forElement:type:defaultValue:", :to => :on_attribute_declaration, :parameters => [:foundAttributeDeclarationWithName, :forElement, :type, :defaultValue] + delegating "parser:foundCDATA:", :to => :on_cdata, :parameters => [:foundCDATA] + delegating "parser:foundCharacters:", :to => :on_characters, :parameters => [:foundCharacters] + delegating "parser:foundComment:", :to => :on_comment, :parameters => [:foundComment] + delegating "parser:foundElementDeclarationWithName:model:", :to => :on_element_declaration, :parameters => [:foundElementDeclarationWithName, :model] + delegating "parser:foundExternalEntityDeclarationWithName:publicID:systemID:", :to => :on_external_entity_declaration, :parameters => [:foundExternalEntityDeclarationWithName, :publicID, :systemID] + delegating "parser:foundIgnorableWhitespace:", :to => :on_ignorable_whitespace, :parameters => [:foundIgnorableWhitespace] + delegating "parser:foundInternalEntityDeclarationWithName:value:", :to => :on_internal_entity_declaration, :parameters => [:foundInternalEntityDeclarationWithName, :value] + delegating "parser:foundNotationDeclarationWithName:publicID:systemID:", :to => :on_notation_declaration, :parameters => [:foundNotationDeclarationWithName, :data] + delegating "parser:foundProcessingInstructionWithTarget:data:", :to => :on_processing_instruction, :parameters => [:foundProcessingInstructionWithTarget, :data] + delegating "parser:foundUnparsedEntityDeclarationWithName:publicID:systemID:notationName:", :to => :on_unparsed_entity_declaration, :parameters => [:foundUnparsedEntityDeclarationWithName, :publicID, :systemID, :notationName] + + delegating "parser:resolveExternalEntityName:systemID:", :to => :resolve_external_entity_name, :parameters => [:resolveExternalEntityName, :systemID] + + delegating "parser:parseErrorOccurred:", :to => :on_parse_error, :parameters => [:parseErrorOccurred] + delegating "parser:validationErrorOccurred:", :to => :on_validation_error, :parameters => [:validationErrorOccurred] + +end \ No newline at end of file

1 0

[611] MacRuby/trunk/lib/hotcocoa/layout_view.rb
by source_changes＠macosforge.org 20 Sep '08

20 Sep '08

Revision: 611 http://trac.macosforge.org/projects/ruby/changeset/611 Author: lsansonetti(a)apple.com Date: 2008-09-19 17:27:42 -0700 (Fri, 19 Sep 2008) Log Message: ----------- consider paddings when calculating the expandable size Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/layout_view.rb Modified: MacRuby/trunk/lib/hotcocoa/layout_view.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/layout_view.rb 2008-09-20 00:08:49 UTC (rev 610) +++ MacRuby/trunk/lib/hotcocoa/layout_view.rb 2008-09-20 00:27:42 UTC (rev 611) @@ -350,6 +350,9 @@ expandable_size -= vertical ? view.frameSize.height : view.frameSize.width expandable_size -= @spacing end + expandable_size -= + vertical ? view.layout.top_padding + view.layout.bottom_padding + : view.layout.left_padding + view.layout.right_padding end expandable_size /= expandable_views

1 0

[610] MacRuby/trunk/lib/hotcocoa/mappings/control.rb
by source_changes＠macosforge.org 20 Sep '08

20 Sep '08

Revision: 610 http://trac.macosforge.org/projects/ruby/changeset/610 Author: lsansonetti(a)apple.com Date: 2008-09-19 17:08:49 -0700 (Fri, 19 Sep 2008) Log Message: ----------- adding constants for the alignment property Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings/control.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings/control.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/control.rb 2008-09-20 00:08:16 UTC (rev 609) +++ MacRuby/trunk/lib/hotcocoa/mappings/control.rb 2008-09-20 00:08:49 UTC (rev 610) @@ -1,5 +1,13 @@ HotCocoa::Mappings.map :control => :NSControl do - + + constant :alignment, { + :left => NSLeftTextAlignment, + :right => NSRightTextAlignment, + :center => NSCenterTextAlignment, + :justified => NSJustifiedTextAlignment, + :natural => NSNaturalTextAlignment + } + custom_methods do include TargetActionConvenience

1 0

[609] MacRuby/trunk/lib/hotcocoa/mappings/notification.rb
by source_changes＠macosforge.org 20 Sep '08

20 Sep '08

Revision: 609 http://trac.macosforge.org/projects/ruby/changeset/609 Author: lsansonetti(a)apple.com Date: 2008-09-19 17:08:16 -0700 (Fri, 19 Sep 2008) Log Message: ----------- fix typos Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings/notification.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings/notification.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/notification.rb 2008-09-19 13:14:55 UTC (rev 608) +++ MacRuby/trunk/lib/hotcocoa/mappings/notification.rb 2008-09-20 00:08:16 UTC (rev 609) @@ -5,12 +5,12 @@ def alloc_with_options(options) if options.delete(:post) if options.delete(:distributed) - NSDistributedNotificationCenter.defaultCenter.postNotificationWithName options.delete(:name), object:options.delete(:object), userInfo:options.delete(:info), deliverImmediately:(options.delete(:immediately) == true) + NSDistributedNotificationCenter.defaultCenter.postNotificationName options.delete(:name), object:options.delete(:object), userInfo:options.delete(:info), deliverImmediately:(options.delete(:immediately) == true) else - NSNotificationCenter.defaultCenter.postNotificationWithName options.delete(:name), object:options.delete(:object), userInfo:options.delete(:info) + NSNotificationCenter.defaultCenter.postNotificationName options.delete(:name), object:options.delete(:object), userInfo:options.delete(:info) end else - NSNotification.notificationWithName options.delete(:name), object:options.delete(:object), userInfo:options.delete(:info) + NSNotification.notificationName options.delete(:name), object:options.delete(:object), userInfo:options.delete(:info) end end

1 0

[608] MacRuby/trunk/lib/hotcocoa/notification_listener.rb
by source_changes＠macosforge.org 19 Sep '08

19 Sep '08

Revision: 608 http://trac.macosforge.org/projects/ruby/changeset/608 Author: rich(a)infoether.com Date: 2008-09-19 06:14:55 -0700 (Fri, 19 Sep 2008) Log Message: ----------- fix spelling error Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/notification_listener.rb Modified: MacRuby/trunk/lib/hotcocoa/notification_listener.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/notification_listener.rb 2008-09-19 13:04:38 UTC (rev 607) +++ MacRuby/trunk/lib/hotcocoa/notification_listener.rb 2008-09-19 13:14:55 UTC (rev 608) @@ -3,10 +3,10 @@ class NotificationListener DistributedBehaviors = { - :drop => NSNotificationSuspensionBehaviorDrop, - :coalese => NSNotificationSuspensionBehaviorCoalesce, - :hold => NSNotificationSuspensionBehaviorHold, - :deliver_immediately => NSNotificationSuspensionBehaviorDeliverImmediately + :drop => NSNotificationSuspensionBehaviorDrop, + :coalesce => NSNotificationSuspensionBehaviorCoalesce, + :hold => NSNotificationSuspensionBehaviorHold, + :deliver_immediately => NSNotificationSuspensionBehaviorDeliverImmediately } attr_reader :callback, :name, :sender, :suspension_behavior @@ -14,7 +14,7 @@ def initialize(options={}, &block) @callback = block @distributed = (options[:distributed] == true) - @suspension_behavior = DistributedBehaviors[options[:when_suspended] || :coalese] + @suspension_behavior = DistributedBehaviors[options[:when_suspended] || :coalesce] @name = options[:named] @sender = options[:sent_by] observe

1 0

[607] MacRuby/trunk/lib
by source_changes＠macosforge.org 19 Sep '08

19 Sep '08

Revision: 607 http://trac.macosforge.org/projects/ruby/changeset/607 Author: rich(a)infoether.com Date: 2008-09-19 06:04:38 -0700 (Fri, 19 Sep 2008) Log Message: ----------- add notifications support Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings/image.rb MacRuby/trunk/lib/hotcocoa/mappings/text_view.rb MacRuby/trunk/lib/hotcocoa/mappings/view.rb MacRuby/trunk/lib/hotcocoa/mappings/window.rb MacRuby/trunk/lib/hotcocoa.rb Added Paths: ----------- MacRuby/trunk/lib/hotcocoa/mappings/notification.rb MacRuby/trunk/lib/hotcocoa/notification_listener.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings/image.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/image.rb 2008-09-19 01:39:37 UTC (rev 606) +++ MacRuby/trunk/lib/hotcocoa/mappings/image.rb 2008-09-19 13:04:38 UTC (rev 607) @@ -11,5 +11,5 @@ NSImage.alloc.init end end - + end Added: MacRuby/trunk/lib/hotcocoa/mappings/notification.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/notification.rb (rev 0) +++ MacRuby/trunk/lib/hotcocoa/mappings/notification.rb 2008-09-19 13:04:38 UTC (rev 607) @@ -0,0 +1,17 @@ +HotCocoa::Mappings.map :notification => :NSNotification do + + defaults :post => true, :distributed => false + + def alloc_with_options(options) + if options.delete(:post) + if options.delete(:distributed) + NSDistributedNotificationCenter.defaultCenter.postNotificationWithName options.delete(:name), object:options.delete(:object), userInfo:options.delete(:info), deliverImmediately:(options.delete(:immediately) == true) + else + NSNotificationCenter.defaultCenter.postNotificationWithName options.delete(:name), object:options.delete(:object), userInfo:options.delete(:info) + end + else + NSNotification.notificationWithName options.delete(:name), object:options.delete(:object), userInfo:options.delete(:info) + end + end + +end Modified: MacRuby/trunk/lib/hotcocoa/mappings/text_view.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/text_view.rb 2008-09-19 01:39:37 UTC (rev 606) +++ MacRuby/trunk/lib/hotcocoa/mappings/text_view.rb 2008-09-19 13:04:38 UTC (rev 607) @@ -1,9 +1,13 @@ HotCocoa::Mappings.map :text_view => :NSTextView do - defaults :frame => [0,0,0,0] - + defaults :layout => {}, :frame => DefaultEmptyRect + def init_with_options(text_view, options) - text_view.initWithFrame options.delete(:frame) + if options[:container] + text_view.initWithFrame options.delete(:frame), :textContainer => options.delete(:container) + else + text_view.initWithFrame options.delete(:frame) + end end - + end Modified: MacRuby/trunk/lib/hotcocoa/mappings/view.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/view.rb 2008-09-19 01:39:37 UTC (rev 606) +++ MacRuby/trunk/lib/hotcocoa/mappings/view.rb 2008-09-19 13:04:38 UTC (rev 607) @@ -44,6 +44,11 @@ @layout end + def on_notification(options={}, &block) + options[:sent_by] = self + NotificationListener.new(options, &block) + end + def remove(subview, options = {}) raise ArgumentError, "#{subview} is not a subview of #{self} and cannot be removed." unless subview.superview == self options[:needs_display] == false ? subview.removeFromSuperviewWithoutNeedingDisplay : subview.removeFromSuperview Modified: MacRuby/trunk/lib/hotcocoa/mappings/window.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/window.rb 2008-09-19 01:39:37 UTC (rev 606) +++ MacRuby/trunk/lib/hotcocoa/mappings/window.rb 2008-09-19 13:04:38 UTC (rev 607) @@ -56,6 +56,11 @@ def view=(view) setContentView(view) end + + def on_notification(options={}, &block) + options[:sent_by] = self + NotificationListener.new(options, &block) + end def show display Added: MacRuby/trunk/lib/hotcocoa/notification_listener.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/notification_listener.rb (rev 0) +++ MacRuby/trunk/lib/hotcocoa/notification_listener.rb 2008-09-19 13:04:38 UTC (rev 607) @@ -0,0 +1,57 @@ +module HotCocoa + + class NotificationListener + + DistributedBehaviors = { + :drop => NSNotificationSuspensionBehaviorDrop, + :coalese => NSNotificationSuspensionBehaviorCoalesce, + :hold => NSNotificationSuspensionBehaviorHold, + :deliver_immediately => NSNotificationSuspensionBehaviorDeliverImmediately + } + + attr_reader :callback, :name, :sender, :suspension_behavior + + def initialize(options={}, &block) + @callback = block + @distributed = (options[:distributed] == true) + @suspension_behavior = DistributedBehaviors[options[:when_suspended] || :coalese] + @name = options[:named] + @sender = options[:sent_by] + observe + end + + def distributed? + @distributed + end + + def receive(notification) + callback.call(notification) + end + + def stop_notifications(options={}) + if options.has_key?(:named) || options.has_key?(:sent_by) + notification_center.removeObserver(self, name:options[:named], object:options[:sender]) + else + notification_center.removeObserver(self) + end + end + + private + + def observe + if distributed? + notification_center.addObserver self, selector:'receive:', name:name, object:sender, suspensionBehavior:suspension_behavior + else + notification_center.addObserver self, selector:'receive:', name:name, object:sender + end + end + + def notification_center + @notification_center ||= (distributed? ? NSDistributedNotificationCenter.defaultCenter : NSNotificationCenter.defaultCenter) + end + end + + def on_notification(options={}, &block) + NotificationListener.new(options, &block) + end +end \ No newline at end of file Modified: MacRuby/trunk/lib/hotcocoa.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa.rb 2008-09-19 01:39:37 UTC (rev 606) +++ MacRuby/trunk/lib/hotcocoa.rb 2008-09-19 13:04:38 UTC (rev 607) @@ -12,6 +12,7 @@ require 'hotcocoa/mapper' require 'hotcocoa/layout_view' require 'hotcocoa/delegate_builder' +require 'hotcocoa/notification_listener' require 'hotcocoa/data_sources/table_data_source' require 'hotcocoa/data_sources/combo_box_data_source' require 'hotcocoa/kernel_ext'

1 0

[606] MacRuby/trunk/lib/hotcocoa/mappings/toolbar_item.rb
by source_changes＠macosforge.org 19 Sep '08

19 Sep '08

Revision: 606 http://trac.macosforge.org/projects/ruby/changeset/606 Author: rich(a)infoether.com Date: 2008-09-18 18:39:37 -0700 (Thu, 18 Sep 2008) Log Message: ----------- allow label= to be called Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings/toolbar_item.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings/toolbar_item.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/toolbar_item.rb 2008-09-19 01:17:43 UTC (rev 605) +++ MacRuby/trunk/lib/hotcocoa/mappings/toolbar_item.rb 2008-09-19 01:39:37 UTC (rev 606) @@ -13,7 +13,7 @@ if !options.has_key?(:label) && !options.has_key?(:identifier) raise ArgumentError, ":identifier or :label required" end - label = options.delete(:label) + label = options[:label] toolbar_item.initWithItemIdentifier(options.delete(:identifier) || label.tr(' ', '_')) toolbar_item.paletteLabel = label if label toolbar_item

1 0

[605] MacRuby/trunk/lib/hotcocoa
by source_changes＠macosforge.org 19 Sep '08

19 Sep '08

Revision: 605 http://trac.macosforge.org/projects/ruby/changeset/605 Author: rich(a)infoether.com Date: 2008-09-18 18:17:43 -0700 (Thu, 18 Sep 2008) Log Message: ----------- enable delegate methods to be required before setting the delegate on the control Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/delegate_builder.rb MacRuby/trunk/lib/hotcocoa/mapper.rb Modified: MacRuby/trunk/lib/hotcocoa/delegate_builder.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/delegate_builder.rb 2008-09-19 01:17:07 UTC (rev 604) +++ MacRuby/trunk/lib/hotcocoa/delegate_builder.rb 2008-09-19 01:17:43 UTC (rev 605) @@ -2,10 +2,11 @@ class DelegateBuilder - attr_reader :control, :delegate, :method_count + attr_reader :control, :delegate, :method_count, :required_methods - def initialize(control) + def initialize(control, required_methods) @control = control + @required_methods = required_methods @method_count = 0 @delegate = Object.new end @@ -15,7 +16,7 @@ increment_method_count bind_block_to_delegate_instance_variable(block) create_delegate_method(selector_name, parameters) - set_delegate + set_delegate if required_methods.empty? end private @@ -29,6 +30,7 @@ end def create_delegate_method(selector_name, parameters) + required_methods.delete(selector_name) eval %{ def delegate.#{parameterize_selector_name(selector_name)} #{block_instance_variable}.call(#{parameter_values_for_mapping(selector_name, parameters)}) Modified: MacRuby/trunk/lib/hotcocoa/mapper.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mapper.rb 2008-09-19 01:17:07 UTC (rev 604) +++ MacRuby/trunk/lib/hotcocoa/mapper.rb 2008-09-19 01:17:43 UTC (rev 605) @@ -121,12 +121,16 @@ def delegate_module_for_control_class return Mapper.delegate_modules[control_class] if Mapper.delegate_modules.has_key?(control_class) delegate_module = Module.new + required_methods = [] inherited_delegate_methods.each do |delegate_method, mapping| + required_methods << delegate_method if mapping[:required] + end + inherited_delegate_methods.each do |delegate_method, mapping| parameters = mapping[:parameters] ? ", "+mapping[:parameters].map {|param| %{"#{param}"} }.join(",") : "" delegate_module.module_eval %{ def #{mapping[:to]}(&block) raise "Must pass in a block to use this delegate method" unless block_given? - @_delegate_builder ||= HotCocoa::DelegateBuilder.new(self) + @_delegate_builder ||= HotCocoa::DelegateBuilder.new(self, #{required_methods.inspect}) @_delegate_builder.add_delegated_method(block, "#{delegate_method}" #{parameters}) end }

1 0

[604] MacRuby/trunk/lib/hotcocoa/mappings
by source_changes＠macosforge.org 19 Sep '08

19 Sep '08

Revision: 604 http://trac.macosforge.org/projects/ruby/changeset/604 Author: rich(a)infoether.com Date: 2008-09-18 18:17:07 -0700 (Thu, 18 Sep 2008) Log Message: ----------- use delegate mappings for mapping delegate methods with display= and allowed= Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings/toolbar.rb MacRuby/trunk/lib/hotcocoa/mappings/toolbar_item.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings/toolbar.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/toolbar.rb 2008-09-18 00:35:31 UTC (rev 603) +++ MacRuby/trunk/lib/hotcocoa/mappings/toolbar.rb 2008-09-19 01:17:07 UTC (rev 604) @@ -1,16 +1,16 @@ HotCocoa::Mappings.map :toolbar => :NSToolbar do constant :size, { - :default => NSToolbarSizeModeDefault, - :regular => NSToolbarSizeModeRegular, - :small => NSToolbarSizeModeSmall + :default => NSToolbarSizeModeDefault, + :regular => NSToolbarSizeModeRegular, + :small => NSToolbarSizeModeSmall } constant :display, { - :default => NSToolbarDisplayModeDefault, + :default => NSToolbarDisplayModeDefault, :icon_and_label => NSToolbarDisplayModeIconAndLabel, - :icon => NSToolbarDisplayModeIconOnly, - :label => NSToolbarDisplayModeLabelOnly + :icon => NSToolbarDisplayModeIconOnly, + :label => NSToolbarDisplayModeLabelOnly } defaults :identifier => 'DefaultToolbarIdentifier', @@ -21,55 +21,11 @@ :size => :default def init_with_options(toolbar, options) - toolbar.initWithIdentifier options.delete(:identifier) - - allowed = options.delete(:allowed).dup - default = options.delete(:default).dup - - ary = default.select { |x| x.is_a?(NSToolbarItem) } - default -= ary - custom_items = {} - ary.each { |x| custom_items[x.itemIdentifier] = x } - allowed.concat(custom_items.keys) - default.concat(custom_items.keys) - - [allowed, default].each do |a| - a.map! do |i| - case i - when :separator - NSToolbarSeparatorItemIdentifier - when :space - NSToolbarSpaceItemIdentifier - when :flexible_space - NSToolbarFlexibleSpaceItemIdentifier - when :show_colors - NSToolbarShowColorsItemIdentifier - when :show_fonts - NSToolbarShowFontsItemIdentifier - when :customize - NSToolbarCustomizeToolbarItemIdentifier - when :print - NSToolbarPrintItemIdentifier - else - i - end - end - end - o = Object.new - o.instance_variable_set(:@allowed, allowed) - o.instance_variable_set(:@default, default) - o.instance_variable_set(:@custom_items, custom_items) - def o.toolbarAllowedItemIdentifiers(sender); @allowed; end - def o.toolbarDefaultItemIdentifiers(sender); @default; end - def o.toolbar(sender, itemForItemIdentifier:identifier, - willBeInsertedIntoToolbar:flag) - @custom_items[identifier] - end - toolbar.delegate = o + toolbar = toolbar.initWithIdentifier options.delete(:identifier) toolbar.allowsUserCustomization = options.delete(:allow_customization) toolbar end - + custom_methods do def size=(mode) @@ -79,7 +35,63 @@ def display=(mode) setDisplayMode(mode) end + + def default=(list) + @default = list.dup + build_custom_items + end + + def allowed=(list) + @allowed = list.dup + build_custom_items + end + + private + + def build_custom_items + if @allowed && @default + ary = @default.select { |x| x.is_a?(NSToolbarItem) } + @default -= ary + @custom_items = {} + ary.each { |x| @custom_items[x.itemIdentifier] = x } + @allowed.concat(@custom_items.keys) + @default.concat(@custom_items.keys) + [@allowed, @default].each do |a| + a.map! do |i| + case i + when :separator + NSToolbarSeparatorItemIdentifier + when :space + NSToolbarSpaceItemIdentifier + when :flexible_space + NSToolbarFlexibleSpaceItemIdentifier + when :show_colors + NSToolbarShowColorsItemIdentifier + when :show_fonts + NSToolbarShowFontsItemIdentifier + when :customize + NSToolbarCustomizeToolbarItemIdentifier + when :print + NSToolbarPrintItemIdentifier + else + i + end + end + end + allowed_items { @allowed } + default_items { @default } + item_for_identifier { |identifier, will_be_inserted| @custom_items[identifier] } + end + end + end + delegating "toolbar:itemForItemIdentifier:willBeInsertedIntoToolbar:", :to => :item_for_identifier, :parameters => [:itemForItemIdentifier, :willBeInsertedIntoToolbar], :required => true + delegating "toolbarAllowedItemIdentifiers:", :to => :allowed_items, :required => true + delegating "toolbarDefaultItemIdentifiers:", :to => :default_items, :required => true + delegating "toolbarSelectableItemIdentifiers:", :to => :selectable_items + delegating "toolbarDidRemoveItem:", :to => :did_remove_item, :parameters => ["toolbarDidRemoveItem.userInfo['item']"] + delegating "toolbarWillAddItem:", :to => :will_add_item, :parameters => ["toolbarWillAddItem.userInfo['item']"] + end Modified: MacRuby/trunk/lib/hotcocoa/mappings/toolbar_item.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/toolbar_item.rb 2008-09-18 00:35:31 UTC (rev 603) +++ MacRuby/trunk/lib/hotcocoa/mappings/toolbar_item.rb 2008-09-19 01:17:07 UTC (rev 604) @@ -1,24 +1,36 @@ HotCocoa::Mappings.map :toolbar_item => :NSToolbarItem do + + defaults :priority => :standard + + constant :priority, { + :standard => NSToolbarItemVisibilityPriorityStandard, + :low => NSToolbarItemVisibilityPriorityLow, + :high => NSToolbarItemVisibilityPriorityHigh, + :user => NSToolbarItemVisibilityPriorityUser + } def init_with_options(toolbar_item, options) - identifier = options.delete(:identifier) - label = options[:label] - unless identifier - if label - identifier = label.tr(' ', '_') - else - raise ArgumentError, ":identifier or :label required" - end + if !options.has_key?(:label) && !options.has_key?(:identifier) + raise ArgumentError, ":identifier or :label required" end - toolbar_item.initWithItemIdentifier identifier - if label - toolbar_item.paletteLabel = label - end + label = options.delete(:label) + toolbar_item.initWithItemIdentifier(options.delete(:identifier) || label.tr(' ', '_')) + toolbar_item.paletteLabel = label if label toolbar_item end custom_methods do + include TargetActionConvenience + + def priority=(value) + setVisibilityPriority(value) + end + + def priority + visibilityPriority + end + end end

1 0