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

3579 Commits

Author SHA1 Message Date
Andreas Preikschat
724e2be04f close tags 2011-09-19 18:00:27 +02:00
Martin Zibricky
fa9287c11b [merge] Merge with trunk r1750 2011-09-19 00:45:19 +02:00
Andreas Preikschat
734c868223 removed semicolon 2011-09-18 17:39:12 +02:00
Stevan Pettit
0b6cc6134a Added a "Finish" button to the "No-internet" window of the First Time Wizard. 
Added code to this button to process any changes made in the plugin screen.

bzr-revno: 1749
 2011-09-18 14:09:32 +01:00
Andreas Preikschat
ceec3d6f3a reverted not necessary change 2011-09-18 12:32:27 +02:00
Andreas Preikschat
d856e957b4 removed FIXME 2011-09-18 12:30:14 +02:00
Andreas Preikschat
2dad85f4c5 r1749 2011-09-18 12:28:53 +02:00
Andreas Preikschat
d62876b411 r1749 2011-09-18 12:28:27 +02:00
Andreas Preikschat
cd33d807fc removed test code 2011-09-18 12:28:10 +02:00
Andreas Preikschat
3c3339f114 final fixes and clean ups 2011-09-18 12:26:47 +02:00
Martin Zibricky
14e94f8758 RAW code for OpenLyrics import with formatting tags 2011-09-18 01:22:16 +02:00
Stevan Pettit
c44b4dccf2 Fixed import statements 2011-09-17 18:33:03 -04:00
Tim Bentley
d47189e904 Remove unneeded timer logger . Was from old renderer 2011-09-17 14:05:28 +01:00
Tim Bentley
11424c8a7a Only load list if changed 2011-09-17 09:28:33 +01:00
Tim Bentley
62979a0062 Sort for added items in Images, Media and Presentations 
Fixes: https://launchpad.net/bugs/827027
 2011-09-17 09:20:03 +01:00
Tim Bentley
6a901f2de9 Add justify to theme options 
Fixes: https://launchpad.net/bugs/802252
 2011-09-16 18:23:39 +01:00
Tim Bentley
52c63d9665 Undo fix 2011-09-14 21:35:32 +01:00
Martin Zibricky
8c87d89301 [merge] merge with trunk r1744 2011-09-13 22:37:19 +02:00
Tim Bentley
7469c08674 Head 2011-09-13 19:13:25 +01:00
Stevan Pettit
1d06562c69 added QCoreApplication.exit() to cancel button 2011-09-13 13:20:51 -04:00
Stevan Pettit
25cb0ac22e Added "Finish" button to no-internet screen. Changed window message 2011-09-12 20:13:12 -04:00
Martin Zibricky
50dbb1ed0b [merge] merge with trunk r1743 2011-09-12 22:36:41 +02:00
Martin Zibricky
fb664bed0c Remove openlyrics tests for easier merging. They will be merged later. 2011-09-12 22:35:39 +02:00
Raoul Snyman
2b6e254b91 Add the option to start background audio paused (default is on). 2011-09-12 22:04:46 +02:00
Martin Zibricky
50e1964795 Remove the db_file_path option from db.Manager init function 2011-09-11 22:39:33 +02:00
Martin Zibricky
606e19734c Allow to override data dir for tests 2011-09-11 22:29:25 +02:00
Stevan Pettit
c04be6775f Added code to remove obsolete settings entries 2011-09-11 08:29:08 -04:00
Martin Zibricky
a3ff14d337 [merge] merge with trunk r1742 2011-09-10 19:28:11 +02:00
Tim Bentley
b3cb4a21f4 fixes 2011-09-09 20:14:19 +01:00
Tim Bentley
ea7c5c4b9e Head 2011-09-09 19:19:48 +01:00
Stevan Pettit
e560371e53 Added code to allow canceling of downloads and to completely bypass any downloads is there is no internet access in the First Time Wizard 
bzr-revno: 1742
Fixes: https://launchpad.net/bugs/836980, https://launchpad.net/bugs/836611
 2011-09-09 07:45:43 +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
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
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
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
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
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
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
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
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
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
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
Tim Bentley
67894aa8d9 Error Handling improvements 2011-08-27 19:43:05 +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
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
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
6c3d156363 fixed inversion :-D 2011-08-26 17:22:57 +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
Stevan Pettit
24126e74c8 Changed filetype of settings file from .ini to .conf 2011-08-26 09:14:12 -04: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
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
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
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
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
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
Stevan Pettit
131c9f90b5 Modified shutdown from sys.exit to os._exit 2011-08-23 08:11:41 -04:00
Tim Bentley
957a86b11e fexes 2011-08-22 18:32:18 +01: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
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
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
Andreas Preikschat
9363177e9d - Fixed bug #804747 (Bible disappear after upgrade)\n- Fixed bug Bug #824129 (Bibles plugin does not always delete corrupted bibles from falied imports)\n- Removed not needed or redundant variables.\n- Removed not needed code.\n- When upgrading bibles move the files to the temp directory.\n- clean ups 
bzr-revno: 1714
Fixes: https://launchpad.net/bugs/804747, https://launchpad.net/bugs/824129
 2011-08-20 10:23:18 +02:00
