From 41cc594e40fcdcbcbd6f420c94689cdaf9d74aa3 Mon Sep 17 00:00:00 2001 From: Tal Leming Date: Tue, 14 Feb 2012 12:32:32 +0000 Subject: [PATCH] Merge changes from trunk. git-svn-id: http://svn.robofab.com/branches/ufo3k@557 b5fa9d6c-a76f-4ffd-b3cb-f825fc41095c --- Lib/robofab/__init__.py | 21 +++++++++++++++---- Lib/robofab/interface/all/dialogs.py | 2 ++ .../interface/all/dialogs_fontlab_legacy2.py | 4 ++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Lib/robofab/__init__.py b/Lib/robofab/__init__.py index d6611cf3e..c3e1d8732 100755 --- a/Lib/robofab/__init__.py +++ b/Lib/robofab/__init__.py @@ -16,10 +16,16 @@ The RoboFab homepage, documentation etc. http://robofab.com SVN REPOSITORY +http://svn.robofab.com +TRAC http://code.robofab.com -LICENSE -Copyright (c) 2003-2009, The RoboFab Developers, Just van Rossum, Tal Leming, Erik van Blokland +RoboFab License Agreement + +Copyright (c) 2005-2012, The RoboFab Developers: + Erik van Blokland + Tal Leming + Just van Rossum All rights reserved. @@ -27,8 +33,15 @@ Redistribution and use in source and binary forms, with or without modification, Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -Neither the name of the RoboFab Developers nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +Neither the name of the The RoboFab Developers nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Up to date info on RoboFab: + http://robofab.com/ + +This is the BSD license: + http://www.opensource.org/licenses/BSD-3-Clause + HISTORY RoboFab starts somewhere during the diff --git a/Lib/robofab/interface/all/dialogs.py b/Lib/robofab/interface/all/dialogs.py index 807acd0e2..c5bb184c9 100755 --- a/Lib/robofab/interface/all/dialogs.py +++ b/Lib/robofab/interface/all/dialogs.py @@ -172,6 +172,8 @@ elif platformApplicationModuleName == "dialogs_fontlab_legacy2": foundPlatformModule = True if __verbose__: print "loaded robofab.interface.all.dialogs_fontlab_legacy2" + if platform == "mac": + from robofab.interface.all.dialogs_fontlab_legacy2 import AskString except ImportError: print "can't import", platformApplicationModuleName diff --git a/Lib/robofab/interface/all/dialogs_fontlab_legacy2.py b/Lib/robofab/interface/all/dialogs_fontlab_legacy2.py index 2c0bc9567..40c21fba2 100644 --- a/Lib/robofab/interface/all/dialogs_fontlab_legacy2.py +++ b/Lib/robofab/interface/all/dialogs_fontlab_legacy2.py @@ -329,8 +329,8 @@ def PutFile(message=None, title=None, directory=None, fileName=None, canCreateDi # start with all the defaults. -def AskString(message, value='', title='RoboFab'): - raise NotImplementedError +#def AskString(message, value='', title='RoboFab'): +# raise NotImplementedError def FindGlyph(aFont, message="Search for a glyph:", title='RoboFab'): raise NotImplementedError