knjrbfw 0.0.8 → 0.0.9

data/lib/knj/jruby-gtk2/menu.rb

@@ -1,40 +1,40 @@
 class Gtk::Menu
-	def initialize
-		if Gtk.takeob
-			@ob = Gtk.takeob
-			Gtk.takeob = nil
-		else
-			splitted = self.class.to_s.split("::")
-			classname =  splitted[splitted.length - 1]
-			class_spawn = Gtk.evalob("org.gnome.gtk." + classname)
-			@ob = class_spawn.new
-		end
-	end
-	
-	def popup(arg1, arg2, event_button, event_time)
-		@ob.popup
-	end
-	
-	def prepend(object)
-		@ob.prepend(object.ob)
-	end
+  def initialize
+    if Gtk.takeob
+      @ob = Gtk.takeob
+      Gtk.takeob = nil
+    else
+      splitted = self.class.to_s.split("::")
+      classname =  splitted[splitted.length - 1]
+      class_spawn = Gtk.evalob("org.gnome.gtk." + classname)
+      @ob = class_spawn.new
+    end
+  end
+  
+  def popup(arg1, arg2, event_button, event_time)
+    @ob.popup
+  end
+  
+  def prepend(object)
+    @ob.prepend(object.ob)
+  end
 end
 
 class Gtk::MenuItem
-	def initialize(title)
-		if Gtk.takeob
-			@ob = Gtk.takeob
-			Gtk.takeob = nil
-		else
-			splitted = self.class.to_s.split("::")
-			classname =  splitted[splitted.length - 1]
-			class_spawn = Gtk.evalob("org.gnome.gtk." + classname)
-			
-			if title
-				@ob = class_spawn.new(title)
-			else
-				@ob = class_spawn.new
-			end
-		end
-	end
+  def initialize(title)
+    if Gtk.takeob
+      @ob = Gtk.takeob
+      Gtk.takeob = nil
+    else
+      splitted = self.class.to_s.split("::")
+      classname =  splitted[splitted.length - 1]
+      class_spawn = Gtk.evalob("org.gnome.gtk." + classname)
+      
+      if title
+        @ob = class_spawn.new(title)
+      else
+        @ob = class_spawn.new
+      end
+    end
+  end
 end

data/lib/knj/jruby-gtk2/progressbar.rb

@@ -1,12 +1,12 @@
 class Gtk::ProgressBar
-	def initialize
-		if Gtk.takeob
-			@ob = Gtk.takeob
-			Gtk.takeob = nil
-		else
-			splitted = self.class.to_s.split("::")
-			javaname = "org.gnome." + splitted.first.downcase + "." + splitted.last
-			@ob = Gtk.evalob(javaname).new
-		end
-	end
+  def initialize
+    if Gtk.takeob
+      @ob = Gtk.takeob
+      Gtk.takeob = nil
+    else
+      splitted = self.class.to_s.split("::")
+      javaname = "org.gnome." + splitted.first.downcase + "." + splitted.last
+      @ob = Gtk.evalob(javaname).new
+    end
+  end
 end

data/lib/knj/jruby-gtk2/statusicon.rb

