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

1103 Commits

Author SHA1 Message Date
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
Andreas Preikschat
a51ad14322 removed OpenLyrics export for now 2011-01-08 21:35:31 +01:00
Tim Bentley
8ea5187543 Head 2011-01-07 18:58:06 +00:00
M2j
dfb2d6be8e Added validators for CCL number and theme name (file name) 2011-01-07 14:43:03 +01:00
Andreas Preikschat
68c550cd71 -basic work for OpenLyrics exporter (songexport wizard is missing) 2011-01-06 14:01:30 +01:00
Andreas Preikschat
fc21428499 fixed docs 2011-01-06 10:34:26 +01:00
Andreas Preikschat
94e14bbb20 - replenish docs 
- moved more code in methods
- improved verse_order detection
 2011-01-06 09:13:45 +01:00
M2j
4fd5d7546e Head 1191 2011-01-05 20:58:31 +01:00
Tim Bentley
a83da28437 Head1191 2011-01-05 19:54:27 +00:00
Andreas Preikschat
b4dfeca4d7 2011-01-05 20:34:56 +01:00
Andreas Preikschat
787b4e2a58 Remove not supported html from songs being imported. 
bzr-revno: 1191
 2011-01-05 19:32:06 +00: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
Tim Bentley
833d31ddb0 Head 2011-01-05 16:57:49 +00:00
Meinert Jordan
e65898fcec Fix Layout of Settings Tab and other dialogs 
bzr-revno: 1189
 2011-01-05 16:54:44 +00:00
M2j
71f6bc26dc basicaly reworked the layout of the mediaitems and renamed variables to fit the standard 2011-01-05 17:50:28 +01:00
Andreas Preikschat
09e2fb7691 clean up 2011-01-05 17:45:29 +01:00
Andreas Preikschat
4246c3b76e - added documentation 
- commented not needed class out
- split class 'OpenLyricsParser'
- relocated and imporved some code in methods
 2011-01-05 17:31:04 +01:00
M2j
92ed275add Alignment fix for SearchEdit 2011-01-05 11:48:47 +01:00
Andreas Preikschat
449610d50e - fixed author wihtou first_name e. g. "Luther" 
- open xml file properly
- tweakes
 2011-01-04 23:06:43 +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
9763a43f55 removed not supported html tags 2011-01-04 16:51:11 +01:00
M2j
bca7d46ad3 Character selection fallback for the ewimporter 2011-01-04 11:13:41 +01: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
a5f73713d4 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) 2011-01-03 22:47:49 +01:00
Andreas Preikschat
a127019f28 fixed wrong use of 'theme', implemented songbooks and songnumber, continued with openlyrics implementation, clean ups 2011-01-03 14:43:09 +01:00
M2j
b0c9b3f077 integrated 'split layout' in the SettingsTab class 
remove the documentMode from the TabWidget in the SettingsDialog
replace comment for HideMode class
 2011-01-03 12:25:30 +01:00
Andreas Preikschat
9fc113abce fix wrong 'themes' usage (themes -> topics), improved methods, make sure a missing property does not crash openlp 2011-01-03 08:16:21 +01:00
M2j
ebd44c7a94 Head 1184 2011-01-02 23:33:18 +01:00
M2j
2e6613edf4 simplified all setupUi() in openlp.core.ui and the setting tabs of the plugins 2011-01-02 23:24:14 +01:00
Andreas Preikschat
909fa25e7b clean ups, added missing file 2011-01-02 18:24:47 +01:00
Tim Bentley
57f2010480 Head 2011-01-02 17:17:55 +00: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
Tim Bentley
0261fc12a1 Head1177 - And Fix ups 2010-12-31 19:32:05 +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
Meinert Jordan
a9bf3aac5a Theme Wizard the layout was distorted because of several manual formating instructions. I limited all format instructions to the necessary minimum. Furthermore I aligned all QFormLayouts towards each other. 
It should contain no functional changes except of bug fixes (traped exceptions).
Some widgets ans slots are renamed for a consistent naming scheme.
Small fixes: removed two consecutive spaces and string introducing double quotes from python code. Edited some log.debug() arguments to avoid UnicodeErrors.

bzr-revno: 1176
Fixes: https://launchpad.net/bugs/695136
 2010-12-31 19:19:06 +00:00
Tim Bentley
0dc2f3ed85 Head1173 2010-12-31 08:41:00 +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
Raoul Snyman
6f26c6fc0a Fix up a small bug left over from the changeover to the new search edit. 2010-12-28 23:41:12 +02:00
M2j
31721c51d6 Theme preview resizing for the ThemeWizard 2010-12-28 22:24:21 +01:00
Raoul Snyman
a9c2b9fa18 Added a new SearchEdit GUI object. 2010-12-28 23:12:20 +02: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
1a31bf2047 reverted changes in slidecontroller.py to avoid interference with merge request 44744 of googol-hush 2010-12-28 10:22:29 +01:00
M2j
7c68265f4b remove two consecutive spaces from python code of the whole OpenLP sources 
replaced double quotes for string in python code of the whole OpenLP sources
 2010-12-27 23:57:35 +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
