openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity
17,536 Commits 6 Branches 56 Tags 310 MiB
Commit Graph

1114 Commits

Author SHA1 Message Date
Tim Bentley 6c8ec8a840 Add logging to mainwindow and clean up logging code 2018-02-03 11:24:39 +00:00
Tim Bentley 6ff1015205 close the splash screen 2018-02-03 07:59:36 +00:00
Raoul Snyman 97172efba5 HEAD 2018-01-30 21:10:09 -07:00
Phill Ridout 368b0ce75c Tidy ups 2018-01-20 09:30:30 +00:00
Phill Ridout 89042982d6 HEAD 2018-01-16 20:49:18 +00:00
Raoul Snyman 7490c7ad1e HEAD 2018-01-13 17:55:21 -07:00
Phill Ridout 42465605ac fix saving and loading progress bar 
Fixes: https://launchpad.net/bugs/1734432
 2018-01-13 09:02:29 +00:00
Phill Ridout c88a08f9e4 HEAD 2018-01-13 07:25:07 +00:00
Raoul Snyman ff421df2bf Fix bug #1742910 
Fixes: https://launchpad.net/bugs/1742910
 2018-01-12 11:29:32 -07:00
Raoul Snyman 7e99381dba Fix some issues highlighted by Tim and Phill, and added a file that was erroneously removed 2018-01-07 10:50:29 -07:00
Raoul Snyman 7b28262987 Fix a mismatch of arguments in a call to reload_bibles() 2018-01-06 21:36:17 -07:00
Phill Ridout dd6887d388 HEAD 2018-01-06 09:56:10 +00:00
Phill Ridout e1400dc227 Finally merge the save lite method in to the 'standard' save method' 2018-01-06 09:55:19 +00:00
Raoul Snyman 2d009f1884 Change a log.error to a log.exception 2018-01-04 14:13:24 -07:00
Raoul Snyman 0601cf1543 Move cleanup to after thread wait; Figured out why the webserver was exiting early 2018-01-04 14:03:15 -07:00
Raoul Snyman db7ff02abb Move the thread code to after the event has been accepted 2018-01-04 10:17:20 -07:00
Raoul Snyman 13885b1a39 HEAD 2018-01-03 23:10:20 -07:00
Tim Bentley 41f35f52e3 End of 2017 2017-12-29 09:15:48 +00:00
Tim Bentley cfc487d623 tests 2017-12-28 08:27:44 +00:00
Raoul Snyman 2fa88b17db Refactor threads to use new openlp.core.threading module 2017-12-20 07:17:07 -07:00
Raoul Snyman 187714cd87 HEAD 2017-12-16 23:51:23 -07:00
Raoul Snyman 1dda8f339f Refactor threading to a centralised location which can keep track of all the threads 2017-12-16 23:50:23 -07:00
Raoul Snyman 9a14750d65 HEAD 2017-12-11 13:25:58 -07:00
Tim Bentley 90118af85c fix abend 2017-12-02 09:11:22 +00:00
Raoul Snyman 64a245bef9 HEAD 2017-12-01 14:58:34 -07:00
Phill Ridout a864dbbbc9 Minor tidyups 2017-11-19 21:57:38 +00:00
Phill Ridout a79ec45055 HEAD 2017-11-18 22:40:05 +00:00
Phill Ridout f07d6e736c Moar pathlib refactors 2017-11-18 22:37:24 +00:00
Phill Ridout 9196db5af0 Pathlib refactors and test fixes 2017-11-18 11:23:15 +00:00
Ken Roberts c46cd951ef Projector imports to fully-qualified, renamed projector dock 2017-11-16 15:53:53 -08:00
Ken Roberts d50029c636 Merge trunk 2017-11-14 16:19:49 -08:00
Ken Roberts 3d4ed035e9 PJLink2-L updates 2017-11-10 03:59:38 -08:00
Raoul Snyman 4dba3b178d Fix up issues after merge 2017-11-03 22:34:10 -07:00
Raoul Snyman 6718be4cff HEAD 2017-11-03 15:31:48 -07:00
Phill Ridout 94dd107abe Changed merged errors 
Fixes: https://launchpad.net/bugs/1400415
 2017-11-03 20:55:41 +00:00
