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

4586 Commits

Author SHA1 Message Date
M2j
a6566a1f84 reworked GUI layout for the rest of the code 
alignment fix for SearchEdit (visible with Clearlooks theme)
replaced capitalized variable names in touched classes
use codepage selection fallback for the ewimporter
 2011-01-05 18:53:58 +01:00
M2j
6dca24bc3c Head 1189 2011-01-05 18:17:22 +01:00
M2j
15c0dac9d0 replaced beginning capitals in variable names in AlertForm class 2011-01-05 18:13:57 +01:00
Tim Bentley
833d31ddb0 Head 2011-01-05 16:57:49 +00:00
Tim Bentley
e7832cc63e Head 2011-01-05 16:55:54 +00:00
Tim Bentley
b6db2e3659 Fixes 2011-01-05 16:55:28 +00:00
Meinert Jordan
e65898fcec Fix Layout of Settings Tab and other dialogs 
bzr-revno: 1189
 2011-01-05 16:54:44 +00:00
M2j
71f6bc26dc basicaly reworked the layout of the mediaitems and renamed variables to fit the standard 2011-01-05 17:50:28 +01:00
Andreas Preikschat
09e2fb7691 clean up 2011-01-05 17:45:29 +01:00
Andreas Preikschat
4246c3b76e - added documentation 
- commented not needed class out
- split class 'OpenLyricsParser'
- relocated and imporved some code in methods
 2011-01-05 17:31:04 +01:00
Tim Bentley
d97414e4e9 Fix title Camels 2011-01-05 16:15:08 +00:00
Tim Bentley
13732b5bd1 Speed up theme load and stop display being set incorrectly for images 
Fixes: https://launchpad.net/bugs/697405
 2011-01-05 16:06:56 +00:00
M2j
92ed275add Alignment fix for SearchEdit 2011-01-05 11:48:47 +01:00
M2j
d7ff9d37d2 formating of a comment 2011-01-05 10:37:11 +01:00
Tim Bentley
38e72ca137 Change message code 2011-01-05 07:18:12 +00:00
Tim Bentley
4b08a7a253 Head 2011-01-05 07:07:31 +00:00
Tim Bentley
803d55c2ec Change message code 2011-01-05 07:07:19 +00:00
Andreas Preikschat
449610d50e - fixed author wihtou first_name e. g. "Luther" 
- open xml file properly
- tweakes
 2011-01-04 23:06:43 +01:00
M2j
21340470d3 simplified all setupUi() in plugins 2011-01-04 22:06:50 +01:00
Raoul Snyman
185f7aa06e Fix for bug #696979 
bzr-revno: 1188
 2011-01-04 22:27:31 +02:00
Tim Bentley
f9954fac80 Add comment to force update 2011-01-04 17:36:22 +00:00
Raoul Snyman
85c6ba2ee4 Fix for bug #696979 2011-01-04 19:26:37 +02:00
Raoul Snyman
411a60c6c5 Fix for bug #697271 2011-01-04 18:04:55 +02:00
Andreas Preikschat
9763a43f55 removed not supported html tags 2011-01-04 16:51:11 +01:00
M2j
cf6208caa7 Head 2011-01-04 11:15:36 +01:00
M2j
bca7d46ad3 Character selection fallback for the ewimporter 2011-01-04 11:13:41 +01:00
Andreas Preikschat
cc229d05af - add standard verseOrder, if xml does not have any verseOrder property 
- added '_get' and '_text' methods which do the same as 'get' and 'text', but make sure that they never return 'None' (but u'' instead)
- fixed wrong use of 'theme'
- implemented songbooks, songnumber and comment
- clean ups
 2011-01-04 10:46:24 +01:00
M2j
6de12718f6 Head 1186 2011-01-04 10:19:53 +01:00
Andreas Preikschat
a5f73713d4 add standard verseOrder, if xml does not have any verseOrder property; added '_get' and '_text' methods which do the same as 'get' and 'text', but make sure that they never return 'None' (but u'' instead) 2011-01-03 22:47:49 +01:00
Andreas Preikschat
a35b50e727 reindex tool adds 'author unknown' if songs do not have any author 2011-01-03 22:14:56 +01:00
Tim Bentley
45367eaab2 Update text and guard video backgrounds 2011-01-03 19:50:25 +00:00
Tim Bentley
0c793a123e Head 2011-01-03 19:48:36 +00:00
Tim Bentley
23d71700aa Theme handling changes 2011-01-03 19:47:14 +00:00
Tim Bentley
38524576ef Allow the exit conformation dialog to be disabled 
bzr-revno: 1186
 2011-01-03 19:22:50 +00:00
Tim Bentley
d4f0953429 Head 2011-01-03 18:42:32 +00:00
Andreas Preikschat
a127019f28 fixed wrong use of 'theme', implemented songbooks and songnumber, continued with openlyrics implementation, clean ups 2011-01-03 14:43:09 +01:00
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
Tim Bentley
c11454b02d Fix review comments 2011-01-03 08:56:17 +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
3bb309e623 Block delete of default theme 2011-01-02 17:20:53 +00:00
Tim Bentley
57f2010480 Head 2011-01-02 17:17:55 +00:00
Tim Bentley
48a96769d7 Add YAS for closure 2011-01-02 16:42:30 +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
Tim Bentley
c487d7f33d Fix the service saving 
Fixes: https://launchpad.net/bugs/696313
 2011-01-02 13:57:55 +00: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
0df8096775 Remove debugging code 2011-01-01 15:28:10 +00:00
Tim Bentley
3190599a76 Head 1181 2011-01-01 15:17:35 +00:00
M2j
e74f46a126 Head 1180 2011-01-01 14:58:32 +01:00
M2j
49e852b7e3 worked on setupUI for MainDisplay, MainWindow and PluginForm 2011-01-01 14:22:12 +01: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
Raoul Snyman
3a50dfc500 Fixed bug #641661 
bzr-revno: 1180
 2011-01-01 14:48:00 +02:00
