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

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

18 Sep '08

Revision: 603 http://trac.macosforge.org/projects/ruby/changeset/603 Author: lsansonetti(a)apple.com Date: 2008-09-17 17:35:31 -0700 (Wed, 17 Sep 2008) Log Message: ----------- set the palette label attribute as the label if provided 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-18 00:29:23 UTC (rev 602) +++ MacRuby/trunk/lib/hotcocoa/mappings/toolbar_item.rb 2008-09-18 00:35:31 UTC (rev 603) @@ -2,8 +2,8 @@ def init_with_options(toolbar_item, options) identifier = options.delete(:identifier) + label = options[:label] unless identifier - label = options[:label] if label identifier = label.tr(' ', '_') else @@ -11,6 +11,10 @@ end end toolbar_item.initWithItemIdentifier identifier + if label + toolbar_item.paletteLabel = label + end + toolbar_item end custom_methods do

1 0

[602] MacRuby/trunk/lib/hotcocoa/mappings/toolbar.rb
by source_changes＠macosforge.org 18 Sep '08

18 Sep '08

Revision: 602 http://trac.macosforge.org/projects/ruby/changeset/602 Author: lsansonetti(a)apple.com Date: 2008-09-17 17:29:23 -0700 (Wed, 17 Sep 2008) Log Message: ----------- adding convenience constants for toolbar size and display Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings/toolbar.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings/toolbar.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/toolbar.rb 2008-09-17 22:33:35 UTC (rev 601) +++ MacRuby/trunk/lib/hotcocoa/mappings/toolbar.rb 2008-09-18 00:29:23 UTC (rev 602) @@ -1,10 +1,24 @@ HotCocoa::Mappings.map :toolbar => :NSToolbar do + constant :size, { + :default => NSToolbarSizeModeDefault, + :regular => NSToolbarSizeModeRegular, + :small => NSToolbarSizeModeSmall + } + + constant :display, { + :default => NSToolbarDisplayModeDefault, + :icon_and_label => NSToolbarDisplayModeIconAndLabel, + :icon => NSToolbarDisplayModeIconOnly, + :label => NSToolbarDisplayModeLabelOnly + } + defaults :identifier => 'DefaultToolbarIdentifier', :allowed => [:separator, :space, :flexible_space, :show_colors, :show_fonts, :customize, :print], :default => [], - :allow_customization => true + :allow_customization => true, + :size => :default def init_with_options(toolbar, options) toolbar.initWithIdentifier options.delete(:identifier) @@ -56,4 +70,16 @@ toolbar end + custom_methods do + + def size=(mode) + setSizeMode(mode) + end + + def display=(mode) + setDisplayMode(mode) + end + + end + end

1 0

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

17 Sep '08

