[commits] (vajda) [15940] merged with trunk:15939

Wed, 28 Nov 2007 14:34:59 -0800

Title: [commits] (vajda) [15940] merged with trunk:15939

Diff

Modified: branches/64/chandler/Makefile (15939 => 15940)

--- branches/64/chandler/Makefile	2007-11-28 22:31:46 UTC (rev 15939)
+++ branches/64/chandler/Makefile	2007-11-28 22:34:46 UTC (rev 15940)
@@ -140,7 +140,7 @@
     $(CHANDLERARCHIVES)/logilab-astng-$(SNAP)-0.17.0-$(BP)1.tar.gz \
     $(CHANDLERARCHIVES)/logilab-common-$(SNAP)-0.21.2-$(BP)1.tar.gz \
     $(CHANDLERARCHIVES)/pylint-$(SNAP)-0.13.1-$(BP)2.tar.gz \
-    $(CHANDLERARCHIVES)/parsedatetime-$(SNAP)-0.8.4-$(BP)2.tar.gz \
+    $(CHANDLERARCHIVES)/parsedatetime-$(SNAP)-0.8.5-$(BP)1.tar.gz \
     $(CONFIGOBJ) \
     $(DOCUTILS) \
     $(CHANDLERARCHIVES)/epydoc-$(SNAP)-3.0beta1-$(BP)2.tar.gz \

Modified: branches/64/chandler/application/dialogs/GetPasswordDialog.py (15939 => 15940)

--- branches/64/chandler/application/dialogs/GetPasswordDialog.py	2007-11-28 22:31:46 UTC (rev 15939)
+++ branches/64/chandler/application/dialogs/GetPasswordDialog.py	2007-11-28 22:34:46 UTC (rev 15940)
@@ -28,9 +28,9 @@
 
         pre = wx.PreDialog()
         if create:
-            title = _(u"Create repository password")
+            title = _(u"Create Repository Password")
         else:
-            title = _(u"Enter repository password")
+            title = _(u"Enter Repository Password")
 
         pre.Create(None, -1, title, wx.DefaultPosition, wx.DefaultSize,
                    wx.DEFAULT_DIALOG_STYLE)

Modified: branches/64/chandler/application/dialogs/ReminderDialog.py (15939 => 15940)

--- branches/64/chandler/application/dialogs/ReminderDialog.py	2007-11-28 22:31:46 UTC (rev 15939)
+++ branches/64/chandler/application/dialogs/ReminderDialog.py	2007-11-28 22:34:46 UTC (rev 15940)
@@ -79,15 +79,16 @@
         sizer.Add(listCtrl, 0, wx.ALIGN_CENTER|wx.ALL, 5)
 
         box = wx.BoxSizer(wx.HORIZONTAL)
-        snoozeButton = wx.Button(panel, -1, _(u"Snooze for 5 minutes"))
+        snoozeButton = wx.Button(panel, -1, _(u"&Snooze for 5 minutes"))
         snoozeButton.Enable(False)
         snoozeButton.Bind(wx.EVT_BUTTON, self.onSnooze)
         box.Add(snoozeButton, 0, wx.ALIGN_RIGHT|wx.ALL, 5)
-        dismissButton = wx.Button(panel, wx.ID_OK, _(u"Dismiss"))
+        dismissButton = wx.Button(panel, wx.ID_OK, _(u"&Dismiss"))
         dismissButton.Enable(False)
         dismissButton.Bind(wx.EVT_BUTTON, self.onDismiss)
         box.Add(dismissButton, 0, wx.ALIGN_CENTER|wx.ALL, 5)
-        dismissAllButton = wx.Button(panel, wx.ID_OK, _(u"Dismiss All"))
+        dismissAllButton = wx.Button(panel, wx.ID_OK, _(u"Dismiss &All"))
+        dismissAllButton.SetDefault()
         dismissAllButton.Bind(wx.EVT_BUTTON, self.onDismiss)
         box.Add(dismissAllButton, 0, wx.ALIGN_RIGHT|wx.ALL, 5)
         sizer.Add(box, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)

Modified: branches/64/chandler/application/dialogs/RestoreShares.py (15939 => 15940)

