Commit Graph

9098 Commits

Author SHA1 Message Date
Jonathan Springer ef5b1cf4ac Revert PEP8 clean ups as they were already done in a different branch 2014-04-16 17:19:22 -04:00
Jonathan Springer 85fc53954d More PEP8 fixes 2014-04-16 16:49:24 -04:00
Jonathan Springer aa6b756956 Change how we define which menu items are included in the main menu on Mac OS X 2014-04-16 16:26:49 -04:00
Samuel Mehrbrodt d65d1c016c Attempt to fix bug #1154467 by waiting 10ms and retrying the commit
bzr-revno: 2365
2014-04-16 21:13:40 +02:00
Jonathan Springer ebc4476fdd Fixes first time wizard to use url and paths in web config file
Fixes PEP8 error in servicemanager

Add tests for first time form

bzr-revno: 2364
2014-04-16 05:49:45 +01:00
Samuel Mehrbrodt c20939215a PDF Fixes
- Changed some types to float instead of int because the string conversion failed: int('1.1') doesnt work
- Check if files exist before deleting them
- Replace 'pass' with 'continue'. 'pass' is like return, it stops the whole method.

bzr-revno: 2363
2014-04-16 05:47:04 +01:00
Samuel Mehrbrodt 49773de4f6 Fix transparent theme on OS X
Got the branch from https://code.launchpad.net/~marmyshev/openlp/bug_1117098 and fixed the tests

bzr-revno: 2362
2014-04-16 05:44:21 +01:00
Samuel Mehrbrodt 30ceaea2b2 Trunk 2014-04-15 23:11:06 +02:00
Samuel Mehrbrodt 5c20fbba22 Trunk 2014-04-15 22:53:58 +02:00
Samuel Mehrbrodt e1a9a36ea3 Trunk 2014-04-15 22:53:47 +02:00
Stefan Strasser db955cbf96 Some enhancements for songbeamer-import
bzr-revno: 2358
2014-04-15 22:52:14 +02:00
Samuel Mehrbrodt 8c18659adb Update verse order when verse names change (OpenLyrics Import)
bzr-revno: 2357
2014-04-15 22:46:54 +02:00
Jonathan Springer c204967304 Fixes for PEP8 2014-04-15 14:42:08 -04:00
Samuel Mehrbrodt 71a972b711 Trunk 2014-04-15 10:41:13 +02:00
Samuel Mehrbrodt 4b76bfc615 Trunk 2014-04-15 10:40:40 +02:00
Samuel Mehrbrodt 4640b1b2d9 Trunk 2014-04-15 10:33:21 +02:00
Samuel Mehrbrodt ccc138413e Trunk 2014-04-15 10:15:07 +02:00
Samuel Mehrbrodt e7edaf170f Merge trunk 2014-04-14 21:44:35 +02:00
Andreas Preikschat a07a97f78b strange pyqt fix 2014-04-14 21:07:01 +02:00
Andreas Preikschat 877fd135d3 head 2014-04-14 20:53:33 +02:00
Jonathan Springer 4a7b76e5ee merge trunk 2014-04-14 14:31:30 -04:00
Raoul Snyman ff5279d21c Cleaned up the UI of the tabs on the "Library" toolbox.
Added a test. 
Fixed up PEP8 so that code analysis passes.

bzr-revno: 2354
2014-04-14 19:28:04 +01:00
Stefan Strasser 69500907c0 Songbeamer-import: added additional verse-marks for recognition (Misc,Part,Teil,$$M=), changed check_verse_marks to handle the special mark $$M=, page-break-recognition handles now also -- 2014-04-13 19:03:28 +02:00
Samuel Mehrbrodt 758a80a4aa Trunk 2014-04-13 13:37:11 +02:00
Samuel Mehrbrodt f3a8c45bd2 Merge trunk 2014-04-13 12:42:57 +02:00
Andreas Preikschat 7e064246fb fixed counter 2014-04-13 10:21:30 +02:00
Andreas Preikschat 49ff37c530 fixed long line; use generator 2014-04-13 09:54:34 +02:00
Andreas Preikschat 4f38ae2809 head 2014-04-13 09:36:42 +02:00
Jonathan Springer 99d0ed01ab merge trunk 2014-04-12 17:31:38 -04:00
Dmitriy Marmyshev 3cf9094e5f Added ability to rename items in ServiceManager.
bzr-revno: 2352
2014-04-12 23:26:09 +02:00
Raoul Snyman 4b6ee2aa2d Fix an import issue 2014-04-12 22:22:31 +02:00
Raoul Snyman b9ba2c68a6 Fix up PEP8 issues. 2014-04-12 22:19:22 +02:00
Raoul Snyman 672eed037c HEAD 2014-04-12 21:48:15 +02:00
Jonathan Springer 51e43a9a52 Fix getting urls for first time wirard from config file. 2014-04-12 14:21:15 -04:00
Andreas Preikschat 2c93a5840b head 2014-04-12 18:05:27 +02:00
Jonathan Springer 991eb6d004 Fix debug messages (bug #1170231)
bzr-revno: 2351
2014-04-12 16:43:08 +02:00
Jonathan Springer 4cb71cb5e3 Remove orphaned and unused registry execute, and fix two functions to register to the registry
instead of executing.

Modify loading file from the command line to only load files ending with osz, or oszl.

Fix argument to pass correct type.

bzr-revno: 2350
2014-04-12 16:40:07 +02:00
Andreas Preikschat d16d8066ad - updated vlc.py
bzr-revno: 2349
2014-04-12 16:37:38 +02:00
Jonathan Springer 307f46921c Merge trunk 2014-04-10 20:29:22 -04:00
Samuel Mehrbrodt 93fe4db118 Bug nr 2014-04-10 21:46:32 +02:00
Samuel Mehrbrodt 056a7b72ed Fix bug 1154467 2014-04-10 21:45:49 +02:00
Samuel Mehrbrodt a82a13d2ed Fixes for PDF DPI Detection 2014-04-09 12:48:12 +02:00
Samuel Mehrbrodt 47767b02c1 Fix debug messages
Fixes: https://launchpad.net/bugs/1170231
2014-04-08 22:41:33 +02:00
Samuel Mehrbrodt 1bf1e79e27 Merge trunk 2014-04-08 16:58:55 +02:00
Samuel Mehrbrodt 1759c72f36 Test 2014-04-08 16:08:07 +02:00
Samuel Mehrbrodt ac05205a1e Trunk 2014-04-08 15:46:08 +02:00
Samuel Mehrbrodt a49854e20b Update verse order when verse names change 2014-04-08 13:07:52 +02:00
Samuel Mehrbrodt d1ab85d2fc Trunk 2014-04-07 15:51:49 +02:00
Jonathan Springer 1945b4c380 Remove changes to platform specific code. 2014-04-06 22:07:19 -04:00
Jonathan Springer e5d5af38c2 Move opening of files passed in via command line to function. 2014-04-06 22:03:05 -04:00