raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
7,874 Commits 5 Branches 0 Tags 296 MiB
3261dc01f1
Commit Graph

6079 Commits

Author SHA1 Message Date
Raoul Snyman
d1ae7a7f28 HEAD 2011-09-08 21:04:38 +02:00
Stevan Pettit
2c589f8b0e Added code to allow canceling of file downloads. Fixed aparent hang if no internet connection. 2011-09-08 09:14:51 -04:00
Martin Zibricky
c8c8c7e654 code to expand <format> tag for openlyrics export 2011-09-08 01:16:14 +02:00
Martin Zibricky
9fb6936263 code to add formatting tags to openlyrics lyrics 2011-09-07 22:54:53 +02:00
Tim Bentley
e93a1d2687 Hide the screen on startup if only 1 screen 
Fixes: https://launchpad.net/bugs/800156
 2011-09-06 20:32:30 +01:00
Tim Bentley
a328d1c7c7 Bypass message if requested from remote plugin 
Fixes: https://launchpad.net/bugs/796195
 2011-09-06 18:53:43 +01:00
Martin Zibricky
6163bc99c3 Do not use depracated dict.has_key() function in openlyrics code 2011-09-06 15:22:17 +02:00
Martin Zibricky
5d2bde01c2 For openlyrics export skip adding format tags if not used. 2011-09-06 15:14:57 +02:00
Andreas Preikschat
c7ab79f987 fixed bug 805088 2011-09-06 13:56:52 +02:00
Martin Zibricky
46203297de [merge] merge with trunk r1740 2011-09-06 12:48:19 +02:00
Raoul Snyman
9659834430 Finished fixing variable names. 2011-09-06 07:47:33 +02:00
Raoul Snyman
14ffb6d3c1 HEAD 2011-09-06 07:05:34 +02:00
Stevan Pettit
796e779300 Fixed various issues around the exporting and importing of settings. 
bzr-revno: 1740
Fixes: https://launchpad.net/bugs/838831
 2011-09-05 19:21:12 +02:00
Stevan Pettit
b90796da45 Cleaned up some code 2011-09-05 09:03:30 -04:00
Raoul Snyman
564c7e4a5a Coding standards clean up. 2011-09-05 14:51:16 +02:00
Martin Zibricky
bd503f5c7d [merge] merge with trunk r1739 2011-09-05 12:48:46 +02:00
Raoul Snyman
11f5a29b6d Added some openlp_process_events signals and move the hiding of the finish button higher up in the code. 
Fixes: https://launchpad.net/bugs/837319
 2011-09-04 23:00:37 +02:00
Raoul Snyman
3a87f3dff1 Songs can now have attached audio files, which are stored in services, and imported if the song needs to be imported. 
bzr-revno: 1738
Fixes: https://launchpad.net/bugs/739770
 2011-09-04 22:00:10 +02:00
Raoul Snyman
79bb94c6b0 Removed empty directories. 2011-09-04 14:04:44 +02:00
Raoul Snyman
a32e2b9d1b Hopefully fixed the problem where existing audio files are deleted. 2011-09-04 11:26:13 +02:00
Stevan Pettit
30c09f9b4b Change local variable names in settings import/export routines. Changed string search 2011-09-03 16:38:25 -04:00
Martin Zibricky
4cf750ce9d Wrap db.Manager to a function arg for automated tests 2011-09-03 16:21:36 +02:00
Martin Zibricky
0de5d5e09a [merge] merge with trunk r1736 2011-09-03 10:35:47 +02:00
Stevan Pettit
50a5b98f8c Fixed problems with "shortcuts" section of export/import file 2011-09-02 18:57:02 -04:00
Martin Zibricky
9a74b05a1f [merge] merge with trunk r1735 2011-09-02 23:31:42 +02:00
Raoul Snyman
e8aae98e09 Fixed up a few things. 2011-09-02 21:04:07 +02:00
Martin Zibricky
e4f3041802 Add pytest to optional dependencies in check_dependecies.py 2011-09-02 13:10:07 +02:00
Raoul Snyman
79123e7df3 Tidied up some method and variable names. 2011-09-01 21:45:36 +02:00
Raoul Snyman
2a02167646 Fixed up a few things, including updating theme when reactivating the current song. 2011-08-31 23:17:10 +02:00
Raoul Snyman
abc2f3e89f Some minor fixes. 2011-08-31 13:29:04 +02:00
Raoul Snyman
4d66954d62 - Fixed re-playing of previous audio file. 
- Fixed left-over files from previous song.
- Renamed a few more enumerations.
- Fixed some exception handling.
 2011-08-31 09:49:57 +02:00
