gtk2passwordapp 1.5.0 → 1.6.0

data/bin/gtk2passwordapp

@@ -1,67 +1,14 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-gem 'gtk2applib', '~> 13.0'
+gem 'gtk2applib', '~> 15.3'
 require 'gtk2applib'
+require 'gtk2passwordapp'
 
-include Gtk2AppLib
-program = Program.new( {
-	'name'		=> 'Ruby-Gnome Password Manager',
-	'authors'	=> ['carlosjhr64@gmail.com'],
-	'website'	=> 'https://sites.google.com/site/gtk2applib/home/gtk2applib-applications/gtk2passwordapp',
-	'website-label'	=> 'Ruby-Gnome Password Manager',
-        'license'        => 'GPL',
-        'copyright'      => '2011-03-07 17:05:39',
-        } )
+program = Gtk2AppLib::Program.new( Gtk2Password::ABOUT )
 
 begin
-  require 'gtk2passwordapp'
-
-  passwords = Gtk2PasswordApp::Passwords.new
-  Gtk2PasswordApp.build_menu(program,passwords)
-
-  modified = false
-  program.window do |window|
-    Gtk2AppLib::Configuration::PARAMETERS[:Account_ComboBoxEntry][0] = passwords.accounts
-    Gtk2AppLib::Dialogs::DIALOG[:Window] = window
-    gui = Gtk2PasswordApp::Component::Gui.new(window) do |is,signal,*emits|
-      $stderr.puts "#{is},#{signal}:\t#{emits}" if $trace
-      Gtk2PasswordApp.method(signal).call(is,passwords) do |action|
-        case action
-        when :modified then modified ||= true
-        when :save
-          if modified then
-            Gtk2PasswordApp.save(program,passwords)
-            modified = false
-          else
-            Gtk2AppLib::DIALOGS.quick_message(*Gtk2PasswordApp::Configuration::NO_UPDATES)
-          end
-        when :close
-          if !modified || Gtk2AppLib::DIALOGS.question?(*Gtk2PasswordApp::Configuration::ARE_YOU_SURE) then
-            passwords.load # revert
-            modified = false
-            program.close
-          end
-        end
-      end
-    end
-    Gtk2PasswordApp::Component::SHARED[:Password_SpinButton].value = Gtk2PasswordApp::Configuration::DEFAULT_PASSWORD_LENGTH
-    Gtk2PasswordApp::Component::SHARED[:Account_ComboBoxEntry].active = Gtk2PasswordApp.index
-    window.signal_connect('destroy') do
-      if modified then
-        if Gtk2AppLib::DIALOGS.question?(*Gtk2PasswordApp::Configuration::WANT_TO_SAVE) then
-          Gtk2PasswordApp.save(program,passwords)
-          modified = false
-        end
-      end
-      if modified then
-        passwords.load # revert
-        modified = false
-      end
-    end
-    window.show_all
-  end
+  Gtk2Password::App.new(program)
 rescue Exception
-  $verbose = true
   $!.puts_bang!
 ensure
   program.finalize

data/lib/gtk2passwordapp/appconfig.rb

@@ -15,8 +15,7 @@ module Configuration
   check = 20
 
   if HILDON then
-    # WIDGET_OPTIONS[:font] = 
-    FONT[:Normal] = FONT[:Large] = Pango::FontDescription.new( 'Arial 18' )
+    FONT[:NORMAL] = FONT[:LARGE] = Pango::FontDescription.new( 'Arial 18' )
     go = 75
     label = 150
     entry = 500
@@ -30,12 +29,13 @@ module Configuration
     WINDOW_DEFAULT_SIZE[0],WINDOW_DEFAULT_SIZE[1] = 100,100
     MENU[:close]		= '_Close'
   end
+  MENU[:help] = '_Help'
 
   wrap		= {:wrap= => true}
   label_width	= {:width_request= => label, :wrap= => true}
   entry_width	= {:width_request= => entry}
-  entry_shorten	= {:width_request= => entry - go - 2*padding}
-  entry_shorten2 = {:width_request= => entry - spin - check - 4*padding, :visibility= => false}
+  shorten_a	= {:width_request= => entry - go - 2*padding}
+  shorten_b = {:width_request= => entry - spin - check - 4*padding, :visibility= => false}
   go_width	= {:width_request= => go}
   check_width	= {:width_request= => check, :active= => true}
   spin_width	= {:width_request= => spin, :set_range  => [3,30]}