--- branches/64/chandler/application/dialogs/RestoreShares.py	2007-11-28 22:31:46 UTC (rev 15939)
+++ branches/64/chandler/application/dialogs/RestoreShares.py	2007-11-28 22:34:46 UTC (rev 15940)
@@ -117,7 +117,7 @@
                         names.append(name)
 
                     cb = wx.CheckBox(self.panel, -1,
-                        _(u"All collections in %(account)s") %
+                        _(u"&All collections in %(account)s") %
                         { 'account' : account.displayName})
                     self.Bind(wx.EVT_CHECKBOX, self.OnAccountCheck,
                         id=cb.GetId())
@@ -152,11 +152,11 @@
             self.sizer.Add(self.noteLabel, 0, wx.ALIGN_LEFT|wx.ALL, 5)
 
             self.NoButton = wx.Button(self.panel, wx.ID_CANCEL,
-                _(u"Don't Sync"))
+                _(u"&Don't Sync"))
             self.LaterButton = wx.Button(self.panel, -1,
-                _(u"Sync Later"))
+                _(u"Sync &Later"))
             self.SyncButton = wx.Button(self.panel, wx.ID_OK,
-                _(u"Sync Now"))
+                _(u"&Sync Now"))
 
             self.Bind(wx.EVT_BUTTON, self.OnNo, id=wx.ID_CANCEL)
             self.Bind(wx.EVT_BUTTON, self.OnLater, id=self.LaterButton.GetId())

Copied: branches/64/chandler/distrib/osx/manifest.debug.intel-osx (from rev 15939, trunk/chandler/distrib/osx/manifest.debug.intel-osx) ( => )

Copied: branches/64/chandler/distrib/osx/manifest.debug.intel-osx-leopard (from rev 15939, trunk/chandler/distrib/osx/manifest.debug.intel-osx-leopard)

Deleted: branches/64/chandler/distrib/osx/manifest.debug.leopard (15939 => 15940)

--- branches/64/chandler/distrib/osx/manifest.debug.leopard	2007-11-28 22:31:46 UTC (rev 15939)
+++ branches/64/chandler/distrib/osx/manifest.debug.leopard	2007-11-28 22:34:46 UTC (rev 15940)
@@ -1,99 +0,0 @@
-# manifest.osx
-#
-# Variables maintain their value until changed, so be aware of the order of
-# things...
-# 
-# src: set this to be relative to buildenv['root']
-# dest: set this to be relative to buildenv['distdir']
-# recursive: set to yes or no
-# glob: set to a comma-separated list of glob patterns
-
-exclude=.svn,*.pyo,*.pyc
-
-# Grab wx and db libs
-src=""
-dest=Contents/Resources
-glob=*.dylib,*.r,*.rsrc,*.jnilib,*.la
-lib
-src=""
-glob=*.la,*.dylib,db_*
-bin
-lib
-
-# Grab the local python site-packages
-src=""
-dest=Contents/Resources/debug
-glob=*
-site-packages
-
-# Grab icu libs
-src=""
-dest=Contents/Resources
-glob=libicu*
-lib
-
-# Grab the locale files
-src=""
-dest=Contents/Resources
-glob=*
-share
-
-# create symlink of share dir
-dest=Contents/Resources/debug
-link=../
-share
-
-# create symlink of lib dir - this allows the app to be called from the command line
-dest=Contents/Resources/debug
-link=../
-lib
-
-# create symlink of Library dir - this allows the app to be called from the command line
-dest=Contents/Resources/debug
-link=../
-Library
-
-# Grab Chandler.py and others
-src=""
-dest=Contents/Resources
-Chandler.py
-version.py
-site.py
-LICENSE.txt
-NOTICE.txt
-WingMacDebug.wpr
-
-# Grab the rest of Chandler from the application/ and parcel/ folders
-recursive=yes
-glob=*.py,*.png,*.xrc,*.daml,*.gif,*.xml,*.txt,*.bmp,*.jpg,*.html,*.pack,*.pem,*.ics,*.js,*.css,*.sh,*.conf
-application
-parcels
-util
-tools
-
-glob=*
-repository
-i18n
-Chandler.egg-info
-
-# Grab the osx README
-src=""
-README.osx.txt
-dest=Contents/Resources
-
-# Grab the bundle files
-src=""
-dest=Contents
-Info.plist
-src=""
-dest=Contents/Resources
-Chandler.icns
-
-src=""
-dest=Contents/MacOS
-ChandlerApp
-
-src=""
-dest=Contents/Resources/debug
-RunPython
-

