shroom 0.0.4 → 0.0.5

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'shroom'
-  s.version = '0.0.4'
+  s.version = '0.0.5'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Shroom is a music player and organizer'
@@ -26,6 +26,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('rbrainz', '>= 0.5.0')
   s.add_dependency('scrobbler', '>= 0.2.3')
   s.add_dependency('shared-mime-info', '>= 0.1')
+  s.requirements << 'rake'
   s.requirements << 'libgnome2-ruby'
   s.requirements << 'libsqlite3-ruby'
   s.requirements << 'libglade2-ruby'

data/lib/sh_browse.rb

@@ -63,6 +63,76 @@ module Sh
               @model.clear
               fill_model
             end
+
+            pbtn_reread_tags = MenuItem.new 'Reread tags'
+            menu.append pbtn_reread_tags
+            pbtn_reread_tags.signal_connect('activate') do |widget|
+              song.read_tags!(true)
+              $db.save_song song
+              @model.clear
+              fill_model
+            end
+            
+            pbtn_properties = ImageMenuItem.new Stock::PROPERTIES
+            menu.append pbtn_properties
+            pbtn_properties.signal_connect('activate') do |widget|
+              glade = Global::GLADE['dlg_song']
+              dlg_song = glade['dlg_song']
+              txt_title = glade['txt_title']
+              txt_title.text = song.title
+
+              # Artists combo box
+              sto_artists = ListStore.new(String, Artist)
+              cmb_artist = glade['cmb_artist']
+              sel = 0
+              $db.artists.sort_by{|a| (a.name || '')}.each_with_index do |artist, i|
+                iter = sto_artists.append
+                iter[0] = artist.name
+                iter[1] = artist
+                sel = i if song.artist && artist.db_id == song.artist.db_id
+              end
+              cmb_artist.model = sto_artists
+              cmb_artist.active = sel
+
+              # Albums combo box
+              sto_albums = ListStore.new(String, Album)
+              cmb_album = glade['cmb_album']
+              sel = 0
+              $db.albums.sort_by{|a| (a.title || '')}.each_with_index do |album, i|
+                iter = sto_albums.append
+                iter[0] = album.title
+                iter[1] = album
+                sel = i if song.album && album.db_id == song.album.db_id
+              end
+              cmb_album.model = sto_albums
+              cmb_album.active = sel
+
+              glade['chk_image'].sensitive = false
+              glade['fbtn_image'].sensitive = false
+              glade['btn_add_artist'].sensitive = false
+              glade['btn_add_album'].sensitive = false
+
+              dlg_song.signal_connect('delete-event') do
+                dlg_song.hide
+              end
+              btn_ok = glade['btn_ok']
+              ok_handle = btn_ok.signal_connect('clicked') do
+                song.title = txt_title.text
+                song.artist = cmb_artist.active_iter[1]
+                song.album = cmb_album.active_iter[1]
+                $db.save_song song
+                @model.clear
+                fill_model
+                dlg_song.hide
+              end
+              btn_cancel = glade['btn_cancel']
+              close_handle = btn_cancel.signal_connect('clicked') do
+                dlg_song.hide
+              end
+              dlg_song.run
+              btn_ok.signal_handler_disconnect ok_handle
+              btn_cancel.signal_handler_disconnect close_handle
+            end
             
             menu.show_all
             menu.popup(nil, nil, event.button, event.time)
@@ -104,7 +174,7 @@ module Sh
 
     def fill_model
       artist_node = album_node = track_node = nil
-      $db.songs.sort_by {|a| a.to_s}.each do |song|
+      $db.songs.sort_by {|a| (a.to_s || '')}.each do |song|
         artist = song.artist
         if not artist_node or artist_node[0].db_id != artist.db_id
           artist_node = @model.append nil

data/lib/sh_cover_art.rb

@@ -7,7 +7,7 @@ module Sh
     def CoverArt.get_cover song
       if $prefs[:cover_art]
         artist, album = song.artist.name, song.album.title