@@ -46,7 +46,7 @@ module Configuration
   PARAMETERS[:Account_ComboBoxEntry]	= [nil,entry_width,'changed'] # catching changed signal
 
   PARAMETERS[:Url_Label]	= ['Url:',label_width]
-  PARAMETERS[:Url_Entry]	= [entry_shorten]
+  PARAMETERS[:Url_Entry]	= [shorten_a]
   PARAMETERS[:Url_Button]	= ['Go!',go_width,clicked]
 
   PARAMETERS[:Note_Label]	= ['Note:',label_width]
@@ -56,7 +56,7 @@ module Configuration
   PARAMETERS[:Username_Entry]	= [entry_width]
 
   PARAMETERS[:Password_Label]	= ['Password:',label_width]
-  PARAMETERS[:Password_Entry]	= [entry_shorten2]
+  PARAMETERS[:Password_Entry]	= [shorten_b]
   PARAMETERS[:Password_CheckButton]	= [check_width,'toggled']
   PARAMETERS[:Password_SpinButton]	= [spin_width]
 
@@ -78,7 +78,7 @@ module Configuration
 end
 end
 
-module Gtk2PasswordApp
+module Gtk2Password
 module Configuration
   # Note that the passwords data file name is auto generated, but...
   # You can place your passwords data file in a directory other than ~/gtk2passwordapp-*
@@ -90,11 +90,29 @@ module Configuration
   DEFAULT_PASSWORD_LENGTH = 7
   EXPIRED_COLOR = Gtk2AppLib::Color[:Red]
 
-  BAD_URL = ['Need url like http://www.site.com/page.html',{:Title => 'Error: Bad Url',:Scrolled_Window => false}]
-  ARE_YOU_SURE = ['Changes will lost, are you sure you want to close?',{:Title => 'Are you sure?'}]
-  WANT_TO_SAVE = ['Would you like to save your changes?',{:Title => 'Save?'}]
-  NO_UPDATES = ["You've not updated any accounts yet.",{:Title => 'Not Modified',:Scrolled_Window => false}]
-  UPDATED = ["Updated!",{:Title => 'Updated!',:Scrolled_Window => false}]
+  BAD_URL = ['Need url like http://www.site.com/page.html',{:TITLE => 'Error: Bad Url',:SCROLLED_WINDOW => false}]
+  ARE_YOU_SURE = ['Changes will lost, are you sure you want to close?',{:TITLE => 'Are you sure?'}]
+  WANT_TO_SAVE = ['Would you like to save your changes?',{:TITLE => 'Save?'}]
+  NO_UPDATES = ["You've not updated any accounts yet.",{:TITLE => 'Not Modified',:SCROLLED_WINDOW => false}]
+  UPDATED = ["Updated!",{:TITLE => 'Updated!',:SCROLLED_WINDOW => false}]
+
+  updates = [:Delete_Button,:Update_Button,:Save_Button]
+  updates.unshift(:Cancel_Button) if Gtk2AppLib::Configuration::MENU[:close]
+  vbox = 'Gtk2AppLib::Widgets::VBox'
+  hbox = 'Gtk2AppLib::Widgets::HBox'
+  GUI = [
+	['Gui',		vbox,	[:Account_Component,:Url_Component,:Note_Component,:Username_Component,:Password_Component,:Buttons_Component]],
+	['Account',	hbox,	[:Account_Label,:Account_ComboBoxEntry]],
+	['Url',		hbox,	[:Url_Label,:Url_Entry,:Url_Button]],
+	['Note',	hbox,	[:Note_Label,:Note_Entry]],
+	['Username',	hbox,	[:Username_Label,:Username_Entry]],
+	['Password',	hbox,	[:Password_Label,:Password_Entry,:Password_CheckButton,:Password_SpinButton]],
+	['Buttons',	vbox,	[:Generators_Component,:Updates_Component,:Datafile_Component,:Clip_Component]],
+	['Generators',	hbox,	[:Random_Button,:Alpha_Button,:Numeric_Button,:Letters_Button,:Caps_Button]],
+	['Updates',	hbox,	updates],
+	['Datafile',	hbox,	[:Datafile_Button]],
+	['Clip',	hbox,	[:Current_Button,:Previous_Button]],
+    ]
 end
 
   def self.passwords_updated(dumpfile)
@@ -111,6 +129,6 @@ end
     # end
     # end
     # Gtk2AppLib::DIALOGS.quick_message("Warning: Could not create backup on 192.168.1.123")
