7428 Commits

Author	SHA1	Message	Date
Tim Bentley	cdbf6ac9ea	Fix timers	2016-02-16 21:14:38 +00:00
Tim Bentley	30dc055532	Video backgrounds work	2016-02-14 17:53:16 +00:00
Tim Bentley	89f6926a71	Add replacement to context	2016-02-14 16:54:31 +00:00
Tim Bentley	583da17777	pep8 comment fixes	2016-02-14 16:14:48 +00:00
Tim Bentley	19b6716bea	More cleanups comments and flash removal	2016-02-14 15:43:54 +00:00
Tim Bentley	360d1155f1	Remove flash	2016-02-14 08:38:21 +00:00
Tim Bentley	7a72fe84df	more updates and cleanups	2016-02-14 08:26:04 +00:00
Tim Bentley	a6b5b36502	More cleanups	2016-02-13 22:10:11 +00:00
Tim Bentley	ea40173f9b	new start	2016-02-13 13:13:00 +00:00
Tim Bentley	108ed79e7b	fix up	2016-02-13 12:48:36 +00:00
Tomas Groth	fdb53f919f	Fix for force-updating display on windows when using themes without transitions.	2016-02-09 22:01:20 +01:00
second@tgc.dk	8d083af742	More workarounds for bug 1531319. ... If presentation loading fails, set slidenumber to 0 to avoid a later error. Fixes bug 1490508. Added test. Use the chosen encoding when importing from easyworship db. bzr-revno: 2616 Fixes: https://launchpad.net/bugs/1490508	2016-02-06 21:53:23 +01:00
Tomas Groth	17d6f13ac0	More workarounds for bug 1531319. ... Fixes: https://launchpad.net/bugs/1531319	2016-02-06 20:43:54 +01:00
Raoul Snyman	0dd29893da	More tests	2016-02-04 23:25:06 +02:00
Raoul Snyman	5928fde62e	Fix a weird issue with the 'clear alternate shortcut' button clearing both	2016-02-02 23:56:03 +02:00
Raoul Snyman	f6c2a5b410	Fix bug #1533246 ... Fixes: https://launchpad.net/bugs/1533246	2016-02-02 23:55:37 +02:00
Raoul Snyman	b2e54a4baa	Downgrade VLC.py to a version that is in use	2016-01-25 20:14:03 +02:00
Tim Bentley	81c9f5f1ca	more simplifications	2016-01-24 10:13:33 +00:00
suutari-olli	dee737e3fb	Added proper comment	2016-01-23 17:28:16 +02:00
Tomas Groth	fb04813088	remove debug prints	2016-01-23 13:38:08 +01:00
Tim Bentley	4aebe441e7	cleanups	2016-01-23 12:11:34 +00:00
Tim Bentley	06ed550c8f	head and Mediainfo	2016-01-23 10:09:36 +00:00
Tim Bentley	29dd834816	debug	2016-01-23 10:07:59 +00:00
Tomas Groth	c34bfd6d95	Adjusted string	2016-01-23 09:15:37 +01:00
Tomas Groth	4594fcefbd	pep fixes	2016-01-22 22:33:20 +01:00
Tomas Groth	4bef5f72f2	trunk	2016-01-22 22:30:26 +01:00
Tomas Groth	e593d77e14	Fix some broken tests that was not being used due to naming.	2016-01-22 22:26:25 +01:00
Tim Bentley	4a0330f126	Add wrapper for mediainfo	2016-01-22 20:12:46 +00:00
Tomas Groth	9415018899	Disable OpenGL on linux (too). Fixes bug 1535332. ... Fixes: https://launchpad.net/bugs/1535332	2016-01-22 20:52:50 +01:00
suutari-olli	5f513a9a1f	This simple fix should make blank to desktop, black and theme available during single screen mode	2016-01-22 19:06:35 +02:00
Tomas Groth	7d677025b5	Disable OpenGL on windows to make webkit player work.	2016-01-21 22:18:56 +01:00
Tomas Groth	85c329fb26	Workaround for windows display not updating, webkit player does not work yet. Partial fix for bug 1531319. ... Fixes: https://launchpad.net/bugs/1531319	2016-01-20 23:25:40 +01:00
Ian Knight	fbd3f9f3dd	Corrected pep8 fails	2016-01-19 17:32:47 +10:30
Ian Knight	7f8e19adca	Prevented Single Click Preview when a double click had triggered & Updated tests for this	2016-01-19 17:22:23 +10:30
Ian Knight	960fbb8865	Implemented Better Preview for Service Manager Blueprint	2016-01-18 03:16:37 +10:30
s.mehrbrodt@gmail.com	ddfed93fbe	"* Fix importing older song dbs by migrating them first ... * Fix comparing songs without title lp:~sam92/openlp/bug-1533081 (revision 2615) [SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1260/ [SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1184/ [SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1123/ [FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/959/ Stopping after failure" bzr-revno: 2609 Fixes: https://launchpad.net/bugs/1533081, https://launchpad.net/bugs/1534306	2016-01-16 22:13:41 +02:00
Tomas Groth	6b23a2224f	Fix playback of linked audio. Fixes bug 1533280. ... Fixes: https://launchpad.net/bugs/1533280	2016-01-15 21:22:08 +01:00
Tomas Groth	e91520fa60	pep8 fixes	2016-01-13 22:00:46 +01:00
Tomas Groth	6f9056c935	trunk	2016-01-12 22:36:32 +01:00
Tomas Groth	3f3078c33a	Fix traceback when expanding and collapsing songs. ... Fixes: https://launchpad.net/bugs/1532169	2016-01-12 22:29:20 +01:00
Tomas Groth	e3d7e436f1	In _process_item, postpone check for _reset_blank, since the service_item can change type while being execute (Pdf->Image). For the same reason always use the serviceitem that might have been converted.	2016-01-12 21:17:15 +01:00
simon.hanna@serve-me.info	98258bc753	Reenable the stylesheet ... remove the icons from mediamanager so that display in plasma works bzr-revno: 2605 Fixes: https://launchpad.net/bugs/1404669	2016-01-11 21:57:20 +00:00
Tomas Groth	c8fd1b8338	Fix taking screenshots while using powerpoint or impress. ... Fixes: https://launchpad.net/bugs/1532938	2016-01-11 22:13:57 +01:00
Simon Hanna	9d8c757d0d	Re-enable the stylesheet, remove icon in mediamanager to fix rendering in plasma	2016-01-10 19:01:36 +01:00
Simon Hanna	4d7ceba301	Merge with trunk	2016-01-10 17:01:43 +01:00
Simon Hanna	e172e2aeb2	Revert Changes	2016-01-10 17:00:05 +01:00
s.mehrbrodt@gmail.com	ad37560ecd	lp:~sam92/openlp/multiple-songbooks (revision 2607) ... [SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1226/ [SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1151/ [SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1090/ [FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/928/ Stopping after failure bzr-revno: 2600	2016-01-09 19:53:09 +00:00
alisonken1@gmail.com	5a2c3e5abc	Ticket 921817 - exception when connecting using PJLink authentication method ... Fix incorrect location data when projector instance created. Fix typo in getting authenticated connection salt setup. Move salt/pin/test hash to resources file for multiple tests. Add test for ticket 921817. Passes local nosetests3 and pep8. bzr-revno: 2599	2016-01-09 19:44:30 +00:00
Raoul Snyman	9904ba8da8	Remove media manager stylesheet for now	2016-01-09 21:10:56 +02:00
Simon Hanna	44cd766885	Remove code that was added by mistake	2016-01-09 18:22:09 +01:00
Ken Roberts	8fcae33516	resolve merge conflics	2016-01-09 08:59:42 -08:00
Simon Hanna	0416e29a83	Merge with trunk	2016-01-09 17:50:08 +01:00
Simon Hanna	afaf54a142	Fix pep8 errors	2016-01-09 17:26:14 +01:00
Samuel Mehrbrodt	fe74a19783	Merge	2016-01-09 16:04:34 +01:00
Tomas Groth	e9e845035a	pep8 fixes	2016-01-09 10:09:29 +01:00
Simon Hanna	21c6a3ff1c	Merge with trunk	2016-01-09 01:07:15 +01:00
Samuel Mehrbrodt	b1c9f6937f	Merge branch	2016-01-09 00:08:21 +01:00
Samuel Mehrbrodt	da5790f17f	Merge trunk	2016-01-09 00:05:43 +01:00
Tomas Groth	5d6758ffaf	trunk	2016-01-08 22:51:40 +01:00
Tomas Groth	a44d70cb0f	Fix some tests on windows.	2016-01-08 22:44:22 +01:00
Tomas Groth	43e273c4ed	Disable OpenGL in the maindisplay on windows for now.	2016-01-08 22:43:43 +01:00
simon.hanna@serve-me.info	e8e553b663	Modify all forms to remove the help button from their status bar. ... I don't think I missed a form. The Wizards remain untouched as the help button works there bzr-revno: 2591 Fixes: https://launchpad.net/bugs/1490184	2016-01-08 17:26:39 +00:00
Samuel Mehrbrodt	69e1660d6c	PEP8	2016-01-08 15:05:54 +01:00
Simon Hanna	2c5475e8fa	Fix some pep issues in the changed files	2016-01-08 14:47:52 +01:00
Raoul Snyman	4fd53706c6	We still need a db_url. Thanks interface tests!	2016-01-08 00:18:01 +02:00
Samuel Mehrbrodt	ddefceee04	Fix migration for non-sqlite	2016-01-07 23:12:03 +01:00
Simon Hanna	d5780b9f78	update functions that were previously methods to drop the '_' ... rename _child to to_str because of name conflicts	2016-01-07 14:10:31 +01:00
Raoul Snyman	b1febaa452	Try to make sense of what the projector stuff is supposed to be doing. Found that internally the normal init_url was being called, which was wrong (i.e. it was being called twice, once from a plugin perspective, and then again from the projector perspective). Also, self.db_url was not being applied.	2016-01-06 22:02:39 +02:00
Simon Hanna	5bc13e45e3	Move some static methods out of their classes where it makes sense	2016-01-05 23:28:48 +01:00
Samuel Mehrbrodt	8780b74342	Use deepcopy instead of copy	2016-01-05 16:17:22 +01:00
Samuel Mehrbrodt	5f2e0ba0ee	Add test for deleting columns in a db	2016-01-05 16:14:58 +01:00
Samuel Mehrbrodt	b9a7170cdf	Add missing file	2016-01-05 08:57:01 +01:00
Samuel Mehrbrodt	4706ff4af8	Merge trunk	2016-01-04 19:47:03 +01:00
Simon Hanna	c467c321b4	Make methods static that don't need to rely on instance data	2016-01-04 13:21:58 +01:00
Samuel Mehrbrodt	c7d7d16921	PEP8	2016-01-04 13:18:11 +01:00
Tomas Groth	8991d2ca62	trunk	2016-01-03 18:02:23 +01:00
Tomas Groth	dec1aa6720	Started on chords support	2016-01-03 18:01:44 +01:00
Simon Hanna	6d0e006b09	Change Combobox to Checkbox for plugin states	2016-01-03 14:03:29 +01:00
Ken Roberts	a023177c4d	Fix typo in projector authentication	2016-01-03 00:15:54 -08:00
Tomas Groth	e562571aa9	trunk	2016-01-03 00:13:48 +01:00
Tim Bentley	4ef5126a22	head	2016-01-01 20:39:54 +00:00
Tim Bentley	9c2b472ee8	prints	2016-01-01 20:39:26 +00:00
Tim Bentley	3a8b068af8	Year older	2015-12-31 22:46:06 +00:00
Simon Hanna	bf9420a781	Update forms to remove the help button in the statusbar ... Fixes: https://launchpad.net/bugs/1490184	2015-12-30 16:03:35 +01:00
Ken Roberts	f864a24f9a	Fix typo in pin code hashing	2015-12-29 06:01:22 -08:00
springermac@gmail.com	b87156e104	"Make sure the main display on Mac OS X stays above the menu bar and dock but still allow the main window to be focused" ... bzr-revno: 2585	2015-12-28 22:01:34 +02:00
springermac@gmail.com	160550f836	"Change some keyboard shortcuts to use predefined platform dependent shortcuts from Qt. ... Display keyboard shortcuts with modifiers in their platform native form." bzr-revno: 2584	2015-12-28 21:35:15 +02:00
second@tgc.dk	0d66ccdae4	"Only import vlc in one place. Make it work with PyInstaller. ... Added bit-install-hint for VLC Pep8 fixes " bzr-revno: 2583	2015-12-27 23:15:24 +02:00
Andreas Preikschat	eefb496cde	HEAD	2015-12-26 22:35:48 +01:00
Andreas Preikschat	18893b3903	Feature: updated vlc.py	2015-12-26 22:34:29 +01:00
Jonathan Springer	e8c1d5adca	Clarify comment	2015-12-26 11:08:50 -05:00
Jonathan Springer	ca8600414f	Add comments and doc strings	2015-12-26 11:05:41 -05:00
Tomas Groth	a6f5251d7e	pep8 fixes	2015-12-26 15:30:12 +01:00
Tomas Groth	c5e5f5b889	Added bit-install-hint for VLC	2015-12-26 15:25:09 +01:00
Tomas Groth	b69bb5ce27	trunk	2015-12-26 10:00:48 +01:00
Jonathan Springer	860d630360	Make sure the main display stays above the menu bar and dock but still allow the main window to be focused	2015-12-24 14:26:41 -05:00
Jonathan Springer	86c4acab9c	Move adding shortcuts to __default_dict__ into __init__ to avoid having QKeySequences being run before a QApplication is created and crashing	2015-12-23 23:13:50 -05:00
Tim Bentley	fe0cdc70fb	cleanup	2015-12-23 22:19:28 +00:00
Jonathan Springer	b858b0b103	merge trunk	2015-12-23 13:01:37 -05:00
Jonathan Springer	9d94845584	Add some missed old shortcuts to their alternate field	2015-12-23 12:58:07 -05:00
Tim Bentley	3a05159871	head	2015-12-23 06:06:50 +00:00
Tim Bentley	3791eea777	clean ups	2015-12-23 06:06:25 +00:00
Jonathan Springer	f3108cffe3	Fix exit dialog	2015-12-22 17:20:39 -05:00
Tim Bentley	e90fb00ddd	head	2015-12-22 19:07:51 +00:00
Tomas Groth	5bbea1685d	trunk with qt5	2015-12-22 14:13:17 +01:00
Tomas Groth	f32c7823df	First stab at a pysword based SWORD-importer.	2015-12-22 14:04:01 +01:00
Jonathan Springer	bee587fa67	merge trunk	2015-12-20 19:43:38 -05:00
Tim Bentley	15f1b61fd4	simplified	2015-12-20 21:30:47 +00:00
Tim Bentley	2ef0b3b210	remove debugs	2015-12-20 18:00:38 +00:00
Tim Bentley	b728dddaa4	remove slidecontroller	2015-12-20 17:58:24 +00:00
Tim Bentley	8de95e34a0	first merge	2015-12-20 17:24:45 +00:00
s.mehrbrodt@gmail.com	12141d6a7e	Small fixes: ... * Multiple '%s' in one string need to be named for translations (otherwise the order might get confused)   * OpenLP 2.0 -> OpenLP 2   * Change buttons of "Do you really want to close" dialog: Instead of ("No", "Yes") use ("Cancel", "Close OpenLP")   * Improve exception dialog (mention that description should be english and relevant files should be attached) * Do not translate the bug report labels * Ignore "E402 module level import not at top of file" pep8 errors (added to ... bzr-revno: 2574	2015-12-18 16:48:53 +00:00
Samuel Mehrbrodt	e6978033e9	PEP8	2015-12-17 22:43:49 +01:00
Jonathan Springer	8327346647	merge trunk	2015-12-16 17:25:41 -05:00
Jonathan Springer	445e755895	Change some keyboard shortcuts to use predefined platform dependent shotcuts from Qt. ... Display keyboard shortcuts with modifiers in their platform native form.	2015-12-16 17:19:50 -05:00
Jonathan Springer	0a935bdb90	merge trunk	2015-12-13 19:21:58 -05:00
Tomas Groth	44a523631e	Only import vlc in one place. Make it work with PyInstaller.	2015-12-13 21:35:23 +01:00
Samuel Mehrbrodt	0d4541b8dc	Merge trunk	2015-12-11 09:33:24 +01:00
Jonathan Springer	ec4ec887ea	Fix CheckMedia player not stopping. ... Fix duration of zero on first play.	2015-12-10 14:03:57 -05:00
Jonathan Springer	fc3c433a21	Fix failing situation by making default_players a list instead of a string	2015-12-10 12:26:08 -05:00
Jonathan Springer	50c0a173eb	Add settings migration for phonon to system change	2015-12-07 16:41:15 -05:00
Jonathan Springer	baa59f9321	Forgot to uncomment some code	2015-12-07 16:40:45 -05:00
Jonathan Springer	2e23d9919d	Fix system player being used for live-background	2015-12-07 16:40:09 -05:00
Jonathan Springer	ae4858e434	Fix traceback in mediacontroller if a service item had a processor type of automatic	2015-12-07 16:34:10 -05:00
Jonathan Springer	3b3c8a35b6	merge trunk	2015-11-29 17:57:37 -05:00
Jonathan Springer	05a653e670	Make sure all generated pixmaps are show at the proper pixel ratio	2015-11-29 17:48:10 -05:00
Tim Bentley	1ba8652985	Remove Prints	2015-11-28 15:38:31 +00:00
Tim Bentley	ae1888106d	Fix Presentations and Media	2015-11-28 15:37:26 +00:00
Jonathan Springer	9c46eda524	Enable and fix mimetype filters. ... Make sure file can be played due to lack of mimetype support on Linux and Windows	2015-11-16 22:59:30 -05:00
Jonathan Springer	285e12bc9d	PEP8	2015-11-06 20:09:32 -05:00
Jonathan Springer	7af1ca1d49	Migrate to PyQt5	2015-11-06 19:49:40 -05:00
tim.bentley@gmail.com	7c5add7fac	First merge for 2.4. ... A Number of small bug fixes which could be done in 2.2. Clean up all the 2.0 to 2.2 migrations stuff. Create a 2.2 to 2.4 migration for settings. Fix problems with the Tag test so you do not need to restart a branch each time we do a release. lp:~trb143/openlp/bugs-2_4b (revision 2578) [SUCCESS] https//ci.openlp.io/job/Branch-01-Pull/1164/ [SUCCESS] https//ci.openlp.io/job/Branch-02-Functional-Tests/1087/ [SUCCESS] https//ci.openlp.io/job/Branch-03-Interface-Tests/1028/... bzr-revno: 2566 Fixes: https://launchpad.net/bugs/913508, https://launchpad.net/bugs/1168778, https://launchpad.net/bugs/1281100, https://launchpad.net/bugs/1390699, https://launchpad.net/bugs/1390706, https://launchpad.net/bugs/1413217, https://launchpad.net/bugs/1420276, https://launchpad.net/bugs/1439304, https://launchpad.net/bugs/1487014	2015-11-05 19:05:19 +00:00
Tim Bentley	a888a4a4aa	more missed	2015-11-04 18:37:06 +00:00
Tim Bentley	ba823a9302	fix align	2015-11-02 21:30:11 +00:00
Tim Bentley	6e754ec0a6	fix align	2015-11-02 21:25:38 +00:00
Tim Bentley	20f0d39113	fix align	2015-11-02 21:19:01 +00:00
Tim Bentley	0e4847b5fa	head	2015-11-02 20:57:48 +00:00
Tim Bentley	d165010aaa	minor fix ups	2015-11-02 20:52:22 +00:00
Tim Bentley	89d9d7d73a	replace code removed in error	2015-10-28 21:21:05 +00:00
Andreas Preikschat	bdd8ef820a	Feature: update vlc.py from upstream	2015-10-25 23:00:57 +01:00
Tim Bentley	ae8b2d051a	Fix about dialog from translators	2015-10-19 22:14:30 +01:00
Tim Bentley	25332a2cb1	Head and 2.2	2015-10-17 12:20:51 +01:00
Tim Bentley	6b60573740	UI changes	2015-10-16 17:30:13 +01:00
Tim Bentley	742e0c912b	Plug item	2015-10-16 17:26:01 +01:00
Tim Bentley	a5b8827c96	Pep 8	2015-10-16 17:17:38 +01:00
Tim Bentley	58124c01d2	Add advanced	2015-10-16 17:09:35 +01:00
second@tgc.dk	48c9389a9f	Ignore close event in maindisplay unless it is trigger by OpenLP itself. Ignores ALT+F4 on windows. ... bzr-revno: 2560	2015-10-15 21:52:13 +01:00
Tim Bentley	925623bf74	core_int	2015-10-15 19:03:57 +01:00
Tim Bentley	ccd604b3be	Strings	2015-10-15 19:00:39 +01:00
Tim Bentley	cd4034ebf1	settings	2015-10-15 18:56:17 +01:00
Raoul Snyman	191a739f81	Let's download things once only, instead of 3 times.	2015-10-14 23:19:02 +02:00
Tomas Groth	949bf4a8a7	Ignore close event in maindisplay unless it is trigger by OpenLP itself. Ignores ALT+F4 on windows.	2015-10-13 22:52:33 +01:00
Tomas Groth	62e9663aec	Make 2 texts translateable	2015-10-12 13:59:17 +01:00
Tim Bentley	21743e4472	fix length	2015-09-10 21:35:14 +01:00
Jonathan Springer	d60a1e8340	Move icons that use build_icon into the function they are needed in so build_icon isn't called when the file is imported avoiding an assert when importing without a QApplication initialized ... Change relative import in bible db to absolute import Docstring cleanups bzr-revno: 2554	2015-09-10 22:11:46 +02:00
Jonathan Springer	6688d45108	merge trunk	2015-09-08 15:15:43 -04:00
Jonathan Springer	eaf1e7a049	Docstring cleanups	2015-09-08 15:13:59 -04:00
Tomas Groth	1dcbc6837c	Make the fix for bug 1473632 work on more linux distros.	2015-09-04 10:01:07 +01:00
Tomas Groth	fec061782b	Make sure presentations is closed correctly. Fixes bug 1490996. ... Fixes: https://launchpad.net/bugs/1490996	2015-09-03 20:21:43 +01:00
Tomas Groth	964af5fc92	Fix crash with VLC on windows with unicode chars in filename. Fixes bug 1491998. ... Fixes: https://launchpad.net/bugs/1491998	2015-09-03 20:11:08 +01:00
Tomas Groth	0b4cf91c42	Fix traceback on windows in the OO/LO song importer. ... Improved the robustness of the download-webbibles-form. Fixes bug 1489757. Fix SongPro import. Fixes bug 1489376. Fix traceback on linux when VLC isn't installed. Fixes bug 1489143. bzr-revno: 2552	2015-08-28 22:05:57 +01:00
Samuel Mehrbrodt	7477f781ef	Close -> Exit (as in the menu)	2015-08-27 10:15:51 +02:00
Tomas Groth	f98c35df94	Fix traceback on linux when VLC isn't installed. Fixes bug 1489143. ... Fixes: https://launchpad.net/bugs/1489143	2015-08-26 22:37:23 +01:00
Samuel Mehrbrodt	813cbaf2ad	PEP8	2015-08-26 10:40:09 +02:00
Samuel Mehrbrodt	8d791a51f4	Better wording for close dialog	2015-08-26 10:37:16 +02:00
Samuel Mehrbrodt	2df4dad39c	Improve exception dialog	2015-08-26 10:20:55 +02:00
Samuel Mehrbrodt	0c9f23a875	PEP8	2015-08-26 09:59:27 +02:00
Samuel Mehrbrodt	eac92737a2	Better strings for translation	2015-08-26 09:51:37 +02:00
Samuel Mehrbrodt	fce9a1e1f2	OpenLP 2.0 -> OpenLP 2	2015-08-26 09:26:19 +02:00
Jonathan Springer	59a04e982f	Add ability to open Apple help file from app bundle. ... Only show offline help if we are running frozen.	2015-08-24 14:19:30 -04:00
Tomas Groth	5940a77b20	Move call to XInitThreads for linux-vlc setup to module-load. Fixes bug 1473632. ... Fixes: https://launchpad.net/bugs/1473632	2015-07-20 21:33:58 +01:00
Tomas Groth	aea6c424fc	Check mediaplayer is loaded before trying to use it when blanking. Fixes bug 1465390. ... Fixes: https://launchpad.net/bugs/1465390	2015-06-15 21:29:34 +01:00
Tomas Groth	bdecfbf3e9	Fix path of presentation thumbnail when loading from service files. Fixes bug 1463703. ... Fixes: https://launchpad.net/bugs/1463703	2015-06-10 17:14:23 +02:00
Tomas Groth	60d45d8b8b	Fix log-traceback when trying to remove servicemanager files before eg. powerpoint has closed the files.	2015-06-08 20:34:22 +01:00
Tomas Groth	e3be044d5d	Improve network exception handling, again.	2015-06-08 20:32:46 +01:00
Tomas Groth	7eb506fae8	Improve network exception handling.	2015-06-07 21:56:06 +01:00
Tim Bentley	b7d0fc8ffc	Fix focus and test	2015-05-31 07:40:37 +01:00
Raoul Snyman	bd92e6a7d3	Fix a left-over from the VLC 2.2 fix; fix a problem when video player from the UI is None ... bzr-revno: 2541	2015-05-30 13:11:32 +01:00
Tomas Groth	623a0974a5	For worshipassistant add a default verse-id for lyrics to use if none is given. Fixes bug 1458056. ... Don't import setting keys that does not exists. Fixes bug 1458672. When going from a theme-blanked item to item which doesn't support theme-blanking, switch to black-blank. Only use transitions if we are changing slide. Fixes bug 1449064. Make translation of 'Advanced' specific to the bible plugin. Many PowerPoint fixes/improvements: * Make screenshots for main webview, even on single screen setup. Fixes bug 1449041. * Implement workaround for unblanking bug in PowerPoint 2010. * Open PowerPoint hidden so the main application window isn't visible. * Added support for odp for PowerPoint 2007 and newer. * Added support for Powerpoint events, which is used to update the slidecontroller if OpenLP is not in focus. * Minimized the flashing of the PowerPoint presentation window in the taskbar. bzr-revno: 2539	2015-05-29 17:22:22 +01:00
Raoul Snyman	5bcdc85ce1	Fix a left-over from the VLC 2.2 fix; fix a problem when video player from the UI is None	2015-05-28 22:38:43 +02:00
Jonathan Springer	aa97feb064	Fix bug 1395848 by setting the WindowStaysOnTop window flag when the MainDisplay is not on the primary screen. ... bzr-revno: 2538	2015-05-28 00:06:22 +02:00
Tomas Groth	a5cebb73c4	trunk	2015-05-25 21:58:05 +01:00
Tomas Groth	c3e567969b	Don't import setting keys that does not exists. Fixes bug 1458672. ... Fixes: https://launchpad.net/bugs/1458672	2015-05-25 21:43:37 +01:00
Tim Bentley	54dbafed8e	Fix issue with android where tagging is wrong is the render takes too long	2015-05-25 20:31:12 +01:00
Jonathan Springer	236dba77e8	Fix bug 1395848 by setting the WindowStaysOnTop window flag when the MainDisplay is not on the primary screen.	2015-05-21 23:15:15 -04:00
Tomas Groth	c9a8f07a37	Only use transitions if we are changing slide. Fixes bug 1449064. ... Fixes: https://launchpad.net/bugs/1449064	2015-05-01 22:17:59 +01:00
Tomas Groth	73ae9a2643	Make screenshots for main webview, even on single screen setup. Fixes bug 1449041. ... Fixes: https://launchpad.net/bugs/1449041	2015-05-01 16:21:59 +02:00
Tomas Groth	d044821483	pep8 fixes	2015-04-30 14:48:45 +02:00
Tomas Groth	54fbaf3a4f	When going from a theme-blanked item to item which doesn't support theme-blanking, switch to black-blank.	2015-04-30 14:37:13 +02:00
Raoul Snyman	fda7ab562c	Add some tests	2015-04-28 16:01:09 +02:00
Raoul Snyman	07b7d9b6a9	Fix a problem with VLC 2.2 on Mac OS X, where VLC could not find it's plugins, and would bomb out. ... bzr-revno: 2533	2015-04-27 17:02:16 +01:00
Raoul Snyman	217b731a95	No need to figure out if VLC is available if we've loaded the module before	2015-04-27 11:24:02 +02:00
Raoul Snyman	ab54b04468	Fix VLC 2.2 on OS X which cannot be loaded due to an incorrect plugin path	2015-04-25 16:32:09 +02:00
Jonathan Springer	a162aa50fa	merge trunk	2015-04-24 17:00:16 -04:00
Tomas Groth	f8114d0b97	Disable button for replacing live background if the webkit player is not available.	2015-04-21 22:49:22 +01:00
Tomas Groth	cd7c4f6197	Make sure we always add a blank line between verses. Fixes bug 1439311. ... Fixes: https://launchpad.net/bugs/1439311	2015-04-11 23:13:30 +01:00
Tomas Groth	6f5a139329	Normalize file path to OS standard after drag-and-drop. Fixes bug 1440571. ... Fixes: https://launchpad.net/bugs/1440571	2015-04-07 23:20:30 +01:00
Tomas Groth	cff0b412f8	Mark a custom slide edited from preview as coming from plugin. Fixes bug 1439671. ... Use html.escape instead of the deprecated cgi.escape Fix support for special characters in theme names. Fixes bug 1438563. Fix another case of traceback when playing media with no players available/enabled (bug 1422761). bzr-revno: 2526 Fixes: https://launchpad.net/bugs/1439671, https://launchpad.net/bugs/1438563, https://launchpad.net/bugs/1422761	2015-04-03 20:31:19 +02:00
Tomas Groth	589bc98bec	Use html.escape instead of the deprecated cgi.escape	2015-04-02 21:32:20 +01:00
Tomas Groth	f8b575065a	pep8 fix	2015-04-02 21:29:43 +01:00
Tomas Groth	d2301e016e	improved logging	2015-04-02 13:50:50 +01:00
Tomas Groth	335c804e8f	Fix support for special characters in theme names. Fixes bug 1438563. ... Fixes: https://launchpad.net/bugs/1438563	2015-04-02 10:04:56 +01:00
Jonathan Springer	16425b05a0	Fix bug 1247661 by restoring to main window when the dock icon is clicked	2015-03-24 18:33:57 -04:00
Tomas Groth	25f6fe0a59	Fix another case of bug 1422761. ... Fixes: https://launchpad.net/bugs/1422761	2015-03-20 17:03:45 +00:00
Tomas Groth	f8084059ba	Added test + small fixes.	2015-03-18 22:04:30 +00:00
Tomas Groth	7e406e7005	Insert timeout on acquiring lock in slidecontroller to avoid hang. Fixes bug 1413324. ... Fixes: https://launchpad.net/bugs/1413324	2015-03-18 22:02:51 +00:00
Tomas Groth	b3fd23da59	Updated the list of extensions supported by VLC.	2015-03-18 20:44:35 +00:00
Tomas Groth	27332f87e1	Run XInitThreads when using VLC to make it work correctly. Fixes bug 1433245. ... Fixes: https://launchpad.net/bugs/1433245	2015-03-17 22:06:21 +00:00
Tomas Groth	c3d21ca742	Disable the stop button in the slidecontroller mediaplayer buttons instead of hiding it to stop the position and audio slider resizing. Fixes bug 1431478.	2015-03-16 21:32:56 +00:00
Tomas Groth	e34179795b	Attempt to fix a webkit player exception	2015-03-15 22:34:12 +00:00
Tomas Groth	fe6249a9e7	Removed tab from text since transifex cannot handle it.	2015-03-09 22:10:21 +00:00
Tomas Groth	39c79aaed9	PEP8 fixes	2015-03-09 20:57:39 +00:00
Tomas Groth	aefe3e9cad	trunk	2015-03-09 20:42:28 +00:00
Raoul Snyman	54c23cc7bd	Fix bug #1419300 by checking if we are doing single-click previewing and not engaging preview on double-click ... Fixes: https://launchpad.net/bugs/1419300	2015-03-07 00:18:51 +02:00
Arjan Schrijver	ea96bff031	Add myself as translator	2015-03-01 14:29:47 +01:00
Tim Bentley	1d82bc534c	Add tests	2015-02-28 09:41:06 +00:00
Tim Bentley	75bae159b0	fix error tag	2015-02-28 07:04:41 +00:00
Tomas Groth	84a0fa0ecd	Moved string format input outside calls to translate. Fixes bug 1425035. ... Fixes: https://launchpad.net/bugs/1425035	2015-02-27 21:14:08 +00:00
Raoul Snyman	4847efdfd6	Release 2.1.3 ... bzr-revno: 2513	2015-02-21 22:05:25 +02:00
Ken Roberts	85b8cb2c50	Fix bug 1422683: Added exception checks to get_web_page() to help with changed description. Rearrange calls so thumbnail downloads don't hang other event threads. Reraise exception when retries > CONNECTION_RETRIES. ... bzr-revno: 2512 Fixes: https://launchpad.net/bugs/1422683	2015-02-21 21:11:25 +02:00
Ken Roberts	23ef01bce2	Fix typo's in function calls ... bzr-revno: 2511	2015-02-21 21:08:55 +02:00
Tomas Groth	66b898f2c3	Don't try to play media if no players are available. Fixes bug 1422761. ... Do not display alert on a single screen when 'Display on a single screen' is not checked. Fixes bug 1423956. bzr-revno: 2510 Fixes: https://launchpad.net/bugs/1422761, https://launchpad.net/bugs/1423956	2015-02-21 21:03:59 +02:00
Phill Ridout	a6fed0a3e5	HEAD	2015-02-21 13:10:28 +00:00
Phill Ridout	4b52fde1da	Fixes possible bug and adds test	2015-02-21 13:08:56 +00:00
Tomas Groth	df9594e11d	trunk	2015-02-21 12:45:44 +00:00
Phill Ridout	05ce21104d	PEP fix	2015-02-19 21:57:26 +00:00
Phill Ridout	a255faa95b	HEAD	2015-02-19 21:53:21 +00:00
Phill Ridout	fa5b036323	adds bytes type	2015-02-19 21:47:53 +00:00
Phill Ridout	fb20f9243f	Further fixes	2015-02-19 21:24:12 +00:00
Ken Roberts	b62bb37776	Reraise exception if retries > CONNECTION_RETRIES	2015-02-19 09:17:04 -08:00
Ken Roberts	fd81d2d80a	Fix thumbnail download blocking events	2015-02-19 07:34:09 -08:00
Ken Roberts	64d0a42946	Typos in projector.manager	2015-02-18 14:21:39 -08:00
Tomas Groth	83ad7c31d7	Don't try to play media if no players are available. Fixes bug 1422761 ... Fixes: https://launchpad.net/bugs/1422761	2015-02-18 21:32:42 +00:00
Phill Ridout	a6dfbdcf71	fix upgrade_db	2015-02-18 21:13:12 +00:00
Ken Roberts	33d8dcfa50	Reraise exception outside of checks	2015-02-18 12:40:39 -08:00
Ken Roberts	2b63b5d3ad	Add extra exceptions to get_web_page	2015-02-18 08:13:36 -08:00
Ken Roberts	80055b7ec0	Fix ftw socket.timeout bug 1422683	2015-02-17 13:27:51 -08:00
Tomas Groth	7c0386b7c0	Fixes for mysql as db backend ... bzr-revno: 2504	2015-02-17 19:50:18 +00:00
Tim Bentley	870b69b497	Remove cache for http authentication ... bzr-revno: 2503	2015-02-17 19:49:16 +00:00
Tomas Groth	1b2b1c74cc	Use the doubleclick-go-live setting in the preview controller. Fixes bug 1422197. ... If no copyright info is given for bible, don't print it. Fixes bug 1420785. Make csv-bible import work with python3. Fixes bug 1421136. Add default shortcut bindings for preview next/prev, and make the appear in the shortcut edit dialog. Fixes bug 1412570. bzr-revno: 2502	2015-02-17 18:50:10 +00:00
Philip Ridout	f7cb420a31	Fixes bug1419691 by checking the theme version number (OpenLP1 themes didn't have a version no.) and by removing the *.theme filter from the file dialog. ... Also added a ValidationError exception class, to tidy up the unzip code slightly bzr-revno: 2501	2015-02-17 05:51:24 +00:00
Philip Ridout	16758d1b80	Fixes bug1073931 "Corrupted databases stop OpenLP from starting" ... Checks if the database session is available before trying to use it. Use a sha256 hash to verify downloaded files. See also: https://code.launchpad.net/~phill-ridout/openlp/sha256 bzr-revno: 2500	2015-02-17 05:47:19 +00:00
Tomas Groth	f01aa970a7	Revert fix for bug 1421561, it is fixed elsewhere.	2015-02-16 22:03:59 +00:00
Tomas Groth	06355032a2	Use the doubleclick-go-live setting in the preview controller. Fixes bug 1422197. ... Fixes: https://launchpad.net/bugs/1422197	2015-02-16 21:59:55 +00:00
Tomas Groth	0617ce3dc9	trunk	2015-02-16 21:02:58 +00:00
Tomas Groth	aef91445ca	Handle OSError exception when creating files in various places. Fixes bug 1416888. ... Fix parsing biblestudytools.com. Fixes bug 1418212. Make Zefania import guess book from number if name is unavailable. Fixes bug 1417033. bzr-revno: 2498	2015-02-14 15:11:11 +00:00
Tim Bentley	58f10d3b6b	Fix cache for http authentication	2015-02-14 09:12:35 +00:00
Phill Ridout	6ca70bbc5c	New line at end of file	2015-02-13 23:27:25 +00:00
Phill Ridout	2eb58a56bd	PEP fixes	2015-02-13 23:21:57 +00:00
Phill Ridout	498d17b000	Added tests	2015-02-13 23:10:16 +00:00
Tomas Groth	81de433df4	Added test for csvbible import	2015-02-13 23:01:07 +00:00
Phill Ridout	af2467ed93	Check for theme version. Implement a custom exception ... Fixes: https://launchpad.net/bugs/1419691	2015-02-13 21:47:06 +00:00
Phill Ridout	77109e61fd	Update doc string	2015-02-13 21:00:55 +00:00
Phill Ridout	3e697dc213	HEAD	2015-02-13 20:41:54 +00:00
Phill Ridout	126873ddaa	fixes bug1416703 by implementing a function to do the conversion ... Fixes: https://launchpad.net/bugs/1416703	2015-02-13 20:41:34 +00:00
Tomas Groth	340a766bba	Change ConnectionException to ConnectionError. Fixes bug 1421561 ... Fixes: https://launchpad.net/bugs/1421561	2015-02-13 20:10:53 +00:00
Phill Ridout	e35a1d7763	head	2015-02-12 21:35:26 +00:00
Phill Ridout	b427e216f1	small fixes	2015-02-12 21:24:39 +00:00
Phill Ridout	f6de8a4f7a	Fix 1416703	2015-02-12 20:44:34 +00:00
Tomas Groth	733812572c	Added projector and fixed spelling.	2015-02-11 22:15:46 +00:00
Tomas Groth	8c8fbe45b2	Fixes to make mysql db work	2015-02-11 20:56:13 +00:00
Tomas Groth	bab5e90e20	Adjust error messages.	2015-02-10 22:25:30 +00:00
Ken Roberts	88cb02bb3d	Fix bug #1417809: Remove default ascii encoding so md5hash can be used to hash other data. ... bzr-revno: 2497 Fixes: https://launchpad.net/bugs/1417809	2015-02-10 21:38:53 +02:00
Tomas Groth	1e9430b435	Fix bug 1414980: Make xml parsing of presentation manager files recover if errors are encountered. ... Fix bug 1414978: Set the cursor back to normal after deleting a presentation. Fix bug 1410738: Added a cancel-button to FTW when no internet is available. Fix bug 1412517: Fix support for 'end' mark in bible-search. bzr-revno: 2495 Fixes: https://launchpad.net/bugs/1414978, https://launchpad.net/bugs/1414980, https://launchpad.net/bugs/1410738, https://launchpad.net/bugs/1412517	2015-02-10 21:24:33 +02:00
Tomas Groth	12a0b8b750	Add default shortcut bindings for preview next/prev, and make the appear in the shortcut edit dialog. Fixes bug 1412570. ... Fixes: https://launchpad.net/bugs/1412570	2015-02-09 20:49:24 +00:00
Phill Ridout	08e1404ffb	rename some of the unpacked vars	2015-02-08 18:38:47 +00:00
Tomas Groth	d8e6f35694	Handle OSError exception when creating files in various places. Fixes bug 1416888. ... Fixes: https://launchpad.net/bugs/1416888	2015-02-06 22:17:24 +00:00
Ken Roberts	a4235aafe9	Remove new functions - fix tests	2015-02-04 08:43:04 -08:00
Tomas Groth	7287759ba5	Fixed a string	2015-02-03 23:41:30 +00:00
Ken Roberts	a50744adbc	Added sha1_filecheck	2015-02-03 14:54:41 -08:00
Phill Ridout	b6493bebbf	Final Fixes	2015-02-02 22:04:30 +00:00
Phill Ridout	b8838f496a	Modified download hashing	2015-02-02 19:25:34 +00:00
Ken Roberts	b02d44416a	Allow md5check to use non-ascii encoding, added md5_filecheck	2015-02-02 10:00:39 -08:00
Phill Ridout	4c36bba911	head	2015-02-01 21:40:59 +00:00
Philip Ridout	b40f931618	Fix - Preview media slider repeatedly shows "Error Occurred" dialogue box ... bzr-revno: 2493	2015-02-01 15:04:37 +00:00
Tim Bentley	93038bb27d	Move delete option to support ham fisted users ... bzr-revno: 2492	2015-02-01 13:37:54 +00:00
Phill Ridout	6d2b1d958e	Better handle failed downloads	2015-01-31 21:52:02 +00:00
Ken Roberts	93ce2caf34	Fix invalid call to QMessageBox() when user wants to delete user-defined source text. ... bzr-revno: 2491	2015-01-31 14:18:19 +00:00
Tim Bentley	6f76c164e0	fix delete	2015-01-30 21:15:03 +00:00
Phill Ridout	59088887fc	PEP Fixes	2015-01-29 21:21:03 +00:00
Phill Ridout	0e79c0fe40	Remove testing code	2015-01-29 20:58:14 +00:00
Phill Ridout	b33fe701df	Make Phonon optional ... Fixes: https://launchpad.net/bugs/1224404	2015-01-29 20:57:02 +00:00
Tomas Groth	10d25f8173	Added a cancel-button to FTW when no internet is available. Fixes bug 1410738 ... Fixes: https://launchpad.net/bugs/1410738	2015-01-27 15:52:18 +01:00
Phill Ridout	bfe1824cb4	removed redundant code	2015-01-26 21:18:23 +00:00
Phill Ridout	1712464e8c	Fix up tests	2015-01-26 20:42:19 +00:00
Phill Ridout	28222ed0f8	fix check_available to work on feature detection	2015-01-25 22:00:14 +00:00
Philip Ridout	5390ed5bac	Fixes Bug #1367141: Presentations/Images with same name gets the same thumbnail ... Uses the database id for thumbnails. Uses an md5 hash of the path and file name for presentations (as there is no db for presentations) Also added code to remove the old thumbnails. bzr-revno: 2487	2015-01-24 18:24:51 +00:00
Phill Ridout	14719b8ab3	remove print statments	2015-01-22 20:12:23 +00:00
Philip Ridout	fe3d887fd7	Corrects Translation strings ... bzr-revno: 2485	2015-01-22 19:47:16 +00:00
Philip Ridout	c43823a2b0	Fixes the copyright headers ... bzr-revno: 2484	2015-01-22 19:46:04 +00:00
Phill Ridout	92eee52d3f	pep fixes	2015-01-22 18:07:56 +00:00
Phill Ridout	051db41e20	removed python3 string	2015-01-22 17:42:29 +00:00
Phill Ridout	75dff3d2be	HEAD	2015-01-22 17:31:00 +00:00
Phill Ridout	833c6fb800	Add test	2015-01-22 15:05:03 +00:00
Phill Ridout	7750f1ec11	Correct the rest of the headers	2015-01-22 13:31:25 +00:00
Tomas Groth	f53187e26a	Fix layout in player-settings. Fixes bug 1410772 ... Make sure we use dnd position if available. Fixes bug 1410843. Set the default delay-spinbox value from the appropriate setting. Fixes bug 1411765. Improve OpenLyrics import handling of authortypes. Fixes bug 1405172 and 1405175. bzr-revno: 2482	2015-01-21 20:35:36 +00:00
Phill Ridout	4d749a89ac	Presentation fixes	2015-01-20 21:56:05 +00:00
Phill Ridout	7fda8043f5	Improve translation string ... Fixes: https://launchpad.net/bugs/1412234	2015-01-20 21:38:34 +00:00
Ken Roberts	745a3e3ef8	Remove translations from error code number strings	2015-01-19 14:36:53 -08:00
Tomas Groth	8ba226fe0e	Fix layout in player-settings. Fixes bug 1410772 ... Fixes: https://launchpad.net/bugs/1410772	2015-01-19 12:21:00 +01:00
Raoul Snyman	de213b0f66	Copyright cleanup time, ... bzr-revno: 2479	2015-01-19 08:34:29 +00:00
Ken Roberts	e959511021	Fix invalid call to QMessageBox	2015-01-18 15:42:59 -08:00
Tomas Groth	d424ae51fa	Make sure we use dnd position if available. Fixes bug 1410843. ... Fixes: https://launchpad.net/bugs/1410843	2015-01-18 21:44:34 +00:00
Tomas Groth	ff87971270	Set the default delay-spinbox value from the appropiate setting. Fixes bug 1411765. ... Fixes: https://launchpad.net/bugs/1411765	2015-01-18 20:52:49 +00:00
Raoul Snyman	ffcea13021	Updated the copyright.	2015-01-18 15:39:21 +02:00
Ken Roberts	deb8ae8656	Fix First Time Wizard fail on URL error (ex: proxy authorization) ... Fix spelling bzr-revno: 2478 Fixes: https://launchpad.net/bugs/1409627	2015-01-16 22:43:47 +02:00
Tomas Groth	cf30667fb5	Fix Windows tests when running on WINE ... bzr-revno: 2477	2015-01-16 22:42:00 +02:00
Phill Ridout	e5bae7e885	Fixes1410694 by fixing typo, also added additional error. Added the OS Name and version to the version file request headers ... Fixes: https://launchpad.net/bugs/1410694	2015-01-14 21:35:02 +00:00
Ken Roberts	6be873bd91	spelling	2015-01-14 07:38:50 -08:00
Tomas Groth	1efc145cdf	PEP8 fixes	2015-01-14 12:32:27 +01:00
Tomas Groth	cffad28749	Close session after upgrade. Fixes a filelock issue in windows tests.	2015-01-14 11:56:18 +01:00
Ken Roberts	9551920821	Catch network error in FTW	2015-01-13 11:03:05 -08:00
Raoul Snyman	3774cf3704	Update the credits in the About dialog	2015-01-11 21:46:41 +02:00
Raoul Snyman	0bb325fea7	HEAD	2015-01-11 17:17:33 +02:00
	0deb0a10cc	[bug 1397606] Set the file dialogue box to the currently selected background image ... bzr-revno: 2471 Fixes: https://launchpad.net/bugs/1397606	2015-01-11 17:17:01 +02:00
Ken Roberts	91933c3e2f	[bug 1409031] Fix retry counter when fetching a webpage ... bzr-revno: 2470 Fixes: https://launchpad.net/bugs/1409031	2015-01-11 17:13:13 +02:00
Ken Roberts	02fb9edeb6	[bug 1407445] Fix remote previous/next calls to servicemananger ... - Remove unneeded Registry() modification - Fix line spacing bzr-revno: 2469 Fixes: https://launchpad.net/bugs/1407445	2015-01-11 17:09:57 +02:00
Raoul Snyman	8758020568	HEAD	2015-01-11 17:02:32 +02:00
Ken Roberts	ac19e018fa	Fix retries on connection timeout error	2015-01-09 07:38:10 -08:00
Phill Ridout	e0fa70e47e	Set the last file location in the file dialog box ... Fixes: https://launchpad.net/bugs/1397606	2015-01-08 22:05:32 +00:00
Ken Roberts	a4efccb00b	Replace remote Registry().execute(event) next/previous with Qt signal	2015-01-06 14:37:18 -08:00
Ken Roberts	093f853fd9	Remove testing api (not needed anymore)	2015-01-05 10:54:44 -08:00
Ken Roberts	2e9f274027	Fix test db temp file for windows, projector edit form notes clearing	2015-01-05 10:36:10 -08:00
Ken Roberts	15f1381de8	Upstream merges	2015-01-04 09:38:59 -08:00
Tomas Groth	9461f334ce	Disable webkit and phonon mediaplayers on Mac OS X, ... bzr-revno: 2467	2015-01-04 09:01:18 +00:00
Phill Ridout	c27c875f33	Readded deleted line. One more comment typo	2015-01-02 11:58:44 +00:00
Phill Ridout	b9f09142ed	HEAD	2015-01-02 11:40:51 +00:00
Phill Ridout	20d927b270	Rework to use a subclassed QLabel to allow dynamic resizing	2015-01-02 11:40:07 +00:00
Tim Bentley	f3c09af379	Years go by	2014-12-31 10:58:13 +00:00
Ken Roberts	e89558da39	Fix label text for CCLI ... bzr-revno: 2463	2014-12-31 10:26:50 +00:00
Phill Ridout	52c7d89706	removal of util function	2014-12-30 11:23:01 +00:00
Phill Ridout	19cb16d65b	Moved 'eliding' code to a sublass of qlabel to enable the text to be rendrawn when resized	2014-12-30 11:21:06 +00:00
Phill Ridout	5d1eac9ded	Add function to provide elided text ... Fixes: https://launchpad.net/bugs/1405260	2014-12-30 08:48:46 +00:00
Phill Ridout	36417083ce	head	2014-12-29 17:25:36 +00:00
Tomas Groth	25e3e742b9	Fix media end time, Bible Parsing, ServiceManage Preview, locking of keytpress ... bzr-revno: 2461	2014-12-28 21:46:34 +00:00
Tomas Groth	aae831e90d	Disable webkit and phonon mediaplayers on Mac for now	2014-12-26 22:52:14 +00:00
Tomas Groth	98c5dd4865	Fix bug 1405476 by checking if an end_time has been set. ... Fixes: https://launchpad.net/bugs/1405476	2014-12-26 17:45:34 +00:00
Tomas Groth	853c532bf9	Do not allow edit of start/end time for optical mediaclips in the servicemanager. Fixes bug 1393186 until re-edit of optical clips is added. ... Fixes: https://launchpad.net/bugs/1393186	2014-12-25 22:02:58 +00:00
Tomas Groth	35de35103b	Remove unneeded serviceitem shift when auto previewing. Fixes bug 1405133 and bug 1401234 ... Fixes: https://launchpad.net/bugs/1401234, https://launchpad.net/bugs/1405133	2014-12-23 21:17:20 +00:00
Phill Ridout	c9e1dcceff	head	2014-12-23 18:57:04 +00:00
Ken Roberts	3be4f10833	Change edit song ccli label to "CCLI song number"	2014-12-22 12:19:05 -08:00
Tim Bentley	93d0314b7e	General fixes	2014-12-22 17:34:43 +00:00
Tomas Groth	672e2cc81f	trunk	2014-12-19 23:08:23 +00:00
Tomas Groth	321709d7a7	[bug 954613] Introduce locking when updating slide display to avoid slidecontroller and display getting out of sync. ... Fixes: https://launchpad.net/bugs/954613	2014-12-19 23:07:32 +00:00
Ken Roberts	10b9099f52	Fix typo	2014-12-18 12:51:34 -08:00
Ken Roberts	c596940a15	Fix notes edit not clearing between calls, added projectoreditform tests	2014-12-18 10:50:51 -08:00
Raoul Snyman	fe02a80e26	HEAD	2014-12-14 22:37:36 +02:00
Raoul Snyman	ba81146093	Fix a bug inadvertently introduced in the merge conflict.	2014-12-14 22:37:24 +02:00
Ken Roberts	b2f6eaf7d4	[Fix #1386913] "Discard" option in projector-select input option should only be for editing source input text ... - Fix "Discard" and "Reset" dialog buttons calling wrong functions (swapttped) - Fix dialog title text to reflect proper "Select" or "Edit" title - Fix tabbed dialog width to be consistent - Added calls to translate for user text - Added basic test for openlp.core.ui.projector.sourceselectform bzr-revno: 2457 Fixes: https://launchpad.net/bugs/1386913	2014-12-14 22:34:52 +02:00
Phill Ridout	ae852466ec	Fix selecting items in media manager using the keyboard when preview media items when clicked is set	2014-12-14 16:54:25 +00:00
Raoul Snyman	5742f7546e	Fixed up merge conflicts.	2014-12-12 22:57:42 +02:00
Phill Ridout	2642a21d53	Refactor get_uno_command & get_uno_instance	2014-12-08 07:19:51 +00:00
Phill Ridout	2dd7a6e776	remove print statment	2014-12-07 17:53:32 +00:00
Phill Ridout	2aff850b64	HEAD	2014-12-07 17:46:46 +00:00
Phill Ridout	9d54d6351a	Tests	2014-12-07 17:46:23 +00:00
Tomas Groth	4ed9e9a722	Added a refresh call to the hide-toolbar so that it gets updated if needed. Makes the blank-to-theme button visible in the toolbar. ... Fix for loading songs with linked audio + test. Fixes bug 1398403 Remove dummy initialization of preview_display to solve issue of mediaplayer preview being hidden. When cloning a song copy the mediafiles as well. Fixes bug 1309998. Use shutil.which instead of calling which with check_output, when detecting mudraw/gs. Moved test service files into appropriate folder. Set the default song search to search as type. bzr-revno: 2454	2014-12-07 08:21:37 +00:00
	24a8f67fd0	Handle LibreOffice and SOffice commands on linux ... Fixed imports conflict on merge. bzr-revno: 2453	2014-12-07 08:20:30 +00:00
Philip Ridout	c9a2b87ac5	Fix links and Color buttons ... bzr-revno: 2452	2014-12-07 08:16:15 +00:00
Tomas Groth	df6c533387	Fix upgrade on song db with lost version. Fixes bug 1391638. ... Treat slide notes and servicemanager notes differently in the web remote and stage view. Fixes bug 1390015. When escaping live display stop looping to prevent display to reappear. Fixes bug 1266271. bzr-revno: 2451	2014-12-07 08:13:52 +00:00
Tomas Groth	46641fecbe	Made the FTW able to handle if the downloaded config file is invalid (part of bug 1222944). ... Improved FTW handling of connection issues. Update thememanager widget after theme import. Close song db session after import to unlock file on windows, so they can be deleted. Fix for importing old bible DBs, like KJV Removed old pyinstaller hooks which has been moved to the packaging branch. When bible or song plugin is disabled in FTW don't show download for those plugins in FTW. Fixes bug 1194622. bzr-revno: 2450	2014-12-07 08:11:59 +00:00
Tomas Groth	56f4b8aa5e	Another fix for blank menu.	2014-12-06 20:40:40 +00:00
Tomas Groth	4123b9af1d	Imported just 'which' from shutil, instead of the complete module. Also set the default song search to search as type.	2014-12-06 20:08:42 +00:00
Phill Ridout	e190bf30e9	Fixes 1397570 by 'feature detection'	2014-12-05 17:04:44 +00:00
Tomas Groth	fd57f81376	Remove dummy initialization of preview_display to solve issue of mediaplayer preview being hidden	2014-12-04 22:14:56 +00:00
Tomas Groth	782b3d3bcf	trunk	2014-12-03 22:35:06 +00:00
Tomas Groth	fd48879513	The fix for loading songs with linked audio. Fixes bug 1398403 ... Fixes: https://launchpad.net/bugs/1398403	2014-12-03 22:31:23 +00:00
Tomas Groth	e94579e7f1	Only update blank menu if needed	2014-12-03 21:19:43 +00:00
Phill Ridout	70c3a21620	HEAD	2014-12-03 19:50:41 +00:00
Phill Ridout	fc4eb5dd4d	URL updates. PEP fix	2014-12-03 17:45:34 +00:00
Tomas Groth	767e3d91f2	Added a refresh call to the hide-toolbar so that it gets updated if needed. Makes the blank-to-theme button visible in the toolbar.	2014-12-02 11:07:03 +00:00
Tomas Groth	20394de842	pep8 fix	2014-12-02 10:02:13 +00:00
Tomas Groth	af4715dc3c	Remove the registered functions instead of overwriting	2014-12-02 09:46:19 +00:00
Tomas Groth	1c71efc532	Allow overwriting functions in registry, and use it when registring MainDisplay. Fixes bug 1397287 ... Fixes: https://launchpad.net/bugs/1397287	2014-12-01 15:08:13 +00:00
Phill Ridout	563347c8b8	HEAD	2014-11-30 07:44:57 +00:00
Tomas Groth	7d51352b2d	Added divx and xvid as supported files for VLC. Fixes bug 1215302 ... Fixes: https://launchpad.net/bugs/1215302	2014-11-28 08:15:59 +00:00
Raoul Snyman	34406385fb	HEAD	2014-11-26 22:50:54 +02:00
Raoul Snyman	a517ed5fea	[refactor] Remove the progress bar on the first download page, and update the label to be slightly more descriptive ... [fix] Hide the back button on the plugins page so that folks can't go back and re-download the config file	2014-11-26 22:02:48 +02:00
Ken Roberts	ea14deaa87	Fix quotes	2014-11-26 09:24:05 -08:00
Tomas Groth	e3bd817c5b	Merge with trunk	2014-11-26 09:04:09 +00:00
Tomas Groth	31018fb5ae	When escaping live display stop looping to prevent display to reappear. Fixes bug 1266271 ... Fixes: https://launchpad.net/bugs/1266271	2014-11-25 22:22:28 +00:00
Raoul Snyman	bd79b1d059	[bug 1314469] Fix the border seen in the main display on KDE by not overwriting that bit of the stylesheet ... Fixes: https://launchpad.net/bugs/1314469	2014-11-24 21:43:34 +02:00
Tomas Groth	5b794e5762	Added small pause before connection retry	2014-11-24 19:38:15 +00:00
Tomas Groth	0af6dc8eea	Always retry on connection failure.	2014-11-23 20:52:16 +00:00
Tim Bentley	4fb0e43c04	New start old bugs	2014-11-20 06:58:33 +00:00
	93706f8d99	Fix for overwriting files on song export + test. Fixes bug 1216232. ... Only show slide-dropdown on live-slidecontroller when it is populated. Fixes bug 1390238. Make sure that the slidecontroller toolbar layout is correctly adjusted to fit its size. Fixes bug 1387304. Mark a song edited from preview as coming from plugin. Fixes bug 1382672 Make the settingswindow higher to make room for the new settings. Fixes bug 1377283. bzr-revno: 2447	2014-11-19 20:59:27 +00:00
Tomas Groth	378132d82f	Moved Settings KeyError handling to the export.	2014-11-13 20:15:43 +00:00
Tomas Groth	ed13dcbd75	Only show slide-dropdown on live-slidecontroller when it is populated. Fixes bug 1390238. ... Fixes: https://launchpad.net/bugs/1390238	2014-11-13 12:21:54 +01:00
Tomas Groth	28599c8f24	Make sure that the slidecontroller toolbar layout is correctly adjusted to fit its size. Fixes bug 1387304 ... Fixes: https://launchpad.net/bugs/1387304	2014-11-13 11:26:44 +01:00
Tomas Groth	f609be65bc	Make the settingswindow higher to make room for the new settings. ... Fixes: https://launchpad.net/bugs/1377283	2014-11-12 21:20:57 +00:00
Tomas Groth	75960ac8da	When bible or song plugin is disabled in FTW don't show download for those plugins in FTW. Fixes bug 1194622. ... Fixes: https://launchpad.net/bugs/1194622	2014-11-11 14:58:03 +01:00
Tomas Groth	2efdc97311	Fix traceback when saving service while in debug mode	2014-11-11 12:34:47 +01:00
Ken Roberts	aadbce133e	Add missing tranlsate to text/fix select/edit title	2014-11-10 16:14:17 -08:00
Phill Ridout	5cc1fa2261	Fixes a few typos	2014-11-10 20:48:22 +00:00
Tomas Groth	61e42a9782	When querying values from Setting, return None if key does not exists. Fixes bug 1387278 ... Fixes: https://launchpad.net/bugs/1387278	2014-11-10 11:51:03 +01:00
Tomas Groth	6b538995f4	Fix for theme copy/creation on windows, fixes bug 1390917 ... Fixes: https://launchpad.net/bugs/1390917	2014-11-10 11:24:44 +01:00
Tomas Groth	bf382863d2	Fix for bug1390987 ... Fixes: https://launchpad.net/bugs/1390987	2014-11-10 09:48:22 +01:00
Ken Roberts	3fa0635d79	Fix Projector Manager dock so View->Lock Panels will lock/unlock the UI features ... bzr-revno: 2445	2014-11-09 13:20:09 +00:00
Philip Ridout	1ed8100537	Added new ColorButton subclassed from QPushButton to select colours reducing code duplication ... Added tests for ColorButton Renamed some methods to take in to account the new signal that ColorButton emits Fixed some tests for FileDialog bzr-revno: 2444	2014-11-09 13:18:53 +00:00
Ken Roberts	b6f87adb1d	Fix bug 1390702	2014-11-08 16:39:55 -08:00
Raoul Snyman	14377f3329	[refactor] Renamed "was_download_cancelled" to "was_cancelled" ... [refactor] Put some more stuff back into initalise() where it belongs [refactor] Rewrote old tests, wrote new tests	2014-11-08 23:15:25 +02:00
Raoul Snyman	4f4c76ae8b	[fix] Don't exit OpenLP when you cancel the FRW from the Tools menu	2014-11-08 21:25:06 +02:00
Ken Roberts	0750071fe2	Fix spacing on View-Projector Manager	2014-11-08 11:22:22 -08:00
Raoul Snyman	dec7390ef5	[bug 1389571] Use Qt threads properly, and kick off a separate thread for each download. ... [fix] Finally fixed the "configuring OpenLP" page by adding headers [refactor] Make the Wizard start up faster by only downloading the config file after the wizard has started	2014-11-08 01:46:18 +02:00
Ken Roberts	f2cd0a9743	Fix "Discard" and "Reset" button calls, pep8	2014-11-07 14:44:40 -08:00
Tomas Groth	48c561e34b	Made the FTW able to handle if the downloaded config file is invalid. ... Fixes: https://launchpad.net/bugs/1222944	2014-11-07 10:32:45 +01:00
Raoul Snyman	435a299b19	First (failed) stab at using threads correctly.	2014-11-06 23:08:56 +02:00
Tomas Groth	f685572da2	Improved FTW handling of connection issues	2014-11-06 14:19:00 +01:00
Tomas Groth	bc8afc9e4f	Update thememanager widget after theme import	2014-11-06 14:16:14 +01:00
Tomas Groth	ff4ddefa77	pep8 fix	2014-11-06 10:42:54 +01:00
Phill Ridout	f160607e17	Renamed some methods	2014-11-02 19:57:06 +00:00
Phill Ridout	9c6e007ed3	Applied changes as superfly suggested	2014-11-02 19:32:40 +00:00
Phill Ridout	b119cc40be	HEAD 2.1.1 release	2014-11-02 17:19:27 +00:00
Phill Ridout	b682117f92	Completed tests for ColorButton	2014-11-02 16:50:18 +00:00
Tim Bentley	616565fe19	Head	2014-11-01 11:12:27 +00:00
Raoul Snyman	b692e11d82	Filter out ampersands and angle brackets ... bzr-revno: 2437	2014-11-01 11:11:48 +00:00
Tomas Groth	146a505ee6	#1387286, playing audio CD clips on windows. ... #1247025, Position fix for d'n'd to servicelist, copied from lp:~oliwee/openlp/bug-1247025. Fix traceback on theme import in windows. bzr-revno: 2436	2014-11-01 11:09:10 +00:00
Raoul Snyman	39fa2641af	Fixed up an import statement	2014-11-01 12:38:33 +02:00
Raoul Snyman	9f1638959e	Fix some more instances of button text	2014-11-01 12:35:54 +02:00
Tim Bentley	ee4bd0f521	head	2014-11-01 07:47:43 +00:00
Tim Bentley	837013763a	fix focus	2014-11-01 07:47:26 +00:00
Tomas Groth	6500a4b813	Fix for bug #1387286, playing audio CD clips on windows ... Fixes: https://launchpad.net/bugs/1387286	2014-10-31 22:44:22 +00:00
Raoul Snyman	ee7fb49e49	Fix some linting issues	2014-10-31 22:12:06 +02:00
Raoul Snyman	6a67a77240	Fix bug #1387309: Filter out ampersands and angle brackets	2014-10-31 21:47:36 +02:00
Tomas Groth	74b582032f	Fix theme import in windows. Test included.	2014-10-31 13:01:07 +01:00
Raoul Snyman	69873c0db3	Two fixes: ... - Fix bug #1386896 by catching the OSError on Mac OS X and just ignoring it - Found a potential bug where the settings form was canceled, with one or more inactive plugins - Wrote a test for the above settings form bug Fixes: https://launchpad.net/bugs/1386896	2014-10-31 00:53:06 +02:00
Tomas Groth	f05a4344af	trunk	2014-10-29 21:13:29 +00:00
Tomas Groth	036ed94c68	Position fix for d'n'd to servicelist, copied from lp:~oliwee/openlp/bug-1247025 ... Fixes: https://launchpad.net/bugs/1247025	2014-10-29 21:04:17 +00:00
Phill Ridout	3685948ed5	HEAD	2014-10-29 19:11:43 +00:00
Ken Roberts	ddd94ba061	Upstream merges	2014-10-28 13:48:20 -07:00
Ken Roberts	6ae179d672	Upstream merges	2014-10-28 13:45:53 -07:00
Raoul Snyman	00455847a7	HEAD	2014-10-28 22:27:09 +02:00
Raoul Snyman	743dc59d51	[fix 1386710] Fix traceback after settings form is saved ... Fixes: https://launchpad.net/bugs/1386710	2014-10-28 21:40:01 +02:00
Raoul Snyman	ae7c863333	[fix 1385979] Check if the item is valid first	2014-10-28 21:02:06 +02:00
Tomas Groth	c19613ce82	Various small bugfixes: ... - Fixes adding of images and media to the media manager. Copied from lp:~rafaellerm/openlp/media_import_fix - Fix for another occurrence of bug #1296574. Copied from lp:~erik-lundin/openlp/bug-1296574 - Fixed a tiny glitch, remove author button became always disabled even if not needed to. Copied from lp:~mahfiaz/openlp/author-delete-button-not-active-in-edit-dialog - Remove prints in http_router - Change filename encoding in PptviewDocument to only apply to local variable, to avoid backtrace. bzr-revno: 2431 Fixes: https://launchpad.net/bugs/1296574	2014-10-28 20:36:54 +02:00
Tim Bentley	afde4a25ad	Fix missing dummy values for debug	2014-10-27 20:22:57 +00:00
Tomas Groth	e9a151cec0	This fixes the adding of images and media to the media manager. Copied from lp:~rafaellerm/openlp/media_import_fix	2014-10-27 14:14:12 +01:00
Tomas Groth	d2f388bb59	Fix for another occurrence of bug #1296574. Copied from lp:~erik-lundin/openlp/bug-1296574 ... Fixes: https://launchpad.net/bugs/1296574	2014-10-27 14:11:55 +01:00
Phill Ridout	80cdb84e4a	HEAD	2014-10-26 07:51:17 +00:00
Phill Ridout	d2b6d2126e	Add copyright and doc stying	2014-10-26 07:50:49 +00:00
Raoul Snyman	b34da371ba	[fix #1385438] Make list widget items select tab pages via user data rather than just their position. ... Fixes: https://launchpad.net/bugs/1385438	2014-10-25 22:26:19 +02:00
Phill Ridout	04c6e27ac5	PEP Fixes	2014-10-24 22:03:49 +01:00
Phill Ridout	8696482f39	Few tweeks, and comments	2014-10-24 21:46:14 +01:00
Phill Ridout	2f9df8cfbd	HEAD	2014-10-24 21:12:48 +01:00
Ken Roberts	f81903bbcf	Merge upstream	2014-10-23 15:16:38 -07:00
Ken Roberts	3cf8c0464c	Fix discard/reset button calls - added button tooltips	2014-10-23 14:00:06 -07:00
Phill Ridout	c9cede9650	Implemented custom widget ColorButton OpenLP wide	2014-10-23 21:56:09 +01:00
Phill Ridout	a4f788599f	add custom colorbutton widget	2014-10-23 20:50:01 +01:00
Ken Roberts	c7d36826aa	Add 1.5 second delay for autoloading projectors	2014-10-22 19:40:22 -07:00
Ken Roberts	0264d57b61	Add input source edit text option	2014-10-22 19:21:26 -07:00
Raoul Snyman	108e3b6687	Forgot to catch the cancel_wizard_text refactor	2014-10-22 23:01:40 +02:00
Raoul Snyman	3771cb42a8	HEAD	2014-10-22 22:47:47 +02:00
Raoul Snyman	551a10d311	Added and updated tests: ... - Refactored FirstTimeForm to use an initalise() method, in order to be more testable - Rewrote FTW tests to test initialise() - Refactored TestMixin get_application() to setup_application() since it doesn't actually return an application object - Refactored ListPreviewWidget to make it more testable - Wrote tests for ListPreviewWidget - Refactored FormattingTagsForm somewhat - Updated FormattingTagsForm tests Updated setup.py with some Python3 changes.	2014-10-22 22:43:05 +02:00
Ken Roberts	d08594ab55	Upstream changes	2014-10-21 18:27:01 -07:00
Ken Roberts	6391b17b6d	Fix focus to ip text widget when calling projetor edit	2014-10-21 17:49:21 -07:00
Ken Roberts	2e6556a11b	Fix call to get_source_list in pjlink1	2014-10-21 17:02:37 -07:00
Ken Roberts	416c37140c	Fix single dialog get_source_list() call	2014-10-21 16:51:51 -07:00
Ken Roberts	5ae48da58e	Fix missing poll check	2014-10-21 16:45:15 -07:00
Ken Roberts	04ad28c106	Fixed typos in ProjectorSource	2014-10-21 15:47:25 -07:00
Ken Roberts	2b5b58379f	Code cleanups	2014-10-21 14:50:35 -07:00
Ken Roberts	b38921a90b	Code cleanups	2014-10-21 14:40:47 -07:00
Ken Roberts	a026633f78	Notes cleanups	2014-10-21 14:24:16 -07:00
Tomas Groth	5662f4b2af	Ask the user if a backup of the data folder should be created after upgrading ... bzr-revno: 2427	2014-10-21 22:08:26 +01:00
Tomas Groth	5ecbfa61fd	Fix tests so they can run individually. ... Fix for importing custom tags from openlyricsxml. Fixed console popping up on windows when running mudraw.exe. Added oxps as supported presentation filetype (by mudraw). bzr-revno: 2425	2014-10-21 22:06:02 +01:00
Ken Roberts	0fe5b9f8fe	Typo in column define	2014-10-21 13:11:25 -07:00
Ken Roberts	a8cebffec0	cleanups	2014-10-21 13:05:35 -07:00
Tim Bentley	2b3e3d777e	Add Test and fix more code	2014-10-21 21:05:08 +01:00
Ken Roberts	598f94f5c1	Add ProjectorSource schema for user-defined source display text	2014-10-21 13:03:58 -07:00
Ken Roberts	21f6216574	Switch PJLINK_DEFAULT_TEXT to dict	2014-10-21 13:01:07 -07:00
Tim Bentley	f5f8c1ce08	Fix start up thread timer	2014-10-21 06:13:22 +01:00
Ken Roberts	3def1baf9d	pep8	2014-10-20 16:36:07 -07:00
Ken Roberts	8bb9510622	Fix tab text on mac	2014-10-20 16:25:27 -07:00
Ken Roberts	16f4fcbce3	Update settings to allow selecting source dialog layout	2014-10-20 16:17:15 -07:00
Ken Roberts	4283ff7502	Add tiled icons on toolbar for muliple-selection	2014-10-20 11:37:59 -07:00
Ken Roberts	8d4eb3b368	Fix icon for source input menu item	2014-10-20 10:07:53 -07:00
Ken Roberts	1e2cfcd7bd	pep8	2014-10-20 09:50:19 -07:00
Ken Roberts	6a2f675e84	Realign tabs to left-right	2014-10-20 09:34:33 -07:00
Ken Roberts	c028353ecd	Fix docstrings	2014-10-19 17:43:40 -07:00
Ken Roberts	3cb21e4c13	Set tab focus to tab with selected source	2014-10-19 17:31:09 -07:00
Ken Roberts	7fb3ca8c17	Fix misplace tabwidget addWidget	2014-10-19 17:11:06 -07:00
Ken Roberts	c42af376cc	Fix tabbed source select gui size	2014-10-19 16:55:19 -07:00
Ken Roberts	4b64e24e36	Initial change to tabs for source select	2014-10-19 12:20:51 -07:00
Ken Roberts	10c415cf1a	Docstrings cleanup	2014-10-17 10:28:12 -07:00
Ken Roberts	d8f94ac3df	Remove extraneous imports	2014-10-17 08:23:45 -07:00
Ken Roberts	81f26dd9a3	pep8 and extra logging info	2014-10-16 20:09:42 -07:00
Ken Roberts	dfcbaa8c28	Add socket timer for lost connections	2014-10-16 19:28:51 -07:00
Ken Roberts	c1415bb891	Fix authentication send, added current source to source select dialog	2014-10-16 17:04:19 -07:00
Ken Roberts	054be0135a	Add check for connect before calling connect on doubleclick	2014-10-16 14:21:01 -07:00
Ken Roberts	187dee6217	Add double-click to connect option	2014-10-16 14:11:43 -07:00
Ken Roberts	0ec753468c	projector view info icon update	2014-10-16 14:01:37 -07:00
Ken Roberts	6264435acb	Fix view status icon on toolbar	2014-10-16 13:48:41 -07:00
Ken Roberts	99c7566f98	Update source selection as soon as power is on	2014-10-16 13:33:29 -07:00
Ken Roberts	77040050f4	Restructure send_busy flag	2014-10-16 13:03:20 -07:00
Ken Roberts	4714cbfcf7	pep8	2014-10-16 11:30:29 -07:00
Ken Roberts	ec59abdc85	pep8	2014-10-16 11:16:08 -07:00
Ken Roberts	645f92e7d4	Change projector wizard to basic edit form	2014-10-16 11:08:44 -07:00
Ken Roberts	f60f8d211b	Fix source select when sources not known yet	2014-10-15 13:53:17 -07:00
Ken Roberts	e4926416f8	Fix unlock send queue	2014-10-15 13:27:43 -07:00
Ken Roberts	c064a17ece	Add toolbar separator	2014-10-15 11:45:41 -07:00
Ken Roberts	5879209627	Fix toolbar icon status on socket error	2014-10-15 11:41:12 -07:00
Ken Roberts	dc321155a0	Fix localhost connection	2014-10-15 11:18:00 -07:00
Ken Roberts	8ea0917230	pep8	2014-10-15 10:38:39 -07:00
Ken Roberts	f468fbb47d	Fix bad data in process command	2014-10-15 10:34:27 -07:00
Ken Roberts	650c5007b2	Add poll_loop after send command	2014-10-15 10:29:15 -07:00
Ken Roberts	2e3391eff4	Remove blocking calls on sockets	2014-10-15 10:22:12 -07:00
Ken Roberts	4d127cd6fa	Fix icon update only when status changes	2014-10-14 20:34:06 -07:00
Ken Roberts	e3439172f8	Toolbar icon enable/disable on power on/off based on projector state	2014-10-14 19:57:58 -07:00
Ken Roberts	fb51f505d5	Extra poll after command returned OK	2014-10-14 19:57:13 -07:00
Ken Roberts	03a31f9bc9	Remove extra spacers in toolbar	2014-10-14 19:30:38 -07:00
Ken Roberts	ef5b597a8b	Fix missing information from view item	2014-10-14 19:18:40 -07:00
Ken Roberts	cf7756d6c7	Fix packet length check for valid command with empty data	2014-10-14 19:18:00 -07:00
Ken Roberts	7931c97698	Toolbar icons/change source icon	2014-10-14 18:40:21 -07:00
Ken Roberts	6e96851e2e	Fix toolbar icons disabled state	2014-10-14 11:59:57 -07:00
Ken Roberts	ad6a8ec5ce	Test cleanups and fix network error icons	2014-10-14 10:40:07 -07:00
Ken Roberts	cc43efa809	Toolbar change based on selected projector items	2014-10-14 10:12:49 -07:00
Ken Roberts	5f232ce5fd	Fix wrong status on sending data	2014-10-14 08:14:16 -07:00
Tomas Groth	cbd1b7c223	Changed setting version name	2014-10-14 09:52:59 +02:00
Ken Roberts	e5743462e2	Added default socket timeout/poll time in settings	2014-10-13 17:07:54 -07:00
Ken Roberts	39e574dba7	Change timer setting based on initial connect/poll	2014-10-13 13:58:39 -07:00
Ken Roberts	713a255241	Fix authentication errors	2014-10-13 13:16:25 -07:00
Ken Roberts	5938ccc9a6	added get_projector_by_id	2014-10-13 13:16:03 -07:00
Tomas Groth	f36c8660ab	Changed a variable name	2014-10-13 20:24:19 +01:00
Ken Roberts	5a1aa5c88c	pep8	2014-10-13 10:09:23 -07:00
Ken Roberts	e7e53501df	Fix authentication error processing	2014-10-13 09:40:58 -07:00
Ken Roberts	498ecb5b6a	increase pin length to allow test pin	2014-10-13 08:11:55 -07:00
Ken Roberts	72cca86208	Refactor pjlink/remove db id in view projector/add pjlink command to constants	2014-10-13 07:51:23 -07:00
Tomas Groth	5091b3de37	Added a test	2014-10-13 16:08:06 +02:00
Tomas Groth	e1fde7f6a5	Ask the user if a backup of the data folder should be created after upgrading	2014-10-13 12:26:23 +02:00
Ken Roberts	26db1f16ad	pep8	2014-10-10 12:14:15 -07:00
Ken Roberts	89800c1a7d	Relocate second toolbar to top	2014-10-10 10:29:52 -07:00
Ken Roberts	a58cf9754b	Merge new toolbar	2014-10-10 10:07:31 -07:00
Ken Roberts	91ab6a64bf	Tiled icons for toolbar	2014-10-10 09:54:35 -07:00
Ken Roberts	fcd14a12cd	tranlate strings and cleanups	2014-10-10 08:58:48 -07:00
Ken Roberts	5da20ec01d	pep8 cleanups	2014-10-09 20:31:51 -07:00
Ken Roberts	cbb995c4c6	More single character cleanups	2014-10-09 20:28:24 -07:00
Ken Roberts	d6bb5aad52	More single character cleanups	2014-10-09 20:16:46 -07:00
Jonathan Springer	859ae13eb3	More work for top and bottom toolbars for the projector manager	2014-10-09 22:49:18 -04:00
Jonathan Springer	857a1d06f6	Intial changes for multiple toolbars for projector manager	2014-10-09 22:08:59 -04:00
Ken Roberts	c0169bb762	Test for MacOSX for wizard buttons	2014-10-09 15:12:08 -07:00
Ken Roberts	66a674c8de	more wizard text updates	2014-10-09 15:00:29 -07:00
Ken Roberts	303eabdfa6	Wizard text updates	2014-10-09 14:46:05 -07:00
Ken Roberts	b8f84f79eb	Fix previous reviews	2014-10-09 13:30:07 -07:00
Ken Roberts	842898aaf9	Remove extraneous imports	2014-10-09 07:41:32 -07:00
Ken Roberts	6c4b8e5b91	Revert multiselection	2014-10-08 19:05:53 -07:00
Ken Roberts	0feca36ede	Add multi-selection to projector item widgets	2014-10-08 18:56:45 -07:00
Ken Roberts	853826a501	Icon/tranlate fixes	2014-10-08 18:43:34 -07:00
Ken Roberts	d4b6c067ef	Fix issue with source select being None	2014-10-08 15:36:23 -07:00
Ken Roberts	db2d2ca3b3	Missed import for is_macosx	2014-10-08 13:21:59 -07:00
Ken Roberts	1eee08ff6b	pep8 on wizard.py	2014-10-08 13:04:50 -07:00
Ken Roberts	06da940310	Update wizard setup for Mac OSX on wizard pages	2014-10-08 13:03:33 -07:00
Ken Roberts	6a75726eed	Update wizard setup for Mac OSX	2014-10-08 13:01:47 -07:00
Raoul Snyman	53905dec21	Fix up the look and feel of the wizards after I messed it up with my changes for OS X	2014-10-08 21:42:30 +02:00
Ken Roberts	c789d1c0ed	Missed db reference in edit page	2014-10-07 12:37:55 -07:00
Ken Roberts	0227e0a2bd	Initial projector code	2014-10-06 12:10:03 -07:00
Tomas Groth	71324fc932	Forward ported fix for bug1265368 ... Fixes: https://launchpad.net/bugs/1265368	2014-09-25 11:07:31 +02:00
Tomas Groth	31a868ca61	Moved thumbnail creation to httprouter.py	2014-09-23 22:45:42 +01:00
Tomas Groth	4bacaab205	trunk	2014-09-21 20:23:40 +01:00
Tomas Groth	15624e20ef	Fixed typo and removed unused import	2014-09-11 12:08:44 +02:00
Tomas Groth	5c4be05fc1	Went back to to the load-into-imagemanager-on-demand approach	2014-09-11 11:52:32 +02:00
Tomas Groth	cf351a7af9	Fix thumbnail creating	2014-09-10 22:30:32 +01:00
Tomas Groth	8d76aeffd2	Added thumbnails for images from serviceitems	2014-09-10 07:40:12 +01:00
Tomas Groth	dab4ad7080	trunk	2014-09-08 22:08:49 +01:00
Raoul Snyman	40edebdab0	Style fixes	2014-09-08 00:30:21 +02:00
Raoul Snyman	bf488da516	Added tests for with and without os x menu icon, renamed some tests to use our test name convention, fixed up and added more tests for the FormattingTagsForm.	2014-09-08 00:17:20 +02:00
Raoul Snyman	09be73cc26	HEAD	2014-09-05 22:15:44 +02:00
Raoul Snyman	1a573315db	Make tabbed docks look better by using document mode	2014-09-04 23:38:39 +02:00
Raoul Snyman	1f9c0a31f8	Made wizard image bigger, and made Theme wizard bigger	2014-09-04 22:25:23 +02:00
Raoul Snyman	496c12b2db	Reformatted a comment; Renamed NT to WIN; Made OpenLPMixin constructor slightly more robust.	2014-09-04 22:10:34 +02:00
Jonathan Springer	ceeb1b0118	Removed icons from menu items on Mac OS X	2014-09-04 20:27:21 +02:00
Raoul Snyman	cf8f15964c	Move to use the new is_macosx() method, and tweak the theme wizard a little more.	2014-09-02 23:15:58 +02:00
Raoul Snyman	184a397970	HEAD	2014-09-02 22:38:36 +02:00
Tomas Groth	df28a6799b	trunk	2014-09-02 21:17:56 +01:00
Tomas Groth	a2710553d9	Implemented a workaround for bug1251437 / http://bugs.python.org/issue22248 ... The problem is the urllib.request.urlopen cannot handle redirect urls with non-ascii chars, so I've added url-encoding of the redirect url. bzr-revno: 2416	2014-08-29 17:37:25 +01:00
Jonathan Springer	f3207dac8e	Consolidate platform specific checks into the common module	2014-08-27 19:18:06 -04:00
Tomas Groth	1adeb175ae	trunk	2014-08-27 10:44:04 +02:00
Tomas Groth	62811d660f	Implemented a workaround for bug1251437 ... Fixes: https://launchpad.net/bugs/1251437	2014-08-27 10:43:18 +02:00
Tomas Groth	36326085f8	trunk	2014-08-26 22:19:08 +01:00
Phill Ridout	0b93faf7b9	PEP fixes	2014-08-26 18:38:07 +01:00
Phill Ridout	34a1ab3b3e	HEAD	2014-08-26 17:51:52 +01:00
Tomas Groth	91f7b2d615	Added a few comments.	2014-08-25 21:52:12 +01:00
Tomas Groth	c50619212d	trunk	2014-08-25 21:34:54 +01:00
Tomas Groth	a48589752f	Moved thumbnail setting into the main settingstab.	2014-08-25 21:04:33 +01:00
Tim Bentley	565c2312d0	head	2014-08-24 10:37:49 +01:00
Tim Bentley	516fd30bc7	fix conversion bug	2014-08-23 21:42:10 +01:00
Raoul Snyman	948eecb6a0	HEAD	2014-08-23 00:13:02 +02:00
Raoul Snyman	8065649158	Make the wizards look right on OS X	2014-08-23 00:12:35 +02:00
Tomas Groth	3b092319c9	trunk	2014-08-21 11:24:40 +02:00
Tomas Groth	db477f8d9c	trunk	2014-08-04 18:12:03 +01:00
Stewart Becker	04bafa62fa	Added an option to wrap footer text ... bzr-revno: 2409	2014-08-04 06:06:34 +01:00
Samuel Mehrbrodt	16399e2ea5	This prevents updates from running (which should only run on outdated databases that existed before) ... bzr-revno: 2408	2014-08-04 06:02:58 +01:00
Samuel Mehrbrodt	933ec66efc	Fix theme export and add unit test. ... bzr-revno: 2406	2014-08-04 06:00:34 +01:00
Stewart Becker	d90fcface2	Style fixes for Tim	2014-07-24 20:28:57 +01:00
Stewart Becker	73ec92ae13	Added option to wrap footer text	2014-07-21 07:37:41 +01:00
Samuel Mehrbrodt	2613ad3076	Don't run upgrades on an up to date database	2014-07-17 23:04:58 +02:00
Tomas Groth	a0b7c72e09	Changed Image dimension-key into width and height + a bunch of small changes	2014-07-15 20:52:59 +02:00
Tomas Groth	00693b8cce	trunk	2014-07-15 15:41:34 +02:00
Samuel Mehrbrodt	6c40962afb	Allow editing of author types and fix bug in servicemanager ... bzr-revno: 2403	2014-07-14 17:25:59 +01:00
Tomas Groth	8fa23ac95d	Added support for showing thumbnails of images in webinterface	2014-07-14 14:41:27 +02:00
Tomas Groth	29f8eedeaf	Merged with trunk and reverted changes to the tag test	2014-07-14 09:19:47 +02:00
Tomas Groth	022ac9bfac	trunk	2014-07-14 09:08:41 +02:00
Raoul Snyman	f2d3bbee47	Added the name of the current item to the service controller, and added some more tests	2014-07-13 01:47:53 +02:00
Tomas Groth	542fe4e887	small changes	2014-07-11 23:45:01 +02:00
Tomas Groth	98a58d45bf	pep8 fixes	2014-07-11 15:35:44 +02:00
Tomas Groth	406cc506c1	Merged with trunk and fixed tests	2014-07-11 13:35:56 +02:00
Samuel Mehrbrodt	7f731146a3	Merge trunk	2014-07-09 14:47:29 +02:00
Tomas Groth	e0c8709ad1	trunk	2014-07-07 19:24:23 +02:00
Tim Bentley	2770c76895	Fix setup.py for python3 to remove binary strings. ... Fix desktop file Fix issue with Theme displaying on import, theme regeneration and FTW. Remove bogus test Add new tests for minin. bzr-revno: 2397	2014-07-07 17:07:04 +01:00
Samuel Mehrbrodt	b92ca3f209	Fix service up movement ... Fixes: https://launchpad.net/bugs/1338316	2014-07-07 13:17:24 +02:00
Tomas Groth	33e104d57d	Tried to fix some linux vs windows issues. Also added a test.	2014-07-04 10:45:17 +02:00
Tomas Groth	d402bf86cb	trunk	2014-07-02 22:48:56 +02:00
Tim Bentley	f649f0af3c	Fix initialisation	2014-07-02 19:13:23 +01:00
Tim Bentley	7d2f8fa6cd	Fix setup.py	2014-07-01 22:10:26 +01:00
Tomas Groth	3c91a6bbfd	Fixed seeking when playing mediaclip	2014-07-01 22:06:55 +02:00
Phill Ridout	9b6979b840	Changed log.warn to log.warning	2014-06-30 21:59:22 +01:00
Samuel Mehrbrodt	af6537116c	Close file also on success	2014-06-30 14:36:35 +02:00
Samuel Mehrbrodt	9702870afa	Close and delete zip in case of exception	2014-06-30 09:30:19 +02:00
Tomas Groth	e773d82341	Updated VLC bindings to latest build	2014-06-26 09:41:22 +02:00
Tomas Groth	248e703345	Fixed loading of libvlc.dll on windows	2014-06-24 19:46:23 +02:00
Samuel Mehrbrodt	39fbbf779d	Move this line out of try/catch block	2014-06-23 15:54:13 +02:00
Samuel Mehrbrodt	aa0e1ca107	Add test	2014-06-23 15:51:56 +02:00
Samuel Mehrbrodt	e174365051	Fix theme export ... Fixes: https://launchpad.net/bugs/1332990	2014-06-23 13:38:17 +02:00
Tomas Groth	956af8706b	Small suggested changes	2014-06-17 09:27:12 +02:00
Tomas Groth	44eccb8360	trunk	2014-06-16 09:01:12 +02:00
Tomas Groth	7a47e5cb67	fixed bug #719514 ' Themes: <file> and <otherfile> are the same file' ... Fixes: https://launchpad.net/bugs/719514	2014-06-15 22:35:31 +02:00
Tomas Groth	2a1a93d319	Made it possible to name optical clips, and fixed some issues.	2014-06-14 23:48:07 +02:00
Samuel Mehrbrodt	340857cecc	Detect languages in source code folder when running from source ... bzr-revno: 2393	2014-06-11 06:09:38 +01:00
Samuel Mehrbrodt	e424c33283	This has been removed in trunk	2014-06-09 10:59:52 +02:00
Tomas Groth	d832933110	Small fix for locating mudraw on windows and mac. ... Enabled presentation plugin on mac and adjusted test accordingly. bzr-revno: 2390	2014-06-08 21:25:32 +01:00
Tim Bentley	8d67406728	Fix a validation bug with presentations being loaded from services ... Fix range bug stopping service items being triggered unless it was the first! bzr-revno: 2389	2014-06-08 18:55:06 +01:00
Samuel Mehrbrodt	5c90d7847e	Merge trunk	2014-06-08 16:25:48 +02:00
Samuel Mehrbrodt	007e18945e	Various string fixes and other tidying up ... - Fix some string errors - remove unused variable - Fix method name - Add setup.cfg with config for pep8 (pep8 reads this file) - Fixed errors in translation utils bzr-revno: 2388	2014-06-08 16:12:23 +02:00
Tim Bentley	f23e603314	Fix up interface better	2014-06-05 17:25:37 +01:00
Stewart Becker	ed295d38dd	Fixed a typo: load_Last_file -> load_last_file ... Added tests for OpenSongImport and fixed some PEP8 issues. bzr-revno: 2387	2014-06-04 05:54:44 +01:00
Samuel Mehrbrodt	a6a43264da	Merge trunk	2014-06-03 21:23:21 +02:00
Tim Bentley	a912db6abf	new bug	2014-06-01 18:12:00 +01:00
Tim Bentley	82f97ee736	Fix suffix error in presentation	2014-05-31 21:00:10 +01:00
Tomas Groth	13cc26f26a	Support for importing Zefania bible XML format ... bzr-revno: 2385	2014-05-31 07:26:25 +01:00
Samuel Mehrbrodt	50c2c9bc0e	Fix bug 1316979 by changing the 'authors' relation to readonly. ... bzr-revno: 2384	2014-05-31 07:17:52 +01:00
Tomas Groth	d424270b7f	Fixed locating mudraw on windows and mac, and enabled presentationplugin on mac.	2014-05-30 11:21:26 +02:00
Samuel Mehrbrodt	56ebf2de00	Revert change in check for language dir	2014-05-28 19:17:26 +02:00
Tomas Groth	06825e4aeb	Added support for audio cds and udisks2	2014-05-23 15:39:25 +02:00
Samuel Mehrbrodt	e70a09c93e	Detect language folder in source directory	2014-05-22 15:40:05 +02:00
Samuel Mehrbrodt	49a48c6463	more string fixes	2014-05-21 19:20:44 +02:00
Tomas Groth	d9c6e2a228	trunk	2014-05-21 17:56:57 +02:00
Samuel Mehrbrodt	d10507e250	Small string fixes	2014-05-21 16:47:44 +02:00
Tomas Groth	7ed56225f2	trunk	2014-05-21 11:31:47 +02:00
Samuel Mehrbrodt	de8074b00a	Improve single click behavior (remove flickering)	2014-05-19 21:19:05 +02:00
Jonathan Springer	6d277ef78d	Merge trunk	2014-05-07 19:52:51 -04:00
Jonathan Springer	60fa4c2dca	Make vlcplayer stop call asynchronous to aviod a deadlock with the UI thread	2014-05-07 18:52:06 -04:00
Samuel Mehrbrodt	f3a86d87d4	Merge trunk	2014-05-07 22:30:52 +02:00
Samuel Mehrbrodt	3d1cb3f383	Add test	2014-05-07 13:00:34 +02:00
Tomas Groth	0d48c09180	Added support for import of Zefania XML bibles.	2014-05-06 21:53:08 +02:00
Samuel Mehrbrodt	a6a08bcfdd	Fix bug 1157938 ... Fixes: https://launchpad.net/bugs/1157938	2014-05-03 17:01:43 +02:00
Andreas Preikschat	deff310f53	removed u'	2014-05-02 08:42:17 +02:00
Andreas Preikschat	4231692ae1	removed print	2014-05-02 08:34:57 +02:00
Andreas Preikschat	8fb086134e	dead code, not used variables, docs, unused imports	2014-05-01 19:49:43 +02:00
Andreas Preikschat	2ba7fa4f44	head	2014-05-01 18:58:32 +02:00
Andreas Preikschat	3f75a913e2	removed not working tests	2014-05-01 18:57:45 +02:00
Stewart Becker	a56f00ddc0	Merge from parent	2014-04-30 21:40:33 +01:00
Andreas Preikschat	0160c583e9	Fix Renderer broken when two option breaks next to each other ... bzr-revno: 2374	2014-04-29 17:57:07 +01:00
Andreas Preikschat	ff1bc31bfc	- Fixed bug #1240037 ... - Fixed a few bugs in the CategoryActionList class (recursion, ...) - Removed depreciated has_key() method. - Changed behaviour of the remove() method to match the behaviour of the list.remove() method - refactored defaultShortcuts to default_shortcuts bzr-revno: 2373	2014-04-29 17:55:30 +01:00
Andreas Preikschat	b73d8b088c	head	2014-04-29 13:04:32 +02:00
Andreas Preikschat	282ed7e1a6	fixed u'	2014-04-29 13:04:19 +02:00
Andreas Preikschat	88a3ac6216	match list behaviour	2014-04-26 19:40:26 +02:00
Andreas Preikschat	3f1e7f1912	fixes	2014-04-26 19:36:47 +02:00
Andreas Preikschat	911864a442	removed useless code	2014-04-26 19:31:59 +02:00
Andreas Preikschat	66c1f7c5da	renamed variable and parameter	2014-04-26 11:35:50 +02:00
Andreas Preikschat	6bdadff334	raise exception when item not in list	2014-04-26 11:01:12 +02:00
Andreas Preikschat	aa899bfde0	fixes	2014-04-26 10:53:36 +02:00
Samuel Mehrbrodt	20f748d608	Allow authors to be tagged by their type (words music etc) ... bzr-revno: 2371	2014-04-26 09:42:26 +01:00
Tim Bentley	9e8f0d82de	Add icons to see the state of the remote (on / SSL / authentication) ... Stop restarting the server as this crashes it and should not be common. bzr-revno: 2370	2014-04-26 09:38:44 +01:00
Andreas Preikschat	5a2793bc50	head	2014-04-26 10:19:12 +02:00
Tomas Groth	bc29a01eb5	head	2014-04-23 21:30:12 +02:00
Stewart Becker	6d63a008f0	Merged in from trunk	2014-04-22 22:46:21 +01:00
Tomas Groth	817fe854e4	PEP8 fixes	2014-04-22 22:42:07 +02:00
Tomas Groth	074ab4b1bb	Head	2014-04-22 22:18:58 +02:00
Andreas Preikschat	5a3aecf997	fixed bugs in class	2014-04-22 17:06:21 +02:00
Andreas Preikschat	70bce87434	head	2014-04-22 12:30:43 +02:00
Andreas Preikschat	6c08a80bfd	added test; refactor	2014-04-22 12:29:15 +02:00
Jonathan Springer	05171453ea	merge trunk	2014-04-21 10:46:54 -04:00
Samuel Mehrbrodt	031868ae31	trunk	2014-04-21 11:49:17 +02:00
Raoul Snyman	dee8ed2850	Fix an exception raised when loading media players if the configuration is blank	2014-04-21 00:23:26 +02:00
Tim Bentley	ce55fd1d57	fixes	2014-04-20 21:16:08 +01:00
Andreas Preikschat	cf798e73d5	removed not needed code	2014-04-20 18:02:50 +02:00
Andreas Preikschat	df800850e1	fixed bug 1240037 (Error occured when moving directory) ... Fixes: https://launchpad.net/bugs/1240037	2014-04-20 18:00:24 +02:00
Tomas Groth	a999e59a4f	Fixes for merge	2014-04-20 16:36:56 +02:00
Tomas Groth	f6231e024a	Head	2014-04-20 15:57:12 +02:00
Andreas Preikschat	51c14bdf51	fixed bug 1296104 ... Fixes: https://launchpad.net/bugs/1296104	2014-04-20 15:24:18 +02:00
Andreas Preikschat	cec47fc950	fixed bug 1146964 ... Fixes: https://launchpad.net/bugs/1146964	2014-04-20 14:06:02 +02:00
Stewart Becker	d62b92718d	Fixed typo	2014-04-19 22:57:49 +01:00
Jonathan Springer	e86539888d	Fix typo	2014-04-17 20:09:31 -04:00
Jonathan Springer	ef5b1cf4ac	Revert PEP8 clean ups as they were already done in a different branch	2014-04-16 17:19:22 -04:00
Jonathan Springer	85fc53954d	More PEP8 fixes	2014-04-16 16:49:24 -04:00
Jonathan Springer	aa6b756956	Change how we define which menu items are included in the main menu on Mac OS X	2014-04-16 16:26:49 -04:00
Jonathan Springer	ebc4476fdd	Fixes first time wizard to use url and paths in web config file ... Fixes PEP8 error in servicemanager Add tests for first time form bzr-revno: 2364	2014-04-16 05:49:45 +01:00
Samuel Mehrbrodt	c20939215a	PDF Fixes ... - Changed some types to float instead of int because the string conversion failed: int('1.1') doesnt work - Check if files exist before deleting them - Replace 'pass' with 'continue'. 'pass' is like return, it stops the whole method. bzr-revno: 2363	2014-04-16 05:47:04 +01:00
Samuel Mehrbrodt	49773de4f6	Fix transparent theme on OS X ... Got the branch from https://code.launchpad.net/~marmyshev/openlp/bug_1117098 and fixed the tests bzr-revno: 2362	2014-04-16 05:44:21 +01:00
Samuel Mehrbrodt	30ceaea2b2	Trunk	2014-04-15 23:11:06 +02:00
Samuel Mehrbrodt	e1a9a36ea3	Trunk	2014-04-15 22:53:47 +02:00
Jonathan Springer	c204967304	Fixes for PEP8	2014-04-15 14:42:08 -04:00
Samuel Mehrbrodt	71a972b711	Trunk	2014-04-15 10:41:13 +02:00
Samuel Mehrbrodt	4640b1b2d9	Trunk	2014-04-15 10:33:21 +02:00
Samuel Mehrbrodt	82dbb7d219	Trunk	2014-04-15 10:30:04 +02:00
Samuel Mehrbrodt	e7edaf170f	Merge trunk	2014-04-14 21:44:35 +02:00
Andreas Preikschat	a07a97f78b	strange pyqt fix	2014-04-14 21:07:01 +02:00
Andreas Preikschat	877fd135d3	head	2014-04-14 20:53:33 +02:00
Jonathan Springer	4a7b76e5ee	merge trunk	2014-04-14 14:31:30 -04:00
Raoul Snyman	ff5279d21c	Cleaned up the UI of the tabs on the "Library" toolbox. ... Added a test. Fixed up PEP8 so that code analysis passes. bzr-revno: 2354	2014-04-14 19:28:04 +01:00
Samuel Mehrbrodt	758a80a4aa	Trunk	2014-04-13 13:37:11 +02:00
Samuel Mehrbrodt	f3a8c45bd2	Merge trunk	2014-04-13 12:42:57 +02:00
Andreas Preikschat	49ff37c530	fixed long line; use generator	2014-04-13 09:54:34 +02:00
Jonathan Springer	99d0ed01ab	merge trunk	2014-04-12 17:31:38 -04:00
Dmitriy Marmyshev	3cf9094e5f	Added ability to rename items in ServiceManager. ... bzr-revno: 2352	2014-04-12 23:26:09 +02:00
Raoul Snyman	b9ba2c68a6	Fix up PEP8 issues.	2014-04-12 22:19:22 +02:00
Raoul Snyman	672eed037c	HEAD	2014-04-12 21:48:15 +02:00
Jonathan Springer	51e43a9a52	Fix getting urls for first time wirard from config file.	2014-04-12 14:21:15 -04:00
Jonathan Springer	4cb71cb5e3	Remove orphaned and unused registry execute, and fix two functions to register to the registry ... instead of executing. Modify loading file from the command line to only load files ending with osz, or oszl. Fix argument to pass correct type. bzr-revno: 2350	2014-04-12 16:40:07 +02:00
Andreas Preikschat	d16d8066ad	- updated vlc.py ... bzr-revno: 2349	2014-04-12 16:37:38 +02:00
Jonathan Springer	307f46921c	Merge trunk	2014-04-10 20:29:22 -04:00
Samuel Mehrbrodt	a82a13d2ed	Fixes for PDF DPI Detection	2014-04-09 12:48:12 +02:00
Samuel Mehrbrodt	1bf1e79e27	Merge trunk	2014-04-08 16:58:55 +02:00
Samuel Mehrbrodt	1759c72f36	Test	2014-04-08 16:08:07 +02:00
Samuel Mehrbrodt	ac05205a1e	Trunk	2014-04-08 15:46:08 +02:00
Samuel Mehrbrodt	b0d3b54f53	Trunk	2014-04-08 11:17:55 +02:00
Samuel Mehrbrodt	d1ab85d2fc	Trunk	2014-04-07 15:51:49 +02:00
Jonathan Springer	1945b4c380	Remove changes to platform specific code.	2014-04-06 22:07:19 -04:00
Jonathan Springer	e5d5af38c2	Move opening of files passed in via command line to function.	2014-04-06 22:03:05 -04:00
Raoul Snyman	4c3e2ac45c	Trying to fix pylint	2014-04-06 01:06:37 +02:00
Tomas Groth	bc2d45fc30	Head	2014-04-05 15:27:53 +02:00
Raoul Snyman	5b69472bc2	HEAD	2014-04-04 22:31:55 +02:00
Tim Bentley	576ab6e1f9	head	2014-04-04 21:20:00 +01:00
Jonathan Springer	bc55bcd7fa	Fix argurment to pass correct type.	2014-04-03 08:38:39 -04:00
Tim Bentley	806ce25296	head	2014-04-02 19:51:36 +01:00
Andreas Preikschat	2a9c85c2a2	fixed a spelling mistake ... bzr-revno: 2346	2014-04-02 19:51:06 +01:00
Samuel Mehrbrodt	eece90b2ec	Merge trunk	2014-04-02 09:04:27 +02:00
Samuel Mehrbrodt	adedb6eaeb	Fix setDefaults -> set_defaults	2014-04-02 09:04:12 +02:00
Raoul Snyman	73941ca56f	Renamed a test case and added a test for the trace_error_handler() method.	2014-04-02 01:49:58 +02:00
Raoul Snyman	ce9ca0b44b	Updated the look of the Library tabs	2014-04-02 01:29:23 +02:00
Samuel Mehrbrodt	d064549eab	Icon, indentation	2014-04-01 22:39:13 +02:00
Jonathan Springer	d26b34aee0	Modify loading file from the command line to only load files ending with osz, oszl, or otz.	2014-04-01 14:58:22 -04:00
Tim Bentley	3e7370c656	head	2014-04-01 18:33:13 +01:00
Tim Bentley	edd1ed849a	minor fixes	2014-04-01 18:32:19 +01:00
Jonathan Springer	6ca37531a0	Remove unnecessary platform specific code, remove orphaned and unused registry execute, and fix two functions to register to the registry instead of executing.	2014-04-01 13:07:25 -04:00
Andreas Preikschat	5bc5678078	- added a script to trigger jenkins ... bzr-revno: 2345	2014-03-31 22:05:42 +02:00
Samuel Mehrbrodt	81a8868a5a	Fix merge	2014-03-31 20:49:47 +02:00
Samuel Mehrbrodt	8b7bbb4761	Merge trunk	2014-03-31 20:48:10 +02:00
Andreas Preikschat	3db984a846	clean up: simplify code	2014-03-31 19:32:49 +02:00
Andreas Preikschat	5227924846	fix: removed stray print	2014-03-31 19:29:14 +02:00
Andreas Preikschat	c451a8eafa	added test	2014-03-31 19:01:09 +02:00
Andreas Preikschat	b69f480dc0	head	2014-03-31 14:19:33 +02:00
Andreas Preikschat	93ff301840	cleanup: remove local variable	2014-03-31 14:13:50 +02:00
Samuel Mehrbrodt	ad9717ea42	Add support for author types to OpenLyrics import and export	2014-03-30 23:42:46 +02:00
Samuel Mehrbrodt	69c32d91a4	Merge trunk	2014-03-30 19:13:26 +02:00
Tomas Groth	bfbfcd5b15	Head	2014-03-30 13:26:13 +02:00
Raoul Snyman	6ad3fca88e	Try to fix bug #1136278 by detecting if the upgrades have already run ... bzr-revno: 2343 Fixes: https://launchpad.net/bugs/1136278	2014-03-30 13:02:25 +02:00
Andreas Preikschat	7787e1a845	head	2014-03-28 21:38:38 +01:00
Samuel Mehrbrodt	71b34578d7	Add support for the Author type property	2014-03-28 17:06:16 +01:00
Tomas Groth	19558e7a03	head	2014-03-26 19:39:54 +01:00
Samuel Mehrbrodt	bf32fe164a	Test	2014-03-26 13:06:48 +01:00
Samuel Mehrbrodt	a4829c62ba	Add missing arguments for debug mode ... Fixes: https://launchpad.net/bugs/1296574	2014-03-26 12:26:16 +01:00
Andreas Preikschat	7a1825a79a	tests	2014-03-23 11:49:03 +01:00
Andreas Preikschat	47ad40aaac	removed white spaces	2014-03-22 20:19:08 +01:00
Andreas Preikschat	d5b421aa70	updated vlc.py	2014-03-22 20:18:27 +01:00
Andreas Preikschat	91adff326d	head	2014-03-22 20:18:04 +01:00
Andreas Preikschat	ad1970f27e	fixed spelling	2014-03-22 10:53:55 +01:00
Tomas Groth	852ec00fd7	Head	2014-03-20 21:11:18 +01:00
Tim Bentley	5d9533947d	Final set of PEP8 cleanups	2014-03-20 19:10:31 +00:00
Tomas Groth	6e46fd6a2a	Revert wrong changes to settings.py	2014-03-19 19:16:03 +01:00
Tomas Groth	991661b169	Head	2014-03-19 18:49:46 +01:00
Raoul Snyman	35e3564655	Tests!	2014-03-18 23:03:53 +02:00
Tim Bentley	30835067d3	fix trunk	2014-03-18 20:36:02 +00:00
Tomas Groth	258f1db411	Merged with head.	2014-03-18 20:40:09 +01:00
Tim Bentley	a3b1a599b2	fix bugs	2014-03-17 19:14:22 +00:00
Tim Bentley	9610be5cd0	Fix up comments	2014-03-17 19:05:55 +00:00
Tomas Groth	5b1c6d82c9	Head	2014-03-17 19:44:34 +01:00
Tim Bentley	6c80ba1c7d	Full migration	2014-03-17 07:29:29 +00:00
Tim Bentley	22e9d6d1a9	Head	2014-03-17 07:14:51 +00:00
Tim Bentley	0a2456fa19	Finish adding RegistryProperties	2014-03-16 21:25:23 +00:00
Tim Bentley	9cf3428542	Head	2014-03-15 06:25:35 +00:00
Tim Bentley	d2efa83e89	Head	2014-03-14 17:34:36 +00:00
Tim Bentley	68a020709a	head	2014-03-13 20:24:33 +00:00
Tim Bentley	ea99cbb08d	use decorator	2014-03-13 20:20:42 +00:00
Tim Bentley	5e6f97d74e	fix order and comment	2014-03-13 20:08:47 +00:00
Tomas Groth	ecc1ffbd4c	Fix tests. ... To avoid segfaults reuse QApplication instance. Also use ICU when getting locale sort key. bzr-revno: 2331	2014-03-13 00:07:23 +02:00
Tim Bentley	31ee1b43a6	first view	2014-03-12 17:41:52 +00:00
Tim Bentley	e78dac1edf	Head	2014-03-11 20:17:18 +00:00
Tomas Groth	5ac6f853d0	Changed get_locale_key to only use ICU if available.	2014-03-11 20:38:47 +01:00
Tim Bentley	a74567b9f6	Bible database tests	2014-03-11 19:01:09 +00:00
Raoul Snyman	b35de747ab	Move HistoryComboBox to openlp.core.common	2014-03-11 20:58:49 +02:00
Tomas Groth	b831ebd48e	Use ICU for locale sort key	2014-03-10 20:53:11 +01:00
Tomas Groth	3988aacfbd	Made it possible to save and load optical clip to servicefile. Also some pep8 and general cleanup.	2014-03-08 21:14:04 +00:00
Tomas Groth	e6f23324ba	Merged with trunk	2014-03-04 22:50:24 +00:00
Tomas Groth	67acb9d824	Implemented DVD clip selection and playback, still needs a lot of cleanups.	2014-03-04 22:33:50 +00:00
Raoul Snyman	c607661aee	HEAD	2014-03-04 23:51:54 +02:00
Tim Bentley	43f156d9fe	Update Songs forms	2014-03-04 18:49:30 +00:00
Raoul Snyman	831f2f3b69	HEAD	2014-02-27 23:39:44 +02:00
Tomas Groth	52a73f3475	merged with head	2014-02-25 21:11:48 +01:00
Tim Bentley	7f58348c8c	fix up pintservice form	2014-02-23 15:41:09 +00:00
Tim Bentley	3d556a9790	Head	2014-02-23 15:02:53 +00:00
Tomas Groth	e90f277bd6	merged with trunk	2014-02-21 22:48:25 +01:00
Philip Ridout	150ff4e980	HEAD	2014-02-11 20:29:57 +00:00
Rafael Lerm	83e20b79b6	Changed string that caused crash on startup. Corrected bug 1269929	2014-01-16 18:34:37 -02:00
Tim Bentley	bc3081fd18	Remove redundent method	2014-01-13 17:31:46 +00:00
Tim Bentley	ca47293345	Fix up help link	2014-01-13 17:29:31 +00:00
Tim Bentley	5d740a7706	Removep ... bzr commit -mRemovep	2014-01-11 22:05:38 +00:00
Tim Bentley	743ad7b44a	Clean up inits	2014-01-11 21:29:01 +00:00
Tim Bentley	7fe95731f9	Fix up Main display	2014-01-11 17:52:01 +00:00
Felipe Polo-Wood	d2782e099f	Merged with Tim's refactoring changes	2014-01-09 14:52:20 -05:00
Tim Bentley	3a5c15a29a	Migrate renderer - cleanup	2014-01-05 17:12:42 +00:00
Tim Bentley	360d9883b4	Migrate renderer	2014-01-05 17:09:51 +00:00
Tim Bentley	8038388110	head	2014-01-04 20:58:46 +00:00
Tim Bentley	60d4009261	start off	2014-01-04 20:58:18 +00:00
Tim Bentley	2dd4a9c542	Add config to service file	2014-01-04 16:33:20 +00:00
Tim Bentley	5eba575618	Add tests for new function	2014-01-04 11:50:27 +00:00
Tim Bentley	d8ec08e020	Cleaned up Theme and Service Managers Now working the same way. ... Fixed up tests for both classes PEP8 changes for Alerts and Custom + various other bits in passing. bzr-revno: 2323	2014-01-03 21:36:27 +00:00
Tim Bentley	db6ba7c780	fix alerts more	2014-01-01 09:57:06 +00:00
Tim Bentley	2755aad4c6	More PEP 8 changes	2014-01-01 09:33:07 +00:00
Raoul Snyman	1cf3140073	Reworked SongSelect branch after a major refactor in trunk. ... To recap: - Added a standalone CCLI SongSelect importer - Add icons to the import and export menu items - Move Theme import and export up with Settings	2014-01-01 00:27:27 +02:00
Tim Bentley	259b2b074f	Fix widget	2013-12-31 21:02:35 +00:00
Tim Bentley	51178b2ede	Fix tests	2013-12-31 20:29:03 +00:00
Tomas Groth	f5ace2c238	merged with trunk	2013-12-31 12:20:11 +00:00
Tomas Groth	3cc69cc9fd	Changed the way a serviceitem from the servicemanager is copied and converted. Also fixed for PEP8.	2013-12-31 12:15:18 +00:00
Tim Bentley	e49beeb2c4	More tests	2013-12-31 07:27:07 +00:00
Tim Bentley	c8a3b33044	Start to fix ServiceManager and extent tests	2013-12-30 19:50:34 +00:00
Felipe Polo-Wood	b495c47a5a	More styling issues	2013-12-30 13:19:50 -05:00
Andreas Preikschat	80c6c371df	FIX: renamed qt method ... bzr-revno: 2322	2013-12-30 12:13:40 +01:00
Felipe Polo-Wood	1a83a0a557	Merge head	2013-12-30 03:53:51 -05:00
Felipe Polo-Wood	b993b0d4a8	Style changes	2013-12-30 03:35:05 -05:00
Andreas Preikschat	8975fec06e	added comment	2013-12-29 21:18:22 +01:00
Tim Bentley	27d651a129	Fix comment	2013-12-29 20:13:58 +00:00
Andreas Preikschat	4c145071af	fixed method rename	2013-12-29 21:13:41 +01:00
Tim Bentley	f187d86d1e	Fix comment	2013-12-29 20:13:40 +00:00
Tim Bentley	8b109a8593	Fix comment	2013-12-29 20:09:41 +00:00
Tomas Groth	84334a039e	Merged with trunk.	2013-12-29 19:47:54 +00:00
Tim Bentley	e6bcf7d852	Head and fix confilcts	2013-12-28 21:33:38 +00:00
Felipe Polo-Wood	1ef910463c	Merge head	2013-12-28 12:06:29 -05:00
Tomas Groth	47ea300786	Merged with trunk	2013-12-27 17:47:40 +00:00
Tomas Groth	685258b744	Made presenting PDF from the servicemanager work	2013-12-27 17:44:12 +00:00
Tim Bentley	1d9ab33f9f	Fix array tag	2013-12-26 20:19:47 +00:00
Tim Bentley	55bb0cd80f	Theme wizard and fixes	2013-12-26 17:36:00 +00:00
Tim Bentley	35c5577cb7	More fixes	2013-12-26 08:56:53 +00:00
Tim Bentley	301eb06ce6	Redo ServiceManager	2013-12-24 21:24:52 +00:00
Tim Bentley	ccde045e60	More fixes	2013-12-24 20:45:29 +00:00
Tim Bentley	da08356f1c	yet more clean ups	2013-12-24 15:55:01 +00:00
Tim Bentley	508d050b4c	Head	2013-12-24 11:32:56 +00:00
Tim Bentley	80e818bd15	more cleanups	2013-12-24 11:32:38 +00:00
Tim Bentley	6d8b5cadb4	Lib cleanup and 2014	2013-12-24 08:56:50 +00:00
Tim Bentley	85da26684c	Mediamanager and DND classes	2013-12-24 07:19:57 +00:00
Tim Bentley	b2bee17211	Few minnor fixes	2013-12-24 06:15:41 +00:00
Tim Bentley	af006d087a	Mainwidow cleanup	2013-12-23 20:43:35 +00:00
Tim Bentley	49dab79ce9	ThemeManager conversion	2013-12-23 07:03:56 +00:00
Tim Bentley	a5ca17246f	Fix on_slide_select bugs	2013-12-21 08:46:30 +00:00
Raoul Snyman	3204a4db72	- Specify OpenLP as the user agent when querying SF.net ... - Fix another test - Update tests for get_web_page	2013-12-20 21:25:42 +02:00
Tim Bentley	d4ce5489ad	updates and fix up slidecontroller	2013-12-19 20:17:06 +00:00
Raoul Snyman	06d08f61a6	Fix bug #1211049: Add a list of valid user agents and a method to return an appropriate user agent for the current platform ... Fixes: https://launchpad.net/bugs/1211049	2013-12-18 23:44:00 +02:00
Tim Bentley	e9a7850bc8	Add registry mixin and code cleanups	2013-12-15 16:50:09 +00:00
Tim Bentley	e93b825ab4	Clean up PluginManager and complete logging	2013-12-14 08:12:41 +00:00
Tim Bentley	d684359e59	Clean up exceptions used in error	2013-12-13 19:44:17 +00:00
Tim Bentley	84e90e01d1	new files	2013-12-13 18:42:26 +00:00
Tim Bentley	cd9f9e4c8d	move registry to common	2013-12-13 17:44:05 +00:00
Jonathan Springer	79a2a5b1db	Merge trunk	2013-12-09 07:19:36 -05:00
Jonathan Springer	2a262e4ef6	pass all keyboard events to shortcut dialog	2013-12-08 21:05:52 -05:00
Tim Bentley	d0a9423982	Head	2013-12-06 19:00:55 +00:00
Felipe Polo-Wood	b85b09c92c	Merge back to trunk	2013-12-02 11:14:09 -05:00
Felipe Polo-Wood	04abbd97d0	implemented caching thru the ImageManager ... Styling issues Merge with fix-router changes	2013-11-22 13:21:07 -05:00
Philip Ridout	81c2f1a4b3	updated tests	2013-11-16 21:04:16 +00:00
Philip Ridout	c41842125d	HEAD	2013-11-16 20:32:50 +00:00
Philip Ridout	4c8f817269	HEAD	2013-11-16 10:07:38 +00:00
Arjan Schrijver	27395fcaf6	Rename 'Thurdsday' to 'Thursday' ... bzr-revno: 2310	2013-11-14 21:07:11 +02:00
Andreas Preikschat	1b89900336	head	2013-11-14 10:05:59 +01:00
Felipe Polo-Wood	6c3253c7c0	Added caching for thumbnail images	2013-11-07 15:13:15 -05:00
Philip Ridout	bb614d4af2	HEAD	2013-11-01 19:35:54 +00:00
Felipe Polo-Wood	1759468ea5	- Undid superfluous line formatting	2013-11-01 11:03:43 -04:00
Felipe Polo-Wood	fecd56106d	Removed extra line ... Made PowerpontController class compatible with Linux	2013-10-31 22:53:52 -04:00
Felipe Polo-Wood	e958e17889	- Added settings dialog at the client (with choice for thumbnail) ... - Fixed problem Presentations at remote getting out of sync	2013-10-31 16:54:38 -04:00
Raoul Snyman	d09747a33a	Fixed the problems with the exception form. Not sure how to test it though...	2013-10-30 22:34:23 +02:00
Felipe Polo-Wood	6d464dec4b	Added resizing capabilities to the thumbnails ... Fixed a problem with setting the presentation slides from the remote	2013-10-29 11:38:28 -04:00
Philip Ridout	a69b2d86ef	More uneeded str's	2013-10-28 21:23:17 +00:00
Felipe Polo-Wood	9a07d6887b	style fixes	2013-10-28 11:16:22 -04:00
Felipe Polo-Wood	1aae38cb8e	Merging	2013-10-27 23:40:38 -04:00
Felipe Polo-Wood	b9850e6e68	bunch of cosmetic changes	2013-10-27 22:33:28 -04:00
Arjan Schrijver	f838a49509	fixed bug #1245269 'Thursday is called Thurdsday' ... Fixes: https://launchpad.net/bugs/1245269	2013-10-27 21:19:19 +01:00
Dmitriy Marmyshev	70144c0da4	Trunk & fixes	2013-10-27 02:53:32 +04:00
Dmitriy Marmyshev	e657a99d0b	Trunk	2013-10-24 21:09:31 +04:00
Tim Bentley	63d65da6c1	Head	2013-10-23 20:26:03 +01:00
Tim Bentley	b1873016c9	Move and tests	2013-10-23 20:25:46 +01:00
Tim Bentley	1022661160	Theme cleanup start and major class restructure ... bzr-revno: 2307	2013-10-23 19:49:39 +01:00
Philip Ridout	051fa9db8f	Changed logging to UTF-8	2013-10-20 21:34:46 +01:00
Felipe Polo-Wood	dd1f556a8e	Fixed formatting issues ... Added three test classes for the presentation controllers Fixed issue that failed load for ImpressDocument	2013-10-19 19:15:46 -04:00
Felipe Polo-Wood	00fd7f01f7	-- General code cleanup to better match the architecture ... -- Added thumbnails to the remote display -- Modify the service list to use the displaytitle	2013-10-19 01:27:25 -04:00
Tim Bentley	ba0808f551	Fix up json	2013-10-18 19:10:47 +01:00
Felipe Polo-Wood	348ebee661	Read titles and notes from the presentation files and display them on the remote	2013-10-17 15:31:17 -04:00
Tim Bentley	0f183af84d	Missed file	2013-10-15 20:17:53 +01:00
Tim Bentley	b9e2a2cdc1	Missed imports	2013-10-13 22:07:28 +01:00
Tim Bentley	63685cb29e	Move Settings and translate	2013-10-13 21:36:42 +01:00
Tim Bentley	a82c64237c	Fix move of check_directory_exists	2013-10-13 18:23:52 +01:00
Tim Bentley	a013d17bdd	fix tests and add basic test	2013-10-13 18:02:12 +01:00
Tim Bentley	b860abb23b	fix fields	2013-10-13 16:52:04 +01:00
Tim Bentley	257fba8548	Start theme clean up	2013-10-13 14:51:13 +01:00
Andreas Preikschat	f0be2ecc17	head + conflict	2013-10-11 11:48:35 +02:00
Tim Bentley	bd7d412cc9	Head	2013-10-04 20:28:09 +01:00
Tim Bentley	2fe31991e2	Fixes	2013-10-04 20:27:53 +01:00
Raoul Snyman	1347ad61d1	Changed the way we create and initialise MediaManagerItems so that we can test things better.	2013-10-02 23:07:20 +02:00
Tim Bentley	c240068a6e	head	2013-09-28 21:55:42 +01:00
Tim Bentley	d630b1525c	fix reload	2013-09-28 21:55:25 +01:00
Tim Bentley	8f47af1732	Head	2013-09-26 22:06:57 +01:00
Dmitriy Marmyshev	1ff6f5fe20	Removes border, but not affects to OSX border and shadow	2013-09-18 10:48:25 +04:00
Dmitriy Marmyshev	3910a582c0	fixed replacing background with video unblank screen even if it blanked to theme. ... Fixes: https://launchpad.net/bugs/1225763	2013-09-18 08:50:07 +04:00
Dmitriy Marmyshev	5d648f80c6	fixed transparent display for OS X ... Fixes: https://launchpad.net/bugs/1117098	2013-09-17 20:23:45 +04:00
Philip Ridout	52781b9628	more Py3 fixes	2013-09-15 20:42:29 +01:00
Philip Ridout	9f5bd87a50	Py3 Fixes	2013-09-15 20:27:40 +01:00
Philip Ridout	a06469fea0	head	2013-09-15 19:36:58 +01:00
Tim Bentley	4d1ba13128	minor fixes	2013-09-15 07:37:43 +01:00
Tim Bentley	b868ecc57d	remove reminances of cherrypy	2013-09-14 20:16:14 +01:00
Tim Bentley	5295697677	fix error message	2013-09-11 20:00:30 +01:00
Andreas Preikschat	4999ecb6e6	last test	2013-09-11 16:22:28 +02:00
Andreas Preikschat	f24f3a751f	more tests	2013-09-11 15:51:49 +02:00
Andreas Preikschat	fea4893f40	removed pritn	2013-09-11 15:30:59 +02:00
Andreas Preikschat	0677e389c1	doc	2013-09-11 15:00:34 +02:00
Dmitriy Marmyshev	b1adce782e	Fixed unicode	2013-09-11 00:29:45 +04:00
Jeffrey S. Smith	334cef478d	Fix various tests and broken code revealed by tests	2013-09-09 16:10:40 -05:00
Tim Bentley	71f74a53c2	Rename class	2013-09-08 22:13:15 +01:00
Andreas Preikschat	3ab4eb36d0	head	2013-09-08 12:30:49 +02:00
Tim Bentley	ee6490dc23	Fix missing ()	2013-09-07 08:52:52 +01:00
Andreas Preikschat	ff27607f9b	head	2013-09-06 00:41:24 +02:00
Dmitriy Marmyshev	df56435f44	fixes	2013-09-05 11:23:59 +04:00
Dmitriy Marmyshev	473d10cf79	styling.	2013-09-04 09:40:20 +04:00
Dmitriy Marmyshev	44e5f5bf62	Trunk & fixes	2013-09-04 09:05:15 +04:00
Dmitriy Marmyshev	2900e756fd	fix	2013-09-04 07:51:53 +04:00
Tim Bentley	e98657d704	Fix up controller tests	2013-09-02 21:59:19 +01:00
Tim Bentley	8ab834c18e	Fix up save and load#	2013-09-01 21:43:22 +01:00
Tim Bentley	6c2c5e8e80	to python 3	2013-09-01 07:31:09 +01:00
Tim Bentley	6282b4fcb6	Tests and fixed	2013-09-01 07:21:29 +01:00
Tim Bentley	ede6adeb48	Tests added	2013-09-01 07:16:27 +01:00
Andreas Preikschat	3e1a863bae	2to3 and resources.py	2013-08-31 20:17:38 +02:00
Tim Bentley	e4ba5cb72a	add test files and ui validation sort of works	2013-08-31 18:20:43 +01:00
Andreas Preikschat	ccf5d6535b	head	2013-08-31 17:23:46 +02:00
Tim Bentley	7b82de9206	Head 2289	2013-08-31 12:43:21 +01:00
Tim Bentley	dceaaa6996	ore changes	2013-08-31 12:43:05 +01:00
Tim Bentley	aebe2d80df	Remove last traces of pickle and clean up the tests ... bzr-revno: 2289	2013-08-31 12:40:59 +01:00
Tim Bentley	b3ab68b0f5	Validation in progress	2013-08-31 09:52:44 +01:00
Tim Bentley	e1f153f4f4	Fix text	2013-08-29 17:40:07 +01:00
Tim Bentley	eb1703bcc9	fix up edit code	2013-08-26 09:11:20 +01:00
Tim Bentley	ba111776ed	Remove pickle from the code now 2.0.2 is in	2013-08-25 19:31:15 +01:00
Tim Bentley	676b9133d1	formatting tags	2013-08-25 14:29:00 +01:00
Philip Ridout	49c9663dcf	renamed var, removed some uneeded ()'s	2013-08-22 20:20:02 +00:00
Andreas Preikschat	9b0b88718d	head	2013-08-22 20:47:08 +02:00
Philip Ridout	2ceb165901	change string names	2013-08-22 05:33:19 +00:00
Samuel Mehrbrodt	74e2c1107c	Don't allow collapsing of the Live or Preview panes. They can still be hidden via the menu. ... bzr-revno: 2285	2013-08-16 22:45:26 +02:00
Philip Ridout	364fde73c5	Fix #120515 by reimplementing QFileDialog.getOpenFileNames	2013-08-13 19:02:04 +01:00
Andreas Preikschat	5e7bc82694	more constructors	2013-08-01 15:04:42 +02:00
Andreas Preikschat	b48fbd40a3	fixed formatting tags	2013-08-01 14:57:59 +02:00
Andreas Preikschat	4cb4a8f261	head	2013-07-31 19:36:06 +02:00
Tim Bentley	50b1ba437e	cherrypy changes	2013-07-27 12:30:38 +02:00
Philip Ridout	57cf6d5445	actually changed validation this time	2013-07-26 21:17:51 +01:00
Philip Ridout	3236af354c	fixed #1204629 and made the validation more robust by checking the open dialog	2013-07-25 21:11:57 +01:00
Andreas Preikschat	5ba72b4ad1	head + conflict	2013-07-21 22:34:51 +02:00
Tim Bentley	208e1c2e1e	Change uno import for exception form to remove excess uno import noise ... bzr-revno: 2282	2013-07-21 16:40:04 +01:00
Tim Bentley	72c83d444b	missing blank line	2013-07-21 15:13:44 +01:00
Tim Bentley	790c9ae4f6	Add doc string	2013-07-21 15:10:21 +01:00
Andreas Preikschat	3fef52348b	head	2013-07-20 11:38:24 +02:00
Tim Bentley	50f3b2b563	Fix uno import noise in python 3	2013-07-19 21:56:31 +01:00
Andreas Preikschat	d5b0f3ac9a	fixed version number	2013-07-19 18:07:33 +02:00
Tim Bentley	7d081b866a	head	2013-07-19 16:52:01 +01:00
Tim Bentley	dc7cb85574	Uneeded import	2013-07-19 16:51:47 +01:00
s.mehrbrodt@gmail.com	951d8964db	Don't allow to collapse the Live or Preview Pane. ... They can still be hidden via the menu.	2013-07-19 17:36:45 +02:00
Andreas Preikschat	a0f35e0d5e	fixed bug 1183078 ... Fixes: https://launchpad.net/bugs/1183078	2013-07-19 15:57:19 +02:00
Andreas Preikschat	e93a59e83a	spelling	2013-07-18 21:44:28 +02:00
Andreas Preikschat	cd91e4dcbf	changed constructor	2013-07-18 21:42:07 +02:00
Andreas Preikschat	7f541327ca	changed to 120 chars	2013-07-18 21:28:35 +02:00
Andreas Preikschat	60833923dc	changed super calls	2013-07-18 21:10:19 +02:00
Andreas Preikschat	25e7df079b	changed constructor	2013-07-18 21:04:38 +02:00
Tim Bentley	c6f29ca53d	fixed for fedora	2013-07-18 18:42:51 +02:00
Andreas Preikschat	025e031d76	updated constructor	2013-07-18 16:34:33 +02:00
Andreas Preikschat	5fb36b5ef7	updated constructor	2013-07-18 16:32:23 +02:00
Andreas Preikschat	1571cab0cf	changed constructors	2013-07-18 16:19:01 +02:00
Andreas Preikschat	13c9a69de1	changed constructors	2013-07-18 16:14:29 +02:00
Andreas Preikschat	3409c491fe	changed constructors	2013-07-18 16:11:39 +02:00
Andreas Preikschat	0e480e389b	changed constructor	2013-07-18 13:23:59 +02:00
Andreas Preikschat	542cdd78cb	changed constructor	2013-07-18 13:19:20 +02:00
Andreas Preikschat	e8e003d6f8	changed constructor	2013-07-18 13:17:40 +02:00
Andreas Preikschat	2c167ca996	changed constructor	2013-07-18 13:15:17 +02:00
Andreas Preikschat	b04d0f42cc	fixed image filter	2013-07-17 14:28:48 +02:00
Andreas Preikschat	8bec349273	fixed image filter	2013-07-17 14:22:21 +02:00
Andreas Preikschat	48d2956bdd	head	2013-07-17 14:21:44 +02:00
Andreas Preikschat	0512b74f32	reverted change	2013-07-15 20:06:45 +02:00
Andreas Preikschat	ad715fec29	try to use locale.strxfrm	2013-07-15 20:02:54 +02:00
Tim Bentley	94e8b90c5d	Added first test	2013-07-13 17:33:32 +01:00
Andreas Preikschat	a091fe9395	fixed service load	2013-07-12 21:35:30 +02:00
Andreas Preikschat	765a10d2ea	fixed service save	2013-07-12 21:32:46 +02:00
Andreas Preikschat	53b0825a18	fixed service save	2013-07-12 21:26:46 +02:00
Tim Bentley	38eec999b7	Head	2013-07-12 19:13:21 +01:00
Tim Bentley	6062605622	make sure we have the image file for theme backgrounds ... Fixes: https://launchpad.net/bugs/1197376	2013-07-11 21:58:15 +01:00
Tim Bentley	51ab25b716	Fix the constraints to be > 1 ... Fixes: https://launchpad.net/bugs/1196926	2013-07-11 21:54:30 +01:00
Andreas Preikschat	3a021b6804	Head	2013-07-09 21:47:12 +02:00
Dmitriy Marmyshev	25ed0ab4d7	small fixes	2013-07-09 01:26:31 +04:00
Tomas Groth	de0f5c912f	Use json as services format instead of python pickle. ... bzr-revno: 2275	2013-07-07 17:53:16 +02:00
Andreas Preikschat	3db606f653	theme import fixes	2013-07-07 16:47:04 +02:00
Andreas Preikschat	07039a4908	import clean up	2013-07-07 16:41:43 +02:00
Andreas Preikschat	90e867b797	fixed service print	2013-07-07 16:19:18 +02:00
Andreas Preikschat	1328ca62d2	print form constructor	2013-07-07 16:16:55 +02:00
Andreas Preikschat	3d803f4423	reverted not needed changes	2013-07-07 00:27:49 +02:00
Andreas Preikschat	a3b99a6a5d	removed fixme	2013-07-07 00:24:27 +02:00
Andreas Preikschat	dec7cc64b3	head	2013-07-07 00:20:17 +02:00
Andreas Preikschat	bd928962bb	- app data clean up ... - removed not need enumeration (qt takes care of the config dir) bzr-revno: 2272	2013-07-07 00:08:43 +02:00
Andreas Preikschat	e145be9873		2013-07-06 23:32:58 +02:00
Andreas Preikschat	022f899c10	added fixme	2013-07-06 23:20:46 +02:00
Andreas Preikschat	18c3574cfe	more FTW fixes	2013-07-06 23:18:15 +02:00
Andreas Preikschat	04bbeead56	more fixes to the FTW	2013-07-06 23:06:45 +02:00
Andreas Preikschat	e3148f7f1a	more fixes to the FTW	2013-07-06 23:04:47 +02:00
Andreas Preikschat	a2b7ebcc30	started to fix FTW	2013-07-06 22:56:13 +02:00
Andreas Preikschat	2c5eb64f6e	sort fix	2013-07-06 21:49:03 +02:00
Andreas Preikschat	eb02bc659a	appdata clean up	2013-07-06 21:21:21 +02:00
Andreas Preikschat	1aac52de8c	do not remember when theme name is empty	2013-07-06 20:33:45 +02:00
Tomas Groth	4e1868983e	Merged trunk into branch.	2013-07-06 12:27:08 +02:00
Andreas Preikschat	d038aa1d9b	head	2013-07-05 21:33:16 +02:00
Andreas Preikschat	bcc8853857	fixed attribute error ... bzr-revno: 2270	2013-07-05 21:22:24 +02:00
Andreas Preikschat	f23aafae46	head	2013-07-05 20:47:32 +02:00
Raoul Snyman	208b208412	migration to Alembic. ... bzr-revno: 2269	2013-07-05 20:42:44 +02:00
Patrick Zimmermann	910587e81f	When replacing live background with an image the preview is updated. When resetting the live background the preview was not reset. This commit fixes this. ... bzr-revno: 2268	2013-07-05 20:41:49 +02:00
Andreas Preikschat	829d68cdd8	fixed attribute error	2013-07-05 20:39:31 +02:00
Andreas Preikschat	6bba69bf88	removed duplicate css	2013-07-05 20:35:27 +02:00
Andreas Preikschat	a18129995e	head	2013-07-05 20:33:03 +02:00
Raoul Snyman	8ddca0be2b	HEAD	2013-07-04 21:15:24 +02:00
Andreas Preikschat	b314b59b52	r2266	2013-07-04 08:41:31 +02:00
Andreas Preikschat	15c1c6d907	head + conflicts	2013-07-03 22:20:12 +02:00
Andreas Preikschat	ec2f013d1d	r2265	2013-07-03 19:20:53 +02:00
Andreas Preikschat	3d738616f8	updated from MASTER	2013-07-03 19:20:23 +02:00
Andreas Preikschat	08f47c4a49	fixed str.decode	2013-07-03 19:10:37 +02:00
Andreas Preikschat	97a4bdf286	reverted changes to prevent merge conflicts	2013-07-03 19:04:45 +02:00
Andreas Preikschat	e75a87c5c9	head	2013-07-03 19:03:08 +02:00
Raoul Snyman	88e1932097	HEAD	2013-07-02 22:28:06 +02:00
Andreas Preikschat	8ee3e7265c	renames	2013-07-01 08:57:13 +02:00
Andreas Preikschat	9b4518467a	r2265	2013-07-01 08:48:01 +02:00
Andreas Preikschat	93bd032cd9	html_builder clean up	2013-07-01 08:47:20 +02:00
Tim Bentley	988fca86a1	Fix up registry for Application exit. Remove FormattingTags pickle , Other minor cleanups ... bzr-revno: 2264	2013-06-30 20:18:21 +01:00
Tim Bentley	f583be0c76	fix registry call	2013-06-30 19:39:38 +01:00
Tim Bentley	1d571507db	remove import	2013-06-30 19:36:52 +01:00
Andreas Preikschat	143ce0015f	added __hash__ methods	2013-06-30 20:33:41 +02:00
Andreas Preikschat	e99ba8a400	head	2013-06-30 19:57:21 +02:00
Andreas Preikschat	7a33b93473	- Removed the loop code and use the loop attribute. ... bzr-revno: 2261	2013-06-30 19:55:22 +02:00
Tim Bentley	5af820b7cd	more cleanups	2013-06-30 06:45:34 +01:00
Tim Bentley	74432f93e2	oops	2013-06-30 06:35:57 +01:00
Tim Bentley	96fbb5ddbb	clean up tags	2013-06-30 06:30:42 +01:00
Patrick Zimmermann	92d586427d	Reset preview when reseting live background.	2013-06-29 12:00:44 +02:00
Andreas Preikschat	f0693e8163	fixed bs4.__version__	2013-06-26 20:54:21 +02:00
Tim Bentley	b6954eba0f	Rename tag	2013-06-25 15:44:56 +01:00
Tim Bentley	26e80be5b7	Who forgot the return	2013-06-24 17:54:23 +01:00
Tim Bentley	32c7663a45	Convert formatting tags to json	2013-06-24 17:21:46 +01:00
Dmitriy Marmyshev	ed66c5cf34	Trunk	2013-06-24 19:12:01 +04:00
Tim Bentley	d32ece04a5	add missing imports	2013-06-23 20:51:17 +01:00
Andreas Preikschat	0fee84cbb6	works now	2013-06-23 19:32:25 +02:00
Andreas Preikschat	c30748873c	python3 fix	2013-06-23 19:22:44 +02:00
Andreas Preikschat	76b508848b	head	2013-06-23 19:21:52 +02:00
Raoul Snyman	9bf7284b94	HEAD	2013-06-23 17:29:16 +02:00
Andreas Preikschat	8fe2aed62f	bytes/str fix	2013-06-23 16:38:41 +02:00
Tim Bentley	4d1061f723	Clean up registry for application	2013-06-21 06:16:35 +01:00
Andreas Preikschat	b53ed99eea	head	2013-06-21 07:06:16 +02:00
Andreas Preikschat	c851fa84f0	head	2013-06-20 20:42:45 +02:00
Andreas Preikschat	aeecc041ec	removed spaces	2013-06-20 20:04:21 +02:00
Andreas Preikschat	d78d147e1d	bug #645452 (increase possible line spacing) ... bzr-revno: 2256 Fixes: https://launchpad.net/bugs/645452	2013-06-19 16:18:50 +02:00
Andreas Preikschat	658b6f89da	import	2013-06-18 21:32:04 +02:00
Andreas Preikschat	1e11f4d821	true division	2013-06-18 11:12:49 +02:00
Andreas Preikschat	62c5908d85	python3 division in slidecontroller	2013-06-18 11:09:54 +02:00
Tim Bentley	ded3671a1b	Clean up slide controller and add bible download tests ... bzr-revno: 2253	2013-06-16 20:34:19 +01:00
Andreas Preikschat	f261a95a37	head	2013-06-16 18:48:37 +02:00
Andreas Preikschat	39d691d2eb	fix	2013-06-16 18:46:44 +02:00
Andreas Preikschat	5cce4c9443	head	2013-06-16 18:40:47 +02:00
Patrick Zimmermann	1aeb9bef2f	Duplicate Song finder merge - UI and Services. ... bzr-revno: 2252	2013-06-16 15:53:40 +01:00
Andreas Preikschat	df493947e7	Removed some code not compatible with python 3 to help with the migration ... bzr-revno: 2251	2013-06-16 15:36:35 +01:00
Tim Bentley	e8d5ad7736	Clean up slidecontroller	2013-06-16 08:54:16 +01:00
Tim Bentley	d253ef5852	Fix bug and add new test or bibles	2013-06-15 21:51:11 +01:00
Patrick Zimmermann	4106ecd71e	Remove superfluous comment.	2013-06-15 12:56:09 +02:00
Patrick Zimmermann	d5cd4aaa91	Merge master.	2013-06-14 22:38:37 +02:00
Andreas Preikschat	6f0ea09327	increased possible min/max line spacing ... Fixes: https://launchpad.net/bugs/645452	2013-06-14 11:56:53 +02:00
Andreas Preikschat	3c4e67545b	head r2249	2013-06-13 12:52:47 +02:00
Patrick Zimmermann	4d8b6f669f	Merge master.	2013-06-11 07:31:11 +02:00
Tomas Groth	db0e243c08	Change from osjd to osj extension. Also use json for local service file.	2013-06-09 17:50:11 +02:00
Tomas Groth	f6f93f41d1	Use json as services format instead of python pickle.	2013-06-09 14:14:25 +02:00
Andreas Preikschat	34099c5df7	if the media doc is invisible, make it visible	2013-06-06 18:07:05 +02:00
Andreas Preikschat	a6422aa58b	head	2013-06-06 08:46:11 +02:00
Andreas Preikschat	43326c5781	fixed code	2013-06-06 08:40:10 +02:00
Andreas Preikschat	67d12883c1	head	2013-06-04 21:36:34 +02:00
Tim Bentley	6e5588b7cf	Update settings and minor cleanups	2013-06-03 19:47:25 +01:00
Tim Bentley	9160832e0a	fix error	2013-06-03 19:03:45 +01:00
Tim Bentley	512155ff68	Add css file	2013-06-03 18:19:42 +01:00
Andreas Preikschat	1f80f6c830	renames	2013-06-01 20:35:00 +02:00
Andreas Preikschat	8c3c43a11d	changed shortcut category	2013-06-01 20:16:34 +02:00
Andreas Preikschat	851c667c8d	head	2013-06-01 16:48:30 +02:00
Tim Bentley	6cca9d536b	head	2013-05-26 18:03:14 +01:00
Tim Bentley	20bd86fbce	Live works!	2013-05-25 18:05:44 +01:00
Tim Bentley	4b2868b271	Fox presentations and refactor service item	2013-05-24 21:17:47 +01:00
Tim Bentley	1113044955	Add basic Live display to remote	2013-05-19 20:56:48 +01:00
Andreas Preikschat	b99d9a7ac9	More Python 3 changes - division fixes ... bzr-revno: 2244	2013-05-19 19:13:26 +01:00
Tim Bentley	945a99ea24	Fix up merge issues	2013-05-19 08:35:07 +01:00
Andreas Preikschat	1d110f446c	head + conflict	2013-05-18 16:11:43 +02:00
Andreas Preikschat	7a42cd3769	added test	2013-05-18 10:44:03 +02:00
Andreas Preikschat	ceb8020998	head	2013-05-12 14:04:55 +02:00
Andreas Preikschat	ad8e28fbe9	renames	2013-05-11 20:11:52 +02:00
Andreas Preikschat	d9288ac267	renames	2013-05-11 19:41:26 +02:00
Andreas Preikschat	23d5df568b	renames	2013-05-11 19:28:42 +02:00
Andreas Preikschat	53160fc539	added doc	2013-05-09 21:43:44 +02:00
Andreas Preikschat	32957eca0c	removed dead code	2013-05-09 21:38:57 +02:00
Andreas Preikschat	7e41362ca2	completed test	2013-05-08 22:05:54 +02:00
Andreas Preikschat	6bff80ca05	head	2013-05-02 09:21:17 +02:00
Andreas Preikschat	221001b633	updated vlc.py	2013-05-02 09:21:03 +02:00
Andreas Preikschat	eae143d232	name fixes	2013-04-29 20:42:29 +02:00
Patrick Zimmermann	0557febe2b	Merge trunk.	2013-04-29 20:23:06 +02:00
Andreas Preikschat	f396e07feb	fixed regression	2013-04-28 20:34:04 +02:00
Andreas Preikschat	92d5fd8e19	removed dead code; fixed attribute names; fixed regression	2013-04-28 20:31:48 +02:00
Andreas Preikschat	02603eaad5	display tool tip in shortcut dialog	2013-04-28 20:22:36 +02:00
Andreas Preikschat	989b922ab9	added shortcut to jump to the search fields	2013-04-28 20:06:49 +02:00
Andreas Preikschat	2d22e8420a	do not pass QImages to build_icon (if not needed)	2013-04-28 19:17:45 +02:00
Patrick Zimmermann	4c2f078bf1	Add a missing \n at EOF. Add a comment.	2013-04-27 22:59:56 +02:00
Patrick Zimmermann	154c82f5ea	Rename a method and remove a non needed registry var.	2013-04-27 12:00:27 +02:00
Andreas Preikschat	9d54944ad4	use true division (py3)	2013-04-24 22:47:30 +02:00
Andreas Preikschat	22541e7297	use true division (py3)	2013-04-24 21:05:34 +02:00
Andreas Preikschat	6d414c0fdb	r2240	2013-04-23 23:48:51 +02:00
Andreas Preikschat	7b7cbc588c	- removed code using the sqlite package (which is not available in python 3) ... bzr-revno: 2240	2013-04-23 23:47:02 +02:00
Andreas Preikschat	8f994b2895	- fixed short lines ... - renamed attributes and methods bzr-revno: 2239	2013-04-23 23:46:07 +02:00
Tim Bentley	11112e7712	Head	2013-04-23 20:08:50 +01:00
Patrick Zimmermann	edb0eab31d	Remove a dev comment. Pretify a comment.	2013-04-23 19:14:35 +02:00
Patrick Zimmermann	145a1aedcb	Add some docstrings and rename some methods for clarity.	2013-04-23 19:12:08 +02:00
Andreas Preikschat	ba261e76e5	- ported code to beautifulsoup 4 ... - moved regular expressions to the top - fixed regression bzr-revno: 2238	2013-04-23 18:56:23 +02:00
Patrick Zimmermann	1c2a5b5156	Merge trunk.	2013-04-22 23:02:12 +02:00
Patrick Zimmermann	823e7b1ec0	Change a line back to trunk state.	2013-04-22 22:51:33 +02:00
Tim Bentley	581c83e70d	Final tidyups	2013-04-21 16:53:51 +01:00
Tim Bentley	2965271ada	and more	2013-04-21 08:26:45 +01:00
Tim Bentley	02b1f7b78b	and more	2013-04-21 08:21:29 +01:00
Tim Bentley	34180112be	Fix Core from abend	2013-04-21 08:06:25 +01:00
Andreas Preikschat	4063de2700	head	2013-04-20 22:34:46 +02:00
Andreas Preikschat	3f60c34440	head	2013-04-20 22:30:51 +02:00
Andreas Preikschat	3dd05a2f4d	head	2013-04-20 22:25:06 +02:00
Andreas Preikschat	ab9e0d7ba2	- removed General section and introduced a Core section ... - added test bzr-revno: 2234 Fixes: https://launchpad.net/bugs/1133237	2013-04-20 22:19:53 +02:00
Andreas Preikschat	76799d931e	head	2013-04-20 19:37:06 +02:00
Andreas Preikschat	58b21030e0	r2231	2013-04-20 13:38:27 +02:00
Patrick Zimmermann	1c31940650	Merge trunk.	2013-04-18 23:17:14 +02:00
Patrick Zimmermann	2b9a13ff97	Clean up PreviewWidget interface a little more.	2013-04-18 22:50:02 +02:00
Patrick Zimmermann	25db18d34c	Use inheritance instead of composition. Some interface cleanup.	2013-04-18 22:15:44 +02:00
Patrick Zimmermann	9e53873a66	Merge trunk.	2013-04-18 20:22:53 +02:00
Andreas Preikschat	098d733ad1	bible renamings	2013-04-18 19:45:14 +02:00
Andreas Preikschat	2ad78e4cb9	renaming	2013-04-18 11:32:48 +02:00
Andreas Preikschat	d002cb383e	renaming	2013-04-18 11:27:11 +02:00
Patrick Zimmermann	d687288336	Correct a preview_list_widget -> preview_widget call and fix update of preview when switching the service item.	2013-04-16 23:42:23 +02:00
Andreas Preikschat	1b447c4590	reoved whitespace	2013-04-16 19:54:40 +02:00
Andreas Preikschat	01a0ad3618	added whitespace to avoid conflict	2013-04-16 19:48:42 +02:00
Patrick Zimmermann	1bbf52c7bf	Fix a logic error, an array index border was wrong.	2013-04-16 19:34:07 +02:00
Patrick Zimmermann	e4d3d8d6d2	Rename a slideno -> row for more consistency.	2013-04-16 19:33:36 +02:00
Tim Bentley	a0f4db607e	Head and fix	2013-04-16 17:37:26 +01:00
Andreas Preikschat	140178a674	added code back which should not be removed in this proposal	2013-04-16 17:55:23 +02:00
Patrick Zimmermann	0840480ef2	Merge trunk.	2013-04-15 23:56:56 +02:00