Navigation Menu

Skip to content

Commit

Permalink
color to freightcolor
Browse files Browse the repository at this point in the history
  • Loading branch information
andrea authored and andrea committed Jan 8, 2012
1 parent 8b0a4d6 commit 47ace3c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
8 changes: 1 addition & 7 deletions Rakefile
@@ -1,6 +1,5 @@

require 'rubygems'
require 'spec/rake/spectask'
require 'rake'
require 'rake/clean'
require 'rake/gempackagetask'
Expand All @@ -9,7 +8,7 @@ require 'rake/testtask'

spec = Gem::Specification.new do |s|
s.name = 'freightrain'
s.version = '0.7.0'
s.version = '0.7.2'
s.add_dependency('require_all', '>= 1.1.0')
s.has_rdoc = false
s.homepage = "http://github.com/bolthar/freightrain"
Expand All @@ -27,8 +26,3 @@ Rake::GemPackageTask.new(spec) do |p|
p.need_tar = true
p.need_zip = true
end

Spec::Rake::SpecTask.new do |t|
t.warning = true
t.spec_files = FileList['spec/**/*.rb']
end
4 changes: 2 additions & 2 deletions lib/extensions/gtk/widgets/gtk_widget.rb
Expand Up @@ -32,7 +32,7 @@ def color_from_rgb(rgb_array)

def get_color(symbol_or_array)
if symbol_or_array.kind_of? Symbol
rgb_array = Color[symbol_or_array]
rgb_array = FreightColor[symbol_or_array]
else
rgb_array = symbol_or_array
end
Expand All @@ -58,4 +58,4 @@ def plug_in(region_widget)

end

end
end
4 changes: 2 additions & 2 deletions lib/freightrain/color.rb → lib/freightrain/freight_color.rb
@@ -1,5 +1,5 @@

class Color
class FreightColor

@@colors = {}
@@colors[:red] = [255, 0, 0]
Expand All @@ -9,4 +9,4 @@ class Color
def self.[](color_symbol)
return @@colors[color_symbol]
end
end
end

0 comments on commit 47ace3c

Please sign in to comment.