raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
622 Commits 5 Branches 0 Tags 296 MiB
058322620d
Commit Graph

528 Commits

Author SHA1 Message Date
Tim Bentley
b201aa30d5 First attempt at serviceitem code 2009-05-02 12:00:35 +01:00
Raoul Snyman
55cd0b90cd Replaced the old logos and graphics with the new ones, did some coding-standards-cleanup, and fixed a bug in the OpenLPToolbar code where it discarded Unicode strings. 2009-05-02 00:26:43 +02:00
Raoul Snyman
2d9cfa9f75 Merged the ~raoul-snyman/openlp/dualdisplay changes into trunk. 
bzr-revno: 437
 2009-05-01 19:36:51 +02:00
Raoul Snyman
7bac2ac6e3 Minor fix. 2009-05-01 14:32:08 +02:00
Raoul Snyman
717e56fff7 Updated the handling of dual displays. 2009-05-01 13:50:09 +02:00
Tim Bentley
0196f15549 Stop Custom Slide having no slides 
Changes to renderer and Rendermanager
 2009-05-01 06:02:53 +01:00
Tim Bentley
4fc7b974fa Fix Rendering to allow dynamic placement of Main and Footers 
Fix bugs in CustomPlugin
 2009-04-30 22:02:28 +01:00
Tim Bentley
e9279b4b12 update Custom plugin to work with Renderer 2009-04-29 20:21:18 +01:00
Tim Bentley
ba6e581223 Start to clean up rendermanger 
fix bugs in rendereing 
fix thememanager to allow new themes to be created
 2009-04-29 20:07:13 +01:00
Tim Bentley
c8726a3892 Latest version with new displays 2009-04-28 20:40:51 +01:00
Tim Bentley
2dbe7d99a2 Changes to code to fix review comments. 2009-04-28 20:20:03 +01:00
Tim Bentley
e6c2ca29c8 Add new display window. 2009-04-28 20:19:20 +01:00
Tim Bentley
0facad72d6 Remove Print statement 
Fix missing Theme bug
 2009-04-25 07:38:21 +01:00
Tim Bentley
2457da9d88 Add version number to splash screem 
Add ability to preview to preview controller
Add render manager to control rendering
Fix bugs in renderer
Add inital rendering to custom and bible plugins
 2009-04-25 07:11:15 +01:00
Tim Bentley
aeb79120f4 Fix name bug 2009-04-25 07:09:47 +01:00
Tim Bentley
4696564c09 Add update to ServiceManager of Themes from ThemeManager 2009-04-23 19:22:54 +01:00
Tim Bentley
a3e2bce831 now we can save the theme as new or overrite 2009-04-23 19:12:36 +01:00
Tim Bentley
d85a0ba293 Fix renderer name 
Introduce rendermanager
 2009-04-22 20:46:10 +01:00
Tim Bentley
a1368e1f76 Finish Theme Editing 2009-04-22 18:28:32 +01:00
Tim Bentley
852e24ab35 More Theme Changes 
State corrections 
XML boolean fixes
 2009-04-21 20:45:50 +01:00
Tim Bentley
c8094b717f Add more controls and fix xml errors 2009-04-20 21:03:04 +01:00
Tim Bentley
0f80ab4266 Move Plugin Manager to core/lib 2009-04-20 19:22:42 +01:00
Tim Bentley
13a2339841 Remove unused file 2009-04-20 05:58:17 +01:00
Tim Bentley
cf2ad84e74 More renderer cleanups 
More ThemeManager fixes
Sortout XML tag name errors
 2009-04-19 21:07:52 +01:00
Tim Bentley
570a35ae65 Renderer cleanups 
Remove code duplication and simplifications
 2009-04-19 20:12:18 +01:00
Tim Bentley
6a309c43ff move the renderer.py class to core.lib 2009-04-19 19:21:22 +01:00
Tim Bentley
79e7e09d65 Add theme delete functionality 2009-04-19 19:17:17 +01:00
Tim Bentley
a02835f0f8 Add new dialog and fix the Theme import code not to include old style preview code 2009-04-19 09:15:40 +01:00
Tim Bentley
a662404122 Fix XML schema for naming 
Fix ThemeManager and Renderer to cover changes
Move code for Boolean Config issues
Various code style fixes
 2009-04-15 05:58:51 +01:00
