[Commits] (john) - Fixed an obvious bug with my subclass of View that was the result of my inadequate testing.

commits at osafoundation.org commits at osafoundation.org
Mon Mar 29 08:01:48 PST 2004


Commit by: john
Modified files:
osaf/chandler/Chandler/parcels/OSAF/views/main/parcel.xml 1.26 1.27
osaf/chandler/Chandler/parcels/OSAF/views/main/Main.py 1.1 1.2
osaf/chandler/Chandler/parcels/OSAF/framework/blocks/parcel.xml 1.55 1.56

Log message:
- Fixed an obvious bug with my subclass of View that was the result of my inadequate testing.
- Added a default attribute for menu operation as part of my plan to add a profile menu for testing why we're spending so much CPU when idle.


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/views/main/parcel.xml.diff?r1=text&tr1=1.26&r2=text&tr2=1.27
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/views/main/Main.py.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/blocks/parcel.xml.diff?r1=text&tr1=1.55&r2=text&tr2=1.56

Index: osaf/chandler/Chandler/parcels/OSAF/framework/blocks/parcel.xml
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/blocks/parcel.xml:1.55 osaf/chandler/Chandler/parcels/OSAF/framework/blocks/parcel.xml:1.56
--- osaf/chandler/Chandler/parcels/OSAF/framework/blocks/parcel.xml:1.55	Sat Mar 20 15:22:01 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/blocks/parcel.xml	Mon Mar 29 08:01:17 2004
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<!-- $Revision: 1.55 $ -->
-<!-- $Date: 2004/03/20 23:22:01 $ -->
+<!-- $Revision: 1.56 $ -->
+<!-- $Date: 2004/03/29 16:01:17 $ -->
 <!-- Copyright (c) 2003 Open Source Applications Foundation -->
 <!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
 
@@ -463,6 +463,7 @@
     
     <Attribute itemName="operation">
       <type itemref="docSchema:MenuEntry/operationEnumType"/>
+      <defaultValue type="docSchema:MenuEntry/operationEnumType">InsertBefore</defaultValue>
     </Attribute>
     
     <Attribute itemName="menuLocation">

Index: osaf/chandler/Chandler/parcels/OSAF/views/main/parcel.xml
diff -u osaf/chandler/Chandler/parcels/OSAF/views/main/parcel.xml:1.26 osaf/chandler/Chandler/parcels/OSAF/views/main/parcel.xml:1.27
--- osaf/chandler/Chandler/parcels/OSAF/views/main/parcel.xml:1.26	Fri Mar 26 16:14:58 2004
+++ osaf/chandler/Chandler/parcels/OSAF/views/main/parcel.xml	Mon Mar 29 08:01:16 2004
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<!-- $Revision: 1.26 $ -->
-<!-- $Date: 2004/03/27 00:14:58 $ -->
+<!-- $Revision: 1.27 $ -->
+<!-- $Date: 2004/03/29 16:01:16 $ -->
 <!-- Copyright (c) 2003 Open Source Applications Foundation -->
 <!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
 
@@ -49,7 +49,6 @@
   -->
   <Menu itemName="FileMenu">
     <title>File</title>
-    <operation>InsertBefore</operation>
     <menuLocation></menuLocation>
     <itemLocation></itemLocation>
     <helpString></helpString>
@@ -57,7 +56,6 @@
 
   <Menu itemName="EditMenu">
     <title>Edit</title>
-    <operation>InsertBefore</operation>
     <menuLocation></menuLocation>
     <itemLocation></itemLocation>
     <helpString></helpString>
@@ -65,7 +63,6 @@
     
   <Menu itemName="ViewMenu">
     <title>View</title>
-    <operation>InsertBefore</operation>
     <menuLocation></menuLocation>
     <itemLocation></itemLocation>
     <helpString></helpString>
@@ -73,7 +70,6 @@
 
   <Menu itemName="TestMenu">
     <title>Test</title>
-    <operation>InsertBefore</operation>
     <menuLocation/>
     <itemLocation/>
     <helpString/>