-    Gtk2AppLib::DIALOGS.quick_message("Passwords Data Saved.",{:Title => 'Saved',:Scrolled_Window => false})
+    Gtk2AppLib::DIALOGS.quick_message("Passwords Data Saved.",{:TITLE => 'Saved',:SCROLLED_WINDOW => false})
   end
 end

data/lib/gtk2passwordapp/iocrypt.rb

@@ -7,7 +7,8 @@ rescue Exception
   require 'crypt-tea'
 end
 
-module Gtk2PasswordApp
+module Gtk2Password
+# Wrapper around Crypt::XXTEA
 class IOCrypt
   LENGTH = 15
 

data/lib/gtk2passwordapp/passwords.rb

@@ -1,5 +1,6 @@
 require 'gtk2passwordapp/passwords_data.rb'
-module Gtk2PasswordApp
+module Gtk2Password
+# Passwords subclasses PasswordsData :P
 class Passwords < PasswordsData
 
   def _create_passphrase
@@ -18,11 +19,12 @@ class Passwords < PasswordsData
     passphrase = ''
 
     @pfile = Gtk2AppLib::USERDIR+'/passphrase.txt'
+    exists = File.exist?(@pfile)
     if mv then
-      File.rename(@pfile, @pfile+'.bak') if File.exist?(@pfile)
+      File.rename(@pfile, @pfile+'.bak') if exists
       passphrase = _create_passphrase
     else
-      if File.exist?(@pfile) then
+      if exists then
         File.open(@pfile,'r'){|fh| passphrase = fh.read }
       else
         passphrase = _create_passphrase
@@ -43,7 +45,7 @@ class Passwords < PasswordsData
   end
 
   def self._get_salt(prompt)
-    (ret = Gtk2PasswordApp.get_salt(prompt,'Salt')) || exit
+    (ret = Gtk2Password.get_salt(prompt,'Salt')) || exit
     ret.strip
   end
 
@@ -82,7 +84,9 @@ class Passwords < PasswordsData
   end
 
   def save(pwd=nil)
-    if pwd then
+    if pwd.nil? then
+      super()
+    else
       pfbak = self.pfile + '.bak'
       pph = get_passphrase(true) # new passphrase
       dfbak = self.dumpfile + '.bak'
@@ -91,8 +95,6 @@ class Passwords < PasswordsData
       @pph = pph
       File.unlink(pfbak) if File.exist?(pfbak)
       File.unlink(dfbak) if File.exist?(dfbak)
-    else
-      super()
     end
     return self.dumpfile
   end

data/lib/gtk2passwordapp/passwords_data.rb

@@ -1,7 +1,8 @@
 require 'gtk2passwordapp/iocrypt'
 require 'digest/md5'
 
-module Gtk2PasswordApp
+module Gtk2Password
+# PasswordsData maitains passwords
 class PasswordsData
   include Configuration
   attr_accessor :account
@@ -30,7 +31,7 @@ class PasswordsData
   end
 
   def load(passphrase = nil)
-    _reset(passphrase) if passphrase 
+    _reset(passphrase) if !passphrase.nil?
     iocrypt = IOCrypt.new(@passphrase)
     @data = iocrypt.load(@dumpfile)
   end
@@ -38,7 +39,7 @@ class PasswordsData
   def save(passphrase = nil)
     # just in case, keep a backup
     File.rename(@dumpfile, @dumpfile+'.bak') if File.exist?(@dumpfile)
-    _reset(passphrase) if passphrase 
+    _reset(passphrase) if !passphrase.nil?
     iocrypt = IOCrypt.new(@passphrase)
     iocrypt.dump(@dumpfile, @data)
     File.chmod(0600, @dumpfile)
@@ -46,7 +47,7 @@ class PasswordsData
 
   def add(account)
     raise "Pre-existing" if @data[account]
-    raise "Can't have nil account" if !account
+    raise "Can't have nil account" if account.nil?
     @data[account] = ['','','','','']
   end
 
@@ -68,43 +69,50 @@ class PasswordsData
   end
 
   def url_of(account, url=nil)
-    raise "#{account} not found" if !@data[account]
-    @data[account][URL] = url if url
-    return @data[account][URL]	|| ''
+    data_account = @data[account]
+    raise "#{account} not found" if data_account.nil?
+    data_account[URL] = url if !url.nil?
+    return data_account[URL]	|| ''
   end
 
   def expired?(account)
