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

3460 Commits

Author SHA1 Message Date
Andreas Preikschat
39537f9ef7 fixed bug 788770 
Fixes: https://launchpad.net/bugs/788770
 2011-05-26 22:17:52 +02:00
Armin Köhler
b5c392112b test close database 2011-05-26 22:15:38 +02:00
Armin Köhler
c435127585 some fixes in relation with the extened LanguageForm 
close cursor from OldBibleDB
 2011-05-26 21:13:11 +02:00
Gerald Britton
dc2a304b16 Merge changes from trunk 2011-05-26 14:20:40 -04:00
Gerald Britton
74e47dcbc7 Add specific error messages for file problems. 
Remove unicode strings in calls to translate()
 2011-05-26 14:20:14 -04:00
Tim Bentley
acdbefd922 Fixes 2011-05-26 18:11:22 +01:00
Jonathan Corwin
40222b23c8 Remove index from search_lyrics for mysql - myisam 2011-05-26 17:35:44 +01:00
Tim Bentley
8f6ed366a1 Copyright updates 2011-05-26 17:25:54 +01:00
Gerald Britton
e70ba41373 Add specific error messages if OoO open fails. Use a lambda to avoid repetition 2011-05-26 09:35:01 -04:00
Gerald Britton
c70c1a7c1a Merge changes from trunk 2011-05-26 09:10:46 -04:00
Armin Köhler
24d7b7b038 small spelling change 2011-05-26 09:34:29 +02:00
Armin Köhler
f3864cb4aa HEAD r1572 2011-05-26 09:27:50 +02:00
Armin Köhler
6486d41b8c correct some words and code 
changed behaviour if the "cancel" button is pressed while upgrading
 2011-05-26 09:25:17 +02:00
Armin Köhler
2930510461 change languageform like Raoul suggest 2011-05-26 09:00:40 +02:00
Raoul Snyman
38000b5e56 Give the media items the ability to do something when they are "focused". 
Make the search edits on the Songs, Bibles and Custom media items focus when the item is selected.
 2011-05-26 08:23:22 +02:00
Meinert Jordan
548e41f15c Localized sorting for various lists. 
bzr-revno: 1572
 2011-05-26 07:37:52 +02:00
Tim Bentley
3b627be641 Finish plugin sorts 2011-05-26 05:48:13 +01:00
Stevan Pettit
4f857f8921 modified: 
openlp/plugins/custom/forms/editcustomform.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/forms/editsongform.py
  openlp/plugins/songs/lib/mediaitem.py
 2011-05-25 23:34:42 -04:00
Gerald Britton
4399fc108f Fixed a silent error when OpenOffice fails to open a file.\ 
Also, added the file name to the exception log and made the exception explicit
 2011-05-25 17:38:32 -04:00
Andreas Preikschat
6e235f6bff - Fixed bug #786896 
- New display tag {br}
- Better regex usage in the SongBeamer import

bzr-revno: 1571
Fixes: https://launchpad.net/bugs/786896
 2011-05-25 23:11:15 +02:00
Gerald Britton
3b7debfe81 merged with trunk 2011-05-25 16:41:23 -04:00
Armin Köhler
0f98c4fd8f change behaviour if "Cancel" button is pushed. 2011-05-25 22:20:17 +02:00
Armin Köhler
175d6cebb2 add Bible Name to LanguageDialog 
renamed "Importing" to "Upgrading" and "Choose" to "Select"
fixed traceback while textsearch
removed unnecessary code
 2011-05-25 21:13:37 +02:00
M2j
7a1a83a98a Head 1570 2011-05-25 20:42:03 +02:00
Armin Köhler
e8cdba44be small clean up 2011-05-25 16:52:46 +02:00
Armin Köhler
dd4543ad2d HEAD r1569 2011-05-25 16:29:16 +02:00
Armin Köhler
0c83471ee4 move some code 
stop moving bibles to subfolders
some fixes
 2011-05-25 16:18:03 +02:00
Andreas Preikschat
cf4dbcdafe r1569 2011-05-25 15:10:44 +02:00
Andreas Preikschat
10f59d0313 started to fix camelCase names 2011-05-25 09:59:51 +02:00
Gerald Britton
de7b7a072a fix up error messages in ooimport.py 2011-05-24 19:14:49 -04:00
Raoul Snyman
8c9728c3b2 HEAD 2011-05-24 22:53:41 +02:00
Raoul Snyman
7669643774 Updated the copyright notice, adding Jeffrey Smith back in after he accidentally got removed somewhere somehow. 2011-05-24 22:47:05 +02:00
Gerald Britton
36e5406b14 Merge trunk changes 2011-05-24 16:41:56 -04:00
Gerald Britton
d05c349f41 Catch common errors during import and report to user 2011-05-24 16:41:14 -04:00
Raoul Snyman
da45bb0b06 Fixed various strings, as listed in bug #734445. 2011-05-24 19:32:36 +02:00
Andreas Preikschat
d068d11c76 (started to) fix bug #86896 2011-05-24 17:06:38 +02:00
Andreas Preikschat
5473d3c817 added windows comment 2011-05-24 07:23:28 +02:00
M2j
06d561f9fc localized string sorting 2011-05-23 22:42:07 +02:00
Andreas Preikschat
ce5c354e06 fix for head 2011-05-23 13:49:14 +02:00
Andreas Preikschat
987cd14fbf r1564 2011-05-23 13:16:28 +02:00
Andreas Preikschat
73293c2985 removed imports 2011-05-23 13:14:05 +02:00
Andreas Preikschat
594caf0a19 fix for windows 2011-05-23 12:34:42 +02:00
Tim Bentley
b6a85d0405 Add Split items to songs and custom, improve impress error handling 
bzr-revno: 1564
 2011-05-23 05:59:35 +01:00
