Commit Graph

7930 Commits

Author SHA1 Message Date
Stevan Pettit
30c09f9b4b Change local variable names in settings import/export routines. Changed string search 2011-09-03 16:38:25 -04:00
Andreas Preikschat
226575861d - updated ts files
bzr-revno: 1737
2011-09-03 18:52:39 +02:00
Andreas Preikschat
54ee75e3e1 updated ts files 2011-09-03 16:51:03 +02:00
Andreas Preikschat
88e8488126 r1736 2011-09-03 16:44:05 +02:00
Martin Zibricky
4cf750ce9d Wrap db.Manager to a function arg for automated tests 2011-09-03 16:21:36 +02:00
Martin Zibricky
0de5d5e09a [merge] merge with trunk r1736 2011-09-03 10:35:47 +02:00
Martin Zibricky
1e4870ddb9 Start of the testing framework
bzr-revno: 1736
2011-09-03 06:35:49 +01: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
e8aae98e09 Fixed up a few things. 2011-09-02 21:04:07 +02:00
Martin Zibricky
85556f754d Add gui test case example 2011-09-02 13:15:41 +02:00
Martin Zibricky
e4f3041802 Add pytest to optional dependencies in check_dependecies.py 2011-09-02 13:10:07 +02:00
Raoul Snyman
79123e7df3 Tidied up some method and variable names. 2011-09-01 21:45:36 +02:00
Tim Bentley
d4fe9d9e3f Head 2011-09-01 05:47:58 +01: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
Martin Zibricky
b24a73d806 [merge] merge with trunk 2011-08-31 11:12:09 +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
Andreas Preikschat
d85128829e Fix Renderer - again
bzr-revno: 1735
2011-08-30 19:10:52 +01: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
Andreas Preikschat
71bdaf0708 comments 2011-08-30 17:15:39 +02:00
Andreas Preikschat
25ce484fb1 hopefully fixed it now completely 2011-08-30 17:12:16 +02:00
Andreas Preikschat
88704fbc68 fix soft break 2011-08-30 15:35:06 +02:00
Andreas Preikschat
8c6b365684 - fixed formatting tags when slides where split due to a virtual split
- changed variable name

bzr-revno: 1733
2011-08-30 08:40:05 +02:00
Andreas Preikschat
6c7527349d do not use the same name twice 2011-08-29 22:58:32 +02:00
Andreas Preikschat
ccd0a46e2b do not expand the tags 2011-08-29 22:56:07 +02:00
Andreas Preikschat
2b7040a517 r1723 2011-08-29 22:54:20 +02:00
Raoul Snyman
540c717dbb Started work on an audio player with a playlist. 2011-08-29 22:39:15 +02:00
Martin Zibricky
1d05abbe04 Necessary changes for automated gui tests to work.
bzr-revno: 1732
2011-08-29 22:05:06 +02:00
Tim Bentley
39cdfa96cc Head 2011-08-29 20:25:47 +01: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
Stevan Pettit
96076a4bac Removed import receiver 2011-08-29 08:59:19 -04:00
Stevan Pettit
7e48256534 Removed need for signal to run appStartup 2011-08-29 08:47:32 -04:00
Andreas Preikschat
76f97ff915 - replaced 'Ini' in two strings with '*.config'
bzr-revno: 1730
2011-08-29 12:48:47 +02:00
Andreas Preikschat
d061436a35 replaced Ini by config 2011-08-29 08:30:31 +02:00
Andreas Preikschat
565a570d8a r1729 2011-08-29 08:22:34 +02:00
Andreas Preikschat
f046edc615 - fixed bug #796528 (Renderer splits slides twice even when the there is enough space)
- fixed method confusion

bzr-revno: 1729
Fixes: https://launchpad.net/bugs/796528
2011-08-29 08:21:24 +02:00
Raoul Snyman
2658c94520 Add audio file support to updating songs from the service. 2011-08-28 22:58:21 +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
Andreas Preikschat
fc71905735 append text to the last slide (if more than one) 2011-08-28 19:46:52 +02:00
Raoul Snyman
0b81824430 HEAD 2011-08-28 19:45:31 +02:00
Raoul Snyman
015249407d Renamed some of the ItemCapabilities. 2011-08-28 19:45:13 +02:00
Stevan Pettit
bf1d8c239f Added code to mainwindow.py to allow exporting/importing of OpenLP settings to an INI file.
During importing, the selected file is checked to insure it is an OpenLP settings file.
The user is warned prior to the import that changes will be made.

I also changed the settings section of an entry in servicemanager from "service" to "servicemanager".

I changed my nick in about.

Changed the import restart message.
Removed need for "import string".
Fixed the Try:

Changed filetype of export settings file from .ini to .conf

bzr-revno: 1728
2011-08-28 18:41:07 +01:00
Andreas Preikschat
bc1f2d2977 removed wrong line 2011-08-28 18:59:09 +02:00
Andreas Preikschat
2acd1ae2ad added comments 2011-08-28 18:04:18 +02:00