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

4937 Commits

Author SHA1 Message Date
suutari-olli bb43a6b417 Merged trunk on 13.4.16 2016-04-13 00:12:49 +03:00
suutari-olli 010c7b6fb4 Merge to trunk on 13.4.16 2016-04-13 00:01:58 +03:00
Tim Bentley 01762951d0 head 2016-04-12 21:26:43 +01:00
Tomas Groth 9628339b4c trunk 2016-04-12 22:05:58 +02:00
suutari-olli 42b72ab3a6 Added back the last missing * 2016-04-12 06:08:47 +03:00
suutari-olli 4af785bf1d - Re-did some of the changes. 
- Fixed Powerpoint to PowerPoint in presentation controllers and one error.
 2016-04-12 05:29:10 +03:00
suutari-olli 6273cc911d Merged trunk on 11.4.2016 2016-04-11 00:17:03 +03:00
Tomas Groth 2aeb7f9e6f trunk 2016-04-10 22:24:07 +02:00
suutari-olli dafbc3f054 In this commit: 
- Removed version number from main window name
- Removed version number from remote window names
- Reworked the traceback error message (New text, added margin to right)
 2016-04-10 02:51:41 +03:00
suutari-olli f57f335b0f Fixed the broken import statements. 2016-04-08 18:03:05 +03:00
suutari-olli 728ffd7205 Merge to trunk on 8.4.16 
You will need to 
manually delete the __pycache__ directory inside openlp_core_utils.
run "bzr resolve openlp_core_utils"
then you will be allowed to commit the changes.

also resolved conflict for advancedtab.py
 2016-04-08 16:46:45 +03:00
Tim Bentley 483c12d779 vlc tests pass 2016-04-07 19:14:10 +01:00
Tim Bentley a41d86cb7c Head 2016-04-06 06:08:44 +01:00
Tim Bentley 6729ea9d19 move file 2016-04-05 19:33:50 +01:00
Tim Bentley 3e8e72be85 move methods and clean up 2016-04-05 18:30:20 +01:00
Tim Bentley b7da0be71e move method 2016-04-05 18:10:51 +01:00
Tim Bentley f19280c88d move method 2016-04-05 17:58:29 +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
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
suutari-olli 1739492520 This branch includes the following UI string changes: 
These changes mainly take place on mainwindow.py but few other strings are changed as well.

Media Manager, Projector Manager, Service Manager, Theme Manager, Preview Panel and Live Panel. 
have been renamed to:  ”Library, Projectors, Service, Themes, Preview and Live."
Tooltips/texts for these have been changed.

In "Configurate OpenLP":

- Changed typing for all labels to lowercase 
(Expect for starting videos automatically, that string may needs to be changed once bug related to that is fixed)

- Removed "Manager" from some strings since it's no longer used.

- Added dots to various tooltips / descriptions.

In advanced tab: Number of recent files to display: has been changed to Number of recent Service files to display:
 2016-04-03 18:54:39 +03:00
suutari-olli e8e893c842 Changed Live to live (lowercaps) for controlling this setting to match other settings. 2016-04-03 14:26:48 +03:00
Tim Bentley ec30c560a7 move tests and code 2016-04-01 18:28:40 +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 12b63f8e71 Merged to trunk (1.4.2016) 2016-04-01 16:10:23 +03: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 ba6d66497c actions 2016-03-31 17:34:22 +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
suutari-olli 4a6b5b7cc4 In this merge: 
- Moved setting for controlling unblanking behaviour to General options tab.
- Removed it from  advanced tab
- Changed default setting to "no"
- Looped playback (once or to end) is now linked to this setting
- Unblanking slides on click -.- no longer unblanks display when sending new items live if
  "Unblank display when sending new item to live" is not enabled. -.-
- Doubleclicking preview -.- ^^
- Improved some comments

To do:
Test(s)?
 2016-03-15 20:37:55 +02:00
suutari-olli ddae0b4247 Removed duplicate: self.on_hide_display(True) 
(Was trying to create/test a test but failed and forgot to take it away)
 2016-03-15 16:11:24 +02:00