Revision: 601 http://trac.macosforge.org/projects/ruby/changeset/601 Author: lsansonetti(a)apple.com Date: 2008-09-17 15:33:35 -0700 (Wed, 17 Sep 2008) Log Message: ----------- adding preliminary mappings for toolbar and text view Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings/control.rb MacRuby/trunk/lib/hotcocoa/mappings.rb Added Paths: ----------- MacRuby/trunk/lib/hotcocoa/mappings/text_view.rb MacRuby/trunk/lib/hotcocoa/mappings/toolbar.rb MacRuby/trunk/lib/hotcocoa/mappings/toolbar_item.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings/control.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/control.rb 2008-09-16 01:05:31 UTC (rev 600) +++ MacRuby/trunk/lib/hotcocoa/mappings/control.rb 2008-09-17 22:33:35 UTC (rev 601) @@ -1,22 +1,9 @@ HotCocoa::Mappings.map :control => :NSControl do custom_methods do + + include TargetActionConvenience - def on_action=(behavior) - object = Object.new - object.instance_variable_set("@behavior", behavior) - def object.perform_action(sender) - @behavior.call(sender) - end - setTarget(object) - setAction("perform_action:") - end - - def on_action(&behavior) - self.on_action = behavior - self - end - def text=(text) setStringValue(text) end Added: MacRuby/trunk/lib/hotcocoa/mappings/text_view.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/text_view.rb (rev 0) +++ MacRuby/trunk/lib/hotcocoa/mappings/text_view.rb 2008-09-17 22:33:35 UTC (rev 601) @@ -0,0 +1,9 @@ +HotCocoa::Mappings.map :text_view => :NSTextView do + + defaults :frame => [0,0,0,0] + + def init_with_options(text_view, options) + text_view.initWithFrame options.delete(:frame) + end + +end Added: MacRuby/trunk/lib/hotcocoa/mappings/toolbar.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/toolbar.rb (rev 0) +++ MacRuby/trunk/lib/hotcocoa/mappings/toolbar.rb 2008-09-17 22:33:35 UTC (rev 601) @@ -0,0 +1,59 @@ +HotCocoa::Mappings.map :toolbar => :NSToolbar do + + defaults :identifier => 'DefaultToolbarIdentifier', + :allowed => [:separator, :space, :flexible_space, :show_colors, + :show_fonts, :customize, :print], + :default => [], + :allow_customization => true + + 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.allowsUserCustomization = options.delete(:allow_customization) + toolbar + end + +end Added: MacRuby/trunk/lib/hotcocoa/mappings/toolbar_item.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/toolbar_item.rb (rev 0) +++ MacRuby/trunk/lib/hotcocoa/mappings/toolbar_item.rb 2008-09-17 22:33:35 UTC (rev 601) @@ -0,0 +1,20 @@ +HotCocoa::Mappings.map :toolbar_item => :NSToolbarItem do + + def init_with_options(toolbar_item, options) + identifier = options.delete(:identifier) + unless identifier + label = options[:label] + if label + identifier = label.tr(' ', '_') + else + raise ArgumentError, ":identifier or :label required" + end + end + toolbar_item.initWithItemIdentifier identifier + end + + custom_methods do + include TargetActionConvenience + end + +end Modified: MacRuby/trunk/lib/hotcocoa/mappings.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings.rb 2008-09-16 01:05:31 UTC (rev 600) +++ MacRuby/trunk/lib/hotcocoa/mappings.rb 2008-09-17 22:33:35 UTC (rev 601) @@ -8,6 +8,23 @@ end DefaultEmptyRect = [0,0,0,0] + + module TargetActionConvenience + def on_action=(behavior) + object = Object.new + object.instance_variable_set("@behavior", behavior) + def object.perform_action(sender) + @behavior.call(sender) + end + setTarget(object) + setAction("perform_action:") + end + + def on_action(&behavior) + self.on_action = behavior + self + end + end def self.map(options, &block) framework = options.delete(:framework)

1 0

[600] MacRuby/trunk/class.c
by source_changes＠macosforge.org 16 Sep '08

16 Sep '08

Revision: 600 http://trac.macosforge.org/projects/ruby/changeset/600 Author: lsansonetti(a)apple.com Date: 2008-09-15 18:05:31 -0700 (Mon, 15 Sep 2008) Log Message: ----------- in isEqual: always return false if given obj is NULL Modified Paths: -------------- MacRuby/trunk/class.c Modified: MacRuby/trunk/class.c =================================================================== --- MacRuby/trunk/class.c 2008-09-13 19:55:35 UTC (rev 599) +++ MacRuby/trunk/class.c 2008-09-16 01:05:31 UTC (rev 600) @@ -64,10 +64,15 @@ static BOOL rb_obj_imp_isEqual(void *rcv, SEL sel, void *obj) { - if (*(Class *)rcv == (Class)rb_cFixnum && *(Class *)obj == (Class)rb_cFixnum) { + if (obj == NULL) + return false; + + if (*(Class *)rcv == (Class)rb_cFixnum + && *(Class *)obj == (Class)rb_cFixnum) { /* XXX check if Numeric#== is not overriden */ return RFIXNUM(rcv)->value == RFIXNUM(obj)->value; } + return rb_funcall((VALUE)rcv, idEq, 1, OC2RB(obj)) == Qtrue; }

