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

2480 Commits

Author SHA1 Message Date
Jon Tibble 7691418bc3 Head r952 and cleanups 2010-07-19 21:43:02 +01:00
Andreas Preikschat a266a54641 Cleanups and song data merging 
bzr-revno: 952
 2010-07-19 21:30:45 +01:00
Martin Thompson acb9cca5d3 Missed a rename 2010-07-19 20:35:33 +01:00
andreas 978372ca9f added check preventing adding a topic/author twice to the song 2010-07-19 20:34:03 +02:00
Jon Tibble 86ad4b1071 Fix DB definition ordering 2010-07-19 16:39:42 +01:00
andreas 6eb260a64e fix 2010-07-19 17:03:49 +02:00
andreas dd662dc277 now filtering songs 2010-07-19 16:56:24 +02:00
andreas a21154addc names 2010-07-19 15:39:18 +02:00
Jon Tibble 9e2b876be3 Add audio files to DB 2010-07-19 13:18:56 +01:00
andreas 30cbaafb09 fixed comment 2010-07-19 12:17:41 +02:00
andreas 3502149556 reworked code 2010-07-19 10:50:44 +02:00
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
Jon Tibble bf71742308 Head r950 2010-07-18 15:36:59 +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
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 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
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
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
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
Jon Tibble a2704186a5 Save current media plugin (Bug #596540) 
bzr-revno: 935
 2010-07-12 17:50:54 +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
andreas 488ead8162 cleanup 2010-07-11 15:23:12 +02: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