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

2326 Commits

Author SHA1 Message Date
M2j
b0c9b3f077 integrated 'split layout' in the SettingsTab class 
remove the documentMode from the TabWidget in the SettingsDialog
replace comment for HideMode class
 2011-01-03 12:25:30 +01:00
Andreas Preikschat
45f912e5da - fixed adding/appending more images to the Service Manager 
- possibility to add/append images to the Service Manager if an image is missing
- prevent that "Replace Live Background" can use a non existing image and prevent replacing the background with more images (as this makes no sense)

bzr-revno: 1185
 2011-01-03 09:42:53 +00:00
Andreas Preikschat
9fc113abce fix wrong 'themes' usage (themes -> topics), improved methods, make sure a missing property does not crash openlp 2011-01-03 08:16:21 +01:00
M2j
ebd44c7a94 Head 1184 2011-01-02 23:33:18 +01:00
M2j
2e6613edf4 simplified all setupUi() in openlp.core.ui and the setting tabs of the plugins 2011-01-02 23:24:14 +01:00
Andreas Preikschat
d8ef3c5947 added a check to prevent replacing the live background with an non existing image, prevent replacing with more images 2011-01-02 22:34:33 +01:00
Andreas Preikschat
909fa25e7b clean ups, added missing file 2011-01-02 18:24:47 +01:00
Tim Bentley
57f2010480 Head 2011-01-02 17:17:55 +00:00
Andreas Preikschat
cfb896e3b1 started work on OpenLyrics importer 2011-01-02 17:42:09 +01:00
Andreas Preikschat
0d2e8ff12d dialog show only once (when more files are missing) 2011-01-02 17:37:31 +01:00
Andreas Preikschat
cce440ba48 2011-01-02 11:29:18 +01:00
Tim Bentley
1031ea40d9 Fix Song form clean up for new song having edited previously. 
Fixes: https://launchpad.net/bugs/696362
 2011-01-02 08:03:42 +00:00
Andreas Preikschat
8a0eeb54bb 2011-01-02 08:57:05 +01:00
Andreas Preikschat
def66c204a fixed wrong indent 2011-01-01 22:55:22 +01:00
Andreas Preikschat
2693e3dbd9 removed a not needed import 2011-01-01 22:46:00 +01:00
Andreas Preikschat
625ef9fc00 fixed adding more images at once, tweaked adding images when one image is not present 2011-01-01 22:41:28 +01:00
Tim Bentley
f6a8e6884c Clean up directory creation 2011-01-01 17:23:24 +00:00
Tim Bentley
3190599a76 Head 1181 2011-01-01 15:17:35 +00:00
Tim Bentley
672eeb812b Head 2011-01-01 12:50:49 +00:00
Tim Bentley
fd5e173d21 Cleanups 2011-01-01 12:49:38 +00:00
Tim Bentley
b52ead934d Add Cursor management 2011-01-01 11:44:16 +00:00
Raoul Snyman
4bb59bff67 Fix bug #641661 2011-01-01 12:33:14 +02:00
Raoul Snyman
f7943d5746 Add in an error message if there is a problem with the user's downloaded Bibles. 2011-01-01 01:06:35 +02:00
Tim Bentley
0261fc12a1 Head1177 - And Fix ups 2010-12-31 19:32:05 +00:00
Meinert Jordan
487837e615 While walking through the German translation, I observed a couple of problems in the internationalization. These problems are addressed in this branch. There are very few changed translatable strings but a lot which will be recognized as new from linguist. 
I couldn't test all calls in the importers, because I don't have bibles in all formats. But nearly all changes in this request should be obvious.

bzr-revno: 1177
 2010-12-31 19:22:41 +00:00
Meinert Jordan
a9bf3aac5a Theme Wizard the layout was distorted because of several manual formating instructions. I limited all format instructions to the necessary minimum. Furthermore I aligned all QFormLayouts towards each other. 
It should contain no functional changes except of bug fixes (traped exceptions).
Some widgets ans slots are renamed for a consistent naming scheme.
Small fixes: removed two consecutive spaces and string introducing double quotes from python code. Edited some log.debug() arguments to avoid UnicodeErrors.

bzr-revno: 1176
Fixes: https://launchpad.net/bugs/695136
 2010-12-31 19:19:06 +00:00