Deleted: branches/64/chandler/distrib/osx/manifest.debug.osx (15939 => 15940)

--- branches/64/chandler/distrib/osx/manifest.debug.osx	2007-11-28 22:31:46 UTC (rev 15939)
+++ branches/64/chandler/distrib/osx/manifest.debug.osx	2007-11-28 22:34:46 UTC (rev 15940)
@@ -1,127 +0,0 @@
-# manifest.osx
-#
-# Variables maintain their value until changed, so be aware of the order of
-# things...
-# 
-# src: set this to be relative to buildenv['root']
-# dest: set this to be relative to buildenv['distdir']
-# recursive: set to yes or no
-# glob: set to a comma-separated list of glob patterns
-
-exclude=.svn,*.pyo,*.pyc
-
-# Grab the python modules 
-src=""
-dest=Contents/Resources/Library/Frameworks/Python.framework/Versions/2.5/lib
-glob=*
-recursive=yes
-python2.5
-
-# Grab python scripts
-src=""
-dest=Contents/Resources/Library/Frameworks/Python.framework/Versions/2.5
-glob=rst*
-bin
-
-# Grab python Framework file
-src=""
-dest=Contents/Resources/Library/Frameworks/Python.framework/Versions/2.5
-glob=*
-Python
-
-# Grab wx and db libs
-src=""
-dest=Contents/Resources
-glob=*.dylib,*.r,*.rsrc,*.jnilib,*.la
-lib
-src=""
-glob=*.la,*.dylib,db_*
-bin
-lib
-
-# Grab icu libs
-src=""
-dest=Contents/Resources
-glob=libicu*
-lib
-
-# Grab the locale files
-src=""
-dest=Contents/Resources
-glob=*
-share
-
-# create symlink of share dir
-dest=Contents/Resources/debug
-link=../
-share
-
-# create symlink of lib dir - this allows the app to be called from the command line
-dest=Contents/Resources/debug
-link=../
-lib
-
-# create symlink of Library dir - this allows the app to be called from the command line
-dest=Contents/Resources/debug
-link=../
-Library
-
-# Grab Chandler.py and others
-src=""
-dest=Contents/Resources
-Chandler.py
-version.py
-LICENSE.txt
-NOTICE.txt
-WingMacDebug.wpr
-
-# Grab the rest of Chandler from the application/ and parcel/ folders
-recursive=yes
-glob=*.py,*.png,*.xrc,*.daml,*.gif,*.xml,*.txt,*.bmp,*.jpg,*.html,*.pack,*.pem,*.ics,*.js,*.css,*.sh,*.conf
-application
-parcels
-util
-tools
-
-glob=*
-repository
-i18n
-Chandler.egg-info
-
-# Grab the osx README
-src=""
-README.osx.txt
-dest=Contents/Resources
-
-# Grab the bundle files
-src=""
-dest=Contents
-Info.plist
-src=""
-dest=Contents/Resources
-Chandler.icns
-
-src=""
-dest=Contents/MacOS
-ChandlerApp
-
-src=""
-dest=Contents/Resources/debug
-RunPython
-
-src=""
-dest=Contents/Resources/Library/Frameworks/Python.framework
-recursive=yes
-Versions
-
-# create symlink of the Headers dir
-dest=Contents/Resources/debug/Library/Frameworks/Python.framework
-link=Versions/Current/
-Headers
-
-# create symlink of the Resources dir
-dest=Contents/Resources/debug/Library/Frameworks/Python.framework
-link=Versions/Current/
-Resources
-
-

Copied: branches/64/chandler/distrib/osx/manifest.debug.ppc-osx (from rev 15939, trunk/chandler/distrib/osx/manifest.debug.ppc-osx) ( => )

