bakkdoor-rswing 0.1.2 → 0.1.3

data/README

@@ -19,13 +19,13 @@ Some examples:
 
   Frame.new("hello, world") do |frame|
     frame.default_close_operation = :exit_on_close
-    frame.size = java.awt.Dimension.new(200,200)
+    frame.size = [200,200]
 
     # create a new button, belonging to this frame with a given name to access it easily later
     Button.new("OK", :belongs_to => frame, :name => :okButton) do |btn|
 
       btn.on_click do
-        Dialog.show frame, "Button clicked!", :dialog_type => :info, :title => "My Title"
+        Dialog.show "Button clicked!", :dialog_type => :info, :title => "My Title", :belongs_to => frame
       end
 
       btn.on_focus do
@@ -42,9 +42,10 @@ Some examples:
 
     # options-dialog
     options = ["Yes", "No", "Cancel"]
-    selected_value = Dialog.showOption(frame, options.join(" or ") + "?",
+    selected_value = Dialog.showOption(options.join(" or ") + "?",
                                         :option_values => options, 
-                                        :option_type => :yes_no_cancel)
+                                        :option_type => :yes_no_cancel,
+                                        :belongs_to => frame)
 
     puts "#{selected_value} was selected"
 

data/lib/rswing/components/container.rb

@@ -1,6 +1,28 @@
 module RSwing
   module Components
     module Container
+      
+      # Adds a component with a set of options to this container.
+      def add(component, options = {})
+        if(self.respond_to?(:getContentPane))
+          self.add_to_content_pane(component, options)
+        else
+#          this should be handled somehow later on:
+          if(layout = Options.value_for(options => :layout))
+            super(component, layout)
+          else
+             super(component)
+          end
+        end
+        
+        # if :name given, add with name
+        if(name = Options.value_for(options => :name))
+          self.add_with_name(component, name)
+        end
+        
+        component # return component
+      end
+      
       # Adds a component to the component_hash with a given name symbol.
       # Raises an exception if name already taken.
       def add_with_name(component, name_symbol)
@@ -47,6 +69,18 @@ module RSwing
       def component_hash
         @component_hash ||= {}
       end
+      
+      # Adds a component with given options to the <tt>content_pane</tt> of a container.
+      # This will only work, if the container actually has a <tt>content_pane</tt>
+      # and should only be called by the <tt>add()</tt> method inside of the
+      # <tt>container</tt> module.
+      def add_to_content_pane(component, options)
+        if(layout = Options.value_for(options => :layout))
+          self.content_pane.add(component, layout)
+        else
+          self.content_pane.add(component)
+        end
+      end
     end
   end
 end

data/lib/rswing/components/dialog.rb

@@ -8,10 +8,13 @@ module RSwing
     # (<tt>show()</tt> and <tt>showOptions</tt>).
     # Can also be used to create custom dialogs by extending from this class.
     class Dialog < JDialog
+      include Window
       include Container
       
-      def initialize(owner, title, options = {}, &block)
-        super(owner, title, Options.value_for(options => :modal))
+      def initialize(title, options = {}, &block)
+        super(Options.value_for(options => :belongs_to), title, Options.value_for(options => :modal))
+        
+        Window.init(self, options)
         
         if(name = Options.value_for(options => :name) && owner.class.include?(Container))
           owner.add_with_name(self, name)
@@ -21,34 +24,16 @@ module RSwing
         if block_given?
           yield self
         end
-        
-      end
-      
-      # Adds a component with a set of options to this dialog.
-      def add(component, options = {})
-        if(layout = Options.value_for(options => :layout))
-          self.content_pane.add(component, layout)
-        else
-          self.content_pane.add(component)
-        end
-        
-        
-        # wenn :name angegeben wurde, mit aufnehmen
-        if(name = Options.value_for(options => :name))
-          self.add_with_name(component, name)
-        end
-        
-        component #zurückgeben
       end
       
       # Creates a MessageDialog.
-      # - <tt>parent</tt>: Parent-Container for this dialog.
       # - <tt>message</tt>: Message, to be displayed in this dialog.
       # - <tt>options</tt>: Options-Hash with the following valid values:
       # 1. <tt>:dialog_type => (:error | :question | :plain | :warning | :info)</tt> (default: :info)
       # 2. <tt>:title => "my title"</tt> (defailt: <tt>""</tt>)
       # 3. <tt>:modal => false</tt> (default: true)
-      def self.show(parent, message, options = {})
+      # 4. <tt>:belongs_to => parent</tt> Parent-Container for this dialog (default: nil)
+      def self.show(message, options = {})
         message_type =
           case Options.value_for(options => :dialog_type)
           when :error
@@ -63,27 +48,28 @@ module RSwing
             JOptionPane::INFORMATION_MESSAGE
           end
         
-        JOptionPane.showMessageDialog(parent, message, Options.value_for(options => :title), message_type)
+        JOptionPane.showMessageDialog(Options.value_for(options => :belongs_to), message, 
+          Options.value_for(options => :title), message_type)
       end
       
       # Creates a OptionsDialog (Dialog with selection for different Options).
-      # - <tt>parent</tt>: Parent-Container for this dialog.
       # - <tt>message</tt>: Message, to be displayed in the dialog.
       # - <tt>options</tt>: Options-Hash with the following valid values:
       # 1. <tt>:option_type => (:yes_no | :yes_no_cancel)</tt> (default: <tt>:yes_no</tt>)
