Commit Graph

1804 Commits

Author SHA1 Message Date
Jon Tibble
cd3fe8b38f Whitespace, linewrap and spelling fixes 2009-09-02 02:44:09 +01:00
Tim Bentley
3ba22197dd Plugin Clean up for trying to display non selected items 2009-08-31 22:53:35 +01:00
Tim Bentley
63f67ea756 EventManager Removal - complete 2009-08-26 06:00:19 +01:00
Tim Bentley
9b826aab56 EventManager Removal part 2 2009-08-25 06:18:09 +01:00
Tim Bentley
7226d4a232 EventManager Removal part 1 2009-08-24 21:05:46 +01:00
Tim Bentley
f6578fc000 Song Exit error message 2009-08-15 20:19:34 +01:00
Tim Bentley
48bca4155d Plugin Clean up to remove extra code and remove need for Theme_Manager 2009-08-15 12:02:24 +01:00
Tim Bentley
b774cc10be Clean up Event Handling and remove call the ThemeManager from plugins 2009-08-15 08:33:01 +01:00
Tim Bentley
10ba1db5f3 Fix bug on song saving
Add new screen for Plugin status
Add new presentation plugin code
2009-08-13 21:02:38 +01:00
Tim Bentley
46cf6c763c Clean up event structure and add calling names
Clean up Remote client to remove qt dependancy
2009-08-12 05:57:24 +01:00
Tim Bentley
38f8005d5d Fix code so we can save songs 2009-08-08 07:19:09 +01:00
Raoul Snyman
bf09df4f0b Made some minor modifications to the edit song dialog, one or two other bug fixes. 2009-08-06 23:30:14 +02:00
Raoul Snyman
2fb7ff511e Make the "Song Maintenance" button on the SongEdit form to work; Include a merge from trunk. 2009-08-06 16:51:38 +02:00
Raoul Snyman
4e1656961b Merged from trunk. 2009-08-06 15:17:36 +02:00
Raoul Snyman
8c010efe5a Changed the layout of the Song Edit form, making it slightly easier for the average PC Joe to digest. 2009-08-04 22:23:33 +02:00
Tim Bentley
2816277af1 New features and fixes.
bzr-revno: 499
2009-08-04 18:18:47 +01:00
Raoul Snyman
dc352c28d3 Merged in some changes for the song maintenance form.
bzr-revno: 498
2009-08-03 21:59:19 +02:00
Raoul Snyman
708a62ad47 Switched around the order of some dialogs when deleting items in the Song Maintenance dialog. 2009-08-02 21:10:54 +02:00
Tim Bentley
13f016cf5f Minor bug fixes 2009-08-02 17:13:59 +01:00
Raoul Snyman
2b237bb488 Made relative imports absolute.
Changed self.NameEdit.text() == u'' to not self.NameEdit.text()
2009-07-26 15:51:32 +02:00
Raoul Snyman
782304114e Merged in changes from the songmaintenance branch
bzr-revno: 497
2009-07-26 15:02:37 +02:00
Raoul Snyman
67f4669df2 Updated author validation to validate the display name as well. 2009-07-26 12:02:18 +02:00
Raoul Snyman
1915f93b6e Added the rest of the validation and tested that it all works. 2009-07-26 10:36:57 +02:00
Raoul Snyman
7eac26d98a Added validation to the Author dialog. 2009-07-26 00:07:59 +02:00
Raoul Snyman
6cb9222aba Last few touches to the song maintenance. 2009-07-25 00:13:40 +02:00
Raoul Snyman
d4d6a88c6f Lots of yummy updates to the song maintenance form. 2009-07-24 22:40:34 +02:00
Raoul Snyman
af9b8edd6f The new song maintenance dialog... getting there. 2009-07-23 22:20:49 +02:00
Raoul Snyman
cf5b415640 Added the start of a song maintenance dialog. 2009-07-22 10:20:42 +02:00
Tim Bentley
8e0901ef67 Fix bug where empty lists fail to display dialogs 2009-07-22 07:14:34 +01:00
Tim Bentley
9da5a3223f Fix song conversions
Fix focus for Song dialog
Preserve state when moving serviceitems
2009-07-21 19:10:14 +01:00
Tim Bentley
2885a08ed2 Fix combo box errors 2009-07-19 08:58:37 +01:00
Tim Bentley
4552fb543a Add song conversion script
Remove conversion code as it did not work!
More Song for tidy ups
2009-07-19 07:31:08 +01:00
Tim Bentley
6a495d451e Finish fixing the songedit form so it now saves. 2009-07-18 08:46:17 +01:00
Tim Bentley
eb47246f18 Fix up song migration code so we only have 1 author
Fix up Songedit dialog to refesh lists on entry 
Fix up meta data bug
2009-07-18 08:30:26 +01:00
Tim Bentley
b1fd518ff6 Text clean ups
Move Author / Topic / Book edit form Song Edit
Add above to Toolbar
Add Icons
2009-07-18 06:43:50 +01:00
Tim Bentley
6fdd5d028f Fix none for new authors
Fix focus bugs in Song child windows
2009-07-14 19:38:33 +01:00
Tim Bentley
66b6836406 More bug fixes
Bibles have correct footers
Songs now save all data and have correct focus
2009-07-13 18:02:38 +01:00
Tim Bentley
f576e9d83d Look a songs Focus issues
Fix Bibles footers
2009-07-12 15:56:06 +01:00
Raoul Snyman
f12949eb0c Fixed up a few logging things, a few bits of indentation, and resolved some conflicts from the last update.
bzr-revno: 484
2009-07-08 07:12:16 +02:00
Tim Bentley
e5a33d2f30 Added Martin's changes to my tree
Resolve confilcts
Get plugins working again and clean up duplicate code
Remove the references to listwithpreviews
2009-07-04 06:52:30 +01:00
Tim Bentley
a4a0b521a4 More cleanups and bug fixes. 2009-06-27 20:55:55 +01:00
Tim Bentley
c981cb21d2 More fixes and cleanups 2009-06-26 19:54:05 +01:00
Tim Bentley
b76790bc2f Fixes and cleanups following MediaManager Merge 2009-06-26 18:51:43 +01:00
Martin Thompson
16716372f0 Merged changes from trunk
Created a BaseListWithDnD to allow plugins to inherit their Drag and
drop handler without too much copy and paste Also moved the basic DnD
handler to the Plugin base class, again to reduce copy/paste.  The
Image plugin uses this functionality, others are TBD
2009-06-24 21:15:24 +01:00
Martin Thompson
726c8826b2 Merged from trunk 2009-06-24 20:46:06 +01:00
Tim Bentley
69df159f17 Change Topics Form handling to allow save button to be enabled. 2009-06-24 07:15:04 +01:00
Tim Bentley
c77cbb0aa1 Clean up migration database tables 2009-06-24 07:10:13 +01:00
Tim Bentley
0b0013331a Commit Fixes to Conversion Utilities
Changes to Presentation Plugin
2009-06-23 17:25:40 +01:00
Tim Bentley
a1b60e034e Fix error on song saving 2009-06-23 16:48:31 +01:00
Martin Thompson
d84c99122f Displayed video+audio+slider
Tweaked some unicode strings
2009-06-22 21:44:35 +01:00
Tim Bentley
3c255076f9 Add Author Search to Song Plugin 2009-06-21 18:45:59 +01:00
Tim Bentley
a95b55f905 Bug fixes to handle window events with no selection
Comment and file cleanups
Add extra filter to file list 
ServiceManager record movements and changes to OOS to allow for files to be stored
2009-06-19 19:41:38 +01:00
Tim Bentley
42d196d751 Corrections from last merge
Clean up Bibles plugin
Clean up Custom plugin
Fix python 2.6 error mesage.
2009-06-17 06:11:16 +01:00
Tim Bentley
e2b8af7073 Mass Unicode migration
Fix bugs found in retesting the app.
2009-06-16 19:21:24 +01:00
Tim Bentley
50d41d562e Complete Song Plugin Tidy Up
All lists now use same MVC mechanisms
Code in the same style.
2009-06-14 16:12:40 +01:00
Tim Bentley
69a846c7c9 Update list handling for Plugin and Edit Screen
Add error handling displays to show whats in error
2009-06-14 14:50:56 +01:00
Tim Bentley
d96267934c Reload list only if title changes. 2009-06-14 08:25:39 +01:00
Tim Bentley
dc40e79ee7 Add Song Theme Handling 2009-06-14 08:02:58 +01:00
Tim Bentley
fbc16a0270 Add Song Book Handling 2009-06-14 07:48:38 +01:00
Tim Bentley
6640d79eb8 Add Topic handling 2009-06-14 07:30:09 +01:00
Tim Bentley
fb815b8ca6 New Song Works
Speed Up media Item
Fix Song definition
2009-06-13 17:15:55 +01:00
Tim Bentley
4f7310a5a6 Add double click to allow servicemanager to live
Add StateMachine to Song Editor (Verses and Authors)
Allow Authors to be Added and Removed from Songs
2009-06-13 07:46:13 +01:00
Tim Bentley
e8ae29e620 Add XML Lyrics handling to Songs. 2009-06-12 18:20:40 +01:00
Tim Bentley
dfb467e830 Add Alternative tile
Code the search field creations
2009-06-12 06:13:54 +01:00
Tim Bentley
56680463c7 Replace str with unicode
refresh the list screen when we change things
2009-06-11 22:14:12 +01:00
Tim Bentley
5871e3419d Corrent Song footer to display correct info
Start of saving extra song data.
2009-06-11 06:13:10 +01:00
Tim Bentley
a6d64ef20e update title and copyright 2009-06-10 19:04:32 +01:00
Tim Bentley
a576962181 Start of Song work
Clean up code to standards
2009-06-10 18:12:03 +01:00
Raoul Snyman
a8307e430b Changed QPixmaps to QImages to see the difference. 2009-06-10 17:37:33 +02:00
Tim Bentley
7becc9cb56 Strange problems with events firing early.
Fixed bugs to stop errors by chaning initilistion order and defining varables.
Changing method names following last review.
2009-06-08 06:04:06 +01:00
Tim Bentley
ed73a78e95 Add double clicks to songs and customSlide
More code cleanups
2009-06-07 20:34:24 +01:00
Raoul Snyman
27de0cd008 Merged proposal #7122
bzr-revno: 459
2009-06-05 21:23:15 +02:00
Tim Bentley
2157699814 Fix up serviceitem for better interface
Fix extra rndering cycle from Servicemanager
Fix Image / Custom / Bibles / Songs to use new interface
2009-06-05 20:00:57 +01:00
Raoul Snyman
473bb289b6 Fixed displaying of "display" label on the display form.
Display form is displayed on the correct screen at startup.
Display form switches to active non-primary screen or hidden on primary screen after set in the settings dialog.
A few syntax tidy-ups.
Made the loading and saving of things to the "registry" better.
2009-06-05 20:53:50 +02:00
Tim Bentley
472ef981b6 Fix crash on delete of last record in list 2009-06-05 17:24:42 +01:00
Tim Bentley
2c5e701e10 Fix Bible import bugs for duplicate bibles
Fix Bibles refresh errors on nw bible creation
Finish Topic / Author and Songbook code for now
2009-06-05 06:00:26 +01:00
Tim Bentley
11a9d28bed Fix unicode bible import error
More Song changes
2009-06-04 21:06:32 +01:00
Tim Bentley
5b58f7137f Fix Database defaults
Add Topic Dialog and add functionality
Add Topic code to Song window
2009-06-04 20:00:41 +01:00
Tim Bentley
b365090544 Song fixes
Bug fixes to event receiver and presentations
2009-06-04 17:14:10 +01:00
Tim Bentley
29530d31ca More changes to Songs plugin to get ManageAuthors working. 2009-06-03 18:32:53 +01:00
Tim Bentley
a473a4dffc Start fixing the songs plugin 2009-06-03 17:14:56 +01:00
Tim Bentley
5fbc870c64 Song plugin add to service manager
custom and bible cleanups
2009-06-03 16:38:14 +01:00
Tim Bentley
8acc980ce4 End of Operation Cleanup for now
Fix more bugs 
Start to sort out Service Item
2009-05-22 19:30:25 +01:00
Tim Bentley
190a371f56 More from Operation Cleanup
Fix spelling of Maintenance
2009-05-21 17:07:01 +01:00
Tim Bentley
2969c3641d More code cleanups 2009-05-16 17:38:03 +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
Tim Bentley
d025d1ebf6 Add New Theme Event Handlers to plugins 2009-04-10 07:06:41 +01: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
ca32157e9c Removal of Plugin utils continues
bzr-revno: 424
2009-03-18 17:19:30 +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
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
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
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
Raoul Snyman
58606e2563 Updated look and feel of the Edit Song dialog.
Changed the form.show() to form.exec_() for dialogs.
Added the code for the (c) button.

