freightrain 0.8.4 → 0.8.5

Sign up to get free protection for your applications and to get access to all the features.
data/Rakefile CHANGED
@@ -8,7 +8,7 @@ require 'rake/testtask'
8
8
 
9
9
  spec = Gem::Specification.new do |s|
10
10
  s.name = 'freightrain'
11
- s.version = '0.8.4'
11
+ s.version = '0.8.5'
12
12
  s.add_dependency('require_all', '>= 1.1.0')
13
13
  s.has_rdoc = false
14
14
  s.homepage = "http://github.com/bolthar/freightrain"
@@ -12,6 +12,7 @@ require File.join(File.dirname(__FILE__), "widgets/gtk_treeview.rb")
12
12
  require File.join(File.dirname(__FILE__), "widgets/gtk_treeviewcolumn.rb")
13
13
  require File.join(File.dirname(__FILE__), "widgets/gtk_layout.rb")
14
14
  require File.join(File.dirname(__FILE__), "widgets/gtk_statusicon.rb")
15
+ require File.join(File.dirname(__FILE__), "widgets/gtk_scale.rb")
15
16
  require File.join(File.dirname(__FILE__), "interface_builder.rb")
16
17
  require File.join(File.dirname(__FILE__), "dialog_helper.rb")
17
18
 
@@ -16,12 +16,17 @@ module Freightrain
16
16
 
17
17
  def create_objects_from_file(file_name)
18
18
  file = get_glade_file(file_name)
19
- corrected_xml = replace_faulty_gtkboxes(File.read(file))
19
+ corrected_xml = replace_faulty_containers(File.read(file), "GtkBox", "GtkHBox", "GtkVBox")
20
+ corrected_xml = replace_faulty_containers(corrected_xml, "GtkPaned", "GtkHPaned", "GtkVPaned")
21
+ corrected_xml = replace_faulty_containers(corrected_xml, "GtkScale", "GtkHScale", "GtkVScale")
20
22
  @builder.add_from_string(corrected_xml)
21
23
  objects = @builder.objects
22
24
  if objects.first.respond_to? :toplevel
23
25
  @control = objects.first.toplevel
24
26
  end
27
+ objects.each do |obj|
28
+ obj.created_callback if obj.respond_to? :created_callback
29
+ end
25
30
  return objects.select do |obj|
26
31
  obj.respond_to? :name
27
32
  end
@@ -55,14 +60,13 @@ module Freightrain
55
60
  return results.first
56
61
  end
57
62
 
58
- def replace_faulty_gtkboxes(xml)
63
+ def replace_faulty_containers(xml, abstract_class, hclass, vclass)
59
64
  document = REXML::Document.new(xml)
60
- document.elements.each("//object[@class='GtkBox']") do |box|
61
- substitute_class = "GtkHBox"
65
+ document.elements.each("//object[@class='#{abstract_class}']") do |box|
66
+ substitute_class = hclass
62
67
  box.elements.each("property[@name='orientation']") do |orientation|
63
- substitute_class = orientation == "vertical" ? "GtkVBox" : "GtkHBox"
68
+ substitute_class = orientation == "vertical" ? vclass : hclass
64
69
  end
65
- p "here3"
66
70
  box.attributes["class"] = substitute_class
67
71
  end
68
72
  return document.to_s
@@ -0,0 +1,12 @@
1
+
2
+ module Gtk
3
+
4
+ class Scale
5
+
6
+ def created_callback
7
+ self.adjustment = Adjustment.new(0,0,100,5,10,10) if self.adjustment.lower == self.adjustment.upper
8
+ end
9
+
10
+ end
11
+
12
+ end
@@ -22,9 +22,8 @@ class AppCommand
22
22
  Generator.create_stub(File.join(@path, "#{@name}.rb"),"application", :name => @name)
23
23
  Generator.create_stub(File.join(@path, "lib", "views", "#{@name}_view.rb"), "view_toplevel", :name => @name.capitalize, :toplevel => @name)
24
24
  Generator.create_stub(File.join(@path, "lib", "views", "#{@name}_view.glade"), "view_toplevel_glade",:name => @name)
25
- Generator.create_stub(File.join(@path, "lib", "views", "#{@name}_view.bnd.yml"), "view_bnd", :name => @name)
26
25
  Generator.create_stub(File.join(@path, "lib", "viewmodels", "#{@name}_view_model.rb"), "viewmodel_toplevel", :name => @name.capitalize)
27
26
  print "Application created in #{@path}\n"
28
27
  end
29
28
 
30
- end
29
+ end
@@ -20,10 +20,9 @@ class TriadCommand
20
20
  def execute
21
21
  Generator.create_stub(File.join(@path, "views", "#{@name}_view.rb"), "view", :name => @name.capitalize)
22
22
  Generator.create_stub(File.join(@path, "views", "#{@name}_view.glade"), "view_control_glade",:name => @name)