Copied: branches/64/chandler/distrib/osx/manifest.intel-osx (from rev 15939, trunk/chandler/distrib/osx/manifest.intel-osx)

Copied: branches/64/chandler/distrib/osx/manifest.intel-osx-leopard (from rev 15939, trunk/chandler/distrib/osx/manifest.intel-osx-leopard) ( => )

Deleted: branches/64/chandler/distrib/osx/manifest.leopard
===================================================================
--- branches/64/chandler/distrib/osx/manifest.leopard	2007-11-28 22:31:46 UTC (rev 15939)
+++ branches/64/chandler/distrib/osx/manifest.leopard	2007-11-28 22:34:46 UTC (rev 15940)
@@ -1,99 +0,0 @@
-# manifest.osx
-#
-# Variables maintain their value until changed, so be aware of the order of
-# things...
-# 
-# src: set this to be relative to buildenv['root']
-# dest: set this to be relative to buildenv['distdir']
-# recursive: set to yes or no
-# glob: set to a comma-separated list of glob patterns
-
-exclude=.svn,*.pyo,*.pyc
-
-# Grab wx and db libs
-src=""
-dest=Contents/Resources
-glob=*.dylib,*.r,*.rsrc,*.jnilib,*.la
-lib
-src=""
-glob=*.la,*.dylib,db_*
-bin
-lib
-
-# Grab the local python site-packages
-src=""
-dest=Contents/Resources/release
-glob=*
-site-packages
-
-# Grab icu libs
-src=""
-dest=Contents/Resources
-glob=libicu*
-lib
-
-# Grab the locale files
-src=""
-dest=Contents/Resources
-glob=*
-share
-
-# create symlink of share dir
-dest=Contents/Resources/release
-link=../
-share
-
-# create symlink of lib dir - this allows the app to be called from the command line
-dest=Contents/Resources/release
-link=../
-lib
-
-# create symlink of Library dir - this allows the app to be called from the command line
-dest=Contents/Resources/release
-link=../
-Library
-
-# Grab Chandler.py and others
-src=""
-dest=Contents/Resources
-Chandler.py
-version.py
-site.py
-LICENSE.txt
-NOTICE.txt
-WingMacRelease.wpr
-
-# Grab the rest of Chandler from the application/ and parcel/ folders
-recursive=yes
-glob=*.py,*.png,*.xrc,*.daml,*.gif,*.xml,*.txt,*.bmp,*.jpg,*.html,*.pack,*.pem,*.ics,*.js,*.css,*.sh,*.conf
-application
-parcels
-util
-tools
-
-glob=*
-repository
-i18n
-Chandler.egg-info
-
-# Grab the osx README
-src=""
-README.osx.txt
-dest=Contents/Resources
-
-# Grab the bundle files
-src=""
-dest=Contents
-Info.plist
-src=""
-dest=Contents/Resources
-Chandler.icns
-
-src=""
-dest=Contents/MacOS
-ChandlerApp
-
-src=""
-dest=Contents/Resources/release
-RunPython
-

Deleted: branches/64/chandler/distrib/osx/manifest.osx (15939 => 15940)