bzr-revno: 325
2009-02-19 22:25:58 +00:00
Raoul Snyman
e67c1868e6 Tidied up and fixed up the song editing dialog.
bzr-revno: 320
2009-02-17 21:01:27 +00:00
Tim Bentley
11e3d43caf Fix merge problem.
Song search works again
Bible import fixes

bzr-revno: 297
2009-02-05 18:27:51 +00:00
Raoul Snyman
3f0ba7a3ba Added an initial ServiceItem, plus a few minor changes.
bzr-revno: 296
2009-02-04 20:16:56 +00:00
Tim Bentley
e00e328ac1 fix double load of manager
bzr-revno: 293
2009-02-02 19:20:59 +00:00
Raoul Snyman
6ea70e92a1 Couple of changes to the Songs plugin classes - trying to get SQLAlchemy to work.
bzr-revno: 292
2009-02-01 21:12:18 +00:00
Raoul Snyman
4071118398 Trying to get around the problem of metadata not being bound to an engine.
bzr-revno: 289
2009-01-21 08:52:03 +00:00
Raoul Snyman
b7b594ac49 Removed unnecessary files.
bzr-revno: 285
2009-01-17 14:54:16 +00:00
Raoul Snyman
11bede8fd8 Updating the SongsManager to use SQLAlchemy
bzr-revno: 284
2009-01-17 13:58:16 +00:00
Tim Bentley
7022a05316 Add form validation - start of
bzr-revno: 283
2009-01-12 19:31:29 +00:00
Tim Bentley
cc0ca326c3 Clean up files and correct mapper issues
Update Author Delete UI State

