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

10398 Commits

Author SHA1 Message Date
Simon Hanna
4d7ceba301 Merge with trunk 2016-01-10 17:01:43 +01:00
Simon Hanna
e172e2aeb2 Revert Changes 2016-01-10 17:00:05 +01:00
Raoul Snyman
0e8dc032da Release 2.3.2 
bzr-revno: 2602
 2016-01-10 15:15:22 +02:00
Simon Hanna
9525453679 Ignore case when matching verse tags during SongBeamerImport 2016-01-10 01:22:31 +01:00
Simon Hanna
076cc57d39 Fix Song import 2016-01-10 01:17:58 +01:00
Simon Hanna
faff2b7da4 Undo changes to instance variables 2016-01-09 23:35:56 +01:00
s.mehrbrodt@gmail.com
ad37560ecd lp:~sam92/openlp/multiple-songbooks (revision 2607) 
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1226/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1151/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1090/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/928/
Stopping after failure

bzr-revno: 2600
 2016-01-09 19:53:09 +00:00
alisonken1@gmail.com
5a2c3e5abc Ticket 921817 - exception when connecting using PJLink authentication method 
Fix incorrect location data when projector instance created.

Fix typo in getting authenticated connection salt setup.

Move salt/pin/test hash to resources file for multiple tests.

Add test for ticket 921817.

Passes local nosetests3 and pep8.

bzr-revno: 2599
 2016-01-09 19:44:30 +00:00