399970e7c7 More Theme Management cleanups 2010-12-27 10:18:09 +00:00
Tim Bentley
a464ab791b Head 1169 2010-12-27 08:32:01 +00:00
rimach
ec062c2640 SongBeamer fixes 
Correct Song Tab error

bzr-revno: 1169
 2010-12-27 08:28:33 +00:00
rimach
0a98f3038e Head 2010-12-26 21:56:51 +01:00
rimach
2cb38c6ab8 add complete check 2010-12-26 21:55:40 +01:00
Tim Bentley
e77ce3ffdb Bump values by 1 version or year 2010-12-26 11:04:47 +00:00
Tim Bentley
67f6fceb0a Allow Songs to be Searched by Theme 2010-12-23 17:51:32 +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
Jon Tibble
3ce8ed46d1 Cleanups 
bzr-revno: 1160
 2010-12-22 14:41:17 +00: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
Jon Tibble
e6f3650bfd Cleanups 2010-12-21 19:39:35 +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
rimach
96ee7fb343 correct SongTab Signal connection 2010-12-20 08:50:39 +01:00
rimach
582b81238f Head 2010-12-20 08:47:21 +01:00
rimach
bd66ef200a add default title 2010-12-20 08:46:59 +01: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
6b760003d0 Head 2010-12-18 17:11:50 +00:00
Tim Bentley
02645f0457 Songs must have an Author 2010-12-18 17:11:21 +00:00
andreas
18e75b7824 - camelCase for Ui_FileRenameDialog 
- Fixed bug #690774
- Keep copyright field empty if the imported song (from the service list) does not have any copyright information.

bzr-revno: 1151
Fixes: https://launchpad.net/bugs/690774
 2010-12-18 08:53:29 +00:00
Meinert Jordan
176d4fbc2a Fix: wrong variable names caused osis and http bible imports to crash 
Fix: handle unicode in song search string generation
Fix: replaced tab indentation
regenerate search_lyrics on song reindex action

bzr-revno: 1149
 2010-12-17 18:55:53 +00:00
Andreas Preikschat
fa79dd2cca keep copyright field empty if imported song does not have any copyright information 2010-12-17 15:28:19 +01:00
Andreas Preikschat
3cdac511e2 fixed bug #690774 2010-12-17 14:30:48 +01:00
Andreas Preikschat
e257f0431b r1147 2010-12-16 20:15:23 +01:00
Andreas Preikschat
fe452bc588 removed mistakes 2010-12-16 20:12:34 +01:00
M2j
e6bc3b9303 song search strings: handle unicode and reindex also search_lyric 2010-12-16 19:20:46 +01:00
Andreas Preikschat
95f30dfb6d fixed bug #690774 2010-12-16 18:56:08 +01:00
Andreas Preikschat
58a4d04980 white spaces 2010-12-16 14:16:53 +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
Andreas Preikschat
77f4adbef0 - fixed progress bar (bible openlp1 import) 
- fixed Bug #688647 (mostly copy&paste)
- fixed "reject" method (the import would not stop, if currentId() == 2/3)
- some songbeamer import tweaks

bzr-revno: 1142
Fixes: https://launchpad.net/bugs/688647
 2010-12-12 09:06:24 +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
Tim Bentley
9d1eabe2a2 Author is optional 2010-12-11 10:46:11 +00:00
Tim Bentley
9d67aea4f7 Fix missing authors on song import 2010-12-11 09:59:23 +00:00
Andreas Preikschat
ce0abd19bd string change, close file, MarkType 2010-12-11 10:53:30 +01:00
Andreas Preikschat
62643d7d5e string change, close file, MarkType 2010-12-11 10:40:52 +01:00
Meinert Jordan
bdc0c28809 Local aware song order 
bzr-revno: 1139
Fixes: https://launchpad.net/bugs/687638
 2010-12-10 17:19:33 +00:00
Meinert Jordan
7c5cb8d80b Import Wizards don't Stop 
bzr-revno: 1138
Fixes: https://launchpad.net/bugs/659019
 2010-12-10 17:18:08 +00:00
Andreas Preikschat
9515b84c56 whitespaces, string change 2010-12-09 18:44:18 +01:00
M2j
7e221a6e98 locale aware song sorting 2010-12-09 16:08:04 +01:00
M2j
465515d71e unicode in song title search strings 2010-12-09 14:30:23 +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
Derek Scotney
3719143f99 Fixes unwanted text imported from some SongSelect files. SongSelect only has a few verse types available for verses and adds extra ones by setting the verse type to 'misc' and then including the actual type on the next line. In the case of a 'misc' type or unknown type, the next line is checked for a valid verse type. The fix has been made for both .txt and .usr file types. 
bzr-revno: 1136
 2010-12-08 20:17:51 +00:00
