[PyObjC-svn] r2133 - in trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit: ClassBrowser CocoaBindings/Bookmarks CocoaBindings/ControlledPreferences CocoaBindings/CurrencyConvBinding CocoaBindings/FilteringController CocoaBindings/GraphicsBindings CocoaBindings/ManualBindings CocoaBindings/MutableTableModel CocoaBindings/TableModel CocoaBindings/TableModelWithSearch CocoaBindings/TemperatureTransformer CocoaBindings/ToDos CurrencyConverter DotView DragItemAround FieldGraph Formatter PackageManager PyInterpreter PyObjCLauncher RoundTransparentWindow SimpleService TableModel TinyTinyEdit TinyURLService WebServicesTool iClass
[email protected] Wed, 08 Apr 2009 16:20:16 -0500
Newsgroups
gmane.comp.python.pyobjc.cvs
Message-ID
<[email protected] >
Author: ronaldoussoren
Date: Wed Apr 8 16:20:16 2009
New Revision: 2133
Log:
* Remove NibClassBuilder usage from all examples in Examples/AppKit
* Ensure these examples actually work correctly with PyObjC 2.2b1
Added:
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModel/main.py
- copied, changed from r2025, /trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModel/__main__.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/main.py
- copied unchanged from r2025, /trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/__main__.py
Removed:
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModel/__main__.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/Info.plist
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/__main__.py
Modified:
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/ClassBrowser/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/Bookmarks/BookmarksDocument.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/Bookmarks/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ControlledPreferences/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/CurrencyConvBinding/Converter.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/CurrencyConvBinding/CurrencyConvBinding.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/CurrencyConvBinding/CurrencyConvBindingDocument.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/CurrencyConvBinding/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/FilteringController/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/GraphicsBindings/GraphicsArrayController.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/GraphicsBindings/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ManualBindings/AppController.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ManualBindings/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/MutableTableModel/TableModelAppDelegate.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModel/TableModelAppDelegate.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModel/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/FilteringArrayController.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/TableModelWithSearchAppDelegate.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/ToolbarCreator.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TemperatureTransformer/TransformerAppDelegate.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TemperatureTransformer/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ToDos/Category.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ToDos/OverdueTransformer.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ToDos/PriorityToColourTransformer.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ToDos/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CurrencyConverter/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/DotView/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/DragItemAround/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/FieldGraph/CGraphController.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/FieldGraph/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/Formatter/main.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/PackageManager/packman.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/PyInterpreter/PyInterpreter.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/PyInterpreter/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/PyObjCLauncher/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/RoundTransparentWindow/RoundTransparentWindow.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/SimpleService/ServiceTest.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/SimpleService/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/TableModel/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/TinyTinyEdit/setup.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/TinyURLService/TinyURLService.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/WebServicesTool/WSTApplicationDelegateClass.py
trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/iClass/setup.py
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/ClassBrowser/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/ClassBrowser/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/ClassBrowser/setup.py Wed Apr 8 16:20:16 2009
@@ -9,6 +9,7 @@
plist = dict(NSMainNibFile="ClassBrowser")
setup(
+ name="ClassBrowser",
app=["ClassBrowser.py"],
data_files=["ClassBrowser.nib"],
options=dict(py2app=dict(plist=plist)),
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/Bookmarks/BookmarksDocument.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/Bookmarks/BookmarksDocument.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/Bookmarks/BookmarksDocument.py Wed Apr 8 16:20:16 2009
@@ -8,7 +8,7 @@
# at http://homepage.mac.com/mmalc/CocoaExamples/controllers.html
import objc
-from Foundation import *
+from Cocoa import *
# BookmarksDocument defines this as it may be used for copy and paste
# in addition to just drag and drop
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/Bookmarks/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/Bookmarks/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/Bookmarks/setup.py Wed Apr 8 16:20:16 2009
@@ -19,6 +19,7 @@
)
setup(
+ name="Bookmarks",
app=["Bookmarks.py"],
data_files=["English.lproj"],
options=dict(py2app=dict(
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ControlledPreferences/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ControlledPreferences/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ControlledPreferences/setup.py Wed Apr 8 16:20:16 2009
@@ -8,6 +8,7 @@
import py2app
setup(
+ name="ControlledPreferences",
app=["ControlledPreferences.py"],
data_files=["English.lproj"],
)
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/CurrencyConvBinding/Converter.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/CurrencyConvBinding/Converter.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/CurrencyConvBinding/Converter.py Wed Apr 8 16:20:16 2009
@@ -1,6 +1,4 @@
from Foundation import *
-from AppKit import *
-from objc import ivar
class Converter (NSObject):
exchangeRate = objc.ivar.double()
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/CurrencyConvBinding/CurrencyConvBinding.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/CurrencyConvBinding/CurrencyConvBinding.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/CurrencyConvBinding/CurrencyConvBinding.py Wed Apr 8 16:20:16 2009
@@ -5,5 +5,4 @@
import CurrencyConvBindingDocument
if __name__ == '__main__':
- # start the event loop
AppHelper.runEventLoop()
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/CurrencyConvBinding/CurrencyConvBindingDocument.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/CurrencyConvBinding/CurrencyConvBindingDocument.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/CurrencyConvBinding/CurrencyConvBindingDocument.py Wed Apr 8 16:20:16 2009
@@ -1,6 +1,5 @@
-from Foundation import *
-from AppKit import *
+from Cocoa import *
-class CurrencyConvBindingDocument (NSObject):
+class CurrencyConvBindingDocument (NSDocument):
def windowNibName(self):
return "CurrencyConvBindingDocument"
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/CurrencyConvBinding/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/CurrencyConvBinding/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/CurrencyConvBinding/setup.py Wed Apr 8 16:20:16 2009
@@ -22,6 +22,7 @@
)
setup(
+ name="CurrencyConvBinding",
app=["CurrencyConvBinding.py"],
data_files=["English.lproj"],
options=dict(py2app=dict(
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/FilteringController/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/FilteringController/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/FilteringController/setup.py Wed Apr 8 16:20:16 2009
@@ -19,6 +19,7 @@
)
setup(
+ name='FilteringController',
app=["FilteringController.py"],
data_files=["English.lproj"],
options=dict(py2app=dict(
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/GraphicsBindings/GraphicsArrayController.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/GraphicsBindings/GraphicsArrayController.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/GraphicsBindings/GraphicsArrayController.py Wed Apr 8 16:20:16 2009
@@ -18,8 +18,9 @@
"""Allow filtering by color, just for the fun of it"""
filterColor = objc.IBOutlet()
- newCircle = objc.IBOuetlet()
+ newCircle = objc.IBOutlet()
shouldFilter = objc.ivar.BOOL()
+ graphicsView = objc.IBOutlet()
def arrangeObjects_(self, objects):
"Filtering is not yet connected in IB!"
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/GraphicsBindings/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/GraphicsBindings/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/GraphicsBindings/setup.py Wed Apr 8 16:20:16 2009
@@ -19,6 +19,7 @@
)
setup(
+ name="GraphicsBinding",
app=["GraphicsBindings.py"],
data_files=["English.lproj"],
options=dict(py2app=dict(
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ManualBindings/AppController.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ManualBindings/AppController.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ManualBindings/AppController.py Wed Apr 8 16:20:16 2009
@@ -2,11 +2,14 @@
# AppController.py
# ManualBindings
#
-import objc
-
from Cocoa import *
class AppController (NSObject):
+ arrayController = objc.IBOutlet()
+ selectedNameField = objc.IBOutlet()
+ selectedPriceField = objc.IBOutlet()
+ tableView = objc.IBOutlet()
+ totalCountField = objc.IBOutlet()
def awakeFromNib(self):
self.totalCountField.bind_toObject_withKeyPath_options_(u"value", self.arrayController, u"[email protected] ", None)
@@ -36,27 +39,22 @@
@objc.accessor
def countOfItemsArray(self):
- print "countOfItemsArray"
return len(self._k_itemsArray)
@objc.accessor
def objectInItemsArrayAtIndex_(self, index):
- print "objectInItemsArrayAtIndex_", index
return self._k_itemsArray[index]
@objc.accessor
def insertObject_inItemsArrayAtIndex_(self, obj, idx):
- print "insertObject_inItemsArrayAtIndex_", idx
self._k_itemsArray.insert(idx, obj)
@objc.accessor
def removeObjectFromItemsArrayAtIndex_(self, idx):
- print "removeObjectFromItemsArrayAtIndex_", idx
del self._k_itemsArray[idx]
@objc.accessor
def replaceObjectInItemsArrayAtIndex_withObject_(self, idx, obj):
- print "!!! replaceObjectInItemsArrayAtIndex_withObject_", idx
self._k_itemsArray[idx] = obj
ITEM_ERROR_DOMAIN = u'ITEM_ERROR_DOMAIN'
@@ -75,8 +73,8 @@
def setName_(self, aName):
self._k_name = aName
- def validatePrice_error_(self, value):
- print ">>>> validatePrice_error_", value #.price
+ @objc.accessor
+ def validatePrice_error_(self, value, error):
if value >= 0:
return True, value, None
@@ -88,5 +86,3 @@
userInfoDict)
return False, value, error
-
- validatePrice_error_ = objc.accessor(validatePrice_error_)
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ManualBindings/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ManualBindings/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ManualBindings/setup.py Wed Apr 8 16:20:16 2009
@@ -8,6 +8,7 @@
import py2app
setup(
+ name="ManualBindings",
app=["ManualBindings.py"],
data_files=["English.lproj"],
)
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/MutableTableModel/TableModelAppDelegate.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/MutableTableModel/TableModelAppDelegate.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/MutableTableModel/TableModelAppDelegate.py Wed Apr 8 16:20:16 2009
@@ -1,13 +1,23 @@
-from Foundation import NSLog, NSMutableArray
-import os
+from Foundation import *
+import pwd
FIELDS = "name password uid gid class change expire gecos home_dir shell".split()
def getPasswords():
- return NSMutableArray.arrayWithArray_([
- dict(zip(FIELDS, line.rstrip().split(':')))
- for line in os.popen('/usr/bin/nidump passwd .')
- if not line.startswith('#')
- ])
+ a = NSMutableArray.array()
+
+ for pw in pwd.getpwall():
+ a.append({
+ 'name': pw.pw_name,
+ 'password': pw.pw_passwd,
+ 'uid': pw.pw_uid,
+ 'gid': pw.pw_gid,
+ 'gecos': pw.pw_gecos,
+ 'home_dir': pw.pw_dir,
+ 'shell': pw.pw_shell,
+ })
+
+ return a
+
class TableModelAppDelegate (NSObject):
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModel/TableModelAppDelegate.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModel/TableModelAppDelegate.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModel/TableModelAppDelegate.py Wed Apr 8 16:20:16 2009
@@ -1,17 +1,23 @@
-from Foundation import NSLog
-from PyObjCTools import NibClassBuilder
-import os
+from Foundation import *
+import os, pwd
FIELDS = "name password uid gid class change expire gecos home_dir shell".split()
def getPasswords():
- return [
- dict(zip(FIELDS, line.rstrip().split(':')))
- for line in os.popen('/usr/bin/nidump passwd .')
- if not line.startswith('#')
- ]
+ a = NSMutableArray.array()
+ for pw in pwd.getpwall():
+ a.append({
+ 'name': pw.pw_name,
+ 'password': pw.pw_passwd,
+ 'uid': pw.pw_uid,
+ 'gid': pw.pw_gid,
+ 'gecos': pw.pw_gecos,
+ 'home_dir': pw.pw_dir,
+ 'shell': pw.pw_shell,
+ })
-NibClassBuilder.extractClasses("MainMenu")
-class TableModelAppDelegate(NibClassBuilder.AutoBaseClass):
+ return a
+
+class TableModelAppDelegate(NSObject):
def passwords(self):
if not hasattr(self, '_cachedpasswords'):
self._cachedpasswords = getPasswords()
Copied: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModel/main.py (from r2025, /trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModel/__main__.py)
==============================================================================
--- /trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModel/__main__.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModel/main.py Wed Apr 8 16:20:16 2009
@@ -7,7 +7,6 @@
#
from PyObjCTools import AppHelper
-from Foundation import NSProcessInfo
# import classes required to start application
import TableModelAppDelegate
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModel/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModel/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModel/setup.py Wed Apr 8 16:20:16 2009
@@ -9,6 +9,6 @@
setup(
name="TableModel",
- app=["__main__.py"],
+ app=["main.py"],
data_files=["English.lproj"],
)
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/FilteringArrayController.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/FilteringArrayController.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/FilteringArrayController.py Wed Apr 8 16:20:16 2009
@@ -6,14 +6,9 @@
# Copyright (c) 2004 __MyCompanyName__. All rights reserved.
#
-from objc import YES, NO
-from Foundation import *
-from AppKit import *
-from PyObjCTools import NibClassBuilder
+from Cocoa import *
import re
-NibClassBuilder.extractClasses("MainMenu")
-
kLiteralSearch = u'Literal Search'
kRegularExpressionSearch = u'Regular Expression Search'
@@ -29,11 +24,12 @@
def dictValueFilter(dicts, regex):
for dct in dicts:
for value in dct.itervalues():
+ print value
if regex.search(value):
yield dct
break
-class FilteringArrayController(NibClassBuilder.AutoBaseClass):
+class FilteringArrayController (NSArrayController):
searchString = None
lastRegex = None
searchType = kLiteralSearch
@@ -49,10 +45,12 @@
return supermethod(objects)
return supermethod(list(dictValueFilter(objects, regex)))
+ @objc.IBAction
def performSearch_(self, sender):
self.searchString = sender.stringValue()
self.rearrangeObjects()
+ @objc.IBAction
def changeSearchType_(self, searchType):
self.lastRegex = None
self.searchString = None
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/TableModelWithSearchAppDelegate.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/TableModelWithSearchAppDelegate.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/TableModelWithSearchAppDelegate.py Wed Apr 8 16:20:16 2009
@@ -1,17 +1,23 @@
-from Foundation import NSLog
-from PyObjCTools import NibClassBuilder
-import os
+from Foundation import *
+import os, pwd
+
-FIELDS = "name password uid gid class change expire gecos home_dir shell".split()
def getPasswords():
- return [
- dict(zip(FIELDS, line.rstrip().split(':')))
- for line in os.popen('/usr/bin/nidump passwd .')
- if not line.startswith('#')
- ]
+ a = NSMutableArray.array()
+ for pw in pwd.getpwall():
+ a.append({
+ 'name': pw.pw_name,
+ 'password': pw.pw_passwd,
+ 'uid': str(pw.pw_uid),
+ 'gid': str(pw.pw_gid),
+ 'gecos': pw.pw_gecos,
+ 'home_dir': pw.pw_dir,
+ 'shell': pw.pw_shell,
+ })
+
+ return a
-NibClassBuilder.extractClasses("MainMenu")
-class TableModelWithSearchAppDelegate(NibClassBuilder.AutoBaseClass):
+class TableModelWithSearchAppDelegate (NSObject):
def passwords(self):
if not hasattr(self, '_cachedpasswords'):
self._cachedpasswords = getPasswords()
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/ToolbarCreator.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/ToolbarCreator.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/ToolbarCreator.py Wed Apr 8 16:20:16 2009
@@ -6,28 +6,26 @@
# Copyright (c) 2004 __MyCompanyName__. All rights reserved.
#
-from objc import YES, NO
-from Foundation import *
-from AppKit import *
-
-from PyObjCTools import NibClassBuilder
-
-NibClassBuilder.extractClasses("MainMenu")
+from Cocoa import *
kToolbarIdentifier = "TableModel Toolbar Identifier"
kSearchFieldItemIdentifier = "TableModel Search Field Identifier"
from FilteringArrayController import kLiteralSearch, kRegularExpressionSearch
-class ToolbarCreator(NibClassBuilder.AutoBaseClass):
+class ToolbarCreator (NSObject):
+ filteringArrayController = objc.IBOutlet()
+ searchField = objc.IBOutlet()
+ window = objc.IBOutlet()
+
def awakeFromNib(self):
self.toolbarItemCache = {}
# create toolbar containing search field
toolbar = NSToolbar.alloc().initWithIdentifier_(kToolbarIdentifier)
toolbar.setDelegate_(self)
- toolbar.setAllowsUserCustomization_(YES)
- toolbar.setAutosavesConfiguration_(YES)
+ toolbar.setAllowsUserCustomization_(True)
+ toolbar.setAutosavesConfiguration_(True)
searchFieldItem = NSToolbarItem.alloc().initWithItemIdentifier_(kSearchFieldItemIdentifier)
self.searchFieldItem = searchFieldItem
@@ -55,6 +53,7 @@
# this better be the kLiteralSearch menu item
self.changeSearchType_(item)
+ @objc.IBAction
def changeSearchType_(self, sender):
obj = sender.representedObject()
self.searchField.cell().setPlaceholderString_(obj)
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TableModelWithSearch/setup.py Wed Apr 8 16:20:16 2009
@@ -8,7 +8,7 @@
import py2app
setup(
- app=["__main__.py"],
+ name="TableModelWithSearch",
+ app=["main.py"],
data_files=["English.lproj"],
- options=dict(py2app=dict(plist='Info.plist')),
)
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TemperatureTransformer/TransformerAppDelegate.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TemperatureTransformer/TransformerAppDelegate.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TemperatureTransformer/TransformerAppDelegate.py Wed Apr 8 16:20:16 2009
@@ -8,10 +8,7 @@
# Based on Apples FahrenheitToCelsiusTransformer Example
# file:///Developer/ADC%20Reference%20Library/documentation/Cocoa/Conceptual/ValueTransformers/index.html
-from Foundation import *
-from AppKit import *
-from PyObjCTools import NibClassBuilder
-import objc
+from Cocoa import *
class FahrenheitToCelsiusTransformer(NSValueTransformer):
@@ -48,8 +45,7 @@
return fahrenheitOutputValue
-NibClassBuilder.extractClasses("MainMenu")
-class TransformerAppDelegate(NibClassBuilder.AutoBaseClass):
+class TransformerAppDelegate (NSObject):
fahrenheit = objc.ivar('fahrenheit', objc._C_DBL)
trans = FahrenheitToCelsiusTransformer.alloc().init()
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TemperatureTransformer/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TemperatureTransformer/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/TemperatureTransformer/setup.py Wed Apr 8 16:20:16 2009
@@ -8,6 +8,7 @@
import py2app
setup(
+ name='TemperatureTransformer',
app=["Transformer.py"],
data_files=["English.lproj"],
)
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ToDos/Category.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ToDos/Category.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ToDos/Category.py Wed Apr 8 16:20:16 2009
@@ -15,25 +15,25 @@
title = objc.ivar('title')
priority = objc.ivar('priority', 'i')
+ @classmethod
def allCategories(cls):
"""Predefined global list of categories"""
return categories
- allCategories = classmethod(allCategories)
+ @classmethod
def categoryForPriority_(cls, thePriority):
for category in categories:
if thePriority >= category.priority:
return category
return None
- categoryForPriority_ = classmethod(categoryForPriority_)
+ @classmethod
def categoryWithTitle_andPriority_(cls, aTitle, aValue):
"""Convenience constructor"""
newCategory = Category.alloc().init()
newCategory.title = aTitle
newCategory.priority = aValue
return newCategory
- categoryWithTitle_andPriority_ = classmethod(categoryWithTitle_andPriority_)
# NSCoding methods
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ToDos/OverdueTransformer.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ToDos/OverdueTransformer.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ToDos/OverdueTransformer.py Wed Apr 8 16:20:16 2009
@@ -12,13 +12,13 @@
class OverdueTransformer(NSValueTransformer):
+ @classmethod
def transformedValueClass(cls):
return NSColor
- transformedValueClass = classmethod(transformedValueClass)
+ @classmethod
def allowsReverseTransformation(cls):
return False
- allowsReverseTransformation = classmethod(allowsReverseTransformation)
def transformedValue_(self, aDate):
if aDate is None:
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ToDos/PriorityToColourTransformer.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ToDos/PriorityToColourTransformer.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ToDos/PriorityToColourTransformer.py Wed Apr 8 16:20:16 2009
@@ -12,13 +12,13 @@
class PriorityToColourTransformer(NSValueTransformer):
+ @classmethod
def transformedValueClass(cls):
return NSColor
- transformedValueClass = classmethod(transformedValueClass)
+ @classmethod
def allowsReverseTransformation(cls):
return False
- allowsReverseTransformation = classmethod(allowsReverseTransformation)
def transformedValue_(self, priority):
if priority > 4:
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ToDos/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ToDos/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CocoaBindings/ToDos/setup.py Wed Apr 8 16:20:16 2009
@@ -19,6 +19,7 @@
)
setup(
+ name='ToDos',
app=["ToDos.py"],
data_files=["English.lproj"],
options=dict(py2app=dict(
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CurrencyConverter/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CurrencyConverter/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/CurrencyConverter/setup.py Wed Apr 8 16:20:16 2009
@@ -8,6 +8,7 @@
import py2app
setup(
+ name='CurrencyConverter',
app=["CurrencyConverter.py"],
data_files=["English.lproj"],
)
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/DotView/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/DotView/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/DotView/setup.py Wed Apr 8 16:20:16 2009
@@ -8,6 +8,7 @@
import py2app
setup(
+ name='DotView',
app=["DotView.py"],
data_files=["English.lproj"],
)
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/DragItemAround/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/DragItemAround/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/DragItemAround/setup.py Wed Apr 8 16:20:16 2009
@@ -7,6 +7,7 @@
from setuptools import setup
setup(
+ name='DragItemAround',
app=["DragItemAround.py"],
data_files=["MainMenu.nib"],
setup_requires=["py2app"],
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/FieldGraph/CGraphController.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/FieldGraph/CGraphController.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/FieldGraph/CGraphController.py Wed Apr 8 16:20:16 2009
@@ -1,6 +1,5 @@
-from Foundation import NSObject
-from PyObjCTools import NibClassBuilder, AppHelper
-from objc import *
+from Foundation import *
+from PyObjCTools import AppHelper
from CGraphModel import *
from CGraphView import *
@@ -9,25 +8,25 @@
#____________________________________________________________
class CGraphController(NSObject):
- graphModel = IBOutlet()
- graphView = IBOutlet()
- fieldNormalizeCheck = IBOutlet()
- settingDrawer = IBOutlet()
- fieldSlider0 = IBOutlet()
- fieldSlider1 = IBOutlet()
- fieldSlider2 = IBOutlet()
- phaseSlider0 = IBOutlet()
- phaseSlider1 = IBOutlet()
- phaseSlider2 = IBOutlet()
- spacingSlider = IBOutlet()
- fieldDisplay0 = IBOutlet()
- fieldDisplay1 = IBOutlet()
- fieldDisplay2 = IBOutlet()
- phaseDisplay0 = IBOutlet()
- phaseDisplay1 = IBOutlet()
- phaseDisplay2 = IBOutlet()
- RMSGainDisplay = IBOutlet()
- spacingDisplay = IBOutlet()
+ graphModel = objc.IBOutlet()
+ graphView = objc.IBOutlet()
+ fieldNormalizeCheck = objc.IBOutlet()
+ settingDrawer = objc.IBOutlet()
+ fieldSlider0 = objc.IBOutlet()
+ fieldSlider1 = objc.IBOutlet()
+ fieldSlider2 = objc.IBOutlet()
+ phaseSlider0 = objc.IBOutlet()
+ phaseSlider1 = objc.IBOutlet()
+ phaseSlider2 = objc.IBOutlet()
+ spacingSlider = objc.IBOutlet()
+ fieldDisplay0 = objc.IBOutlet()
+ fieldDisplay1 = objc.IBOutlet()
+ fieldDisplay2 = objc.IBOutlet()
+ phaseDisplay0 = objc.IBOutlet()
+ phaseDisplay1 = objc.IBOutlet()
+ phaseDisplay2 = objc.IBOutlet()
+ RMSGainDisplay = objc.IBOutlet()
+ spacingDisplay = objc.IBOutlet()
#____________________________________________________________
# Update GUI display and control values
@@ -66,32 +65,32 @@
#____________________________________________________________
# Handle GUI values
- @IBAction
+ @objc.IBAction
def fieldDisplay0_(self, sender):
self.setNormalizedField(0, sender.floatValue())
self.drawGraph()
- @IBAction
+ @objc.IBAction
def fieldDisplay1_(self, sender):
self.setNormalizedField(1, sender.floatValue())
self.drawGraph()
- @IBAction
+ @objc.IBAction
def fieldDisplay2_(self, sender):
self.setNormalizedField(2, sender.floatValue())
self.drawGraph()
- @IBAction
+ @objc.IBAction
def fieldSlider0_(self, sender):
self.setNormalizedField(0, sender.floatValue())
self.drawGraph()
- @IBAction
+ @objc.IBAction
def fieldSlider1_(self, sender):
self.setNormalizedField(1, sender.floatValue())
self.drawGraph()
- @IBAction
+ @objc.IBAction
def fieldSlider2_(self, sender):
self.setNormalizedField(2, sender.floatValue())
self.drawGraph()
@@ -123,46 +122,46 @@
self.graphModel.setField(t, v)
- @IBAction
+ @objc.IBAction
def phaseDisplay0_(self, sender):
self.graphModel.setPhase(0, degToRad(sender.floatValue()))
self.drawGraph()
- @IBAction
+ @objc.IBAction
def phaseDisplay1_(self, sender):
self.graphModel.setPhase(1, degToRad(sender.floatValue()))
self.drawGraph()
- @IBAction
+ @objc.IBAction
def phaseDisplay2_(self, sender):
self.graphModel.setPhase(2, degToRad(sender.floatValue()))
self.drawGraph()
- @IBAction
+ @objc.IBAction
def phaseSlider0_(self, sender):
self.graphModel.setPhase(0, degToRad(sender.floatValue()))
self.drawGraph()
- @IBAction
+ @objc.IBAction
def phaseSlider1_(self, sender):
self.graphModel.setPhase(1, degToRad(sender.floatValue()))
self.drawGraph()
- @IBAction
+ @objc.IBAction
def phaseSlider2_(self, sender):
self.graphModel.setPhase(2, degToRad(sender.floatValue()))
self.drawGraph()
- @IBAction
+ @objc.IBAction
def spacingDisplay_(self, sender):
self.graphModel.setSpacing(degToRad(sender.floatValue()))
self.drawGraph()
- @IBAction
+ @objc.IBAction
def spacingSlider_(self, sender):
self.graphModel.setSpacing(degToRad(sender.floatValue()))
self.drawGraph()
- @IBAction
+ @objc.IBAction
def settingDrawerButton_(self, sender):
self.settingDrawer.toggle_(self)
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/FieldGraph/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/FieldGraph/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/FieldGraph/setup.py Wed Apr 8 16:20:16 2009
@@ -8,6 +8,7 @@
plist = dict(CFBundleName='FieldGraph')
setup(
+ name="FieldGraph",
app=["Main.py"],
setup_requires=["py2app"],
data_files=["English.lproj", 'CrossCursor.tiff', 'Map.png'],
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/Formatter/main.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/Formatter/main.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/Formatter/main.py Wed Apr 8 16:20:16 2009
@@ -7,7 +7,7 @@
return product
return str(product)
- def getObjectValue_forString_errorDescription_(self, upc):
+ def getObjectValue_forString_errorDescription_(self, value, upc, error):
print self, upc
if not upc:
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/PackageManager/packman.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/PackageManager/packman.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/PackageManager/packman.py Wed Apr 8 16:20:16 2009
@@ -19,8 +19,6 @@
- save preferences in the favorites db (for databases that are in in there)?
"""
-import objc; objc.setVerbose(1); del objc # XXX: Debugging only
-
from Cocoa import *
import objc
import threading
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/PyInterpreter/PyInterpreter.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/PyInterpreter/PyInterpreter.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/PyInterpreter/PyInterpreter.py Wed Apr 8 16:20:16 2009
@@ -200,7 +200,7 @@
self.textView.setFont_(self.font())
self.textView.setContinuousSpellCheckingEnabled_(False)
self.textView.setRichText_(False)
- self._executeWithRedirectedIO(self._interp)
+ self._executeWithRedirectedIO_args_kwds_(self._interp, (), {})
#
# NIB loading protocol
@@ -265,7 +265,7 @@
# Interpreter functions
#
- def _executeWithRedirectedIO(self, fn, *args, **kwargs):
+ def _executeWithRedirectedIO_args_kwds_(self, fn, args, kwargs):
old = sys.stdin, sys.stdout, sys.stderr
if self._stdin is not None:
sys.stdin = self._stdin
@@ -279,7 +279,7 @@
def executeLine_(self, line):
self.addHistoryLine_(line)
- self._executeWithRedirectedIO(self._executeLine_, line)
+ self._executeWithRedirectedIO_args_kwds_(self._executeLine_, (line,), {})
self._history = filter(None, self._history)
self._history.append(u'')
self._historyView = len(self._history) - 1
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/PyInterpreter/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/PyInterpreter/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/PyInterpreter/setup.py Wed Apr 8 16:20:16 2009
@@ -8,6 +8,7 @@
plist = dict(NSMainNibFile='PyInterpreter')
setup(
+ name="PyInterpreter",
app=["PyInterpreter.py"],
data_files=["PyInterpreter.nib"],
setup_requires=["py2app"],
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/PyObjCLauncher/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/PyObjCLauncher/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/PyObjCLauncher/setup.py Wed Apr 8 16:20:16 2009
@@ -8,6 +8,7 @@
import py2app
setup(
+ name="PyObjC Launcher",
app=["PyObjCLauncher.py"],
data_files=["English.lproj"],
options=dict(py2app=dict(
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/RoundTransparentWindow/RoundTransparentWindow.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/RoundTransparentWindow/RoundTransparentWindow.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/RoundTransparentWindow/RoundTransparentWindow.py Wed Apr 8 16:20:16 2009
@@ -43,6 +43,8 @@
self.window().invalidateShadow()
class CustomWindow(NSWindow):
+ def awakeFromNib(self):
+ self.initialLocation = NSPoint()
def initWithContentRect_styleMask_backing_defer_(self, contentRect, aStyle,
bufferingType, flag):
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/SimpleService/ServiceTest.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/SimpleService/ServiceTest.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/SimpleService/ServiceTest.py Wed Apr 8 16:20:16 2009
@@ -12,7 +12,9 @@
return s
class ServiceTest(NSObject):
- def doOpenFileService_userData_error_(self, pboard, data):
+
+ @serviceSelector
+ def doOpenFileService_userData_error_(self, pboard, data, error):
#NSLog(u"doOpenFileService_userData_error_(%r, %r)" % (pboard, data,))
try:
types = pboard.types()
@@ -38,11 +40,8 @@
return ERROR(u'Exception, see traceback')
- doOpenFileService_userData_error_ = serviceSelector(
- doOpenFileService_userData_error_
- )
-
- def doCapitalizeService_userData_error_(self, pboard, data):
+ @serviceSelector
+ def doCapitalizeService_userData_error_(self, pboard, data, err):
#NSLog(u"doCapitalizeService_userData_error_(%r, %r)" % (pboard, data,))
try:
types = pboard.types()
@@ -71,7 +70,3 @@
import traceback
traceback.print_exc()
return ERROR(u'Exception, see traceback')
-
- doCapitalizeService_userData_error_ = serviceSelector(
- doCapitalizeService_userData_error_
- )
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/SimpleService/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/SimpleService/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/SimpleService/setup.py Wed Apr 8 16:20:16 2009
@@ -43,6 +43,7 @@
setup(
+ name='Simple Service',
app=["SimpleService_main.py"],
options=dict(py2app=dict(plist=plist)),
)
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/TableModel/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/TableModel/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/TableModel/setup.py Wed Apr 8 16:20:16 2009
@@ -8,6 +8,7 @@
import py2app
setup(
+ name='TableModel',
app=["TableModel.py"],
data_files=["English.lproj"],
)
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/TinyTinyEdit/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/TinyTinyEdit/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/TinyTinyEdit/setup.py Wed Apr 8 16:20:16 2009
@@ -20,6 +20,7 @@
setup(
+ name='Tiny Tiny Edit',
app=["TinyTinyEdit.py"],
data_files=["MainMenu.nib", "TinyTinyDocument.nib"],
options=dict(py2app=dict(plist=plist)),
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/TinyURLService/TinyURLService.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/TinyURLService/TinyURLService.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/TinyURLService/TinyURLService.py Wed Apr 8 16:20:16 2009
@@ -21,7 +21,9 @@
return urllib2.urlopen(TINYURL_API, data).read().decode('utf-8')
class TinyURLService(NSObject):
- def doTinyURLService_userData_error_(self, pboard, data):
+
+ @serviceSelector
+ def doTinyURLService_userData_error_(self, pboard, data, error):
# Mail.app in 10.4.1 doesn't do NSURLPboardType correctly!
# Probably elsewhere too, so we just use strings.
try:
@@ -70,9 +72,6 @@
traceback.print_exc()
return ERROR(u'Exception, see traceback')
- doTinyURLService_userData_error_ = serviceSelector(
- doTinyURLService_userData_error_
- )
def main():
serviceProvider = TinyURLService.alloc().init()
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/WebServicesTool/WSTApplicationDelegateClass.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/WebServicesTool/WSTApplicationDelegateClass.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/WebServicesTool/WSTApplicationDelegateClass.py Wed Apr 8 16:20:16 2009
@@ -4,7 +4,6 @@
An instance of this class is instantiated in the MainMenu.nib default NIB file.
"""
from Cocoa import *
-from PyObjCTools import NibClassBuilder
from WSTConnectionWindowControllerClass import WSTConnectionWindowController
class WSTApplicationDelegate(NSObject):
Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/iClass/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/iClass/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Examples/AppKit/iClass/setup.py Wed Apr 8 16:20:16 2009
@@ -7,10 +7,8 @@
from setuptools import setup
setup(
+ name="iClass",
app=["main.py"],
data_files=["English.lproj"],
setup_requires=["py2app"],
- options=dict(py2app=dict(plist=dict(
- CFBundleName='iClass',
- ))),
)
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com