Tim Bentley
6b4a5ff5d9 Allow existing themes to be edited (well at least viewed) 2009-04-11 16:16:02 +01:00
Tim Bentley
61dbab1899 Amend theme XML to handle missing data 
Add some value management on Theme dialog
 2009-04-11 08:33:45 +01:00
Tim Bentley
192088165e Add Theme Manager files 
Add Initial display of new theme
 2009-04-11 06:43:52 +01:00
Tim Bentley
d025d1ebf6 Add New Theme Event Handlers to plugins 2009-04-10 07:06:41 +01:00
Tim Bentley
9b29d2b668 Change ThemeManager to use new XML format and renderer API's 
Put in Propper logging for Screen resolution detection.
 2009-04-10 06:59:40 +01:00
Tim Bentley
b581fcab8f Add screen list to General Tab 
Add new Font bits to XML code
Add guards to renderer incase of no second text area
 2009-04-10 06:48:57 +01:00
Tim Bentley
5d29da2547 Update Renderer to allow Main and Footer boxes on the display 2009-04-09 20:12:47 +01:00
Tim Bentley
8ea6f35f1f Generate Array of Screens and their sizes and pass through components. 2009-04-09 19:50:20 +01:00
Tim Bentley
1fb2b366b2 Fix ThemeXML class as per review comments 
Change all references to it
 2009-04-07 20:45:21 +01:00
Tim Bentley
0dfe60ef9f Fix Problems from last merge review 
Get Custom Plugin theme combo working following event post from ThemeManager
 2009-04-07 20:03:36 +01:00
Tim Bentley
0e7dfb9fc4 Combine patch from previous tree which I messed up. Here is a summary of the changes. 
444. By Tim Bentley 23 hours ago

    Add new event for Theme Loading
443. By Tim Bentley 23 hours ago

    Add Eventing after Themes loaded to tell plugins the themes have changed
442. By Tim Bentley on 2009-04-04

    Store Theme name in list for correct display
441. By Tim Bentley on 2009-04-04

    Add ThemeManagerDialog
    More Rendering improvements
440. By Tim Bentley on 2009-04-04

    Add Themes to Bible Tab and default values
439. By Tim Bentley on 2009-04-04

    Add rendering for Circles and amend XML schema accordingly
438. By Tim Bentley on 2009-04-04

    Renderer now supports linear gradients correctly
    Update XML to include direction
    Add Booleans instead of 0/1 to XML schema
437. By Tim Bentley on 2009-04-03

    More ThemeManager changes
    Fix Rendering and theme handling
    Generate PNG theme on conversion
436. By Tim Bentley on 2009-04-01

    Fix up Theme XML code to work with strings and files.
    Fix Render.py to work with new XML schema
435. By Tim Bentley on 2009-04-01

    Import version 2 xml and build object.
 2009-04-06 19:45:45 +01:00
Tim Bentley
95409076d0 Update Render.py to handle footers to slides if required. 
Values will eventually come from Theme.
 2009-03-29 17:51:42 +01:00
Tim Bentley
4ac2ed4fd6 Update Render to use Qgradient instead of home built code. 
Colors hard coded for now.
 2009-03-29 15:38:23 +01:00
Tim Bentley
8aa67b5a8b Fix bugs around ThemeManager 
Add themexmlhandler to manage xml marshalling for themes
 2009-03-28 20:12:22 +00:00
Tim Bentley
68501479d7 Add Theme Preview to ThemeManager 2009-03-28 07:01:00 +00:00
Tim Bentley
1e32183a2a Add Import functionality to Theme Manager 2009-03-28 05:43:30 +00:00
Tim Bentley
381afda908 Fixed duplicate Image plugin loading 
Fixed error in Custom Plugin stopping it load
 2009-03-25 20:30:48 +00:00
Tim Bentley
e2715e0358 More corrections following revert 2009-03-24 06:07:03 +00:00
Tim Bentley
ddde031adb Final changes following a revert and removal. 
Finish plugin.py
Add getThemes hook to thememanager.py
 2009-03-23 20:18:06 +00:00
Tim Bentley
66f13e5ede Clean up Plugin Interface to be more Generic 
Clean up Mainwindow for adding plugins
Add ThemeManager to Main window and pass to plugins
Add event Manager code to plugins and define some listners
Revert changes to Alert Form.
 2009-03-23 19:17:07 +00:00
