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

620 Commits

Author SHA1 Message Date
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
Stevan Pettit
215abd2966 Merged with trunk 2011-08-25 08:15:31 -04:00
Stevan Pettit
b95924ae74 Added code to export/import settings via an ini file 2011-08-16 22:58:07 -04:00
Mattias Põldaru
a3ddb50479 Now we do not read several GB video files entirely into memory when opening service, this also fixes #257 in tracker. 2011-08-16 01:46:31 +03:00
Andreas Preikschat
17e397ffa8 added spellchecker to service notes dialog (bug #825979); escape texts in various places (bug #825983) 
Fixes: https://launchpad.net/bugs/825983, https://launchpad.net/bugs/825979
 2011-08-14 15:05:39 +02:00
Stevan Pettit
f92552735f fixed bug 802150 (Attempt to save a service causes a crash when image/media/presentation files do not exist) 
bzr-revno: 1707
Fixes: https://launchpad.net/bugs/802150
 2011-08-11 11:20:29 +02:00
Stevan Pettit
c0978d8e22 Added code to skip-all missing files during service save 2011-08-10 17:29:44 -04:00
Stevan Pettit
a66f7f3365 removed un-needed commented code. fixed dialog "no" answer 2011-08-05 17:53:56 -04:00
Stevan Pettit
b4e776b92c removed un-needed code 2011-08-04 09:43:05 -04:00
Stevan Pettit
7f440527f8 modified servicemanager to check for missing files during service save 2011-08-03 14:49:47 -04:00
Tim Bentley
0b46165429 Last set of fixes 2011-08-02 19:17:07 +01:00
Tim Bentley
f1902ade5a Fix up drag and drop code 2011-07-27 19:28:35 +01:00
Andreas Preikschat
187bb647c0 - improved rendering speed by checking if the text fits as a whole (to save time figuring out that it fits as a whole) 
- use binary chop to find the number of lines which will fit on a slide (if it does not fit as a whole)
- do not use instance variables as arguments
- renamed image_manager to imageManager and theme_manager to themeManager as the classes are derived of Qt

Some changes to html (html5):
- added doctype
- removed obsolete language attribute

bzr-revno: 1694
 2011-07-24 19:52:53 +02:00
Tim Bentley
c813b31427 Correct up and down selection for service manage panel 
Fixes: https://launchpad.net/bugs/805084
 2011-07-23 06:48:55 +01:00
Andreas Preikschat
7483c8dfe8 r1690 2011-07-18 15:24:58 +02:00
Andreas Preikschat
47e43404aa - added doctype to html 
- added encoding to html
- changed <br /> to <br>
- removed obsolete language attribute
 2011-07-16 11:00:30 +02:00
Andreas Preikschat
b51f9b2a0c - do not set a service modified when using the up/down arrows to change the selected service item 
- only set the service modified when an item is selected while using the 'move button' and 'delete button'
 2011-07-16 09:20:13 +02:00
Tim Bentley
77a055a304 Head 2011-07-10 13:07:10 +01:00
Tim Bentley
7d21d45764 missing : 2011-07-10 13:02:58 +01:00
Tim Bentley
4651ec35b6 Fixes 2011-07-10 12:59:23 +01:00
Tim Bentley
dd302537ec Fix code 2011-07-10 07:58:15 +01:00
Tim Bentley
e9fb8e59c1 Allow service item themes to change and be added back to slide controller 
Break object link between saved item in slide controller and service manager.

Fixes: https://launchpad.net/bugs/806829
 2011-07-09 08:43:35 +01:00
Tim Bentley
cf9355d725 Add some formatting 2011-07-09 07:03:52 +01:00
Tim Bentley
b94115d4b2 Amend tooltips so show theme for service item if present. 
Fixes: https://launchpad.net/bugs/806834
 2011-07-08 21:55:18 +01:00
Tim Bentley
d02ee451f2 Add ability to clone a song with a full copy of it. 
Add missing build_icon and line wrap error.

Slow down event generation to stop flood of messages which crash the system. UI does not notice the change.

Changes for 795980 also included

bzr-revno: 1675
Fixes: https://launchpad.net/bugs/795980, https://launchpad.net/bugs/752374, https://launchpad.net/bugs/763583
 2011-07-07 21:14:12 +01:00
Tim Bentley
091cdbbc24 Slow down slidecontroller events to allow buffers to clear. 
Line wrap incorrect and fix object name

Fixes: https://launchpad.net/bugs/752374
 2011-07-02 07:48:17 +01:00
Andreas Preikschat
418c3b9c18 - use the functions context_menu_action and context_menu_separator from core/lib/ui 
bzr-revno: 1672
 2011-07-01 10:26:26 +02:00
Andreas Preikschat
c2fb73dde6 do not regenerate all service items when collapsing/expanding all items 2011-06-29 16:28:10 +02:00
Andreas Preikschat
6980299697 use help function 2011-06-29 11:23:42 +02:00
Tim Bentley
608910a098 Fix name 2011-06-12 17:02:52 +01:00
Tim Bentley
c812770153 Copyright fixes 2011-06-12 16:41:01 +01:00
Tim Bentley
26419d8f18 Speed up edit by not calling render until there is a match 2011-06-11 18:17:13 +01:00
Tim Bentley
0c549e33e5 Only mark the service as changed if it has changed 
Fixes: https://launchpad.net/bugs/795890
 2011-06-11 12:22:40 +01:00
Jonathan Corwin
ee8b11e4e9 More strings 2011-06-10 22:50:44 +01:00
Jonathan Corwin
7cdd9b2fbc Close and delete old display window when creating a new one 2011-06-08 22:39:07 +01:00
Tim Bentley
b6d0f2243d Fix error if cnp 2011-06-04 19:14:32 +01:00
Tim Bentley
0841802ddc Fix state for service items 2011-06-04 19:08:48 +01:00
Andreas Preikschat
c63382e41c - hide the theme menu when theme level is not 'Song' 
- clean ups
 2011-05-27 12:17:59 +02:00
Andreas Preikschat
18e3cb0232 removed not needed import 2011-05-27 09:02:02 +02:00
Andreas Preikschat
8a38c0b766 do not hide the menu 2011-05-27 08:45:42 +02:00
Andreas Preikschat
b890b52a8d finished the theme menu 2011-05-27 08:29:14 +02:00
Andreas Preikschat
8aef6f3c8e r1576 2011-05-26 20:13:50 +02:00
Tim Bentley
acdbefd922 Fixes 2011-05-26 18:11:22 +01:00
Tim Bentley
8f6ed366a1 Copyright updates 2011-05-26 17:25:54 +01:00
Andreas Preikschat
98614f629c make themes in menu checkable 2011-05-26 10:15:56 +02:00
Tim Bentley
3b627be641 Finish plugin sorts 2011-05-26 05:48:13 +01:00
Raoul Snyman
7669643774 Updated the copyright notice, adding Jeffrey Smith back in after he accidentally got removed somewhere somehow. 2011-05-24 22:47:05 +02:00
Jonathan Corwin
bbbf0d3435 Go live/add to service via list 2011-05-20 23:30:20 +01:00
Andreas Preikschat
07b704677a 2011-05-13 15:58:17 +02:00
Andreas Preikschat
4e870ed705 only allow drag if an item is selected 2011-05-12 17:50:20 +02:00
Jonathan Corwin
03380fb40f head 2011-05-06 23:00:52 +01:00
Jonathan Corwin
5c6639e95b Fix remote bug if same item in service twice. More stage view tweaks 2011-05-06 23:00:18 +01:00
Andreas Preikschat
68c1236a2a 2011-05-06 07:17:13 +02:00
Gerald Britton
d9afa8ec2d Change series of ifs into if/elif/elif 2011-05-05 14:23:54 -04:00
Tim Bentley
7908ac4f67 Fix large Service Files 2011-04-29 09:45:36 +01:00
Tim Bentley
f83d52621a Fixes 2011-04-29 08:40:19 +01:00
Tim Bentley
188431ce37 Fix up Service Save 2011-04-29 07:21:31 +01:00
Tim Bentley
c7e07bdbd5 r1496 2011-04-28 21:11:11 +01:00
Tim Bentley
17d74a8d9a Add Load service Progress Bar 2011-04-28 19:13:19 +01:00
Tim Bentley
3923c14d0c Head 2011-04-26 19:39:32 +01:00
Andreas Preikschat
f89e362b5d mark service as modified when item notes have been edited 2011-04-25 10:35:48 +02:00
Tim Bentley
6e9459b63d r1482 2011-04-25 07:44:04 +01:00
Andreas Preikschat
946d74372d 2011-04-17 13:00:44 +02:00
Andreas Preikschat
19b2e0bede - added a missing space 
bzr-revno: 1471
 2011-04-16 22:10:21 +02:00
Tim Bentley
f94ae1a9c5 Head r 1469 2011-04-16 12:42:35 +01:00
Andreas Preikschat
de8e8ee422 fixed missing space 2011-04-16 09:23:00 +02:00
Raoul Snyman
7fdd4bb1c1 Line length cleanups. 2011-04-15 23:55:11 +02:00
Raoul Snyman
8090adf1bc Made UiStrings a Singleton, and updated all usage of it. 2011-04-15 23:43:59 +02:00
Andreas Preikschat
1968991239 r1456 + resolved conflict 2011-04-12 23:07:08 +02:00
Andreas Preikschat
f24a8f1365 fixed bug #754484 
bzr-revno: 1455
Fixes: https://launchpad.net/bugs/754484
 2011-04-11 20:16:35 +02:00
Tim Bentley
1882c5366d Review fixes 2011-04-10 19:54:26 +01:00
Andreas Preikschat
9dbd54bf8f more fixes 2011-04-10 20:44:27 +02:00
Tim Bentley
29ef34b569 Add saving of selected Bible names in Quick and Advanced. 
Clean up combo box selection code (General)

Fixes: https://launchpad.net/bugs/755687
 2011-04-10 07:18:31 +01:00
Andreas Preikschat
9011c85a6b removed static methods 2011-04-09 18:11:02 +02:00
Andreas Preikschat
283171e296 use weight to sort categories 2011-04-09 16:50:44 +02:00
Andreas Preikschat
9c526081d8 fixed bug #754484 
Fixes: https://launchpad.net/bugs/754484
 2011-04-08 15:50:54 +02:00
Andreas Preikschat
84605fb430 fixed wrong context of shortcuts; moved functions 2011-04-04 16:38:17 +02:00
Andreas Preikschat
dfc2eed1f4 adapted latest merge 2011-04-03 16:20:55 +02:00
Andreas Preikschat
9c39f57d5a r1443 2011-04-03 15:37:53 +02:00
Andreas Preikschat
28b83aadae translate categories 2011-04-03 13:36:43 +02:00
Tim Bentley
6445964646 r1442 2011-04-03 07:19:28 +01:00
Jonathan Corwin
27fbd9594b Head 2011-04-02 10:53:08 +01:00
Jonathan Corwin
db68c0419f Fix bug when hit service live button, but nothing to go live. Add option to preview immediately in media manager. Add keyboard shortcuts to media manager 2011-04-02 10:52:32 +01:00
Tim Bentley
fbc94dda3a 1441 2011-04-01 05:48:21 +01:00
Andreas Preikschat
dee95a2f57 r1441 2011-03-31 21:06:09 +02:00
Andreas Preikschat
b17ad26672 make sure we save the default shortcut 2011-03-31 20:53:50 +02:00
Andreas Preikschat
4ca738e9b3 staticmethod for adding/removing actions 2011-03-31 10:43:19 +02:00
Mattias Põldaru
beffd0c25c Text fixes by superfly. 2011-03-31 10:31:08 +03:00
Mattias Põldaru
df1db913cd merge 2011-03-30 21:35:48 +03:00
Andreas Preikschat
19138cd9e5 started reworking shortcuts 2011-03-29 15:56:49 +02:00
Tim Bentley
2ba0d410fc More Cleanups 2011-03-28 19:56:39 +01:00
Tim Bentley
c8a7594685 Bye Bye RenderManager 2011-03-28 19:12:46 +01:00
Tim Bentley
afaf10f986 r1428 and fixes 2011-03-26 19:00:47 +00:00
Tim Bentley
be7eeb9e6a r1421 2011-03-25 17:49:53 +00:00
Tim Bentley
2de02a0c76 Fix up verse selection correctly. 2011-03-25 06:13:42 +00:00
Andreas Preikschat
a9cd8db787 do not show error message when file does not exist, fixed return 2011-03-24 22:13:51 +01:00
Andreas Preikschat
9376d7e965 r1418 2011-03-24 21:39:31 +01:00
Andreas Preikschat
30de0d9916 fixed ticket 65 2011-03-24 21:37:02 +01:00
Raoul Snyman
efbcfd0772 Updated copyright information. 2011-03-24 21:04:02 +02:00
Tim Bentley
9836131025 Allow Preview Controller to request servicemanger to make the preview item live and add next to preview. 
Fixes: https://launchpad.net/bugs/730294
 2011-03-23 21:08:24 +00:00
Tim Bentley
7fc84ad2b2 Enter and save end times 2011-03-19 11:50:48 +00:00
Mattias Põldaru
b502ad549c Differentiated error message for zero sized service. 2011-03-16 09:55:08 +02:00
Tim Bentley
23bfaf1566 Old spelling bug 2011-03-15 19:55:49 +00:00
Mattias Põldaru
0773370662 Fix for #65 2011-03-15 16:38:16 +02:00
Tim Bentley
040738718c Allow cursor keys to work in service manager again. 
Add Expand / Collapse all to the keyboard.

Fixes: https://launchpad.net/bugs/707725
 2011-03-15 09:12:53 +00:00
Mattias Põldaru
010adf3f25 Improve readability a bit, as Meths suggested. 2011-03-10 20:31:34 +02:00
Mattias Põldaru
f117446954 I hope it finally is right. 2011-03-09 21:22:52 +02:00
Mattias Põldaru
89187ffade Neater again. 2011-03-09 20:22:07 +02:00
Mattias Põldaru
32034dea95 Just to make more sense. 2011-03-09 20:08:06 +02:00
Mattias Põldaru
f710746a55 Returns now done right. Commented out dialog part, which needs more work 2011-03-09 20:02:21 +02:00
Mattias Põldaru
c7a435951d Better code, as suggested and a few suggested fixes as well. 2011-03-09 09:17:58 +02:00
Mattias Põldaru
25dbf271f6 Cleanup 2011-03-08 12:16:09 +02:00
Mattias Põldaru
216cc407c6 Now able to write >2GiB service files (haven't tested opening these),\n on IOError not-saved * asterisk will remain in place,\nbefore adding >50GiB files, user is asked first. 2011-03-08 11:32:37 +02:00
Mattias Põldaru
562a88a993 Fixes #730459 and 4 unreported bugs. 2011-03-08 09:38:25 +02:00
Tim Bentley
094e7968d0 Fix not flagging of service item changes 2011-03-06 07:59:26 +00:00
Raoul Snyman
780a87e840 Updated copyright information. Removed .eric4project directory from version control. 2011-02-24 07:47:38 +02:00
Tim Bentley
966e3996ea r1314 2011-02-19 20:36:41 +00:00
Tim Bentley
b5e369ba4d More Print Work 2011-02-19 17:33:24 +00:00
Jon Tibble
dc41ce5ab4 Enumerations and magic numbers 2011-02-18 03:15:09 +00:00
Jon Tibble
1fbc873a8c Cleanups 2011-02-16 03:28:06 +00:00
Jon Tibble
3f6f1940d9 Head r1301 2011-02-14 20:07:04 +00:00
Jon Tibble
3c8c87138f Typo 2011-02-14 19:15:49 +00:00