Commit Graph

13967 Commits

Author SHA1 Message Date
suutari-olli
7721b853af Changed the requested python2 stuff into python 3 stuff. 2016-05-02 11:06:05 +03:00
suutari-olli
f5e7e932d1 Improved a bunch of comments. 2016-05-02 09:54:15 +03:00
suutari-olli
8e20bfa19c - Renamed one new function to better describe the action
- Removed 3rd empty line after imports
2016-05-02 08:32:16 +03:00
suutari-olli
8865b47afd Improved the UI message for the new setting. 2016-05-02 07:56:56 +03:00
suutari-olli
7f4cd5f4c0 Removed # Cherry comment which I made earlier to locate some code. 2016-05-02 07:36:05 +03:00
suutari-olli
bb6555349b Improved one comment. 2016-05-02 07:31:01 +03:00
suutari-olli
a77ce8bff5 - Fixed the setting. (Was directed to another setting on one connection)
- Pep8
2016-05-02 07:26:08 +03:00
suutari-olli
69b374f27b - Added "Search while typing" feature for Bible Quick search.
- Added a Setting for controlling this ^^ behaviour
- Refactored some code to avoid duplicate error messages
2016-05-02 07:16:15 +03:00
suutari-olli
4e3ce9d596 New line is now after ( in biblestab, hopefully this fixes pep8. 2016-04-30 03:14:08 +03:00
suutari-olli
09a084be18 - Removed un-needed import that was added earlier
- Pep8 fixes
2016-04-30 03:07:36 +03:00
suutari-olli
10c4118583 Added a test for checking that all the general required stuff is called on quick search. 2016-04-30 02:58:07 +03:00
suutari-olli
8345d1bb1e Code cleanup, (Removed def banana) 2016-04-29 02:35:32 +03:00
suutari-olli
433b19ed75 Reworked UI messages on new settings, pep8 fixes. 2016-04-29 01:45:05 +03:00
suutari-olli
c9680a40dc Added a setting for automatically resetting the Quick search type to "Combined" on startup.
This setting is by default enabled. (I Feel like some users may get confused if their search
has changed to Text or Reference)
2016-04-29 01:20:42 +03:00
suutari-olli
aa2720da40 Merged trunk on 28.4.16, removed broken test. 2016-04-28 23:12:34 +03:00
suutari-olli
0217ecae2b Commit for merging trunk.
This also has a broken test.
2016-04-28 19:28:45 +03:00
1744032383 Fix bug #1557514 by auto-detecting the columns of the tables in the songs database
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1557514 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1503/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1414/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1352/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1148/
[SUCCESS] https://ci.openlp...

bzr-revno: 2654
Fixes: https://launchpad.net/bugs/1557514
2016-04-27 22:44:03 +01:00
60f3ae195c Forgot to add the test file 2016-04-27 23:23:16 +02:00
7262345912 Fix bug #1557514 by auto-detecting the columns of the tables in the songs database
Fixes: https://launchpad.net/bugs/1557514
2016-04-27 20:58:35 +02:00
ian@knightly.xyz
f4697a6051 Added QR code and link to iOS remote app and test to HTML Builder.
lp:~knightrider0xd/openlp/ios-app (revision 2650)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1499/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1410/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1348/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1145/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/736/
[SUCCESS] https://ci.openlp.io/job/B...

bzr-revno: 2653
2016-04-27 17:57:34 +01:00
second@tgc.dk
69b3cd34d3 Added support for importing SWORD bibles using PySword.
bzr-revno: 2652
Fixes: https://launchpad.net/bugs/785625
2016-04-27 17:56:58 +01:00
Tomas Groth
72c435633c fix merge issues 2016-04-26 21:04:22 +02:00
Tomas Groth
58ac52a30e merge trunk 2016-04-26 20:58:03 +02:00
chris@minkus.me.uk
b43349e3ea Natural sort for authors, topics, songbooks, themes in Edit Song comboboxen & Song Maintenance form, as mentioned previously by Raoul - Matthew 21:28–29! :)
Also some minor fixes that I picked up after merge 2637 for natural sorting:
x Author, Topics, Theme search were performing two sorts (one database sort, then a natural sort in code). Removed the first database sort.
x Changed all sorting to use in-place sort() rather than copy sorted(), as apparently there's a speed bonus (http://stacko...

