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

6374 Commits

Author SHA1 Message Date
Raoul Snyman
9904ba8da8 Remove media manager stylesheet for now 2016-01-09 21:10:56 +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
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
fe74a19783 Merge 2016-01-09 16:04:34 +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
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
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
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
5bc13e45e3 Move some static methods out of their classes where it makes sense 2016-01-05 23:28:48 +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
Samuel Mehrbrodt
4706ff4af8 Merge trunk 2016-01-04 19:47:03 +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
Ken Roberts
a023177c4d Fix typo in projector authentication 2016-01-03 00:15:54 -08:00
Tim Bentley
4ef5126a22 head 2016-01-01 20:39:54 +00:00
Tim Bentley
9c2b472ee8 prints 2016-01-01 20:39:26 +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
Ken Roberts
f864a24f9a Fix typo in pin code hashing 2015-12-29 06:01:22 -08: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
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
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
Tim Bentley
fe0cdc70fb cleanup 2015-12-23 22:19:28 +00: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
Tim Bentley
3a05159871 head 2015-12-23 06:06:50 +00:00
Tim Bentley
3791eea777 clean ups 2015-12-23 06:06:25 +00:00
Jonathan Springer
f3108cffe3 Fix exit dialog 2015-12-22 17:20:39 -05:00
Tim Bentley
e90fb00ddd head 2015-12-22 19:07:51 +00:00
Jonathan Springer
bee587fa67 merge trunk 2015-12-20 19:43:38 -05:00
Tim Bentley
15f1b61fd4 simplified 2015-12-20 21:30:47 +00:00
Tim Bentley
2ef0b3b210 remove debugs 2015-12-20 18:00:38 +00:00
Tim Bentley
b728dddaa4 remove slidecontroller 2015-12-20 17:58:24 +00:00
Tim Bentley
8de95e34a0 first merge 2015-12-20 17:24:45 +00: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
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
Jonathan Springer
0a935bdb90 merge trunk 2015-12-13 19:21:58 -05: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
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
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
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
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@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
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
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
Andreas Preikschat
bdd8ef820a Feature: update vlc.py from upstream 2015-10-25 23:00:57 +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
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
Tim Bentley
21743e4472 fix length 2015-09-10 21:35:14 +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
6688d45108 merge trunk 2015-09-08 15:15:43 -04:00
Jonathan Springer
eaf1e7a049 Docstring cleanups 2015-09-08 15:13:59 -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
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
Jonathan Springer
59a04e982f Add ability to open Apple help file from app bundle. 
Only show offline help if we are running frozen.
 2015-08-24 14:19:30 -04:00
Tomas Groth
5940a77b20 Move call to XInitThreads for linux-vlc setup to module-load. Fixes bug 1473632. 
Fixes: https://launchpad.net/bugs/1473632
 2015-07-20 21:33:58 +01:00
Tomas Groth
aea6c424fc Check mediaplayer is loaded before trying to use it when blanking. Fixes bug 1465390. 
Fixes: https://launchpad.net/bugs/1465390
 2015-06-15 21:29:34 +01:00
Tomas Groth
bdecfbf3e9 Fix path of presentation thumbnail when loading from service files. Fixes bug 1463703. 
Fixes: https://launchpad.net/bugs/1463703
 2015-06-10 17:14:23 +02:00
Tomas Groth
60d45d8b8b Fix log-traceback when trying to remove servicemanager files before eg. powerpoint has closed the files. 2015-06-08 20:34:22 +01:00
Tomas Groth
e3be044d5d Improve network exception handling, again. 2015-06-08 20:32:46 +01:00
Tomas Groth
7eb506fae8 Improve network exception handling. 2015-06-07 21:56:06 +01:00
Tim Bentley
b7d0fc8ffc Fix focus and test 2015-05-31 07:40:37 +01:00
Raoul Snyman
bd92e6a7d3 Fix a left-over from the VLC 2.2 fix; fix a problem when video player from the UI is None 
bzr-revno: 2541
 2015-05-30 13:11:32 +01:00
Tomas Groth
623a0974a5 For worshipassistant add a default verse-id for lyrics to use if none is given. Fixes bug 1458056. 
Don't import setting keys that does not exists. Fixes bug 1458672.
When going from a theme-blanked item to item which doesn't support theme-blanking, switch to black-blank.
Only use transitions if we are changing slide. Fixes bug 1449064.
Make translation of 'Advanced' specific to the bible plugin.
Many PowerPoint fixes/improvements:
 * Make screenshots for main webview, even on single screen setup. Fixes bug 1449041.
 * Implement workaround for unblanking bug in PowerPoint 2010.
 * Open PowerPoint hidden so the main application window isn't visible.
 * Added support for odp for PowerPoint 2007 and newer.
 * Added support for Powerpoint events, which is used to update the slidecontroller if OpenLP is not in focus.
 * Minimized the flashing of the PowerPoint presentation window in the taskbar.