Raoul Snyman
0d16b05779 Now with pausing too! 2011-08-30 23:20:32 +02:00
Raoul Snyman
c41e7c49df CAN HEARZ IT!!!! 2011-08-30 22:29:29 +02:00
Raoul Snyman
8b8b4fbf51 HEAD 2011-08-30 21:42:12 +02:00
Andreas Preikschat
d85128829e Fix Renderer - again 
bzr-revno: 1735
 2011-08-30 19:10:52 +01:00
Mattias Põldaru
af10011c0c This seems to fix 
819271, web NIV download from Bibleserver crash.
No crash (257) and performance jump and reduced memory usage on loading services with huge files.
Fixed filename comparison on drag and drop.

bzr-revno: 1734
 2011-08-30 19:06:45 +01:00
rimach
709037ccca review changes part 2 and Head 2011-08-30 18:58:12 +02:00
rimach
38e08a5c8b Head 2011-08-30 18:56:52 +02:00
rimach
2c5bc34968 review changes part 2 2011-08-30 18:54:45 +02:00
Andreas Preikschat
71bdaf0708 comments 2011-08-30 17:15:39 +02:00
Andreas Preikschat
25ce484fb1 hopefully fixed it now completely 2011-08-30 17:12:16 +02:00
Andreas Preikschat
88704fbc68 fix soft break 2011-08-30 15:35:06 +02:00
rimach
169f8a2942 review changes 2011-08-29 23:52:26 +02:00
rimach
c608301b0b review changes 2011-08-29 23:51:03 +02:00
Andreas Preikschat
6c7527349d do not use the same name twice 2011-08-29 22:58:32 +02:00
Andreas Preikschat
ccd0a46e2b do not expand the tags 2011-08-29 22:56:07 +02:00
Raoul Snyman
540c717dbb Started work on an audio player with a playlist. 2011-08-29 22:39:15 +02:00
Martin Zibricky
1d05abbe04 Necessary changes for automated gui tests to work. 
bzr-revno: 1732
 2011-08-29 22:05:06 +02:00
rimach
d7f4298fbb bugfixing and Head 2011-08-29 21:59:12 +02:00
rimach
20c9813d26 Head 2011-08-29 21:56:46 +02:00
rimach
c547db5462 bugfixing 2011-08-29 21:55:58 +02:00
Raoul Snyman
bbc8e04a3f HEAD 2011-08-29 20:46:01 +02:00
Stevan Pettit
7cbccb6b70 Added code to reload Bible list after first time wizard is rerun 
bzr-revno: 1731
 2011-08-29 17:54:09 +01:00
Mattias Põldaru
44c4febd29 Merge with upstream 2011-08-29 16:08:50 +03:00
Stevan Pettit
96076a4bac Removed import receiver 2011-08-29 08:59:19 -04:00
Stevan Pettit
7e48256534 Removed need for signal to run appStartup 2011-08-29 08:47:32 -04:00
Andreas Preikschat
d061436a35 replaced Ini by config 2011-08-29 08:30:31 +02:00
Andreas Preikschat
f046edc615 - fixed bug #796528 (Renderer splits slides twice even when the there is enough space) 
- fixed method confusion

bzr-revno: 1729
Fixes: https://launchpad.net/bugs/796528
 2011-08-29 08:21:24 +02:00