-    raise "#{account} not found" if !@data[account]
-    return true if !@data[account][LAST_UPDATE] || ((Time.now.to_i - @data[account][LAST_UPDATE]) > PASSWORD_EXPIRED)
+    data_account = @data[account]
+    raise "#{account} not found" if data_account.nil?
+    last_update = data_account[LAST_UPDATE]
+    return true if last_update.nil? || ((Time.now.to_i - last_update) > PASSWORD_EXPIRED)
     return false
   end
 
-  def password_of(account, p=nil)
-    raise "#{account} not found" if !@data[account]
-    if p then
-      @data[account][PREVIOUS] = @data[account][PASSWORD]
-      @data[account][PASSWORD] = p
-      @data[account][LAST_UPDATE] = Time.now.to_i
+  def password_of(account, password=nil)
+    data_account = @data[account]
+    raise "#{account} not found" if data_account.nil?
+    if !password.nil? then
+      data_account[PREVIOUS] = data_account[PASSWORD]
+      data_account[PASSWORD] = password
+      data_account[LAST_UPDATE] = Time.now.to_i
     end
-    return @data[account][PASSWORD]	|| ''
+    return data_account[PASSWORD]	|| ''
   end
 
   # previous password
   def previous_password_of(account)
-    raise "#{account} not found" if !@data[account]
-    return @data[account][PREVIOUS]	|| ''
+    data_account = @data[account]
+    raise "#{account} not found" if data_account.nil?
+    return data_account[PREVIOUS]	|| ''
   end
 
-  def note_of(account, n=nil)
-    raise "#{account} not found" if !@data[account]
-    @data[account][NOTE] = n if n
-    return @data[account][NOTE]	|| ''
+  def note_of(account, note=nil)
+    data_account = @data[account]
+    raise "#{account} not found" if data_account.nil?
+    data_account[NOTE] = note if !note.nil?
+    return data_account[NOTE]	|| ''
   end
 
   def username_of(account, usr=nil)
-    raise "#{account} not found" if !@data[account]
-    @data[account][USERNAME] = usr if usr 
-    return @data[account][USERNAME]	|| ''
+    data_account = @data[account]
+    raise "#{account} not found" if data_account.nil?
+    data_account[USERNAME] = usr if !usr.nil?
+    return data_account[USERNAME]	|| ''
   end
 end
 end

data/lib/gtk2passwordapp.rb

@@ -1,249 +1,286 @@
 require 'gtk2passwordapp/passwords'
-module Gtk2PasswordApp
+module Gtk2Password
+
+  ABOUT		= {
+	'name'		=> 'Ruby-Gnome Password Manager',
+	'authors'	=> ['carlosjhr64@gmail.com'],
+	'website'	=> 'https://sites.google.com/site/gtk2applib/home/gtk2applib-applications/gtk2passwordapp',
+	'website-label'	=> 'Ruby-Gnome Password Manager',
+        'license'        => 'GPL',
+        'copyright'      => '2011-04-26 13:57:20',
+  }
 
   PRIMARY	= Gtk::Clipboard.get((Configuration::SWITCH_CLIPBOARDS)? Gdk::Selection::CLIPBOARD: Gdk::Selection::PRIMARY)
   CLIPBOARD	= Gtk::Clipboard.get((Configuration::SWITCH_CLIPBOARDS)? Gdk::Selection::PRIMARY: Gdk::Selection::CLIPBOARD)
 
-  @@index = 0
-  def self.index
-    @@index
-  end
-  def self.build_menu(program,passwords)
-    if program.icon? then
-      program.clear_dock_menu
-      program.append_dock_menu(Gtk::SeparatorMenuItem.new)
-      passwords.accounts.each do |account|
-        item = program.append_dock_menu(account) do
-          @@index = passwords.accounts.index(account)
-          PRIMARY.text   = passwords.password_of(account)
-          CLIPBOARD.text = passwords.username_of(account)
-        end
-        item.child.modify_fg(Gtk::STATE_NORMAL, Configuration::EXPIRED_COLOR) if passwords.expired?(account)
-      end
-    end
+  def self.get_salt(prompt,title=prompt)
+    Gtk2AppLib::DIALOGS.entry( prompt, {:TITLE=>title, :Entry => [{:visibility= => false},'activate']} )
   end
 
-  def self.save(program,passwords)
-    dumpfile = passwords.save
-    Gtk2PasswordApp.passwords_updated(dumpfile)
-    Gtk2PasswordApp.build_menu(program,passwords)
+  Configuration::GUI.each do |clss,spr,keys|
+    code = Gtk2AppLib::Component.define(clss,spr,keys)
+    $stderr.puts "<<<START CODE EVAL>>>\n#{code}\n<<<END CODE EVAL>>>" if $trace && $verbose
+    eval( code )
   end
 