Tim Bentley
50a81cc3c9 png not jpg 2011-05-22 19:50:34 +01:00
Tim Bentley
b544e519b1 Add tolltip and impress debugging 2011-05-22 19:48:14 +01:00
Tim Bentley
37679fc1db Finish slide spltting code 2011-05-22 14:08:43 +01:00
Jonathan Corwin
ac29839151 Add items to service via the search on the web remote 
bzr-revno: 1562
 2011-05-22 12:56:22 +01:00
Stevan Pettit
08932ad664 modified: 
openlp/core/lib/mediamanageritem.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/lib/mediaitem.py
 2011-05-21 21:29:09 -04:00
Jonathan Corwin
031525b0e6 Lose the [None] and fix jquery issue 2011-05-21 18:43:37 +01:00
Stevan Pettit
23e95892ec modified: 
openlp/plugins/songs/lib/wowimport.py
pending merges:
  Gerald Britton 2011-05-21 [merge] Words of Worship import where a file m...
    Gerald Britton 2011-05-20 Fix Words of Worship import to issue error...
 2011-05-21 10:49:25 -04:00
Jonathan Corwin
218ee2db2b tweak the jquery 2011-05-21 10:14:30 +01:00
Stevan Pettit
48148bc297 modified: 
openlp/core/lib/mediamanageritem.py
  openlp/core/ui/servicemanager.py
  openlp/core/ui/slidecontroller.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/lib/mediaitem.py
pending merges:
  Tim Bentley 2011-05-20 [merge] Stop preview media and presentations when...
    Tim Bentley 2011-05-20 Fix extra indent
    Tim Bentley 2011-05-20 [merge] Head
    Tim Bentley 2011-05-20 Stop the media / presentation if going from P...
 2011-05-20 21:30:23 -04:00
Jonathan Corwin
732f5321dd indent 2011-05-20 23:32:46 +01:00
Jonathan Corwin
bbbf0d3435 Go live/add to service via list 2011-05-20 23:30:20 +01:00
Andreas Preikschat
f753070f53 fix for windows 2011-05-20 19:06:38 +02:00
Gerald Britton
a5a8c0d6d2 Fix Words of Worship import to issue error message for files missing the expected header 2011-05-20 12:34:44 -04:00
Andreas Preikschat
5a7aa2fb9f do not override list 2011-05-20 17:18:57 +02:00
Andreas Preikschat
3359726be2 improved media item sorting 2011-05-20 17:14:10 +02:00
Jonathan Corwin
d4e83ae45a Remote web add to service 2011-05-20 00:09:42 +01:00
Stevan Pettit
af5fdcf73d modified: 
openlp/plugins/custom/lib/mediaitem.py
 2011-05-19 18:34:46 -04:00
Stevan Pettit
206ee04db6 modified: 
openlp/plugins/custom/forms/editcustomform.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/forms/editsongform.py
  openlp/plugins/songs/lib/mediaitem.py
 2011-05-19 18:20:00 -04:00
Tim Bentley
32127d51bb Add Search to Custom 
bzr-revno: 1557
 2011-05-19 17:10:49 +01:00
Stevan Pettit
fc5b72b0b4 Add the ability to double-click a slide entry in custom to edit the slide. 
bzr-revno: 1556
 2011-05-19 07:37:05 +02:00
Andreas Preikschat
f537f91939 Improved regex usage. 
bzr-revno: 1555
 2011-05-19 07:29:50 +02:00
Tim Bentley
0c2196339a Fix search order 2011-05-19 05:48:10 +01:00
Tim Bentley
cff081066f Head 2011-05-19 05:42:10 +01:00
Stevan Pettit
e3ca10b46f modified: 
openlp/plugins/custom/forms/editcustomform.py
 2011-05-18 23:19:36 -04:00
Armin Köhler
8c308ac4f8 Fixed bug #779995: FoilPresenter songs with verses without text cause a traceback. 
bzr-revno: 1554
 2011-05-18 22:56:18 +02:00
Armin Köhler
674260eadb fix bug https://bugs.launchpad.net/openlp/+bug/779995 2011-05-18 21:07:08 +02:00
Jonathan Corwin
7b534642b9 Plan B. Figure out what the code is actually meant to be doing 2011-05-18 19:59:36 +01:00
Jonathan Corwin
3add2de140 Fix song editing what I did broke. Oops 2011-05-18 19:32:18 +01:00
Armin Köhler
c51d8182a6 delete all sucessfull imported bibles by default 
remove the possibility to choose which bibles should be deleted after the upgrade
 2011-05-18 20:19:11 +02:00