Raoul Snyman
2658c94520 Add audio file support to updating songs from the service. 2011-08-28 22:58:21 +02:00
Raoul Snyman
532ad84b87 - Bundle audio files with the song when adding it to the service 
- Save audio files with service
- Load audio files from service
- Copy audio files to songs plugin when adding a song from a service.
 2011-08-28 22:51:44 +02:00
Andreas Preikschat
fc71905735 append text to the last slide (if more than one) 2011-08-28 19:46:52 +02:00
Raoul Snyman
0b81824430 HEAD 2011-08-28 19:45:31 +02:00
Raoul Snyman
015249407d Renamed some of the ItemCapabilities. 2011-08-28 19:45:13 +02:00
Stevan Pettit
bf1d8c239f Added code to mainwindow.py to allow exporting/importing of OpenLP settings to an INI file. 
During importing, the selected file is checked to insure it is an OpenLP settings file.
The user is warned prior to the import that changes will be made.

I also changed the settings section of an entry in servicemanager from "service" to "servicemanager".

I changed my nick in about.

Changed the import restart message.
Removed need for "import string".
Fixed the Try:

Changed filetype of export settings file from .ini to .conf

bzr-revno: 1728
 2011-08-28 18:41:07 +01:00
Andreas Preikschat
bc1f2d2977 removed wrong line 2011-08-28 18:59:09 +02:00
Andreas Preikschat
2acd1ae2ad added comments 2011-08-28 18:04:18 +02:00
Andreas Preikschat
2364ea72c2 hopefully completed the fix 2011-08-28 17:53:27 +02:00
Stevan Pettit
9957419f2b Changed system exit call 2011-08-28 09:39:34 -04:00
Stevan Pettit
d4e6c44d21 Fixed signal name 2011-08-27 16:42:22 -04:00
Tim Bentley
67894aa8d9 Error Handling improvements 2011-08-27 19:43:05 +01:00
Tim Bentley
3f078a553f Head 2011-08-27 16:04:11 +01:00
Tim Bentley
c1a648900f Fix initial setup bug 2011-08-27 16:02:45 +01:00
Andreas Preikschat
f3691516fd import tags from xml (part 1) 2011-08-27 16:00:24 +02:00
Andreas Preikschat
65630c6853 r1726 2011-08-27 13:24:24 +02:00
Andreas Preikschat
8020869dec - added some hints that the exporter export OpenLyrics files 
bzr-revno: 1726
 2011-08-27 13:19:55 +02:00
Tim Bentley
9949fba4ae Update songusage database to add plugin and what type of access. 
Amend triggers to record the correct data
Update report to output the new data items.

Apply fix in bug to allow Meda_data tables to be defined in core

bzr-revno: 1725
 2011-08-27 09:15:55 +01:00
Tim Bentley
611577577f Remove extra imports 2 2011-08-27 07:12:03 +01:00
Tim Bentley
9de4c0c118 Remove extra imports 2011-08-27 07:07:30 +01:00
Stevan Pettit
3722253bcf Added code to process any Bibles downloaded during the re-run of the First Time wizard 2011-08-26 23:14:30 -04:00
Raoul Snyman
f099329217 Up/Down buttons, Remove/Remove All buttons. 2011-08-27 01:04:54 +02:00
Raoul Snyman
c81117991a HEAD 2011-08-26 22:59:27 +02:00
Tim Bentley
ed57b9bfbd Record timestamps of changes in songs database 
bzr-revno: 1724
 2011-08-26 20:51:14 +01:00
