Merge lp:~mac9416/keryx/unstable into lp:keryx/stable

[mac9416]

This is a not-too-beautiful refactoring of 0.92.4. But it's functional.

[mac9416 (mac9416)]

review: Approve

[lp:~mac9416/keryx/unstable]

181. By mac9416 on 2017-06-11

Updated spec, added missing lib file.

182. By mac9416 on 2017-06-11

Final changes for 0.92.5 release

183. By mac9416 on 2017-06-11

But seriously, last change for 0.92.5

Unmerged revisions

183. By mac9416 on 2017-06-11

But seriously, last change for 0.92.5

182. By mac9416 on 2017-06-11

Final changes for 0.92.5 release

181. By mac9416 on 2017-06-11

Updated spec, added missing lib file.

180. By mac9416 on 2017-06-06

release 0.92.5

179. By mac9416 on 2017-05-29

Cleaned up the start dialog

178. By mac9416 on 2017-05-28

Removed default projects

177. By mac9416 on 2017-05-27

Got rid of keryx.conf. Convention > Configuration.

176. By mac9416 on 2017-05-27

Added tools to build a Linux executable.

175. By mac9416 on 2017-05-25

Clean up the Debian library

174. By mac9416 on 2017-05-25

Even more config.py cleanup

=== modified file 'app.fil'
--- app.fil	2010-01-27 00:19:45 +0000
+++ app.fil	2017-06-11 16:11:12 +0000
@@ -13,7 +13,7 @@
 ./lib/wxkeryx/main.py
 ./lib/wxkeryx/misc.py
 ./lib/wxkeryx/options.py
-./lib/wxkeryx/startDialog.py
+./lib/wxkeryx/StartDialog.py
 ./plugins/ColorMap.py
 ./plugins/Debian.py
 ./plugins/Search.py

=== added file 'build.bat'
--- build.bat	1970-01-01 00:00:00 +0000
+++ build.bat	2017-06-11 16:11:12 +0000
@@ -0,0 +1,13 @@
+rem Get rid of any existing build.
+rd /s /q dist
+
+rem Build the executable.
+pyinstaller keryx.spec --log-level WARN
+
+rem Move important assets to the dist directory.
+xcopy /e /i doc dist\doc
+xcopy /e /i locale dist\locale
+xcopy /e /i pixmaps dist\pixmaps
+
+rem Get rid of pyinstaller's temp directories. The interesting stuff is in dist.
+rd /s /q build __pycache__
\ No newline at end of file

=== added file 'build.sh'
--- build.sh	1970-01-01 00:00:00 +0000
+++ build.sh	2017-06-11 16:11:12 +0000
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+# Get rid of any existing build.
+rm -r dist
+
+# Build the executable.
+pyinstaller keryx.spec --log-level WARN
+
+# Move important assets to the dist directory.
+cp -r doc/ dist/
+cp -r locale/ dist/
+cp -r pixmaps/ dist/
+
+# Get rid of pyinstaller's temp directories. The interesting stuff is in dist.
+rm -r build __pycache__
\ No newline at end of file

=== removed file 'doc/INSTALL'
--- doc/INSTALL	2009-08-09 19:36:06 +0000
+++ doc/INSTALL	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-==========================
-        Installing:
-==========================
-
-Windows: No installation required. Just run keryx.exe from the win32 directory
-
-Linux: No install required as long as Python and wxPython are installed.
-       Just run 'python keryx.py' or './keryx.py' if it is set as executable.
-
-==========================
-        Building:
-==========================
-
-py2exe is required to build a proper windows executable.
-
-WARNING: Issues with Python 2.6 prevent succesful builds.
-
-Run 'python setup.py py2exe' to build a win32 binary. This has been tested using
-the following:
-
-Python 2.5.4
-wxPython 2.8.9.1 unicode
-Py2exe 0.6.9
-Pywin32
\ No newline at end of file

=== modified file 'doc/README'
--- doc/README	2010-02-13 02:43:32 +0000
+++ doc/README	2017-06-11 16:11:12 +0000
@@ -7,8 +7,7 @@
      Contact/Support:
 ==========================
 
-	Website: http://keryxproject.org
-	Email: Chris Oliver <[e-mail]>
+	Email: Michael Crenshaw <[e-mail]>
     Launchpad Project: http://launchpad.net/keryx
 
 ==========================
@@ -30,77 +29,12 @@
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 ==========================
-       Requirements
-==========================
-
-Windows: None
-
-Linux: Python, wxPython
-
-Ubuntu users need the following packages in order to have wxPython successfully
-installed:
-
-libwxbase2.8-0
-libwxgtk2.8-0
-python-wxversion
-python-wxgtk2.8
-
-wxPython is only required for using Keryx's interface. Project creation can be
-done via command line parameters. See USAGE for more information.
-
-==========================
-Installation Instructions:
-==========================
-
-Extract the Keryx archive anywhere (typically a usb device).
-
-==========================
-          Usage:
-==========================
-Keryx is based around the concept of 'projects'. Each project keeps track of the
-software versions that are installed on that computer. To get started you must
-first create a project on that computer.
-
-If you are unable to install wxPython but have Python installed you can still
-create projects. In a console run:
-
-'python keryx.py --create <project name> <plugin name>'
-
-and Keryx will create a new project in the project directory. This is helpful
-for Ubuntu server users along with users who have not installed wxPython yet.
-The only <plugin name> currently available is debian.
-
-Once you have created this project, make sure you have a copy on your usb device
-that will be used to run Keryx from on a computer with highspeed internet.
-
-Keryx can be run on ANY computer with Python and wxPython installed, meaning
-Windows, Mac and Linux computers. Running Keryx on any Windows computer is
-nothing more than running 'keryx.exe'. If you are running Keryx using Python, cd
-to the directory and run 'python keryx.py' to start. Some environments support
-running a python application by double clicking it as well.
-
-After you have Keryx running on an internet connected host, downloading packages
-is as simple as opening your project and selecting the packages to download.
-Keryx will automatically select the package dependencies for you making sure
-that nothing is left behind. Any packages you download are saved to your
-project's folder in the 'packages' directory.
-
-When you are finished you can return to your project computer and install the
-packages through the usual way.
-
-==========================
-Uninstallation/Upgrading:
-==========================
-
-Extract the newest version over top, replacing all files.
-
-==========================
          Thanks:
 ==========================
 
 Buran Ayuthia
 John Gleissner
-mac9416
+mac9416
 jacseen
 Kevin Buente
 Douglass Clem
@@ -110,21 +44,3 @@
 Ingelrest François - Plugin framework base
 heylove - Logo is based off areao.42-Icons
 Anyone else I forgot to mention
-
-==========================
-     Additional Notes:
-==========================
-
-Command line parameters:
-
--h or --help                            Displays this message
--v or --version                         Displays Keryx version number
---create <project name> <plugin name>   Creates a new project in the default
-                                          directory with name of <project name>
-                                          and type project <plugin name>
---config <file>                         Uses <file> to as configuration file
-
-Due to py2exe's nature, information printed to the console is NOT displayed.
-While the command line parameters will still work properly, no indication of
-success will be shown in the console. The information will still be written in
-the log files for further review.

=== removed directory 'doc/Tutorial_Files'
=== removed file 'doc/Tutorial_Files/Create_Project.png'
Binary files doc/Tutorial_Files/Create_Project.png	2010-03-13 19:04:52 +0000 and doc/Tutorial_Files/Create_Project.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'doc/Tutorial_Files/Install_Packages.png'
Binary files doc/Tutorial_Files/Install_Packages.png	2010-03-13 19:04:52 +0000 and doc/Tutorial_Files/Install_Packages.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'doc/Tutorial_Files/Installing_Packages.png'
Binary files doc/Tutorial_Files/Installing_Packages.png	2010-03-13 19:04:52 +0000 and doc/Tutorial_Files/Installing_Packages.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'doc/Tutorial_Files/Open_Project.png'
Binary files doc/Tutorial_Files/Open_Project.png	2010-03-13 19:04:52 +0000 and doc/Tutorial_Files/Open_Project.png	1970-01-01 00:00:00 +0000 differ
=== added file 'doc/config.rst'
--- doc/config.rst	1970-01-01 00:00:00 +0000
+++ doc/config.rst	2017-06-11 16:11:12 +0000
@@ -0,0 +1,8 @@
+=======================================
+lib.config - Configure Keryx's behavior
+=======================================
+
+.. contents::
+
+.. automodule:: lib.config
+   :members:
\ No newline at end of file

=== added file 'doc/debian.rst'
--- doc/debian.rst	1970-01-01 00:00:00 +0000
+++ doc/debian.rst	2017-06-11 16:11:12 +0000
@@ -0,0 +1,5 @@
+lib.debian - APT support
+========================
+
+.. automodule:: lib.debian
+   :members:
\ No newline at end of file

