* fixed line endings

* fix stock icon loading so it works in conjunction with plugins.

git-svn-id: file:///Users/arjan/backup/gaphor/gaphor/trunk@1806 a8418922-720d-0410-834f-a69b97ada669
This commit is contained in:
Arjan Molenaar 2007-08-01 13:59:01 +00:00
parent 58e9b4e87e
commit c1bb0713a6
3 changed files with 46 additions and 43 deletions

View File

@ -116,7 +116,7 @@ def load_stock_icons():
"""
from xml.sax import make_parser
parser = make_parser()
icon_dir = os.path.abspath(pkg_resources.resource_filename('gaphor', 'ui/pixmaps'))
icon_dir = os.path.abspath(pkg_resources.resource_filename('gaphor.ui', 'pixmaps'))
log.info('Icon dir: %s' % icon_dir)
#icon_dir = 'gaphor/data/pixmaps'
loader = StockIconLoader(icon_dir)
@ -124,7 +124,7 @@ def load_stock_icons():
parser.setFeature(handler.feature_namespaces, 1)
parser.setContentHandler(loader)
filename = pkg_resources.resource_filename('gaphor', 'ui/icons.xml')
filename = pkg_resources.resource_filename('gaphor.ui', 'icons.xml')
if os.name == 'nt':
# Make the filename a full URL
filename = 'file:' + filename.replace('\\\\', '/')

View File

@ -89,8 +89,11 @@ setup(
author_email='arjanmol@users.sourceforge.net',
license='GNU General Public License',
description='Gaphor is a UML modeling tool',
long_description="Gaphor is a UML modeling tool written in Python. "
"It uses the GTK+ environment for user interaction.",
long_description="""
Gaphor is a UML modeling tool written in Python.
It uses the GTK+ environment for user interaction.
""",
classifiers = [
'Development Status :: 4 - Beta',
'Environment :: X11 Applications :: GTK',