Tim Bentley
0dc2f3ed85 Head1173 2010-12-31 08:41:00 +00:00
M2j
599ee1f7fa Lots of i18n fixes and some others. In detail: 
translate() expanded for numbered strings
MediaManager context menus are using the plugins strings instead of own string manipulations
Removed string manipulations from ThemeManager and fixed the delete validation                   
Added disambiguation for some plugin strings to distinguish between name plural and container title
Added or repaired translate() calls at several positions.
 2010-12-31 03:17:41 +01:00
Tim Bentley
cd74645379 Fix bug where blank hides the screen on restart. 
Presentations unblank the screen and reset the display flags and setting.

Fixes: https://launchpad.net/bugs/660448
 2010-12-30 09:13:39 +00:00
Raoul Snyman
5e730c3138 Created a new SearchEdit class, and implemented it in the song search. 
bzr-revno: 1172
 2010-12-29 18:16:51 +00:00
M2j
3ef0098c07 fix bug #695136 2010-12-29 17:35:10 +01:00
Tim Bentley
bb10026b63 Correct change in error 2010-12-29 09:37:36 +00:00
Tim Bentley
ad346d8e05 Add message popup and guard Images and Media as well 2010-12-29 09:27:13 +00:00
Tim Bentley
87c1074cfe Add guard for missing filename 2010-12-29 09:14:13 +00:00
Raoul Snyman
6f26c6fc0a Fix up a small bug left over from the changeover to the new search edit. 2010-12-28 23:41:12 +02:00
M2j
31721c51d6 Theme preview resizing for the ThemeWizard 2010-12-28 22:24:21 +01:00
Raoul Snyman
a9c2b9fa18 Added a new SearchEdit GUI object. 2010-12-28 23:12:20 +02:00
M2j
557a66db9d ThemeWizard: Show theme name in title and hide themeNameEdit if wizard is in editing mode. 
ThemeWizard: Changed transitionsComboBox to align with the FormLayout.
(change some log.debug() arguments to avoid UnicodeError exceptions)
 2010-12-28 12:18:56 +01:00
M2j
1a31bf2047 reverted changes in slidecontroller.py to avoid interference with merge request 44744 of googol-hush 2010-12-28 10:22:29 +01:00
M2j
7c68265f4b remove two consecutive spaces from python code of the whole OpenLP sources 
replaced double quotes for string in python code of the whole OpenLP sources
 2010-12-27 23:57:35 +01:00
M2j
9212399ad7 renamed slots to common naming scheme 
renamed objects to conform British English
(reverted some experimental edit of themewizard.ui)
 2010-12-27 22:53:02 +01:00
M2j
914827c023 same as before for SongImportWidget 
(removing unneccesary format instructions and FormLayout alignment)
 2010-12-27 19:23:46 +01:00
M2j
68e33c658a Head 1169 2010-12-27 17:05:56 +01:00
M2j
6815ac3146 - Finishes and tested rewrite of themewizard and bibleimportwizard 
- Added exceptions to OpenSong and CSV bible import wich occur for invalid files
 2010-12-27 16:31:53 +01:00
Tim Bentley
399970e7c7 More Theme Management cleanups 2010-12-27 10:18:09 +00:00
Tim Bentley
a464ab791b Head 1169 2010-12-27 08:32:01 +00:00
rimach
ec062c2640 SongBeamer fixes 
Correct Song Tab error

bzr-revno: 1169
 2010-12-27 08:28:33 +00:00
rimach
0a98f3038e Head 2010-12-26 21:56:51 +01:00
rimach
2cb38c6ab8 add complete check 2010-12-26 21:55:40 +01:00
Tim Bentley
e77ce3ffdb Bump values by 1 version or year 2010-12-26 11:04:47 +00:00
Tim Bentley
2d6581abe0 Head1166 2010-12-26 10:43:39 +00:00
Tim Bentley
bd91d078a2 Number of theme bug fixes and clean ups 
Plugin list is now singular

bzr-revno: 1165
Fixes: https://launchpad.net/bugs/694148
 2010-12-26 10:17:21 +00:00
Tim Bentley
3783fe03c8 Head 2010-12-24 13:52:08 +00:00
Tim Bentley
46f93f1cd5 Plugin names are singluar 2010-12-24 12:36:40 +00:00
Raoul Snyman
b9bfb14c21 Web interface does not always send all necessary data 
bzr-revno: 1164
Fixes: https://launchpad.net/bugs/693694
 2010-12-24 10:01:52 +00:00
