knjrbfw 0.0.91 → 0.0.92

data/VERSION

@@ -1 +1 @@
-0.0.91
+0.0.92

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.91"
+  s.version = "0.0.92"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-08-30}
+  s.date = %q{2012-09-03}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [

data/lib/knj/gtk2.rb

@@ -190,9 +190,9 @@ class Knj::Gtk2
       class_str = object.class.to_s
       
       if object.is_a?(Gtk::Label) or object.is_a?(Gtk::Button)
-        object.label = GetText.gettext(object.label)
+        object.label = GetText.gettext(object.label) if !object.label.to_s.strip.empty?
       elsif object.is_a?(Gtk::Window)
-        object.title = GetText.gettext(object.title)
+        object.title = GetText.gettext(object.title) if !object.title.to_s.strip.empty?
       end
     end
   end

data/lib/knj/gtk2_tv.rb

@@ -1,20 +1,35 @@
 #This module contains various helper-methods for handeling stuff regarding treeviews.
 module Knj::Gtk2::Tv
+  ALLOWED_ARGS = [:cols, :reorderable, :sortable, :type]
+  
   #Initializes a treeview with a model and a number of columns. Returns a hash containing various data like the renderers.
   #===Examples
   # Knj::Gtk2::Tv.init(treeview, ["ID", "Name"])
-  def self.init(tv, args)
+  def self.init(tv, rargs)
     ret = {
       :renderers => []
     }
     
-    if args.is_a?(Array)
-      columns = args
-      args = {}
+    if rargs.is_a?(Array)
+      columns = rargs
+      rargs = {}
     else
-      columns = args[:cols]
+      columns = rargs[:cols]
+    end
+    
+    
+    #Default arguments.
+    rargs = {
+      :reorderable => true,
+      :sortable => true
+    }.merge!(rargs)
+    
+    rargs.each do |key, val|
+      raise "Invalid argument: '#{key}'." if !ALLOWED_ARGS.include?(key)
     end
     
+    
+    #Spawn store.
     model_args = []
     columns.each do |args|
       if args.is_a?(String)
@@ -32,7 +47,7 @@ module Knj::Gtk2::Tv
       end
     end
     
-    if args[:type] == :treestore
+    if rargs[:type] == :treestore
       list_store = Gtk::TreeStore.new(*model_args)
     else
       list_store = Gtk::ListStore.new(*model_args)
@@ -79,8 +94,13 @@ module Knj::Gtk2::Tv
       end
       
       col.spacing = 0
-      col.reorderable = true
-      col.sort_column_id = count
+      col.reorderable = rargs[:reorderable] if !args.key?(:reorderable) or args[:reorderable]
+      
+      if !rargs[:sortable]
+        col.sort_column_id = -1
+      else
+        col.sort_column_id = count
+      end
       
       if args.key?(:fixed_width)
         col.sizing = Gtk::TreeViewColumn::FIXED

data/lib/knj/objects.rb

@@ -166,7 +166,7 @@ class Knj::Objects
         
         if callback.key?("signal") and args.key?("signal") and callback["signal"] == args["signal"]
           docall = true
-        elsif callback["signals"] and args["signal"] and callback["signals"].index(args["signal"]) != nil
+        elsif callback["signals"] and args["signal"] and callback["signals"].include?(args["signal"])
           docall = true
         end
         
@@ -185,6 +185,7 @@ class Knj::Objects
           
           callback["block"].call(*callargs)
         elsif callback["callback"]
+          require "php4r"
           Php4r.call_user_func(callback["callback"], args)
         else
           raise "No valid callback given."

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.91
+  version: 0.0.92
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-30 00:00:00 +02:00
+date: 2012-09-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -392,7 +392,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1209507472905610326
+      hash: -538892594692910848
       segments: 
       - 0
       version: "0"