Commit Graph

9132 Commits

Author SHA1 Message Date
Stevan Pettit
1d06562c69 added QCoreApplication.exit() to cancel button 2011-09-13 13:20:51 -04:00
Raoul Snyman
ea7cda4418 Fixed import of song tracks from v1.2 and added the option to start paused.
bzr-revno: 1744
2011-09-13 18:08:38 +02:00
Stevan Pettit
25cb0ac22e Added "Finish" button to no-internet screen. Changed window message 2011-09-12 20:13:12 -04:00
Martin Zibricky
50dbb1ed0b [merge] merge with trunk r1743 2011-09-12 22:36:41 +02:00
Martin Zibricky
fb664bed0c Remove openlyrics tests for easier merging. They will be merged later. 2011-09-12 22:35:39 +02:00
Raoul Snyman
2b6e254b91 Add the option to start background audio paused (default is on). 2011-09-12 22:04:46 +02:00
Raoul Snyman
807aac95ee Delete audio files when you delete a song. 2011-09-12 19:09:11 +02:00
Raoul Snyman
017359ff5c Fixed up audio file import from version 1.2, plus a few bits I missed from renaming things. 2011-09-12 18:35:32 +02:00
Raoul Snyman
906b0fe67e Added support for copying files from openlp.org 1.2.x. 2011-09-12 08:29:58 +02:00
Raoul Snyman
75fda95339 HEAD 2011-09-12 06:59:07 +02:00
Stevan Pettit
48e9becf51 Added code to remove obsolete settings entries causing problems with the export/import of settings.
bzr-revno: 1743
2011-09-12 06:56:35 +02:00
Martin Zibricky
655245051a Consolidating and restructuring test code 2011-09-11 23:53:19 +02:00
Martin Zibricky
eef786f85c update tests to work with latest changes 2011-09-11 22:40:30 +02:00
Martin Zibricky
50e1964795 Remove the db_file_path option from db.Manager init function 2011-09-11 22:39:33 +02:00
Martin Zibricky
606e19734c Allow to override data dir for tests 2011-09-11 22:29:25 +02:00
Stevan Pettit
c04be6775f Added code to remove obsolete settings entries 2011-09-11 08:29:08 -04:00
Martin Zibricky
5c13123cef Delete print statement 2011-09-10 22:15:23 +02:00
Martin Zibricky
a3ff14d337 [merge] merge with trunk r1742 2011-09-10 19:28:11 +02:00
Tim Bentley
b3cb4a21f4 fixes 2011-09-09 20:14:19 +01:00
Tim Bentley
ea7c5c4b9e Head 2011-09-09 19:19:48 +01:00
Tim Bentley
02da8317cc Head 2011-09-09 17:37:22 +01:00
Stevan Pettit
e560371e53 Added code to allow canceling of downloads and to completely bypass any downloads is there is no internet access in the First Time Wizard
bzr-revno: 1742
Fixes: https://launchpad.net/bugs/836980, https://launchpad.net/bugs/836611
2011-09-09 07:45:43 +02:00
Raoul Snyman
d1ae7a7f28 HEAD 2011-09-08 21:04:38 +02:00
Tim Bentley
05741443a8 Bypass the error message if triggered from the Remote interface. No action is taken though
Do not display the initial screen if there is only 1 display.

bzr-revno: 1741
Fixes: https://launchpad.net/bugs/800156, https://launchpad.net/bugs/796195
2011-09-08 17:44:26 +01:00
Stevan Pettit
2c589f8b0e Added code to allow canceling of file downloads. Fixed aparent hang if no internet connection. 2011-09-08 09:14:51 -04:00
Martin Zibricky
11876791a4 update openlyrics schema to allow nested formatting tags 2011-09-08 14:11:13 +02:00
Martin Zibricky
c8c8c7e654 code to expand <format> tag for openlyrics export 2011-09-08 01:16:14 +02:00
Martin Zibricky
9fb6936263 code to add formatting tags to openlyrics lyrics 2011-09-07 22:54:53 +02:00
Martin Zibricky
39946ccbe2 Add formatting tags to song example data 2011-09-06 23:02:41 +02:00
Tim Bentley
e93a1d2687 Hide the screen on startup if only 1 screen
Fixes: https://launchpad.net/bugs/800156
2011-09-06 20:32:30 +01:00
Tim Bentley
a328d1c7c7 Bypass message if requested from remote plugin
Fixes: https://launchpad.net/bugs/796195
2011-09-06 18:53:43 +01:00
Raoul Snyman
4731904fba Merge from upstream. 2011-09-06 18:56:39 +02:00
Martin Zibricky
6163bc99c3 Do not use depracated dict.has_key() function in openlyrics code 2011-09-06 15:22:17 +02:00
Martin Zibricky
5d2bde01c2 For openlyrics export skip adding format tags if not used. 2011-09-06 15:14:57 +02:00
Andreas Preikschat
4c869fa1f5 fixed bug 805088
Fixes: https://launchpad.net/bugs/805088
2011-09-06 13:57:31 +02:00
Andreas Preikschat
c7ab79f987 fixed bug 805088 2011-09-06 13:56:52 +02:00
Martin Zibricky
b15d65feba add tests for openlyrics 2011-09-06 12:49:15 +02:00
Martin Zibricky
46203297de [merge] merge with trunk r1740 2011-09-06 12:48:19 +02:00
Raoul Snyman
9659834430 Finished fixing variable names. 2011-09-06 07:47:33 +02:00
Raoul Snyman
14ffb6d3c1 HEAD 2011-09-06 07:05:34 +02:00
Martin Zibricky
e491e77981 add test for openlyrics export 2011-09-06 00:31:09 +02:00
Tim Bentley
7aafc658be Head 2011-09-05 20:59:47 +01:00
Raoul Snyman
d364f4bccb HEAD 2011-09-05 21:12:39 +02:00
Stevan Pettit
796e779300 Fixed various issues around the exporting and importing of settings.
bzr-revno: 1740
Fixes: https://launchpad.net/bugs/838831
2011-09-05 19:21:12 +02:00
Stevan Pettit
b90796da45 Cleaned up some code 2011-09-05 09:03:30 -04:00
Martin Zibricky
15b63b8279 add openlyrics validator 2011-09-05 14:58:48 +02:00
Martin Zibricky
d8642636ec add song example for tests 2011-09-05 14:57:35 +02:00
Martin Zibricky
57f8f5c54c Add test function argument with database containing some data 2011-09-05 14:55:39 +02:00
Raoul Snyman
564c7e4a5a Coding standards clean up. 2011-09-05 14:51:16 +02:00
Martin Zibricky
bd503f5c7d [merge] merge with trunk r1739 2011-09-05 12:48:46 +02:00