RubyGems - gtk2passwordapp - Versions diffs - 1.4.0 → 1.5.0 - Mend

gtk2passwordapp 1.4.0 → 1.5.0

Files changed (6) hide show

data/README.txt +13 -35
data/bin/gtk2passwordapp +52 -21
data/lib/gtk2passwordapp.rb +241 -266
data/lib/gtk2passwordapp/appconfig.rb +94 -26
data/lib/gtk2passwordapp/passwords.rb +5 -3
metadata +13 -13

data/README.txt CHANGED Viewed

@@ -5,45 +5,23 @@ Uses crypt-tea's Tiny Encryption Algorithm to encrypt the datafile.
 Features random password generator and clipboard use.
-To add an account, enter the new account name in the "Account:" entry/combo box.
-For the account, write the associated url, a note about the accout, and the username
-in the appropriate entry boxes.
-To set a new password, either enter the password in the "New:" entry box, or
-generate it by pressing "Random", "Alpha-Numeric", "Numeric", "Letters", or
-"All-Caps".  One can set the password length generated with the spin-box.
-To make the password generated visible, un-check the check button.
-Once one has edited the account, clicking the "Update Account" button finalizes the record.
-Note, however, that the change is not yet permanent and saved on disk.
-To delete an account, select the account in the entry/combo box, and
-the press the "Delete Account" button.
-Once one is done with all updates, one then needs to press "Save To Disk".
-"Cancel All Changes" or closing the window without "Save To Disk" will ignore all of the sessions updates.
-The "Clip Current Password" button copies the current password to the primary clipboard.
-The "Clip Previous Password" button copies the previous (old) password to the primary clipboard.
-The "Change Data File Password" button will allow one the change
-the master password. Do not forget the master password!
-Right click most anywhere on the app's window for the main menu.
-"Close" will dock the app and has the same effect as "Cancel All Changes".
-Left click on the docked icon to bring back the editor window.
-Right click on the docked icon to select one of the accounts to load
-the password and username to the clipboard.
-The password is copied to the primary clipboard and will paste on
-middle mouse button click.
-Right click on an entry box to paste the username (via the clipboard's menu).
+To add an account, enter the new account name in the "Account:" entry/combo box.  For the account, write the associated url, a note about the account, and the username in the appropriate entry boxes.
+To set a new password, either enter the password in the "New:" entry box, or generate it by pressing "Random", "Alpha-Numeric", "Numeric", "Letters", or "All-Caps".  One can set the password length generated with the spin-box.  To make the password generated visible, un-check the check button.
+Once one has edited the account, clicking the "Update Account" button finalizes the record.  Note, however, that the change is not yet permanent and saved on disk.  To delete an account, select the account in the entry/combo box, and the press the "Delete Account" button.  Once one is done with all updates, one then needs to press "Save To Disk".  Clicking the "Close" button or closing the window without "Save To Disk" will ignore all of the sessions updates.
+The "Clip Current Password" button copies the current password to the primary clipboard.  The "Clip Previous Password" button copies the previous (old) password to the primary clipboard.  The "Change Data File Password" button will allow one the change the master password.  Do not forget the master password!
+Right click most anywhere on the app's window for the main menu.  "Close" will dock the app and has the same effect as the "Close" button.
+Left click on the docked icon to bring back the editor window.  Right click on the docked icon to select one of the accounts to load the password and username to the clipboard.  The password is copied to the primary clipboard and will paste on middle mouse button click.  Right click on an entry box to paste the username (via the clipboard's menu).
 Lastly, do not edit
 	~/.gtk2passwordapp-1/passphrase.txt
-It's used to "salt" the password... without it,
-one will not be able to decrypt the datafile.
+It's used to "salt" the password... without it, one will not be able to decrypt the datafile.
 For full documentation and comments, see
-	http://ruby-gnome-apps.blogspot.com/search/label/Passwords
+https://sites.google.com/site/gtk2applib/home/gtk2applib-applications/gtk2passwordapp
 carlosjhr64@gmail.com

data/bin/gtk2passwordapp CHANGED Viewed

@@ -1,38 +1,69 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-gem 'gtk2applib', '~> 7'
+gem 'gtk2applib', '~> 13.0'
 require 'gtk2applib'
 include Gtk2AppLib
-PROGRAM = Program.new( {
-	:name		=> 'Ruby-Gnome Password Manager',
-	:tooltip	=> 'Password Manager',
-        :icon_name      => 'Passwords',
-        :FILE           => __FILE__,
-        :lock           => "Proceed anyways?",
+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',
         } )
 begin
   require 'gtk2passwordapp'
-  passwords = Gtk2PasswordApp::Passwords.new
-  Gtk2PasswordApp.build_menu(passwords)
-  about = {
-        :authors        => ['carlosjhr64@gmail.com'],
-	:website	=> 'http://ruby-gnome-apps.blogspot.com/search/label/Passwords',
-	:website_label	=> 'Ruby-Gnome Password Manager',
-        :license        => 'GPL',
-        :copyright      => '2010-08-17 19:00:27',
-        }
+  passwords = Gtk2PasswordApp::Passwords.new
+  Gtk2PasswordApp.build_menu(program,passwords)
-  PROGRAM.window(about) do |window|
-    Gtk2PasswordApp.edit(window,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
 rescue Exception
   $verbose = true
-  Gtk2AppLib.puts_bang!
+  $!.puts_bang!
 ensure
-  PROGRAM.finalize
+  program.finalize
 end

data/lib/gtk2passwordapp.rb CHANGED Viewed

@@ -1,275 +1,250 @@
 require 'gtk2passwordapp/passwords'
 module Gtk2PasswordApp
-   include Configuration
-   PRIMARY	= Gtk::Clipboard.get((SWITCH_CLIPBOARDS)? Gdk::Selection::CLIPBOARD: Gdk::Selection::PRIMARY)
-   CLIPBOARD	= Gtk::Clipboard.get((SWITCH_CLIPBOARDS)? Gdk::Selection::PRIMARY: Gdk::Selection::CLIPBOARD)
-   @@index = nil
-   def self.build_menu(passwords)
-     passwords.accounts.each {|account|
-       item = PROGRAM.dock_menu.append_menu_item(account){
-         @@index = passwords.accounts.index(account)
-         PRIMARY.text   = passwords.password_of(account)
-         CLIPBOARD.text = passwords.username_of(account)
-       }
-       item.child.modify_fg(Gtk::STATE_NORMAL, COLOR[:red]) if passwords.expired?(account)
-     }
-     PROGRAM.dock_menu.show_all
-   end
-   def self.rebuild_menu(passwords)
-     items = PROGRAM.dock_menu.children
-     3.times{ items.shift } # shift out Quit, Run, and Spacer
-     while item = items.shift do
-       PROGRAM.dock_menu.remove(item)
-       item.destroy
-     end
-     Gtk2PasswordApp.build_menu(passwords)
-   end
+  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)
-   def self.get_salt(prompt,title=prompt)
-     Gtk2AppLib::DIALOGS.entry(prompt,{:title=>title,:visibility=>false})
-   end
-   EDITOR_LABELS = [
- 	:account,
-  	:url,
-  	:note,
-  	:username,
-  	:password,
- 	]
-   EDITOR_BUTTONS = [
- 	[ :random, :alphanum, :num, :alpha, :caps, ],
- 	[ :cancel, :delete, :update, :save, ],
- 	[ :cpwd ],
- 	[ :current, :previous, ],
- 	]
-   TEXT = {
- 	# Labels
- 	:account	=> 'Account',
- 	:note		=> 'Note',
- 	:password	=> 'New',
- 	# Buttons
- 	:username	=> 'Username',
- 	:current	=> 'Clip Current Password',
- 	:url		=> 'Url',
- 	:note		=> 'Note',
- 	:edit		=> 'Edit',
- 	:update		=> 'Update Account',
- 	:alphanum	=> 'Alpha-Numeric',
- 	:num		=> 'Numeric',
- 	:alpha		=> 'Letters',
- 	:caps		=> 'All-Caps',
- 	:random		=> 'Random',
- 	:previous	=> 'Clip Previous Password',
- 	:quit		=> 'Quit',
- 	:cancel		=> 'Cancel All Changes',
- 	:save		=> 'Save To Disk',
- 	:cpwd		=> 'Change Data File Password',
- 	:delete		=> 'Delete Account',
-   }
-   def self.edit(window, passwords)
-       dialog_options = {:window=>window}
-       updated = false	# only saves data if data updated
+  @@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
+  end
-       vbox = Gtk2AppLib::VBox.new(window)
-       goto_url = pwdlength = visibility = nil
-       widget = {}
-       EDITOR_LABELS.each {|s|
-         hbox = Gtk2AppLib::HBox.new(vbox)
-         label = Gtk2AppLib::Label.new(TEXT[s]+':',hbox,{:label_width=>LABEL_WIDTH})
-         dx =  ((s == :password)? (SPIN_BUTTON_LENGTH+2*PADDING+30): ((s == :url)? (GO_BUTTON_LENGTH+2*PADDING): 0))
-         width = ENTRY_WIDTH  - dx
-         widget[s] = (s==:account)?
-		Gtk2AppLib::ComboBoxEntry.new(passwords.accounts,hbox,{:comboboxentry_width=>width}) :
-		Gtk2AppLib::Entry.new('',hbox,{:entry_width=>width})
+  def self.save(program,passwords)
+    dumpfile = passwords.save
+    Gtk2PasswordApp.passwords_updated(dumpfile)
+    Gtk2PasswordApp.build_menu(program,passwords)
+  end
-         if s == :password then
-           visibility = Gtk2AppLib::CheckButton.new(hbox,{:active=>true})
-           pwdlength = Gtk2AppLib::SpinButton.new(hbox)
-           pwdlength.value = DEFAULT_PASSWORD_LENGTH
-         elsif s == :url then
-           goto_url = Gtk2AppLib::Button.new('Go',hbox,{:button_width=>GO_BUTTON_LENGTH}){
-             # The go button opens the url in a browser
-             system("#{APP[:browser]} #{widget[:url].text} > /dev/null 2> /dev/null &")
-           }
-         end
-       }
+  def self.get_salt(prompt,title=prompt)
+    Gtk2AppLib::DIALOGS.entry( prompt, {:Title=>title, :Entry => [{:visibility= => false},'activate']} )
+  end
-       EDITOR_BUTTONS.each{|row|
-         hbox = Gtk2AppLib::HBox.new(vbox)
-         row.each {|s| widget[s] = Gtk2AppLib::Button.new(TEXT[s],hbox) }
-       }
-       widget[:account].active = @@index	if @@index
-       account_changed = proc {
-         account = (widget[:account].active_text)? widget[:account].active_text.strip: ''
-         if account.length > 0 then
-           widget[:password].text	= ''
-           if passwords.include?(account) then
-             widget[:url].text		= passwords.url_of(account)
-             widget[:note].text		= passwords.note_of(account)
-             widget[:username].text	= passwords.username_of(account)
-           else
-             widget[:url].text		= ''
-             widget[:note].text		= ''
-             widget[:username].text	= ''
-           end
-           @@index = widget[:account].active
-         end
-       }
-       account_changed.call
-       widget[:account].signal_connect('changed'){
-         account_changed.call
-       }
-       # New Password
-       widget[:password].visibility = false
-       # Update
-       widget[:update].signal_connect('clicked'){
-         url = widget[:url].text.strip
-         if url.length == 0 || url =~ URL_PATTERN then
-           account = (widget[:account].active_text)? widget[:account].active_text.strip: ''
-           if account.length > 0 then
-             updated = true if !updated
-             if !passwords.include?(account) then
-               passwords.add(account)
-               @@index = i = passwords.accounts.index(account)
-               widget[:account].insert_text(i,account)
-             end
-             passwords.url_of(account, url)
-             passwords.note_of(account, widget[:note].text.strip)
-             passwords.username_of(account, widget[:username].text.strip)
-             password = widget[:password].text.strip
-             if password.length > 0 then
-               passwords.password_of(account, password) if !passwords.verify?(account, password)
-               widget[:password].text = ''
-             end
-           end
-         else
-           Gtk2AppLib::DIALOGS.quick_message('Need url like http://www.site.com/page.html', dialog_options)
-         end
-       }
-       # Random
-       widget[:random].signal_connect('clicked'){
-         suggestion = ''
-         pwdlength.value.to_i.times do
-           suggestion += (rand(94)+33).chr
-         end
-         widget[:password].text = suggestion
-       }
-       # Alpha-Numeric
-       widget[:alphanum].signal_connect('clicked'){
-         suggestion = ''
-         while suggestion.length < pwdlength.value.to_i do
-           chr = (rand(75)+48).chr
-           suggestion += chr if chr =~/\w/
-         end
-         widget[:password].text = suggestion
-       }
-       # Numeric
-       widget[:num].signal_connect('clicked'){
-         suggestion = ''
-         pwdlength.value.to_i.times do
-           chr = (rand(10)+48).chr
-           suggestion += chr
-         end
-         widget[:password].text = suggestion
-       }
-       # Letters
-       widget[:alpha].signal_connect('clicked'){
-         suggestion = ''
-         while suggestion.length < pwdlength.value.to_i do
-           chr = (rand(58)+65).chr
-           suggestion += chr if chr =~/[A-Z]/i
-         end
-         widget[:password].text = suggestion
-       }
-       # Caps
-       widget[:caps].signal_connect('clicked'){
-         suggestion = ''
-         pwdlength.value.to_i.times do
-           chr = (rand(26)+65).chr
-           suggestion += chr
-         end
-         widget[:password].text = suggestion
-       }
-       # Visibility
-       visibility.signal_connect('clicked'){
-         widget[:password].visibility = !widget[:password].visibility?
-       }
-       # Current
-       widget[:current].signal_connect('clicked'){
-         account = (widget[:account].active_text)? widget[:account].active_text.strip: ''
-         PRIMARY.text = passwords.password_of(account)
-         CLIPBOARD.text = passwords.username_of(account)
-       }
-       # Previous
-       widget[:previous].signal_connect('clicked'){
-         account = (widget[:account].active_text)? widget[:account].active_text.strip: ''
-         PRIMARY.text = passwords.previous_password_of(account)
-         CLIPBOARD.text = passwords.username_of(account)
-       }
-       # Change Password
-       widget[:cpwd].signal_connect('clicked'){
-         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
-             end
-             Gtk2AppLib.passwords_updated( passwords.save(pwd1) )
-           end
-         end
-       }
-       # Save
-       widget[:save].signal_connect('clicked'){
-         if updated then
-           Gtk2AppLib.passwords_updated( passwords.save )
-           updated = false
-           Gtk2PasswordApp.rebuild_menu(passwords)
-         end
-         PROGRAM.close
-       }
-       # Delete
-       widget[:delete].signal_connect('clicked'){
-         account = (widget[:account].active_text)? widget[:account].active_text.strip: nil
-         if account then
-           i = passwords.accounts.index(account)
-           if i then
-             passwords.delete(account)
-             widget[:account].remove_text(i)
-             @@index = (widget[:account].active = (i > 0)? i - 1: 0)
-             updated = true
-             Gtk2AppLib::DIALOGS.quick_message("#{account} deleted.", dialog_options)
-           end
-         end
-       }
+  def self.account( shared = Component::SHARED )
+    account = (shared[:Account_ComboBoxEntry].active_text)? shared[:Account_ComboBoxEntry].active_text.strip: ''
+    (account.length>0)? account: nil
+  end
-       # Cancel
-       widget[:cancel].signal_connect('clicked'){ PROGRAM.close }
-       window.signal_connect('destroy'){
-         if updated then
-           passwords.load # revert
-           updated = false
-         end
-       }
-       window.show_all
-   end
+  def self.clicked(is,passwords)
+    shared = Component::SHARED
+    pwdlength = shared[:Password_SpinButton]
+    account = Gtk2PasswordApp.account
+    case is
+    when shared[:Url_Button]
+      url = shared[:Url_Entry].text.strip
+      Gtk2AppLib.run(url) if url =~ Configuration::URL_PATTERN
+    when shared[:Random_Button]
+      suggestion = ''
+      pwdlength.value.to_i.times do
+        suggestion += (rand(94)+33).chr
+      end
+      shared[:Password_Entry].text = suggestion
+    when shared[:Alpha_Button]
+      suggestion = ''
+      while suggestion.length <  pwdlength.value.to_i do
+        chr = (rand(75)+48).chr
+        suggestion += chr if chr =~/\w/
+      end
+      shared[:Password_Entry].text = suggestion
+    when shared[:Numeric_Button]
+      suggestion = ''
+      pwdlength.value.to_i.times do
+        chr = (rand(10)+48).chr
+        suggestion += chr
+      end
+      shared[:Password_Entry].text = suggestion
+    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
+      end
+      shared[:Password_Entry].text = suggestion
+    when shared[:Caps_Button]
+      suggestion = ''
+      pwdlength.value.to_i.times do
+        chr = (rand(26)+65).chr
+        suggestion += chr
+      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)
+        end
+      end
+    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)
+          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
+          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 shared[:Previous_Button]
+      if account then
+        PRIMARY.text = passwords.previous_password_of(account)
+        CLIPBOARD.text = passwords.username_of(account)
+      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 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}."
+    end
+  end
+  def self.toggled(is,passwords)
+    pwd = Component::SHARED[:Password_Entry]
+    pwd.visibility = !pwd.visibility?
+  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
+      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
+  end
 end

