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