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

6542 Commits

Author SHA1 Message Date
Tim Bentley
5dd4b8e386 Pep8 2016-04-04 21:27:33 +01:00
Tim Bentley
85587ce2f3 uno commands 2016-04-04 21:14:04 +01:00
Tim Bentley
98a021b89f Pep8 2016-04-04 21:03:19 +01:00
Tim Bentley
dffba47b44 move version checker 2016-04-04 20:53:54 +01:00
Tim Bentley
a0bfc7d069 move methods 2016-04-03 20:44:09 +01:00
Tim Bentley
6fa0f07e32 head 2016-04-03 20:07:09 +01:00
Tim Bentley
d7e2e0e839 remove import 2016-04-03 20:06:48 +01:00
ian@knightly.xyz
a0e004b68f Adds the ability to choose a maximum height for non-text slides in the list-preview-widget in slide controllers. See branch description for further details. May require sanity check. 
Changes since last proposal:
- Fixed copy-paste error in comments
- Shifted common test code into setup function as recommended.
- Testing max height doesn't exceed settings spin-box (as requested) not changed as any positive int is valid & spin-box values are arbitrary. (See reply to diff comments on r2630 for ...

bzr-revno: 2636
Fixes: https://launchpad.net/bugs/891860, https://launchpad.net/bugs/1550856
 2016-04-03 16:55:55 +01:00
Tim Bentley
7424d6be8b More refactoring 
bzr-revno: 2635
 2016-04-03 16:54:13 +01:00
Ken Roberts
6bca1fc455 Fix decode() string error in about text - fix qt try/except error in projector 2016-04-01 20:04:15 -07:00
Tim Bentley
ec30c560a7 move tests and code 2016-04-01 18:28:40 +01:00
Tim Bentley
dbb07db257 fix PEP8 2016-04-01 18:15:45 +01:00
Tim Bentley
0678155400 fix PEP8 2016-04-01 18:09:47 +01:00
Tim Bentley
203c7b9dd8 move historycombo 2016-04-01 17:56:54 +01:00
suutari-olli
36d15615d1 - Changed comments related to "default image" to match "logo". 
- Removed one default_
 2016-04-01 05:32:36 +03:00
suutari-olli
4f5bb4f5eb Added empty newline to the end of generaltab.py 2016-04-01 04:45:46 +03:00
suutari-olli
eee1301f4e In this branch: 
- Removed old "Default image" settings from advanced tab.
- Removed related imports and functions.
- Renamed def on_background_color_changed to on_logo_background_color_changed
 2016-04-01 04:11:28 +03:00
suutari-olli
79724872fd In this branch: 
- Renamed "Default image" and related settings to "Logo" etc.
- Moved these settings to General tab from Advanced tab
- Re-wired these settings to code functions

To do:

- Remove these from advanced tab.
- Verify tests still work
 2016-04-01 03:54:33 +03:00
suutari-olli
3aa7851c7d Added two tests for this. 
The other to check if visibility is changed to "True" for logo, the other for the opposite.

To do:

How to name this new setting? / Old "Default image" settings.
 2016-03-31 23:35:04 +03:00
Tim Bentley
cd239fe802 fixes 2016-03-31 17:47:42 +01:00
Tim Bentley
4362ff63f8 language manager 2016-03-31 17:42:42 +01:00
Tim Bentley
ba6d66497c actions 2016-03-31 17:34:22 +01:00
Tim Bentley
3693cf331d fix string in natural sort and move db 2016-03-31 17:14:28 +01:00
suutari-olli
005cf54116 Removed duplicate check for this setting from def setup, 
realized it is overridden by later check anyways.
 2016-03-30 20:33:56 +03:00
suutari-olli
16077a855f Removed # which was added in search for solution from: 
Registry().execute('live_display_active')
(This was noticed while looking at the diff)
 2016-03-30 20:04:10 +03:00
suutari-olli
19862a69a3 Merged to trunk. 2016-03-30 19:54:20 +03:00
suutari-olli
a95f72c93a Now using self.setVisible(False) instead of transparency for hiding the logo. 
Renamed the visual text for the setting to: "Don't show Logo"
 2016-03-30 19:50:12 +03:00