Tim Bentley
62f48a33f2 Continue fixing the EventManager usage 
Use Mainwindow to trigger the loading of the themes by the ServiceManager
 2009-03-22 20:20:45 +00:00
Tim Bentley
6a0eaa2cfe Clean up Plugin Interface to be more Generic 
Clean up Mainwindow for adding plugins
Add ThemeManager to Main window and pass to plugins 
Add event Manager code to plugins and define some listners
Update AlertDialog to send message and allow text to be entered
 2009-03-22 07:13:34 +00:00
Tim Bentley
b8c0ee1d70 Add ThemeManager and EventManager 2009-03-22 07:11:05 +00:00
Tim Bentley
be3725a6fe Remove PluginUtils as no longer used all references migrated 
bzr-revno: 426
 2009-03-19 17:36:06 +00:00
Tim Bentley
1a8ab17bbb Update Presentation Plugin to match rest of the plugins 
Fix style errors as discovered

bzr-revno: 425
 2009-03-19 17:31:33 +00:00
Tim Bentley
ca32157e9c Removal of Plugin utils continues 
bzr-revno: 424
 2009-03-18 17:19:30 +00:00
Tim Bentley
d13b2efc22 Start Custom Service Item 
Fix Image config problems

bzr-revno: 423
 2009-03-17 05:05:04 +00:00
Tim Bentley
4bbce39f35 Fix up Bible Plugin to new standards. 
bzr-revno: 422
 2009-03-16 17:33:51 +00:00
Tim Bentley
e99239ef12 Big cleanup. 
Custom and Video Plugins up to latest standard (MVC)
Config now working with new handles Video and Images.
Moved strings from "" to u'' where found.

bzr-revno: 421
 2009-03-15 19:31:33 +00:00
Tim Bentley
0d33ba5668 Add delete option to Custom plugin 
bzr-revno: 420
 2009-03-15 06:35:07 +00:00
Tim Bentley
55bd3cc772 Fix errors in redisplay of data 
Remove cut and paste rubbish

bzr-revno: 419
 2009-03-14 08:11:25 +00:00
Tim Bentley
f1163003e6 Fix screen refresh returning from Edit dialog. 
bzr-revno: 418
 2009-03-14 07:09:10 +00:00
Tim Bentley
016380bc41 Clean up UI and add translation code. 
bzr-revno: 417
 2009-03-14 07:08:40 +00:00
Tim Bentley
268f6361b5 Fix up quote problems in SongXMLHandler 
Add MVC to Custom
Add Update to Custom
Remove xml1.py as has served it's purpose

bzr-revno: 416
 2009-03-14 07:08:15 +00:00
Raoul Snyman
eaa1aa81fd Fixed Tim Bentley's problem with the loading sequence of modules. 
Changed some names and quotes in xml1.py.

bzr-revno: 415
 2009-03-13 17:49:51 +00:00
Tim Bentley
b525734702 Fix Unicode error on database write 
Try to add TextItemData again

bzr-revno: 414
 2009-03-13 16:00:14 +00:00
Tim Bentley
6224795661 Add Classes for songxml, video tidy up and custom plugins 
bzr-revno: 413
 2009-03-13 06:13:11 +00:00
Tim Bentley
71a3ac4c78 Start to add data to database 
bzr-revno: 412
 2009-03-13 06:12:22 +00:00
Martin Thompson
90a91aa788 Updated tests to pass again. 
Found some device dependent problems in the tests of the theme
rendering (when monitor resolution changes, so does font size (in
pixels)). This meant that the tests failed (as they are comparisons
with golden-bitmaps). Have updated the tests to do a more "approximate
comparison", with a low tolerance.  This is slow currently, could do
with optimising.

bzr-revno: 411
 2009-03-12 20:19:24 +00:00
Martin Thompson
1d9569236d nothing 
bzr-revno: 410
 2009-03-12 20:18:14 +00:00
Martin Thompson
f1a6057b08 Removed some commented out code 
bzr-revno: 409
 2009-03-12 20:17:31 +00:00
Tim Bentley
21bfa234e8 Add SongXMLHander Class 
Tidy up OSIS Bible importer
Start to move Video Plugin to mediaitem and remove PluginUtils

