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

2796 Commits

Author SHA1 Message Date
M2j aa0b49290d add version information for mako, migrate and uno to exceptionform 2011-10-20 22:11:06 +02:00
Andreas Preikschat e5401c7eac - fixed bug 871441 (Live Preview image is not updated when you "Replace live background") 
- removed dead code
- fixed docstrings
- removed 'maindisplay_active' signal in same places

bzr-revno: 1781
 2011-10-19 19:30:32 +01:00
Tim Bentley 9603fcd1cc Fix bug 836897 to allow Alerts to be amended without changing the slide 
Refactored the CSS,Javascript,Html load code for alerts and provided a framework for other things.

bzr-revno: 1779
Fixes: https://launchpad.net/bugs/836897
 2011-10-19 19:25:08 +01:00
Tim Bentley 4d3dd6dbb5 Rename signal 2011-10-19 18:53:07 +01:00
rimach 2d870bd90c bugfixing and sync 2011-10-17 23:54:06 +02:00
rimach 599573b5ce Sync 2011-10-17 23:51:24 +02:00
rimach dbf77e2fb4 bugfixing 2011-10-17 23:35:44 +02:00
Meinert Jordan 972d917c8a Remove mailto code and use QT code 
bzr-revno: 1777
Fixes: https://launchpad.net/bugs/863841
 2011-10-17 17:46:35 +01:00
Tim Bentley bf2ada0b67 Fix up review comments 2011-10-16 16:39:49 +01:00
Andreas Preikschat 406ea9fe0a r1776 + resolved conflict 2011-10-16 17:21:25 +02:00
Andreas Preikschat 004472baa8 reverted alert change 2011-10-16 16:53:39 +02:00
Tim Bentley 8ebf7ff131 Finish dynamic Alert updates 2011-10-16 08:59:21 +01:00
M2j 525658ae8b better readable coding style 2011-10-15 23:21:22 +02:00
M2j 1527704c03 - exception dialog uses Qt call instead of external library 
- unicode support in report and attached filename was broken
 2011-10-15 22:18:49 +02:00
Andreas Preikschat 9259eed4a6 -fixed bug 871272 
-clean ups

Fixes: https://launchpad.net/bugs/871272
 2011-10-15 13:30:39 +02:00
Andreas Preikschat a1a79c98d1 overwrite parent method 2011-10-15 09:52:25 +02:00
Andreas Preikschat ec5991a197 removed dead code§ 2011-10-15 09:36:51 +02:00
Tim Bentley 9652a690b3 More cleanups and start of updates 2011-10-15 07:32:01 +01:00
Tim Bentley bb8b0cd435 Move the Alert web code back to the plugin 2011-10-13 06:14:03 +01:00
Tim Bentley e87b4658d8 fix up alert changing triggers 2011-10-11 20:54:18 +01:00
Tim Bentley 9176911810 Try 1 2011-10-11 19:10:53 +01:00
Andreas Preikschat 76f47a4f62 - clean ups 
- only display alert when the screen is not hidden
 2011-10-10 18:54:01 +02:00
Andreas Preikschat 658e8f234b clean ups 2011-10-10 18:37:46 +02:00
Andreas Preikschat 6883427cbd fixed bug 871441 
Fixes: https://launchpad.net/bugs/871441
 2011-10-10 18:22:41 +02:00
Andreas Preikschat 06068eedce fixed bug 863846 
Fixes: https://launchpad.net/bugs/863846
 2011-10-08 15:29:35 +02:00
Tim Bentley 161300fe73 Number of changes 
- Allow time (24/12) hour for sage view
- Add pictorial display of the lay out in theme manage
- Fix bug where remote edit removes an overridden theme.

bzr-revno: 1770
 2011-10-05 19:20:54 +01:00
Tim Bentley 575aa02022 Amend text 2011-10-05 18:18:56 +01:00
Andreas Preikschat 45b296b741 clean up 2011-10-05 19:04:59 +02:00
Tim Bentley 159a95855f Change Text 2011-10-05 17:14:21 +01:00
Andreas Preikschat 1967951061 attempt to prevent calling updatePreview more than once 2011-10-04 20:01:13 +02:00
Andreas Preikschat 201ec584a8 removed dead code + minor clean up 2011-10-03 20:51:32 +02:00
Andreas Preikschat 360e117918 removed dead code 2011-10-03 20:14:39 +02:00
Andreas Preikschat 88c0a22ac4 improve performance of preview 
Fixes: https://launchpad.net/bugs/856296
 2011-10-03 19:27:34 +02:00