-  def self.get_salt(prompt,title=prompt)
-    Gtk2AppLib::DIALOGS.entry( prompt, {:Title=>title, :Entry => [{:visibility= => false},'activate']} )
-  end
+  # App is an App is an App...
+  class App
+    @@index = 0
 
-  def self.account( shared = Component::SHARED )
-    account = (shared[:Account_ComboBoxEntry].active_text)? shared[:Account_ComboBoxEntry].active_text.strip: ''
-    (account.length>0)? account: nil
-  end
+    def initialize(program)
+      @program		= program
+      @passwords	= Gtk2Password::Passwords.new
+      @modified		= false
+      self.build_menu
+      program.window do |window|
+        @window	= window
+        self.pre_gui
+        @gui	= self.build_gui
+        self.post_gui
+      end
+    end
 
-  def self.clicked(is,passwords)
+    def menu_item(account)
+      item = @program.append_dock_menu(account) do
+        @@index	= @passwords.accounts.index(account)
+        PRIMARY.text	= @passwords.password_of(account)
+        CLIPBOARD.text	= @passwords.username_of(account)
+      end
+      item.child.modify_fg(Gtk::STATE_NORMAL, Configuration::EXPIRED_COLOR)	if @passwords.expired?(account)
+    end
 
-    shared = Component::SHARED
-    pwdlength = shared[:Password_SpinButton]
-    account = Gtk2PasswordApp.account
+    def build_menu
+      if @program.icon? then
+        @program.clear_dock_menu
+        @program.append_dock_menu(Gtk::SeparatorMenuItem.new)
+        @passwords.accounts.each{|account| menu_item(account)}
+      end
+    end
 
-    case is
+    def _save
+      dumpfile = @passwords.save
+      Gtk2Password.passwords_updated(dumpfile)
+      build_menu
+    end
 
-    when shared[:Url_Button]
-      url = shared[:Url_Entry].text.strip
-      Gtk2AppLib.run(url) if url =~ Configuration::URL_PATTERN
+    def save
+      if @modified then
+        _save
+        @modified = false
+      else
+        Gtk2AppLib::DIALOGS.quick_message(*Gtk2Password::Configuration::NO_UPDATES)
+      end
+    end
 
-    when shared[:Random_Button]
-      suggestion = ''
-      pwdlength.value.to_i.times do
-        suggestion += (rand(94)+33).chr
+    def finalyze
+      if @modified then
+        if Gtk2AppLib::DIALOGS.question?(*Gtk2Password::Configuration::WANT_TO_SAVE) then
+          save
+          @modified = false
+        end
       end
-      shared[:Password_Entry].text = suggestion
+      if @modified then
+        @passwords.load # revert
+        @modified = false
+      end
+    end
+
+    def post_gui
+      @gui[:password_spinbutton].value = Gtk2Password::Configuration::DEFAULT_PASSWORD_LENGTH
+      @gui[:account_comboboxentry].active = @@index
+      @window.signal_connect('destroy'){ finalyze }
+      @window.show_all
+    end
+
+    def pre_gui
+      Gtk2AppLib::Configuration::PARAMETERS[:Account_ComboBoxEntry][0] = @passwords.accounts
+      Gtk2AppLib::Dialogs::DIALOG[:Window] = @window
+    end
 
-    when shared[:Alpha_Button]
-      suggestion = ''
-      while suggestion.length <  pwdlength.value.to_i do
-        chr = (rand(75)+48).chr
-        suggestion += chr if chr =~/\w/
+    def close
+      if !@modified || Gtk2AppLib::DIALOGS.question?(*Gtk2Password::Configuration::ARE_YOU_SURE) then
+        @passwords.load # revert
+        @modified = false
+        @program.close
       end
-      shared[:Password_Entry].text = suggestion
+    end
 
-    when shared[:Numeric_Button]
-      suggestion = ''
-      pwdlength.value.to_i.times do
-        chr = (rand(10)+48).chr
-        suggestion += chr
+    def method_call(is,signal)
+      self.method(signal).call(is) do |action|
+        case action
+        when :modified	then @modified ||= true
+        when :save	then save
+        when :close	then close
+        end
       end
-      shared[:Password_Entry].text = suggestion
+    end
 
