[Commits] (heikki) Testing commitslist, bug numbers should now have links to bugzilla. For example, here should be a link to bug 2005 (even though I am actually just fixing the copyright year to include 2005).\nThe commitslist improvement is bug 2694.
Commit by: heikki Modified files: chandler/application/Application.py 1.311 1.312 Log message: Testing commitslist, bug numbers should now have links to bugzilla. For example, here should be a link to bug 2005 (even though I am actually just fixing the copyright year to include 2005).\nThe commitslist improvement is bug 2694. ViewCVS links: http://cvs.osafoundation.org/index.cgi/chandler/application/Application.py.diff?r1=text&tr1=1.311&r2=text&tr2=1.312 Index: chandler/application/Application.py diff -u chandler/application/Application.py:1.311 chandler/application/Application.py:1.312 --- chandler/application/Application.py:1.311 Fri Mar 18 13:41:41 2005 +++ chandler/application/Application.py Fri Mar 18 14:16:15 2005 @@ -1,6 +1,6 @@ -__version__ = "$Revision: 1.311 $" -__date__ = "$Date: 2005/03/18 21:41:41 $" -__copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation" +__version__ = "$Revision: 1.312 $" +__date__ = "$Date: 2005/03/18 22:16:15 $" +__copyright__ = "Copyright (c) 2003-2005 Open Source Applications Foundation" __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"; import gettext, os, sys, threading, time ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (heikki) Testing commitslist, bug numbers should now have links to bugzilla. For example, here should be a link to bug 2005 (even though I am actually just fixing the copyright year to include 2005).\nThe commitslist improvement is bug 2694.
Commit by: heikki Modified files: chandler/application/dialogs/ReminderDialog.py 1.6 1.7 Log message: Testing commitslist, bug numbers should now have links to bugzilla. For example, here should be a link to bug 2005 (even though I am actually just fixing the copyright year to include 2005).\nThe commitslist improvement is bug 2694. ViewCVS links: http://cvs.osafoundation.org/index.cgi/chandler/application/dialogs/ReminderDialog.py.diff?r1=text&tr1=1.6&r2=text&tr2=1.7 Index: chandler/application/dialogs/ReminderDialog.py diff -u chandler/application/dialogs/ReminderDialog.py:1.6 chandler/application/dialogs/ReminderDialog.py:1.7 --- chandler/application/dialogs/ReminderDialog.py:1.6 Mon Feb 7 14:40:01 2005 +++ chandler/application/dialogs/ReminderDialog.py Fri Mar 18 14:18:44 2005 @@ -1,6 +1,6 @@ -__version__ = "$Revision: 1.6 $" -__date__ = "$Date: 2005/02/07 22:40:01 $" -__copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation" +__version__ = "$Revision: 1.7 $" +__date__ = "$Date: 2005/03/18 22:18:44 $" +__copyright__ = "Copyright (c) 2003-2005 Open Source Applications Foundation" __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"; import os, sys, mx, wx ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (heikki) Testing commitslist, bug numbers should now have links to bugzilla. For example, here should be a link to bug 2005 (even though I am actually just fixing the copyright year to include 2005).
Commit by: heikki Modified files: chandler/application/tests/ParcelLoaderTestCase.py 1.9 1.10 Log message: Testing commitslist, bug numbers should now have links to bugzilla. For example, here should be a link to bug 2005 (even though I am actually just fixing the copyright year to include 2005). The commitslist improvement is bug 2694. Bugzilla links: h t t p : / / b u g z i l l a ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (heikki) Testing commitslist, bug numbers should now have links to bugzilla. For example, here should be a link to bug 2005 (even though I am actually just fixing the copyright year to include 2005).
Commit by: heikki Modified files: chandler/application/tests/testparcels/uuidof/parcel.xml 1.4 1.5 Log message: Testing commitslist, bug numbers should now have links to bugzilla. For example, here should be a link to bug 2005 (even though I am actually just fixing the copyright year to include 2005). The commitslist improvement is bug 2694. Bugzilla links: http://bugzilla.osafoundation.org/show_bug.cgi?id=2005 http://bugzilla.osafoundation.org/show_bug.cgi?id=2005 http://bugzilla.osafoundation.org/show_bug.cgi?id=2694 ViewCVS links: http://cvs.osafoundation.org/index.cgi/chandler/application/tests/testparcels/uuidof/parcel.xml.diff?r1=text&tr1=1.4&r2=text&tr2=1.5 Index: chandler/application/tests/testparcels/uuidof/parcel.xml diff -u chandler/application/tests/testparcels/uuidof/parcel.xml:1.4 chandler/application/tests/testparcels/uuidof/parcel.xml:1.5 --- chandler/application/tests/testparcels/uuidof/parcel.xml:1.4Thu Mar 3 18:03:05 2005 +++ chandler/application/tests/testparcels/uuidof/parcel.xmlFri Mar 18 15:01:35 2005 @@ -1,8 +1,8 @@ - - - + + + http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) Directory /usr/local/cvsrep/server/core/src/org/osaf/jcr added to the repository
Commit by: bcm Modified files: server/core/src/org/osaf/jcr Log message: Directory /usr/local/cvsrep/server/core/src/org/osaf/jcr added to the repository ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/jcr? ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) Directory /usr/local/cvsrep/server/core/src/org/osaf/jcr/jackrabbit added to the repository
Commit by: bcm Modified files: server/core/src/org/osaf/jcr/jackrabbit Log message: Directory /usr/local/cvsrep/server/core/src/org/osaf/jcr/jackrabbit added to the repository ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/jcr/jackrabbit? ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) replace jackrabbit's BindableRepositoryFactory with our own simple
Commit by: bcm
Modified files:
server/core/build.xml 1.10 1.11
server/core/src/org/osaf/cosmo/security/CosmoJCRCredentialsProvider.java None
1.1
server/core/src/org/osaf/jcr/JCRServletCredentialsProvider.java None 1.1
server/core/src/org/osaf/jcr/jackrabbit/JackrabbitRepositoryFactory.java None
1.1
server/etc/server.xml 1.10 1.11
Log message:
replace jackrabbit's BindableRepositoryFactory with our own simple
JackrabbitRespositoryFactory. jackrabbit's one required the object reference
to be an instance of BindableFactory (a jackrabbit core class), whereas ours
expects a plain old Reference as passed in by tomcat's jndi resource system.
add a JCRServletCredentialsProvider interface for webapps to extract
credentials from an authenticated servlet request and package them into an
instance of javax.jcr.Credentials suitable for logging into a JCR repository.
add a credentials provider implementation that uses Acegi Security to find an
Authentication object in the current thread's secure context and packages it
into an instance of javax.jcr.SimpleCredentials. dummy method right now, need
to figure out how to extract username and password from Authentication, but
still works for logging into jackrabbit's repository since username and
password aren't actually checked in there.
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/core/build.xml.diff?r1=text&tr1=1.10&r2=text&tr2=1.11
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/security/CosmoJCRCredentialsProvider.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/jcr/JCRServletCredentialsProvider.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/jcr/jackrabbit/JackrabbitRepositoryFactory.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/etc/server.xml.diff?r1=text&tr1=1.10&r2=text&tr2=1.11
Index: server/core/build.xml
diff -u server/core/build.xml:1.10 server/core/build.xml:1.11
--- server/core/build.xml:1.10 Thu Mar 17 19:26:16 2005
+++ server/core/build.xml Fri Mar 18 15:50:45 2005
@@ -25,6 +25,8 @@
+
+
Index: server/etc/server.xml
diff -u server/etc/server.xml:1.10 server/etc/server.xml:1.11
--- server/etc/server.xml:1.10 Thu Mar 17 11:55:58 2005
+++ server/etc/server.xml Fri Mar 18 15:50:46 2005
@@ -5,7 +5,9 @@
factory
-
org.apache.jackrabbit.core.jndi.BindableRepositoryFactory
+
+ org.osaf.jcr.jackrabbit.JackrabbitRepositoryFactory
+
configFilePath
@@ -70,8 +72,6 @@
userTable="user"
digest="MD5"
debug="0"/>
-
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) use Acegi Security to authenticate instead of the container. need to add
Commit by: bcm
Modified files:
server/webapps/console/build.xml 1.6 1.7
server/webapps/console/web/WEB-INF/struts-config.xml 1.3 1.4
Log message:
use Acegi Security to authenticate instead of the container. need to add
authorization to security config so that only users in the root role can
access the console.
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/webapps/console/build.xml.diff?r1=text&tr1=1.6&r2=text&tr2=1.7
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/struts-config.xml.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
Index: server/webapps/console/build.xml
diff -u server/webapps/console/build.xml:1.6
server/webapps/console/build.xml:1.7
--- server/webapps/console/build.xml:1.6Thu Feb 24 18:08:50 2005
+++ server/webapps/console/build.xmlFri Mar 18 15:52:54 2005
@@ -50,6 +50,7 @@
file="${core.build}/chandler-server-core.jar"/>
+
@@ -81,7 +82,11 @@
-
+
+
+
+
+
Index: server/webapps/console/web/WEB-INF/struts-config.xml
diff -u server/webapps/console/web/WEB-INF/struts-config.xml:1.3
server/webapps/console/web/WEB-INF/struts-config.xml:1.4
--- server/webapps/console/web/WEB-INF/struts-config.xml:1.3Tue Mar 1
18:48:29 2005
+++ server/webapps/console/web/WEB-INF/struts-config.xmlFri Mar 18
15:52:54 2005
@@ -104,9 +104,6 @@
-
-
-
+
___________
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) forgot to commit this file, which contains the configuration for Acegi
Commit by: bcm Modified files: server/webapps/console/etc/web.xml 1.5 1.6 Log message: forgot to commit this file, which contains the configuration for Acegi Security authentication ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/webapps/console/etc/web.xml.diff?r1=text&tr1=1.5&r2=text&tr2=1.6 Index: server/webapps/console/etc/web.xml diff -u server/webapps/console/etc/web.xml:1.5 server/webapps/console/etc/web.xml:1.6 --- server/webapps/console/etc/web.xml:1.5 Mon Feb 28 17:48:38 2005 +++ server/webapps/console/etc/web.xml Fri Mar 18 15:54:02 2005 @@ -5,9 +5,39 @@ version="2.4"> Chandler Server Admin Console +contextConfigLocation + + classpath:applicationContext-base.xml + classpath:applicationContext-hibernate.xml + classpath:applicationContext-webdav-client.xml + classpath:applicationContext-manager.xml + classpath:applicationContext-security.xml + /WEB-INF/action-servlet.xml + + + javax.servlet.jsp.jstl.fmt.localizationContext MessageResources + + + org.springframework.web.context.ContextLoaderListener + + + +authen +net.sf.acegisecurity.util.FilterToBeanProxy + + targetClass + +net.sf.acegisecurity.util.FilterChainProxy + + + + +authen +/* + action org.apache.struts.action.ActionServlet @@ -67,20 +97,4 @@ jdbc/ChandlerUserDB javax.sql.DataSource - - - Admin Console - / - - - root - - - -BASIC -Chandler Server - - -root - ___________ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) replace obsolete jackrabbit CredentialsProvider interface with cosmo core
reds =
+credentialsProvider.extractCredentials(request);
if (creds != null) {
if (log.isDebugEnabled()) {
log.debug("Logging into repository");
@@ -74,6 +78,10 @@
log.error("error logging into repository", e);
throw new DavException(DavServletResponse.SC_INTERNAL_SERVER_ERROR,
e.getMessage());
+} catch (ServletException e) {
+log.error("error extracting credentials", e);
+throw new DavException(DavServletResponse.SC_INTERNAL_SERVER_ERROR,
+ e.getMessage());
}
}
@@ -101,13 +109,14 @@
/**
*/
-public CredentialsProvider getCredentialsProvider() {
+public JCRServletCredentialsProvider getCredentialsProvider() {
return credentialsProvider;
}
/**
*/
-public void setCredentialsProvider(CredentialsProvider provider) {
+public void
+setCredentialsProvider(JCRServletCredentialsProvider provider) {
credentialsProvider = provider;
}
}
Index: server/webapps/webdav/build.xml
diff -u server/webapps/webdav/build.xml:1.4 server/webapps/webdav/build.xml:1.5
--- server/webapps/webdav/build.xml:1.4 Thu Mar 17 19:28:18 2005
+++ server/webapps/webdav/build.xml Fri Mar 18 15:56:22 2005
@@ -55,6 +55,9 @@
+
+
+
Index: server/webapps/webdav/etc/applicationContext-webdav.xml
diff -u server/webapps/webdav/etc/applicationContext-webdav.xml:1.1
server/webapps/webdav/etc/applicationContext-webdav.xml:1.2
--- server/webapps/webdav/etc/applicationContext-webdav.xml:1.1 Thu Mar 17
19:28:18 2005
+++ server/webapps/webdav/etc/applicationContext-webdav.xml Fri Mar 18
15:56:22 2005
@@ -19,7 +19,7 @@
+class="org.osaf.cosmo.security.CosmoJCRCredentialsProvider"/>
Index: server/webapps/webdav/web/WEB-INF/.cvsignore
diff -u server/webapps/webdav/web/WEB-INF/.cvsignore:1.1
server/webapps/webdav/web/WEB-INF/.cvsignore:1.2
--- server/webapps/webdav/web/WEB-INF/.cvsignore:1.1Tue Mar 15 12:30:23 2005
+++ server/webapps/webdav/web/WEB-INF/.cvsignoreFri Mar 18 15:56:23 2005
@@ -1,2 +1,3 @@
classes
lib
+applicationContext*.xml
Index: server/webapps/webdav/web/WEB-INF/web.xml
diff -u server/webapps/webdav/web/WEB-INF/web.xml:1.4
server/webapps/webdav/web/WEB-INF/web.xml:1.5
--- server/webapps/webdav/web/WEB-INF/web.xml:1.4 Thu Mar 17 19:28:20 2005
+++ server/webapps/webdav/web/WEB-INF/web.xml Fri Mar 18 15:56:23 2005
@@ -17,11 +17,13 @@
/WEB-INF/applicationContext-webdav.xml
+
org.springframework.web.context.ContextLoaderListener
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) update with latest cosmo plans
Commit by: bcm Modified files: server/docs/TODO.txt 1.17 1.18 Log message: update with latest cosmo plans ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/docs/TODO.txt.diff?r1=text&tr1=1.17&r2=text&tr2=1.18 Index: server/docs/TODO.txt diff -u server/docs/TODO.txt:1.17 server/docs/TODO.txt:1.18 --- server/docs/TODO.txt:1.17 Tue Mar 1 18:48:27 2005 +++ server/docs/TODO.txtFri Mar 18 16:06:39 2005 @@ -2,35 +2,44 @@ 0.1 RELEASE === -core: +source code control/build system: - * give user appropriate ACLs so that he has read/write permissions - on his homedir. - * cache User.roles and Role.users collections + * make new module 'cosmo' + * use maven + * unify ROOT and console webapps into a webui subproject + * move webdav webapp into a webdav subproject + * change all packages from org.osaf.chandler.server to org.osaf.cosmo -ROOT webapp: +core: - * final look and feel + * in credentials provider, fill out username and password + * switch to using JCR for homedirs + * rename HomeDAO to ContentStoreDAO + * plan for ticket credentials -console webapp: +webui: - * final look and feel + * make sure only users in the root role can access admin pages -share webapp (Slide): +webdav: - * homedir directory index must not show link to parent for non-root - users - * replace server signature in directory index + * write tests for all components + * add ticket-based authentication security: + * figure out how to make acegi security require authentication + * implement authz with acegi security + install/configure: + * rename * Windows startup script * validation of install procedure by other people docs: + * rewrite all existing docs * FAQ.txt * LICENSE.txt * BUILDING.txt @@ -40,25 +49,17 @@ 0.2 RELEASE === -core: - -ROOT webapp: +webui: * "forgot username?" function that finds username by email address and mails it to the user * "forgot password?" function that generates new password and mails it to the user - -console webapp: - + * user account mgmt screen - change email, password * batch remove on user list * page,sort,search user list -self webapp: - - * account mgmt screen - change email, password - -share webapp (Slide): +webdav: * maintain sharing status for each resource - last accessed date for each user, maybe also last modified date ___________ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (morgen) Fix for bug 2728 (Send button broken), r=bkirsch, capps
Commit by: morgen
Modified files:
chandler/application/Application.py 1.309.2.1 1.309.2.2
Log message:
Fix for bug 2728 (Send button broken), r=bkirsch,capps
Bugzilla links:
http://bugzilla.osafoundation.org/show_bug.cgi?id=2728
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/application/Application.py.diff?r1=text&tr1=1.309.2.1&r2=text&tr2=1.309.2.2
Index: chandler/application/Application.py
diff -u chandler/application/Application.py:1.309.2.1
chandler/application/Application.py:1.309.2.2
--- chandler/application/Application.py:1.309.2.1 Fri Mar 18 11:30:01 2005
+++ chandler/application/Application.py Fri Mar 18 16:53:01 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.309.2.1 $"
-__date__ = "$Date: 2005/03/18 19:30:01 $"
+__version__ = "$Revision: 1.309.2.2 $"
+__date__ = "$Date: 2005/03/19 00:53:01 $"
__copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -462,11 +462,25 @@
if event.GetEventType() == wx.wxEVT_COMMAND_TOOL_CLICKED:
appBar = Block.findBlockByName("ApplicationBar")
+
+# @@@MOR:
+# Only change the focus if we're clicking one of the 'view
selector'
+# buttons (one of the first 4) since stealing focus from the DV
+# breaks the Send button. This hack on a hack should get removed
+# when wx 2.5.4 is integrated.
+numToCheck = 4
+
for child in appBar.childrenBlocks:
+
+if numToCheck == 0:
+break
+
if hasattr(child, "widget") and child.widget.GetId() == wxID:
Block.findBlockByName("Sidebar").widget.SetFocus()
break
+numToCheck -= 1
+
if wxID >= Block.MINIMUM_WX_ID and wxID <= Block.MAXIMUM_WX_ID:
block = Block.widgetIDToBlock (wxID)
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (morgen) Fix for 2728 (Send button broken)
Commit by: morgen
Modified files:
chandler/application/Application.py 1.312 1.313
Log message:
Fix for 2728 (Send button broken)
Bugzilla links:
http://bugzilla.osafoundation.org/show_bug.cgi?id=2728
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/application/Application.py.diff?r1=text&tr1=1.312&r2=text&tr2=1.313
Index: chandler/application/Application.py
diff -u chandler/application/Application.py:1.312
chandler/application/Application.py:1.313
--- chandler/application/Application.py:1.312 Fri Mar 18 14:16:15 2005
+++ chandler/application/Application.py Fri Mar 18 17:01:55 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.312 $"
-__date__ = "$Date: 2005/03/18 22:16:15 $"
+__version__ = "$Revision: 1.313 $"
+__date__ = "$Date: 2005/03/19 01:01:55 $"
__copyright__ = "Copyright (c) 2003-2005 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -463,11 +463,25 @@
if event.GetEventType() == wx.wxEVT_COMMAND_TOOL_CLICKED:
appBar = Block.findBlockByName("ApplicationBar")
+
+# @@@MOR:
+# Only change the focus if we're clicking one of the 'view
selector'
+# buttons (one of the first 4) since stealing focus from the DV
+# breaks the Send button. This hack on a hack should get removed
+# when wx 2.5.4 is integrated.
+numToCheck = 4
+
for child in appBar.childrenBlocks:
+
+if numToCheck == 0:
+break
+
if hasattr(child, "widget") and child.widget.GetId() == wxID:
Block.findBlockByName("Sidebar").widget.SetFocus()
break
+numToCheck -= 1
+
if wxID >= Block.MINIMUM_WX_ID and wxID <= Block.MAXIMUM_WX_ID:
block = Block.widgetIDToBlock (wxID)
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (alecf) fix bug 2655 - do drag-scrolling on a timer - reduces excess paints and makes the drag more responsive.
class because targets may need to recieve multiple different timers +""" +def __init__(self, callback, *args, **kwargs): +super(ClosureTimer, self).__init__(*args, **kwargs) +self._callback = callback + +def Notify(self): +self._callback() + class CalendarBlock(CollectionCanvas.CollectionBlock): """ Abstract block used as base Kind for Calendar related blocks. @@ -638,8 +653,19 @@ self.SetScrollRate(0, self._scrollYRate) self.Scroll(0, (40*7)/self._scrollYRate) -def ScaledScroll(self, scrollX, scrollY, buffer=0): -self.Scroll(scrollX, (scrollY / self._scrollYRate) + buffer) +def ScaledScroll(self, dx, dy): +(scrollX, scrollY) = self.CalcUnscrolledPosition(0,0) +scrollX += dx +scrollY += dy + +# rounding ensures we scroll at least one unit +if dy < 0: +rounding = -self._scrollYRate +else: +rounding = self._scrollYRate + +scaledY = (scrollY // self._scrollYRate) + rounding +self.Scroll(scrollX, scaledY) def _doDrawingCalculations(self): # @@@ magic numbers @@ -849,6 +875,15 @@ view.commit() return None +def OnBeginResizeItem(self): +self._lastUnscrolledPosition = self._dragStartUnscrolled +self.StartDragTimer() +pass + +def OnEndResizeItem(self): +self.StopDragTimer() +pass + def OnResizingItem(self, unscrolledPosition): newTime = self.getDateTimeFromPosition(unscrolledPosition) item = self._currentDragBox.getItem() @@ -857,16 +892,39 @@ # make sure we're changing by at least delta, and # staying on the same day (we don't support resizing across days yet) -if (resizeMode == "LOW" and +if (resizeMode == ColumnarCanvasItem.RESIZE_MODE_END and newTime > (item.startTime + delta) and item.startTime.day == newTime.day): item.endTime = newTime -elif (resizeMode == "TOP" and +elif (resizeMode == ColumnarCanvasItem.RESIZE_MODE_START and newTime < (item.endTime - delta) and item.endTime.day == newTime.day): item.startTime = newTime self.Refresh() +def OnDragTimer(self): +""" +This timer goes off while we're dragging/resizing +""" +scrolledPosition = self.CalcScrolledPosition(self._dragCurrentUnscrolled) +self.ScrollIntoView(scrolledPosition) + +def StartDragTimer(self): +self.scrollTimer = ClosureTimer(self.OnDragTimer) +self.scrollTimer.Start(100, wx.TIMER_CONTINUOUS) + +def StopDragTimer(self): +self.scrollTimer.Stop() +self.scrollTimer = None + +def OnBeginDragItem(self): +self.StartDragTimer() +pass + +def OnEndDragItem(self): +self.StopDragTimer() +pass + def OnDraggingItem(self, unscrolledPosition): # at the start of the drag, the mouse was somewhere inside the # dragbox, but not necessarily exactly at x,y @@ -884,6 +942,12 @@ item.ChangeStart(newTime) self.Refresh() +def GetResizeMode(self): +""" +Helper method for drags +""" +return self._originalDragBox.getResizeMode(self._dragStartUnscrolled) + def getDateTimeFromPosition(self, position): # bound the position by the available space that the user # can see/scroll to ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (vajda) upgraded to 0.9.8
Commit by: vajda Modified files: external/PyLucene/patches-0.9.8 None 1.1 external/PyLucene/Makefile 1.23 1.24 external/PyLucene/patches-0.9.6 1.1 None Log message: upgraded to 0.9.8 ViewCVS links: http://cvs.osafoundation.org/index.cgi/external/PyLucene/patches-0.9.8?rev=1.1&content-type=text/vnd.viewcvs-markup http://cvs.osafoundation.org/index.cgi/external/PyLucene/Makefile.diff?r1=text&tr1=1.23&r2=text&tr2=1.24 http://cvs.osafoundation.org/index.cgi/external/PyLucene/patches-0.9.6.diff?r1=text&tr1=1.1&r2=text&tr2=None Index: external/PyLucene/Makefile diff -u external/PyLucene/Makefile:1.23 external/PyLucene/Makefile:1.24 --- external/PyLucene/Makefile:1.23 Wed Jan 12 18:44:16 2005 +++ external/PyLucene/Makefile Fri Mar 18 18:26:35 2005 @@ -1,5 +1,5 @@ -VERSION=0.9.6 +VERSION=0.9.8 RELVER=$(VERSION)-1 PYLUCENE=$(BUILD_ROOT)/PyLucene SRC=$(PYLUCENE)/PyLucene-$(VERSION) _______ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (vajda) upgraded PyLucene to version 0.9.8
Commit by: vajda Modified files: chandler/Makefile 1.90 1.91 Log message: upgraded PyLucene to version 0.9.8 ViewCVS links: http://cvs.osafoundation.org/index.cgi/chandler/Makefile.diff?r1=text&tr1=1.90&r2=text&tr2=1.91 Index: chandler/Makefile diff -u chandler/Makefile:1.90 chandler/Makefile:1.91 --- chandler/Makefile:1.90 Fri Mar 18 13:41:41 2005 +++ chandler/Makefile Fri Mar 18 19:05:05 2005 @@ -27,7 +27,7 @@ ../libxml2-$(SNAP)-2.6.16-3.tar.gz \ ../m2crypto-$(SNAP)-0.12-9.tar.gz \ ../pychecker-$(SNAP)-0.8.13-2.tar.gz \ - ../pylucene-$(SNAP)-0.9.6-1.tar.gz \ + ../pylucene-$(SNAP)-0.9.8-1.tar.gz \ ../python-$(SNAP)-2.4-2.tar.gz \ ../soappy-$(SNAP)-0.10.2-2.tar.gz \ ../twisted-$(SNAP)-r11303-4.tar.gz \ ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (davids) colheader - checkpoint for bitmap support
mnHeaderItem::ConvertJustification( longsourceEnum, boolbToNative ) Index: internal/wxPython-2.5/wxPython/demo/ColumnHeader.py diff -u internal/wxPython-2.5/wxPython/demo/ColumnHeader.py:1.5 internal/wxPython-2.5/wxPython/demo/ColumnHeader.py:1.6 --- internal/wxPython-2.5/wxPython/demo/ColumnHeader.py:1.5 Thu Mar 17 10:32:02 2005 +++ internal/wxPython-2.5/wxPython/demo/ColumnHeader.py Sun Mar 20 12:19:01 2005 @@ -1,6 +1,10 @@ - -import wx -import wx.colheader +# +# ColumnHeader.py +# + +import wx +import wx.colheader +import images #-- @@ -44,23 +48,38 @@ btn = wx.Button( self, -1, "Delete", (110, 190) ) self.Bind( wx.EVT_BUTTON, self.OnTestDeleteButton, btn ) +btn = wx.Button( self, -1, "Add Bitmap Item", (210, 190) ) +self.Bind( wx.EVT_BUTTON, self.OnAddBitmapItemButton, btn ) + def OnColumnHeaderClick( self, event ): ch = event.GetEventObject() self.l0.SetLabel( "clicked (%d) - selected (%ld)" %(event.GetId(), ch.GetSelectedItemIndex()) ) # self.log.write( "Click! (%ld)\n" % event.GetEventType()) def OnTestResizeButton(self, event): +curWidth = self.ch1.GetTotalUIExtent() if (self.stepSize == 1): self.stepDir = (-1) else: if (self.stepSize == (-1)): self.stepDir = 1 self.stepSize = self.stepSize + self.stepDir -self.ch1.DoSetSize( 20, 40, 351 + 40 * self.stepSize, 20, 0 ) +self.ch1.DoSetSize( 20, 40, curWidth + 40 * self.stepSize, 20, 0 ) def OnTestDeleteButton(self, event): -self.ch1.DeleteItem( 1 ) -self.l0.SetLabel( "deleted item (%d) from (%d)" %(1, 1001) ) +ch = self.ch1 +ch.DeleteItem( 1 ) +self.l0.SetLabel( "deleted item (%d) from (%d)" %(1, ch.GetId()) ) + +def OnAddBitmapItemButton(self, event): +ch = self.ch2 +itemCount = ch.GetItemCount() + 1 +ch.AppendItem( "", wx.colheader.COLUMNHEADER_JUST_Center, 40, 0, 0, 1 ) +testBmp = images.getTest2Bitmap() +ch.SetImageRef( itemCount, testBmp ) +ch.SetSelectedItemIndex( itemCount - 1 ) +ch.ResizeToFit() +self.l0.SetLabel( "added bitmap item (%d) to (%d)" %(itemCount, ch.GetId()) ) #-- Index: internal/wxPython-2.5/wxPython/src/colheader.i diff -u internal/wxPython-2.5/wxPython/src/colheader.i:1.4 internal/wxPython-2.5/wxPython/src/colheader.i:1.5 --- internal/wxPython-2.5/wxPython/src/colheader.i:1.4 Mon Mar 7 11:12:53 2005 +++ internal/wxPython-2.5/wxPython/src/colheader.i Sun Mar 20 12:19:01 2005 @@ -97,6 +97,9 @@ virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags ); virtual wxSize DoGetBestSize( void ) const; +void ResizeToFit( void ); +long GetTotalUIExtent( void ); + void SetUnicodeFlag( boolbSetFlag ); long GetSelectedItemIndex( void ); @@ -114,6 +117,12 @@ boolbSortAscending = false ); void DeleteItem( longitemIndex ); +void GetImageRef( +longitemIndex, +wxBitmap&imageRef ); +void SetImageRef( +longitemIndex, +wxBitmap&imageRef ); wxString GetLabelText( longitemIndex ); void SetLabelText( ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (davids) colheader - fixed a GTK compilation problem in my last checkin (d'oh!)
Commit by: davids
Modified files:
internal/wxPython-2.5/src/generic/colheader.cpp 1.19 1.20
Log message:
colheader - fixed a GTK compilation problem in my last checkin (d'oh!)
r=TBD
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/src/generic/colheader.cpp.diff?r1=text&tr1=1.19&r2=text&tr2=1.20
Index: internal/wxPython-2.5/src/generic/colheader.cpp
diff -u internal/wxPython-2.5/src/generic/colheader.cpp:1.19
internal/wxPython-2.5/src/generic/colheader.cpp:1.20
--- internal/wxPython-2.5/src/generic/colheader.cpp:1.19Sun Mar 20
12:19:00 2005
+++ internal/wxPython-2.5/src/generic/colheader.cpp Sun Mar 20 14:27:31 2005
@@ -1733,7 +1733,7 @@
{
wxRect iconBoundsR;
- GetBitmapBounds( &iconBoundsR );
+ GetBitmapBounds( boundsR, m_TextJust, &iconBoundsR );
dc->DrawBitmap( imageRef, iconBoundsR.x, iconBoundsR.y, false );
}
_______
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (davids) colheader - fixed another compilation failure
Commit by: davids Modified files: internal/wxPython-2.5/src/generic/colheader.cpp 1.20 1.21 Log message: colheader - fixed another compilation failure r=TBD ViewCVS links: http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/src/generic/colheader.cpp.diff?r1=text&tr1=1.20&r2=text&tr2=1.21 Index: internal/wxPython-2.5/src/generic/colheader.cpp diff -u internal/wxPython-2.5/src/generic/colheader.cpp:1.20 internal/wxPython-2.5/src/generic/colheader.cpp:1.21 --- internal/wxPython-2.5/src/generic/colheader.cpp:1.20Sun Mar 20 14:27:31 2005 +++ internal/wxPython-2.5/src/generic/colheader.cpp Sun Mar 20 21:04:20 2005 @@ -1734,7 +1734,7 @@ wxRect iconBoundsR; GetBitmapBounds( boundsR, m_TextJust, &iconBoundsR ); - dc->DrawBitmap( imageRef, iconBoundsR.x, iconBoundsR.y, false ); + dc->DrawBitmap( m_ImageRef, iconBoundsR.x, iconBoundsR.y, false ); } return 0; _______ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (davids) colheader - typing difficulties...
Commit by: davids Modified files: internal/wxPython-2.5/src/generic/colheader.cpp 1.21 1.22 Log message: colheader - typing difficulties... r=TBD ViewCVS links: http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/src/generic/colheader.cpp.diff?r1=text&tr1=1.21&r2=text&tr2=1.22 Index: internal/wxPython-2.5/src/generic/colheader.cpp diff -u internal/wxPython-2.5/src/generic/colheader.cpp:1.21 internal/wxPython-2.5/src/generic/colheader.cpp:1.22 --- internal/wxPython-2.5/src/generic/colheader.cpp:1.21Sun Mar 20 21:04:20 2005 +++ internal/wxPython-2.5/src/generic/colheader.cpp Sun Mar 20 21:12:07 2005 @@ -1734,7 +1734,7 @@ wxRect iconBoundsR; GetBitmapBounds( boundsR, m_TextJust, &iconBoundsR ); - dc->DrawBitmap( m_ImageRef, iconBoundsR.x, iconBoundsR.y, false ); + dc->DrawBitmap( *m_ImageRef, iconBoundsR.x, iconBoundsR.y, false ); } return 0; _______ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (pje) Spike: notes on event granularity and latency, w/wrapping in atomic actions
nce a given object could change multiple +times during an action, and batch observers (like the UI) really only want to +know the final score, not everything that happened during the game. + +Queries, however, may force another event type to be introduced, or alter the +model in some other ways. It can be expensive to always update a query's +internal state to reflect an up-to-the-moment view of the data the query was +run against. Yet, if an action wants to use a query, it should always see the +data in an up-to-date state. + +So, a possible way to deal with this is by having a queriable event log as part +of the "action" mechanism. Then, when a query is used, it can simply check for +changes that affect it, and then generate a normal change event to reflect the +effects on the query. In a way, you could say that this allows a query to +"peek ahead" at the events it would ordinarily not see until the batch +completed. + +In effect, this calls for queries to poll for changes rather than push them +to observers, which will complicate the event model since all event sources +will now need a way to support being polled. + +On the other hand, supporting undo/redo and rollback of nested actions +effectively requires that capability anyway. That is, to know what the state +was at a particular time, and determine the difference between that state and +the current one. + + + + + ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) add commons-logging.jar to webdav webapp to get commons-logging working
Commit by: bcm Modified files: server/webapps/webdav/build.xml 1.5 1.6 Log message: add commons-logging.jar to webdav webapp to get commons-logging working ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/build.xml.diff?r1=text&tr1=1.5&r2=text&tr2=1.6 Index: server/webapps/webdav/build.xml diff -u server/webapps/webdav/build.xml:1.5 server/webapps/webdav/build.xml:1.6 --- server/webapps/webdav/build.xml:1.5 Fri Mar 18 15:56:22 2005 +++ server/webapps/webdav/build.xml Mon Mar 21 10:26:56 2005 @@ -68,6 +68,7 @@ + ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) move log4j.xml out of webdav webapp classpath and explicitly load log4j with
Commit by: bcm Modified files: server/webapps/webdav/build.xml 1.6 1.7 server/webapps/webdav/etc/log4j.xml 1.3 1.4 server/webapps/webdav/web/WEB-INF/.cvsignore 1.2 1.3 server/webapps/webdav/web/WEB-INF/web.xml 1.5 1.6 Log message: move log4j.xml out of webdav webapp classpath and explicitly load log4j with spring's Log4jConfigListener, which allows us to place the application log in tomcat's log directory. ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/build.xml.diff?r1=text&tr1=1.6&r2=text&tr2=1.7 http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/etc/log4j.xml.diff?r1=text&tr1=1.3&r2=text&tr2=1.4 http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/web/WEB-INF/.cvsignore.diff?r1=text&tr1=1.2&r2=text&tr2=1.3 http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/web/WEB-INF/web.xml.diff?r1=text&tr1=1.5&r2=text&tr2=1.6 Index: server/webapps/webdav/etc/log4j.xml diff -u server/webapps/webdav/etc/log4j.xml:1.3 server/webapps/webdav/etc/log4j.xml:1.4 --- server/webapps/webdav/etc/log4j.xml:1.3 Fri Mar 18 15:56:22 2005 +++ server/webapps/webdav/etc/log4j.xml Mon Mar 21 10:33:38 2005 @@ -3,7 +3,10 @@ http://jakarta.apache.org/log4j/";> + + @@ -13,6 +16,10 @@ + + + + Index: server/webapps/webdav/build.xml diff -u server/webapps/webdav/build.xml:1.6 server/webapps/webdav/build.xml:1.7 --- server/webapps/webdav/build.xml:1.6 Mon Mar 21 10:26:56 2005 +++ server/webapps/webdav/build.xml Mon Mar 21 10:33:37 2005 @@ -57,6 +57,7 @@ + - - - Index: server/webapps/webdav/web/WEB-INF/.cvsignore diff -u server/webapps/webdav/web/WEB-INF/.cvsignore:1.2 server/webapps/webdav/web/WEB-INF/.cvsignore:1.3 --- server/webapps/webdav/web/WEB-INF/.cvsignore:1.2Fri Mar 18 15:56:23 2005 +++ server/webapps/webdav/web/WEB-INF/.cvsignoreMon Mar 21 10:33:38 2005 @@ -1,3 +1,4 @@ classes lib applicationContext*.xml +log4j.xml Index: server/webapps/webdav/web/WEB-INF/web.xml diff -u server/webapps/webdav/web/WEB-INF/web.xml:1.5 server/webapps/webdav/web/WEB-INF/web.xml:1.6 --- server/webapps/webdav/web/WEB-INF/web.xml:1.5 Fri Mar 18 15:56:23 2005 +++ server/webapps/webdav/web/WEB-INF/web.xml Mon Mar 21 10:33:38 2005 @@ -6,7 +6,7 @@ Cosmo WebDAV Server log4jConfigLocation -/WEB-INF/classes/log4j.xml +/WEB-INF/log4j.xml contextConfigLocation @@ -17,13 +17,11 @@ /WEB-INF/applicationContext-webdav.xml - org.springframework.web.context.ContextLoaderListener _______ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) CosmoJCRCredentialsProvider fills out username and password in the
word * switch to using JCR for homedirs * rename HomeDAO to ContentStoreDAO * plan for ticket credentials ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (stearns) Fix 2698 (Fast typing in 'title' field can cause out-of-sequence characters), r=Morgen
Commit by: stearns
Modified files:
chandler/parcels/osaf/framework/blocks/detail/Detail.py 1.105.2.1 1.105.2.2
Log message:
Fix 2698 (Fast typing in 'title' field can cause out-of-sequence characters),
r=Morgen
- don't write back to the item on every keystroke.
Bugzilla links:
http://bugzilla.osafoundation.org/show_bug.cgi?id=2698
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/detail/Detail.py.diff?r1=text&tr1=1.105.2.1&r2=text&tr2=1.105.2.2
Index: chandler/parcels/osaf/framework/blocks/detail/Detail.py
diff -u chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.105.2.1
chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.105.2.2
--- chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.105.2.1 Fri Mar
18 12:38:01 2005
+++ chandler/parcels/osaf/framework/blocks/detail/Detail.py Mon Mar 21
11:30:07 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.105.2.1 $"
-__date__ = "$Date: 2005/03/18 20:38:01 $"
+__version__ = "$Revision: 1.105.2.2 $"
+__date__ = "$Date: 2005/03/21 19:30:07 $"
__copyright__ = "Copyright (c) 2004-2005 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -688,7 +688,7 @@
def onKeyPressed (self, event):
# called when we get an event; to saves away the data and skips the
event
-self.saveTextValue(validate = event.m_keyCode == wx.WXK_RETURN)
+self.saveTextValue(validate = event.m_keyCode == wx.WXK_RETURN and
self.lineStyleEnum != "MultiLine")
event.Skip()
def OnDataChanged (self):
@@ -718,15 +718,16 @@
return knowsBody
def saveAttributeFromWidget (self, item, widget, validate):
-attributeName = GetRedirectAttribute(item, 'body');
-textType = item.getAttributeAspect(attributeName, 'type')
-widgetText = widget.GetValue()
-if widgetText:
-#XXX: Ensures that any non-ascii text entered in to the detail view
-# is properly encoded to ascii. This is a short term fix
-# and will not address issues related to internationalization
-text = unicode(widgetText, 'utf-8', 'ignore').encode('ascii',
'ignore')
-item.body = textType.makeValue(text, encoding='ascii',
indexed=True)
+if validate:
+attributeName = GetRedirectAttribute(item, 'body');
+textType = item.getAttributeAspect(attributeName, 'type')
+widgetText = widget.GetValue()
+if widgetText:
+#XXX: Ensures that any non-ascii text entered in to the detail
view
+# is properly encoded to ascii. This is a short term fix
+# and will not address issues related to
internationalization
+text = unicode(widgetText, 'utf-8', 'ignore').encode('ascii',
'ignore')
+item.body = textType.makeValue(text, encoding='ascii',
indexed=True)
def loadAttributeIntoWidget (self, item, widget):
attributeName = GetRedirectAttribute(item, 'body');
@@ -890,7 +891,8 @@
Our parent block knows which attribute we edit.
"""
def saveAttributeFromWidget(self, item, widget, validate):
-item.setAttributeValue(self.whichAttribute(), widget.GetValue())
+if validate:
+item.setAttributeValue(self.whichAttribute(), widget.GetValue())
def loadAttributeIntoWidget(self, item, widget):
try:
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (stearns) Fix 2698 (Fast typing in 'title' field can cause out-of-sequence characters), r=Morgen
Commit by: stearns
Modified files:
chandler/parcels/osaf/framework/blocks/detail/Detail.py 1.106 1.107
Log message:
Fix 2698 (Fast typing in 'title' field can cause out-of-sequence characters),
r=Morgen
- don't write back to the item on every keystroke.
Bugzilla links:
http://bugzilla.osafoundation.org/show_bug.cgi?id=2698
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/detail/Detail.py.diff?r1=text&tr1=1.106&r2=text&tr2=1.107
Index: chandler/parcels/osaf/framework/blocks/detail/Detail.py
diff -u chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.106
chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.107
--- chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.106 Fri Mar
18 12:40:48 2005
+++ chandler/parcels/osaf/framework/blocks/detail/Detail.py Mon Mar 21
11:32:14 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.106 $"
-__date__ = "$Date: 2005/03/18 20:40:48 $"
+__version__ = "$Revision: 1.107 $"
+__date__ = "$Date: 2005/03/21 19:32:14 $"
__copyright__ = "Copyright (c) 2004-2005 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -688,7 +688,7 @@
def onKeyPressed (self, event):
# called when we get an event; to saves away the data and skips the
event
-self.saveTextValue(validate = event.m_keyCode == wx.WXK_RETURN)
+self.saveTextValue(validate = event.m_keyCode == wx.WXK_RETURN and
self.lineStyleEnum != "MultiLine")
event.Skip()
def OnDataChanged (self):
@@ -718,15 +718,16 @@
return knowsBody
def saveAttributeFromWidget (self, item, widget, validate):
-attributeName = GetRedirectAttribute(item, 'body');
-textType = item.getAttributeAspect(attributeName, 'type')
-widgetText = widget.GetValue()
-if widgetText:
-#XXX: Ensures that any non-ascii text entered in to the detail view
-# is properly encoded to ascii. This is a short term fix
-# and will not address issues related to internationalization
-text = unicode(widgetText, 'utf-8', 'ignore').encode('ascii',
'ignore')
-item.body = textType.makeValue(text, encoding='ascii',
indexed=True)
+if validate:
+attributeName = GetRedirectAttribute(item, 'body');
+textType = item.getAttributeAspect(attributeName, 'type')
+widgetText = widget.GetValue()
+if widgetText:
+#XXX: Ensures that any non-ascii text entered in to the detail
view
+# is properly encoded to ascii. This is a short term fix
+# and will not address issues related to
internationalization
+text = unicode(widgetText, 'utf-8', 'ignore').encode('ascii',
'ignore')
+item.body = textType.makeValue(text, encoding='ascii',
indexed=True)
def loadAttributeIntoWidget (self, item, widget):
attributeName = GetRedirectAttribute(item, 'body');
@@ -890,7 +891,8 @@
Our parent block knows which attribute we edit.
"""
def saveAttributeFromWidget(self, item, widget, validate):
-item.setAttributeValue(self.whichAttribute(), widget.GetValue())
+if validate:
+item.setAttributeValue(self.whichAttribute(), widget.GetValue())
def loadAttributeIntoWidget(self, item, widget):
try:
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (morgen) Changes for bug 2678 (New welcome note and About dialog)
Commit by: morgen Modified files: chandler/application/welcome.html 1.29 1.29.2.1 chandler/parcels/osaf/views/main/parcel.xml 1.194 1.194.2.1 Log message: Changes for bug 2678 (New welcome note and About dialog) Bugzilla links: http://bugzilla.osafoundation.org/show_bug.cgi?id=2678 ViewCVS links: http://cvs.osafoundation.org/index.cgi/chandler/application/welcome.html.diff?r1=text&tr1=1.29&r2=text&tr2=1.29.2.1 http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/main/parcel.xml.diff?r1=text&tr1=1.194&r2=text&tr2=1.194.2.1 Index: chandler/parcels/osaf/views/main/parcel.xml diff -u chandler/parcels/osaf/views/main/parcel.xml:1.194 chandler/parcels/osaf/views/main/parcel.xml:1.194.2.1 --- chandler/parcels/osaf/views/main/parcel.xml:1.194 Thu Mar 17 14:48:45 2005 +++ chandler/parcels/osaf/views/main/parcel.xml Mon Mar 21 13:03:16 2005 @@ -1,7 +1,7 @@ - - + + @@ -1533,8 +1533,8 @@ Content items --> - - http://wiki.osafoundation.org/bin/view/Chandler/ZeroPointFourGuidedTour To find out more about this release, please visit http://wiki.osafoundation.org/bin/view/Chandler/ChandlerZeroPointFourReadme This release is not intended for day-to-day use. Please do not trust your data with this version. Thank you for downloading Chandler, The Chandler Team" /> + + http://wiki.osafoundation.org/bin/view/Chandler/ZeroPointFiveGuidedTour ; For more details on this release, please visit! : http://wiki.osafoundation.org/bin/view/Chandler/ChandlerZeroPointFiveReadme. ; Please note, this release is still intended to be experimental, do not trust your real data with this version. An experimental file import/export feature is available to backup your calendar data. Thank you for trying Chandler. Your feedback is welcome on our mail lists: http://wiki.osafoundation.org/bin/view/Chandler/OsafMailingLists ; The Chandler Team" /> Index: chandler/application/welcome.html diff -u chandler/application/welcome.html:1.29 chandler/application/welcome.html:1.29.2.1 --- chandler/application/welcome.html:1.29 Wed Oct 27 11:15:48 2004 +++ chandler/application/welcome.html Mon Mar 21 13:03:15 2005 @@ -6,19 +6,19 @@ -About Chandler +About Chandler -This is the 0.4 release of Chandler, the Personal Information Management software developed by the http://www.osafoundation.org";>Open Source Applications Foundation. +This is the 0.5 release of Chandler, the Personal Information Management software developed by the http://www.osafoundation.org";>Open Source Applications Foundation. -http://wiki.osafoundation.org/bin/view/Chandler/WhatIsZeroPointFour";>What's New -http://wiki.osafoundation.org/bin/view/Chandler/ZeroPointFourPreferences";>Setting Preferences -http://www.osafoundation.org/0.4/GuidedTour.htm";>Guided Tour -http://wiki.osafoundation.org/bin/view/Chandler/ZeroPointFourKnownMajorBugs";>Known Major Bugs +http://wiki.osafoundation.org/bin/view/Chandler/WhatIsZeroPointFive";>What's New +http://wiki.osafoundation.org/bin/view/Chandler/WhatIsZeroPointFive#Setting_Preferences";>Setting Preferences +http://www.osafoundation.org/0.5/GuidedTour.htm";>Guided Tour (PDF format) +http://wiki.osafoundation.org/bin/view/Chandler/ZeroPointFiveKnownMajorBugs";>Known Major Bugs http://wiki.osafoundation.org/bin/view/Chandler/ReportingBugs";>How to report a bug -http://osafoundation.org/Chandler_0.1-0.4_license_terms.htm";>Licensing terms -http://wiki.osafoundation.org/bin/view/Chandler/ChandlerZeroPointFourReadme#How_to_get_involved";>Getting involved -http://wiki.osafoundation.org/bin/view/Chandler/ChandlerZeroPointFourReadme#Further_information";>Where to go for help +http://osafoundation.org/Chandler_0.1-0.5_license_terms.htm";>Licensing terms +http://wiki.osafoundation.org/bin/view/Chandler/ChandlerZeroPointFiveReadme#How_to_get_involved";>Getting involved +http://wiki.osafoundation.org/bin/view/Chandler/ChandlerZeroPointFiveReadme#Further_information";>Where to go for help http://wiki.osafoundation.org/bin/view/Chandler/ChandlerContributors";>Credits ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (morgen) New welcome note and About dialog
Commit by: morgen Modified files: chandler/application/welcome.html 1.29 1.30 chandler/parcels/osaf/views/main/parcel.xml 1.194 1.195 Log message: New welcome note and About dialog ViewCVS links: http://cvs.osafoundation.org/index.cgi/chandler/application/welcome.html.diff?r1=text&tr1=1.29&r2=text&tr2=1.30 http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/main/parcel.xml.diff?r1=text&tr1=1.194&r2=text&tr2=1.195 Index: chandler/application/welcome.html diff -u chandler/application/welcome.html:1.29 chandler/application/welcome.html:1.30 --- chandler/application/welcome.html:1.29 Wed Oct 27 11:15:48 2004 +++ chandler/application/welcome.html Mon Mar 21 13:08:05 2005 @@ -6,19 +6,19 @@ -About Chandler +About Chandler -This is the 0.4 release of Chandler, the Personal Information Management software developed by the http://www.osafoundation.org";>Open Source Applications Foundation. +This is the 0.5 release of Chandler, the Personal Information Management software developed by the http://www.osafoundation.org";>Open Source Applications Foundation. -http://wiki.osafoundation.org/bin/view/Chandler/WhatIsZeroPointFour";>What's New -http://wiki.osafoundation.org/bin/view/Chandler/ZeroPointFourPreferences";>Setting Preferences -http://www.osafoundation.org/0.4/GuidedTour.htm";>Guided Tour -http://wiki.osafoundation.org/bin/view/Chandler/ZeroPointFourKnownMajorBugs";>Known Major Bugs +http://wiki.osafoundation.org/bin/view/Chandler/WhatIsZeroPointFive";>What's New +http://wiki.osafoundation.org/bin/view/Chandler/WhatIsZeroPointFive#Setting_Preferences";>Setting Preferences +http://www.osafoundation.org/0.5/GuidedTour.htm";>Guided Tour (PDF format) +http://wiki.osafoundation.org/bin/view/Chandler/ZeroPointFiveKnownMajorBugs";>Known Major Bugs http://wiki.osafoundation.org/bin/view/Chandler/ReportingBugs";>How to report a bug -http://osafoundation.org/Chandler_0.1-0.4_license_terms.htm";>Licensing terms -http://wiki.osafoundation.org/bin/view/Chandler/ChandlerZeroPointFourReadme#How_to_get_involved";>Getting involved -http://wiki.osafoundation.org/bin/view/Chandler/ChandlerZeroPointFourReadme#Further_information";>Where to go for help +http://osafoundation.org/Chandler_0.1-0.5_license_terms.htm";>Licensing terms +http://wiki.osafoundation.org/bin/view/Chandler/ChandlerZeroPointFiveReadme#How_to_get_involved";>Getting involved +http://wiki.osafoundation.org/bin/view/Chandler/ChandlerZeroPointFiveReadme#Further_information";>Where to go for help http://wiki.osafoundation.org/bin/view/Chandler/ChandlerContributors";>Credits Index: chandler/parcels/osaf/views/main/parcel.xml diff -u chandler/parcels/osaf/views/main/parcel.xml:1.194 chandler/parcels/osaf/views/main/parcel.xml:1.195 --- chandler/parcels/osaf/views/main/parcel.xml:1.194 Thu Mar 17 14:48:45 2005 +++ chandler/parcels/osaf/views/main/parcel.xml Mon Mar 21 13:08:05 2005 @@ -1,7 +1,7 @@ - - + + @@ -1533,8 +1533,8 @@ Content items --> - - http://wiki.osafoundation.org/bin/view/Chandler/ZeroPointFourGuidedTour To find out more about this release, please visit http://wiki.osafoundation.org/bin/view/Chandler/ChandlerZeroPointFourReadme This release is not intended for day-to-day use. Please do not trust your data with this version. Thank you for downloading Chandler, The Chandler Team" /> + + http://wiki.osafoundation.org/bin/view/Chandler/ZeroPointFiveGuidedTour ; For more details on this release, please visit! : http://wiki.osafoundation.org/bin/view/Chandler/ChandlerZeroPointFiveReadme. ; Please note, this release is still intended to be experimental, do not trust your real data with this version. An experimental file import/export feature is available to backup your calendar data. Thank you for trying Chandler. Your feedback is welcome on our mail lists: http://wiki.osafoundation.org/bin/view/Chandler/OsafMailingLists ; The Chandler Team" /> ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) implement role-based authz in the core and in the webdav adapter. this has the
/osaf/cosmo/security/CosmoUser.java:1.2
--- server/core/src/org/osaf/cosmo/security/CosmoUser.java:1.1 Thu Mar 17
19:26:16 2005
+++ server/core/src/org/osaf/cosmo/security/CosmoUser.java Mon Mar 21
13:15:03 2005
@@ -1,22 +1,50 @@
package org.osaf.cosmo.security;
+import org.osaf.chandler.server.model.Role;
import org.osaf.chandler.server.model.User;
+import java.util.ArrayList;
+import java.util.Iterator;
+
import net.sf.acegisecurity.GrantedAuthority;
+import net.sf.acegisecurity.GrantedAuthorityImpl;
/**
- * A class that decorates the Cosmo core @{link User} to provide an
- * implementation of @{link CosmoUserDetails} suitable for use by Acegi
- * Security's @{link AuthenticationProvider}.
+ * A class that decorates the Cosmo core [EMAIL PROTECTED] User} to provide an
+ * implementation of [EMAIL PROTECTED] CosmoUserDetails} suitable for use by
Acegi
+ * Security's [EMAIL PROTECTED] AuthenticationProvider}.
*/
public class CosmoUser implements CosmoUserDetails {
+/**
+ * The prefix to add to the name of the (uppercased) Cosmo role
+ * name to generate an Acegi Security GrantedAuthority (eg "root"
+ * becomes "ROLE_ROOT"). The GrantedAuthority is used by
+ * AcegiSecurity's
+ * [EMAIL PROTECTED] net.sf.acegisecurity.vote.RoleVoter} to
+ * decide whether or not the user is granted access to a
+ * resource by virtue of role membership.
+ * @see net.sf.acegisecurity.vote.RoleVoter
+ */
+public static final String ROLE_PREFIX = "ROLE_";
+
private User user;
+private GrantedAuthority[] authorities;
/**
* @param user the wrapped @{link User}
*/
public CosmoUser(User user) {
this.user = user;
+
+// set granted authorities
+ArrayList tmp = new ArrayList();
+for (Iterator i=getUser().getRoles().iterator(); i.hasNext();) {
+Role role = (Role) i.next();
+String authority = ROLE_PREFIX + role.getName().toUpperCase();
+tmp.add(new GrantedAuthorityImpl(authority));
+}
+this.authorities = (GrantedAuthority[])
+tmp.toArray(new GrantedAuthority[0]);
}
/**
@@ -41,8 +69,6 @@
* @returns the authorities (never null)
*/
public GrantedAuthority[] getAuthorities() {
-// XXX get permissions out of database
-GrantedAuthority[] authorities = new GrantedAuthority[0];
return authorities;
}
Index: server/docs/TODO.txt
diff -u server/docs/TODO.txt:1.19 server/docs/TODO.txt:1.20
--- server/docs/TODO.txt:1.19 Mon Mar 21 10:56:48 2005
+++ server/docs/TODO.txtMon Mar 21 13:15:04 2005
@@ -12,7 +12,7 @@
core:
- * switch to using JCR for homedirs
+ * switch to using JCR for homedirs (incl. tests)
* rename HomeDAO to ContentStoreDAO
* plan for ticket credentials
@@ -22,14 +22,13 @@
webdav:
+ * figure out why cadaver to the webdav app returns "Did not find a
+ collection resource".
* write tests for all components
* add ticket-based authentication
security:
- * figure out how to make acegi security require authentication
- * implement authz with acegi security
-
install/configure:
* rename
Index: server/webapps/webdav/web/WEB-INF/web.xml
diff -u server/webapps/webdav/web/WEB-INF/web.xml:1.6
server/webapps/webdav/web/WEB-INF/web.xml:1.7
--- server/webapps/webdav/web/WEB-INF/web.xml:1.6 Mon Mar 21 10:33:38 2005
+++ server/webapps/webdav/web/WEB-INF/web.xml Mon Mar 21 13:15:05 2005
@@ -14,7 +14,8 @@
/WEB-INF/applicationContext-base.xml
/WEB-INF/applicationContext-hibernate.xml
/WEB-INF/applicationContext-security.xml
- /WEB-INF/applicationContext-webdav.xml
+ /WEB-INF/applicationContext-webdav-adapter.xml
+ /WEB-INF/applicationContext-webdav-security.xml
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (vajda) Directory /usr/local/cvsrep/internal/chandlerdb/chandlerdb/persistence added to the repository
Commit by: vajda Modified files: internal/chandlerdb/chandlerdb/persistence Log message: Directory /usr/local/cvsrep/internal/chandlerdb/chandlerdb/persistence added to the repository ViewCVS links: http://cvs.osafoundation.org/index.cgi/internal/chandlerdb/chandlerdb/persistence? ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (stearns) Fix 2684 (AE's crash chandler), r=Morgen
Commit by: stearns
Modified files:
chandler/parcels/osaf/framework/attributeEditors/AttributeEditors.py 1.27 1.28
Log message:
Fix 2684 (AE's crash chandler), r=Morgen
- Temporary hack until wx 2.5.4 is done: override wx.TextCtrl.Destroy to not
call super() if we're already destroyed.
Bugzilla links:
http://bugzilla.osafoundation.org/show_bug.cgi?id=2684
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/attributeEditors/AttributeEditors.py.diff?r1=text&tr1=1.27&r2=text&tr2=1.28
Index: chandler/parcels/osaf/framework/attributeEditors/AttributeEditors.py
diff -u
chandler/parcels/osaf/framework/attributeEditors/AttributeEditors.py:1.27
chandler/parcels/osaf/framework/attributeEditors/AttributeEditors.py:1.28
--- chandler/parcels/osaf/framework/attributeEditors/AttributeEditors.py:1.27
Thu Mar 17 00:23:48 2005
+++ chandler/parcels/osaf/framework/attributeEditors/AttributeEditors.py
Mon Mar 21 14:14:27 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.27 $"
-__date__ = "$Date: 2005/03/17 08:23:48 $"
+__version__ = "$Revision: 1.28 $"
+__date__ = "$Date: 2005/03/21 22:14:27 $"
__copyright__ = "Copyright (c) 2003-2005 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -289,6 +289,13 @@
value = attrType.makeValue (valueString)
setattr (item, attributeName, value)
+class myTextCtrl(wx.TextCtrl):
+def Destroy(self):
+# @@@ Hack until we switch to wx 2.5.4: don't destroy if we're already
destroyed
+# (in which case we're a PyDeadObject)
+if isinstance(self, wx.TextCtrl):
+super(myTextCtrl, self).Destroy()
+
class LabeledAttributeEditor (StringAttributeEditor):
""" Attribute Editor that shows a Label for the attribute in addition to
the value. """
def __init__(self, isShared, presentationStyle=None):
@@ -450,7 +457,7 @@
controlPosition = (self.editOffset, -1)
# create the edit control
-control = wx.TextCtrl (parent, id, '', controlPosition)
+control = myTextCtrl (parent, id, '', controlPosition)
# get size hints based on the parent
control.SetSizeHints(minW=controlSize[0], minH=controlSize[1])
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (stearns) Fix 2684 (AE's crash chandler), r=Morgen
Commit by: stearns
Modified files:
chandler/parcels/osaf/framework/attributeEditors/AttributeEditors.py 1.27
1.27.2.1
Log message:
Fix 2684 (AE's crash chandler), r=Morgen
- Temporary hack until wx 2.5.4 is done: override wx.TextCtrl.Destroy to not
call super() if we're already destroyed.
Bugzilla links:
http://bugzilla.osafoundation.org/show_bug.cgi?id=2684
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/attributeEditors/AttributeEditors.py.diff?r1=text&tr1=1.27&r2=text&tr2=1.27.2.1
Index: chandler/parcels/osaf/framework/attributeEditors/AttributeEditors.py
diff -u
chandler/parcels/osaf/framework/attributeEditors/AttributeEditors.py:1.27
chandler/parcels/osaf/framework/attributeEditors/AttributeEditors.py:1.27.2.1
--- chandler/parcels/osaf/framework/attributeEditors/AttributeEditors.py:1.27
Thu Mar 17 00:23:48 2005
+++ chandler/parcels/osaf/framework/attributeEditors/AttributeEditors.py
Mon Mar 21 14:16:03 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.27 $"
-__date__ = "$Date: 2005/03/17 08:23:48 $"
+__version__ = "$Revision: 1.27.2.1 $"
+__date__ = "$Date: 2005/03/21 22:16:03 $"
__copyright__ = "Copyright (c) 2003-2005 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -289,6 +289,13 @@
value = attrType.makeValue (valueString)
setattr (item, attributeName, value)
+class myTextCtrl(wx.TextCtrl):
+def Destroy(self):
+# @@@ Hack until we switch to wx 2.5.4: don't destroy if we're already
destroyed
+# (in which case we're a PyDeadObject)
+if isinstance(self, wx.TextCtrl):
+super(myTextCtrl, self).Destroy()
+
class LabeledAttributeEditor (StringAttributeEditor):
""" Attribute Editor that shows a Label for the attribute in addition to
the value. """
def __init__(self, isShared, presentationStyle=None):
@@ -450,7 +457,7 @@
controlPosition = (self.editOffset, -1)
# create the edit control
-control = wx.TextCtrl (parent, id, '', controlPosition)
+control = myTextCtrl (parent, id, '', controlPosition)
# get size hints based on the parent
control.SetSizeHints(minW=controlSize[0], minH=controlSize[1])
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (davids) colheader - first working version of bitmap support
20
+
l1 = wx.StaticText( self, -1, "wx.ColumnHeader (1001)", (20, 20),
(200, 20) )
-ch1 = wx.colheader.ColumnHeader( self, 1001, (20, 40), (350, 20), 0 )
+ch1 = wx.colheader.ColumnHeader( self, 1001, (20, 40), (350,
colHeight), 0 )
ch1.AppendItem("Sun", wx.colheader.COLUMNHEADER_JUST_Center, 50, 1, 0,
1)
ch1.AppendItem("Mon", wx.colheader.COLUMNHEADER_JUST_Center, 50, 0, 0,
1)
ch1.AppendItem("Tue", wx.colheader.COLUMNHEADER_JUST_Center, 50, 0, 0,
1)
@@ -23,21 +26,21 @@
ch1.AppendItem("Thu", wx.colheader.COLUMNHEADER_JUST_Center, 50, 0, 0,
1)
ch1.AppendItem("Fri", wx.colheader.COLUMNHEADER_JUST_Center, 50, 0, 0,
1)
ch1.AppendItem("Sat", wx.colheader.COLUMNHEADER_JUST_Center, 50, 0, 0,
1)
+self.ch1 = ch1
self.Bind( wx.colheader.EVT_COLUMNHEADER_SELCHANGED,
self.OnColumnHeaderClick, ch1 )
#ch1.SetToolTipString( "Column header (1)" )
-self.ch1 = ch1
l2 = wx.StaticText( self, -1, "wx.ColumnHeader (1002)", (80, 70),
(200, 20) )
-ch2 = wx.colheader.ColumnHeader( self, 1002, (80, 90), (270, 20), 0 )
+ch2 = wx.colheader.ColumnHeader( self, 1002, (80, 90), (270,
colHeight), 0 )
ch2.AppendItem( "Juan", wx.colheader.COLUMNHEADER_JUST_Left, 90, 1, 1,
1 )
ch2.AppendItem( "ValdÂŽz", wx.colheader.COLUMNHEADER_JUST_Center, 90,
0, 1, 1 )
ch2.AppendItem( "coffee guy", wx.colheader.COLUMNHEADER_JUST_Right,
90, 0, 1, 1 )
+self.ch2 = ch2
self.Bind( wx.colheader.EVT_COLUMNHEADER_SELCHANGED,
self.OnColumnHeaderClick, ch2 )
#ch2.SetToolTipString("Column header (2)")
-self.ch2 = ch2
-l0 = wx.StaticText( self, -1, "(click result)", (10, 150), (150, 20) )
+l0 = wx.StaticText( self, -1, "[result]", (10, 150), (150, 20) )
self.l0 = l0
btn = wx.Button( self, -1, "Resize", (10, 190) )
@@ -45,16 +48,16 @@
self.stepSize = 0
self.stepDir = -1
-btn = wx.Button( self, -1, "Delete", (110, 190) )
-self.Bind( wx.EVT_BUTTON, self.OnTestDeleteButton, btn )
-
-btn = wx.Button( self, -1, "Add Bitmap Item", (210, 190) )
+btn = wx.Button( self, -1, "Add Bitmap Item", (110, 190) )
self.Bind( wx.EVT_BUTTON, self.OnAddBitmapItemButton, btn )
+btn = wx.Button( self, -1, "Delete Selected Item", (275, 190) )
+self.Bind( wx.EVT_BUTTON, self.OnTestDeleteButton, btn )
+
def OnColumnHeaderClick( self, event ):
ch = event.GetEventObject()
self.l0.SetLabel( "clicked (%d) - selected (%ld)" %(event.GetId(),
ch.GetSelectedItemIndex()) )
-# self.log.write( "Click! (%ld)\n" % event.GetEventType())
+# self.log.write( "Click! (%ld)\n" % event.GetEventType() )
def OnTestResizeButton(self, event):
curWidth = self.ch1.GetTotalUIExtent()
@@ -66,21 +69,25 @@
self.stepSize = self.stepSize + self.stepDir
self.ch1.DoSetSize( 20, 40, curWidth + 40 * self.stepSize, 20, 0 )
-def OnTestDeleteButton(self, event):
-ch = self.ch1
-ch.DeleteItem( 1 )
-self.l0.SetLabel( "deleted item (%d) from (%d)" %(1, ch.GetId()) )
-
def OnAddBitmapItemButton(self, event):
ch = self.ch2
-itemCount = ch.GetItemCount() + 1
+itemCount = ch.GetItemCount()
ch.AppendItem( "", wx.colheader.COLUMNHEADER_JUST_Center, 40, 0, 0, 1 )
testBmp = images.getTest2Bitmap()
ch.SetImageRef( itemCount, testBmp )
-ch.SetSelectedItemIndex( itemCount - 1 )
+ch.SetSelectedItemIndex( itemCount )
ch.ResizeToFit()
self.l0.SetLabel( "added bitmap item (%d) to (%d)" %(itemCount,
ch.GetId()) )
+def OnTestDeleteButton(self, event):
+ch = self.ch1
+itemIndex = ch.GetSelectedItemIndex()
+if (itemIndex >= 0):
+ch.DeleteItem( itemIndex )
+self.l0.SetLabel( "deleted item (%d) from (%d)" %(itemIndex,
ch.GetId()) )
+else:
+self.l0.SetLabel( "header (%d): no item selected" %(ch.GetId()) )
+
#--
def runTest(frame, nb, log):
Index: internal/wxPython-2.5/wxPython/src/colheader.i
diff -u internal/wxPython-2.5/wxPython/src/colheader.i:1.5
internal/wxPython-2.5/wxPython/src/colheader.i:1.6
--- internal/wxPython-2.5/wxPython/src/colheader.i:1.5 Sun Mar 20 12:19:01 2005
+++ internal/wxPython-2.5/wxPython/src/colheader.i Mon Mar 21 14:37:36 2005
@@ -97,6 +97,7 @@
virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags
);
virtual wxSize DoGetBestSize( void ) const;
+wxSize CalculateDefaultSize( void ) const;
void ResizeToFit( void );
long GetTotalUIExtent( void );
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (davids) colheader - added partial support for Win32 bitmaps
Commit by: davids
Modified files:
internal/wxPython-2.5/src/generic/colheader.cpp 1.23 1.24
Log message:
colheader - added partial support for Win32 bitmaps
r=TBD
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/src/generic/colheader.cpp.diff?r1=text&tr1=1.23&r2=text&tr2=1.24
Index: internal/wxPython-2.5/src/generic/colheader.cpp
diff -u internal/wxPython-2.5/src/generic/colheader.cpp:1.23
internal/wxPython-2.5/src/generic/colheader.cpp:1.24
--- internal/wxPython-2.5/src/generic/colheader.cpp:1.23Mon Mar 21
14:37:35 2005
+++ internal/wxPython-2.5/src/generic/colheader.cpp Mon Mar 21 17:01:23 2005
@@ -1208,6 +1208,7 @@
itemData.mask = HDI_FORMAT | HDI_WIDTH;
resultV = (long)Header_GetItem( targetViewRef, itemIndex, &itemData );
+ // add string reference
itemData.mask = HDI_TEXT | HDI_FORMAT | HDI_WIDTH;
itemData.pszText = (LPSTR)(itemRef->m_LabelTextRef.c_str());
itemData.cxy = (int)(itemRef->m_ExtentX);
@@ -1215,6 +1216,16 @@
// itemData.cchTextMax = sizeof(itemData.pszText) /
sizeof(itemData.pszText[0]);
itemData.fmt = wxColumnHeaderItem::ConvertJustification(
itemRef->m_TextJust, TRUE ) | HDF_STRING;
+ // add bitmap reference as needed
+ if ((itemRef->m_ImageRef != NULL) && itemRef->m_ImageRef->Ok())
+ {
+ itemData.mask |= HDI_BITMAP;
+ itemData.fmt |= HDF_BITMAP;
+ itemData.fmt &= ~HDF_STRING;
+ itemData.hbm = (HBITMAP)(itemRef->m_ImageRef->GetHBITMAP());
+ }
+
+ // add sort arrows as needed
itemData.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
if (itemRef->m_BSelected && itemRef->m_BEnabled &&
itemRef->m_BSortEnabled)
itemData.fmt |= (itemRef->m_BSortAscending ? HDF_SORTUP :
HDF_SORTDOWN);
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) add acegi security jar so we don't have to build it from source
Commit by: bcm Modified files: server/ext/acegi-security-0.8.0.jar None 1.1 Log message: add acegi security jar so we don't have to build it from source ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/ext/acegi-security-0.8.0.jar?rev=1.1&content-type=text/vnd.viewcvs-markup _______ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) add jsp-api.jar so we don't need to have a working installation of tomcat to
Commit by: bcm Modified files: server/ext/jsp-api.jar None 1.1 Log message: add jsp-api.jar so we don't need to have a working installation of tomcat to build ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/ext/jsp-api.jar?rev=1.1&content-type=text/vnd.viewcvs-markup _______ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) update locations of acegi security and jsp-api jars
Commit by: bcm
Modified files:
server/shared.properties 1.8 1.9
Log message:
update locations of acegi security and jsp-api jars
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/shared.properties.diff?r1=text&tr1=1.8&r2=text&tr2=1.9
Index: server/shared.properties
diff -u server/shared.properties:1.8 server/shared.properties:1.9
--- server/shared.properties:1.8Thu Mar 17 19:28:17 2005
+++ server/shared.propertiesMon Mar 21 22:08:31 2005
@@ -25,7 +25,6 @@
# filesystem locations
#
-catalina.home=${env.CATALINA_HOME}
xdoclet.home=${env.XDOCLET_HOME}
chsrv.ext=${chsrv.home}/ext
@@ -60,7 +59,7 @@
maven.repository=${user.home}/.maven/repository
-acegi-security.jar=${maven.repository}/acegisecurity/jars/acegi-security-0.8.1-SNAPSHOT.jar
+acegi-security.jar=${chsrv.ext}/acegi-security-0.8.0.jar
antlr.jar=${chsrv.ext}/antlr.jar
aopalliance.jar=${chsrv.ext}/aopalliance.jar
cglib.jar=${chsrv.ext}/cglib-full-2.0.2.jar
@@ -85,7 +84,7 @@
jcr-webdav.jar=${maven.repository}/jcr-server/jars/jcr-webdav-0.16.2.jar
jdom.jar=${chsrv.ext}/jdom.jar
joda-time.jar=${chsrv.ext}/joda-time-0.98.jar
-jspapi.jar=${catalina.home}/common/lib/jsp-api.jar
+jspapi.jar=${chsrv.ext}/jsp-api.jar
jstl.jar=${chsrv.ext}/jstl.jar
jta.jar=${chsrv.ext}/jta.jar
log4j.jar=${chsrv.ext}/log4j-1.2.8.jar
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) use jackrabbit's JAAS LoginModule
Commit by: bcm
Modified files:
server/etc/jaas.config 1.4 1.5
Log message:
use jackrabbit's JAAS LoginModule
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/etc/jaas.config.diff?r1=text&tr1=1.4&r2=text&tr2=1.5
Index: server/etc/jaas.config
diff -u server/etc/jaas.config:1.4 server/etc/jaas.config:1.5
--- server/etc/jaas.config:1.4 Thu Mar 17 19:28:17 2005
+++ server/etc/jaas.config Mon Mar 21 22:08:49 2005
@@ -1,3 +1,3 @@
Jackrabbit {
-org.osaf.cosmo.webdav.security.CosmoLoginModule required debug=false;
+org.apache.jackrabbit.core.security.SimpleLoginModule required debug=false;
};
_______
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) add servlet-api jar directly to compilation classpath so we don't have to
Commit by: bcm Modified files: server/webapps/ROOT/build.xml 1.3 1.4 server/webapps/console/build.xml 1.7 1.8 Log message: add servlet-api jar directly to compilation classpath so we don't have to refer to a working installation of tomcat ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/webapps/ROOT/build.xml.diff?r1=text&tr1=1.3&r2=text&tr2=1.4 http://cvs.osafoundation.org/index.cgi/server/webapps/console/build.xml.diff?r1=text&tr1=1.7&r2=text&tr2=1.8 Index: server/webapps/ROOT/build.xml diff -u server/webapps/ROOT/build.xml:1.3 server/webapps/ROOT/build.xml:1.4 --- server/webapps/ROOT/build.xml:1.3 Tue Mar 1 12:42:57 2005 +++ server/webapps/ROOT/build.xml Mon Mar 21 22:09:25 2005 @@ -16,8 +16,8 @@ - + Index: server/webapps/console/build.xml diff -u server/webapps/console/build.xml:1.7 server/webapps/console/build.xml:1.8 --- server/webapps/console/build.xml:1.7Fri Mar 18 15:52:54 2005 +++ server/webapps/console/build.xmlMon Mar 21 22:09:25 2005 @@ -17,9 +17,9 @@ - + ___________ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) upgrade Acegi Security to 0.8.1
Commit by: bcm
Modified files:
server/shared.properties 1.9 1.10
server/core/src/org/osaf/cosmo/security/CosmoUser.java 1.2 1.3
server/ext/acegi-security-0.8.1.jar None 1.1
server/ext/acegi-security-0.8.0.jar 1.1 None
Log message:
upgrade Acegi Security to 0.8.1
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/shared.properties.diff?r1=text&tr1=1.9&r2=text&tr2=1.10
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/security/CosmoUser.java.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/server/ext/acegi-security-0.8.1.jar?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/ext/acegi-security-0.8.0.jar.diff?r1=text&tr1=1.1&r2=text&tr2=None
Index: server/core/src/org/osaf/cosmo/security/CosmoUser.java
diff -u server/core/src/org/osaf/cosmo/security/CosmoUser.java:1.2
server/core/src/org/osaf/cosmo/security/CosmoUser.java:1.3
--- server/core/src/org/osaf/cosmo/security/CosmoUser.java:1.2 Mon Mar 21
13:15:03 2005
+++ server/core/src/org/osaf/cosmo/security/CosmoUser.java Tue Mar 22
08:02:06 2005
@@ -63,6 +63,20 @@
}
/**
+ * Indicates whether the user is locked or unloacked. A locked
+ * user can not be authenticated.
+ *
+ * Note: since user locking has not been implemented in
+ * Cosmo, this method always returns true.
+ *
+ * @returns true if the user is not locked,
+ * false otherwise
+ */
+public boolean isAccountNonLocked() {
+return true;
+}
+
+/**
* Returns the authorities granted to the user. Cannot return
* null.
*
Index: server/shared.properties
diff -u server/shared.properties:1.9 server/shared.properties:1.10
--- server/shared.properties:1.9Mon Mar 21 22:08:31 2005
+++ server/shared.propertiesTue Mar 22 08:02:06 2005
@@ -59,7 +59,7 @@
maven.repository=${user.home}/.maven/repository
-acegi-security.jar=${chsrv.ext}/acegi-security-0.8.0.jar
+acegi-security.jar=${chsrv.ext}/acegi-security-0.8.1.jar
antlr.jar=${chsrv.ext}/antlr.jar
aopalliance.jar=${chsrv.ext}/aopalliance.jar
cglib.jar=${chsrv.ext}/cglib-full-2.0.2.jar
___________
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) tyop
Commit by: bcm Modified files: server/core/src/org/osaf/cosmo/security/CosmoUser.java 1.3 1.4 Log message: tyop ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/security/CosmoUser.java.diff?r1=text&tr1=1.3&r2=text&tr2=1.4 Index: server/core/src/org/osaf/cosmo/security/CosmoUser.java diff -u server/core/src/org/osaf/cosmo/security/CosmoUser.java:1.3 server/core/src/org/osaf/cosmo/security/CosmoUser.java:1.4 --- server/core/src/org/osaf/cosmo/security/CosmoUser.java:1.3 Tue Mar 22 08:02:06 2005 +++ server/core/src/org/osaf/cosmo/security/CosmoUser.java Tue Mar 22 08:03:19 2005 @@ -63,7 +63,7 @@ } /** - * Indicates whether the user is locked or unloacked. A locked + * Indicates whether the user is locked or unlocked. A locked * user can not be authenticated. * * Note: since user locking has not been implemented in ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) integrate role-based authz with Acegi Security (Basic authen for now, to be
Commit by: bcm Modified files: server/webapps/console/build.xml 1.8 1.9 server/webapps/console/etc/action-servlet.xml None 1.1 server/webapps/console/etc/applicationContext-webui-security.xml None 1.1 server/webapps/console/etc/log4j.xml 1.1.1.1 1.2 server/webapps/console/etc/web.xml 1.6 None server/webapps/console/web/WEB-INF/web.xml None 1.1 server/webapps/console/web/WEB-INF/.cvsignore 1.1.1.1 1.2 server/webapps/console/web/WEB-INF/action-servlet.xml 1.1.1.1 None Log message: integrate role-based authz with Acegi Security (Basic authen for now, to be replaced with form-based login) into console webapp. configure log4j with the Spring context listener so we can place the application logfile (cosmo-webui.log) in the tomcat logs directory. move config files around in the source tree to reduce the amount of packing we need to do for the webapp. ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/webapps/console/build.xml.diff?r1=text&tr1=1.8&r2=text&tr2=1.9 http://cvs.osafoundation.org/index.cgi/server/webapps/console/etc/action-servlet.xml?rev=1.1&content-type=text/vnd.viewcvs-markup http://cvs.osafoundation.org/index.cgi/server/webapps/console/etc/applicationContext-webui-security.xml?rev=1.1&content-type=text/vnd.viewcvs-markup http://cvs.osafoundation.org/index.cgi/server/webapps/console/etc/log4j.xml.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=1.2 http://cvs.osafoundation.org/index.cgi/server/webapps/console/etc/web.xml.diff?r1=text&tr1=1.6&r2=text&tr2=None http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/web.xml?rev=1.1&content-type=text/vnd.viewcvs-markup http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/.cvsignore.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=1.2 http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/action-servlet.xml.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None Index: server/webapps/console/etc/log4j.xml diff -u server/webapps/console/etc/log4j.xml:1.1.1.1 server/webapps/console/etc/log4j.xml:1.2 --- server/webapps/console/etc/log4j.xml:1.1.1.1Wed Feb 16 13:08:37 2005 +++ server/webapps/console/etc/log4j.xmlTue Mar 22 10:13:36 2005 @@ -3,7 +3,7 @@ http://jakarta.apache.org/log4j/";> - + @@ -13,6 +13,10 @@ + + + + Index: server/webapps/console/build.xml diff -u server/webapps/console/build.xml:1.8 server/webapps/console/build.xml:1.9 --- server/webapps/console/build.xml:1.8Mon Mar 21 22:09:25 2005 +++ server/webapps/console/build.xmlTue Mar 22 10:13:36 2005 @@ -78,8 +78,8 @@ + - @@ -96,7 +96,8 @@ - + + @@ -104,18 +105,9 @@ - - - - - - - - - Index: server/webapps/console/web/WEB-INF/.cvsignore diff -u server/webapps/console/web/WEB-INF/.cvsignore:1.1.1.1 server/webapps/console/web/WEB-INF/.cvsignore:1.2 --- server/webapps/console/web/WEB-INF/.cvsignore:1.1.1.1 Wed Feb 16 13:08:37 2005 +++ server/webapps/console/web/WEB-INF/.cvsignore Tue Mar 22 10:13:36 2005 @@ -1,4 +1,4 @@ lib classes -applicationContext.xml -web.xml +action-servlet.xml +log4j.xml ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) change the Spring webapp root key so the webdav application log doesn't
Commit by: bcm Modified files: server/webapps/webdav/etc/log4j.xml 1.4 1.5 server/webapps/webdav/web/WEB-INF/web.xml 1.7 1.8 Log message: change the Spring webapp root key so the webdav application log doesn't collide with the webui application log ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/etc/log4j.xml.diff?r1=text&tr1=1.4&r2=text&tr2=1.5 http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/web/WEB-INF/web.xml.diff?r1=text&tr1=1.7&r2=text&tr2=1.8 Index: server/webapps/webdav/web/WEB-INF/web.xml diff -u server/webapps/webdav/web/WEB-INF/web.xml:1.7 server/webapps/webdav/web/WEB-INF/web.xml:1.8 --- server/webapps/webdav/web/WEB-INF/web.xml:1.7 Mon Mar 21 13:15:05 2005 +++ server/webapps/webdav/web/WEB-INF/web.xml Tue Mar 22 10:14:39 2005 @@ -5,6 +5,10 @@ Cosmo WebDAV Server +webAppRootKey +webdav.root + + log4jConfigLocation /WEB-INF/log4j.xml Index: server/webapps/webdav/etc/log4j.xml diff -u server/webapps/webdav/etc/log4j.xml:1.4 server/webapps/webdav/etc/log4j.xml:1.5 --- server/webapps/webdav/etc/log4j.xml:1.4 Mon Mar 21 10:33:38 2005 +++ server/webapps/webdav/etc/log4j.xml Tue Mar 22 10:14:39 2005 @@ -3,10 +3,7 @@ http://jakarta.apache.org/log4j/";> - - + ___________ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) use form-based authentication for the console app rather than basic
Commit by: bcm Modified files: server/docs/TODO.txt 1.20 1.21 server/webapps/console/etc/applicationContext-webui-security.xml 1.1 1.2 server/webapps/console/web/login.jsp None 1.1 Log message: use form-based authentication for the console app rather than basic authentication. require secure transport for all requests to the console webapp. insecure requests are redirected to secure connections. ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/docs/TODO.txt.diff?r1=text&tr1=1.20&r2=text&tr2=1.21 http://cvs.osafoundation.org/index.cgi/server/webapps/console/etc/applicationContext-webui-security.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2 http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/login.jsp?rev=1.1&content-type=text/vnd.viewcvs-markup Index: server/docs/TODO.txt diff -u server/docs/TODO.txt:1.20 server/docs/TODO.txt:1.21 --- server/docs/TODO.txt:1.20 Mon Mar 21 13:15:04 2005 +++ server/docs/TODO.txtTue Mar 22 11:29:52 2005 @@ -18,12 +18,15 @@ webui: - * make sure only users in the root role can access admin pages + * use a session attribute rather than a request parameter to denote a + failed login attempt (requires extending the authentication + filter). webdav: * figure out why cadaver to the webdav app returns "Did not find a collection resource". + * force all requests to come over secure connections? * write tests for all components * add ticket-based authentication Index: server/webapps/console/etc/applicationContext-webui-security.xml diff -u server/webapps/console/etc/applicationContext-webui-security.xml:1.1 server/webapps/console/etc/applicationContext-webui-security.xml:1.2 --- server/webapps/console/etc/applicationContext-webui-security.xml:1.1 Tue Mar 22 10:13:36 2005 +++ server/webapps/console/etc/applicationContext-webui-security.xmlTue Mar 22 11:29:53 2005 @@ -9,13 +9,59 @@ + + + + + +CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON +PATTERN_TYPE_APACHE_ANT + /**=channelProcessingFilter,httpSessionContextIntegrationFilter,authenticationProcessingFilter,securityEnforcementFilter + + + + + + + + + + + + + + + + + + + + + + + CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON +PATTERN_TYPE_APACHE_ANT + /**=REQUIRES_SECURE_CHANNEL + + + + + + - - net.sf.acegisecurity.context.security.SecureContextImpl - + + net.sf.acegisecurity.context.security.SecureContextImpl + + + CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON PATTERN_TYPE_APACHE_ANT - /**=ROLE_ROOT + /index.jsp=ROLE_ROOT + /user/**=ROLE_ROOT + + - - Cosmo WebUI + class="net.sf.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint"> + + /login.jsp + + + true + + + + + +/login.jsp?login_failed=1 + + +/ + + + + + @@ -64,24 +131,4 @@ - - - - - - - - - - - -CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON -PATTERN_TYPE_APACHE_ANT - /**=httpSessionContextIntegrationFilter,basicProcessingFilter,securityEnforcementFilter - - - - _______ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (davids) colheader - code cleanup, minor bug fixes
,
+void wxColumnHeaderItem::SetBitmapRef(
+ wxBitmap&bitmapRef,
const wxRect*boundsR )
{
wxRect targetBoundsR;
- delete m_ImageRef;
- m_ImageRef = new wxBitmap( imageRef );
+ // NB: could rewrite to make NULL wxBitmap for no bitmap
+ delete m_BitmapRef;
+ m_BitmapRef = new wxBitmap( bitmapRef );
- if ((boundsR != NULL) && (m_ImageRef != NULL) && m_ImageRef->Ok())
+ if ((boundsR != NULL) && HasValidBitmapRef( m_BitmapRef ))
{
- GetBitmapBounds( boundsR, m_TextJust, &targetBoundsR );
+ GetBitmapItemBounds( boundsR, m_TextJust, &targetBoundsR );
- m_ImageRef->SetWidth( targetBoundsR.width );
- m_ImageRef->SetHeight( targetBoundsR.height );
+ m_BitmapRef->SetWidth( targetBoundsR.width );
+ m_BitmapRef->SetHeight( targetBoundsR.height );
}
else
{
- // wxLogDebug( _T("wxColumnHeaderItem::SetImageRef failed") );
+ // wxLogDebug( _T("wxColumnHeaderItem::SetBitmapRef failed") );
}
}
@@ -1561,6 +1594,7 @@
RgnHandle savedClipRgn;
Rect qdBoundsR;
long nativeTextJust;
+bool bHasIcon;
OSStatus errStatus;
errStatus = noErr;
@@ -1570,6 +1604,9 @@
qdBoundsR.top = 0;
qdBoundsR.bottom = qdBoundsR.top + boundsR->height;
+ // determine bitmap rendering condition
+ bHasIcon = ((dc != NULL) && HasValidBitmapRef( m_BitmapRef ));
+
// clip down to the item bounds
savedClipRgn = NewRgn();
GetClip( savedClipRgn );
@@ -1613,7 +1650,7 @@
nativeTextJust = ConvertJustification( m_TextJust, TRUE );
- if (! m_LabelTextRef.IsEmpty())
+ if (! bHasIcon && ! m_LabelTextRef.IsEmpty())
{
CFStringRef cfLabelText;
TextEncodingtargetEncoding;
@@ -1634,12 +1671,12 @@
}
// render the bitmap, should one be present
- if ((dc != NULL) && (m_ImageRef != NULL) && m_ImageRef->Ok())
+ if (bHasIcon)
{
wxRect iconBoundsR;
- GetBitmapBounds( boundsR, m_TextJust, &iconBoundsR );
- dc->DrawBitmap( *m_ImageRef, iconBoundsR.x, iconBoundsR.y,
false );
+ GetBitmapItemBounds( boundsR, m_TextJust, &iconBoundsR );
+ dc->DrawBitmap( *m_BitmapRef, iconBoundsR.x, iconBoundsR.y,
false );
}
// restore the clip region
@@ -1649,9 +1686,14 @@
return (long)errStatus;
#else
+bool bHasIcon;
+
if ((parentW == NULL) || (dc == NULL))
return (-1L);
+ // determine bitmap rendering condition
+ bHasIcon = ((dc != NULL) && HasValidBitmapRef( m_BitmapRef ));
+
// draw column header background
{
wxRect localBoundsR;
@@ -1689,9 +1731,11 @@
}
// FIXME: need to clip long text items
- dc->DrawText( m_LabelTextRef, originX, localBoundsR.y + 1 );
+ if (! bHasIcon && ! m_LabelTextRef.IsEmpty())
+ dc->DrawText( m_LabelTextRef, originX, localBoundsR.y + 1 );
// draw sort direction arrows (if specified)
+ // NB: what if icon avail? mut. ex.?
if (m_BSelected && m_BSortEnabled)
{
#if defined(__WXGTK__)
@@ -1705,12 +1749,12 @@
}
// render the bitmap, should one be present
- if ((dc != NULL) && (m_ImageRef != NULL) && m_ImageRef->Ok())
+ if (bHasIcon)
{
wxRect iconBoundsR;
- GetBitmapBounds( boundsR, m_TextJust, &iconBoundsR );
- dc->DrawBitmap( *m_ImageRef, iconBoundsR.x, iconBoundsR.y,
false );
+ GetBitmapItemBounds( boundsR, m_TextJust, &iconBoundsR );
+ dc->DrawBitmap( *m_BitmapRef, iconBoundsR.x, iconBoundsR.y,
false );
}
return 0;
@@ -1746,7 +1790,7 @@
gdiBoundsR.top = boundsR->y;
gdiBoundsR.bottom = gdiBoundsR.top + boundsR->height;
- // now...frame it
+ // now...frame it (or something)
targetHDC = GetHdcOf( *dc );
//targetPen = CreatePen( PS_SOLID, 2, 0 );
@@ -1867,7 +1911,7 @@
#endif
// static
-void wxColumnHeaderItem::GetBitmapBounds(
+void wxColumnHeaderItem::GetBitmapItemBounds(
const wxRect*itemBoundsR,
longtargetJustification,
wxRect *targetBoundsR )
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (davids) colheader - fixed GTK compilation mistake
Commit by: davids
Modified files:
internal/wxPython-2.5/src/generic/colheader.cpp 1.25 1.26
Log message:
colheader - fixed GTK compilation mistake
r=TBD
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/src/generic/colheader.cpp.diff?r1=text&tr1=1.25&r2=text&tr2=1.26
Index: internal/wxPython-2.5/src/generic/colheader.cpp
diff -u internal/wxPython-2.5/src/generic/colheader.cpp:1.25
internal/wxPython-2.5/src/generic/colheader.cpp:1.26
--- internal/wxPython-2.5/src/generic/colheader.cpp:1.25Tue Mar 22
11:42:06 2005
+++ internal/wxPython-2.5/src/generic/colheader.cpp Tue Mar 22 11:48:03 2005
@@ -1673,10 +1673,10 @@
// render the bitmap, should one be present
if (bHasIcon)
{
- wxRect iconBoundsR;
+ wxRect subItemBoundsR;
- GetBitmapItemBounds( boundsR, m_TextJust, &iconBoundsR );
- dc->DrawBitmap( *m_BitmapRef, iconBoundsR.x, iconBoundsR.y,
false );
+ GetBitmapItemBounds( boundsR, m_TextJust, &subItemBoundsR );
+ dc->DrawBitmap( *m_BitmapRef, subItemBoundsR.x,
subItemBoundsR.y, false );
}
// restore the clip region
@@ -1686,6 +1686,9 @@
return (long)errStatus;
#else
+wxRect localBoundsR, subItemBoundsR;
+wxPointlabelTextSize;
+long originX, insetX;
bool bHasIcon;
if ((parentW == NULL) || (dc == NULL))
@@ -1694,17 +1697,11 @@
// determine bitmap rendering condition
bHasIcon = ((dc != NULL) && HasValidBitmapRef( m_BitmapRef ));
- // draw column header background
- {
- wxRect localBoundsR;
- wxPoint labelTextSize;
- longoriginX, insetX;
-
- // leverage native (GTK) wxRenderer
- localBoundsR = *boundsR;
- localBoundsR.y = 0;
- wxRendererNative::Get().DrawHeaderButton( parentW, *dc,
localBoundsR );
- }
+ // draw column header background:
+ // leverage native (GTK) wxRenderer
+ localBoundsR = *boundsR;
+ localBoundsR.y = 0;
+ wxRendererNative::Get().DrawHeaderButton( parentW, *dc, localBoundsR );
// draw text label, with justification
insetX = 4;
@@ -1739,10 +1736,8 @@
if (m_BSelected && m_BSortEnabled)
{
#if defined(__WXGTK__)
- wxRect arrowBoundsR;
-
- GTKGetSortArrowBounds( &localBoundsR, &arrowBoundsR );
- GTKDrawSortArrow( dc, &arrowBoundsR, m_BSortAscending );
+ GTKGetSortArrowBounds( &localBoundsR, &subItemBoundsR );
+ GTKDrawSortArrow( dc, &subItemBoundsR, m_BSortAscending );
#else
// FIXME: what about non-(Mac,MSW,GTK) platforms?
#endif
@@ -1751,10 +1746,8 @@
// render the bitmap, should one be present
if (bHasIcon)
{
- wxRect iconBoundsR;
-
- GetBitmapItemBounds( boundsR, m_TextJust, &iconBoundsR );
- dc->DrawBitmap( *m_BitmapRef, iconBoundsR.x, iconBoundsR.y,
false );
+ GetBitmapItemBounds( boundsR, m_TextJust, &subItemBoundsR );
+ dc->DrawBitmap( *m_BitmapRef, subItemBoundsR.x,
subItemBoundsR.y, false );
}
return 0;
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (davids) colheader - fixed MSW clunker
Commit by: davids
Modified files:
internal/wxPython-2.5/src/generic/colheader.cpp 1.26 1.27
Log message:
colheader - fixed MSW clunker
r=TBD
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/src/generic/colheader.cpp.diff?r1=text&tr1=1.26&r2=text&tr2=1.27
Index: internal/wxPython-2.5/src/generic/colheader.cpp
diff -u internal/wxPython-2.5/src/generic/colheader.cpp:1.26
internal/wxPython-2.5/src/generic/colheader.cpp:1.27
--- internal/wxPython-2.5/src/generic/colheader.cpp:1.26Tue Mar 22
11:48:03 2005
+++ internal/wxPython-2.5/src/generic/colheader.cpp Tue Mar 22 12:00:38 2005
@@ -1233,7 +1233,7 @@
// - need m_BitmapJustification + mgmt. to fully implement nonMutEx
behavior
// FIXME: scaling a la wxBytmap::SetWidth/Height doesn't apply !!!
// FIXME: protect against HBMP leaks?
- if (HasValidBitmapRef( itemRef )))
+ if (itemRef->HasValidBitmapRef( itemRef->m_BitmapRef ))
{
itemData.fmt &= ~HDF_STRING;
itemData.fmt |= HDF_BITMAP;
_______
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) Directory /usr/local/cvsrep/server/core/src/org/osaf/chandler/server/dao/jcr added to the repository
Commit by: bcm Modified files: server/core/src/org/osaf/chandler/server/dao/jcr Log message: Directory /usr/local/cvsrep/server/core/src/org/osaf/chandler/server/dao/jcr added to the repository ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/dao/jcr? ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) Directory /usr/local/cvsrep/server/core/src/org/osaf/spring/jcr added to the repository
Commit by: bcm Modified files: server/core/src/org/osaf/spring/jcr Log message: Directory /usr/local/cvsrep/server/core/src/org/osaf/spring/jcr added to the repository ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/spring/jcr? ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) add stub classes for Spring/JCR integration and a stub JCR ShareDAO.
Commit by: bcm Modified files: server/core/etc/jcr-client.xml None 1.1 server/core/src/org/osaf/chandler/server/dao/jcr/ContentStoreDAOJCR.java None 1.1 server/core/src/org/osaf/spring/jcr/JCRCallback.java None 1.1 server/core/src/org/osaf/spring/jcr/JCRTemplate.java None 1.1 Log message: add stub classes for Spring/JCR integration and a stub JCR ShareDAO. ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/core/etc/jcr-client.xml?rev=1.1&content-type=text/vnd.viewcvs-markup http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/dao/jcr/ContentStoreDAOJCR.java?rev=1.1&content-type=text/vnd.viewcvs-markup http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/spring/jcr/JCRCallback.java?rev=1.1&content-type=text/vnd.viewcvs-markup http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/spring/jcr/JCRTemplate.java?rev=1.1&content-type=text/vnd.viewcvs-markup ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (davids) colheader - updated some comments
Commit by: davids
Modified files:
internal/wxPython-2.5/src/generic/colheader.cpp 1.27 1.28
Log message:
colheader - updated some comments
r=TBD
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/src/generic/colheader.cpp.diff?r1=text&tr1=1.27&r2=text&tr2=1.28
Index: internal/wxPython-2.5/src/generic/colheader.cpp
diff -u internal/wxPython-2.5/src/generic/colheader.cpp:1.27
internal/wxPython-2.5/src/generic/colheader.cpp:1.28
--- internal/wxPython-2.5/src/generic/colheader.cpp:1.27Tue Mar 22
12:00:38 2005
+++ internal/wxPython-2.5/src/generic/colheader.cpp Tue Mar 22 13:18:31 2005
@@ -1065,6 +1065,7 @@
#else
wxClientDC dc( this );
+ // NB: this case being used for both Mac and GTK
for (long i=0; iDrawItem( this, &dc, &boundsR
);
@@ -1230,11 +1231,11 @@
// add bitmap reference as needed
// NB: text and icon are mutually exclusive:
- // - need m_BitmapJustification + mgmt. to fully implement nonMutEx
behavior
- // FIXME: scaling a la wxBytmap::SetWidth/Height doesn't apply !!!
- // FIXME: protect against HBMP leaks?
+ // - need m_BitmapJustification + mgmt. to fully implement non-MutEx
behavior
if (itemRef->HasValidBitmapRef( itemRef->m_BitmapRef ))
{
+ // FIXME: scaling a la wxBitmap::SetWidth/Height doesn't apply
!!!
+ // FIXME: protect against HBMP leaks?
itemData.fmt &= ~HDF_STRING;
itemData.fmt |= HDF_BITMAP;
itemData.mask |= HDI_BITMAP;
@@ -1246,7 +1247,7 @@
}
// add sort arrows as needed
- // NB: should sort and bitmap be MutEx?
+ // NB: should sort arrows and bitmaps be MutEx?
itemData.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
if (itemRef->m_BSelected && itemRef->m_BEnabled &&
itemRef->m_BSortEnabled)
itemData.fmt |= (itemRef->m_BSortAscending ? HDF_SORTUP :
HDF_SORTDOWN);
@@ -1684,8 +1685,8 @@
DisposeRgn( savedClipRgn );
return (long)errStatus;
-#else
+#else
wxRect localBoundsR, subItemBoundsR;
wxPointlabelTextSize;
long originX, insetX;
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (john) * fixed #2701
Commit by: john Modified files: chandler/parcels/osaf/contentmodel/ItemCollection.py 1.40 1.40.2.1 chandler/repository/query/Query.py 1.38 1.38.2.1 Log message: * fixed #2701 Bugzilla links: http://bugzilla.osafoundation.org/show_bug.cgi?id=2701 ViewCVS links: http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/contentmodel/ItemCollection.py.diff?r1=text&tr1=1.40&r2=text&tr2=1.40.2.1 http://cvs.osafoundation.org/index.cgi/chandler/repository/query/Query.py.diff?r1=text&tr1=1.38&r2=text&tr2=1.38.2.1 Index: chandler/repository/query/Query.py diff -u chandler/repository/query/Query.py:1.38 chandler/repository/query/Query.py:1.38.2.1 --- chandler/repository/query/Query.py:1.38 Tue Mar 15 09:20:14 2005 +++ chandler/repository/query/Query.py Tue Mar 22 14:08:30 2005 @@ -1,6 +1,6 @@ -__revision__ = "$Revision: 1.38 $" -__date__ = "$Date: 2005/03/15 17:20:14 $" +__revision__ = "$Revision: 1.38.2.1 $" +__date__ = "$Date: 2005/03/22 22:08:30 $" __copyright__ = "Copyright (c) 2004, 2005 Open Source Applications Foundation" __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"; @@ -238,8 +238,14 @@ log.debug(u"RepoQuery.queryCallback: %s %s query result" % (uuid, [added, removed, changed_uuids] )) for callbackUUID in self._otherViewSubscribeCallbacks: item = view.find (callbackUUID) -method = getattr (type(item), self._otherViewSubscribeCallbacks [callbackUUID]) -method (item, (added,removed)) +""" + We allow subscriptions to items without callbacks. This used to keep the _resultSet up to date +when notifications aren't required -- DJA +""" +methodName = self._otherViewSubscribeCallbacks [callbackUUID] +if methodName: +method = getattr (type(item), methodName) +method (item, (added,removed)) log.debug(u"queryCallback: %s:%f" % (self.queryString, time.time()-start)) def __len__ (self): @@ -336,8 +342,14 @@ for callbackUUID in self._sameViewSubscribeCallbacks: i = self.itsView.find(callbackUUID) -method = getattr(type(i), self._sameViewSubscribeCallbacks[callbackUUID]) -method(i, action) +""" + We allow subscriptions to items without callbacks. This used to keep the _resultSet up to date +when notifications aren't required -- DJA +""" +methodName = self._sameViewSubscribeCallbacks[callbackUUID] +if methodName: +method = getattr(type(i), methodName) +method(i, action) class LogicalPlan(object): """ Index: chandler/parcels/osaf/contentmodel/ItemCollection.py diff -u chandler/parcels/osaf/contentmodel/ItemCollection.py:1.40 chandler/parcels/osaf/contentmodel/ItemCollection.py:1.40.2.1 --- chandler/parcels/osaf/contentmodel/ItemCollection.py:1.40 Sun Mar 13 18:54:12 2005 +++ chandler/parcels/osaf/contentmodel/ItemCollection.pyTue Mar 22 14:08:30 2005 @@ -1,4 +1,4 @@ -__date__ = "$Date: 2005/03/14 02:54:12 $" +__date__ = "$Date: 2005/03/22 22:08:30 $" __copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation" __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"; @@ -128,4 +128,12 @@ self.createIndex() return self.resultSet.getIndexPosition (self.indexName, item) - +def subscribe(self, *arguments, **keywords): +if self.source: +self.source.subscribe (self, "") +super (ItemCollection, self).subscribe (*arguments, **keywords) + +def unsubscribe(self, *arguments, **keywords): +super (ItemCollection, self).unsubscribe (*arguments, **keywords) +if self.source: +self.source.unsubscribe (self) ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bkirsch) backs aut change for bug #2665 as Katie is checking in a patch to CalendarCanvas.py
Commit by: bkirsch
Modified files:
chandler/application/Application.py 1.313 1.314
Log message:
backs aut change for bug #2665 as Katie is checking in a patch to
CalendarCanvas.py
Bugzilla links:
http://bugzilla.osafoundation.org/show_bug.cgi?id=2665
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/application/Application.py.diff?r1=text&tr1=1.313&r2=text&tr2=1.314
Index: chandler/application/Application.py
diff -u chandler/application/Application.py:1.313
chandler/application/Application.py:1.314
--- chandler/application/Application.py:1.313 Fri Mar 18 17:01:55 2005
+++ chandler/application/Application.py Tue Mar 22 14:15:00 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.313 $"
-__date__ = "$Date: 2005/03/19 01:01:55 $"
+__version__ = "$Revision: 1.314 $"
+__date__ = "$Date: 2005/03/22 22:15:00 $"
__copyright__ = "Copyright (c) 2003-2005 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -454,35 +454,6 @@
wxID = event.GetId()
-#XXX: This is a patch for bug #2665 that forces the sidebar to
-# get focus. This is required because TextCtrl's can be
-# Destroyed before losing focus in OSX. When the TextCntrl does
-# get an onLoseFocusEvent event and does a GetValue
-# the memory has already been deallocated.
-# this patch can be removed when wxPython 2.5.4 is integrated in
to Chandler.
-
-if event.GetEventType() == wx.wxEVT_COMMAND_TOOL_CLICKED:
-appBar = Block.findBlockByName("ApplicationBar")
-
-# @@@MOR:
-# Only change the focus if we're clicking one of the 'view
selector'
-# buttons (one of the first 4) since stealing focus from the DV
-# breaks the Send button. This hack on a hack should get removed
-# when wx 2.5.4 is integrated.
-numToCheck = 4
-
-for child in appBar.childrenBlocks:
-
-if numToCheck == 0:
-break
-
-if hasattr(child, "widget") and child.widget.GetId() == wxID:
-Block.findBlockByName("Sidebar").widget.SetFocus()
-break
-
-numToCheck -= 1
-
-
if wxID >= Block.MINIMUM_WX_ID and wxID <= Block.MAXIMUM_WX_ID:
block = Block.widgetIDToBlock (wxID)
updateUIEvent = event.GetEventType() == wx.EVT_UPDATE_UI.evtType[0]
_______
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (john) * fixed #2701
Commit by: john Modified files: chandler/repository/query/Query.py 1.39 1.40 chandler/parcels/osaf/contentmodel/ItemCollection.py 1.41 1.42 Log message: * fixed #2701 Bugzilla links: http://bugzilla.osafoundation.org/show_bug.cgi?id=2701 ViewCVS links: http://cvs.osafoundation.org/index.cgi/chandler/repository/query/Query.py.diff?r1=text&tr1=1.39&r2=text&tr2=1.40 http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/contentmodel/ItemCollection.py.diff?r1=text&tr1=1.41&r2=text&tr2=1.42 Index: chandler/parcels/osaf/contentmodel/ItemCollection.py diff -u chandler/parcels/osaf/contentmodel/ItemCollection.py:1.41 chandler/parcels/osaf/contentmodel/ItemCollection.py:1.42 --- chandler/parcels/osaf/contentmodel/ItemCollection.py:1.41 Fri Mar 18 13:41:41 2005 +++ chandler/parcels/osaf/contentmodel/ItemCollection.pyTue Mar 22 14:16:20 2005 @@ -1,4 +1,4 @@ -__date__ = "$Date: 2005/03/18 21:41:41 $" +__date__ = "$Date: 2005/03/22 22:16:20 $" __copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation" __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"; @@ -128,4 +128,12 @@ self.createIndex() return self.resultSet.getIndexPosition (self.indexName, item) - +def subscribe(self, *arguments, **keywords): +if self.source: +self.source.subscribe (self, "") +super (ItemCollection, self).subscribe (*arguments, **keywords) + +def unsubscribe(self, *arguments, **keywords): +super (ItemCollection, self).unsubscribe (*arguments, **keywords) +if self.source: +self.source.unsubscribe (self) Index: chandler/repository/query/Query.py diff -u chandler/repository/query/Query.py:1.39 chandler/repository/query/Query.py:1.40 --- chandler/repository/query/Query.py:1.39 Fri Mar 18 13:41:49 2005 +++ chandler/repository/query/Query.py Tue Mar 22 14:16:19 2005 @@ -1,6 +1,6 @@ -__revision__ = "$Revision: 1.39 $" -__date__ = "$Date: 2005/03/18 21:41:49 $" +__revision__ = "$Revision: 1.40 $" +__date__ = "$Date: 2005/03/22 22:16:19 $" __copyright__ = "Copyright (c) 2004, 2005 Open Source Applications Foundation" __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"; @@ -238,8 +238,14 @@ log.debug(u"RepoQuery.queryCallback: %s %s query result" % (uuid, [added, removed, changed_uuids] )) for callbackUUID in self._otherViewSubscribeCallbacks: item = view.find (callbackUUID) -method = getattr (type(item), self._otherViewSubscribeCallbacks [callbackUUID]) -method (item, (added,removed)) +""" + We allow subscriptions to items without callbacks. This used to keep the _resultSet up to date +when notifications aren't required -- DJA +""" +methodName = self._otherViewSubscribeCallbacks [callbackUUID] +if methodName: +method = getattr (type(item), methodName) +method (item, (added,removed)) log.debug(u"queryCallback: %s:%f" % (self.queryString, time.time()-start)) def __len__ (self): @@ -336,8 +342,14 @@ for callbackUUID in self._sameViewSubscribeCallbacks: i = self.itsView.find(callbackUUID) -method = getattr(type(i), self._sameViewSubscribeCallbacks[callbackUUID]) -method(i, action) +""" + We allow subscriptions to items without callbacks. This used to keep the _resultSet up to date +when notifications aren't required -- DJA +""" +methodName = self._sameViewSubscribeCallbacks[callbackUUID] + if methodName: +method = getattr(type(i), methodName) +method(i, action) class LogicalPlan(object): """ ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (vajda) moved some DBContainer code to C
/* tp_str */
+(reprfunc)t_uuid_str,/* tp_str */
0, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT, /* tp_flags */
-"UUID objects", /* tp_doc */
+"t_uuid objects",/* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
-(richcmpfunc)UUID_richcmp, /* tp_richcompare */
+(richcmpfunc)t_uuid_richcmp, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
-UUID_methods,/* tp_methods */
-UUID_members,/* tp_members */
+t_uuid_methods, /* tp_methods */
+t_uuid_members, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
-(initproc)UUID_init, /* tp_init */
+(initproc)t_uuid_init, /* tp_init */
0, /* tp_alloc */
-(newfunc)UUID_new, /* tp_new */
+(newfunc)t_uuid_new, /* tp_new */
};
-static void UUID_dealloc(UUID *self)
+static void t_uuid_dealloc(t_uuid *self)
{
Py_XDECREF(self->uuid);
self->ob_type->tp_free((PyObject *) self);
}
-static PyObject *UUID_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+static PyObject *t_uuid_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
-UUID *self = (UUID *) type->tp_alloc(type, 0);
+t_uuid *self = (t_uuid *) type->tp_alloc(type, 0);
if (self)
{
@@ -115,7 +110,7 @@
return (PyObject *) self;
}
-static int UUID_init(UUID *self, PyObject *args, PyObject *kwds)
+static int t_uuid_init(t_uuid *self, PyObject *args, PyObject *kwds)
{
unsigned char uuid[16];
unsigned char *text;
@@ -155,12 +150,12 @@
return 0;
}
-static int UUID_hash(UUID *self)
+static int t_uuid_hash(t_uuid *self)
{
return self->hash;
}
-static PyObject *UUID_str(UUID *self)
+static PyObject *t_uuid_str(t_uuid *self)
{
unsigned char *uuid = (unsigned char *) PyString_AS_STRING(self->uuid);
unsigned char buf[36];
@@ -170,7 +165,7 @@
return PyString_FromStringAndSize(buf, sizeof(buf));
}
-static PyObject *UUID_repr(UUID *self)
+static PyObject *t_uuid_repr(t_uuid *self)
{
unsigned char *uuid = (unsigned char *) PyString_AS_STRING(self->uuid);
unsigned char buf[44];
@@ -182,7 +177,7 @@
return PyString_FromStringAndSize(buf, sizeof(buf));
}
-static int UUID_cmp(UUID *o1, UUID *o2)
+static int t_uuid_cmp(t_uuid *o1, t_uuid *o2)
{
if (!PyObject_TypeCheck(o1, &UUIDType))
{
@@ -199,7 +194,7 @@
return PyObject_Compare(o1->uuid, o2->uuid);
}
-static PyObject *UUID_richcmp(UUID *o1, UUID *o2, int opid)
+static PyObject *t_uuid_richcmp(t_uuid *o1, t_uuid *o2, int opid)
{
if (!PyObject_TypeCheck(o1, &UUIDType) ||
!PyObject_TypeCheck(o2, &UUIDType))
@@ -211,7 +206,7 @@
return PyObject_RichCompare(o1->uuid, o2->uuid, opid);
}
-static PyObject *format64(UUID *self)
+static PyObject *format64(t_uuid *self)
{
unsigned char *uuid = (unsigned char *) PyString_AS_STRING(self->uuid);
unsigned char buf[22];
@@ -258,6 +253,12 @@
}
+int PyUUID_Check(PyObject *obj)
+{
+return obj->ob_type == &UUIDType;
+}
+
+
void inituuid(void)
{
if (PyType_Ready(&UUIDType) >= 0)
@@ -266,8 +267,13 @@
"UUID generation utility");
if (m)
{
+PyObject *cobj;
+
Py_INCREF(&UUIDType);
PyModule_AddObject(m, "UUID", (PyObject *) &UUIDType);
+
+cobj = PyCObject_FromVoidPtr(PyUUID_Check, NULL);
+PyModule_AddObject(m, "PyUUID_Check", cobj);
}
}
}
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (morgen) Tweaks to Welcome note, per Pieter
Commit by: morgen Modified files: chandler/parcels/osaf/views/main/parcel.xml 1.194.2.1 1.194.2.2 Log message: Tweaks to Welcome note, per Pieter ViewCVS links: http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/main/parcel.xml.diff?r1=text&tr1=1.194.2.1&r2=text&tr2=1.194.2.2 Index: chandler/parcels/osaf/views/main/parcel.xml diff -u chandler/parcels/osaf/views/main/parcel.xml:1.194.2.1 chandler/parcels/osaf/views/main/parcel.xml:1.194.2.2 --- chandler/parcels/osaf/views/main/parcel.xml:1.194.2.1 Mon Mar 21 13:03:16 2005 +++ chandler/parcels/osaf/views/main/parcel.xml Tue Mar 22 15:15:15 2005 @@ -1,7 +1,7 @@ - - + + @@ -1534,7 +1534,7 @@ --> - http://wiki.osafoundation.org/bin/view/Chandler/ZeroPointFiveGuidedTour ; For more details on this release, please visit! : http://wiki.osafoundation.org/bin/view/Chandler/ChandlerZeroPointFiveReadme. ; Please note, this release is still intended to be experimental, do not trust your real data with this version. An experimental file import/export feature is available to backup your calendar data. Thank you for trying Chandler. Your feedback is welcome on our mail lists: http://wiki.osafoundation.org/bin/view/Chandler/OsafMailingLists ; The Chandler Team" /> + http://wiki.osafoundation.org/bin/view/Chandler/ZeroPointFiveGuidedTour ; For more details on this release, please visit: ! http://wiki.osafoundation.org/bin/view/Chandler/ChandlerZeroPointFiveReadme ; Please note, this release is still intended to be experimental, do not trust your real data with this version. An experimental file import/export feature is available to backup your calendar data. Thank you for trying Chandler. Your feedback is welcome on our mail lists: http://wiki.osafoundation.org/bin/view/Chandler/OsafMailingLists ; The Chandler Team" /> ___________ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (morgen) Tweak to Welcome Note, per Pieter
Commit by: morgen Modified files: chandler/parcels/osaf/views/main/parcel.xml 1.195 1.196 Log message: Tweak to Welcome Note, per Pieter ViewCVS links: http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/main/parcel.xml.diff?r1=text&tr1=1.195&r2=text&tr2=1.196 Index: chandler/parcels/osaf/views/main/parcel.xml diff -u chandler/parcels/osaf/views/main/parcel.xml:1.195 chandler/parcels/osaf/views/main/parcel.xml:1.196 --- chandler/parcels/osaf/views/main/parcel.xml:1.195 Mon Mar 21 13:08:05 2005 +++ chandler/parcels/osaf/views/main/parcel.xml Tue Mar 22 15:17:52 2005 @@ -1,7 +1,7 @@ - - + + @@ -1534,7 +1534,7 @@ --> - http://wiki.osafoundation.org/bin/view/Chandler/ZeroPointFiveGuidedTour ; For more details on this release, please visit! : http://wiki.osafoundation.org/bin/view/Chandler/ChandlerZeroPointFiveReadme. ; Please note, this release is still intended to be experimental, do not trust your real data with this version. An experimental file import/export feature is available to backup your calendar data. Thank you for trying Chandler. Your feedback is welcome on our mail lists: http://wiki.osafoundation.org/bin/view/Chandler/OsafMailingLists ; The Chandler Team" /> + http://wiki.osafoundation.org/bin/view/Chandler/ZeroPointFiveGuidedTour ; For more details on this release, please visit: ! http://wiki.osafoundation.org/bin/view/Chandler/ChandlerZeroPointFiveReadme ; Please note, this release is still intended to be experimental, do not trust your real data with this version. An experimental file import/export feature is available to backup your calendar data. Thank you for trying Chandler. Your feedback is welcome on our mail lists: http://wiki.osafoundation.org/bin/view/Chandler/OsafMailingLists ; The Chandler Team" /> ___________ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (alecf) fix a typo that was fouling up PyCon users
Commit by: alecf
Modified files:
chandler/application/dialogs/Util.py 1.9 1.10
Log message:
fix a typo that was fouling up PyCon users
add a "." after wx so that the username/password dialog can appear
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/application/dialogs/Util.py.diff?r1=text&tr1=1.9&r2=text&tr2=1.10
Index: chandler/application/dialogs/Util.py
diff -u chandler/application/dialogs/Util.py:1.9
chandler/application/dialogs/Util.py:1.10
--- chandler/application/dialogs/Util.py:1.9Fri Feb 4 13:39:42 2005
+++ chandler/application/dialogs/Util.pyTue Mar 22 15:21:20 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.9 $"
-__date__ = "$Date: 2005/02/04 21:39:42 $"
+__version__ = "$Revision: 1.10 $"
+__date__ = "$Date: 2005/03/22 23:21:20 $"
__copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -70,11 +70,11 @@
if valueDict.get("password", False):
text = wx.TextCtrl(self, -1,
item.getAttributeValue(valueDict["attr"]),
- wxDefaultPosition, [400,-1], wx.TE_PASSWORD)
+ wx.DefaultPosition, [400,-1], wx.TE_PASSWORD)
else:
text = wx.TextCtrl(self, -1,
item.getAttributeValue(valueDict["attr"]),
- wxDefaultPosition, [400,-1])
+ wx.DefaultPosition, [400,-1])
box.Add(text, 1, wx.ALIGN_CENTRE|wx.ALL, 5)
sizer.AddSizer(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
_______
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (vajda) fixed Windows build issues
17;
}
if (PyString_CheckExact(value))
{
-*vt = VT_STRING;
+*vt = vt_STRING;
return PyString_GET_SIZE(value) + 3;
}
if (PyUnicode_CheckExact(value))
{
-*vt = VT_UNICODE;
+*vt = vt_UNICODE;
return (PyUnicode_GET_DATA_SIZE(value) * 5) / 4 + 3;
}
if (PyInt_CheckExact(value))
{
-*vt = VT_INT;
+*vt = vt_INT;
return 5;
}
if (PyLong_CheckExact(value))
{
-*vt = VT_LONG;
+*vt = vt_LONG;
return 5;
}
-*vt = VT_UNKNOWN;
+*vt = vt_UNKNOWN;
return 0;
}
static int _writeValue(char *buffer, PyObject *value, valueType vt)
{
-if (vt == VT_UNKNOWN)
+if (vt == vt_UNKNOWN)
_size_valueType(value, &vt);
switch (vt) {
- case VT_UNKNOWN:
+ case vt_UNKNOWN:
break;
- case VT_NONE:
+ case vt_NONE:
{
buffer[0] = '\0';
return 1;
}
- case VT_BOOL:
+ case vt_BOOL:
{
if (value == Py_True)
{
@@ -256,13 +262,13 @@
return 1;
}
}
- case VT_UUID:
+ case vt_UUID:
{
buffer[0] = '\3';
memcpy(buffer + 1, PyString_AS_STRING(((t_uuid *) value)->uuid), 16);
return 17;
}
- case VT_STRING:
+ case vt_STRING:
{
int len = PyString_GET_SIZE(value);
@@ -272,7 +278,7 @@
return len + 3;
}
- case VT_UNICODE:
+ case vt_UNICODE:
{
PyObject *str = PyUnicode_AsUTF8String(value);
int len = PyString_GET_SIZE(str);
@@ -284,14 +290,14 @@
return len + 3;
}
- case VT_INT:
+ case vt_INT:
{
buffer[0] = '\4';
*((int *) (buffer + 1)) = htonl(PyInt_AS_LONG(value));
return 5;
}
- case VT_LONG:
+ case vt_LONG:
{
buffer[0] = '\4';
*((int *) (buffer + 1)) = htonl(PyInt_AsLong(value));
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (stearns) Fix 2666 and 2734 (r=Morgen), and 2743 (r=bkirsch, alecf): Detail view rendering messed up when you drag an event in the calendar view, detail view rendering is messed up when you enter values in the different fields, Chandler crashes in the calendar view
Commit by: stearns
Modified files:
chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py 1.42 1.43
chandler/parcels/osaf/framework/blocks/detail/Detail.py 1.107 1.108
Log message:
Fix 2666 and 2734 (r=Morgen), and 2743 (r=bkirsch,alecf): Detail view rendering
messed up when you drag an event in the calendar view, detail view rendering is
messed up when you enter values in the different fields, Chandler crashes in
the calendar view
Bugzilla links:
http://bugzilla.osafoundation.org/show_bug.cgi?id=2666
http://bugzilla.osafoundation.org/show_bug.cgi?id=2734
http://bugzilla.osafoundation.org/show_bug.cgi?id=2743
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py.diff?r1=text&tr1=1.42&r2=text&tr2=1.43
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/detail/Detail.py.diff?r1=text&tr1=1.107&r2=text&tr2=1.108
Index: chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py
diff -u chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.42
chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.43
--- chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.42
Fri Mar 18 17:31:54 2005
+++ chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py Tue Mar
22 15:41:50 2005
@@ -1,8 +1,8 @@
""" Canvas for calendaring blocks
"""
-__version__ = "$Revision: 1.42 $"
-__date__ = "$Date: 2005/03/19 01:31:54 $"
+__version__ = "$Revision: 1.43 $"
+__date__ = "$Date: 2005/03/22 23:41:50 $"
__copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -1036,7 +1036,7 @@
parent.Bind(wx.EVT_SIZE, self.OnSize)
def SaveItem(self):
-if self.item != None:
+if ((self.item != None) and (not self.IsBeingDeleted())):
self.item.displayName = self.GetValue()
def OnTextEnter(self, event):
Index: chandler/parcels/osaf/framework/blocks/detail/Detail.py
diff -u chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.107
chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.108
--- chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.107 Mon Mar
21 11:32:14 2005
+++ chandler/parcels/osaf/framework/blocks/detail/Detail.py Tue Mar 22
15:41:51 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.107 $"
-__date__ = "$Date: 2005/03/21 19:32:14 $"
+__version__ = "$Revision: 1.108 $"
+__date__ = "$Date: 2005/03/22 23:41:51 $"
__copyright__ = "Copyright (c) 2004-2005 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -275,7 +275,16 @@
except AttributeError:
pass
-
+def onCollectionChanged (self, action):
+"""
+When our item collection has changed, we need to synchronize ourselves.
+(We suppress this if we're in the midst of stamping; our item's in an
+inconsistent state.)
+"""
+if not getattr(self, "ignoreCollectionChangedWhileStamping", False):
+# Block.logger.debug("DetailRoot: onCollectionChanged")
+self.synchronizeWidget()
+
class DetailTrunkDelegate (Trunk.TrunkDelegate):
"""
Delegate for the trunk builder on DetailRoot; the cache key is the given
item's Kind
@@ -391,7 +400,11 @@
if shouldShow != widget.IsShown():
# we have a widget
# make sure widget shown state is what we want
-widget.Show (shouldShow)
+if shouldShow:
+widget.Show (shouldShow)
+else:
+widget.SetMinSize(wx.Size(0,0))
+widget.Hide()
self.isShown = shouldShow
return True
return False
@@ -563,7 +576,13 @@
operation = 'add'
else:
operation = 'remove'
+
+# Suppress our on-change processing to avoid issues with
+# notifications midway through stamping. See bug 2739.
+self.detailRoot().ignoreCollectionChangedWhileStamping = True
item.StampKind(operation, mixinKind)
+del self.detailRoot().ignoreCollectionChangedWhileStamping
+
# notify the world that the item has a new kind.
self.resynchronizeDetailView ()
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (stearns) Fix 2666 and 2734 (r=Morgen), and 2743 (r=bkirsch, alecf): Detail view rendering messed up when you drag an event in the calendar view, detail view rendering is messed up when you enter values in the different fields, Chandler crashes in the calendar view
Commit by: stearns
Modified files:
chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py 1.40 1.40.2.1
chandler/parcels/osaf/framework/blocks/detail/Detail.py 1.105.2.2 1.105.2.3
Log message:
Fix 2666 and 2734 (r=Morgen), and 2743 (r=bkirsch,alecf): Detail view rendering
messed up when you drag an event in the calendar view, detail view rendering is
messed up when you enter values in the different fields, Chandler crashes in
the calendar view
Bugzilla links:
http://bugzilla.osafoundation.org/show_bug.cgi?id=2666
http://bugzilla.osafoundation.org/show_bug.cgi?id=2734
http://bugzilla.osafoundation.org/show_bug.cgi?id=2743
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py.diff?r1=text&tr1=1.40&r2=text&tr2=1.40.2.1
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/detail/Detail.py.diff?r1=text&tr1=1.105.2.2&r2=text&tr2=1.105.2.3
Index: chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py
diff -u chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.40
chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.40.2.1
--- chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.40
Thu Mar 17 15:01:28 2005
+++ chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py Tue Mar
22 15:42:16 2005
@@ -1,8 +1,8 @@
""" Canvas for calendaring blocks
"""
-__version__ = "$Revision: 1.40 $"
-__date__ = "$Date: 2005/03/17 23:01:28 $"
+__version__ = "$Revision: 1.40.2.1 $"
+__date__ = "$Date: 2005/03/22 23:42:16 $"
__copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -972,7 +972,7 @@
parent.Bind(wx.EVT_SIZE, self.OnSize)
def SaveItem(self):
-if self.item != None:
+if ((self.item != None) and (not self.IsBeingDeleted())):
self.item.displayName = self.GetValue()
def OnTextEnter(self, event):
Index: chandler/parcels/osaf/framework/blocks/detail/Detail.py
diff -u chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.105.2.2
chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.105.2.3
--- chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.105.2.2 Mon Mar
21 11:30:07 2005
+++ chandler/parcels/osaf/framework/blocks/detail/Detail.py Tue Mar 22
15:42:16 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.105.2.2 $"
-__date__ = "$Date: 2005/03/21 19:30:07 $"
+__version__ = "$Revision: 1.105.2.3 $"
+__date__ = "$Date: 2005/03/22 23:42:16 $"
__copyright__ = "Copyright (c) 2004-2005 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -275,7 +275,16 @@
except AttributeError:
pass
-
+def onCollectionChanged (self, action):
+"""
+When our item collection has changed, we need to synchronize ourselves.
+(We suppress this if we're in the midst of stamping; our item's in an
+inconsistent state.)
+"""
+if not getattr(self, "ignoreCollectionChangedWhileStamping", False):
+# Block.logger.debug("DetailRoot: onCollectionChanged")
+self.synchronizeWidget()
+
class DetailTrunkDelegate (Trunk.TrunkDelegate):
"""
Delegate for the trunk builder on DetailRoot; the cache key is the given
item's Kind
@@ -391,7 +400,11 @@
if shouldShow != widget.IsShown():
# we have a widget
# make sure widget shown state is what we want
-widget.Show (shouldShow)
+if shouldShow:
+widget.Show (shouldShow)
+else:
+widget.SetMinSize(wx.Size(0,0))
+widget.Hide()
self.isShown = shouldShow
return True
return False
@@ -563,7 +576,13 @@
operation = 'add'
else:
operation = 'remove'
+
+# Suppress our on-change processing to avoid issues with
+# notifications midway through stamping. See bug 2739.
+self.detailRoot().ignoreCollectionChangedWhileStamping = True
item.StampKind(operation, mixinKind)
+del self.detailRoot().ignoreCollectionChangedWhileStamping
+
# notify the world that the item has a new kind.
self.resynchronizeDetailView ()
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (vajda) fixed linux build issues
Commit by: vajda Modified files: internal/chandlerdb/chandlerdb/persistence/container.c 1.2 1.3 Log message: fixed linux build issues ViewCVS links: http://cvs.osafoundation.org/index.cgi/internal/chandlerdb/chandlerdb/persistence/container.c.diff?r1=text&tr1=1.2&r2=text&tr2=1.3 Index: internal/chandlerdb/chandlerdb/persistence/container.c diff -u internal/chandlerdb/chandlerdb/persistence/container.c:1.2 internal/chandlerdb/chandlerdb/persistence/container.c:1.3 --- internal/chandlerdb/chandlerdb/persistence/container.c:1.2 Tue Mar 22 15:38:03 2005 +++ internal/chandlerdb/chandlerdb/persistence/container.c Tue Mar 22 15:51:30 2005 @@ -5,13 +5,18 @@ #include -#ifdef _MSC_VER +#if defined(_MSC_VER) #include #include -#else +#elif defined(__MACH__) #include +#elif defined(linux) +#include +#else +#error system is not linux, os x or winnt #endif + #include #include "structmember.h" _______ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bkirsch) backing out change for bug #2665
Commit by: bkirsch
Modified files:
chandler/application/Application.py 1.309.2.2 1.309.2.3
Log message:
backing out change for bug #2665
Bugzilla links:
http://bugzilla.osafoundation.org/show_bug.cgi?id=2665
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/application/Application.py.diff?r1=text&tr1=1.309.2.2&r2=text&tr2=1.309.2.3
Index: chandler/application/Application.py
diff -u chandler/application/Application.py:1.309.2.2
chandler/application/Application.py:1.309.2.3
--- chandler/application/Application.py:1.309.2.2 Fri Mar 18 16:53:01 2005
+++ chandler/application/Application.py Tue Mar 22 15:53:45 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.309.2.2 $"
-__date__ = "$Date: 2005/03/19 00:53:01 $"
+__version__ = "$Revision: 1.309.2.3 $"
+__date__ = "$Date: 2005/03/22 23:53:45 $"
__copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -453,35 +453,6 @@
wxID = event.GetId()
-#XXX: This is a patch for bug #2665 that forces the sidebar to
-# get focus. This is required because TextCtrl's can be
-# Destroyed before losing focus in OSX. When the TextCntrl does
-# get an onLoseFocusEvent event and does a GetValue
-# the memory has already been deallocated.
-# this patch can be removed when wxPython 2.5.4 is integrated in
to Chandler.
-
-if event.GetEventType() == wx.wxEVT_COMMAND_TOOL_CLICKED:
-appBar = Block.findBlockByName("ApplicationBar")
-
-# @@@MOR:
-# Only change the focus if we're clicking one of the 'view
selector'
-# buttons (one of the first 4) since stealing focus from the DV
-# breaks the Send button. This hack on a hack should get removed
-# when wx 2.5.4 is integrated.
-numToCheck = 4
-
-for child in appBar.childrenBlocks:
-
-if numToCheck == 0:
-break
-
-if hasattr(child, "widget") and child.widget.GetId() == wxID:
-Block.findBlockByName("Sidebar").widget.SetFocus()
-break
-
-numToCheck -= 1
-
-
if wxID >= Block.MINIMUM_WX_ID and wxID <= Block.MAXIMUM_WX_ID:
block = Block.widgetIDToBlock (wxID)
updateUIEvent = event.GetEventType() == wx.EVT_UPDATE_UI.evtType[0]
_______
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (vajda) fix to handle None transactions
Commit by: vajda
Modified files:
internal/chandlerdb/setup.py 1.8 1.9
internal/chandlerdb/chandlerdb/persistence/container.c 1.3 1.4
Log message:
fix to handle None transactions
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/chandlerdb/setup.py.diff?r1=text&tr1=1.8&r2=text&tr2=1.9
http://cvs.osafoundation.org/index.cgi/internal/chandlerdb/chandlerdb/persistence/container.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
Index: internal/chandlerdb/chandlerdb/persistence/container.c
diff -u internal/chandlerdb/chandlerdb/persistence/container.c:1.3
internal/chandlerdb/chandlerdb/persistence/container.c:1.4
--- internal/chandlerdb/chandlerdb/persistence/container.c:1.3 Tue Mar 22
15:51:30 2005
+++ internal/chandlerdb/chandlerdb/persistence/container.c Tue Mar 22
16:30:18 2005
@@ -3,8 +3,6 @@
* The container C type
*/
-#include
-
#if defined(_MSC_VER)
#include
#include
@@ -16,7 +14,7 @@
#error system is not linux, os x or winnt
#endif
-
+#include
#include
#include "structmember.h"
@@ -414,7 +412,7 @@
else
{
DB *db = ((DBObject *) (((t_container *) self)->db))->db;
-DB_TXN *db_txn = ((DBTxnObject *) txn)->txn;
+DB_TXN *db_txn = txn == Py_None ? NULL : ((DBTxnObject *) txn)->txn;
DBT key, data;
int vLen = PyString_GET_SIZE(value);
int len = 36 + vLen;
@@ -545,7 +543,7 @@
else
{
DB *db = ((DBObject *) (((t_container *) self)->db))->db;
-DB_TXN *db_txn = ((DBTxnObject *) txn)->txn;
+DB_TXN *db_txn = txn == Py_None ? NULL : ((DBTxnObject *) txn)->txn;
valueType prevType, nextType, aliasType;
char keyBuffer[52], *dataBuffer;
DBT key, data;
Index: internal/chandlerdb/setup.py
diff -u internal/chandlerdb/setup.py:1.8 internal/chandlerdb/setup.py:1.9
--- internal/chandlerdb/setup.py:1.8Tue Mar 22 15:38:03 2005
+++ internal/chandlerdb/setup.pyTue Mar 22 16:30:18 2005
@@ -1,6 +1,6 @@
-__revision__ = "$Revision: 1.8 $"
-__date__ = "$Date: 2005/03/22 23:38:03 $"
+__revision__ = "$Revision: 1.9 $"
+__date__ = "$Date: 2005/03/23 00:30:18 $"
__copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -53,12 +53,12 @@
else:
raise ValueError, 'unsupported os: %s' %(os.name)
-setup(name='chandlerdb', version='0.4',
+setup(name='chandlerdb', version='0.5',
ext_modules=extensions,
py_modules=modules)
if os.name == 'nt' and os.path.exists('rijndael.py'):
shutil.move('rijndael.py', 'chandlerdb/util/rijndael.py')
-setup(name='chandlerdb', version='0.4',
+setup(name='chandlerdb', version='0.5',
py_modules=['chandlerdb.util.rijndael'])
if __name__ == "__main__":
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (vajda) fixed windows debug build issues
Commit by: vajda
Modified files:
internal/chandlerdb/setup.py 1.9 1.10
Log message:
fixed windows debug build issues
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/chandlerdb/setup.py.diff?r1=text&tr1=1.9&r2=text&tr2=1.10
Index: internal/chandlerdb/setup.py
diff -u internal/chandlerdb/setup.py:1.9 internal/chandlerdb/setup.py:1.10
--- internal/chandlerdb/setup.py:1.9Tue Mar 22 16:30:18 2005
+++ internal/chandlerdb/setup.pyTue Mar 22 16:41:40 2005
@@ -1,6 +1,6 @@
-__revision__ = "$Revision: 1.9 $"
-__date__ = "$Date: 2005/03/23 00:30:18 $"
+__revision__ = "$Revision: 1.10 $"
+__date__ = "$Date: 2005/03/23 00:41:40 $"
__copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -10,7 +10,8 @@
def main():
PREFIX = os.environ['PREFIX']
-
+DEBUG = os.environ.get('DEBUG', 0)
+
extensions = []
modules = ['chandlerdb.__init__',
'chandlerdb.util.__init__',
@@ -35,11 +36,15 @@
sources=['chandlerdb/item/item.c']))
if os.name == 'nt':
+if DEBUG == 0:
+libdb_name = 'libdb43'
+else:
+libdb_name = 'libdb43d'
ext = Extension('chandlerdb.persistence.container',
sources=['chandlerdb/persistence/container.c'],
include_dirs=[os.path.join(PREFIX, 'include', 'db')],
library_dirs=[os.path.join(PREFIX, 'lib')],
-libraries=['libdb43', 'ws2_32'])
+libraries=[libdb_name, 'ws2_32'])
else:
ext = Extension('chandlerdb.persistence.container',
sources=['chandlerdb/persistence/container.c'],
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (vajda) - moved some DBContainer code to C
self._flags)
except DBNotFoundError:
return
except DBLockDeadlockError:
@@ -1070,7 +1060,7 @@
store.abortTransaction(txnStatus)
-class ValueContainer(DBContainer):
+class ValueContainer(DBContainer, CValueContainer):
FORMAT_VERSION = 0x0005
@@ -1101,18 +1091,6 @@
# uValue -> uAttr, uValue
return pack('>16s16s', value[0:16], key)
-def saveValue(self, buffer, uItem, version, uAttr, uValue, value):
-
-buffer.truncate(0)
-buffer.seek(0)
-
-buffer.write(uAttr._uuid)
-buffer.write(uItem._uuid)
-buffer.write(pack('>l', ~version))
-buffer.write(value)
-
-self.put(uValue._uuid, buffer.getvalue())
-
def loadValue(self, uValue):
value = self.get(uValue._uuid)
Index: chandler/repository/persistence/DBItemIO.py
diff -u chandler/repository/persistence/DBItemIO.py:1.7
chandler/repository/persistence/DBItemIO.py:1.8
--- chandler/repository/persistence/DBItemIO.py:1.7 Fri Mar 18 13:41:48 2005
+++ chandler/repository/persistence/DBItemIO.py Tue Mar 22 16:56:35 2005
@@ -1,6 +1,6 @@
-__revision__ = "$Revision: 1.7 $"
-__date__ = "$Date: 2005/03/18 21:41:48 $"
+__revision__ = "$Revision: 1.8 $"
+__date__ = "$Date: 2005/03/23 00:56:35 $"
__copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -188,7 +188,7 @@
elif attrCard == 'dict':
self.writeDict(buffer, item, value, withSchema, attrType)
-self.store._values.saveValue(self.valueBuffer, item._uuid, version,
+self.store._values.saveValue(self.store.txn, item._uuid, version,
uAttr, uValue, buffer.getvalue())
def _unchangedValue(self, item, name):
@@ -281,7 +281,7 @@
else:
buffer.write('\0\0')
- self.store._values.saveValue(self.valueBuffer, item._uuid, version,
+ self.store._values.saveValue(self.store.txn, item._uuid, version,
attribute._uuid, uValue,
buffer.getvalue())
TYPED= 0x01
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (john) * fixed #2740, #2510, and a bug in the fix for #2701
Commit by: john
Modified files:
chandler/parcels/osaf/contentmodel/ItemCollection.py 1.42 1.43
Log message:
* fixed #2740, #2510, and a bug in the fix for #2701
Bugzilla links:
http://bugzilla.osafoundation.org/show_bug.cgi?id=2740
http://bugzilla.osafoundation.org/show_bug.cgi?id=2510
http://bugzilla.osafoundation.org/show_bug.cgi?id=2701
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/contentmodel/ItemCollection.py.diff?r1=text&tr1=1.42&r2=text&tr2=1.43
Index: chandler/parcels/osaf/contentmodel/ItemCollection.py
diff -u chandler/parcels/osaf/contentmodel/ItemCollection.py:1.42
chandler/parcels/osaf/contentmodel/ItemCollection.py:1.43
--- chandler/parcels/osaf/contentmodel/ItemCollection.py:1.42 Tue Mar 22
14:16:20 2005
+++ chandler/parcels/osaf/contentmodel/ItemCollection.pyTue Mar 22
16:58:19 2005
@@ -1,4 +1,4 @@
-__date__ = "$Date: 2005/03/22 22:16:20 $"
+__date__ = "$Date: 2005/03/23 00:58:19 $"
__copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -74,7 +74,7 @@
if self.ruleIsStale:
args = {}
newQueryString = self._rule
-if self.source:
+if self.source is not None:
if newQueryString:
newQueryString = "union (" + newQueryString + ", for i in
$0 where True)"
else:
@@ -129,11 +129,11 @@
return self.resultSet.getIndexPosition (self.indexName, item)
def subscribe(self, *arguments, **keywords):
-if self.source:
+if self.source is not None:
self.source.subscribe (self, "")
super (ItemCollection, self).subscribe (*arguments, **keywords)
def unsubscribe(self, *arguments, **keywords):
super (ItemCollection, self).unsubscribe (*arguments, **keywords)
-if self.source:
+if self.source is not None:
self.source.unsubscribe (self)
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (john) * fixed #2740, #2510, and a bug in the fix for #2701
Commit by: john
Modified files:
chandler/parcels/osaf/contentmodel/ItemCollection.py 1.40.2.1 1.40.2.2
Log message:
* fixed #2740, #2510, and a bug in the fix for #2701
Bugzilla links:
http://bugzilla.osafoundation.org/show_bug.cgi?id=2740
http://bugzilla.osafoundation.org/show_bug.cgi?id=2510
http://bugzilla.osafoundation.org/show_bug.cgi?id=2701
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/contentmodel/ItemCollection.py.diff?r1=text&tr1=1.40.2.1&r2=text&tr2=1.40.2.2
Index: chandler/parcels/osaf/contentmodel/ItemCollection.py
diff -u chandler/parcels/osaf/contentmodel/ItemCollection.py:1.40.2.1
chandler/parcels/osaf/contentmodel/ItemCollection.py:1.40.2.2
--- chandler/parcels/osaf/contentmodel/ItemCollection.py:1.40.2.1 Tue Mar
22 14:08:30 2005
+++ chandler/parcels/osaf/contentmodel/ItemCollection.pyTue Mar 22
17:09:22 2005
@@ -1,4 +1,4 @@
-__date__ = "$Date: 2005/03/22 22:08:30 $"
+__date__ = "$Date: 2005/03/23 01:09:22 $"
__copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -74,7 +74,7 @@
if self.ruleIsStale:
args = {}
newQueryString = self._rule
-if self.source:
+if self.source is not None:
if newQueryString:
newQueryString = "union (" + newQueryString + ", for i in
$0 where True)"
else:
@@ -129,11 +129,11 @@
return self.resultSet.getIndexPosition (self.indexName, item)
def subscribe(self, *arguments, **keywords):
-if self.source:
+if self.source is not None:
self.source.subscribe (self, "")
super (ItemCollection, self).subscribe (*arguments, **keywords)
def unsubscribe(self, *arguments, **keywords):
super (ItemCollection, self).unsubscribe (*arguments, **keywords)
-if self.source:
+if self.source is not None:
self.source.unsubscribe (self)
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) Directory /usr/local/cvsrep/server/core/src/org/osaf/spring/jcr/support added to the repository
Commit by: bcm Modified files: server/core/src/org/osaf/spring/jcr/support Log message: Directory /usr/local/cvsrep/server/core/src/org/osaf/spring/jcr/support added to the repository ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/spring/jcr/support? ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) add final JCR/Spring integration classes and fill out implementation of
ebdav/src/org/osaf/cosmo/webdav/CosmoDavSessionProvider.java
Tue Mar 22 17:29:28 2005
@@ -1,27 +1,11 @@
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.osaf.cosmo.webdav;
-import org.osaf.jcr.JCRServletCredentialsProvider;
+import org.osaf.spring.jcr.JCRCredentialsProvider;
import javax.jcr.Credentials;
import javax.jcr.Repository;
import javax.jcr.Session;
import javax.jcr.RepositoryException;
-import javax.servlet.ServletException;
import org.apache.jackrabbit.server.simple.dav.DavSessionImpl;
import org.apache.jackrabbit.webdav.DavSessionProvider;
@@ -35,7 +19,7 @@
/**
* Implementation of the jcr-server [EMAIL PROTECTED] DavSessionProvider}
* interface that uses wired-in instances of
- * [EMAIL PROTECTED] Repository} and [EMAIL PROTECTED]
JCRServletCredentialsProvider} to
+ * [EMAIL PROTECTED] Repository} and [EMAIL PROTECTED] JCRCredentialsProvider}
to
* locate extract credentials from the request, log into the
* repository, and provide a [EMAIL PROTECTED] DavSession} to the request.
*/
@@ -43,8 +27,9 @@
private static final Logger log =
Logger.getLogger(CosmoDavSessionProvider.class);
-private JCRServletCredentialsProvider credentialsProvider;
+private JCRCredentialsProvider credentialsProvider;
private Repository repository;
+private String workspaceName;
/**
* Acquires a DavSession. Upon success, the WebdavRequest will
@@ -61,13 +46,13 @@
public void acquireSession(WebdavRequest request) throws DavException {
// XXX cache dav session in web session
try {
-Credentials creds =
-credentialsProvider.extractCredentials(request);
+Credentials creds = getCredentialsProvider().provideCredentials();
if (creds != null) {
if (log.isDebugEnabled()) {
log.debug("Logging into repository");
}
-Session repSession = repository.login(creds);
+Session repSession =
+repository.login(creds, getWorkspaceName());
DavSession ds = new DavSessionImpl(repSession);
request.setDavSession(ds);
}
@@ -75,10 +60,6 @@
log.error("error logging into repository", e);
throw new DavException(DavServletResponse.SC_INTERNAL_SERVER_ERROR,
e.getMessage());
-} catch (ServletException e) {
-log.error("error extracting credentials", e);
-throw new DavException(DavServletResponse.SC_INTERNAL_SERVER_ERROR,
- e.getMessage());
}
}
@@ -93,6 +74,18 @@
/**
*/
+public JCRCredentialsProvider getCredentialsProvider() {
+return credentialsProvider;
+}
+
+/**
+ */
+public void setCredentialsProvider(JCRCredentialsProvider provider) {
+credentialsProvider = provider;
+}
+
+/**
+ */
public Repository getRepository() {
return repository;
}
@@ -103,17 +96,15 @@
this.repository = repository;
}
-
/**
*/
-public JCRServletCredentialsProvider getCredentialsProvider() {
-return credentialsProvider;
+public String getWorkspaceName() {
+return workspaceName;
}
/**
*/
-public void
-setCredentialsProvider(JCRServletCredentialsProvider provider) {
-credentialsProvider = provider;
+public void setWorkspaceName(String workspaceName) {
+this.workspaceName = workspaceName;
}
}
Index: server/webapps/webdav/web/WEB-INF/web.xml
diff -u server/webapps/webdav/web/WEB-INF/web.xml:1.8
server/webapps/webdav/web/WEB-INF/web.xml:1.9
--- server/webapps/webdav/web/WEB-INF/web.xml:1.8 Tue Mar 22 10:14:39 2005
+++ server/webapps/webdav/web/WEB-INF/web.xml Tue Mar 22 17:29:29 2005
@@ -60,7 +60,7 @@
/
-jcr/repository
+jcr/repository/webdav
javax.jcr.Repository
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) use simple readable filesystem and persistence manager implementations for
Commit by: bcm Modified files: server/etc/repository.xml 1.1 1.2 server/webapps/console/etc/log4j.xml 1.2 1.3 server/webapps/webdav/etc/log4j.xml 1.5 1.6 Log message: use simple readable filesystem and persistence manager implementations for jackrabbit to help track down what is going on inside the repository when i create homedirs. turn up debugging for jackrabbit in both webapps for the same reason. ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/etc/repository.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2 http://cvs.osafoundation.org/index.cgi/server/webapps/console/etc/log4j.xml.diff?r1=text&tr1=1.2&r2=text&tr2=1.3 http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/etc/log4j.xml.diff?r1=text&tr1=1.5&r2=text&tr2=1.6 Index: server/etc/repository.xml diff -u server/etc/repository.xml:1.1 server/etc/repository.xml:1.2 --- server/etc/repository.xml:1.1 Tue Mar 15 12:30:22 2005 +++ server/etc/repository.xml Tue Mar 22 17:53:01 2005 @@ -152,24 +152,22 @@ virtual file system of the workspace: class: FQN of class implementing the FileSystem interface --> + ---> - +
[Commits] (vajda) oops
Commit by: vajda
Modified files:
internal/chandlerdb/setup.py 1.10 1.11
Log message:
oops
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/chandlerdb/setup.py.diff?r1=text&tr1=1.10&r2=text&tr2=1.11
Index: internal/chandlerdb/setup.py
diff -u internal/chandlerdb/setup.py:1.10 internal/chandlerdb/setup.py:1.11
--- internal/chandlerdb/setup.py:1.10 Tue Mar 22 16:41:40 2005
+++ internal/chandlerdb/setup.pyTue Mar 22 18:42:08 2005
@@ -1,6 +1,6 @@
-__revision__ = "$Revision: 1.10 $"
-__date__ = "$Date: 2005/03/23 00:41:40 $"
+__revision__ = "$Revision: 1.11 $"
+__date__ = "$Date: 2005/03/23 02:42:08 $"
__copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -10,7 +10,7 @@
def main():
PREFIX = os.environ['PREFIX']
-DEBUG = os.environ.get('DEBUG', 0)
+DEBUG = int(os.environ.get('DEBUG', '0'))
extensions = []
modules = ['chandlerdb.__init__',
_______
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (alecf) fix for bug 2741, r=morgen
Commit by: alecf
Modified files:
chandler/application/dialogs/Util.py 1.9 1.9.2.1
Log message:
fix for bug 2741, r=morgen
fix up wx.DefaultPosition
Bugzilla links:
http://bugzilla.osafoundation.org/show_bug.cgi?id=2741
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/application/dialogs/Util.py.diff?r1=text&tr1=1.9&r2=text&tr2=1.9.2.1
Index: chandler/application/dialogs/Util.py
diff -u chandler/application/dialogs/Util.py:1.9
chandler/application/dialogs/Util.py:1.9.2.1
--- chandler/application/dialogs/Util.py:1.9Fri Feb 4 13:39:42 2005
+++ chandler/application/dialogs/Util.pyWed Mar 23 07:48:53 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.9 $"
-__date__ = "$Date: 2005/02/04 21:39:42 $"
+__version__ = "$Revision: 1.9.2.1 $"
+__date__ = "$Date: 2005/03/23 15:48:53 $"
__copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -70,11 +70,11 @@
if valueDict.get("password", False):
text = wx.TextCtrl(self, -1,
item.getAttributeValue(valueDict["attr"]),
- wxDefaultPosition, [400,-1], wx.TE_PASSWORD)
+ wx.DefaultPosition, [400,-1], wx.TE_PASSWORD)
else:
text = wx.TextCtrl(self, -1,
item.getAttributeValue(valueDict["attr"]),
- wxDefaultPosition, [400,-1])
+ wx.DefaultPosition, [400,-1])
box.Add(text, 1, wx.ALIGN_CENTRE|wx.ALL, 5)
sizer.AddSizer(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (davids) colheader - minor cleanup
, or appears to lack, a native control: a simple bevel button shall suffice for the theme background. +The GTK framework lacks, or appears to lack, a native control: a simple bevel button shall suffice for the theme background. """ - if __name__ == '__main__': import sys,os import run ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (stearns) Fix 2395 (unchecking 'all-day' checkbox garbles the display of all-day and duration fields), r=john
Commit by: stearns Modified files: chandler/parcels/osaf/framework/blocks/detail/Detail.py 1.108 1.109 Log message: Fix 2395 (unchecking 'all-day' checkbox garbles the display of all-day and duration fields), r=john Bugzilla links: http://bugzilla.osafoundation.org/show_bug.cgi?id=2395 ViewCVS links: http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/detail/Detail.py.diff?r1=text&tr1=1.108&r2=text&tr2=1.109 Index: chandler/parcels/osaf/framework/blocks/detail/Detail.py diff -u chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.108 chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.109 --- chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.108 Tue Mar 22 15:41:51 2005 +++ chandler/parcels/osaf/framework/blocks/detail/Detail.py Wed Mar 23 12:09:53 2005 @@ -1,5 +1,5 @@ -__version__ = "$Revision: 1.108 $" -__date__ = "$Date: 2005/03/22 23:41:51 $" +__version__ = "$Revision: 1.109 $" +__date__ = "$Date: 2005/03/23 20:09:53 $" __copyright__ = "Copyright (c) 2004-2005 Open Source Applications Foundation" __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"; @@ -250,17 +250,10 @@ # Called when an itemCollection gets new sharees, # because the Notify button should then be enabled. # Also called after stamping. - -# @@@BJS: stripped-down for trees of blocks; used to be: -## @@@DLD - devise a block-dependency-event scheme. -#item= self.selectedItem() -#self.synchronizeDetailView(item) -# -# After moving DetailRoot into the event boundary in the -# trees of blocks, we need to call synchronizeWidget on -# the TrunkParentBlock since stamping may change the tree -# of blocks displayed in the detail view event boundary -- DJA -self.parentBlock.synchronizeWidget() +# +# Just tell our parent block's widget to resync; this'll force +# our tree of blocks to be rerendered. +self.parentBlock.widget.wxSynchronizeWidget(rerenderHint=True) def finishSelectionChanges (self): """ ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (stearns) Fix 2395 (unchecking 'all-day' checkbox garbles the display of all-day and duration fields), r=john
Commit by: stearns Modified files: chandler/parcels/osaf/framework/blocks/detail/Detail.py 1.105.2.3 1.105.2.4 Log message: Fix 2395 (unchecking 'all-day' checkbox garbles the display of all-day and duration fields), r=john Bugzilla links: http://bugzilla.osafoundation.org/show_bug.cgi?id=2395 ViewCVS links: http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/detail/Detail.py.diff?r1=text&tr1=1.105.2.3&r2=text&tr2=1.105.2.4 Index: chandler/parcels/osaf/framework/blocks/detail/Detail.py diff -u chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.105.2.3 chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.105.2.4 --- chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.105.2.3 Tue Mar 22 15:42:16 2005 +++ chandler/parcels/osaf/framework/blocks/detail/Detail.py Wed Mar 23 12:10:20 2005 @@ -1,5 +1,5 @@ -__version__ = "$Revision: 1.105.2.3 $" -__date__ = "$Date: 2005/03/22 23:42:16 $" +__version__ = "$Revision: 1.105.2.4 $" +__date__ = "$Date: 2005/03/23 20:10:20 $" __copyright__ = "Copyright (c) 2004-2005 Open Source Applications Foundation" __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"; @@ -250,17 +250,10 @@ # Called when an itemCollection gets new sharees, # because the Notify button should then be enabled. # Also called after stamping. - -# @@@BJS: stripped-down for trees of blocks; used to be: -## @@@DLD - devise a block-dependency-event scheme. -#item= self.selectedItem() -#self.synchronizeDetailView(item) -# -# After moving DetailRoot into the event boundary in the -# trees of blocks, we need to call synchronizeWidget on -# the TrunkParentBlock since stamping may change the tree -# of blocks displayed in the detail view event boundary -- DJA -self.parentBlock.synchronizeWidget() +# +# Just tell our parent block's widget to resync; this'll force +# our tree of blocks to be rerendered. +self.parentBlock.widget.wxSynchronizeWidget(rerenderHint=True) def finishSelectionChanges (self): """ ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) CVSOOT and console webapps into one. this allows us to use tiles for the
@@ -29,6 +30,14 @@
Error.NotFound.ResourceNotFound=The resource you were looking for was not
found. It may have been previously removed from the server.
#
+# Welcome messages
+#
+
+Welcome.HeadTitle=Cosmo sharing server
+Welcome.WelcomeMsg=Welcome to the Cosmo sharing server installed at
{0}!
+Welcome.LoggedInAs=You are logged in as {0}.
+
+#
# User messages
#
Index: server/webapps/console/etc/action-servlet.xml
diff -u server/webapps/console/etc/action-servlet.xml:1.1
server/webapps/console/etc/action-servlet.xml:1.2
--- server/webapps/console/etc/action-servlet.xml:1.1 Tue Mar 22 10:13:36 2005
+++ server/webapps/console/etc/action-servlet.xml Wed Mar 23 14:03:35 2005
@@ -14,10 +14,10 @@
+
-
Index: server/webapps/console/web/index.jsp
diff -u server/webapps/console/web/index.jsp:1.1.1.1
server/webapps/console/web/index.jsp:1.2
--- server/webapps/console/web/index.jsp:1.1.1.1Wed Feb 16 13:08:37 2005
+++ server/webapps/console/web/index.jspWed Mar 23 14:03:35 2005
@@ -1 +1 @@
-
+
Index: server/shared.properties
diff -u server/shared.properties:1.11 server/shared.properties:1.12
--- server/shared.properties:1.11 Tue Mar 22 17:29:22 2005
+++ server/shared.propertiesWed Mar 23 14:03:29 2005
@@ -42,7 +42,6 @@
core.etc=${core.home}/etc
core.test=${core.home}/test
-ROOT.home=${chsrv.home}/webapps/ROOT
console.home=${chsrv.home}/webapps/console
share.home=${chsrv.home}/webapps/share
webdav.home=${chsrv.home}/webapps/webdav
@@ -100,6 +99,7 @@
struts.jar=${chsrv.ext}/struts.jar
struts-el.jar=${chsrv.ext}/struts-el.jar
strutstest.jar=${chsrv.ext}/strutstest-2.1.3.jar
+urlrewrite.jar=${chsrv.ext}/urlrewrite-2.0.1.jar
#
# distribution properties
Index: server/etc/console.xml
diff -u server/etc/console.xml:1.5 server/etc/console.xml:1.6
--- server/etc/console.xml:1.5 Tue Mar 22 17:29:25 2005
+++ server/etc/console.xml Wed Mar 23 14:03:31 2005
@@ -1,6 +1,6 @@
-
Index: server/webapps/webdav/etc/log4j.xml
diff -u server/webapps/webdav/etc/log4j.xml:1.6
server/webapps/webdav/etc/log4j.xml:1.7
--- server/webapps/webdav/etc/log4j.xml:1.6 Tue Mar 22 17:53:02 2005
+++ server/webapps/webdav/etc/log4j.xml Wed Mar 23 14:03:37 2005
@@ -21,10 +21,6 @@
-
-
-
-
Index: server/webapps/console/web/WEB-INF/web.xml
diff -u server/webapps/console/web/WEB-INF/web.xml:1.2
server/webapps/console/web/WEB-INF/web.xml:1.3
--- server/webapps/console/web/WEB-INF/web.xml:1.2 Tue Mar 22 17:29:27 2005
+++ server/webapps/console/web/WEB-INF/web.xml Wed Mar 23 14:03:36 2005
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
version="2.4">
- Chandler Server Admin Console
+ Chandler Server
webAppRootKey
webui.root
@@ -47,10 +47,28 @@
+
+url-rewrite
+
+ org.tuckey.web.filters.urlrewrite.UrlRewriteFilter
+
+
+ logLevel
+ WARN
+
+
+ statusEnabled
+ false
+
+
authen
/*
+
+url-rewrite
+/*
+
action
org.apache.struts.action.ActionServlet
@@ -65,46 +83,12 @@
1
-default
-*.css
-
-
-jsp
-*.jsp
-
-
action
-/
+*.do
-
-
- html
- /WEB-INF/tld/struts-html-el.tld
-
-
- logic
- /WEB-INF/tld/struts-logic-el.tld
-
-
- tiles
- /WEB-INF/tld/struts-tiles-el.tld
-
-
- c
- /WEB-INF/tld/c.tld
-
-
- fmt
- /WEB-INF/tld/fmt.tld
-
-
- fn
- /WEB-INF/tld/fn.tld
-
-
java.lang.Throwable
-/error
+/error.do
jcr/repository/webui
Index: server/webapps/console/web/WEB-INF/jsp/layout.jsp
diff -u server/webapps/console/web/WEB-INF/jsp/layout.jsp:1.2
server/webapps/console/web/WEB-INF/jsp/layout.jsp:1.3
--- server/webapps/console/web/WEB-INF/jsp/layout.jsp:1.2 Wed Feb 16
14:22:45 2005
+++ server/webapps/console/web/WEB-INF/jsp/layout.jsp Wed Mar 23 14:03:37 2005
@@ -21,12 +21,15 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
Index: server/webapps/console/etc/log4j.xml
diff -u server/webapps/console/etc/log4j.xml:1.3
server/webapps/console/etc/log4j.xml:1.4
--- server/webapps/console/etc/log4j.xml:1.3Tue Mar 22 17:53:02 2005
+++ server/webapps/console/etc/log4j.xmlWed Mar 23 14:03:35 2005
@@ -21,10 +21,6 @@
-
-
-
-
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) update TODO list based on goals laid out in client/server meeting 3/22.
Commit by: bcm Modified files: server/docs/TODO.txt 1.22 1.23 Log message: update TODO list based on goals laid out in client/server meeting 3/22. the list now reflects the current strategy and thoughts for Chandler 0.6 support (requirements still evolving, of course). there are two main features known today that impact Cosmo: ticket-based sharing and web-based account signup. the latter feature implies other features, including web-based account mgmt (both self- and admin). it also shows that what i'm working on now is still only a prototype, exploring several WebDAV/content store platforms (Slide, Jackrabbit, perhaps Tomcat's WebDAV servlet), with a special eye towards security, the ability to have segregated home directories in the content store, an extensible design (to support CalDAV and ticket authen/authz), and a scalable architecture. ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/docs/TODO.txt.diff?r1=text&tr1=1.22&r2=text&tr2=1.23 Index: server/docs/TODO.txt diff -u server/docs/TODO.txt:1.22 server/docs/TODO.txt:1.23 --- server/docs/TODO.txt:1.22 Wed Mar 23 14:03:30 2005 +++ server/docs/TODO.txtWed Mar 23 14:21:26 2005 @@ -2,18 +2,9 @@ PROTOTYPE = -source code control/build system: - - * make new module 'cosmo' - * use maven - * move console webapp into a webui subproject - * move webdav webapp into a webdav subproject - * change all packages from org.osaf.chandler.server to org.osaf.cosmo - core: * write tests for JCR homedirs - * rename HomeDAO to ContentStoreDAO * plan for ticket credentials webui: @@ -33,41 +24,52 @@ verified to exist in the store * force all requests to come over secure connections? * write tests for all components - * add ticket-based authentication * consider prototyping with Tomcat's WebDAV servlet security: -install/configure: - - * rename start up script to cosmoctl - * Windows startup script - * validation of install procedure by other people - -docs: - - * rewrite all existing docs - * FAQ.txt - * LICENSE.txt - * BUILDING.txt - * have somebody edit all docs + * implement ticket-based authentication 0.1 RELEASE === +source code control/build system: + + * make new module 'cosmo' + * use maven + * move console webapp into a webui subproject + * move webdav webapp into a webdav subproject + * change all packages from org.osaf.chandler.server to org.osaf.cosmo + webui: + * account signup screen * "forgot username?" function that finds username by email address and mails it to the user * "forgot password?" function that generates new password and mails it to the user - * user account mgmt screen - change email, password + * account mgmt screen - change email, password * batch remove on user list * page,sort,search user list + * icons on user list for root users webdav: - * maintain sharing status for each resource - last accessed date for + * ?? maintain sharing status for each resource - last accessed date for each user, maybe also last modified date - * CalDAV freebusy report + * ?? CalDAV freebusy report + +install/configure: + + * rename start up script to cosmoctl + * Windows startup script + * validation of install procedure by other people + +docs: + + * rewrite all existing docs + * FAQ.txt + * LICENSE.txt + * BUILDING.txt + * have somebody edit all docs _______ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) more small updates
Commit by: bcm Modified files: server/docs/TODO.txt 1.23 1.24 Log message: more small updates ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/docs/TODO.txt.diff?r1=text&tr1=1.23&r2=text&tr2=1.24 Index: server/docs/TODO.txt diff -u server/docs/TODO.txt:1.23 server/docs/TODO.txt:1.24 --- server/docs/TODO.txt:1.23 Wed Mar 23 14:21:26 2005 +++ server/docs/TODO.txtWed Mar 23 14:39:48 2005 @@ -5,7 +5,6 @@ core: * write tests for JCR homedirs - * plan for ticket credentials webui: @@ -20,16 +19,12 @@ * figure out why cadaver to the webdav app returns "Did not find a collection resource". - * figure out why the browser view doesn't show homedirs which are - verified to exist in the store * force all requests to come over secure connections? * write tests for all components * consider prototyping with Tomcat's WebDAV servlet security: - * implement ticket-based authentication - 0.1 RELEASE === @@ -56,10 +51,15 @@ webdav: + * ticket generation * ?? maintain sharing status for each resource - last accessed date for each user, maybe also last modified date * ?? CalDAV freebusy report +security: + + * ticket-based authen and authz + install/configure: * rename start up script to cosmoctl ___________ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (john) * fixed #1897
o": +children = [child for child in block.parentBlock.childrenBlocks] +blockIndex = children.index (block) +""" + Unselect all the items in the radio group before this toolbar item +""" +index = blockIndex - 1 +while index >= 0 and children [index].toolbarItemKind == "Radio": +children [index].selected = False +index -= 1 +""" + Select this toolbar item +""" +children [blockIndex].selected = True +""" + Unselect all the items in the radio group after this toolbar item +""" +index = blockIndex + 1 +while index < len (children) and children [index].toolbarItemKind == "Radio": +children [index].selected = False +index += 1 +event.Skip() + + class Toolbar (Block.RectangularChild, DynamicContainer): def instantiateWidget (self): self.ensureDynamicChildren () @@ -830,9 +868,8 @@ kind = theKind, shortHelp=self.title, longHelp=self.helpString) -# Bind events to the Application OnCommand dispatcher, which will -# call the block.event method -theToolbar.Bind (wx.EVT_TOOL, wx.GetApp().OnCommand, id=id) +tool.__class__ = wxToolbarItem +theToolbar.Bind (wx.EVT_TOOL, tool.OnToolEvent, id=id) elif self.toolbarItemKind == 'Separator': theToolbar.AddSeparator() elif self.toolbarItemKind == 'Check': @@ -881,10 +918,10 @@ elif __debug__: assert False, "unknown toolbarItemKind" -if tool is not None: +if tool is not None and tool.__class__ != wxToolbarItem: # convert this object from a wx.ToolBarTool to a wxToolBarItem, # so we can call methods on that widget class. -assert tool.__class__ is wxToolBarToolClass, "wx ToolBarTool class mismatch with ToolbarItem" +assert tool.__class__ is wx.ToolBarToolBase, "wx ToolBarTool class mismatch with ToolbarItem" tool.__class__ = wxToolbarItem return tool Index: chandler/parcels/osaf/framework/blocks/parcel.xml diff -u chandler/parcels/osaf/framework/blocks/parcel.xml:1.157 chandler/parcels/osaf/framework/blocks/parcel.xml:1.158 --- chandler/parcels/osaf/framework/blocks/parcel.xml:1.157 Thu Mar 17 15:01:28 2005 +++ chandler/parcels/osaf/framework/blocks/parcel.xml Wed Mar 23 17:02:06 2005 @@ -1,7 +1,7 @@ - - + + @@ -1237,6 +1237,10 @@ + + + + ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (john) * fixed #1897
index >= 0 and children [index].toolbarItemKind == "Radio": +children [index].selected = False +index -= 1 +""" + Select this toolbar item +""" +children [blockIndex].selected = True +""" + Unselect all the items in the radio group after this toolbar item +""" +index = blockIndex + 1 +while index < len (children) and children [index].toolbarItemKind == "Radio": +children [index].selected = False +index += 1 +event.Skip() + + class Toolbar (Block.RectangularChild, DynamicContainer): def instantiateWidget (self): self.ensureDynamicChildren () @@ -830,9 +868,8 @@ kind = theKind, shortHelp=self.title, longHelp=self.helpString) -# Bind events to the Application OnCommand dispatcher, which will -# call the block.event method -theToolbar.Bind (wx.EVT_TOOL, wx.GetApp().OnCommand, id=id) +tool.__class__ = wxToolbarItem +theToolbar.Bind (wx.EVT_TOOL, tool.OnToolEvent, id=id) elif self.toolbarItemKind == 'Separator': theToolbar.AddSeparator() elif self.toolbarItemKind == 'Check': @@ -881,10 +918,10 @@ elif __debug__: assert False, "unknown toolbarItemKind" -if tool is not None: +if tool is not None and tool.__class__ != wxToolbarItem: # convert this object from a wx.ToolBarTool to a wxToolBarItem, # so we can call methods on that widget class. -assert tool.__class__ is wxToolBarToolClass, "wx ToolBarTool class mismatch with ToolbarItem" +assert tool.__class__ is wx.ToolBarToolBase, "wx ToolBarTool class mismatch with ToolbarItem" tool.__class__ = wxToolbarItem return tool Index: chandler/parcels/osaf/framework/blocks/parcel.xml diff -u chandler/parcels/osaf/framework/blocks/parcel.xml:1.157 chandler/parcels/osaf/framework/blocks/parcel.xml:1.157.2.1 --- chandler/parcels/osaf/framework/blocks/parcel.xml:1.157 Thu Mar 17 15:01:28 2005 +++ chandler/parcels/osaf/framework/blocks/parcel.xml Wed Mar 23 17:22:56 2005 @@ -1,7 +1,7 @@ - - + + @@ -1237,6 +1237,10 @@ + + + + Index: chandler/parcels/osaf/views/main/parcel.xml diff -u chandler/parcels/osaf/views/main/parcel.xml:1.194.2.2 chandler/parcels/osaf/views/main/parcel.xml:1.194.2.3 --- chandler/parcels/osaf/views/main/parcel.xml:1.194.2.2 Tue Mar 22 15:15:15 2005 +++ chandler/parcels/osaf/views/main/parcel.xml Wed Mar 23 17:22:57 2005 @@ -1,7 +1,7 @@ - - + + @@ -992,6 +992,7 @@ Radio No Filter +True ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (davids) colheader - fixed control "ablement" support
RefreshItem( itemIndex );
SetViewDirty();
}
@@ -543,8 +546,7 @@
}
// static
-wxVisualAttributes
-wxColumnHeader::GetClassDefaultAttributes(
+wxVisualAttributes wxColumnHeader::GetClassDefaultAttributes(
wxWindowVariant variant )
{
// FIXME: is this dependency necessary?
@@ -1453,6 +1455,7 @@
}
else
{
+ // this case is OK - can be used to clear an existing bitmap
// wxLogDebug( _T("wxColumnHeaderItem::SetBitmapRef failed") );
}
}
@@ -1636,7 +1639,7 @@
// NB: DrawThemeButton height is fixed, regardless of the boundsRect
argument!
if (! m_BSortEnabled)
- MacDrawThemeBackgroundNoArrows( &qdBoundsR, m_BSelected );
+ MacDrawThemeBackgroundNoArrows( &qdBoundsR, m_BSelected &&
m_BEnabled );
else
errStatus = DrawThemeButton( &qdBoundsR,
kThemeListHeaderButton, &drawInfo, NULL, NULL, NULL, 0 );
@@ -1650,6 +1653,7 @@
nativeTextJust = ConvertJustification( m_TextJust, TRUE );
+ // render the label text as/if specified
if (! bHasIcon && ! m_LabelTextRef.IsEmpty())
{
CFStringRef cfLabelText;
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (davids) colheader - added support for unmarked selections
(-1) @@ -79,28 +84,35 @@ self.stepDir = 1 self.stepSize = self.stepSize + self.stepDir self.ch1.DoSetSize( 20, 40, curWidth + 40 * self.stepSize, 20, 0 ) -self.l0.SetLabel( "resized (%d)" %(ch1.GetId()) ) +self.l0.SetLabel( "resized (%d)" %(self.ch1.GetId()) ) -def OnTestEnableButton(self, event): +def OnTestEnableButton( self, event ): curEnabled = self.ch1.IsEnabled() curEnabled = not curEnabled self.ch1.Enable( curEnabled ) self.ch2.Enable( curEnabled ) self.l0.SetLabel( "enabled (%d)" %(curEnabled) ) +def OnTestAllowSelections( self, event ): +curEnabled = self.ch1.GetFlagVisibleSelection() +curEnabled = not curEnabled +self.ch1.SetFlagVisibleSelection( curEnabled ) +self.ch2.SetFlagVisibleSelection( curEnabled ) +self.l0.SetLabel( "selection visible (%d)" %(curEnabled) ) + def OnTestAddBitmapItemButton( self, event ): ch = self.ch2 itemCount = ch.GetItemCount() ch.AppendItem( "", wx.colheader.COLUMNHEADER_JUST_Center, 40, 0, 0, 1 ) testBmp = images.getTest2Bitmap() ch.SetBitmapRef( itemCount, testBmp ) -ch.SetSelectedItemIndex( itemCount ) +ch.SetSelectedItem( itemCount ) ch.ResizeToFit() self.l0.SetLabel( "added bitmap item (%d) to (%d)" %(itemCount, ch.GetId()) ) def OnTestDeleteItemButton( self, event ): ch = self.ch1 -itemIndex = ch.GetSelectedItemIndex() +itemIndex = ch.GetSelectedItem() if (itemIndex >= 0): ch.DeleteItem( itemIndex ) self.l0.SetLabel( "deleted item (%d) from (%d)" %(itemIndex, ch.GetId()) ) @@ -125,6 +137,8 @@ This control embodies the native look and feel to the greatest practical degree, and fills in some holes to boot. +Selections, bitmaps and sort arrows are optional + A limitation: text and bitmaps are mutually exclusive. The MSW version of this control will have a persistant selection indicator. The native MSW control has no canonical selection UI, instead using a sort arrow to serve double-duty as a selection indicator; nonetheless, it has a rollover indicator. Index: internal/wxPython-2.5/wxPython/src/colheader.i diff -u internal/wxPython-2.5/wxPython/src/colheader.i:1.7 internal/wxPython-2.5/wxPython/src/colheader.i:1.8 --- internal/wxPython-2.5/wxPython/src/colheader.i:1.7 Tue Mar 22 11:42:06 2005 +++ internal/wxPython-2.5/wxPython/src/colheader.i Thu Mar 24 07:51:07 2005 @@ -101,10 +101,15 @@ void ResizeToFit( void ); long GetTotalUIExtent( void ); -void SetUnicodeFlag( -boolbSetFlag ); - long GetSelectedItemIndex( void ); -void SetSelectedItemIndex( +bool GetFlagVisibleSelection( void ); +void SetFlagVisibleSelection( +boolbFlagValue ); +bool GetFlagUnicode( void ); +void SetFlagUnicode( +boolbFlagValue ); + +long GetSelectedItem( void ); +void SetSelectedItem( longitemIndex ); wxColumnHeaderHitTestResult HitTest( const wxPoint&locationPt ); ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) implement logout feature and fix up security so that user and root roles are
Commit by: bcm Modified files: server/core/src/org/osaf/struts/OSAFLogoutAction.java None 1.1 server/docs/TODO.txt 1.24 1.25 server/webapps/console/etc/MessageResources.properties 1.4 1.5 server/webapps/console/etc/applicationContext-webui-security.xml 1.2 1.3 server/webapps/console/web/WEB-INF/struts-config.xml 1.5 1.6 server/webapps/console/web/WEB-INF/urlrewrite.xml 1.1 1.2 server/webapps/console/web/WEB-INF/jsp/layout.jsp 1.3 1.4 Log message: implement logout feature and fix up security so that user and root roles are checked for all implemented urls. ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/struts/OSAFLogoutAction.java?rev=1.1&content-type=text/vnd.viewcvs-markup http://cvs.osafoundation.org/index.cgi/server/docs/TODO.txt.diff?r1=text&tr1=1.24&r2=text&tr2=1.25 http://cvs.osafoundation.org/index.cgi/server/webapps/console/etc/MessageResources.properties.diff?r1=text&tr1=1.4&r2=text&tr2=1.5 http://cvs.osafoundation.org/index.cgi/server/webapps/console/etc/applicationContext-webui-security.xml.diff?r1=text&tr1=1.2&r2=text&tr2=1.3 http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/struts-config.xml.diff?r1=text&tr1=1.5&r2=text&tr2=1.6 http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/urlrewrite.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2 http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/jsp/layout.jsp.diff?r1=text&tr1=1.3&r2=text&tr2=1.4 Index: server/webapps/console/etc/applicationContext-webui-security.xml diff -u server/webapps/console/etc/applicationContext-webui-security.xml:1.2 server/webapps/console/etc/applicationContext-webui-security.xml:1.3 --- server/webapps/console/etc/applicationContext-webui-security.xml:1.2 Tue Mar 22 11:29:53 2005 +++ server/webapps/console/etc/applicationContext-webui-security.xmlThu Mar 24 12:12:03 2005 @@ -88,7 +88,10 @@ CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON PATTERN_TYPE_APACHE_ANT - /index.jsp=ROLE_ROOT + /index.jsp=ROLE_ROOT,ROLE_USER + /welcome=ROLE_ROOT,ROLE_USER + /logout=ROLE_ROOT,ROLE_USER + /users=ROLE_ROOT /user/**=ROLE_ROOT Index: server/webapps/console/web/WEB-INF/struts-config.xml diff -u server/webapps/console/web/WEB-INF/struts-config.xml:1.5 server/webapps/console/web/WEB-INF/struts-config.xml:1.6 --- server/webapps/console/web/WEB-INF/struts-config.xml:1.5Wed Mar 23 14:03:36 2005 +++ server/webapps/console/web/WEB-INF/struts-config.xmlThu Mar 24 12:12:04 2005 @@ -40,6 +40,11 @@ + + + + "/> - - - + + + + + + + + + + + + + + + + Index: server/webapps/console/etc/MessageResources.properties diff -u server/webapps/console/etc/MessageResources.properties:1.4 server/webapps/console/etc/MessageResources.properties:1.5 --- server/webapps/console/etc/MessageResources.properties:1.4 Wed Mar 23 14:03:35 2005 +++ server/webapps/console/etc/MessageResources.properties Thu Mar 24 12:12:03 2005 @@ -1,5 +1,6 @@ Layout.Header.TopTitle=Cosmo sharing server +Layout.Header.LogOut=Log out Layout.ConsoleNav.Header=Admin console: Button.Go=Go Index: server/docs/TODO.txt diff -u server/docs/TODO.txt:1.24 server/docs/TODO.txt:1.25 --- server/docs/TODO.txt:1.24 Wed Mar 23 14:39:48 2005 +++ server/docs/TODO.txtThu Mar 24 12:12:03 2005 @@ -8,7 +8,8 @@ webui: - * implement logout + * use struts and tiles for login form + * add home link to header * see if we can't get Struts to work with "/user/bcm/update" rather than "/user/update.do" with "username=bcm" in content body * use a session attribute rather than a request parameter to denote a Index: server/webapps/console/web/WEB-INF/urlrewrite.xml diff -u server/webapps/console/web/WEB-INF/urlrewrite.xml:1.1 server/webapps/console/web/WEB-INF/urlrewrite.xml:1.2 --- server/webapps/console/web/WEB-INF/urlrewrite.xml:1.1 Wed Mar 23 14:03:36 2005 +++ server/webapps/console/web/WEB-INF/urlrewrite.xml Thu Mar 24 12:12:04 2005 @@ -1,27 +1,31 @@ - -http://tuckey.org/res/dtds/urlrewrite2.dtd";> - - - - -^/error$ -/error.do - - - - -^/welcome$ -/welcome.do - - - - -^/users$ -/users.do - - -^/user/([a-z]+)$ -/user.do?username=$1 - - + +http://tuckey.org/res/dtds/urlrewrite2.dtd";> + + + + +^/error$ +/error.do + + + + +^/welcome$ +/welcome.do + + +^/logout$ +/logout.do + + + + +^/users$ +/users.do + + +^/user/([a-z]+)$ +/user.do?username=$1 + + ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) use struts and tiles for login page
ver/webapps/console/web/WEB-INF/jsp/layout.jsp:1.4 server/webapps/console/web/WEB-INF/jsp/layout.jsp:1.5 --- server/webapps/console/web/WEB-INF/jsp/layout.jsp:1.4 Thu Mar 24 12:12:04 2005 +++ server/webapps/console/web/WEB-INF/jsp/layout.jsp Thu Mar 24 12:32:04 2005 @@ -3,6 +3,11 @@ + + + + + @@ -24,25 +29,33 @@ - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (capps) Fixes bug 2537 show feedback in calendar header for selected button r=alecf
Commit by: capps
Modified files:
chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py 1.40.2.1
1.40.2.2
Log message:
Fixes bug 2537 show feedback in calendar header for selected button r=alecf
Bugzilla links:
http://bugzilla.osafoundation.org/show_bug.cgi?id=2537
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py.diff?r1=text&tr1=1.40.2.1&r2=text&tr2=1.40.2.2
Index: chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py
diff -u
chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.40.2.1
chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.40.2.2
--- chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.40.2.1
Tue Mar 22 15:42:16 2005
+++ chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py Thu Mar
24 12:39:19 2005
@@ -1,8 +1,8 @@
""" Canvas for calendaring blocks
"""
-__version__ = "$Revision: 1.40.2.1 $"
-__date__ = "$Date: 2005/03/22 23:42:16 $"
+__version__ = "$Revision: 1.40.2.2 $"
+__date__ = "$Date: 2005/03/24 20:39:19 $"
__copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -348,16 +348,44 @@
selectedDate = self.parent.blockItem.selectedDate
startDate = self.parent.blockItem.rangeStart
+
+# Update the month button given the selected date
self.monthButton.SetLabel(selectedDate.Format("%B %Y"))
self.monthButton.UpdateSize()
self.todayButton.UpdateSize()
+# Update the days in the header based on the selected date
+# @@@ hack hack until we get the colheader
+
+if (('__WXMAC__' in wx.PlatformInfo) or
+('__WXGTK__' in wx.PlatformInfo)):
+
+if self.parent.blockItem.dayMode:
+self.weekButton.SetLabel("Week", font=self.bigFont,
+ fgcolor=self.bigFontColor)
+else:
+self.weekButton.SetLabel("Week", font=self.bigBoldFont,
+ fgcolor=wx.BLUE)
+
for day in range(7):
currentDate = startDate + DateTime.RelativeDateTime(days=day)
dayName = currentDate.Format('%a ') + str(currentDate.day)
-self.dayButtons[day].SetLabel(dayName)
+if (('__WXMAC__' in wx.PlatformInfo) or
+('__WXGTK__' in wx.PlatformInfo)):
+if (self.parent.blockItem.dayMode and
+(selectedDate == currentDate)):
+self.dayButtons[day].SetLabel(dayName,
+ font=self.bigBoldFont,
+ fgcolor=wx.BLUE)
+else:
+self.dayButtons[day].SetLabel(dayName,
+ font=self.bigFont,
+ fgcolor=self.bigFontColor)
+else:
+self.dayButtons[day].SetLabel(dayName)
+
self.Layout()
self.Refresh()
@@ -437,7 +465,8 @@
# for us.
startDay = self.parent.blockItem.rangeStart
-dc.SetPen(wx.Pen(wx.BLUE))
+dc.SetPen(wx.Pen(wx.Color(153,204,255)))
+dc.SetBrush(wx.Brush(wx.Color(153,204,255)))
if self.parent.blockItem.dayMode == True:
selectedDay = self.parent.blockItem.selectedDate
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (davids) colheader - demo tweaks
itmap() +ch.SetBitmapRef( itemCount, testBmp ) +ch.SetSelectedItem( itemCount ) +ch.ResizeToFit() +self.l0.SetLabel( "added bitmap item (%d) to (%d)" %(itemCount, ch.GetId()) ) + def OnTestResizeButton( self, event ): curWidth = self.ch1.GetTotalUIExtent() if (self.stepSize == 1): @@ -86,39 +105,20 @@ self.ch1.DoSetSize( 20, 40, curWidth + 40 * self.stepSize, 20, 0 ) self.l0.SetLabel( "resized (%d)" %(self.ch1.GetId()) ) -def OnTestEnableButton( self, event ): +def OnTestEnableCheckBox( self, event ): curEnabled = self.ch1.IsEnabled() curEnabled = not curEnabled self.ch1.Enable( curEnabled ) self.ch2.Enable( curEnabled ) self.l0.SetLabel( "enabled (%d)" %(curEnabled) ) -def OnTestAllowSelections( self, event ): +def OnTestVisibleSelectionCheckBox( self, event ): curEnabled = self.ch1.GetFlagVisibleSelection() curEnabled = not curEnabled self.ch1.SetFlagVisibleSelection( curEnabled ) self.ch2.SetFlagVisibleSelection( curEnabled ) self.l0.SetLabel( "selection visible (%d)" %(curEnabled) ) -def OnTestAddBitmapItemButton( self, event ): -ch = self.ch2 -itemCount = ch.GetItemCount() -ch.AppendItem( "", wx.colheader.COLUMNHEADER_JUST_Center, 40, 0, 0, 1 ) -testBmp = images.getTest2Bitmap() -ch.SetBitmapRef( itemCount, testBmp ) -ch.SetSelectedItem( itemCount ) -ch.ResizeToFit() -self.l0.SetLabel( "added bitmap item (%d) to (%d)" %(itemCount, ch.GetId()) ) - -def OnTestDeleteItemButton( self, event ): -ch = self.ch1 -itemIndex = ch.GetSelectedItem() -if (itemIndex >= 0): - ch.DeleteItem( itemIndex ) -self.l0.SetLabel( "deleted item (%d) from (%d)" %(itemIndex, ch.GetId()) ) -else: -self.l0.SetLabel( "header (%d): no item selected" %(ch.GetId()) ) - #-- def runTest( frame, nb, log ): ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) rename welcome page - it's really the user's home page. add home link to main
request parameter to denote a Index: server/webapps/console/etc/applicationContext-webui-security.xml diff -u server/webapps/console/etc/applicationContext-webui-security.xml:1.4 server/webapps/console/etc/applicationContext-webui-security.xml:1.5 --- server/webapps/console/etc/applicationContext-webui-security.xml:1.4 Thu Mar 24 12:32:02 2005 +++ server/webapps/console/etc/applicationContext-webui-security.xmlThu Mar 24 12:44:14 2005 @@ -89,7 +89,7 @@ CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON PATTERN_TYPE_APACHE_ANT /index.jsp=ROLE_ROOT,ROLE_USER - /welcome=ROLE_ROOT,ROLE_USER + /home=ROLE_ROOT,ROLE_USER /logout=ROLE_ROOT,ROLE_USER /users=ROLE_ROOT /user/**=ROLE_ROOT Index: server/webapps/console/web/index.jsp diff -u server/webapps/console/web/index.jsp:1.2 server/webapps/console/web/index.jsp:1.3 --- server/webapps/console/web/index.jsp:1.2Wed Mar 23 14:03:35 2005 +++ server/webapps/console/web/index.jspThu Mar 24 12:44:14 2005 @@ -1 +1 @@ - + Index: server/webapps/console/web/WEB-INF/struts-config.xml diff -u server/webapps/console/web/WEB-INF/struts-config.xml:1.7 server/webapps/console/web/WEB-INF/struts-config.xml:1.8 --- server/webapps/console/web/WEB-INF/struts-config.xml:1.7Thu Mar 24 12:32:03 2005 +++ server/webapps/console/web/WEB-INF/struts-config.xmlThu Mar 24 12:44:14 2005 @@ -37,17 +37,17 @@ redirect="false"/> - + - + - + Index: server/webapps/console/web/WEB-INF/jsp/layout.jsp diff -u server/webapps/console/web/WEB-INF/jsp/layout.jsp:1.5 server/webapps/console/web/WEB-INF/jsp/layout.jsp:1.6 --- server/webapps/console/web/WEB-INF/jsp/layout.jsp:1.5 Thu Mar 24 12:32:04 2005 +++ server/webapps/console/web/WEB-INF/jsp/layout.jsp Thu Mar 24 12:44:15 2005 @@ -26,16 +26,20 @@ - + + + + | - + + @@ -44,11 +48,11 @@ - + - - - + + + ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (capps) Fixes bug 2537 show feedback in calendar header for selected button r=alecf
Commit by: capps
Modified files:
chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py 1.43 1.44
Log message:
Fixes bug 2537 show feedback in calendar header for selected button r=alecf
Bugzilla links:
http://bugzilla.osafoundation.org/show_bug.cgi?id=2537
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py.diff?r1=text&tr1=1.43&r2=text&tr2=1.44
Index: chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py
diff -u chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.43
chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.44
--- chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.43
Tue Mar 22 15:41:50 2005
+++ chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py Thu Mar
24 12:44:17 2005
@@ -1,8 +1,8 @@
""" Canvas for calendaring blocks
"""
-__version__ = "$Revision: 1.43 $"
-__date__ = "$Date: 2005/03/22 23:41:50 $"
+__version__ = "$Revision: 1.44 $"
+__date__ = "$Date: 2005/03/24 20:44:17 $"
__copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -389,16 +389,44 @@
selectedDate = self.parent.blockItem.selectedDate
startDate = self.parent.blockItem.rangeStart
+
+# Update the month button given the selected date
self.monthButton.SetLabel(selectedDate.Format("%B %Y"))
self.monthButton.UpdateSize()
self.todayButton.UpdateSize()
+# Update the days in the header based on the selected date
+# @@@ hack hack until we get the colheader
+
+if (('__WXMAC__' in wx.PlatformInfo) or
+('__WXGTK__' in wx.PlatformInfo)):
+
+if self.parent.blockItem.dayMode:
+self.weekButton.SetLabel("Week", font=self.bigFont,
+ fgcolor=self.bigFontColor)
+else:
+self.weekButton.SetLabel("Week", font=self.bigBoldFont,
+ fgcolor=wx.BLUE)
+
for day in range(7):
currentDate = startDate + DateTime.RelativeDateTime(days=day)
dayName = currentDate.Format('%a ') + str(currentDate.day)
-self.dayButtons[day].SetLabel(dayName)
+if (('__WXMAC__' in wx.PlatformInfo) or
+('__WXGTK__' in wx.PlatformInfo)):
+if (self.parent.blockItem.dayMode and
+(selectedDate == currentDate)):
+self.dayButtons[day].SetLabel(dayName,
+ font=self.bigBoldFont,
+ fgcolor=wx.BLUE)
+else:
+self.dayButtons[day].SetLabel(dayName,
+ font=self.bigFont,
+ fgcolor=self.bigFontColor)
+else:
+self.dayButtons[day].SetLabel(dayName)
+
self.Layout()
self.Refresh()
@@ -478,7 +506,8 @@
# for us.
startDay = self.parent.blockItem.rangeStart
-dc.SetPen(wx.Pen(wx.BLUE))
+dc.SetPen(wx.Pen(wx.Color(153,204,255)))
+dc.SetBrush(wx.Brush(wx.Color(153,204,255)))
if self.parent.blockItem.dayMode == True:
selectedDay = self.parent.blockItem.selectedDate
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) shuffle some things around a little bit more. mostly done with the jackrabbit
Commit by: bcm Modified files: server/docs/TODO.txt 1.27 1.28 Log message: shuffle some things around a little bit more. mostly done with the jackrabbit prototype, need to investigate a few things before doing interop testing with chandler ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/docs/TODO.txt.diff?r1=text&tr1=1.27&r2=text&tr2=1.28 Index: server/docs/TODO.txt diff -u server/docs/TODO.txt:1.27 server/docs/TODO.txt:1.28 --- server/docs/TODO.txt:1.27 Thu Mar 24 12:44:13 2005 +++ server/docs/TODO.txtThu Mar 24 12:47:03 2005 @@ -8,17 +8,13 @@ webui: - * see if we can't get Struts to work with "/user/bcm/update" rather - than "/user/update.do" with "username=bcm" in content body - * use a session attribute rather than a request parameter to denote a - failed login attempt (requires extending the authentication - filter). - webdav: + * figure out why on my work machine homedirs created through the + console don't show up in webdav whereas they do on my home machine * figure out why cadaver to the webdav app returns "Did not find a - collection resource". - * force all requests to come over secure connections? + collection resource" + * require channel security? * write tests for all components * consider prototyping with Tomcat's WebDAV servlet @@ -47,6 +43,8 @@ * batch remove on user list * page,sort,search user list * icons on user list for root users + * see if we can't get Struts to work with "/user/bcm/update" rather + than "/user/update.do" with "username=bcm" in content body webdav: ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (davids) colheader - missed a minor item in prior check-in
Commit by: davids Modified files: internal/wxPython-2.5/wxPython/demo/ColumnHeader.py 1.12 1.13 Log message: colheader - missed a minor item in prior check-in r=TBD ViewCVS links: http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/demo/ColumnHeader.py.diff?r1=text&tr1=1.12&r2=text&tr2=1.13 Index: internal/wxPython-2.5/wxPython/demo/ColumnHeader.py diff -u internal/wxPython-2.5/wxPython/demo/ColumnHeader.py:1.12 internal/wxPython-2.5/wxPython/demo/ColumnHeader.py:1.13 --- internal/wxPython-2.5/wxPython/demo/ColumnHeader.py:1.12Thu Mar 24 12:42:42 2005 +++ internal/wxPython-2.5/wxPython/demo/ColumnHeader.py Thu Mar 24 12:58:24 2005 @@ -102,7 +102,7 @@ if (self.stepSize == (-1)): self.stepDir = 1 self.stepSize = self.stepSize + self.stepDir -self.ch1.DoSetSize( 20, 40, curWidth + 40 * self.stepSize, 20, 0 ) +self.ch1.DoSetSize( 190, 40, curWidth + 40 * self.stepSize, 20, 0 ) self.l0.SetLabel( "resized (%d)" %(self.ch1.GetId()) ) def OnTestEnableCheckBox( self, event ): _______ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (morgen) Directory /usr/local/cvsrep/chandler/parcels/osaf/examples/zaobao/servlet added to the repository
Commit by: morgen Modified files: chandler/parcels/osaf/examples/zaobao/servlet Log message: Directory /usr/local/cvsrep/chandler/parcels/osaf/examples/zaobao/servlet added to the repository ViewCVS links: http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/examples/zaobao/servlet? ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (morgen) ZaoBao enhancements:
els/osaf/examples/zaobao/ZaoBaoWakeupCall.py:1.6
--- chandler/parcels/osaf/examples/zaobao/ZaoBaoWakeupCall.py:1.5 Thu Jan
27 13:01:48 2005
+++ chandler/parcels/osaf/examples/zaobao/ZaoBaoWakeupCall.py Thu Mar 24
13:53:06 2005
@@ -1,5 +1,5 @@
-__revision__ = "$Revision: 1.5 $"
-__date__ = "$Date: 2005/01/27 21:01:48 $"
+__revision__ = "$Revision: 1.6 $"
+__date__ = "$Date: 2005/03/24 21:53:06 $"
__copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -36,5 +36,7 @@
#print 'failed to parse %s' % item.url
#print e
logging.exception('zaobao failed to parse %s' % item.url)
+except Exception, e:
+logging.exception('zaobao failed to parse %s' % item.url)
view.commit()
Index: chandler/parcels/osaf/examples/zaobao/parcel.xml
diff -u chandler/parcels/osaf/examples/zaobao/parcel.xml:1.40
chandler/parcels/osaf/examples/zaobao/parcel.xml:1.41
--- chandler/parcels/osaf/examples/zaobao/parcel.xml:1.40 Thu Mar 17
13:56:38 2005
+++ chandler/parcels/osaf/examples/zaobao/parcel.xmlThu Mar 24 13:53:06 2005
@@ -1,24 +1,25 @@
-
-
+
+
http://osafoundation.org/parcels/core";
- xmlns:doc="http://osafoundation.org/examples/zaobao";
-
xmlns:wakeupCall="http://osafoundation.org/parcels/osaf/framework/wakeup";>
+ xmlns="http://osafoundation.org/parcels/core";
+ xmlns:doc="http://osafoundation.org/examples/zaobao";
+ xmlns:wakeupCall="http://osafoundation.org/parcels/osaf/framework/wakeup";
+ itemClass="osaf.examples.zaobao.RSSData.Parcel">
http://osafoundation.org/examples/zaobao"/>
- 0.3
-
+0.3
+
-
-
osaf.examples.zaobao.ZaoBaoWakeupCall.WakeupCall
- True
+
+
osaf.examples.zaobao.ZaoBaoWakeupCall.WakeupCall
+True
True
True
00:00:30:00
-
+
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (morgen) Adding 'isRead' attribute to ContentItem to support new ZaoBao feature
Commit by: morgen Modified files: chandler/application/Application.py 1.315 1.316 chandler/parcels/osaf/contentmodel/parcel.xml 1.98 1.99 Log message: Adding 'isRead' attribute to ContentItem to support new ZaoBao feature ViewCVS links: http://cvs.osafoundation.org/index.cgi/chandler/application/Application.py.diff?r1=text&tr1=1.315&r2=text&tr2=1.316 http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/contentmodel/parcel.xml.diff?r1=text&tr1=1.98&r2=text&tr2=1.99 Index: chandler/application/Application.py diff -u chandler/application/Application.py:1.315 chandler/application/Application.py:1.316 --- chandler/application/Application.py:1.315 Wed Mar 23 17:02:05 2005 +++ chandler/application/Application.py Thu Mar 24 13:53:36 2005 @@ -1,5 +1,5 @@ -__version__ = "$Revision: 1.315 $" -__date__ = "$Date: 2005/03/24 01:02:05 $" +__version__ = "$Revision: 1.316 $" +__date__ = "$Date: 2005/03/24 21:53:36 $" __copyright__ = "Copyright (c) 2003-2005 Open Source Applications Foundation" __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"; @@ -21,7 +21,7 @@ #@@@Temporary testing tool written by Morgen -- DJA import tools.timing -SCHEMA_VERSION = "2" +SCHEMA_VERSION = "3" """ Event used to post callbacks on the UI thread Index: chandler/parcels/osaf/contentmodel/parcel.xml diff -u chandler/parcels/osaf/contentmodel/parcel.xml:1.98 chandler/parcels/osaf/contentmodel/parcel.xml:1.99 --- chandler/parcels/osaf/contentmodel/parcel.xml:1.98 Sun Mar 13 18:54:12 2005 +++ chandler/parcels/osaf/contentmodel/parcel.xml Thu Mar 24 13:53:36 2005 @@ -1,8 +1,8 @@ - - + + @@ -99,6 +99,12 @@ False + + + False + + + _______ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (grant) Fix Bug 2725 Removing an event in the calendar view deletes the whole collection r=alecf
Commit by: grant Modified files: chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py 1.40.2.2 1.40.2.3 chandler/parcels/osaf/framework/blocks/calendar/CollectionCanvas.py 1.26 1.26.2.1 Log message: Fix Bug 2725 Removing an event in the calendar view deletes the whole collection r=alecf On the mac only, when the user clicks on an event in the calendar app, secretly begin and end editing under the covers. This means the focus is set up more reasonably, and the Remove event will be handled by the calendar (and not the sidebar). Bugzilla links: http://bugzilla.osafoundation.org/show_bug.cgi?id=2725 ViewCVS links: http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py.diff?r1=text&tr1=1.40.2.2&r2=text&tr2=1.40.2.3 http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/calendar/CollectionCanvas.py.diff?r1=text&tr1=1.26&r2=text&tr2=1.26.2.1 Index: chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py diff -u chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.40.2.2 chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.40.2.3 --- chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.40.2.2 Thu Mar 24 12:39:19 2005 +++ chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py Thu Mar 24 15:03:53 2005 @@ -1,8 +1,8 @@ """ Canvas for calendaring blocks """ -__version__ = "$Revision: 1.40.2.2 $" -__date__ = "$Date: 2005/03/24 20:39:19 $" +__version__ = "$Revision: 1.40.2.3 $" +__date__ = "$Date: 2005/03/24 23:03:53 $" __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation" __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"; @@ -835,9 +835,18 @@ # handle mouse related actions: move, resize, create, select -def GrabFocusHack(self): -self.editor.SaveItem() -self.editor.Hide() +# +# Bug 2725: +# This is a hack to get single-click focus to work +# correctly on the Mac. Essentially, we're simulating a double-click +# so that we end up with our wxInPlaceEditor having focus. +# Otherwise, SetFocus() seems not to work. +# +def MacFakeDoubleClickHack(self, box): +if '__WXMAC__' in wx.PlatformInfo: +self.OnEditItem(box) +self.editor.SaveItem() +self.editor.Hide() def OnEditItem(self, box): position = self.CalcScrolledPosition(box.bounds.GetPosition()) Index: chandler/parcels/osaf/framework/blocks/calendar/CollectionCanvas.py diff -u chandler/parcels/osaf/framework/blocks/calendar/CollectionCanvas.py:1.26 chandler/parcels/osaf/framework/blocks/calendar/CollectionCanvas.py:1.26.2.1 --- chandler/parcels/osaf/framework/blocks/calendar/CollectionCanvas.py:1.26 Thu Mar 17 15:43:07 2005 +++ chandler/parcels/osaf/framework/blocks/calendar/CollectionCanvas.py Thu Mar 24 15:03:53 2005 @@ -1,8 +1,8 @@ """ Canvas block for displaying item collections """ -__version__ = "$Revision: 1.26 $" -__date__ = "$Date: 2005/03/17 23:43:07 $" +__version__ = "$Revision: 1.26.2.1 $" +__date__ = "$Date: 2005/03/24 23:03:53 $" __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation" __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"; @@ -468,6 +468,7 @@ hitBox = box if hitBox: +self.MacFakeDoubleClickHack(hitBox) self.OnSelectItem(hitBox.getItem()) self.SetDragBox(hitBox) @@ -538,6 +539,11 @@ def GrabFocusHack(self): pass +def MacFakeDoubleClickHack(self, hitBox): +# Hack for Bug 2725. See CalendarCanvas.py for the +# only override, and an explanation +pass + def OnCreateItem(self, position, createOnDrag): """ Creates a new item on the canvas. ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (morgen) Adding zaobao/schema parcel as a dependency now that the zaobao parcel item's startupParcel can make instances of RSSItem (and thus needs its Kind loaded)
Commit by: morgen Modified files: chandler/parcels/osaf/examples/zaobao/parcel.xml 1.41 1.42 Log message: Adding zaobao/schema parcel as a dependency now that the zaobao parcel item's startupParcel can make instances of RSSItem (and thus needs its Kind loaded) ViewCVS links: http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/examples/zaobao/parcel.xml.diff?r1=text&tr1=1.41&r2=text&tr2=1.42 Index: chandler/parcels/osaf/examples/zaobao/parcel.xml diff -u chandler/parcels/osaf/examples/zaobao/parcel.xml:1.41 chandler/parcels/osaf/examples/zaobao/parcel.xml:1.42 --- chandler/parcels/osaf/examples/zaobao/parcel.xml:1.41 Thu Mar 24 13:53:06 2005 +++ chandler/parcels/osaf/examples/zaobao/parcel.xmlThu Mar 24 15:09:11 2005 @@ -1,7 +1,7 @@ - - + + @@ -9,6 +9,7 @@ xmlns="http://osafoundation.org/parcels/core"; xmlns:doc="http://osafoundation.org/examples/zaobao"; xmlns:wakeupCall="http://osafoundation.org/parcels/osaf/framework/wakeup"; + xmlns:schema="http://osafoundation.org/examples/zaobao/schema"; itemClass="osaf.examples.zaobao.RSSData.Parcel"> http://osafoundation.org/examples/zaobao"/> ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (jed) Fixes Bug#2659
Commit by: jed
Modified files:
chandler/parcels/osaf/framework/blocks/ControlBlocks.py 1.192 1.193
Log message:
Fixes Bug#2659
Summary view column header and sidebar selection extend the entire width of the
view.
r=bkirsch
Bugzilla links:
http://bugzilla.osafoundation.org/show_bug.cgi?id=2659
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/ControlBlocks.py.diff?r1=text&tr1=1.192&r2=text&tr2=1.193
Index: chandler/parcels/osaf/framework/blocks/ControlBlocks.py
diff -u chandler/parcels/osaf/framework/blocks/ControlBlocks.py:1.192
chandler/parcels/osaf/framework/blocks/ControlBlocks.py:1.193
--- chandler/parcels/osaf/framework/blocks/ControlBlocks.py:1.192 Fri Mar
18 13:41:43 2005
+++ chandler/parcels/osaf/framework/blocks/ControlBlocks.py Thu Mar 24
16:07:11 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.192 $"
-__date__ = "$Date: 2005/03/18 21:41:43 $"
+__version__ = "$Revision: 1.193 $"
+__date__ = "$Date: 2005/03/25 00:07:11 $"
__copyright__ = "Copyright (c) 2003-2005 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm";
@@ -611,14 +611,14 @@
widthMinusLastColumn += self.GetColSize (column)
lastColumnWidth = size.width - widthMinusLastColumn
"""
- Big fat hack. Since the grid is a scrolled window we set a
border equal to the size
-of the scrollbar so the scroll bars won't show. Instead we should
consider modifying
-grid adding a new style for not showing scrollbars. Bug #2375
+ This is a temporary fix to get around an apparent bug in grids.
We only want to adjust
+for scrollbars if they are present. The -2 is a hack, without
which the sidebar will grow
+indefinitely when resizing the window.
"""
-lastColumnWidth = lastColumnWidth -
wx.SystemSettings_GetMetric(wx.SYS_VSCROLL_X)
-# @@@ This does not work properly and needs to be looked at
-# Removing it for the single column case because it causes the
-# sidebar to grow indefinitely
+if (self.GetSize() == self.GetVirtualSize()):
+lastColumnWidth = lastColumnWidth - 2
+else:
+lastColumnWidth = lastColumnWidth -
wx.SystemSettings_GetMetric(wx.SYS_VSCROLL_X)
if lastColumnWidth > 0:
self.SetColSize (lastColumnIndex, lastColumnWidth)
self.ForceRefresh()
@@ -685,12 +685,9 @@
# update the last column to fill the rest of the widget
remaining = self.GetSize().width - widthMinusLastColumn
-"""
- Big fat hack. Since the grid is a scrolled window we set a border
equal to the size
-of the scrollbar so the scroll bars won't show. Instead we should
consider modifying
-grid adding a new style for not showing scrollbars. Bug #2375
-"""
-remaining = remaining - wx.SystemSettings_GetMetric(wx.SYS_VSCROLL_X)
+# Adjust for scrollbar if it is present
+if (self.GetSize() != self.GetVirtualSize()):
+remaining = remaining -
wx.SystemSettings_GetMetric(wx.SYS_VSCROLL_X)
if remaining > 0:
self.SetColSize(newColumns - 1, remaining)
___
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) Directory /usr/local/cvsrep/server/core/test/org/osaf/chandler/server/dao/jcr added to the repository
Commit by: bcm Modified files: server/core/test/org/osaf/chandler/server/dao/jcr Log message: Directory /usr/local/cvsrep/server/core/test/org/osaf/chandler/server/dao/jcr added to the repository ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/dao/jcr? ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) Directory /usr/local/cvsrep/server/core/test/org/osaf/chandler/server/dao/slide added to the repository
Commit by: bcm Modified files: server/core/test/org/osaf/chandler/server/dao/slide Log message: Directory /usr/local/cvsrep/server/core/test/org/osaf/chandler/server/dao/slide added to the repository ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/dao/slide? ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
[Commits] (bcm) Directory /usr/local/cvsrep/server/core/test/org/osaf/chandler/server/manager/slide added to the repository
Commit by: bcm Modified files: server/core/test/org/osaf/chandler/server/manager/slide Log message: Directory /usr/local/cvsrep/server/core/test/org/osaf/chandler/server/manager/slide added to the repository ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/manager/slide? ___ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