Tim Bentley
01128d4dc7 Fix report and triggers 2011-08-26 20:31:02 +01:00
Tim Bentley
1e4b922bfa DB Fixed 2011-08-26 20:09:25 +01:00
Tim Bentley
2dd0aa234e remove prints 2011-08-26 19:07:44 +01:00
Tim Bentley
f266485001 Add fields to database 2011-08-26 18:56:36 +01:00
Andreas Preikschat
d88a268c5c removed 'again' 2011-08-26 17:48:58 +02:00
Andreas Preikschat
fa85525a68 r1723 2011-08-26 17:32:37 +02:00
Andreas Preikschat
fbb32a0278 added hints that exported files are OpenLyrics files 2011-08-26 17:30:51 +02:00
Andreas Preikschat
6c3d156363 fixed inversion :-D 2011-08-26 17:22:57 +02:00
Andreas Preikschat
407b342f45 changed 'switch' name 2011-08-26 17:15:17 +02:00
Andreas Preikschat
953ff87ff5 do not delete temporary tags when resetting the list; preparations 2011-08-26 17:06:22 +02:00
Andreas Preikschat
627b9429aa documented formatting tags; added infrastructure to allow temporary formatting tags 2011-08-26 16:27:53 +02:00
Andreas Preikschat
dd00f95f64 r1723 2011-08-26 15:18:06 +02:00
Stevan Pettit
24126e74c8 Changed filetype of settings file from .ini to .conf 2011-08-26 09:14:12 -04:00
Tim Bentley
4f0c7716bc Fix default value 2011-08-26 14:13:32 +01:00
Tim Bentley
dec8ce3a8d Add ability to set colours around borders of images and in themes. 
May not be to all tastes ;-)

bzr-revno: 1722
 2011-08-26 13:20:49 +01:00
Tim Bentley
1adac78588 Add date fields to songs 2011-08-26 13:02:06 +01:00
Raoul Snyman
2c0df18f35 - Implemented a seamless database upgrade system. 
- Added the first upgrade as a demonstration.
- Added database version check so that newer version databases are not loaded.

bzr-revno: 1721
 2011-08-26 13:39:32 +02:00
Martin Zibricky
eef0af11ac Fix error msg with corrupted file 2011-08-26 13:04:56 +02:00
Tim Bentley
61feddd34e Fix method call 2011-08-26 11:21:47 +01:00
Tim Bentley
869bc9bb20 Fix field name 2011-08-26 09:21:27 +01:00
Raoul Snyman
4b1ce7102e A few more tweaks as requested by Andreas. 2011-08-25 22:14:02 +02:00
Raoul Snyman
bcf9b174ff Fixed a bug where the version number saved to the database was incorrect. Added the ability to throw an error message and not load the database if the db is too new or incorrect. 2011-08-25 22:02:55 +02:00
Tim Bentley
d5717a486e Head 2011-08-25 20:53:37 +01:00
Tim Bentley
5f6b315c4a fix trace 2011-08-25 20:52:07 +01:00
Stevan Pettit
d927adbe5a Changed import re-start message. Removed need for "import string" 2011-08-25 14:40:44 -04:00
Tim Bentley
803adc92c0 Fixes 2011-08-25 19:33:25 +01:00
Tim Bentley
ba3fb9221e Head 2011-08-25 19:22:38 +01:00
Martin Zibricky
20c431a6e5 - Remove darwin specific dead code 
- Move app.setOrganization and app.setApplication to orgininal place
 2011-08-25 17:33:21 +02:00
Stevan Pettit
215abd2966 Merged with trunk 2011-08-25 08:15:31 -04:00
Raoul Snyman
ddf148449d Now with exception handling. 2011-08-25 13:47:07 +02:00
Martin Zibricky
1dc05c0f66 Add ability to run openlp without app.exec_() method (needed to run gui tests) 2011-08-25 13:16:04 +02:00
Martin Zibricky
7fae06483a Move main() from openlp.pyw to openlp.core.__init__ 2011-08-25 12:04:17 +02:00
Raoul Snyman
923261c59c Even better, got rid of 'upgrade_schema' function which is not really needed. 2011-08-25 11:22:48 +02:00
Martin Zibricky
68facbf2b5 Move class OpenLP from openlp.pyw to openlp.core.__init__ 2011-08-25 11:04:41 +02:00
Raoul Snyman
7e572cd0c2 Database upgrading, revision 1. 2011-08-25 11:02:59 +02:00
Stevan Pettit
9b4df37a77 Modified code to handle keys with _ 2011-08-24 12:17:24 -04:00
Raoul Snyman
cdcfeaece8 Keeping things tidy: Actually save to DB now, and delete removed files. 2011-08-24 14:22:39 +02:00
Raoul Snyman
122c2226bd Now copying files too\! 2011-08-24 13:53:22 +02:00
Andreas Preikschat
50b820af4e try to fix gradient when using html5 doctype 2011-08-24 10:34:15 +02:00
Raoul Snyman
d5e92c0d35 Added a media files form and populated it from the media plugin, if the media plugin is enabled. 2011-08-23 23:48:46 +02:00
rimach
d64d22533f preview issue fixed, sync with trunk 2011-08-23 22:29:11 +02:00
rimach
229fe56305 Head 2011-08-23 22:28:09 +02:00
rimach
565c429bf9 preview issue fixed 2011-08-23 22:19:45 +02:00
Andreas Preikschat
0d99f5be96 hopefully fixed bug #796528 (to be cleaned up 
Fixes: https://launchpad.net/bugs/796528
 2011-08-23 21:57:29 +02:00