bzr-revno: 408
 2009-03-12 19:52:37 +00:00
Tim Bentley
cf2067fb61 Fix Custom plugin to add it self to config if not present. 
Correct spacing error in code.

bzr-revno: 407
 2009-03-11 06:39:11 +00:00
Tim Bentley
5c3136fdbe Fix manager to stop accessing config 
bzr-revno: 406
 2009-03-11 06:28:48 +00:00
Tim Bentley
8b635e6cb5 Open up database 
bzr-revno: 404
 2009-03-11 06:27:16 +00:00
Raoul Snyman
051b314da8 Fixed the displayResults method of SongMediaItem to display 1 song + all authors, rather than an instance of a song for each author of that song. 
Fixed up the topics management dialog a bit.
Corrected the spacing on the eventreceiver.py file.
Corrected the calling of the receiver to use the static methods without creating an instance of the Receiver class each time.

bzr-revno: 403
 2009-03-10 16:46:25 +00:00
Raoul Snyman
86bde695ea Some tweaks to the songs plugin. 
bzr-revno: 402
 2009-03-09 18:47:37 +00:00
Raoul Snyman
735527d558 Moved code out into SongMediaItem 
bzr-revno: 401
 2009-03-09 12:49:55 +00:00
Scott Guerrieri
34ace15939 Fixed a down arrow functionality issue on the editcustomform.py 
bzr-revno: 400
 2009-03-09 02:16:38 +00:00
Raoul Snyman
6306be9eda Added the long lost media item! 
bzr-revno: 399
 2009-03-08 20:02:50 +00:00
Raoul Snyman
f844f696a1 Moved image media manager item out into it's own class. 
bzr-revno: 398
 2009-03-08 12:41:07 +00:00
Tim Bentley
904212c587 Add slide swapping to dialog 
Fixed Context menu

bzr-revno: 397
 2009-03-08 06:36:05 +00:00
Raoul Snyman
036dfef2eb Added the verse editing form and modified the song editing form to accommodate verses. 
bzr-revno: 396
 2009-03-07 21:38:59 +00:00
Tim Bentley
bd7577a0f1 Fix field names and more state changes 
bzr-revno: 395
 2009-03-07 20:36:12 +00:00
Tim Bentley
710b60bc19 Fix Updates to window 
bzr-revno: 394
 2009-03-07 17:45:11 +00:00
Tim Bentley
233e0c25de Update state machine for buttons. 
bzr-revno: 393
 2009-03-07 17:13:36 +00:00
Tim Bentley
b5550abda9 Add new features and edit validation 
Text can be added , cleared and edited.

bzr-revno: 392
 2009-03-07 17:13:19 +00:00
Tim Bentley
749590386d Correct classpath errors with images 
bzr-revno: 391
 2009-03-07 09:21:27 +00:00
Tim Bentley
6304f73b8e Finish adding custom plugin bits 
bzr-revno: 390
 2009-03-07 09:20:56 +00:00
Tim Bentley
7badfb650f Initial Release of Custom plugin. 
All bits present but does not work!

bzr-revno: 389
 2009-03-07 09:20:26 +00:00
Tim Bentley
b32703e845 More bible fixes after move 
Method name standardisation
OSIS bible import clean up
OSIS bible import parser improvements.

bzr-revno: 388
 2009-03-07 06:59:08 +00:00
Tim Bentley
d559adcbe6 Update copyright 
bzr-revno: 387
 2009-03-07 06:58:39 +00:00
Raoul Snyman
0e28795da2 Moved some files in the image plugin. 
bzr-revno: 386
 2009-03-06 23:41:22 +00:00
Raoul Snyman
6c78f9b0fe Moved some files into the relevant module. 
bzr-revno: 385
 2009-03-06 19:02:18 +00:00
Raoul Snyman
f56c36787c Added the lib module in the images plugin. 
bzr-revno: 384
 2009-03-06 18:58:37 +00:00
Tim Bentley
81a7a142e4 Fix new chapter code in presentation logic 
bzr-revno: 383
 2009-03-06 18:00:52 +00:00
Tim Bentley
4ad8b74167 Fix up Bible bugs following addition of Tabs and Move code split 
bzr-revno: 382
 2009-03-06 07:18:30 +00:00