M2j
b0a53020f6 bible wizard without manual design tweaks 2010-12-24 01:44:41 +01:00
Tim Bentley
67f6fceb0a Allow Songs to be Searched by Theme 2010-12-23 17:51:32 +00:00
Raoul Snyman
2d0acec7ba Fix bug #693694 2010-12-23 10:43:00 +02:00
M2j
5dddb3a53d typo 2010-12-22 20:03:38 +01:00
M2j
1027d60635 Fix: Bug in editsongform 
Fix: Bug in bibleserver import
 2010-12-22 19:15:48 +01:00
Jon Tibble
3ce8ed46d1 Cleanups 
bzr-revno: 1160
 2010-12-22 14:41:17 +00:00
Tim Bentley
47441be28a Fix song edit bug 
Fix Custom wording 693150

Fixes: https://launchpad.net/bugs/693150, https://launchpad.net/bugs/691952
 2010-12-21 19:49:02 +00:00
Jon Tibble
e6f3650bfd Cleanups 2010-12-21 19:39:35 +00:00
Tim Bentley
4d18dcbafb Head 2010-12-21 16:33:32 +00:00
Tim Bentley
f1eb140954 Fix song saving error. Reverting 1036 as this is causing an exception in song saving 
Fixes: https://launchpad.net/bugs/691952
 2010-12-21 16:32:46 +00:00
andreas
c6d408f0e1 Fix file extensions 
bzr-revno: 1157
 2010-12-21 16:31:11 +00:00
Andreas Preikschat
8f99aa4c96 fixed doc 2010-12-21 15:31:18 +01:00
Andreas Preikschat
87e7cb6242 translate file description 2010-12-21 15:26:20 +01:00
Andreas Preikschat
44427b5c04 file extension filter 2010-12-21 15:00:36 +01:00
Tim Bentley
f444aacdba Remove Bible add to existing service item option 2010-12-21 13:47:38 +00:00
Andreas Preikschat
313343856a f 2010-12-21 14:40:41 +01:00
Tim Bentley
cb4fa5d03a Fix Preview of Theme with Image bug 
Fix Protection of Single Character Theme titles
Add Cursor update to Image import

Fixes: https://launchpad.net/bugs/692684
 2010-12-20 20:22:21 +00:00
Tim Bentley
12af5cada3 Fix field name 2010-12-20 14:15:03 +00:00
rimach
96ee7fb343 correct SongTab Signal connection 2010-12-20 08:50:39 +01:00
rimach
582b81238f Head 2010-12-20 08:47:21 +01:00
rimach
bd66ef200a add default title 2010-12-20 08:46:59 +01:00
Tim Bentley
bef5479a6a Fix spacing 2010-12-19 08:22:48 +00:00
Tim Bentley
b553b2ac89 Tighten up the validation 2010-12-18 19:24:44 +00:00
Tim Bentley
47ac10f413 Fix songs with no text being saved 
Fixes: https://launchpad.net/bugs/691952
 2010-12-18 17:28:50 +00:00
Tim Bentley
6b760003d0 Head 2010-12-18 17:11:50 +00:00
Tim Bentley
02645f0457 Songs must have an Author 2010-12-18 17:11:21 +00:00
Meinert Jordan
347d772143 Rewritten openlp.plugins.bibles.lib.parse_reference() function. 
Localization of bible reference separators.
Non-breaking space between verse numbers and verse text.
Web-Import from bibleserver.com
Replaced commas in title strings of biblegateway.csv => completely updated the file

Two known issues:
The localized separators are still hard coded and need GUI configuration.
Not all of the new bibles are full usable, because OpenLP has still unlocalized code for the book names (applies also to other bible imports like OSIS).

bzr-revno: 1152
 2010-12-18 14:45:01 +00:00
andreas
18e75b7824 - camelCase for Ui_FileRenameDialog 
- Fixed bug #690774
- Keep copyright field empty if the imported song (from the service list) does not have any copyright information.

bzr-revno: 1151
Fixes: https://launchpad.net/bugs/690774
 2010-12-18 08:53:29 +00:00
M2j
fc2569cf83 missed some fixes 2010-12-18 03:12:41 +01:00
M2j
c226979f24 Format fixes, comment fixes and biblegateway.csv updated 2010-12-17 23:10:29 +01:00
Meinert Jordan
176d4fbc2a Fix: wrong variable names caused osis and http bible imports to crash 
Fix: handle unicode in song search string generation
Fix: replaced tab indentation
regenerate search_lyrics on song reindex action

