Commit Graph

2160 Commits

Author SHA1 Message Date
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
M2j
69c6e0ef02 use filesystem char encoding for file operations 2010-06-10 16:42:55 +02:00
Jon Tibble
0e07c0f664 Use reStructuredText in Theme 2010-06-10 15:09:32 +01:00
Jon Tibble
5868a37018 Small refactorings 2010-06-10 14:28:41 +01:00
Jon Tibble
78a6d20bb3 Fix theme migration method parameters 2010-06-10 14:20:43 +01:00
Jon Tibble
31c3be39e4 Remove old song import/export forms 2010-06-10 14:18:08 +01:00
M2j
2dac357fa7 HEAD 2010-06-10 15:17:39 +02:00
Jon Tibble
3a7ca9a185 Fix module name thinkos 2010-06-10 14:12:19 +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
M2j
83968d8194 fix: QStringList has no pop() methode 2010-06-10 10:07:58 +02:00
M2j
f51d67cd51 exception and string fix 2010-06-10 09:59:46 +02:00
Jon Tibble
8d059fb84e Add DocStrings 2010-06-10 02:57:59 +01:00
Jon Tibble
1cfcdadbd1 thememanager tweaks 2010-06-10 01:03:38 +01:00
Jon Tibble
e40cdf792f Fix theme export breakage and lack of feedback 2010-06-10 00:28:02 +01:00
M2j
19ca36f946 final fine tuning 2010-06-10 01:08:12 +02:00
M2j
b022fef955 combining two import statements 2010-06-10 01:03:08 +02:00
M2j
88930d3600 fix: Collecting files for theme export was broken 2010-06-10 00:18:07 +02: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
M2j
8733ceac70 HEAD 2010-06-09 20:33:47 +02:00
Jon Tibble
0b1621923a PEP8 type checking and cleanups 2010-06-09 18:09:32 +01:00
Frode Woldsund
f5b02659b6 Replaces missed trUtf8('...') -> translate(u'PluginName.ClassName', '...') 2010-06-09 13:11:01 +02:00
Jon Tibble
6792a4cce7 Couple more whitespace cleanups 2010-06-08 16:56:47 +01:00
Jon Tibble
559e4c4d63 Cleanups 2010-06-08 16:38:09 +01:00
M2j
62d7649e2b reenable verses without number in the verse order 2010-06-08 15:47:23 +02:00
Frode Woldsund
2df6bf5ef5 Fixed some wrong translate context and some indentation errors 2010-06-07 23:36:22 +02:00
Jon Tibble
c481cf5c8c Catch correct exception type
bzr-revno: 835
2010-06-07 14:39:40 +01:00
M2j
69b98a44e8 fix for image names 2010-06-07 11:37:27 +02:00
M2j
d7a84fb592 derive captable image formats from Qt 2010-06-07 01:40:24 +02:00
Jon Tibble
9bb7343092 Fix incorrect exception 2010-06-07 00:24:45 +01:00
M2j
69608de08c fix: bug introduced in 833 2010-06-07 01:23:29 +02:00
Frode Woldsund
b7d4f537e5 . 2010-06-07 00:44:49 +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
84d8f0f12a ups.. removed a "0" that should not be here.. 2010-06-06 16:46:07 +02:00
Frode Woldsund
d364bcbc2a fixed translate() 'u symbol in Aboutform 2010-06-06 16:26:08 +02:00
Frode Woldsund
6e1ef3cc70 Fixed translate() function in songsPlugin and songusagePlugin 2010-06-06 16:22:00 +02:00
Frode Woldsund
5e64814133 Fixed translate() function in RemotePlugin 2010-06-06 15:44:07 +02:00
Frode Woldsund
3c096b4d0a Fixed translate() function in PresentationPlugin 2010-06-06 15:42:24 +02:00
Frode Woldsund
4571e808ba Fixed translate() function in MediaPlugin 2010-06-06 15:30:57 +02:00
Frode Woldsund
febb743acd Fixed all translate() function in ImagePlugin 2010-06-06 15:26:42 +02:00
Tim Bentley
0e5450f9d1 Fix tag error 2010-06-06 13:39:13 +01:00
Frode Woldsund
0788937721 Fixed translate() function in BiblesPlugin 2010-06-06 13:49:39 +02:00
Frode Woldsund
2c1f1f9455 Fixed translate() funtion in alertsplugin 2010-06-06 13:34:35 +02:00
Frode Woldsund
7f2c1f04a5 Fixed all translate() function in the project (exept the one in plugin), by adding spaces and make sure on line is longer then 80 char and adding u' in front of all argument is translate() functions 2010-06-06 13:05:35 +02: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
Frode Woldsund
e88c05bd58 Added unicon symbol to all arguments in the translate() function. And fixed missing "spaces" and other smal error regarding the coding standar 2010-06-06 11:52:11 +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
8da2167ebe Live generation cleaned up 2010-06-05 17:06:39 +01:00
Tim Bentley
7bf8e71acf Song editing cleaned up 2010-06-05 16:46:14 +01:00
Tim Bentley
61b4850941 Clean up slidecontroller 2010-06-05 16:31:07 +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
Jon Tibble
08f0c1ff49 Cleanup including diff check fixes 2010-06-01 18:13:54 +01:00
Jon Tibble
2d988d9c8a Fix MediaManagerItem after import cleanups 2010-06-01 17:01:03 +01:00
Jon Tibble
d756aacf7a Unused variable 2010-06-01 01:45:20 +01:00
Jon Tibble
bea44a5124 Fix __init__ calling and imports 2010-06-01 01:05:05 +01:00
Jon Tibble
83354166da Whitespace and unused variable 2010-06-01 00:23:08 +01:00
Jon Tibble
9d6d6f4ac9 Imports and variable naming 2010-06-01 00:16:06 +01: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
4a4bf00140 Head r829 2010-05-30 16:26:45 +01:00
Jon Tibble
dcd5b62524 Fix redefinition of init_models() 2010-05-29 22:28:40 +01:00
Jon Tibble
c109b26d22 Cleanup BaseModel key iteration 2010-05-29 21:57:56 +01:00
Jon Tibble
fb1e222422 Moar whitespace, exceptions and naming 2010-05-29 20:50:50 +01:00
Jon Tibble
f41cadd17b CONSTANTS and an exception 2010-05-28 16:01:50 +01:00
Jon Tibble
bbcfd7729c Refactor BaseModel 2010-05-28 01:26:49 +01:00
Jon Tibble
85b5437f80 Head r827 2010-05-28 01:20:50 +01:00
Jon Tibble
2e3b296d2d Use documented list methods 2010-05-28 01:18:26 +01:00
Jon Tibble
d33a719172 Imports for declared exceptions 2010-05-27 21:56:34 +01:00
andreas
039792104b - again changes done to the bible footer 2010-05-27 18:58:00 +02:00
andreas
dfd53e5628 - footer now displays both bible versions/copyright information (dual bible view)
- small fix
2010-05-27 18:13:25 +02:00
Jon Tibble
4616bbcb36 Explicitly declare exceptions 2010-05-27 17:00:51 +01:00
Tim Bentley
fbbcdc20da Head826 2010-05-27 16:58:04 +01:00
Jon Tibble
dc96d471e6 Variable cleanup 2010-05-27 15:41:47 +01:00
Jon Tibble
3678ea5ea2 Many varied cleanups
bzr-revno: 826
2010-05-27 09:42:56 +01:00
Tim Bentley
7443c4af72 Head 2010-05-26 18:38:04 +01:00
Tim Bentley
9032935219 Fix tags 2010-05-26 18:36:06 +01:00
Tim Bentley
332d9fa6f0 Comments 2010-05-26 18:34:25 +01:00
Jon Tibble
48446a8312 log.error checking 2010-05-26 17:01:45 +01:00
Jon Tibble
15038a9184 More cleanups 2010-05-26 16:52:33 +01:00
Jon Tibble
e195f0ffb7 Match method and overridden method arguments and cleanups 2010-05-26 00:47:26 +01:00
Jon Tibble
f0c03ad2cb Cleanups 2010-05-26 00:07:50 +01:00
Raoul Snyman
5b39ab942a Indented everything to 4 spaces, as per Jon's recommendation. 2010-05-25 20:55:02 +02:00
Raoul Snyman
6b1a6a0638 More intelligent version checking. 2010-05-25 19:12:21 +02: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
29cfcee29f Fix undefined variables 2010-05-25 16:04:37 +01:00
Jon Tibble
c7d420d4b9 Fix class defs and name redefinitions 2010-05-25 15:30:34 +01:00
Jon Tibble
a2448e36da Remove redundant code 2010-05-25 15:20:05 +01:00
Jon Tibble
f75a6fd732 Whitespace 2010-05-25 13:39:12 +01:00
Jon Tibble
e9904754c2 Remove code redefinitions 2010-05-25 02:39:48 +01:00
Jon Tibble
14307fcc8a Fix indentation 2010-05-25 01:48:42 +01:00
Jon Tibble
a1423dc966 Fix reimport 2010-05-25 01:19:43 +01:00
Jon Tibble
122756eca5 Fix indentations 2010-05-24 23:37:20 +01:00
Tim Bentley
f6d7743905 Fix memory leak and improve slide controller tags
bzr-revno: 823
2010-05-24 19:04:22 +01:00
Raoul Snyman
98cc2d93ec Windows-related fixes:
- Update Windows installer file to get version automatically.
- Update version file (for Windows)
- Update OpenLP.spec for PyInstaller/Windows build.
2010-05-23 17:49:34 +02:00
Tim Bentley
f7987501b9 Stop memory growth, improve verse display 2010-05-23 08:03:28 +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
Jon Tibble
1ee3ccd180 Head r819 2010-05-20 17:47:24 +01:00
Jon Tibble
1609f589e4 Some head 2010-05-20 17:46:53 +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
Raoul Snyman
28a403bd07 Some other minor touchups. 2010-05-18 23:32:58 +02:00
Raoul Snyman
304aed1c1e Fixed up problems with adding and removing songs from the service manager. 2010-05-18 23:18:52 +02: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
Tim Bentley
f78565f241 Display clean up 2010-05-16 16:39:58 +01:00
Tim Bentley
2300b9d0b7 Heads817 2010-05-16 16:33:31 +01:00
andreas@andypc
005dccb5d8 Fix bug in bibles with 2 bible displays
bzr-revno: 817
2010-05-16 16:24:16 +01:00
rimach@siduxbox
42fbb208df Add translations and update the code to accept them/use them
bzr-revno: 816
2010-05-16 16:22:03 +01:00
Tim Bentley
ac845a93ba Fix screen issues - not sure how though 2010-05-16 16:18:05 +01:00
andreas
bfb3143cfc fix for empty slide in dual bible view 2010-05-15 21:59:21 +02:00
Tim Bentley
c5b12ffaf3 Screen size fix for Raoul 2010-05-15 07:57:29 +01:00
Tim Bentley
580125ee86 Head815 2010-05-15 07:52:20 +01:00
Tim Bentley
23c3974afd Display fixes 2010-05-15 07:44:36 +01:00
Martin Thompson
cd8377f03d Fixed crash when monitor=<some monitor that doesn't exist> in OpenLP.conf 2010-05-12 21:43:48 +01:00
rimach
294b0abfc0 remove unused imports, correct import order 2010-05-11 23:05:08 +02:00
rimach
e0664a1e88 bugfixing for i18n 2010-05-11 21:00:21 +02:00
Jon Tibble
ed233039ad Head r814 2010-05-11 17:41:19 +01:00
rimach
16b202d8b5 Head 2010-05-10 22:44:38 +02:00
Tim Bentley
be85eb8999 Head813 2010-05-10 20:48:29 +01:00
Tim Bentley
f7244c5e6e Remove comments and simplify 2010-05-10 19:29:51 +01:00
Tim Bentley
51728db0b6 Add cache to renderer 2010-05-10 19:19:45 +01:00
rimach
2ee1c5ed9b load correct settings for translation 2010-05-10 19:56:29 +02:00
Martin Thompson
a8a7e675a4 Updated from review comments 2010-05-09 21:02:38 +01:00
rimach
ae36bc2bb9 Head 2010-05-09 10:47:57 +02:00
Martin Thompson
efa1e8c2d9 Quick fix to handle Bible config gets confused and returns None 2010-05-07 21:29:21 +01:00
Tim Bentley
fa99ba64b1 Fix names 2010-05-07 19:29:17 +01:00
Jon Tibble
dfb02e4996 Head r812 2010-05-07 01:21:03 +01:00
Martin Thompson
d04d75ad41 More changes to suit pyqt4.4 2010-05-06 21:41:42 +01:00
Martin Thompson
c613773bfb Merged trunk 2010-05-06 21:30:23 +01:00
Martin Thompson
dbdf681165 More changes to suit pyqt4.4 2010-05-06 21:30:08 +01:00
Tim Bentley
14912955ae Remove ? 2010-05-06 17:51:57 +01:00
Tim Bentley
6c9c9848db Clean up fixes 2010-05-06 17:49:12 +01:00
Jon Tibble
33198ad86e Head r811 and trivialities 2010-05-06 03:02:19 +01:00
Martin Thompson
6f8e3f7ea2 Fixed a qt4.5ism 2010-05-05 20:57:20 +01:00
Tim Bentley
0e7fb1c80c minor errors 2010-05-05 20:21:05 +01:00
Tim Bentley
fd22b01e59 Head811 2010-05-05 20:15:09 +01:00
Tim Bentley
27a963a9c2 Validate Service item viewer loading 2010-05-05 20:14:48 +01:00
Jonathan Corwin
3f569d428d Remotes: support more filetypes and subfolders for web
presentation_hide signal support

