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

859 Commits

Author SHA1 Message Date
Jon Tibble
c9491f0085 Cleanup, speedup and another UI library component 
bzr-revno: 1269
 2011-02-04 21:33:23 +00:00
Jon Tibble
dae7dff242 Fix last commit 
Speed up OpenSong bible importer
 2011-02-04 19:58:44 +00:00
Jon Tibble
c3ac82a934 UI library - add_widget_completer 2011-02-04 18:17:28 +00:00
Tim Bentley
b1c9905bf9 1266 2011-02-04 16:39:12 +00:00
Jon Tibble
4101122337 Remove scripts now importers take their role. 
Fix missing import.
More UI library component refactors.
Clean up spacer use in import forms.
More deduplication in slidecontroller.py

bzr-revno: 1266
 2011-02-04 15:03:31 +00:00
Jon Tibble
1ecaab4fa9 Cleanup import wizard spacers 2011-02-03 20:12:06 +00:00
Tim Bentley
2069737e1f remove extra post events 2011-02-03 18:48:41 +00:00
Andreas Preikschat
32b5f0f33d 2011-02-03 18:28:48 +01:00
Andreas Preikschat
aaba4c1b5e fixed Receiver, fixed errorBox 2011-02-03 16:57:36 +01:00
Andreas Preikschat
84611b5da1 r1263 2011-02-03 16:43:40 +01:00
Andreas Preikschat
d962d21138 r1262 2011-02-03 14:42:17 +01:00
Andreas Preikschat
eff7708e00 fixed doc 2011-02-03 14:41:42 +01:00
Jon Tibble
e9ea8fd8cc Dedupe song object checking 2011-02-03 01:55:12 +00:00
Jon Tibble
f4d25560e9 UI library - critical_error_message_box 2011-02-02 23:12:31 +00:00
Jon Tibble
303433a20d UI library - save_cancel_button_box 2011-02-02 19:30:06 +00:00
Jon Tibble
078adca936 Slim down song editer UI 2011-02-02 04:35:26 +00:00
Jon Tibble
0b36143ac2 Slim down song importer UI 2011-02-02 03:32:25 +00:00
Jon Tibble
91540c221a Cleanups and fix song edit form 2011-02-01 18:05:59 +00:00
Jon Tibble
f63b046d9b Fix silly incorrectly formatted name 2011-02-01 01:02:44 +00:00
Jon Tibble
9744d246d6 Deduplication 2011-02-01 00:33:50 +00:00
Andreas Preikschat
74d20ae81b removed blank lines 2011-01-27 19:14:55 +01:00
Andreas Preikschat
3d510596e4 make curosr busy when merging authors/topics/books 2011-01-27 17:59:15 +01:00
Andreas Preikschat
3362fa9a84 removed not needed code 2011-01-27 16:42:11 +01:00
Andreas Preikschat
c030104b3a better wizard form, clean ups, docs 2011-01-27 16:34:52 +01:00
Andreas Preikschat
aa494c9ea3 2011-01-27 16:13:11 +01:00
Andreas Preikschat
e0b6107dd5 clean up 2011-01-26 20:12:14 +01:00
Andreas Preikschat
54e1b8d9b7 clean ups 2011-01-26 17:54:10 +01:00
Andreas Preikschat
ff2dc95123 add lang when exporting, file dialog 2011-01-25 20:27:46 +01:00
Andreas Preikschat
98084cbe2f 2011-01-25 19:35:00 +01:00
Andreas Preikschat
ea83bf26d7 2011-01-25 19:34:17 +01:00
Andreas Preikschat
1d6b7a164a fixed copyright info 2011-01-25 17:56:37 +01:00
Andreas Preikschat
5b680b32f6 2011-01-24 22:00:36 +01:00
Andreas Preikschat
d087bbb53a verseOrder fix 2011-01-24 21:01:09 +01:00
Andreas Preikschat
e7b1f88e53 openlyrics fixes, add meta data to songs, opensong import fix, signals for openlyrics export 2011-01-24 20:36:44 +01:00
Andreas Preikschat
c6505d7e04 2011-01-24 20:31:31 +01:00
Andreas Preikschat
1e0b9cbdd4 2011-01-24 20:27:59 +01:00
Andreas Preikschat
6cf4e9c2d5 openlyrics export (not finished) 2011-01-23 19:04:38 +01:00
Andreas Preikschat
6d1b297310 2011-01-23 17:15:05 +01:00
Andreas Preikschat
b5982dec40 2011-01-23 17:05:46 +01:00
Jon Tibble
ab17e6aaf0 Small OOo refactor, fix last commit 2011-01-21 22:28:34 +00:00
Jon Tibble
f61dbdeef2 Head r1232 2011-01-21 16:17:11 +00:00
Andreas Preikschat
f22df08fde Better button handling 
bzr-revno: 1232
 2011-01-21 16:16:34 +00:00
