sweet 0.0.2 → 0.0.3

data/lib/sweet/swt/application.rb

@@ -0,0 +1,17 @@
+module Sweet::Application
+
+  def perform(&block)
+    display.syncExec block
+  end
+
+  def busy(&block)
+    Thread.new do
+      perform do
+        custom::BusyIndicator.showWhile(display) do
+          block.call
+        end
+      end
+    end
+  end
+
+end

data/lib/sweet/{composite.rb → swt/composite.rb}

@@ -1,14 +1,17 @@
 class Java::OrgEclipseSwtWidgets::Composite
 
-  def layout=(name, options = {})
+  def layout=(name, opts = {})
+    Sweet.debug "layout = #{name}(#{opts.inspect})"
+    # TODO allow instantiated layouts and layout classes
     class_name = "#{name.to_s.capitalize}Layout"
     l = instance_eval "org.eclipse.swt.layout.#{class_name}.new"
 
-    options.each_pair do |k,v|
+    opts.each_pair do |k,v|
       l.send("#{k}=", v)
     end
 
     setLayout l
+    Sweet.debug getLayout
   end
   
 end

data/lib/sweet/{downloader.rb → swt/downloader.rb}

@@ -1,5 +1,5 @@
 module Sweet
-  SWT_JAR = File.join(File.dirname(__FILE__), '../../swt/swt.jar')
+  SWT_JAR = File.join(File.dirname(__FILE__), 'swt.jar')
 
   module Downloader
     def self.download_swt(opts = {})

data/lib/sweet/swt/shell.rb

@@ -0,0 +1,22 @@
+# TODO pack into WIDGETS
+class Java::OrgEclipseSwtWidgets::Shell
+  attr_reader :display
+  alias_property :title => :text
+
+  def sweeten(display, name, opts = {}, &block)
+    @display = display
+
+    self.text = opts.delete(:title) || name
+    w, h = opts.delete(:width), opts.delete(:height)
+
+    super(self, opts, &block)
+
+    pack
+    size = (w || width), (h || height)
+  end
+
+  def menubar(&block)
+    self.menu_bar = make_menu(:menubar, &block)
+  end
+
+end

data/lib/sweet/swt/widget.rb

@@ -0,0 +1,89 @@
+require 'forwardable' # TODO remove?
+
+class Java::OrgEclipseSwtWidgets::Widget
+  include Sweet::Component
+
+  def sweet_block_handler(handler, &block)
+    return false unless handler.is_a? Numeric
+    addListener handler, &block
+    true
+  end
+
+  # TODO unify this layout mess somehow
+  # TODO hierarchical hash for nicer client code
+  def grid_data=(*options)
+    opts = {}
+    options.each do |(k, v)|
+      opts[k] = v
+    end
+    ax, ay = opts[:align]
+    gx, gy = opts[:grab]
+    sx, sy = opts[:span]
+    args = [ax || swt::BEGINNING, ay || swt::CENTER,
+      gx || false, gy || false, sx || 1, sy || 1]
+    puts args.inspect
+    args.map!{|v| v.is_a?(Symbol) ? v.swt_const : v}
+    Sweet.debug args.inspect
+    l = layouts::GridData.new(*args)
+    self.layout_data = l
+  end
+  def row_data=(x, y = nil)
+    self.layout_data = layouts::RowData.new(x || swt::DEFAULT, y || swt::DEFAULT)
+  end
+
+  def hide
+    self.visible = false
+  end
+  def show
+    self.visible = true
+  end
+
+  def width
+    size.x
+  end
+  def width=(value)
+    Sweet.debug "width=(#{value.inspect})"
+    setSize(value, height)
+  end
+
+  def height
+    size.y
+  end
+  def height=(value)
+    self.size = nil, value
+  end
+
+  def size=(*s)
+    Sweet.debug "size=(#{s.inspect})"
+    nw, nh = s.flatten
+    nw ||= width
+    nh ||= height
+    Sweet.debug "setSize(#{nw.inspect}, #{nh.inspect})"
+    setSize(nw, nh)
+  end
+
+  def popup(&block)
+    self.menu = make_menu(:popup, &block)
+  end
+
+  private
+  def make_menu(type, &block)
+    Sweet.create_widget(sweet_containers.last, type, &block)
+  end
+
+  # TODO replace via import?
+  def swt
+    org.eclipse.swt.SWT
+  end
+  def widgets
+    org.eclipse.swt.widgets
+  end
+  def layouts
+    org.eclipse.swt.layout
+  end
+  def custom
+    org.eclipse.swt.custom
+  end
+
+end
+

data/lib/sweet/wx.rb

