Stewart Becker
a56f00ddc0
Merge from parent
2014-04-30 21:40:33 +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
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
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
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
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
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
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
b9ba2c68a6
Fix up PEP8 issues.
2014-04-12 22:19:22 +02:00
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
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
4c3e2ac45c
Trying to fix pylint
2014-04-06 01:06:37 +02:00
5b69472bc2
HEAD
2014-04-04 22:31:55 +02:00
Andreas Preikschat
2a9c85c2a2
fixed a spelling mistake
...
bzr-revno: 2346
2014-04-02 19:51:06 +01:00
Samuel Mehrbrodt
adedb6eaeb
Fix setDefaults -> set_defaults
2014-04-02 09:04:12 +02:00
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
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
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
b69f480dc0
head
2014-03-31 14:19:33 +02:00
Samuel Mehrbrodt
ad9717ea42
Add support for author types to OpenLyrics import and export
2014-03-30 23:42:46 +02:00
Andreas Preikschat
7787e1a845
head
2014-03-28 21:38:38 +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
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
Tim Bentley
5d9533947d
Final set of PEP8 cleanups
2014-03-20 19:10:31 +00:00
Tomas Groth
991661b169
Head
2014-03-19 18:49:46 +01: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
9610be5cd0
Fix up comments
2014-03-17 19:05:55 +00:00
Tim Bentley
6c80ba1c7d
Full migration
2014-03-17 07:29:29 +00:00
Tim Bentley
0a2456fa19
Finish adding RegistryProperties
2014-03-16 21:25:23 +00:00
Tim Bentley
5e6f97d74e
fix order and comment
2014-03-13 20:08:47 +00:00
Tim Bentley
31ee1b43a6
first view
2014-03-12 17:41:52 +00:00
c607661aee
HEAD
2014-03-04 23:51:54 +02:00
Tim Bentley
43f156d9fe
Update Songs forms
2014-03-04 18:49:30 +00:00
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
Tomas Groth
e90f277bd6
merged with trunk
2014-02-21 22:48:25 +01: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
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
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
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