bzr-revno: 2651
2016-04-26 17:07:18 +01:00
Ian Knight
56f5bbac52 Testing 2016-04-26 12:17:38 +09:30
Ian Knight
b8173f7f0e Added Test to HTML Builder 2016-04-26 12:13:29 +09:30
Chris Hill
a5cd1e15bc resolve pep8 W293 warning 2016-04-25 12:01:32 +01:00
Chris Hill
bb15b4ce71 merge w/ trunk 2016-04-25 11:54:08 +01:00
Chris Hill
1e9b7148f5 Resolve pep8 errors - separate def, two line split 2016-04-25 11:53:20 +01:00
Tomas Groth
ebaf99f4fb Fix traceback 2016-04-23 20:33:53 +02:00
907e1df129 - Update string format to Python3 style
- Added projector multiple lamp values test
- Updated strings for translation (they should all be ok now)
- Fix merge conflicts (projector_pjlink1 and projector_ui tests)

Convert string format from Python2
     '%s %s' % (value1, value2)
to Python3
     '{key1} {key2}'.format(key1=value1, key2=value2)

Jenkins down - local pep8 and tests (except windows tests) passed.

Previous Jenkins test:
--------------------------------
lp:~alisonken1/openlp/string...

bzr-revno: 2650
2016-04-23 14:48:27 +01:00
Tim Bentley
071a4438e9 Finish moving things around
bzr-revno: 2649
2016-04-23 14:46:59 +01:00
Tim Bentley
fed2466ad6 Add Icon and defense tests for missing mediainfo
bzr-revno: 2648
2016-04-23 14:45:55 +01:00
Tim Bentley
37ea1c5da1 fix 2016-04-22 20:25:28 +01:00
Tim Bentley
f2784decc7 fix 2016-04-22 20:04:17 +01:00
Tim Bentley
d9d31c4626 tests 2016-04-22 19:35:23 +01:00
Tim Bentley
123a7f02a7 yet more files 2016-04-22 19:32:59 +01:00
Tim Bentley
0d755e3354 more files 2016-04-22 19:32:45 +01:00
Tim Bentley
38996c81cc more files 2016-04-22 19:25:57 +01:00
Tim Bentley
20acc90951 Pep8 2016-04-22 17:37:21 +01:00
bec015142b Merge trunk to fix conflicts 2016-04-22 04:41:29 -07:00
suutari.olli@gmail.com
f0d75a29c2 This branch introduces the following fixes/features:
- Fixed bug 1565447 (Unable to save panel visibility if View mode is used)
  (Added a hidden setting for controlling this)
- Locking Panels now also locks “View” menu so view menu can’t
  be set if panels are locked.
- Panels are now locked by default, this prevents users from
  totally messing their UI so easily.
- Added a checkbox for disabling/enabling Projectors during first time wizard
  (By default disabled, added a hidden setting fo...

bzr-revno: 2647
Fixes: https://launchpad.net/bugs/1508582, https://launchpad.net/bugs/1565447
2016-04-21 22:16:24 +01:00
Tim Bentley
59b3c7b053 head 2016-04-21 17:27:04 +01:00
Tim Bentley
bd8ddf7506 fix tests 2016-04-21 17:26:34 +01:00
gabriel.loo@gmail.com
c3e27b44f0 Disable the search box while a search is being performed and re-enable it after search is done or the Stop button is pressed. This way it behaves like the Search button and prevents the user from submitting multiple searches while another is ongoing (this is what caused the segfault).
bzr-revno: 2646
Fixes: https://launchpad.net/bugs/1570228
2016-04-21 17:03:36 +01:00
Tomas Groth
89ce4131e7 Skip pysword tests is pysword isn't installed. 2016-04-20 21:29:04 +02:00
Tim Bentley
f2537981e4 update 2016-04-20 17:36:37 +01:00
Chris Hill
4b088acc93 Coding standards fix - E731 do not assign a lambda expression, use a def for pep8 2016-04-19 20:32:23 +01:00
Chris Hill
d76965f8fd Extracted lambdas from sorts in song plugin - improve performance 2016-04-19 20:00:45 +01:00
suutari-olli
a0859a5694 Noticed I had created 2 unneeded blank lines to test file. 2016-04-18 21:30:22 +03:00