Tim Bentley 5053e27c76 Fix up review comments 2011-10-03 17:53:54 +01:00
Tim Bentley 9f9f2186ae Minor performance improvement 2011-10-02 20:57:42 +01:00
Tim Bentley 6426d9aac4 Display is now big enough 2011-10-02 17:38:05 +01:00
Tim Bentley 297a250010 Display works but bigggggggggg 2011-10-02 08:52:28 +01:00
Tim Bentley 9b5074991c Add new dialog 2011-10-01 21:33:53 +01:00
Andreas Preikschat 8f3f09eef9 r1765 + resolved conflict 2011-10-01 09:28:45 +02:00
Tim Bentley 128b6b80bf Display now works 2011-09-29 18:57:48 +01:00
rimach 3261dc01f1 sync with head and update 2011-09-28 23:00:43 +02:00
rimach 33d9ce07ac sync with head 2011-09-28 22:57:01 +02:00
rimach c299efab1a update 2011-09-28 22:54:43 +02:00
Tim Bentley 9142ffb488 more visible lines 2011-09-28 21:43:30 +01:00
Tim Bentley ff32139b2e refactor code to stop duplicate code 2011-09-28 18:39:26 +01:00
Tim Bentley 632e2ce2dd More fixes 2011-09-28 05:50:56 +01:00
Tim Bentley 3e2e87bb2c Initial stab 
Fixes: https://launchpad.net/bugs/814201
 2011-09-27 20:37:34 +01:00
Tim Bentley 276d4045e3 Fix edit for tags loaded for song which is not saved 
bzr-revno: 1765
 2011-09-27 18:23:21 +01:00
Tim Bentley 695e08a63a get the right field 2011-09-26 19:56:52 +01:00
Tim Bentley 7fe57a9a5d Make Int 2011-09-26 19:12:27 +01:00
Tim Bentley fb3f001c26 Add Justify theme option 
bzr-revno: 1762
Fixes: https://launchpad.net/bugs/802252
 2011-09-26 17:07:30 +01:00
Tim Bentley 682e822d21 Clean up 2011-09-25 08:27:09 +01:00
Tim Bentley 88c09d8981 Correct problem it tags not being used on song load 2011-09-25 07:37:40 +01:00
Raoul Snyman 0aadc32d4f Fixed the last part of bug #855342 where when you save a file a few times, it throws an exception. 
Fixes: https://launchpad.net/bugs/855342
 2011-09-24 00:14:23 +02:00
Martin Zibricky 3492681ca2 [merge] merge with truk r1756 2011-09-23 02:43:51 +02:00
Martin Zibricky 7d016dd6a6 Fix regressions with formattingtagsform 2011-09-23 02:41:01 +02:00
Martin Zibricky 354bec8b33 Fix - do not save temporary key by formatting tags into openlp configuration 2011-09-22 22:30:15 +02:00
rimach 81be1f36ae bugfixing and sync with trunk 2011-09-22 21:21:34 +02:00
rimach d88f437ffc bugfixing 2011-09-22 21:20:25 +02:00
rimach 11aae0bb82 sync with trunnk 2011-09-22 20:54:05 +02:00
rimach 18bda31ee9 correct merge proposal issues 2011-09-22 20:22:35 +02:00
Martin Zibricky 8b6887036b Fix regressions with users tags in preview and import/export in openlyrics 2011-09-22 16:23:51 +02:00
Raoul Snyman e3ecee8ae5 Fixed bug #855342 where saving an already-saved service file with an audio file in it caused an exception. 
Fixes: https://launchpad.net/bugs/855342
 2011-09-21 22:47:30 +02:00
Martin Zibricky c47f936fd5 [merge] Merge with trunk r1754 2011-09-21 01:08:46 +02:00
Raoul Snyman 429a1a4541 Remove reference to the non-existent __del__ method. 
Fixes: https://launchpad.net/bugs/854125
 2011-09-19 20:55:34 +02:00
Martin Zibricky fa9287c11b [merge] Merge with trunk r1750 2011-09-19 00:45:19 +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
Stevan Pettit c44b4dccf2 Fixed import statements 2011-09-17 18:33:03 -04:00
Tim Bentley 6a901f2de9 Add justify to theme options 
Fixes: https://launchpad.net/bugs/802252
 2011-09-16 18:23:39 +01:00
Martin Zibricky 8c87d89301 [merge] merge with trunk r1744 2011-09-13 22:37:19 +02: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
Raoul Snyman 2b6e254b91 Add the option to start background audio paused (default is on). 2011-09-12 22:04:46 +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
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
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
Stevan Pettit 30c09f9b4b Change local variable names in settings import/export routines. Changed string search 2011-09-03 16:38:25 -04: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 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
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 2c5bc34968 review changes part 2 2011-08-30 18:54:45 +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
Raoul Snyman 540c717dbb Started work on an audio player with a playlist. 2011-08-29 22:39:15 +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
Andreas Preikschat d061436a35 replaced Ini by config 2011-08-29 08:30:31 +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
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
Stevan Pettit 9957419f2b Changed system exit call 2011-08-28 09:39:34 -04:00
Andreas Preikschat f3691516fd import tags from xml (part 1) 2011-08-27 16:00: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
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 61feddd34e Fix method call 2011-08-26 11:21:47 +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
Stevan Pettit 215abd2966 Merged with trunk 2011-08-25 08:15:31 -04:00
Stevan Pettit 9b4df37a77 Modified code to handle keys with _ 2011-08-24 12:17:24 -04: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
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
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
Andreas Preikschat 8108e279dc changed menu shortcut letter 2011-08-20 21:36:51 +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
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
Andreas Preikschat 9865e2b73a r1710 2011-08-15 11:30:36 +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 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