-    when shared[:Letters_Button]
-      suggestion = ''
-      while suggestion.length < pwdlength.value.to_i do
-        chr = (rand(58)+65).chr
-        suggestion += chr if chr =~/[A-Z]/i
+    def build_gui
+      Gtk2Password::Gui.new(@window) do |is,signal,*emits|
+        $stderr.puts "#{is},#{signal}:\t#{emits}" if $trace
+        method_call(is,signal)
       end
-      shared[:Password_Entry].text = suggestion
+    end
 
-    when shared[:Caps_Button]
-      suggestion = ''
-      pwdlength.value.to_i.times do
-        chr = (rand(26)+65).chr
-        suggestion += chr
+    def self.get_account(account)
+      if !account.nil? then
+        account.strip!
+        account = nil if account.length<1
       end
-      shared[:Password_Entry].text = suggestion
-
-    when shared[:Delete_Button]
-      # MODIFIES!!!
-      if account then
-        i = passwords.accounts.index(account)
-        if i then
-          passwords.delete(account)
-          shared[:Account_ComboBoxEntry].remove_text(i)
-          @@index = (shared[:Account_ComboBoxEntry].active = (i > 0)? i - 1: 0)
-          yield(:modified)
+      return account
+    end
+    def get_account
+      App.get_account( @gui[:account_comboboxentry].active_text )
+    end
+
+    def clicked(is)
+
+      pwdlength = @gui[:password_spinbutton]
+      account = get_account
+
+      case is
+
+      when @gui[:url_button]
+        url = @gui[:url_entry].text.strip
+        Gtk2AppLib.run(url) if url =~ Configuration::URL_PATTERN
+
+      when @gui[:random_button]
+        suggestion = ''
+        pwdlength.value.to_i.times do
+          suggestion += (rand(94)+33).chr
         end
-      end
+        @gui[:password_entry].text = suggestion
 
-    when shared[:Update_Button]
-      # MODIFIES!!!
-      if account then
-        url = shared[:Url_Entry].text.strip
-        if url.length == 0 || url =~ Configuration::URL_PATTERN then
-          yield(:modified)
-          if !passwords.include?(account) then
-            passwords.add(account) 
-            @@index = i = passwords.accounts.index(account)
-            shared[:Account_ComboBoxEntry].insert_text(i,account)
+      when @gui[:alpha_button]
+        suggestion = ''
+        while suggestion.length <  pwdlength.value.to_i do
+          chr = (rand(75)+48).chr
+          suggestion += chr if chr =~/\w/
+        end
+        @gui[:password_entry].text = suggestion
+
+      when @gui[:numeric_button]
+        suggestion = ''
+        pwdlength.value.to_i.times do
+          chr = (rand(10)+48).chr
+          suggestion += chr
+        end
+        @gui[:password_entry].text = suggestion
+
+      when @gui[:letters_button]
+        suggestion = ''
+        while suggestion.length < pwdlength.value.to_i do
+          chr = (rand(58)+65).chr
+          suggestion += chr if chr =~/[A-Z]/i
+        end
+        @gui[:password_entry].text = suggestion
+
+      when @gui[:caps_button]
+        suggestion = ''
+        pwdlength.value.to_i.times do
+          chr = (rand(26)+65).chr
+          suggestion += chr
+        end
+        @gui[:password_entry].text = suggestion
+
+      when @gui[:delete_button]
+        # MODIFIES!!!
+        if account then
+          i = @passwords.accounts.index(account)
+          if i then
+            @passwords.delete(account)
+            @gui[:account_comboboxentry].remove_text(i)
+            @@index = (@gui[:account_comboboxentry].active = (i > 0)? i - 1: 0)
+            yield(:modified)
           end
-          passwords.url_of(account, url)
-          passwords.note_of(account, shared[:Note_Entry].text.strip)
-          passwords.username_of(account, shared[:Username_Entry].text.strip)
-          password = shared[:Password_Entry].text.strip
-          passwords.password_of(account, password) if !passwords.verify?(account, password)
-          Gtk2AppLib::DIALOGS.quick_message(*Configuration::UPDATED)
-        else
-          Gtk2AppLib::DIALOGS.quick_message(*Configuration::BAD_URL)
         end
-      end
 