@@ -2,7 +2,7 @@ Gtk.events << ["StatusIcon", "activate", org.gnome.gtk.StatusIcon::Activate, :on
 Gtk.events << ["StatusIcon", "popup-menu", org.gnome.gtk.StatusIcon::PopupMenu, :onPopupMenu, nil]
 
 class Gtk::StatusIcon
-	def pixbuf=(newpixbuf)
-		@ob.from_pixbuf = newpixbuf.ob
-	end
+  def pixbuf=(newpixbuf)
+    @ob.from_pixbuf = newpixbuf.ob
+  end
 end

data/lib/knj/jruby-gtk2/stock.rb

@@ -1,8 +1,8 @@
 class Gtk::Stock
-	OK = org.gnome.gtk.Stock::OK
-	YES = org.gnome.gtk.Stock::YES
-	NO = org.gnome.gtk.Stock::NO
-	DIALOG_WARNING = org.gnome.gtk.Stock::DIALOG_WARNING
-	DIALOG_QUESTION = org.gnome.gtk.Stock::DIALOG_QUESTION
-	DIALOG_INFO = org.gnome.gtk.Stock::DIALOG_INFO
+  OK = org.gnome.gtk.Stock::OK
+  YES = org.gnome.gtk.Stock::YES
+  NO = org.gnome.gtk.Stock::NO
+  DIALOG_WARNING = org.gnome.gtk.Stock::DIALOG_WARNING
+  DIALOG_QUESTION = org.gnome.gtk.Stock::DIALOG_QUESTION
+  DIALOG_INFO = org.gnome.gtk.Stock::DIALOG_INFO
 end

data/lib/knj/jruby-gtk2/tests/test_glade_window.rb

@@ -1,44 +1,44 @@
 #!/usr/bin/jruby
 
 require "knj/autoload"
-require "knj/gtk2_tv"
+require "#{$knjpath}gtk2_tv"
 
 class WinAppEdit
-	def initialize
-		print "Loading Glade.\n"
-		@glade = GladeXML.new("test_glade_window.glade"){|h|method(h)}
-		print "Done loading glade.\n"
-		
-		@glade["tvTest"].selection.signal_connect("changed") do
-			print "test\n"
-		end
-		
-		@glade["tvTest"].init(["ID", "Title"])
-		@glade["tvTest"].append(["Test1", "Test2"])
-		
-		@glade["window"].show_all
-	end
-	
-	def on_tvTest_row_activated
-		#print "Test\n"
-	end
-	
-	def on_btnSave_clicked(arg1)
-		print arg1.to_s + "\n"
-		print "Save clicked.\n"
-		
-		val = @glade["tvTest"].sel
-		Knj::Php.print_r(val)
-	end
-	
-	def on_btnCancel_clicked
-		print "Cancel clicked.\n"
-	end
-	
-	def on_window_destroy
-		print "Destroyed!\n"
-		Gtk.main_quit
-	end
+  def initialize
+    print "Loading Glade.\n"
+    @glade = GladeXML.new("test_glade_window.glade"){|h|method(h)}
+    print "Done loading glade.\n"
+    
+    @glade["tvTest"].selection.signal_connect("changed") do
+      print "test\n"
+    end
+    
+    @glade["tvTest"].init(["ID", "Title"])
+    @glade["tvTest"].append(["Test1", "Test2"])
+    
+    @glade["window"].show_all
+  end
+  
+  def on_tvTest_row_activated
+    #print "Test\n"
+  end
+  
+  def on_btnSave_clicked(arg1)
+    print arg1.to_s + "\n"
+    print "Save clicked.\n"
+    
+    val = @glade["tvTest"].sel
+    Knj::Php.print_r(val)
+  end
+  
+  def on_btnCancel_clicked
+    print "Cancel clicked.\n"
+  end
+  
+  def on_window_destroy
+    print "Destroyed!\n"
+    Gtk.main_quit
+  end
 end
 
 print "Starting app.\n"

data/lib/knj/jruby-gtk2/tests/test_normal_window.rb

@@ -2,7 +2,7 @@ require "knj/autoload"
 
 button = Gtk::Button.new("Test")
 button.signal_connect("clicked") do
-	print "Clicked!\n"
+  print "Clicked!\n"
 end
 
 win = Gtk::Window.new("Trala")
@@ -10,8 +10,8 @@ win.add(button)
 win.show_all
 
 win.signal_connect("destroy") do
-	print "Destroy!\n"
-	Gtk.main_quit
+  print "Destroy!\n"
+  Gtk.main_quit
 end
 
 Gtk.main

data/lib/knj/jruby-gtk2/tests/test_trayicon.rb

@@ -8,11 +8,11 @@ icon = Gtk::StatusIcon.new
 icon.pixbuf = pixbuf
 
 icon.signal_connect("activate") do
-	print "Activate\n"
+  print "Activate\n"
 end
 
 icon.signal_connect("popup-menu") do
-	print "Popup-menu\n"
+  print "Popup-menu\n"
 end
 
 Gtk.main

data/lib/knj/jruby-gtk2/treeview.rb

@@ -2,104 +2,104 @@ Gtk.events << ["TreeView", "row_activated", org.gnome.gtk.TreeView::RowActivated
 Gtk.events << ["TreeSelection", "changed", org.gnome.gtk.TreeSelection::Changed, :onChanged, nil]
 
 class Gtk::TreeView
-	def set_model(newmodel)
-		@knj_model = newmodel
-		@ob.model = newmodel.ob
-		newmodel.tv = self
-		
-		$knj_jruby_gtk_last_treeview = self
-	end
-	
-	alias :model= :set_model
-	
-	def append_column(column)
-		#do nothing - the Java mode should already have done this.
-	end
-	
-	def model
-		return @knj_model
-	end
-	
-	def columns
-		return TreeViewColumns.new(self)
-	end
-	
-	def selection
-		if !@tsel
-			Gtk.takeob = @ob.selection
-			@tsel = Gtk::TreeSelection.new
-		end
-		
-		return @tsel
-	end
+  def set_model(newmodel)
+    @knj_model = newmodel
+    @ob.model = newmodel.ob
+    newmodel.tv = self
+    
+    $knj_jruby_gtk_last_treeview = self
+  end
+  
+  alias :model= :set_model
+  
+  def append_column(column)
+    #do nothing - the Java mode should already have done this.
+  end
+  
+  def model
+    return @knj_model
+  end
+  
+  def columns
+    return TreeViewColumns.new(self)
+  end
+  
+  def selection
+    if !@tsel
+      Gtk.takeob = @ob.selection
+      @tsel = Gtk::TreeSelection.new
+    end
+    
+    return @tsel
+  end
 end
 
 class TreeViewColumns < Array
-	def initialize(treeview)
-		@treeview = treeview
-		@treeview.ob.columns.each do |column|
-			Gtk.takeob = column
-			self << Gtk::TreeViewColumn.new(nil, nil)
-		end
-	end
+  def initialize(treeview)
+    @treeview = treeview
+    @treeview.ob.columns.each do |column|
+      Gtk.takeob = column
+      self << Gtk::TreeViewColumn.new(nil, nil)
+    end
+  end
 end
 
 class Gtk::TreeSelection
-	def initialize(val1 = nil)
-		if Gtk.takeob
-			@ob = Gtk.takeob
-			Gtk.takeob = nil
-		else
-			@ob = @treeview.ob.append_column
-			@ob.title = title
-			renderer.init(self)
-			colstring = @treeview.model.dcol[@treeview.columns.length - 1]
-			renderer.text = colstring
-		end
-	end
+  def initialize(val1 = nil)
+    if Gtk.takeob
+      @ob = Gtk.takeob
+      Gtk.takeob = nil
+    else
+      @ob = @treeview.ob.append_column
+      @ob.title = title
+      renderer.init(self)
+      colstring = @treeview.model.dcol[@treeview.columns.length - 1]
+      renderer.text = colstring
+    end
+  end
 end
 
 class Gtk::TreeViewColumn
-	def initialize(title, renderer, last_args = {})
-		@treeview = $knj_jruby_gtk_last_treeview
-		
-		if Gtk.takeob
-			@ob = Gtk.takeob
-			Gtk.takeob = nil
-		else
-			@ob = @treeview.ob.append_column
-			@ob.title = title
-			$knj_jruby_gtk_last_treeview_column = self
-			renderer.init(self)
-			colstring = @treeview.model.dcol[@treeview.columns.length - 1]
-			renderer.text = colstring
-		end
-	end
-	
-	def set_visible(newval)
-		@treeview.remove_column(@ob)
-	end
-	
-	alias visible= set_visible
+  def initialize(title, renderer, last_args = {})
+    @treeview = $knj_jruby_gtk_last_treeview
+    
+    if Gtk.takeob
+      @ob = Gtk.takeob
+      Gtk.takeob = nil
+    else
+      @ob = @treeview.ob.append_column
+      @ob.title = title
+      $knj_jruby_gtk_last_treeview_column = self
+      renderer.init(self)
+      colstring = @treeview.model.dcol[@treeview.columns.length - 1]
+      renderer.text = colstring
+    end
+  end
+  
+  def set_visible(newval)
+    @treeview.remove_column(@ob)
+  end
+  
+  alias visible= set_visible
 end
 
 class Gtk::TreeIter
-	def []=(key, value)
-		dcol = @knj_model.dcol[key]
-		@knj_model.ob.set_value(@ob, dcol, value)
-	end
-	
-	def [](key)
-		tv = @knj_model.tv
-		selected = tv.ob.get_selection.get_selected_rows
-		
-		iter = @knj_model.ob.get_iter(selected[0])
-		dcol = @knj_model.dcol[key]
-		
-		return @knj_model.ob.get_value(iter, dcol)
-	end
-	
-	def model=(newmodel)
-		@knj_model = newmodel
-	end
+  def []=(key, value)
+    dcol = @knj_model.dcol[key]
+    @knj_model.ob.set_value(@ob, dcol, value)
+  end
+  
+  def [](key)
+    tv = @knj_model.tv
+    selected = tv.ob.get_selection.get_selected_rows
+    
+    iter = @knj_model.ob.get_iter(selected[0])
+    dcol = @knj_model.dcol[key]
+    
+    return @knj_model.ob.get_value(iter, dcol)
+  end
+  
+  def model=(newmodel)
+    @knj_model = newmodel
+  end
 end

data/lib/knj/jruby-gtk2/vbox.rb

@@ -1,12 +1,12 @@
 class Gtk::VBox
-	def initialize
-		if Gtk.takeob
-			@ob = Gtk.takeob
-			Gtk.takeob = nil
-		else
-			splitted = self.class.to_s.split("::")
-			javaname = "org.gnome." + splitted.first.downcase + "." + splitted.last
-			@ob = Gtk.evalob(javaname).new(false, 0)
-		end
-	end
+  def initialize
+    if Gtk.takeob
+      @ob = Gtk.takeob
+      Gtk.takeob = nil
+    else
+      splitted = self.class.to_s.split("::")
+      javaname = "org.gnome." + splitted.first.downcase + "." + splitted.last
+      @ob = Gtk.evalob(javaname).new(false, 0)
+    end
+  end
 end

data/lib/knj/jruby-gtk2/window.rb

@@ -1,11 +1,11 @@
 Gtk.events << ["Window", "destroy", org.gnome.gtk.Window::DeleteEvent, :onDeleteEvent, false]
 
 class Gtk::Window
-	def destroy
-		@ob.hide #destroy does not exist in the Java-version? - knj
-	end
-	
-	def set_frame_dimensions(arg1, arg2, arg3, arg4)
-		@ob.border_width = arg1
-	end
+  def destroy
+    @ob.hide #destroy does not exist in the Java-version? - knj
+  end
+  
+  def set_frame_dimensions(arg1, arg2, arg3, arg4)
+    @ob.border_width = arg1
+  end
 end

data/lib/knj/jruby_compiler.rb

@@ -1,14 +1,14 @@
 class Knj::Jruby_compiler
-	def initialize(args = {})
-		@args = args
-		
-		factory = javax.script.ScriptEngineManager.new
-		engine = factory.getEngineByName("jruby")
-		code = File.read(args[:path])
-		@script = engine.compile(code)
-	end
-	
-	def run
-		@script.eval
-	end
+  def initialize(args = {})
+    @args = args
+    
+    factory = javax.script.ScriptEngineManager.new
+    engine = factory.getEngineByName("jruby")
+    code = File.read(args[:path])
+    @script = engine.compile(code)
+  end
+  
+  def run
+    @script.eval
+  end
 end

data/lib/knj/knj.rb

@@ -1,19 +1,20 @@
 if $knjpath
-	autoload_path = "#{$knjpath}autoload.rb"
+  autoload_path = "#{$knjpath}autoload.rb"
 else
-	autoload_path = "#{File.dirname(__FILE__)}/autoload.rb"
+  $knjpath = "knj/"
+  autoload_path = "#{File.dirname(__FILE__)}/autoload.rb"
 end
 
 require autoload_path if $knjautoload != false
 
 module Knj
-	def self.appserver_cli(filename)
-		Knj::Os.chdir_file(filename)
-		require "#{$knjpath}/includes/appserver_cli.rb"
-	end
-	
-	def self.dirname(filepath)
-		raise "Filepath does not exist: #{filepath}" if !File.exists?(filepath)
-		return Knj::Php.realpath(File.dirname(filepath))
-	end
+  def self.appserver_cli(filename)
+    Knj::Os.chdir_file(filename)
+    require "#{$knjpath}/includes/appserver_cli.rb"
+  end
+  
+  def self.dirname(filepath)
+    raise "Filepath does not exist: #{filepath}" if !File.exists?(filepath)
+    return Knj::Php.realpath(File.dirname(filepath))
+  end
 end

data/lib/knj/knj_controller.rb

@@ -1,11 +1,16 @@
 #This files makes the framework able to receive calls from the Rhodes framework from RhoMobile.
 class KnjController < Rho::RhoController
-	#GET /Server
-	def index
-		render
-	end
-	
-	def html_links
-		System.open_url(@params["url"])
-	end
+  #GET /Server
+  def index
+    render
+  end
+  
+  def html_links
+    System.open_url(@params["url"])
+  end
+  
+  def callback
+    block = $rhodes.callbacks(@params["callback_id"])
+    block.call(:params => @params)
+  end
 end