-        path = "#{$cover_dir}/#{artist} - #{album}"
+        path = "#{$cover_dir}/#{artist.to_md5}_#{album.to_md5}"
         return path if File.exists? path
         doc = lastfm("album.getInfo", {:artist => artist, :album => album})
         img_url = REXML::XPath.first(doc, '//image[@size="extralarge"]').text

data/lib/sh_global.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'yaml'
+require 'libglade2'
 
 module Sh
   KEYS = {
@@ -8,8 +9,10 @@ module Sh
   }
 
   class Global
+    SUPPORTED_EXTENSIONS = ['.mp3', '.m4a', '.ogg', '.flac', '.wma', '.wav']
+    GLADE = {}
+
     def initialize
-      #$KCODE = 'u'
       # Won't work on Windows
       $home = ENV['HOME']
       $config_dir = "#{$home}/.shroom"
@@ -28,6 +31,10 @@ module Sh
       }
 
       Global.load_prefs
+
+      add_toplevel_glade('dlg_preferences')
+      add_toplevel_glade('dlg_song')
+      GLADE.freeze
     end
 
     def Global.load_prefs
@@ -48,6 +55,11 @@ module Sh
     def Global.locate(file)
       find_in_load_path("shroom-res/#{file}") || "shroom-res/#{file}"
     end
+
+    private
+    def add_toplevel_glade name
+      GLADE[name] = GladeXML.new(Global.locate('shroom.glade'), name)
+    end
   end
 end
 

data/lib/sh_mmkeys.rb

@@ -0,0 +1,44 @@
+module Sh
+  class MMKeys
+    def initialize &block
+      raise(ArgumentError, "No callback block provided") unless block
+      @supported = try_require('rubygems') and try_require('rbus')
+
+      if supported?
+        bus = RBus.session_bus
+
+        begin
+          @mmkeys = bus.get_object('org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/MediaKeys')
+          @mmkeys.interface!('org.gnome.SettingsDaemon.MediaKeys')
+          @mmkeys.GrabMediaPlayerKeys('Shroom', 0)
+        rescue
+          begin
+            @mmkeys = bus.get_object('org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/MediaKeys')
+            @mmkeys.interface!('org.gnome.SettingsDaemon.MediaKeys')
+            @mmkeys.GrabMediaPlayerKeys('Shroom', 0)
+          rescue
+            # MediaKeys are not supported after all
+            @supported = false
+          end
+        end
+      end
+      
+      # Do we still think that MediaKeys are supported?
+      if supported? and @mmkeys
+        @mmkeys.connect!(:MediaPlayerKeyPressed) do |app, key|
+          if app.downcase == 'shroom'
+            block.call key
+          end
+        end
+      end
+    end
+
+    def supported?
+      return @supported
+    end
+
+    def destroy
+      @mmkeys.ReleaseMediaPlayerKeys('Shroom')
+    end
+  end
+end

data/lib/sh_playlist.rb

@@ -0,0 +1,36 @@
+module Sh
+  class Playlist
+    def initialize dir
+      @dir = dir
+      @songs = []
+    end
+
+    def Playlist.parse(path)
+      list = Playlist.new(File.dirname(path))
+      open(path) do |f|
+        while line = f.gets
+          line.strip!
+          unless line[0] == ?# or line.empty?
+            ref = File.expand_path(line.gsub('\\', '/'), File.dirname(path))
+            if File.exists? ref
+              if Sh::Global::SUPPORTED_EXTENSIONS.include? File.extname(ref)
+                list << ($db.songs(:path => ref).first || Sh::Song.new(ref).read_tags!)
+              end
+            else
+              puts "Not found: " + ref
+            end
+          end
+        end
+      end
+      return list
+    end
+
+    def <<(song)
+      @songs << song
+    end
+
+    def songs
+      return @songs.dup
+    end
+  end
+end

data/lib/sh_song.rb

@@ -34,7 +34,12 @@ module Sh
     end
 
     def lookup!
