smartdict-gtk 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/smartdict/gui/controller.rb

@@ -1,6 +1,8 @@
 module Smartdict::Gui
   class Controller
     extend ActiveSupport::Autoload
+    extend Forwardable
+
     autoload :Config
 
     HISTORY_SIZE_ON_START = 50
@@ -8,6 +10,8 @@ module Smartdict::Gui
     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
 
+    def_delegators :@main_window, :toggle_visibility, :hide_visibility, :show_visibility
+
     def initialize
       @translator = Smartdict::Translator.new(
         :from_lang => config.from_lang,
@@ -30,6 +34,8 @@ module Smartdict::Gui
       @interchange_button = InterchangeButton.new(self)
       @word_list          = WordList.new(self)
 
+      @db_mutex = Mutex.new
+
       load_history
     end
 
@@ -44,18 +50,21 @@ module Smartdict::Gui
     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)
+      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)
+        end
+
+        @text_view.show_translation(translation)
+        @word_list.scroll_up
       end
-      @text_view.show_translation(translation)
-      @word_list.scroll_up
     rescue Smartdict::TranslationNotFound => error
       @text_view.buffer.text = error.message
     rescue Exception => error
@@ -70,10 +79,6 @@ module Smartdict::Gui
       @text_view.show_translation(translation)
     end
 
-    def toggle_main_window
-      @main_window.toggle_visibility
-    end
-
     def open_about_window
       AboutWindow.new
     end
@@ -93,6 +98,10 @@ module Smartdict::Gui
       @to_lang_combo_box.active, @from_lang_combo_box.active = @from_lang_combo_box.active, @to_lang_combo_box.active
     end
 
+    def focus_word_entry
+      @word_entry.grab_focus
+    end
+
 
     private
 
@@ -115,5 +124,13 @@ module Smartdict::Gui
       end
     end
 
+    def safe_concurrent_run
+      Thread.new do
+        @db_mutex.synchronize do
+          yield
+        end
+      end
+    end
+
   end
 end

data/lib/smartdict/gui/main_window.rb

@@ -10,9 +10,11 @@ class Smartdict::Gui::MainWindow < ::Gtk::Window
 
     @controller = controller
 
-    signal_connect("delete_event") { @controller.toggle_main_window }
+    signal_connect("delete_event") { @controller.hide_visibility }
     signal_connect("destroy") { @controller.quit }
 
+    signal_connect("focus_in_event") { @controller.focus_word_entry }
+
     set_default_size(720, 450)
     set_icon(Smartdict::Icons.logo)
   end
@@ -63,16 +65,23 @@ class Smartdict::Gui::MainWindow < ::Gtk::Window
 
 
   def toggle_visibility
-    if self.visible? and self.active?
-      @prev_position =  self.position
-      self.hide_all
-    elsif self.visible? and !self.active?
-      self.present
+    if visible? and active?
+      hide_visibility
+    elsif visible? and !active?
+      present
     else
-      self.show_all
-      self.move(*@prev_position)
-      self.present
+      show_visibility
     end
   end
 
+  def show_visibility
+   show_all
+   move(*@prev_position) if @prev_position
+   present
+  end
+
+  def hide_visibility
+    @prev_position = position
+    hide_all
+  end
 end

data/lib/smartdict/gui/status_icon.rb

@@ -8,7 +8,7 @@ module Smartdict::Gui
       build_menu
       self.pixbuf = Gdk::Pixbuf.new(Smartdict::Icons.logo)
 
-      signal_connect('activate'){@controller.toggle_main_window}
+      signal_connect('activate'){@controller.toggle_visibility}
 
       ##Show menu on rigth click
       self.signal_connect('popup-menu'){|tray, button, time| @menu.popup(nil, nil, button, time)}

data/lib/smartdict/gui.rb

@@ -26,10 +26,40 @@ module Smartdict::Gui
   LEFT_BOX_BUTTON_HEIGHT = 36
 
   def run
-    Smartdict::Gui::Controller.new.run
+    if running?
+      puts "smartdict-gtk is already running. PID=#{running_pid}"
+      Process.kill("USR1", running_pid)
+    else
+      File.write(pid_file, Process.pid.to_s)
+      controller = Smartdict::Gui::Controller.new
+      Signal.trap("USR1") do
+        controller.show_visibility
+      end
+      controller.run
+    end
   end
 
   def root_dir
     File.join(File.dirname(__FILE__), '../..')
   end
+
+
+
+  private
+
+  def running_pid
+    pid = File.read(pid_file).strip.to_i
+    Process.getpgid(pid)
+    pid
+  rescue Errno::ENOENT, Errno::ESRCH
+    nil
+  end
+
+  def running?
+    !!running_pid
+  end
+
+  def pid_file
+    File.join(Smartdict.user_dir, 'smartdict-gtk.pid')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartdict-gtk
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartdict-core
@@ -225,7 +225,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