Ken Roberts
b6f87adb1d
Fix bug 1390702
2014-11-08 16:39:55 -08:00
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
0750071fe2
Fix spacing on View-Projector Manager
2014-11-08 11:22:22 -08:00
Tomas Groth
bc8afc9e4f
Update thememanager widget after theme import
2014-11-06 14:16:14 +01:00
Ken Roberts
f81903bbcf
Merge upstream
2014-10-23 15:16:38 -07:00
3771cb42a8
HEAD
2014-10-22 22:47:47 +02:00
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
Tim Bentley
f5f8c1ce08
Fix start up thread timer
2014-10-21 06:13:22 +01:00
Ken Roberts
b8f84f79eb
Fix previous reviews
2014-10-09 13:30:07 -07:00
Ken Roberts
0227e0a2bd
Initial projector code
2014-10-06 12:10:03 -07:00
1a573315db
Make tabbed docks look better by using document mode
2014-09-04 23:38:39 +02:00
Jonathan Springer
ceeb1b0118
Removed icons from menu items on Mac OS X
2014-09-04 20:27:21 +02:00
Jonathan Springer
f3207dac8e
Consolidate platform specific checks into the common module
2014-08-27 19:18:06 -04: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
Jonathan Springer
6d277ef78d
Merge trunk
2014-05-07 19:52:51 -04:00
Samuel Mehrbrodt
a6a08bcfdd
Fix bug 1157938
...
Fixes: https://launchpad.net/bugs/1157938
2014-05-03 17:01:43 +02:00
Stewart Becker
a56f00ddc0
Merge from parent
2014-04-30 21:40:33 +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
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
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
307f46921c
Merge trunk
2014-04-10 20:29:22 -04: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
ce9ca0b44b
Updated the look of the Library tabs
2014-04-02 01:29:23 +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
Andreas Preikschat
7787e1a845
head
2014-03-28 21:38:38 +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
Tim Bentley
30835067d3
fix trunk
2014-03-18 20:36:02 +00:00
Tim Bentley
9610be5cd0
Fix up comments
2014-03-17 19:05:55 +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
831f2f3b69
HEAD
2014-02-27 23:39:44 +02:00
Tim Bentley
7f58348c8c
fix up pintservice form
2014-02-23 15:41:09 +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
7fe95731f9
Fix up Main display
2014-01-11 17:52:01 +00:00
Tim Bentley
360d9883b4
Migrate renderer
2014-01-05 17:09:51 +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
Tim Bentley
e6bcf7d852
Head and fix confilcts
2013-12-28 21:33:38 +00:00
Tim Bentley
6d8b5cadb4
Lib cleanup and 2014
2013-12-24 08:56:50 +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
d4ce5489ad
updates and fix up slidecontroller
2013-12-19 20:17:06 +00:00
Tim Bentley
e9a7850bc8
Add registry mixin and code cleanups
2013-12-15 16:50:09 +00:00
Tim Bentley
cd9f9e4c8d
move registry to common
2013-12-13 17:44:05 +00: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
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
3e1a863bae
2to3 and resources.py
2013-08-31 20:17:38 +02:00
Andreas Preikschat
9b0b88718d
head
2013-08-22 20:47:08 +02: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
3409c491fe
changed constructors
2013-07-18 16:11:39 +02:00
Andreas Preikschat
e145be9873
2013-07-06 23:32:58 +02:00
Andreas Preikschat
15c1c6d907
head + conflicts
2013-07-03 22:20:12 +02:00
Tim Bentley
f583be0c76
fix registry call
2013-06-30 19:39:38 +01:00
Tim Bentley
26e80be5b7
Who forgot the return
2013-06-24 17:54:23 +01:00
Tim Bentley
4d1061f723
Clean up registry for application
2013-06-21 06:16:35 +01:00
Andreas Preikschat
5cce4c9443
head
2013-06-16 18:40:47 +02:00
Tim Bentley
e8d5ad7736
Clean up slidecontroller
2013-06-16 08:54:16 +01:00
Andreas Preikschat
34099c5df7
if the media doc is invisible, make it visible
2013-06-06 18:07:05 +02:00
Tim Bentley
6e5588b7cf
Update settings and minor cleanups
2013-06-03 19:47:25 +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
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
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
4063de2700
head
2013-04-20 22:34:46 +02:00
Andreas Preikschat
d002cb383e
renaming
2013-04-18 11:27:11 +02:00
Andreas Preikschat
fd3cad1c7c
r2223
2013-03-30 09:40:49 +01:00
Andreas Preikschat
6c7d608fbb
fixed FTW regression
2013-03-28 21:05:46 +01:00
Andreas Preikschat
3fef841bb2
fixed FTW shown again
2013-03-26 12:45:18 +01:00
Andreas Preikschat
e708140d13
head
2013-03-26 12:35:29 +01:00
Tim Bentley
611dbdf044
Head
2013-03-19 17:53:51 +00:00
Tim Bentley
861e64ee83
plugin 1
2013-03-19 17:53:32 +00:00
Arjan Schrijver
ec12b36665
Merge HEAD
2013-03-18 15:11:58 +01:00
Arjan Schrijver
47c48618bc
Fixed a traceback that occurred when calling critical_error_message_box and friends while the splashscreen is disabled in the settings.
2013-03-18 14:30:31 +01:00
Tim Bentley
5e6ec9d269
fix missed events
2013-03-17 20:40:47 +00:00
Tim Bentley
df2da440f0
Fixes
2013-03-17 20:00:39 +00:00
Tim Bentley
e641c0e8b3
main window and theme manager
2013-03-16 11:05:52 +00:00
Arjan Schrijver
2cb47f6040
Merge HEAD
2013-03-14 12:39:04 +01:00
Tim Bentley
7efe1320fb
Fix theme handling
2013-03-12 09:09:42 +00:00
Tim Bentley
46fe786f8b
More fixes
2013-03-11 19:11:46 +00:00
Arjan Schrijver
043c35a985
Merge HEAD
2013-03-11 16:23:43 +01:00
Andreas Preikschat
ca406df0a4
head
2013-03-08 09:14:39 +01:00
Arjan Schrijver
52523224ec
Merge HEAD
2013-03-07 12:23:52 +01:00
Andreas Preikschat
7e8b21b99f
progress bar fix
2013-03-07 12:11:35 +01:00
Andreas Preikschat
6066c80194
changed most of the signals to our new style
2013-03-07 12:01:06 +01:00
Arjan Schrijver
68d034e877
Revert code shortening from lp:~googol/openlp/image_groups
2013-03-07 10:03:02 +01:00
Raoul Snyman
e5c87ed6f2
HEAD
2013-03-07 08:47:43 +02:00
Tim Bentley
4fb0aca862
Fix review comments
2013-03-05 17:11:58 +00:00
Raoul Snyman
e2c0ab3d8a
HEAD
2013-03-05 08:25:16 +02:00
Tim Bentley
5ee12ff1c0
Fix bug from bootstrap merge
2013-03-04 18:01:57 +00:00
Tim Bentley
3a44717acf
Head and conflict
2013-03-04 16:55:13 +00:00
Arjan Schrijver
91ad9ae9cc
Merge HEAD
2013-03-04 14:48:42 +01:00
Arjan Schrijver
2561f995ac
Fixed manual import of configuration file with a list of images
2013-03-04 14:37:19 +01:00
Raoul Snyman
6c1a0aa5e7
HEAD
2013-03-04 10:53:43 +02:00
Arjan Schrijver
97184a9ea1
Moved conversion code. Doesn't work yet.
2013-03-03 18:24:32 +01:00
Arjan Schrijver
c02098faa8
Merge HEAD
2013-03-03 17:53:33 +01:00
Tim Bentley
188aa53082
Head + conflicts
2013-03-01 17:36:43 +00:00
Andreas Preikschat
40de8647cf
renamed general settings to core
...
Fixes: https://launchpad.net/bugs/1133237
2013-02-28 21:47:59 +01:00
Tim Bentley
26ba57456f
Head + conflicts
2013-02-26 17:27:30 +00:00
Andreas Preikschat
5a5845ccd1
added commented line
2013-02-26 16:41:36 +01:00
Andreas Preikschat
25373944b2
started work on converting old image settings
2013-02-26 12:23:57 +01:00
Tim Bentley
0a1ebfbdb9
Head + merge issues
2013-02-21 21:33:06 +00:00
Tim Bentley
20c3157d6d
final fixes
2013-02-21 17:05:56 +00:00
Andreas Preikschat
8d164cd21e
clean up
2013-02-20 08:02:48 +01:00
Tim Bentley
6d732cf3ba
Cleanups
2013-02-19 19:50:14 +00:00
Andreas Preikschat
29194b5e1e
fixed bug #1128376 (Configure shortcuts has two items called settings)
...
Fixes: https://launchpad.net/bugs/112837
2013-02-19 14:57:14 +01:00
Andreas Preikschat
20d687524a
fixed missing items
2013-02-19 14:09:00 +01:00
Andreas Preikschat
38c2c2db5e
make diff more readable
2013-02-19 10:33:07 +01:00
Andreas Preikschat
53f93d6342
r2187 + conflicts
2013-02-19 10:16:54 +01:00
Andreas Preikschat
781da422b6
started to remove forgotten shortcut kwargs
2013-02-19 10:13:49 +01:00
Tim Bentley
4b30d6cd29
Openup servicemanager again
2013-02-18 21:36:36 +00:00
74fc1d3988
HEAD
2013-02-18 23:05:08 +02:00
Tim Bentley
4cb0b33fca
Cleanup pluginmanager
2013-02-18 20:57:14 +00:00
Tim Bentley
7b03764a4a
code cleanups
2013-02-18 20:41:08 +00:00
Tim Bentley
e8b123925f
Bootstrap cleanup
2013-02-18 19:59:35 +00:00
Tim Bentley
de6ce12092
Mark 1
2013-02-17 21:28:45 +00:00
Andreas Preikschat
480b666918
cleaned pluginmanager constructor
2013-02-17 13:57:52 +01:00
f4a2855094
Removed an unecessary variable.
2013-02-16 14:11:51 +02:00
a8fafc3363
HEAD
2013-02-16 14:01:10 +02:00
98311d9ad1
Add an interface test for the find_plugins method.
...
Not sure if this should be an interface test or a scenario test, but it does very little mocking, tries to let the bits of OpenLP run for real, and checks that all the plugins are imported.
Remove the superfluous argument to the find_plugins method.
2013-02-11 23:16:30 +02:00
1dacaf2487
HEAD
2013-02-11 21:52:07 +02:00
Tim Bentley
064a4bad20
Merge fixes
2013-02-10 16:05:52 +00:00
0f7f17f79c
Various code cleanups.
...
- Renamed variables to python_style
- Renamed some functions to python_style
- PEP8 compliance cleanup
2013-02-10 12:39:28 +02:00
Andreas Preikschat
5739536d8c
fixed more regression
2013-02-09 16:27:35 +01:00
Tim Bentley
3063526430
Fix problems with start up thread
2013-02-07 10:16:08 +00:00
Tim Bentley
c90d45ca73
Bye Bye Event Receiver
2013-02-07 08:42:17 +00:00
Tim Bentley
fae34b1b4d
Head + fix merge problems
2013-02-07 07:17:19 +00:00
Tim Bentley
1430559205
More Receiver to Registry migrations
2013-02-06 21:52:15 +00:00
Tim Bentley
eac2ce39b3
More Receiver removals
2013-02-05 21:42:15 +00:00
Andreas Preikschat
b3e20f2788
r2170 + conflict
2013-02-05 09:10:50 +01:00
Andreas Preikschat
f94ae4d7c2
reordered imports
2013-02-05 09:05:28 +01:00
Andreas Preikschat
3df730db09
used += instead
2013-02-04 22:26:27 +01:00
Andreas Preikschat
9aa7cf7b29
r2169 + conflict
2013-02-04 22:07:38 +01:00
Tim Bentley
b7b19a4180
Fix up Registry function processing
2013-02-04 19:25:12 +00:00
Tim Bentley
ca5e46a2b1
Add test idea for the registry
2013-02-03 21:46:56 +00:00
Tim Bentley
a9a4c7938e
Fix name and other bugs
2013-02-03 19:23:12 +00:00
Tim Bentley
28aeed815f
Minor fixes
2013-02-03 17:42:31 +00:00
Tim Bentley
ad438ba4b2
Remove rogue print
2013-02-03 16:56:19 +00:00
Tim Bentley
b83b6eccd1
Head and merge failures
2013-02-03 16:40:39 +00:00
Tim Bentley
123f460f7e
Fix up Receiver code changes
2013-02-03 15:06:17 +00:00
12fc795c9c
Fix up some issues caused by my refactor and some apparent merge conflict somewhere.
2013-02-03 16:40:48 +02:00
Tim Bentley
27cd63ebcd
Remove events and move to Registry
2013-02-03 09:07:31 +00:00
327711d0ef
HEAD
2013-02-02 23:16:42 +02:00
922c392ecb
Slowly start moving names to PEP8 style names.
2013-02-02 22:54:34 +02:00
Tim Bentley
aa14303003
standards for thememanager and more Registry
2013-02-01 21:48:06 +00:00
Tim Bentley
4c26ff8f80
Cleaned up ServiceManager
2013-02-01 20:40:23 +00:00
439fc9b8f0
More cleanups
2013-02-01 22:36:27 +02:00
Andreas Preikschat
9bc317532c
r2162 + conflict
2013-01-31 19:47:53 +01:00
Andreas Preikschat
16ba742d1d
sorted default dict a bit; fixed settings conversion; renamed a setting; removed old setting
2013-01-31 08:56:34 +01:00
Tim Bentley
72920494a6
Head and merge fixes
2013-01-30 22:01:52 +00:00
Andreas Preikschat
d7472876c7
change wording
2013-01-30 21:34:54 +01:00
Andreas Preikschat
cc5776c7d3
fixed 'song/ccli number' setting; do not change setting.ini when IMPORTING
2013-01-30 21:29:33 +01:00
Andreas Preikschat
94be547550
removed not needed return
2013-01-30 19:29:10 +01:00
Andreas Preikschat
320b692db7
fixed lower case on some settings
2013-01-30 19:24:41 +01:00
Tim Bentley
bdb9089409
Cleanup ServiceManager code
2013-01-27 07:36:04 +00:00
Tim Bentley
1e3590a152
Clean up complete for now
2013-01-24 06:00:51 +00:00
Tim Bentley
e519e1b435
remove main window code in service manager
2013-01-23 21:47:23 +00:00
Tim Bentley
be6977a1a3
remove plugin helpers
2013-01-23 21:05:25 +00:00
Tim Bentley
aafef12bf8
Head with fixes
2013-01-23 20:29:43 +00:00
Tim Bentley
76d259264d
More cleanups
2013-01-23 19:53:40 +00:00
Tim Bentley
3378e32da3
More cleanups and removal of plugin_helpers
2013-01-23 19:28:47 +00:00
Tim Bentley
a6de33f177
Registry takes shape and takes over
2013-01-22 21:09:43 +00:00
Andreas Preikschat
bee9c96b9a
song export fixes
2013-01-18 22:24:25 +01:00
Andreas Preikschat
0fc9c4792f
tweaked 'settings migrator'
2013-01-16 19:59:34 +01:00
Andreas Preikschat
15c96f8b87
fixed upper General
2013-01-16 13:26:17 +01:00
Andreas Preikschat
6cecfe0fb7
fixed settingsmanager bug; fixed translation bug
2013-01-15 00:26:51 +01:00
Andreas Preikschat
fa6703f307
fixed up remove_obsolete_settings method
2013-01-12 09:54:49 +01:00
Andreas Preikschat
095066cf19
add possibility to remove old_keys from the config
2013-01-11 21:44:30 +01:00
Andreas Preikschat
75a86f05ee
fixed removed plugin
2013-01-11 13:43:18 +01:00
Andreas Preikschat
0f042dde6f
clean ups
2013-01-11 01:35:00 +01:00
Andreas Preikschat
91fbf037a2
splitted ui.py into two files; changed imports
2013-01-11 01:19:11 +01:00
Andreas Preikschat
2616f63007
removed value parameter (still needs work)
2013-01-11 00:07:48 +01:00
Andreas Preikschat
306919d15f
moved settings to own file
2013-01-10 20:54:45 +01:00
Andreas Preikschat
eb6bc6adbc
started work to store setting in a (half) central place
2013-01-10 20:33:48 +01:00
Jonathan Corwin
794567b1ec
Import %General, better error message, support 'players' section
2013-01-02 22:32:41 +00:00
Jonathan Corwin
4257ce2932
Attempt to load %General section, and just ignore those we don't know
2012-12-29 22:55:40 +00:00
Tim Bentley
4a0b3f90aa
2013 is comming
2012-12-29 20:56:56 +00:00
Tim Bentley
9f28874eb5
Code fixes
2012-12-29 18:13:08 +00:00
Tim Bentley
4b6292220a
Main window done
2012-12-29 13:15:42 +00:00
Andreas Preikschat
0a57bed2f7
fixed setting import
2012-12-27 18:00:40 +01:00
Andreas Preikschat
cbd22b7141
fixed bug caused by merge
2012-12-27 17:46:27 +01:00