Tim Bentley
980ed505e2 Tidy up Video and Bible tab code. 
bzr-revno: 381
 2009-03-06 06:05:01 +00:00
Tim Bentley
6af1637550 Config for bibles 
bzr-revno: 380
 2009-03-05 20:58:34 +00:00
Raoul Snyman
c9ef88cfdc Fixed up the settings dialog and the alerts tab a bit. 
bzr-revno: 379
 2009-03-05 20:31:17 +00:00
Tim Bentley
dffcec7ca3 Change Tab load code to base class instead of plugins 
Code VideoTab to save and reload value

bzr-revno: 378
 2009-03-05 18:16:10 +00:00
Raoul Snyman
8533912cea Fixed the main form splitter problem, set the margins and spacing on some of the layouts in the bible media item. 
bzr-revno: 377
 2009-03-05 10:52:55 +00:00
Martin Thompson
c4c3fb4851 Tidied 
bzr-revno: 376
 2009-03-04 21:57:18 +00:00
Martin Thompson
3370a7f7c1 Pulled select row helper function out 
bzr-revno: 375
 2009-03-04 21:56:50 +00:00
Martin Thompson
940eb089e9 Merging multiple items done 
bzr-revno: 374
 2009-03-04 21:56:27 +00:00
Martin Thompson
5660ef45fd A few more tests 
bzr-revno: 373
 2009-03-04 21:55:50 +00:00
Martin Thompson
068f963077 First test of service manager works 
bzr-revno: 372
 2009-03-04 21:55:24 +00:00
Martin Thompson
cf364ae208 Removed list with previews again 
bzr-revno: 371
 2009-03-04 21:54:49 +00:00
Martin Thompson
bb95123534 Updating 
bzr-revno: 370
 2009-03-04 21:54:26 +00:00
Martin Thompson
b662b16c6f Still doing controllers, but missed this one 
bzr-revno: 369
 2009-03-04 21:54:00 +00:00
Martin Thompson
f1f235efac Started looking at slide controllers again 
bzr-revno: 368
 2009-03-04 21:53:31 +00:00
Martin Thompson
2be33e6c66 Pre merge from SVN 
bzr-revno: 367
 2009-03-04 21:53:09 +00:00
Martin Thompson
bef8369e86 Started splitting out the service manager 
bzr-revno: 366
 2009-03-04 21:52:32 +00:00
Tim Bentley
c451048355 Complete Alerts tab state saving , and reloading. 
bzr-revno: 365
 2009-03-04 19:55:37 +00:00
Tim Bentley
2ce0aafcc9 Update alerttab to save font and color and provide preview. 
bzr-revno: 364
 2009-03-04 19:25:27 +00:00
Tim Bentley
d924329cf0 Add persistance to Alerts Tab and default colors 
bzr-revno: 363
 2009-03-03 17:21:47 +00:00
Tim Bentley
6ff73a17b8 Tidy up more code and add color to alerts font 
bzr-revno: 361
 2009-03-02 22:37:03 +00:00
Tim Bentley
598509ff60 Tidy ups after merge 
bzr-revno: 360
 2009-03-02 22:36:42 +00:00
Tim Bentley
67ec9c9ee5 Correct the Config name. 
bzr-revno: 359
 2009-03-02 22:36:06 +00:00
Tim Bentley
2faca83bd9 More Fixes and clean ups 
bzr-revno: 358
 2009-03-02 22:35:32 +00:00
Raoul Snyman
86115ec964 Plugins pass themselves as the parent to MediaManagerItem to facilitate easier communication between each plugin's set of objects. 
bzr-revno: 357
 2009-03-02 22:12:14 +00:00
Raoul Snyman
b2c51566b4 Added the Bible Media Item, moved all the media manager code out to the bible media item. 
bzr-revno: 356
 2009-03-02 21:57:49 +00:00
Tim Bentley
fa1f2a8ec3 More updates and add config to settingstab. 
bzr-revno: 355
 2009-03-01 20:21:57 +00:00
Raoul Snyman
744234a183 Updated some funky layouts on the settings tabs. 
bzr-revno: 354
 2009-03-01 14:36:49 +00:00
Tim Bentley
1744d21a82 Settings clean ups and fixes. 
Added Video and Bible.
Cleaned up About and Alert dialogs.
Removed old unrequired code

bzr-revno: 353
 2009-03-01 09:13:27 +00:00
