gimdb 0.0.3 → 0.0.4

data/README.rdoc

@@ -55,7 +55,7 @@ Avaiable options are:
 * activerecord
 * sqlite3-ruby[http://github.com/jamis/sqlite3-ruby]
 * nokogiri[http://github.com/tenderlove/nokogiri]
-* libgnome2 <tt>(sudo apt-get install libgnome2-ruby)</tt>
+* libgtk2 <tt>(sudo apt-get install libgtk2-ruby)</tt>
 * libglade2 <tt>(sudo apt-get install libglade2-ruby)</tt>
 
 == Install
@@ -67,6 +67,11 @@ Avaiable options are:
 * sudo apt-get install rubygems
 * sudo gem install gimdb
 
+Remember also to add rubygems bin path to your PATH env variable.
+Edit <tt>~/.bashrc</tt> and add the follow line:
+
+    PATH=$PATH:/var/lib/gems/1.8/bin
+
 == Support
 
 You can use this email address for any questions or help: mailto:enrico@megiston.it.

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/data/gimdb.glade

@@ -193,6 +193,7 @@
                 <child>
                   <widget class="GtkMenu" id="menu3">
                     <property name="visible">True</property>
+                    <signal name="button_press_event" handler="on_about_clicked"/>
                     <child>
                       <widget class="GtkImageMenuItem" id="imagemenuitem10">
                         <property name="label">gtk-about</property>
@@ -1017,62 +1018,15 @@ Year</property>
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkVBox" id="vbox2">
+          <widget class="GtkVBox" id="dialog_users_box">
             <property name="visible">True</property>
             <child>
-              <widget class="GtkTable" id="table_combo">
-                <property name="visible">True</property>
-                <property name="n_rows">2</property>
-                <property name="n_columns">2</property>
-                <child>
-                  <widget class="GtkEntry" id="entry_user">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">&#x25CF;</property>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkButton" id="add_user">
-                    <property name="label">gtk-add</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_stock">True</property>
-                    <signal name="clicked" handler="on_add_users_clicked"/>
-                  </widget>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkButton" id="del_user">
-                    <property name="label">gtk-delete</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_stock">True</property>
-                    <signal name="clicked" handler="on_del_users_clicked"/>
-                  </widget>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
+              <placeholder/>
             </child>
           </widget>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -1111,7 +1065,6 @@ Year</property>
             </child>
           </widget>
           <packing>
-            <property name="expand">False</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>

data/gimdb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gimdb}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Enrico Pilotto"]
-  s.date = %q{2010-05-08}
+  s.date = %q{2010-05-13}
   s.default_executable = %q{gimdb}
   s.description = %q{GTK graphical interface for Internet Movie DataBase. You can create users and save for each of them the movies to see, movies seen and favourites movies in a sqlite3 database.}
   s.email = %q{enrico@megiston.it}
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
      "po/it/gimdb.po",
      "src/controller.rb",
      "src/gimdb.rb",
+     "src/manager_box.rb",
      "src/model.rb",
      "src/movie_box.rb"
   ]

data/po/gimdb.pot

@@ -16,31 +16,36 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: movie_box.rb:53
 msgid "Genres"
 msgstr ""
 
-#: movie_box.rb:75
 msgid "<b>To see</b>"
 msgstr ""
 
-#: movie_box.rb:76
 msgid "<b>Seen</b>"
 msgstr ""
 
-#: movie_box.rb:77
 msgid "<b>Favourites</b>"
 msgstr ""
 
-#: gimdb.rb:158
 msgid "Searching"
 msgstr ""
 
-#: gimdb.rb:345
+msgid "Add"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
 msgid "New user added"
 msgstr ""
 
-#: gimdb.rb:362
+msgid "User edited"
+msgstr ""
+
 msgid "User deleted"
 msgstr ""
 

data/po/it/gimdb.po

@@ -16,31 +16,36 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: movie_box.rb:53
 msgid "Genres"
 msgstr "Generi"
 
-#: movie_box.rb:75
 msgid "<b>To see</b>"
 msgstr "<b>Da vedere</b>"
 
-#: movie_box.rb:76
 msgid "<b>Seen</b>"
 msgstr "<b>Visto</b>"
 
-#: movie_box.rb:77
 msgid "<b>Favourites</b>"
 msgstr "<b>Preferito</b>"
 
-#: gimdb.rb:158
 msgid "Searching"
 msgstr "Ricerca in corso"
 
-#: gimdb.rb:345
+msgid "Add"
+msgstr "Aggiungi"
+
+msgid "Edit"
+msgstr "Modifica"
+
+msgid "Delete"
+msgstr "Cancella"
+
 msgid "New user added"
 msgstr "Nuovo utente aggiunto"
 