suutari-olli 0c23135304 - Removed Whites space before (self, item) on row 789, how did it get there in the first place? 2016-03-15 11:39:54 +02:00
suutari-olli 546ed56823 - If display is blanked when song in Live is edited, now re-blanks display after updating the song. (Improved fix) 
- Improved un-blanking when starting Loop, pressing "Stop loop" no longer unblanks display.
- Improved comment(s)

To do:
- Write test(s)
 2016-03-14 04:11:13 +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
suutari-olli 43df6739b0 Now including fix for bug: 
https://bugs.launchpad.net/openlp/+bug/1531691
 2016-03-03 04:49:04 +02:00
suutari-olli 87b9ae3600 Added "Unblank display when changing slide in Live" to advanced tab. 
Added automatic unblanking when starting loopped playback.

Now, only the tests remain!
 2016-03-03 02:07:52 +02:00
suutari-olli 770843e0c6 This branch adds the functionality of un-blanking display from: 
blank to desktop, black and theme by clicking slides in "Live" panel.

This also adds this functionality for:
- Starting loops
- Go to verse x
- Next/Previous verse
 2016-03-03 00:49:49 +02: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
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
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 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
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 4594fcefbd pep fixes 2016-01-22 22:33:20 +01:00
Tomas Groth 4bef5f72f2 trunk 2016-01-22 22:30:26 +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
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
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
Simon Hanna 21c6a3ff1c Merge with trunk 2016-01-09 01:07:15 +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
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
Simon Hanna 5bc13e45e3 Move some static methods out of their classes where it makes sense 2016-01-05 23:28:48 +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
Simon Hanna 6d0e006b09 Change Combobox to Checkbox for plugin states 2016-01-03 14:03:29 +01: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
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
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
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 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
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 58124c01d2 Add advanced 2015-10-16 17:09:35 +01: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
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 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
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 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
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 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 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
Tomas Groth 25f6fe0a59 Fix another case of bug 1422761. 
Fixes: https://launchpad.net/bugs/1422761
 2015-03-20 17:03:45 +00:00
Tomas Groth f8084059ba Added test + small fixes. 2015-03-18 22:04:30 +00:00
Tomas Groth 7e406e7005 Insert timeout on acquiring lock in slidecontroller to avoid hang. Fixes bug 1413324. 
Fixes: https://launchpad.net/bugs/1413324
 2015-03-18 22:02:51 +00:00
Tomas Groth b3fd23da59 Updated the list of extensions supported by VLC. 2015-03-18 20:44:35 +00:00
Tomas Groth 27332f87e1 Run XInitThreads when using VLC to make it work correctly. Fixes bug 1433245. 
Fixes: https://launchpad.net/bugs/1433245
 2015-03-17 22:06:21 +00:00
Tomas Groth c3d21ca742 Disable the stop button in the slidecontroller mediaplayer buttons instead of hiding it to stop the position and audio slider resizing. Fixes bug 1431478. 2015-03-16 21:32:56 +00:00
Tomas Groth e34179795b Attempt to fix a webkit player exception 2015-03-15 22:34:12 +00:00
Tomas Groth fe6249a9e7 Removed tab from text since transifex cannot handle it. 2015-03-09 22:10:21 +00:00
Tomas Groth 39c79aaed9 PEP8 fixes 2015-03-09 20:57:39 +00:00
Tomas Groth aefe3e9cad trunk 2015-03-09 20:42:28 +00:00
Arjan Schrijver ea96bff031 Add myself as translator 2015-03-01 14:29:47 +01:00
Tim Bentley 1d82bc534c Add tests 2015-02-28 09:41:06 +00:00
Tim Bentley 75bae159b0 fix error tag 2015-02-28 07:04:41 +00:00
Tomas Groth 84a0fa0ecd Moved string format input outside calls to translate. Fixes bug 1425035. 
Fixes: https://launchpad.net/bugs/1425035
 2015-02-27 21:14:08 +00:00
Raoul Snyman 4847efdfd6 Release 2.1.3 
bzr-revno: 2513
 2015-02-21 22:05:25 +02:00