bzr-revno: 282
2009-01-11 08:51:43 +00:00
Tim Bentley
7397c42ac4 Upgrade Songs Database to version 2
Change SQL layer to SQLALChemy
Fix the UI to use new layer
More changes to editsong dialog
Force suffix of sqlite

bzr-revno: 280
2009-01-10 08:33:31 +00:00
Raoul Snyman
14a9b67085 Added some SQLAlchemy models.
bzr-revno: 277
2009-01-06 21:48:31 +00:00
Carsten Tinggaard
9887764d51 Refactored+update part 1; from UpperCaseWords to lower_case_words
Added attribute songid and changed names

bzr-revno: 275
2009-01-06 20:10:03 +00:00
Tim Bentley
41977dad1c More Tidyups
bzr-revno: 274
2009-01-06 19:57:03 +00:00
Tim Bentley
a6734c885f more changes
bzr-revno: 271
2009-01-06 18:59:47 +00:00
Tim Bentley
1d2818355f Forgotton on last commit
bzr-revno: 270
2009-01-06 18:58:00 +00:00
Tim Bentley
d6462a6ff4 Update UI
Fix database name retrival
Use ORM for get_Authors method.

bzr-revno: 269
2009-01-06 18:36:54 +00:00
Tim Bentley
c9c3317483 Add debugging to help with seach results
bzr-revno: 268
2009-01-05 18:18:34 +00:00
Tim Bentley
0e05dc79f8 Add Author Caching to stop excess database hits
Finish 1st cut of Author Maintenance (Add / Update / Delete)

