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

885 Commits

Author SHA1 Message Date
Andreas Preikschat 25373944b2 started work on converting old image settings 2013-02-26 12:23:57 +01:00
Tim Bentley 0a1ebfbdb9 Head + merge issues 2013-02-21 21:33:06 +00:00
Tim Bentley 20c3157d6d final fixes 2013-02-21 17:05:56 +00:00
Andreas Preikschat 8d164cd21e clean up 2013-02-20 08:02:48 +01:00
Tim Bentley 6d732cf3ba Cleanups 2013-02-19 19:50:14 +00:00
Andreas Preikschat 29194b5e1e fixed bug #1128376 (Configure shortcuts has two items called settings) 
Fixes: https://launchpad.net/bugs/112837
 2013-02-19 14:57:14 +01:00
Andreas Preikschat 20d687524a fixed missing items 2013-02-19 14:09:00 +01:00
Andreas Preikschat 38c2c2db5e make diff more readable 2013-02-19 10:33:07 +01:00
Andreas Preikschat 53f93d6342 r2187 + conflicts 2013-02-19 10:16:54 +01:00
Andreas Preikschat 781da422b6 started to remove forgotten shortcut kwargs 2013-02-19 10:13:49 +01:00
Tim Bentley 4b30d6cd29 Openup servicemanager again 2013-02-18 21:36:36 +00:00
Raoul Snyman 74fc1d3988 HEAD 2013-02-18 23:05:08 +02:00
Tim Bentley 4cb0b33fca Cleanup pluginmanager 2013-02-18 20:57:14 +00:00
Tim Bentley 7b03764a4a code cleanups 2013-02-18 20:41:08 +00:00
Tim Bentley e8b123925f Bootstrap cleanup 2013-02-18 19:59:35 +00:00
Tim Bentley de6ce12092 Mark 1 2013-02-17 21:28:45 +00:00
Andreas Preikschat 480b666918 cleaned pluginmanager constructor 2013-02-17 13:57:52 +01:00
Raoul Snyman f4a2855094 Removed an unecessary variable. 2013-02-16 14:11:51 +02:00
Raoul Snyman a8fafc3363 HEAD 2013-02-16 14:01:10 +02:00
Raoul Snyman 98311d9ad1 Add an interface test for the find_plugins method. 
Not sure if this should be an interface test or a scenario test, but it does very little mocking, tries to let the bits of OpenLP run for real, and checks that all the plugins are imported.

Remove the superfluous argument to the find_plugins method.
 2013-02-11 23:16:30 +02:00
Raoul Snyman 1dacaf2487 HEAD 2013-02-11 21:52:07 +02:00
Tim Bentley 064a4bad20 Merge fixes 2013-02-10 16:05:52 +00:00
Raoul Snyman 0f7f17f79c Various code cleanups. 
- Renamed variables to python_style
- Renamed some functions to python_style
- PEP8 compliance cleanup
 2013-02-10 12:39:28 +02:00