-    when shared[:Datafile_Button]
-      if pwd1 = Gtk2PasswordApp.get_salt('New Password') then
-        if pwd2 = Gtk2PasswordApp.get_salt('Verify') then
-          while !(pwd1==pwd2) do
-            pwd1 = Gtk2PasswordApp.get_salt('Try again!')
-            return if !pwd1
-            pwd2 = Gtk2PasswordApp.get_salt('Verify')
-            return if !pwd2
+      when @gui[:update_button]
+        # MODIFIES!!!
+        if account then
+          url = @gui[:url_entry].text.strip
+          if url.length == 0 || url =~ Configuration::URL_PATTERN then
+            yield(:modified)
+            if !@passwords.include?(account) then
+              @passwords.add(account) 
+              @@index = i = @passwords.accounts.index(account)
+              @gui[:account_comboboxentry].insert_text(i,account)
+            end
+            @passwords.url_of(account, url)
+            @passwords.note_of(account, @gui[:note_entry].text.strip)
+            @passwords.username_of(account, @gui[:username_entry].text.strip)
+            password = @gui[:password_entry].text.strip
+            @passwords.password_of(account, password) if !@passwords.verify?(account, password)
+            Gtk2AppLib::DIALOGS.quick_message(*Configuration::UPDATED)
+          else
+            Gtk2AppLib::DIALOGS.quick_message(*Configuration::BAD_URL)
           end
-          dumpfile = passwords.save(pwd1)
-          Gtk2PasswordApp.passwords_updated(dumpfile)
         end
-      end
 
-    when shared[:Current_Button]
-      if account then
-        PRIMARY.text = passwords.password_of(account)
-        CLIPBOARD.text = passwords.username_of(account)
-      end
+      when @gui[:datafile_button]
+        if pwd1 = Gtk2Password.get_salt('New Password') then
+          if pwd2 = Gtk2Password.get_salt('Verify') then
+            while !(pwd1==pwd2) do
+              pwd1 = Gtk2Password.get_salt('Try again!')
+              return if !pwd1
+              pwd2 = Gtk2Password.get_salt('Verify')
+              return if !pwd2
+            end
+            dumpfile = @passwords.save(pwd1)
+            Gtk2Password.passwords_updated(dumpfile)
+          end
+        end
 
-    when shared[:Previous_Button]
-      if account then
-        PRIMARY.text = passwords.previous_password_of(account)
-        CLIPBOARD.text = passwords.username_of(account)
+      when @gui[:current_button]
+        if account then
+          PRIMARY.text = @passwords.password_of(account)
+          CLIPBOARD.text = @passwords.username_of(account)
+        end
+
+      when @gui[:previous_button]
+        if account then
+          PRIMARY.text = @passwords.previous_password_of(account)
+          CLIPBOARD.text = @passwords.username_of(account)
+        end
+
+      when @gui[:save_button]	then yield(:save)
+      when @gui[:cancel_button]	then yield(:close)
+      else $stderr.puts "What? #{is} in #{is.parent.class}."
       end
 
-    when shared[:Save_Button]	then yield(:save)
-    when shared[:Cancel_Button]	then yield(:close)
-    else $stderr.puts "What? #{is} in #{is.parent.class}."
     end
 
-  end
+    def _changed_clear
+      @gui[:url_entry].text		= ''
+      @gui[:note_entry].text		= ''
+      @gui[:username_entry].text	= ''
+    end
 
-  def self.changed(is,passwords)
-    shared = Component::SHARED
-    account = Gtk2PasswordApp.account
-    case is
-    when shared[:Account_ComboBoxEntry]
-      if account then
-        shared[:Password_Entry].text	= ''
-        if passwords.include?(account) then
-          shared[:Url_Entry].text	= passwords.url_of(account)
-          shared[:Note_Entry].text	= passwords.note_of(account)
-          shared[:Username_Entry].text	= passwords.username_of(account)
-          shared[:Password_Entry].text	= passwords.password_of(account)
-        else
-          shared[:Url_Entry].text	= ''
-          shared[:Note_Entry].text	= ''
-          shared[:Username_Entry].text	= ''
-        end
-        @@index = is.active
-        $stderr.puts "Index: #{@@index}" if $trace
-      end
-    else
-      $stderr.puts "What? Expected #{shared[:Account_ComboBoxEntry]}, got #{is}."
+    def _changed_set(account)
+      @gui[:url_entry].text		= @passwords.url_of(account)
+      @gui[:note_entry].text		= @passwords.note_of(account)
+      @gui[:username_entry].text	= @passwords.username_of(account)
+      @gui[:password_entry].text	= @passwords.password_of(account)
     end
-  end
 