--- branches/64/chandler/distrib/osx/manifest.osx	2007-11-28 22:31:46 UTC (rev 15939)
+++ branches/64/chandler/distrib/osx/manifest.osx	2007-11-28 22:34:46 UTC (rev 15940)
@@ -1,125 +0,0 @@
-# manifest.osx
-#
-# Variables maintain their value until changed, so be aware of the order of
-# things...
-# 
-# src: set this to be relative to buildenv['root']
-# dest: set this to be relative to buildenv['distdir']
-# recursive: set to yes or no
-# glob: set to a comma-separated list of glob patterns
-
-exclude=.svn,*.pyo,*.pyc
-
-# Grab the python modules 
-src=""
-dest=Contents/Resources/Library/Frameworks/Python.framework/Versions/2.5/lib
-glob=*
-recursive=yes
-python2.5
-
-# Grab python Framework file
-src=""
-dest=Contents/Resources/Library/Frameworks/Python.framework/Versions/2.5
-Python
-
-# Grab python scripts
-src=""
-dest=Contents/Resources/Library/Frameworks/Python.framework/Versions/2.5
-glob=rst*
-bin
-
-# Grab wx and db libs
-src=""
-dest=Contents/Resources
-glob=*.dylib,*.r,*.rsrc,*.jnilib,*.la
-lib
-src=""
-glob=*.la,*.dylib,db_*
-bin
-lib
-
-# Grab icu libs
-src=""
-dest=Contents/Resources
-glob=libicu*
-lib
-
-# Grab the locale files
-src=""
-dest=Contents/Resources
-glob=*
-share
-
-# create symlink of share dir
-dest=Contents/Resources/release
-link=../
-share
-
-# create symlink of lib dir - this allows the app to be called from the command line
-dest=Contents/Resources/release
-link=../
-lib
-
-# create symlink of Library dir - this allows the app to be called from the command line
-dest=Contents/Resources/release
-link=../
-Library
-
-# Grab Chandler.py and others
-src=""
-dest=Contents/Resources
-Chandler.py
-version.py
-LICENSE.txt
-NOTICE.txt
-WingMacRelease.wpr
-
-# Grab the rest of Chandler from the application/ and parcel/ folders
-recursive=yes
-glob=*.py,*.png,*.xrc,*.daml,*.gif,*.xml,*.txt,*.bmp,*.jpg,*.html,*.pack,*.pem,*.ics,*.js,*.css,*.sh,*.conf
-application
-parcels
-util
-tools
-
-glob=*
-repository
-i18n
-Chandler.egg-info
-
-# Grab the osx README
-src=""
-README.osx.txt
-dest=Contents/Resources
-
-# Grab the bundle files
-src=""
-dest=Contents
-Info.plist
-src=""
-dest=Contents/Resources
-Chandler.icns
-
-src=""
-dest=Contents/MacOS
-ChandlerApp
-
-src=""
-dest=Contents/Resources/release
-RunPython
-
-src=""
-dest=Contents/Resources/Library/Frameworks/Python.framework
-recursive=yes
-Versions
-
-# create symlink of the Headers dir
-dest=Contents/Resources/release/Library/Frameworks/Python.framework
-link=Versions/Current/
-Headers
-
-# create symlink of the Resources dir
-dest=Contents/Resources/release/Library/Frameworks/Python.framework
-link=Versions/Current/
-Resources
-

Copied: branches/64/chandler/distrib/osx/manifest.ppc-osx (from rev 15939, trunk/chandler/distrib/osx/manifest.ppc-osx) ( => )

Modified: branches/64/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py
===================================================================
--- branches/64/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py	2007-11-28 22:31:46 UTC (rev 15939)
+++ branches/64/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py	2007-11-28 22:34:46 UTC (rev 15940)
@@ -1820,11 +1820,11 @@
         # Setting the insertion point seems to work when several keys are typed
         # before the edit widget is displayed, but perhaps there's a better
         # way to achieve this?
+        if self.editor:
+            self.editor.SetInsertionPoint(0)
+            self.editor.SetValue(key)
+            self.editor.SetInsertionPointEnd()
 
