knjrbfw 0.0.8 → 0.0.9

data/lib/knj/gtk2_cb.rb

@@ -1,85 +1,85 @@
 module Knj::Gtk2::Cb
-	def self.init(paras)
-		return paras["cb"].init(paras["items"])
-	end
-	
-	def self.sel(cb)
-		return cb.sel
-	end
+  def self.init(paras)
+    return paras["cb"].init(paras["items"])
+  end
+  
+  def self.sel(cb)
+    return cb.sel
+  end
 end
 
 class Gtk::ComboBox
-	def init(items)
-		@knj = {
-			"items" => []
-		}
-		
-		ls = Gtk::ListStore.new(String, String)
-		cr = Gtk::CellRendererText.new
-		self.pack_start(cr, false)
-		self.add_attribute(cr, "text", 0)
-		
-		if items.is_a?(Array)
-			items.each do |appendob|
-				iter = ls.append
-				
-				if appendob.is_a?(String)
-					iter[0] = appendob
-				elsif appendob.respond_to?("is_knj?")
-					iter[0] = appendob.title
-					@knj["items"] << {
-						"iter" => iter,
-						"object" => appendob
-					}
-				end
-			end
-		else
-			raise "Unsupported type: " + items.class.to_s
-		end
-		
-		self.model = ls
-		
-		self.active = 0
-	end
-	
-	def sel
-		iter = self.active_iter
-		
-		if @knj["items"].length > 0
-			@knj["items"].each do |item|
-				if item["iter"] == iter
-					return item["object"]
-				end
-			end
-			
-			return false
-		else
-			return {
-				"active" => self.active,
-				"text" => iter[0]
-			}
-		end
-	end
-	
-	def sel=(actob)
-		if actob.respond_to?("is_knj?")
-			@knj["items"].each do |item|
-				if item["object"].id == actob.id
-					self.active_iter = item["iter"]
-					return nil
-				end
-			end
-		else
-			self.model.each do |model, path, iter|
-				text = self.model.get_value(iter, 0)
-				
-				if text == actob
-					self.active_iter = iter
-					return nil
-				end
-			end
-		end
-		
-		raise "Could not find such a row: " + textval
-	end
+  def init(items)
+    @knj = {
+      "items" => []
+    }
+    
+    ls = Gtk::ListStore.new(String, String)
+    cr = Gtk::CellRendererText.new
+    self.pack_start(cr, false)
+    self.add_attribute(cr, "text", 0)
+    
+    if items.is_a?(Array)
+      items.each do |appendob|
+        iter = ls.append
+        
+        if appendob.is_a?(String)
+          iter[0] = appendob
+        elsif appendob.respond_to?("is_knj?")
+          iter[0] = appendob.title
+          @knj["items"] << {
+            "iter" => iter,
+            "object" => appendob
+          }
+        end
+      end
+    else
+      raise "Unsupported type: " + items.class.to_s
+    end
+    
+    self.model = ls
+    
+    self.active = 0
+  end
+  
+  def sel
+    iter = self.active_iter
+    
+    if @knj["items"].length > 0
+      @knj["items"].each do |item|
+        if item["iter"] == iter
+          return item["object"]
+        end
+      end
+      
+      return false
+    else
+      return {
+        "active" => self.active,
+        "text" => iter[0]
+      }
+    end
+  end
+  
+  def sel=(actob)
+    if actob.respond_to?("is_knj?")
+      @knj["items"].each do |item|
+        if item["object"].id == actob.id
+          self.active_iter = item["iter"]
+          return nil
+        end
+      end
+    else
+      self.model.each do |model, path, iter|
+        text = self.model.get_value(iter, 0)
+        
+        if text == actob
+          self.active_iter = iter
+          return nil
+        end
+      end
+    end
+    
+    raise "Could not find such a row: " + textval
+  end
 end

data/lib/knj/gtk2_menu.rb

@@ -1,57 +1,57 @@
 class Knj::Gtk2::Menu