23
- Generator.create_stub(File.join(@path, "views", "#{@name}_view.bnd.yml"), "view_bnd", :name => @name)
24
23
  Generator.create_stub(File.join(@path, "viewmodels", "#{@name}_view_model.rb"), "view_model", :name => @name.capitalize)
25
24
  print "#{@name} triad created\n"
26
25
  end
27
26
 
28
27
 
29
- end
28
+ end
@@ -14,4 +14,4 @@ class Generator
14
14
  end
15
15
  end
16
16
 
17
- end
17
+ end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: freightrain
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.4
4
+ version: 0.8.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-04-20 00:00:00.000000000 Z
12
+ date: 2012-06-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: require_all
16
- requirement: &5937440 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
21
21
  version: 1.1.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *5937440
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: 1.1.0
25
30
  description: ruby desktop development made easy
26
31
  email: andrea@andreadallera.com
27
32
  executables:
@@ -32,78 +37,78 @@ files:
32
37
  - README.rdoc
33
38
  - Rakefile
34
39
  - bin/ftrain
35
- - lib/freightrain/viewmodels/freight_view_model.rb
36
- - lib/freightrain/viewmodels/dialog_extension.rb
37
- - lib/freightrain/auto_requirer.rb
40
+ - lib/scaffolding/generator.rb
41
+ - lib/scaffolding/commands/app.rb
42
+ - lib/scaffolding/commands/triad.rb
43
+ - lib/scaffolding/scaffolding.rb
44
+ - lib/scaffolding/templates/view_control_glade.ftt
45
+ - lib/scaffolding/templates/view.ftt
46
+ - lib/scaffolding/templates/view_toplevel.ftt
47
+ - lib/scaffolding/templates/application.ftt
48
+ - lib/scaffolding/templates/viewmodel_toplevel.ftt
49
+ - lib/scaffolding/templates/view_model.ftt
50
+ - lib/scaffolding/templates/view_toplevel_glade.ftt
51
+ - lib/freightrain-dev/auto_stubber.rb
38
52
  - lib/freightrain/string_patch.rb
39
- - lib/freightrain/bootstrapper.rb
40
- - lib/freightrain/signals/freight_signal.rb
41
- - lib/freightrain/signals/signal_host.rb
42
- - lib/freightrain/views/freight_view.rb
43
- - lib/freightrain/views/code_interface_builder.rb
44
- - lib/freightrain/views/interface_builder.rb
45
- - lib/freightrain/views/callback_wrapper.rb
46
- - lib/freightrain/services/service_host.rb
47
- - lib/freightrain/services/freight_service.rb
48
- - lib/freightrain/ioc/container.rb
49
- - lib/freightrain/ioc/registry.rb
50
- - lib/freightrain/ioc/container_hookable.rb
51
- - lib/freightrain/elements/freight_element_view_model.rb
52
- - lib/freightrain/elements/layout_widget.rb
53
- - lib/freightrain/elements/freight_element_view.rb
54
- - lib/freightrain/regions/freight_region.rb
55
- - lib/freightrain/regions/region_host.rb
56
- - lib/freightrain/binding/freight_binding.rb
57
53
  - lib/freightrain/binding/binding_host.rb
58
54
  - lib/freightrain/binding/binding_loader.rb
59
- - lib/freightrain/binding/binding_base.rb
60
- - lib/freightrain/binding/converters/converter_factory.rb
55
+ - lib/freightrain/binding/freight_binding.rb
61
56
  - lib/freightrain/binding/converters/boolean_converter.rb
62
57
  - lib/freightrain/binding/converters/float_converter.rb
63
- - lib/freightrain/binding/converters/integer_converter.rb
64
58
  - lib/freightrain/binding/converters/default_converter.rb
59
+ - lib/freightrain/binding/converters/integer_converter.rb
60
+ - lib/freightrain/binding/converters/converter_factory.rb
61
+ - lib/freightrain/binding/binding_base.rb
62
+ - lib/freightrain/services/freight_service.rb
63
+ - lib/freightrain/services/service_host.rb
64
+ - lib/freightrain/views/interface_builder.rb
65
+ - lib/freightrain/views/freight_view.rb
66
+ - lib/freightrain/views/code_interface_builder.rb
67
+ - lib/freightrain/views/callback_wrapper.rb
65
68
  - lib/freightrain/freight_color.rb
66
- - lib/extensions/qt/qt_bootstrapper.rb
69
+ - lib/freightrain/regions/freight_region.rb
70
+ - lib/freightrain/regions/region_host.rb
71
+ - lib/freightrain/bootstrapper.rb
72
+ - lib/freightrain/signals/freight_signal.rb
73
+ - lib/freightrain/signals/signal_host.rb
74
+ - lib/freightrain/auto_requirer.rb
75
+ - lib/freightrain/viewmodels/dialog_extension.rb
76
+ - lib/freightrain/viewmodels/freight_view_model.rb
77
+ - lib/freightrain/elements/layout_widget.rb
78
+ - lib/freightrain/elements/freight_element_view_model.rb
79
+ - lib/freightrain/elements/freight_element_view.rb
80
+ - lib/freightrain/ioc/registry.rb
81
+ - lib/freightrain/ioc/container_hookable.rb
82
+ - lib/freightrain/ioc/container.rb
83
+ - lib/freightrain.rb
84
+ - lib/extensions/qt/dialog_helper.rb
67
85
  - lib/extensions/qt/interface_builder.rb