Andreas Preikschat 5739536d8c fixed more regression 2013-02-09 16:27:35 +01:00
Tim Bentley 3063526430 Fix problems with start up thread 2013-02-07 10:16:08 +00:00
Tim Bentley c90d45ca73 Bye Bye Event Receiver 2013-02-07 08:42:17 +00:00
Tim Bentley fae34b1b4d Head + fix merge problems 2013-02-07 07:17:19 +00:00
Tim Bentley 1430559205 More Receiver to Registry migrations 2013-02-06 21:52:15 +00:00
Tim Bentley eac2ce39b3 More Receiver removals 2013-02-05 21:42:15 +00:00
Andreas Preikschat b3e20f2788 r2170 + conflict 2013-02-05 09:10:50 +01:00
Andreas Preikschat f94ae4d7c2 reordered imports 2013-02-05 09:05:28 +01:00
Andreas Preikschat 3df730db09 used += instead 2013-02-04 22:26:27 +01:00
Andreas Preikschat 9aa7cf7b29 r2169 + conflict 2013-02-04 22:07:38 +01:00
Tim Bentley b7b19a4180 Fix up Registry function processing 2013-02-04 19:25:12 +00:00
Tim Bentley ca5e46a2b1 Add test idea for the registry 2013-02-03 21:46:56 +00:00
Tim Bentley a9a4c7938e Fix name and other bugs 2013-02-03 19:23:12 +00:00
Tim Bentley 28aeed815f Minor fixes 2013-02-03 17:42:31 +00:00
Tim Bentley ad438ba4b2 Remove rogue print 2013-02-03 16:56:19 +00:00
Tim Bentley b83b6eccd1 Head and merge failures 2013-02-03 16:40:39 +00:00
Tim Bentley 123f460f7e Fix up Receiver code changes 2013-02-03 15:06:17 +00:00
Raoul Snyman 12fc795c9c Fix up some issues caused by my refactor and some apparent merge conflict somewhere. 2013-02-03 16:40:48 +02:00
Tim Bentley 27cd63ebcd Remove events and move to Registry 2013-02-03 09:07:31 +00:00
Raoul Snyman 327711d0ef HEAD 2013-02-02 23:16:42 +02:00
Raoul Snyman 922c392ecb Slowly start moving names to PEP8 style names. 2013-02-02 22:54:34 +02:00
Tim Bentley aa14303003 standards for thememanager and more Registry 2013-02-01 21:48:06 +00:00
Tim Bentley 4c26ff8f80 Cleaned up ServiceManager 2013-02-01 20:40:23 +00:00
Raoul Snyman 439fc9b8f0 More cleanups 2013-02-01 22:36:27 +02:00
Andreas Preikschat 9bc317532c r2162 + conflict 2013-01-31 19:47:53 +01:00
Andreas Preikschat 16ba742d1d sorted default dict a bit; fixed settings conversion; renamed a setting; removed old setting 2013-01-31 08:56:34 +01:00
Tim Bentley 72920494a6 Head and merge fixes 2013-01-30 22:01:52 +00:00
Andreas Preikschat d7472876c7 change wording 2013-01-30 21:34:54 +01:00
Andreas Preikschat cc5776c7d3 fixed 'song/ccli number' setting; do not change setting.ini when IMPORTING 2013-01-30 21:29:33 +01:00
Andreas Preikschat 94be547550 removed not needed return 2013-01-30 19:29:10 +01:00
Andreas Preikschat 320b692db7 fixed lower case on some settings 2013-01-30 19:24:41 +01:00
Tim Bentley bdb9089409 Cleanup ServiceManager code 2013-01-27 07:36:04 +00:00
Tim Bentley 1e3590a152 Clean up complete for now 2013-01-24 06:00:51 +00:00
Tim Bentley e519e1b435 remove main window code in service manager 2013-01-23 21:47:23 +00:00
Tim Bentley be6977a1a3 remove plugin helpers 2013-01-23 21:05:25 +00:00
Tim Bentley aafef12bf8 Head with fixes 2013-01-23 20:29:43 +00:00
Tim Bentley 76d259264d More cleanups 2013-01-23 19:53:40 +00:00
Tim Bentley 3378e32da3 More cleanups and removal of plugin_helpers 2013-01-23 19:28:47 +00:00
Tim Bentley a6de33f177 Registry takes shape and takes over 2013-01-22 21:09:43 +00:00
Andreas Preikschat bee9c96b9a song export fixes 2013-01-18 22:24:25 +01:00
Andreas Preikschat 0fc9c4792f tweaked 'settings migrator' 2013-01-16 19:59:34 +01:00
Andreas Preikschat 15c96f8b87 fixed upper General 2013-01-16 13:26:17 +01:00
Andreas Preikschat 6cecfe0fb7 fixed settingsmanager bug; fixed translation bug 2013-01-15 00:26:51 +01:00
Andreas Preikschat fa6703f307 fixed up remove_obsolete_settings method 2013-01-12 09:54:49 +01:00
Andreas Preikschat 095066cf19 add possibility to remove old_keys from the config 2013-01-11 21:44:30 +01:00
Andreas Preikschat 75a86f05ee fixed removed plugin 2013-01-11 13:43:18 +01:00
Andreas Preikschat 0f042dde6f clean ups 2013-01-11 01:35:00 +01:00
Andreas Preikschat 91fbf037a2 splitted ui.py into two files; changed imports 2013-01-11 01:19:11 +01:00
Andreas Preikschat 2616f63007 removed value parameter (still needs work) 2013-01-11 00:07:48 +01:00
Andreas Preikschat 306919d15f moved settings to own file 2013-01-10 20:54:45 +01:00
Andreas Preikschat eb6bc6adbc started work to store setting in a (half) central place 2013-01-10 20:33:48 +01:00
Jonathan Corwin 794567b1ec Import %General, better error message, support 'players' section 2013-01-02 22:32:41 +00:00
Jonathan Corwin 4257ce2932 Attempt to load %General section, and just ignore those we don't know 2012-12-29 22:55:40 +00:00
Tim Bentley 4a0b3f90aa 2013 is comming 2012-12-29 20:56:56 +00:00
Tim Bentley 9f28874eb5 Code fixes 2012-12-29 18:13:08 +00:00
Tim Bentley 4b6292220a Main window done 2012-12-29 13:15:42 +00:00
Andreas Preikschat 0a57bed2f7 fixed setting import 2012-12-27 18:00:40 +01:00
Andreas Preikschat cbd22b7141 fixed bug caused by merge 2012-12-27 17:46:27 +01:00
Andreas Preikschat b6c9fa16c5 reverted last commit 2012-12-27 17:27:59 +01:00
Andreas Preikschat 18aaf682e8 started to implment central place for default values 2012-12-20 21:33:43 +01:00
Andreas Preikschat 6ed77d4032 r2128 + conflicts 2012-12-20 13:09:12 +01:00
Andreas Preikschat fc38f62a17 trunk + conflicts 2012-12-04 22:50:14 +01:00
Tim Bentley a1d3d002ef String fixes 2012-12-04 06:09:55 +00:00
Tim Bentley fae1d79fff 2020 2012-12-03 19:19:10 +00:00
Tim Bentley a7294a8e8b Copyright and Translation updates from 2.0 2012-12-01 07:57:54 +00:00
Tim Bentley 57ad90f1a6 Head 2012-11-16 21:46:56 +00:00
Tim Bentley 5646183803 Fixes 2012-11-11 21:16:14 +00:00
Tim Bentley 55f4bc3a73 Fix name and add spearator 2012-11-11 19:33:53 +00:00
Tim Bentley 69b2bcb21f Head 2016 2012-11-10 16:43:42 +00:00
Tim Bentley 47c9af348c Fix spelling - oops 2012-11-07 21:37:01 +00:00
Tim Bentley 9e1e07c04c Head 2103 2012-11-07 18:41:07 +00:00
Philip Ridout 4f78c5e5bc fixes bug #1066142 "cancel firsttime wizard without song causes song reindexing" 2012-11-04 20:45:31 +00:00
Andreas Preikschat 3629c8a535 r2098 + conflict 2012-11-01 16:56:03 +01:00
Tim Bentley e24c588df3 Head 2012-10-25 20:17:14 +01:00
Tim Bentley 716dc9ccf0 More updates 2012-10-21 15:07:57 +01:00
Tim Bentley cdbc1fd82e Copyrights 2012-10-21 14:16:22 +01:00
Tim Bentley aea75e6c73 fix up player tab after setup changes and start to fix light save 2012-10-14 16:58:04 +01:00
Tim Bentley 34284ea8ae Clean up media extension lists and move the controller. Fix reload of suffixes to happen after media or presentaions changes 2012-10-07 08:25:55 +01:00
Tim Bentley 56501b69f7 Head 2074 2012-10-06 09:37:40 +01:00
Andreas Preikschat c4bdea7edd fixes 2012-10-03 19:55:39 +02:00
Andreas Preikschat 4a7a7e9050 fixes 2012-10-03 19:09:56 +02:00
Andreas Preikschat 159f3ea9a2 r2074 + conflicts 2012-10-03 18:38:06 +02:00
ElderP 3855b28d40 Added [crashreport] as a valid section for settings import 2012-09-21 16:35:42 -04:00
Tim Bentley 6ef5fa88d2 Split media tabs, update ServiceItem and add auto start feature 2012-09-09 07:27:53 +01:00
Martin Zibricky 9ecca162bd Additional translate() substitution fixes in openlp.core modules. 2012-09-06 15:49:47 +02:00
Martin Zibricky 9736707e5b Fixed bug #1046599: String substitution cannot be done for translate() funciton and for QString type. 2012-09-06 11:31:27 +02:00
Brian T. Meyer briantmeyer@cox.net c14a4f4e8d fixed spaces around brackets to match style guidelines 2012-08-04 10:09:12 -07:00
Brian T. Meyer briantmeyer@cox.net 8100a66622 Contains fix to allow QT to move place About, Exit and Preference Menu 
Items into the Application menu per Apple UI guidelines.
 2012-08-03 21:34:13 -07:00