bzr-revno: 1149
 2010-12-17 18:55:53 +00:00
andreas
01257a319f White Space Cleanups 
bzr-revno: 1148
 2010-12-17 18:51:56 +00:00
Andreas Preikschat
fa79dd2cca keep copyright field empty if imported song does not have any copyright information 2010-12-17 15:28:19 +01:00
M2j
04d4d76dcd removed commented code in openlp.plugins.bibles.lib.http 2010-12-17 14:46:34 +01:00
M2j
9c5177b0f7 exception, if bibleserver.com response contains no verses 2010-12-17 14:33:25 +01:00
Andreas Preikschat
3cdac511e2 fixed bug #690774 2010-12-17 14:30:48 +01:00
M2j
a46ea7c4eb localisation off seperators. 2010-12-17 14:21:55 +01:00
M2j
fb80a09120 HEAD 1147 2010-12-16 21:03:07 +01:00
M2j
f119a4afa5 further work on parse_reference and other things 2010-12-16 21:00:01 +01:00
Andreas Preikschat
e257f0431b r1147 2010-12-16 20:15:23 +01:00
Andreas Preikschat
fe452bc588 removed mistakes 2010-12-16 20:12:34 +01:00
M2j
e6bc3b9303 song search strings: handle unicode and reindex also search_lyric 2010-12-16 19:20:46 +01:00
Andreas Preikschat
95f30dfb6d fixed bug #690774 2010-12-16 18:56:08 +01:00
M2j
ff98870391 - bible imports broken by variable renaming 
- removed tab indentation
 2010-12-16 18:11:02 +01:00
Andreas Preikschat
58a4d04980 white spaces 2010-12-16 14:16:53 +01:00
Tim Bentley
b9a97dd651 Remove comments 2010-12-14 20:22:57 +00:00
Tim Bentley
d848dedb79 Fix custom edit bug 
Fixes: https://launchpad.net/bugs/690335
 2010-12-14 20:22:01 +00:00
M2j
6e834900e6 rewritten bible reference parser with more features and localisation capabilities 
(first, untested version)
 2010-12-13 20:06:07 +01:00
Andreas Preikschat
d9768b6536 whitespaces 2010-12-13 15:24:16 +01:00
andreas
e7a40c492f - "Save" button now only saves the alert (if the alert has not created before the save button is disabled). -> the buttons are less confusing 
- feedback:
1) If the "alert text" field does not contain "<>" but the parameter field is not empty, then a pop up opens.
2) If the "alert text" field does contain "<>" but the parameter field is empty, a pop up opens.

bzr-revno: 1145
 2010-12-12 17:08:12 +00:00
Andreas Preikschat
90b806c6a4 comment fix 2010-12-12 16:57:43 +01:00
Tim Bentley
52803af6d3 Add Autocompletion to the Songs Dialog 
Fix up some lost and confused Camels

bzr-revno: 1143
 2010-12-12 14:41:06 +00:00
Andreas Preikschat
adb765f3fa fixed a bug, user feedback 2010-12-12 11:33:33 +01:00
Andreas Preikschat
77f4adbef0 - fixed progress bar (bible openlp1 import) 
- fixed Bug #688647 (mostly copy&paste)
- fixed "reject" method (the import would not stop, if currentId() == 2/3)
- some songbeamer import tweaks

bzr-revno: 1142
Fixes: https://launchpad.net/bugs/688647
 2010-12-12 09:06:24 +00:00
Tim Bentley
4a7300c6c0 Topic and Book Auto completion 2010-12-12 08:35:02 +00:00
M2j
fda3085449 resource added 2010-12-12 01:03:51 +01:00
M2j
b5075ccddf Bible web import from Bibleserver.com - first version 2010-12-12 00:54:07 +01:00
Tim Bentley
031b23ccda Format errors 2010-12-11 20:57:45 +00:00
Tim Bentley
bc0ca88af5 Add Autocompletion for Authors and Themes 2010-12-11 20:31:47 +00:00
Andreas Preikschat
0cae712cc4 fixed openlp bible importer progress bar 2010-12-11 13:18:35 +01:00
Andreas Preikschat
2de4edfe56 disable olp import if importError, songbeamer tweaks 2010-12-11 13:07:38 +01:00
Tim Bentley
9d1eabe2a2 Author is optional 2010-12-11 10:46:11 +00:00
Tim Bentley
9d67aea4f7 Fix missing authors on song import 2010-12-11 09:59:23 +00:00
Andreas Preikschat
ce0abd19bd string change, close file, MarkType 2010-12-11 10:53:30 +01:00
Andreas Preikschat
62643d7d5e string change, close file, MarkType 2010-12-11 10:40:52 +01:00
Andreas Preikschat
a268bd9536 Add OpenLP1 bible importer 
bzr-revno: 1140
 2010-12-10 17:25:40 +00:00