bzr-revno: 265
2009-01-03 14:19:43 +00:00
Tim Bentley
0385a13773 More updates
bzr-revno: 263
2009-01-02 20:20:33 +00:00
Tim Bentley
c83207838d Add new dialogs to songs for extra data requirements
bzr-revno: 260
2009-01-01 10:03:09 +00:00
Tim Bentley
ae7e7d47de Revamp Presentations Plugin adding directory search and save. Persist the Presntations
Update the Plugin helper
Tidy up bibles and Songs a bit more.

bzr-revno: 257
2008-12-27 07:54:33 +00:00
Tim Bentley
5123bcdfbb More Fixes
Hacks for Unicode problem.

bzr-revno: 256
2008-12-24 14:07:27 +00:00
Tim Bentley
592d329baf Display song on Edit form having selected form list
bzr-revno: 255
2008-12-24 07:28:25 +00:00
Tim Bentley
1692da442b Remove Print statements.
bzr-revno: 254
2008-12-21 07:50:39 +00:00
Tim Bentley
33c43f8dfe Add Context Menus,
Fix results for Songs.

bzr-revno: 253
2008-12-21 07:49:22 +00:00
Tim Bentley
e1f5e5723a Add Context menu.
bzr-revno: 251
2008-12-20 17:50:08 +00:00
Tim Bentley
abb9a6e4c0 More improvements and functional additions
bzr-revno: 250
2008-12-20 16:59:56 +00:00
Tim Bentley
76723fbc92 Update UI a bit to display columns
bzr-revno: 249
2008-12-20 08:43:47 +00:00
Tim Bentley
9e4fa53b0e Add Songs database layer
bzr-revno: 248
2008-12-19 20:27:09 +00:00
Carsten Tinggaard
78d0dc34c2 Test data for xml
bzr-revno: 247
2008-12-19 08:06:53 +00:00
Carsten Tinggaard
dbde9ddc5f Test data for OpenLP1 format
bzr-revno: 246
2008-12-19 08:06:29 +00:00
Carsten Tinggaard
ba5d6f0e48 Module for functionality between UI, song files and songs
bzr-revno: 244
2008-12-17 14:26:05 +00:00
Carsten Tinggaard
f266416d3b Module for handling song files version 1 and 2
bzr-revno: 243
2008-12-17 14:25:33 +00:00
Raoul Snyman
90c45ac148 Added export songs menu to export menu.
bzr-revno: 238
2008-12-17 12:38:02 +00:00
Raoul Snyman
f6cc0ecf94 Added a copy of the openlp.org import for the openlp.org 2 import.
bzr-revno: 237
2008-12-17 12:11:35 +00:00
Carsten Tinggaard
fe2037663f Added OpenSong Bridge and Pre-chorus handling
bzr-revno: 236
2008-12-17 11:51:47 +00:00
Carsten Tinggaard
5ba4665ee5 Path check improved - test can be executed in all folders
bzr-revno: 235
2008-12-17 11:51:12 +00:00
Raoul Snyman
b198db1b3e Added showing the OpenSong import form on clicking the item in the import menu.
bzr-revno: 234
2008-12-17 11:41:52 +00:00
Raoul Snyman
b7008f7b62 Added the song import menu items, and made the openlp.org 1.0 item show an import form.
bzr-revno: 233
2008-12-16 22:00:32 +00:00
Raoul Snyman
238b1c4ae3 Making stuff adhere to PEP 8.
bzr-revno: 222
2008-12-14 20:43:44 +00:00
Raoul Snyman
508a542d6f Rewrote Plugin methods to match Python standards, fixed a few other things here and there.
bzr-revno: 219
2008-12-14 15:49:54 +00:00
Tim Bentley
412a30f1b5 Add text search to Bibles
Add Initialise method for plugins

