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