Stevan Pettit
9f284d9ab2 Moved export/import settings menu items from tools to file menu. Added status-tips 2011-08-18 22:43:08 -04:00
Stevan Pettit
b95924ae74 Added code to export/import settings via an ini file 2011-08-16 22:58:07 -04:00
Raoul Snyman
ca5c8d9a0b Fixed bug #802146: Couldn't import some SongShowPlus files. Rearranged the file menu as well to be in a more logical order, and to look a little nicer. 
Fixes: https://launchpad.net/bugs/802146
 2011-08-16 23:19:57 +02:00
Raoul Snyman
301993a3ea 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. 
Fixes: https://launchpad.net/bugs/825809
 2011-08-16 21:53:52 +02:00
Mattias Põldaru
a3ddb50479 Now we do not read several GB video files entirely into memory when opening service, this also fixes #257 in tracker. 2011-08-16 01:46:31 +03:00
Mattias Põldaru
bdde2a4fb4 String fix. 2011-08-16 01:44:02 +03:00
Mattias Põldaru
aca0a86915 Fix comparison of always unequal unicode and non-unicode string on drag-and-drop. 2011-08-16 01:42:48 +03:00
Andreas Preikschat
9865e2b73a r1710 2011-08-15 11:30:36 +02:00
Andreas Preikschat
41b3bde919 changed underscore varialbe to camelCase 2011-08-14 15:11:41 +02:00
Andreas Preikschat
17e397ffa8 added spellchecker to service notes dialog (bug #825979); escape texts in various places (bug #825983) 
Fixes: https://launchpad.net/bugs/825983, https://launchpad.net/bugs/825979
 2011-08-14 15:05:39 +02:00
Andreas Preikschat
ec93173891 r1708 2011-08-13 12:41:57 +02:00
Andreas Preikschat
11f3a9e13a removed code; moved clean_filename method to utils 2011-08-12 16:54:16 +02:00
Andreas Preikschat
3f3ab71eeb more clean ups 2011-08-12 15:38:05 +02:00
Andreas Preikschat
0924bfc246 fixed bug #804747; clean ups 
Fixes: https://launchpad.net/bugs/804747
 2011-08-12 15:11:30 +02:00
Andreas Preikschat
cb16463d99 moved recent files to a menu (bug #818794) 
bzr-revno: 1708
Fixes: https://launchpad.net/bugs/818794
 2011-08-11 13:40:52 +02:00
Stevan Pettit
f92552735f fixed bug 802150 (Attempt to save a service causes a crash when image/media/presentation files do not exist) 
bzr-revno: 1707
Fixes: https://launchpad.net/bugs/802150
 2011-08-11 11:20:29 +02:00
Andreas Preikschat
ba02eb6a98 moved recent files to a menu (bug #818794) 
Fixes: https://launchpad.net/bugs/818794
 2011-08-11 11:01:25 +02:00
Stevan Pettit
c0978d8e22 Added code to skip-all missing files during service save 2011-08-10 17:29:44 -04:00
Andreas Preikschat
f2090100a1 Fixed link to 'Contributing' site. 
bzr-revno: 1705
 2011-08-08 10:46:07 +02:00
Andreas Preikschat
c27d50bdda fixed link to 'Contributing' site 2011-08-08 08:30:25 +02:00
Andreas Preikschat
ffbfd1efe9 - improved code readability 
- updated docstrings

bzr-revno: 1704
 2011-08-07 16:37:40 +02:00
Stevan Pettit
392c103476 Fixed bug #818791 ("Reorder Service Item" does not manage two instances of the same image) 
bzr-revno: 1703
Fixes: https://launchpad.net/bugs/818791
 2011-08-06 16:06:28 +02:00