Tim Bentley
19d120de1b
Head and review comments
2016-04-13 19:38:49 +01:00
suutari.olli@gmail.com
6398e217df
Added new icon for Preview. (Provided by superfly)
...
--------------------------------------
This branch changes icons for Preview and Replace Live background buttons.
Currently preview button uses same icon as Blank to Theme and
Replace Live background uses same icon as Blank to black.
This is problematic because these icons don’t describe these
actions and may be confused with their other meanings.
Preview icon is replaced by system_mediamanager.png icon, which consists of
frame and is eas...
bzr-revno: 2640
Fixes: https://launchpad.net/bugs/1536808
2016-04-13 18:40:05 +01:00
suutari-olli
7219ba22e6
Added: self.BackgroundColorColon = translate('OpenLP.Ui', 'Background color:')
...
to uistrings, background color label now uses this.
This same string will be used several times in this branch:
https://code.launchpad.net/~suutari-olli/openlp/ui-messages-part-1/+merge/291628
2016-04-13 18:50:04 +03:00
suutari-olli
010c7b6fb4
Merge to trunk on 13.4.16
2016-04-13 00:01:58 +03:00
Tim Bentley
65e84a317e
fix tests
2016-04-12 22:00:18 +01:00
Tim Bentley
d87c884f2d
fix tests
2016-04-12 21:45:50 +01:00
Tim Bentley
01762951d0
head
2016-04-12 21:26:43 +01:00
Chris Hill
1d05ec4111
merge w/ trunk
2016-04-12 21:18:07 +01:00
Chris Hill
dfb34a5156
Enable auto-select for all searches when item previously selected
2016-04-12 21:17:12 +01:00
Tomas Groth
9628339b4c
trunk
2016-04-12 22:05:58 +02:00
Tomas Groth
d3a57ae46b
various fixes and improvements to the sword import.
2016-04-12 21:55:32 +02:00
second@tgc.dk
cdadaf1ecb
"Fix traceback when searching for book that doesn't exists in second bible. Fixes bug 1553863.
...
Set progress bar steps to number of chapters in zefania import.
Use standard button text in the FTW, if possible. Fixes bug 1554554.
Translation fixes. Fixes bug 1545072
Fix song tag detection. Fixes bug 1549549.
Fix a method call with too many parentheses, which fixes getting bible books from crosswalk."
bzr-revno: 2639
Fixes: https://launchpad.net/bugs/1545072 , https://launchpad.net/bugs/1549549 , https://launchpad.net/bugs/1553863 , https://launchpad.net/bugs/1554554
2016-04-12 21:36:16 +02:00
Tomas Groth
2aeb7f9e6f
trunk
2016-04-10 22:24:07 +02:00
Tomas Groth
91714caedf
Fix a method call with too many parentheses.
2016-04-10 22:13:33 +02:00
suutari-olli
f57f335b0f
Fixed the broken import statements.
2016-04-08 18:03:05 +03:00
suutari-olli
728ffd7205
Merge to trunk on 8.4.16
...
You will need to
manually delete the __pycache__ directory inside openlp_core_utils.
run "bzr resolve openlp_core_utils"
then you will be allowed to commit the changes.
also resolved conflict for advancedtab.py
2016-04-08 16:46:45 +03:00
suutari-olli
76aa114ff0
This now moves old settings from advanced tab into the new settings.
2016-04-08 16:40:34 +03:00
Chris Hill
743a916292
merge w/ trunk
2016-04-08 12:53:54 +01:00
Tim Bentley
483c12d779
vlc tests pass
2016-04-07 19:14:10 +01:00
Tim Bentley
189dc95bbf
fix up tests
2016-04-07 19:01:16 +01:00
Tomas Groth
489321316f
Made a exception catch more specific.
2016-04-06 23:14:23 +02:00
Tim Bentley
a41d86cb7c
Head
2016-04-06 06:08:44 +01:00
Tim Bentley
a56f851794
Remove utils and move code to common and lib dirs, fix up tests and broken tests
...
bzr-revno: 2638
2016-04-06 05:58:51 +01:00
Tim Bentley
7f1f8cf780
pep8
2016-04-05 21:14:50 +01:00
Tim Bentley
31a2b37a88
pep8
2016-04-05 21:07:57 +01:00
Tim Bentley
59e3603a3e
fix tests
2016-04-05 20:58:40 +01:00
Tim Bentley
1082254f02
fix tests
2016-04-05 20:51:46 +01:00
Tim Bentley
3500c73494
fix tests
2016-04-05 20:44:00 +01:00
Tim Bentley
b6c49450d4
fix tests
2016-04-05 20:33:37 +01:00
Tim Bentley
fb2de75cbc
fix tests
2016-04-05 20:11:10 +01:00
Tim Bentley
7c88006c7b
fix tests
2016-04-05 19:44:50 +01:00
Tim Bentley
1725518088
delete directory
2016-04-05 19:34:08 +01:00
Tim Bentley
6729ea9d19
move file
2016-04-05 19:33:50 +01:00
Tim Bentley
2df1169ea8
fix tests
2016-04-05 19:11:42 +01:00
Chris Hill
74497b9229
Implement natural sort for authors, topics, songbooks, themes in Edit Song comboboxen, Song Maintenance form
2016-04-05 18:55:22 +01:00
Tim Bentley
3e8e72be85
move methods and clean up
2016-04-05 18:30:20 +01:00
Tim Bentley
b7da0be71e
move method
2016-04-05 18:10:51 +01:00
Tim Bentley
f19280c88d
move method
2016-04-05 17:58:29 +01:00
Tim Bentley
6dcd4b54d9
fix import issues
2016-04-05 17:43:55 +01:00
Tim Bentley
cfc3a978a8
fix import issues
2016-04-05 17:34:21 +01:00
Tim Bentley
3e8af699c3
fix import issues
2016-04-04 22:19:37 +01:00
Tim Bentley
d440891819
fix import
2016-04-04 22:11:23 +01:00
Tim Bentley
ee62d9fa6c
change package
2016-04-04 22:01:24 +01:00
Tim Bentley
0b480f5e8d
add test mixin
2016-04-04 21:47:33 +01:00
Tim Bentley
8a1b62fdcd
move tests
2016-04-04 21:41:08 +01:00
Tim Bentley
5dd4b8e386
Pep8
2016-04-04 21:27:33 +01:00
Tim Bentley
85587ce2f3
uno commands
2016-04-04 21:14:04 +01:00
Tim Bentley
98a021b89f
Pep8
2016-04-04 21:03:19 +01:00
Tim Bentley
dffba47b44
move version checker
2016-04-04 20:53:54 +01:00
Chris Hill
abc25744a2
Remove second sort from author, topic, theme search, change all sorting from sorted() to sort()
2016-04-03 22:20:40 +01:00
