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

2795 Commits

Author SHA1 Message Date
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
6ab287cfaa reverted changes 2010-07-19 09:54:22 +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
Martin Thompson
cd7f0167a1 Merged from trunk - handle lack of getters/setters in songimport through direct attribute use 2010-07-18 20:44:49 +01:00
Martin Thompson
168aeea3e1 Tweaks from review 2010-07-18 20:27:27 +01:00
Tim Bentley
bf0dad308f More cleanups - page break bibles 2010-07-18 20:04:12 +01:00
Tim Bentley
44592ae579 Html cleanups 2010-07-18 19:01:35 +01:00
Jon Tibble
bf71742308 Head r950 2010-07-18 15:36:59 +01:00
Tim Bentley
ea2d0cdb72 Preview Works 2010-07-18 15:08:17 +01:00
Billy Lange
7e12cda88f Add confirm before theme delete 
bzr-revno: 950
 2010-07-18 08:07:01 +01:00
Billy Lange
ca1d6c8675 Fixed spaces 2010-07-17 21:53:17 +02:00
Jon Tibble
f757117771 Fixes and cleanups 
bzr-revno: 949
 2010-07-17 19:47:55 +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
Tim Bentley
0d7f81c020 Live display for Images 2010-07-17 12:00:36 +01:00
Tim Bentley
996f779602 Text and Previews for Live 2010-07-17 11:25:52 +01: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
Tim Bentley
f45625ac92 Head 2010-07-17 09:59:29 +01:00
Tim Bentley
443ff3fecd More refactoring and improvements 2010-07-17 09:59:15 +01:00
Tim Bentley
885e5d8ea2 Fix bug #606437 2010-07-17 07:04:52 +01: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
c7a8bbee8b More getters and setters 2010-07-16 22:26:57 +01:00
Jon Tibble
5097cbaf9c Start cleaning getters and setters 2010-07-16 22:06:10 +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
Jon Tibble
e83cb035ac Tab Order and Theme fix (Bug #606256) 
bzr-revno: 946
 2010-07-16 17:43:02 +01:00
andreas
fedde147ae started working on 'merging' song books, topics, authors (NOT finished yet) 2010-07-16 18:39:18 +02:00
Tim Bentley
53c6e93d08 Fix conflict in head945 2010-07-16 17:03:00 +01: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
Jon Tibble
d04a09f317 Use populate() for DB objects 
bzr-revno: 945
 2010-07-16 12:50:37 +01:00
andreas
84416b0bdc head944 2010-07-16 11:25:01 +02:00
andreas
1050e216e1 comment cleanup 2010-07-16 11:19:02 +02:00
andreas
0c03809526 comment cleanup 2010-07-16 11:16:40 +02:00
andreas
853ae906d3 reverted changed done before we official changed line length from 79 to 80 2010-07-16 11:09:11 +02:00
andreas
eaf2f568f4 error messages added 2010-07-16 11:00:20 +02:00
Philip Ridout
b410590267 Sorted out the show/hide desktop. 
bzr-revno: 944
 2010-07-16 07:23:14 +02:00
Jon Tibble
96ed86a13a Use populate() for DB objects 2010-07-15 23:45:55 +01:00
Martin Thompson
059032f237 Changed internal 'song' attribute to clearer 'song_import'. OpenSong themes now map to Topics. Text cleaning called 2010-07-15 21:29:24 +01:00
Martin Thompson
bb34a304a9 Tweaked Topics handler 2010-07-15 21:27:44 +01:00
Martin Thompson
294a02af45 Renamed back and fixed a couple of = signs 2010-07-15 21:26:57 +01:00
Phill Ridout
42d627ec5b Extra line removed 2010-07-15 19:07:23 +01:00
Billy Lange
d1c41fae7a Confirm deletion of theme 2010-07-15 18:36:09 +02:00
andreas
dd2137bf07 fixed import 2010-07-15 11:34:03 +02:00
Jon Tibble
f8ead8e7c8 Fix service save location (Bug #605649) 
bzr-revno: 942
 2010-07-15 09:20:40 +01:00
Raoul Snyman
3838a16fdf Removed the display tab, moved options to general tab, plus some cleanups. 
bzr-revno: 941
 2010-07-15 10:07:48 +02:00
Raoul Snyman
cce709218f Removed comments and now-defunct display tab. 2010-07-15 07:38:23 +02:00
Jon Tibble
c15fb864ec Fix service save location (Bug #605649) 2010-07-15 01:06:20 +01:00
Jon Tibble
afd28025a5 Fix service save icon save method 2010-07-14 23:16:59 +01:00
Raoul Snyman
1d65cc4e6f Renamed "tab_index" to "tabIndex" as well. 2010-07-14 23:28:20 +02:00
Martin Thompson
222f10ba45 Now fixed the trunk merge 2010-07-14 21:52:45 +01:00
Martin Thompson
76a731c725 Merged from trunk 2010-07-14 21:47:40 +01:00
Martin Thompson
490e2451e0 spaces 2010-07-14 21:46:23 +01:00
Martin Thompson
d54770646d Rename cclino to ccli_number and theme to theme_name in all song import related files 2010-07-14 21:38:46 +01:00
Raoul Snyman
dc4f60516f Some modifications to the Configure dialog: 
- Moved single display option to General tab
- Removed Display tab
- Renamed variables to be Qt compliant
 2010-07-14 22:37:54 +02:00
Phill Ridout
484b1c227e Finally got round to sorting out the show/hide desktop. 2010-07-14 21:34:14 +01:00
Martin Thompson
0f4c7276b3 Using new manager 2010-07-14 21:10:27 +01:00
Tim Bentley
366c11e15a More updates 2010-07-14 18:36:48 +01:00
Raoul Snyman
38afbbdd5b HEAD 2010-07-14 17:59:13 +02:00
Raoul Snyman
0cf1acf97b Removed an unnecessary import. 
Fixed margins.
Moved the "display" tab into the general tab.
 2010-07-14 17:58:28 +02:00
Jon Tibble
e1c8aabe0a Fix AdvancedTab layout 2010-07-13 19:45:40 +01:00
Jon Tibble
b5f667fe51 Fix theme editing (Bug #594909 part 1) 
bzr-revno: 938
 2010-07-13 19:32:29 +01:00
Tim Bentley
84792a779a Head 937 2010-07-13 19:16:23 +01:00
Tim Bentley
957e7294c8 Latest changes parked 2010-07-13 18:23:05 +01:00
Jon Tibble
022935fe58 Fix last merge 2010-07-13 17:31:19 +01:00
Jon Tibble
44506f2c84 AdvancedTab: Double click to live 2010-07-13 17:00:33 +01:00
Jon Tibble
9d3085ba6c Head r935 2010-07-12 23:35:28 +01:00
Jon Tibble
02b33ed660 Theme background images (Bug #594911) 2010-07-12 23:32:46 +01:00
Jon Tibble
767214bb13 Proper theme name editing (Bug #594909) 2010-07-12 22:11:00 +01:00
andreas
1031125932 code style 2010-07-12 23:02:06 +02:00
andreas
d4780cb37b code style 2010-07-12 22:56:09 +02:00
Tim Bentley
166fabbd5f Output now on main screen 2010-07-12 20:36:42 +01:00
Tim Bentley
4d69120225 Head 2010-07-12 18:14:04 +01:00
Tim Bentley
a071dcc879 Head 2010-07-12 18:13:59 +01:00
Jon Tibble
a2704186a5 Save current media plugin (Bug #596540) 
bzr-revno: 935
 2010-07-12 17:50:54 +01:00
Tim Bentley
5989140c0d More updates 2010-07-12 17:49:38 +01:00
Andreas Preikschat
13c0496553 Improve song data integrity 
bzr-revno: 934
 2010-07-12 17:48:54 +01:00
Jon Tibble
eac602389c Code layout tweaks 2010-07-12 15:45:55 +01:00
Jon Tibble
46d561b320 Add saving current media plugin (Bug #596540) 2010-07-12 15:32:48 +01:00
andreas
75f9f809a8 use database for checking 2010-07-12 15:18:07 +02:00
Jon Tibble
4bffb39567 Import fixes 2010-07-12 11:59:48 +01:00
Jonathan Corwin
e77d6ec981 Common thumbnails for all presentation types and create when presentation first added 
bzr-revno: 932
 2010-07-12 08:25:17 +01:00
Jonathan Corwin
bff74507d7 Coding standards 2010-07-11 21:53:53 +01:00
Jonathan Corwin
fe5b3e6771 pptview/impress fixes to thumbnails on Windows 2010-07-11 21:22:53 +01:00
Tim Bentley
19400843d4 Renderer replacement- text now output and pages 2010-07-11 17:02:20 +01:00
Tim Bentley
3d9fca212f Renderer replacement- text now outputs 2010-07-11 16:53:40 +01:00
andreas
488ead8162 cleanup 2010-07-11 15:23:12 +02:00
Tim Bentley
f3b4a1dae5 Renderer replacement- display splash now. 2010-07-11 13:35:41 +01:00
Tim Bentley
c46901cb8a Renderer replacement- screen fix 2010-07-11 12:38:09 +01:00
Tim Bentley
44ae86e82b Renderer replacement humm 2010-07-11 11:58:36 +01:00
Tim Bentley
02c0fe9e89 Renderer replacement started 2010-07-11 08:45:49 +01:00
Tim Bentley
1a2dfc863d Head931 2010-07-11 06:41:17 +01:00
Tim Bentley
0bd6d297c7 Add new renderer code 2010-07-11 06:40:56 +01:00
Jonathan Corwin
fb4faf0dbb Powerpoint fix 2010-07-10 23:41:36 +01:00
Jonathan Corwin
08c36f7e1c Got a conflict fix wrong 2010-07-10 23:33:09 +01:00
Jonathan Corwin
968eaad46a Head 2010-07-10 23:28:59 +01:00
Jonathan Corwin
91b3c06849 Missed one 2010-07-10 23:21:50 +01:00
Jonathan Corwin
27bccda0b6 Presentation thumbnail changes 2010-07-10 23:21:14 +01: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
Jon Tibble
4eb067343c Fix mismerge 2010-07-10 11:44:23 +01:00
Jon Tibble
f3a56ecee6 Fix service saving (Bug #603798) 
bzr-revno: 930
 2010-07-10 11:31:36 +01:00
Jon Tibble
4c08162e33 Fix docstring for last commit 2010-07-10 02:21:03 +01:00
Jon Tibble
60b5568979 Fix bug then fix fix! (Bug #603798) 2010-07-10 02:01:14 +01:00
Jon Tibble
9d92f358d4 AdvancedTab: Creation & Recent files 2010-07-09 22:32:32 +01:00
Tim Bentley
9d77444ddf Revert Changes 2010-07-09 21:27:18 +01:00
Tim Bentley
b438cb22a5 Head928 2010-07-09 20:46:40 +01:00
Tim Bentley
341e0a165b Fix bug 594909 2010-07-09 20:46:09 +01:00
Martin Thompson
bd6337af0d Changed opensong import file extension to All files *.* 2010-07-09 19:17:48 +01:00
Martin Thompson
3c21924e03 Fixed some coding stds. HAndles unnumbered choruses etc by putting a '1' on the end. Strip out page and column breaks. Theme and CCLI no currently not imported correctly 2010-07-09 19:08:03 +01:00
Jon Tibble
f1f5a61ef6 build_icon fixes 2010-07-09 12:26:31 +01:00
Jon Tibble
520d0ea36f Head r926 2010-07-08 14:50:06 +01:00
andreas
1ef947c4fc name fix 2010-07-08 14:38:48 +02:00
andreas
f514bfc1ba coding standard fixes 2010-07-08 14:32:09 +02:00
Jon Tibble
7a65d5ff08 Fix build_icon patch 2010-07-08 13:25:17 +01:00
andreas
f09843e55b import menu fixes 2010-07-08 14:19:22 +02:00
Jon Tibble
1b9830429b Use build_icon 2010-07-08 12:46:03 +01:00
Jon Tibble
6e57776884 Icons and naming for aboutdialog 2010-07-08 12:24:45 +01:00
Jon Tibble
cea09a4214 Remove dead code 2010-07-08 11:26:52 +01:00
Jon Tibble
a913c47254 Remove initPluginNameVisible hack 2010-07-08 10:14:00 +01:00
Jon Tibble
38977e81ea Cleanups 2010-07-08 09:14:10 +01:00
Martin Thompson
e4b7e23c42 Added test data 2010-07-07 21:18:38 +01:00
Martin Thompson
b04c93e9a7 test theme, alttheme -> our theme 2010-07-07 21:17:58 +01:00
Martin Thompson
860d3e2923 Removed opensong code from songxml 2010-07-07 21:17:16 +01:00
Martin Thompson
b3559a993d test theme, alttheme -> our theme 2010-07-07 21:16:14 +01:00
Martin Thompson
7297248d88 Sets CCLI info 2010-07-07 20:38:23 +01:00
Jon Tibble
88a739c1d5 Head r925 2010-07-07 18:19:31 +01:00
Jon Tibble
19a831d9cf Naming fixes for toolbar and maindisplay 2010-07-07 18:06:31 +01:00
Jon Tibble
cde04a9218 Naming fixes for mediamanageritem 2010-07-07 17:03:30 +01:00
andreas
bc15cc8104 -coding standard fixes 2010-07-07 18:00:44 +02:00
andreas
03a3d7b3f5 (small) coding standard fixes 2010-07-07 17:40:17 +02:00
Jon Tibble
961df67a33 Cleanups 2010-07-07 15:44:22 +01:00
Raoul Snyman
167c60345b Updated translation files. 
Fixed a few more strings.
 2010-07-07 14:58:03 +02:00
Jon Tibble
f813c98fdd Refactor view mode code 
bzr-revno: 924
 2010-07-07 10:51:41 +01:00
Jon Tibble
6de04962bd Head r922 2010-07-06 23:30:02 +01:00
Jon Tibble
09fb6e6dda Parent tweaks 2010-07-06 22:59:52 +01:00
Jon Tibble
8de0de9921 Rename methods to better indicate function 2010-07-06 22:23:09 +01:00
Jon Tibble
b225a96d09 Small modes refactoring 2010-07-06 22:18:55 +01:00
Raoul Snyman
9e7f98e33c Fixed a small bug where the item in the menu would remain checked despite the fact that the element on the form was no longer visible. 2010-07-06 22:27:57 +02:00
Raoul Snyman
4c291bbed0 Added View Modes. 2010-07-06 22:05:48 +02:00
Jon Tibble
e85c39e7a5 Head r920 2010-07-06 18:24:20 +01:00
Raoul Snyman
08293786c7 Fix up some strings and come bugs in the alerts plugin. 
bzr-revno: 920
 2010-07-06 19:12:54 +02:00
Raoul Snyman
5c6ab2ee1a Some more fixes. 2010-07-06 17:59:29 +02:00
Raoul Snyman
f1eeaff633 Some more string fixes. 2010-07-06 17:54:15 +02:00
Raoul Snyman
9a46ebca56 More string fixes 2010-07-06 17:44:15 +02:00
Raoul Snyman
0e53994ca6 String fixes. 2010-07-06 17:41:56 +02:00
Raoul Snyman
a167d759a5 String fixes. 2010-07-06 17:40:25 +02:00
Raoul Snyman
419b21a2b1 Fix up some strings and come bugs in the alerts plugin. 2010-07-06 17:26:52 +02:00
Raoul Snyman
33be4fe2f6 HEAD 2010-07-06 16:58:25 +02:00
Jon Tibble
6504d74fa0 Rename CheckedBoxen 2010-07-06 13:58:33 +01:00
Jonathan Corwin
c75d29eaa7 Must get TRB143 a new mop for Christmas 2010-07-05 23:17:14 +01:00
Jon Tibble
d1482d4a60 Fix song saving 
bzr-revno: 917
 2010-07-05 22:49:28 +01:00
Jon Tibble
c8faf0cc08 Fix song saving 2010-07-05 22:23:39 +01:00
Martin Thompson
cfc9c72845 Merged from trunk - updated to lxml 2010-07-05 21:11:13 +01:00
Martin Thompson
ab1f040aaa Working on non-ascii characters in zipfiles 2010-07-05 21:00:05 +01:00
Tim Bentley
667d44eb8c and add_to_list 2010-07-05 17:33:45 +01:00
Tim Bentley
cbe65f921a Head915 2010-07-05 17:01:29 +01:00
Tim Bentley
08f650871a Signature Cleanups 2010-07-05 17:00:48 +01:00
Jon Tibble
4439625013 Fixes and cleanups 2010-07-05 12:39:48 +01:00
Jon Tibble
e2a2500a1a XML: merge song XML handling 2010-07-04 17:40:53 +01:00
Jon Tibble
765cc6ddbe Head r913 2010-07-04 17:15:29 +01:00
Jon Tibble
9910655223 Start customisation 2010-07-04 14:42:01 +01:00
Jon Tibble
46df1164d4 Import fix 
bzr-revno: 913
 2010-07-04 13:02:37 +01:00
Jon Tibble
b7563ae075 Import fix 2010-07-04 00:10:28 +01:00
Jon Tibble
0f53c65f4f Importish fix 2010-07-03 22:52:28 +01:00
Jon Tibble
aa390e9831 Cleanups 2010-07-03 22:50:42 +01:00
Raoul Snyman
0a4c9481bf Add a nice little icon for the plugin list. 2010-07-03 23:07:21 +02:00
Raoul Snyman
3a19271a18 Shuffle the menus. 2010-07-03 22:39:29 +02:00
Phill Ridout
a180c4c321 corrected video tag 2010-07-03 20:45:14 +01:00
Phill Ridout
02f86d0603 hopefully should be go for this one! :-p 2010-07-03 20:02:36 +01:00
Phill Ridout
9b89788b21 removed escapes 2010-07-03 19:55:53 +01:00
Phill Ridout
b58d501e28 removed unecessary escapes! 2010-07-03 19:26:11 +01:00
Jon Tibble
1e4a11f4e5 XML: Objecify it to make it run 2010-07-03 18:46:00 +01:00
Jon Tibble
732bf24ef8 XML: Cleanups 2010-07-03 14:26:29 +01:00
Phill Ridout
2b85659031 Removal of HTMLIMAGE at the request of TRB143 2010-07-03 11:46:13 +01:00
Phill Ridout
5f15b2fd7d added missing </head> 2010-07-03 06:41:24 +01:00
Phill Ridout
fda7412f75 added css to remove white space arround background video 
adjusted spacing, added escapes to double quotes and moved the > on the body tag to its proper place!
 2010-07-03 04:06:02 +01:00
Jon Tibble
497d1c9dc9 XML: Put it where it should be 2010-07-03 02:33:40 +01:00
Jon Tibble
0c184d5e60 Remove some unused methods 2010-07-03 02:07:36 +01:00
Jon Tibble
989ffb9fc5 Head r911 2010-07-03 01:24:17 +01:00
Jonathan Corwin
db961c76db Clean up after TRB143's attempts to outclean Meths 
Fix pptview plugin when running as exe
 2010-07-02 23:18:54 +01:00
Tim Bentley
64de9f1d7a Head909 2010-07-02 19:21:59 +01:00
Tim Bentley
0656b34df9 Cleanups 2010-07-02 19:21:45 +01:00
Andreas Preikschat
f519e037b9 Some random fix ;-) 
bzr-revno: 909
 2010-07-02 19:18:54 +01:00
andreas
c93cad3a20 fixed a small bug 2010-07-02 19:00:23 +02:00
Tim Bentley
603c2e7be2 Head907 2010-07-02 17:54:22 +01:00
Tim Bentley
ecbef6a00b Fix up display layers 2010-07-02 17:54:08 +01:00
Jon Tibble
3447c7fed6 XML: Start refactoring 2010-07-02 15:57:48 +01:00
Jon Tibble
45375e7442 Cleanup plugins (Bug #600996) 2010-07-02 13:13:46 +01:00
Jon Tibble
9e1474e851 Fix songs and wildcard import 2010-07-02 11:29:36 +01:00
Tim Bentley
e3e6c82eac Fix up display levels and renames 2010-07-02 06:16:30 +01:00
Tim Bentley
c892f9b38f Fix up transitions so they work 2010-07-02 05:36:13 +01:00
Jon Tibble
f67457c378 Revert bug fix 2010-07-01 20:34:48 +01:00
Jon Tibble
d939a39895 Cleanup signals (Bug #599146) 2010-07-01 16:46:51 +01:00
Jon Tibble
254ac02561 Alerts: Import and long lines 2010-07-01 13:56:02 +01:00
Jon Tibble
c61121bb51 DB cleanups 2010-07-01 11:31:37 +01:00
Jon Tibble
079d72f93f Database refactoring 2010-06-30 23:05:51 +01:00
Martin Thompson
38ccc21f89 Added GUI for importing OpenSong 2010-06-30 22:19:18 +01:00
Martin Thompson
02fd6fe4da Main class handles zipfiles 2010-06-30 21:05:43 +01:00
Martin Thompson
94553048e3 Merged from trunk 2010-06-30 20:54:30 +01:00
Martin Thompson
7ce01d0e65 Moved test scripts and data to a test folder 2010-06-30 20:53:08 +01:00
Raoul Snyman
eda9093064 Change namespace of other plugin icons and make ServiceItems use the plugin's icon instead of some arb image "prediction" that is prone to failure. 
bzr-revno: 903
 2010-06-30 21:29:08 +02:00
Raoul Snyman
6038d46a56 Make ServiceItems use the plugin's icon instead of some arb image "prediction" that is prone to failure. 2010-06-30 20:36:57 +02:00
Raoul Snyman
568e80748c Change namespace of other plugin icons. 2010-06-30 20:16:07 +02:00
Tim Bentley
9ebdc1e2d3 Update missing checks 2010-06-30 18:05:12 +01:00
Tim Bentley
8b5931d50c Video and Image updates 2010-06-30 17:30:25 +01:00
Tim Bentley
6cd1e520a1 Head 901 2010-06-30 17:11:09 +01:00
Tim Bentley
7198148a48 Replaceable Backgound images now work 2010-06-30 17:10:54 +01:00
Jon Tibble
0359fbbc57 Head r900 2010-06-30 12:59:55 +01:00
Jon Tibble
912516e8f0 Really fix service loading! 2010-06-30 12:59:09 +01:00
Tim Bentley
56e4e38b99 Head900 2010-06-30 05:53:09 +01:00
Tim Bentley
4767ec08a2 Image display refactoring 2010-06-30 05:52:52 +01:00
Raoul Snyman
5c4a835dac Added decent images for remotes, alerts and song usage. 2010-06-29 23:23:56 +02:00
Jon Tibble
0b48e66466 Fix service loading 
bzr-revno: 899
 2010-06-29 17:14:50 +01:00
Jon Tibble
c0a924e304 Fix service loading 2010-06-29 17:07:45 +01:00
Jon Tibble
cede98c0cb Head 897 2010-06-29 16:40:46 +01:00
Jon Tibble
d37b4d1e8d Plugin and other docstrings 2010-06-29 16:25:24 +01:00
Jon Tibble
6235140868 Head r896 2010-06-29 11:04:22 +01:00
Jon Tibble
0b8e4f2845 Fix filter usage (Fixes theme deletion) 2010-06-29 11:02:23 +01:00
Jon Tibble
4a4da4ba2c Naming and docstrings 2010-06-29 08:07:03 +01:00
andreas
6d233a75a0 - small fixes 2010-06-28 22:02:56 +02:00
andreas
68a934de71 - small fixes 2010-06-28 22:00:35 +02:00
Martin Thompson
75c6ba2284 Improved =s 2010-06-28 20:55:04 +01:00
andreas
93ae2b9cf8 resolved conflicts 2010-06-28 21:28:28 +02:00
Tim Bentley
ebb368559f Head894 2010-06-28 20:14:31 +01:00
Jon Tibble
19ff5dec55 Refactor database code 
bzr-revno: 894
 2010-06-28 20:12:08 +01:00
andreas
51e07d66df fixed deletion bug in media manager (custom, media, images, presentations) 2010-06-28 21:05:55 +02:00
andreas
eccd2999ee started fixing deletion bug in media manager (custom still to be done) 2010-06-28 20:20:05 +02:00
Tim Bentley
fd09e3d5a0 Tidy up loop icons 2010-06-28 18:54:29 +01:00
Tim Bentley
109ef118c4 Head893 2010-06-28 17:48:36 +01:00
Tim Bentley
eafdf71e5c Fix up screen blanking and videos 2010-06-28 17:48:21 +01:00
andreas
5de4832ae7 changed the variable name 2010-06-28 18:23:59 +02:00
andreas
4f05a42627 fixed bug #599066 2010-06-28 17:43:40 +02:00
Jon Tibble
3be57e57e7 Rename method to save_object() 2010-06-28 14:38:29 +01:00
Jon Tibble
f0896422d4 Fix off-by-one in song saving 2010-06-28 13:43:14 +01:00
Jon Tibble
ad9328a30f RFC: Fix couple of leftovers 2010-06-28 12:24:18 +01:00
Jon Tibble
6c182ef70b Head r892 2010-06-28 11:48:58 +01:00
Jonathan Corwin
b9896bb915 Trap presentation errors when OpenOffice.org is not installed 
bzr-revno: 892
 2010-06-28 07:35:06 +01:00
Jonathan Corwin
9a2b05f830 Prevent crash if OpenOffice not installed on Windows 2010-06-27 23:34:33 +01:00
Raoul Snyman
b188592c32 Fixed up problems with version checking. 2010-06-27 14:49:01 +02:00
Tim Bentley
5ba7febc3b Video cleanups for display 2010-06-27 08:19:34 +01:00
Jonathan Corwin
7cf31532b8 Remove error trace if no impress 2010-06-26 21:34:26 +01:00
andreas
9c4f565776 fixed double spaces 2010-06-26 18:13:52 +02:00
andreas
696c413cee Improved delete button behaviour 2010-06-26 18:08:38 +02:00
Tim Bentley
4b38c22d30 Alerts now work and more hiding cleanups 2010-06-26 15:13:10 +01:00
Jonathan Corwin
d4b70b34e7 sofimport error trap if ooo not installed 2010-06-26 12:16:59 +01:00
Tim Bentley
d82f94e326 Refactor Alert code for Html 2010-06-26 09:09:09 +01:00
Tim Bentley
b59b2bdafa Fix bug #596541 hide theme combo for global themes 2010-06-26 08:19:30 +01:00
Tim Bentley
4820d5d15f Head 2010-06-26 07:24:53 +01:00
Tim Bentley
90cf4428c4 Hide buttons to menu part 1 2010-06-26 07:24:38 +01:00
Tim Bentley
89ccc8f390 Head 2010-06-25 21:44:21 +01:00
Tim Bentley
780e45891c More fixes 2010-06-25 21:44:13 +01:00
Jonathan Corwin
e5da1cb5f9 head 2010-06-25 21:21:40 +01:00
Jonathan Corwin
217b40c26f Bug 598361 - Preview presentation error. Ensure presentations close correctly 2010-06-25 21:20:03 +01:00
Jon Tibble
4d1a7e8b41 Cleanup last few commits 2010-06-25 20:01:03 +01:00
andreas
5135706761 ListWidget usability improvement 
bzr-revno: 886
 2010-06-25 19:38:16 +01:00
Jon Tibble
51ca897c77 Docstrings 
bzr-revno: 885
 2010-06-25 19:34:36 +01:00
Martin Thompson
baec9d5c2f Unicode chars in my testcase work OK 2010-06-25 19:20:45 +01:00
andreas
1800ae4ddb improvement in regard to bug #598415 2010-06-25 20:18:52 +02:00
Jon Tibble
f5a8a846b7 Head r883 2010-06-25 19:16:39 +01:00
Jon Tibble
01421770ed Head r883 2010-06-25 19:14:38 +01:00
Tim Bentley
72ef67512c Head883 2010-06-25 17:50:49 +01:00
Tim Bentley
7c873ada58 Fix bug #598415 2010-06-25 17:50:35 +01:00
Frode Woldsund
4807fed62e Fixed (c) symbol. 
bzr-revno: 883
 2010-06-25 16:28:55 +02:00
Frode Woldsund
5c5427d963 Merged with current trunk and used '\xa9' as (c) symbol 2010-06-25 10:07:51 +02:00
Raoul Snyman
0034691bd0 pptviewlib changes 2010-06-25 07:22:58 +02:00
Tim Bentley
4be942efe3 Head 2010-06-25 06:11:01 +01:00
Jon Tibble
585ffbdc6d Head r881 2010-06-25 01:30:26 +01:00
Jon Tibble
3cee3f0f8e Fix grammo 2010-06-25 01:25:21 +01:00
Jon Tibble
6798f3402c Head r881 2010-06-25 01:24:56 +01:00
Jonathan Corwin
adb5776d61 pptviewlib changes 
bzr-revno: 881
 2010-06-24 22:01:57 +01:00
Raoul Snyman
ae17e3b6b3 Some more OOo related fixes. 2010-06-24 22:48:38 +02:00
Jonathan Corwin
a23a354532 pptviewlib.dll 2010-06-24 21:25:35 +01:00
Jonathan Corwin
6f525dc0c2 Presentation tidies 
bzr-revno: 880
 2010-06-24 21:16:34 +01:00
Martin Thompson
76e3538127 Imports all of SOF and the opensong default songs without crashing 2010-06-24 21:13:32 +01:00
Jon Tibble
95945c622f Fix check_item_selection 
bzr-revno: 879
 2010-06-24 21:05:04 +01:00
Jonathan Corwin
1ea6d1da50 Merge excepts together (again) 2010-06-24 20:58:45 +01:00
Raoul Snyman
10663be6bc Fix bug #595676i, improve the OSIS importer and add source languages from Pootle. 
bzr-revno: 878
 2010-06-24 21:46:53 +02:00
Jonathan Corwin
84b7a4f4ad head 2010-06-24 20:43:06 +01:00
Jonathan Corwin
30f8441ce9 Merge excepts together 2010-06-24 20:42:15 +01:00
Raoul Snyman
9dc12ac522 Try to fix the song plugin's dependence on OOo. 2010-06-24 21:40:41 +02:00
Jon Tibble
78b1c8d1af Do the fix properly 2010-06-24 20:36:33 +01:00
Raoul Snyman
e29127477e Merge from trunk. 2010-06-24 21:18:50 +02:00
Jon Tibble
b402cc5639 Fix check_item_selection 2010-06-24 20:04:18 +01:00
Raoul Snyman
aa2d1586ea Fix bug #595676 and improve the OSIS importer. 2010-06-24 20:35:01 +02:00
Jon Tibble
4ac7ce16c0 Ampersands and item selection checking 
bzr-revno: 877
 2010-06-24 19:16:43 +01:00
Tim Bentley
b4626d80eb Screen sizes now work 2010-06-24 19:06:34 +01:00
Jon Tibble
2c42aa0289 Refactor check_item_selected 2010-06-24 16:50:40 +01:00
Jon Tibble
ca7f3eb599 Fix and add some ampersands 2010-06-24 16:28:42 +01:00
Jonathan Corwin
bbf5ecf0fc Head 2010-06-23 23:30:15 +01:00
Jonathan Corwin
fe01718d46 Presentation tidyups 2010-06-23 23:26:54 +01:00
Tim Bentley
da5ff6c3db Update version numbers and white space 2010-06-23 18:37:01 +01:00
Frode Woldsund
56f87c3a35 Fixed (c) symbol 2010-06-23 15:39:36 +02:00
Frode Woldsund
07db3c4c21 removed u' 2010-06-23 09:22:05 +02:00
Frode Woldsund
4826408536 stupid whitespace ... 2010-06-23 09:05:43 +02:00
Frode Woldsund
b95b598340 Forgot to import translate from openlp.core.lib :( 2010-06-23 08:54:11 +02:00
Tim Bentley
d2af535c70 Start to clean up display code. 
Make Video Hide / Reappear
Add Audio player to play audio with no display
Replace Labels with QGraphicXXXXItems
 2010-06-23 06:13:32 +01:00
Martin Thompson
f7b8095f68 Handles [1] type verse numbering, parses all of SOF and Songs.zip 2010-06-22 22:54:10 +01:00
Frode Woldsund
683a53c594 Fixed 2 translate() functions in songplugin 2010-06-22 23:53:18 +02:00
Martin Thompson
9c573d7bef Handles [C] followed by non-numbered lines, by assigned them all to [C1] 2010-06-22 22:24:24 +01:00
Martin Thompson
e8a397d3ec Handles songs without a preliminary V tag 2010-06-22 21:41:31 +01:00
Tim Bentley
dc1479e830 Stop screen blanking on 1 display as startup 2010-06-22 18:12:47 +01:00
Jon Tibble
912668c619 Fix version check (Bug #597121) 2010-06-22 17:17:15 +01:00
Jon Tibble
d9d976d64b Cleanup and import fix 2010-06-22 16:09:49 +01:00
Jon Tibble
43a4eaed96 Head r872 2010-06-22 15:34:03 +01:00
Jon Tibble
ec87fddf53 * Fix log file location (Bug #596822) 
* Script resources generation
* Cleanup long lines

bzr-revno: 872
 2010-06-22 14:14:09 +01:00
Jon Tibble
a9e9f334e2 Fix log file location 2010-06-22 13:32:15 +01:00
Frode Woldsund
92776230dd Another translate() bugfix. 
bzr-revno: 871
 2010-06-22 09:13:29 +02:00
Raoul Snyman
817e75898e Fix up Theme form parentage. 
bzr-revno: 870
 2010-06-22 09:08:31 +02:00
Jon Tibble
70df49476d Long lines 2010-06-22 00:38:54 +01:00
Frode Woldsund
e18a8067c7 switched place on function that did not make sense: translate(unicode -> unicode(translate 2010-06-21 23:57:01 +02:00
Frode Woldsund
5f72066b32 Merged whit trunk and fixed one missing u'' 2010-06-21 23:35:07 +02:00
Jon Tibble
1cf85205ce More translate() 2010-06-21 22:04:56 +01:00
Jon Tibble
2a71670149 Stray trailing backslashes 2010-06-21 21:52:25 +01:00
Raoul Snyman
d7bd2c5074 Fix up Theme form parentage. 
Some new lines?
 2010-06-21 22:06:36 +02:00
Tim Bentley
a4d7ae1600 Final extermination of translate u"s 2010-06-21 19:28:36 +01:00
Raoul Snyman
c8bbd65349 Updated the majority of the translate() functions. 
bzr-revno: 866
 2010-06-21 20:00:21 +02:00
Raoul Snyman
74767e3874 Merge from trunk 2010-06-21 18:47:34 +02:00
Raoul Snyman
6c1b5a6fad Updated the majority of the translate() functions. 
Removed .qm files.
Ignore .qm files.
 2010-06-21 18:43:59 +02:00
Tim Bentley
b08707cc80 Head864 2010-06-21 17:21:00 +01:00
Tim Bentley
af5ae6047a Fix bug with Inactive not working 2010-06-21 17:20:41 +01:00
Jon Tibble
e7b4e16405 Couple o' Cleanups 2010-06-20 14:03:06 +01:00
Jon Tibble
700b41390e Head r863 2010-06-20 13:43:09 +01:00
Raoul Snyman
068cb0ff8b Fix bug #596506 and bug #596505 
bzr-revno: 863
 2010-06-20 14:37:22 +02:00
Raoul Snyman
ce79049868 Reverted a change that could introduce a bug! 2010-06-20 14:12:49 +02:00
Raoul Snyman
054ec36e4a Fixed bug #596505 2010-06-20 13:43:16 +02:00
Raoul Snyman
28bb5e519d Fix bug #596506 2010-06-20 13:09:15 +02:00
M2j
888bc50622 fixes 2010-06-20 08:48:32 +02:00
M2j
8e25f3850e corrected one string 2010-06-20 01:58:42 +02:00
M2j
87c21201e7 HEAD 2010-06-20 01:31:32 +02:00
M2j
3061c319d5 Automatic verse order entry expanding 
deleted a misplaced QSpacerItem
 2010-06-20 01:16:15 +02:00
Jon Tibble
afefd3c45f Head r861 2010-06-20 00:12:00 +01:00
M2j
735ae40996 single character verse entries 2010-06-19 23:54:53 +02:00
Jon Tibble
e3a07c1e57 Cleanups 2010-06-19 21:21:36 +01:00
Raoul Snyman
ba4b7a9b7f Removed lowercasing of image formats. 2010-06-19 20:42:49 +02:00
Raoul Snyman
d321249366 Removed unnecessary comments. 2010-06-19 20:38:17 +02:00
Jon Tibble
1005a3c1b1 Cleanup unneeded trailing backslashes 2010-06-19 19:29:18 +01:00
Raoul Snyman
8c6e033c3d Fixed up translate parameters. 2010-06-19 20:29:08 +02:00
Raoul Snyman
38255ffdb6 Merge from trunk 2010-06-19 20:03:21 +02:00
Raoul Snyman
e615401007 Make image formats filter in a central location. 2010-06-19 20:00:50 +02:00
Jon Tibble
a34957297c Cleanups 2010-06-19 18:56:21 +01:00
Jon Tibble
f2836baae4 More docstrings 2010-06-19 18:31:42 +01:00
Jon Tibble
91c0fcb9e7 Head r860 2010-06-19 18:30:41 +01:00
Jon Tibble
685fe0311a Cleanups 
bzr-revno: 860
 2010-06-19 18:26:34 +01:00
Meinert Jordan
a80e212c06 Unicode for Themes 
bzr-revno: 859
 2010-06-19 18:20:35 +01:00
Jon Tibble
0235f251bf Cleanups 2010-06-19 14:18:38 +01:00
M2j
0f7c997214 small fix for unicode Theme names 2010-06-19 14:01:06 +02:00
Jon Tibble
2d050b07db Head r858 2010-06-19 12:53:20 +01:00
M2j
9cdc489735 HEAD 2010-06-19 13:43:05 +02:00
Jon Tibble
14cafa91c2 Complete openlp.migration removal 
bzr-revno: 858
 2010-06-19 12:42:33 +01:00
Frode Woldsund
6b1255551a String Cleanup in MainWindow 
bzr-revno: 857
 2010-06-19 13:32:18 +02:00
Tim Bentley
0a3bf10fb9 Translation updates 
Remove Text over video for now.
Fix song editing bug

bzr-revno: 856
Fixes: https://launchpad.net/bugs/596211
 2010-06-19 12:02:18 +01:00
M2j
b7ec09cf87 Unicode support for theme XML 2010-06-19 12:41:13 +02:00
Tim Bentley
cf73f77e0d Fix bug #596211 2010-06-19 11:37:58 +01:00
Tim Bentley
41789ef5e3 Translate string clean up 
core/lib/__init__.py
core/utils/languagemanager.py
core/lib/mediamanageritem.py
core/ui/slidecontroller.py
core/ui/plugin*.py
core/ui/service*.py
 2010-06-19 05:05:39 +01:00
Tim Bentley
18a32a2217 Remove Media dynamic backgrounds for now. 
Clean up Media, Image and Custom translate strings
 2010-06-19 04:43:10 +01:00
Frode Woldsund
77e0e5a397 String Cleanup: replace translate(u'', u'') -> translate('', '') 2010-06-19 01:48:16 +02:00
M2j
b13f9eb74f String cleanup: Themes 2010-06-19 01:18:08 +02:00
Jon Tibble
f7fb45e69e Complete openlp.migration removal 2010-06-18 23:13:10 +01:00
Raoul Snyman
a616a7d160 - Fixed a problem where authors with null names in the db were not editable. 
- Fixed the add author shortcut on the edit song form to split up the author's name so that the above error doesn't occur.
- Made the Clear Search button run a blank search (which is what the user expects).
 2010-06-19 00:09:41 +02:00
Raoul Snyman
d48daa2c98 Added last bits of streamlining of Song Maintenance form. 2010-06-18 21:55:45 +02:00
Raoul Snyman
cc2db3a5f4 Merge from trunk 2010-06-18 18:44:10 +02:00
Jon Tibble
226277e55d Head r852 2010-06-18 12:57:50 +01:00
Tim Bentley
0d35135945 Fix Bug #595672 2010-06-18 08:42:38 +01:00
Tim Bentley
d143b197a3 Head851 2010-06-18 06:59:31 +01:00
Tim Bentley
e4f77dbacb Bug fixes 2010-06-18 06:58:40 +01:00
Jon Tibble
7f88043177 RFC: Cleanups 2010-06-18 02:26:01 +01:00
Jon Tibble
8382ea5303 Fix service manager DnD (Bug #595671) 2010-06-18 00:17:16 +01:00
Jon Tibble
5dc87d3ede Cleanups 2010-06-17 22:07:01 +01:00
Jon Tibble
16ab2da4d6 Fix HTTPBible verse counts 2010-06-17 22:01:30 +01:00
Jon Tibble
d395438173 Head r851 2010-06-17 18:00:14 +01:00
Jon Tibble
035ae84f39 Import translate 2010-06-17 15:23:50 +01:00
Jon Tibble
1af5f700e2 Bible search fix 
Edit and Delete feedback for Media Manager Items
Fix Bible Import Wizard setField errors
Fix addToServiceItem locations
Remove unused scripts/get-strings.py

bzr-revno: 850
 2010-06-17 15:06:47 +01:00
Frode Woldsund
d5bd675489 Complete trUtf8 -> translate conversion 
bzr-revno: 849
 2010-06-17 15:03:10 +01:00
Frode Woldsund
7c6b5c0b99 translate(pluginName.pluginName) -> translate(pluginName) and removed some spaces 2010-06-17 14:02:18 +02:00
Jon Tibble
9d9464aee5 Head r848 2010-06-17 12:45:45 +01:00
Jon Tibble
143f361f8d Fix translate and remove unused script 2010-06-17 12:43:58 +01:00
Jon Tibble
4683e20860 Fix addToServiceItem location 2010-06-17 02:56:05 +01:00
Frode Woldsund
99d97a95a3 removed a "enter-space" 2010-06-17 00:17:50 +02:00
Frode Woldsund
cc7b6a9ec3 Merged whit current trunk 2010-06-17 00:14:46 +02:00
Frode Woldsund
40fbf5ad63 Fixed syntax in translate() function that contained u'%s' and % stuff 2010-06-17 00:11:11 +02:00
Jonathan Corwin
674b9e00ad Remove the main display so we can see the ppt's 2010-06-16 22:22:02 +01:00
Jonathan Corwin
62376aa93d Head 2010-06-16 21:54:41 +01:00
Jon Tibble
04f2a9797b Bible search fix: 
* Add feedback
* cater for partial file-based bibles
* Prevent an uncaught exception
 2010-06-16 02:48:52 +01:00
Jon Tibble
5e0ab4a7f6 Fix lack of feedback for edit and delete 2010-06-16 02:23:57 +01:00
Jon Tibble
814a4f023d Fix Bible Import setField errors 2010-06-16 01:31:44 +01:00
Martin Thompson
3417d85a58 Elementtree now from lxml 2010-06-15 22:26:35 +01:00
Martin Thompson
fc27f8107e First test looks promsing 2010-06-15 22:25:50 +01:00
Martin Thompson
2f077c3982 Renamed so as not to conflict with the Pthon XML library which is still used by the Song XML class 2010-06-15 22:24:49 +01:00