smartdict-gtk 0.0.4 → 0.1.0

data/README.markdown

@@ -1,41 +1,10 @@
-# smartdict-gtk
+# smartdict-gtk [![Build Status](https://secure.travis-ci.org/smartdict/smartdict-gtk.png)](http://travis-ci.org/smartdict/smartdict-gtk)
 
+By [Sergey Potapov](https://github.com/greyblake)
 
 ## Installation
 
-### Prerequisites
-
-
-#### Debian/Ubuntu
-
-On Debian/Ubuntu you need to install the next packages:
-
-* libglib2.0-dev
-* ligatk1.0-dev
-* libcairo-dev
-* libsqlite3-dev
-* libpango1.0-dev
-
-To do that run:
-
-```
-apt-get install libglib2.0-dev ligatk1.0-dev libcairo-dev libsqlite3-dev libpango1.0-dev
-```
-
-Please report if you have issues or it's not complete list of required dependencies.
-
-
-### Ruby version
-
-Tested on MRI 1.9.3-p125
-
-
-### Install the gem
-
-```
-gem install smartdict-gtk
-```
-
+See installation instructions for [Smartdict](https://github.com/smartdict/smartdict#installation)
 
 
 ## Copyright

data/bin/smartdict-gtk

@@ -1,17 +1,17 @@
 #!/usr/bin/env ruby
 
+# For development
+parent_dir = File.expand_path('../../../', __FILE__)
+Dir["#{parent_dir}/smartdict-*/lib"].each do |lib_dir|
+  $LOAD_PATH.unshift(lib_dir) if Dir.exists?(lib_dir)
+end
+
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'rubygems'
 
-# For development
-# require 'bundler'
-# Bundler.setup(:default, :development)
-
 require 'smartdict-core'
 require 'smartdict-icons'
 require 'smartdict-gtk'
 
-Smartdict.env = :user
-
-Smartdict.run
-Smartdict::Gui.run
+args = ARGV.dup
+Smartdict::Gui::Cli.run(args)

data/lib/smartdict-gtk.rb

@@ -1 +1,7 @@
-require File.expand_path('../smartdict', __FILE__)
+require 'smartdict'
+
+module Smartdict
+  extend ActiveSupport::Autoload
+
+  autoload :Gui
+end

data/lib/smartdict/gui.rb

@@ -4,7 +4,12 @@ module Smartdict::Gui
   extend ActiveSupport::Autoload
   extend self
 
+  autoload :VERSION, 'smartdict/gui/version'
+
+  autoload :Cli
   autoload :Controller
+
+  # Widgets
   autoload :MainWindow
   autoload :WordEntry
   autoload :TranslateButton
@@ -23,4 +28,8 @@ module Smartdict::Gui
   def run
     Smartdict::Gui::Controller.new.run
   end
+
+  def root_dir
+    File.join(File.dirname(__FILE__), '../..')
+  end
 end

data/lib/smartdict/gui/about_window.rb

@@ -10,13 +10,15 @@ class Smartdict::Gui::AboutWindow < Gtk::AboutDialog
   end
 
   def set_info
-    self.name         = "Smartdict 2"
+    info = Smartdict.info
+    self.name         = "smartdict-gtk"
     self.program_name = "Smartdict"
-    self.version      = Smartdict::VERSION
-    self.copyright    = "Potapov Sergey (greyblake)"
-    self.authors      = ["Potapov Sergey"]
-    self.comments     = "Simple dictionary"
-    self.website      = "https://github.com/smartdict/smartdict"
+    self.version      = Smartdict::Gui::VERSION
+    self.copyright    = info.author
+    self.authors      = [info.author]
+    self.comments     = "Core v#{info.version}\nSimple dictionary"
+    self.website      = info.url
+    self.logo         = Gdk::Pixbuf.new(Smartdict::Icons.logo, 128, 128)
   end
 
   def set_license

data/lib/smartdict/gui/cli.rb

@@ -0,0 +1,38 @@
+# Handles options for smartdict-gtk command.
+class Smartdict::Gui::Cli
+  def self.run(args)
+    case args.first
+    when nil, /\s+/
+      run_application
+    when '-v', '--version', 'version'
+      puts version_message
+    when '-h', '--help', 'help', /\w+/
+      puts help_message
+    end
+  end
+
+
+  private
+
+  def self.run_application
+    Smartdict.env = :user
+    Smartdict.run
+    Smartdict::Gui.run
+  end
+
+  def self.version_message
+    info = Smartdict.info
+    "Smartdict GUI(gtk) v#{Smartdict::Gui::VERSION}\n" \
+    "Smartdict core v#{info.version}\n" \
+    "Author: #{info.author} (#{info.email})\n" \
+    "URL: #{info.url}\n" \
+  end
+
+  def self.help_message
+    "Smartdict GUI(gtk)\n\n" \
+    "  Usage:\n" \
+    "    smartdict-gtk              run the application\n" \
+    "    smartdict-gtk --version    see version\n" \
+    "    smartdict-gtk --help       see help message\n" \
+  end
+end

data/lib/smartdict/gui/controller.rb

@@ -1,27 +1,36 @@
-require 'benchmark'
-
 module Smartdict::Gui
   class Controller
     extend ActiveSupport::Autoload
     autoload :Config
 
+    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
 
     def initialize
+      @translator = Smartdict::Translator.new(
+        :from_lang => config.from_lang,
+        :to_lang   => config.to_lang,
+        :log       => true
+      )
+
       @main_window      = MainWindow.new(self)
       @word_entry       = WordEntry.new(self)
       @translate_button = TranslateButton.new(self)
       @menu_bar         = MenuBar.new(self)
       @text_view        = TextView.new(self)
       @status_icon      = StatusIcon.new(self)
-      @from_lang_combo_box = LangComboBox.new(self, config.from_lang) {|lang| Smartdict::Translator.from_lang_code = lang }
-      @to_lang_combo_box   = LangComboBox.new(self, config.to_lang) {|lang| Smartdict::Translator.to_lang_code = lang }
+      @from_lang_combo_box = LangComboBox.new(self, config.from_lang) do |lang|
+        @translator.default_opts[:from_lang] = lang
+      end
+      @to_lang_combo_box = LangComboBox.new(self, config.to_lang) do |lang|
+        @translator.default_opts[:to_lang] = lang
+      end
       @interchange_button = InterchangeButton.new(self)
       @word_list          = WordList.new(self)
 
-      #open_export_dialog
-      #exit
+      load_history
     end
 
     def run
@@ -36,28 +45,33 @@ module Smartdict::Gui
 
     def translate
       word = @word_entry.text.strip.downcase
-      translation = Smartdict::Translator.translate(word)
+      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.prepend_word(translation)
-    rescue Smartdict::TranslationNotFound => err
-      @text_view.buffer.text = err.message
+      @word_list.scroll_up
+    rescue Smartdict::TranslationNotFound => error
+      @text_view.buffer.text = error.message
+    rescue Exception => error
+      @text_view.show_error(error)
     end
 
     # @param [String] word
     # @param [String] from_lang language code
     # @param [String] to_lang language code
     def translate_selected_word(word, from_lang, to_lang)
-      translation = Smartdict::Translator.translate(word)
+      translation = @translator.translate(word, :log => false)
       @text_view.show_translation(translation)
     end
 
     def toggle_main_window
-      if @main_window.visible? and @main_window.active?
-        @main_window.hide_all
-      else
-        @main_window.show_all
-        @main_window.present
-      end
+      @main_window.toggle_visibility
     end
 
     def open_about_window
@@ -70,7 +84,7 @@ module Smartdict::Gui
 
     def export_translations(format_name, file_path, options = {})
       format = Smartdict::Core::FormatManager.find(format_name)
-      translations = Smartdict::ListBuilder.build(options)
+      translations = Smartdict::Log.fetch(options)
       content = format.format_list(translations)
       File.open(file_path, 'w') { |file| file.write content }
     end
@@ -85,5 +99,21 @@ module Smartdict::Gui
     def config
       @config ||= Config.new
     end
+
+    def add_to_history?(word, from_lang, to_lang)
+      !@word_list.first_item_matches?(word, from_lang, to_lang)
+    end
+
+    def add_to_history(translation)
+      @word_list.prepend_word(translation)
+    end
+
+    def load_history
+      translations = Smartdict::Log.fetch(:order_desc => true, :limit => HISTORY_SIZE_ON_START)
+      translations.reverse.each do |tr|
+        @word_list.prepend_word(tr)
+      end
+    end
+
   end
 end

data/lib/smartdict/gui/main_window.rb

@@ -10,7 +10,7 @@ class Smartdict::Gui::MainWindow < ::Gtk::Window
 
     @controller = controller
 
-    signal_connect("delete_event") { hide_all  }
+    signal_connect("delete_event") { @controller.toggle_main_window }
     signal_connect("destroy") { @controller.quit }
 
     set_default_size(720, 450)
@@ -61,4 +61,18 @@ class Smartdict::Gui::MainWindow < ::Gtk::Window
     add(main_box)
   end
 
+
+  def toggle_visibility
+    if self.visible? and self.active?
+      @prev_position =  self.position
+      self.hide_all
+    elsif self.visible? and !self.active?
+      self.present
+    else
+      self.show_all
+      self.move(*@prev_position)
+      self.present
+    end
+  end
+
 end

data/lib/smartdict/gui/text_view.rb

@@ -11,4 +11,8 @@ class Smartdict::Gui::TextView < ::Gtk::TextView
   def show_translation(translation)
     buffer.set_translation(translation)
   end
+
+  def show_error(error)
+    buffer.set_error(error)
+  end
 end

data/lib/smartdict/gui/text_view/buffer.rb

@@ -7,6 +7,7 @@ class Smartdict::Gui::TextView::Buffer < ::Gtk::TextBuffer
     create_tag("transcription"  , {"style"  => Pango::STYLE_ITALIC, :scale => 1.3})
     create_tag("word_class"     , {"weight" => Pango::WEIGHT_BOLD , :scale => 1.0})
     create_tag("translated_word", {:scale => 1.0})
+    create_tag("text", {})
   end
 
   def set_translation(translation)
@@ -21,6 +22,16 @@ class Smartdict::Gui::TextView::Buffer < ::Gtk::TextBuffer
     end
   end
 
+  def set_error(error)
+    self.text = ''
+    insert_text "An error occured. Please report it: \n"
+    insert_url "https://github.com/smartdict/smartdict-gtk/issues/new"
+    insert_text "\n\nError information:\n" \
+                "    #{error.class}:  #{error.message}\n\n" \
+                "Backtrace:\n"
+    insert_text "    " + error.backtrace.join("\n    ")
+  end
+
 
   private
 
@@ -36,4 +47,21 @@ class Smartdict::Gui::TextView::Buffer < ::Gtk::TextBuffer
     word_text = (" " * INDENT * 2) + "#{word}\n"
     insert(end_iter, word_text, "translated_word")
   end
+
+  # TODO: implement
+  # There is no legal way to display link with Ruby.
+  # See Python solution for _insert_url(): http://download.gna.org/nfoview/doc/api/nfoview.view_source.html
+  def insert_url(url)
+    tag = create_tag(nil, {"underline" => Pango::UNDERLINE_SINGLE, "foreground" => "blue"})
+    #tag.signal_connect("event") do |tag, text_view, event, itr|
+    #  if event.event_type == Gdk::Event::BUTTON_RELEASE
+    #    puts url
+    #  end
+    #end
+    insert(end_iter, url, tag)
+  end
+
+  def insert_text(text)
+    insert(end_iter, text, "text")
+  end
 end

data/lib/smartdict/gui/version.rb

@@ -0,0 +1,3 @@
+module Smartdict::Gui
+  VERSION = File.read(File.join(Smartdict::Gui.root_dir, "VERSION")).strip
+end

data/lib/smartdict/gui/word_list.rb

@@ -15,8 +15,7 @@ class Smartdict::Gui::WordList < ::Gtk::TreeView
       # set options of column
       self.resizable      = true
       self.clickable      = true
-      self.sort_indicator = false
-      self.sort_column_id = column_id
+      self.reorderable    = false
     end
   end
 
@@ -42,6 +41,28 @@ class Smartdict::Gui::WordList < ::Gtk::TreeView
     item[0] = translation.word
     item[1] = translation.from_lang
     item[2] = translation.to_lang
+    selection.select_iter(item)
+  end
+
+  def first_item_matches?(word, from_lang, to_lang)
+    iter = @list_model.iter_first
+    return false unless iter
+    word      == @list_model.get_value(iter, 0) &&
+    from_lang == @list_model.get_value(iter, 1) &&
+    to_lang   == @list_model.get_value(iter, 2)
+  end
+
+  def scroll_up
+    # TODO: It's a dirty hack!
+    # We need just resize WordList and set vadjustment.value = 0.
+    # But WordList is resized after, so I do this hack to make sure
+    # that it's already resized.
+    Thread.new do
+      # Expected to parent be Gtk::ScrolledWindow
+      vad = self.parent.vadjustment
+      vad.value = vad.lower
+      vad.value_changed
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartdict-gtk
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000 Z
+date: 2012-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartdict-core
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: smartdict-icons
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +59,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: dm-enum
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +155,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.4
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.11
 description: GTK GUI for Smartdict dictionary
 email: blake131313@gmail.com
 executables:
@@ -149,9 +181,9 @@ extra_rdoc_files:
 files:
 - ./bin/smartdict-gtk
 - ./lib/smartdict-gtk.rb
-- ./lib/smartdict.rb
 - ./lib/smartdict/gui.rb
 - ./lib/smartdict/gui/about_window.rb
+- ./lib/smartdict/gui/cli.rb
 - ./lib/smartdict/gui/controller.rb
 - ./lib/smartdict/gui/controller/config.rb
 - ./lib/smartdict/gui/export_dialog.rb
@@ -164,6 +196,7 @@ files:
 - ./lib/smartdict/gui/text_view.rb
 - ./lib/smartdict/gui/text_view/buffer.rb
 - ./lib/smartdict/gui/translate_button.rb
+- ./lib/smartdict/gui/version.rb
 - ./lib/smartdict/gui/word_entry.rb
 - ./lib/smartdict/gui/word_list.rb
 - GPL-LICENSE.txt
@@ -191,7 +224,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

data/lib/smartdict.rb

@@ -1,5 +0,0 @@
-module Smartdict
-  extend ActiveSupport::Autoload
-
-  autoload :Gui
-end