data/lib/gtk2passwordapp/appconfig.rb CHANGED Viewed

@@ -2,47 +2,115 @@
 # Do not edit or delete passphrase, or you'll loose your passwords data.
 module Gtk2AppLib
+# Only one gtk2passwordapp will be allowed to run.
+# Will kill a duplicate proccess...
+Lock.lock_mode
 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-*
-  PASSWORDS_DATA_DIR = UserSpace::DIRECTORY
-  HILDON = (WRAPPER.to_s =~ /HildonWrapper/)? true: false
+  padding = Widgets::WIDGET[:Widgets][:pack_start].last
+  go = 50
+  label = 75
+  entry = 300
+  spin = 60
+  check = 20
-  GO_BUTTON_LENGTH	= 50
-  SPIN_BUTTON_LENGTH	= 60
-  PADDING		= 2
-  ENTRY_WIDTH		= (HILDON)? 600: 300
-  LABEL_WIDTH		= 75
+  if HILDON then
+    # WIDGET_OPTIONS[:font] =
+    FONT[:Normal] = FONT[:Large] = Pango::FontDescription.new( 'Arial 18' )
+    go = 75
+    label = 150
+    entry = 500
+    spin = 75
+    check = 25
+    if Gtk2AppLib::Configuration::OSTYPE == 'Internet Tablet OS: maemo Linux based OS2008' then
+      # Icon works on N800, but not N800 (Maemo 5)
+      MENU[:close]		= '_Close'
+    end
+  else
+    WINDOW_DEFAULT_SIZE[0],WINDOW_DEFAULT_SIZE[1] = 100,100
+    MENU[:close]		= '_Close'
+  end
+  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}
+  go_width	= {:width_request= => go}
+  check_width	= {:width_request= => check, :active= => true}
+  spin_width	= {:width_request= => spin, :set_range  => [3,30]}
+  clicked	= 'clicked'
-  # Switches the roles of PRIMARY and CLIPBOARD when true
-  SWITCH_CLIPBOARDS	= HILDON
+  PARAMETERS[:Account_Label]		= ['Account:',label_width]
+  # nil needs to be set to the accounts list in bin/gtk2passwordapp
+  PARAMETERS[:Account_ComboBoxEntry]	= [nil,entry_width,'changed'] # catching changed signal
-  PASSWORD_EXPIRED	= 60*60*24*30*3 # 3 months
+  PARAMETERS[:Url_Label]	= ['Url:',label_width]
+  PARAMETERS[:Url_Entry]	= [entry_shorten]
+  PARAMETERS[:Url_Button]	= ['Go!',go_width,clicked]
-  URL_PATTERN		= Regexp.new('^https?:\/\/[^\s\']+$')
+  PARAMETERS[:Note_Label]	= ['Note:',label_width]
+  PARAMETERS[:Note_Entry]	= [entry_width]
-  if HILDON then
-    WIDGET_OPTIONS[:font] = FONT[:normal] = FONT[:large] = Pango::FontDescription.new( 'Arial 18' )
-  end
+  PARAMETERS[:Username_Label]	= ['Username:',label_width]
+  PARAMETERS[:Username_Entry]	= [entry_width]
+  PARAMETERS[:Password_Label]	= ['Password:',label_width]
+  PARAMETERS[:Password_Entry]	= [entry_shorten2]
+  PARAMETERS[:Password_CheckButton]	= [check_width,'toggled']
+  PARAMETERS[:Password_SpinButton]	= [spin_width]
-  MENU[:close]		= '_Close'
+  PARAMETERS[:Random_Button]	= ['Random',clicked]
+  PARAMETERS[:Alpha_Button]	= ['Alpha-Numeric',clicked]
+  PARAMETERS[:Numeric_Button]	= ['Numeric',clicked]
+  PARAMETERS[:Letters_Button]	= ['Letters',clicked]
+  PARAMETERS[:Caps_Button]	= ['All-Caps',clicked]
-  WINDOW_DEFAULT_SIZE[0],WINDOW_DEFAULT_SIZE[1] = 100,100
+  PARAMETERS[:Cancel_Button]	= ['Close',clicked]
+  PARAMETERS[:Delete_Button]	= ['Delete Account',clicked]
+  PARAMETERS[:Update_Button]	= ['Update Account',clicked]
+  PARAMETERS[:Save_Button]	= ['Save To Disk',clicked]
-  WIDGET_OPTIONS[:max]		= 20 # MAX PASSWORD LENGTH
-  WIDGET_OPTIONS[:min]		= 3  # MIN PASSWORD LENGTH
+  PARAMETERS[:Datafile_Button]	= ['Change Data File Password',clicked]
+  PARAMETERS[:Current_Button]	= ['Clip Current Password',clicked]
+  PARAMETERS[:Previous_Button]	= ['Clip Previous Password',clicked]
+end
+end
+module Gtk2PasswordApp
+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-*
+  PASSWORDS_DATA_DIR = Gtk2AppLib::USERDIR
+  # Switches the roles of PRIMARY and CLIPBOARD when true
+  SWITCH_CLIPBOARDS	= (Gtk2AppLib::HILDON || !Gtk2AppLib::Configuration::X)? true: false
+  PASSWORD_EXPIRED	= 60*60*24*30*3 # 3 months
+  URL_PATTERN		= Regexp.new('^https?:\/\/[^\s\']+$')
   DEFAULT_PASSWORD_LENGTH = 7