@@ -0,0 +1,57 @@
+require 'sweet/base'
+
+require 'rubygems'
+require 'wx'
+%w{object application}.each{|file| require "sweet/wx/#{file}"}
+
+module Sweet
+
+  # TODO integrate all standard widgets
+  WIDGET_HACKS = {
+    Wx::TextCtrl => {:custom_code => proc{ alias text get_value; alias text= set_value} }
+  }
+
+  default = {:init_args => :text}
+  WIDGET_DEFAULTS = {
+    :label => default.merge(:class => Wx::StaticText),
+    :edit_line => default.merge(:class => Wx::TextCtrl),
+    :button => default.merge(:block_handler => :evt_button)
+  }
+
+  class App < Wx::App
+    include Sweet::Application
+
+    def initialize(name, opts, &block)
+      @name, @opts, @block = name, opts, block
+      super()
+    end
+
+    def on_init
+      title = @opts[:title] || @name
+      frame = Wx::Frame.new(nil, -1, title)
+      initialize_app(frame)
+      frame.sweeten(self, @opts, &@block)
+      frame.show
+    end
+  end
+
+  def self.create_app(name, opts, &block)
+    App.new(name, opts, &block).main_loop
+  end
+  
+  def self.create_widget_class(cls, init)
+    cls.is_a?(Class) ? cls : Wx.const_get(cls)
+  end
+
+  def self.initialize_widget(parent, cls, opts, init)
+    Sweet.debug "Creating #{cls}(#{parent})"
+    c = cls.new(parent, -1, opts.delete(:text) || '')
+    parent.get_sizer.add(c) if parent.get_sizer # TODO parameters
+    c
+  end
+  
+  def self.delegate_events(cls)
+    # nothing to do
+  end
+
+end

data/lib/sweet/wx/application.rb

@@ -0,0 +1,9 @@
+module Sweet::Application
+  def perform(&block)
+    instance_eval &block
+  end
+
+  def busy(&block)
+    Wx::BusyCursor.busy &block
+  end
+end

data/lib/sweet/wx/object.rb

@@ -0,0 +1,19 @@
+class Wx::Object
+  include Sweet::Component
+
+  def handle_event(evt, &block)
+    send evt, get_id do |event|
+      block.call
+    end
+  end
+
+  def layout=(layout)
+    l = case layout
+    when :flow
+      Wx::BoxSizer.new(Wx::HORIZONTAL)
+    when :stack
+      Wx::BoxSizer.new(Wx::VERTICAL)
+    end
+    set_sizer l
+  end
+end

data/spec/api_spec.rb

@@ -0,0 +1,15 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+require 'sweet'
+
+describe Sweet do
+  before(:each) do
+    @sweet = Sweet.new
+  end
+
+  it "should desc" do
+    # TODO
+  end
+end
+

data/spec/downloader_spec.rb

@@ -1,36 +1,38 @@
-require 'sweet/downloader'
+if RUBY_PLATFORM =~ /java/
+  require 'sweet/swt/downloader'
 
-describe Sweet::Downloader, '#system_qualifier' do
-  before :each do
-    @d = Sweet::Downloader
-  end
+  describe Sweet::Downloader, '#system_qualifier' do
+    before :each do
+      @d = Sweet::Downloader
+    end
 
-  it 'returns gtk-linux-x86 for Linux i686' do
-    @d.system_qualifier(:os => 'Linux', :arch => 'i686').should == 'gtk-linux-x86'
-  end
+    it 'returns gtk-linux-x86 for Linux i686' do
+      @d.system_qualifier(:os => 'Linux', :arch => 'i686').should == 'gtk-linux-x86'
+    end
 
-  it 'returns gtk-linux-x86 for Linux x86_64' do
-    @d.system_qualifier(:os => 'Linux', :arch => 'x86_64').should == 'gtk-linux-x86_64'
-  end
+    it 'returns gtk-linux-x86 for Linux x86_64' do
+      @d.system_qualifier(:os => 'Linux', :arch => 'x86_64').should == 'gtk-linux-x86_64'
+    end
 
-  it 'returns motif-linux-x86 for Linux i686 and :tk => "motif"' do
-    @d.system_qualifier(:os => 'Linux', :arch => 'i686', :tk => 'motif').should == 'motif-linux-x86'
-  end
+    it 'returns motif-linux-x86 for Linux i686 and :tk => "motif"' do
+      @d.system_qualifier(:os => 'Linux', :arch => 'i686', :tk => 'motif').should == 'motif-linux-x86'
+    end
 
-  it 'returns cocoa-macos for Mac OS X i686' do
-    @d.system_qualifier(:os => 'Mac OS X', :arch => 'i686').should == 'cocoa-macosx'
-  end
+    it 'returns cocoa-macos for Mac OS X i686' do
+      @d.system_qualifier(:os => 'Mac OS X', :arch => 'i686').should == 'cocoa-macosx'
+    end
 
-  it 'returns cocoa-macos-x86_64 for Mac OS X x86_64' do
-    @d.system_qualifier(:os => 'Mac OS X', :arch => 'x86_64').should == 'cocoa-macosx-x86_64'
-  end
+    it 'returns cocoa-macos-x86_64 for Mac OS X x86_64' do
+      @d.system_qualifier(:os => 'Mac OS X', :arch => 'x86_64').should == 'cocoa-macosx-x86_64'
+    end
 