-      track = lookup_multiple.first
+      begin
+        track = lookup_multiple.first
+      rescue Exception
+        return
+      end
+      
       if track
         # Don't distinguish between bands with the same name by adding to the name
         track.artist.disambiguation = false
@@ -74,7 +79,8 @@ module Sh
       query = Webservice::Query.new
       filter = Webservice::TrackFilter.new(:artist => artist.name, :title => title, :puid => puids.first)
       tracks = query.get_tracks(filter).entities
-      @matches = tracks || []
+      @matches = (tracks || [])
+      return @matches
     end
 
     public

data/lib/sh_tagreader.rb

@@ -17,20 +17,25 @@ module Sh
         '.wma' => 'audio/x-ms-wma'
       }[File.extname path]
 
-      case @mime
-      when 'audio/mpeg'
-        metadata = TagReader.read_mp3 path
-      when 'audio/mp4'
-        metadata = TagReader.read_m4a path
-      when 'audio/ogg'
-        metadata = TagReader.read_ogg path
-      when 'audio/x-flac'
-        metadata = TagReader.read_flac path
-      when 'audio/x-ms-wma'
-        metadata = TagReader.read_wma path
-      when 'audio/x-wav'
-        metadata = TagReader.read_wave path
+      begin
+        case @mime
+        when 'audio/mpeg'
+          metadata = TagReader.read_mp3 path
+        when 'audio/mp4'
+          metadata = TagReader.read_m4a path
+        when 'audio/ogg'
+          metadata = TagReader.read_ogg path
+        when 'audio/x-flac'
+          metadata = TagReader.read_flac path
+        when 'audio/x-ms-wma'
+          metadata = TagReader.read_wma path
+        when 'audio/x-wav'
+          metadata = TagReader.read_wave path
+        end
+      rescue Exception
+        puts "Error parsing tags for " + path
       end
+
       yield metadata if block
       return metadata
     end

data/lib/sh_util.rb

@@ -21,6 +21,54 @@ class Object
   end
 end
 
+require 'digest/md5'
+
+class String
+  def to_md5
+    return (Digest::MD5.new << self).to_s
+  end
+end
+
+class StringMatcher
+  def initialize str1, str2
+    @str1, @str2 = str1, str2
+  end
+
+  def compare
+    pairs1 = word_letter_pairs @str1
+    pairs2 = word_letter_pairs @str2
+    union = pairs1.size + pairs2.size
+    intersection = 0
+    pairs1.size.times do
+      intersection += 1 if pairs2.delete pairs1.pop
+    end
+    return (2 * intersection).to_f / union
+  end
+
+  def compare_ignore_case
+    compare @str1.upcase, @str2.upcase
+  end
+
+  private
+  def letter_pairs str
+    n_pairs = str.length - 1
+    pairs = []
+    n_pairs.times do |i|
+      pairs[i] = str.slice(i, 2)
+    end
+    return pairs
+  end
+
+  def word_letter_pairs str
+    pairs = []
+    words = str.split(/\s/)
+    words.each do |word|
+      pairs.concat letter_pairs(word)
+    end
+    return pairs
+  end
+end
+
 module Kelp
   class ProgressDialog < Gtk::Dialog
     def initialize(title)
@@ -66,8 +114,8 @@ module Kelp
       @image = Image.new(pixbuf)
       vbox.pack_start @image, true, true, 8
       if pixbuf
-      self.width_request = pixbuf.width + 16
-      self.height_request = size[1] + pixbuf.height + 16
+        self.width_request = pixbuf.width + 16
+        self.height_request = size[1] + pixbuf.height + 16
       end
       vbox.show_all
       signal_connect('response') { destroy }

data/lib/sh_view.rb

@@ -1,8 +1,9 @@
 require 'sh_browse'
 require 'sh_queue'
+require 'sh_playlist'
 require 'sh_lyrics'
 require 'sh_cover_art'
-require 'libglade2'
+require 'sh_mmkeys'
 require 'gtk2'
 include Gtk
 