Jon Tibble
f44b54cec2 Head r1231 2011-01-21 01:18:29 +00:00
Jon Tibble
601621335a Cleanups 2011-01-21 01:17:37 +00:00
Andreas Preikschat
2dc091de47 commit fix 2011-01-20 06:42:44 +01:00
Andreas Preikschat
3a818af9fc empty line 2011-01-19 21:31:14 +01:00
Andreas Preikschat
9504df4f6f docs, comments, better button handling 2011-01-19 21:27:43 +01:00
Andreas Preikschat
da1070468b removed white spaces 2011-01-19 20:37:44 +01:00
Jon Tibble
96833d826a Fix typos 2011-01-19 14:45:03 +00:00
Jon Tibble
e41b6b1f06 Fix duplicate checks (Bug #703149) 2011-01-19 03:46:53 +00:00
Andreas Preikschat
0f0234ba28 - removed the doc for an attribute which is not passed 
- removed white spaces

bzr-revno: 1228
 2011-01-18 20:29:08 +00:00
Jon Tibble
091d604901 Better string fix 2011-01-18 19:31:03 +00:00
Jon Tibble
14d45a0011 Fix verse order saving 2011-01-18 19:11:46 +00:00
Andreas Preikschat
608dbd2537 removed white spaces 2011-01-18 19:53:09 +01:00
Mattias Põldaru
9e02f15995 more fixes, thanks to o123hallo and Meths 2011-01-17 21:09:35 +02:00
Mattias Põldaru
83ca6f4230 more modifications, now this works again 2011-01-17 19:35:19 +02:00
Mattias Põldaru
1863103081 more unknown upstream changes 2011-01-17 18:36:37 +02:00
Jon Tibble
90c742f9ba Fix song validating and saving process 2011-01-17 00:52:00 +00:00
Jon Tibble
a064ad1b05 Head r1218 and fixes 2011-01-15 20:06:25 +00:00
Jon Tibble
284402b7b2 Refactor in existing error framework 2011-01-15 19:24:50 +00:00
Jon Tibble
ee6412e2a0 Refactor error messages 2011-01-15 00:53:12 +00:00
Jon Tibble
2428e9a46a Fix db fix 2011-01-14 21:37:32 +00:00
Jon Tibble
6e2cc7ebff Fix db committing too early (Bug #703073) 2011-01-14 21:19:41 +00:00
Jon Tibble
7490928190 Refactor wizards 2011-01-13 17:55:29 +00:00
Mattias Põldaru
39bd27d0df first working example 2011-01-12 10:59:14 +02:00
Andreas Preikschat
98f0b30014 - added OpenLyrics importer 
- continued to implement OpenLyrics features
- split class
- fix wrong use of "theme"
- and other thinks

Importing songs with multiple languages has not been considered (yet). (One song with all languages is imported.)

bzr-revno: 1203
 2011-01-10 12:21:39 +02:00
M2j
746ab70e5a Head 1201 2011-01-10 00:24:55 +01:00
Andreas Preikschat
ce1241aa0f merged classes together 2011-01-09 17:52:31 +01:00
M2j
ce2ca01eac fixed layout problem for long bible names (or long presentation controller names) 
unified the linebreak in setSizePolicy() calls
 2011-01-09 16:37:45 +01:00
M2j
ef3ae247fc Head 1197 2011-01-09 02:19:34 +01:00
M2j
6e8a371da7 wrong parentship caused theme and servicemanager to disapear in a floating dock 
more intelligent resizing of item list in PluginForm and SongMaintenanceForm
Fix in BS web bible parser
 2011-01-09 01:27:46 +01:00
Andreas Preikschat
f2784fc4dd removed whitespaces 2011-01-08 21:59:46 +01:00
Andreas Preikschat
4d5248cc12 r1197 2011-01-08 21:42:00 +01:00
M2j
dfb2d6be8e Added validators for CCL number and theme name (file name) 2011-01-07 14:43:03 +01:00
M2j
a6566a1f84 reworked GUI layout for the rest of the code 
alignment fix for SearchEdit (visible with Clearlooks theme)
replaced capitalized variable names in touched classes
use codepage selection fallback for the ewimporter
 2011-01-05 18:53:58 +01:00
M2j
6dca24bc3c Head 1189 2011-01-05 18:17:22 +01:00
M2j
92ed275add Alignment fix for SearchEdit 2011-01-05 11:48:47 +01:00
M2j
21340470d3 simplified all setupUi() in plugins 2011-01-04 22:06:50 +01:00
Raoul Snyman
411a60c6c5 Fix for bug #697271 2011-01-04 18:04:55 +02:00
Andreas Preikschat
cc229d05af - add standard verseOrder, if xml does not have any verseOrder property 
- added '_get' and '_text' methods which do the same as 'get' and 'text', but make sure that they never return 'None' (but u'' instead)
- fixed wrong use of 'theme'
- implemented songbooks, songnumber and comment
- clean ups
 2011-01-04 10:46:24 +01:00
Andreas Preikschat
cfb896e3b1 started work on OpenLyrics importer 2011-01-02 17:42:09 +01:00
Tim Bentley
1031ea40d9 Fix Song form clean up for new song having edited previously. 
Fixes: https://launchpad.net/bugs/696362
 2011-01-02 08:03:42 +00:00
Meinert Jordan
487837e615 While walking through the German translation, I observed a couple of problems in the internationalization. These problems are addressed in this branch. There are very few changed translatable strings but a lot which will be recognized as new from linguist. 
I couldn't test all calls in the importers, because I don't have bibles in all formats. But nearly all changes in this request should be obvious.

bzr-revno: 1177
 2010-12-31 19:22:41 +00:00
M2j
599ee1f7fa Lots of i18n fixes and some others. In detail: 
translate() expanded for numbered strings
MediaManager context menus are using the plugins strings instead of own string manipulations
Removed string manipulations from ThemeManager and fixed the delete validation                   
Added disambiguation for some plugin strings to distinguish between name plural and container title
Added or repaired translate() calls at several positions.
 2010-12-31 03:17:41 +01:00
M2j
3ef0098c07 fix bug #695136 2010-12-29 17:35:10 +01:00
M2j
31721c51d6 Theme preview resizing for the ThemeWizard 2010-12-28 22:24:21 +01:00
M2j
557a66db9d ThemeWizard: Show theme name in title and hide themeNameEdit if wizard is in editing mode. 
ThemeWizard: Changed transitionsComboBox to align with the FormLayout.
(change some log.debug() arguments to avoid UnicodeError exceptions)
 2010-12-28 12:18:56 +01:00
M2j
914827c023 same as before for SongImportWidget 
(removing unneccesary format instructions and FormLayout alignment)
 2010-12-27 19:23:46 +01:00
Tim Bentley
e77ce3ffdb Bump values by 1 version or year 2010-12-26 11:04:47 +00:00
M2j
5dddb3a53d typo 2010-12-22 20:03:38 +01:00
M2j
1027d60635 Fix: Bug in editsongform 
Fix: Bug in bibleserver import
 2010-12-22 19:15:48 +01:00
Tim Bentley
47441be28a Fix song edit bug 
Fix Custom wording 693150

Fixes: https://launchpad.net/bugs/693150, https://launchpad.net/bugs/691952
 2010-12-21 19:49:02 +00:00
Tim Bentley
4d18dcbafb Head 2010-12-21 16:33:32 +00:00
Tim Bentley
f1eb140954 Fix song saving error. Reverting 1036 as this is causing an exception in song saving 
Fixes: https://launchpad.net/bugs/691952
 2010-12-21 16:32:46 +00:00
Andreas Preikschat
313343856a f 2010-12-21 14:40:41 +01:00
Tim Bentley
12af5cada3 Fix field name 2010-12-20 14:15:03 +00:00
Tim Bentley
bef5479a6a Fix spacing 2010-12-19 08:22:48 +00:00
Tim Bentley
b553b2ac89 Tighten up the validation 2010-12-18 19:24:44 +00:00
Tim Bentley
47ac10f413 Fix songs with no text being saved 
Fixes: https://launchpad.net/bugs/691952
 2010-12-18 17:28:50 +00:00
Tim Bentley
02645f0457 Songs must have an Author 2010-12-18 17:11:21 +00:00
M2j
e6bc3b9303 song search strings: handle unicode and reindex also search_lyric 2010-12-16 19:20:46 +01:00
Andreas Preikschat
d9768b6536 whitespaces 2010-12-13 15:24:16 +01:00
Tim Bentley
52803af6d3 Add Autocompletion to the Songs Dialog 
Fix up some lost and confused Camels

bzr-revno: 1143
 2010-12-12 14:41:06 +00:00
Tim Bentley
4a7300c6c0 Topic and Book Auto completion 2010-12-12 08:35:02 +00:00
Tim Bentley
031b23ccda Format errors 2010-12-11 20:57:45 +00:00
Tim Bentley
bc0ca88af5 Add Autocompletion for Authors and Themes 2010-12-11 20:31:47 +00:00
Andreas Preikschat
2de4edfe56 disable olp import if importError, songbeamer tweaks 2010-12-11 13:07:38 +01:00
M2j
b465d763cd use the same call as in the Qt sources 2010-12-09 00:33:38 +01:00
M2j
c33654c68c Bug #659019 2010-12-08 23:55:28 +01:00
M2j
3ad231940c HEAD 1127 2010-12-08 09:25:28 +01:00
M2j
62766269f1 - remove None in .split() method 
- change translatable codepage selection strings
 2010-12-08 09:21:17 +01:00
andreas
41c805e607 hanged importer messages (Bug #668789) 
- disabled text search for web bibles (does not matter if the web bible is the dual or normal bible)
- available web bibles in the bible importer are now sorted
- imported bible in the Media Manager are now sorted
- speed improvements (unfortunately this takes the ability to keep unselected item unselected when doing an other search)
- "second" instead of "dual"
- docs, comments
- added an auto completion for bible books ("Quick Search" Tab; "Verse Search" combo box)

bzr-revno: 1129
Fixes: https://launchpad.net/bugs/668789
 2010-12-03 20:45:41 +00:00
andreas
7c65303400 - added the <u>Underline</u> tag 
- clean ups

SongBeamerImport:
- clean ups and tweaks
- fixed a bug which would drop the first line of a verse, when it does not have any "verse type"
- convert SongBeamer's html tags to OpenLP specific style

bzr-revno: 1128
 2010-12-03 20:42:56 +00:00
Andreas Preikschat
6b1254e923 trunk r1127 2010-12-02 15:00:32 +01:00
andreas
c8fe3ceb67 - docs 
- disable "edit" and "delete" button when loading a song or creating a new one (*)

(*) To reproduce this, edit/create a song, select a verse and click "Cancel". When you edit/create another song, the "edit" and "delete" buttons are enabled.

Manually fix conflict in comments on merge (trb143)

bzr-revno: 1127
 2010-12-02 09:11:34 +00:00
Tim Bentley
cc9ef10821 Songs get created correctly and displays refreshed 2010-11-29 16:02:41 +00:00
Andreas Preikschat
8929aaaa23 docs; make sure, that the edit/delete buttons are always disabled after loading the window 2010-11-28 16:10:51 +01:00
Tim Bentley
1cf4914862 fixes from last merge and more code for song management 2010-11-27 20:51:54 +00:00
Andreas Preikschat
66f230169d SongBeamer import clean ups and tweaks 2010-11-26 15:23:48 +01:00
Andreas Preikschat
e4e2892ec7 trunk r1119 2010-11-21 12:00:37 +01:00
Tim Bentley
94fb7d49d6 Remove stray print statements 2010-11-18 17:57:51 +00:00
M2j
4ccb48ffce HEAD 1114 2010-11-12 14:40:24 +01:00
Andreas Preikschat
f8b793ca3b removed whitespaces, added second blank line before class 2010-11-09 18:10:37 +01:00
M2j
4294ae83b8 split song verse order at consecutive whitespaces and not just u' ' 2010-11-04 20:32:43 +01:00
Andreas Preikschat
f4b86d1f14 songmanager -> manager, fixed traceback 2010-11-03 19:18:44 +01:00
Raoul Snyman
baaa7e0508 Updated documentation. 
Renamed the import wizards to match the general form naming convention.
Removed an unnecessary class.
 2010-10-16 21:38:23 +02:00
Andreas Preikschat
aab9d1b2ca docs 2010-10-12 18:47:53 +02:00
Andreas Preikschat
0cefed0eb5 onVerseTypeComboBoxChanged 2010-10-11 19:29:03 +02:00
Andreas Preikschat
35fdbdeee8 fix for bug #657694 and some code enhancements 2010-10-11 17:26:48 +02:00
Andreas Preikschat
421577f8ce make sure that the 'edit' and 'delete' buttons are disabled after editing all verses 2010-10-10 14:14:12 +02:00
Philip Ridout
274b3b9253 Removed the xml filter for OpenSong 2010-10-05 22:32:03 +01:00
Philip Ridout
40d06d492b and added some u's before "'"'s 2010-10-05 20:47:35 +01:00
Philip Ridout
e81efb84f6 Removed extension checking in wow import as this is handled by the filters in the open dialouge box. Instead, check the the header to ensure that the file is a wow song file regardless of ext. 
Corrected open song import extension.
 2010-10-05 20:41:54 +01:00
Philip Ridout
881cb4e3c3 Added file extension checking to words of worship import 
Added the ability for importers to specifiy file fillters, and added the relevent filters for most importers (the ones where I could easily find the file ext, still need easiworship and song beamer, and maybe a few others!)
 2010-10-03 23:28:47 +01:00
rimach
5049aab6d2 Changes for SongBeamer Import 2010-09-27 06:51:16 +02:00
Jonathan Corwin
3615fe5d13 Fix save/load of songnumber/book 2010-09-25 12:55:01 +01:00
Raoul Snyman
697cc79b3a Fix bug #598805 2010-09-24 22:54:52 +02:00
Jeffrey S. Smith
e99ebe64c7 Replace disablable with can_disable. Change obj_prefix default 2010-09-23 14:23:56 -05:00
rimach
9111a1885e add SongBeamer import 2010-09-23 21:01:52 +02:00
Jeffrey S. Smith
29cfa96ce8 Factorize code for making song import wizard pages 2010-09-22 10:01:37 -05:00
Raoul Snyman
c235b793b0 Fix bug #644106 
Fix a related bug in the song importer.
 2010-09-21 20:12:46 +02:00
Jeffrey S. Smith
d4a1b7f796 Added a song importer for EasyWorship 2010-09-20 13:22:57 -05:00
Jonathan Corwin
93b2d54c92 String fixes 2010-09-18 16:24:39 +01:00
Raoul Snyman
1e5645995c Some more spelling/grammatical corrections. 2010-09-17 22:06:41 +02:00
Raoul Snyman
794493d0d1 Fixed bug #640460. 2010-09-17 21:02:25 +02:00
Raoul Snyman
ef9684320c HEAD 2010-09-14 22:34:44 +02:00
Raoul Snyman
2f33ae1bab Add in code to display a disabled message if an importer is not available. 2010-09-14 22:33:33 +02:00
Raoul Snyman
0a84fc0bcc Added extra labels to show that an item is disabled. 
Added functionality to the SongFormat class to keep track of availability of importers.
 2010-09-13 23:09:13 +02:00
Raoul Snyman
d4a0171203 HEAD 2010-09-13 07:16:16 +02:00
Raoul Snyman
b8893f4ab2 Merge in the openlp.org 1.x importer. 
bzr-revno: 1017
 2010-09-08 06:57:13 +02:00
Tim Bentley
4c648f142c Fix song editing display bug 
Fixes: https://launchpad.net/bugs/630247
 2010-09-07 17:12:47 +01:00
Raoul Snyman
60fa82b78c Fix bug #598805 2010-09-07 15:23:02 +02:00
Raoul Snyman
f30aecfd46 A couple of bugfixes. 2010-09-07 00:02:48 +02:00
Raoul Snyman
035bf7577f Update some strings, fix up the layout in the edit song dialog. 2010-09-06 07:54:51 +02:00
Tim Bentley
04cfa6a730 Move spell and tag dialog to it"s own file 2010-09-04 09:12:54 +01:00
Derek Scotney
56b5a037ae Conflicts resolved 2010-09-01 22:20:27 +02:00
Philip Ridout
7e0245344a Adding the Words of Worship importer. 
bzr-revno: 1001
 2010-09-01 07:11:31 +02:00
Jon Tibble
0abf1597eb Fix trunk merging 2010-08-28 20:54:50 +01:00
Jon Tibble
168033566a Head r997 2010-08-28 20:40:27 +01:00
Jon Tibble
066a97f4d7 Really fix song maintenance as subform (Bug #612282) 2010-08-28 20:32:24 +01:00
Tim Bentley
618813f020 Display and renderer changes 
bzr-revno: 997
 2010-08-28 17:35:16 +01:00
Derek Scotney
80ded239a8 Changes to CCLI file importer to work with import wizard 2010-08-28 15:15:12 +02:00
Jon Tibble
000d23f7c6 Cleanup long lines 2010-08-28 02:31:11 +01:00
Jon Tibble
bb31492609 Fix song maintenance as subform (Bug #612282) 2010-08-27 23:49:27 +01:00
Philip Ridout
6b6da86c54 wow_import implemented in to import wizard 
bug fix in wizzard, so that it starts from the first page if used previously
bux fix in importer, so that it resets the defualts after commiting a song to the db
 2010-08-27 20:53:22 +01:00
Jon Tibble
6266c3369e Cleanup the OpenLPv2 song importer 2010-08-27 16:25:29 +01:00
Derek Scotney
ab7cd33c8d Updates to CCLI handling 2010-08-26 21:45:09 +02:00
Tim Bentley
ca58541cb5 Head993 2010-08-26 16:50:11 +01:00
Jon Tibble
06fd68b3d8 Cleanups & fix version check 2010-08-26 01:37:25 +01:00
Tim Bentley
492389b715 Head990 2010-08-25 18:08:36 +01:00
Raoul Snyman
8b141b0942 Fixed the couple of issues Jon T. pointed out. 2010-08-24 21:08:57 +02:00
Raoul Snyman
78889633f6 Changed incrementProgressBar again slightly so that passing a blank string or None to the text will not update the text. 2010-08-24 17:31:33 +02:00
Raoul Snyman
70cd4bc700 Added an extra argument to the incrementProgressBar function so that an increment can be specified (like 0, if you don't want an increment). 2010-08-24 17:28:45 +02:00
Raoul Snyman
25f6bb33e7 Made changes suggested/requested by Jonathan C. 2010-08-24 17:25:26 +02:00
Raoul Snyman
788e8a2b55 Fixed a problem with the getListOfFiles function which was returning a list of repr'd QListWidgetItems instead of a list of strings. 
Made a SongFormat.ccli -> SongFormat.CCLI after renaming some fields caught this too.
 2010-08-24 10:08:07 +02:00
Raoul Snyman
ef44dc72c6 Changed the Generic importer to multifile as well. 2010-08-23 21:29:39 +02:00
Raoul Snyman
6d0b229860 Merge from HEAD. 
Add file I forgot to add previously.
Change Songs Of Fellowship importer to multi-file.
 2010-08-23 19:36:42 +02:00
Raoul Snyman
530530d791 Got the song wizard working. Pity none of the importers seems to work at the moment. 2010-08-22 21:50:30 +02:00
Tim Bentley
f705b69e20 Spellchecking of songs and custom 2010-08-22 08:05:05 +01:00
Tim Bentley
9f4066bf3f More fixes and update song editing 2010-08-21 20:35:32 +01:00
Raoul Snyman
3d478ec975 Song Wizard! 2010-08-20 21:40:07 +02:00
Raoul Snyman
d992fb1e07 First add and delete buttons working! 2010-08-08 16:38:51 +02:00
Andreas Preikschat
23022c095d improved button behaviour 2010-07-31 13:52:17 +02:00
Jon Tibble
c9edfb9508 Cleanup QMessageBoxes using defaults 2010-07-31 03:06:44 +01:00
Jon Tibble
003cfd1e68 Fix unused var and standardise loop vars 2010-07-30 17:13:17 +01:00
Jon Tibble
37b2304eeb Trailing new lines 2010-07-27 10:32:52 +01:00
Raoul Snyman
2f2b339863 Update the copyright notice. 2010-07-25 00:10:47 +02:00
Raoul Snyman
651ee535f6 Hopefully the last of the string fixes. 2010-07-23 21:17:36 +02:00
Andreas Preikschat
5b0ca457a1 Fix song authors and books 
bzr-revno: 958
 2010-07-21 14:31:25 +01:00
andreas
c4a59586a6 improvement + fix 2010-07-21 15:13:03 +02:00
andreas
2691636e71 fixed Song Book publisher 
fixed Authors like "0123hallo" which cannot be splitted
 2010-07-21 12:30:29 +02:00
Jon Tibble
3560277684 Cleanups 2010-07-20 21:43:42 +01:00
Jon Tibble
425b80d57a DATABASE SCHEMA CHANGE, fixes and cleanups 
bzr-revno: 956
 2010-07-20 20:46:04 +01:00
Jon Tibble
ee4802735d Fix topic/author adding (Bug #607034) 
bzr-revno: 955
 2010-07-20 18:03:04 +01:00
andreas
99fc77d4dc head953 2010-07-20 18:45:45 +02:00
Jon Tibble
cb431fea2a Fix song object creation (Bug #607034) 2010-07-20 16:22:05 +01:00
Jon Tibble
1738040b87 Save Song Book (Bug #607030) 2010-07-20 12:02:03 +01:00
Jon Tibble
11c90c3eb7 Fix song book form ampersands 2010-07-20 09:37:15 +01:00
Jon Tibble
42cff45762 Complete refactor for new code 2010-07-19 21:45:53 +01:00
Jon Tibble
7691418bc3 Head r952 and cleanups 2010-07-19 21:43:02 +01:00
andreas
978372ca9f added check preventing adding a topic/author twice to the song 2010-07-19 20:34:03 +02:00
andreas
6eb260a64e fix 2010-07-19 17:03:49 +02:00
andreas
dd662dc277 now filtering songs 2010-07-19 16:56:24 +02:00
andreas
a21154addc names 2010-07-19 15:39:18 +02:00
andreas
30cbaafb09 fixed comment 2010-07-19 12:17:41 +02:00
andreas
3502149556 reworked code 2010-07-19 10:50:44 +02:00
Jon Tibble
dd8c6f378b Fix alt title field 2010-07-19 09:50:16 +01:00
andreas
1a462e1a65 reverted changes 2010-07-19 09:54:57 +02:00
andreas
2009e95ff0 head 2010-07-19 09:51:20 +02:00
Jon Tibble
f71f27c890 Database refactor 2010-07-19 00:37:24 +01:00
Jon Tibble
bf71742308 Head r950 2010-07-18 15:36:59 +01:00
Jon Tibble
f964c5d1ce Add alternate_title field 2010-07-17 18:36:03 +01:00
andreas
d0e914a681 name standardisation + reloads song list after author(s) have been edited/merged 2010-07-17 18:03:59 +02:00
andreas
c7f32e280c docs 2010-07-17 17:10:46 +02:00
andreas
f458f80ce2 added check to prevent an author/topic being associated (with one song) twice (causing an error) 2010-07-17 17:01:47 +02:00
andreas
dacfe58bea continued working on 'merging' song books, topics, authors (still not finished) 2010-07-17 13:49:54 +02:00
andreas
94660ee798 continued working on 'merging' song books, topics, authors (NOT finished yet) 2010-07-17 11:55:48 +02:00
andreas
b844687abd head947 2010-07-17 11:27:45 +02:00
Jon Tibble
096e0e8b61 Fixes and cleanups 2010-07-16 23:36:53 +01:00
Jon Tibble
c7904f613e Fix set_last_dir call 2010-07-16 22:32:36 +01:00
Jon Tibble
65d5f89302 Fix English and alignment 2010-07-16 19:53:49 +01:00
andreas
1f3656f792 continued working on 'merging' song books, topics, authors (NOT finished yet) 2010-07-16 20:20:18 +02:00
andreas
fedde147ae started working on 'merging' song books, topics, authors (NOT finished yet) 2010-07-16 18:39:18 +02:00
andreas
e11ebea963 error messages changes 2010-07-16 15:22:53 +02:00
Jon Tibble
897929967a Add Theme fix and form tab ordering 2010-07-16 13:31:47 +01:00
andreas
eaf2f568f4 error messages added 2010-07-16 11:00:20 +02:00
andreas
75f9f809a8 use database for checking 2010-07-12 15:18:07 +02:00
andreas
488ead8162 cleanup 2010-07-11 15:23:12 +02:00
andreas
0623d2bb4e fixes for merge 2010-07-10 23:44:43 +02:00
andreas
931f572a4e spelling mistakes 2010-07-10 23:39:54 +02:00
andreas
ab179f8e12 fixes for merge 2010-07-10 23:26:09 +02:00
andreas
d6fe2d1c9f oppps... spelling 2010-07-10 20:19:54 +02:00
andreas
639ce2bfbc fixed double whitespace 2010-07-10 19:30:01 +02:00
andreas
1b536ab0c8 Books, Topics and Authors redundancy imporvements. 2010-07-10 19:02:42 +02:00
Jon Tibble
1b9830429b Use build_icon 2010-07-08 12:46:03 +01:00
Jon Tibble
aa390e9831 Cleanups 2010-07-03 22:50:42 +01:00
Jon Tibble
1e4a11f4e5 XML: Objecify it to make it run 2010-07-03 18:46:00 +01:00
Jon Tibble
497d1c9dc9 XML: Put it where it should be 2010-07-03 02:33:40 +01:00
Tim Bentley
0656b34df9 Cleanups 2010-07-02 19:21:45 +01:00
Jon Tibble
079d72f93f Database refactoring 2010-06-30 23:05:51 +01:00
Jon Tibble
19ff5dec55 Refactor database code 
bzr-revno: 894
 2010-06-28 20:12:08 +01:00
Jon Tibble
3be57e57e7 Rename method to save_object() 2010-06-28 14:38:29 +01:00
Jon Tibble
f0896422d4 Fix off-by-one in song saving 2010-06-28 13:43:14 +01:00
Jon Tibble
ad9328a30f RFC: Fix couple of leftovers 2010-06-28 12:24:18 +01:00
Jon Tibble
01421770ed Head r883 2010-06-25 19:14:38 +01:00
Frode Woldsund
5c5427d963 Merged with current trunk and used '\xa9' as (c) symbol 2010-06-25 10:07:51 +02:00
Jon Tibble
585ffbdc6d Head r881 2010-06-25 01:30:26 +01:00
Jon Tibble
ca7f3eb599 Fix and add some ampersands 2010-06-24 16:28:42 +01:00
Frode Woldsund
56f87c3a35 Fixed (c) symbol 2010-06-23 15:39:36 +02:00
Jon Tibble
43a4eaed96 Head r872 2010-06-22 15:34:03 +01:00
Tim Bentley
a4d7ae1600 Final extermination of translate u"s 2010-06-21 19:28:36 +01:00
Raoul Snyman
74767e3874 Merge from trunk 2010-06-21 18:47:34 +02:00
Raoul Snyman
6c1b5a6fad Updated the majority of the translate() functions. 
Removed .qm files.
Ignore .qm files.
 2010-06-21 18:43:59 +02:00
Jon Tibble
e7b4e16405 Couple o' Cleanups 2010-06-20 14:03:06 +01:00
M2j
888bc50622 fixes 2010-06-20 08:48:32 +02:00
M2j
8e25f3850e corrected one string 2010-06-20 01:58:42 +02:00
M2j
87c21201e7 HEAD 2010-06-20 01:31:32 +02:00
M2j
3061c319d5 Automatic verse order entry expanding 
deleted a misplaced QSpacerItem
 2010-06-20 01:16:15 +02:00
M2j
735ae40996 single character verse entries 2010-06-19 23:54:53 +02:00
Jon Tibble
2d050b07db Head r858 2010-06-19 12:53:20 +01:00
Jon Tibble
14cafa91c2 Complete openlp.migration removal 
bzr-revno: 858
 2010-06-19 12:42:33 +01:00
Tim Bentley
0a3bf10fb9 Translation updates 
Remove Text over video for now.
Fix song editing bug

bzr-revno: 856
Fixes: https://launchpad.net/bugs/596211
 2010-06-19 12:02:18 +01:00
Tim Bentley
cf73f77e0d Fix bug #596211 2010-06-19 11:37:58 +01:00
Jon Tibble
f7fb45e69e Complete openlp.migration removal 2010-06-18 23:13:10 +01:00
Raoul Snyman
a616a7d160 - Fixed a problem where authors with null names in the db were not editable. 
- Fixed the add author shortcut on the edit song form to split up the author's name so that the above error doesn't occur.
- Made the Clear Search button run a blank search (which is what the user expects).
 2010-06-19 00:09:41 +02:00
Raoul Snyman
d48daa2c98 Added last bits of streamlining of Song Maintenance form. 2010-06-18 21:55:45 +02:00
Raoul Snyman
cc2db3a5f4 Merge from trunk 2010-06-18 18:44:10 +02:00
Jon Tibble
5dc87d3ede Cleanups 2010-06-17 22:07:01 +01:00
Jon Tibble
37dd8888ca Head r847 2010-06-15 16:43:52 +01:00
Meinert Jordan
48619f72cc Various i18n fixes. 
bzr-revno: 847
 2010-06-15 17:22:26 +02:00
Jon Tibble
e71caf43e7 Head r846 2010-06-14 19:22:08 +01:00
Raoul Snyman
b5aa2f86f9 Added in dynamic adding of authors and topics to the song edit form. 2010-06-13 22:29:47 +02:00
Raoul Snyman
4af5e1d8ef Tidied up the UI of the Song Maintenance Dialog to make it look good on all OSes. 2010-06-13 20:28:59 +02:00
Jon Tibble
54aa8958fe RFC PT2: Refactor Manager 2010-06-13 00:00:14 +01:00
Jon Tibble
13c646153f Keep library classes/methods in lib dirs 2010-06-12 13:33:04 +01:00
Jon Tibble
55f6197212 RFC: Refactor database setup code 
A possible way to refactor database code to remove code duplication and,
I hope, provide a simpler, more intuitive model to be copied by others
 2010-06-12 02:52:04 +01:00
Jon Tibble
78114b8063 Apply docstrings feedback 2010-06-10 20:45:02 +01:00
Jon Tibble
7ddaff2843 Head r839 2010-06-10 17:36:49 +01:00
Jon Tibble
31c3be39e4 Remove old song import/export forms 2010-06-10 14:18:08 +01:00
M2j
f8580333bd realized too late, that you may not test for NoneType 2010-06-10 11:10:54 +02:00
M2j
0229b362af phrase verse index decoding more pythonish 2010-06-10 11:05:56 +02:00
Jon Tibble
8d059fb84e Add DocStrings 2010-06-10 02:57:59 +01:00
M2j
50f123490f fix: verses in comboBox of editverseform 2010-06-09 23:50:55 +02:00
M2j
8296b8dc84 Additional translatable strings 
Removed string_to_unicode and variant_to_unicode
 2010-06-09 23:15:37 +02:00
M2j
940c6fd44f Set theme and service file content to UTF-8 
Replaced replaced all non-ASCII chars in the sources (exept of comments)
Fixed theme background images bug
 2010-06-09 21:10:57 +02:00
Jon Tibble
559e4c4d63 Cleanups 2010-06-08 16:38:09 +01:00
Frode Woldsund
2df6bf5ef5 Fixed some wrong translate context and some indentation errors 2010-06-07 23:36:22 +02:00
Frode Woldsund
23ac93019a Merged the trunk into my tree 2010-06-07 00:30:11 +02:00
M2j
761f30ec00 fix: set editverseform comboBox only for valid verse names 2010-06-06 21:56:41 +02:00
Tim Bentley
b624ba0ed0 Fixed for now - could be better 2010-06-06 18:03:48 +01:00
Tim Bentley
950dc73d2b try again and fix from last merge 2010-06-06 17:25:39 +01:00
Tim Bentley
cb35fb7be4 Head832 + fix 2010-06-06 16:59:01 +01:00
Frode Woldsund
6e1ef3cc70 Fixed translate() function in songsPlugin and songusagePlugin 2010-06-06 16:22:00 +02:00
Tim Bentley
0e5450f9d1 Fix tag error 2010-06-06 13:39:13 +01:00
M2j
604a6d0c77 identify button from object name 
revert some only cosmetic changes
 2010-06-06 12:15:12 +02:00
Frode Woldsund
dc35faf1ae Fixed all errors from the feedback I got from IRC 2010-06-06 12:07:48 +02:00
Tim Bentley
4714502f67 Clean up song imports 2010-06-06 08:28:07 +01:00
Tim Bentley
e06556489e Finish converting tags 2010-06-06 07:40:08 +01:00
M2j
5a238e663b string recoding cleanups 2010-06-06 01:05:53 +02:00
Tim Bentley
3bfa515c12 Verse Translations part 2 - fixed 2010-06-05 21:12:13 +01:00
Tim Bentley
af3932f182 Verse Translations part 2 - revised 2010-06-05 21:00:50 +01:00
Tim Bentley
9d4cb86a6e Verse Translations part 1 2010-06-05 18:48:26 +01:00
Tim Bentley
7bf8e71acf Song editing cleaned up 2010-06-05 16:46:14 +01:00
Tim Bentley
c022e6a89f Fix cursor position 2010-06-05 15:29:06 +01:00
Tim Bentley
4b0dc2a83f Head831 2010-06-05 14:28:53 +01:00
Tim Bentley
2143a24182 tidy ups 2010-06-05 14:28:34 +01:00
M2j
262d125b00 HEAD 2010-06-03 12:28:54 +02:00
M2j
ffcdddf928 fixing string encoding in songmaintenanceform 
making verses w/o index a alias for the first one
 2010-06-02 17:33:55 +02:00
Frode Woldsund
3be909c5c0 Replaced { self.trUtf8() } with { translate() } which is the new standar. I also imported the translate library on the following files. I did not remove any import sinse I do not know how this { self.trUtf8() } does work. 2010-06-01 00:06:16 +02:00
Jon Tibble
fb1e222422 Moar whitespace, exceptions and naming 2010-05-29 20:50:50 +01:00
Jon Tibble
d33a719172 Imports for declared exceptions 2010-05-27 21:56:34 +01:00
Jon Tibble
e195f0ffb7 Match method and overridden method arguments and cleanups 2010-05-26 00:47:26 +01:00
Jon Tibble
871640c374 Whitespace 2010-05-25 17:16:43 +01:00
Jon Tibble
e29f3d30c0 Remove unnecessary semicolons 2010-05-25 16:35:34 +01:00
Jon Tibble
3e9176d8c9 Head r820 2010-05-20 22:02:53 +01:00
Jon Tibble
c8b6a3640d Import fixes 2010-05-20 17:49:47 +01:00
Tim Bentley
38290cb804 Head819 2010-05-20 17:43:18 +01:00
Tim Bentley
cd8f59c7d0 Remove extra blank line 2010-05-20 17:40:56 +01:00
Tim Bentley
0dfda8ff27 Finish tagging the songs 2010-05-18 20:29:40 +01:00
Raoul Snyman
09bcb066eb HEAD+fixes 2010-05-17 22:48:16 +02:00
Tim Bentley
d86f0285c9 Song Edit tableisation 2010-05-17 19:39:28 +01:00
rimach
850b4a507f correction for last merge proposal 2010-05-01 22:01:32 +02:00
rimach
4e296bfb5f changes 2010-05-01 21:45:06 +02:00
Jon Tibble
b81160768b Coding style fixes 2010-04-30 22:00:17 +01:00
rimach
190a6d4819 Head 2010-04-30 22:03:26 +02:00
rimach
181c19d112 futher changes 2010-04-27 22:54:55 +02:00
rimach
95a1419d9c Head 2010-04-25 21:29:39 +02:00
rimach
b83d115738 Copyright character solution 2010-04-22 19:27:26 +02:00
Jonathan Corwin
40e6289102 head 2010-04-20 23:12:04 +01:00
Jonathan Corwin
29e4d4cf1a event fixes 2010-04-20 23:00:55 +01:00
Raoul Snyman
b45dcc6b81 Added autocompletion to the topics, songbooks and themes. 2010-04-19 07:31:31 +02:00
Raoul Snyman
7e747f7cc9 Added autocompletion to the Authors combobox. 2010-04-19 07:22:56 +02:00
Jonathan Corwin
bc6b7a8488 signal/slot refactor part 1 2010-04-16 08:31:01 +01:00
Tim Bentley
b51998c760 Replace missing tags 2010-04-06 19:26:25 +01:00
Tim Bentley
5b9229777d fixes 2010-04-04 14:16:01 +01:00
Raoul Snyman
513b7a10b7 Reworked the verse dialog. 2010-04-04 01:00:05 +02:00
Tim Bentley
4eca8e265a Consistancy 2010-04-03 12:59:17 +01:00
Tim Bentley
10c3c54db2 Correct error message 2010-04-03 12:11:57 +01:00
Tim Bentley
18eb768f2f Sort out multiple Chorus tags 2010-04-03 09:04:41 +01:00
Raoul Snyman
f955c8d096 Added a SongXML class to read the lyrics of songs. 2010-04-03 02:13:07 +02:00
Raoul Snyman
20636bf655 Wizard works, though not functional. 2010-04-02 22:03:51 +02:00
Raoul Snyman
21b6bedcb4 First go at the Song Import Wizard. 2010-04-02 14:23:40 +02:00
Tim Bentley
d2b56fc719 Basic verse counting 2010-03-27 07:16:39 +00:00
Tim Bentley
097a414c59 oops string bug 2010-03-27 07:03:12 +00:00
Tim Bentley
611ae15790 Fix up tag editing 2010-03-27 07:01:50 +00:00
Tim Bentley
b90169a129 Song editing improvements 2010-03-26 21:04:50 +00:00
Jon Tibble
fe1755c25f Head r760 2010-03-23 19:56:25 +00:00
Raoul Snyman
2c325d718b Changes: 
- Consolidated common icons for a slightly smaller resource file.
- Changed the Import Bible icon to an import icon.
- Merge from head.
 2010-03-23 21:04:15 +02:00
Jon Tibble
310f790e8e Some head 2010-03-23 15:14:20 +00:00
Raoul Snyman
ea5ceaf00a Updated copyright. 
Updated credits.
 2010-03-22 01:58:01 +02:00
Jon Tibble
2f840944e9 Unused variable fixes 2010-03-21 15:55:45 +00:00
Tim Bentley
cd873b9196 add full stops 2010-03-12 07:31:59 +00:00
Tim Bentley
2607d23c00 String more strings and song edit error 2010-03-11 21:01:19 +00:00
Tim Bentley
e092dc85cd Song edit bug - save and preview on new song 2010-03-11 12:53:20 +00:00
Jon Tibble
5947f58cf6 Head r717 2010-02-27 15:13:28 +00:00
Tim Bentley
86e03f0c11 Move editing to line 2 2010-02-27 10:10:03 +00:00
Tim Bentley
1979f24502 Fix song editing where text is lost 2010-02-27 09:55:44 +00:00
Jon Tibble
2185f4e842 Remove C-style semi-colons 2010-02-26 23:47:59 +00:00
Tim Bentley
edc46f2967 Fix songs so tagging can work > 10 verses. Tested with 100! 2010-02-09 16:09:57 +00:00
Tim Bentley
18760262ab Edit Cancel updating song by accident 2010-02-07 20:11:37 +00:00
Tim Bentley
00e84d40f3 Cleanups and fix alerts for Presentations 2010-02-06 08:04:01 +00:00
Raoul Snyman
b4b075c961 Updated copyright year. 2009-12-31 14:52:01 +02:00
Tim Bentley
f7f0f18142 Fix bug with Verse Tags being lost when expanding or contracting the verse edit list 2009-12-13 08:28:51 +00:00
Tim Bentley
480fc4771f Fix up song tagging so case does not matter 
Fix bug in transitions when using images
Remove MediaTab as not wanted
 2009-12-05 08:05:11 +00:00
Tim Bentley
b8149cc826 Fix up Icon code to use isinstance 
Fix up code to ignore cases when doing tests.
 2009-12-04 20:25:48 +00:00
Tim Bentley
547074d29a Verse tagging verses must be in format of vX 2009-12-04 18:52:44 +00:00
Tim Bentley
156a70208b Add new types to verse editing 
Clean up dialog so looks better
Add controls around the editor in terms of validation
 2009-12-02 08:35:02 +00:00
Michael Gorven
9f5d1956ac Merge lp:~mgorven/openlp/copyright-symbol: Fix copyright symbol in translation strings. 
https://code.launchpad.net/~mgorven/openlp/copyright-symbol/+merge/15399

bzr-revno: 683
 2009-12-01 09:13:35 +02:00
Raoul Snyman
f5bee07341 Added Michael to the copyright notice. 
Fixed a bug where Media Manager item toolbar buttons were becoming toggle buttons.
Cleaned up config settings.
Miscellaneous other bugfixes.
 2009-11-30 22:29:26 +02:00
Michael Gorven
ba89e6e1a2 Fix copyright symbol in translation strings. 2009-11-30 08:39:36 +02:00
Tim Bentley
8036cbf077 Head678 2009-11-29 19:03:20 +00:00
Tim Bentley
f46cd2c6cb Song validation changes 2009-11-29 18:21:40 +00:00
Tim Bentley
ff8ab8f14f Fix song editing validation 2009-11-29 14:06:41 +00:00
Tim Bentley
2247d01d6f Verse Tag editing - Add, Edit, Edit All and save work 2009-11-28 07:50:12 +00:00
Tim Bentley
23d945a454 Replace phonon code, add framework for transitions 2009-11-28 06:49:53 +00:00
Tim Bentley
ab5b0ee0d5 Amended plugin to use correct stat values 
Fixed bible media item to initialise in correct order
Fixed servicemanager to use correct methods on service loading
Sorted out lots of issues tagging the song verses
 2009-11-27 21:54:37 +00:00
Raoul Snyman
d0832a2c86 Changed all the trUtf8(u'...') to trUtf8('...') 2009-11-26 20:43:49 +02:00
Tim Bentley
1d359c7503 More Song tagging fixes 2009-11-26 18:41:39 +00:00
Tim Bentley
fe2d35a937 More song tagging changes - fixes 2009-11-23 17:54:47 +00:00
Tim Bentley
5e2beba4ea More song tagging changes 2009-11-23 17:28:21 +00:00
Tim Bentley
50aa143446 Save verse details 2009-11-22 20:51:52 +00:00
Tim Bentley
388a596922 Add verse number code to song plugin 2009-11-22 20:33:39 +00:00
Raoul Snyman
1d80bb6229 Attempt to fix recursion in blanking. 
Fixed all the Receiver.send_message instances to stop instantiating the Receiver class.
 2009-11-13 23:24:59 +02:00
Tim Bentley
03607395eb Song editing utf8 fixes part 2 2009-11-04 19:13:49 +00:00
Tim Bentley
3929792bea Headr655 2009-11-04 18:53:19 +00:00
Tim Bentley
f4d373e7a5 Song editing utf8 fixes part 1 2009-11-04 18:53:05 +00:00
Jon Tibble
2136155f48 Fix theme loading and song editing 2009-11-04 01:16:15 +00:00
Jon Tibble
c2a0944e6b More truth testing cleanup - plugins 2009-11-03 19:01:53 +00:00
Tim Bentley
8751433da8 Fixes from last few merges 2009-11-01 21:02:31 +00:00
Tim Bentley
7a349c998e Fix up handling of service items in the slide controllers and stop editing issues 2009-10-31 20:27:08 +00:00
Tim Bentley
4eaa7a1535 Finish remote editing of ServiceManager by updating live 2009-10-31 08:45:24 +00:00
Tim Bentley
48e750ded2 Add Save service on New code, and configuration to turn it off. 2009-10-30 20:14:55 +00:00
Tim Bentley
0d959fbfb1 Song Edit Preview button only active from Preview, Reset Theme Editor image text Edit 2009-10-30 06:43:28 +00:00
Tim Bentley
302d29ea85 More remote edit changes 2009-10-29 13:44:33 +00:00
Tim Bentley
0ffbc050de Songs now have remote edit working 2009-10-29 09:18:26 +00:00
Tim Bentley
03ba804be7 Biblegateway addition 2009-10-27 07:20:01 +00:00
Tim Bentley
3ee930f6ae Fix Line split code. Stop SlideController being editied 2009-10-26 16:19:26 +00:00
Tim Bentley
6dd0db436e Split if line contains 3 --- can allow for spaces at end of line 2009-10-26 08:23:43 +00:00
Tim Bentley
3f69bb7635 "Save and Preview" added to Song editor 2009-10-25 18:07:23 +00:00
Jon Tibble
aeb75d2056 Fix imports and typo 2009-10-24 17:40:36 +01:00