+  EXPIRED_COLOR = Gtk2AppLib::Color[:Red]
-  WIDGET_OPTIONS[:spinbutton_width] = SPIN_BUTTON_LENGTH
-  WIDGET_OPTIONS[:padding]	= PADDING
+  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}]
 end
   def self.passwords_updated(dumpfile)
-    # After the password files are saved, you have the option here to backup or mirror the files elsewhere....
-   #fn = File.basename(dumpfile)
-   #system( "scp #{dumpfile} user@192.168.1.123:.gtk2passwordapp-1/#{fn}")
-   #system( "scp #{Configuration::PASSWORDS_DATA_DIR}/passphrase.txt user@192.168.1.123:.gtk2passwordapp-1/passphrase.txt")
+    ## After the password files are saved, you have the option here to backup or mirror the files elsewhere.
+    ## Here's an example:
+    # system( "ssh user@192.168.1.123 mv .gtk2passwordapp-1/*.dat .gtk2passwordapp-1/bak/")
+    # system( "ssh user@192.168.1.123 cp .gtk2passwordapp-1/passphrase.txt .gtk2passwordapp-1/bak/passphrase.txt") # you might choose not too.
+    # fn = File.basename(dumpfile)
+    # if system( "scp #{dumpfile} user@192.168.1.123:.gtk2passwordapp-1/#{fn}")	then
+    # # again, you might choose not to distribute passphrase (reduces cracking to your short password)
+    # if system( "scp #{Configuration::PASSWORDS_DATA_DIR}/passphrase.txt user@192.168.1.123:.gtk2passwordapp-1/passphrase.txt") then
+    #   Gtk2AppLib::DIALOGS.quick_message("Passwords saved on 192.168.1.101 and 102")
+    #   return
+    # 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})
   end
 end