Raoul Snyman
6a60ece204 Added Up, Down, Remove and Remove All buttons. Reworked the UI to make use of the buttons better. 2011-08-23 15:44:50 +02:00
Stevan Pettit
131c9f90b5 Modified shutdown from sys.exit to os._exit 2011-08-23 08:11:41 -04:00
Raoul Snyman
409a16eb35 Added the tab, list and buttons for linked audio. 2011-08-23 08:38:02 +02:00
Tim Bentley
957a86b11e fexes 2011-08-22 18:32:18 +01:00
Andreas Preikschat
e209c81fed simplification 2011-08-22 16:11:37 +02:00
Andreas Preikschat
650dc83aeb do not use re with xml 2011-08-22 15:39:02 +02:00
Stevan Pettit
b36a4f74d3 Fixed traceback error when adding ini to filename 2011-08-21 19:15:16 -04:00
Andreas Preikschat
b0df1bdd94 - changed menu shortcut letter 
bzr-revno: 1718
 2011-08-21 21:15:36 +02:00
Tim Bentley
d1f823d864 More fixes 2 2011-08-21 19:02:58 +01:00
Tim Bentley
6c55362eee More fixes 2011-08-21 17:59:03 +01:00
Tim Bentley
62cffbb3b6 Review fixes and improvements 2011-08-21 17:13:45 +01:00
Stevan Pettit
79ab8cc1c0 Added code to always create a filename.INI file. 2011-08-21 10:05:24 -04:00
Tim Bentley
21bf34c436 Theme fix 2011-08-21 06:33:07 +01:00
Tim Bentley
76c0881559 Head 1716 2011-08-21 05:51:19 +01:00
Tim Bentley
d660d1d5ae Add missing file 2011-08-21 05:51:03 +01:00
Andreas Preikschat
8108e279dc changed menu shortcut letter 2011-08-20 21:36:51 +02:00
Raoul Snyman
8957c5e4bf Fixed bug #825809 where SQLAlchemy 0.7 throws a 'ArgumentError: SQL expression object or string expected' when passed something other than an SQL expression object or a string. 
bzr-revno: 1716
Fixes: https://launchpad.net/bugs/825809
 2011-08-20 20:48:27 +02:00
Andreas Preikschat
c7d875a67f compatibility for OpenLyrics files created with OpenLP 1.9.6 and OpenLyrics 0.7 2011-08-20 19:39:38 +02:00
Andreas Preikschat
0ab092e56e removed _get method 2011-08-20 19:15:31 +02:00
Andreas Preikschat
23733608ef adapted virtual breaks in OpenLyrics implementation for the upcomming 0.8 release 2011-08-20 19:06:48 +02:00
Tim Bentley
3c17af592d Fix autoupdates 2011-08-20 16:02:57 +01:00
Tim Bentley
cc1e174d62 Updates 2011-08-20 14:21:25 +01:00
Tim Bentley
9e6d05098b 1715 2011-08-20 12:46:18 +01:00
Tim Bentley
ad61defdae Add border colors and fix song usage 2011-08-20 12:45:06 +01:00