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
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
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
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