1 0

[599] MacRuby/trunk/version.h
by source_changes＠macosforge.org 13 Sep '08

13 Sep '08

Revision: 599 http://trac.macosforge.org/projects/ruby/changeset/599 Author: lsansonetti(a)apple.com Date: 2008-09-13 12:55:35 -0700 (Sat, 13 Sep 2008) Log Message: ----------- we are 0.4 now Modified Paths: -------------- MacRuby/trunk/version.h Modified: MacRuby/trunk/version.h =================================================================== --- MacRuby/trunk/version.h 2008-09-13 19:29:38 UTC (rev 598) +++ MacRuby/trunk/version.h 2008-09-13 19:55:35 UTC (rev 599) @@ -52,7 +52,7 @@ #endif #if WITH_OBJC -# define MACRUBY_VERSION 0.3 +# define MACRUBY_VERSION 0.4 # define RUBY_DESCRIPTION \ "MacRuby version " STRINGIZE(MACRUBY_VERSION) \ " (ruby "RUBY_VERSION \

1 0

[598] MacRuby/trunk/lib/hotcocoa/mappings/window.rb
by source_changes＠macosforge.org 13 Sep '08

13 Sep '08

Revision: 598 http://trac.macosforge.org/projects/ruby/changeset/598 Author: rich(a)infoether.com Date: 2008-09-13 12:29:38 -0700 (Sat, 13 Sep 2008) Log Message: ----------- fix spelling Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings/window.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings/window.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/window.rb 2008-09-09 21:10:10 UTC (rev 597) +++ MacRuby/trunk/lib/hotcocoa/mappings/window.rb 2008-09-13 19:29:38 UTC (rev 598) @@ -1,6 +1,6 @@ HotCocoa::Mappings.map :window => :NSWindow do - defaults :style => [:titled, :closable, :miniturizable, :resizable], + defaults :style => [:titled, :closable, :miniaturizable, :resizable], :backing => :buffered, :defer => true, :show => true, @@ -13,7 +13,7 @@ :borderless => NSBorderlessWindowMask, :titled => NSTitledWindowMask, :closable => NSClosableWindowMask, - :miniturizable => NSMiniaturizableWindowMask, + :miniaturizable => NSMiniaturizableWindowMask, :resizable => NSResizableWindowMask, :textured => NSTexturedBackgroundWindowMask }

1 0

[597] MacRuby/trunk/Rakefile
by source_changes＠macosforge.org 09 Sep '08

09 Sep '08

Revision: 597 http://trac.macosforge.org/projects/ruby/changeset/597 Author: lsansonetti(a)apple.com Date: 2008-09-09 14:10:10 -0700 (Tue, 09 Sep 2008) Log Message: ----------- s/cc/gcc Modified Paths: -------------- MacRuby/trunk/Rakefile Modified: MacRuby/trunk/Rakefile =================================================================== --- MacRuby/trunk/Rakefile 2008-09-09 19:41:29 UTC (rev 596) +++ MacRuby/trunk/Rakefile 2008-09-09 21:10:10 UTC (rev 597) @@ -399,7 +399,7 @@ CONFIG["optflags"] = "-O2" CONFIG["debugflags"] = "-g" CONFIG["warnflags"] = "-Wall -Wno-parentheses" - CONFIG["LIBRUBY_LDSHARED"] = "cc -dynamiclib -undefined suppress -flat_namespace" + CONFIG["LIBRUBY_LDSHARED"] = "gcc -dynamiclib -undefined suppress -flat_namespace" CONFIG["LIBRUBY_DLDFLAGS"] = "-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)" CONFIG["rubyw_install_name"] = "" CONFIG["RUBYW_INSTALL_NAME"] = ""