-#: gimdb.rb:362
+msgid "User edited"
+msgstr "Utente modificato"
+
 msgid "User deleted"
 msgstr "Utente cancellato"
 

data/src/gimdb.rb

@@ -25,6 +25,7 @@ end
 require "#{$GIMDB_PATH}/lib/imdb"
 require "#{$GIMDB_PATH}/src/controller"
 require "#{$GIMDB_PATH}/src/movie_box"
+require "#{$GIMDB_PATH}/src/manager_box"
 
 
 class GimdbGlade
@@ -66,10 +67,12 @@ class GimdbGlade
     @scrolled          = @glade.get_widget('scrolled')
     @vbox_movies       = Gtk::VBox.new
     @dialog_users      = @glade.get_widget('dialog_users')
-    @entry_user        = @glade.get_widget('entry_user')
-    @combo_del_users   = @glade.get_widget('combo_del_users')
-    @table_combo       = @glade.get_widget('table_combo')
-    @check_genres_all  =  @glade.get_widget('check_genres_all')
+    @dialog_users_box  = @glade.get_widget('dialog_users_box').pack_start(GtkGimdb::ManagerBox.new(:users, :name) do |t|
+                                                                            @label_status.text = _(t)
+                                                                            @label_status.show
+                                                                            build_users_menu
+                                                                          end)
+    @check_genres_all  = @glade.get_widget('check_genres_all')
 
     @genres = [
      :action,:adventure,:animation,:biography,:comedy,
@@ -85,7 +88,6 @@ class GimdbGlade
 
     # Some stuffs
     @users = User.find(:all, :conditions => 'selected = 1')
-    @all_users = User.all
     build_users_menu
     @spin_year_to.value = Time.now.year.to_i
     @combo_rating_from.active = 0
@@ -236,7 +238,7 @@ class GimdbGlade
 
   def build_users_menu
     submenu = Gtk::Menu.new
-    @all_users.sort{|x,y| x.name <=> y.name}.each do |u|
+    User.all.sort{|x,y| x.name <=> y.name}.each do |u|
       m = Gtk::CheckMenuItem.new(u.name)
       m.active = true if @users.include?(u)
       submenu.append(m)
@@ -322,53 +324,15 @@ class GimdbGlade
   end
 
   def on_manage_users_clicked(widget, arg = nil)
-    @combo_del_users = Gtk::ComboBox.new
-    @table_combo.attach(@combo_del_users, 0,1, 1,2)
-    @all_users.sort{|x,y| x.name <=> y.name}.each do |u|
-      @combo_del_users.append_text(u.name)
-    end
-    @combo_del_users.active = 0
     @dialog_users.show_all
   end
 
-  def on_add_users_clicked(widget, arg = nil)
-    unless @entry_user.text.empty?
-      u = User.new(:name => @entry_user.text)
-      begin
-        u.save
-        @all_users << u
-        build_users_menu
-        @combo_del_users.append_text(u.name)
-        @combo_del_users.active = 0
-        @entry_user.text = ''
-        @label_status.text = _('New user added')
-        @label_status.show
-        # @dialog_users.hide
-      rescue
-        nil
-      end
-    end
-  end
-
-  def on_del_users_clicked(widget, arg = nil)
-    name = @combo_del_users.active_text
-    u = User.find_by_name(name)
-    unless u.nil? 
-      u.destroy
-      @all_users.delete(u)
-      build_users_menu
-      @combo_del_users.remove_text(@combo_del_users.active)
-      @label_status.text = _('User deleted')
-      @label_status.show
-      # @combo_del_users.active = 0
-    end
-  end
-
   def on_select_all_users_clicked(widget, arg = nil)
     @users_menu_item.submenu.children.each do |c|
       c.active = !c.active?
     end
     @dialog_users.hide
+    @label_status.hide
   end
 
   def on_close_manage_users_clicked(widget, arg = nil)
@@ -376,4 +340,36 @@ class GimdbGlade
     @label_status.hide
   end
 
+  def on_about_clicked(widget, arg = nil)
+    @dialog_about = Gtk::AboutDialog.new
+    begin
+      f = File.open("#{$GIMDB_PATH}/VERSION", 'r')
+      version = ''
+      f.each_line { |line| version += line }
+      @dialog_about.version = version
+    rescue
+      nil
+    end
+    begin
+      f = File.open("#{$GIMDB_PATH}/LICENSE", 'r')
+      license = ''
+      f.each_line { |line| license += line }
+      @dialog_about.license = license
+    rescue
+      nil
+    end
+    @dialog_about.program_name = 'GIMDB'
+    @dialog_about.logo = Gdk::Pixbuf.new("#{$GIMDB_PATH}/data/icons/imdb.png")
+    @dialog_about.comments = 'GTK graphical interface for the Internet Movie DataBase.'
+    @dialog_about.copyright = "Copyright © #{Time.now.year} Enrico Pilotto"
+    @dialog_about.website = 'http://github.com/pioz/gimdb'
+    @dialog_about.website_label = 'Website'
+    @dialog_about.authors = ['Enrico Pilotto <enrico@megiston.it>']
+    @dialog_about.translator_credits = 'Italian: Enrico Pilotto <enrico@megiston.it>'
+    @dialog_about.modal = true
+    @dialog_about.skip_taskbar_hint = true
+    @dialog_about.signal_connect('response') { @dialog_about.hide }
+    @dialog_about.run
+  end
+
 end

data/src/manager_box.rb

@@ -0,0 +1,106 @@
+#require "#{$GIMDB_PATH}/src/model"
+
+
+module GtkGimdb
+
+  class ManagerBox < Gtk::HBox
+    include GetText
+
+
+    def initialize(klass, field)
+      bindtextdomain($DOMAIN, $LOCALEDIR, nil, 'UTF-8')
+      super()
+      @comboboxentry = Gtk::ComboBoxEntry.new
+      @image_add  = Gtk::Image.new(Gtk::Stock::ADD, Gtk::IconSize::BUTTON)
+      @image_edit = Gtk::Image.new(Gtk::Stock::EDIT, Gtk::IconSize::BUTTON)
+      @image_del  = Gtk::Image.new(Gtk::Stock::DELETE, Gtk::IconSize::BUTTON)
+      @button = Gtk::Button.new(_('Add'))
+      @button.image = @image_add
+      @button.image.show
+      @klass = klass.to_s.classify.constantize
+      @field = field
+      @objs = @klass.all.collect{|o| o.send(@field)}
+      @status = :add
+      @pos = 0
+      setting_up { |t| yield(t) }
+    end
+
+
+    private
+
+    
+    def setting_up
+      reorder
+
+      @button.signal_connect('clicked') do
+        if @status == :add
+          o = @klass.new(@field.to_sym => @comboboxentry.active_text)
+          if o.save
+            @objs << @comboboxentry.active_text
+            yield("New #{@klass.to_s.downcase} added") if block_given?
+          end
+          reorder
+        elsif @status == :edit
+          o = @klass.send("find_by_#{@field}", @obj_to_edit)
+          unless o.nil?
+            o.send("#{@field}=", @comboboxentry.active_text)
+            if o.save
+              @objs.delete(@obj_to_edit)
+              @objs << @comboboxentry.active_text
+              yield("#{@klass} edited") if block_given?
+            end
+          end
+          reorder
+        elsif @status == :del
+          o = @klass.send("find_by_#{@field}", @comboboxentry.active_text)
+          unless o.nil?
+            o.destroy
+            @objs.delete(@comboboxentry.active_text)
+            yield("#{@klass} deleted") if block_given?
+          end
+          reorder
+        else
+          nil
+        end
+      end
+
+      @comboboxentry.signal_connect('changed') do
+        @pos = @comboboxentry.active if @comboboxentry.active > -1
+        if @pos == 0
+          @status = :add
+          @button.label = _('Add')
+          @button.image = @image_add          
+        elsif @objs.include?(@comboboxentry.active_text)
+          @status = :del
+          @obj_to_edit = @comboboxentry.active_text
+          @button.label = _('Delete')
+          @button.image = @image_del
+        else
+          @status = :edit
+          @button.label = _('Edit')
+          @button.image = @image_edit
+        end
+        @button.image.show
+      end
+
+      table = Gtk::Table.new(1, 2)
+      table.attach(@comboboxentry, 0,1, 0,1)
+      table.attach(@button, 1,2, 0,1, Gtk::SHRINK, Gtk::EXPAND|Gtk::FILL)
+      self.pack_start(table)
+      self.show_all
+    end
+
+
+    def reorder
+      @objs.sort!
+      (@objs.size + 2).times { @comboboxentry.remove_text(0) }
+      @comboboxentry.append_text('')
+      @objs.each do |o|
+        @comboboxentry.append_text(o)
+      end
+      @comboboxentry.active = 0
+    end
+
+  end
+
+end

data/src/model.rb

@@ -132,4 +132,6 @@ end
 class User < ActiveRecord::Base
   has_many :populars, :dependent => :delete_all
   has_many :movies, :through => :populars
+  validates_presence_of :name
+  validates_uniqueness_of :name
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gimdb
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Enrico Pilotto
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-08 00:00:00 +02:00
+date: 2010-05-13 00:00:00 +02:00
 default_executable: gimdb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,6 +75,7 @@ files:
 - po/it/gimdb.po
 - src/controller.rb
 - src/gimdb.rb
+- src/manager_box.rb
 - src/model.rb
 - src/movie_box.rb
 has_rdoc: true