druzy-little_frame 1.0.4 → 1.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/druzy/little_frame/file_chooser.rb +4 -27
  3. data/lib/druzy/little_frame/version.rb +1 -1
  4. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 409d9d3db0a7b0ad381023ad5030b150f78603b9
4
- data.tar.gz: 30d510e9466408481060df0925a7aa26c32c9931
3
+ metadata.gz: fc54858f42941f05d1dc33ce067dd8c031650dff
4
+ data.tar.gz: fa462b7440c7fee30ccc093fb474dfa59405e7c7
5
5
  SHA512:
6
- metadata.gz: 39575a37349d7d6f2f50a478b1c411122de3ce6506f67b9c0da33fa295bbf494221f8640053d92e38cad29225196607b515f33d4c35ffa7e294e2649b8e5f4fb
7
- data.tar.gz: ddd5f305bdcf6f555541ee46446501f1896c69674025321f9549027ba6d45e82135981c8b7fec0df9dd0d14230d18c5bf70fcaa17044331ebdd694739a94ec80
6
+ metadata.gz: 054eab74815a1b64d7658814bfafef5cbed03b64fb18b2e55c725382ec962b699355e91fea98ed8db541cc5ba90f5a494b96048de958449b1c9ca39f1848a590
7
+ data.tar.gz: 872435e0ff65a28834b8c72a40e0a649f7e29e306b47855a6553528dcc1eeac176e24534910184bac730b63df7fba5102c8dfd97f64869f4b79a65b847eb5dcf
data/lib/druzy/little_frame/file_chooser.rb CHANGED
@@ -1,10 +1,10 @@
1
- require 'druzy/mvc'
1
+ require 'druzy/mvc/mvc_with_result'
2
2
  require 'gtk3'
3
3
 
4
4
  module Druzy
5
5
  module LittleFrame
6
6
 
7
- class FileChooser < Druzy::MVC::Controller
7
+ class FileChooser < Druzy::MVC::ControllerWithResult
8
8
  def initialize(args)
9
9
  if (args[:model]==nil)
10
10
  initialize(:model => FileChooserModel.new(args))
@@ -26,20 +26,11 @@ module Druzy
26
26
  end
27
27
  end
28
28
 
29
- def result
30
- if @model.result == nil
31
- @model.stopped_thread=Thread.current
32
- Thread.stop
33
- end
34
-
35
- return @model.result
36
- end
37
-
38
29
  end
39
30
 
40
31
 
41
- class FileChooserModel < Druzy::MVC::Model
42
- attr_accessor :files, :result, :stopped_thread, :filters_mime_type
32
+ class FileChooserModel < Druzy::MVC::ModelWithResult
33
+ attr_accessor :files, :filters_mime_type
43
34
 
44
35
  def initialize(args)
45
36
  if args[:filter_mime_type] != nil
@@ -48,20 +39,11 @@ module Druzy
48
39
  else
49
40
  super()
50
41
  @files = nil
51
- @result = nil
52
- @stopped_thread = nil
53
42
  @filters_mime_type=args[:filters_mime_type]
54
43
 
55
44
  end
56
45
  end
57
46
 
58
- def result=(result)
59
- @result = result
60
- if @stopped_thread != nil
61
- @stopped_thread.wakeup
62
- end
63
- end
64
-
65
47
  end
66
48
 
67
49
  class FileChooserView < Druzy::MVC::View
@@ -113,9 +95,6 @@ module Druzy
113
95
  @button_hbox.pack_end(@open, :expand => false, :padding => 20)
114
96
  @button_hbox.pack_end(@cancel, :expand => false)
115
97
 
116
- @thread_gtk = Thread.new do
117
- Gtk.main
118
- end
119
98
  end
120
99
 
121
100
  def display
@@ -124,8 +103,6 @@ module Druzy
124
103
 
125
104
  def close
126
105
  @window.destroy
127
- Gtk.main_quit if Gtk.main_level!=0
128
- @thread_gtk.join
129
106
  end
130
107
  end
131
108
 
data/lib/druzy/little_frame/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Druzy
2
2
  module LittleFrame
3
- VERSION = "1.0.4"
3
+ VERSION = "1.0.5"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: druzy-little_frame
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.4
4
+ version: 1.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonathan Le Greneur
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-05-29 00:00:00.000000000 Z
11
+ date: 2016-06-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: druzy-mvc
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 1.0.3
19
+ version: 1.1.1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - ">="
25
25
  - !ruby/object:Gem::Version
26
- version: 1.0.3
26
+ version: 1.1.1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: gtk3
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: '10.0'
61
+ version: '10.5'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: '10.0'
68
+ version: '10.5'
69
69
  description:
70
70
  email:
71
71
  - jonathan.legreneur@free.fr