Phill Ridout fe5430e157 HEAD 2017-10-27 22:11:29 +01:00
Raoul Snyman d5ab3340eb Move widgets to a widgets module 2017-10-23 15:09:57 -07:00
Raoul Snyman 53c8337017 Moved ScreenList to display module 2017-10-10 14:15:08 -07:00
Raoul Snyman 15a4a93c96 Phase 2 complete 2017-10-10 00:08:44 -07:00
Raoul Snyman fad0298490 Fix a bug when importing settings 2017-10-09 18:09:45 -07:00
Philip Ridout 98d5f0ec67 fix 1660473, shamlessly ported from 2.4.5 2017-10-08 19:38:56 +01:00
Raoul Snyman b406cfd5a8 Phase 1 complete 2017-10-07 00:05:07 -07:00
Raoul Snyman 640ebf8c3c Added JavaScript tests in; Refactored some stuff, removed some stuff. Lots börken. 2017-10-04 00:44:08 -07:00
Tomas Groth ff25d0d59e merge trunk 2017-09-29 20:59:42 +02:00
Raoul Snyman 1b7482243d Centralise style tweaks 2017-09-28 16:28:18 -07:00
Raoul Snyman c2e16cc8e9 HEAD 2017-09-28 10:32:10 -07:00
Raoul Snyman 93fd4053b2 Add dark theme from QDarkStyle. Part 1: Force the theme 2017-09-28 10:31:28 -07:00
Tomas Groth 359362126a merge trunk 2017-09-26 20:43:35 +02:00
Raoul Snyman 4bb031b22e HEAD 2017-09-25 12:55:33 -07:00
Tomas Groth 1481f747f1 merge trunk 2017-09-25 21:41:55 +02:00
Tomas Groth 3094b053ff Various adjustments, main window starts now, still no canvas. 2017-09-25 20:59:43 +02:00
Philip Ridout 2c52059275 more fixes 2017-09-24 21:26:39 +01:00
Raoul Snyman a4bd979f19 Hide the cancel button 2017-09-22 21:10:18 -07:00
Raoul Snyman 50511c4953 HEAD 2017-09-22 21:04:41 -07:00
Raoul Snyman e1ca15173d Actually show the progress dialog when we're waiting for the thread to shut down. 2017-09-22 20:50:45 -07:00
Philip Ridout b440584cb5 Moved the patched shuilils to the path module 2017-09-20 21:44:57 +01:00
Raoul Snyman 2f8cdc81e0 Fix up the version tests and remove old references to 'versionchecker' 2017-09-12 23:08:38 -07:00
Raoul Snyman d1a47036cf Remove unnecessary slot 2017-09-11 22:52:38 -07:00
Raoul Snyman 1e06f472c6 HEAD 2017-09-08 22:23:37 -07:00
Raoul Snyman a6324b6b7f Refactor version check threading 2017-09-08 22:19:22 -07:00
Philip Ridout f0e7381f5c Pathlib changes in presentation plugin 2017-09-07 22:52:39 +01:00
Philip Ridout 7a3f54e54c Back up settings before upgrading them 2017-09-03 11:18:14 +01:00
Philip Ridout 8f9cb4a090 Modify setting upgrade code to provide versioned updates. Upgrade settings to use JSON encoded Path objects 2017-08-26 16:06:11 +01:00
Philip Ridout f8a68c23d0 Enable JSON to handle unsupported objects and tests 2017-08-25 21:03:25 +01:00
Philip Ridout 6ac671a5fa HEAD 2017-08-23 21:13:58 +01:00
Philip Ridout b384e6f2fa Convert some more utility fuctions over to using the pathlib 2017-08-12 18:45:56 +01:00
Tim Bentley c2321e7c10 Merge head 2017-08-03 18:54:40 +01:00
Raoul Snyman 2e43e7939e HEAD 2017-08-02 21:21:19 -07:00
Philip Ridout 63bd98372a Move applocation over to using pathlib 2017-08-01 21:59:41 +01:00
Raoul Snyman b83452b2e5 Fix the import path of UiStrings 2017-07-04 16:13:51 -07:00
Raoul Snyman 7c0157ed4b Remove all instances of 'OpenLP 2' and 'OpenLP 2.4' and fix one entry to be more descriptive 2017-07-04 15:30:41 -07:00
Tim Bentley da51b046b2 Head 2017-06-09 16:56:40 +01:00
Tim Bentley 1c4f335f23 head without some chords stuff! 2017-06-06 21:58:12 +01:00
Tim Bentley 08a135de78 sort out ftw 2017-06-06 21:45:59 +01:00
Philip Ridout a24d5f8f15 TODO's TODOne, and a few other cleanups 2017-05-30 19:42:35 +01:00
Raoul Snyman a2a51b95dd Various fixes: 
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- Fix opening the data folder in KDE where it was being misinterpreted as a SMB share
- Fix a problem with the media player no longer controlling the playlist
- Fix a problem where a timer would expire after the application had been torn down
- Fix song database upgrades by moving upgrades 4 and 5 into 6 and writing some damage control
- Add a CHANGELOG.rst file
 2017-03-22 21:43:13 -07:00
