Andreas Preikschat
01fad9972c
added comments back
2010-12-09 13:49:15 +01:00
M2j
20b1c33a4b
making 'cancel bible import' work
2010-12-09 00:40:28 +01:00
Andreas Preikschat
9f6a0f7c64
moved file
2010-12-08 18:56:29 +01:00
Andreas Preikschat
aca56b78b5
changed olp1 to OpenLP1
2010-12-08 18:46:22 +01:00
Andreas Preikschat
b044226332
changed class name
2010-12-08 18:19:51 +01:00
Andreas Preikschat
12e7c96463
camelCase changes
2010-12-08 18:18:12 +01:00
Andreas Preikschat
6fd338c492
tweaked importer
2010-12-07 17:34:19 +01:00
Andreas Preikschat
d5e0643b45
attempt to clean up bible importers
2010-12-06 20:30:04 +01:00
Andreas Preikschat
9db57568b0
started olp1 bible import
2010-12-05 17:11:21 +01:00
Andreas Preikschat
e3cb6a6508
changed
2010-12-05 17:07:16 +01:00
Andreas Preikschat
b8e6da0417
completed work
2010-12-05 16:47:23 +01:00
Andreas Preikschat
a66a77bdec
completed work
2010-12-05 16:44:51 +01:00
Andreas Preikschat
e6cfad921a
olpv1 bible importer
2010-12-04 21:42:03 +01:00
Andreas Preikschat
245465ab11
improved completor performance
2010-12-03 20:53:56 +01:00
Andreas Preikschat
b88436c641
autocompleter should be 'CaseInsensitive'
2010-12-02 18:36:35 +01:00
Andreas Preikschat
6b1254e923
trunk r1127
2010-12-02 15:00:32 +01:00
Andreas Preikschat
cd6948f613
added an autoCompleter for bible books for 'Verse Search'
2010-12-01 19:37:54 +01:00
Andreas Preikschat
28390e965d
enable search button
2010-11-29 20:02:58 +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
f6c30b7106
removed == 1
2010-11-19 22:34:15 +01:00
Andreas Preikschat
435338caad
more generic parameters for __init__
2010-11-16 19:33:37 +01:00
Andreas Preikschat
588cfa111f
long lines
2010-11-16 18:57:13 +01:00
Jon Tibble
f63625b72f
Fix biblegateway for BeautifulSoup 3.1
2010-11-16 03:31:17 +00:00
Andreas Preikschat
80721aad35
replaced 'dual'
2010-11-15 18:47:33 +01:00
Andreas Preikschat
a357bdf6a0
improved performance
2010-11-13 21:13:24 +01:00
Andreas Preikschat
272eea72b7
removed theme sorting
2010-11-13 08:17:39 +01:00
Andreas Preikschat
38397f07a2
changed texts again
2010-11-12 23:27:57 +01:00
Andreas Preikschat
093dc1afca
make sure that the theme list (in the settings are sorted), docs/comments
2010-11-12 23:02:25 +01:00
Andreas Preikschat
a0bbe76717
comments/missing lines
2010-11-12 22:51:18 +01:00
Andreas Preikschat
46321741ad
make sure, that the bible list in the importer is sorted
2010-11-12 22:34:06 +01:00
Andreas Preikschat
b34bb86b7c
spelling
2010-11-12 18:54:34 +01:00
Andreas Preikschat
45945cc302
-docs/comments -disabled text mode for webbibles -"dual" instead of "second"
2010-11-12 14:50:13 +01:00
Andreas Preikschat
802e886e96
removed whitespaces
2010-11-09 18:23:18 +01:00
Andreas Preikschat
f8b793ca3b
removed whitespaces, added second blank line before class
2010-11-09 18:10:37 +01:00
Andreas Preikschat
06cf6dcc20
changed bible importer finish message, clean ups
2010-11-09 17:56:16 +01:00
Jon Tibble
b7dd528d50
Cleanups
2010-11-03 17:19:44 +00:00
Tim Bentley
53d498bdc9
Fix bugs
2010-10-27 18:42:10 +01:00
Tim Bentley
8d31844ee0
Add Vacuum to databases on exit
...
Tidy up custom plugin naming
Fixes: https://launchpad.net/bugs/636835
2010-10-27 16:30:30 +01:00
Jon Tibble
8a977ef155
Fix spelling of Samuel (Bug #647931 )
2010-10-21 22:43:14 +01:00
Jon Tibble
a6bcfbf568
Cleanups
2010-10-21 16:31:22 +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
Raoul Snyman
177d2d0351
More documentation updates.
2010-10-11 22:47:00 +02:00
Andreas Preikschat
84d0c01274
fixes for the merge proposal
2010-10-09 21:36:05 +02:00
Andreas Preikschat
2ad3f983f7
added reStructuredText back
2010-10-09 08:48:21 +02:00
Andreas Preikschat
ae015a270a
added reStructuredText back
2010-10-09 08:00:50 +02:00
Andreas Preikschat
1bf1aeacd4
minor fixes for proposal
2010-10-08 19:37:34 +02:00
Andreas Preikschat
2a21349a6e
head
2010-10-08 19:07:49 +02:00
Andreas Preikschat
2e2efab2d4
tweaks
2010-10-08 19:07:14 +02:00
Andreas Preikschat
59b387b9d0
replaced 'permission' with permissions since the db uses permissions
2010-10-06 16:57:38 +02:00
Andreas Preikschat
f515dc60d0
changed methods (call the db methods instead of the manager's methods)
2010-10-06 16:15:39 +02:00
Andreas Preikschat
fa68d0d9ff
text search for bibles
2010-10-05 20:44:54 +02:00
rimach
f869e0d979
replace self.text_strings with self.textStrings, fix doc string
2010-10-05 18:09:48 +02:00
rimach
1c48bfab67
Head
2010-10-05 17:26:28 +02:00
Andreas Preikschat
f8ed4acf78
clean ups
2010-10-01 16:37:51 +02:00
Andreas Preikschat
919b07bd61
clean ups
2010-10-01 16:18:15 +02:00
Andreas Preikschat
e17f6c7c9e
-disable search buttons while searching, -clean ups
2010-10-01 15:50:29 +02:00
Andreas Preikschat
74752da694
implemented 'text search' for bibles
2010-09-30 20:40:10 +02:00
rimach
ec16298908
add missing newlines, simplify getString function, wrap long lines
2010-09-29 23:06:59 +02:00
Andreas Preikschat
0872cefacf
clean ups
2010-09-28 19:51:42 +02:00
rimach
a76dd15fbe
resolve diverged branches
2010-09-27 20:34:40 +02:00
rimach
f265c552ea
replace strings with text_strings
2010-09-27 20:15:55 +02:00
Andreas Preikschat
52e572e94d
Naming Conventions
2010-09-26 19:23:58 +02:00
Andreas Preikschat
2f1134556f
veses/chapters comboBoxes now behave differently
2010-09-26 19:17:29 +02:00
Andreas Preikschat
8d51d2820f
rearranged methods
2010-09-26 15:38:40 +02:00
Andreas Preikschat
7b47d52eca
This fixes the following bugs and issues:
...
- Bible items cannot be extended any more
- Dual and single Bible verses cannot be mixed (Media Manager/Service Manager)
- Bible item title in the service manager contains all bible passages (separated by a comma) bug #634533 and bug #609355
- Fixed bug #643783
bzr-revno: 1053
2010-09-22 22:11:51 +02:00
Andreas Preikschat
6c39c3d1af
clean up
2010-09-22 20:56:42 +02:00
Andreas Preikschat
15378611d8
different fixes
2010-09-22 20:46:02 +02:00
Tim Bentley
5e38d34997
Fix issues with other merges
2010-09-22 05:57:50 +01:00
Andreas Preikschat
2a4e64c9db
fix for Bug #643783
2010-09-21 20:44:48 +02:00
Raoul Snyman
c235b793b0
Fix bug #644106
...
Fix a related bug in the song importer.
2010-09-21 20:12:46 +02:00
Tim Bentley
1c58fcda9f
Remove print statement
2010-09-21 18:42:16 +01:00
Tim Bentley
79881d9023
Update plugin version numbers
2010-09-21 18:30:32 +01:00
Andreas Preikschat
a22dec796e
typing error
2010-09-21 07:57:23 +02:00
Andreas Preikschat
8b6e90ab44
tweak
2010-09-20 20:55:14 +02:00
Andreas Preikschat
137fb7417e
removed code and added a dialog
2010-09-20 20:38:18 +02:00
Andreas Preikschat
17b4335ee4
do not delete results when changing from keep to clear
2010-09-19 18:51:52 +02:00
rimach
23099261bd
Head
2010-09-19 10:47:00 +02:00
Andreas Preikschat
bd5f82096f
head + resolved conflicts
2010-09-19 07:59:38 +02:00
Andreas Preikschat
02b46f051c
changed combobox behaviour
2010-09-18 23:29:41 +02:00
Jonathan Corwin
93b2d54c92
String fixes
2010-09-18 16:24:39 +01:00
Andreas Preikschat
bfc3543d39
changed/removed variable
2010-09-17 14:17:50 +02:00
Andreas Preikschat
194e278581
fixed bug (forgotten %); removed unused variables
2010-09-17 14:10:41 +02:00
Andreas Preikschat
9913754df4
spelling mistake
2010-09-17 13:41:52 +02:00
rimach
399813e6aa
fix for the merge comments, add correct translations for settings window
2010-09-16 23:10:36 +02:00
Andreas Preikschat
5ad41ac457
tweaked methods
2010-09-16 18:57:21 +02:00
Andreas Preikschat
30ad1a3eb0
whitespace
2010-09-16 18:35:19 +02:00
Andreas Preikschat
6795c04947
added two methods
2010-09-16 18:22:23 +02:00
rimach
3bc527e4fc
bugfixing
2010-09-15 19:55:27 +02:00
Andreas Preikschat
d4ffc72c17
clean ups
2010-09-15 18:52:22 +02:00
rimach
c53731d74b
media items' __init__ methods
2010-09-14 20:34:39 +02:00
rimach
2d47e2523c
remove executable flag
2010-09-14 20:18:47 +02:00
Andreas Preikschat
4aba7e3357
change bible title in service manager (NOT nice)
2010-09-14 20:07:38 +02:00
rimach
33f49f7d4a
Head
2010-09-14 19:46:39 +02:00
rimach
22304d491d
correct coding rules, some optimizations
2010-09-14 19:46:21 +02:00
Jon Tibble
1968803619
More cleanups
2010-09-14 15:43:21 +01:00
Jon Tibble
5fe753c833
Cleanups
2010-09-14 15:21:44 +01:00
rimach
8e8a6e42ff
Head
2010-09-13 21:08:26 +02:00
Raoul Snyman
d4a0171203
HEAD
2010-09-13 07:16:16 +02:00
rimach
e2c8ee11f2
Fix removing dock with translation
2010-09-12 23:03:16 +02:00
Andreas Preikschat
6654a7993a
started to rework bibles (dual/single verses)
2010-09-11 21:36:47 +02:00
rimach
6d7e7d7ad2
hopefully Line ending corrected and resolve merge conflict, part2
2010-09-10 21:21:14 +02:00
rimach
d4cabf9693
move translations from mediamanager to plugins with dict
2010-09-10 17:50:30 +02:00
rimach
44806ff859
Head
2010-09-05 23:04:25 +02:00
Tim Bentley
e2c117034a
Fix up bug for bible settings of duel drop down
...
Fixes: https://launchpad.net/bugs/629848
2010-09-04 20:40:28 +01:00
rimach
95ffc8dd3b
add translation code for MediaDocks and PluginList
2010-09-04 00:51:28 +02:00
Raoul Snyman
5432daae57
Fix for bug #621695 .
...
bzr-revno: 1004
2010-09-03 08:29:29 +02:00
Raoul Snyman
a37fafa722
Fix the name of the keyword argument.
2010-09-03 07:33:03 +02:00
Raoul Snyman
df007a438e
Fixed double-spacing
2010-09-02 12:53:50 +02:00
Andreas Preikschat
cadfefe616
opps.. forgot the %s
2010-09-01 21:22:55 +02:00
Andreas Preikschat
b21e164fd3
added permission to footer
2010-09-01 19:54:10 +02:00
Andreas Preikschat
80851ddfc4
added permission, changed formattig
2010-09-01 19:27:38 +02:00
Andreas Preikschat
60ced9e184
moved some code
2010-08-31 20:28:21 +02:00
Andreas Preikschat
31aba2eadb
removed commented lines, name change
2010-08-29 18:20:56 +02:00
Andreas Preikschat
9fc45065fc
removed unnecessary line
2010-08-29 14:58:40 +02:00
Andreas Preikschat
87db3e98e6
clean ups, tweaks, fixed 625997
2010-08-29 14:49:45 +02:00
Jon Tibble
9a1ed78fd5
Cleanups
2010-08-29 00:52:10 +01:00
Andreas Preikschat
beaac2d923
removed everything which cannot work
2010-08-28 21:41:06 +02:00
Andreas Preikschat
37b2b1bb9d
clean up
2010-08-28 21:28:50 +02:00
Andreas Preikschat
de3659bc92
commented everything out, which cannot work (currently)
2010-08-28 21:17:52 +02:00
Andreas Preikschat
521b06ee8c
clean up - not working
2010-08-28 20:56:46 +02:00
Andreas Preikschat
36e2f2e33f
fixed stuff messed up resolvesing the conflict
2010-08-28 19:32:44 +02:00
Andreas Preikschat
14dbfaa4b5
fixed stuff messed up resolvesing the conflict
2010-08-28 19:10:14 +02:00
Andreas Preikschat
8071a65720
head
2010-08-28 19:05:45 +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
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
1e86aa98ba
Fix theme text weight and html tag cleanups
2010-08-21 07:00:46 +01:00
Tim Bentley
def949fc9a
Head987
2010-08-20 19:14:58 +01:00
Andreas Preikschat
5a22e67346
clean up
2010-08-18 17:04:16 +02:00
Andreas Preikschat
1b1261a1a4
- improved usage of different bibles and/or books in one service item
2010-08-15 17:35:20 +02:00
Andreas Preikschat
30e867e020
- rework
...
- improved usage of different bibles
2010-08-15 16:49:07 +02:00
Andreas Preikschat
c41bb80a95
made lines more readable
2010-08-10 18:49:52 +02:00
Andreas Preikschat
df8b064058
made lines more readable
2010-08-10 18:48:10 +02:00
Andreas Preikschat
47125ba600
made lines more readable
2010-08-10 18:44:04 +02:00
Andreas Preikschat
403ee4cd53
more convenient names
2010-08-08 20:05:33 +02:00
Andreas Preikschat
24de78680e
cleanup
2010-08-06 09:23:32 +02:00
Andreas Preikschat
719268f121
cleanup
2010-08-06 09:07:20 +02:00
Andreas Preikschat
3bee58e314
'if' not necessary
2010-08-06 09:00:34 +02:00
Andreas Preikschat
60b179b2ed
improved single and dual bible usage in one service item
2010-08-05 21:32:58 +02:00
Andreas Preikschat
e6f0fde98d
tweaks and cleanups
2010-08-04 10:02:52 +02:00
Tim Bentley
f3e62c9f14
Bible text display cleanups
2010-08-03 20:23:05 +01:00
Andreas Preikschat
444a219a20
removed unused list
2010-08-03 19:17:09 +02:00
Andreas Preikschat
6df4e2cfef
continued fixing + cleaned my work up
2010-08-03 19:04:08 +02:00
Andreas Preikschat
b3d17de18a
fixed second bible when using Keep to create multiple bible verses in one service item
2010-08-03 12:49:04 +02:00
Andreas Preikschat
569377e7d0
fixed second bible when using Keep to create multiple bible verses in one service item
2010-08-03 12:46:12 +02:00
Andreas Preikschat
778388b2ae
search result are dependent (in regard to 2nd bible)
2010-08-02 22:03:20 +02:00
Andreas Preikschat
06752ffa66
show both bible versions in the title
2010-08-02 21:11:05 +02:00
Tim Bentley
fb4bd1a8c2
Head981
2010-08-01 09:30:42 +01:00
Jon Tibble
c9edfb9508
Cleanup QMessageBoxes using defaults
2010-07-31 03:06:44 +01:00
Jon Tibble
ab3efd2b3b
Fix issues with plugins (inc. bug #605655 )
2010-07-31 01:05:27 +01:00
Tim Bentley
e95ea60d9b
Alerts start to work
2010-07-30 20:15:55 +01:00
Tim Bentley
c46dfab8a1
Head979
2010-07-30 19:02:57 +01:00
Tim Bentley
0518f4987a
Bibles do not loop
2010-07-30 19:02:03 +01:00
Tim Bentley
50691074b8
Head978
2010-07-30 18:49:55 +01:00
Jon Tibble
003cfd1e68
Fix unused var and standardise loop vars
2010-07-30 17:13:17 +01:00
Jon Tibble
9df8cb11f9
Fix doc text location
2010-07-30 13:04:15 +01:00
Jon Tibble
26bae2e35b
Fix message parenting
2010-07-29 16:10:40 +01:00
Jon Tibble
7729ba3ced
Bible reference error message
2010-07-29 16:04:09 +01:00
Jon Tibble
fc849398a9
Bible reference refactor
2010-07-29 15:36:02 +01:00
Jon Tibble
2bd442ff4f
More naming cleanup
2010-07-28 14:15:39 +01:00
Tim Bentley
44fd8f31e0
Head974
2010-07-27 19:54:53 +01:00
Jon Tibble
db87a9e7dd
Exception handling fixes in bible import
2010-07-27 16:07:00 +01:00
Jon Tibble
dfcd2f6293
Explicit exception handling
...
bzr-revno: 974
2010-07-27 16:01:06 +01:00
Jon Tibble
d0fa9228a8
Head r972
2010-07-27 13:56:03 +01:00
Jon Tibble
cc38e0f367
Explicit exception catching
2010-07-27 13:54:26 +01:00
Jon Tibble
37b2304eeb
Trailing new lines
2010-07-27 10:32:52 +01:00
Jon Tibble
5ae5a5d63f
Fix showing screen after black and cleanups
...
bzr-revno: 972
2010-07-27 07:58:35 +01:00
Raoul Snyman
6abb0c7cc3
Fixed a small bug where there was a "u" in the verse label with () brackets.
...
bzr-revno: 971
2010-07-27 07:31:35 +02:00
Jon Tibble
16924808bd
Fixes and cleanups
2010-07-26 21:31:05 +01:00
Tim Bentley
271a5f598f
Head970
2010-07-26 17:42:36 +01:00
Raoul Snyman
2ef095dd98
Fixed a small bug where there was a "u" in the verse label with () brackets.
2010-07-26 08:06:17 +02:00
Jon Tibble
96033624aa
Head r968
2010-07-25 12:47:53 +01:00
Tim Bentley
fbe647b896
Head968
2010-07-25 10:03:01 +01:00
Tim Bentley
9efad8da66
Head966 - and fix mediaitem
2010-07-25 07:21:29 +01:00
Jon Tibble
69ffb9124e
Fix some pesky bits
2010-07-25 00:12:36 +01:00
Raoul Snyman
2f2b339863
Update the copyright notice.
2010-07-25 00:10:47 +02:00
Jon Tibble
6e6d44710f
Head r965
2010-07-24 22:03:58 +01:00
Jon Tibble
7df342ff1a
Fix bible search strictness for web bibles
2010-07-24 21:52:37 +01:00
Raoul Snyman
d29ffb72c5
Going through all the strings and making them decent, user-friendly English.
...
bzr-revno: 965
2010-07-24 22:34:16 +02:00
Tim Bentley
ec788f33c9
Head964
2010-07-24 17:56:02 +01:00
Jon Tibble
87fc38fb6f
Head r964 and book spelling
2010-07-24 17:54:55 +01:00
Jon Tibble
3ea6ce9520
Use urllib.urlencode()
2010-07-24 15:03:04 +01:00
Jon Tibble
4b5ad13eec
Fix numbered book BG bibles
2010-07-24 13:59:02 +01:00
Jon Tibble
8004bc4c18
Import fix for last commit
2010-07-24 03:19:24 +01:00
Jon Tibble
323090e141
Bible search fixes (Bug #608409 )
2010-07-24 03:14:08 +01:00
Jon Tibble
ccda22a962
Fix BG refactor
2010-07-24 02:10:57 +01:00
Raoul Snyman
2b7d7f3ba5
More string updating.
2010-07-23 20:03:19 +02:00
Jon Tibble
9b425cb52d
Fix BibleGateway refactor
2010-07-23 17:21:27 +01:00
Jon Tibble
1ea37f8d77
Cleanup refactor
2010-07-23 16:25:54 +01:00
Jon Tibble
e9edb0c7a4
Refactor BibleGateway retrieval
2010-07-23 03:19:35 +01:00
Jon Tibble
b5ceb59e27
Cleanup getters and setters
2010-07-23 01:01:06 +01:00
Raoul Snyman
33fa1541a7
HEAD
2010-07-21 07:20:30 +02:00
Raoul Snyman
7ec7235676
Updated more strings and things.
2010-07-21 07:20:03 +02:00
Tim Bentley
85c40e4e16
Head956
2010-07-20 21:17:12 +01:00
Tim Bentley
e31a039568
Head952 and cleanups
2010-07-20 06:16:06 +01:00
Raoul Snyman
71ee0eff8c
HEAD
2010-07-20 06:58:20 +02:00
Raoul Snyman
35bcb8eabd
HEAD
2010-07-20 06:58:01 +02:00
Jon Tibble
7691418bc3
Head r952 and cleanups
2010-07-19 21:43:02 +01:00