Stevan Pettit
968674a659
Merged with trunk, fixed conflicts and other changes
2012-05-20 23:06:17 -04:00
Andreas Preikschat
779a1201fc
reverted some changes to avoid conflicts + clean up
2012-05-17 22:26:31 +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
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