Tim Bentley 9451e4def6 add switch to turn off servers 2017-03-05 17:43:18 +00:00
Tim Bentley 8b0f64317c fix up change to xdb and handle missing remotes directories 2017-03-04 09:45:14 +00:00
Tim Bentley 5d917de2f8 Head 2017-03-03 19:27:31 +00:00
Raoul Snyman 32328cfe6a Hide the Projectors manager by default so that it doesn't confuse people 2017-01-22 11:12:41 -07:00
Tim Bentley 74ca42e220 Yet another year goes by 2016-12-31 11:01:36 +00:00
Tim Bentley 126c5462a0 Head 2016-12-22 15:12:03 +00:00
Raoul Snyman 95eb290226 Make the tab style affect only the media library tabs, not everything else too 2016-12-15 22:36:04 +02:00
Raoul Snyman d7ea8e4386 HEAD 2016-12-15 19:58:23 +02:00
Raoul Snyman 4a222d1310 HEAD 2016-12-13 08:41:59 +02:00
Raoul Snyman 97dfafba4e Make the tabs in the media library prettier 2016-12-13 08:04:27 +02:00
Raoul Snyman 79934596ac Fix the problem with the Library/Media Manager icons not showing up. 2016-12-13 00:14:45 +02:00
Raoul Snyman ccdc88c4cb Change the name of the help menu to try to fix the double-help-menu problem 2016-11-29 17:44:32 +02:00
Tim Bentley 2d695f13ea Head 2016-10-26 19:12:38 +01:00
Olli Suutari 33aaf53c42 - Pep8 (Over ident fixed) 2016-08-15 00:14:35 +03:00
Olli Suutari 3ac99b3e28 - Merged trunk on 14/8/16 2016-08-15 00:04:22 +03:00
Tim Bentley f38ad2cc14 move startup code 2016-08-13 06:18:46 +01:00
Tim Bentley 304032cd7d Merge and fix mess 2016-08-12 06:15:56 +01:00
suutari.olli@gmail.com 6f5495bcbf This branch includes various UI string changes, such as: 
- 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.
- Removed version from window title
- Removed version from web remote page window names.
- Re-did the trace back message.
-  etc...

In "Configurate OpenLP":
- Changed typing for all labels to lowercase
- Remove...

bzr-revno: 2691
 2016-08-12 00:12:50 +02:00
Olli Suutari 8c107048b4 - Created a shortcut for the new help button, removed the old two shortcuts and created obsolete settings transfer. 2016-08-12 00:32:20 +03:00
Olli Suutari 851a35a822 - Removed Local & Online help buttons, created "User manual" button. 2016-08-12 00:11:34 +03:00
Olli Suutari f590294b4a - Coded a combined help button, which opens the Local Help if using Mac or Win and Online help if using other OS's. 
(still need to change the help menu items)
 2016-08-11 23:54:56 +03:00
Tim Bentley 098697a2cc more endpoint moves 2016-08-10 21:52:27 +01:00
suutari.olli@gmail.com ae81497fe3 This branch includes various UI string changes, such as: 
- 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.
- Removed version from window title
- Removed version from web remote page window names.
- Re-did the trace back message.
-  etc...