Armin Köhler
236ca44105 HEAD r1552 2011-05-18 20:00:40 +02:00
Tim Bentley
d6ea529411 Fix description 2 2011-05-18 16:01:33 +01:00
Tim Bentley
67be2937be Fix description 2011-05-18 15:34:35 +01:00
Tim Bentley
509811620d Head 2011-05-18 15:27:29 +01:00
Andreas Preikschat
4cd23308b8 regex clean ups 2011-05-18 16:26:19 +02:00
Jonathan Corwin
2d5d16b40b Return filename in text for non-text types. Display verse tag in remote view 2011-05-17 23:00:50 +01:00
Jonathan Corwin
0323dfcb90 Add ability to search and go live on all media manager items via the web remote. Also tweak the web interface to fit better on a phone screen 
bzr-revno: 1550
 2011-05-17 22:22:24 +01:00
Jonathan Corwin
7a857290a6 More fixes 2011-05-17 19:48:04 +01:00
Jonathan Corwin
5fcb41bc9d fixes 2011-05-16 22:01:21 +01:00
Tim Bentley
a66b582484 Head 2011-05-16 18:59:02 +01:00
Tim Bentley
dfbf368c8a Sort images 2011-05-16 18:58:52 +01:00
Andreas Preikschat
b92d437a8d - fixed a traceback which occurred when performing a text search but no bible is available 
bzr-revno: 1549
 2011-05-16 13:13:57 +02:00
Jonathan Corwin
274c4ee87a tidies 2011-05-15 21:53:25 +01:00
Jonathan Corwin
f701eb9417 Head 2011-05-15 21:34:32 +01:00
Jonathan Corwin
2655c1b133 Remote searches presentations, media and images 2011-05-15 21:03:45 +01:00
Tim Bentley
070d719961 Fixes 2011-05-15 20:18:50 +01:00
Tim Bentley
387c911fdb Head 2011-05-15 20:07:53 +01:00
Tim Bentley
70660b7b71 Add Search to Custom and cleanups 2011-05-15 20:07:40 +01:00
Armin Köhler
fbd5349c2f small bugfixes 
hide entry in tools menu if there are no bibles to upgrade
 2011-05-15 20:42:08 +02:00
Jonathan Corwin
3f21b3e2ca Remote custom search. Revert a few remote web changes 2011-05-15 19:33:00 +01:00
Armin Köhler
b10fbf98eb HEAD r1547 2011-05-15 16:22:04 +02:00
Andreas Preikschat
cbdaf3334b fixed spelling 2011-05-15 15:10:21 +02:00
Andreas Preikschat
909cbfb176 - Move the No Search Results code. (I do not expect the code to be used by another QListWidget.) 
- Remove setUniformItemSizes

bzr-revno: 1546
 2011-05-15 15:08:16 +02:00
Andreas Preikschat
a2db0a1b5d fixed traceback when doing a text search without bible 2011-05-15 15:06:16 +02:00
Andreas Preikschat
4baaedc710 - Prevent adjusting the loop delay spin box (on the Gerneral Tab) to 0. 
- Changed title for the stage view html.

bzr-revno: 1545
 2011-05-15 14:57:25 +02:00
Andreas Preikschat
685bd32ccc r1544 2011-05-15 14:11:33 +02:00
Andreas Preikschat
c728559862 moved 'No Search Results' code 2011-05-15 14:11:08 +02:00
Andreas Preikschat
6d1ec4ae10 - prevent setting the loop delay spin box to 0 
- Changed title for the stage view html
 2011-05-15 12:38:11 +02:00
Jonathan Corwin
357d34a4d8 Remote bible search. Kludgy and probably broken something or going to conflict. Also tweaked Remote web interface 2011-05-14 22:25:22 +01:00
Raoul Snyman
3774bf2312 Added layout style to advanced tab. 
Made search edit focused on switch to quick tab.
Reordered methods to: private, inherited, slots, additional.
 2011-05-14 22:12:01 +02:00
Jonathan Corwin
75414d2ba8 Fix a couple of things 2011-05-14 13:26:05 +01:00
Andreas Preikschat
d22cacd982 Fixed a traceback which is occurs when you "lock" the search and do not select a dual bible (quick tab). 
bzr-revno: 1542
 2011-05-14 12:50:47 +02:00
Jonathan Corwin
047287950c Remote song search and go live beginnings 2011-05-14 10:48:58 +01:00
Andreas Preikschat
b04e688647 fixed attribute error 2011-05-13 22:59:14 +02:00
Andreas Preikschat
b1979857e4 complete fix 2011-05-13 21:58:05 +02:00
Andreas Preikschat
1f4bc114a9 Fixed traceback, when 'locked' and no dual bible selected. 2011-05-13 21:44:34 +02:00
Jonathan Corwin
55a5480ea4 Stage view changes: show all slides for a verse and tidy verse tags 
bzr-revno: 1540
 2011-05-13 18:43:38 +01:00