@@ -84,7 +80,6 @@
   -->
   <MenuItem itemName="QuitItem">
     <title>Quit</title>
-    <operation>InsertBefore</operation>
     <menuLocation>FileMenu</menuLocation>
     <itemLocation></itemLocation>
     <menuItemKind>Normal</menuItemKind>
@@ -95,10 +90,8 @@
   
   <MenuItem itemName="UndoItem">
     <title>Undo</title>
-    <operation>InsertBefore</operation>
     <menuLocation>EditMenu</menuLocation>
     <itemLocation></itemLocation>
-    <operation>InsertBefore</operation>
     <menuItemKind>Normal</menuItemKind>
     <accel>Z</accel>
     <helpString></helpString>
@@ -107,7 +100,6 @@
 
   <MenuItem itemName="RedoItem">
     <title>Redo</title>
-    <operation>InsertBefore</operation>
     <menuLocation>EditMenu</menuLocation>
     <itemLocation></itemLocation>
     <menuItemKind>Normal</menuItemKind>
@@ -118,7 +110,6 @@
 
   <MenuItem itemName="EditSeparator1">
     <title></title>
-    <operation>InsertBefore</operation>
     <menuLocation>EditMenu</menuLocation>
     <itemLocation></itemLocation>
     <menuItemKind>Separator</menuItemKind>
@@ -128,7 +119,6 @@
   
   <MenuItem itemName="CutItem">
     <title>Cut</title>
-    <operation>InsertBefore</operation>
     <menuLocation>EditMenu</menuLocation>
     <itemLocation></itemLocation>
     <menuItemKind>Normal</menuItemKind>
@@ -139,7 +129,6 @@
 
   <MenuItem itemName="CopyItem">
     <title>Copy</title>
-    <operation>InsertBefore</operation>
     <menuLocation>EditMenu</menuLocation>
     <itemLocation></itemLocation>
     <menuItemKind>Normal</menuItemKind>
@@ -150,7 +139,6 @@
 
   <MenuItem itemName="PasteItem">
     <title>Paste</title>
-    <operation>InsertBefore</operation>
     <menuLocation>EditMenu</menuLocation>
     <itemLocation></itemLocation>
     <menuItemKind>Normal</menuItemKind>
@@ -161,7 +149,6 @@
   
   <MenuItem itemName="EditSeparator2">
     <title></title>
-    <operation>InsertBefore</operation>
     <menuLocation>EditMenu</menuLocation>
     <itemLocation></itemLocation>
     <menuItemKind>Separator</menuItemKind>
@@ -171,7 +158,6 @@
   
   <MenuItem itemName="PreferencesItem">
     <title>Preferences</title>
-    <operation>InsertBefore</operation>
     <menuLocation>EditMenu</menuLocation>
     <itemLocation></itemLocation>
     <menuItemKind>Normal</menuItemKind>
@@ -182,7 +168,6 @@
 
   <MenuItem itemName="ViewSideBarItem">
     <title>View Sidebar</title>
-    <operation>InsertBefore</operation>
     <menuLocation>ViewMenu</menuLocation>
     <itemLocation></itemLocation>
     <menuItemKind>Check</menuItemKind>
@@ -193,7 +178,6 @@
 
   <MenuItem itemName="ViewNavigationBarItem">
     <title>View Navigation Bar</title>
-    <operation>InsertBefore</operation>
     <menuLocation>ViewMenu</menuLocation>
     <itemLocation></itemLocation>
     <menuItemKind>Check</menuItemKind>
@@ -204,7 +188,6 @@
 
   <MenuItem itemName="ViewBookmarksBarItem">
     <title>View Bookmarks Bar</title>
-    <operation>InsertBefore</operation>
     <menuLocation>ViewMenu</menuLocation>
     <itemLocation></itemLocation>
     <menuItemKind>Check</menuItemKind>
@@ -215,7 +198,6 @@
 
   <MenuItem itemName="ViewStatusBarItem">
     <title>View Status Bar</title>