1 0

[596] MacRuby/branches/testing/instruby.rb
by source_changes＠macosforge.org 09 Sep '08

09 Sep '08

Revision: 596 http://trac.macosforge.org/projects/ruby/changeset/596 Author: lsansonetti(a)apple.com Date: 2008-09-09 12:41:29 -0700 (Tue, 09 Sep 2008) Log Message: ----------- backport fix from trunk Modified Paths: -------------- MacRuby/branches/testing/instruby.rb Modified: MacRuby/branches/testing/instruby.rb =================================================================== --- MacRuby/branches/testing/instruby.rb 2008-09-09 19:41:22 UTC (rev 595) +++ MacRuby/branches/testing/instruby.rb 2008-09-09 19:41:29 UTC (rev 596) @@ -512,7 +512,7 @@ puts "installing IB support" ib_dest = '/Developer/usr/bin' mkdir_p ib_dest -install('bin/rb_nibtool', ib_dest, :mode => $prog_mode) +ln_sfh File.join("../../..", CONFIG['bindir'], 'rb_nibtool'), ib_dest install('tool/rb_nibtool.old', ib_dest, :mode => $prog_mode) touch_file = '/System/Library/Frameworks/.bridgesupport_dylib_gcmarked'

1 0

[595] MacRuby/tags/0.3/instruby.rb
by source_changes＠macosforge.org 09 Sep '08

09 Sep '08

Revision: 595 http://trac.macosforge.org/projects/ruby/changeset/595 Author: lsansonetti(a)apple.com Date: 2008-09-09 12:41:22 -0700 (Tue, 09 Sep 2008) Log Message: ----------- backport fix from trunk Modified Paths: -------------- MacRuby/tags/0.3/instruby.rb Modified: MacRuby/tags/0.3/instruby.rb =================================================================== --- MacRuby/tags/0.3/instruby.rb 2008-09-09 19:19:55 UTC (rev 594) +++ MacRuby/tags/0.3/instruby.rb 2008-09-09 19:41:22 UTC (rev 595) @@ -512,7 +512,7 @@ puts "installing IB support" ib_dest = '/Developer/usr/bin' mkdir_p ib_dest -install('bin/rb_nibtool', ib_dest, :mode => $prog_mode) +ln_sfh File.join("../../..", CONFIG['bindir'], 'rb_nibtool'), ib_dest install('tool/rb_nibtool.old', ib_dest, :mode => $prog_mode) touch_file = '/System/Library/Frameworks/.bridgesupport_dylib_gcmarked'

1 0

[594] MacRuby/trunk/instruby.rb
by source_changes＠macosforge.org 09 Sep '08

09 Sep '08

Revision: 594 http://trac.macosforge.org/projects/ruby/changeset/594 Author: lsansonetti(a)apple.com Date: 2008-09-09 12:19:55 -0700 (Tue, 09 Sep 2008) Log Message: ----------- do not install a new copy of rb_nibtool but instead make a symlink to the version inside the framework which has the correct shebang line Modified Paths: -------------- MacRuby/trunk/instruby.rb Modified: MacRuby/trunk/instruby.rb =================================================================== --- MacRuby/trunk/instruby.rb 2008-09-09 06:16:52 UTC (rev 593) +++ MacRuby/trunk/instruby.rb 2008-09-09 19:19:55 UTC (rev 594) @@ -512,7 +512,7 @@ puts "installing IB support" ib_dest = '/Developer/usr/bin' mkdir_p ib_dest -install('bin/rb_nibtool', ib_dest, :mode => $prog_mode) +ln_sfh File.join("../../..", CONFIG['bindir'], 'rb_nibtool'), ib_dest install('tool/rb_nibtool.old', ib_dest, :mode => $prog_mode) touch_file = '/System/Library/Frameworks/.bridgesupport_dylib_gcmarked'

1 0