-	def initialize(paras)
-		@paras = paras
-		@items = []
-		@mainmenu = Gtk::Menu.new
-		@signal = ""
-		
-		count = 0
-		if @paras["items"].respond_to?("reverse")
-			items = @paras["items"].reverse
-		else
-			items = @paras["items"]
-		end
-		
-		if items.is_a?(Array)
-			items = Knj::ArrayExt.dict(items)
-		end
-		
-		items.each do |signal, menuitem|
-			if menuitem.is_a?(Array)
-				old_mi = menuitem
-				menuitem = {"text" => menuitem[0], "connect" => menuitem[1]}
-			end
-			
-			newitem = Gtk::MenuItem.new(menuitem["text"])
-			
-			if menuitem["connect"]
-				newitem.signal_connect("activate") do
-					Knj::Php.call_user_func(menuitem["connect"])
-				end
-			else
-				newitem.signal_connect("activate") do
-					on_menuitem_activate
-				end
-			end
-			
-			@items[count] = {
-				"gtkmenuitem" => newitem,
-				"signal" => signal
-			}
-			@mainmenu.prepend(newitem)
-			
-			count += 1
-		end
-		
-		event = Gdk::EventButton.new(Gdk::Event::BUTTON_PRESS)
-		
-		@mainmenu.show_all
-		@mainmenu.popup(nil, nil, event.button, event.time)
-	end
-	
-	def on_menuitem_activate(signal)
-		@signal = signal
-	end
-	
-	def signal() return @signal end
+  def initialize(paras)
+    @paras = paras
+    @items = []
+    @mainmenu = Gtk::Menu.new
+    @signal = ""
+    
+    count = 0
+    if @paras["items"].respond_to?("reverse")
+      items = @paras["items"].reverse
+    else
+      items = @paras["items"]
+    end
+    
+    if items.is_a?(Array)
+      items = Knj::ArrayExt.dict(items)
+    end
+    
+    items.each do |signal, menuitem|
+      if menuitem.is_a?(Array)
+        old_mi = menuitem
+        menuitem = {"text" => menuitem[0], "connect" => menuitem[1]}
+      end
+      
+      newitem = Gtk::MenuItem.new(menuitem["text"])
+      
+      if menuitem["connect"]
+        newitem.signal_connect("activate") do
+          Knj::Php.call_user_func(menuitem["connect"])
+        end
+      else
+        newitem.signal_connect("activate") do
+          on_menuitem_activate
+        end
+      end
+      
+      @items[count] = {
+        "gtkmenuitem" => newitem,
+        "signal" => signal
+      }
+      @mainmenu.prepend(newitem)
+      
+      count += 1
+    end
+    
+    event = Gdk::EventButton.new(Gdk::Event::BUTTON_PRESS)
+    
+    @mainmenu.show_all
+    @mainmenu.popup(nil, nil, event.button, event.time)
+  end
+  
+  def on_menuitem_activate(signal)
+    @signal = signal
+  end
+  
+  def signal() return @signal end
 end

data/lib/knj/gtk2_statuswindow.rb

@@ -1,64 +1,64 @@
 class Knj::Gtk2::StatusWindow
-	def initialize(opts = {})
-		@opts = opts
-		
-		@window = Gtk::Window.new("Status")
-		@window.modal = true
-		@window.border_width = 8
-		@window.set_frame_dimensions(3, 3, 3, 3)
-		@window.signal_connect("destroy") do
-			destroy
-		end
-		
-		if opts["transient_for"]
-			@window.transient_for = @opts["transient_for"]
-		end
-		
-		@label = Gtk::Label.new("Loading...")
-		@pbar = Gtk::ProgressBar.new
-		
-		@vbox = Gtk::VBox.new
-		@vbox.spacing = 4
-		@vbox.pack_start(@label, false, true)
-		@vbox.pack_start(@pbar, false, true)
-		
-		@window.add(@vbox)
-		
-		@window.show_all
-	end
-	
-	def label=(newlabel)
-		if @label
-			@label.label = newlabel
-		end
-	end
-	
-	def setStatus(perc, newlabel, temp = nil)
-		if !perc
-			perc = 0
-		end
-		
-		self.percent = perc
-		self.label = newlabel.to_s
-	end
-	
-	def percent=(newperc)
-		if @pbar
-			@pbar.fraction = newperc
-		end
-	end
-	
-	def destroy
-		if @window
-			@window.destroy
-		end
-		
-		@window = nil
-		@vbox = nil
-		@pbar = nil
-		@label = nil
-		@opts = nil
-	end
-	
-	alias closeWindow destroy
+  def initialize(opts = {})
+    @opts = opts
+    
+    @window = Gtk::Window.new("Status")
+    @window.modal = true
+    @window.border_width = 8
+    @window.set_frame_dimensions(3, 3, 3, 3)
+    @window.signal_connect("destroy") do
+      destroy
+    end
+    
+    if opts["transient_for"]
+      @window.transient_for = @opts["transient_for"]
+    end
+    
+    @label = Gtk::Label.new("Loading...")
+    @pbar = Gtk::ProgressBar.new
+    
+    @vbox = Gtk::VBox.new
+    @vbox.spacing = 4
+    @vbox.pack_start(@label, false, true)
+    @vbox.pack_start(@pbar, false, true)
+    
+    @window.add(@vbox)
+    
+    @window.show_all
+  end
+  
+  def label=(newlabel)
+    if @label
+      @label.label = newlabel
+    end
+  end
+  
+  def setStatus(perc, newlabel, temp = nil)
+    if !perc
+      perc = 0
+    end
+    
+    self.percent = perc
+    self.label = newlabel.to_s
+  end
+  
+  def percent=(newperc)
+    if @pbar
+      @pbar.fraction = newperc
+    end
+  end
+  
+  def destroy
+    if @window
+      @window.destroy
+    end
+    
+    @window = nil
+    @vbox = nil
+    @pbar = nil
+    @label = nil
+    @opts = nil
+  end
+  
+  alias closeWindow destroy
 end