bzr-revno: 215
2008-12-13 09:03:39 +00:00
Tim Bentley
eb1b1010c0 Updates to UI plugins
bzr-revno: 213
2008-12-11 21:07:12 +00:00
Raoul Snyman
aed4a2763b Moved the song xml classes to lib.
bzr-revno: 196
2008-12-07 09:23:37 +00:00
Raoul Snyman
2b0328e011 Added the "lib" module for the Songs plugin.
bzr-revno: 195
2008-12-07 08:09:59 +00:00
Carsten Tinggaard
c471a84766 Fixed path and name for the song class
bzr-revno: 180
2008-12-05 13:18:53 +00:00
Carsten Tinggaard
889b43dc81 Fixed path to xmlrootclass
bzr-revno: 179
2008-12-05 13:17:21 +00:00
Raoul Snyman
44c3063cc0 Fixed up them plugins.
bzr-revno: 154
2008-12-01 18:36:53 +00:00
Raoul Snyman
026388ce18 Added a WinRegistry helper class, made a few changes.
bzr-revno: 150
2008-12-01 13:15:31 +00:00
Raoul Snyman
9c5b487840 Moved everything to *real* toolbars... much better!
bzr-revno: 145
2008-11-30 20:01:19 +00:00
Raoul Snyman
dbec7d75b3 WE HAVE OUR FIRST INTEGRATING PLUGIN!!
bzr-revno: 144
2008-11-30 18:36:13 +00:00
Raoul Snyman
2e3ff9706f Fixed up things that were broken due to the move.
bzr-revno: 140
2008-11-29 05:36:16 +00:00
Raoul Snyman
b5adedabdc Moved song forms to the Songs plugin.
bzr-revno: 129
2008-11-26 19:53:21 +00:00
Raoul Snyman
2259e7bd61 Moved SongXml, created openlp.plugins.songs.forms module.
bzr-revno: 128
2008-11-26 19:46:06 +00:00
Raoul Snyman
f82134aeb6 Renamed SongPlugin to SongsPlugin.
bzr-revno: 127
2008-11-26 19:42:04 +00:00
Raoul Snyman
e4560515a5 Renamed "Song" to "Songs" plugin.
bzr-revno: 125
2008-11-26 18:55:18 +00:00