In "Configurate OpenLP":
- Changed typing for all labels to lowercase
- Remove...

bzr-revno: 2688
 2016-08-10 19:31:33 +01:00
Ken Roberts c35a2d1430 String conversions with templates part 1 
- Fix string format key error in first time wizard from previous string conversion
- Fix projector pjlink1 test to use MagicMock
- Part 1 string conversions where format template is a string variable that's filled later
- Update projectordb test
- Fix a test on htmlbuilder string formatting
- Revert openlp/core/lib/htmlbuilder.py
- Convert renderer to use Template()
- Added test for renderer css
- Merge trunk and fix conflict
- Fix formatting in excep...
 2016-08-10 19:29:21 +01:00
Ken Roberts 2f7a1ab456 Merge trunk 2016-08-05 12:41:22 -07:00
suutari-olli 1c63fb6ec0 - Changed stuff based on suggestions by superfly 2016-08-04 00:19:14 +03:00
suutari-olli aa1cd8fa91 - Merged trunk on 24.7.16 
- Added superflys startup traceback fix to my code
- Resolved conflicts
 2016-07-24 23:20:25 +03:00
Tim Bentley ca2ceba972 Head 2016-07-23 05:59:26 +01:00
Tim Bentley 6e5070316c next prev 2016-07-17 08:12:42 +01:00
Tim Bentley eaa7904f58 More remotes removal and custom pages 2016-07-07 06:14:52 +01:00
Tomas Groth 8aa917c89c A bunch of fixes suggested by pylint. 2016-07-01 23:17:20 +02:00
Tim Bentley 6a955a5573 api and router work, move settings and tab 2016-06-10 17:16:35 +01:00
Tim Bentley 15bf9420ae Rename Controller 2016-06-05 22:28:35 +01:00
Tim Bentley 32fad35f79 move remote to api and add waitress 2016-06-05 22:16:13 +01:00
Tim Bentley 8ce073d83f Move Websockets to core from plugin 2016-06-05 06:49:27 +01:00
Ken Roberts 598d715de6 Initial string conversions for variable templates 2016-06-03 17:15:19 -07:00
Ken Roberts 7f5096d0f9 core_lib files string conversions 2016-05-20 09:22:06 -07:00
suutari-olli 77e9e1ad27 Lowercapped bunch of stuff, splitted expection error 2016-05-10 04:55:26 +03:00
suutari-olli bd9c9a8430 - Merged trunk 2016-05-10 03:58:37 +03:00
Ken Roberts 5601e61c0f Convert strings to python3 in mainwindow 2016-04-29 13:25:12 -07:00
Tim Bentley 071a4438e9 Finish moving things around 
bzr-revno: 2649
 2016-04-23 14:46:59 +01:00
Tim Bentley 0d755e3354 more files 2016-04-22 19:32:45 +01:00
Tim Bentley bdeff60a97 updates 2016-04-17 20:32:15 +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
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 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
suutari-olli 2f6870ed8a Merged trunk on 13.4.16 2016-04-13 17:12:28 +03: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 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
Tim Bentley dffba47b44 move version checker 2016-04-04 20:53:54 +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
Tim Bentley ec30c560a7 move tests and code 2016-04-01 18:28:40 +01: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
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
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 5bc13e45e3 Move some static methods out of their classes where it makes sense 2016-01-05 23:28:48 +01:00
Tim Bentley 3a8b068af8 Year older 2015-12-31 22:46:06 +00:00
Jonathan Springer f3108cffe3 Fix exit dialog 2015-12-22 17:20:39 -05:00
Jonathan Springer bee587fa67 merge trunk 2015-12-20 19:43:38 -05:00
Samuel Mehrbrodt e6978033e9 PEP8 2015-12-17 22:43:49 +01:00
Samuel Mehrbrodt 0d4541b8dc Merge trunk 2015-12-11 09:33:24 +01:00
Jonathan Springer 7af1ca1d49 Migrate to PyQt5 2015-11-06 19:49:40 -05:00
Tim Bentley 6b60573740 UI changes 2015-10-16 17:30:13 +01:00
Samuel Mehrbrodt 7477f781ef Close -> Exit (as in the menu) 2015-08-27 10:15:51 +02: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
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 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