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
bd8ddf7506 fix tests 2016-04-21 17:26:34 +01:00
Tim Bentley
f2537981e4 update 2016-04-20 17:36:37 +01:00
Ken Roberts
b5c9f96ccf oops fix - typo 2016-04-17 16:57:33 -07:00
Ken Roberts
b2ed6bb84c Fix split in string formatting 2016-04-17 16:47:44 -07:00
Tim Bentley
1942a8ac14 fix 2016-04-17 21:11:55 +01:00
Tim Bentley
bdeff60a97 updates 2016-04-17 20:32:15 +01:00
Tim Bentley
34f00cda92 dnd and files 2016-04-17 20:09:46 +01:00
Tim Bentley
b2147045b2 colorbutton2 2016-04-17 20:06:17 +01:00
Tim Bentley
6767ba504c colorbutton 2016-04-17 19:57:03 +01:00
alisonken1@gmail.com
f6cb085b0d "- Update string format to Python3 style 
- Added projector lamp values test

Convert string format from Python2 
     '%s %s' % (value1, value2)
to Python3
     '{key1} {key2}'.format(key1=value1, key2=value2)

--------------------------------
lp:~alisonken1/openlp/strings_projector_pjlink (revision 2642)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1442/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1359/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1297/
..."

bzr-revno: 2645
 2016-04-17 17:33:08 +02:00
Ken Roberts
278ec2bed2 Update projector UI strings to Python3 format 2016-04-17 02:15:23 -07:00
Ken Roberts
37bae16307 String formatting 2016-04-16 14:32:56 -07:00
ian@knightly.xyz
dadff3c4de Allows users to change the automatic scrolling behaviour for when a new slide is selected. 
Currently on selecting a new slide, the next slide will be scrolled into view.
The changes provide a combo-box in the advanced settings that allow users to select additional options (see branch description for details).

Additional bounds checking and unit tests have been added to support this.

This latest proposal also contains additional input validation and testing thereof for values from Settings(...

bzr-revno: 2644
Fixes: https://launchpad.net/bugs/1550858
 2016-04-16 22:01:22 +01:00
suutari.olli@gmail.com
6df9cbeb47 "In this re-proposal: 
Added: self.BackgroundColorColon = translate('OpenLP.Ui', 'Background color:')
to uistrings, background color label now uses this.

This same string will be used several times in this branch:
https://code.launchpad.net/~suutari-olli/openlp/ui-messages-part-1/+merge/291628

--------------------------------------------------------------------------------------------------------------

- Merged to trunk on 13.4.16, tests are now passing.

lp:~suutari-olli/openlp/show-no-log..."

bzr-revno: 2643
Fixes: https://launchpad.net/bugs/1512038
 2016-04-16 21:51:35 +02:00
Ian Knight
f8718ee1cb Added extra validation checks and matching tests to __recalculate_layout(), row_resized(), replace_service_item() & change_slide() 2016-04-17 02:05:08 +09:30
Ian Knight
665a35b085 Cleaned up extra brackets 2016-04-17 01:20:58 +09:30
Tim Bentley
40981701e9 fix checks 2016-04-16 15:43:31 +01:00
suutari-olli
49dca3a0f9 - Changed how preset enabled setting is called 
- Changed the Projectors desription
- Changed Show .ppt .odp and pdf presentations to files.
 2016-04-16 16:58:28 +03:00
Tim Bentley
b8bbb4391c move code from presentations 2016-04-16 14:51:42 +01:00
Ken Roberts
d92757af97 Convert strings to format() method 2016-04-16 01:08:45 -07:00
Ian Knight
ae6e6baeca Added comments 2016-04-16 16:44:04 +09:30
Ian Knight
c8172d882f Merged from trunk 2016-04-16 16:32:36 +09:30
Ian Knight
26e8dde0ea Implemented feature, cleaned pep8 errors 2016-04-16 16:30:48 +09:30
Ian Knight
17d9bf0adc Implemented auto-scroll-choice 2016-04-16 16:23:01 +09:30
suutari-olli
9f5426abdc Added short descriptions for enabling/disabling plugins, improved the messages. 2016-04-15 21:48:27 +03:00
suutari-olli
4520403387 - Added checkbox for controlling the visibility of Projectors panel in 1st time wiz. 2016-04-15 19:06:14 +03:00
suutari-olli
c9065a286a Added a setting that hides/shows Projectors panel after first time wizard. 
This still needs a visual UI (Aka checkbox to wizard)
 2016-04-14 10:19:59 +03:00
suutari-olli
2b35156931 - Changed default setting from False to True for 'user interface/lock panel': True 
(This has caused countless cases of users messing up their UI and not knowing how to fix it)
 2016-04-14 04:17:36 +03:00
suutari-olli
217ecbbfb0 - Removed # Banana and # Cherry comments, which I created to find parts of the code. 
(Cherry was replaced with actual comment)
 2016-04-14 04:10:59 +03:00
suutari-olli
d51910b6a0 In this commit: 
- Fixed bug 1565447 (Unable to save panel visibility if View mode is used)
- Locking panel visibility now makes the Mode menu unavailable.
 2016-04-14 03:59:24 +03:00
Tim Bentley
317364ca7e pep8 2016-04-13 20:15:53 +01:00
Tim Bentley
6bac0cee26 pep8 2016-04-13 19:39:39 +01:00
Tim Bentley
19d120de1b Head and review comments 2016-04-13 19:38:49 +01:00
suutari-olli
7219ba22e6 Added: self.BackgroundColorColon = translate('OpenLP.Ui', 'Background color:') 
to uistrings, background color label now uses this.

This same string will be used several times in this branch:
https://code.launchpad.net/~suutari-olli/openlp/ui-messages-part-1/+merge/291628
 2016-04-13 18:50:04 +03:00
suutari-olli
010c7b6fb4 Merge to trunk on 13.4.16 2016-04-13 00:01:58 +03:00
Tim Bentley
65e84a317e fix tests 2016-04-12 22:00:18 +01: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
Tomas Groth
2aeb7f9e6f trunk 2016-04-10 22:24:07 +02: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
suutari-olli
76aa114ff0 This now moves old settings from advanced tab into the new settings. 2016-04-08 16:40:34 +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
31a2b37a88 pep8 2016-04-05 21:07:57 +01:00
Tim Bentley
6729ea9d19 move file 2016-04-05 19:33:50 +01:00
Tim Bentley
2df1169ea8 fix tests 2016-04-05 19:11:42 +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
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