Commit Graph

14505 Commits

Author SHA1 Message Date
Tomas Groth
595fd90d45 Fix some errors on windows 2016-11-29 14:06:54 +01:00
ef7f0b1389 Fix pep8 2016-11-25 16:21:27 +02:00
d0ed37e1d5 Move contents of html files into actual html files 2016-11-25 16:17:34 +02:00
846476c4ad Stop wizards from resizing themselves based on the contents of comboboxes 2016-11-25 15:58:33 +02:00
826bfd02dd Add a WordProject Bible importer 2016-11-24 23:48:51 +02:00
second@tgc.dk
20ab44be0f Continuation of lp:~suutari-olli/openlp/bug-fixes-2-4-3
This branch fixes the following bugs:
Bug #1487788: Importing photos does not give focus to OpenLP
Bug #1512040: Loop tooltip gets stuck to "Stop playing..."
Bug #1513490: List of authors uses localized "and" instead of English
Bug #1624661: Missing DB in unmounted disk results in Traceback 

bzr-revno: 2706
2016-11-22 21:34:14 +01:00
Tomas Groth
8275f1139a Change tests to reflect change. 2016-11-21 22:07:01 +01:00
Tomas Groth
b31d5ad08e pep8 fix 2016-11-21 21:56:48 +01:00
Tomas Groth
5e600f4417 Change the text for missing data path text. 2016-11-21 21:21:31 +01:00
Tomas Groth
f83d9ad520 Insert real button label in text to make sure it shows correct text. 2016-11-20 21:24:11 +01:00
phill.ridout@gmail.com
f6de30de23 Move the "no results" code in to the list widget.
lp:~phill-ridout/openlp/no-results (revision 2709)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1839/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1750/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1688/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1434/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1024/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_...

bzr-revno: 2705
2016-11-16 00:44:11 +02:00
phill.ridout@gmail.com
1b8a710b16 Move some code in to the searchedit module
lp:~phill-ridout/openlp/search_edit (revision 2705)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1835/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1746/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1684/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1430/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1020/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analys...

bzr-revno: 2704
2016-11-14 14:14:38 +02:00
Philip Ridout
9133c078c7 Pep againbzr pushbzr push 2016-11-12 11:50:06 +00:00
Philip Ridout
f031df3637 Fixed Tests 2016-11-12 11:19:52 +00:00
Philip Ridout
6a3982bab9 Moved over to using UiStrings 2016-11-12 10:00:36 +00:00
Philip Ridout
906f9af54b removed TODO comment 2016-11-12 08:34:55 +00:00
Philip Ridout
9f90b89076 PEP fixes 2016-11-11 21:28:11 +00:00
Philip Ridout
80793f9412 Modified SaveEdit, so that it saves the chosen search type 2016-11-11 21:23:03 +00:00
Philip Ridout
7a2df5eab3 Added test! 2016-11-11 20:50:47 +00:00
Philip Ridout
426cd13fd0 fix if statment 2016-11-11 19:19:59 +00:00
Philip Ridout
94fca706ff Move no results functionality to the ListWidgetWithDnD 2016-11-10 07:09:04 +00:00
phill.ridout@gmail.com
389fb391df Regenerated resources for my earlier resource clean up merge77
lp:~phill-ridout/openlp/bug1623711-part2 (revision 2703)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1813/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1724/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1662/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1416/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1006/
[SUCCESS] https://ci.openlp.io/j...

bzr-revno: 2703
2016-11-05 14:16:40 +02:00
Philip Ridout
3d07ec5a09 Regen resources 2016-11-02 19:24:33 +00:00
phill.ridout@gmail.com
09fb235999 lp:~phill-ridout/openlp/bug1623711-2.4 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1806/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1717/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1655/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1411/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1001/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1069/
[SUCCESS] https://ci.openlp.io/j...

bzr-revno: 2702
2016-11-01 21:01:29 +00:00
phill.ridout@gmail.com
f92dbeeb7a Added a script to clean up the resource folder.
Ran script and made some other resource cleanup code changes.


Add this to your merge proposal:
--------------------------------
lp:~phill-ridout/openlp/resource_clean_up (revision 2705)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1803/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1714/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1652/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests...