raoul@snyman.info
d5856f02c6 [Song select] Stop search on viewing a song. 
[Song select] Add a stop button to the SongSelect importer to stop searching.
[Song select] Fix a potential bug where the song author only has 1 name (most commonly seen when the name is 'Unknown')

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/song-select-fixes (revision 2582)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1227/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1152/
[SUCC...

bzr-revno: 2598
 2016-01-09 19:38:10 +00:00
Raoul Snyman
9904ba8da8 Remove media manager stylesheet for now 2016-01-09 21:10:56 +02:00
Raoul Snyman
a4391bd6e3 HEAD 2016-01-09 20:01:49 +02:00
Simon Hanna
44cd766885 Remove code that was added by mistake 2016-01-09 18:22:09 +01:00
Ken Roberts
8fcae33516 resolve merge conflics 2016-01-09 08:59:42 -08:00
simon.hanna@serve-me.info
04e117181d Strip whitespace from title when importing a Songbeamer song. 
bzr-revno: 2596
 2016-01-09 16:59:25 +00:00
Simon Hanna
0416e29a83 Merge with trunk 2016-01-09 17:50:08 +01:00
Simon Hanna
afaf54a142 Fix pep8 errors 2016-01-09 17:26:14 +01:00
Samuel Mehrbrodt
1e5c187552 PEP8 2016-01-09 16:30:27 +01:00
Samuel Mehrbrodt
ad5246fc4a songbookentry -> songbook_entry, mock_song -> song 2016-01-09 16:23:11 +01:00
Samuel Mehrbrodt
fe74a19783 Merge 2016-01-09 16:04:34 +01:00
Tomas Groth
e16a1916b7 forgot to remove debug print 2016-01-09 14:53:59 +01:00
Tomas Groth
e9e845035a pep8 fixes 2016-01-09 10:09:29 +01:00
Simon Hanna
21c6a3ff1c Merge with trunk 2016-01-09 01:07:15 +01:00
Simon Hanna
8ccfde6929 Merge trunk in 2016-01-09 01:03:54 +01:00
Samuel Mehrbrodt
b1c9f6937f Merge branch 2016-01-09 00:08:21 +01:00
Samuel Mehrbrodt
da5790f17f Merge trunk 2016-01-09 00:05:43 +01:00
Tomas Groth
5d6758ffaf trunk 2016-01-08 22:51:40 +01:00
Tomas Groth
a44d70cb0f Fix some tests on windows. 2016-01-08 22:44:22 +01:00
Tomas Groth
43e273c4ed Disable OpenGL in the maindisplay on windows for now. 2016-01-08 22:43:43 +01:00
Tomas Groth
b5270b48a9 Fix for easyslide importer and added test. 2016-01-08 22:42:36 +01:00
Tomas Groth
211f93a921 Made importer list sorted, again. 2016-01-08 20:53:58 +01:00
Tomas Groth
21b8388069 Small cleanup of videopsalm 2016-01-08 20:52:24 +01:00
Tomas Groth
345f135e98 Made sundayplus importer work with python3. Added tests. 2016-01-08 20:51:03 +01:00
Tim Bentley
7fd37c1033 head 2016-01-08 17:44:47 +00:00
s.mehrbrodt@gmail.com
859288f172 Usability improvements 
* When pressing Ctrl+F, select the text in the searchfield to allow immediate typing
* Allow entering the verse order in lowercase (automatically convert to uppercase)

bzr-revno: 2592
Fixes: https://launchpad.net/bugs/1530340, https://launchpad.net/bugs/1530354
 2016-01-08 17:28:47 +00:00
simon.hanna@serve-me.info
e8e553b663 Modify all forms to remove the help button from their status bar. 
I don't think I missed a form. The Wizards remain untouched as the help button works there

bzr-revno: 2591
Fixes: https://launchpad.net/bugs/1490184
 2016-01-08 17:26:39 +00:00
simon.hanna@serve-me.info
a6ef19683d CodecForTr was dropped in Qt5 
The deletion of songs still depended on that.

Just a minor edit to drop the dependency

bzr-revno: 2590
 2016-01-08 17:24:48 +00:00
Tim Bentley
fd3a85a68c head 2016-01-08 17:09:29 +00:00
Samuel Mehrbrodt
69e1660d6c PEP8 2016-01-08 15:05:54 +01:00
Simon Hanna
2c5475e8fa Fix some pep issues in the changed files 2016-01-08 14:47:52 +01:00
Raoul Snyman
4fd53706c6 We still need a db_url. Thanks interface tests! 2016-01-08 00:18:01 +02:00
Samuel Mehrbrodt
ddefceee04 Fix migration for non-sqlite 2016-01-07 23:12:03 +01:00
Simon Hanna
d5780b9f78 update functions that were previously methods to drop the '_' 
rename _child to to_str because of name conflicts
 2016-01-07 14:10:31 +01:00
Raoul Snyman
b1febaa452 Try to make sense of what the projector stuff is supposed to be doing. Found that internally the normal init_url was being called, which was wrong (i.e. it was being called twice, once from a plugin perspective, and then again from the projector perspective). Also, self.db_url was not being applied. 2016-01-06 22:02:39 +02:00
Simon Hanna
11876436a1 Fix deletion of custom slides 2016-01-06 00:58:31 +01:00
Simon Hanna
584a0fda0d Fix the deletion of songs 
This was left out when migrating to Qt 5
 2016-01-05 23:58:04 +01:00
Simon Hanna
5bc13e45e3 Move some static methods out of their classes where it makes sense 2016-01-05 23:28:48 +01:00
Tim Bentley
8df7c3a9ea add tests 2016-01-05 19:32:12 +00:00
Tim Bentley
2bbdf51aca remove extra string 2016-01-05 18:20:47 +00:00
Tim Bentley
3975901e11 Fix search breakage 2016-01-05 18:19:40 +00:00
Samuel Mehrbrodt
860f596dde Only trigger this method by user input 
Else we will have infinite loop by using setText in that method
 2016-01-05 17:10:16 +01:00
Samuel Mehrbrodt
0cd2bbff36 Convert lowercase verse order to uppercase automatically 
Fixes: https://launchpad.net/bugs/1530354
 2016-01-05 16:42:07 +01:00
Samuel Mehrbrodt
c47d1bdca4 Select text in search field when it gains focus 
Fixes: https://launchpad.net/bugs/1530340
 2016-01-05 16:32:49 +01:00
Samuel Mehrbrodt
8780b74342 Use deepcopy instead of copy 2016-01-05 16:17:22 +01:00
Samuel Mehrbrodt
5f2e0ba0ee Add test for deleting columns in a db 2016-01-05 16:14:58 +01:00
Samuel Mehrbrodt
b9a7170cdf Add missing file 2016-01-05 08:57:01 +01:00
Raoul Snyman
6714df645e [song select] Stop search on viewing a song. 2016-01-04 22:28:41 +02:00
Samuel Mehrbrodt
d274b6cb08 Fix exporting OpenLyrics 2016-01-04 20:00:19 +01:00
Samuel Mehrbrodt
245e374171 Fix removing a songbook 2016-01-04 19:50:42 +01:00
Samuel Mehrbrodt
4706ff4af8 Merge trunk 2016-01-04 19:47:03 +01:00
Samuel Mehrbrodt
e4ecc3e763 Fix searching with multiple songbooks 2016-01-04 19:46:00 +01:00
Samuel Mehrbrodt
a106245d8b Display multiple songbooks in the footer 2016-01-04 13:48:47 +01:00
Simon Hanna
c467c321b4 Make methods static that don't need to rely on instance data 2016-01-04 13:21:58 +01:00
Samuel Mehrbrodt
c7d7d16921 PEP8 2016-01-04 13:18:11 +01:00
Samuel Mehrbrodt
d2ab4862b4 Initial support for multiple songbooks 2016-01-04 13:11:24 +01:00
Simon Hanna
4206d11228 Make methods static where possible 2016-01-04 01:18:01 +01:00
Ken Roberts
a023177c4d Fix typo in projector authentication 2016-01-03 00:15:54 -08:00
Simon Hanna
6e9547dc33 Strip whitespace from title tag on import of Songbeamer file 2016-01-03 01:39:53 +01:00
Tim Bentley
607371a6d7 Years move on 
bzr-revno: 2588
 2016-01-02 21:37:40 +00:00
Tim Bentley
3a8b068af8 Year older 2015-12-31 22:46:06 +00:00
Simon Hanna
bf9420a781 Update forms to remove the help button in the statusbar 
Fixes: https://launchpad.net/bugs/1490184
 2015-12-30 16:03:35 +01:00
Simon Hanna
39e48b9fed Show double verses at the end of songs in stageview 
Fixes: https://launchpad.net/bugs/1510572
 2015-12-30 01:09:11 +01:00
Ken Roberts
f864a24f9a Fix typo in pin code hashing 2015-12-29 06:01:22 -08:00
Raoul Snyman
ffbf75bb2f Release 2.3.1 
bzr-revno: 2586
 2015-12-28 22:19:43 +02:00
springermac@gmail.com
b87156e104 "Make sure the main display on Mac OS X stays above the menu bar and dock but still allow the main window to be focused" 
bzr-revno: 2585
 2015-12-28 22:01:34 +02:00
springermac@gmail.com
160550f836 "Change some keyboard shortcuts to use predefined platform dependent shortcuts from Qt. 
Display keyboard shortcuts with modifiers in their platform native form."

bzr-revno: 2584
 2015-12-28 21:35:15 +02:00
second@tgc.dk
0d66ccdae4 "Only import vlc in one place. Make it work with PyInstaller. 
Added bit-install-hint for VLC
Pep8 fixes

"

bzr-revno: 2583
 2015-12-27 23:15:24 +02:00
Andreas Preikschat
eefb496cde HEAD 2015-12-26 22:35:48 +01:00
Andreas Preikschat
18893b3903 Feature: updated vlc.py 2015-12-26 22:34:29 +01:00
Jonathan Springer
e8c1d5adca Clarify comment 2015-12-26 11:08:50 -05:00
Jonathan Springer
ca8600414f Add comments and doc strings 2015-12-26 11:05:41 -05:00
Raoul Snyman
9f939859b7 [Songs Plugin] Add a stop button to the SongSelect importer to stop searching. 2015-12-26 16:33:29 +02:00
Tomas Groth
a6f5251d7e pep8 fixes 2015-12-26 15:30:12 +01:00
Tomas Groth
c5e5f5b889 Added bit-install-hint for VLC 2015-12-26 15:25:09 +01:00
Tomas Groth
b69bb5ce27 trunk 2015-12-26 10:00:48 +01:00
raoul@snyman.info
a898b8e878 A couple of fixes for Debian package requirements: Add jQuery and jQuery Mobile sources; Add Keywords field to desktop file. 
bzr-revno: 2580
 2015-12-24 19:33:33 +00:00
Jonathan Springer
860d630360 Make sure the main display stays above the menu bar and dock but still allow the main window to be focused 2015-12-24 14:26:41 -05:00
Jonathan Springer
86c4acab9c Move adding shortcuts to __default_dict__ into __init__ to avoid having QKeySequences being run before a QApplication is created and crashing 2015-12-23 23:13:50 -05:00
Raoul Snyman
8bf871fe2b [SongSelect] Fix a potential bug where the song author only has 1 name (most commonly seen when the name is 'Unknown') 2015-12-23 20:20:22 +02:00
Jonathan Springer
b858b0b103 merge trunk 2015-12-23 13:01:37 -05:00
Jonathan Springer
9d94845584 Add some missed old shortcuts to their alternate field 2015-12-23 12:58:07 -05:00
Raoul Snyman
322b481b01 [Debian package requirements] Add jQuery and jQuery Mobile sources; Add Keywords field to desktop file 2015-12-23 14:55:30 +02:00
Jonathan Springer
f3108cffe3 Fix exit dialog 2015-12-22 17:20:39 -05:00
springermac@gmail.com
d9a02f6ada Migrate to PyQt5 
bzr-revno: 2576
 2015-12-21 21:27:10 +01:00
Jonathan Springer
bee587fa67 merge trunk 2015-12-20 19:43:38 -05:00
Tomas Groth
89ae1ae738 Added tests for LyriX import. 2015-12-20 20:28:14 +01:00
Tomas Groth
2a4205c0a1 Migrated songselect and songbeamer tests to the SongImportTestHelper based structure. 2015-12-20 17:46:39 +01:00
Tomas Groth
037d3f4f7d Added support for author types in tests + some VideoPsalm fixes 2015-12-18 23:24:20 +01:00
Tomas Groth
6eb17b561d trunk 2015-12-18 21:13:21 +01:00
s.mehrbrodt@gmail.com
12141d6a7e Small fixes: 
* Multiple '%s' in one string need to be named for translations (otherwise the order might get confused)
  * OpenLP 2.0 -> OpenLP 2
  * Change buttons of "Do you really want to close" dialog: Instead of ("No", "Yes") use ("Cancel", "Close OpenLP")
  * Improve exception dialog (mention that description should be english and relevant files should be attached)
  * Do not translate the bug report labels
  * Ignore "E402 module level import not at top of file" pep8 errors (added to ...

bzr-revno: 2574
 2015-12-18 16:48:53 +00:00
Samuel Mehrbrodt
e6978033e9 PEP8 2015-12-17 22:43:49 +01:00
Tomas Groth
6b8178a0b4 Added support of importing VideoPsalm songbooks. 2015-12-17 22:39:52 +01:00
Jonathan Springer
8327346647 merge trunk 2015-12-16 17:25:41 -05:00
Jonathan Springer
445e755895 Change some keyboard shortcuts to use predefined platform dependent shotcuts from Qt. 
Display keyboard shortcuts with modifiers in their platform native form.
 2015-12-16 17:19:50 -05:00
Tomas Groth
e40d8e7126 Added suport for importing songs exported from Lyrix. 2015-12-15 00:00:57 +01:00
Jonathan Springer
0a935bdb90 merge trunk 2015-12-13 19:21:58 -05:00
springermac@gmail.com
4687d71c50 Fix traceback in mediacontroller if a service item had a processor type of automatic 
bzr-revno: 2573
 2015-12-13 22:59:45 +01:00
Tomas Groth
44a523631e Only import vlc in one place. Make it work with PyInstaller. 2015-12-13 21:35:23 +01:00
Samuel Mehrbrodt
0d4541b8dc Merge trunk 2015-12-11 09:33:24 +01:00
Jonathan Springer
ec4ec887ea Fix CheckMedia player not stopping. 
Fix duration of zero on first play.
 2015-12-10 14:03:57 -05:00
Jonathan Springer
fc3c433a21 Fix failing situation by making default_players a list instead of a string 2015-12-10 12:26:08 -05:00
Jonathan Springer
50c0a173eb Add settings migration for phonon to system change 2015-12-07 16:41:15 -05:00
Jonathan Springer
baa59f9321 Forgot to uncomment some code 2015-12-07 16:40:45 -05:00
Jonathan Springer
2e23d9919d Fix system player being used for live-background 2015-12-07 16:40:09 -05:00
Jonathan Springer
ae4858e434 Fix traceback in mediacontroller if a service item had a processor type of automatic 2015-12-07 16:34:10 -05:00
Tim Bentley
9a950ea4ab remove prints 2015-12-05 12:45:51 +00:00
Tim Bentley
dcf97bf93b head 2015-12-05 12:45:01 +00:00
Tim Bentley
ab18eaa051 fixes 2015-12-05 12:44:37 +00:00
Jonathan Springer
3b3c8a35b6 merge trunk 2015-11-29 17:57:37 -05:00
Jonathan Springer
05a653e670 Make sure all generated pixmaps are show at the proper pixel ratio 2015-11-29 17:48:10 -05:00
Tim Bentley
3a31f86e84 Head 2015-11-28 17:05:06 +00:00
Tim Bentley
64867b52a8 Add tests for Presentations 2015-11-28 17:04:46 +00:00
Tim Bentley
1ba8652985 Remove Prints 2015-11-28 15:38:31 +00:00
Tim Bentley
ae1888106d Fix Presentations and Media 2015-11-28 15:37:26 +00:00
Jonathan Springer
c37b033ba0 Fix typo in typo fix 2015-11-23 14:14:58 -05:00
Jonathan Springer
9e349b55f7 Fix typo 2015-11-23 14:04:10 -05:00
Jonathan Springer
7d3ec1ae24 Fix typo 2015-11-23 13:55:56 -05:00
Tim Bentley
fba6767e79 fix old versions 2015-11-22 14:06:54 +00:00
Tim Bentley
78078fb2ed catchup late fixes from 2.2.1 2015-11-21 08:31:17 +00:00
Jonathan Springer
9c46eda524 Enable and fix mimetype filters. 
Make sure file can be played due to lack of mimetype support on Linux and Windows
 2015-11-16 22:59:30 -05:00
Tim Bentley
a5a2b8b02b fix remote call data 2015-11-15 15:13:40 +00:00
Tim Bentley
ae21d548ba fix join 2015-11-08 21:19:54 +00:00
Tim Bentley
97e3eea173 and add tests 2015-11-08 21:07:48 +00:00
Tim Bentley
1ff9413d5a remove s 2015-11-08 20:23:16 +00:00
Tim Bentley
7299aae51c fix code 2015-11-08 20:19:02 +00:00
Jonathan Springer
285e12bc9d PEP8 2015-11-06 20:09:32 -05:00
Jonathan Springer
7af1ca1d49 Migrate to PyQt5 2015-11-06 19:49:40 -05:00
Tim Bentley
19a2deef30 allow local remote views 2015-11-06 21:43:31 +00:00
tim.bentley@gmail.com
7c5add7fac First merge for 2.4. 
A Number of small bug fixes which could be done in 2.2.
Clean up all the 2.0 to 2.2 migrations stuff.
Create a 2.2 to 2.4 migration for settings.
Fix problems with the Tag test so you do not need to restart a branch each time we do a release.

lp:~trb143/openlp/bugs-2_4b (revision 2578)
[SUCCESS] https//ci.openlp.io/job/Branch-01-Pull/1164/
[SUCCESS] https//ci.openlp.io/job/Branch-02-Functional-Tests/1087/
[SUCCESS] https//ci.openlp.io/job/Branch-03-Interface-Tests/1028/...

bzr-revno: 2566
Fixes: https://launchpad.net/bugs/913508, https://launchpad.net/bugs/1168778, https://launchpad.net/bugs/1281100, https://launchpad.net/bugs/1390699, https://launchpad.net/bugs/1390706, https://launchpad.net/bugs/1413217, https://launchpad.net/bugs/1420276, https://launchpad.net/bugs/1439304, https://launchpad.net/bugs/1487014
 2015-11-05 19:05:19 +00:00
tim.bentley@gmail.com
7fb1b03e75 Fix the pep 8 text. 
lp:~trb143/openlp/bug-about (revision 2566)
[SUCCESS] https//ci.openlp.io/job/Branch-01-Pull/1170/
[SUCCESS] https//ci.openlp.io/job/Branch-02-Functional-Tests/1093/
[SUCCESS] https//ci.openlp.io/job/Branch-03-Interface-Tests/1034/
[SUCCESS] https//ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/881/
[SUCCESS] https//ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/477/
[SUCCESS] https//ci.openlp.io/job/Branch-05a-Code_Analysis/597/
[SUCCESS] https//ci.openlp.io/j...

bzr-revno: 2565
 2015-11-04 18:39:01 +00:00
Tim Bentley
a888a4a4aa more missed 2015-11-04 18:37:06 +00:00
Tim Bentley
ba823a9302 fix align 2015-11-02 21:30:11 +00:00
Tim Bentley
6e754ec0a6 fix align 2015-11-02 21:25:38 +00:00
Tim Bentley
20f0d39113 fix align 2015-11-02 21:19:01 +00:00
Tim Bentley
0e4847b5fa head 2015-11-02 20:57:48 +00:00
second@tgc.dk
2cca48f26b Made ZionWorx importer work under python3, fixes bug 1510282. 
Improved WorshipCenter Pro import, support more fields and verse types.

bzr-revno: 2564
Fixes: https://launchpad.net/bugs/1225760, https://launchpad.net/bugs/1510282
 2015-11-02 20:56:27 +00:00
Tim Bentley
d165010aaa minor fix ups 2015-11-02 20:52:22 +00:00
Tim Bentley
89d9d7d73a replace code removed in error 2015-10-28 21:21:05 +00:00
Tomas Groth
05043edb6d Strip trailing whitespaces from verse-string. 2015-10-28 16:43:17 +00:00
Tomas Groth
fc5f2e1018 Improve the worshipcenter pro importer and updated test. 2015-10-27 15:00:11 +00:00
Tomas Groth
d65fa351c3 Added test for zionworx file import. 2015-10-27 13:16:48 +00:00
Tomas Groth
85f034abdd Make zionwork imported work with python3 
Fixes: https://launchpad.net/bugs/1510282
 2015-10-27 12:28:13 +00:00
Andreas Preikschat
bdd8ef820a Feature: update vlc.py from upstream 2015-10-25 23:00:57 +01:00
Tim Bentley
a197e92f7d Missing strings 2015-10-22 17:23:40 +01:00
Tim Bentley
ae8b2d051a Fix about dialog from translators 2015-10-19 22:14:30 +01:00
Tim Bentley
25332a2cb1 Head and 2.2 2015-10-17 12:20:51 +01:00
Tim Bentley
50ceb568e5 Release 2.2 
bzr-revno: 2562
 2015-10-17 12:18:23 +01:00
Tim Bentley
375884b1bb Songs 2015-10-16 17:58:22 +01:00
Tim Bentley
9590de703a plugins again 2015-10-16 17:49:58 +01:00
Tim Bentley
e8f0844339 custom 2015-10-16 17:43:48 +01:00
Tim Bentley
ae1124f8bd bible 2015-10-16 17:38:39 +01:00
Tim Bentley
6b60573740 UI changes 2015-10-16 17:30:13 +01:00
Tim Bentley
742e0c912b Plug item 2015-10-16 17:26:01 +01:00
Tim Bentley
a5b8827c96 Pep 8 2015-10-16 17:17:38 +01:00
Tim Bentley
58124c01d2 Add advanced 2015-10-16 17:09:35 +01:00
second@tgc.dk
48c9389a9f Ignore close event in maindisplay unless it is trigger by OpenLP itself. Ignores ALT+F4 on windows. 
bzr-revno: 2560
 2015-10-15 21:52:13 +01:00
Tim Bentley
925623bf74 core_int 2015-10-15 19:03:57 +01:00
Tim Bentley
ccd604b3be Strings 2015-10-15 19:00:39 +01:00
Tim Bentley
cd4034ebf1 settings 2015-10-15 18:56:17 +01:00
Raoul Snyman
191a739f81 Let's download things once only, instead of 3 times. 2015-10-14 23:19:02 +02:00
Tomas Groth
949bf4a8a7 Ignore close event in maindisplay unless it is trigger by OpenLP itself. Ignores ALT+F4 on windows. 2015-10-13 22:52:33 +01:00
Tomas Groth
62e9663aec Make 2 texts translateable 2015-10-12 13:59:17 +01:00
Tomas Groth
19bd2dd25a pep8 fixes 2015-10-10 21:50:59 +01:00
Tomas Groth
cacb3ca0a0 Fix string that makes it possible to translate the string. 2015-10-03 13:00:44 +01:00
Tomas Groth
05899eb41d Update link to google play store 2015-10-01 12:17:26 +01:00
Tim Bentley
21743e4472 fix length 2015-09-10 21:35:14 +01:00
Tim Bentley
afa4f7b0b2 fix broken trunk 2015-09-10 21:27:17 +01:00
Jonathan Springer
d60a1e8340 Move icons that use build_icon into the function they are needed in so build_icon isn't called when the file is imported avoiding an assert when importing without a QApplication initialized 
Change relative import in bible db to absolute import
Docstring cleanups

bzr-revno: 2554
 2015-09-10 22:11:46 +02:00
Jonathan Springer
85d2cfda6a Move icon creation inside setup_item to avoid generating the icon multiple times 2015-09-09 16:02:19 -04:00
Jonathan Springer
6688d45108 merge trunk 2015-09-08 15:15:43 -04:00
Jonathan Springer
eaf1e7a049 Docstring cleanups 2015-09-08 15:13:59 -04:00
Jonathan Springer
46d4105cb1 Change relative import to absolute import 2015-09-08 15:13:26 -04:00
Jonathan Springer
934a9cb7b3 Move icons that use build_icon into the function they are needed in so build_icon isn't called when the file is imported avoiding an assert when importing without a QApplication initialized 2015-09-08 15:11:09 -04:00
Tomas Groth
1dcbc6837c Make the fix for bug 1473632 work on more linux distros. 2015-09-04 10:01:07 +01:00
Tomas Groth
fec061782b Make sure presentations is closed correctly. Fixes bug 1490996. 
Fixes: https://launchpad.net/bugs/1490996
 2015-09-03 20:21:43 +01:00
Tomas Groth
964af5fc92 Fix crash with VLC on windows with unicode chars in filename. Fixes bug 1491998. 
Fixes: https://launchpad.net/bugs/1491998
 2015-09-03 20:11:08 +01:00
Tomas Groth
0b4cf91c42 Fix traceback on windows in the OO/LO song importer. 
Improved the robustness of the download-webbibles-form. Fixes bug 1489757.
Fix SongPro import. Fixes bug 1489376.
Fix traceback on linux when VLC isn't installed. Fixes bug 1489143.

bzr-revno: 2552
 2015-08-28 22:05:57 +01:00
Jonathan Springer
54a18c68a2 Add ability to open Apple help file from app bundle. Only show offline help if we are running frozen. 
bzr-revno: 2551
 2015-08-28 21:28:35 +02:00
Tomas Groth
579f532aec Removed unnecessary line. 2015-08-28 14:20:17 +01:00
Tomas Groth
c559741143 Forgot to remove debug print... 2015-08-28 13:34:28 +01:00
Tomas Groth
0c24d3705b Fix traceback on windows in the OO/LO song importer. 2015-08-28 11:22:06 +01:00
Tomas Groth
585c319c8b Improved the robustness of the download-webbibles-form. Fixes bug 1489757. 
Fixes: https://launchpad.net/bugs/1489757
 2015-08-28 09:50:13 +01:00
Tomas Groth
4488fedfdc Fix SongPro import. Fixes bug 1489376. 
Fixes: https://launchpad.net/bugs/1489376
 2015-08-27 12:24:24 +01:00
Samuel Mehrbrodt
7477f781ef Close -> Exit (as in the menu) 2015-08-27 10:15:51 +02:00
Tomas Groth
f98c35df94 Fix traceback on linux when VLC isn't installed. Fixes bug 1489143. 
Fixes: https://launchpad.net/bugs/1489143
 2015-08-26 22:37:23 +01:00
Samuel Mehrbrodt
813cbaf2ad PEP8 2015-08-26 10:40:09 +02:00
Samuel Mehrbrodt
8d791a51f4 Better wording for close dialog 2015-08-26 10:37:16 +02:00
Samuel Mehrbrodt
2df4dad39c Improve exception dialog 2015-08-26 10:20:55 +02:00
Samuel Mehrbrodt
0c9f23a875 PEP8 2015-08-26 09:59:27 +02:00
Samuel Mehrbrodt
eac92737a2 Better strings for translation 2015-08-26 09:51:37 +02:00
Samuel Mehrbrodt
fce9a1e1f2 OpenLP 2.0 -> OpenLP 2 2015-08-26 09:26:19 +02:00