-      # 2. <tt>:option_values => ["OK", "Cancel", "Quit"]</tt> (default: <tt>["Ja", "Nein"]</tt>)
-      # 3. <tt>:title => "mein titel"</tt> (default: <tt>""</tt>)
+      # 2. <tt>:option_values => ["OK", "Cancel", "Quit"]</tt> (default: <tt>["Yes", "No"]</tt>)
+      # 3. <tt>:title => "my title"</tt> (default: <tt>""</tt>)
       # 4. <tt>:modal => false</tt> (default: <tt>true</tt>)
-      # 5. <tt>:icon => nil</tt> (default: keins)
-      def self.showOption(parent, message, options = {})
-        title = options[:title].nil? ? "Bitte wählen Sie" : options[:title]
+      # 5. <tt>:icon => nil</tt> (default: nil)
+      # 6. <tt>:belongs_to => parent</tt> Parent-Container for this dialog (default: nil)
+      def self.showOption(message, options = {})
+        title = options[:title].nil? ? Options.gui_options[:option_default_title] : options[:title]
         icon = Options.value_for(options => :icon) 
         
         option_type = option_type_for(Options.value_for(options => :option_type))
         option_values = Options.value_for(options => :option_values)
           
-        selected_option_index = JOptionPane.showOptionDialog(parent, message, title, option_type, JOptionPane::QUESTION_MESSAGE, icon, 
-				option_values.to_java(:Object), nil);
+        selected_option_index = JOptionPane.showOptionDialog(Options.value_for(options => :belongs_to), message, 
+          title, option_type, JOptionPane::QUESTION_MESSAGE, icon, option_values.to_java(:Object), nil);
                               
         option_values[selected_option_index]
       end

data/lib/rswing/components/frame.rb

@@ -3,33 +3,22 @@ module RSwing
     JFrame = javax.swing.JFrame
     
     class Frame < JFrame
+      include Window
       include Container
       
-      def initialize(title, &block)
+      # valid options are:
+      # 1. <tt>:size => [800, 600]</tt> 800x600 pixels (default: nil)
+      def initialize(title, options = {}, &block)
         super(title)
         
+        Window.init(self, options)
+        
         # falls block übergeben wurde, mit aktuellem objekt aufrufen
         if block_given?
           yield self
         end
       end
       
-      def add(component, options = {})
-        if(layout = Options.value_for(options => :layout))
-          self.content_pane.add(component, layout)
-        else
-          self.content_pane.add(component)
-        end
-        
-        
-        # wenn :name angegeben wurde, mit aufnehmen
-        if(name = Options.value_for(options => :name))
-          self.add_with_name(component, name)
-        end
-        
-        component #zurückgeben
-      end
-      
       # Sets the default close operation for this frame.
       # Valid operations are:
       # 1. <tt>:do_nothing_on_close</tt>

data/lib/rswing/components/options.rb

@@ -12,14 +12,18 @@ module RSwing
           :double_buffer => true,
           :dialog_type => :info,
           :option_type => :yes_no,
-          :option_values => ["Ja", "Nein"],
+          :option_values => ["Yes", "No"],
+          :option_default_title => "Please select:",
           :icon => nil,
           :belongs_to => nil,
           :layout => nil,
+          :layout_manager => nil,
           :title => nil,
           :name => nil,
           :font => nil,
           :doc => nil,
+          :size => nil,
+          :location => nil,
           :columns => 10,
           :text => ""
         }
@@ -31,6 +35,7 @@ module RSwing
       # * Example:
       #     <tt>Options.value_for(options => :name)</tt>
       def self.value_for(hash)
+        raise "Value must be a hash!" unless hash.kind_of? Hash
         hash.each_pair do |options_hash, option_key|
           # es sollte nur ein paar angegeben werden, sodass wir einfach nur das erste nehmen
           # und den entsprechenden wert zurückgeben

data/lib/rswing/components/panel.rb

@@ -8,8 +8,8 @@ module RSwing
       include Events::MouseEvents
       include Events::FocusEvents
       
-      def initialize(layout_manager, options = {}, &block)
-        super(layout_manager, Options.value_for(options => :double_buffer))
+      def initialize(options = {}, &block)
+        super(Options.value_for(options => :layout_manager), Options.value_for(options => :double_buffer))
         
         if (border_title = Options.value_for(options => :title))
           border = BorderFactory.createTitledBorder(border_title)
@@ -24,14 +24,6 @@ module RSwing
         
         Container.add_if_requested(self, options)
       end
-      
-      def add(component, options = {})
-        super.add(component)
-        
-        if(name = Options.value_for(options => :name))
-          self.add_with_name(component, name)
-        end
-      end
     end 
   end
 end

data/lib/rswing.rb

@@ -10,8 +10,10 @@ require "events/key_events"
 require "events/mouse_events"
 
 # containers
-require "button"
 require "container"
+require "window"
+
+require "button"
 require "dialog"
 require "frame"
 require "listener"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bakkdoor-rswing
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Christopher Bertels
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-06 00:00:00 -07:00
+date: 2008-10-29 00:00:00 -07:00
 default_executable: 
 dependencies: []