bzr-revno: 2701
2016-11-01 21:00:24 +00:00
Philip Ridout
053da160a3 Diverged branches? 2016-11-01 19:22:39 +00:00
Philip Ridout
87fede54dc Fixes #1623711* 2016-11-01 19:17:57 +00:00
Philip Ridout
ec19cc5f07 Modified some resources and added test 2016-10-30 08:29:22 +00:00
Philip Ridout
7db45b7ce6 Found some more appropiate sized images. Removed some duplicates 2016-10-27 21:37:33 +01:00
Philip Ridout
a2e36b447f Ran said script 2016-10-27 18:49:44 +01:00
Philip Ridout
a9c482e788 Added a script to automatically clean up the resources folder 2016-10-27 18:48:18 +01:00
Philip Ridout
997cb859d3 Changed some icons to use svg 2016-10-27 18:45:50 +01:00
tim.bentley@gmail.com
a4d623a3c0 My dad needed a report of all the songs on their database, they had 1800.
Made this into a reporting option and cleaned up the menu.
Fixed some errors spotted as well

Fixed issues and comments
1800 songs takes about 3 secs to run on my i7

lp:~trb143/openlp/reporting (revision 2701)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1801/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1712/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1650/
[SUCCESS] https://ci....

bzr-revno: 2700
2016-10-26 19:10:24 +01:00
Tim Bentley
f56a86f377 Fix titles 2016-10-26 19:02:57 +01:00
Tim Bentley
885d70307e Fix song bug with formatting 2016-10-25 21:34:48 +01:00
Tim Bentley
e6571644dd head 2016-10-23 20:24:53 +01:00
7acfe1dbfd Add new branding to OpenLP for when we get to 2.6 2016-10-23 20:28:30 +02:00
suutari.olli@gmail.com
bbf93bdf7c - Replaced Escape item with "Show desktop"
(Same as blank to desktop,  but does not unblank).
- Combined Offline & Online help buttons into "User Manual" button,
  which launches the appropriate help based on OS. (Offline for Win/Mac)
- Improved blank to modes shortcut descriptions.
- Setting migration for old help/escape help keys.

- Fixed bugs:
https://bugs.launchpad.net/openlp/+bug/805082
https://bugs.launchpad.net/openlp/+bug/1612187
https://bugs.launchpad.net/openlp/+bug/1616441
https...

bzr-revno: 2699
2016-10-18 18:04:50 +01:00
Olli Suutari
aef0941e18 - Modified the def create_separated_list by suggestions of TRB143 2016-10-17 22:42:07 +03:00
Olli Suutari
a7b4d001c7 - Merged trunk and fixed conflict. 2016-10-17 20:40:45 +03:00
suutari.olli@gmail.com
ed647f2828 Fixed the issue where web bible's result in traceback in "Search while typing"
(by removing one miss-placed line)

This branch also fixes the issue where the new "Clear Bible search results" and 
"Lock button" give focus to Text search if it is used in "Select" tab.

lp:~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick (revision 2707)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1775/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Fun...

bzr-revno: 2698
2016-10-17 17:36:09 +01:00
Olli Suutari
b3d537eec8 - Merged trunk on 17/10/16 2016-10-17 07:29:35 +03:00
Olli Suutari
98b51a1db8 - Code cleanup 2016-10-17 07:29:08 +03:00
Olli Suutari
340b2f3298 - Actually fixed the missing DB bug. 2016-10-17 07:17:33 +03:00
second@tgc.dk
5d24b2c473 Fixes getting bible texts from CrossWalk
Fix to handling of form feed char and vertical tab char.

bzr-revno: 2697
2016-10-04 17:41:43 +01:00
Olli Suutari
0887ca6645 - Removed self from def handle_db_error 2016-10-04 17:21:40 +03:00
Olli Suutari
5d9d76f62d pep8 2016-10-04 17:14:28 +03:00
Olli Suutari
39916d59ed - Attempt to fix jen 2016-10-04 17:09:53 +03:00
Olli Suutari
97d828af43 - Added pip's fix for sword test 2016-10-04 16:48:54 +03:00
Olli Suutari
3c733ddd20 - Merged trunk on 4.10.16 2016-10-04 16:39:14 +03:00