=== added file 'doc/index.rst'
--- doc/index.rst	1970-01-01 00:00:00 +0000
+++ doc/index.rst	2017-06-11 16:11:12 +0000
@@ -0,0 +1,32 @@
+.. Keryx documentation master file, created by
+   sphinx-quickstart on Sun May  7 20:29:57 2017.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+===================
+Keryx documentation
+===================
+
+Contents:
+
+.. toctree::
+   :maxdepth: 1
+
+   tutorial
+   lib
+   config
+   debian
+   package
+   project
+   source
+   version
+   plugins
+   log
+
+==================
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`

=== removed file 'doc/keryx.conf'
--- doc/keryx.conf	2010-02-16 02:44:28 +0000
+++ doc/keryx.conf	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-#### Default values ####
-LogDir=../logs
-LocaleDir=../locale
-PluginsDir=../plugins
-ProjectsDir=../projects
-PixmapsDir=../pixmaps
-ThemesDir=../pixmaps/themes
-DefaultTheme=../pixmaps/themes/default
-CurrentTheme=../pixmaps/themes/default
-
-#### Examples ####
-
-#LogDir=../logs
-#LocaleDir=../locale
-#PackagesDir=../packages
-#PixmapsDir=../pixmaps
-#PluginsDir=../plugins
-#ProjectsDir=../projects
-#ThemesDir=../pixmaps/themes
-#DefaultTheme=../pixmaps/themes/default
-#CurrentTheme=../pixmaps/themes/default
-
-### Proxy configuration ###
-# Leave ProxyUsername and ProxyPassword commented 
-# when the proxy does not require them.
-
-#HTTPProxy=http://127.0.0.1:8880
-#ProxyUsername=username
-#ProxyPassword=password

=== added file 'doc/lib.rst'
--- doc/lib.rst	1970-01-01 00:00:00 +0000
+++ doc/lib.rst	2017-06-11 16:11:12 +0000
@@ -0,0 +1,8 @@
+==============================
+lib - Tools to make Keryx work
+==============================
+
+.. contents::
+
+.. automodule:: lib
+   :members:
\ No newline at end of file

=== added file 'doc/log.rst'
--- doc/log.rst	1970-01-01 00:00:00 +0000
+++ doc/log.rst	2017-06-11 16:11:12 +0000
@@ -0,0 +1,8 @@
+=============================
+lib.log - Log Keryx's actions
+=============================
+
+.. contents::
+
+.. automodule:: lib.log
+   :members:
\ No newline at end of file

=== added file 'doc/package.rst'
--- doc/package.rst	1970-01-01 00:00:00 +0000
+++ doc/package.rst	2017-06-11 16:11:12 +0000
@@ -0,0 +1,8 @@
+======================================
+lib.Package - Represent an APT package
+======================================
+
+.. contents::
+
+.. automodule:: lib.package
+   :members:
\ No newline at end of file

=== added file 'doc/plugins.rst'
--- doc/plugins.rst	1970-01-01 00:00:00 +0000
+++ doc/plugins.rst	2017-06-11 16:11:12 +0000
@@ -0,0 +1,12 @@
+=========================================
+lib.plugins - Add UI elements dynamically
+=========================================
+
+.. contents::
+
+.. deprecated:: 0.93
+   This module was deprecated in 0.93 to reduce complexity. UI elements
+   currently inserted dynamically will soon be hard-coded into the interface.
+
+.. automodule:: lib.plugins
+   :members:
\ No newline at end of file

=== added file 'doc/project.rst'
--- doc/project.rst	1970-01-01 00:00:00 +0000
+++ doc/project.rst	2017-06-11 16:11:12 +0000
@@ -0,0 +1,8 @@
+====================================
+lib.project - Manage a Keryx project
+====================================
+
+.. contents::
+
+.. automodule:: lib.project
+   :members:
\ No newline at end of file

=== added file 'doc/source.rst'
--- doc/source.rst	1970-01-01 00:00:00 +0000
+++ doc/source.rst	2017-06-11 16:11:12 +0000
@@ -0,0 +1,8 @@
+====================================
+lib.source - Manage software sources
+====================================
+
+.. contents::
+
+.. automodule:: lib.source
+   :members:
\ No newline at end of file

=== added file 'doc/tutorial.rst'
--- doc/tutorial.rst	1970-01-01 00:00:00 +0000
+++ doc/tutorial.rst	2017-06-11 16:11:12 +0000
@@ -0,0 +1,68 @@
+##############
+Keryx Tutorial
+##############
+
+.. contents::
+
+*************
+Getting Keryx
+*************
+
+Grab Keryx from the Download page and extract it to your flash drive.
+
+**************
+Starting Keryx
+**************
+
+On Linux
+========
+
+Navigate to the keryx/linux directory on your flash drive and double-click the 'keryx' icon.
+
+On Windows
+==========
+
+Navigate to the keryx/win32 directory on your flash drive and double-click the 'keryx' or 'keryx.exe' icon.
+
+*************************************
+Creating a Project (Offline Computer)
+*************************************
+
+After starting Keryx, enter the name of your project (or leave the default) and click 'New Project'.
+
+When asked whether you would like to download the latest package lists, choose 'No', then exit Keryx.
+
+***********************************
+Opening a Project (Online Computer)
+***********************************
+
+Start Keryx and choose your project from the bottom drop-down menu. Then click 'Open Project'.
+
+If you would like to have the latest packages available for download, choose 'Yes' when prompted whether to download latest package lists (recommended).
+
+**************************************
+Installing Packages (Offline Computer)
+**************************************
+
+Open your project and select 'Install Packages' from the 'Project' menu. Check all the packages you want to install and click 'Continue'.
+
+A terminal will display the progress of package installation. After installation is complete, press ENTER.
+
+So that Keryx will know that you have installed new packages, you should now update the project status (Project > Update Status).
+
+*****************************
+What if something goes wrong?
+*****************************
+
+There are several ways to get help with a problem. You can
+
+ * report a bug on Launchpad
+ * ask on the Forums or on Launchpad
+ * contact our mailing list
+ * chat with us in #keryx on Freenode
+
+*****************************
+And if everything goes right?
+*****************************
+
+Please consider donating to the project!
\ No newline at end of file

=== added file 'doc/version.rst'
--- doc/version.rst	1970-01-01 00:00:00 +0000
+++ doc/version.rst	2017-06-11 16:11:12 +0000
@@ -0,0 +1,8 @@
+==================================================
+lib.version - Tools to handle APT package versions
+==================================================
+
+.. contents::
+
+.. automodule:: lib.version
+   :members:
\ No newline at end of file

=== modified file 'keryx.py'
--- keryx.py	2010-03-12 03:02:38 +0000
+++ keryx.py	2017-06-11 16:11:12 +0000
@@ -19,122 +19,41 @@
 
 # Import commands here, even though we don't use it because debian.py uses it
 # and our plugin system confuses pyinstaller. We need to manually specify this
-# in keryx so that pyinstaller can grab it and bundle the code
-
-# Import modules to satisfy plugin dependencies:
-import commands
-
-# Then import everything else.
-import os
+# in Keryx so that pyinstaller can grab it and bundle the code
+
 import sys
 
-from lib import consts
-
-#####################
-# Set configuration #
-#####################
-if ('--config' in sys.argv): # If config is specified
-    index = sys.argv.index('--config')
-    try: filename = sys.argv[index + 1]
-    except: 
-        print 'ERROR: No config filename given'
-        sys.exit(1)
-        
-    
-    # Reinitialize consts if the a specific file has been passed
-    import lib.config
-    lib.config.fromFile(filename)
-
-# Else if file_config exists, load it
-elif os.path.exists(consts.file_config):
-    import lib.config
-    lib.config.fromFile(consts.file_config)
-    
-# Import log and project AFTER configuration has been set
-from lib import log, project
-
-################
-# Translations #
-################
+from lib import config, log
+
+# Handle translations
+import gettext
+import locale
+
+_ = gettext.gettext
+gettext.install(config.name.lower(), config.locale_dir)
+
+lang, encoding = locale.getdefaultlocale()
+
 try:
-    import gettext
-    import locale
-    gettext.install(consts.appNameShort, consts.dirLocale, unicode=True)
-    
-    lang = locale.getdefaultlocale()[0]
-    lang = gettext.translation(consts.appNameShort, consts.dirLocale, languages=[lang])
+    lang = gettext.translation(config.name.lower(),
+                               config.locale_dir,
+                               languages=[lang])
     lang.install()
-except: pass
+except FileNotFoundError:
+    print(_('Could not locate a translation file for your language.'))
 
-#TODO: Set wxWidgets translation information
+# TODO: Set wxWidgets translation information
  
-###################
-# Parse arguments #
-###################
-if ('--help' in sys.argv) or ('-h' in sys.argv):
-    log.info(consts.parameters)
-    sys.exit(0)
-
+# Parse arguments
 if ('--version' in sys.argv) or ('-v' in sys.argv):
-    log.info('%s %s' % (consts.appName, consts.appVersion))
+    log.info('%s %s' % (config.name, config.version))
     sys.exit(0)
 
-if ('--create' in sys.argv):
-    import platform
-    from lib import plugins, project
-    try:
-        index = sys.argv.index('--create')
-        name = sys.argv[index + 1]
-        plugin_name = 'debian'
-    except:
-        log.error(_('Unable to create project'))
-        sys.exit(1)
-    plugins.load(consts.dirPlugins, '', False) # Don't load interface plugins
-    for item in range(0,len(plugins.OSPluginList)):
-        if plugin_name == plugins.OSPluginList[item][0].lower():
-            # Append new project
-            project.projects.append(project.Project())
-            proj = project.projects[len(project.projects) - 1]
-    
-            # Create project
-            success, filename = proj.CreateKeryx(name, 
-                                            plugins.OSPluginList[item][0],
-                                            plugins.OSPluginList[item][1])
-
-            if success: 
-                log.info(_('Project created successfully.'))
-                sys.exit(0)
-    log.error(_('Unable to create project.'))
-    log.info(_('Make sure a project by this name does not already exist and you have selected the right plugin for this project.'))
-    sys.exit(1)
-
-
-WXVER = "2.8"
-
-if not hasattr(sys, "frozen"):  # If this isn't a compiled version of Keryx...
-    import wxversion
-    if wxversion.checkInstalled(WXVER):
-        wxversion.select(WXVER)
-    else:
-        import wx
-        app = wx.PySimpleApp()
-        wx.MessageBox("Warning: The requested version of wxPython is not installed.\n"
-                      "Please install version %s" % WXVER,
-                      "wxPython Version Warning")
-        app.MainLoop()
-
-#############################
-# Attempt to load interface #
-#############################
-#try:
-if 1:
-    import lib.wxkeryx
-    lib.wxkeryx.Start()
-#except Exception, e:
-    #print e
-#    log.error(_('Unable to load interface.'))
-#    log.info(_('Make sure you have wxPython installed.'))
-#    log.info(_('Read the README for details on installing wxPython'))
-#    log.info(_('You can you \'python keryx.py --create\' to create a new project through the command-line if you do not have wxPython installed'))
-#    log.info(_('Use \'python keryx.py --help\' to see all command-line parameters.'))
-#    sys.exit(1)
+if not hasattr(sys, 'frozen'):  # If this isn't a compiled version of Keryx...
+    import wx
+    app = wx.App()
+    app.MainLoop()
+
+# Attempt to load interface
+from lib import wxkeryx
+wxkeryx.start()

=== added file 'keryx.spec'
--- keryx.spec	1970-01-01 00:00:00 +0000
+++ keryx.spec	2017-06-11 16:11:12 +0000
@@ -0,0 +1,29 @@
+# -*- mode: python -*-
+
+block_cipher = None
+
+
+a = Analysis(['keryx.py'],
+             pathex=['/home/tony/PycharmProjects/keryx'],
+             binaries=[],
+             datas=[],
+             hiddenimports=[],
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          name='keryx',
+          debug=False,
+          strip=False,
+          upx=True,
+          console=False, 
+          icon='pixmaps/keryx.ico')

=== modified file 'lib/__init__.py'
--- lib/__init__.py	2010-03-05 00:06:56 +0000
+++ lib/__init__.py	2017-06-11 16:11:12 +0000
@@ -17,30 +17,54 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 import os
-import webbrowser
-
-import consts
+import subprocess
+
+from . import config
+
+
+class FreeSpaceUnavailable(Exception):
+    """This means there's no way to get the free space on some device."""
+    pass
 
 try:
-    import win32file
+    from win32file import GetDiskFreeSpaceEx
 except ImportError:
-    pass  # Probably not a Windows system.
-
-def driveFreeSpace():
-    """Retrieves the cwd's filesystem stats"""
-    if os.name == 'posix': # get free space if they have statvfs
-        data = os.statvfs(consts.cwd)
+    def GetDiskFreeSpaceEx(drive):
+        """This is a placeholder for if win32file is unavailable.
+        
+        :param str drive: the name of the drive to check for free space
+        """
+        raise FreeSpaceUnavailable
+
+
+def drive_free_space():
+    """Retrieve the current working directory's free space.
+    
+    :return: the remaining space in KiB, MiB, or GiB
+    :rtype: str
+    """
+    if os.name == 'posix':  # get free space if they have statvfs
+        data = os.statvfs(config.cwd)
         return convert_file_size(float(data[0] * data[4]))
     if os.name == 'nt':
-        drive = os.path.splitdrive(consts.cwd)[0] # Gets drive letter
-        d_size = win32file.GetDiskFreeSpaceEx(drive)
+        drive = os.path.splitdrive(config.cwd)[0]  # Gets drive letter
+        try:
+            d_size = GetDiskFreeSpaceEx(drive)
+        except FreeSpaceUnavailable:
+            return 'Unavailable'
         return convert_file_size(d_size[2])
     # unsupported OS, return error
     return 'Unavailable'
+
+
+def convert_file_size(num_bytes):
+    """Convert file size from bytes to appropriate size.
     
-def convert_file_size(bytes):
-    """Converts file size from bytes to appropriate size"""
-    kb = bytes / 1024.0
+    :param int num_bytes: the number of bytes to be formatted
+    :return: a nice representation of the size, in KiB, MiB, or GiB
+    :rtype: str
+    """
+    kb = num_bytes / 1024.0
     if kb < 1000:
         return '%.1f %s' % (kb, 'KiB')
     mb = kb / 1024.0
@@ -49,12 +73,9 @@
     gb = mb / 1024.0
     return '%.2f %s' % (gb, 'GiB')
 
-def browserOpen(url):
-    """Opens default browser to url"""
-    webbrowser.open(url)
 
 def utf(desc):
-    """Returns string in fully UTF compatible format"""
+    """Convert the string to a fully UTF compatible format."""
     new_word = ''
     for letter in desc:
         if ord(letter) > 128:
@@ -62,14 +83,54 @@
         new_word += letter
     return new_word
 
-def joinUrl(first, last):
-    """ Returns full URL """
-    if first.endswith('/'):
-        if last.startswith('/'): return first + last[1:]
-        else:                    return first + last
+
+def join_url(first, *args):
+    """Combines the given elements into a full URL.
+    
+    :param str first: the first part of the URL
+    :param str args: subsequent parts of the URL
+    :return: a complete URL from the given parts
+    :rtype: str
+    """
+    if len(args) == 0:
+        return first
+    elif len(args) == 1:
+        return first.strip('/') + '/' + args[0].strip('/')
     else:
-        if last.startswith('/'): return first + last
-        else:                    return first + '/' + last
-
-
-
+        return join_url(first.strip('/') + '/' + args[0].strip('/'), *args[1:])
+
+
+def run_root(program, args=''):
+    """Run the given program with the given arguments, gaining root privileges
+    using some GUI-based su/sudo program. The first available from among the 
+    choices gksu, gksudo, kdesu, and kdesudo will be used.
+
+    :param str program: the command to be run
+    :param str args: the arguments to run with the command
+    :return: a success/error code and a message
+    :rtype: list(int, str)
+    """
+    # Find an available privilege-escalating tool.
+    root = ''
+    for a in ('gksu', 'gksudo', 'kdesu', 'kdesudo'):
+        if subprocess.run('which ' + a).returncode == 0:
+            root = a
+            break
+
+    # Give compatible GUI su's a shorter command description
+    if root.startswith('gk'):
+        description = '%s %s' % (program, args)
+        if len(description) > 50:
+            description = '--description \'%s...\'' % (description[:46])
+    else:  # Certain su GUIs do not accept alternate descriptions
+        description = ''
+
+    # If no tool was available, return an error code.
+    # TODO: actually raise an error.
+    if root == '':
+        return 64, 'Could not find superuser access'
+
+    # Attempt to run the program as root.
+    proc = subprocess.run('%s %s -- %s %s' %
+                          (root, description, program, args))
+    return proc.returncode, ''

=== added file 'lib/config.py'
--- lib/config.py	1970-01-01 00:00:00 +0000
+++ lib/config.py	2017-06-11 16:11:12 +0000
@@ -0,0 +1,96 @@
+import os
+import sys
+from os.path import abspath, join
+from gettext import gettext as _
+
+cwd = abspath(os.path.dirname(sys.argv[0]))
+
+
+class Theme:
+    """Represents a GUI theme by defining UI elements (mostly icons)."""
+    def __init__(self, theme_dir):
+        """Set theme asset paths according to the given theme directory.
+        
+        :param str theme_dir: the directory containing a UI theme
+        """
+        self.path = theme_dir
+        self.icon_about = join(self.path, 'about.png')
+        self.icon_arrow_down = join(self.path, 'arrow_down.png')
+        self.icon_arrow_up = join(self.path, 'arrow_up.png')
+        self.icon_book_open = join(self.path, 'book_open.png')
+        self.icon_bug_report = join(self.path, 'bug.png')
+        self.icon_close = join(self.path, 'close.png')
+        self.icon_donate = join(self.path, 'donate.png')
+        self.icon_download = join(self.path, 'download.png')
+        self.icon_downloaded = join(self.path, 'downloaded.png')
+        self.icon_error = join(self.path, 'error.png')
+        self.icon_find = join(self.path, 'find.png')
+        self.icon_help = join(self.path, 'help.png')
+        self.icon_home = join(self.path, 'home.png')
+        self.icon_install = join(self.path, 'install.png')
+        self.icon_layout = join(self.path, 'layout.png')
+        self.icon_new = join(self.path, 'new.png')
+        self.icon_open = join(self.path, 'open.png')
+        self.icon_options = join(self.path, 'options.png')
+        self.icon_package = join(self.path, 'package.png')
+        self.icon_plugin = join(self.path, 'plugin.png')
+        self.icon_plugin_add = join(self.path, 'plugin_add.png')
+        self.icon_plugin_disable = join(self.path, 'plugin_disabled.png')
+        self.icon_project_details = join(self.path, 'project_details.png')
+        self.icon_quit = join(self.path, 'quit.png')
+        self.icon_refresh = join(self.path, 'refresh.png')
+        self.icon_sources = join(self.path, 'sources.png')
+        self.icon_translate = join(self.path, 'translate.png')
+        self.icon_update = join(self.path, 'update.png')
+        self.icon_updates = join(self.path, 'get_updates.png')
+        self.icon_uptodate = join(self.path, 'uptodate.png')
+
+# Strings
+name = 'Keryx'
+subtitle = _('Bringing Updates Home.')
+version = '0.92.5'
+
+authors = 'Chris Oliver\nBuran Ayuthia\nmac9416\njacseen'
+email = '[e-mail]'
+artists = 'Chris Oliver'
+docwriters = 'Chris Oliver'
+translators = ''
+copyright = '(C) 2008-2009 Chris Oliver'
+description = name + _(' is a package manager for computers without internet.')
+license = name + ' is free software; you can redistribute ' \
+    'it and/or modify it under the terms of the GNU General Public ' \
+    'License as published by the Free Software Foundation; either ' \
+    'version 2 of the License, or (at your option) any later version.\n' \
+    'Keryx is distributed in the hope that it will be useful, but ' \
+    'WITHOUT ANY WARRANTY; without even the implied warranty of ' \
+    'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ' \
+    'General Public License for more details. You should have received ' \
+    'a copy of the GNU General Public License along with Keryx; if ' \
+    'not, write to the Free Software Foundation, Inc., 59 Temple ' \
+    'Place, Suite 330, Boston, MA  02111-1307 USA'
+
+# URLs
+bug_url = 'https://bugs.launchpad.net/keryx'
+donate_url = 'http://keryxproject.org/donate'
+help_url = 'http://keryxproject.org/forum'
+homepage_url = 'http://keryxproject.org'
+tutorial_url = join(cwd, 'doc', 'sphinx', 'tutorial.html')
+translate_url = 'https://translations.launchpad.net/keryx'
+
+# Directories
+locale_dir = abspath(join(cwd, 'locale'))
+log_dir = abspath(join(cwd, 'logs'))
+projects_dir = abspath(join(cwd, 'projects'))
+
+# Files
+log_path = join(log_dir, 'log')
+
+# UI assets paths
+pixmaps_dir = join(cwd, 'pixmaps')
+themes_dir = join(pixmaps_dir, 'themes')
+default_theme_dir = join(themes_dir, 'default')
+theme = Theme(default_theme_dir)
+
+# Logo
+ico_path = join(pixmaps_dir, 'keryx.ico')
+logo_path = join(pixmaps_dir, 'keryx.png')

=== removed file 'lib/config.py'
--- lib/config.py	2010-03-13 19:04:52 +0000
+++ lib/config.py	1970-01-01 00:00:00 +0000
@@ -1,113 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Author: Chris Oliver ([e-mail])
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-import consts
-import os.path
-#from gettext import gettext as _
-
-def genDir(val): 
-    return os.path.abspath(os.path.join(consts.cwd, val))
-
-def fromFile(filename):
-    # Import settings
-    try:
-        print 'Loading config: ' + filename
-        consts.file_config = filename
-        data = open(filename, 'r').read()
-        data = data.split('\n')
-        for item in data:
-            try:
-                key, val = item.split('=')
-                if key == 'LogDir': 
-                    consts.LogPath = val
-                    consts.dirLog = genDir(val)
-                    consts.fileLog = os.path.join(consts.dirLog, 'log')
-                if key == 'LocaleDir': 
-                    consts.LocalePath = val
-                    consts.dirLocale = genDir(val)
-#                if key == 'PackagesDir': 
-#                    consts.PackagesPath = val
-#                    consts.dirPackages = genDir(val)
-                if key == 'PixmapsDir': 
-                    consts.PixmapsPath = val
-                    consts.dirPixmaps = genDir(val)
-                    pixmapsChange()
-                if key == 'PluginsDir': 
-                    consts.PluginsPath = val
-                    consts.dirPlugins = genDir(val)
-                if key == 'ProjectsDir': 
-                    consts.ProjectsPath = val
-                    consts.dirProjects = genDir(val)
-                if key == 'ThemesDir': 
-                    consts.ThemesPath = val
-                    consts.dirThemes = genDir(val)
-                if key == 'DefaultTheme': 
-                    consts.ThemeDefaultPath = val
-                    consts.dirThemeDefault = genDir(val)
-                if key == 'CurrentTheme': 
-                    consts.CurrentThemePath = val
-                    consts.dirCurrentTheme = genDir(val)
-                    themeChange()
-                if key == 'HTTPProxy':
-                    consts.proxy_enabled = True
-                    consts.http_proxy = {'http':val}
-                if key == 'ProxyUsername': consts.proxy_username = val
-                if key == 'ProxyPassword': consts.proxy_password = val
-            except: pass
-        consts.file_config = filename # Set the file_config location, so that if the config is change, settings go back to there
-    except Exception, e: 
-        print e
-
-def pixmapsChange():
-    # Logo
-    consts.fileIco = os.path.join(consts.dirPixmaps,'keryx.ico')
-    consts.fileLogo = os.path.join(consts.dirPixmaps,'keryx.png')
-
-def themeChange():
-    """Load theme images"""
-    consts.icon_about = os.path.join(consts.dirCurrentTheme, 'about.png')
-    consts.icon_arrow_down = os.path.join(consts.dirCurrentTheme, 'arrow_down.png')
-    consts.icon_arrow_up = os.path.join(consts.dirCurrentTheme, 'arrow_up.png')
-    consts.icon_bug_report = os.path.join(consts.dirCurrentTheme, 'bug.png')
-    consts.icon_book_open = os.path.join(consts.dirCurrentTheme, 'book_open.png')
-    consts.icon_close = os.path.join(consts.dirCurrentTheme, 'close.png')
-    consts.icon_donate = os.path.join(consts.dirCurrentTheme, 'donate.png')
-    consts.icon_download = os.path.join(consts.dirCurrentTheme, 'download.png')
-    #icon_download_package = os.path.join(dirCurrentTheme, 'download_package.png')
-    consts.icon_downloaded = os.path.join(consts.dirCurrentTheme, 'downloaded.png')
-    consts.icon_error = os.path.join(consts.dirCurrentTheme, 'error.png')
-    consts.icon_find = os.path.join(consts.dirCurrentTheme, 'find.png')
-    consts.icon_help = os.path.join(consts.dirCurrentTheme, 'help.png')
-    consts.icon_home = os.path.join(consts.dirCurrentTheme, 'home.png')
-    consts.icon_install = os.path.join(consts.dirCurrentTheme, 'install.png')
-    consts.icon_layout = os.path.join(consts.dirCurrentTheme, 'layout.png')
-    consts.icon_new = os.path.join(consts.dirCurrentTheme, 'new.png')
-    consts.icon_open = os.path.join(consts.dirCurrentTheme, 'open.png')
-    consts.icon_options = os.path.join(consts.dirCurrentTheme, 'options.png')
-    consts.icon_package = os.path.join(consts.dirCurrentTheme, 'package.png')
-    consts.icon_plugin = os.path.join(consts.dirCurrentTheme, 'plugin.png')
-    consts.icon_plugin_add = os.path.join(consts.dirCurrentTheme, 'plugin_add.png')
-    consts.icon_plugin_disable = os.path.join(consts.dirCurrentTheme, 'plugin_disabled.png')
-    consts.icon_project_details = os.path.join(consts.dirCurrentTheme, 'project_details.png')
-    consts.icon_quit = os.path.join(consts.dirCurrentTheme, 'quit.png')
-    consts.icon_refresh = os.path.join(consts.dirCurrentTheme, 'refresh.png')
-    consts.icon_sources = os.path.join(consts.dirCurrentTheme, 'sources.png')
-    consts.icon_translate = os.path.join(consts.dirCurrentTheme, 'translate.png')
-    consts.icon_update = os.path.join(consts.dirCurrentTheme, 'update.png')
-    consts.icon_updates = os.path.join(consts.dirCurrentTheme, 'get_updates.png')
-    consts.icon_uptodate = os.path.join(consts.dirCurrentTheme, 'uptodate.png')

=== removed file 'lib/consts.py'
--- lib/consts.py	2010-03-13 19:04:52 +0000
+++ lib/consts.py	1970-01-01 00:00:00 +0000
@@ -1,150 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Author: Chris Oliver ([e-mail])
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-import os
-import sys
-from gettext import gettext as _
-
-cwd = os.path.abspath(os.path.dirname(sys.argv[0]))
-
-# Strings
-appName      = 'Keryx'
-appVersion   = '0.92.4'
-appNameShort = 'keryx'
-appFileExt   = '.keryx'
-appComments  = _('Bringing Updates Home.')
-filterDesc = _('Keryx Project Files') + ' | (*' + appFileExt + ')'
-
-authors = 'Chris Oliver\nBuran Ayuthia\nmac9416\njacseen'
-email = '[e-mail]'
-artists = 'Chris Oliver'
-docwriters = 'Chris Oliver'
-translators = ''
-copyright = '(C) 2008-2009 Chris Oliver'
-description = appName + _(' is a package manager for computers without internet.')
-license = appName + _(""" is free software; you can redistribute it and/or 
-modify it under the terms of the GNU General Public License as published by the 
-Free Software Foundation; either version 2 of the License, or (at your option) 
-any later version.
-
-Keryx is distributed in the hope that it will be useful, but WITHOUT ANY 
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
-PARTICULAR PURPOSE. See the GNU General Public License for more details. You 
-should have received a copy of the GNU General Public License along with Keryx; 
-if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 
-330, Boston, MA  02111-1307  USA""")
-
-welcome_message = _('Welcome to ') + appName
-
-parameters="""
-Command line parameters:
--h or --help                            Displays this message
--v or --version                         Displays Keryx version number
---create <project name> <plugin name>   Creates a new project in the default 
-                                          directory with name of <project name>
-                                          and type project <plugin name>
---config <file>                         Uses <file> to as configuration file\n"""
-
-# Proxy
-proxy_enabled = False
-http_proxy = {}
-proxy_username = ''
-proxy_password = ''
-
-# URLs
-urlBug = 'https://bugs.launchpad.net/keryx'
-urlDonate = 'http://keryxproject.org/donate'
-urlHelp = 'http://keryxproject.org/forum'
-urlHomepage = 'http://keryxproject.org'
-urlTutorial = os.path.join(os.path.join(cwd, 'doc'), 'Tutorial.html')
-urlTranslate = 'https://translations.launchpad.net/keryx'
-
-columns = [(_("S"), 50), (_("Package Name"), 200), (_("Installed Version"), 200), (_("Latest Version"), 200), (_("Description"), 200)]
-
-# Directories
-LocalePath = 'locale'
-LogPath = 'logs'
-#PackagesPath = 'packages'
-PixmapsPath = 'pixmaps'
-PluginsPath = 'plugins'
-ProjectsPath = 'projects'
-ThemesPath = PixmapsPath + '/themes'
-ThemeDefaultPath = ThemesPath + '/default'
-CurrentThemePath = ThemeDefaultPath
-
-dirLocale = os.path.abspath(os.path.join(cwd, LocalePath))
-dirLog = os.path.abspath(os.path.join(cwd, LogPath))
-#dirPackages = os.path.abspath(os.path.join(cwd, PackagesPath))
-dirPixmaps = os.path.abspath(os.path.join(cwd, PixmapsPath))
-dirPlugins = os.path.abspath(os.path.join(cwd, PluginsPath))
-dirProjects = os.path.abspath(os.path.join(cwd, ProjectsPath))
-dirThemes = os.path.abspath(os.path.join(cwd, ThemesPath))
-dirThemeDefault = os.path.abspath(os.path.join(cwd, ThemeDefaultPath))
-dirCurrentTheme = os.path.abspath(os.path.join(cwd, CurrentThemePath))
-
-# Files
-configFilename = appNameShort + '.conf'
-file_config = os.path.join(cwd, configFilename)
-fileLog   = os.path.join(dirLog, 'log')
-
-# Filetypes
-wildcard = '%s (*.keryx)|*.keryx|' \
-           '%s (*.*)|*.*' % (_("Keryx project"), _("All files"))
-wildcard_plugin = '%s (*.py)|*.py|' \
-                  '%s (*.*)|*.*' % (_("Python File"), _("All files"))
-
-# Logo
-fileIco = os.path.join(dirPixmaps,'keryx.ico')
-fileLogo = os.path.join(dirPixmaps,'keryx.png')
-
-# Load theme images
-icon_about = os.path.join(dirCurrentTheme, 'about.png')
-icon_arrow_down = os.path.join(dirCurrentTheme, 'arrow_down.png')
-icon_arrow_up = os.path.join(dirCurrentTheme, 'arrow_up.png')
-icon_book_open = os.path.join(dirCurrentTheme, 'book_open.png')
-icon_bug_report = os.path.join(dirCurrentTheme, 'bug.png')
-icon_close = os.path.join(dirCurrentTheme, 'close.png')
-icon_donate = os.path.join(dirCurrentTheme, 'donate.png')
-icon_download = os.path.join(dirCurrentTheme, 'download.png')
-#icon_download_package = os.path.join(dirCurrentTheme, 'download_package.png')
-icon_downloaded = os.path.join(dirCurrentTheme, 'downloaded.png')
-icon_error = os.path.join(dirCurrentTheme, 'error.png')
-icon_find = os.path.join(dirCurrentTheme, 'find.png')
-icon_help = os.path.join(dirCurrentTheme, 'help.png')
-icon_home = os.path.join(dirCurrentTheme, 'home.png')
-icon_install = os.path.join(dirCurrentTheme, 'install.png')
-icon_layout = os.path.join(dirCurrentTheme, 'layout.png')
-icon_new = os.path.join(dirCurrentTheme, 'new.png')
-icon_open = os.path.join(dirCurrentTheme, 'open.png')
-icon_options = os.path.join(dirCurrentTheme, 'options.png')
-icon_package = os.path.join(dirCurrentTheme, 'package.png')
-icon_plugin = os.path.join(dirCurrentTheme, 'plugin.png')
-icon_plugin_add = os.path.join(dirCurrentTheme, 'plugin_add.png')
-icon_plugin_disable = os.path.join(dirCurrentTheme, 'plugin_disabled.png')
-icon_project_details = os.path.join(dirCurrentTheme, 'project_details.png')
-icon_quit = os.path.join(dirCurrentTheme, 'quit.png')
-icon_refresh = os.path.join(dirCurrentTheme, 'refresh.png')
-icon_sources = os.path.join(dirCurrentTheme, 'sources.png')
-icon_translate = os.path.join(dirCurrentTheme, 'translate.png')
-icon_update = os.path.join(dirCurrentTheme, 'update.png')
-icon_updates = os.path.join(dirCurrentTheme, 'get_updates.png')
-icon_uptodate = os.path.join(dirCurrentTheme, 'uptodate.png')
-
-#color_error = wx.Color(255,118,106)
-#color_update = "light blue"
-#color_uptodate = wx.Color(150, 235, 140)

=== added file 'lib/debian.py'
--- lib/debian.py	1970-01-01 00:00:00 +0000
+++ lib/debian.py	2017-06-11 16:11:12 +0000
@@ -0,0 +1,530 @@
+# -*- coding: utf-8 -*-
+#
+# Author: Chris Oliver ([e-mail])
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+import os
+import platform
+import shutil
+import subprocess
+from gettext import gettext as _
+from os.path import join as path_join
+
+import lib
+from lib import config
+from lib import log
+from lib import run_root
+from lib.source import Source
+from lib.package import Package
+from lib.version import version_compare
+
+
+FILE = 'debian.conf'
+
+# Set this plugin's attributes
+NAME = 'Debian'
+TYPE = 'OS'
+VERSION = '0.92.4'
+AUTHOR = 'Chris Oliver <[e-mail]>'
+
+
+def is_os():
+    """Determines whether the current OS uses APT
+    
+    :return: true if the current OS uses APT, false otherwise
+    :rtype: bool
+    """
+    return os.path.exists('/etc/apt/')
+
+
+def create_project(name):
+    """Creates project files
+    
+    :param str name: the name of the new project being created
+    """
+    dir_new = path_join(config.projects_dir, name)
+
+    # Copy relevant files to the project directory.
+    __grab_files(dir_new)
+
+    # Write project info to a file in the project directory.
+    with open(path_join(dir_new, FILE), 'w') as outfile:
+        outfile.write('Computer Name: %s\n' % get_comp_name() +
+                      'OS Name: %s\n' % get_os_name() +
+                      'OS Version: %s\n' % get_os_version() +
+                      'Architecture: %s\n' % get_os_arch() +
+                      'Kernel: %s\n' % get_kernel_name())
+
+
+def load_local_package_list(directory, arch):
+    """Load package information from locally-stored lists.
+    
+    :param str directory: the directory to load lists from
+    :param str arch: the OS architecture to load lists for
+    :return: a dict populated with package information
+    :rtype: dict
+    """
+    list_dir = path_join(directory, 'lists')
+    debs = __parse_sources(directory)
+    filenames = __files_from_debs(debs, arch)
+    installed = __get_installed(directory)
+
+    # Initialize vars
+    packages = {}
+
+    for item in filenames:
+        # TODO: better enforce zipping/unzipping of list files.
+        path = path_join(list_dir, item)
+        if not os.path.exists(path):
+            path = path.strip('.gz')
+        with open(path, 'r') as data:
+            url = 'http://%s' % item.split('_dists')[0].replace('_', '/')
+            # Append all packages to list
+            packages = __read_packages(data, installed, packages, url)
+
+    return packages
+
+
+def load_remote_package_list(directory, arch):
+    """Get information to load package lists from the project's repos.
+    
+    :param str directory: the project's directory, to load source info from
+    :param str arch: '32bit' or '64bit'
+    :return: pairs of (url, destination) pairs
+    :rtype: list(list)
+    """
+    list_dir = path_join(directory, 'lists')
+    debs = __parse_sources(directory)
+    # TODO: extract hashes for list files from Release files
+    # and 'return zip(urls, temp_names, checksums)' instead
+    temp_names = __files_from_debs(debs, arch, list_dir)
+    urls = __urls_from_debs(debs, arch)
+
+    # FIXME: don't return a list, just fix everything that expects a list
+    # instead of an iterator.
+    return list(zip(urls, temp_names))  # Returns urls, gzip file locations
+
+
+def get_dependencies(directory, all_packages, package_name):
+    """Takes package name and returns package information for each dependency 
+    (recursive).
+    
+    :param str directory: the directory to place downloaded packages in
+    :param dict all_packages: the dict holding all the package info
+    :param str package_name: the name of the package to get dependencies for
+    :return: a list of URLs to download package dependencies
+    :rtype: list(str)
+    """
+    urls = []
+    if package_name not in all_packages:
+        return {}
+    values = all_packages.get(package_name)
+    depends = values.depends.split(', ')
+    depends += values.recommends.split(', ')  # APT treats recommends as depends
+    depends += values.pre_depends.split(', ')  # pre-depends are important too
+    filename = values.filename.split('/')  # Get the parts for the pkg filename
+    urls.append((values.filename,
+                 path_join(directory, filename[-1]),
+                 values.checksums))
+    values.installed_version = values.version
+    all_packages[package_name] = values
+
+    for item in depends:
+        data = item.split()
+        if not data == []:
+            # Get dependencies for this package too if it isn't already
+            # installed
+            if data[0] in all_packages \
+                    and not all_packages.get(data[0]).installed_version:
+                urls += get_dependencies(directory,
+                                         all_packages,
+                                         data[0])
+
+    return urls
+
+
+def get_sources(directory):
+    """Get the filename of main sources file, relative to directory.
+    
+    :param str directory: the directory holding APT state files
+    :return: the path to the sources.list file
+    :rtype: str
+    """
+    return path_join(directory, 'sources', 'sources.list')
+
+
+def install_cache(project_dir, script_name, move=False):
+    """Transfer index files to the APT cache. Uses sh script called as 'root'.
+    
+    :param str project_dir: the directory holding the project
+    :param str script_name: the name of the script which will place the files
+    :param bool move: flags whether files should be moved rather than copied
+    :return: flag whether the process was successful
+    :rtype: bool
+    """
+    packs_dir = path_join(project_dir, 'packages')
+    # Make sure there are packages to install
+    if not os.path.exists(packs_dir):
+        log.error(_('%s does not exist: no packages to be installed') %
+                  packs_dir)
+        return False
+
+    # If we're missing the partial dir, APT will throw a fit.
+    partial_dir = path_join(packs_dir, 'partial')
+    if not os.path.exists(partial_dir):
+        os.mkdir(partial_dir)
+
+    script_path = path_join(project_dir, '%s.sh' % script_name)
+    shutil.copyfile(path_join(config.cwd, 'lib', 'install.sh'), script_path)
+
+    if move:
+        transfer = '-move'
+    else:
+        transfer = ''
+
+    log.info(_('install_cache: launching script as root'))
+    run = run_root('sh', '%s %s %s' % (script_path, project_dir, transfer))
+    if run[0] != 0:
+        log.error('exit code:%i\n%s' % (run[0], run[1]))
+        log.info(_('install_cache: failed'))
+        return False
+    log.info(_('install_cache: transfer success'))
+    return True
+
+
+def install_packs(project_dir, pack_names):
+    """Install the listed packages using downloaded package files in the given
+    project directory.
+    
+    :param str project_dir: the directory of the current project
+    :param list(str) pack_names: names of the packages to be installed
+    :return: a flag whether the process was successful
+    :rtype: bool
+    """
+    packs_dir = path_join(project_dir, 'packages')
+    run = run_root('xterm',
+                   '-e sh -c \"apt-get -y -o '
+                   'dir::cache::archives=\\\"%s\\\" '
+                   '--allow-unauthenticated install %s; echo \\\"'
+                   'Press [ENTER] to exit.\\\"; '
+                   'read x\"' % (packs_dir, pack_names))
+    if run[0] != 0:
+        log.error(_('exit code:%i\n%s' % (run[0], run[1])))
+        log.info(_('Failed to start Xterm as root'))
+        return False
+    return True
+
+
+def update_status(out_dir, status_path='/var/lib/dpkg/status'):
+    """Update the project's status file (list of installed packages).
+    
+    :param str out_dir: the directory to place the status file in
+    :param str status_path: the path to the new status file
+    :return: a flag whether the process was successful
+    :rtype: bool
+    """
+    lists_dir = path_join(out_dir, 'lists')
+    outfile = path_join(lists_dir, 'status')
+    outfile_bak = path_join(lists_dir, 'status.bak')
+    # Back up the current status file.
+    run_root('cp', '%s %s' % (outfile, outfile_bak))
+    # Copy in the new status file.
+    run_root('cp', '%s %s' % (status_path, outfile))
+    # TODO: check for error from 'cp', return False
+    return True  # Everything went well.
+
+
+def __read_packages(infile, installed, packages, main_url=''):
+    """Read package info from the given index file, include information from the
+    list of currently-installed packages, and add it to the current list of
+    packages.
+    
+    :param File infile: the opened index file to read package data from
+    :param list installed: the list of packages installed on the system
+    :param dict packages: the list of already-parsed packages
+    :return: packages dictionary with additional package info added
+    :rtype: dict
+    """
+    # Create a new package object. We don't know its name yet.
+    current = Package('', checksums={})
+
+    for line in infile:
+        # Excuse how unreadable this next section is. It could be implemented by
+        # checking .startswith('Keyname:') for each one, but that's slow. Don't
+        # Try to narrow these down further unless you get a full listing of
+        # index file key names. False positives abound.
+        if line[0] == 'P':
+            # Pre-depends
+            if line[0:3] == 'Pre':
+                current.pre_depends = line[13:-1]
+            # Package
+            elif line[0:8] == 'Package:':
+                current.name = line[9:-1]
+        # Version
+        elif line[0] == 'V' and line[0:3] == 'Ver':
+            current.version = line[9:-1]
+        elif line[0] == 'D':
+            # Depends
+            if line[0:3] == 'Dep':
+                current.depends = line[9:-1]
+            # Description
+            elif line[0:12] == 'Description:':
+                current.description = lib.utf(line[13:-1])
+        # Filename
+        elif line[0] == 'F':
+            current.filename = lib.join_url(main_url, line[10:-1])
+        elif line[0] == 'S':
+            # Size
+            if line[1] == 'i':
+                current.size = int(line[6:-1])
+            # SHA1
+            elif line[3] == '1':
+                current.checksums['SHA1'] = line[6:-1]
+            # SHA256
+            elif line[3] == '2':
+                current.checksums['SHA256'] = line[8:-1]
+        # Recommends
+        elif line[0] == 'R' and line[0:3] == 'Rec':
+            current.recommends = line[12:-1]
+        # MD5sum
+        elif line[0] == 'M' and line[1] == 'D':
+            current.checksums['MD5sum'] = line[8:-1]
+        elif line[0] == '\n' and current.name != '':
+            # Finished reading this package, append it
+            # Set the packages installed version
+            __update_package(current, installed, packages)
+            packages[current.name] = current
+            current = Package('', checksums={})
+
+    return packages
+
+
+def __update_package(package, installed, packages):
+    """Update package information based on packages already installed.
+    
+    :param Package package: the package to be compared to installed packages
+    :param dict installed: the dict of currently installed packages
+    :param dict packages: the dict of already-parsed packages
+    """
+    # Package already exists so update values if need be
+    if package.name in packages:
+        if version_compare(packages[package.name].version, package.version) \
+                == 2:
+            return  # If it's an older one, skip it
+
+    # If there's no installed version, move on.
+    if package.name not in installed:
+        return
+
+    installed_version = installed[package.name].version
+    package.status = version_compare(installed_version, package.version)
+    package.installed_version = installed_version
+
+    packages[package.name] = package  # Set package info
+
+
+def __grab_files(directory):
+    """Grab files necessary for a Debian project.
+    
+    :param str directory: the directory to place APT files in
+    """
+    dir_lists = path_join(directory, 'lists')
+    dir_sources = path_join(directory, 'sources')
+
+    shutil.copytree('/etc/apt/', dir_sources)
+    try:
+        shutil.copytree('/var/lib/apt/lists/', dir_lists)
+    except shutil.Error:
+        # Certain files in this directory require root. There's no more specific
+        # error to catch. If for some reason not all the necessary files get
+        # copied, that'll be dealt with in the code that uses them.
+        pass
+    shutil.copyfile('/var/lib/dpkg/status',
+                    path_join(dir_lists, 'status'))
+    shutil.copyfile('/var/lib/dpkg/status',
+                    path_join(dir_lists, 'status.bak'))
+
+
+def __parse_sources(directory):
+    """Get a list of all deb entries for project.
+    
+    :param str directory: the directory holding source files to be parsed
+    :return: a list of deb source lines from source files in the given dir
+    :rtype: list
+    """
+    sources = []
+    sources_dir = path_join(directory, 'sources')
+
+    # Parse main source file
+    main_source = path_join(sources_dir, 'sources.list')
+    if os.path.exists(main_source):
+        sources += __parse_source_file(main_source)
+
+    # Parse extra source files
+    sources_d_dir = path_join(sources_dir, 'sources.list.d')
+    if os.path.exists(sources_d_dir):
+        for item in os.listdir(sources_d_dir):
+            if item.endswith('.list'):
+                sources += __parse_source_file(path_join(sources_d_dir, item))
+
+    return sources
+
+
+def __parse_source_file(location):
+    """Get a specific source file's deb (repo/source) entries.
+    
+    :param str location: the path to the source file to be parsed
+    :return: a list of deb lines from this file
+    :rtype: list
+    """
+    found = []
+    infile = open(location)
+    for line in infile:
+        # TODO: Add support for more protocols
+        if line.startswith('deb http://'):
+            if line.endswith('\n'):
+                found.append(line[:-1])
+            else:
+                found.append(line)
+    return found
+
+
+def __files_from_debs(deb_list, arch, directory=''):
+    """Generates package index filenames based on the given entries from source 
+    file "deb" entries.
+    
+    :param list deb_list: a list of deb source lines 
+    :param str arch: either '32bit' or '64bit'
+    :param str directory: the directory to prepend to the retrieved filenames
+    :return: the file names/paths for the index files related to the given repos
+    :rtype: generator
+    """
+    for line in deb_list:
+        source = Source(line, arch)
+        for filename in source.filenames:
+            path = path_join(directory, filename)
+            yield path
+
+
+def __urls_from_debs(deb_list, arch):
+    """Return URLs for all index files associated with the repos specified in
+    deb_list.
+    
+    :param list deb_list: a list of deb source lines
+    :param str arch: either '32bit' or '64bit'
+    :return: the URLs for the index files related to the given repos
+    :rtype: generator
+    """
+    for line in deb_list:
+        source = Source(line, arch)
+        for url in source.urls:
+            yield url
+
+
+def __get_installed(directory):
+    """Get a list of installed packages.
+    
+    :param str directory: the directory holding package info files
+    :return: a dict of installed Packages with package.name as their keys
+    :rtype: dict(Package)
+    """
+    with open(path_join(directory, 'lists', 'status'), 'r') as status:
+        installed = {}
+        current = Package('')
+        for line in status:
+            if line.startswith('Package:'):
+                current.name = line[9:-1]
+            elif line.startswith('Version:'):
+                current.version = line[9:-1]
+            elif line.startswith('Status:'):
+                current.status = line[8:-1]
+            elif line.startswith('\n') \
+                    and current.status == 'install ok installed':
+                installed[current.name] = current
+                current = Package('')
+
+    return installed
+
+
+def get_comp_name():
+    """Get the name of this computer.
+    
+    :return: the name of this computer
+    :rtype: str
+    """
+    system, node, release, version, machine, processor = platform.uname()
+    return system
+
+
+def get_os_name():
+    """Get the name of this computers operating system.
+    
+    :return: the computer's OS name
+    :rtype: str
+    """
+    process = subprocess.run(['cat', '/etc/issue.net'], stdout=subprocess.PIPE)
+    output = str(process.stdout)
+    if process.returncode != 0:
+        log.error(_('Problem retrieving Debian version'))
+    os_name = output.split()[0]
+    return os_name
+
+
+def get_os_version():
+    """Get the version of this computer's operating system.
+    
+    :return: the OS version
+    :rtype: str
+    """
+    process = subprocess.run(['cat', '/etc/issue.net'], stdout=subprocess.PIPE)
+    output = str(process.stdout)
+    if process.returncode != 0:
+        log.error(_('Problem retrieving Debian version'))
+    os_version = output.split()[1]
+    return os_version
+
+
+def get_os_arch():
+    """Get the architecture of this computer's operating system. Return value is 
+    either '32bit' or '64bit'.
+    
+    :return: the OS's architecture
+    :rtype: str
+    """
+    # platform doesn't reliably get the architecture when compiled. So get
+    # it more cleverly.
+    process = subprocess.run(['apt-get', '-v'], stdout=subprocess.PIPE)
+    apt_version = str(process.stdout)
+    if 'i386' in apt_version:
+        os_arch = '32bit'
+    elif 'amd64' in apt_version:
+        os_arch = '64bit'
+    else:
+        log.error(_('Unable to detect architecture. Defaulting to 64-bit. '
+                    'If this is incorrect, edit your project\'s '
+                    'debian.conf.'))
+        os_arch = '64bit'
+    return os_arch
+
+
+def get_kernel_name():
+    """Get the name of this computer's kernel.
+    
+    :return: the name of the kernel
+    :rtype: str
+    """
+    system, node, release, version, machine, processor = platform.uname()
+    return release

=== added file 'lib/install.sh'
--- lib/install.sh	1970-01-01 00:00:00 +0000
+++ lib/install.sh	2017-06-11 16:11:12 +0000
@@ -0,0 +1,101 @@
+#!/bin/sh -
+#
+# Keryx 0.92.4 install script
+#
+# Used to transfer the necessary files back to a computer
+# from a project so that the downloaded packages can
+# be installed.
+#
+# Usage <script.sh> [<project directory>] ['-move']
+#
+# written by jacseen, class=amateur :)
+# http://keryxproject.org   mailto:[e-mail]
+
+if [ -n "$1" ] && [ -e "$1" ]
+then
+proj="$1"
+shift
+else
+proj="$(pwd)"
+fi
+cd "$proj"
+
+if [ -n "$1" ] && [ "$1" = "-move" ]
+then
+transfer="mov"
+else
+transfer="copy"
+fi
+
+slists=lists
+tlists=/var/lib/apt/lists
+#spacks=packages
+#tpacks=/var/cache/apt/archives
+ssources=sources
+tsources=/etc/apt
+
+#Find all index files, skipping the 'status' files and copy them
+cd ./"$slists"/
+if [ ! $? = 0 ] #if cannot cd into lists, not project dir
+then
+echo "Not project dir: $(pwd)"
+exit 65
+fi
+filelist=`find -maxdepth 1 -iname '*_dists_*'`
+
+#TODO:attain lock on folder $tlists to be package-manager-friendly
+# will be attained directly with python in later versions
+
+for fn in $filelist
+do
+cp -t "$tlists" "$fn"
+if [ ! $? = 0 ]
+then
+    echo "Failure when copying list: $fn"
+    exit 66
+fi
+done
+
+#TODO:release lock on folder $tlists
+
+### Debs will no longer be moved to the cache. The downloads directory will ###
+### Be made Temporary cache. ###
+
+#Find all downloaded packages and move to cache
+#cd ../"$spacks"/
+#filelist=`find -maxdepth 1 -name '*.deb'`
+
+#TODO:attain lock on folder $tpacks to be package-manager-friendly
+# will be attained directly with python in later versions
+
+#for fn in $filelist
+#do
+#    if [ $transfer = "mov" ]
+#    then
+#        mv -f -t "$tpacks" "$fn"
+#    else
+#        cp -t "$tpacks" "$fn"
+#    fi
+#    if [ ! $? = 0 ]
+#    then
+#        echo "Failure when ${transfer}ing package: $fn"
+#        exit 67
+#    fi
+#done
+
+#TODO:release lock on folder $tpacks
+
+#Update the main sources.list file in case it was changed in keryx
+
+cd ../"$ssources"/
+cp -t "$tsources" "sources.list"
+if [ ! $? = 0 ]
+then
+echo "Failure when copying sources.list"
+exit 68
+fi
+
+# Update the APT caches with the latest lists
+apt-cache gencaches
+
+exit 0
\ No newline at end of file

=== modified file 'lib/log.py'
--- lib/log.py	2010-02-20 04:17:16 +0000
+++ lib/log.py	2017-06-11 16:11:12 +0000
@@ -16,36 +16,40 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-import consts
+from . import config
 import logging
 import os
-import sys
 
 from logging.handlers import RotatingFileHandler
 
 # Make sure the directory exists
-if not os.path.exists(consts.dirLog): 
-    os.mkdir(consts.dirLog)
-
-try:
-    __logHandler = RotatingFileHandler(consts.fileLog, maxBytes=0, backupCount=2)
-    __logHandler.doRollover()
-    __logHandler.setFormatter(logging.Formatter('[%(asctime)s] %(levelname)-7s %(message)s', datefmt='%y-%m-%d %H:%M:%S'))
-
-    logger = logging.getLogger(consts.appNameShort)
-    logger.setLevel(logging.INFO)
-    logger.addHandler(__logHandler)
-except:
-    print 'Unable to start Keryx'
-    print 'Make sure no other instances of Keryx are still running.'
-    sys.exit(1)
+if not os.path.exists(config.log_dir):
+    os.mkdir(config.log_dir)
+
+__logHandler = RotatingFileHandler(config.log_path, maxBytes=0, backupCount=2)
+__logHandler.doRollover()
+__logHandler.setFormatter(
+    logging.Formatter('[%(asctime)s] %(levelname)-7s %(message)s',
+                      datefmt='%y-%m-%d %H:%M:%S'))
+
+logger = logging.getLogger(config.name.lower())
+logger.setLevel(logging.INFO)
+logger.addHandler(__logHandler)
+
 
 def info(status):
-    """Prints status to log file and to console"""
+    """Print status to log file and to console.
+    
+    :param str status: the status to be logged
+    """
     logger.info(status)
-    print status
+    print(status)
+
 
 def error(status):
-    """Prints error to log file and to console"""
+    """Print error to log file and to console.
+    
+    :param str status: the status to be logged
+    """
     logger.error(status)
-    print status
+    print(status)

=== added file 'lib/package.py'
--- lib/package.py	1970-01-01 00:00:00 +0000
+++ lib/package.py	2017-06-11 16:11:12 +0000
@@ -0,0 +1,43 @@
+class Package:
+    """Represents a package in the APT system, as described in the lists from
+    some package repository.
+    """
+    def __init__(self,
+                 name,
+                 version='',
+                 description='',
+                 filename='',
+                 size='',
+                 depends='',
+                 recommends='',
+                 pre_depends='',
+                 checksums=None,
+                 status='',
+                 installed_version=''):
+        """Sets the initial values for this Package.
+        
+        :param str name: the name of this package
+        :param str version: the version of this package
+        :param str description: the description of this package
+        :param str filename: the filename of this package
+        :param str size: the size of this package
+        :param list depends: a list of packages this one depends on
+        :type depends: None or list
+        :param recommends: a list of packages this one recommends
+        :type recommends: None or list
+        :param pre_depends: a list of pre-dependencies for this package
+        :type pre_depends: None or list
+        :param checksums: a dictionary of algorithm: checksum pairs
+        :type checksums: None or dict
+        """
+        self.name = name
+        self.version = version
+        self.description = description
+        self.filename = filename
+        self.size = size
+        self.depends = depends
+        self.recommends = recommends
+        self.pre_depends = pre_depends
+        self.checksums = checksums
+        self.status = status
+        self.installed_version = installed_version

=== removed file 'lib/plugins.py'
--- lib/plugins.py	2010-02-20 04:17:16 +0000
+++ lib/plugins.py	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Author: Chris Oliver ([e-mail])
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-import consts
-import os.path
-import re
-import sys
-
-import log
-
-OSPluginList = []
-InterfacePluginList = []
-app = None
-fail = False
-
-class pluginBase(object):
-    """Used to make sure plugins have necessary functions"""
-    def __init__(self):                pass
-    def IsOS(self):                    pass
-    def cleanup(self):                 pass
-
-    # Interface plugins
-    def getWidgets(self, instance):    self.app = instance
-
-    # OS Plugins
-    def createProject(self):           pass
-    def loadProject(self):             pass
-    def loadLocalPackageList(self):    pass
-    def loadInternetPackageList(self): pass
-    def getDependencies(self):         pass
-    def getSources(self):              pass
-    def installCache(self):            pass
-    def installRepo(self):             pass
-
-
-def load(dir, instance, load_interface_plugins=True):
-    """Enumerates a list of plugins in a directory"""
-    app = instance
-
-    # Make sure dir exists
-    if not os.path.isdir(dir):
-        log.info(_('Cannot find ') + consts.dirPlugins + _(', exiting.'))
-        return
-
-    # Try to load each file in plugins dir
-    sys.path.insert(0, dir)
-    for file in os.listdir(dir):
-        if file.endswith('.py'):
-            status = initialize(file)
-            if status != None: # Plugin loaded correctly
-                status[1].getWidgets(instance) # Give all interface plugins widget tree
-                # FIXME: Give plugins that have the attribute set only
-                if status[2] == 'OS':          OSPluginList.append(status)
-                elif status[2] == 'Interface' and load_interface_plugins:
-                    #status[1].getWidgets(instance) # Give all interface plugins widget tree
-                    InterfacePluginList.append(status)
-
-    if fail: log.info(_('Plugin(s) have failed to load. This may be due to not having python-wxversion installed.'))
-
-def initialize(file):
-    """Initializes plugin given filename and returns its instance"""
-    try:
-        plugin = __import__(re.sub('\.pyc?$', '', file))
-        if not hasattr(plugin, 'PLUGIN_NAME'): return
-        name = getattr(plugin, 'PLUGIN_NAME')
-        instance = getattr(plugin, name)()
-        ptype = getattr(plugin, 'PLUGIN_TYPE')
-        version = getattr(plugin, 'PLUGIN_VERSION')
-        log.info(_('Plugin loaded: ') + file[:-3] + ' v' + version)
-        return [name, instance, ptype, version]
-    except Exception, e:
-        log.error(file + _(' failed to load.'))
-        log.error(e)

=== modified file 'lib/project.py'
--- lib/project.py	2010-02-20 04:17:16 +0000
+++ lib/project.py	2017-06-11 16:11:12 +0000
@@ -17,104 +17,114 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 import os
-from threading import Thread
-
-import consts
-import log
-import plugins
+
+import time
+
+from lib import debian
+from . import config
+from . import log
 
 # Make sure the directory exists
-if not os.path.exists(consts.dirProjects): 
-    os.mkdir(consts.dirProjects)
-
-# List of currently opened projects
-projects = []
+if not os.path.exists(config.projects_dir):
+    os.mkdir(config.projects_dir)
+
+# The currently-opened project
+current = None
+
+
+class ProjectExistsException(Exception):
+    pass
+
+
+def create_project(project_name):
+    """Create a project with the given name and plugin."""
+    # Get the full path of the new project's directory
+    project_dir = os.path.join(config.projects_dir, project_name)
+
+    # Make sure a project by that name doesn't already exist
+    if os.path.exists(project_dir):
+        raise ProjectExistsException
+
+    # Write the basic project information to the project directory
+    os.mkdir(project_dir)
+
+    # Write the remaining project information to the project file
+    debian.create_project(project_name)
+
+    log.info('Created project: ' + project_name)
+
 
 class Project(object):
     """Stores project information and common tasks"""
-    def __init__(self, name="", dir="", plugin="", comp="", os="", ver="", arch="", kernel=""):
+    def __init__(self,
+                 name='',
+                 directory='',
+                 plugin=None,
+                 comp='',
+                 os_name='',
+                 ver='',
+                 arch='',
+                 kernel=''):
         self.name = name
-        self.dir = dir
+        self.dir = directory
         self.plugin = plugin
-        self.computername = comp
-        self.os = os
-        self.version = ver
-        self.architecture = arch
-        self.kernel = kernel
+        self.comp_name = comp
+        self.os_name = os_name
+        self.os_version = ver
+        self.os_arch = arch
+        self.kernel_name = kernel
         self.packages = {}
 
-    def GetData(self):
-        return [self.name, self.dir, self.os, self.version, self.architecture, self.kernel]
+    def get_data(self):
+        return [self.name,
+                self.dir,
+                self.os_name,
+                self.os_version,
+                self.os_arch,
+                self.kernel_name]
 
-    def SetData(self, name="", dir="", plugin="", comp="", os="", ver="", arch="", kernel=""):
+    def set_data(self,
+                 name='',
+                 directory='',
+                 plugin=None,
+                 comp='',
+                 os_name='',
+                 ver='',
+                 arch='',
+                 kernel=''):
         self.name = name
-        self.dir = dir
+        self.dir = directory
         self.plugin = plugin
-        self.computername = comp
-        self.os = os
-        self.version = ver
-        self.architecture = arch
-        self.kernel = kernel
-
-
-
-    """Project manipulation functions"""
-
-    def CreateKeryx(self, name, pluginName, plugin):
-        """Creates a project"""
-        try:
-        #if 1:
-            dirProj = os.path.join(consts.dirProjects, name)
-            if os.path.exists(dirProj): return False, '' # False, '' means that files were changed
-            filename = os.path.join(dirProj, name) + consts.appFileExt
-            os.mkdir(dirProj)
-            projFile = open(filename, 'wb')
-            projFile.write(name + '\n' + pluginName)
-            projFile.close()
-            log.info('Created project: ' + name)
-            plugin.createProject(name) #Create plugin information
-            return True, filename
-        except:
-            return False, name
-
-    def OpenKeryx(self, name):
+        self.comp_name = comp
+        self.os_name = os_name
+        self.os_version = ver
+        self.os_arch = arch
+        self.kernel_name = kernel
+
+    def open_project(self, name):
         """Opens a project"""
-        try:
-            infile = open(name, 'rb')
-            data = infile.read()
-            infile.close()
-            data = data.split('\n')
-
-            self.name = data[0]
-            self.dir = os.path.dirname(name)
-            self.plugin_name = data[1]
-
-            #Initialize plugin
-            for item in plugins.OSPluginList:
-                if item[0] == data[1]:
-                    self.plugin = item[1] # Set plugin to correct one
-                    info = self.plugin.loadProject(self.dir)
-
-                    self.computername = info[0]
-                    self.os = info[1]
-                    self.version = info[2]
-                    self.architecture = info[3]
-                    self.kernel = info[4]
-
-                    return True
-        except: 
-            return False
-
-    def getDependencies(self, package):
+        self.name = name
+        self.dir = os.path.join(config.projects_dir, name)
+
+        self.comp_name = debian.get_comp_name()
+        self.os_name = debian.get_os_name()
+        self.os_version = debian.get_os_version()
+        self.os_arch = debian.get_os_arch()
+        self.kernel_name = debian.get_kernel_name()
+
+    def get_dependencies(self, package):
         """Gets dependencies for package"""
-        return self.plugin.getDependencies(os.path.join(self.dir, 'packages'), self.packages, package)
-
-    def getUrls(self):
-        return self.plugin.loadInternetPackageList(self.dir, self.architecture)
-
-    def loadLocal(self, jobID, abortEvent):
-        self.packages = self.plugin.loadLocalPackageList(self.dir, self.architecture)
+        return debian.get_dependencies(os.path.join(self.dir, 'packages'),
+                                       self.packages,
+                                       package)
+
+    def get_urls(self):
+        return debian.load_remote_package_list(self.dir, self.os_arch)
+
+    def load_local(self, jobID, abortEvent):
+        self.packages = debian.load_local_package_list(self.dir, self.os_arch)
+
         return True
 
-    def getSources(self):
-        return self.plugin.getSources(self.dir)
+    def get_sources(self):
+        return debian.get_sources(self.dir)

=== added file 'lib/source.py'
--- lib/source.py	1970-01-01 00:00:00 +0000
+++ lib/source.py	2017-06-11 16:11:12 +0000
@@ -0,0 +1,41 @@
+from lib import join_url
+
+
+class Source:
+    """Represents a line from an APT sources file."""
+    def __init__(self, line, arch):
+        """Sets up the source's information based on the given deb line.
+        
+        :param str line: a line from an APT sources file
+        :param str arch: either '32bit' or '64bit'
+        """
+        self.line = line
+        self.arch = arch
+        self.urls = self.__get_urls()
+        self.filenames = self.__get_filenames()
+
+    def __get_urls(self):
+        """Get the URLs of index files associated with this source."""
+        parts = self.line.split()
+        repo_url = parts[1]
+        dist = parts[2]
+        for section in parts[3:]:
+            url = join_url(repo_url, 'dists', dist, section)
+
+            if self.arch == '32bit':
+                url = join_url(url, 'binary-i386/Packages.gz')
+            elif self.arch == '64bit':
+                url = join_url(url, 'binary-amd64/Packages.gz')
+
+            yield url
+
+    def __get_filenames(self):
+        """Get a list of filenames for index files in this repo. It's the path
+        to the file on the server with slashes replaced by underscores and the
+        .gz file extension removed.
+        """
+        for url in self.urls:
+            # Simply remove the protocol designator and replace slashes with
+            # underscores.
+            path = url.split('//')[1]
+            yield path.replace('/', '_')

=== added directory 'lib/tests'
=== added file 'lib/tests/__init__.py'
=== added file 'lib/tests/test_source.py'
--- lib/tests/test_source.py	1970-01-01 00:00:00 +0000
+++ lib/tests/test_source.py	2017-06-11 16:11:12 +0000
@@ -0,0 +1,14 @@
+from unittest import TestCase
+from lib.source import Source
+
+
+class TestSource(TestCase):
+    def test_urls(self):
+        source = Source('deb http://security.ubuntu.com/ubuntu xenial-security '
+                        'main restricted',
+                        '64bit')
+
+        # Make sure the class knows there are two URLs associated with that line
+        self.assertEqual(sum(1 for _ in source.urls), 2)
+
+        # TODO: test more things

=== added file 'lib/version.py'
--- lib/version.py	1970-01-01 00:00:00 +0000
+++ lib/version.py	2017-06-11 16:11:12 +0000
@@ -0,0 +1,207 @@
+def version_compare(str1, str2):
+    ver1 = Version(str1)
+    ver2 = Version(str2)
+
+    ver_type = ('epoch', 'upstream', 'debian')
+    test_type = (0, 2, 1)
+
+    parse1 = []
+    parse2 = []
+
+    version_list1 = (ver1.epoch(), ver1.upstream(), ver1.debian_version())
+    version_list2 = (ver2.epoch(), ver2.upstream(), ver2.debian_version())
+
+    for index in range(3):
+        equal = __compare_info(version_list1[index], version_list2[index], ver_type[index])
+        if equal != 0:
+            break
+
+    return equal
+
+
+def __compare_info(string1, string2, ver_type):
+    equal = 0
+    if string1 and string2:  # Both strings contain a value
+        parse1 = parse_version(string1)
+        parse2 = parse_version(string2)
+
+        max = len(parse1)
+        if len(parse1) > len(parse2):
+            max = len(parse2)
+        # Go through the parsed list of the version number, broken down by
+        # type
+        for count in range(max):
+            compare1 = parse1[count][1]
+            type1 = parse1[count][0]
+            compare2 = parse2[count][1]
+            type2 = parse2[count][0]
+            if type1 == 'alpha'   and type2 == 'alpha' or \
+               type1 == 'num'     and type2 == 'num'       or \
+               type1 == 'delimit' and type2 == 'delimit':
+                if compare1 < compare2:
+                    equal = 1
+                    break
+                elif compare1 > compare2:
+                    equal = 2
+                    break
+            elif type1 == 'alpha'   and type2 == 'num'     or \
+                 type1 == 'alpha'   and type2 == 'delimit' or \
+                 type1 == 'alpha'   and type2 == 'tilde'   or \
+                 type1 == 'num'     and type2 == 'tilde'   or \
+                 type1 == 'delimit' and type2 == 'num'     or \
+                 type1 == 'delimit' and type2 == 'tilde':
+                equal = 2
+                break
+            elif type1 == 'num'     and type2 == 'alpha'   or \
+                 type1 == 'num'     and type2 == 'delimit' or \
+                 type1 == 'tilde'   and type2 == 'alpha'   or \
+                 type1 == 'tilde'   and type2 == 'num'     or \
+                 type1 == 'tilde'   and type2 == 'delimit' or \
+                 type1 == 'delimit' and type2 == 'alpha':
+                equal = 1
+                break
+            elif type1 == 'tilde'   and type2 == 'tilde':
+                # The more tilde characters, the less its value
+                if len(str(compare1)) > len(str(compare2)):
+                    equal = 1
+                    break
+                elif len(str(compare1)) < len(str(compare2)):
+                    equal = 2
+                    break
+        if equal == 0:
+            if len(parse1) > max:
+                compare1 = parse1[max][1]
+                type1 = parse1[max][0]
+#                    print compare1,
+#                    print type1
+                if type1 == 'num' or \
+                   type1 == 'alpha' or \
+                   type1 == 'delimit':
+                    equal = 2
+                elif type1 == 'tilde':
+                    equal = 1
+            elif len(parse2) > max:
+                compare2 = parse2[max][1]
+                type2 = parse2[max][0]
+                if type2 == 'num' or \
+                   type2 == 'alpha' or \
+                   type2 == 'delimit':
+                    equal = 1
+                elif type1 == 'tilde':
+                    equal = 2
+
+    elif ver_type == 'epoch'  and string1 and not string2 or \
+         ver_type == 'debian' and not string1 and string2:
+        equal = 1
+    elif ver_type == 'debian' and string1 and not string2 or \
+         ver_type == 'epoch'  and not string1 and string2:
+        equal = 2
+
+    return equal
+
+
+def parse_version(version):
+    version_list = []
+
+    # Tracks the current string type (num, alpha, delimit, tilde)
+    build_type = ''
+    string_val = ''
+
+    for char in version:
+        if __type_changed(build_type, char):
+            # If the build type is not empty (there is a string ready to be
+            # appended)
+            if build_type:
+                if string_val.isdigit():
+                    # Convert string to integer
+                    version_list.append([build_type, int(string_val)])
+                    string_val = ''
+                else:
+                    version_list.append([build_type, string_val])
+                    string_val = ''
+            build_type = __get_type(char)
+        string_val += char
+
+    if build_type:
+        if string_val.isdigit():
+            version_list.append([build_type, int(string_val)])
+        else:
+            version_list.append([build_type, string_val])
+
+    return version_list  # returns a list of [build_type, string_val]
+
+
+def __type_changed(build_type, char):
+    ret_val = False
+
+    if (char.isdigit() and build_type != 'num') or \
+       (char.isalpha() and build_type != 'alpha') or \
+       (build_type == 'num' and not char.isdigit()) or \
+       (build_type == 'alpha' and not char.isalpha()) or \
+       (build_type == 'tilde' and char != '~') or \
+       (build_type == 'delimit' and (char == '~' or char.isdigit() or char.isalpha())):
+        ret_val = True
+
+    return ret_val
+
+
+def __get_type(char):
+    ret_type = ''
+    if char.isalpha():
+        ret_type = 'alpha'
+    elif char.isdigit():
+        ret_type = 'num'
+    elif char == '~':
+        ret_type = 'tilde'
+    else:
+        ret_type = 'delimit'
+
+    return ret_type
+
+
+class Version:
+    """This class represents the version of a package and provides certain tools
+    to learn information about that version.
+    """
+    def __init__(self, ver_string):
+        self.version = ver_string
+        self.epoch_value = self.__get_epoch(self.version)
+        upstream_deb = self.__get_upstrdeb(self.version)
+        self.upstream_value = upstream_deb[0]
+        self.debver_value = upstream_deb[1]
+
+    def epoch(self):
+        return self.epoch_value
+
+    def upstream(self):
+        return self.upstream_value
+
+    def debian_version(self):
+        return self.debver_value
+
+    def __get_epoch(self, str1):
+        ret_epoch = []
+        epoch = str1.split(':')
+        if len(epoch) > 1:
+            ret_epoch = epoch[0]
+
+        return ret_epoch
+
+    def __get_upstrdeb(self, str1):
+        ver_list = []
+        version = str1.split('-')
+
+        debver = ''
+        upstream = ''
+
+        if len(version) > 1:
+            debver = version[len(version) - 1]
+            for index in range(len(version) - 1):
+                if index == 0:
+                    upstream = version[index]
+                else:
+                    upstream += '-' + version[index]
+        else:
+            upstream = str1
+
+        return [upstream, debver]

=== modified file 'lib/wxkeryx/__init__.py'
--- lib/wxkeryx/__init__.py	2010-02-20 04:17:16 +0000
+++ lib/wxkeryx/__init__.py	2017-06-11 16:11:12 +0000
@@ -16,34 +16,33 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-import wx
-
-from lib import consts, log, project
-from main import MainApp
-from startDialog import startDialog
-
-class wxKeryx(wx.App):
+import wx
+from gettext import gettext as _
+
+from lib import config, log, project
+from .main import MainApp
+from .startDialog import StartDialog
+
+
+class WxKeryx(wx.App):
     def OnInit(self):
         log.info(_('wxWidgets interface loaded'))
-        wx.InitAllImageHandlers()
-        main = MainApp(None, -1, consts.appName + " v" + consts.appVersion)
+        main = MainApp(None, -1, config.name + ' v' + config.version)
         self.SetTopWindow(main)
         main.Show()
         main.SetFocus()
         
-        start = startDialog(None, -1, '')
+        start = StartDialog()
         success = start.ShowModal()
         start.Destroy()
         
-        if success == wx.ID_CANCEL: main.Close()
+        if success == wx.ID_CANCEL:
+            main.Close()
         else:
-            main.Refresh(project.projects[len(project.projects) - 1].GetData())
+            main.Refresh(project.current.get_data())
             self.MainLoop()
         return 1
 
-# end of class wxKeryx
 
-def Start():
-#    import gettext
-#    gettext.install(consts.appNameShort)
-    keryx = wxKeryx(0)
+def start():
+    WxKeryx(0)

=== modified file 'lib/wxkeryx/delayedresult.py'
--- lib/wxkeryx/delayedresult.py	2010-02-20 04:17:16 +0000
+++ lib/wxkeryx/delayedresult.py	2017-06-11 16:11:12 +0000
@@ -1,11 +1,14 @@
-import os.path
+import os.path
+import urllib
 import wx
-import wx.lib.delayedresult as delayedresult
-
-import lib
-from lib import consts, log
-
-class thread(wx.Frame):
+import wx.lib.delayedresult as delayedresult
+from gettext import gettext as _
+
+from lib import log
+from lib import config
+
+
+class Thread(wx.Frame):
     """This demos simplistic use of delayedresult module."""
     def __init__(self, parent, func, endfunc):
         wx.Frame.__init__(self, None, title=_("Loading..."))
@@ -13,81 +16,64 @@
         self.function = func
         self.endfunction = endfunc
 
-        self.SetIcon(wx.Icon(consts.fileIco, wx.BITMAP_TYPE_ICO))
+        self.SetIcon(wx.Icon(config.ico_path, wx.BITMAP_TYPE_ICO))
         panel = wx.Panel(self)
-        loading = wx.StaticText(panel, -1, _("This may take a while. Please be patient."))
+        loading = wx.StaticText(panel, -1, _("This may take a while. Please be "
+                                             "patient."))
         self.gauge = wx.Gauge(panel)
-        #cancelBtn  = wx.Button(panel, -1, "Cancel")
-        
-        #self.cur = wx.StaticText(panel, -1, "Current Transfer:")
-        #self.cur.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
-        #self.current = wx.StaticText(panel)
-        #self.download_gauge = wx.Gauge(panel)
-        #self.status = wx.TextCtrl(panel, style=wx.TE_MULTILINE|wx.TE_READONLY)
-        
-        #status = wx.BoxSizer()
-        #status.Add(self.cur, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5)
-        #status.Add(self.current, 1, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5)
 
         main = wx.BoxSizer(wx.VERTICAL)
-        main.Add(loading, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALL, 5)
-        main.Add(self.gauge, 0, wx.EXPAND|wx.ALL, 5)
-        #main.Add(status)
-        #main.Add(self.download_gauge, 0, wx.EXPAND|wx.ALL, 5)
-        #main.Add(self.status, 1, wx.EXPAND|wx.ALL, 5)
-        #main.Add(cancelBtn, 0, wx.ALIGN_RIGHT|wx.ALL, 5)
+        main.Add(loading, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5)
+        main.Add(self.gauge, 0, wx.EXPAND | wx.ALL, 5)
 
         panel.SetSizer(main)
-        self.SetSize(wx.Size(300,100))
+        self.SetSize(wx.Size(300, 100))
         self.Center()
         self.Show()
 
         self.jobID = 0
         self.abortEvent = delayedresult.AbortEvent()
-        self.Bind(wx.EVT_CLOSE, self.OnClose)
-        #self.Bind(wx.EVT_BUTTON, self.handleAbort, cancelBtn)
-        self.Bind(wx.EVT_TIMER, self.TimerHandler)
+        self.Bind(wx.EVT_CLOSE, self.on_close)
+        self.Bind(wx.EVT_TIMER, self.timer_handler)
 
         self.timer = wx.Timer(self)
         self.timer.Start(100)
         
         self.parent.Enable(False)
-        self.handleGet(None)
+        self.handle_get(None)
 
-    def TimerHandler(self, event): 
+    def timer_handler(self, event):
         self.gauge.Pulse()
         
-    def OnClose(self, event):
+    def on_close(self, event):
         """Only needed because in demo, closing the window does not kill the 
         app, so worker thread continues and sends result to dead frame; normally
-        your app would exit so this would not happen."""
+        your app would exit so this would not happen.
+        """
         #if self.buttonAbort.IsEnabled():
             #self.log( "Exiting: Aborting job %s" % self.jobID )
-            #self.handleAbort(None)
+            #self.handle_abort(None)
         self.Show()
             
-    def handleGet(self, event): 
+    def handle_get(self, event):
         """Compute result in separate thread, doesn't affect GUI response."""
-        #self.buttonGet.Enable(False)
-        #self.buttonAbort.Enable(True)
         self.abortEvent.clear()
         self.jobID += 1
         
-        #log.info( "Starting job %s in producer thread: GUI remains responsive"
-        #          % self.jobID )
-        delayedresult.startWorker(self._resultConsumer, self.function, 
-                                  wargs=(self.jobID,self.abortEvent), jobID=self.jobID)
+        delayedresult.startWorker(self._result_consumer, self.function,
+                                  wargs=(self.jobID, self.abortEvent),
+                                  jobID=self.jobID)
 
-                                                
-    def _resultProducer(self, jobID, abortEvent):
+    def _result_producer(self, job_id, abort_event):
         """Downloads the files in self.files"""
         
         msg = "Downloading %i file(s)\n" % len(self.files)
-        wx.CallAfter(self.LogMessage, msg)
+        wx.CallAfter(self.log_message, msg)
 
         success = True
         for data in self.files:
-            if abortEvent(): return [1, self.files]
+            if abort_event():
+                return [1, self.files]
 
             url = data[0]
             file = data[1]
@@ -97,61 +83,63 @@
             end = end[len(end) - 1]
 
             msg = "%s%s    %s" % (protocol, site, end)
-            wx.CallAfter(self.SetFile, msg)
+            wx.CallAfter(self.set_file, msg)
 
-            try: # Attempt to download the file
+            try:  # Attempt to download the file
                 urllib.urlretrieve(url, file, self.progress)
-                #TODO: Generate md5hashes for these files
+                # TODO: Generate md5hashes for these files
                 
                 msg = "Success: %s\nSaved to: %s\n" % (url, file)
-                wx.CallAfter(self.LogMessage, msg)
+                wx.CallAfter(self.log_message, msg)
     
-            except IOError, e: # Failed downloading
+            except IOError as e:  # Failed downloading
                 success = False
                 msg = "Failed: %s\nReason: %s\n" % (url, str(e))
-                wx.CallAfter(self.LogMessage, msg)
+                wx.CallAfter(self.log_message, msg)
 
-        if success == True: 
-            wx.CallAfter(self.DisplayMessage,_("All downloads have been completed successfully."), _("Download Complete"))
-            result = [0,self.files]
+        if success:
+            wx.CallAfter(self.display_message, _("All downloads have been "
+                                                 "completed successfully."),
+                         _("Download Complete"))
+            result = [0, self.files]
         else:
-            wx.CallAfter(self.DisplayMessage, _("Some downloads failed to complete.") + "\n" +_("Please check") + " " + os.path.join(consts.dirLog, "log") + " " + _("for more details."), _("Download Failed"))
-            result = [1,self.files]
+            wx.CallAfter(self.display_message, _("Some downloads failed to complete.") + "\n" + _("Please check") + " " + config.log_path + " " + _("for more details."), _("Download Failed"))
+            result = [1, self.files]
         return result
 
     def progress(self, blocks, size, total):
-        if blocks*size > total: fraction = float(total)/float(total)
-        else:                   fraction = float(blocks*size)/float(total)
+        if blocks*size > total:
+            fraction = float(total)/float(total)
+        else:
+            fraction = float(blocks*size)/float(total)
         
-        wx.CallAfter(self.SetGauge, int(round(fraction*100,2)))
+        wx.CallAfter(self.set_gauge, int(round(fraction * 100, 2)))
 
-    def LogMessage(self, msg):
+    def log_message(self, msg):
         log.info(msg)
         self.status.AppendText(msg)
-    def DisplayMessage(self, msg, caption): 
+
+    def display_message(self, msg, caption):
         wx.MessageBox(msg, caption)
-    def SetGauge(self, val): 
+
+    def set_gauge(self, val):
         self.download_gauge.SetValue(val)
-    def SetFile(self, val): 
+
+    def set_file(self, val):
         self.current.SetLabel(val)
 
-    def handleAbort(self, event): 
+    def handle_abort(self, event):
         """Abort the result computation."""
-        log.info( "Aborting result for job %s" % self.jobID )
+        log.info("Aborting result for job %s" % self.jobID)
         #self.buttonGet.Enable(True)
         #self.buttonAbort.Enable(False)
         self.abortEvent.set()
 
-        
-    def _resultConsumer(self, delayedResult):
-        jobID = delayedResult.getJobID()
+    def _result_consumer(self, delayed_result):
+        jobID = delayed_result.getJobID()
         assert jobID == self.jobID
-        try:
-            result = delayedResult.get()
-        except Exception, exc:
-            log.info( "Result for job %s raised exception: %s" % (jobID, exc) )
-            return
-        
+        result = delayed_result.get()
+
         # output result
         #log.info( "Got result for job %s: %s" % (jobID, result) )
         self.parent.Enable()

=== modified file 'lib/wxkeryx/download.py'
--- lib/wxkeryx/download.py	2010-02-20 04:17:16 +0000
+++ lib/wxkeryx/download.py	2017-06-11 16:11:12 +0000
@@ -1,48 +1,54 @@
-import os.path
-import urllib
-import wx
+import os.path
+import urllib.request
+import wx
 import hashlib
-import wx.lib.delayedresult as delayedresult
-
+import wx.lib.delayedresult as delayedresult
+from gettext import gettext as _
+
 import lib
-from lib import consts, log
-
-class download(wx.Frame):
+from lib import log
+from lib import config
+
+
+class Download(wx.Frame):
     """This demos simplistic use of delayedresult module."""
     def __init__(self, parent, endfunc, files, extract=False, overwrite=False):
-        wx.Frame.__init__(self, None, title=_("Downloading..."))
+        self.theme = config.theme
+        wx.Frame.__init__(self, parent, title=_('Downloading...'))
         self.parent = parent
         self.files = files
         self.function = endfunc
-        self.extract = extract
-        self.overwrite = overwrite
+        self.extract = extract
+        self.overwrite = overwrite
         self.retries = 1
 
-        #TODO: Add overwrite function
+        # TODO: Add overwrite function
 
-        self.SetIcon(wx.Icon(consts.fileIco, wx.BITMAP_TYPE_ICO))
+        self.SetIcon(wx.Icon(config.ico_path, wx.BITMAP_TYPE_ICO))
         panel = wx.Panel(self)
-        loading = wx.StaticText(panel, -1, _("This may take a while. Please be patient."))
+        loading = wx.StaticText(panel, -1, _('This may take a while. '
+                                             'Please be patient.'))
         self.gauge = wx.Gauge(panel)
-        #cancelBtn  = wx.Button(panel, -1, "Cancel")
 
-        self.cur = wx.StaticText(panel, -1, _("Current Transfer:"))
-        self.cur.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
-        self.current = wx.StaticText(panel, -1, "\n")
+        self.cur = wx.StaticText(panel, -1, _('Current Transfer:'))
+        self.cur.SetFont(wx.Font(8,
+                                 wx.FONTFAMILY_DEFAULT,
+                                 wx.FONTSTYLE_NORMAL,
+                                 wx.FONTWEIGHT_BOLD))
+        self.current = wx.StaticText(panel, -1, '\n')
         self.download_gauge = wx.Gauge(panel)
-        self.status = wx.TextCtrl(panel, style=wx.TE_MULTILINE|wx.TE_READONLY)
+        self.status = wx.TextCtrl(panel, style=wx.TE_MULTILINE | wx.TE_READONLY)
 
         status = wx.BoxSizer()
-        status.Add(self.cur, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5)
-        status.Add(self.current, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5)
+        status.Add(self.cur, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
+        status.Add(self.current, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
 
         main = wx.BoxSizer(wx.VERTICAL)
-        main.Add(loading, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALL, 5)
-        main.Add(self.gauge, 0, wx.EXPAND|wx.ALL, 5)
+        main.Add(loading, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5)
+        main.Add(self.gauge, 0, wx.EXPAND | wx.ALL, 5)
         main.Add(status)
-        main.Add(self.download_gauge, 0, wx.EXPAND|wx.ALL, 5)
-        main.Add(self.status, 1, wx.EXPAND|wx.ALL, 5)
-        #main.Add(cancelBtn, 0, wx.ALIGN_RIGHT|wx.ALL, 5)
+        main.Add(self.download_gauge, 0, wx.EXPAND | wx.ALL, 5)
+        main.Add(self.status, 1, wx.EXPAND | wx.ALL, 5)
 
         panel.SetSizer(main)
         self.Center()
@@ -50,218 +56,217 @@
 
         self.jobID = 0
         self.abortEvent = delayedresult.AbortEvent()
-        self.Bind(wx.EVT_CLOSE, self.OnClose)
-        #self.Bind(wx.EVT_BUTTON, self.handleAbort, cancelBtn)
-        self.Bind(wx.EVT_TIMER, self.TimerHandler)
+        self.Bind(wx.EVT_CLOSE, self.on_close)
+        self.Bind(wx.EVT_TIMER, self.timer_handler)
 
         self.timer = wx.Timer(self)
         self.timer.Start(100)
 
         self.parent.Enable(False)
-        self.handleGet(None)
-
-    def TimerHandler(self, event): self.gauge.Pulse()
-
-    def OnClose(self, event):
+        self.handle_get(None)
+
+    def timer_handler(self, event):
+        self.gauge.Pulse()
+
+    def on_close(self, event):
         """Only needed because in demo, closing the window does not kill the
         app, so worker thread continues and sends result to dead frame; normally
         your app would exit so this would not happen."""
         #if self.buttonAbort.IsEnabled():
             #self.log( "Exiting: Aborting job %s" % self.jobID )
-            #self.handleAbort(None)
+            #self.handle_abort(None)
         self.Show()
 
-    def handleGet(self, event):
+    def handle_get(self, event):
         """Compute result in separate thread, doesn't affect GUI response."""
-        #self.buttonGet.Enable(False)
-        #self.buttonAbort.Enable(True)
         self.abortEvent.clear()
         self.jobID += 1
 
-        log.info( "Starting job %s in producer thread: GUI remains responsive"
-                  % self.jobID )
-        delayedresult.startWorker(self._resultConsumer, self._resultProducer,
-                                  wargs=(self.jobID,self.abortEvent), jobID=self.jobID)
-
-
-    def _resultProducer(self, jobID, abortEvent):
+        log.info("Starting job %s in producer thread: GUI remains responsive" %
+                 self.jobID)
+        delayedresult.startWorker(self._result_consumer,
+                                  self._result_producer,
+                                  wargs=(self.jobID, self.abortEvent),
+                                  jobID=self.jobID)
+
+    def _result_producer(self, jobID, abort_event):
         """Downloads the files in self.files"""
         self.numfiles = len(self.files)
         msg = _("Downloading ") + str(self.numfiles) + " " + _("file(s)") + "\n"
-        wx.CallAfter(self.LogMessage, msg)
+        wx.CallAfter(self.log_message, msg)
 
-        if consts.proxy_enabled:
-            if consts.http_proxy['http'][0:7] != 'http://':
-                proxy = {'http://':consts.http_proxy['http']}
-            else:
-                proxy = consts.http_proxy
-            downloader = Downloader(proxy)
-        else:
-            downloader = Downloader()
+        downloader = Downloader()
 
         failed = self.files[:]
         self.numfile = 0
         for data in self.files:
-            if abortEvent(): return [1, failed]
+            if abort_event():
+                return [1, failed]
             url = data[0]
-            filepath = data[1]
-            end = url.split('/')
-            protocol = end[0] + '//'
-            site = end[2]
-            end = end[len(end) - 1]
-            if len(data) <= 2:
-                checksum = {}
-            else:
+            filepath = data[1]
+            end = url.split('/')[-1]
+            if len(data) <= 2:
+                checksum = {}
+            else:
                 checksum = data[2]
 
-            msg = _("Starting") + " " + end
-            wx.CallAfter(self.SetFile, msg)
-            #TODO: Change this to file progress (move to self.progress)
+            msg = _('Starting') + ' ' + end
+            wx.CallAfter(self.set_file, msg)
+            # TODO: Change this to file progress (move to self.progress)
 
             self.curfile = end
             self.numfile += 1
-            if os.path.exists(filepath):
-                if not self.overwrite:
-                    if self._verify(filepath, checksum) >= 1:
-                        msg = _("Skipped: ") + end + "\n" + _("Reason: ") + _("File already exists.") + "\n"
-                        wx.CallAfter(self.LogMessage, msg)
-                        failed.remove(data)
-                        continue
-                    else:
-                        msg = _("Deleted: ") + filepath + "\n" + _("Reason: ") + _("Existing file failed checksum verify.") + "\n"
-                        wx.CallAfter(self.LogMessage, msg)
-                os.remove(filepath)
-            retries = 0
-            success = False
-            while retries <= self.retries:
-
-                try: # Attempt to download the file
-                    msg = _("Downloading: ") + url + "\n"
-                    if retries != 0: msg = _("Retrying: ")+"[%i/%i] " % (retries, self.retries) + url + "\n"
-                    wx.CallAfter(self.LogMessage, msg)
+            if os.path.exists(filepath):
+                if not self.overwrite and self._verify(filepath, checksum) >= 1:
+                    msg = _("Skipped: ") + end + "\n" + _("Reason: ") + \
+                          _("File already exists.") + "\n"
+                    wx.CallAfter(self.log_message, msg)
+                    failed.remove(data)
+                    continue
+                else:
+                    msg = _("Deleted: ") + filepath + "\n" + \
+                          _("Reason: ") + \
+                          _("Existing file failed checksum verify.") + "\n"
+                    wx.CallAfter(self.log_message, msg)
+                os.remove(filepath)
+            retries = 0
+            success = False
+            while retries <= self.retries:
+                try:  # Attempt to download the file
+                    msg = _("Downloading: ") + url + "\n"
+                    if retries != 0:
+                        msg = _("Retrying: ") + "[%i/%i] " % (retries, self.retries) + url + "\n"
+                    wx.CallAfter(self.log_message, msg)
 
                     downloader.retrieve(url, filepath, self.progress)
                     
-                    if self._verify(filepath, checksum) == 0:
+                    if self._verify(filepath, checksum) == 0:
                         msg = _("Failed verify: ") + filepath + "\n"
-                        wx.CallAfter(self.LogMessage, msg)
+                        wx.CallAfter(self.log_message, msg)
                         os.remove(filepath)
-                        retries += 1
+                        retries += 1
                         continue
 
-                    success = True
-                    failed.remove(data)
+                    success = True
+                    failed.remove(data)
                     msg = _("Success: ") + filepath + "\n"
-                    wx.CallAfter(self.LogMessage, msg)
-
+                    wx.CallAfter(self.log_message, msg)
+
                     if self.extract:
                         msg = _("Extracting") + " " + end
-                        wx.CallAfter(self.SetFile, msg)
+                        wx.CallAfter(self.set_file, msg)
                         try:
                             import gzip
                             infile = gzip.open(filepath, 'rb')
-                            outfile = open(filepath[:-3], 'wb')
+                            outfile = open(filepath.strip('.gz'), 'wb')
                             outfile.write(infile.read())
                             outfile.close()
                             infile.close()
                             os.remove(filepath)
                         except:  # Failed to extract
                             msg = _("Unable to extract: ") + filepath
-                            wx.CallAfter(self.LogMessage, msg)
-                    break
-
-                except IOError, e: # Failed downloading
-                    msg = _("Failed: ") + url + "\n" + _("Reason: ") + str(e) + "\n"
-                    wx.CallAfter(self.LogMessage, msg)
-                    retries += 1
-
-
-        msg = _("Downloaded: ") + str(len(self.files) - len(failed)) + ", " + _("Failed: ") + str(len(failed)) + "\n"
-        wx.CallAfter(self.LogMessage, msg)
-        if failed == []:
-            wx.CallAfter(self.DisplayMessage,_("All downloads have been completed successfully."), _("Download Complete"))
-            result = [0,failed]
-        else:
-            wx.CallAfter(self.DisplayMessage, _("Some downloads failed to complete.") + "\n" +_("Please check") + " " + os.path.join(consts.dirLog, "log") + " " + _("for more details."), _("Download Failed"))
-            result = [1,failed]
-        return result
-
-    def _verify(self, filename, checksum, cspriority=['SHA256','SHA1','MD5sum']):
-        """ Does a hash check on 'filename' as per hashes in 'checksum' dict. Currently only supports sha256, sha1, md5."""
-        if cspriority != []:
-            checks = [x for x in cspriority if checksum.has_key(x)]
-            if checks == []: return 2
-        else:
-            checks = checksum.keys()
-        if checks == []: return 2
-
-        if checks[0] == 'SHA256':
-            check = hashlib.sha256()
-        elif checks[0] == 'SHA1':
-            check = hashlib.sha1()
-        elif checks[0] == 'MD5sum':
-            check = hashlib.md5()
-        else:
-            return 2
-        
-        try:
-            fd = open(filename, 'rb')
+                            wx.CallAfter(self.log_message, msg)
+                    break
+
+                except IOError as e:  # Failed downloading
+                    msg = _("Failed: ") + url + "\n" + \
+                          _("Reason: ") + str(e) + "\n"
+                    wx.CallAfter(self.log_message, msg)
+                    retries += 1
+
+        msg = _("Downloaded: ") + str(len(self.files) - len(failed)) + ", " + \
+              _("Failed: ") + str(len(failed)) + "\n"
+        wx.CallAfter(self.log_message, msg)
+        """if not failed:
+            wx.CallAfter(wx.MessageBox,
+                         _('All downloads have been completed successfully.'),
+                         _('Download Complete'))
+            result = [0, []]
+        else:
+            wx.CallAfter(wx.MessageBox,
+                         _("Some downloads failed to complete.") +
+                         "\n" + _("Please check") + " "
+                         + config.log_path + " "
+                         + _("for more details."), _("Download Failed"))
+            result = [1, failed]"""
+        return [0, []]#result
+
+    def _verify(self,
+                filename,
+                checksum,
+                cspriority=('SHA256', 'SHA1', 'MD5sum')):
+        """Does a hash check on 'filename' as per hashes in 'checksum' dict. 
+        Currently only supports sha256, sha1, md5.
+        """
+        if cspriority:
+            checks = [x for x in cspriority if x in checksum]
+            if not checks:
+                return 2
+        else:
+            checks = checksum.keys()
+        if checks:
+            return 2
+
+        if checks[0] == 'SHA256':
+            check = hashlib.sha256()
+        elif checks[0] == 'SHA1':
+            check = hashlib.sha1()
+        elif checks[0] == 'MD5sum':
+            check = hashlib.md5()
+        else:
+            return 2
+        
+        with open(filename, 'rb') as fd:
             data = fd.read(1024*64)
             while data:
                 check.update(data)
-                data=fd.read(1024*64)
-            fd.close()
-            if check.hexdigest() == checksum[checks[0]]:
-                return 1
-            return 0
-        except:
-            return 2
+                data = fd.read(1024*64)
+        if check.hexdigest() == checksum[checks[0]]:
+            return 1
+        return 0
 
     def progress(self, blocks, size, total):
-        if blocks*size > total: fraction = float(total)/float(total)
-        else:                   fraction = float(blocks*size)/float(total)
-
-        wx.CallAfter(self.SetGauge, int(round(fraction*100,2)))
-        msg = self.curfile + "\n" + str(int(round(fraction*100,2))) + " % of " + lib.convert_file_size(total) + " - File "+ str(self.numfile) + "/" + str(self.numfiles)
-        wx.CallAfter(self.SetFile, msg)
-
-    def LogMessage(self, msg):
+        if blocks*size > total:
+            fraction = float(total)/float(total)
+        else:
+            fraction = float(blocks*size)/float(total)
+
+        wx.CallAfter(self.set_gauge, int(round(fraction * 100, 2)))
+        msg = self.curfile + "\n" + str(int(round(fraction*100, 2))) + \
+              " % of " + lib.convert_file_size(total) + " - File " + \
+              str(self.numfile) + "/" + str(self.numfiles)
+        wx.CallAfter(self.set_file, msg)
+
+    def log_message(self, msg):
         log.info(msg[:-1])
         self.status.AppendText(msg)
-    def DisplayMessage(self, msg, caption): 
-        wx.MessageBox(msg, caption)
-    def SetGauge(self, val): 
+
+    def set_gauge(self, val):
         self.download_gauge.SetValue(val)
-    def SetFile(self, val): 
+
+    def set_file(self, val):
         self.current.SetLabel(val)
 
-    def handleAbort(self, event):
+    def handle_abort(self, event):
         """Abort the result computation."""
-        log.info( "Aborting result for job %s" % self.jobID )
+        log.info("Aborting result for job %s" % self.jobID)
         #self.buttonGet.Enable(True)
         #self.buttonAbort.Enable(False)
         self.abortEvent.set()
 
-
-    def _resultConsumer(self, delayedResult):
+    def _result_consumer(self, delayedResult):
         jobID = delayedResult.getJobID()
         assert jobID == self.jobID
-        try:
-            result = delayedResult.get()
-        except Exception, exc:
-            log.info( "Result for job %s raised exception: %s" % (jobID, exc) )
-            return
+        result = delayedResult.get()
 
         # output result
         #log.info( "Got result for job %s: %s" % (jobID, result) )
         self.parent.Enable()
-        self.Destroy()
-        if self.function: self.function()
-
-class Downloader(urllib.FancyURLopener):
-    def __init__(self, proxy={}):
-        urllib.FancyURLopener.__init__(self, proxy)
-
-    def prompt_user_passwd(self, host='', realm=''):
-        return (consts.proxy_username, consts.proxy_password)
-
+        self.DestroyLater()
+        if self.function:
+            self.function()
+
+
+class Downloader(urllib.request.FancyURLopener):
+    def __init__(self):
+        urllib.request.FancyURLopener.__init__(self, {})

=== modified file 'lib/wxkeryx/editor.py'
--- lib/wxkeryx/editor.py	2010-02-20 04:17:16 +0000
+++ lib/wxkeryx/editor.py	2017-06-11 16:11:12 +0000
@@ -1,25 +1,26 @@
-import platform
+import platform
 import wx
-from lib import consts, project
+from lib import config
+
 
 class FileEditor(wx.Dialog):
     def __init__(self, window_name, filename):
-        wx.Dialog.__init__(self, None, -1, window_name)#, size=(300, 300))
-        self.SetIcon(wx.Icon(consts.fileIco, wx.BITMAP_TYPE_ICO))
+        wx.Dialog.__init__(self, None, -1, window_name)
+        self.SetIcon(wx.Icon(config.ico_path, wx.BITMAP_TYPE_ICO))
         sizer = wx.BoxSizer(wx.VERTICAL)
         self.txt = wx.TextCtrl(self, style=wx.TE_MULTILINE|wx.TE_RICH2)
         self.txt.LoadFile(filename)
         sizer.Add(self.txt, 1, wx.EXPAND|wx.ALL, 3)
         
         # Add buttons
-        btnsizer = wx.StdDialogButtonSizer()
-        btnSave = wx.Button(self, wx.ID_OK, 'Save')
-        btnSave.SetDefault()
-        btnsizer.AddButton(btnSave) 
-        btnCancel = wx.Button(self, wx.ID_CANCEL)
-        btnsizer.AddButton(btnCancel)
-        btnsizer.Realize()
-        sizer.Add(btnsizer, 0, wx.ALIGN_BOTTOM|wx.ALIGN_RIGHT|wx.ALL, 5)
+        btn_sizer = wx.StdDialogButtonSizer()
+        btn_save = wx.Button(self, wx.ID_OK, 'Save')
+        btn_save.SetDefault()
+        btn_sizer.AddButton(btn_save)
+        btn_cancel = wx.Button(self, wx.ID_CANCEL)
+        btn_sizer.AddButton(btn_cancel)
+        btn_sizer.Realize()
+        sizer.Add(btn_sizer, 0, wx.ALIGN_BOTTOM|wx.ALIGN_RIGHT|wx.ALL, 5)
 
         self.SetSizer(sizer)
         
@@ -30,7 +31,8 @@
     def comment(self, event):
         location = 0
         for line in self.txt.GetValue().split('\n'):
-            if line.find('#') != -1: # line contains a comment
-                self.txt.SetStyle(location + line.index('#'), len(line)+location, wx.TextAttr("RED"))
+            if line.find('#') != -1:  # line contains a comment
+                self.txt.SetStyle(location + line.index('#'),
+                                  len(line) + location,
+                                  wx.TextAttr("RED"))
             location += len(line) + 1
-        

=== modified file 'lib/wxkeryx/main.py'
--- lib/wxkeryx/main.py	2010-03-13 19:04:52 +0000
+++ lib/wxkeryx/main.py	2017-06-11 16:11:12 +0000
@@ -18,44 +18,63 @@
 
 import os.path
 import sys
+import webbrowser
+
+import time
 import wx
+import wx.adv
 import wx.lib.buttons as buttons
-import wx.lib.filebrowsebutton as filebrowse
 from wx.lib.mixins.listctrl import CheckListCtrlMixin
 
 import lib
-from lib import consts, log, plugins, project
-from startDialog import startDialog
-from misc import detailsTab, ProportionalSplitter, VirtualList
-from options import optionDialog
-from delayedresult import thread
-from download import download
-from editor import FileEditor
+from lib import log, project
+from .startDialog import StartDialog
+from .misc import DetailsTab, ProportionalSplitter, VirtualList
+from .delayedresult import Thread
+from .download import Download
+from .editor import FileEditor
+
+from gettext import gettext as _
+
+from lib import config
+
 
 class MainApp(wx.Frame):
     def __init__(self, *args, **kwds):
+        self.theme = config.theme
         kwds["style"] = wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        self.splitter = ProportionalSplitter(self)#, style=wx.SP_3D|wx.SP_BORDER)
+        self.splitter = ProportionalSplitter(self)
         self.panel = wx.Panel(self.splitter)
         self.notebook = wx.Notebook(self.panel, -1, style=wx.NB_BOTTOM)
-        self.project_notebook_pane = wx.Panel(self.notebook, -1, style=wx.TAB_TRAVERSAL)
-        self.SetIcon(wx.Icon(consts.fileIco, wx.BITMAP_TYPE_ICO))
+        self.project_notebook_pane = wx.Panel(self.notebook,
+                                              -1,
+                                              style=wx.TAB_TRAVERSAL)
+        self.SetIcon(wx.Icon(config.ico_path, wx.BITMAP_TYPE_ICO))
         self.statusbar = self.CreateStatusBar(1, 0)
 
         # Side Buttons
         self.buttonPanel = wx.Panel(self)
-        self.downloadButton = buttons.GenBitmapTextButton(self.buttonPanel, -1, wx.Bitmap(consts.icon_download), _("Download"))#, size=(95, 25))
-        self.updatesButton = buttons.GenBitmapTextButton(self.buttonPanel, -1, wx.Bitmap(consts.icon_updates), _("Get Updates"))#, size=(95, 25))
-        self.refreshButton = buttons.GenBitmapTextButton(self.buttonPanel, -1, wx.Bitmap(consts.icon_refresh), _("Refresh"))#, size=(95, 25))
-        #self.updateStatusButton = buttons.GenBitmapTextButton(self.buttonPanel, -1, wx.Bitmap(consts.icon_refresh), _("Update Status"))#, size=(95, 25))
+        self.downloadButton = buttons.GenBitmapTextButton(self.buttonPanel,
+                                                          -1,
+                                                          wx.Bitmap(self.theme.icon_download),
+                                                          _("Download"))
+        self.updatesButton = buttons.GenBitmapTextButton(self.buttonPanel,
+                                                         -1,
+                                                         wx.Bitmap(self.theme.icon_updates),
+                                                         _("Get Updates"))
+        self.refreshButton = buttons.GenBitmapTextButton(self.buttonPanel,
+                                                         -1,
+                                                         wx.Bitmap(self.theme.icon_refresh),
+                                                         _("Refresh"))
 
         self.notebook_il = wx.ImageList(16, 16)
-        self.notebook_il.Add(wx.Bitmap(consts.icon_project_details))
+        self.notebook_il.Add(wx.Bitmap(self.theme.icon_project_details))
         self.notebook.SetImageList(self.notebook_il)
 
-        self.projectDetails = wx.TextCtrl(self.project_notebook_pane, style = wx.TE_MULTILINE | wx.TE_RICH |wx.TE_READONLY)
-        self.details = detailsTab(self.notebook)
+        self.projectDetails = wx.TextCtrl(self.project_notebook_pane,
+                                          style=wx.TE_MULTILINE | wx.TE_RICH | wx.TE_READONLY)
+        self.details = DetailsTab(self.notebook)
 
         # Create list view
         self.list = VirtualList(self.splitter, self.details)
@@ -67,123 +86,163 @@
         self.__do_layout()
         self.__bind_events()
 
-        plugins.load(consts.dirPlugins, self)
-        for name, instance, type, ver in plugins.InterfacePluginList: instance.start()
-
-        if len(plugins.OSPluginList) < 1:
-            wx.MessageBox(_("No OS plugins were loaded. Make sure you have OS plugins in ") +
-                          consts.dirPlugins + ". " + _("Check the log for more details."))
-            sys.exit(1)
-
     def __popup_menu(self):
         self.popupmenu = wx.Menu()
-        #FIXME: popup menu items cannot display bitmap properly?
+        # FIXME: popup menu items cannot display bitmap properly?
         item = self.popupmenu.Append(-1, _("Download"))
         self.Bind(wx.EVT_MENU, self.OnDownload, item)
-        item = self.popupmenu.Append(-1, _("View Details"))
-        self.Bind(wx.EVT_MENU, self.OnDetails, item)
-        self.list.Bind(wx.EVT_CONTEXT_MENU, self.OnShowPopup)
+        self.list.Bind(wx.EVT_CONTEXT_MENU, self.on_show_popup)
 
     def __create_menu(self):
         # Menu Bar
         self.menubar = wx.MenuBar()
         self.fileFile = wx.Menu()
-        self.fileClose = wx.MenuItem(self.fileFile, wx.NewId(), _("&Close Project...\tCtrl+X"), _("Closes the current project"), wx.ITEM_NORMAL)
-        self.fileClose.SetBitmap(wx.Bitmap(consts.icon_close))
-        self.fileFile.AppendItem(self.fileClose)
+        self.fileClose = wx.MenuItem(self.fileFile,
+                                     wx.NewId(),
+                                     _("&Close Project...\tCtrl+X"),
+                                     _("Closes the current project"),
+                                     wx.ITEM_NORMAL)
+        self.fileClose.SetBitmap(wx.Bitmap(self.theme.icon_close))
+        self.fileFile.Append(self.fileClose)
         self.fileFile.AppendSeparator()
-        self.fileQuit = wx.MenuItem(self.fileFile, wx.NewId(), _("&Quit\tCtrl+Q"), _("Quit this application"), wx.ITEM_NORMAL)
-        self.fileQuit.SetBitmap(wx.Bitmap(consts.icon_quit))
-        self.fileFile.AppendItem(self.fileQuit)
+        self.fileQuit = wx.MenuItem(self.fileFile,
+                                    wx.NewId(),
+                                    _("&Quit\tCtrl+Q"),
+                                    _("Quit this application"),
+                                    wx.ITEM_NORMAL)
+        self.fileQuit.SetBitmap(wx.Bitmap(self.theme.icon_quit))
+        self.fileFile.Append(self.fileQuit)
         self.menubar.Append(self.fileFile, _("&File"))
 
         tmp_menu = wx.Menu()
-        self.editOptions = wx.MenuItem(tmp_menu, wx.NewId(), _("&Options...\tCtrl+O"), _("Open options dialog"), wx.ITEM_NORMAL)
-        self.editOptions.SetBitmap(wx.Bitmap(consts.icon_options))
-        tmp_menu.AppendItem(self.editOptions)
-        self.menubar.Append(tmp_menu, _("&Edit"))
-
-        tmp_menu = wx.Menu()
-        self.projRefresh = wx.MenuItem(tmp_menu, wx.NewId(), _("&Refresh\tCtrl+R"), _("Refresh package list"), wx.ITEM_NORMAL)
-        self.projRefresh.SetBitmap(wx.Bitmap(consts.icon_refresh))
-        tmp_menu.AppendItem(self.projRefresh)
-        tmp_menu.AppendSeparator()
-        self.projUpdates = wx.MenuItem(tmp_menu, wx.NewId(), _("Get &Updates\tCtrl+U"), _("Grabs all packages that have updates"), wx.ITEM_NORMAL)
-        self.projUpdates.SetBitmap(wx.Bitmap(consts.icon_updates))
-        tmp_menu.AppendItem(self.projUpdates)
-        self.projDownload = wx.MenuItem(tmp_menu, wx.NewId(), _("&Download Package\tCtrl+D"), _("Downloads selected package"), wx.ITEM_NORMAL)
-        self.projDownload.SetBitmap(wx.Bitmap(consts.icon_download))
-        tmp_menu.AppendItem(self.projDownload)
-        self.projInstall = wx.MenuItem(tmp_menu, wx.NewId(), _("&Install Packages..."), _("Helps you install packages onto Project Machine"), wx.ITEM_NORMAL)
-        self.projInstall.SetBitmap(wx.Bitmap(consts.icon_install))
-        tmp_menu.AppendItem(self.projInstall)
-        self.projUpdateStatus = wx.MenuItem(tmp_menu, wx.NewId(), _("&Update Status"), _("Regrabs the list of installed packages"), wx.ITEM_NORMAL)
-        self.projUpdateStatus.SetBitmap(wx.Bitmap(consts.icon_refresh))
-        tmp_menu.AppendItem(self.projUpdateStatus)
-        tmp_menu.AppendSeparator()
-        self.projDetails = wx.MenuItem(tmp_menu, wx.NewId(), _("&View Details\tCtrl+V"), _("Shows details of selected package"), wx.ITEM_NORMAL)
-        self.projDetails.SetBitmap(wx.Bitmap(consts.icon_package))
-        tmp_menu.AppendItem(self.projDetails)
-        tmp_menu.AppendSeparator()
-        self.projSources = wx.MenuItem(tmp_menu, wx.NewId(), _("&Edit Sources...\tCtrl+E"), _("Edit project sources"), wx.ITEM_NORMAL)
-        self.projSources.SetBitmap(wx.Bitmap(consts.icon_sources))
-        tmp_menu.AppendItem(self.projSources)
+        self.projRefresh = wx.MenuItem(tmp_menu,
+                                       wx.NewId(),
+                                       _("&Refresh\tCtrl+R"),
+                                       _("Refresh package list"),
+                                       wx.ITEM_NORMAL)
+        self.projRefresh.SetBitmap(wx.Bitmap(self.theme.icon_refresh))
+        tmp_menu.Append(self.projRefresh)
+        tmp_menu.AppendSeparator()
+        self.projUpdates = wx.MenuItem(tmp_menu,
+                                       wx.NewId(),
+                                       _("Get &Updates\tCtrl+U"),
+                                       _("Grabs all packages that have updates"),
+                                       wx.ITEM_NORMAL)
+        self.projUpdates.SetBitmap(wx.Bitmap(self.theme.icon_updates))
+        tmp_menu.Append(self.projUpdates)
+        self.projDownload = wx.MenuItem(tmp_menu,
+                                        wx.NewId(),
+                                        _("&Download Package\tCtrl+D"),
+                                        _("Downloads selected package"),
+                                        wx.ITEM_NORMAL)
+        self.projDownload.SetBitmap(wx.Bitmap(self.theme.icon_download))
+        tmp_menu.Append(self.projDownload)
+        self.projInstall = wx.MenuItem(tmp_menu,
+                                       wx.NewId(),
+                                       _("&Install Packages..."),
+                                       _("Helps you install packages onto "
+                                         "Project Machine"),
+                                       wx.ITEM_NORMAL)
+        self.projInstall.SetBitmap(wx.Bitmap(self.theme.icon_install))
+        tmp_menu.Append(self.projInstall)
+        self.projUpdateStatus = wx.MenuItem(tmp_menu,
+                                            wx.NewId(),
+                                            _("&Update Status"),
+                                            _("Regrabs the list of installed "
+                                              "packages"),
+                                            wx.ITEM_NORMAL)
+        self.projUpdateStatus.SetBitmap(wx.Bitmap(self.theme.icon_refresh))
+        tmp_menu.Append(self.projUpdateStatus)
+        tmp_menu.AppendSeparator()
+        self.projSources = wx.MenuItem(tmp_menu,
+                                       wx.NewId(),
+                                       _("&Edit Sources...\tCtrl+E"),
+                                       _("Edit project sources"),
+                                       wx.ITEM_NORMAL)
+        self.projSources.SetBitmap(wx.Bitmap(self.theme.icon_sources))
+        tmp_menu.Append(self.projSources)
 
         self.menubar.Append(tmp_menu, _("&Project"))
 
         tmp_menu = wx.Menu()
-        self.helpHomepage = wx.MenuItem(tmp_menu, wx.NewId(), _("&Homepage"), _("Visit the website"), wx.ITEM_NORMAL)
-        self.helpHomepage.SetBitmap(wx.Bitmap(consts.icon_home))
-        tmp_menu.AppendItem(self.helpHomepage)
-        self.helpTutorial = wx.MenuItem(tmp_menu, wx.NewId(), _("&Tutorial"), _("Read the tutorial"), wx.ITEM_NORMAL)
-        self.helpTutorial.SetBitmap(wx.Bitmap(consts.icon_book_open))
-        tmp_menu.AppendItem(self.helpTutorial)
-        self.helpOnline = wx.MenuItem(tmp_menu, wx.NewId(), _("&Get Help Online"), _("Visit the forums"), wx.ITEM_NORMAL)
-        self.helpOnline.SetBitmap(wx.Bitmap(consts.icon_help))
-        tmp_menu.AppendItem(self.helpOnline)
-        self.helpTranslate = wx.MenuItem(tmp_menu, wx.NewId(), _("&Translate This Application"), _("Help translate to other languages"), wx.ITEM_NORMAL)
-        self.helpTranslate.SetBitmap(wx.Bitmap(consts.icon_translate))
-        tmp_menu.AppendItem(self.helpTranslate)
-        self.helpReport = wx.MenuItem(tmp_menu, wx.NewId(), _("R&eport A Problem"), _("Report a bug"), wx.ITEM_NORMAL)
-        self.helpReport.SetBitmap(wx.Bitmap(consts.icon_bug_report))
-        tmp_menu.AppendItem(self.helpReport)
-        tmp_menu.AppendSeparator()
-        self.helpDonate = wx.MenuItem(tmp_menu, wx.NewId(), _("&Donate"), _("Make a donation"), wx.ITEM_NORMAL)
-        self.helpDonate.SetBitmap(wx.Bitmap(consts.icon_donate))
-        tmp_menu.AppendItem(self.helpDonate)
-        tmp_menu.AppendSeparator()
-        self.helpAbout = wx.MenuItem(tmp_menu, wx.NewId(), _("&About..."), _("About " + consts.appName), wx.ITEM_NORMAL)
-        self.helpAbout.SetBitmap(wx.Bitmap(consts.icon_about))
-        tmp_menu.AppendItem(self.helpAbout)
-        self.menubar.Append(tmp_menu, _("&Help"))
+        self.helpHomepage = wx.MenuItem(tmp_menu,
+                                        wx.NewId(),
+                                        _("&Homepage"),
+                                        _("Visit the website"),
+                                        wx.ITEM_NORMAL)
+        self.helpHomepage.SetBitmap(wx.Bitmap(self.theme.icon_home))
+        tmp_menu.Append(self.helpHomepage)
+        self.helpTutorial = wx.MenuItem(tmp_menu,
+                                        wx.NewId(),
+                                        _("&Tutorial"),
+                                        _("Read the tutorial"),
+                                        wx.ITEM_NORMAL)
+        self.helpTutorial.SetBitmap(wx.Bitmap(self.theme.icon_book_open))
+        tmp_menu.Append(self.helpTutorial)
+        self.helpOnline = wx.MenuItem(tmp_menu,
+                                      wx.NewId(),
+                                      _("&Get Help Online"),
+                                      _("Visit the forums"),
+                                      wx.ITEM_NORMAL)
+        self.helpOnline.SetBitmap(wx.Bitmap(self.theme.icon_help))
+        tmp_menu.Append(self.helpOnline)
+        self.helpTranslate = wx.MenuItem(tmp_menu,
+                                         wx.NewId(),
+                                         _("&Translate This Application"),
+                                         _("Help translate to other languages"),
+                                         wx.ITEM_NORMAL)
+        self.helpTranslate.SetBitmap(wx.Bitmap(self.theme.icon_translate))
+        tmp_menu.Append(self.helpTranslate)
+        self.helpReport = wx.MenuItem(tmp_menu,
+                                      wx.NewId(),
+                                      _("R&eport A Problem"),
+                                      _("Report a bug"),
+                                      wx.ITEM_NORMAL)
+        self.helpReport.SetBitmap(wx.Bitmap(self.theme.icon_bug_report))
+        tmp_menu.Append(self.helpReport)
+        tmp_menu.AppendSeparator()
+        self.helpDonate = wx.MenuItem(tmp_menu,
+                                      wx.NewId(),
+                                      _("&Donate"),
+                                      _("Make a donation"),
+                                      wx.ITEM_NORMAL)
+        self.helpDonate.SetBitmap(wx.Bitmap(self.theme.icon_donate))
+        tmp_menu.Append(self.helpDonate)
+        tmp_menu.AppendSeparator()
+        self.helpAbout = wx.MenuItem(tmp_menu,
+                                     wx.NewId(),
+                                     _("&About..."),
+                                     _("About " + config.name),
+                                     wx.ITEM_NORMAL)
+        self.helpAbout.SetBitmap(wx.Bitmap(self.theme.icon_about))
+        tmp_menu.Append(self.helpAbout)
+        self.menubar.Append(tmp_menu,
+                            _("&Help"))
         self.SetMenuBar(self.menubar)
         # Menu Bar end
 
     def __bind_events(self):
-        self.Bind(wx.EVT_MENU, self.OnClose, self.fileClose)
-        self.Bind(wx.EVT_MENU, self.OnQuit, self.fileQuit)
-        self.Bind(wx.EVT_MENU, self.OnOptions, self.editOptions)
-        self.Bind(wx.EVT_MENU, self.OnHomepage, self.helpHomepage)
-        self.Bind(wx.EVT_MENU, self.OnTutorial, self.helpTutorial)
-        self.Bind(wx.EVT_MENU, self.OnHelpOnline, self.helpOnline)
-        self.Bind(wx.EVT_MENU, self.OnTranslate, self.helpTranslate)
-        self.Bind(wx.EVT_MENU, self.OnReport, self.helpReport)
-        self.Bind(wx.EVT_MENU, self.OnDonate, self.helpDonate)
-        self.Bind(wx.EVT_MENU, self.OnAbout, self.helpAbout)
+        self.Bind(wx.EVT_MENU, self.on_close, self.fileClose)
+        self.Bind(wx.EVT_MENU, self.on_quit, self.fileQuit)
+        self.Bind(wx.EVT_MENU, self.on_homepage, self.helpHomepage)
+        self.Bind(wx.EVT_MENU, self.on_tutorial, self.helpTutorial)
+        self.Bind(wx.EVT_MENU, self.on_help_online, self.helpOnline)
+        self.Bind(wx.EVT_MENU, self.on_translate, self.helpTranslate)
+        self.Bind(wx.EVT_MENU, self.on_report, self.helpReport)
+        self.Bind(wx.EVT_MENU, self.on_donate, self.helpDonate)
+        self.Bind(wx.EVT_MENU, self.on_about, self.helpAbout)
 
         self.Bind(wx.EVT_MENU, self.OnRefresh, self.projRefresh)
         self.Bind(wx.EVT_MENU, self.OnUpdates, self.projUpdates)
         self.Bind(wx.EVT_MENU, self.OnDownload, self.projDownload)
         self.Bind(wx.EVT_MENU, self.OnInstall, self.projInstall)
         self.Bind(wx.EVT_MENU, self.OnUpdateStatus, self.projUpdateStatus)
-        self.Bind(wx.EVT_MENU, self.OnDetails, self.projDetails)
         self.Bind(wx.EVT_MENU, self.OnSources, self.projSources)
 
         self.Bind(wx.EVT_BUTTON, self.OnDownload, self.downloadButton)
         self.Bind(wx.EVT_BUTTON, self.OnRefresh, self.refreshButton)
-        #self.Bind(wx.EVT_BUTTON, self.OnUpdateStatus, self.updateStatusButton)
         self.Bind(wx.EVT_BUTTON, self.OnUpdates, self.updatesButton)
-        self.Bind(wx.EVT_CLOSE, self.Closing)
+        self.Bind(wx.EVT_CLOSE, self.closing)
 
     def __set_properties(self):
         self.SetSize((700, 500))
@@ -204,14 +263,16 @@
         sizer_buttons.Add(self.downloadButton, 0, wx.ALL, 3)
         sizer_buttons.Add(self.updatesButton, 0, wx.ALL, 3)
         sizer_buttons.Add(self.refreshButton, 0, wx.ALL, 3)
-        #sizer_buttons.Add(self.updateStatusButton, 0, wx.ALL, 3)
-        #sizer_bottom.Add(sizer_buttons, 0, wx.ALIGN_CENTER_VERTICAL, 0)
         self.buttonPanel.SetSizer(sizer_buttons)
 
         sizer_project = wx.BoxSizer(wx.VERTICAL)
         sizer_project.Add(self.projectDetails, 1, wx.EXPAND, 0)
         self.project_notebook_pane.SetSizer(sizer_project)
-        self.notebook.InsertPage(0, self.project_notebook_pane, _("Project Details"), False, 0)
+        self.notebook.InsertPage(0,
+                                 self.project_notebook_pane,
+                                 _("Project Details"),
+                                 False,
+                                 0)
         sizer_bottom.Add(self.notebook, 1, wx.EXPAND, 0)
         self.panel.SetSizer(sizer_bottom)
         self.notebook.SetSelection(0)
@@ -223,143 +284,122 @@
         self.Layout()
         self.Centre()
 
-    def OnShowPopup(self, evt):
+    def on_show_popup(self, evt):
         pos = evt.GetPosition()
         pos = self.ScreenToClient(pos)
         self.PopupMenu(self.popupmenu, pos)
 
-    def Closing(self, event): # Cleanup cleanup, everybody do your share
-        #self.thread.StopThreads()
-        #self.thread.Destroy()
-        log.info(_("Cleaning up plugins"))
-        for name, instance, type, version in plugins.InterfacePluginList: instance.cleanup()
+    def closing(self, event):  # Cleanup cleanup, everybody do your share
         log.info(_("Shutting down"))
         self.Destroy()
 
-    def OnClose(self, event):
+    def on_close(self, event):
         self.list.DeleteAllItems()
         self.projectDetails.Clear()
-        self.list.tabpage.SetPackage()
-        start = startDialog(None, -1, '')
+        self.list.tabpage.set_package()
+        start = StartDialog()
         success = start.ShowModal()
         start.Destroy()
 
         if success == wx.ID_CANCEL:
             self.Close()
         else:
-            self.Refresh(project.projects[len(project.projects) - 1].GetData())
-
-    def OnQuit(self, event):       self.Close()
-    def OnHomepage(self, event):   lib.browserOpen(consts.urlHomepage)
-    def OnTutorial(self, event):   lib.browserOpen(consts.urlTutorial)
-    def OnHelpOnline(self, event): lib.browserOpen(consts.urlHelp)
-    def OnTranslate(self, event):  lib.browserOpen(consts.urlTranslate)
-    def OnReport(self, event):     lib.browserOpen(consts.urlBug)
-    def OnDonate(self, event):     lib.browserOpen(consts.urlDonate)
-    def OnAbout(self, event):
-        info = wx.AboutDialogInfo()
-
-        info.SetIcon(wx.Icon(consts.fileLogo, wx.BITMAP_TYPE_PNG))
-        info.SetName(consts.appName)
-        info.SetVersion(consts.appVersion)
-        info.SetDescription(consts.description)
-        info.SetCopyright(consts.copyright)
-        info.SetWebSite(consts.urlHomepage)
-        info.SetLicence(consts.license)
-        info.AddDeveloper(consts.authors)
-        info.AddDocWriter(consts.docwriters)
-        info.AddArtist(consts.artists)
-        info.AddTranslator(consts.translators)
-
-        wx.AboutBox(info)
+            self.Refresh(lib.project.current.get_data())
+
+    def on_quit(self, event):
+        self.Close()
+
+    def on_homepage(self, event):
+        webbrowser.open(config.homepage_url)
+
+    def on_tutorial(self, event):
+        webbrowser.open(config.tutorial_url)
+
+    def on_help_online(self, event):
+        webbrowser.open(config.help_url)
+
+    def on_translate(self, event):
+        webbrowser.open(config.translate_url)
+
+    def on_report(self, event):
+        webbrowser.open(config.bug_url)
+
+    def on_donate(self, event):
+        webbrowser.open(config.donate_url)
+
+    def on_about(self, event):
+        info = wx.adv.AboutDialogInfo()
+
+        info.SetIcon(wx.Icon(config.logo_path, wx.BITMAP_TYPE_PNG))
+        info.SetName(config.name)
+        info.SetVersion(config.version)
+        info.SetDescription(config.description)
+        info.SetCopyright(config.copyright)
+        info.SetWebSite(config.homepage_url)
+        info.SetLicence(config.license)
+        info.AddDeveloper(config.authors)
+        info.AddDocWriter(config.docwriters)
+        info.AddArtist(config.artists)
+        info.AddTranslator(config.translators)
+
+        wx.adv.AboutBox(info)
 
     def OnSources(self, event):
-        proj = project.projects[len(project.projects) - 1]
-        name = proj.getSources() + _(' - Sources Editor')
-        edit = FileEditor(name, proj.getSources())
+        proj = project.current
+        name = proj.get_sources() + _(' - Sources Editor')
+        edit = FileEditor(name, proj.get_sources())
         if edit.ShowModal() == wx.ID_OK:
-            edit.txt.SaveFile(proj.getSources())
-            if wx.MessageBox(_("Sources have changed. Would you like to reload the package list?"), _("Save Successful"), wx.YES_NO) == 2: #wx.ID_YES:
+            edit.txt.SaveFile(proj.get_sources())
+            if wx.MessageBox(_("Sources have changed. Would you like to reload "
+                               "the package list?"),
+                             _("Save Successful"),
+                             wx.YES_NO) == 2: #wx.ID_YES:
                 self.OnRefresh(None)
         edit.Destroy()
 
-    def OnOptions(self, event):
-        options = optionDialog(None, -1, '')
-        if options.ShowModal() == wx.ID_OK:
-            # Set settings
-            consts.proxy_enabled = options.proxyCheckBox.GetValue()
-            conf = open(consts.file_config, 'w')
-            conf.write('LogDir=' + options.logCtrl.GetValue() + '\n' +
-                        #'LocaleDir=' + options.localeCtrl.GetValue() + '\n' +
-                        #'PackagesDir=' + options.packagesCtrl.GetValue() + '\n' +
-                        'PluginsDir=' + options.pluginsCtrl.GetValue() + '\n' +
-                        'ProjectsDir=' + options.projectsCtrl.GetValue() + '\n' +
-                        'PixmapsDir=' + options.pixmapsCtrl.GetValue() + '\n' +
-                        'ThemesDir=' + options.themesCtrl.GetValue() + '\n' +
-                        'DefaultTheme=' + options.defaultThemeCtrl.GetValue() + '\n' +
-                        'CurrentTheme=' + options.defaultThemeCtrl.GetValue() + '\n')
-
-            if options.proxyCheckBox.GetValue():
-                proxy_url = 'http://%s:%s' % (options.proxy_url.GetValue(), options.proxy_port.GetValue())
-                consts.http_proxy = {'http': proxy_url}
-                conf.write('HTTPProxy=' + proxy_url + '\n' +
-                           'ProxyUsername=' + options.proxy_username.GetValue() + '\n' +
-                           'ProxyPassword=' + options.proxy_password.GetValue() + '\n')
-            conf.close()
-            wx.MessageBox(_("If you changed a folder location, changes take affect after restarting Keryx."), _("Saved Changes"))
-        options.Destroy()
-
     def OnDownload(self, event):
         # Downloads selected package and dependencies
-        try:
-            selected = self.list.GetSelectedItem()
-            if selected: files = project.projects[len(project.projects) - 1].getDependencies(selected[1])
-        except:
-            return
-
-        # Generate filename list.
-        list = ""
-        for i in range(len(files)):
-            list += files[i][0] + "\n"
+        selected = self.list.get_selected_item()
+        if selected:
+            files = project.current.get_dependencies(selected.name)
+
+        # Generate filename list.
+        list = ""
+        for f in files:
+            list += f[0] + "\n"
 
         # Confirm downloads
-        dlg = ScrolledMessageDialog(None, _("Confirm Download"), _("Do you wish to download the following") + " " + str(len(files)) + " " + _("files?"), list)
-        #dlg = wx.MessageDialog(None, _("Do you wish to download the following") + " " + str(len(files)) + " " + _("files?") + list, _("Confirm Downloads"), wx.YES_NO | wx.ICON_QUESTION)
+        dlg = ScrolledMessageDialog(None,
+                                    _("Confirm Download"),
+                                    _("Do you wish to download the following")
+                                    + " " + str(len(files)) + " " + _("files?"),
+                                    list)
         result = dlg.ShowModal() == wx.ID_OK
         dlg.Destroy()
 
         # User doesn't want to download them
         if not result:
-            self.Refresh(project.projects[len(project.projects) -1].GetData())
-            #self.downloadedLists()
             return
 
         # Make sure packages directory exists
-        dir = os.path.join(project.projects[len(project.projects) -1].dir, 'packages')
+        dir = os.path.join(project.current.dir, 'packages')
         if not os.path.exists(dir):
             os.mkdir(dir)
 
-        #########################################################
-        # FIXME: Return to the plugin for post download cleanup #
-        #########################################################
-        frame = download(self, None, files)
-        #self.downloads.files = files
-        #self.thread.start(self, self.downloads.start, None) #self.downloadedLsts) # Do nothing after the packages are downloaded
-        #a.start(self, lists.start, None) # New thread
-
-        # If it fails, reset the package lists, in other words, reload the list again.
-
-        #self.download.downloads = files
-        #self.download.start()
-
-        #FIXME: If any package fails to download, set package installed version to blank
-        #list of failed files now stored in frame[1] as returned by download.py
-
+        # FIXME: Return to the plugin for post download cleanup
+        Download(self, None, files)
+
+        # FIXME: If any package fails to download, set package installed version
+        # to blank list of failed files now stored in frame[1] as returned by
+        # download.py
+
     def OnInstall(self, event):
         # Get the necessary information for package installation
-        projdir = project.projects[len(project.projects) -1].dir
+        projdir = project.current.dir
         spacksdir = os.path.join(projdir, 'packages')
-        spacks = [x for x in os.listdir(spacksdir) if os.path.isfile(os.path.join(spacksdir, x)) and (os.path.splitext(x)[1] == '.deb')]
+        spacks = [x for x in os.listdir(spacksdir)
+                  if os.path.isfile(os.path.join(spacksdir, x)) and
+                  (os.path.splitext(x)[1] == '.deb')]
         packnames = sorted([x[:x.find('_')] for x in spacks])
 
         # Ask what packages need to be installed
@@ -373,7 +413,7 @@
         if result == wx.ID_CANCEL:
             return
 
-        result = project.projects[len(project.projects) - 1].plugin.installCache(project.projects[len(project.projects) -1].dir, 'installcache')
+        result = project.current.plugin.install_cache(project.current.dir, 'installcache')
         if not result:
             wx.MessageBox(_("Failed to update the APT cache. Aborting " \
                             "installation."), 
@@ -381,19 +421,18 @@
             return
 
         # Install the packages
-        projdir = project.projects[len(project.projects) -1].dir
-        result = project.projects[len(project.projects) - 1]. \
-                    plugin.installPacks(projdir, ' '.join(packnames))
+        projdir = project.current.dir
+        result = project.current.plugin.install_packs(projdir, ' '.join(packnames))
         if result:
-            wx.MessageBox(_("Package installation finished. You should update " \
+            wx.MessageBox(_("Package installation finished. You should update "
                             "your project status (Project > Update Status)."), 
                           _("Installation finished"))
         else:
-            wx.MessageBox(_("An error occurred while installing your " \
-                            "packages. Make sure no other package manager is " \
-                            "running when you try to Install the packages. " \
-                            "Check the log for more details.\n\nAnother " \
-                            "option is installing the packages by hand using " \
+            wx.MessageBox(_("An error occurred while installing your "
+                            "packages. Make sure no other package manager is "
+                            "running when you try to Install the packages. "
+                            "Check the log for more details.\n\nAnother "
+                            "option is installing the packages by hand using "
                             "apt-get."), 
                           _("Install Error"))
 
@@ -405,97 +444,78 @@
 
         # Make sure we have updates
         if len(updates) == 0:
-            return wx.MessageBox(_("No updates available. Your computer is up-to-date."),_("No updates"))
+            return wx.MessageBox(_("No updates available. Your computer is "
+                                   "up-to-date."),
+                                 _("No updates"))
 
-        # Got a list of package names, lets generate a list of filenames to download
+        # Got a list of package names, lets generate a list of filenames to
+        # download
         for item in updates:
-            files += project.projects[len(project.projects) - 1].getDependencies(item)
+            files += project.current.get_dependencies(item)
 
         # Make sure packages directory exists
-        dir = os.path.join(project.projects[len(project.projects) - 1].dir, 'packages')
+        dir = os.path.join(project.current.dir, 'packages')
         if not os.path.exists(dir):
             os.mkdir(dir)
 
-        frame = download(self, None, files)
-
-    def OnDetails(self, event):
-        for i in range(self.notebook.GetPageCount()): # Find the details page and select it
-            if self.notebook.GetPageText(i) == _("Package Details"): self.notebook.SetSelection(i)
-
-#    def OnOpen(self, event):
-#        dlg = wx.FileDialog(self, message=_("Choose a file"),
-#            defaultDir=consts.dirProjects,
-#            defaultFile="",
-#            wildcard=consts.wildcard,
-#            style=wx.OPEN | wx.CHANGE_DIR)
-
-#        # Show the dialog and retrieve the user response. If it is the OK response,
-#        # process the data
-#        if dlg.ShowModal() == wx.ID_OK:
-#            paths = dlg.GetPaths()
-#            data = project.openKeryx(paths[0])
-#            dlg.Destroy()
-#            if data:
-#                proj = project.project(data[0], data[1], data[2],  data[3], data[4], data[5], data[6], data[7])
-#                project.projects[len(project.projects) -1] = proj # variable must be initialized
-#                self.Refresh(project.projects[len(project.projects) -1].GetData())
-
-#    def OnNew(self, event):
-#        dlg = wx.TextEntryDialog(self, _("What would you like to name your new project?"),
-#                _('New Project'), platform.node())
-#        if dlg.ShowModal() == wx.ID_OK:
-#            response = dlg.GetValue()
-#            #print response
-#        dlg.Destroy()
+        Download(self, None, files)
 
     def OnUpdateStatus(self, event):
-        dlg = wx.MessageDialog(None, _("This will update Keryx about which packages are installed on your computer. Only run this on the computer you created this project on.\n\n" + \
-                          "Would you like to continue?"),
-                          _("Update Status"), wx.YES_NO | wx.ICON_QUESTION)
+        dlg = wx.MessageDialog(None,
+                               _("This will update Keryx about which packages "
+                                 "are installed on your computer. Only run "
+                                 "this on the computer you created this "
+                                 "project on.\n\nWould you like to continue?"),
+                               _("Update Status"), wx.YES_NO | wx.ICON_QUESTION)
         result = dlg.ShowModal()
         dlg.Destroy()
         if result == wx.ID_NO:
             return
         success = self.UpdateStatus()
         if success:
-            dlg = wx.MessageBox(_("Status update Succeeded."),
+            wx.MessageBox(_("Status update Succeeded."),
                           _("Status Update Succeeded"))
             self.loadLocal()
         else:
-            dlg = wx.MessageBox(_("Status update failed. Try running Keryx as root (using 'sudo')."),
-                          _("Status Update Failed"), wx.ICON_ERROR)
+            wx.MessageBox(_("Status update failed. Try running Keryx as root "
+                            "(using 'sudo')."),
+                          _("Status Update Failed"),
+                          wx.ICON_ERROR)
+
     def UpdateStatus(self):
-        project_dir = project.projects[len(project.projects) -1].dir
-        return project.projects[len(project.projects) - 1].plugin.updateStatus(project_dir)
-
-
+        project_dir = project.current.dir
+        return project.current.plugin.update_status(project_dir)
+
     def OnRefresh(self, event):
-        self.Refresh(project.projects[len(project.projects) -1].GetData())
+        self.Refresh(project.current.get_data())
+
     def Refresh(self, data):
-        self.SetTitle(data[0] + " - " + consts.appName + " v" + consts.appVersion)
+        self.SetTitle(data[0] + " - " + config.name + " v" + config.version)
         self.projectDetails.Clear()
         self.projectDetails.AppendText(data[0] + '\n')
-        if data[2] != '': self.projectDetails.AppendText(_("Operating System:") + '\t' + data[2] + '\n')
-        if data[3] != '': self.projectDetails.AppendText(_("Version:") + '\t' + data[3] + '\n')
-        if data[4] != '': self.projectDetails.AppendText(_("Kernel:") + '\t' + data[5] + '\n')
-        if data[5] != '': self.projectDetails.AppendText(_("Architecture:") + '\t' + data[4] + '\n')
-        self.projectDetails.AppendText(_("Drive Free Space:") + '\t' + lib.driveFreeSpace() + '\n')
-        #self.projectDetails.AppendText("%s\n%s\t%s\n%s\t%s\n%s\t%s\n%s\t%s\n%s\t%s" %
-        #    (data[0], os, data[2], v, data[3], k, data[4], a, data[5], f, lib.driveFreeSpace()))
+        if data[2] != '':
+            self.projectDetails.AppendText(_("Operating System:") + '\t' + data[2] + '\n')
+        if data[3] != '':
+            self.projectDetails.AppendText(_("Version:") + '\t' + data[3] + '\n')
+        if data[4] != '':
+            self.projectDetails.AppendText(_("Kernel:") + '\t' + data[5] + '\n')
+        if data[5] != '':
+            self.projectDetails.AppendText(_("Architecture:") + '\t' + data[4] + '\n')
+        self.projectDetails.AppendText(_("Drive Free Space:") + '\t' + lib.drive_free_space() + '\n')
 
         points = self.projectDetails.GetFont().GetPointSize()
         style = wx.Font(points, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD)
         self.projectDetails.SetStyle(0, len(data[0]), wx.TextAttr("black", wx.NullColour, style))
 
         # Get index file URLs.
-        urls = project.projects[len(project.projects) -1].getUrls()
+        urls = project.current.get_urls()
 
         # Inquire whether latest package list should be downloaded
-        #dlg = wx.MessageDialog(None, _('Download the latest package list?'),
-        #                  _("Download latest?"), wx.YES_NO | wx.ICON_QUESTION)
         urls_string = '\n'.join(['\n'.join(x) for x in urls])
-        dlg = ScrolledMessageDialog(None, _("Download Latest?"),
-                            _("Download the latest package lists?"), urls_string)
+        dlg = ScrolledMessageDialog(None,
+                                    _("Download Latest?"),
+                                    _("Download the latest package lists?"),
+                                    urls_string)
 
         result = dlg.ShowModal()
         dlg.Destroy()
@@ -503,29 +523,28 @@
         # Load package list
         self.SetStatusText(_("Loading packages") + "...", 0)
 
-        if result == wx.ID_OK: frame = download(self, self.loadLocal, urls, True)
-        else:                   self.loadLocal()
-
+        if result == wx.ID_OK:
+            Download(self, self.loadLocal, urls, True)
+        else:
+            self.loadLocal()
 
     def loadLocal(self, result=None):
         #TODO: Verify downloads?
-        thread(self, project.projects[len(project.projects) - 1].loadLocal, self.loadPackages)
+        Thread(self, project.current.load_local, self.loadPackages)
 
     def loadPackages(self, result=None):
-        proj = project.projects[len(project.projects) - 1]
-        #self.thread.Start(project.LocalPackagesThread(proj), None)
-        self.list.SetMap(proj.packages)
-        self.list.SortListItems(1, 1) # Sort column 1, ascending A->Z order
+        proj = project.current
+        self.list.set_map(proj.packages)
+        self.list.SortListItems(1)  # Sort column 1, ascending A->Z order
 
-        self.SetStatusText(str(len(proj.packages.keys())) + " " + _("Packages"),0)
+        self.SetStatusText(str(len(proj.packages.keys())) + " " + _("Packages"), 0)
 
 # end of class MainApp
 
-# Begin mac9416's wonderful custom dialog!
 
 class ScrolledMessageDialog(wx.Dialog):
     def __init__(self, parent, title, caption, msg,
-                 pos=wx.DefaultPosition, size=(400,250),
+                 pos=wx.DefaultPosition, size=(400, 250),
                  style=wx.DEFAULT_DIALOG_STYLE):
         wx.Dialog.__init__(self, parent, -1, title, pos, size, style)
         x, y = pos
@@ -553,6 +572,7 @@
         sizer.Add(btnSizer, 0, wx.ALIGN_RIGHT | wx.TOP | wx.BOTTOM, 10)
         self.SetSizerAndFit(sizer)
 
+
 class SelectPackagesDialog(wx.Dialog):
     """Dialog for selection of packages to be installed"""
     def __init__(self, parent, id, title, items):
@@ -602,6 +622,7 @@
         for index in range(self.check_list.list.GetItemCount()):
             self.check_list.list.CheckItem(index, False)
 
+
 class CheckListCtrl(wx.ListCtrl, CheckListCtrlMixin):
     def __init__(self, parent):
         wx.ListCtrl.__init__(self, parent, -1, style=wx.LC_REPORT)
@@ -611,6 +632,7 @@
     def OnItemActivated(self, evt):
         self.ToggleItem(evt.m_itemIndex)
 
+
 class CheckListPanel(wx.Panel):
     def __init__(self, parent, items):
         wx.Panel.__init__(self, parent, -1)

=== modified file 'lib/wxkeryx/misc.py'
--- lib/wxkeryx/misc.py	2010-02-20 04:17:16 +0000
+++ lib/wxkeryx/misc.py	2017-06-11 16:11:12 +0000
@@ -16,158 +16,176 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-import os.path
-import urllib
 import wx
-import wx.lib.delayedresult as delayedresult
-import wx.lib.mixins.listctrl  as  listmix
-
+import wx.lib.mixins.listctrl as listmix
+from gettext import gettext as _
+
 import lib
-from lib import consts, log
-
-class VirtualList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSorterMixin):
-    def __init__(self, parent, tabpage, data = {}):
-        wx.ListCtrl.__init__( self, parent, -1, style=wx.LC_SINGLE_SEL|wx.LC_REPORT|wx.LC_VIRTUAL|wx.LC_HRULES|wx.LC_VRULES)
+from lib import config
+from lib.package import Package
+
+
+class VirtualList(wx.ListCtrl,
+                  listmix.ListCtrlAutoWidthMixin,
+                  listmix.ColumnSorterMixin):
+    def __init__(self, parent, tabpage, data={}):
+        self.theme = config.theme
+        wx.ListCtrl.__init__(self,
+                             parent,
+                             -1,
+                             style=wx.LC_SINGLE_SEL |
+                                   wx.LC_REPORT |
+                                   wx.LC_VIRTUAL |
+                                   wx.LC_HRULES |
+                                   wx.LC_VRULES)
         self.tabpage = tabpage
         # Add some art
         self.il = wx.ImageList(16, 16)
-        self.sm_up = self.il.Add(wx.Bitmap(consts.icon_arrow_up))
-        self.sm_dn = self.il.Add(wx.Bitmap(consts.icon_arrow_down))
-        self.uptodate = self.il.Add(wx.Bitmap(consts.icon_uptodate))
-        self.update = self.il.Add(wx.Bitmap(consts.icon_update))
-        self.error = self.il.Add(wx.Bitmap(consts.icon_error))
-        self.downloaded = self.il.Add(wx.Bitmap(consts.icon_downloaded))
+        self.sm_up = self.il.Add(wx.Bitmap(self.theme.icon_arrow_up))
+        self.sm_dn = self.il.Add(wx.Bitmap(self.theme.icon_arrow_down))
+        self.uptodate = self.il.Add(wx.Bitmap(self.theme.icon_uptodate))
+        self.update = self.il.Add(wx.Bitmap(self.theme.icon_update))
+        self.error = self.il.Add(wx.Bitmap(self.theme.icon_error))
+        self.downloaded = self.il.Add(wx.Bitmap(self.theme.icon_downloaded))
         self.SetImageList(self.il, wx.IMAGE_LIST_SMALL)
 
         # Add some attributes (colourful background for each item rows)
         self.attrUpdate = wx.ListItemAttr()
-        self.attrUpdate.SetBackgroundColour("light blue") # blue
+        self.attrUpdate.SetBackgroundColour("light blue")  # blue
         self.attrUptodate = wx.ListItemAttr()
-        self.attrUptodate.SetBackgroundColour(wx.Color(150, 235, 140)) # green
+        self.attrUptodate.SetBackgroundColour(wx.Colour(150, 235, 140))  # green
         self.attrError = wx.ListItemAttr()
-        self.attrError.SetBackgroundColour(wx.Color(255, 118, 106)) # red
+        self.attrError.SetBackgroundColour(wx.Colour(255, 118, 106))  # red
         self.attrDownloaded = wx.ListItemAttr()
-        self.attrDownloaded.SetBackgroundColour(wx.Color(255, 215, 100)) # yellow
+        self.attrDownloaded.SetBackgroundColour(wx.Colour(255, 215, 100))  # yellow
 
         # Build the columns
         count = 0
-        for title, width in consts.columns:
+
+        columns = [(_('S'), 50),
+                  (_('Package Name'), 200),
+                  (_('Installed Version'), 200),
+                  (_('Latest Version'), 200),
+                  (_('Description'), 200)]
+
+        for title, width in columns:
             self.InsertColumn(count, title)
             self.SetColumnWidth(count, width)
             count += 1
-        #self.InsertColumn(0, _("S"))
-        #self.InsertColumn(1, _("Package Name"))
-        #self.InsertColumn(2, _("Installed Version"))
-        #self.InsertColumn(3, _("Latest Version"))
-        #self.InsertColumn(4, _("Description"))
-
-        #self.SetColumnWidth(0, 50)
-        #self.SetColumnWidth(1, 200)
-        #self.SetColumnWidth(2, 200)
-        #self.SetColumnWidth(3, 200)
-        #self.SetColumnWidth(4, 200)
-
-        #These two should probably be passed to init more cleanly
-        #setting the numbers of items = number of elements in the dictionary
-        self.SetMap(data)
+
+        # These two should probably be passed to init more cleanly setting the
+        # numbers of items = number of elements in the dictionary
+        self.set_map(data)
         self.currentItem = None
 
-        #mixins
+        # mixins
         listmix.ListCtrlAutoWidthMixin.__init__(self)
         listmix.ColumnSorterMixin.__init__(self, 3)
 
-        #sort by genre (column 2), A->Z ascending order (1)
-        #self.SortListItems(0, 1)
-
-        #events
-        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected)
-        self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.OnItemActivated)
-        self.Bind(wx.EVT_LIST_ITEM_DESELECTED, self.OnItemDeselected)
-
-    def SetMap(self, dataMap):
-        self.itemDataMap = dataMap
-        self.itemIndexMap = dataMap.keys()
-        self.SetItemCount(len(dataMap))
-        self.tabpage.SetPackage()
+        # events
+        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.on_item_selected)
+        self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self._on_item_selected)
+        self.Bind(wx.EVT_LIST_ITEM_DESELECTED, self._on_item_deselected)
+
+    def set_map(self, data_map):
+        self.itemDataMap = data_map
+        self.itemIndexMap = data_map.keys()
+        self.SetItemCount(len(data_map))
+        self.tabpage.set_package()
         self.Refresh()
 
-    def OnColClick(self,event): event.Skip()
-
-    def GetSelectedItem(self): return self.itemDataMap[self.itemIndexMap[self.currentItem]]
-
-    def OnItemSelected(self, event):
-        self.currentItem = event.m_itemIndex
-        index=self.itemIndexMap[self.currentItem]
-        self.tabpage.SetPackage(self.itemDataMap[index])
-
-    def OnItemActivated(self, event):
-        self.currentItem = event.m_itemIndex
-        #print 'item activated'
-
-    def getColumnText(self, index, col):
+    def on_col_click(self, event):
+        event.Skip()
+
+    def get_selected_item(self):
+        return self.itemDataMap[self.itemIndexMap[self.currentItem]]
+
+    def on_item_selected(self, event):
+        self.currentItem = event.Index
+        index = self.itemIndexMap[self.currentItem]
+        self.tabpage.set_package(self.itemDataMap[index])
+
+    def _on_item_selected(self, event):
+        self.currentItem = event.m_itemIndex
+
+    def get_column_text(self, index, col):
         item = self.GetItem(index, col)
         return item.GetText()
 
-    def OnItemDeselected(self, evt):
+    def _on_item_deselected(self, evt):
         pass
 
     def OnGetItemText(self, item, col):
-        index=self.itemIndexMap[item]
-        s = self.itemDataMap[index][col]
-        return s
+        index = self.itemIndexMap[item]
+        if col == 0:
+            return self.itemDataMap[index].status
+        elif col == 1:
+            return self.itemDataMap[index].name
+        elif col == 2:
+            return self.itemDataMap[index].installed_version
+        elif col == 3:
+            return self.itemDataMap[index].version
+        elif col == 4:
+            return self.itemDataMap[index].description
 
     def OnGetItemImage(self, item):
-        index=self.itemIndexMap[item]
-        icon=self.itemDataMap[index][0]
+        index = self.itemIndexMap[item]
+        icon = self.itemDataMap[index].status
 
-        if icon==0:
+        if icon == 0:
             return self.uptodate
-        elif icon==1:
+        elif icon == 1:
             return self.update
-        elif icon==2:
+        elif icon == 2:
             return self.error
-        elif icon==3:
+        elif icon == 3:
             return self.downloaded
         else:
             return -1
 
     def OnGetItemAttr(self, item):
-        index=self.itemIndexMap[item]
-        update=self.itemDataMap[index][0]
+        index = self.itemIndexMap[item]
+        update = self.itemDataMap[index].status
 
-        if update==0:
+        if update == 0:
             return self.attrUptodate
-        elif update==1:
+        elif update == 1:
             return self.attrUpdate
-        elif update==2:
+        elif update == 2:
             return self.attrError
-        elif update==3:
+        elif update == 3:
             return self.attrDownloaded
         else:
             return None
 
-    def SortItems(self,sorter=cmp):
+    def SortItems(self, sorter):
         items = list(self.itemDataMap.keys())
-        items.sort(sorter)
+        items.sort()
         self.itemIndexMap = items
 
         # redraw the list
         self.Refresh()
 
     # Used by the ColumnSorterMixin, see wx/lib/mixins/listctrl.py
-    def GetListCtrl(self): return self
+    def GetListCtrl(self):
+        return self
 
     # Used by the ColumnSorterMixin, see wx/lib/mixins/listctrl.py
-    def GetSortImages(self): return (self.sm_dn, self.sm_up)
-
-# end of class VirtualList
-
-class detailsTab(object):
+    def GetSortImages(self):
+        return (self.sm_dn, self.sm_up)
+
+
+class DetailsTab(object):
     def __init__(self, notebook):
+        self.theme = config.theme
         self.notebook = notebook
         self.pane = wx.Panel(self.notebook, -1, style=wx.TAB_TRAVERSAL)
-        index = self.notebook.GetImageList().Add(wx.Bitmap(consts.icon_package))
-        self.details = wx.TextCtrl(self.pane, style = wx.TE_MULTILINE | wx.TE_RICH | wx.TE_READONLY)
+        index = self.notebook.GetImageList().\
+            Add(wx.Bitmap(self.theme.icon_package))
+        self.details = wx.TextCtrl(self.pane,
+                                   style=wx.TE_MULTILINE |
+                                         wx.TE_RICH |
+                                         wx.TE_READONLY)
 
         attr = wx.TextAttr()
         attr.SetTabs([400])
@@ -178,92 +196,123 @@
         self.pane.SetSizer(sizer)
         self.notebook.AddPage(self.pane, _("Package Details"), False, index)
 
-    def SetPackage(self, stats = ['','','','','','','',0]):
+    def set_package(self, stats=Package('')):
         self.details.Clear()
-        if stats[1] == '': return
-
-        update = stats[0]
-        name = stats[1]
-        inst = stats[2]
-        latest = stats[3]
-        descrip = stats[4]
-        depends = stats[5]
-        filename = stats[6]
-        size = lib.convert_file_size(stats[7])
-
-        if not name == '': self.details.AppendText(name + '\n')
-        if not descrip == '': self.details.AppendText(_("Description:\t") + descrip + '\n')
-        if not inst == '': self.details.AppendText(_("Installed Version:\t") + inst + '\n')
-        if not latest == '': self.details.AppendText(_("Latest Version:\t") + latest + '\n')
-        if not depends =='': self.details.AppendText(_("Dependencies:\t") + depends + '\n')
-        if not size == '': self.details.AppendText(_("Size:\t") + size + '\n')
-        if not filename == '': self.details.AppendText(_("Filename:\t") + filename + '\n')
-        #self.details.AppendText("%s\n%s\t%s\n%s\t%s\n%s\t%s\n%s\t%s\n%s\t%s\n%s\t%s" %
-        #    (name, d, descrip, i, inst, l, latest, dep, depends, s, size, f, filename))
+        if stats.name == '':
+            return
+
+        update = stats.status
+        name = stats.name
+        inst = stats.installed_version
+        latest = stats.version
+        descrip = stats.description
+        depends = stats.depends
+        filename = stats.filename
+        size = lib.convert_file_size(stats.size)
+
+        if not name == '':
+            self.details.AppendText(name + '\n')
+        if not descrip == '':
+            self.details.AppendText(_("Description:\t") + descrip + '\n')
+        if not inst == '':
+            self.details.AppendText(_("Installed Version:\t") + inst + '\n')
+        if not latest == '':
+            self.details.AppendText(_("Latest Version:\t") + latest + '\n')
+        if not depends == '':
+            self.details.AppendText(_("Dependencies:\t") + depends + '\n')
+        if not size == '':
+            self.details.AppendText(_("Size:\t") + size + '\n')
+        if not filename == '':
+            self.details.AppendText(_("Filename:\t") + filename + '\n')
 
         # Fixes scrolling issue
         self.details.ScrollLines(-15)
 
         points = self.details.GetFont().GetPointSize()
-        style = wx.Font(points, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD)
-        self.details.SetStyle(0, len(name), wx.TextAttr("black", wx.NullColour, style))
+        style = wx.Font(points,
+                        wx.FONTFAMILY_DEFAULT,
+                        wx.FONTSTYLE_NORMAL,
+                        wx.FONTWEIGHT_BOLD)
+        self.details.SetStyle(0,
+                              len(name),
+                              wx.TextAttr("black", wx.NullColour, style))
 
-# end of class detailsTab
 
 class ProportionalSplitter(wx.SplitterWindow):
-        def __init__(self,parent, id = -1, proportion=0.60, size = wx.DefaultSize, **kwargs):
-                wx.SplitterWindow.__init__(self,parent,id,wx.Point(0, 0),size, **kwargs)
-                self.SetMinimumPaneSize(50) #the minimum size of a pane.
-                self.proportion = proportion
-                if not 0 < self.proportion < 1:
-                        raise ValueError, "proportion value for ProportionalSplitter must be between 0 and 1."
-                self.ResetSash()
-                self.Bind(wx.EVT_SIZE, self.OnReSize)
-                self.Bind(wx.EVT_SPLITTER_SASH_POS_CHANGED, self.OnSashChanged, id=id)
-                ##hack to set sizes on first paint event
-                self.Bind(wx.EVT_PAINT, self.OnPaint)
-                self.firstpaint = True
-
-        def SplitHorizontally(self, win1, win2):
-                if self.GetParent() is None: return False
-                return wx.SplitterWindow.SplitHorizontally(self, win1, win2,
-                        int(round(self.GetParent().GetSize().GetHeight() * self.proportion)))
-
-        def SplitVertically(self, win1, win2):
-                if self.GetParent() is None: return False
-                return wx.SplitterWindow.SplitVertically(self, win1, win2,
-                        int(round(self.GetParent().GetSize().GetWidth() * self.proportion)))
-
-        def GetExpectedSashPosition(self):
-                if self.GetSplitMode() == wx.SPLIT_HORIZONTAL:
-                        tot = max(self.GetMinimumPaneSize(),self.GetParent().GetClientSize().height)
-                else:
-                        tot = max(self.GetMinimumPaneSize(),self.GetParent().GetClientSize().width)
-                return int(round(tot * self.proportion))
-
-        def ResetSash(self):
-                self.SetSashPosition(self.GetExpectedSashPosition())
-
-        def OnReSize(self, event):
-                """Window has been resized, so we need to adjust the sash based on self.proportion."""
-                self.ResetSash()
-                event.Skip()
-
-        def OnSashChanged(self, event):
-                """We'll change self.proportion now based on where user dragged the sash."""
-                pos = float(self.GetSashPosition())
-                if self.GetSplitMode() == wx.SPLIT_HORIZONTAL:
-                        tot = max(self.GetMinimumPaneSize(),self.GetParent().GetClientSize().height)
-                else:
-                        tot = max(self.GetMinimumPaneSize(),self.GetParent().GetClientSize().width)
-                self.proportion = pos / tot
-                event.Skip()
-
-        def OnPaint(self,event):
-                if self.firstpaint:
-                        if self.GetSashPosition() != self.GetExpectedSashPosition():
-                                self.ResetSash()
-                        self.firstpaint = False
-                event.Skip()
-
-# end of class ProportionalSplitter
+    def __init__(self,
+                 parent,
+                 id=-1,
+                 proportion=0.60,
+                 size=wx.DefaultSize,
+                 **kwargs):
+            wx.SplitterWindow.__init__(self,
+                                       parent,
+                                       id,
+                                       wx.Point(0, 0),
+                                       size,
+                                       **kwargs)
+            self.SetMinimumPaneSize(50)
+            self.proportion = proportion
+            if not 0 < self.proportion < 1:
+                raise ValueError("proportion value for "
+                                 "ProportionalSplitter must be between 0 "
+                                 "and 1.")
+            self.ResetSash()
+            self.Bind(wx.EVT_SIZE, self.OnReSize)
+            self.Bind(wx.EVT_SPLITTER_SASH_POS_CHANGED,
+                      self.OnSashChanged,
+                      id=id)
+            self.Bind(wx.EVT_PAINT, self.OnPaint)
+            self.firstpaint = True
+
+    def SplitHorizontally(self, win1, win2):
+            if self.GetParent() is None: return False
+            return wx.SplitterWindow.SplitHorizontally(self, win1, win2,
+                    int(round(self.GetParent().GetSize().GetHeight() *
+                              self.proportion)))
+
+    def SplitVertically(self, win1, win2):
+            if self.GetParent() is None: return False
+            return wx.SplitterWindow.SplitVertically(self, win1, win2,
+                    int(round(self.GetParent().GetSize().GetWidth() *
+                              self.proportion)))
+
+    def GetExpectedSashPosition(self):
+        if self.GetSplitMode() == wx.SPLIT_HORIZONTAL:
+            tot = max(self.GetMinimumPaneSize(),
+                      self.GetParent().GetClientSize().height)
+        else:
+            tot = max(self.GetMinimumPaneSize(),
+                      self.GetParent().GetClientSize().width)
+        return int(round(tot * self.proportion))
+
+    def ResetSash(self):
+            self.SetSashPosition(self.GetExpectedSashPosition())
+
+    def OnReSize(self, event):
+            """Window has been resized, so we need to adjust the sash based on 
+            self.proportion.
+            """
+            self.ResetSash()
+            event.Skip()
+
+    def OnSashChanged(self, event):
+            """We'll change self.proportion now based on where user dragged the 
+            sash.
+            """
+            pos = float(self.GetSashPosition())
+            if self.GetSplitMode() == wx.SPLIT_HORIZONTAL:
+                    tot = max(self.GetMinimumPaneSize(),
+                              self.GetParent().GetClientSize().height)
+            else:
+                    tot = max(self.GetMinimumPaneSize(),
+                              self.GetParent().GetClientSize().width)
+            self.proportion = pos / tot
+            event.Skip()
+
+    def OnPaint(self, event):
+            if self.firstpaint:
+                    if self.GetSashPosition() != self.GetExpectedSashPosition():
+                            self.ResetSash()
+                    self.firstpaint = False
+            event.Skip()

=== removed file 'lib/wxkeryx/options.py'
--- lib/wxkeryx/options.py	2010-03-05 00:06:56 +0000
+++ lib/wxkeryx/options.py	1970-01-01 00:00:00 +0000
@@ -1,300 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Author: Chris Oliver ([e-mail])
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-import os.path
-import shutil
-import wx
-import wx.lib.buttons as buttons
-import  wx.lib.colourselect as  csel
-
-from lib import consts, plugins
-
-class optionDialog(wx.Dialog):
-    def __init__(self, *args, **kwds):
-        kwds["style"] = wx.DEFAULT_DIALOG_STYLE
-        wx.Dialog.__init__(self, *args, **kwds)
-        self.SetTitle(_("Options"))
-        self.SetIcon(wx.Icon(consts.fileIco, wx.BITMAP_TYPE_ICO))
-        sizer = wx.BoxSizer(wx.VERTICAL)
-        
-        # Add notebook
-        self.notebook = wx.Notebook(self)
-        self.notebook_il = wx.ImageList(16, 16)
-        self.notebook_il.Add(wx.Bitmap(consts.icon_layout))
-        self.notebook_il.Add(wx.Bitmap(consts.icon_download))
-        self.notebook_il.Add(wx.Bitmap(consts.icon_plugin))
-        self.notebook.SetImageList(self.notebook_il)
-        sizer.Add(self.notebook, 1, wx.EXPAND|wx.TOP|wx.RIGHT|wx.LEFT, 5)
-
-        # Add line
-        line = wx.StaticLine(self, -1, size=(20,-1), style=wx.LI_HORIZONTAL)
-        sizer.Add(line, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.RIGHT|wx.LEFT|wx.TOP, 5)
-
-        # Add buttons
-        btnsizer = wx.StdDialogButtonSizer()
-        btn = wx.Button(self, wx.ID_OK)
-        btn.SetDefault()
-        btnsizer.AddButton(btn) 
-        btn = wx.Button(self, wx.ID_CANCEL)
-        btnsizer.AddButton(btn)
-        btnsizer.Realize()
-        sizer.Add(btnsizer, 0, wx.ALIGN_BOTTOM|wx.ALIGN_RIGHT|wx.ALL, 5)
-
-        self.addTabs()
-        self.SetSizer(sizer)
-        self.Fit()
-        
-    def addTabs(self):
-        pane = wx.Panel(self.notebook, -1, style=wx.TAB_TRAVERSAL)
-        vert = wx.BoxSizer(wx.VERTICAL)
-
-        txt = wx.StaticText(pane, -1, _("All directories should be relative paths."))
-        vert.Add(txt, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 3)
-
-        sizer = wx.BoxSizer()
-        txt = wx.StaticText(pane, -1, _("Log Directory:"))
-        sizer.Add(txt, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 3)
-        self.logCtrl = wx.TextCtrl(pane, -1, consts.LogPath, size=wx.Size(250,-1))
-        sizer.Add(self.logCtrl, 1, wx.ALL, 3)
-        vert.Add(sizer, 0, wx.EXPAND)
-
-        sizer = wx.BoxSizer()
-        txt = wx.StaticText(pane, -1, _("Locale Directory:"))
-        sizer.Add(txt, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 3)
-        self.localeCtrl = wx.TextCtrl(pane, -1, consts.LocalePath)
-        sizer.Add(self.localeCtrl, 1, wx.ALL, 3)
-        vert.Add(sizer, 0, wx.EXPAND)
-
-        #sizer = wx.BoxSizer()
-        #txt = wx.StaticText(pane, -1, _("Packages Directory:"))
-        #sizer.Add(txt, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 3)
-        #self.packagesCtrl = wx.TextCtrl(pane, -1, consts.PackagesPath)
-        #sizer.Add(self.packagesCtrl, 1, wx.ALL, 3)
-        #vert.Add(sizer, 0, wx.EXPAND)
-        
-        sizer = wx.BoxSizer(wx.HORIZONTAL)
-        txt = wx.StaticText(pane, -1, _("Plugins Directory:"))
-        sizer.Add(txt, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 3)
-        self.pluginsCtrl = wx.TextCtrl(pane, -1, consts.PluginsPath)
-        sizer.Add(self.pluginsCtrl, 1, wx.ALL, 3)
-        vert.Add(sizer, 0, wx.EXPAND)
-
-        sizer = wx.BoxSizer(wx.HORIZONTAL)
-        txt = wx.StaticText(pane, -1, _("Projects Directory:"))
-        sizer.Add(txt, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 3)
-        self.projectsCtrl = wx.TextCtrl(pane, -1, consts.ProjectsPath)
-        sizer.Add(self.projectsCtrl, 1, wx.ALL, 3)
-        vert.Add(sizer, 0, wx.EXPAND)
-        
-        sizer = wx.BoxSizer(wx.HORIZONTAL)
-        txt = wx.StaticText(pane, -1, _("Themes Directory:"))
-        sizer.Add(txt, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 3)
-        self.pixmapsCtrl = wx.TextCtrl(pane, -1, consts.PixmapsPath)
-        sizer.Add(self.pixmapsCtrl, 1, wx.ALL, 3)
-        vert.Add(sizer, 0, wx.EXPAND)
-        
-        sizer = wx.BoxSizer(wx.HORIZONTAL)
-        txt = wx.StaticText(pane, -1, _("Themes Directory:"))
-        sizer.Add(txt, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 3)
-        self.themesCtrl = wx.TextCtrl(pane, -1, consts.ThemesPath)
-        sizer.Add(self.themesCtrl, 1, wx.ALL, 3)
-        vert.Add(sizer, 0, wx.EXPAND)
-        
-        sizer = wx.BoxSizer(wx.HORIZONTAL)
-        txt = wx.StaticText(pane, -1, _("Default Theme Directory:"))
-        sizer.Add(txt, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 3)
-        self.defaultThemeCtrl = wx.TextCtrl(pane, -1, consts.ThemeDefaultPath)
-        sizer.Add(self.defaultThemeCtrl, 1, wx.ALL, 3)
-        vert.Add(sizer, 0, wx.EXPAND)
-
-        pane.SetSizer(vert)
-        self.notebook.AddPage(pane, _("Directories"), False, 0)
-        
-        ### Second page ### THIS PAGE IS USED FOR THE PROXY
-        pane = wx.Panel(self.notebook, -1, style=wx.TAB_TRAVERSAL)
-        vert = wx.BoxSizer(wx.VERTICAL)
-        # vert keeps track of the vertical objects in the page (rows)
-
-        self.proxyCheckBox= wx.CheckBox(pane, -1, "Enable proxy support")
-        self.proxyCheckBox.SetValue(consts.proxy_enabled) # Set proxy value
-        vert.Add(self.proxyCheckBox, 0, wx.ALL, 3)
-
-        # Make a bold font.
-        bold_font = wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.BOLD)#, False, u'Comic Sans MS')
-        
-        sizer = wx.BoxSizer(wx.HORIZONTAL)
-        # Add the "URL:" static text.
-        url = wx.StaticText(pane, -1, _("URL: "))
-        url.SetFont(bold_font)
-        sizer.Add(url, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 3)
-        # Add the "http://" static text.
-        http = wx.StaticText(pane, -1, _("http://"))
-        sizer.Add(http, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 3)
-        # Add the URL text box.
-        self.proxy_url = wx.TextCtrl(pane, -1, '')
-        sizer.Add(self.proxy_url, 1, wx.ALL, 3)
-        # Add the ":" static text.
-        colon = wx.StaticText(pane, -1, _(":"))
-        sizer.Add(colon, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 3)
-        # Add the port text box.
-        self.proxy_port = wx.TextCtrl(pane, -1, '')
-        sizer.Add(self.proxy_port, 1, wx.ALL, 3)
-        vert.Add(sizer, 0, wx.EXPAND)
-
-        sizer = wx.BoxSizer(wx.HORIZONTAL)
-        txt = wx.StaticText(pane, -1, _("Username:"))
-        txt.SetFont(bold_font)
-        sizer.Add(txt, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 3)
-        self.proxy_username = wx.TextCtrl(pane, -1, consts.proxy_username)
-        sizer.Add(self.proxy_username, 1, wx.ALL, 3)
-        vert.Add(sizer, 0, wx.EXPAND)
-
-        sizer = wx.BoxSizer(wx.HORIZONTAL)
-        txt = wx.StaticText(pane, -1, _("Password:"))
-        txt.SetFont(bold_font)
-        sizer.Add(txt, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 3)
-        self.proxy_password = wx.TextCtrl(pane, -1, consts.proxy_password, style=wx.TE_PASSWORD)
-        sizer.Add(self.proxy_password, 1, wx.ALL, 3)
-        vert.Add(sizer, 0, wx.EXPAND)
-
-        pane.SetSizer(vert)
-        self.notebook.AddPage(pane, _("Download Options"), False, 1)
-
-        self.LoadProxy()
-        self.OnChecked(None) # Enable/Disable proxy textbox based on checkbox status
-        self.Bind(wx.EVT_CHECKBOX, self.OnChecked, self.proxyCheckBox)
-
-        ### Third page ###
-        pane = wx.Panel(self.notebook, -1, style=wx.TAB_TRAVERSAL)
-        sizer = wx.BoxSizer(wx.VERTICAL)
-        
-        txt = wx.StaticText(pane, -1, _("Loaded plugins:"))
-        txt.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
-        sizer.Add(txt, 0, wx.ALL, 3)
-
-        self.pluginList = wx.ListBox(pane)
-        sizer.Add(self.pluginList, 1, wx.EXPAND, 0)
-
-        self.fill()
-
-        sizer2 = wx.BoxSizer(wx.HORIZONTAL)
-        self.disableBtn = buttons.GenBitmapTextButton(pane, -1, wx.Bitmap(consts.icon_plugin_disable), _("Disable"))#, size=(120, 25))
-        sizer2.Add(self.disableBtn, 0, wx.ALL, 3)
-        self.Bind(wx.EVT_BUTTON, self.OnDisable, self.disableBtn)
-
-        #bmp = wx.Bitmap(os.path.join(consts.dirPixmaps, 'plugin_go.png'))
-        #self.disableBtn = buttons.GenBitmapTextButton(pane, -1, bmp, _("Start"))#, size=(120, 25))
-        #sizer2.Add(self.disableBtn, 0, wx.ALL, 3)
-                
-        self.addBtn = buttons.GenBitmapTextButton(pane, -1, wx.Bitmap(consts.icon_plugin_add), _("Add"))#, size=(120, 25))
-        sizer2.Add(self.addBtn, 0, wx.ALL, 3)
-        self.Bind(wx.EVT_BUTTON, self.OnAdd, self.addBtn)
-        
-        #bmp = wx.Bitmap(os.path.join(consts.dirPixmaps, 'plugin_edit.png'))
-        #self.disableBtn = buttons.GenBitmapTextButton(pane, -1, bmp, _("Edit"))#, size=(120, 25))
-        #sizer2.Add(self.disableBtn, 0, wx.ALL, 3)
-        
-        #bmp = wx.Bitmap(os.path.join(consts.dirPixmaps, 'plugin_delete.png'))
-        #self.disableBtn = buttons.GenBitmapTextButton(pane, -1, bmp, _("Delete"))#, size=(120, 25))
-        #sizer2.Add(self.disableBtn, 0, wx.ALL, 3)
-
-        sizer.Add(sizer2)
-        pane.SetSizer(sizer)
-        self.notebook.AddPage(pane, _("Plugins"), False, 2)
-
-    def OnChecked(self, evt):
-        if self.proxyCheckBox.GetValue():
-            self.proxy_url.Enable()
-            self.proxy_port.Enable()
-            self.proxy_username.Enable()
-            self.proxy_password.Enable()
-        else:
-            self.proxy_url.Disable() 
-            self.proxy_port.Disable() 
-            self.proxy_username.Disable()
-            self.proxy_password.Disable()
-
-    def LoadProxy(self):
-        """So right here, we've got to grab the value from the config and set it in the interface"""
-        try:
-            url = consts.http_proxy['http']
-            (url, port) = (url.split(':')[1][2:], url.split(':')[-1])
-            self.proxy_url.SetValue(url)
-            self.proxy_port.SetValue(port)
-        except: 
-            pass
-
-    def fill(self): # Fill plugin list
-        self.pluginList.Clear()
-        for item in plugins.OSPluginList: self.pluginList.Append(item[0])
-        for item in plugins.InterfacePluginList: self.pluginList.Append(item[0])
-
-    def OnAdd(self, evt):
-        dlg = wx.FileDialog(self, message=_("Choose a file"),
-                            defaultDir = consts.cwd, 
-                            defaultFile = "",
-                            wildcard = consts.wildcard_plugin,
-                            style=wx.OPEN | wx.CHANGE_DIR)
-
-        # Show the dialog and retrieve the user response. If it is the OK response, 
-        # process the data
-        if dlg.ShowModal() == wx.ID_OK:
-            file = dlg.GetPaths()
-            dlg.Destroy()
-            if file[0]:
-                # Copy the file to the plugins directory
-                shutil.copyfile(file[0], os.path.join(consts.dirPlugins, os.path.basename(file[0]))) 
-        else: 
-            return
-
-        wx.MessageBox(_("Plugin installed successfully. Restart Keryx to load the plugin."), _("Install Successful"))
-
-    def OnDisable(self, evt):
-        def disable(instance):
-            try:
-                instance.cleanup()
-                wx.MessageBox(_("Plugin disabled successfully."))
-                return True
-            except: return False
-
-        temp = []
-        for item in plugins.OSPluginList: 
-            if item[0] == self.pluginList.Items[self.pluginList.GetSelection()]:
-                if disable(item[1]): # Successfully disabled
-                    temp = []
-                    for i in plugins.OSPluginList:
-                        if i[0] != item[0]: temp.append(i)
-                    plugins.OSPluginList = temp
-                    self.fill()
-                    return
-                
-        for item in plugins.InterfacePluginList: 
-            if item[0] == self.pluginList.Items[self.pluginList.GetSelection()]:
-                if disable(item[1]): # Successfully disabled
-                    for i in plugins.InterfacePluginList:
-                        if i[0] != item[0]: temp.append(i)
-                    plugins.InterfacePluginList = temp
-                    self.fill()
-                    return
-                
-        wx.MessageBox(_("Unable to find plugin."))
-        return False
-        
-# end of class optionDialog
-
-

=== modified file 'lib/wxkeryx/startDialog.py'
--- lib/wxkeryx/startDialog.py	2010-10-23 18:57:40 +0000
+++ lib/wxkeryx/startDialog.py	2017-06-11 16:11:12 +0000
@@ -16,163 +16,141 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-import lib.project, os.path, platform, wx
+import os.path
+import platform
+import wx
 import wx.lib.buttons as buttons
-from lib import consts, log, plugins
-from lib.project import Project
-
-class startDialog(wx.Dialog):
+
+import lib.project
+from lib.project import Project, ProjectExistsException
+from lib import config
+from lib import debian
+
+from gettext import gettext as _
+
+
+class StartDialog(wx.Dialog):
     """Startup dialog"""
-    def __init__(self, *args, **kwds):
-        kwds["style"] = wx.DEFAULT_DIALOG_STYLE
-        wx.Dialog.__init__(self, *args, **kwds)
-        self.SetIcon(wx.Icon(consts.fileIco, wx.BITMAP_TYPE_ICO))
-        self.bitmap = wx.StaticBitmap(self, -1, wx.Bitmap(consts.fileLogo))
-        self.welcomeText = wx.StaticText(self, -1, consts.welcome_message)
-        self.newText = wx.StaticText(self, -1, _("To get started, create a new project on your offline computer."))
-        self.nameTextCtrl = wx.TextCtrl(self, -1, platform.node())#, size=(120,20))
-        self.choice = wx.Choice(self, -1, choices=[], style=wx.CB_SORT)
-
-        # Append the plugins into the combo box
-        for name, instance, type, ver in plugins.OSPluginList: 
-            self.choice.Append(name)
-        self.choice.Select(0)
-
-        self.newProjectButton = buttons.GenBitmapTextButton(self, -1, wx.Bitmap(consts.icon_new), _("New Project"))#, size=(110, 25))
+    def __init__(self):
+        self.theme = config.theme
+        wx.Dialog.__init__(self, None, -1, _('Welcome to ') + config.name)
+        self.SetIcon(wx.Icon(config.ico_path, wx.BITMAP_TYPE_ICO))
+        self.bitmap = wx.StaticBitmap(self, -1, wx.Bitmap(config.logo_path))
+        self.welcomeText = wx.StaticText(self,
+                                         -1,
+                                         _('Welcome to ') + config.name)
+        self.welcomeText.SetFont(wx.Font(8,
+                                         wx.FONTFAMILY_DEFAULT,
+                                         wx.FONTSTYLE_NORMAL,
+                                         wx.FONTWEIGHT_BOLD,
+                                         0,
+                                         ''))
+        self.newText = wx.StaticText(self, -1, _('To get started, create a new '
+                                                 'project on your offline '
+                                                 'computer.'))
+        self.nameTextCtrl = wx.TextCtrl(self, -1, platform.node())
+
+        self.newProjectButton = \
+            buttons.GenBitmapTextButton(self,
+                                        -1,
+                                        wx.Bitmap(self.theme.icon_new),
+                                        _('New Project'))
         self.static_line = wx.StaticLine(self, -1)
-        self.openTxt = wx.StaticText(self, -1, _("Open a project:"))
-        self.openProjBox = wx.Choice(self, -1, choices=[_('Browse...')], style=wx.CB_SORT)
+        self.openTxt = wx.StaticText(self, -1, _('Open a project:'))
+        self.openProjectBox = wx.Choice(self,
+                                        -1,
+                                        choices=[_('Browse...')],
+                                        style=wx.CB_SORT)
         
         self.projects = []
-        for root, dirs, files in os.walk(consts.dirProjects):
-            for item in files:
-                if item.endswith(consts.appFileExt): 
-                    self.openProjBox.Append(item[:-6])
-                    self.projects.append(os.path.join(root, item))
+        for thing in os.listdir(config.projects_dir):
+            if os.path.isdir(os.path.join(config.projects_dir, thing)):
+                self.openProjectBox.Append(thing)
+                self.projects.append(os.path.join(config.projects_dir, thing))
                     
-        try:
-            self.openProjBox.Select(1)
-        except: 
-            self.openProjBox.Select(0)
-
-        self.openProjectButton = buttons.GenBitmapTextButton(self, -1, wx.Bitmap(consts.icon_open), _("Open Project"))#, size=(120, 25))
-
-        self.SetTitle(consts.welcome_message)
-        self.welcomeText.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))