-        self.editor.SetInsertionPoint(0)
-        self.editor.SetValue(key)
-        self.editor.SetInsertionPointEnd()
-
     def handleOneChange(self, op, event, filterAllDay=False, filterTimed=False):
         """
         Change self.visibleEvents based on op and event, return the tuple

Modified: branches/64/chandler/parcels/osaf/pim/reminders.py (15939 => 15940)

--- branches/64/chandler/parcels/osaf/pim/reminders.py	2007-11-28 22:31:46 UTC (rev 15939)
+++ branches/64/chandler/parcels/osaf/pim/reminders.py	2007-11-28 22:34:46 UTC (rev 15940)
@@ -301,11 +301,19 @@
         resultTuples = []
         
         for entry in pendingKind.iterItems():
+            thisTuple = tuple(getattr(entry, attr, None)
+                               for attr in ('when', 'item', 'reminder'))
             # Show everything except reminders in the trash, and
-            # reminders that have been snoozed into the future.
-            if (not entry.item in trash and
-                not (entry.snoozed and entry.when > when)):
-                resultTuples.append((entry.when, entry.item, entry.reminder))
+            # reminders that have been snoozed into the future. Also,
+            # don't return any "dead" items in the tuple, and check
+            # for missing attributes (bug 11415).
+            if (thisTuple[0] is not None and
+                not isDead(thisTuple[1]) and
+                not isDead(thisTuple[2]) and
+                not thisTuple[1] in trash and
+                not (entry.snoozed and thisTuple[0] > when)):
+
+                resultTuples.append(thisTuple)
                                 
         resultTuples.sort(key=lambda t: t[0])
         return resultTuples

Modified: branches/64/chandler/repository/item/Sets.py (15939 => 15940)

--- branches/64/chandler/repository/item/Sets.py	2007-11-28 22:31:46 UTC (rev 15939)
+++ branches/64/chandler/repository/item/Sets.py	2007-11-28 22:34:46 UTC (rev 15940)
@@ -371,7 +371,7 @@
             if change == 'collection':
 
                 if op in ('add', 'remove'):
-                    otherItem = self.itsView.get(other)
+                    otherItem = self.itsView.find(other)
 
                     if op == 'add':
                         if (otherItem is not None and
@@ -1582,7 +1582,7 @@
                     if other not in index:
                         op = None
                 elif not self.filter(other):
-                    otherItem = self.itsView.get(other)
+                    otherItem = self.itsView.find(other)
                     if not (otherItem is None or otherItem.isDeleting()):
                         op = None
 
@@ -1606,7 +1606,7 @@
                 contains = None
                 
             if matched and not contains is True:
-                item = self.itsView.get(other)
+                item = self.itsView.find(other)
                 if item is None or not item.isDeferring():
                     self._collectionChanged('add', 'collection', other, ())
             elif not matched and not contains is False:

Modified: branches/64/chandler/tools/distribute.py (15939 => 15940)

--- branches/64/chandler/tools/distribute.py	2007-11-28 22:31:46 UTC (rev 15939)
+++ branches/64/chandler/tools/distribute.py	2007-11-28 22:34:46 UTC (rev 15940)
@@ -83,10 +83,10 @@
         if sys.platform == 'darwin':
             if platform.machine() == 'i386':
                 options.platformName = 'Mac OS X (intel)'
-                options.platformID   = 'iosx'
+                options.platformID   = 'intel-osx'
             else:
                 options.platformName = 'Mac OS X (ppc)'
-                options.platformID   = 'osx'
+                options.platformID   = 'ppc-osx'
 
             release   = platform.release()
             version   = release.split('.')
@@ -95,6 +95,9 @@
             if len(version) == 3:
                 options.platformSubID = platforms.get(version[0], version[0])
 
+            if options.platformSubID == 'leopard':
+                options.platformID += '-leopard'
+
         elif sys.platform == 'cygwin':
             options.platformName = 'Windows'
             options.platformID   = 'win'
@@ -173,13 +176,9 @@
     return 'Chandler_%s_%s%s' % (options.platformID, modeStr, options.version_info['version'])
 
 def buildDistributionImage(mode, options):
-    if options.platformID == 'iosx':
+    if 'osx' in options.platformID:
         p = 'osx'
-
-        if options.platformSubID == 'leopard':
-            s = options.platformSubID
-        else:
-            s = p
+        s = options.platformID
     else:
         if options.platformID == 'linux':
             p = 'linux'

Modified: branches/64/external/parsedatetime/Makefile (15939 => 15940)

--- branches/64/external/parsedatetime/Makefile	2007-11-28 22:31:46 UTC (rev 15939)
+++ branches/64/external/parsedatetime/Makefile	2007-11-28 22:34:46 UTC (rev 15940)
@@ -1,6 +1,6 @@
 
-VERSION=0.8.4
-RELVER=$(VERSION)-$(BRANCH_REV_PREFIX)2
+VERSION=0.8.5
+RELVER=$(VERSION)-$(BRANCH_REV_PREFIX)1
 PDT=$(BUILD_ROOT)/parsedatetime
 SRC=""
 TARBALL=parsedatetime-$(SNAP)-$(RELVER).tar.gz


_______________________________________________
Commits mailing list
[email protected]
http://lists.osafoundation.org/mailman/listinfo/commits

Reply via email to