Tim Bentley
d11cb1d622 Only set tab_visited when the tab is visited and not on loading 2016-03-29 17:55:33 +01:00
Tim Bentley
be8bdcf1f3 remove print 2016-03-29 17:00:55 +01:00
Tim Bentley
2433efdfd0 Update themes in service manager when themes are set in settings 2016-03-29 16:45:59 +01:00
Tomas Groth
12a8481e14 Use standard button text in the FTW, if possible. Fixes bug 1554554. 
Fixes: https://launchpad.net/bugs/1554554
 2016-03-23 12:55:54 +01:00
Tomas Groth
dc0924fbbb Translation fixes. Fixes bug 1545072 
Fixes: https://launchpad.net/bugs/1545072
 2016-03-22 22:11:12 +01:00
Tomas Groth
c9a8e2cf59 trunk 2016-03-22 15:14:16 +01:00
Ian Knight
80a8abf4d0 Merged changes from trunk 2016-03-21 01:30:15 +10:30
Ian Knight
4980465f98 Cleaned pep8 errors 2016-03-21 01:14:00 +10:30
suutari-olli
dd70dbe515 Changed word order from "show nothing default" to "default show nothing" to better match other settings in the set. 2016-03-16 19:37:54 +02:00
ian@knightly.xyz
dc6a9b6d86 Added single click preview for service manager (see attached blueprint) 
- Checkbox appears in advanced settings tab.
- When enabled, items will be sent to preview when clicked in service manager, but NOT if double-clicked.

bzr-revno: 2629
Fixes: https://launchpad.net/bugs/1536809
 2016-03-15 22:34:58 +01:00
second@tgc.dk
6738d936cd Fix slide order change when splitting custom slides. Fixes bug 1554748. 
Fix EasyWorship import issues with missing verses and traceback on unknown chars.
Fix traceback in the bug-report dialog. Fixes bug 1554428.
Fix weird test bug in test_pluginmanager.py.
Pep8 fixes

bzr-revno: 2628
Fixes: https://launchpad.net/bugs/1547234, https://launchpad.net/bugs/1553922, https://launchpad.net/bugs/1554428, https://launchpad.net/bugs/1554748
 2016-03-15 22:32:10 +01:00
suutari-olli
432c7a6380 Visual ident pep8 fix. 
If there are other's after this, they are part of trunk?
 2016-03-15 22:12:37 +02:00
