Merge commit 'drf/master'

.gitignore

@@ -9,3 +9,4 @@ build/
 Debug/
 ui_*
 .*.swp
+pymsn/

amsn2.py

@@ -16,16 +16,16 @@
     # Detect graphical toolkit available.
     # Format - 'default_front_end : module name'
     # cocoa > efl > qt4 > gtk > console
-    toolkits = {'cocoa' : '????',
+    toolkits = {'cocoa' : 'amsn2.gui.front_ends.cocoa',
                 'elf' : 'ecore',
                 'qt4' : 'PyQt4.QtGui',
                 'gtk' : 'gtk',
                 'console' : None}
     for toolkit in toolkits:
         try:
-            default_front_end = toolkit
             module_name = toolkits[toolkit]
             module = __import__(module_name)
+            default_front_end = toolkit
             vars()[module_name] = module
             # Debug
             # print 'Imported toolkit "%s" with module "%s"' % (toolkit, module)
@@ -36,7 +36,7 @@
             pass
         except TypeError:
             pass
-
+        
     parser = optparse.OptionParser()
     parser.add_option("-a", "--account", dest="account",
                       default=None, help="The account's username to use")

amsn2/gui/front_ends/cocoa/readme.txt

@@ -8,12 +8,13 @@ Building
 We use NIB files to build our interface, in order to load the NIB's correctly, we require aMSN 2 to be run from inside an application bundle. To build the bundle you need (from macports):
 
 python25
-py-openssl (see note)
+py25-openssl
 py25-gobject
+py25-crypto
+py25-hashlib
+py25-py2app-devel
 py25-pyobjc2-cocoa
-	- py25-pyobjc2
-	- py25-py2app-devel
-		- py25-py2app (see note)
+
 
 After they have been installed, you will need to run this inside the root folder of amsn2:
 $ /opt/local/bin/python2.5 setupCocoa.py py2app -A
@@ -23,11 +24,11 @@ $ dist/aMSN2.app/Contents/MacOS/aMSN2
 
 py-openssl - Note
 =================
-It is recommended to use the 0.7 version of py-openssl. An updated portfile can be found at: http://hosting.notjustanothermacuser.com/macports/py-openssl/Portfiles/0.7_0.tar.gz
+It is recommended to use the 0.7 version of py-openssl. Last version of Macports is using version 0.7. You can also use an updated portfile that can be found at: http://hosting.notjustanothermacuser.com/macports/py-openssl/Portfiles/0.7_0.tar.gz
 
 py2app - Note
 =============
-The current py2app on mac ports is out of date, they have 0.3.6, while py25-pyobjc2-cooca requires > 0.4.0. No "official" releases of py2app have been made since 0.3.6, however the current trunk from SVN gives version 0.4.2. If you wish to use macports' python25, and you wish to build the bundle then you will need to update the Portfile for py25-py2app. The updated portfile can be found at: http://hosting.notjustanothermacuser.com/macports/py25-py2app/Portfiles/0.4.2_0.tar.gz
+Be sure to use py25-py2app-devel and not py25-py2app from Macports, because py25-py2app is outdated and does not work with pyobjc2-cocoa. 
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 

amsn2/gui/front_ends/cocoa/skins.py

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+#
+# amsn - a python client for the WLM Network
+#
+# Copyright (C) 2008 Dario Freddi <drf54321@gmail.com>
+#
+# 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+import os.path
+
+class Skin(object):
+    def __init__(self, core, path):
+        self._path = path
+        pass
+
+    def getKey(self, key, default):
+        pass
+
+    def setKey(self, key, value):
+        pass
+
+
+
+class SkinManager(object):
+    def __init__(self, core):
+        self._core = core
+        self.skin = Skin(core, "skins")
+
+    def setSkin(self, name):
+        self.skin = Skin(self._core, os.path.join("skins", name))
+
+    def listSkins(self, path):
+        pass