aaba690c97
Fix call to wrong signal on error
2016-06-17 16:05:26 -07:00
c64df391aa
bug 1593882 fix
2016-06-17 15:46:21 -07:00
76ffe35621
bug 1593882 - fix authenticated connection but bin not set
2016-06-17 15:06:55 -07:00
29043f0789
string format error
2016-06-17 08:30:23 -07:00
Tomas Groth
d92d46e06c
Fix a formatting error
2016-06-17 12:05:25 +02:00
c8754c86aa
Merge trunk fix conflict
2016-06-16 18:08:21 -07:00
suutari-olli
2ee123a9e1
- Clear the results button now also clears the text input field and gives it focus.
2016-06-17 01:27:06 +03:00
suutari-olli
1d73961216
- Added the Images by using "bzr add"
...
E:\bzr\openlp\combined-reference-and-text-search>bzr add E:\bzr\openlp\combined-
reference-and-text-search\resources\images
adding resources/images/bibles_search_clear.png
adding resources/images/bibles_search_combined.png
2016-06-17 00:48:05 +03:00
second@tgc.dk
45d2640159
"Fix various pyodbc related issues. Fixes bug 1590657.
...
Fix of tracback during SongPro import. Fixes bug 1582152.
Fix traceback during songshowplus import. Fixes bug 1585489.
Skip PresentationManager files we do not support."
bzr-revno: 2677
Fixes: https://launchpad.net/bugs/1582152 , https://launchpad.net/bugs/1585489 , https://launchpad.net/bugs/1590657
2016-06-16 22:12:27 +02:00
018f6f8af5
Fix spelling
2016-06-16 08:07:34 -07:00
7a8b519b8c
Add test for renderer change to template string
2016-06-16 07:44:32 -07:00
b627736e5e
Convert renderer string to Template()
2016-06-15 08:05:05 -07:00
suutari-olli
7c74b50318
- Code cleanup (Removed 2 un-required empty rows)
2016-06-15 00:55:37 +03:00
suutari-olli
3e926c7480
- Added "Clear search results" button to Quick & Advanced search.
...
> Added a new icon for this: http://www.1001freedownloads.com/free-clipart/tango-edit-clear
^^CC0 1.0 Universal (CC0 1.0)
2016-06-15 00:49:29 +03:00
Tomas Groth
0c2b68ac54
merge trunk
2016-06-14 23:12:54 +02:00
f052cf99d9
Fix bug #1589815 by first reducing the string to digits only and then checking if there's anything left.
...
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1589815 (revision 2675)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1603/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1514/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1452/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1225/
[SUCC...
bzr-revno: 2676
2016-06-14 22:07:18 +01:00
f20499b1af
Convert htmlbuilder.py to use Template() strings for css
...
- Changed strings to use Template() instead of format() for css building
- Fix htmlbuilder strings tests
- Cleanup template variables and fix tests to match
- bug 1590386 - string format error in editbibledialog.py
- bug 1590475 - string format error in mediaitem.py
- Function call error in firsttimeform.py (missed label text variable)
--------------------------------
lp:~alisonken1/openlp/strings-templates2 (revision 2679)
[SUCCESS] ...
bzr-revno: 2675
Fixes: https://launchpad.net/bugs/1590386 , https://launchpad.net/bugs/1590475
2016-06-14 22:05:51 +01:00
suutari-olli
db003d7ec6
- Merged trunk on 14.6.16
...
To do?
- Add clear search results button for locked Bible search results
- Prevent duplicated search results on "Lock search results"
2016-06-14 23:54:36 +03:00
suutari-olli
d5b11c13d2
- Some code cleanup
2016-06-14 23:53:39 +03:00
Tomas Groth
4fc4fa8969
pep8 fixes
2016-06-14 22:36:51 +02:00
suutari-olli
5a54b2a660
- Improved the "Search too short" message for Quick search.
...
(Reference search just uses "No search results for now")
- Reverted the attempt to stop duplicated search results if search results are locked,
(This is something that I havn't figured out how to do)
2016-06-14 22:54:26 +03:00
Tomas Groth
41c0d3fcf9
Fix various pyodbc related issues. Fixes bug 1590657.
...
Fixes: https://launchpad.net/bugs/1590657
2016-06-14 21:11:57 +02:00
Tomas Groth
e89803a3ad
merge trunk
2016-06-14 21:06:54 +02:00
suutari-olli
c249eb1f20
merged trunk on 14.6.16
2016-06-14 01:02:56 +03:00
suutari-olli
65ffd10cdf
- Improved the "Too short search" item functionality.
...
- Improved some comments.
2016-06-13 01:02:24 +03:00
suutari-olli
4ec7e5e879
- Added "Search too short for search while typing" message to search results
...
!! Need to rename this from: search_results_banana to something smarter.
- Fixed "," breaking OLP if it's the last char in text search.
- "," no longer separates keywords in Text search.
- Removed mention about separating keywords with "," from the empty search message.
- Started working on not duplicating search results on "Lock search results" > THIS DOES NOT WORK YET.
2016-06-11 13:10:15 +03:00
aedcecc7ff
String format oops
2016-06-08 19:57:21 -07:00
e222a11390
String format oops
2016-06-08 13:41:21 -07:00
b84dbb15a2
Oops in string format
2016-06-08 13:26:01 -07:00
Tomas Groth
f696698b3e
pep8 fixes
2016-06-08 21:58:30 +02:00
Tomas Groth
df82628c01
Fix merge issue
2016-06-08 21:34:29 +02:00
Tomas Groth
2fe7a9d127
trunk
2016-06-08 21:27:52 +02:00
Tomas Groth
805b7a83eb
Small fixes
2016-06-08 21:06:04 +02:00
Tomas Groth
fe8aa2a9e3
Make transposing work for lyrics with verse tags.
2016-06-07 22:53:56 +02:00
Tomas Groth
3d98d60d59
Implement chord transposing in the lyrics editor.
2016-06-07 22:21:21 +02:00
Tomas Groth
0ee555cd84
Some code formatting.
2016-06-07 22:13:21 +02:00
828741ec84
Remove testing verbosity flag
2016-06-07 06:21:07 -07:00
5fe54b5907
Beauty spa for the htmlbuilder
2016-06-07 06:12:22 -07:00
0d2745a1d1
Fix bug #1589815 by first reducing the string to digits only and then checking if there's anything left.
2016-06-07 09:35:06 +02:00
Tomas Groth
ca2b466cfd
Connected transpose buttons to methods.
2016-06-06 22:18:26 +02:00
2443b94eda
Convert htmlbuilder strings to Template()
2016-06-06 08:16:09 -07:00
Tomas Groth
75e9291603
Added transpose buttons to song lyric editor - not functional yet.
2016-06-05 22:31:23 +02:00
Tomas Groth
82d5c6dcb2
Make chords.js a bit more readable.
2016-06-05 22:30:22 +02:00
ian@knightly.xyz
d690366595
Adds automatic functionality to the max-height for non-text items feature, and sets this as the default value.
...
Advanced tab spin box replaced with combo box.
Test coverage expanded on other functions in listpreviewwidget and pep8 errors fixed.
Fixed test naming.
Merged with trunk as of 2016-06-02_10:30.
lp:~knightrider0xd/openlp/non-text-item-height-default (revision 2674)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1584/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1 ...
bzr-revno: 2674
2016-06-05 15:09:57 +01:00
suutari-olli
8f7f9f9804
- Removed one old comment related to old setting and old solution
2016-06-05 15:32:57 +03:00
suutari-olli
9990472586
- Merged trunk on 5.6.16
...
- Removed some additional error messages from "Search while typing"
(Count verses not found in both bibles, no Bibles installed)
2016-06-05 15:15:51 +03:00
suutari-olli
4f5abd290f
- Created "def verse_search_while_typing"
...
/ This does not trigger web bibles error message and is
used during search while typing.
- Removed the new/old setting created for the old solution
2016-06-05 14:03:28 +03:00
a4483af5b4
Revert htmlbuilder for now
2016-06-04 01:03:25 -07:00
ed7ea01f43
Tests fixes and updates
2016-06-03 22:38:51 -07:00
598d715de6
Initial string conversions for variable templates
2016-06-03 17:15:19 -07:00