suutari-olli
a73c42ac34 Added: "Do not show anything on startup" as an option for disabling default image and background. 
(By default OpenLP logo and white bg color are shown on primary Live monitor
(At the moment it's only possible to change the color/image but not disable them.)
 2016-03-15 21:39:51 +02:00
Tomas Groth
4cea5e8b43 Fix traceback in the bug-report dialog. Fixes bug 1554428. 
Fixes: https://launchpad.net/bugs/1554428
 2016-03-12 22:22:21 +01:00
Tim Bentley
0c2c869dbf Fix more bugs 2016-03-08 17:49:57 +00:00
Tim Bentley
4e39f71f4e remove crash systemplayer 2016-03-07 21:55:13 +00:00
Tim Bentley
7308a97c29 remove crash 2016-03-07 21:52:09 +00:00
Ian Knight
68460f5e3f Added smart scaling when manually resized, integrated with settings dialog, fixed some pep8 errors 2016-03-06 03:11:32 +10:30
Ken Roberts
4a74c9ce68 Projector - String standards 2016-03-03 09:53:29 -08:00
second@tgc.dk
0afada2129 Another attempt to fully fix bug 1531319. 
bzr-revno: 2625
 2016-02-29 21:57:10 +01:00
Ian Knight
1e94cd92e9 Split auto-scroll & height cap features to new branch 2016-02-29 15:31:05 +10:30
alisonken1@gmail.com
ec5a362ea5 - Fix projector manager receiving an invalid class response on initial connection 
- Fix string encoding to ascii when sending request to projector

--------------------------------
lp:~alisonken1/openlp/bug-1550891 (revision 2624)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1301/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1223/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1162/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/997/...

bzr-revno: 2624
Fixes: https://launchpad.net/bugs/1550891
 2016-02-28 20:41:25 +00:00
suutari.olli@gmail.com
b490772f8b This branch fixes the issue where Blank to desktop, 
black and theme won't work if Live screen has stolen focus.

Examples of this happening: Clicking anything in the live window or certain single screen mode scenarios.

This was achieved by adding 3 lines of code, one for each method under the definition of methods available in this screen mode.

I also explained this in a comment I inserted to the code.

Since the only way to screw this seems to be by removing these additions,
a test for the...

bzr-revno: 2623
 2016-02-28 20:33:19 +00:00
Ken Roberts
7c23941f35 Fix sending unicode string when expecting ascii (binary) data 2016-02-28 04:35:15 -08:00
Ken Roberts
9774618d37 Bugfix 1550891 - non-standard class reply from projector 2016-02-28 02:26:38 -08:00
Tim Bentley
af51d10fad fix up some tests 2016-02-27 14:03:52 +00:00
suutari-olli
e3c4f53dc4 Seems like I added one empty row at some point... 
Removing it...
 2016-02-27 00:03:32 +02:00
suutari-olli
6ef2cc8b59 Added test, fixed comment. 2016-02-26 23:28:01 +02:00
Tim Bentley
071dfa6299 remove prints 2016-02-26 18:17:39 +00:00
Tim Bentley
5f5d69d4d2 Getting there many bits work 2016-02-26 16:00:04 +00:00
Simon Hanna
1d51939308 Do not show version numbers for plugins 2016-02-22 15:51:58 +01:00
Simon Hanna
9356d990ac Show plugin information even if the plugin is disabled 2016-02-22 15:51:11 +01:00
Simon Hanna
9ced5436ba Fix exception caused when plugins are disabled 2016-02-22 15:34:00 +01:00
Simon Hanna
5ba53fa097 Merge trunk in 2016-02-22 15:25:22 +01:00
Tim Bentley
9eed19ee50 fix missing bits from revert 2016-02-21 09:29:16 +00:00
Tim Bentley
72a180716b revert changes 2016-02-21 09:23:09 +00:00
Tomas Groth
7c43ae6b88 Another attempt to fully fix bug 1531319, 
Fixes: https://launchpad.net/bugs/1531319
 2016-02-20 22:42:31 +01:00
Tim Bentley
334eb6c8c5 fix missing resize) 2016-02-20 11:51:58 +00:00
Tim Bentley
3e522186ec Displays work now 2016-02-19 18:59:39 +00:00
Tim Bentley
cdbf6ac9ea Fix timers 2016-02-16 21:14:38 +00:00
Tim Bentley
30dc055532 Video backgrounds work 2016-02-14 17:53:16 +00:00
Tim Bentley
89f6926a71 Add replacement to context 2016-02-14 16:54:31 +00:00
Tim Bentley
583da17777 pep8 comment fixes 2016-02-14 16:14:48 +00:00
Tim Bentley
19b6716bea More cleanups comments and flash removal 2016-02-14 15:43:54 +00:00
Tim Bentley
360d1155f1 Remove flash 2016-02-14 08:38:21 +00:00
Tim Bentley
7a72fe84df more updates and cleanups 2016-02-14 08:26:04 +00:00
Tim Bentley
a6b5b36502 More cleanups 2016-02-13 22:10:11 +00:00
Tim Bentley
ea40173f9b new start 2016-02-13 13:13:00 +00:00
Tim Bentley
108ed79e7b fix up 2016-02-13 12:48:36 +00:00
Tomas Groth
fdb53f919f Fix for force-updating display on windows when using themes without transitions. 2016-02-09 22:01:20 +01:00
second@tgc.dk
8d083af742 More workarounds for bug 1531319. 
If presentation loading fails, set slidenumber to 0 to avoid a later error. Fixes bug 1490508. Added test.
Use the chosen encoding when importing from easyworship db.

bzr-revno: 2616
Fixes: https://launchpad.net/bugs/1490508
 2016-02-06 21:53:23 +01:00
Tomas Groth
17d6f13ac0 More workarounds for bug 1531319. 
Fixes: https://launchpad.net/bugs/1531319
 2016-02-06 20:43:54 +01:00
Raoul Snyman
0dd29893da More tests 2016-02-04 23:25:06 +02:00
Raoul Snyman
5928fde62e Fix a weird issue with the 'clear alternate shortcut' button clearing both 2016-02-02 23:56:03 +02:00
Raoul Snyman
f6c2a5b410 Fix bug #1533246 
Fixes: https://launchpad.net/bugs/1533246
 2016-02-02 23:55:37 +02:00
Raoul Snyman
b2e54a4baa Downgrade VLC.py to a version that is in use 2016-01-25 20:14:03 +02:00
Tim Bentley
81c9f5f1ca more simplifications 2016-01-24 10:13:33 +00:00
suutari-olli
dee737e3fb Added proper comment 2016-01-23 17:28:16 +02:00
Tomas Groth
fb04813088 remove debug prints 2016-01-23 13:38:08 +01:00
Tim Bentley
4aebe441e7 cleanups 2016-01-23 12:11:34 +00:00
Tim Bentley
06ed550c8f head and Mediainfo 2016-01-23 10:09:36 +00:00
Tim Bentley
29dd834816 debug 2016-01-23 10:07:59 +00:00
Tomas Groth
c34bfd6d95 Adjusted string 2016-01-23 09:15:37 +01:00
Tomas Groth
4594fcefbd pep fixes 2016-01-22 22:33:20 +01:00
Tomas Groth
4bef5f72f2 trunk 2016-01-22 22:30:26 +01:00
Tomas Groth
e593d77e14 Fix some broken tests that was not being used due to naming. 2016-01-22 22:26:25 +01:00
Tim Bentley
4a0330f126 Add wrapper for mediainfo 2016-01-22 20:12:46 +00:00
Tomas Groth
9415018899 Disable OpenGL on linux (too). Fixes bug 1535332. 
Fixes: https://launchpad.net/bugs/1535332
 2016-01-22 20:52:50 +01:00
suutari-olli
5f513a9a1f This simple fix should make blank to desktop, black and theme available during single screen mode 2016-01-22 19:06:35 +02:00
Tomas Groth
7d677025b5 Disable OpenGL on windows to make webkit player work. 2016-01-21 22:18:56 +01:00
Tomas Groth
85c329fb26 Workaround for windows display not updating, webkit player does not work yet. Partial fix for bug 1531319. 
Fixes: https://launchpad.net/bugs/1531319
 2016-01-20 23:25:40 +01:00
Ian Knight
fbd3f9f3dd Corrected pep8 fails 2016-01-19 17:32:47 +10:30
Ian Knight
7f8e19adca Prevented Single Click Preview when a double click had triggered & Updated tests for this 2016-01-19 17:22:23 +10:30
Ian Knight
960fbb8865 Implemented Better Preview for Service Manager Blueprint 2016-01-18 03:16:37 +10:30
s.mehrbrodt@gmail.com
ddfed93fbe "* Fix importing older song dbs by migrating them first 
* Fix comparing songs without title

lp:~sam92/openlp/bug-1533081 (revision 2615)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1260/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1184/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1123/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/959/
Stopping after failure"

bzr-revno: 2609
Fixes: https://launchpad.net/bugs/1533081, https://launchpad.net/bugs/1534306
 2016-01-16 22:13:41 +02:00
Tomas Groth
6b23a2224f Fix playback of linked audio. Fixes bug 1533280. 
Fixes: https://launchpad.net/bugs/1533280
 2016-01-15 21:22:08 +01:00
Tomas Groth
e91520fa60 pep8 fixes 2016-01-13 22:00:46 +01:00
Tomas Groth
6f9056c935 trunk 2016-01-12 22:36:32 +01:00
Tomas Groth
3f3078c33a Fix traceback when expanding and collapsing songs. 
Fixes: https://launchpad.net/bugs/1532169
 2016-01-12 22:29:20 +01:00
Tomas Groth
e3d7e436f1 In _process_item, postpone check for _reset_blank, since the service_item can change type while being execute (Pdf->Image). For the same reason always use the serviceitem that might have been converted. 2016-01-12 21:17:15 +01:00
simon.hanna@serve-me.info
98258bc753 Reenable the stylesheet 
remove the icons from mediamanager so that display in plasma works

bzr-revno: 2605
Fixes: https://launchpad.net/bugs/1404669
 2016-01-11 21:57:20 +00:00
Tomas Groth
c8fd1b8338 Fix taking screenshots while using powerpoint or impress. 
Fixes: https://launchpad.net/bugs/1532938
 2016-01-11 22:13:57 +01:00
Simon Hanna
9d8c757d0d Re-enable the stylesheet, remove icon in mediamanager to fix rendering in plasma 2016-01-10 19:01:36 +01:00
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
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
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
Simon Hanna
6d0e006b09 Change Combobox to Checkbox for plugin states 2016-01-03 14:03:29 +01:00
Ken Roberts
a023177c4d Fix typo in projector authentication 2016-01-03 00:15:54 -08:00
Tomas Groth
e562571aa9 trunk 2016-01-03 00:13:48 +01: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
Tomas Groth
5bbea1685d trunk with qt5 2015-12-22 14:13:17 +01:00
Tomas Groth
f32c7823df First stab at a pysword based SWORD-importer. 2015-12-22 14:04:01 +01: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