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

2579 Commits

Author SHA1 Message Date
Andreas Preikschat 8f3f09eef9 r1765 + resolved conflict 2011-10-01 09:28:45 +02:00
Tim Bentley 276d4045e3 Fix edit for tags loaded for song which is not saved 
bzr-revno: 1765
 2011-09-27 18:23:21 +01:00
Tim Bentley 695e08a63a get the right field 2011-09-26 19:56:52 +01:00
Tim Bentley 7fe57a9a5d Make Int 2011-09-26 19:12:27 +01:00
Tim Bentley fb3f001c26 Add Justify theme option 
bzr-revno: 1762
Fixes: https://launchpad.net/bugs/802252
 2011-09-26 17:07:30 +01:00
Tim Bentley 682e822d21 Clean up 2011-09-25 08:27:09 +01:00
Tim Bentley 88c09d8981 Correct problem it tags not being used on song load 2011-09-25 07:37:40 +01:00
Raoul Snyman 0aadc32d4f Fixed the last part of bug #855342 where when you save a file a few times, it throws an exception. 
Fixes: https://launchpad.net/bugs/855342
 2011-09-24 00:14:23 +02:00
Martin Zibricky 3492681ca2 [merge] merge with truk r1756 2011-09-23 02:43:51 +02:00
Martin Zibricky 7d016dd6a6 Fix regressions with formattingtagsform 2011-09-23 02:41:01 +02:00
Martin Zibricky 354bec8b33 Fix - do not save temporary key by formatting tags into openlp configuration 2011-09-22 22:30:15 +02:00
Martin Zibricky 8b6887036b Fix regressions with users tags in preview and import/export in openlyrics 2011-09-22 16:23:51 +02:00
Raoul Snyman e3ecee8ae5 Fixed bug #855342 where saving an already-saved service file with an audio file in it caused an exception. 
Fixes: https://launchpad.net/bugs/855342
 2011-09-21 22:47:30 +02:00
Martin Zibricky c47f936fd5 [merge] Merge with trunk r1754 2011-09-21 01:08:46 +02:00
Raoul Snyman 429a1a4541 Remove reference to the non-existent __del__ method. 
Fixes: https://launchpad.net/bugs/854125
 2011-09-19 20:55:34 +02:00
Martin Zibricky fa9287c11b [merge] Merge with trunk r1750 2011-09-19 00:45:19 +02:00
Stevan Pettit 0b6cc6134a Added a "Finish" button to the "No-internet" window of the First Time Wizard. 
Added code to this button to process any changes made in the plugin screen.

bzr-revno: 1749
 2011-09-18 14:09:32 +01:00
Stevan Pettit c44b4dccf2 Fixed import statements 2011-09-17 18:33:03 -04:00
Tim Bentley 6a901f2de9 Add justify to theme options 
Fixes: https://launchpad.net/bugs/802252
 2011-09-16 18:23:39 +01:00
Martin Zibricky 8c87d89301 [merge] merge with trunk r1744 2011-09-13 22:37:19 +02:00
Stevan Pettit 1d06562c69 added QCoreApplication.exit() to cancel button 2011-09-13 13:20:51 -04: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
Raoul Snyman 2b6e254b91 Add the option to start background audio paused (default is on). 2011-09-12 22:04:46 +02:00
Stevan Pettit c04be6775f Added code to remove obsolete settings entries 2011-09-11 08:29:08 -04:00
Martin Zibricky a3ff14d337 [merge] merge with trunk r1742 2011-09-10 19:28:11 +02: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
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
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
Martin Zibricky 46203297de [merge] merge with trunk r1740 2011-09-06 12:48:19 +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 bd503f5c7d [merge] merge with trunk r1739 2011-09-05 12:48:46 +02:00
Raoul Snyman 11f5a29b6d Added some openlp_process_events signals and move the hiding of the finish button higher up in the code. 
Fixes: https://launchpad.net/bugs/837319
 2011-09-04 23:00:37 +02:00
Stevan Pettit 30c09f9b4b Change local variable names in settings import/export routines. Changed string search 2011-09-03 16:38:25 -04:00
Stevan Pettit 50a5b98f8c Fixed problems with "shortcuts" section of export/import file 2011-09-02 18:57:02 -04:00
Martin Zibricky 9a74b05a1f [merge] merge with trunk r1735 2011-09-02 23:31:42 +02:00
Raoul Snyman 2a02167646 Fixed up a few things, including updating theme when reactivating the current song. 2011-08-31 23:17:10 +02:00
Raoul Snyman abc2f3e89f Some minor fixes. 2011-08-31 13:29:04 +02:00
Raoul Snyman 4d66954d62 - Fixed re-playing of previous audio file. 
- Fixed left-over files from previous song.
- Renamed a few more enumerations.
- Fixed some exception handling.
 2011-08-31 09:49:57 +02:00
Raoul Snyman 0d16b05779 Now with pausing too! 2011-08-30 23:20:32 +02:00
Raoul Snyman c41e7c49df CAN HEARZ IT!!!! 2011-08-30 22:29:29 +02:00
Raoul Snyman 8b8b4fbf51 HEAD 2011-08-30 21:42:12 +02:00
Mattias Põldaru af10011c0c This seems to fix 
819271, web NIV download from Bibleserver crash.
No crash (257) and performance jump and reduced memory usage on loading services with huge files.
Fixed filename comparison on drag and drop.

bzr-revno: 1734
 2011-08-30 19:06:45 +01:00
Raoul Snyman 540c717dbb Started work on an audio player with a playlist. 2011-08-29 22:39:15 +02:00
Raoul Snyman bbc8e04a3f HEAD 2011-08-29 20:46:01 +02:00
Stevan Pettit 7cbccb6b70 Added code to reload Bible list after first time wizard is rerun 
bzr-revno: 1731
 2011-08-29 17:54:09 +01:00
Mattias Põldaru 44c4febd29 Merge with upstream 2011-08-29 16:08:50 +03:00
Andreas Preikschat d061436a35 replaced Ini by config 2011-08-29 08:30:31 +02:00
Raoul Snyman 532ad84b87 - Bundle audio files with the song when adding it to the service 
- Save audio files with service
- Load audio files from service
- Copy audio files to songs plugin when adding a song from a service.
 2011-08-28 22:51:44 +02:00