@@ -22,8 +23,6 @@ module Sh
 
       Notify.init 'Shroom' if @rnotify
 
-      @glade= GladeXML.new(Global.locate('shroom.glade'))
-
       if File.exists? $prefs[:library_dir]
         cancelled = false
         dialog = Kelp::ProgressDialog.new("Updating database...")
@@ -31,7 +30,7 @@ module Sh
         new_songs = []
         Dir[$prefs[:library_dir]+'/**/*'].each do |path|
           ext = File.extname path
-          if ['.mp3', '.m4a', '.ogg', '.flac'].include? ext
+          if Sh::Global::SUPPORTED_EXTENSIONS.include? ext
             new_songs << Song.new(path) unless $db.contains? path
           end
         end
@@ -66,7 +65,7 @@ module Sh
       @window.signal_connect('destroy') do
         quit
       end
-
+      
       @status_icon = StatusIcon.new
       @status_icon.pixbuf = icon
       @status_icon.visible = true
@@ -136,34 +135,10 @@ module Sh
         end if @player
       end
       btn_next.signal_connect('clicked') do |btn|
-        if @queue
-          playing = @player.playing?
-          @player.stop
-          @queue_pos += 1
-          if @queue_pos < @queue.size
-            prepare_song
-            play if playing
-          else
-            @queue_pos = 0
-            prepare_song
-            @btn_play.active = false
-          end
-        end
+        next_song
       end
       btn_prev.signal_connect('clicked') do |btn|
-        if @queue
-          playing = @player.playing?
-          @player.stop
-          @queue_pos -= 1
-          if @queue_pos >= 0
-            prepare_song
-            play if playing
-          else
-            @queue_pos = 0
-            prepare_song
-            @btn_play.active = false
-          end
-        end
+        prev_song
       end
 
       # Horizontally split area
@@ -232,6 +207,32 @@ module Sh
         i += 1
       end
 
+      # Multimedia keys
+      MMKeys.new do |key|
+        case key
+        when 'Stop'
+          stop
+        when 'Next'
+          next_song
+        when 'Previous'
+          prev_song
+        when 'Play'
+          if playing?
+            pause
+          else
+            play
+          end
+        when 'PlayPause'
+          if playing?
+            pause
+          else
+            play
+          end
+        when 'Pause'
+          pause
+        end
+      end
+
       # Show everything
       @window.show_all
     end