data/lib/knj/gtk2_tv.rb

@@ -1,63 +1,63 @@
 module Knj::Gtk2::Tv
-	def self.init(tv, columns)
-		args = []
-		columns.each do |pair|
-			args << String
-		end
-		
-		list_store = Gtk::ListStore.new(*args)
-		tv.model = list_store
-		
-		count = 0
-		columns.each do |col_title|
-			renderer = Gtk::CellRendererText.new
-			col = Gtk::TreeViewColumn.new(col_title, renderer, :text => count)
-			tv.append_column(col)
-			count += 1
-		end
-	end
-	
-	def self.append(tv, data)
-		iter = tv.model.append
-		
-		count = 0
-		data.each do |value|
-			iter[count] = value.to_s
-			count += 1
-		end
-	end
-	
-	def self.sel(tv)
-		selected = tv.selection.selected_rows
-		
-		if !tv.model or selected.size <= 0
-			return nil
-		end
-		
-		iter = tv.model.get_iter(selected[0])
-		returnval = []
-		columns = tv.columns
-		
-		count = 0
-		columns.each do |column|
-			returnval[count] = iter[count]
-			count += 1
-		end
-		
-		return returnval
-	end
+  def self.init(tv, columns)
+    args = []
+    columns.each do |pair|
+      args << String
+    end
+    
+    list_store = Gtk::ListStore.new(*args)
+    tv.model = list_store
+    
+    count = 0
+    columns.each do |col_title|
+      renderer = Gtk::CellRendererText.new
+      col = Gtk::TreeViewColumn.new(col_title, renderer, :text => count)
+      tv.append_column(col)
+      count += 1
+    end
+  end
+  
+  def self.append(tv, data)
+    iter = tv.model.append
+    
+    count = 0
+    data.each do |value|
+      iter[count] = value.to_s
+      count += 1
+    end
+  end
+  
+  def self.sel(tv)
+    selected = tv.selection.selected_rows
+    
+    if !tv.model or selected.size <= 0
+      return nil
+    end
+    
+    iter = tv.model.get_iter(selected[0])
+    returnval = []
+    columns = tv.columns
+    
+    count = 0
+    columns.each do |column|
+      returnval[count] = iter[count]
+      count += 1
+    end
+    
+    return returnval
+  end
 end
 
 class Gtk::TreeView
-	def sel
-		return Knj::Gtk2::Tv.sel(self)
-	end
-	
-	def append(data)
-		return Knj::Gtk2::Tv.append(self, data)
-	end
-	
-	def init(cols)
-		return Knj::Gtk2::Tv.init(self, cols)
-	end
+  def sel
+    return Knj::Gtk2::Tv.sel(self)
+  end
+  
+  def append(data)
+    return Knj::Gtk2::Tv.append(self, data)
+  end
+  
+  def init(cols)
+    return Knj::Gtk2::Tv.init(self, cols)
+  end
 end

data/lib/knj/hash_methods.rb

@@ -1,37 +1,28 @@
-class Knj::Hash_methods
-	def initialize(data = {})
-		@data = data
-	end
-	
-	def [](key)
-		return @data[key]
-	end
-	
-	def []=(key, val)
-    return @data[key] = val
-	end
-	
-	def db
-		return @data[:db]
-	end
-	
-	def ob
-		return @data[:ob]
-	end
-	
-	def args
-		return @data[:args]
-	end
-	
-	def data
-		return @data[:data]
-	end
-	
-	def method_missing(method, *paras)
-		if !@data.key?(method)
-			raise "No such method '#{method}' on class '#{self.class.name}'"
-		end
-		
-		return @data[method.to_sym]
-	end
+class Knj::Hash_methods < Hash
+  def initialize(hash = {})
+    self.update(hash)
+  end
+  
+  def db
+    return self[:db]
+  end
+  
+  def ob
+    return self[:ob]
+  end
+  
+  def args
+    return self[:args]
+  end
+  
+  def data
+    return self[:data]
+  end
+  
+  def method_missing(method, *args)
+    method = method.to_sym
+    return self[method] if self.key?(method)
+    
+    raise "No such method '#{method}' on class '#{self.class.name}'"
+  end
 end