Commit Graph

841 Commits

Author SHA1 Message Date
Tim Bentley 197a423c29 fix cursor busy off 2013-02-21 17:30:18 +00: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 310f6032ed tidy ups 2013-02-16 13:24:56 +00:00
Tim Bentley c6ad115b10 More Signal removals 2013-02-14 21:50:10 +00:00
Tim Bentley d1f7900ed4 fixes 2013-02-07 21:50:25 +00:00
Andreas Preikschat 28ea251866 fixed servicemanager bugs preventing saving/opening a service 2013-02-07 19:00:40 +01: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 f94ae4d7c2 reordered imports 2013-02-05 09:05:28 +01:00
Tim Bentley b7b19a4180 Fix up Registry function processing 2013-02-04 19:25:12 +00:00
Tim Bentley a9a4c7938e Fix name and other bugs 2013-02-03 19:23:12 +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
Tim Bentley 4f2b21ddfa Fix review comments 2013-02-02 19:49:56 +00:00
Raoul Snyman c891edc40c Last of the dialogs 2013-02-01 23:34:23 +02:00
Tim Bentley 4c26ff8f80 Cleaned up ServiceManager 2013-02-01 20:40:23 +00:00
Tim Bentley 3b6f897f6e Cleanup Advance Tab 2013-02-01 20:09:47 +00:00
Tim Bentley 72920494a6 Head and merge fixes 2013-01-30 22:01:52 +00:00
Andreas Preikschat 6822834c86 r2160 2013-01-30 18:56:00 +01:00
Tim Bentley 0a1f91af8b Review fixes 2013-01-29 17:19:19 +00:00
Tim Bentley 80a2a7449e Move var cleanups 2013-01-27 20:36:18 +00:00
Tim Bentley 91a959a490 More name cleanups 2013-01-27 10:18:06 +00:00
Tim Bentley eb3e5b8642 Remote Edit cleanup and simplification 2013-01-27 09:57:03 +00:00
Tim Bentley bdb9089409 Cleanup ServiceManager code 2013-01-27 07:36:04 +00:00
Tim Bentley 183c0c700d More Registry cleanups and bug fixes 2013-01-26 07:39:07 +00:00
Tim Bentley 96afb2a737 Fix tests so they work better. Pylint fixes and bug fixex 2013-01-25 20:50:18 +00:00
Tim Bentley c0aca32660 Head 2013-01-24 20:08:52 +00:00
Andreas Preikschat 2f69520db8 - fixed traceback in service manager 2013-01-24 10:18:38 +01: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 aafef12bf8 Head with fixes 2013-01-23 20:29:43 +00:00
Tim Bentley 9a107e627b Head 2013-01-23 19:53:02 +00:00
Tim Bentley 3378e32da3 More cleanups and removal of plugin_helpers 2013-01-23 19:28:47 +00:00
Tim Bentley 064ca583ca Live and Preview Moved 2013-01-22 21:25:16 +00:00
Tim Bentley a6de33f177 Registry takes shape and takes over 2013-01-22 21:09:43 +00:00
Andreas Preikschat d0c9c35deb r2154 + fixed trunk 2013-01-21 20:47:53 +01:00
Tim Bentley 895215715c Move text changes 2013-01-21 17:22:10 +00:00
Tim Bentley aabc55b4dd For code cleanups 2013-01-21 11:11:47 +00:00
Tim Bentley 4224d8befe Spelling 2013-01-21 07:34:50 +00:00
Tim Bentley b04a6bba79 Code tidy ups to make pylint happier 2013-01-21 07:29:43 +00:00
Dmitriy Marmyshev a20c077698 Add Autoplay feature to Service items and Service Manager
bzr-revno: 2152
2013-01-21 06:45:00 +00:00
Andreas Preikschat e762e3b672 r2151 + conflicts 2013-01-20 13:23:22 +01:00
Tim Bentley 4224e2441a Lets use the value as it has been set 2013-01-19 13:46:28 +00:00
Andreas Preikschat e55b6ce78e removed set_last_dir and get_last_dir methods 2013-01-17 23:14:06 +01:00
Dmitriy Marmyshev 5ce7ceafed fixed varaibles 2013-01-17 17:09:46 +04:00
Dmitriy Marmyshev 0c18fcad88 renaming varables 2013-01-16 02:17:55 +04: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
Dmitriy Marmyshev daf1887ab9 HEAD 2013-01-09 20:12:31 +04:00
Tim Bentley feef9df575 Head 2013-01-02 21:50:45 +00:00
Jonathan Corwin 38e580fbd7 Edit/save custom slide items in service files.
bzr-revno: 2136
2013-01-02 21:31:11 +00:00
Dmitriy Marmyshev df916a3fc1 HEAD 2013-01-01 14:28:52 +04:00
Tim Bentley e79250c06b Fix seek slider code - and Head 2012-12-30 08:33:42 +00:00
Dmitriy Marmyshev 8a96b0b3a1 HEAD 2012-12-30 02:52:19 +04:00
Tim Bentley 4a0b3f90aa 2013 is comming 2012-12-29 20:56:56 +00:00
Jonathan Corwin d814553924 Head + need fixings (forgot to commit head first, sorry) 2012-12-28 22:33:06 +00:00
Tim Bentley ae576251bd Core lib 2012-12-28 22:06:43 +00:00
Andreas Preikschat b6c9fa16c5 reverted last commit 2012-12-27 17:27:59 +01:00
Dmitriy Marmyshev 86d916509b deleted commented code 2012-12-26 00:22:41 +04:00
Jonathan Corwin 0092fc6960 Save any service text item as a custom slide 2012-12-23 00:00:24 +00: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
Dmitriy Marmyshev 3f380c68d9 Code cleanUp lines to 120 2012-12-19 00:25:07 +04:00
Dmitriy Marmyshev 770f245d0c HEAD 2012-12-18 00:39:07 +04:00
Dmitriy Marmyshev 3e3911c133 Renamed varaibles by standard. 2012-12-16 20:45:38 +04:00
Tim Bentley cbbb6c7e2a Head merge and resolve conflicts 2012-12-13 19:02:32 +00:00
Tim Bentley 0ea45fd885 SlideController and ServiceManager 2012-12-10 18:04:58 +00:00
Tim Bentley 564b2e41ae Style Fixes 2012-12-10 06:15:42 +00:00
Tim Bentley 6748266fba Fix the setting for lite saves 2012-12-08 16:20:52 +00:00
Tim Bentley 5be9ba5b2c Cleanup Service Item Validation and start tests 2012-12-08 08:40:41 +00:00
Tim Bentley 11276f6bba Ffix up icons 2012-12-07 18:56:33 +00:00
Tim Bentley 34275d0a5f Fix service save 2012-12-05 22:42:48 +00:00
Andreas Preikschat 6c1e303dbd fixed branch 2012-12-05 21:33:39 +01:00
Andreas Preikschat fc38f62a17 trunk + conflicts 2012-12-04 22:50:14 +01: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 cf0bb94b3f Clean ups 2012-11-26 17:57:36 +00:00
Tim Bentley 57ad90f1a6 Head 2012-11-16 21:46:56 +00:00
Dmitriy Marmyshev 2093d9829f Renamed varaibles by standard 2012-11-16 22:48:49 +04:00
Dmitriy Marmyshev 9bb9c6a629 Renamed varaibles by standard. 2012-11-16 21:06:52 +04:00
Dmitriy Marmyshev 2f34b5ddf2 Renamed all variables by standard. 2012-11-14 15:47:15 +04:00
Dmitriy Marmyshev 7780751807 all methods renamed by standard. 2012-11-13 12:32:09 +04:00
Dmitriy Marmyshev 4af902e74d Some fixes for autoplay 2012-11-13 12:11:49 +04: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
Philip Ridout e90af50fd6 Removes items with missing files prior to saving (after confirmation from user)
bzr-revno: 2106
2012-11-10 16:38:26 +00:00
Dmitriy Marmyshev d5a4cbd900 Autoplay slides ffuture 2012-11-09 22:44:25 +04:00
Tim Bentley 47c9af348c Fix spelling - oops 2012-11-07 21:37:01 +00:00
Tim Bentley 751246ce0c Merge cleanups 2012-11-04 20:11:10 +00:00
Philip Ridout 443ad478c1 Added validate function to serviceitem 2012-11-02 18:54:42 +00:00
Tim Bentley a91dc027d2 Documentation 2012-11-01 16:54:37 +00:00
Tim Bentley b01fd0b293 SaveAs lite validation 2012-11-01 16:36:45 +00:00
Andreas Preikschat 3629c8a535 r2098 + conflict 2012-11-01 16:56:03 +01:00
Philip Ridout d35d4f4f79 Added some methods to serviceitem.py so as not to expose "inner workings of ServiceItem" and modified get_frame_path method. (Which required a modification to slidecontroller.py & messagelistener.py) 2012-10-31 21:04:29 +00:00
Philip Ridout 713f742a3a fixed indentation. 2012-10-30 18:36:39 +00:00
Philip Ridout fafe262adc Fixes bug1065423 "Missing image in service causes traceback when opening"
Fixes bug1065420 ""missing files" dialog opens more then once when more files are missing"
2012-10-27 10:06:33 +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 a5824120c3 Lite save works 2012-10-15 17:20:23 +01:00
Tim Bentley c29cf8ce70 Lite Save for Media working 2012-10-14 17:21:47 +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 159f3ea9a2 r2074 + conflicts 2012-10-03 18:38:06 +02:00
Tim Bentley 1d881e426a Fix service date formats 2012-09-16 16:33:05 +01:00
Tim Bentley 436063b1ec Head 1.9.12 2012-09-15 15:27:28 +01:00
Tim Bentley c8f54a44ae Titles 2012-09-15 15:27:09 +01:00
Tim Bentley 795d11849d Local save works 2012-09-15 06:57:03 +01:00
Martin Zibricky a33936f247 Fixed #1046587 - individual placeholders are passed to time.strftime(). 2012-09-15 01:55:55 +02:00
Tim Bentley a3b2fcd113 Video lenght 2 2012-09-14 17:35:07 +01: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
Tim Bentley d003ff9009 Allow saved media to be played 2012-08-24 21:06:56 +01:00
Andreas Preikschat 3c69631b59 clean ups 2012-07-07 16:54:14 +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
Stevan Pettit 245c0acd89 Merge with trunk, resolve conflicts 2012-06-09 19:14:28 -04:00
Andreas Preikschat fcb7328cde various clean ups 2012-06-09 17:46:01 +02:00
Stevan Pettit 968674a659 Merged with trunk, fixed conflicts and other changes 2012-05-20 23:06:17 -04:00
Andreas Preikschat 5157f3a714 fixed traceback 2012-05-19 17:49:23 +02:00
Andreas Preikschat b124481ea2 continued with QVariant 2012-05-19 11:13:32 +02:00
Andreas Preikschat 039ba3f412 r1972 + conflict 2012-05-18 17:14:09 +02:00
Andreas Preikschat 779a1201fc reverted some changes to avoid conflicts + clean up 2012-05-17 22:26:31 +02:00
Andreas Preikschat cb13f805e4 clean up + fix 2012-05-17 22:06:23 +02:00
Andreas Preikschat 3fa5422d7d fixed recent file menu 2012-05-17 21:49:06 +02:00
Andreas Preikschat ed3b7660fa removed not neede unicode calls 2012-05-17 20:57:01 +02:00
Andreas Preikschat 5378399302 more clean ups 2012-05-17 18:32:43 +02:00
Andreas Preikschat 2d99f59c84 started to use QString v2 api 2012-05-17 17:13:09 +02:00
Andreas Preikschat 0b9923742e trivial clean ups 2012-05-17 14:59:57 +02:00
Stevan Pettit f1586052a6 Added code to allow OpenLP to run portable 2012-05-11 08:22:34 -04:00
Tim Bentley 01ed8e4ed8 Fix delete key for services
bzr-revno: 1970
2012-05-07 18:07:34 +01:00
Tim Bentley 7cb1603d12 Fix traceback 2012-05-07 17:01:53 +01:00
Andreas Preikschat 5f1afcf9de show shortcuts in service item menu 2012-05-07 17:49:22 +02:00
Tim Bentley f9247078bc more Delete clean ups 2012-05-07 09:35:52 +01:00
Tim Bentley bcb6668792 Delete clean ups 2012-05-07 09:21:21 +01:00
Tim Bentley 5815d637a7 Add Service delete to Shortcuts and allow from keyboard 2012-05-07 08:40:34 +01:00
Andreas Preikschat baf1c792e5 clean ups 2012-05-05 14:24:25 +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 640e12d85e Some more refactoring and renaming.
Changed the Bible upgrade to leave the old values behind so that older versions of OpenLP don't delete the "corrupted" databases.
2012-04-23 21:19:13 +02:00
Tim Bentley 2052387a91 head 2012-04-10 20:39:20 +01:00
Tim Bentley 04b4a34c68 Add service count for remotes 2012-04-10 20:38:25 +01:00
M2j 5ee446f694 Head 1933 2012-04-03 19:59:34 +02:00
M2j 7175902e6d removed whitespaces 2012-04-03 19:58:42 +02:00
Meinert Jordan a57289da8c Bug #967522: Don't drag from empty service manager area
bzr-revno: 1929
Fixes: https://launchpad.net/bugs/967522
2012-04-02 23:12:51 +02:00
M2j 40774f6375 Bug #923500: Do not mark service changed when accepting settings dialog. 2012-04-02 17:33:54 +02:00
M2j 3fc81ea230 Bug #967522: Don't drag from empty service manager area 2012-04-02 14:25:55 +02:00
Jon Tibble a21ab3859b Head r1910 2012-03-18 21:20:58 +00:00
Raoul Snyman 7f6ed27040 Shortened some translation comments, as Qt says that the entire context of a translation may be no longer than 255 characters.
Updated the translation files while I was at it.
2012-03-17 23:30:53 +02:00
Jon Tibble a9d70a2d2e Bugs #888815 #941966 2012-03-17 14:44:23 +00:00
Jon Tibble 6133e6a840 Unused variables 2012-03-12 22:12:16 +00:00
M2j 587850bb59 Bug #943919: Make shortcuts for "Move to Previous/Next" in live slide controller
configurable.
2012-03-03 14:52:57 +01:00
M2j 45de016abb derive OpenLPToolbar().actions keys from object names to prevent collisions in
case translators translate different strings same.
2012-03-02 13:11:13 +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 3a6a402b56 use Python methods instead of Qt 2012-02-26 22:09:22 +01:00
Mattias Põldaru d09cfa4a57 Merge trunk. 2012-02-08 00:07:24 +02:00
Mattias Põldaru 6f219e175f Name changes to camelCase where appropriate. 2012-02-02 14:42:52 +02:00
Mattias Põldaru 83155d45ea Text changes, thanks to Raoul. 2012-01-28 00:10:12 +02:00
Mattias Põldaru 8c483a58b3 Added checkbox for to disable default service name, just as suggested. 2012-01-25 11:32:20 +02:00
Jonathan Stafford 2c472ff38e Small Fixes 2012-01-23 17:33:12 +08:00
Jonathan Stafford 4f0cd62f63 Fix typo 2012-01-22 17:14:50 +08:00
Jonathan Stafford cc04a82c08 Changed up arrow to jump to last slide of previous service item (when applicable) 2012-01-22 17:07:59 +08:00
Mattias Põldaru 62d4db0c82 Added a comment for translators. 2012-01-18 21:16:50 +02:00
Mattias Põldaru df60a89121 Change default name and remove now obsolete string. 2012-01-16 15:59:23 +02:00
Mattias Põldaru ba0ab63149 Merge trunk. 2012-01-15 03:34:08 +02:00
Mattias Põldaru b70f95c825 Added possibility to choose one day time in next week or now as the datetime. Also took Meinert's comment about too restricted filename characters into account. 2012-01-15 03:21:35 +02:00
Mattias Põldaru 6263a0c999 Merge trunk. 2012-01-03 02:12:09 +02:00
Mattias Põldaru 1cf246940d A few fixes, useful when default service name is wrong. 2012-01-03 02:08:08 +02:00
Stevan Pettit 34eb37a4f4 Modified statement to avoid duplicate code execution 2012-01-01 08:43:43 -05:00
Stevan Pettit 3b58fe88f2 Added test to open save-as dialog if save location is unavailable 2011-12-31 23:09:49 -05:00
Tim Bentley 2a5e8935bb New year merge 2011-12-27 10:33:55 +00:00
Mattias Põldaru cd565fe4a9 First almost working example. I suppose someone suggest to make specific class now. You may be right :) 2011-12-15 20:13:45 +02:00
M2j f733db0e5a Head 1834 2011-12-13 01:15:39 +01:00
M2j 0c06569dc5 Bug #882819 - recover v1.x theme file names from XML info 2011-12-13 00:46:04 +01:00
Tim Bentley 143f65f476 Fix review comments 2011-12-12 18:00:12 +00:00
Tim Bentley 4211f196cd Fix review comments 2011-12-12 17:22:40 +00:00
Tim Bentley 4430deb207 Head 2011-12-12 17:21:23 +00:00
Tim Bentley b07e10282d clean up service 2011-12-10 14:34:28 +00:00
Tim Bentley 1d673caff4 Fixes and notifications 2011-12-10 08:45:17 +00: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
Tim Bentley 9f9f2186ae Minor performance improvement 2011-10-02 20:57:42 +01:00
Tim Bentley 695e08a63a get the right field 2011-09-26 19:56:52 +01:00
Tim Bentley 7fe57a9a5d Make Int 2011-09-26 19:12:27 +01:00
Tim Bentley 682e822d21 Clean up 2011-09-25 08:27:09 +01:00
Tim Bentley 88c09d8981 Correct problem it tags not being used on song load 2011-09-25 07:37:40 +01:00
Raoul Snyman 0aadc32d4f Fixed the last part of bug #855342 where when you save a file a few times, it throws an exception.
Fixes: https://launchpad.net/bugs/855342
2011-09-24 00:14:23 +02:00
Raoul Snyman e3ecee8ae5 Fixed bug #855342 where saving an already-saved service file with an audio file in it caused an exception.
Fixes: https://launchpad.net/bugs/855342
2011-09-21 22:47:30 +02:00
Raoul Snyman 4d66954d62 - Fixed re-playing of previous audio file.
- Fixed left-over files from previous song.
- Renamed a few more enumerations.
- Fixed some exception handling.
2011-08-31 09:49:57 +02:00
Raoul Snyman 8b8b4fbf51 HEAD 2011-08-30 21:42:12 +02:00
Mattias Põldaru 44c4febd29 Merge with upstream 2011-08-29 16:08:50 +03:00
Raoul Snyman 532ad84b87 - Bundle audio files with the song when adding it to the service
- Save audio files with service
- Load audio files from service
- Copy audio files to songs plugin when adding a song from a service.
2011-08-28 22:51:44 +02:00
Raoul Snyman 0b81824430 HEAD 2011-08-28 19:45:31 +02:00
Raoul Snyman 015249407d Renamed some of the ItemCapabilities. 2011-08-28 19:45:13 +02:00