smartdict-gtk 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/smartdict/gui/controller.rb

@@ -34,7 +34,7 @@ module Smartdict::Gui
       @interchange_button = InterchangeButton.new(self)
       @word_list          = WordList.new(self)
 
-      @db_mutex = Mutex.new
+      @mutex = Mutex.new
 
       load_history
     end
@@ -50,25 +50,11 @@ module Smartdict::Gui
     end
 
     def translate
-      safe_concurrent_run do
-        word = @word_entry.text.strip.downcase
-        from_lang = @translator.default_opts[:from_lang]
-        to_lang = @translator.default_opts[:to_lang]
-
-        if add_to_history?(word, from_lang, to_lang)
-          translation = @translator.translate(word)
-          add_to_history(translation)
-        else
-          translation = @translator.translate(word, :log => false)
+      Thread.new do
+        @mutex.synchronize do
+          _translate
         end
-
-        @text_view.show_translation(translation)
-        @word_list.scroll_up
       end
-    rescue Smartdict::TranslationNotFound => error
-      @text_view.buffer.text = error.message
-    rescue Exception => error
-      @text_view.show_error(error)
     end
 
     # @param [String] word
@@ -124,12 +110,24 @@ module Smartdict::Gui
       end
     end
 
-    def safe_concurrent_run
-      Thread.new do
-        @db_mutex.synchronize do
-          yield
-        end
+    def _translate
+      word = @word_entry.text.strip.downcase
+      from_lang = @translator.default_opts[:from_lang]
+      to_lang = @translator.default_opts[:to_lang]
+
+      if add_to_history?(word, from_lang, to_lang)
+        translation = @translator.translate(word)
+        add_to_history(translation)
+      else
+        translation = @translator.translate(word, :log => false)
       end
+
+      @text_view.show_translation(translation)
+      @word_list.scroll_up
+    rescue Smartdict::TranslationNotFound => error
+      @text_view.buffer.text = error.message
+    rescue Exception => error
+      @text_view.show_error(error)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartdict-gtk
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartdict-core
@@ -217,6 +217,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3712988387274917201
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -225,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: GTK GUI for Smartdict dictionary