Tim Bentley
c667ed5cc9 Head 2011-01-01 12:40:33 +00:00
Raoul Snyman
8cd04bc017 Fixed a few stray bugs to do with services. 2011-01-01 14:25:12 +02:00
Tim Bentley
fd92d47057 More changes to cursors 2011-01-01 12:20:42 +00:00
Tim Bentley
348ea6de26 Head 2011-01-01 11:45:10 +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
Raoul Snyman
cd826f525a HEAD 2010-12-31 23:45:12 +02:00
Raoul Snyman
3198de5c55 For once and for all, change the save/save as/load/etc of services. 2010-12-31 23:43:02 +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
M2j
e6a24cf08c rewritten setupUI for AboutDialog, AdvancedTab, ExceptionDialog, FilerenameDialog and GeneralTab 2010-12-31 19:10:45 +01:00
Jonathan Corwin
a83df7ce04 Fix https://bugs.launchpad.net/openlp/+bug/672164/comments/9 2010-12-31 17:13:23 +00:00
Tim Bentley
e243afe421 Head1174 2010-12-31 14:10:01 +00:00
M2j
05eff3015a Head 1174 2010-12-31 13:25:19 +01:00
Tim Bentley
0dc2f3ed85 Head1173 2010-12-31 08:41:00 +00:00
Tim Bentley
0a1118266b fix ups requested by Raoul 2010-12-31 08:34:53 +00:00
Andreas Preikschat
a957e00825 fix for a edge case, where the slidecontroller will not resize 2010-12-31 09:06:42 +01: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
M2j
74bfde72dc removed '- OpenLP' in ThemeWizard title 2010-12-30 13:02:36 +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
Tim Bentley
0ec22826a8 Fix message text 2010-12-29 17:26:03 +00:00
M2j
3ef0098c07 fix bug #695136 2010-12-29 17:35:10 +01:00
Tim Bentley
8cdf4d39bf Add muppet exit guard 2010-12-29 12:45:16 +00: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
a2eae992bf HEAD 2010-12-28 23:23:11 +02: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
Tim Bentley
0ce3848d0f Fix missed years 2010-12-28 11:07:59 +00:00
Tim Bentley
ecc46c12c4 Theme manager cleanup 2010-12-28 10:56:19 +00:00
Andreas Preikschat
3a3aee9c4a dockwidget tweak 2010-12-28 11:35:59 +01:00
Andreas Preikschat
2354ae6530 instead of using the dockwidgets, the slidecontrollers update themselves 2010-12-28 11:06:05 +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
Andreas Preikschat
3e55468a3d fixed AttributeError 2010-12-28 09:37:13 +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
Andreas Preikschat
dcbba9bbf4 fixed long line 2010-12-27 17:07:44 +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
Andreas Preikschat
708010ffb0 r1169 2010-12-27 16:02:44 +01:00
Andreas Preikschat
71af1b3bf0 resize controllers when resizing or moving the docks 2010-12-27 15:55:53 +01:00
Tim Bentley
399970e7c7 More Theme Management cleanups 2010-12-27 10:18:09 +00:00
Andreas Preikschat
a0b15e5324 cleaned up the slidecontroller 2010-12-27 11:14:46 +01:00
Tim Bentley
a464ab791b Head 1169 2010-12-27 08:32:01 +00:00
Tim Bentley
4e58f880c3 More changes for next release 2010-12-27 08:31:20 +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
Andreas Preikschat
304f7b406d started work on slidecontroller resize 2010-12-26 15:44:07 +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
49d8a6a2f2 More changes 2010-12-26 10:43:25 +00:00
andreas
8dc93ad67d Part of corrections to display sizes 
bzr-revno: 1166
Fixes: https://launchpad.net/bugs/598356
 2010-12-26 10:19: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
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
Tim Bentley
ad36b2e83f Theme handling cleanups 2010-12-24 08:07:26 +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
Tim Bentley
cc0af53b85 Head 2010-12-23 17:46:21 +00:00
M2j
66d8a188fe Remove most manual formating in the themewizard (regards to bug #686103) 2010-12-23 18:44:42 +01:00
Tim Bentley
e9082eaec3 Start to add functionality to allow tags to be customised 2010-12-23 17:42:28 +00:00
Tim Bentley
e48ba4f29d Fix up theme delete / rename validation for now. 
bzr-revno: 1163
 2010-12-23 13:18:24 +02:00
Andreas Preikschat
085e746b4c fix for bug #598356 2010-12-23 10:44:57 +01: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
Tim Bentley
0e064c9928 Fix theme delete / rename issue with plugin stored values 
Fixes: https://launchpad.net/bugs/693202
 2010-12-22 18:49:01 +00: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
4067310afc Fix song saving bug #691952 
Fix custom edit bug #693150

bzr-revno: 1159
 2010-12-22 07:49:51 +02: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
Andreas Preikschat
b07c7fae68 added final credit 2010-12-21 20:07:37 +01: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
47ac045f1d Fix config tag error 2010-12-21 11:09:00 +00: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
Tim Bentley
d1c79a595d Fix image edit bug 2010-12-17 19:15:31 +00: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
4e9d6370b3 clean up 2010-12-16 17:08:10 +01:00
Andreas Preikschat
58a4d04980 white spaces 2010-12-16 14:16:53 +01:00
Andreas Preikschat
0e1383c35d clean ups 2010-12-15 20:22:25 +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
Meinert Jordan
08ab85cb8a Additional buttons in the exception dialog for sending a bug report per email or saving it to a file. 
The report contains the traceback along with library versions.

The bug report is prefilled with the traceback, the openlp version, platform informations (on Linux also KDE or GNOME), the and the versions of all used libraries.

bzr-revno: 1144
 2010-12-12 16:58:06 +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
M2j
a1d413307b HEAD 1141 2010-12-12 00:27:23 +01:00
M2j
f3f2e5cdc8 minor changes 2010-12-12 00:25:49 +01:00
Tim Bentley
031b23ccda Format errors 2010-12-11 20:57:45 +00:00
Tim Bentley
a25ce9d3cf Sort out Camels 2010-12-11 20:49:50 +00:00
Tim Bentley
bc0ca88af5 Add Autocompletion for Authors and Themes 2010-12-11 20:31:47 +00:00
M2j
af202e3358 removed CLI interface of the mailto library 2010-12-11 21:22:03 +01:00
M2j
c28b129421 format mailto() sources 
some exception dialog enhancements
 2010-12-11 16:39:12 +01: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
M2j
1cb9594e58 test exception removed 2010-12-11 01:29:57 +01:00
M2j
8ad603b251 completed exception report dialog 2010-12-11 01:26:41 +01:00
M2j
5bae9c74e3 added mailto code 2010-12-10 22:19:46 +01:00
M2j
88ba36c9dd Bug report features for exception dialog 2010-12-10 21:42:20 +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
Raoul Snyman
16ea5d4875 HEAD 2010-12-10 07:09:55 +02:00
Raoul Snyman
c2b8228729 Updates to documentation. 2010-12-10 07:09:03 +02: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
rimach
79bb7457d3 Head 2010-12-08 22:06:00 +01:00
rimach
653f1e8ea6 next steps 2010-12-08 22:03:25 +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
Tim Bentley
2f04bde2aa Fix size input validation 2010-12-08 19:00:24 +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
rimach
5a5d03a7bd Head 2010-12-07 23:43:05 +01:00
rimach
dd8bc1dd9d next steps for shortcuts, please give a try 2010-12-07 23:38:41 +01:00
Derek Scotney
298a159b5e Update to verse types 2010-12-07 23:10:57 +02:00
Tim Bentley
ccc640bb27 Stop invalid characters being entered 2010-12-07 20:47:09 +00:00
Derek Scotney
a5fc219abb Updated to handle CCLI verse type 'misc' 2010-12-07 22:03:20 +02:00
Tim Bentley
a55cdd3a50 Fix string to int problem 2010-12-07 18:55:58 +00:00
Tim Bentley
1b3db9f429 Fix Theme Bug text color. 
Fix serious spelling error.

bzr-revno: 1133
Fixes: https://launchpad.net/bugs/686122
 2010-12-07 17:28:46 +00: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
Jon Tibble
533a0c5b5b Head r1131 2010-12-06 23:28:01 +00:00
Tim Bentley
117f77a4a4 Spell Vertical 2010-12-06 19:42:17 +00:00
Tim Bentley
04b4cdaf9f Head1131 2010-12-06 19:39:04 +00:00
Tim Bentley
b01aed6b0d Fix theme main font color bug 
Fixes: https://launchpad.net/bugs/686122
 2010-12-06 19:36:15 +00:00
Andreas Preikschat
d5e0643b45 attempt to clean up bible importers 2010-12-06 20:30:04 +01:00
Tim Bentley
fd473b81d7 Spell Vertical 2010-12-06 19:28:52 +00:00
Tim Bentley
109d214fb3 Add comment 2010-12-06 19:25:44 +00:00
Raoul Snyman
3389e487ca Fixed issues from merges. 
Set second page of wizard on edit.
 2010-12-05 20:02:36 +02:00
Andreas Preikschat
9db57568b0 started olp1 bible import 2010-12-05 17:11:21 +01:00
Andreas Preikschat
e3cb6a6508 changed 2010-12-05 17:07:16 +01:00
Andreas Preikschat
b8e6da0417 completed work 2010-12-05 16:47:23 +01:00
Andreas Preikschat
a66a77bdec completed work 2010-12-05 16:44:51 +01:00
Raoul Snyman
5b19753bf7 HEAD 2010-12-05 08:57:35 +02:00
Raoul Snyman
222d5fe9be HEAD 2010-12-05 08:40:35 +02:00
Andreas Preikschat
e6cfad921a olpv1 bible importer 2010-12-04 21:42:03 +01:00
Tim Bentley
38d777d98e Fix more line endings 2010-12-04 09:05:11 +00:00
Tim Bentley
ea246d777a Head1129 2010-12-03 20:47:05 +00:00
andreas
41c805e607 hanged importer messages (Bug #668789) 
- disabled text search for web bibles (does not matter if the web bible is the dual or normal bible)
- available web bibles in the bible importer are now sorted
- imported bible in the Media Manager are now sorted
- speed improvements (unfortunately this takes the ability to keep unselected item unselected when doing an other search)
- "second" instead of "dual"
- docs, comments
- added an auto completion for bible books ("Quick Search" Tab; "Verse Search" combo box)

bzr-revno: 1129
Fixes: https://launchpad.net/bugs/668789
 2010-12-03 20:45:41 +00:00
andreas
7c65303400 - added the <u>Underline</u> tag 
- clean ups

SongBeamerImport:
- clean ups and tweaks
- fixed a bug which would drop the first line of a verse, when it does not have any "verse type"
- convert SongBeamer's html tags to OpenLP specific style

bzr-revno: 1128
 2010-12-03 20:42:56 +00:00
Tim Bentley
41dfd114d7 Theme values are preserved correctly 
Fixes: https://launchpad.net/bugs/684901
 2010-12-03 20:22:59 +00:00
Andreas Preikschat
245465ab11 improved completor performance 2010-12-03 20:53:56 +01:00
Tim Bentley
22f52b74c1 Fix spelling 2010-12-03 19:21:15 +00:00
Tim Bentley
99cfc65446 Allow theme name to be changed after error message 
Fixes: https://launchpad.net/bugs/684901
 2010-12-03 19:00:40 +00:00
Tim Bentley
37c065a6e4 pylint finished for now 2010-12-03 18:56:12 +00:00
Tim Bentley
1b6aa34d39 Pylint again 2010-12-03 15:14:32 +00:00
rimach
d7f944b49a Head 2010-12-02 22:58:23 +01:00
Andreas Preikschat
b88436c641 autocompleter should be 'CaseInsensitive' 2010-12-02 18:36:35 +01:00
Tim Bentley
ada84d9352 pylint fixes part 1 2010-12-02 14:37:38 +00:00
Andreas Preikschat
6b1254e923 trunk r1127 2010-12-02 15:00:32 +01:00
andreas
c8fe3ceb67 - docs 
- disable "edit" and "delete" button when loading a song or creating a new one (*)

(*) To reproduce this, edit/create a song, select a verse and click "Cancel". When you edit/create another song, the "edit" and "delete" buttons are enabled.

Manually fix conflict in comments on merge (trb143)

bzr-revno: 1127
 2010-12-02 09:11:34 +00:00
Andreas Preikschat
cd6948f613 added an autoCompleter for bible books for 'Verse Search' 2010-12-01 19:37:54 +01:00
Tim Bentley
7f1e21c13b Fix field names and verse order bug 2010-11-30 20:23:21 +00:00
Andreas Preikschat
28390e965d enable search button 2010-11-29 20:02:58 +01:00
Tim Bentley
cc9ef10821 Songs get created correctly and displays refreshed 2010-11-29 16:02:41 +00:00
Tim Bentley
2c3c0f2255 Songs get built correctly 2010-11-29 14:04:37 +00:00
Tim Bentley
5decd5c466 Cleanups and fixes 2010-11-29 07:32:08 +00:00
Tim Bentley
6ecc121bdf Convert verse tags 2010-11-28 19:38:27 +00:00
Tim Bentley
e2ac8b6dcc More code fixes 2010-11-28 16:48:36 +00:00
Tim Bentley
132c678569 Fix exit for non Sqlite Databases 2010-11-28 15:20:53 +00:00
Andreas Preikschat
8929aaaa23 docs; make sure, that the edit/delete buttons are always disabled after loading the window 2010-11-28 16:10:51 +01:00
Tim Bentley
9fa384b57f More changes 2010-11-28 14:40:46 +00:00
Tim Bentley
dba32e3614 Fix DnD bug 2010-11-28 13:41:52 +00:00
Andreas Preikschat
3a13ebdce7 remove strike tags in songBeamer files; decent check for digits 2010-11-28 14:41:50 +01:00
Tim Bentley
a7e8104f59 Song rebuilding continues 2010-11-28 13:39:51 +00:00
Andreas Preikschat
7889a22810 fixed <p> tag, replaced the <u> tag and another fix 2010-11-27 22:12:52 +01:00
Tim Bentley
1cf4914862 fixes from last merge and more code for song management 2010-11-27 20:51:54 +00:00
Tim Bentley
90c631ce87 Documentation fixups and \nstart to add OpenlLyrics export for songs 2010-11-27 15:25:00 +00:00
Tim Bentley
771c86783e Remove theme background for Images 2010-11-27 08:59:49 +00:00
rimach
bd173bd217 Head 2010-11-27 08:09:14 +01:00
Andreas Preikschat
52c12d50be trunk r1124 2010-11-26 17:33:01 +01:00
Andreas Preikschat
4d1b88072f fixed reStructuredText 2010-11-26 17:30:04 +01:00
Andreas Preikschat
ae036056b1 added the tag {u} 2010-11-26 17:25:56 +01:00
Andreas Preikschat
0dc9d433b7 SongBeamer import converts tags, that they'll work with OpenLP 2010-11-26 17:06:24 +01:00
Andreas Preikschat
66f230169d SongBeamer import clean ups and tweaks 2010-11-26 15:23:48 +01:00
Tim Bentley
2752279d43 Remove need to restart for double click event changes 2010-11-26 09:49:06 +00:00
Tim Bentley
f153c27d32 Fix preview of live when returning from blank display 2010-11-26 09:00:14 +00:00
Tim Bentley
a12498e011 Fix up comments from merge 
More cleanups discovered
Fix Theme Copying as it was broken
 2010-11-24 21:50:51 +00:00
Tim Bentley
9cc994e0e0 Fix up theme lines per slide text 2010-11-24 19:41:14 +00:00
Tim Bentley
e20e336c5e Remove extra debugging 2010-11-24 17:40:28 +00:00
Tim Bentley
0b1a187f94 Head 2010-11-24 17:39:07 +00:00
Tim Bentley
827840710f Remove print 2010-11-24 17:38:59 +00:00
Jon Tibble
1c11cab27b Whitespace & unused imports 2010-11-24 01:51:08 +00:00
Jon Tibble
3ae6d7db97 Fix BibleGateway searches for BeautifulSoup 3.1 
bzr-revno: 1122
 2010-11-24 01:06:36 +00:00
rimach
8a65b52e6a Head 2010-11-23 22:34:34 +01:00
Tim Bentley
45905753ed Start to add line count code to wizard 2010-11-23 20:48:55 +00:00
Tim Bentley
85261fe659 Fix server load edit bug 2010-11-22 18:52:58 +00:00
Tim Bentley
e103dea7f1 Add extra invalid theme name 2010-11-21 20:46:44 +00:00
Tim Bentley
4c19db0b91 Force black backgounds for videos 2010-11-21 20:45:22 +00:00
Andreas Preikschat
e4e2892ec7 trunk r1119 2010-11-21 12:00:37 +01:00
Tim Bentley
f900980eef Add debugging for Servie editing and fix edit_id bug 2010-11-20 18:14:43 +00:00
Tim Bentley
948cb57d59 Remove blank check box line 
Fix situation when trying to work with no themes

Fixes: https://launchpad.net/bugs/677710
 2010-11-20 16:36:54 +00:00
Raoul Snyman
5867fddd5b Added theme wizard picture. 
Fixed up theme wizard somewhat (still not done).
 2010-11-20 00:26:15 +02:00
Andreas Preikschat
f6c30b7106 removed == 1 2010-11-19 22:34:15 +01:00
Tim Bentley
6823931e38 Review cleanup 2010-11-19 18:05:49 +00:00
Jon Tibble
efdf1405de Head r1117 2010-11-19 01:18:36 +00:00
Tim Bentley
94fb7d49d6 Remove stray print statements 2010-11-18 17:57:51 +00:00
Tim Bentley
1dfef4f061 Style Police 2010-11-18 17:46:47 +00:00
Tim Bentley
44038028bc Add theme error message 2010-11-18 17:40:20 +00:00
Tim Bentley
c08030b462 Version 1 now imports ok 2010-11-17 18:35:04 +00:00
Tim Bentley
19fc6f47a1 Start of version 1 import conversion 2010-11-16 20:24:21 +00:00
Andreas Preikschat
435338caad more generic parameters for __init__ 2010-11-16 19:33:37 +01:00
Andreas Preikschat
b561bf6bdd trunk r1117 2010-11-16 19:00:47 +01:00
Andreas Preikschat
588cfa111f long lines 2010-11-16 18:57:13 +01:00
Tim Bentley
c0adc51f62 Head 2010-11-16 17:36:50 +00:00
Tim Bentley
bca4071900 Fix up boolean theme fields 2010-11-16 17:33:41 +00:00
Raoul Snyman
aadc913ba1 Fix a bug where a null field would cause an exception. 2010-11-16 19:12:11 +02:00
Raoul Snyman
689cddf3e4 Removed an unnecessary line. 2010-11-16 11:29:46 +02:00
Raoul Snyman
59f47a5e1f Fix the spelling. 2010-11-16 08:20:39 +02:00
Raoul Snyman
8ed5bb883e Added a "re-index" tool for songs. 2010-11-16 08:19:23 +02:00
Jon Tibble
f63625b72f Fix biblegateway for BeautifulSoup 3.1 2010-11-16 03:31:17 +00:00
rimach
ad94471014 shortcuthandling ideas 2010-11-15 23:54:41 +01:00
Andreas Preikschat
80721aad35 replaced 'dual' 2010-11-15 18:47:33 +01:00
M2j
bb571b0df5 using list of tuples 2010-11-13 22:04:11 +01:00
Andreas Preikschat
a357bdf6a0 improved performance 2010-11-13 21:13:24 +01:00
Tim Bentley
e9e895f969 Sort themes when read 
bzr-revno: 1115
 2010-11-13 11:44:55 +00:00
M2j
e81bd1c3fc remove QtCore from header 2010-11-13 09:01:47 +01:00
Tim Bentley
6f51b68824 Sort theme 2010-11-13 07:30:34 +00:00
Andreas Preikschat
272eea72b7 removed theme sorting 2010-11-13 08:17:39 +01:00
Tim Bentley
0d9649ff40 Sort themes in sorder 2010-11-13 07:09:00 +00:00
Andreas Preikschat
38397f07a2 changed texts again 2010-11-12 23:27:57 +01:00
Andreas Preikschat
093dc1afca make sure that the theme list (in the settings are sorted), docs/comments 2010-11-12 23:02:25 +01:00
Andreas Preikschat
a0bbe76717 comments/missing lines 2010-11-12 22:51:18 +01:00
Andreas Preikschat
46321741ad make sure, that the bible list in the importer is sorted 2010-11-12 22:34:06 +01:00
Andreas Preikschat
b34bb86b7c spelling 2010-11-12 18:54:34 +01:00
Andreas Preikschat
45945cc302 -docs/comments -disabled text mode for webbibles -"dual" instead of "second" 2010-11-12 14:50:13 +01:00
M2j
4ccb48ffce HEAD 1114 2010-11-12 14:40:24 +01:00
M2j
682fcc2405 use a list in the OLP1 import to get sorted entries in the encoding comboBox 2010-11-12 14:20:45 +01:00
M2j
ef91b24d8a using PySQLite type conversion 2010-11-12 13:23:44 +01:00
Tim Bentley
550654bb2c Display fixes 2010-11-09 20:17:38 +00:00
Andreas Preikschat
802e886e96 removed whitespaces 2010-11-09 18:23:18 +01:00
Andreas Preikschat
f8b793ca3b removed whitespaces, added second blank line before class 2010-11-09 18:10:37 +01:00
Andreas Preikschat
06cf6dcc20 changed bible importer finish message, clean ups 2010-11-09 17:56:16 +01:00
Tim Bentley
dc184fdd2e Head 2010-11-08 18:51:56 +00:00
Tim Bentley
4360447a3b More fixes to editor 2010-11-08 06:11:04 +00:00
M2j
5e9ff18927 caracter encoding comboBox for openlp.org 1.x import 2010-11-07 23:57:30 +01:00
Raoul Snyman
fb5a146104 Added and changed the expand all and collapse all icons. 2010-11-07 23:01:02 +02:00
Tim Bentley
0102500e47 Fix saving 2010-11-06 07:58:46 +00:00
Tim Bentley
73692e9e9f More theme changes 2010-11-05 19:20:41 +00:00
M2j
0853e52de7 single chardet for the whole olp1import database 2010-11-04 23:25:42 +01:00
M2j
fa89971771 openlp.org 1.x importer graped authors out of the lyrics 2010-11-04 21:45:49 +01:00
M2j
4294ae83b8 split song verse order at consecutive whitespaces and not just u' ' 2010-11-04 20:32:43 +01:00
Tim Bentley
e1d2695bc9 Cast adrift amendthemeform 2010-11-04 17:03:52 +00:00
Tim Bentley
69f72c2ba8 Head 2010-11-04 17:02:10 +00:00
Tim Bentley
52c9b9e53a change 2010-11-04 17:00:31 +00:00
Tim Bentley
53bf428a76 changes 2010-11-04 16:58:35 +00:00
Andreas Preikschat
0f76533470 clean up 2010-11-04 17:26:30 +01:00
Jon Tibble
be308c5637 Lots of cleanups 
bzr-revno: 1112
 2010-11-03 22:22:48 +00:00
Andreas Preikschat
a2c0987e44 Changed "songmanager" to "manager" 
Fixed a bug which occurs when you click on "Save & Preview" a second time

bzr-revno: 1111
 2010-11-04 00:17:31 +02:00
Jon Tibble
8a56d7acde Head 1110 2010-11-03 18:35:56 +00:00
Andreas Preikschat
f4b86d1f14 songmanager -> manager, fixed traceback 2010-11-03 19:18:44 +01:00
Jon Tibble
947e4d4173 Long lines 2010-11-03 18:03:28 +00:00
Jon Tibble
ddc99e13e8 Unused imports 2010-11-03 17:40:45 +00:00
Tim Bentley
6cf851022e Update preview 2010-11-03 17:33:08 +00:00
Jon Tibble
b7dd528d50 Cleanups 2010-11-03 17:19:44 +00:00
M2j
36a71d8764 HEAD 1109 2010-11-01 21:50:26 +01:00
M2j
47e7937baf - recognize openlp.org 1.x import char encoding by title, lyrics and copyright 
- prefere utf-8 encoding for CCLI imports
 2010-11-01 21:48:30 +01:00
Tim Bentley
f7ddb507e8 Fix renderer 2010-11-01 19:33:33 +00:00
Tim Bentley
206eb1006e Fix preview bug 2010-11-01 19:22:00 +00:00
Tim Bentley
e486246cd0 Head 1107 2010-10-30 12:09:52 +01:00
Tim Bentley
7edae012dc UI works with independent mode 2010-10-30 12:09:36 +01:00
Tim Bentley
74bb054b83 Head1107 2010-10-30 11:17:25 +01:00
Raoul Snyman
a45069e4d3 Customisable Shortcuts, Phase 1: View-only list of actions and shortcuts, currently also only the actions in the main window are in the shortcut dialog. 
bzr-revno: 1108
 2010-10-30 12:14:22 +02:00
Tim Bentley
51d68f2066 Fix up file type / mime type issues 2010-10-30 10:29:59 +01:00
Raoul Snyman
5327f9bc4c Some minor fixes. 2010-10-30 09:51:34 +02:00
Meinert Jordan
b673d905d7 Some things from my months old todo list: 
- enabling nested docks for more flexible container arrangements
- show the next slide content
- some old UTF8 problems

bzr-revno: 1106
 2010-10-29 21:23:43 +02:00
Tim Bentley
eacf6cc870 Head1105 2010-10-29 20:04:08 +01:00
Andreas Preikschat
21dbf51a0b Fix custom and songusage managers 
bzr-revno: 1105
Fixes: https://launchpad.net/bugs/667531
 2010-10-29 17:17:45 +01:00
M2j
ed82a6c17e enable nested docks 
preview the next slide content
whipe out some UTF8 sins in the custom plugin
 2010-10-29 18:08:31 +02:00
Tim Bentley
e6506e7433 Spelling 2010-10-29 07:44:38 +01:00
Tim Bentley
9ed0ff2ea2 Proper fix for 1102 2010-10-29 07:36:17 +01:00
Tim Bentley
fff4cf1e1c Revert 1102 
Fixes: https://launchpad.net/bugs/667837
 2010-10-28 18:23:17 +01:00
Tim Bentley
5d9ef61e2c Only Vacuum changed databases 2010-10-28 18:02:28 +01:00
Andreas Preikschat
e3b7cc2c91 fixed manager for customs 2010-10-28 16:56:52 +02:00
Andreas Preikschat
d458ac2a98 replaced songusagemanager 2010-10-28 14:10:25 +02:00
Raoul Snyman
0373f93130 Change the table to a tree. 
Hook the tree up to the shortcut list.
Fix adding actions to shortcut list.
 2010-10-28 08:36:18 +02:00
Raoul Snyman
a249393b2c HEAD 2010-10-28 07:24:31 +02:00
Raoul Snyman
419b6469ce Finished up the actions list. 2010-10-28 07:21:45 +02:00
Tim Bentley
7dcd7f3011 Fix Media icon - it went AWOL 2010-10-27 20:40:38 +01:00
Tim Bentley
53d498bdc9 Fix bugs 2010-10-27 18:42:10 +01:00
Raoul Snyman
fceb9d8978 Separated action list stuff into its own file. 2010-10-27 17:35:15 +02:00
Tim Bentley
8d31844ee0 Add Vacuum to databases on exit 
Tidy up custom plugin naming

Fixes: https://launchpad.net/bugs/636835
 2010-10-27 16:30:30 +01:00
Tim Bentley
901b9d98c5 Auto Save service on exit if already saved service 
Fixes: https://launchpad.net/bugs/657307
 2010-10-27 16:20:25 +01:00
Raoul Snyman
574d108a82 Started working on some list classes to create nice categorised action lists. 2010-10-27 15:49:21 +02:00
Tim Bentley
7285490fcb Fix Image saving bug 2010-10-26 20:25:31 +01:00
Tim Bentley
d3e4cf7a2d Remove # 2010-10-26 20:11:26 +01:00
Tim Bentley
54d99657ab Head 2010-10-26 20:08:20 +01:00
Tim Bentley
f67e25c82e Fix Image size backgounds 2010-10-26 20:07:12 +01:00
Tim Bentley
1da9d5629d Updates to screen handling 2010-10-24 20:23:12 +01:00
Tim Bentley
39f7b3b4d8 Head 2010-10-24 19:20:23 +01:00
Tim Bentley
0936c7d6d5 Updates 2010-10-24 18:36:43 +01:00
Andreas Preikschat
b3ae89e045 head 2010-10-24 18:18:01 +02:00
Andreas Preikschat
8d82715924 added empty lines 2010-10-24 13:08:46 +02:00
Andreas Preikschat
c8e5f9c07e fixed traceback after editing image item, icons for down/up buttons 2010-10-24 13:00:20 +02:00
Tim Bentley
8e1a7334d3 Fix up presentations 2010-10-24 07:26:07 +01:00
Tim Bentley
68fa2c4791 Fix themes and class names 2010-10-23 18:37:10 +01:00
Tim Bentley
feb3be1cb9 Head 2010-10-23 08:24:30 +01:00
Tim Bentley
b0ba4472bd Fix up themes now 2010-10-23 08:23:49 +01:00
Tim Bentley
76ddf975a7 Add ImageManager 2010-10-22 19:56:58 +01:00
Tim Bentley
6dbb80ee94 Initial version of Image performance improvements 2010-10-22 18:24:56 +01:00
Jon Tibble
8a977ef155 Fix spelling of Samuel (Bug #647931) 2010-10-21 22:43:14 +01:00
Jon Tibble
a6bcfbf568 Cleanups 2010-10-21 16:31:22 +01:00
Raoul Snyman
49faf7fb1f Working on bringing actions into the shortcut form. 2010-10-21 09:42:13 +02:00
Tim Bentley
0851b94837 Theme now created correctly we I think 2010-10-17 20:34:10 +01:00
Tim Bentley
61c763639b Theme cleanup and more UI work. 2010-10-17 19:58:42 +01:00
Tim Bentley
97c7ebc4c5 Head 2010-10-17 15:53:06 +01:00
Tim Bentley
63b3be4767 Head 2010-10-17 15:44:00 +01:00
Tim Bentley
c3b890e198 Performance updates 2010-10-17 15:43:51 +01:00
Raoul Snyman
09dbafaf3e HEAD 2010-10-17 16:25:03 +02:00
Tim Bentley
cf139be7cb Fix image but and more path optimisation 
bzr-revno: 1095
Fixes: https://launchpad.net/bugs/661965
 2010-10-17 14:32:40 +01:00
Tim Bentley
ca20598dde More path optimisation 
Fixes: https://launchpad.net/bugs/661965
 2010-10-17 08:26:14 +01:00
Raoul Snyman
009e337158 Removed an incorrect import. 
Added more documentation.
 2010-10-17 00:50:36 +02:00
Raoul Snyman
baaa7e0508 Updated documentation. 
Renamed the import wizards to match the general form naming convention.
Removed an unnecessary class.
 2010-10-16 21:38:23 +02:00
Tim Bentley
7dcac8ea54 Fix htmlbuilder 2010-10-16 17:21:02 +01:00
Tim Bentley
cf2d215534 More imporovements 2010-10-16 14:54:57 +01:00
Tim Bentley
cbef9f0519 Head 2010-10-16 08:22:14 +01:00
Tim Bentley
cc4acf4edd Position Tab updates 2010-10-16 08:21:24 +01:00
Tim Bentley
2f3bfc51cc Alerts work again , image performance improvements 
bzr-revno: 1092
 2010-10-15 17:37:02 +01:00
Andreas Preikschat
da3db82d24 Code Cleanups 
bzr-revno: 1090
 2010-10-15 16:47:16 +01:00
Tim Bentley
edbc6bf5ce Head 2010-10-15 16:38:11 +01:00
Tim Bentley
f3646cf6e6 Code cleanups 2010-10-15 16:37:29 +01:00
Tim Bentley
cef92476ad Path image improvements 2010-10-15 16:33:06 +01:00
Tim Bentley
4f04bba5e6 Fix alert view bug 2010-10-15 15:43:42 +01:00
Jonathan Corwin
dc0c597243 Warn, not error, if COM Impress not available 2010-10-15 10:00:08 +01:00
Andreas Preikschat
3ae6295e21 clean ups 2010-10-15 10:35:00 +02:00
Jeffrey Smith
b89b8983f8 This is a fix for bug #659673 
bzr-revno: 1087
 2010-10-14 21:41:43 +02:00
Jeffrey S. Smith
b58eecdf63 In EasyWorship song importer, add initial support for non-latin1 encodings 2010-10-14 13:15:02 -05:00
Andreas Preikschat
c4e6b4aaac Fixed a bug in the song editor where the last added verse would revert to the previous verse type. 
bzr-revno: 1086
 2010-10-14 18:46:14 +02:00
Tim Bentley
4f7566c76b Position code and preview 2010-10-13 21:19:38 +01:00
Tim Bentley
5e485a0673 Head 2010-10-13 20:40:39 +01:00
Tim Bentley
567e0009a7 Position screen 2010-10-13 20:40:01 +01:00
Raoul Snyman
161a1e444a Documentation updates. 
bzr-revno: 1085
 2010-10-13 07:14:54 +02:00
Andreas Preikschat
aab9d1b2ca docs 2010-10-12 18:47:53 +02:00
Andreas Preikschat
2d00d08ccf Fix for bug #657694 (lines 8-9) 
Enhanced the code (lines 11-29)

bzr-revno: 1084
 2010-10-12 08:11:13 +02:00
Raoul Snyman
177d2d0351 More documentation updates. 2010-10-11 22:47:00 +02:00
Andreas Preikschat
0cefed0eb5 onVerseTypeComboBoxChanged 2010-10-11 19:29:03 +02:00
Tim Bentley
f4023118db Fix up the theme class again 2010-10-11 17:43:14 +01:00
Tim Bentley
026c25facb Head 2010-10-11 17:14:46 +01:00
Tim Bentley
562a27e8ca More refactoring 2010-10-11 17:14:36 +01:00
andreas
080a1ede33 Revised custom Dialog and new edit form 
bzr-revno: 1083
 2010-10-11 17:13:49 +01:00
Andreas Preikschat
35fdbdeee8 fix for bug #657694 and some code enhancements 2010-10-11 17:26:48 +02:00
Andreas Preikschat
034bae031a missing space 2010-10-11 09:47:55 +02:00
Raoul Snyman
3a8b33a5ff Some updates to the documentation: 
- Added some more classes to the rST files.
- Fixed up some docstrings to proper rST.
 2010-10-10 23:13:10 +02:00
Andreas Preikschat
b9b202e5a8 another fix for the merge 2010-10-10 22:19:58 +02:00
Andreas Preikschat
bf7df829d0 Make sure that the 'edit' and 'delete' buttons are disabled after editing all verses (because no verse is selected). 
bzr-revno: 1079
 2010-10-10 18:42:29 +02:00
Andreas Preikschat
65798895db A few things: 
- Finished bible "text search" (the search considers all verses which are in the database).
- Comment/doc clean ups.
- Changed "permission" to "permissions" since the database uses "permissions" (changing this is just being consequent).
- Disabled search button while searching.

bzr-revno: 1078
 2010-10-10 18:40:20 +02:00
Andreas Preikschat
373597120b fixes for merge 2010-10-10 17:59:11 +02:00
Andreas Preikschat
bab38de43e -'verse' -> 'slide' -buttons name fixes 2010-10-10 16:23:00 +02:00
Andreas Preikschat
144060a74b moved method to its old position 2010-10-10 15:29:08 +02:00
Andreas Preikschat
4dde13136c layout clean ups 2010-10-10 15:17:01 +02:00
Andreas Preikschat
3c32cb5be5 clean ups + forgotten file 2010-10-10 15:09:45 +02:00
Andreas Preikschat
421577f8ce make sure that the 'edit' and 'delete' buttons are disabled after editing all verses 2010-10-10 14:14:12 +02:00
Andreas Preikschat
842c55002a fixed broken copyright block 2010-10-09 22:00:33 +02:00
Andreas Preikschat
b97bc5fe0e head 2010-10-09 21:41:19 +02:00
Andreas Preikschat
84d0c01274 fixes for the merge proposal 2010-10-09 21:36:05 +02:00
Andreas Preikschat
de940f7ca5 first draft of new custom editor 2010-10-09 21:20:07 +02:00
Andreas Preikschat
2f99a85c4e continued save button problem 2010-10-09 14:15:31 +02:00
Tim Bentley
216f044883 For settings updates 2010-10-09 12:20:47 +01:00
Andreas Preikschat
607a0d1155 - make sure the 'edit all' button is disabled when creating a new custom 
- ask if unsaved data should be saved when clicking on the save button
 2010-10-09 13:00:28 +02:00
Tim Bentley
f5ccb757ab Head 2010-10-09 11:59:56 +01:00
Tim Bentley
5009196d45 Fint main tab 2010-10-09 11:59:49 +01:00
Jonathan Corwin
e67edb909f Option to use phonon or webkit for video. Fix blank to image 
bzr-revno: 1076
 2010-10-09 11:11:55 +01:00
Tim Bentley
1e096fc4fe Head1075 2010-10-09 07:49:08 +01:00
Tim Bentley
8892959b35 First form works 2010-10-09 07:48:54 +01:00
Andreas Preikschat
2ad3f983f7 added reStructuredText back 2010-10-09 08:48:21 +02:00
Andreas Preikschat
ae015a270a added reStructuredText back 2010-10-09 08:00:50 +02:00
Jonathan Corwin
87ebd77138 Remove commented code 2010-10-08 21:42:25 +01:00
Jonathan Corwin
5a502475fd Head 2010-10-08 20:42:17 +01:00
Jonathan Corwin
5f5c207b20 volume 2010-10-08 20:40:59 +01:00
Tim Bentley
fd45f2e32d Add config option for Expanding service items 2010-10-08 20:32:07 +01:00
Tim Bentley
c9eaf99696 Add config option for Expanding service items 2010-10-08 20:15:01 +01:00
Andreas Preikschat
1bf1aeacd4 minor fixes for proposal 2010-10-08 19:37:34 +02:00
Andreas Preikschat
2a21349a6e head 2010-10-08 19:07:49 +02:00
Andreas Preikschat
2e2efab2d4 tweaks 2010-10-08 19:07:14 +02:00
Raoul Snyman
ecb2022df3 HEAD 2010-10-08 18:08:06 +02:00
Raoul Snyman
a988db8e08 Added the ability to capture a shortcut. 2010-10-08 18:07:52 +02:00
Tim Bentley
e37682cb03 Fix duplicate file save bug 
Fix Dnd bug

bzr-revno: 1074
Fixes: https://launchpad.net/bugs/656177
 2010-10-08 07:17:59 +01:00
Philip Ridout
30c2ff400e Update File load extensions for song imports 
bzr-revno: 1073
 2010-10-08 07:16:01 +01:00
Jonathan Corwin
415f79b9ed head r1072 2010-10-07 22:49:25 +01:00
Jonathan Corwin
d6ce88959c Add the use phonon media setting 2010-10-07 22:47:17 +01:00
Raoul Snyman
cff333ddc2 Added a shortcut list dialog shell. 2010-10-07 23:27:26 +02:00
Tim Bentley
75d35cf182 Fix duplicate file saving bug 
Fix drag and drop service item bug

Fixes: https://launchpad.net/bugs/656177
 2010-10-07 18:52:40 +01:00
Tim Bentley
681b6dc60f Head 2010-10-07 06:16:14 +01:00
Tim Bentley
749eb51dd4 Theme xml fixes 2010-10-07 06:15:02 +01:00
Tim Bentley
bccc3c56ca Fix text issues 2010-10-06 21:30:49 +01:00
Tim Bentley
c262d9ad75 Fix remote edit issue 2010-10-06 21:24:53 +01:00
Tim Bentley
16b4aa0715 fix line lenght 2010-10-06 21:10:26 +01:00
Tim Bentley
7863a2ebfc Add Service Item update from edit with config flag 2010-10-06 20:27:30 +01:00
Andreas Preikschat
59b387b9d0 replaced 'permission' with permissions since the db uses permissions 2010-10-06 16:57:38 +02:00
Andreas Preikschat
f515dc60d0 changed methods (call the db methods instead of the manager's methods) 2010-10-06 16:15:39 +02:00
Tim Bentley
39f1aa2e09 Head1071 2010-10-06 05:55:00 +01:00
Tim Bentley
85dd394e25 Head1071 2010-10-06 05:47:29 +01:00
Jonathan Corwin
9a744119d3 Alerts over Phonon videos. Fix blank to theme bug for image backgrounds. 2010-10-05 23:23:46 +01:00
Philip Ridout
274b3b9253 Removed the xml filter for OpenSong 2010-10-05 22:32:03 +01:00
Tim Bentley
368bc2647f Head 2010-10-05 20:53:20 +01:00
Tim Bentley
4e8a7f47eb Fix up theme xml handling to new schema 2010-10-05 20:52:28 +01:00
Philip Ridout
40d06d492b and added some u's before "'"'s 2010-10-05 20:47:35 +01:00
Philip Ridout
e81efb84f6 Removed extension checking in wow import as this is handled by the filters in the open dialouge box. Instead, check the the header to ensure that the file is a wow song file regardless of ext. 
Corrected open song import extension.
 2010-10-05 20:41:54 +01:00
Andreas Preikschat
fa68d0d9ff text search for bibles 2010-10-05 20:44:54 +02:00
rimach
f869e0d979 replace self.text_strings with self.textStrings, fix doc string 2010-10-05 18:09:48 +02:00
rimach
1c48bfab67 Head 2010-10-05 17:26:28 +02:00
Andreas Preikschat
6ab70f1bc0 Fixed up chapter and verse comboboxes for advanced Bible search. 
A few other cleanups.

bzr-revno: 1070
 2010-10-04 08:18:35 +02:00
Philip Ridout
881cb4e3c3 Added file extension checking to words of worship import 
Added the ability for importers to specifiy file fillters, and added the relevent filters for most importers (the ones where I could easily find the file ext, still need easiworship and song beamer, and maybe a few others!)
 2010-10-03 23:28:47 +01:00
Tim Bentley
fc092ed919 Theme wizard start 2010-10-03 08:42:02 +01:00
Jonathan Corwin
f331f13278 Optional phonon videos, start 2010-10-01 23:47:37 +01:00
Andreas Preikschat
f8ed4acf78 clean ups 2010-10-01 16:37:51 +02:00
Andreas Preikschat
919b07bd61 clean ups 2010-10-01 16:18:15 +02:00
Andreas Preikschat
e17f6c7c9e -disable search buttons while searching, -clean ups 2010-10-01 15:50:29 +02:00
Tim Bentley
4d3a473e91 Service Manager loading - finished 2010-09-30 21:21:45 +01:00
Andreas Preikschat
74752da694 implemented 'text search' for bibles 2010-09-30 20:40:10 +02:00
Tim Bentley
68b38aa88c fix up rest of service load updates 2010-09-30 18:07:27 +01:00
Tim Bentley
bdc924093e Update service items on service load 2010-09-30 06:12:06 +01:00
rimach
e6de575c88 Head 2010-09-30 07:04:43 +02:00
rimach
2e72e2cbe7 add missing function content 2010-09-30 07:04:31 +02:00
rimach
ec16298908 add missing newlines, simplify getString function, wrap long lines 2010-09-29 23:06:59 +02:00
rimach
3eaf7a0738 Head 2010-09-29 22:39:15 +02:00
rimach
fd502f3443 Head 2010-09-29 22:38:12 +02:00
rimach
345a94381a bugfixing 2010-09-29 22:37:52 +02:00
Tim Bentley
0f480a6dd5 Fix loading of service items bug 
Fixes: https://launchpad.net/bugs/651076
 2010-09-29 17:48:45 +01:00
Andreas Preikschat
0872cefacf clean ups 2010-09-28 19:51:42 +02:00
Tim Bentley
882e4679f4 Head1066 2010-09-28 18:41:33 +01:00
Tim Bentley
f6a02fa6fa Fix blank line 
Fixes: https://launchpad.net/bugs/649999
 2010-09-28 18:41:14 +01:00
rimach
a76dd15fbe resolve diverged branches 2010-09-27 20:34:40 +02:00
rimach
d249b2a326 changes for SongBeamer import 2010-09-27 20:17:39 +02:00
rimach
f265c552ea replace strings with text_strings 2010-09-27 20:15:55 +02:00
rimach
91544f5db1 Head 2010-09-27 06:51:32 +02:00
rimach
5049aab6d2 Changes for SongBeamer Import 2010-09-27 06:51:16 +02:00
Andreas Preikschat
52e572e94d Naming Conventions 2010-09-26 19:23:58 +02:00
Andreas Preikschat
2f1134556f veses/chapters comboBoxes now behave differently 2010-09-26 19:17:29 +02:00
Andreas Preikschat
f1fd4b6d2b Bible code tidy 
bzr-revno: 1066
 2010-09-26 15:33:11 +01:00
Tim Bentley
25a4ff7880 Fix errors in merge 2010-09-26 15:01:27 +01:00
Andreas Preikschat
8d51d2820f rearranged methods 2010-09-26 15:38:40 +02:00
Tim Bentley
0d5fc3c980 Style Fixups 2010-09-26 13:23:50 +01:00
Tim Bentley
2f75087e40 Merge request cleanups 2010-09-26 09:38:11 +01:00
Tim Bentley
e33e4cb7ff Replace Context menu with smart context menu 2010-09-26 09:07:47 +01:00
Tim Bentley
cc42dc34d8 Basic Theme copy and rename working 2010-09-26 08:39:50 +01:00
Tim Bentley
6351e65c1c Head193 2010-09-26 07:20:37 +01:00
Tim Bentley
271d3b4af5 More updates 2010-09-26 07:20:24 +01:00
Tim Bentley
b4fcff6fe4 Update preview text 
bzr-revno: 1063
 2010-09-25 17:22:49 +01:00
Tim Bentley
451f08db9f Spaces 2010-09-25 17:16:36 +01:00
Tim Bentley
fb5a481da5 Update preview song 2010-09-25 17:14:14 +01:00
Jonathan Corwin
f7b90c5a76 Fix song number/book save and load 
bzr-revno: 1061
 2010-09-25 14:03:01 +01:00
Jeffrey Smith
5d61520b6e Better handling of memo files larger than 16MiB. 
Handle blank fields more intelligently.

bzr-revno: 1060
 2010-09-25 14:54:06 +02:00
Jeffrey S. Smith
0a3dc7bff4 EW importer needs to import 'translate' before using it 2010-09-25 07:13:42 -05:00
Jeffrey S. Smith
053d73de9b Add licence block to EW importer 2010-09-25 06:58:16 -05:00
Jeffrey S. Smith
20085d0a6c Make strings used in UI translatable 2010-09-25 06:55:26 -05:00
Jonathan Corwin
3615fe5d13 Fix save/load of songnumber/book 2010-09-25 12:55:01 +01:00
Tim Bentley
83334a19e9 New Manifest file 2010-09-25 11:07:40 +01:00
Tim Bentley
a5367b647f Head 2010-09-25 08:48:02 +01:00
Tim Bentley
3748bbf53a Fix crash and optimise display 
bzr-revno: 1058
 2010-09-25 08:47:23 +01:00
Tim Bentley
8f98ae9d2e Add Image cache 2010-09-25 08:45:21 +01:00
Tim Bentley
6a171899f5 Remove visible lag on displaying first picture of background 2010-09-25 07:29:03 +01:00
Tim Bentley
dabc04c7dd Fix replacement backgrounds 2010-09-25 07:11:00 +01:00
Jeffrey S. Smith
6504397662 Fix bug in reading memo files larger than 16MiB 2010-09-24 22:56:33 -05:00
Jeffrey S. Smith
4f11181bfa Return None for blank fields in the database 2010-09-24 22:55:21 -05:00
Raoul Snyman
697cc79b3a Fix bug #598805 2010-09-24 22:54:52 +02:00
Christian Richter
70f8795d61 Fixed exception thrown on unchecking 'Auto detect' in languages menu 
Fixed saving of language setting
Added pinging of review page in translation_util.py

bzr-revno: 1056
 2010-09-24 19:51:21 +02:00
Jeffrey Smith
a079e698f9 Refactor code for making song import wizard pages. 
bzr-revno: 1055
 2010-09-24 19:19:32 +02:00
Tim Bentley
f62ac45a29 Head1054 2010-09-24 12:30:10 +01:00
Tim Bentley
d3e8da302c More cleanups 2010-09-24 12:29:52 +01:00
rimach
53478cb707 bugfixing 2010-09-24 06:16:48 +02:00
Jeffrey S. Smith
e99ebe64c7 Replace disablable with can_disable. Change obj_prefix default 2010-09-23 14:23:56 -05:00
rimach
90fd6dec20 add SongBeamer import 2010-09-23 21:02:18 +02:00
rimach
9111a1885e add SongBeamer import 2010-09-23 21:01:52 +02:00
Tim Bentley
17132f0505 Remove line breaks in ServiceManager 
bzr-revno: 1054
Fixes: https://launchpad.net/bugs/642788
 2010-09-23 18:45:49 +01:00
rimach
da33167b66 Head 2010-09-23 19:43:30 +02:00
rimach
7a7a4795f4 correct english sentense 2010-09-23 19:13:57 +02:00
rimach
ef6845dad8 Head 2010-09-23 19:12:04 +02:00
Tim Bentley
8ab9299814 remove line break before truncation. 
Fixes: https://launchpad.net/bugs/642788
 2010-09-23 17:45:17 +01:00
Andreas Preikschat
7b47d52eca This fixes the following bugs and issues: 
- Bible items cannot be extended any more
- Dual and single Bible verses cannot be mixed (Media Manager/Service Manager)
- Bible item title in the service manager contains all bible passages (separated by a comma) bug #634533 and bug #609355
- Fixed bug #643783

bzr-revno: 1053
 2010-09-22 22:11:51 +02:00
Andreas Preikschat
6c39c3d1af clean up 2010-09-22 20:56:42 +02:00
Tim Bentley
983c2012fd Update plugin list 
Fix ServiceManager 
Put splash image back 
Fix hide screen bug.

bzr-revno: 1052
Fixes: https://launchpad.net/bugs/641644, https://launchpad.net/bugs/642754
 2010-09-22 19:50:55 +01:00
Andreas Preikschat
15378611d8 different fixes 2010-09-22 20:46:02 +02:00
Jonathan Corwin
ba78b7372b Speed up video loop, and adjust left margin for outline 
bzr-revno: 1051
 2010-09-22 19:43:55 +01:00
rimach
5231023f1c Head 2010-09-22 20:30:06 +02:00
rimach
d1172e14c1 fix click/unclick 'Auto detect', fix saving of language setting 2010-09-22 20:03:10 +02:00
Jeffrey S. Smith
29cfa96ce8 Factorize code for making song import wizard pages 2010-09-22 10:01:37 -05:00
Tim Bentley
47b359a313 Fix issues with other merges 2010-09-22 06:03:10 +01:00
Tim Bentley
5e38d34997 Fix issues with other merges 2010-09-22 05:57:50 +01:00
Jonathan Corwin
050d1478c9 Attempt to speed up video restart when looping. Make sure outlined fonts don't vanish off left hand side 2010-09-21 23:22:05 +01:00
rimach
395fe85d42 update 2010-09-21 21:53:46 +02:00
Tim Bentley
e790f9aedc Move display fixes 2010-09-21 20:08:23 +01:00
Tim Bentley
3e0a3f799b Fix bug 642754 in service manager 2010-09-21 20:05:45 +01:00
Andreas Preikschat
2a4e64c9db fix for Bug #643783 2010-09-21 20:44:48 +02:00
Raoul Snyman
c235b793b0 Fix bug #644106 
Fix a related bug in the song importer.
 2010-09-21 20:12:46 +02:00
Tim Bentley
1c58fcda9f Remove print statement 2010-09-21 18:42:16 +01:00
Tim Bentley
8e94d87e65 Put the display image back after it was lost 2010-09-21 18:35:26 +01:00
Tim Bentley
79881d9023 Update plugin version numbers 2010-09-21 18:30:32 +01:00
Tim Bentley
d50ffbafa3 Fix review comments 2010-09-21 18:24:01 +01:00
Tim Bentley
b1d312626a Head1047 2010-09-21 17:47:54 +01:00
Andreas Preikschat
a22dec796e typing error 2010-09-21 07:57:23 +02:00
Jeffrey S. Smith
49e6a4589c Get rid of extra blank lines and handle \{ \} \ in RTF 2010-09-20 15:58:55 -05:00
Andreas Preikschat
8b6e90ab44 tweak 2010-09-20 20:55:14 +02:00
Andreas Preikschat
137fb7417e removed code and added a dialog 2010-09-20 20:38:18 +02:00
Tim Bentley
419008d4b7 Head 2010-09-20 19:36:56 +01:00
Jeffrey S. Smith
d4a1b7f796 Added a song importer for EasyWorship 2010-09-20 13:22:57 -05:00
Tim Bentley
56297a1cce fixes for 641644 
Fixes: https://launchpad.net/bugs/641644
 2010-09-20 19:01:32 +01:00
Tim Bentley
5675eba314 Fix local variable issues 2010-09-20 17:43:36 +01:00
Tim Bentley
fe6a3af42c Explicit error type 2010-09-20 17:33:38 +01:00
Tim Bentley
293443ba61 Fixed but untested 
Fixes: https://launchpad.net/bugs/642778
 2010-09-20 06:06:18 +01:00
Tim Bentley
b73a921dbc Fix bug if no lanuagage files 2010-09-20 05:59:51 +01:00
Tim Bentley
551bf3c41f r1044 2010-09-20 05:39:46 +01:00
Jonathan Corwin
827eb93c67 r1044 2010-09-19 22:07:26 +01:00
Jonathan Corwin
ad51cb8040 Remove top/left border on maindisplay. QGraphicsWebView only appeared in Qt4.6 2010-09-19 21:59:00 +01:00
Andreas Preikschat
17b4335ee4 do not delete results when changing from keep to clear 2010-09-19 18:51:52 +02:00
rimach
23099261bd Head 2010-09-19 10:47:00 +02:00
Andreas Preikschat
bd5f82096f head + resolved conflicts 2010-09-19 07:59:38 +02:00
Christian Richter
9539e0fb22 Change OpenOffice to use pipes not sockets to resolve slow networking issue. Fix option parsing unicode problem for python 2.5 
bzr-revno: 1044
 2010-09-18 23:18:32 +01:00
Andreas Preikschat
02b46f051c changed combobox behaviour 2010-09-18 23:29:41 +02:00
Raoul Snyman
3ff6d4da16 Fix for bug #640697 
bzr-revno: 1043
 2010-09-18 21:32:34 +02:00
rimach
86bed937f5 Remove unused lines 2010-09-18 20:56:57 +02:00
rimach
9971027e4d Head, Remove unneeded lines 2010-09-18 20:37:02 +02:00
Raoul Snyman
bf35338c99 Fix some typos. 2010-09-18 20:15:54 +02:00
Raoul Snyman
7f5a6411d6 Fix for bug #640697 2010-09-18 19:14:27 +02:00
Jonathan Corwin
93b2d54c92 String fixes 2010-09-18 16:24:39 +01:00
Jonathan Corwin
2837c36553 tweaks 2010-09-17 21:32:00 +01:00
Raoul Snyman
1e5645995c Some more spelling/grammatical corrections. 2010-09-17 22:06:41 +02:00
Raoul Snyman
85732d6ad8 Fix bug #640460. 
bzr-revno: 1039
 2010-09-17 21:38:12 +02:00
Raoul Snyman
794493d0d1 Fixed bug #640460. 2010-09-17 21:02:25 +02:00
Raoul Snyman
fdc0d14790 Fixed a spelling error. 
bzr-revno: 1038
 2010-09-17 18:38:21 +02:00
Raoul Snyman
c54450377f Attempting to solve bug #635338 
bzr-revno: 1037
 2010-09-17 16:32:07 +02:00
Raoul Snyman
9fb2bb1458 Some more fixes for the Windows World: 
- Fixed location of .qm files, so that they can be found in a Windows build
- Added PyEnchant to the build process
- Fixed up langaugemanager.py so that it conforms to coding standards

bzr-revno: 1036
 2010-09-17 16:30:26 +02:00
Andreas Preikschat
bfc3543d39 changed/removed variable 2010-09-17 14:17:50 +02:00
Andreas Preikschat
194e278581 fixed bug (forgotten %); removed unused variables 2010-09-17 14:10:41 +02:00
Andreas Preikschat
9913754df4 spelling mistake 2010-09-17 13:41:52 +02:00
Raoul Snyman
c8d9fd97df Fixed a spelling error. 2010-09-17 08:20:51 +02:00
rimach
d69f077f53 Head 2010-09-16 23:27:46 +02:00
Jonathan Corwin
2ad441e883 Speedups 2010-09-16 22:19:51 +01:00
rimach
8bf0b34d22 Head 2010-09-16 23:12:51 +02:00
rimach
399813e6aa fix for the merge comments, add correct translations for settings window 2010-09-16 23:10:36 +02:00
rimach
d2bf1fedae correct piped soffice start, fix Python2.5 problem with unicode strings in optparse 2010-09-16 23:01:44 +02:00
Raoul Snyman
22774b880a - Fixed up the QM file locations for static builds. 
- Added PyEnchant to the build process.
- Fixed LanguageManager to be complaint with the coding standards.
 2010-09-16 22:40:12 +02:00
Raoul Snyman
a3aaf7dce8 Some fancy footwork around encodings. 2010-09-16 20:51:29 +02:00
Andreas Preikschat
5ad41ac457 tweaked methods 2010-09-16 18:57:21 +02:00
Andreas Preikschat
30ad1a3eb0 whitespace 2010-09-16 18:35:19 +02:00
Andreas Preikschat
6795c04947 added two methods 2010-09-16 18:22:23 +02:00
Martin Thompson
ec9230be38 Put comment in right place 2010-09-15 22:02:32 +01:00
rimach
5f7348ed2e Head 2010-09-15 22:51:22 +02:00
rimach
ea1321ef20 add pipe using for soffice 2010-09-15 22:51:01 +02:00
Martin Thompson
f7fafae09c Fixed merge fail 2010-09-15 21:46:16 +01:00
rimach
ad6294ffcc simplify icon name settings 2010-09-15 22:23:03 +02:00
Martin Thompson
ebf3ce587d Tweaks from review 2010-09-15 21:12:03 +01:00
rimach
84a6c273fe Python 2.5 cant handle unicode strings in optparse 2010-09-15 20:07:08 +02:00
rimach
a308c66aa9 Python 2.5 cant handle unicode strings in optparse 2010-09-15 20:06:30 +02:00
Tim Bentley
bc537365bd Speed up render 2010-09-15 19:03:54 +01:00
rimach
915842a311 Head 2010-09-15 19:57:44 +02:00
rimach
3bc527e4fc bugfixing 2010-09-15 19:55:27 +02:00
Andreas Preikschat
d4ffc72c17 clean ups 2010-09-15 18:52:22 +02:00
Raoul Snyman
ef9684320c HEAD 2010-09-14 22:34:44 +02:00
Raoul Snyman
2f33ae1bab Add in code to display a disabled message if an importer is not available. 2010-09-14 22:33:33 +02:00
rimach
c53731d74b media items' __init__ methods 2010-09-14 20:34:39 +02:00
rimach
2d47e2523c remove executable flag 2010-09-14 20:18:47 +02:00
Andreas Preikschat
4aba7e3357 change bible title in service manager (NOT nice) 2010-09-14 20:07:38 +02:00
rimach
33f49f7d4a Head 2010-09-14 19:46:39 +02:00
rimach
22304d491d correct coding rules, some optimizations 2010-09-14 19:46:21 +02:00
Tim Bentley
627ba9626c Fix errors in merge 2010-09-14 18:29:56 +01:00
Tim Bentley
fe21b6be12 Fix video crashing 
Fixes: https://launchpad.net/bugs/637886
 2010-09-14 18:06:08 +01:00
Tim Bentley
d476e63621 fix service editing crashing 
Fixes: https://launchpad.net/bugs/637547
 2010-09-14 18:05:05 +01:00
Tim Bentley
efb58a710f Remove whitespace 2010-09-14 17:44:21 +01:00
Jon Tibble
1968803619 More cleanups 2010-09-14 15:43:21 +01:00
Jon Tibble
5fe753c833 Cleanups 2010-09-14 15:21:44 +01:00
Jon Tibble
23859bb241 Head r1030 2010-09-14 14:04:04 +01:00
Raoul Snyman
0a84fc0bcc Added extra labels to show that an item is disabled. 
Added functionality to the SongFormat class to keep track of availability of importers.
 2010-09-13 23:09:13 +02:00
Martin Thompson
a8dd0f5ddc Merged and fixed importing of 'other' verse types 2010-09-13 21:12:45 +01:00
rimach
8e8a6e42ff Head 2010-09-13 21:08:26 +02:00
Raoul Snyman
a1f7c9c5a0 Various string-related fixes: 
- Removed a bunch of double spaces.
- Renamed the translation files.
- Updated the translation files.
- Fixed up a few widgets.
Also fixed up the layout on the Edit Song form.

bzr-revno: 1030
 2010-09-13 08:17:07 +02:00
Tim Bentley
317a4ea8c6 Fix code so translations can be found 
bzr-revno: 1029
 2010-09-13 07:05:24 +01:00
Raoul Snyman
d4a0171203 HEAD 2010-09-13 07:16:16 +02:00
rimach
9546c338fc Head 2010-09-12 23:03:45 +02:00
rimach
e2c8ee11f2 Fix removing dock with translation 2010-09-12 23:03:16 +02:00
Martin Thompson
062a88e2f2 Better handling of progress bar. Attempt to get 'other' type verses into database 2010-09-12 21:31:23 +01:00
Raoul Snyman
826e366880 Fixes bug #635330 and attempts to fix bug #635338 
bzr-revno: 1028
 2010-09-12 22:25:08 +02:00
Tim Bentley
37aecbefaf Lanugages now work 2010-09-12 10:14:02 +01:00
Jonathan Corwin
15c868568f Head 2010-09-11 22:40:26 +01:00
Jonathan Corwin
0d36cba0bb Video background loop/change 2010-09-11 22:40:14 +01:00
Andreas Preikschat
6654a7993a started to rework bibles (dual/single verses) 2010-09-11 21:36:47 +02:00
Raoul Snyman
4e8f663444 Set the correct default encoding. 
Centralise decoding to a single function.
HEAD
 2010-09-11 21:00:01 +02:00
Raoul Snyman
c1ed2a76e2 Detect v1.0 database at the beginning of the import, not half way through. 
Do some detection of the encoding.
 2010-09-11 20:51:27 +02:00
Tim Bentley
7b46f33cde Space 2010-09-11 16:58:03 +01:00
Tim Bentley
8d51128e0c Fix translation code to find qm files 2010-09-11 15:03:10 +01:00
Tim Bentley
0412fca642 Remove execuitable flag 2010-09-11 13:42:50 +01:00
Tim Bentley
beedfb78e6 Change version checking code 2010-09-11 12:11:19 +01:00
Tim Bentley
36b3446d2c Theme Cleanup up 2010-09-11 07:59:36 +01:00
rimach
d542e2762a hopefully Line ending corrected part3 2010-09-10 21:47:33 +02:00
rimach
5b32a9f6a9 Head 2010-09-10 21:23:20 +02:00
rimach
6d7e7d7ad2 hopefully Line ending corrected and resolve merge conflict, part2 2010-09-10 21:21:14 +02:00
rimach
2b700c481f hopefully Line ending corrected and resolve merge conflict 2010-09-10 20:46:04 +02:00
Jonathan Corwin
02abcf24fc Head 2010-09-10 18:52:22 +01:00
Jonathan Corwin
d549935fa8 Bug 634771 - Check for no recent files 2010-09-10 18:49:22 +01:00
rimach
d4cabf9693 move translations from mediamanager to plugins with dict 2010-09-10 17:50:30 +02:00
rimach
fa328945d3 Head 2010-09-09 23:12:02 +02:00
Jonathan Corwin
81a1cfc815 Tidy up versetag counting 2010-09-09 20:34:45 +01:00
Raoul Snyman
1dcf3a2769 jQuery-fied the JavaScript, made the interface look a little prettier. 
bzr-revno: 1023
 2010-09-09 21:01:23 +02:00
Derek Scotney
198cd94011 All verse types have auto numbering 2010-09-09 20:30:38 +02:00
Derek Scotney
efd4b77ef8 All verse types have auto numbering 2010-09-09 20:30:25 +02:00
Jonathan Corwin
15a155044f Left+Bottom align footer, and prevent wrapping 
bzr-revno: 1021
 2010-09-09 19:05:08 +01:00
Jonathan Corwin
dd2136774b Remove height, so fix actually works 2010-09-09 08:30:14 +01:00
Jonathan Corwin
58dc96b124 Anchor footer from bottom, and prevent footer line wrapping 2010-09-08 22:55:24 +01:00
Raoul Snyman
158c612cf9 Fixed up the styles a little, and sync'ed to HEAD. 2010-09-08 22:38:37 +02:00
Tim Bentley
0eea3f40f3 Head 2010-09-08 20:39:39 +01:00
Tim Bentley
3bfea1c715 Proper fix for 632674 2010-09-08 20:36:39 +01:00
Tim Bentley
472da0cf27 Short term fix for 633354 
Fix display and text bugs

bzr-revno: 1019
Fixes: https://launchpad.net/bugs/594808, https://launchpad.net/bugs/632674
 2010-09-08 20:13:58 +01:00
Raoul Snyman
c2fdb62e74 Added a simple dialog to display any uncaught exceptions. 
bzr-revno: 1018
 2010-09-08 21:06:23 +02:00
rimach
8da2009413 Head 2010-09-08 20:40:19 +02:00
Tim Bentley
ccb75ad3b6 Fix display to work on 1024x768 resolution without nasty slider movements 
Fixes: https://launchpad.net/bugs/594808
 2010-09-08 19:12:16 +01:00
Tim Bentley
b39136782e Quick hack to get songs back 2010-09-08 19:00:48 +01:00
Tim Bentley
cfca50ff25 Fix setText bug when null list item 
Fixes: https://launchpad.net/bugs/632674
 2010-09-08 18:51:19 +01:00
Raoul Snyman
b8893f4ab2 Merge in the openlp.org 1.x importer. 
bzr-revno: 1017
 2010-09-08 06:57:13 +02:00
rimach
8bdedae911 Head 2010-09-07 23:04:13 +02:00
Raoul Snyman
7c2da6e2e3 Added a global exception catcher, so that our poor n00bs can see what happened. 2010-09-07 22:42:33 +02:00
Tim Bentley
1dd5ee185c Fix song editing bug 
bzr-revno: 1016
Fixes: https://launchpad.net/bugs/630247
 2010-09-07 19:41:09 +01:00
Tim Bentley
4c648f142c Fix song editing display bug 
Fixes: https://launchpad.net/bugs/630247
 2010-09-07 17:12:47 +01:00
Raoul Snyman
60fa82b78c Fix bug #598805 2010-09-07 15:23:02 +02:00
Raoul Snyman
f30aecfd46 A couple of bugfixes. 2010-09-07 00:02:48 +02:00
Raoul Snyman
63139e8c3b Just check for the tracks table before importing from it. 2010-09-06 22:41:11 +02:00
Martin Thompson
c25b0aa8ff Test for multi character versetypes 2010-09-06 21:37:22 +01:00
Raoul Snyman
f82513f11d Finally done the openlp.org 1.x song importer. 2010-09-06 22:33:28 +02:00
Martin Thompson
db118196a5 test_opensong passes again 2010-09-06 20:56:20 +01:00
Martin Thompson
53dc52c7c8 merged 2010-09-06 20:43:37 +01:00
Martin Thompson
2ae4c5a1b1 Merged 2010-09-06 20:42:39 +01:00
Raoul Snyman
5e61bf938e HEAD 2010-09-06 20:05:08 +02:00
Tim Bentley
991d8f1caf Fix bugs regarding screen blanking 
bzr-revno: 1015
Fixes: https://launchpad.net/bugs/639285, https://launchpad.net/bugs/630254
 2010-09-06 16:35:33 +01:00
Raoul Snyman
035bf7577f Update some strings, fix up the layout in the edit song dialog. 2010-09-06 07:54:51 +02:00
Raoul Snyman
08e97a67cb More string fixes and updates from Pootle. 2010-09-06 06:53:48 +02:00
rimach
44806ff859 Head 2010-09-05 23:04:25 +02:00
Tim Bentley
91eff095a5 Fix hiding of screen and adding items behind it and showing them. 
Fixes: https://launchpad.net/bugs/630285
 2010-09-05 20:52:49 +01:00
Tim Bentley
a4d8e225c0 Allow images to blank to theme. 
As none defined cos it's an image use global

Fixes: https://launchpad.net/bugs/630254
 2010-09-05 17:11:50 +01:00
Jonathan Corwin
aa0f4f7af0 Finish wizard integration 2010-09-05 16:16:48 +01:00
Jonathan Corwin
3d550e383c Head 2010-09-05 15:18:38 +01:00
Tim Bentley
2617e8d67b Fix bug for song CCLI setting 
Fix bug for dual bible tab which was a general settings bug.

bzr-revno: 1013
Fixes: https://launchpad.net/bugs/629848, https://launchpad.net/bugs/622894
 2010-09-05 07:05:00 +01:00
Jonathan Corwin
301a190483 Size maindisplay to full screen correctly, and eliminate maindisplay scrollbars 
bzr-revno: 1012
 2010-09-04 22:31:32 +01:00
Tim Bentley
e2c117034a Fix up bug for bible settings of duel drop down 
Fixes: https://launchpad.net/bugs/629848
 2010-09-04 20:40:28 +01:00
Jonathan Corwin
e54340d8f3 scrollbar attempt 2 2010-09-04 20:13:26 +01:00
Tim Bentley
da64f5147c Head1011 2010-09-04 19:14:51 +01:00
Tim Bentley
2cc3b8543c Clean up the renderer 
bzr-revno: 1011
 2010-09-04 19:12:48 +01:00
Philip Ridout
cefc155441 Rearranged the screen co-ordinate fields. 
bzr-revno: 1010
 2010-09-04 20:08:13 +02:00
Philip Ridout
55982e4b74 Fix incorrect method 
bzr-revno: 1009
 2010-09-04 19:01:17 +01:00
Jonathan Corwin
9c0391fe73 Screen size and scrollbar fix? 2010-09-04 18:55:10 +01:00
Raoul Snyman
a44ae94de7 HEAD 2010-09-04 19:53:10 +02:00
Raoul Snyman
2901c79ed6 Start work on the openlp.org 1.x importer. 
Add a couple of fixes to the song import.
Add a few fixes to the OpenSong importer.
 2010-09-04 19:51:41 +02:00
Tim Bentley
20844c8d28 Fix CCLI for songs 
Fixes: https://launchpad.net/bugs/622894
 2010-09-04 18:39:03 +01:00
Philip Ridout
cd9a7d4951 Changed with and height arround on the general tab. This brings it in line with the standard way of specifing a screen res, as well as bring it in line with the x & y cords before the height and width! 2010-09-04 17:36:07 +01:00
Tim Bentley
b9bb5b8c4f Cleanups 2010-09-04 17:14:56 +01:00
Tim Bentley
e521e986c4 Head1008 2010-09-04 16:51:28 +01:00
Tim Bentley
62a031982e Renderer cleanup 2010-09-04 16:51:18 +01:00
Philip Ridout
163bf9d2f4 Corrected one line that was missed (not by me :-p) 2010-09-04 15:26:04 +01:00
Jonathan Corwin
5dd5e15060 Subtract shadow from width, not add it 2010-09-04 15:23:20 +01:00
Jonathan Corwin
704502b05d Head 2010-09-04 14:35:15 +01:00
Jonathan Corwin
a74af25265 tidy 2010-09-04 14:09:47 +01:00
Jonathan Corwin
1899fc3415 css tidies, attempt to get paging correct, replacing qtextdoc with qwebview 2010-09-04 14:06:06 +01:00
Tim Bentley
26bceb84b9 Sort out spelling highlighting 2010-09-04 11:39:48 +01:00
Tim Bentley
04cfa6a730 Move spell and tag dialog to it"s own file 2010-09-04 09:12:54 +01:00
Tim Bentley
e5b2ff9e06 Move backgrounds to css from images 2010-09-04 08:48:58 +01:00
rimach
95ffc8dd3b add translation code for MediaDocks and PluginList 2010-09-04 00:51:28 +02:00
Jonathan Corwin
1fca6ec81d Italics/Bold theme to CSS. Share css for both QTextDocument and QWebView 2010-09-03 23:03:54 +01:00
Jon Tibble
9fa6039557 Head r1006 2010-09-03 21:08:38 +01:00
Jonathan Corwin
1275fdb35a Fix {} colour substitutions and problems displaying first slide 
bzr-revno: 1006
 2010-09-03 20:49:09 +01:00
Tim Bentley
3f93a44519 Fix bugs with renderer 
bzr-revno: 1005
 2010-09-03 20:44:56 +01:00
Tim Bentley
27dd493d40 debug cleanups 2010-09-03 19:33:55 +01:00
Jonathan Corwin
e292748b83 Colour and poss blank verse fix? 2010-09-03 19:30:56 +01:00
Tim Bentley
da88990549 Bug 625997 2010-09-03 19:24:11 +01:00
Raoul Snyman
5432daae57 Fix for bug #621695. 
bzr-revno: 1004
 2010-09-03 08:29:29 +02:00
Andreas Preikschat
b138a4c1e8 Improved dual Bible handling, fixed some edge-case bugs, including bug #625997. 
bzr-revno: 1003
 2010-09-03 08:26:43 +02:00
Raoul Snyman
a37fafa722 Fix the name of the keyword argument. 2010-09-03 07:33:03 +02:00
Jon Tibble
da658e8850 Silly space 2010-09-03 00:20:35 +01:00
Jonathan Corwin
8be66a0e6f A bit of python crept into the javascript 2010-09-02 22:24:44 +01:00
Jonathan Corwin
6b2b7c2f1e Head 2010-09-02 22:03:55 +01:00
Jonathan Corwin
96737c0bc0 Use QtGraphicsWebview. Reduce div count where possible 2010-09-02 21:41:24 +01:00
Martin Thompson
84bff09d03 REmoved prints 2010-09-02 21:30:01 +01:00
Martin Thompson
11a9d3d8f5 Handles versetypes like 'V3a' 2010-09-02 21:21:31 +01:00
Martin Thompson
192010588f Test for & in authors 2010-09-02 20:43:28 +01:00
Jon Tibble
1b00eb4f0c Head r1001 2010-09-02 13:46:42 +01:00
Raoul Snyman
952dfca9fc Updated translation files, removed some more double-spaces 2010-09-02 13:05:48 +02:00
Raoul Snyman
081c66a1ed More extra spaces removed. 2010-09-02 13:00:08 +02:00
Raoul Snyman
df007a438e Fixed double-spacing 2010-09-02 12:53:50 +02:00
Jonathan Corwin
a9281e4cb9 replace evil-tables(tm) with div's 2010-09-01 22:36:02 +01:00
Derek Scotney
56b5a037ae Conflicts resolved 2010-09-01 22:20:27 +02:00
Derek Scotney
9ed0df5023 Removed unnecessary commented out lines 2010-09-01 21:31:16 +02:00
Derek Scotney
ce73d86e0a More code convention corrections 2010-09-01 21:27:45 +02:00
Andreas Preikschat
cadfefe616 opps.. forgot the %s 2010-09-01 21:22:55 +02:00
Tim Bentley
b24467d32c cleanup 2010-09-01 20:20:40 +01:00
Tim Bentley
c7b65b3476 Head5 2010-09-01 20:15:49 +01:00
Andreas Preikschat
b21e164fd3 added permission to footer 2010-09-01 19:54:10 +02:00
Andreas Preikschat
80851ddfc4 added permission, changed formattig 2010-09-01 19:27:38 +02:00
Raoul Snyman
ad57ee0927 Removed an unnecessary space. 2010-09-01 08:19:45 +02:00
Raoul Snyman
8344bcb1f7 HEAD 2010-09-01 08:19:09 +02:00
Philip Ridout
7e0245344a Adding the Words of Worship importer. 
bzr-revno: 1001
 2010-09-01 07:11:31 +02:00
Jonathan Corwin
0c62215bb7 Less interesting, but hopefully slightly faster transitions 2010-08-31 23:15:19 +01:00
Martin Thompson
b4cfea211e Import completely unlabelled songs. Import unreferenced verses 2010-08-31 20:49:57 +01:00
Derek Scotney
5734c3052a Code convention corrections 2010-08-31 21:01:55 +02:00
Andreas Preikschat
60ced9e184 moved some code 2010-08-31 20:28:21 +02:00
Tim Bentley
fbc048e878 Renderer fixes 2010-08-31 18:51:48 +01:00
Raoul Snyman
cafd5fca54 Reduce "Go to Verse" to "Go To" 2010-08-31 15:23:21 +02:00
Raoul Snyman
d116196993 HEAD 2010-08-31 08:41:40 +02:00
Raoul Snyman
b5dc5bafc0 - Fix for "TextLabel" in translation. 
- HEAD
 2010-08-31 08:41:03 +02:00
Jon Tibble
941ef772a5 Cleanups 2010-08-31 00:19:04 +01:00
Jonathan Corwin
305610ed8e fixes 2010-08-30 21:57:59 +01:00
Derek Scotney
83c5ee3450 Removed openlp/plugins/songs/lib/.directory 2010-08-30 22:42:07 +02:00
Martin Thompson
733bedebe8 Passes first tests again 2010-08-30 21:19:16 +01:00
Jonathan Corwin
3ea9ed2643 Head 2010-08-30 20:07:54 +01:00
Jonathan Corwin
b96a284d9e transition changes 2010-08-30 19:55:59 +01:00
Derek Scotney
590aef4a87 Corrected docstring lengths 2010-08-30 20:32:00 +02:00
Raoul Snyman
2d9b39986a Some more fixes for the OpenSong import. 2010-08-29 22:05:36 +02:00
Raoul Snyman
0e919ab903 Only show the display screen on startup if it is not on the primary screen. 
bzr-revno: 1000
 2010-08-29 21:29:45 +02:00
Raoul Snyman
75d64a165c Removed the commented out line, since this works. 2010-08-29 21:16:17 +02:00
Derek Scotney
d3ee43965f Change comments to reStructuredText format 2010-08-29 20:24:09 +02:00
Raoul Snyman
90ac6da839 Don't show the display on startup if there's only one monitor. 2010-08-29 20:12:36 +02:00
Raoul Snyman
130e315333 HEAD 2010-08-29 19:54:36 +02:00
Andreas Preikschat
31aba2eadb removed commented lines, name change 2010-08-29 18:20:56 +02:00
Tim Bentley
002b5de1c3 remove slash 2010-08-29 15:44:14 +01:00
Tim Bentley
93c87c396b add space 2010-08-29 15:42:47 +01:00
Tim Bentley
4379004f0e rename theme suffix 2010-08-29 15:27:51 +01:00
Tim Bentley
f065f95d00 Head998 2010-08-29 15:20:21 +01:00
Andreas Preikschat
1911972177 head 2010-08-29 15:07:10 +02:00
Andreas Preikschat
9fc45065fc removed unnecessary line 2010-08-29 14:58:40 +02:00
Andreas Preikschat
87db3e98e6 clean ups, tweaks, fixed 625997 2010-08-29 14:49:45 +02:00
Jon Tibble
9a1ed78fd5 Cleanups 2010-08-29 00:52:10 +01:00
Raoul Snyman
59d2e2dab6 Fixed up the OpenSong importer. 2010-08-29 01:09:05 +02:00
Philip Ridout
271bbe22b2 Made the constants more like constants! 2010-08-28 21:46:03 +01:00
Jon Tibble
0abf1597eb Fix trunk merging 2010-08-28 20:54:50 +01:00
Raoul Snyman
7fcd2512ce HEAD 2010-08-28 21:49:12 +02:00
Andreas Preikschat
beaac2d923 removed everything which cannot work 2010-08-28 21:41:06 +02:00
Jon Tibble
168033566a Head r997 2010-08-28 20:40:27 +01:00
Jon Tibble
066a97f4d7 Really fix song maintenance as subform (Bug #612282) 2010-08-28 20:32:24 +01:00
Andreas Preikschat
37b2b1bb9d clean up 2010-08-28 21:28:50 +02:00
Andreas Preikschat
de3659bc92 commented everything out, which cannot work (currently) 2010-08-28 21:17:52 +02:00
Andreas Preikschat
521b06ee8c clean up - not working 2010-08-28 20:56:46 +02:00
Tim Bentley
10aa9432d6 Fix font sizes and performance of previews 2010-08-28 19:44:49 +01:00
Andreas Preikschat
36e2f2e33f fixed stuff messed up resolvesing the conflict 2010-08-28 19:32:44 +02:00
Andreas Preikschat
14dbfaa4b5 fixed stuff messed up resolvesing the conflict 2010-08-28 19:10:14 +02:00
Andreas Preikschat
8071a65720 head 2010-08-28 19:05:45 +02:00
Tim Bentley
618813f020 Display and renderer changes 
bzr-revno: 997
 2010-08-28 17:35:16 +01:00
Tim Bentley
5ba4de64ca String fixes 2010-08-28 16:49:51 +01:00
Derek Scotney
81b53ee21b Changs to comment formatting 2010-08-28 15:27:17 +02:00
Derek Scotney
676cc9305c Changes to CCLI file importer to work with import wizard 2010-08-28 15:17:27 +02:00
Derek Scotney
80ded239a8 Changes to CCLI file importer to work with import wizard 2010-08-28 15:15:12 +02:00
Philip Ridout
f712ccca50 Signal fix as mentioned by Meths 2010-08-28 03:51:29 +01:00
Jon Tibble
000d23f7c6 Cleanup long lines 2010-08-28 02:31:11 +01:00
Jonathan Corwin
c4f3bccb59 Problems with outlines in qtwebkit 533.3. Shadow colour and kerning 2010-08-28 00:19:50 +01:00
Jon Tibble
bb31492609 Fix song maintenance as subform (Bug #612282) 2010-08-27 23:49:27 +01:00
Philip Ridout
1611251ec2 and an empty line at the end 2010-08-27 21:18:48 +01:00
Philip Ridout
e4f4626f04 shortened some long lines. 2010-08-27 21:14:23 +01:00
Philip Ridout
4e059f8cc5 Forgot to add the wowimport.py file 2010-08-27 21:02:59 +01:00
Philip Ridout
6b6da86c54 wow_import implemented in to import wizard 
bug fix in wizzard, so that it starts from the first page if used previously
bux fix in importer, so that it resets the defualts after commiting a song to the db
 2010-08-27 20:53:22 +01:00
Tim Bentley
3645c9400e Fix theme bug reported on Redhat bugzilla 
bzr-revno: 996
 2010-08-27 20:18:37 +01:00
Jon Tibble
5cfdaf3b77 Update OpenLPv2 song importer 
bzr-revno: 995
 2010-08-27 19:50:08 +01:00
Tim Bentley
759019e5eb Fix theme import Redhat Bugzilla 2010-08-27 19:48:06 +01:00
Tim Bentley
a4f1b29cca Fix bug losing transitions 2010-08-27 19:28:19 +01:00
Tim Bentley
3c637f6c2d chnage theme suffix 2010-08-27 17:44:42 +01:00
Tim Bentley
e1afe3be94 Head994 2010-08-27 17:10:15 +01:00
Jon Tibble
6266c3369e Cleanup the OpenLPv2 song importer 2010-08-27 16:25:29 +01:00
Raoul Snyman
596b49af9e Fixed up some HTML that crept in somewhere. 2010-08-27 11:11:57 +02:00
Jonathan Corwin
f717dc10d4 Bring up to date 2010-08-26 23:08:09 +01:00
Jonathan Corwin
1c66c7cd2c Head 2010-08-26 22:34:34 +01:00
Jonathan Corwin
ea2419924c progressbar 2010-08-26 22:32:31 +01:00
Raoul Snyman
3d60cc894d Added the initial openlp.org 1.x importer. 2010-08-26 22:53:24 +02:00
Raoul Snyman
dfe8bbae9c Some minor syntactic sugar. 2010-08-26 22:52:54 +02:00
Derek Scotney
ab7cd33c8d Updates to CCLI handling 2010-08-26 21:45:09 +02:00
Tim Bentley
ba4821e5f8 Screen re-sizing now works 2010-08-26 17:51:27 +01:00
Tim Bentley
2e6c06ad1f Screen switching now works 2010-08-26 17:08:26 +01:00
Tim Bentley
ca58541cb5 Head993 2010-08-26 16:50:11 +01:00
Tim Bentley
d6a67e7382 Screen fixes 2010-08-26 16:50:03 +01:00
Raoul Snyman
364940c547 Additional failover for version problems. 
bzr-revno: 993
 2010-08-26 15:54:05 +02:00
Jon Tibble
53295b08e0 Cleanups and a version check fix 
bzr-revno: 992
 2010-08-26 14:45:56 +01:00
Raoul Snyman
8c27f92ee3 Fix a string. 2010-08-26 07:52:30 +02:00
Raoul Snyman
3b1c151e15 Fail silently on version problems. 
Renamed a variable to be a little more sensible.
 2010-08-26 07:35:34 +02:00
Tim Bentley
adb757cd2f Cleanups and screen fixes 2010-08-26 06:01:29 +01:00
Jon Tibble
06fd68b3d8 Cleanups & fix version check 2010-08-26 01:37:25 +01:00
Tim Bentley
492389b715 Head990 2010-08-25 18:08:36 +01:00
Tim Bentley
2ec84cc5d9 White Space cleanup 2010-08-25 18:08:24 +01:00
Raoul Snyman
8b141b0942 Fixed the couple of issues Jon T. pointed out. 2010-08-24 21:08:57 +02:00
Tim Bentley
fcb62e41b8 Cut paste bug 2010-08-24 18:53:41 +01:00
Tim Bentley
46e35ead28 Spotted video bug 2010-08-24 18:28:13 +01:00
Tim Bentley
7359e91283 Fix bible titles 2010-08-24 18:12:47 +01:00
Tim Bentley
b2234ae269 Remove Unused variables 2010-08-24 17:39:51 +01:00
Raoul Snyman
78889633f6 Changed incrementProgressBar again slightly so that passing a blank string or None to the text will not update the text. 2010-08-24 17:31:33 +02:00
Raoul Snyman
70cd4bc700 Added an extra argument to the incrementProgressBar function so that an increment can be specified (like 0, if you don't want an increment). 2010-08-24 17:28:45 +02:00
Raoul Snyman
25f6bb33e7 Made changes suggested/requested by Jonathan C. 2010-08-24 17:25:26 +02:00
Jonathan Corwin
0066edecbb Remove comments 2010-08-24 13:50:26 +01:00
Raoul Snyman
788e8a2b55 Fixed a problem with the getListOfFiles function which was returning a list of repr'd QListWidgetItems instead of a list of strings. 
Made a SongFormat.ccli -> SongFormat.CCLI after renaming some fields caught this too.
 2010-08-24 10:08:07 +02:00
Jonathan Corwin
5c90fae68d Footer and css fixes 2010-08-23 23:24:42 +01:00
Jonathan Corwin
2c3e732453 SongImport.__init__() 2010-08-23 22:52:21 +01:00
Raoul Snyman
ef44dc72c6 Changed the Generic importer to multifile as well. 2010-08-23 21:29:39 +02:00
Tim Bentley
9403beb8b8 Fix blinking screen on Settings 2010-08-23 20:14:05 +01:00
Tim Bentley
6ab5447159 Fix up image deletion bug 2010-08-23 18:48:52 +01:00
Derek Scotney
0f7fb002b4 Added SongSelectFileImport to source control 2010-08-23 19:42:59 +02:00
Raoul Snyman
6d0b229860 Merge from HEAD. 
Add file I forgot to add previously.
Change Songs Of Fellowship importer to multi-file.
 2010-08-23 19:36:42 +02:00
Derek Scotney
558ec5dd38 Update to SongSelect functionality 2010-08-23 19:31:16 +02:00
Tim Bentley
37d1ab68b4 Remove border and handle missing enchant 2010-08-23 05:58:32 +01:00
Jonathan Corwin
8b79abdfe6 sof wizard 2010-08-22 23:36:11 +01:00
Raoul Snyman
530530d791 Got the song wizard working. Pity none of the importers seems to work at the moment. 2010-08-22 21:50:30 +02:00
Tim Bentley
a4e58c3349 Finish off spelling and tags for Custom and Song dialogs 2010-08-22 09:27:08 +01:00
Tim Bentley
ed4801b48a Add Html Tags to context menu 2010-08-22 08:39:23 +01:00
Tim Bentley
f705b69e20 Spellchecking of songs and custom 2010-08-22 08:05:05 +01:00
Tim Bentley
9f4066bf3f More fixes and update song editing 2010-08-21 20:35:32 +01:00
Tim Bentley
076215435b Fix up tags for renderer 2010-08-21 20:17:56 +01:00
Derek Scotney
54736fdac0 Implementation of SongSelect file import 2010-08-21 17:33:31 +02:00
Tim Bentley
06901951a6 Bug Fixes 2010-08-21 11:07:59 +01:00
Tim Bentley
3698f4abd9 cleanups for merge 2010-08-21 09:24:14 +01:00
Tim Bentley
086cf2d814 Head988 2010-08-21 08:46:42 +01:00
Tim Bentley
58f7f248e3 Remove text indentation 2010-08-21 08:46:00 +01:00
Tim Bentley
8459cf1c25 Fix service item focus bug 2010-08-21 08:25:54 +01:00
Tim Bentley
1e86aa98ba Fix theme text weight and html tag cleanups 2010-08-21 07:00:46 +01:00
Raoul Snyman
d4c274866d Moved the SVG file because it's not an icon SVG, it's the original logo file. 2010-08-20 22:07:02 +02:00
Raoul Snyman
3d478ec975 Song Wizard! 2010-08-20 21:40:07 +02:00
Jonathan Corwin
1e0d68016f Jonathans changes 2010-08-20 20:06:42 +01:00
Tim Bentley
def949fc9a Head987 2010-08-20 19:14:58 +01:00
Andreas Preikschat
5a22e67346 clean up 2010-08-18 17:04:16 +02:00
Andreas Preikschat
1b1261a1a4 - improved usage of different bibles and/or books in one service item 2010-08-15 17:35:20 +02:00
Andreas Preikschat
30e867e020 - rework 
- improved usage of different bibles
 2010-08-15 16:49:07 +02:00
Andreas Preikschat
a043407e25 Dual bible fixes 
bzr-revno: 987
 2010-08-11 20:47:24 +01:00
Andreas Preikschat
c41bb80a95 made lines more readable 2010-08-10 18:49:52 +02:00
Andreas Preikschat
df8b064058 made lines more readable 2010-08-10 18:48:10 +02:00
Andreas Preikschat
47125ba600 made lines more readable 2010-08-10 18:44:04 +02:00
Jonathan Corwin
51f35dc9ce Alerts over presentations + tidyups 2010-08-09 22:21:04 +01:00
Andreas Preikschat
403ee4cd53 more convenient names 2010-08-08 20:05:33 +02:00
Raoul Snyman
d992fb1e07 First add and delete buttons working! 2010-08-08 16:38:51 +02:00
Tim Bentley
6c3f21dfb0 Theme Editing now previews and RenderManager Cleanups 2010-08-07 14:37:10 +01:00
Tim Bentley
45b12cf462 Theme preview updates 2010-08-07 09:50:58 +01:00
Tim Bentley
efd5c60dfd Display fixes amd theme updates 2010-08-07 07:18:05 +01:00
Tim Bentley
bec051a502 Fade previews now work 2010-08-06 17:38:52 +01:00
Andreas Preikschat
24de78680e cleanup 2010-08-06 09:23:32 +02:00
Andreas Preikschat
719268f121 cleanup 2010-08-06 09:07:20 +02:00
Andreas Preikschat
3bee58e314 'if' not necessary 2010-08-06 09:00:34 +02:00
Tim Bentley
956017da0e Start to fix preview for fades 2010-08-06 06:09:32 +01:00
Tim Bentley
15c6e47f4e Cleanups 2010-08-05 21:39:20 +01:00
Tim Bentley
b612ece199 Fix theme editing display size 2010-08-05 21:26:39 +01:00
Andreas Preikschat
60b179b2ed improved single and dual bible usage in one service item 2010-08-05 21:32:58 +02:00
Tim Bentley
9722b4e382 Theme cleanups 2010-08-05 20:01:24 +01:00
Tim Bentley
ab37fdbcf8 Theme blanking works now 2010-08-05 08:49:25 +01:00
Tim Bentley
003d0552eb Theme blanking works 2010-08-05 06:37:26 +01:00
Tim Bentley
6d352df382 Video cleanups 2010-08-04 20:09:43 +01:00
Andreas Preikschat
e6f0fde98d tweaks and cleanups 2010-08-04 10:02:52 +02:00
Tim Bentley
821911503e Alerts now work 2010-08-04 05:59:41 +01:00
Tim Bentley
f3e62c9f14 Bible text display cleanups 2010-08-03 20:23:05 +01:00
Tim Bentley
6d5eae7377 Update to alert 2010-08-03 19:30:38 +01:00
Andreas Preikschat
444a219a20 removed unused list 2010-08-03 19:17:09 +02:00
Andreas Preikschat
6df4e2cfef continued fixing + cleaned my work up 2010-08-03 19:04:08 +02:00
Andreas Preikschat
b3d17de18a fixed second bible when using Keep to create multiple bible verses in one service item 2010-08-03 12:49:04 +02:00
Andreas Preikschat
569377e7d0 fixed second bible when using Keep to create multiple bible verses in one service item 2010-08-03 12:46:12 +02:00
Tim Bentley
7152d60a16 Fix up for alerts. 2010-08-03 06:15:50 +01:00
Tim Bentley
9539e5b2a6 Head986 2010-08-03 05:56:33 +01:00
Tim Bentley
bdda14740b More changes 2010-08-03 05:56:21 +01:00
Andreas Preikschat
778388b2ae search result are dependent (in regard to 2nd bible) 2010-08-02 22:03:20 +02:00
Tim Bentley
197fe4cb08 Fix song usage 
Fix 598407

bzr-revno: 986
Fixes: https://launchpad.net/bugs/598407
 2010-08-02 20:32:40 +01:00
Tim Bentley
9bdc7db801 Fixes 2010-08-02 20:23:39 +01:00
Andreas Preikschat
06752ffa66 show both bible versions in the title 2010-08-02 21:11:05 +02:00
Tim Bentley
39be81f8b2 Fix bug #598407 2010-08-02 20:08:55 +01:00
Tim Bentley
9da35664bb Fix up songusage 2010-08-02 20:05:40 +01:00
Tim Bentley
929b36705a Remove blank lines 2010-08-02 18:56:50 +01:00
Tim Bentley
4e0a3ca40b Fix song usage missing code 2010-08-02 18:51:44 +01:00
Jon Tibble
3ce079240f Work with SQLAlchemy 0.6 
bzr-revno: 985
Fixes: https://launchpad.net/bugs/611889
 2010-08-02 12:59:38 +01:00
Tim Bentley
82aa9c333a Add Volume slider and document APIs 2010-08-02 06:16:07 +01:00
Jon Tibble
72c2336d84 Work with SQLAlchemy 0.6 (Bug #611889) 2010-08-02 03:53:14 +01:00
Tim Bentley
c10fc012a3 Video starts to work 2010-08-01 17:46:24 +01:00
Tim Bentley
992cebb05c Head984 2010-08-01 16:48:26 +01:00
Andreas Preikschat
839d5da3ef Disable buttons when no item to act on 
bzr-revno: 984
 2010-08-01 16:32:09 +01:00
Jon Tibble
41ed61bfe3 Fix previous fix 2010-08-01 15:28:40 +01:00
Tim Bentley
6787a41eae Fix disply settings again - alerts coded 2010-08-01 14:11:54 +01:00
Tim Bentley
047e8efe1f Head982 2010-08-01 09:44:58 +01:00
Jon Tibble
65c95057b7 Fix alerts and screen resizing 
bzr-revno: 982
 2010-08-01 09:35:17 +01:00
Tim Bentley
fb4bd1a8c2 Head981 2010-08-01 09:30:42 +01:00
Tim Bentley
f10e478438 Alert workings 2010-08-01 09:28:31 +01:00
Jon Tibble
4b0093e97b Fix alerts width 2010-07-31 23:23:48 +01:00
Jon Tibble
e815a5ff08 Fix non-updating screen when unchecking override 2010-07-31 22:58:56 +01:00
Andreas Preikschat
23022c095d improved button behaviour 2010-07-31 13:52:17 +02:00