Andreas Preikschat 4b6769f9b2 fixed bug 1021272 (Exporting settings fails with traceback in Build 2014) 
Fixes: https://launchpad.net/bugs/1021272
 2012-07-05 17:25:23 +02:00
Andreas Preikschat 894c6c2868 fixed 1014684 (OpenLP doesn't start on Windows XP) 
bzr-revno: 2005
 2012-06-26 17:14:42 +01:00
Andreas Preikschat ab8e6ee30a use get_filesystem_encoding 2012-06-22 22:12:43 +02:00
Samuel Findlay 4510fdbede Added three names in Copyright headers and About window (Samuel Findlay, Edwin Lunando, Dave Warnock). Fixed consistency issues. 2012-06-23 00:14:53 +10:00
Jonathan Corwin ef134c2ea7 Release the application reference 2012-06-18 23:05:11 +01:00
Stevan Pettit 245c0acd89 Merge with trunk, resolve conflicts 2012-06-09 19:14:28 -04:00
Stevan Pettit c4d3ba5559 Fixed indenting 2012-06-09 00:32:28 -04:00
Stevan Pettit cb50427af1 Merge branch. Fixed conflict 2012-06-09 00:23:24 -04:00
Stevan Pettit d00a3898e1 Merge with trunk. Fixed conflict 2012-06-08 19:19:03 -04:00
Andreas Preikschat 81b4d84c1f changed attributes and arguments to camelCase 2012-06-04 12:22:47 +02:00
Stevan Pettit 394a02c696 Merged trunk 2012-05-29 08:59:11 -04:00
Andreas Preikschat d5f1c54669 do some of the clean ups even when we just imported settings 2012-05-27 12:58:10 +02:00
Andreas Preikschat 612500c677 r1976 2012-05-26 19:53:03 +02:00
Andreas Preikschat 51d69a28ce stop imageManager thread on shutdown 2012-05-26 19:51:27 +02:00
Andreas Preikschat 56b02b02b1 attribute instead of method 2012-05-26 19:12:01 +02:00
Stevan Pettit ec27884d39 Removed last Qtcore.Qsetting usage 2012-05-24 07:02:01 -04:00
Andreas Preikschat 0517f3d8d7 renamed attribute 2012-05-23 18:59:28 +02:00
Andreas Preikschat 45c05e700d clean ups 2012-05-23 18:53:04 +02:00
Andreas Preikschat ded1e82659 r1975 2012-05-23 18:49:24 +02:00
Stevan Pettit 968674a659 Merged with trunk, fixed conflicts and other changes 2012-05-20 23:06:17 -04:00
Stevan Pettit 0548bfb345 Modified code to use the directory choosen by user, don't append a sub-dir 2012-05-20 21:23:50 -04:00
Raoul Snyman 1c57abf8ab Refactored ScreenList into a true Pythonic singleton, though I sadly had to go with a "create" classmethod in order to retain the functionality of the previous constructor.. 2012-05-20 22:56:11 +02:00
Stevan Pettit f239cdcdad Various changes 2012-05-20 15:29:08 -04:00
Andreas Preikschat 9fa14f3e3a attempt to fix bug 923496 
Fixes: https://launchpad.net/bugs/923496
 2012-05-20 17:52:21 +02:00
Andreas Preikschat a085694be1 removed toString(), toPyObject() 2012-05-19 17:10:05 +02:00
Andreas Preikschat c36475f27e completely fixed recently file menu 2012-05-17 21:57:45 +02:00
Andreas Preikschat 3fa5422d7d fixed recent file menu 2012-05-17 21:49:06 +02:00
Stevan Pettit a7fc64f0c3 Fixed problem with Import settings. 2012-05-17 15:23:58 -04:00
Andreas Preikschat ed3b7660fa removed not neede unicode calls 2012-05-17 20:57:01 +02:00
Andreas Preikschat a379d9ec54 more clean ups 2012-05-17 18:53:54 +02:00
Andreas Preikschat 4a979b49d9 continued to implement QString v2 api 2012-05-17 18:19:06 +02:00
Andreas Preikschat 2d99f59c84 started to use QString v2 api 2012-05-17 17:13:09 +02:00
Stevan Pettit f1586052a6 Added code to allow OpenLP to run portable 2012-05-11 08:22:34 -04:00
Stevan Pettit cf0e8c184e Fixed code per comments. Fixed misc syntax errors. 2012-05-10 19:23:45 -04:00
Stevan Pettit 3f62cc16bb Merged with trunk. Resolved a conflict 2012-05-03 20:19:11 -04:00
Stevan Pettit e86272f4d5 Fixed dialogues. Made changes to GUI. 2012-05-03 14:30:30 -04:00
Raoul Snyman c03403f103 HEAD 2012-05-01 20:42:34 +02:00
M2j c6c62bdcad pythonifying code: 
- replace has_key() by key in dict
- remove len() method from sequence and mapping types when mapping to bool
 2012-04-29 17:31:56 +02:00
Raoul Snyman 070ed7fcb5 Merged HEAD from trunk and fixed a conflict. 
Some more refactoring.
 2012-04-22 21:37:11 +02:00
M2j 3185e0b101 removed whitespaces at line ends 2012-04-04 09:26:51 +02:00
M2j 7175902e6d removed whitespaces 2012-04-03 19:58:42 +02:00
M2j 6657e27694 add objectName parameter to create_button_box method 
remove QMetaObject.connectSlotsByName() calls as they do nothing in our code
 2012-04-02 00:44:09 +02:00
M2j b952b2cdbc Merge differing trees and remove whitspaces 2012-03-04 15:52:09 +01:00
M2j 6d909c64eb unified remaining action creation methods (addToolbarButton, context_menu_action, context_menu_separator) 2012-03-02 11:22:52 +01:00
M2j 95c8f8fe5a removed base_action, checkable_action, icon_action, and shortcut_action 2012-02-28 00:44:35 +01:00
M2j 3a6a402b56 use Python methods instead of Qt 2012-02-26 22:09:22 +01:00
Jonathan Stafford 13ab688518 Changing the "Wrap Slide" option into a three-way radio button selection to allow the option of the up/down arrow keys to jump between service items at the end of each song, etc. 
bzr-revno: 1876
 2012-02-06 17:35:41 +00:00
Jonathan Stafford e6f1ed20a9 Moved Setting to Advanced Tab 2012-02-06 21:28:16 +08:00
Mattias Põldaru 7fca26dd0e Remove a leftover line which causes trouble on OSX. 2012-02-01 01:47:33 +02:00
Jonathan Stafford 02975a61bf Renamed and moved both enumerations to lib/__init__.py 2012-01-28 16:07:54 +08:00
Stevan Pettit ce230df91d Added code to allow user to change the location of the OpenLP data directory 2012-01-19 15:25:53 -05:00
Jonathan Stafford c1604b64ff Fixed camelCase, indentation, extra spaces, and slide timer 2012-01-15 21:11:10 +08:00
Jonathan Stafford 87775f164a Migrate Wrap Setting to Slide Advance Setting 2012-01-15 17:08:08 +08:00
Tim Bentley 2a5e8935bb New year merge 2011-12-27 10:33:55 +00:00
Mattias Põldaru c2397af633 Ensure that action category names are unicode, to prevent warnings on comparison. Also a fix for a path problem. 
bzr-revno: 1830
 2011-12-10 20:31:16 +00:00
Andreas Preikschat 4eee13430e -Fixed media item recreation (which caused bug #900399) 
- Doc/method clean up
- Replaced continue with break
- Replaced method with one-liner

bzr-revno: 1827
 2011-12-09 17:32:17 +01:00
Mattias Põldaru 1538d0b3bf More earlier conversions to unicode. 2011-12-09 14:35:18 +02:00
Mattias Põldaru e471edca89 Convert strings unicode as soon as possible and assume they are in unicode later. 2011-12-09 13:50:25 +02:00
Andreas Preikschat 12547fad2a doc clean up, removed method with a one liner, fixed media item recreation bug 2011-12-07 21:25:12 +01:00
Jon Tibble 04d7669948 Fix non-ascii file check on Macs 2011-12-05 21:40:56 +00:00
Jon Tibble a54e7ff709 Fix non-ascii service filename loading 2011-12-04 20:57:58 +00:00
Jon Tibble 5804dade74 Reduce recent file list duplication (Bug #892668) 2011-12-04 14:42:39 +00:00
Jon Tibble bba6d6730f Head r1812 2011-12-02 20:17:57 +00:00
Jon Tibble ac365e5b6a Cleanups 2011-11-26 21:26:50 +00:00
rimach dc327e2385 bugfixing 2011-10-26 22:11:15 +02:00
rimach a2ebf30b68 bugfixing 2011-10-24 22:04:29 +02:00
Andreas Preikschat 05bf2ec6fa removed obsolete signals and rearranged the docs 2011-10-22 13:09:01 +02:00
rimach 11aae0bb82 sync with trunnk 2011-09-22 20:54:05 +02:00
Stevan Pettit 0b6cc6134a Added a "Finish" button to the "No-internet" window of the First Time Wizard. 
Added code to this button to process any changes made in the plugin screen.

bzr-revno: 1749
 2011-09-18 14:09:32 +01:00
Stevan Pettit 25cb0ac22e Added "Finish" button to no-internet screen. Changed window message 2011-09-12 20:13:12 -04:00
Stevan Pettit c04be6775f Added code to remove obsolete settings entries 2011-09-11 08:29:08 -04:00
Stevan Pettit b90796da45 Cleaned up some code 2011-09-05 09:03:30 -04:00
Stevan Pettit 30c09f9b4b Change local variable names in settings import/export routines. Changed string search 2011-09-03 16:38:25 -04:00
Stevan Pettit 50a5b98f8c Fixed problems with "shortcuts" section of export/import file 2011-09-02 18:57:02 -04:00
rimach 2c5bc34968 review changes part 2 2011-08-30 18:54:45 +02:00
rimach c608301b0b review changes 2011-08-29 23:51:03 +02:00
rimach 20c9813d26 Head 2011-08-29 21:56:46 +02:00
Stevan Pettit 7cbccb6b70 Added code to reload Bible list after first time wizard is rerun 
bzr-revno: 1731
 2011-08-29 17:54:09 +01:00
Andreas Preikschat d061436a35 replaced Ini by config 2011-08-29 08:30:31 +02:00
Stevan Pettit 9957419f2b Changed system exit call 2011-08-28 09:39:34 -04:00
Stevan Pettit 3722253bcf Added code to process any Bibles downloaded during the re-run of the First Time wizard 2011-08-26 23:14:30 -04:00
Stevan Pettit 24126e74c8 Changed filetype of settings file from .ini to .conf 2011-08-26 09:14:12 -04:00
Stevan Pettit d927adbe5a Changed import re-start message. Removed need for "import string" 2011-08-25 14:40:44 -04:00
Stevan Pettit 215abd2966 Merged with trunk 2011-08-25 08:15:31 -04:00
Stevan Pettit 9b4df37a77 Modified code to handle keys with _ 2011-08-24 12:17:24 -04:00
rimach 229fe56305 Head 2011-08-23 22:28:09 +02:00
Stevan Pettit 131c9f90b5 Modified shutdown from sys.exit to os._exit 2011-08-23 08:11:41 -04:00
Stevan Pettit b36a4f74d3 Fixed traceback error when adding ini to filename 2011-08-21 19:15:16 -04:00
Stevan Pettit 79ab8cc1c0 Added code to always create a filename.INI file. 2011-08-21 10:05:24 -04:00