bzr-revno: 811
2010-05-05 19:29:08 +01:00
Tim Bentley
a8bbd540d4 service loading prefix check 2010-05-05 19:07:57 +01:00
Tim Bentley
e1f97fc9b9 Fix initial display 2010-05-05 18:35:11 +01:00
rimach
66ec680e4e remove else from toolbar.py 2010-05-05 19:17:00 +02:00
rimach
4661756d68 Head 2010-05-05 19:09:23 +02:00
Jonathan Corwin
4f8d058928 rename get to send and allow webpages to be served from subfolders 2010-05-04 22:49:02 +01:00
Jon Tibble
a8f2cd2e1f Import fixes 2010-05-04 22:19:40 +01:00
Tim Bentley
e0bfaf07bc Cleanup and finish bits 2010-05-04 21:01:45 +01:00
Raoul Snyman
108d3244c9 Documentation!
bzr-revno: 810
2010-05-04 19:53:27 +02:00
Jonathan Corwin
465ce8c7f7 web fixes, allow more file types. Slidecontroller_hide event 2010-05-03 22:49:42 +01:00
rimach
0c061087e9 Head 2010-05-03 22:39:06 +02:00
Tim Bentley
4d9f429ae0 Fix bible spelling in database
bzr-revno: 809
2010-05-03 07:12:59 +01:00
Jonathan Corwin
456d35f2d4 Fix image qstring 2010-05-01 23:02:31 +01:00
rimach
850b4a507f correction for last merge proposal 2010-05-01 22:01:32 +02:00
Raoul Snyman
fff2d780eb HEAD 2010-05-01 22:00:01 +02:00
rimach
4e296bfb5f changes 2010-05-01 21:45:06 +02:00
Tim Bentley
40ad9729ba Head 807 2010-05-01 14:06:22 +01:00
Tim Bentley
4ffb7d8a18 Fix up drag and Drop for service items 2010-05-01 14:05:17 +01:00
Jonathan Corwin
9ef2b13ad6 comments, update client, load html from disk, blanking 2010-05-01 13:10:48 +01:00
Jonathan Corwin
6c52ad359f head again, perhaps I should have waited 2010-05-01 10:02:47 +01:00
Jonathan Corwin
12810ad34a Head 2010-05-01 09:46:06 +01:00
Tim Bentley
13922b0599 Renames for consistancy 2010-05-01 07:58:41 +01:00
Tim Bentley
077933d703 Head 805 2010-05-01 07:50:43 +01:00
Jon Tibble
5a7e36b5bc Correct settingsSection naming convention 2010-04-30 23:38:15 +01:00
rimach
32c635b2f0 resolve merge proposal comments 2010-05-01 00:07:51 +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
Tim Bentley
5614e10324 Fix again 2010-04-30 20:56:26 +01:00
Tim Bentley
22c2e4c38e Minor cleanups and add comments to code 2010-04-30 20:37:47 +01:00
rimach
faffe729f8 Head 2010-04-30 21:30:50 +02:00
rimach
b74dec5446 update 2010-04-30 21:23:02 +02:00
Tim Bentley
79180c7f1c Text over video with loop 2010-04-30 17:57:53 +01:00
Tim Bentley
09da62f9cc Text over video 2010-04-30 17:30:25 +01:00
Tim Bentley
387e281da0 Fix up bugs from last merge 2010-04-30 16:41:48 +01:00
Tim Bentley
932560e81d Fix missing %s 2010-04-30 15:49:27 +01:00
Tim Bentley
c42054ec87 Fix up final 802 fallout 2010-04-30 15:30:07 +01:00
Tim Bentley
61a1693ce0 Head 802 2010-04-30 15:27:05 +01:00
Tim Bentley
7491b30be0 Head 801 2010-04-30 10:38:28 +01:00
Tim Bentley
8e630c5adf Fixes 2010-04-30 10:38:17 +01:00
Tim Bentley
591dc07354 Fix up presentations so they work again 2010-04-30 06:50:52 +01:00
Tim Bentley
d28498611d Fix up video playing so main screen is hidden on start 2010-04-30 06:16:06 +01:00
Jon Tibble
c6a7549d12 Make settings_section/last directory entries consistent 2010-04-30 02:59:15 +01:00
Jon Tibble
8d6a624c6c Fix break 2010-04-30 02:43:05 +01:00
Jon Tibble
a582d09752 Make plugin tab file locations consistent 2010-04-30 02:35:41 +01:00