Andreas Preikschat
31cebdf4f7 added missing period 2011-05-13 17:34:56 +02:00
Jonathan Corwin
ef5c4bc7d4 Detect repeat verses 2011-05-12 22:55:45 +01:00
Armin Köhler
4ffa5c59d7 change some strings to better english 
small fixes
 2011-05-12 22:04:33 +02:00
Armin Köhler
d1f8e9f275 HEAD 1535 2011-05-12 21:17:30 +02:00
Raoul Snyman
dd68784555 Some enhancements to the Bibles media item. 
bzr-revno: 1535
 2011-05-12 20:10:09 +02:00
Raoul Snyman
d168987a9f Fixed a missing full stop in a tool tip. 2011-05-12 13:55:53 +02:00
Andreas Preikschat
01e4b8641c corrected use of VerseTags 
bzr-revno: 1534
 2011-05-12 13:10:52 +02:00
Raoul Snyman
e55e9f284a Dropped the results dropdowns in favour of a toggle button. 2011-05-12 01:59:04 +02:00
Raoul Snyman
5e954d86b6 Changed from a QTabWidget to QTabBar, giving us resizeable tabs. 2011-05-12 01:25:11 +02:00
Jonathan Corwin
e940279b34 More stageview changes 2011-05-12 00:16:53 +01:00
Jonathan Corwin
3e1bdc7475 More stageview changes 2011-05-11 23:32:25 +01:00
Andreas Preikschat
9709429261 r1532 2011-05-11 10:13:10 +02:00
Jonathan Corwin
c5656fbfd9 Remote hostname fix. Remove tags from remote text 
bzr-revno: 1532
 2011-05-10 22:17:02 +01:00
Andreas Preikschat
78c3c3ef39 clean up 2011-05-10 16:08:11 +02:00
Andreas Preikschat
a042ef1132 fix for ticket 155 
bzr-revno: 1530
 2011-05-10 13:15:54 +02:00
Gerald Britton
71818097cd Fix for bug #762856. 
bzr-revno: 1529
Fixes: https://launchpad.net/bugs/762856
 2011-05-10 13:14:56 +02:00
Andreas Preikschat
c60ebb40b2 fix for ticket 155 2011-05-09 15:58:17 +02:00
Andreas Preikschat
b04292a9c6 Display "No Search Results" if the search did not match any song/bible verse. 
bzr-revno: 1527
Fixes: https://launchpad.net/bugs/739759
 2011-05-09 10:29:32 +02:00