Tim Bentley
e39c681c44 Add text entry validator to display positions 
Fix Spelling

bzr-revno: 1135
Fixes: https://launchpad.net/bugs/685317
 2010-12-08 19:21:59 +00:00
Derek Scotney
cc7780574b reverted back to revision 1134 2010-12-08 21:14:27 +02:00
Tim Bentley
b405195261 Fix size input validation again 2010-12-08 19:12:38 +00: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
rimach
44b0574778 fix for missing title field 2010-12-07 23:47:02 +01:00
Derek Scotney
298a159b5e Update to verse types 2010-12-07 23:10:57 +02:00
Derek Scotney
a5fc219abb Updated to handle CCLI verse type 'misc' 2010-12-07 22:03:20 +02:00
Jon Tibble
9291516b59 Fix v2 import bug 2010-12-06 23:37:55 +00: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
7f1e21c13b Fix field names and verse order bug 2010-11-30 20:23:21 +00:00
Tim Bentley
cc9ef10821 Songs get created correctly and displays refreshed 2010-11-29 16:02:41 +00:00
Tim Bentley
2c3c0f2255 Songs get built correctly 2010-11-29 14:04:37 +00:00
Tim Bentley
6ecc121bdf Convert verse tags 2010-11-28 19:38:27 +00:00
Tim Bentley
e2ac8b6dcc More code fixes 2010-11-28 16:48:36 +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
9fa384b57f More changes 2010-11-28 14:40:46 +00:00
Andreas Preikschat
3a13ebdce7 remove strike tags in songBeamer files; decent check for digits 2010-11-28 14:41:50 +01:00
Tim Bentley
a7e8104f59 Song rebuilding continues 2010-11-28 13:39:51 +00:00
Andreas Preikschat
7889a22810 fixed <p> tag, replaced the <u> tag and another fix 2010-11-27 22:12:52 +01:00
Tim Bentley
1cf4914862 fixes from last merge and more code for song management 2010-11-27 20:51:54 +00:00
Tim Bentley
90c631ce87 Documentation fixups and \nstart to add OpenlLyrics export for songs 2010-11-27 15:25:00 +00:00
Andreas Preikschat
52c12d50be trunk r1124 2010-11-26 17:33:01 +01:00
Andreas Preikschat
4d1b88072f fixed reStructuredText 2010-11-26 17:30:04 +01:00
Andreas Preikschat
ae036056b1 added the tag {u} 2010-11-26 17:25:56 +01:00
Andreas Preikschat
0dc9d433b7 SongBeamer import converts tags, that they'll work with OpenLP 2010-11-26 17:06:24 +01:00
Andreas Preikschat
66f230169d SongBeamer import clean ups and tweaks 2010-11-26 15:23:48 +01:00
Tim Bentley
e20e336c5e Remove extra debugging 2010-11-24 17:40:28 +00:00
Tim Bentley
45905753ed Start to add line count code to wizard 2010-11-23 20:48:55 +00:00
Tim Bentley
85261fe659 Fix server load edit bug 2010-11-22 18:52:58 +00:00
Andreas Preikschat
e4e2892ec7 trunk r1119 2010-11-21 12:00:37 +01:00
Tim Bentley
f900980eef Add debugging for Servie editing and fix edit_id bug 2010-11-20 18:14:43 +00:00
Tim Bentley
94fb7d49d6 Remove stray print statements 2010-11-18 17:57:51 +00:00
Tim Bentley
1dfef4f061 Style Police 2010-11-18 17:46:47 +00:00
Andreas Preikschat
b561bf6bdd trunk r1117 2010-11-16 19:00:47 +01:00
Raoul Snyman
aadc913ba1 Fix a bug where a null field would cause an exception. 2010-11-16 19:12:11 +02:00
Raoul Snyman
689cddf3e4 Removed an unnecessary line. 2010-11-16 11:29:46 +02:00
Raoul Snyman
59f47a5e1f Fix the spelling. 2010-11-16 08:20:39 +02:00
Raoul Snyman
8ed5bb883e Added a "re-index" tool for songs. 2010-11-16 08:19:23 +02:00
M2j
bb571b0df5 using list of tuples 2010-11-13 22:04:11 +01:00
M2j
e81bd1c3fc remove QtCore from header 2010-11-13 09:01:47 +01:00
M2j
4ccb48ffce HEAD 1114 2010-11-12 14:40:24 +01:00
M2j
682fcc2405 use a list in the OLP1 import to get sorted entries in the encoding comboBox 2010-11-12 14:20:45 +01:00
M2j
ef91b24d8a using PySQLite type conversion 2010-11-12 13:23:44 +01:00