68
- - lib/extensions/qt/widgets/qt_line_edit.rb
86
+ - lib/extensions/qt/qt_bootstrapper.rb
69
87
  - lib/extensions/qt/widgets/qt_layout.rb
70
- - lib/extensions/qt/widgets/qt_abstract_button.rb
88
+ - lib/extensions/qt/widgets/qt_calendar_widget.rb
71
89
  - lib/extensions/qt/widgets/qt_base.rb
72
90
  - lib/extensions/qt/widgets/qt_label.rb
73
- - lib/extensions/qt/widgets/qt_calendar_widget.rb
74
- - lib/extensions/qt/dialog_helper.rb
75
- - lib/extensions/wx/interface_builder.rb
76
- - lib/extensions/wx/wx_bootstrapper.rb
77
- - lib/extensions/wx/widgets/wx_panel.rb
78
- - lib/extensions/wx/widgets/wx_object.rb
79
- - lib/extensions/wx/dialog_helper.rb
91
+ - lib/extensions/qt/widgets/qt_abstract_button.rb
92
+ - lib/extensions/qt/widgets/qt_line_edit.rb
93
+ - lib/extensions/gtk/dialog_helper.rb
80
94
  - lib/extensions/gtk/interface_builder.rb
81
- - lib/extensions/gtk/widgets/gtk_combo_box.rb
82
- - lib/extensions/gtk/widgets/gtk_image.rb
83
- - lib/extensions/gtk/widgets/gtk_widget.rb
84
95
  - lib/extensions/gtk/widgets/gtk_toggle_button.rb
85
- - lib/extensions/gtk/widgets/gtk_calendar.rb
96
+ - lib/extensions/gtk/widgets/gtk_statusicon.rb
97
+ - lib/extensions/gtk/widgets/gtk_scale.rb
86
98
  - lib/extensions/gtk/widgets/gtk_layout.rb
99
+ - lib/extensions/gtk/widgets/gtk_treeviewcolumn.rb
100
+ - lib/extensions/gtk/widgets/gtk_image.rb
101
+ - lib/extensions/gtk/widgets/gtk_calendar.rb
87
102
  - lib/extensions/gtk/widgets/gtk_treeview.rb
103
+ - lib/extensions/gtk/widgets/gtk_combo_box.rb
88
104
  - lib/extensions/gtk/widgets/gtk_toggle_tool_button.rb
89
- - lib/extensions/gtk/widgets/gtk_statusicon.rb
90
- - lib/extensions/gtk/widgets/gtk_treeviewcolumn.rb
105
+ - lib/extensions/gtk/widgets/gtk_widget.rb
91
106
  - lib/extensions/gtk/gtk_bootstrapper.rb
92
- - lib/extensions/gtk/dialog_helper.rb
93
- - lib/freightrain-dev/auto_stubber.rb
94
- - lib/freightrain.rb
95
- - lib/scaffolding/generator.rb
96
- - lib/scaffolding/commands/app.rb
97
- - lib/scaffolding/commands/triad.rb
98
- - lib/scaffolding/scaffolding.rb
99
- - lib/scaffolding/templates/view_toplevel_glade.ftt
100
- - lib/scaffolding/templates/view.ftt
101
- - lib/scaffolding/templates/view_toplevel.ftt
102
- - lib/scaffolding/templates/viewmodel_toplevel.ftt
103
- - lib/scaffolding/templates/application.ftt
104
- - lib/scaffolding/templates/view_control_glade.ftt
105
- - lib/scaffolding/templates/view_bnd.ftt
106
- - lib/scaffolding/templates/view_model.ftt
107
+ - lib/extensions/wx/dialog_helper.rb
108
+ - lib/extensions/wx/interface_builder.rb
109
+ - lib/extensions/wx/widgets/wx_panel.rb
110
+ - lib/extensions/wx/widgets/wx_object.rb
111
+ - lib/extensions/wx/wx_bootstrapper.rb
107
112
  homepage: http://github.com/bolthar/freightrain
108
113
  licenses: []
109
114
  post_install_message:
@@ -124,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
124
129
  version: '0'
125
130
  requirements: []
126
131
  rubyforge_project:
127
- rubygems_version: 1.8.17
132
+ rubygems_version: 1.8.24
128
133
  signing_key:
129
134
  specification_version: 3
130
135
  summary: ruby desktop development made easy
File without changes