Commit Graph

1087 Commits

Author SHA1 Message Date
Mattias Põldaru
1c1e66bba8 refurbished, added self._success = False to exceptions 2011-01-18 01:16:30 +02:00
Mattias Põldaru
0c38bccd45 more exceptions and a few other changes 2011-01-18 00:27:25 +02:00
Jon Tibble
0ccb0f4fdd Few small cleanups 2011-01-17 21:52:27 +00:00
Mattias Põldaru
f090c5409f smart features removed, using objectify now 2011-01-17 22:47:46 +02: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
Mattias Põldaru
a93a37c494 just another massive rewrite, now with regions 2011-01-17 18:21:46 +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
f6a6a7a4fc Fix db flushing for songs 2011-01-14 22:17:46 +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
ecb97881a1 Refactor file deleting, cleanups 2011-01-14 18:58:47 +00:00
Andreas Preikschat
ddc2812ca2 removed file 2011-01-14 18:33:48 +01:00
Jon Tibble
7490928190 Refactor wizards 2011-01-13 17:55:29 +00:00
Mattias Põldaru
f523181533 master tree changes 2011-01-13 12:57:24 +02:00
Mattias Põldaru
ccb2e8693c more changes 2011-01-13 12:54:36 +02:00
Andreas Preikschat
28bcaf4313 r1208 2011-01-12 17:45:51 +01:00
Andreas Preikschat
9bb2b942a0 fix for merge 2011-01-12 17:45:32 +01:00
Mattias Põldaru
f1a437891a a lot of changes for better code 2011-01-12 17:10:20 +02:00
Mattias Põldaru
39bd27d0df first working example 2011-01-12 10:59:14 +02:00
Jon Tibble
c32f8538d4 Fix debugging patch 2011-01-12 03:25:45 +00:00
Jon Tibble
cf0608cc45 Increase ooo verbosity to aid debugging 2011-01-11 17:13:17 +00:00
Andreas Preikschat
e2124942cc clean ups 2011-01-11 17:49:53 +01: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
Meinert Jordan
c75e69feab fixed layout problem for long bible names (or long presentation controller names)
unified the linebreak in setSizePolicy() calls

bzr-revno: 1201
2011-01-09 21:22:22 +02:00
Andreas Preikschat
b52d0aafd5 re.compile code from reindex tool 2011-01-09 20:18:08 +01:00
Andreas Preikschat
62794614f9 clean ups 2011-01-09 18:07:17 +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
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