data/lib/gtk2passwordapp/passwords.rb CHANGED Viewed

@@ -17,7 +17,7 @@ class Passwords < PasswordsData
   def get_passphrase(mv=false)
     passphrase = ''
-    @pfile = UserSpace::DIRECTORY+'/passphrase.txt'
+    @pfile = Gtk2AppLib::USERDIR+'/passphrase.txt'
     if mv then
       File.rename(@pfile, @pfile+'.bak') if File.exist?(@pfile)
       passphrase = _create_passphrase
@@ -33,8 +33,8 @@ class Passwords < PasswordsData
   end
   def has_datafile?
-    Find.find(UserSpace::DIRECTORY){|fn|
-      Find.prune if !(fn==UserSpace::DIRECTORY) &&  File.directory?(fn)
+    Find.find(Gtk2AppLib::USERDIR){|fn|
+      Find.prune if !(fn==Gtk2AppLib::USERDIR) &&  File.directory?(fn)
       if fn =~/[0123456789abcdef]{32}\.dat$/ then
         return true
       end
@@ -74,6 +74,8 @@ class Passwords < PasswordsData
           pwd = Passwords._get_salt('Try again!')
           @pwd = Passwords._get_salt('Verify New Password')
         end
+        super(@pwd+@pph)
+        self.save
       end
     end
     # Off to the races...

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: gtk2passwordapp
 version: !ruby/object:Gem::Version
-  hash: 7
-  prerelease: false
+  hash: 3
+  prerelease:
   segments:
   - 1
-  - 4
+  - 5
   - 0
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - carlosjhr64@gmail.com
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-08-17 00:00:00 -07:00
+date: 2011-03-07 00:00:00 -08:00
 default_executable: gtk2passwordapp
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -26,12 +26,11 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        hash: 27
+        hash: 9
         segments:
         - 1
         - 3
-        - 0
-        version: 1.3.0
+        version: "1.3"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency
@@ -42,10 +41,11 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        hash: 13
+        hash: 63
         segments:
-        - 7
-        version: "7"
+        - 13
+        - 0
+        version: "13.0"
   type: :runtime
   version_requirements: *id002
 description: |
@@ -71,7 +71,7 @@ files:
 - README.txt
 - bin/gtk2passwordapp
 has_rdoc: true
-homepage: http://ruby-gnome-apps.blogspot.com/search/label/Passwords
+homepage: https://sites.google.com/site/gtk2applib/home/gtk2applib-applications/gtk2passwordapp
 licenses: []
 post_install_message:
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - gtk2
 rubyforge_project: gtk2passwordapp
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key:
 specification_version: 3
 summary: Ruby-Gnome Password Manager