-    <operation>InsertBefore</operation>
     <menuLocation>ViewMenu</menuLocation>
     <itemLocation></itemLocation>
     <menuItemKind>Check</menuItemKind>
@@ -226,7 +208,6 @@
 
   <MenuItem itemName="GenerateAllItem">
     <title>Generate Content Items</title>
-    <operation>InsertBefore</operation>
     <menuLocation>TestMenu</menuLocation>
     <itemLocation/>
     <menuItemKind>Normal</menuItemKind>
@@ -237,7 +218,6 @@
 
   <MenuItem itemName="GenerateContactItem">
     <title>Generate Contacts</title>
-    <operation>InsertBefore</operation>
     <menuLocation>TestMenu</menuLocation>
     <itemLocation/>
     <menuItemKind>Normal</menuItemKind>
@@ -248,7 +228,6 @@
 
   <MenuItem itemName="GenerateCalendarItem">
     <title>Generate Calendar Events</title>
-    <operation>InsertBefore</operation>
     <menuLocation>TestMenu</menuLocation>
     <itemLocation/>
     <menuItemKind>Normal</menuItemKind>
@@ -259,7 +238,6 @@
 
   <MenuItem itemName="GenerateNoteItem">
     <title>Generate Notes</title>
-    <operation>InsertBefore</operation>
     <menuLocation>TestMenu</menuLocation>
     <itemLocation/>
     <menuItemKind>Normal</menuItemKind>
@@ -270,7 +248,6 @@
 
   <MenuItem itemName="ImportContactItem">
     <title>Import Contacts from Outlook CSV</title>
-    <operation>InsertBefore</operation>
     <menuLocation>TestMenu</menuLocation>
     <itemLocation/>
     <menuItemKind>Normal</menuItemKind>
@@ -281,7 +258,6 @@
 
   <MenuItem itemName="CheckRepositoryItem">
     <title>Check Repository</title>
-    <operation>InsertBefore</operation>
     <menuLocation>TestMenu</menuLocation>
     <itemLocation/>
     <menuItemKind>Normal</menuItemKind>
@@ -559,9 +535,9 @@
     <alignmentEnum>grow</alignmentEnum>
     <stretchFactor>1.0</stretchFactor>
   </BoxContainer>
-  
-  <View itemName="MainView">
-        itemClass="OSAF.views.main.MainView.MainView">
+
+  <View itemName="MainView"
+        itemClass="OSAF.views.main.Main.MainView">
     <!-- Menus -->
     <childrenBlocks itemref="doc:FileMenu"/>
     <childrenBlocks itemref="doc:QuitItem"/>

Index: osaf/chandler/Chandler/parcels/OSAF/views/main/Main.py
diff -u osaf/chandler/Chandler/parcels/OSAF/views/main/Main.py:1.1 osaf/chandler/Chandler/parcels/OSAF/views/main/Main.py:1.2
--- osaf/chandler/Chandler/parcels/OSAF/views/main/Main.py:1.1	Fri Mar 26 16:14:58 2004
+++ osaf/chandler/Chandler/parcels/OSAF/views/main/Main.py	Mon Mar 29 08:01:16 2004
@@ -1,17 +1,17 @@
-__version__ = "$Revision: 1.1 $"
-__date__ = "$Date: 2004/03/27 00:14:58 $"
+__version__ = "$Revision: 1.2 $"
+__date__ = "$Date: 2004/03/29 16:01:16 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
 import application.Globals as Globals
-from ContainerBlocks import *
+from OSAF.framework.blocks.Views import View
 from OSAF.framework.notifications.Notification import Notification
 from wxPython.wx import *
 
 import OSAF.framework.utils.imports.OutlookContacts as OutlookContacts
 import OSAF.contentmodel.tests.GenerateItems as GenerateItems
 
-class Main(View):
+class MainView(View):
     """
       Main Chandler view contains event handlers for Chandler
     """



More information about the Commits mailing list