Raoul Snyman
a0d5bb100c Added a songs settings tab. 
bzr-revno: 352
 2009-02-28 23:31:24 +00:00
Raoul Snyman
1c47f553f3 Rearranged the settings tab system to work the same way as the media manager item system. 
bzr-revno: 351
 2009-02-28 23:19:45 +00:00
Tim Bentley
3477003106 Rename settingstab to settingstabitem 
bzr-revno: 350
 2009-02-28 11:18:38 +00:00
Tim Bentley
5e67ab6dc9 Move bible settings to plugin 
rename settings to settingsform to keep to the standard naming

bzr-revno: 349
 2009-02-28 11:18:04 +00:00
Tim Bentley
fce0085b90 Add General Tab and Create Virtual plugin settings 
bzr-revno: 348
 2009-02-28 08:10:09 +00:00
Tim Bentley
c326d35bdb Start of the Settings dialog development. 
Add infrastructure to load plugin hooks to settings dialog
Amend Video to add settings tab.

bzr-revno: 347
 2009-02-28 07:23:48 +00:00
Tim Bentley
45cd4c181e Final tidy up for bible plugin for now. 
bzr-revno: 346
 2009-02-24 21:00:00 +00:00
Tim Bentley
b05e609a41 Tidy up search code some more. 
bzr-revno: 345
 2009-02-24 20:24:01 +00:00
Tim Bentley
db2dd4cd87 Fix load bugs on 1st time for bible chapter. 
bzr-revno: 344
 2009-02-23 20:56:54 +00:00
Tim Bentley
814c9ad79a Fix up book search to work with abbreviations 
bzr-revno: 343
 2009-02-23 19:46:24 +00:00
Tim Bentley
8a01d651c0 Update Advanced Search again! 
bzr-revno: 342
 2009-02-23 19:03:26 +00:00
Tim Bentley
5fc7e69cb2 Fix up more errors in advanced search code 
bzr-revno: 341
 2009-02-22 07:48:38 +00:00
Tim Bentley
05009dc82f Fix up copyright year. 
Yes I was bored ;-)

bzr-revno: 340
 2009-02-22 07:44:08 +00:00
Tim Bentley
78a3b04ffd Update HTTP fetch to get chapter name 
Replace chapter name if HTTP fetch.  Add Testaments and abbreveations to database.
More field name tidy ups and comments

bzr-revno: 339
 2009-02-21 20:40:38 +00:00
Tim Bentley
468f6cc256 Fix up after merge clash 
bzr-revno: 338
 2009-02-21 20:02:33 +00:00
Tim Bentley
ec6c106009 Change config names 
bzr-revno: 337
 2009-02-21 19:49:46 +00:00
Martin Thompson
603ac29b90 Moved toolbars out into separate class, as they are used by more than Media Manager items 
Move Service Manager into own class so it can do some real work

bzr-revno: 336
 2009-02-21 19:23:54 +00:00
Martin Thompson
851c669e8b Got screen to update after adding and removing files 
Added tooltip of entire path name

bzr-revno: 335
 2009-02-20 21:16:01 +00:00
Martin Thompson
f0177bdbda Image plugin previews images! 
bzr-revno: 334
 2009-02-20 21:15:42 +00:00
Martin Thompson
8a8f5da5a7 Trying to get a nice image selector going 
bzr-revno: 333
 2009-02-20 21:15:14 +00:00
Martin Thompson
8816b6c2dc About to make some big changes to the imageplugin... 
bzr-revno: 332
 2009-02-20 21:14:52 +00:00
Martin Thompson
ad48e1f4e6 Allowed slide contrllers to be passed to the plugins. It's broken at 
the moment though!

bzr-revno: 331
 2009-02-20 21:13:04 +00:00
Tim Bentley
d1a6cc585b Tidy up code and comments 
bzr-revno: 330
 2009-02-20 21:03:45 +00:00
Tim Bentley
e54f83a228 Fix list box and naming 
bzr-revno: 329
 2009-02-20 21:03:24 +00:00
Tim Bentley
33ac1c3d30 fix state machine for fields 
bzr-revno: 328
 2009-02-20 17:11:10 +00:00
Tim Bentley
1f28305ac3 Clean up code and simplify. 
bzr-revno: 327
 2009-02-20 17:10:53 +00:00