bzr-revno: 2539
 2015-05-29 17:22:22 +01:00
Raoul Snyman
5bcdc85ce1 Fix a left-over from the VLC 2.2 fix; fix a problem when video player from the UI is None 2015-05-28 22:38:43 +02:00
Jonathan Springer
aa97feb064 Fix bug 1395848 by setting the WindowStaysOnTop window flag when the MainDisplay is not on the primary screen. 
bzr-revno: 2538
 2015-05-28 00:06:22 +02:00
Tomas Groth
a5cebb73c4 trunk 2015-05-25 21:58:05 +01:00
Tomas Groth
c3e567969b Don't import setting keys that does not exists. Fixes bug 1458672. 
Fixes: https://launchpad.net/bugs/1458672
 2015-05-25 21:43:37 +01:00
Tim Bentley
54dbafed8e Fix issue with android where tagging is wrong is the render takes too long 2015-05-25 20:31:12 +01:00
Jonathan Springer
236dba77e8 Fix bug 1395848 by setting the WindowStaysOnTop window flag when the MainDisplay is not on the primary screen. 2015-05-21 23:15:15 -04:00
Tomas Groth
c9a8f07a37 Only use transitions if we are changing slide. Fixes bug 1449064. 
Fixes: https://launchpad.net/bugs/1449064
 2015-05-01 22:17:59 +01:00
Tomas Groth
73ae9a2643 Make screenshots for main webview, even on single screen setup. Fixes bug 1449041. 
Fixes: https://launchpad.net/bugs/1449041
 2015-05-01 16:21:59 +02:00
Tomas Groth
d044821483 pep8 fixes 2015-04-30 14:48:45 +02:00
Tomas Groth
54fbaf3a4f When going from a theme-blanked item to item which doesn't support theme-blanking, switch to black-blank. 2015-04-30 14:37:13 +02:00
Raoul Snyman
fda7ab562c Add some tests 2015-04-28 16:01:09 +02:00
Raoul Snyman
07b7d9b6a9 Fix a problem with VLC 2.2 on Mac OS X, where VLC could not find it's plugins, and would bomb out. 
bzr-revno: 2533
 2015-04-27 17:02:16 +01:00
Raoul Snyman
217b731a95 No need to figure out if VLC is available if we've loaded the module before 2015-04-27 11:24:02 +02:00
Raoul Snyman
ab54b04468 Fix VLC 2.2 on OS X which cannot be loaded due to an incorrect plugin path 2015-04-25 16:32:09 +02:00
Jonathan Springer
a162aa50fa merge trunk 2015-04-24 17:00:16 -04:00
Tomas Groth
f8114d0b97 Disable button for replacing live background if the webkit player is not available. 2015-04-21 22:49:22 +01:00
Tomas Groth
cd7c4f6197 Make sure we always add a blank line between verses. Fixes bug 1439311. 
Fixes: https://launchpad.net/bugs/1439311
 2015-04-11 23:13:30 +01:00
Tomas Groth
6f5a139329 Normalize file path to OS standard after drag-and-drop. Fixes bug 1440571. 
Fixes: https://launchpad.net/bugs/1440571
 2015-04-07 23:20:30 +01:00
Tomas Groth
cff0b412f8 Mark a custom slide edited from preview as coming from plugin. Fixes bug 1439671. 
Use html.escape instead of the deprecated cgi.escape
Fix support for special characters in theme names. Fixes bug 1438563.
Fix another case of traceback when playing media with no players available/enabled (bug 1422761).

bzr-revno: 2526
Fixes: https://launchpad.net/bugs/1439671, https://launchpad.net/bugs/1438563, https://launchpad.net/bugs/1422761
 2015-04-03 20:31:19 +02:00
Tomas Groth
589bc98bec Use html.escape instead of the deprecated cgi.escape 2015-04-02 21:32:20 +01:00
Tomas Groth
f8b575065a pep8 fix 2015-04-02 21:29:43 +01:00
Tomas Groth
d2301e016e improved logging 2015-04-02 13:50:50 +01:00
Tomas Groth
335c804e8f Fix support for special characters in theme names. Fixes bug 1438563. 
Fixes: https://launchpad.net/bugs/1438563
 2015-04-02 10:04:56 +01:00
Jonathan Springer
16425b05a0 Fix bug 1247661 by restoring to main window when the dock icon is clicked 2015-03-24 18:33:57 -04:00
Tomas Groth
25f6fe0a59 Fix another case of bug 1422761. 
Fixes: https://launchpad.net/bugs/1422761
 2015-03-20 17:03:45 +00:00