Jonathan Corwin
2c76faca48 u 2011-05-08 20:31:44 +01:00
Jonathan Corwin
61b3a8e19b head 2011-05-08 20:28:04 +01:00
Jonathan Corwin
a293be51e8 Local hostname fix. remote now returns just text. New html element to return html 2011-05-08 20:26:32 +01:00
Andreas Preikschat
2a0f3b272a r1522 2011-05-08 15:21:00 +02:00
Andreas Preikschat
55e4bad542 display 'No Search Results' if no song/bible verse matched the search keyword (bug #739759) 
Fixes: https://launchpad.net/bugs/739759
 2011-05-08 13:35:10 +02:00
Andreas Preikschat
a4e5d290a3 - changed a few loops to list comprehensions 
- fixed unclosed file
- attempt to reduce possible tracebacks when running two instances of the FRW

bzr-revno: 1525
 2011-05-08 13:08:28 +02:00
Jonathan Corwin
7103d98dba Just add a couple of links... 2011-05-07 23:19:42 +01:00
Andreas Preikschat
c07f2f40c5 r1522 2011-05-07 13:06:43 +02:00
Jonathan Corwin
1a3626ef13 no newline at end of file... 2011-05-07 09:54:06 +01:00
Jonathan Corwin
9715e6dd1f more refixes 2011-05-07 09:27:43 +01:00
Jonathan Corwin
547b58e7b5 remove link on remote, add /stage shortcut plus tidies and refix 2011-05-07 09:18:02 +01:00
Jonathan Corwin
03380fb40f head 2011-05-06 23:00:52 +01:00
Jonathan Corwin
5c6639e95b Fix remote bug if same item in service twice. More stage view tweaks 2011-05-06 23:00:18 +01:00
Andreas Preikschat
80f7aa2cc9 r1522 + resolved conflicts 2011-05-06 21:15:08 +02:00
Gerald Britton
2def15c12f Bug 762856: Support Bridge section and make more robust error recovery 2011-05-06 13:56:58 -04:00
Andreas Preikschat
6cb329dbc4 - fixed missing periods in tooltips 
- removed period from string

bzr-revno: 1522
 2011-05-06 11:17:16 +02:00
Andreas Preikschat
4f2740cbb0 Fixed the songshowplus importer returning when it shouldn't (as pointed out by jerryb) 
bzr-revno: 1521
 2011-05-06 10:44:52 +02:00
Andreas Preikschat
7854c664e8 added blank lines 2011-05-06 09:41:29 +02:00
Jonathan Corwin
764ca4d9c5 Stage view 2011-05-06 08:40:02 +01:00
Andreas Preikschat
82a509c012 fixed strings 2011-05-06 09:38:51 +02:00
Andreas Preikschat
68c1236a2a 2011-05-06 07:17:13 +02:00
Andreas Preikschat
de54c419ce fixed songshowplus importer 2011-05-06 06:36:22 +02:00
Jonathan Corwin
de9754caf1 Well one standard learnt. Probably a few more to go... 2011-05-05 19:48:11 +01:00
Andreas Preikschat
e1b1f7c6d0 fixed alert bug 2011-05-05 20:40:04 +02:00
Andreas Preikschat
0c9bea3b50 - removed obsolete code 
- fixes
 2011-05-05 15:02:12 +02:00
Jonathan Corwin
9388055376 where did that space come from? 2011-05-04 23:42:35 +01:00
Jonathan Corwin
cce8556b45 remote browser: detect change of song, and Android browser ajax cache issue 2011-05-04 23:34:43 +01:00
Andreas Preikschat
307ef744dd - fixed not closed file 
- attempt to make FRW avoiding tracebacks when running more than once
- clean ups
 2011-05-04 09:29:16 +02:00
Armin Köhler
4ee247c8b1 code cleanup 
small fixes
 2011-05-03 22:34:39 +02:00
Armin Köhler
368987bb67 code cleanup 2011-05-03 19:09:30 +02:00
Armin Köhler
d44b42aaff improve BookNameForm (add possibility to reduce the books in the ComboBox and try to autodetect if a bible only contains only parts of a bible, so that only a part of the bible books are displayed at startup) 2011-05-03 13:44:23 +02:00
Armin Köhler
4bee8ca5f6 add a dialog at startup which inform the user that the bible format has changed and provide a possibility to upgrade 
small cleanup
 2011-05-03 09:41:03 +02:00
Armin Köhler
b9204fa62b small changes 2011-05-02 20:20:38 +02:00
Armin Köhler
3eca8f6b50 updated bibles_resources.sqlite with some additional apocryph books 
comparing books with lower()
display only which are not added to a bible in BookNameForm
small fixes
 2011-05-02 15:45:30 +02:00
Armin Köhler
5b93b821b8 HEAD r1511 2011-05-02 15:24:25 +02:00
Armin Köhler
b4c3d1d5ae code cleaning 2011-05-02 06:21:18 +02:00
Andreas Preikschat
ccdd666c72 Fixed the alignment of the Quick Search Tab. (Bug #769998) 
bzr-revno: 1510
Fixes: https://launchpad.net/bugs/769998
 2011-05-01 20:01:00 +02:00
Andreas Preikschat
53fe9666d2 fixed long line 2011-05-01 15:27:19 +02:00
Andreas Preikschat
e0b862a897 fixed alignment of the quick tab (bug #769998) 
Fixes: https://launchpad.net/bugs/769998
 2011-05-01 15:11:47 +02:00
Tim Bentley
8085ffee74 Remove line 2011-05-01 08:21:55 +01:00
Tim Bentley
54e1674803 Head push 2011-04-30 18:36:28 +01:00
Tim Bentley
f6537acbf4 Updates 2011-04-30 18:36:13 +01:00
Jonathan Corwin
f472807251 os.path.splitext includes the . in the extension! 2011-04-30 17:11:28 +01:00
Tim Bentley
54a3dd8412 Remove not needed var and fix 195 strings 2011-04-30 09:37:28 +01:00
Jonathan Corwin
e9de9bea92 Fix Presentation bugs 773036 and 769513 
bzr-revno: 1505
 2011-04-30 09:13:49 +01:00
Tim Bentley
3b805f6374 Add new thread at startup time 2011-04-30 08:42:20 +01:00
Jonathan Corwin
8bec30cf9c Make Impress changes windows specific 2011-04-30 08:31:03 +01:00
Tim Bentley
9a88a7fcf7 Logging and comments 2011-04-30 06:43:41 +01:00
Jonathan Corwin
6584e6a1ed process events not required 2011-04-29 23:31:39 +01:00
Jonathan Corwin
879dfdbb16 head 2011-04-29 23:29:53 +01:00
Jonathan Corwin
a9df8468aa Minimized impress troubles 2011-04-29 23:29:29 +01:00
Tim Bentley
69395170e1 minor cleanups 2011-04-29 21:08:22 +01:00
Tim Bentley
0f7f03da30 Clean up Phonon media Object creation 
bzr-revno: 1503
 2011-04-29 20:22:20 +01:00
Tim Bentley
189daad93c More improvements 2011-04-29 17:41:26 +01:00
Tim Bentley
1eeebeda1c Add Progressbar 
bzr-revno: 1501
 2011-04-29 14:28:18 +01:00
Andreas Preikschat
5dc73b6a65 started work 2011-04-29 13:33:04 +02:00
Tim Bentley
e6f69c01f4 Remove 2 phonon initialisations 2011-04-29 12:21:14 +01:00
Jonathan Corwin
ebf5777a02 Fix bug 773036 2011-04-29 09:58:10 +01:00
Tim Bentley
7908ac4f67 Fix large Service Files 2011-04-29 09:45:36 +01:00
Tim Bentley
45d90db949 Allow leading space in song title 
bzr-revno: 1500
 2011-04-29 08:42:42 +01:00
Raoul Snyman
80b6135c5a Fixed bug #771529, dealing with 1.9.0 databases. 
bzr-revno: 1499
 2011-04-29 09:22:18 +02:00
Tim Bentley
79dc4948fa Head 2011-04-29 08:11:19 +01:00
Tim Bentley
34838aba06 Fix up Presentation and Image Imports 2011-04-29 08:10:22 +01:00
Andreas Preikschat
44b071680c - modified song <-> xml converter to consider [---] and v1a respectively 
bzr-revno: 1498
 2011-04-29 09:08:53 +02:00
Raoul Snyman
19d085bb3c Changed [:] notation to .startswith(). 2011-04-29 08:28:09 +02:00
Tim Bentley
b6b0819a50 fix the strip code 
Fixes: https://launchpad.net/bugs/742636
 2011-04-29 07:15:10 +01:00
Raoul Snyman
7f1db15ab1 Fixed bug #771529, dealing with 1.9.0 databases. 2011-04-29 01:25:28 +02:00
Tim Bentley
e50dc0cfbf head1945 2011-04-28 17:52:46 +01:00
Raoul Snyman
d23e564539 Fixed bug #744515, funny quotes in KJV imported from OSIS. 2011-04-27 18:15:35 +02:00
Raoul Snyman
f732d24f35 Fixed bug #744515, OSIS import fails to import certain words in ESV (at least). 2011-04-27 16:54:27 +02:00
Armin Köhler
2f346ee450 small changes 2011-04-26 20:55:13 +02:00
Tim Bentley
3923c14d0c Head 2011-04-26 19:39:32 +01:00
Armin Köhler
3b99f531f3 small fixes 2011-04-26 20:39:08 +02:00
Armin Köhler
6c23c18db5 HEAD r1490 2011-04-26 20:22:36 +02:00
Jonathan Corwin
4e6c61cc01 Fix issues when importing some OpenSong songs. Bug 759586 
bzr-revno: 1490
Fixes: https://launchpad.net/bugs/759586
 2011-04-26 19:18:14 +01:00
Armin Köhler
d7dc4def53 change name from reimport to upgrade 
fix speed problem while changing the advanced bible
change some "for" loops
 2011-04-26 20:18:13 +02:00
Meinert Jordan
62d55814d2 - fix the recreation of the song order to work with single character verse references 
- rename 'type' variable to avoid the function name (and unify the naming)
- fix: remove unicode string in a translate() call

bzr-revno: 1489
 2011-04-26 19:16:13 +01:00
Jonathan Corwin
a080552081 head 2011-04-25 23:37:58 +01:00
Jonathan Corwin
5bc0c27970 OpenSong fixes bug 759586 2011-04-25 23:15:38 +01:00
Andreas Preikschat
77063381d2 call set_defaults() when logging an error 2011-04-25 09:23:45 +02:00
Andreas Preikschat
c12b4bc28f - improved the song importers by allowing to provide feedback to the user. 
- Do not abort a song import, always try to continue and log which songs could not be imported.
- Clean ups (close files, deduplication, ...)

bzr-revno: 1483
 2011-04-25 09:06:16 +02:00
Tim Bentley
6e9459b63d r1482 2011-04-25 07:44:04 +01:00
Andreas Preikschat
393f25cd88 fixed a bug where a song's author/topic/songbooks might not be saved 2011-04-24 17:36:12 +02:00
Jonathan Corwin
e352635511 Extra location checks for pptview.exe. Remove dll from bzr and change windows build to create it (without debug) 
bzr-revno: 1480
 2011-04-23 12:33:27 +01:00
Andreas Preikschat
ba45d7e113 fixed names; hide/show menu entries when disabeling/enabeling the songs plugin 2011-04-21 19:14:07 +02:00
Armin Köhler
8e1ef8c890 little bug fix 
add check if openlp/bibles/resources directory exists and mkdir if not
 2011-04-21 16:32:04 +02:00
M2j
2582b33768 syntax fix 2011-04-21 11:02:41 +02:00
M2j
8439d1ed4f fix verse order rebuild to handle single character verse references 
rename variable to avoid using the 'type' keyword
 2011-04-21 10:53:48 +02:00
Jonathan Corwin
c0b0c1a82d tabs to spaces *grr at VC++* 2011-04-21 08:35:17 +01:00
Jonathan Corwin
09d101311c head 2011-04-21 08:30:14 +01:00
Jonathan Corwin
f3f1836150 remove pptviewlib.dll and build it via windows-builder.py 2011-04-21 00:21:31 +01:00
Jonathan Corwin
c402e5c075 non-debug version of dll 2011-04-20 19:01:25 +01:00
Andreas Preikschat
8cd3742c87 added textEdit and buttons for better feedback 2011-04-20 19:36:16 +02:00
Armin Köhler
b0b127022c bug fixes 
add some additional Apocrypha books
 2011-04-20 11:00:29 +02:00
Armin Köhler
a0643be598 HEAD r1477 2011-04-20 09:25:53 +02:00
Armin Köhler
81fe6f13e3 add attention picture 2011-04-20 09:25:16 +02:00
Armin Köhler
d508d2f415 HEAD r1477 2011-04-20 09:09:17 +02:00
Armin Köhler
e8c2d7e805 add reimportwizard for older bible databases 2011-04-19 22:25:27 +02:00
Andreas Preikschat
48d0d39a17 ask before creating an error report 
copy not imported files to a folder
 2011-04-19 17:55:36 +02:00
Andreas Preikschat
d45f93b594 return where possible instead of breaking 2011-04-19 13:46:25 +02:00
Andreas Preikschat
3b98cbe0fd fixed OpenSong import 2011-04-19 13:34:04 +02:00
Andreas Preikschat
0fa4bee842 r1476 2011-04-18 21:27:02 +02:00
Andreas Preikschat
974a90a173 no xml raises XMLSyntaxError, that is why this is not needed 2011-04-18 21:24:06 +02:00
Andreas Preikschat
6baefdadce more fixes 2011-04-18 20:57:58 +02:00
Andreas Preikschat
757933c448 clean ups 2011-04-18 20:03:41 +02:00
Andreas Preikschat
16fa78bbe3 fixes 2011-04-18 19:15:41 +02:00
Andreas Preikschat
a530851124 added error logger methods 2011-04-18 18:46:22 +02:00
Andreas Preikschat
0398b93f78 started clean up of song importers 2011-04-17 19:24:28 +02:00
Andreas Preikschat
2d02f3e9a0 2011-04-17 17:47:02 +02:00
Andreas Preikschat
6fb421825c r1471 2011-04-17 15:31:13 +02:00
Tim Bentley
b436c34742 Remove blank line 2011-04-17 13:53:35 +01:00
Tim Bentley
4b3d506379 Allow alerts to be sent but not saved 
Fixes: https://launchpad.net/bugs/763066
 2011-04-17 07:26:55 +01:00
Jonathan Corwin
7080e910c2 Further detection efforts 2011-04-16 22:47:54 +01:00
Jonathan Corwin
91d53b7adc Add the dll too 2011-04-16 17:15:08 +01:00
Jonathan Corwin
596c928881 Untidy the code I tided, so it functions correctly! 2011-04-16 17:14:21 +01:00
Armin Köhler
dabc4415d2 HEAD r1469 2011-04-16 14:29:49 +02:00
Armin Köhler
23c8ea8679 small cleanups 2011-04-16 13:52:20 +02:00
Tim Bentley
f94ae1a9c5 Head r 1469 2011-04-16 12:42:35 +01:00
Tim Bentley
24ec1abb56 more changes 2011-04-16 12:36:20 +01:00
Raoul Snyman
8090adf1bc Made UiStrings a Singleton, and updated all usage of it. 2011-04-15 23:43:59 +02:00
Tim Bentley
7476b37ba4 Refactor the SettingsTab to be more KDE like. 
Sort out the Tabs parentage
Clean up the code paths to stop the Tab being loaded twice at startup.
Clean up the TAB Hide/Unhide code. Removed it and rebuild the UI if required.
Fix Bible Quick text to say right things.

bzr-revno: 1467
Fixes: https://launchpad.net/bugs/739762
 2011-04-15 21:47:19 +01:00
Jonathan Corwin
78b3b04afa Fix blanking between ppt and songs 
Fix stutter when timed powerpoint starts

bzr-revno: 1466
 2011-04-15 21:38:47 +01:00
Andreas Preikschat
84fdb9bb0a - remember the search type which was used before OpenLP was closed and restore it on startup (Bug #746243) 
bzr-revno: 1465
Fixes: https://launchpad.net/bugs/746243
 2011-04-15 22:32:54 +02:00
Tim Bentley
0b35701e30 Head 2011-04-15 18:14:52 +01:00
Andreas Preikschat
b8db8807fd r1464 2011-04-15 18:15:37 +02:00
Andreas Preikschat
a13cf49940 idea to improve song import feedback 2011-04-15 18:01:15 +02:00
Andreas Preikschat
237cabfeff only try to import a database when it is a v1 database, clean ups 2011-04-15 16:10:31 +02:00
Andreas Preikschat
14a2e8e4c2 finished work on restoring current search methods 2011-04-15 14:55:56 +02:00
Jonathan Corwin
4286f6389d Switching from ppt to songs now fine 2011-04-14 22:34:01 +01:00
Andreas Preikschat
77559e0210 started to implement #746243 
Fixes: https://launchpad.net/bugs/746243
 2011-04-14 23:32:21 +02:00
Armin Köhler
e8202924f7 delete unused testament stuff 2011-04-14 22:33:02 +02:00
Armin Köhler
77f43e32b9 small cleanups 2011-04-14 22:18:23 +02:00
Tim Bentley
206cd90639 Finished 2011-04-14 19:30:53 +01:00
Armin Köhler
ac120effc8 HEAD r1460 2011-04-14 10:43:09 +02:00
Armin Köhler
df0d9244eb Changed layout of AlternativeBookNamesDB from sqlalchemy to sqlite3 2011-04-14 10:40:30 +02:00
Jonathan Corwin
d45423569f Head 2011-04-13 23:11:21 +01:00
Jonathan Corwin
5f93ff657e PPT's are getting there. Going from blank ppt to song broken now 2011-04-13 23:10:41 +01:00
Tim Bentley
6454b88a83 Fix Tab parentage 2011-04-13 20:12:47 +01:00
Andreas Preikschat
c62c8cbe9e r1460 2011-04-13 20:53:37 +02:00
Andreas Preikschat
9e88d0bff4 clean ups 2011-04-13 20:53:05 +02:00
Tim Bentley
3a6b1def4a r1460 2011-04-13 19:42:01 +01:00
Andreas Preikschat
747bd13b66 - fixed the advanced bible initialisation 
- append a space to the each bible book name to simplify working with the completer

bzr-revno: 1459
 2011-04-13 20:36:25 +02:00
Tim Bentley
0b4fd3c585 r1458 2011-04-13 19:20:09 +01:00
Andreas Preikschat
606287bda1 reverted change 2011-04-13 20:18:25 +02:00
Andreas Preikschat
1a4ee39767 Finished implementing shortcuts, this includes: 
- changing shortcuts,
- saving/loading them to the config, so that they will be restored
- shourtcuts can now be easily added/removed to the action list

- fixed bug #739779.
- fixed "+" shortcut in the service manager
- fixed bug #758206

bzr-revno: 1458
Fixes: https://launchpad.net/bugs/739779, https://launchpad.net/bugs/758206
 2011-04-13 20:08:37 +02:00
Andreas Preikschat
6082785b3e use map; fixed changing quickBible 2011-04-13 16:28:31 +02:00
Andreas Preikschat
2dc2304a2c fixed advanced bible book initialisation; append a space to completion suggestions 2011-04-13 15:31:23 +02:00
Tim Bentley
5f228a69d1 Minor fixes and Bible Label corrections 2011-04-13 06:12:31 +01:00
Andreas Preikschat
e72e9c8952 fixed bug #744337 
bzr-revno: 1457
Fixes: https://launchpad.net/bugs/744337
 2011-04-12 23:20:21 +02:00
Andreas Preikschat
1968991239 r1456 + resolved conflict 2011-04-12 23:07:08 +02:00
Tim Bentley
20fbe4d28d Settings Cleanup part2 2011-04-12 20:32:17 +01:00
Tim Bentley
e00eaba884 Settings Cleanup part1 2011-04-12 18:45:32 +01:00
Armin Köhler
6c047fc83e changed content of book drop list in advanced search. If a second bible is choosen the combobox only contains books which both bibles (first and second) contains. 
changed autocomplete in quick search. If a second bible is choosen it now suggest only books which both bibles contains.
 2011-04-12 13:33:29 +02:00
Andreas Preikschat
9a1be99781 added comments; same fix for import 2011-04-12 11:55:02 +02:00
Andreas Preikschat
962f038c9b fixed bug #744337 
Fixes: https://launchpad.net/bugs/744337
 2011-04-12 11:37:59 +02:00
Armin Köhler
a1c5ece681 HEAD r1456 2011-04-11 22:57:27 +02:00
Armin Köhler
0ad2d85171 small fix 2011-04-11 22:57:00 +02:00
Tim Bentley
6657c49b04 Fix crash in last change which stopped OpenLP starting 
bzr-revno: 1456
 2011-04-11 21:27:23 +02:00
Tim Bentley
427c2a1843 oops 2011-04-11 19:27:01 +01:00
Andreas Preikschat
f24a8f1365 fixed bug #754484 
bzr-revno: 1455
Fixes: https://launchpad.net/bugs/754484
 2011-04-11 20:16:35 +02:00
Tim Bentley
7ba5497764 Improved version 2011-04-11 19:15:02 +01:00
Andreas Preikschat
b669eded5d - disable/enable the next button if a bible/song importer is not available (http://support.openlp.org/issues/113) 
- fixed song importers being available even though they should not.

bzr-revno: 1454
 2011-04-11 20:15:02 +02:00
Tim Bentley
1f91c4c82d if book 2011-04-11 19:02:24 +01:00
Tim Bentley
ad16ba8ef1 Fix missing value 2011-04-11 18:49:14 +01:00
Armin Köhler
0ca3b07ec7 HEAD r1452 2011-04-11 18:23:13 +02:00
Armin Köhler
7cdf2bc320 small cleanups 2011-04-11 18:21:54 +02:00
Andreas Preikschat
53660fe23f enable/disable next button if bible importer is not available 2011-04-11 17:01:42 +02:00
Andreas Preikschat
073d6c8403 disable 'next button' if importer is not available 2011-04-11 16:34:14 +02:00
Andreas Preikschat
de616b9d1a fixed OpenOffice import being available even if OpenOffice is not installed 2011-04-11 16:17:43 +02:00
Tim Bentley
1882c5366d Review fixes 2011-04-10 19:54:26 +01:00
Andreas Preikschat
9dbd54bf8f more fixes 2011-04-10 20:44:27 +02:00
Tim Bentley
c8d2baff7c Add bible verse layout to Quick tab. 
Not moved to Advanced tab as no real estate.

Fixes: https://launchpad.net/bugs/745218
 2011-04-10 08:32:15 +01:00
Tim Bentley
c55df2583a Remove trailing comma 
Fixes: https://launchpad.net/bugs/748960
 2011-04-10 07:27:23 +01:00