Meinert Jordan
bdc0c28809 Local aware song order 
bzr-revno: 1139
Fixes: https://launchpad.net/bugs/687638
 2010-12-10 17:19:33 +00:00
Meinert Jordan
7c5cb8d80b Import Wizards don't Stop 
bzr-revno: 1138
Fixes: https://launchpad.net/bugs/659019
 2010-12-10 17:18:08 +00:00
Andreas Preikschat
5d33376740 again changed olp to openlp 2010-12-09 19:01:04 +01:00
Andreas Preikschat
9515b84c56 whitespaces, string change 2010-12-09 18:44:18 +01:00
Andreas Preikschat
a15aebcc32 latest changes for merge 2010-12-09 17:53:48 +01:00
Andreas Preikschat
6284480055 trunk r1136 2010-12-09 17:10:15 +01:00
M2j
7e221a6e98 locale aware song sorting 2010-12-09 16:08:04 +01:00
Andreas Preikschat
7e86da26f2 close connection when finished, removed unused variable 2010-12-09 14:35:17 +01:00
M2j
465515d71e unicode in song title search strings 2010-12-09 14:30:23 +01:00
Andreas Preikschat
01fad9972c added comments back 2010-12-09 13:49:15 +01:00
M2j
20b1c33a4b making 'cancel bible import' work 2010-12-09 00:40:28 +01:00
M2j
b465d763cd use the same call as in the Qt sources 2010-12-09 00:33:38 +01:00
M2j
c33654c68c Bug #659019 2010-12-08 23:55:28 +01:00
Derek Scotney
3719143f99 Fixes unwanted text imported from some SongSelect files. SongSelect only has a few verse types available for verses and adds extra ones by setting the verse type to 'misc' and then including the actual type on the next line. In the case of a 'misc' type or unknown type, the next line is checked for a valid verse type. The fix has been made for both .txt and .usr file types. 
bzr-revno: 1136
 2010-12-08 20:17:51 +00:00
Tim Bentley
e39c681c44 Add text entry validator to display positions 
Fix Spelling

bzr-revno: 1135
Fixes: https://launchpad.net/bugs/685317
 2010-12-08 19:21:59 +00:00
Derek Scotney
cc7780574b reverted back to revision 1134 2010-12-08 21:14:27 +02:00
Tim Bentley
b405195261 Fix size input validation again 2010-12-08 19:12:38 +00:00
Andreas Preikschat
9f6a0f7c64 moved file 2010-12-08 18:56:29 +01:00
Andreas Preikschat
aca56b78b5 changed olp1 to OpenLP1 2010-12-08 18:46:22 +01:00
Andreas Preikschat
b044226332 changed class name 2010-12-08 18:19:51 +01:00
Andreas Preikschat
12e7c96463 camelCase changes 2010-12-08 18:18:12 +01:00
M2j
3ad231940c HEAD 1127 2010-12-08 09:25:28 +01:00
M2j
62766269f1 - remove None in .split() method 
- change translatable codepage selection strings
 2010-12-08 09:21:17 +01:00
rimach
44b0574778 fix for missing title field 2010-12-07 23:47:02 +01:00
Derek Scotney
298a159b5e Update to verse types 2010-12-07 23:10:57 +02:00
Derek Scotney
a5fc219abb Updated to handle CCLI verse type 'misc' 2010-12-07 22:03:20 +02:00
Andreas Preikschat
6fd338c492 tweaked importer 2010-12-07 17:34:19 +01:00
Jon Tibble
7f60e706aa Unused imports 2010-12-06 23:59:01 +00:00
Jon Tibble
9291516b59 Fix v2 import bug 2010-12-06 23:37:55 +00:00