-  it 'returns win32-win32-x86 for Windows XP' do
-    @d.system_qualifier(:os => 'Windows XP', :arch => 'i686').should == 'win32-win32-x86'
-  end
+    it 'returns win32-win32-x86 for Windows XP' do
+      @d.system_qualifier(:os => 'Windows XP', :arch => 'i686').should == 'win32-win32-x86'
+    end
 
-  it 'returns win32-win32-x86_64 for Windows Vista on x86_64' do
-    @d.system_qualifier(:os => 'Windows Vista', :arch => 'x86_64').should == 'win32-win32-x86_64'
-  end
+    it 'returns win32-win32-x86_64 for Windows Vista on x86_64' do
+      @d.system_qualifier(:os => 'Windows Vista', :arch => 'x86_64').should == 'win32-win32-x86_64'
+    end
 
+  end
 end

data/spec/fox_spec.rb

@@ -0,0 +1,15 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+require 'sweet'
+
+describe Sweet do
+  before(:each) do
+    @sweet = Sweet.new
+  end
+
+  it "should desc" do
+    # TODO
+  end
+end
+

data/spec/gtk2_spec.rb

@@ -0,0 +1,15 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+require 'sweet'
+
+describe Sweet do
+  before(:each) do
+    @sweet = Sweet.new
+  end
+
+  it "should desc" do
+    # TODO
+  end
+end
+

data/spec/sweet_spec.rb

@@ -0,0 +1,15 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+require 'sweet'
+
+describe Sweet do
+  before(:each) do
+    @sweet = Sweet.new
+  end
+
+  it "should desc" do
+    # TODO
+  end
+end
+

data/spec/swing_spec.rb

@@ -0,0 +1,15 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+require 'sweet'
+
+describe Sweet do
+  before(:each) do
+    @sweet = Sweet.new
+  end
+
+  it "should desc" do
+    # TODO
+  end
+end
+

data/spec/swt_spec.rb

@@ -0,0 +1,15 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+require 'sweet'
+
+describe Sweet do
+  before(:each) do
+    @sweet = Sweet.new
+  end
+
+  it "should desc" do
+    # TODO
+  end
+end
+

data/spec/wx_spec.rb

@@ -0,0 +1,15 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+require 'sweet'
+
+describe Sweet do
+  before(:each) do
+    @sweet = Sweet.new
+  end
+
+  it "should desc" do
+    # TODO
+  end
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 2
-  version: 0.0.2
+    - 3
+  version: 0.0.3
 platform: ruby
 authors: 
   - Michael Klaus
@@ -14,14 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 +02:00
+date: 2010-07-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: zippy
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -44,20 +43,50 @@ files:
   - README.rdoc
   - Rakefile
   - bin/sweet
+  - spec/api_spec.rb
   - spec/downloader_spec.rb
+  - spec/sweet_spec.rb
+  - spec/swing_spec.rb
+  - spec/wx_spec.rb
+  - spec/gtk2_spec.rb
+  - spec/fox_spec.rb
+  - spec/swt_spec.rb
   - lib/sweet.rb
-  - lib/sweet/shell.rb
-  - lib/sweet/widget.rb
+  - lib/sweet/gtk2.rb
   - lib/sweet/hacks.rb
-  - lib/sweet/downloader.rb
-  - lib/sweet/composite.rb
+  - lib/sweet/fox.rb
+  - lib/sweet/swt.rb
+  - lib/sweet/swing.rb
   - lib/sweet/base.rb
-  - lib/sweet/dialog.rb
-  - examples/snippet128.rb
-  - examples/snippet169.rb
-  - examples/snippet108.rb
-  - examples/snippet82.rb
-  - examples/hello_world.rb
+  - lib/sweet/wx.rb
+  - lib/sweet/gtk2/widget.rb
+  - lib/sweet/gtk2/application.rb
+  - lib/sweet/swt/shell.rb
+  - lib/sweet/swt/widget.rb
+  - lib/sweet/swt/application.rb
+  - lib/sweet/swt/downloader.rb
+  - lib/sweet/swt/composite.rb
+  - lib/sweet/swt/swt.jar
+  - lib/sweet/swt/src.zip
+  - lib/sweet/swt/dialog.rb
+  - lib/sweet/fox/application.rb
+  - lib/sweet/fox/object.rb
+  - lib/sweet/wx/application.rb
+  - lib/sweet/wx/object.rb
+  - lib/sweet/swing/frame.rb
+  - lib/sweet/swing/component.rb
+  - lib/sweet/swing/application.rb
+  - examples/gtk2/hello_world.rb
+  - examples/swt/components.rb
+  - examples/swt/snippet128.rb
+  - examples/swt/snippet169.rb
+  - examples/swt/snippet108.rb
+  - examples/swt/snippet82.rb
+  - examples/swt/hello_world.rb
+  - examples/swt/components/buttons.rb
+  - examples/fox/hello_world.rb
+  - examples/wx/hello_world.rb
+  - examples/swing/hello_world.rb
 has_rdoc: true
 homepage: http://github.org/QaDeS/sweet
 licenses: []
@@ -74,7 +103,6 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -82,7 +110,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
           - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -92,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: The SWT wrapper for JRuby