-  def self.toggled(is,passwords)
-    pwd = Component::SHARED[:Password_Entry]
-    pwd.visibility = !pwd.visibility?
-  end
+    def _changed(is,account)
+      @gui[:password_entry].text	= ''
+      (@passwords.include?(account))?  _changed_set(account) : _changed_clear
+      @@index = is.active
+      $stderr.puts "Index: #{@@index}" if $trace
+    end
 
-  module Component
-    SHARED = {}
-
-    updates = [:Delete_Button,:Update_Button,:Save_Button]
-    updates.unshift(:Cancel_Button) if Gtk2AppLib::Configuration::MENU[:close]
-
-    vbox = 'Gtk2AppLib::Widgets::VBox'
-    hbox = 'Gtk2AppLib::Widgets::HBox'
-    classes = [
-	['Gui',		vbox,	[:Account_Component,:Url_Component,:Note_Component,:Username_Component,:Password_Component,:Buttons_Component]],
-	['Account',	hbox,	[:Account_Label,:Account_ComboBoxEntry]],
-	['Url',		hbox,	[:Url_Label,:Url_Entry,:Url_Button]],
-	['Note',	hbox,	[:Note_Label,:Note_Entry]],
-	['Username',	hbox,	[:Username_Label,:Username_Entry]],
-	['Password',	hbox,	[:Password_Label,:Password_Entry,:Password_CheckButton,:Password_SpinButton]],
-	['Buttons',	vbox,	[:Generators_Component,:Updates_Component,:Datafile_Component,:Clip_Component]],
-	['Generators',	hbox,	[:Random_Button,:Alpha_Button,:Numeric_Button,:Letters_Button,:Caps_Button]],
-	['Updates',	hbox,	updates],
-	['Datafile',	hbox,	[:Datafile_Button]],
-	['Clip',	hbox,	[:Current_Button,:Previous_Button]],
-    ]
-    classes.each do |clss,spr,keys|
-      code = Gtk2AppLib::Component.define(clss,spr,keys)
-      $stderr.puts "<<<START CODE EVAL>>>\n#{code}\n<<<END CODE EVAL>>>" if $trace && $verbose
-      eval( code )
-    end
-
-    def self.init_code(clss,keys)
-      code = <<-EOT
-        class #{clss}
-          def _init(block)
-      EOT
-      keys.each do |key|
-        code += <<-EOT
-            SHARED[:#{key}] = self.#{key.to_s.downcase}
-        EOT
+    def changed(is)
+      if account = get_account then
+        _changed(is,account)
       end
-      code += <<-EOT
-          end
-        end
-      EOT
-      code
-    end
-
-    # Regardless of where in the gui they are...
-    [	['Account',	[:Account_ComboBoxEntry]],
-	['Url',		[:Url_Entry,:Url_Button]],
-	['Note',	[:Note_Entry]],
-	['Username',	[:Username_Entry]],
-	['Password',	[:Password_Entry,:Password_SpinButton]],
-	['Generators',	[:Random_Button,:Alpha_Button,:Numeric_Button,:Letters_Button,:Caps_Button]],
-	['Updates',	updates],
-	['Datafile',	[:Datafile_Button]],
-	['Clip',	[:Current_Button,:Previous_Button]],
-    ].each do |clss,keys|
-      code = Component.init_code(clss,keys) 
-      $stderr.puts "<<<START CODE EVAL>>>\n#{code}\n<<<END CODE EVAL>>>" if $trace && $verbose
-      eval( code )
+    end
+
+    def self.toggled(pwd)
+      pwd.visibility = !pwd.visibility?
+    end
+    def toggled(is)
+      App.toggled(@gui[:password_entry])
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gtk2passwordapp
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 15
   prerelease: 
   segments: 
   - 1
-  - 5
+  - 6
   - 0
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors: 
 - carlosjhr64@gmail.com
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 -08:00
+date: 2011-04-26 00:00:00 -07:00
 default_executable: gtk2passwordapp
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,11 +41,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 49
         segments: 
-        - 13
-        - 0
-        version: "13.0"
+        - 15
+        - 3
+        version: "15.3"
   type: :runtime
   version_requirements: *id002
 description: |
@@ -70,7 +70,7 @@ files:
 - ./pngs/icon.png
 - README.txt
 - bin/gtk2passwordapp
-has_rdoc: true
+has_rdoc: false
 homepage: https://sites.google.com/site/gtk2applib/home/gtk2applib-applications/gtk2passwordapp
 licenses: []
 
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: 
 - gtk2
-rubyforge_project: gtk2passwordapp
+rubyforge_project: 
 rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3