@@ -240,6 +241,7 @@ module Sh
     def create_menu
       menu_items = [
         ['/_File'],
+        ['/File/Import playlist', '<StockItem>', '<control>I', Stock::OPEN, lambda {import_playlist}],
         ['/File/sep1', '<Separator>', nil, nil, lambda {}],
         ['/File/Quit', '<StockItem>', '<control>Q', Stock::QUIT, lambda {Gtk.main_quit}],
         ['/_Edit'],
@@ -254,20 +256,37 @@ module Sh
       item_factory.get_widget('<main>')
     end
 
+    def import_playlist
+      dialog = Gtk::FileChooserDialog.new("Open File",
+        @window,
+        Gtk::FileChooser::ACTION_OPEN,
+        nil,
+        [Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
+        [Gtk::Stock::OPEN, Gtk::Dialog::RESPONSE_ACCEPT])
+
+      if dialog.run == Gtk::Dialog::RESPONSE_ACCEPT
+        stop
+        self.queue = Sh::Playlist.parse(dialog.filename).songs
+        play
+      end
+      dialog.destroy
+    end
+
     def show_preferences
-      dlg_prefs = @glade.get_widget("dlg_preferences")
+      glade = Sh::Global::GLADE['dlg_preferences']
+      dlg_prefs = glade['dlg_preferences']
       dlg_prefs.signal_connect('delete-event') do
         dlg_prefs.hide
       end
-      fbtn_library = @glade.get_widget("fbtn_library")
+      fbtn_library = glade['fbtn_library']
       fbtn_library.current_folder = $prefs[:library_dir]
-      chk_lastfm = @glade.get_widget("chk_lastfm")
+      chk_lastfm = glade['chk_lastfm']
       chk_lastfm.active = $prefs[:lastfm]
-      txt_lastfm_user = @glade.get_widget("txt_lastfm_user")
+      txt_lastfm_user = glade['txt_lastfm_user']
       txt_lastfm_user.text = $prefs[:lastfm_user]
-      txt_lastfm_pass = @glade.get_widget("txt_lastfm_pass")
+      txt_lastfm_pass = glade['txt_lastfm_pass']
       txt_lastfm_pass.text = $prefs[:lastfm_password]
-      btn_ok = @glade.get_widget("btn_ok")
+      btn_ok = glade['btn_ok']
       ok_handle = btn_ok.signal_connect('clicked') do
         $prefs[:library_dir] = fbtn_library.filename
         $prefs[:lastfm] = chk_lastfm.active?
@@ -276,16 +295,13 @@ module Sh
         Sh::Global.save_prefs
         dlg_prefs.hide
       end
-      btn_close = @glade.get_widget("btn_close")
-      close_handle = btn_close.signal_connect('clicked') do
+      btn_cancel = glade['btn_cancel']
+      close_handle = btn_cancel.signal_connect('clicked') do
         dlg_prefs.hide
       end
-      dlg_prefs.show
-      while dlg_prefs.visible?
-        Gtk.main_iteration
-      end
+      dlg_prefs.run
       btn_ok.signal_handler_disconnect ok_handle
-      btn_close.signal_handler_disconnect close_handle
+      btn_cancel.signal_handler_disconnect close_handle
     end
 
     def show_about
@@ -305,18 +321,7 @@ module Sh
       @player.demolish if @player
       @player = Sh::Player.new @queue[@queue_pos]
       @player.on_finished do |player|
-        if player == @player
-          @player.stop
-          @queue_pos += 1
-          if @queue_pos < @queue.size
-            prepare_song
-            play
-          else
-            @queue_pos = 0
-            prepare_song
-            @btn_play.active = false
-          end
-        end
+        next_song
       end
       on_song_changed
     end
@@ -346,7 +351,13 @@ module Sh
         # Cover art
         if $prefs[:cover_art]
           @pixbuf = nil
-          (@pixbuf = Gdk::Pixbuf.new(song.album.image_path)) rescue Exception
+          begin
+            if File.exists? song.album.image_path
+              @pixbuf = Gdk::Pixbuf.new(song.album.image_path)
+            end
+          rescue
+            @pixbuf = nil
+          end
           if @pixbuf
             @note.pixbuf_icon = @pixbuf.scale(48, 48) if @rnotify
             @img_cover.pixbuf = @pixbuf.scale(132, 132)
@@ -411,18 +422,64 @@ module Sh
     end
 
     def play
-      stop
       if @player
         @btn_play.active = true
         @player.play
       end
     end
 
+    def pause
+      if @player
+        @btn_play.active = false
+        @player.pause
+      end
+    end
+
+    def playing?
+      return @player && @player.playing?
+    end
+
+    def paused?
+      return @player && @player.paused?
+    end
+
     def stop
       @btn_play.active = false
       @player.stop if @player
     end
 
+    def next_song
+      if @queue
+        playing = @player.playing?
+        @player.stop
+        @queue_pos += 1
+        if @queue_pos < @queue.size
+          prepare_song
+          play if playing
+        else
+          @queue_pos = 0
+          prepare_song
+          @btn_play.active = false
+        end
+      end
+    end
+
+    def prev_song
+      if @queue
+        playing = @player.playing?
+        @player.stop
+        @queue_pos -= 1
+        if @queue_pos >= 0
+          prepare_song
+          play if playing
+        else
+          @queue_pos = 0
+          prepare_song
+          @btn_play.active = false
+        end
+      end
+    end
+
     def show
       Gtk.main
     end

data/lib/shroom-res/shroom.glade

@@ -87,6 +87,7 @@
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
+                                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
@@ -101,6 +102,7 @@
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
@@ -152,6 +154,20 @@
           <widget class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
             <property name="layout_style">end</property>
+            <child>
+              <widget class="GtkButton" id="btn_cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
             <child>
               <widget class="GtkButton" id="btn_ok">
                 <property name="label">gtk-ok</property>
@@ -160,6 +176,235 @@
                 <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="dlg_song">
+    <property name="border_width">5</property>
+    <property name="type_hint">normal</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkTable" id="table1">
+            <property name="visible">True</property>
+            <property name="n_rows">5</property>
+            <property name="n_columns">3</property>
+            <property name="row_spacing">4</property>
+            <child>
+              <widget class="GtkLabel" id="lbl_title">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Title:</property>
+              </widget>
+              <packing>
+                <property name="x_options"></property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkEntry" id="txt_title">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">&#x25CF;</property>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">3</property>
+                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="btn_add_album">
+                <property name="label" translatable="yes">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>
+              </widget>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkComboBox" id="cmb_album">
+                <property name="visible">True</property>
+                <property name="active">0</property>
+                <property name="items" translatable="yes">Unknown</property>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="lbl_album">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Album:</property>
+              </widget>
+              <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options"></property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="lbl_artist">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Artist:</property>
+              </widget>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options"></property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkComboBox" id="cmb_artist">
+                <property name="visible">True</property>
+                <property name="active">0</property>
+                <property name="items" translatable="yes">Unknown</property>
+              </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>
+                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="btn_add_artist">
+                <property name="label" translatable="yes">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>
+              </widget>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="lbl_image">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Image:</property>
+              </widget>
+              <packing>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="x_options"></property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkImage" id="img_image">
+                <property name="visible">True</property>
+                <property name="stock">gtk-missing-image</property>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="vbox1">
+                <property name="visible">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <widget class="GtkCheckButton" id="chk_image">
+                    <property name="label" translatable="yes">Separate image</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkFileChooserButton" id="fbtn_image">
+                    <property name="visible">True</property>
+                    <property name="title" translatable="yes">Select A Image</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <widget class="GtkButton" id="btn_cancel">
+                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -167,8 +412,8 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="btn_close">
-                <property name="label">gtk-close</property>
+              <widget class="GtkButton" id="btn_ok">
+                <property name="label" translatable="yes">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -190,4 +435,96 @@
       </widget>
     </child>
   </widget>
+  <widget class="GtkDialog" id="dlg_artist">
+    <property name="border_width">5</property>
+    <property name="type_hint">normal</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox3">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkTable" id="table1">
+            <property name="visible">True</property>
+            <property name="n_rows">2</property>
+            <property name="n_columns">3</property>
+            <property name="row_spacing">4</property>
+            <child>
+              <widget class="GtkLabel" id="lbl_name">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Name:</property>
+              </widget>
+              <packing>
+                <property name="x_options"></property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkEntry" id="entry1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">&#x25CF;</property>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">3</property>
+                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area3">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <widget class="GtkButton" id="button2">
+                <property name="label" translatable="yes">button</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="button1">
+                <property name="label" translatable="yes">button</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
 </glade-interface>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shroom
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Aiden Nibali
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-26 00:00:00 +10:00
+date: 2009-07-31 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -131,6 +131,7 @@ files:
 - lib/sh_main.rb
 - lib/sh_queue.rb
 - lib/sh_album.rb
+- lib/sh_playlist.rb
 - lib/sh_song.rb
 - lib/sh_artist.rb
 - lib/sh_cover_art.rb
@@ -138,6 +139,7 @@ files:
 - lib/sh_lyrics.rb
 - lib/sh_database.rb
 - lib/sh_util.rb
+- lib/sh_mmkeys.rb
 - lib/shroom-res
 - lib/shroom-res/icon_16x16.png
 - lib/shroom-res/icon.svg
@@ -165,6 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
   version: 
 requirements: 
+- rake
 - libgnome2-ruby
 - libsqlite3-ruby
 - libglade2-ruby