smartdict-gtk 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/smartdict/gui.rb

@@ -21,6 +21,7 @@ module Smartdict::Gui
   autoload :InterchangeButton
   autoload :ExportDialog
   autoload :WordList
+  autoload :StatusBar
 
 
   LEFT_BOX_BUTTON_HEIGHT = 36

data/lib/smartdict/gui/controller.rb

@@ -8,7 +8,7 @@ module Smartdict::Gui
     HISTORY_SIZE_ON_START = 50
 
     attr_reader :main_window, :word_entry, :translate_button, :menu_bar, :text_view, :status_icon,
-                :from_lang_combo_box, :to_lang_combo_box, :interchange_button, :word_list
+                :from_lang_combo_box, :to_lang_combo_box, :interchange_button, :word_list, :status_bar
 
     def_delegators :@main_window, :toggle_visibility, :hide_visibility, :show_visibility
 
@@ -25,6 +25,7 @@ module Smartdict::Gui
       @menu_bar         = MenuBar.new(self)
       @text_view        = TextView.new(self)
       @status_icon      = StatusIcon.new(self)
+      @status_bar       = StatusBar.new(self)
       @from_lang_combo_box = LangComboBox.new(self, config.from_lang) do |lang|
         @translator.default_opts[:from_lang] = lang
       end
@@ -34,7 +35,7 @@ module Smartdict::Gui
       @interchange_button = InterchangeButton.new(self)
       @word_list          = WordList.new(self)
 
-      @mutex = Mutex.new
+      @db_mutex = Mutex.new
 
       load_history
     end
@@ -50,9 +51,23 @@ module Smartdict::Gui
     end
 
     def translate
-      Thread.new do
-        @mutex.synchronize do
-          _translate
+      word      = @word_entry.text.strip.downcase
+      from_lang = @translator.default_opts[:from_lang]
+      to_lang   = @translator.default_opts[:to_lang]
+      status_message = "Looking for \"#{word}\" ..."
+
+      safe_concurrent_run do
+        do_with_status(status_message) do
+          with_reported_exception do
+            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
+          end
         end
       end
     end
@@ -110,20 +125,24 @@ module Smartdict::Gui
       end
     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)
+    def safe_concurrent_run
+      Thread.new do
+        @db_mutex.synchronize do
+          yield
+        end
       end
+    end
 
-      @text_view.show_translation(translation)
-      @word_list.scroll_up
+    def do_with_status(status_message)
+      context_id = @status_bar.get_context_id(status_message)
+      @status_bar.push(context_id, status_message)
+      yield
+    ensure
+      @status_bar.pop(context_id)
+    end
+
+    def with_reported_exception
+      yield
     rescue Smartdict::TranslationNotFound => error
       @text_view.buffer.text = error.message
     rescue Exception => error

data/lib/smartdict/gui/main_window.rb

@@ -3,7 +3,7 @@ class Smartdict::Gui::MainWindow < ::Gtk::Window
 
   def_delegators :@controller, :menu_bar, :word_entry, :translate_button, :text_view,
 			       :from_lang_combo_box, :to_lang_combo_box, :interchange_button,
-                               :word_list
+                               :word_list, :status_bar
 
   def initialize(controller)
     super("Smartdict")
@@ -58,7 +58,7 @@ class Smartdict::Gui::MainWindow < ::Gtk::Window
       add_child(Gtk::Builder.new, right_scrolled_win)
 
     main_box.add(main_hpaned)
-    #main_box.pack_start(@status_bar, false,false)
+    main_box.pack_start(status_bar, false, false)
 
     add(main_box)
   end

data/lib/smartdict/gui/status_bar.rb

@@ -0,0 +1,16 @@
+class Smartdict::Gui::StatusBar < ::Gtk::Statusbar
+  DEFAULT_MESSAGE = "Enter a word to look for a translation"
+
+  def initialize(controller)
+    super()
+    @controller = controller
+    push_default_message
+  end
+
+  private
+
+  def push_default_message
+    context_id = get_context_id("default")
+    push(context_id, DEFAULT_MESSAGE)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartdict-gtk
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartdict-core
@@ -192,6 +192,7 @@ files:
 - ./lib/smartdict/gui/lang_combo_box.rb
 - ./lib/smartdict/gui/main_window.rb
 - ./lib/smartdict/gui/menu_bar.rb
+- ./lib/smartdict/gui/status_bar.rb
 - ./lib/smartdict/gui/status_icon.rb
 - ./lib/smartdict/gui/text_view.rb
 - ./lib/smartdict/gui/text_view/buffer.rb
@@ -204,9 +205,9 @@ files:
 - README.markdown
 - !binary |-
   YmluL3NtYXJ0ZGljdC1ndGs=
-homepage: http://github.com/greyblake/smartdict-gtk
+homepage: http://smartdict.net
 licenses:
-- MIT
+- GPL
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -217,9 +218,6 @@ 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:
@@ -228,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: GTK GUI for Smartdict dictionary