raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,335 Commits 5 Branches 0 Tags 296 MiB
Commit Graph

10860 Commits

Author SHA1 Message Date
suutari-olli acde9cad5e - Fixed the dot chechk method. 
(No longer removes dot after numbers, eg. 1.)
 2016-05-15 18:04:15 +03:00
Ken Roberts f51132e876 core/common convert strings to python3 format 2016-05-13 21:24:46 -07:00
tim.bentley@gmail.com f37722dd73 "Allow themes to have video files so allow for background videos behind text. 
move string to python 3 format

lp:~trb143/openlp/background_videos (revision 2692)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1522/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1433/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1371/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1167/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Test..."

bzr-revno: 2659
 2016-05-12 23:00:54 +02:00
Ken Roberts c58ce31e8b "Convert __init__.py file strings from python2 to python3 format 
Python2 "%s text" % value1
Python2 "%s text %s" % (value1, value2)
Python3 "{var1} text {var2:02d}".format(var1=text, var2=number)

- String conversions in init files
- Added test for projector power state change
- Remove extraneous print() call in mediainfo plugin
- Fix translate() string formatting
- Revert string format for re.compile() until further testing is done
- Skip crosswalk.com test until their server is fixed

-----..."

bzr-revno: 2658
 2016-05-12 22:34:57 +02:00
suutari-olli 7e5b49ffdf - Merged trunk on 11.5.16 2016-05-11 18:37:58 +03:00
suutari-olli ba4cd29b4c - Improved the timer method, resulting in much smoother searches. 2016-05-11 18:35:35 +03:00
suutari-olli 524adae71f - Pep8 fixes 2016-05-10 14:13:41 +03:00
suutari-olli 46e7ad4983 - Changes based on comments by TRB143 2016-05-10 14:06:00 +03:00
Tim Bentley 33eb1ba274 remove rogue print 2016-05-10 05:40:59 +01:00
Tim Bentley df654d72fb change net to com 2016-05-10 05:36:25 +01:00
suutari-olli 77e9e1ad27 Lowercapped bunch of stuff, splitted expection error 2016-05-10 04:55:26 +03:00
suutari-olli d7f3e4a9f2 Lowercapped some settings. 2016-05-10 04:11:49 +03:00
suutari-olli bd9c9a8430 - Merged trunk 2016-05-10 03:58:37 +03:00
suutari-olli e4bce11a03 Commiting for merging trunk, some new changes. 2016-05-10 03:53:14 +03:00
Tomas Groth fa9a29d303 Fix crosswalk bible list download 2016-05-06 07:33:43 +02:00
Tomas Groth 7ee0af01b2 fix traceback if bible list download fails. 2016-05-05 22:30:00 +02:00
Ken Roberts 9ac95cf665 Skip crosswalk.com test while server down 2016-05-05 12:37:48 -07:00
Ian Knight 55002518ef Added Functional Tests, cleaned PEP8 errors 2016-05-06 04:27:32 +09:30
Tomas Groth 26e72a1fec make mediainfo detection work on win and mac. 2016-05-05 20:17:45 +02:00
Tomas Groth 907282d3cd make mudraw/mutool detection work on mac 2016-05-05 20:14:33 +02:00
Ken Roberts 72fc30d600 merge trunk 2016-05-05 08:51:07 -07:00
Ken Roberts 16c0ebfcda Revert regex string conversion until more testing 2016-05-05 08:41:48 -07:00
Ian Knight bc6253a627 Housekeeping, added check for thumbnails to avoid icon scaling issues 2016-05-05 13:27:04 +09:30
Tomas Groth 166b222765 trunk 2016-05-04 22:05:46 +02:00
Ian Knight a2bc59b3d9 Merge from trunk 2016-05-04 21:50:37 +09:30
Ian Knight f0d7cf7f36 Corrected aspect ratio on slide previews 2016-05-04 21:40:42 +09:30
Tim Bentley 51613fd32d fix strings 2016-05-02 09:12:39 +01:00
suutari-olli 006a90aca7 Added . to the end of web bibles sentence. 
is installed as Web Bible.
 2016-05-02 11:09:44 +03:00
suutari-olli 7721b853af Changed the requested python2 stuff into python 3 stuff. 2016-05-02 11:06:05 +03:00
Tim Bentley 0efd1931b4 head 2016-05-02 09:05:47 +01:00
suutari-olli f5e7e932d1 Improved a bunch of comments. 2016-05-02 09:54:15 +03:00
Ken Roberts e42c6a9071 - Convert strings in mainwindow.py 
- Convert strings in maindisplay.py
- Added test for projector Manufacturer.__repr__()
- pep8 in tests/functional/openlp_plugins/songs/test_openlpimporter.py

--------------------------------
lp:~alisonken1/openlp/strings_mainwindow (revision 2656)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1512/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1423/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1361/
[SUCCESS] https://ci.o...

bzr-revno: 2656
 2016-05-02 06:49:54 +01: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
Tim Bentley 6d7039ed41 minor fixes 2016-04-30 18:19:55 +01:00
Tim Bentley 162f1ecbe9 remove old loop 2016-04-30 16:49:06 +01:00
Tim Bentley c80f45320b video theme creation 2016-04-30 16:40:23 +01:00
Tim Bentley 8094cd051a head 2016-04-30 10:35:54 +01:00
Tim Bentley 6158a0672c background videos 2016-04-30 10:34:37 +01:00
Tomas Groth b7a32ebbb2 Added support for using the new mutool in mudraw mode 2016-04-30 11:05:10 +02: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
Ken Roberts 5601e61c0f Convert strings to python3 in mainwindow 2016-04-29 13:25:12 -07:00
Samuel Mehrbrodt 30dc1bd2eb Unused import 2016-04-29 18:44:24 +02:00
Samuel Mehrbrodt 48c5737bd1 Fix comment 2016-04-29 18:43:14 +02:00
Samuel Mehrbrodt d636461cbb Fix performance in songbook search 
Speedup by ~500%

Fixes: https://launchpad.net/bugs/1552563
 2016-04-29 18:30:17 +02: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
raoul@snyman.info 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
suutari-olli 31ede5556d Added this to program startup code, should replace_service_manager_item ever crash the program. 
Settings().setValue('core/is live item edited and replaced', False)
 2016-04-27 23:38:46 +03:00
Raoul Snyman 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
Ken Roberts d3d6e6c620 Missed translate() string format 2016-04-27 05:49:55 -07: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 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
Ken Roberts 884f060dea Oops and text in projector test 2016-04-24 04:22:04 -07:00
Ken Roberts 28e14012a8 Remove unneeded print statement 2016-04-24 04:04:32 -07:00
Ken Roberts 292606ba38 Fix translate() string format and some missed conversions 2016-04-23 14:38:43 -07:00
Ken Roberts 3e0769d946 Fix extraneous print() in media plugin 2016-04-23 14:12:28 -07:00
Ken Roberts d5b98b7308 Added projector power test 2016-04-23 12:55:47 -07:00
Ken Roberts 591ed15ab7 Merge upstream 2016-04-23 12:28:52 -07:00
Tomas Groth ebaf99f4fb Fix traceback 2016-04-23 20:33:53 +02:00
Ken Roberts 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
Ken Roberts c1222dc2bb Convert strings to python3 in __init__ files 2016-04-22 17:40:59 -07:00
Tim Bentley f2784decc7 fix 2016-04-22 20:04:17 +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
Ken Roberts 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
Tim Bentley f2537981e4 update 2016-04-20 17:36:37 +01:00
suutari-olli 55061b8fc1 - Added two tests for checking if doubleclicking preview should add item to service or send it to live. 2016-04-20 18:56:10 +03: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
Ian Knight 631aea771e Housekeeping 2016-04-18 16:26:28 +09:30
Ian Knight dffac25933 Ran generate_resources.sh 2016-04-18 16:24:49 +09:30
Ian Knight 225708102c Added QR code and link for iOS app to remote plugin ui 2016-04-18 15:05:21 +09:30
Ken Roberts b5c9f96ccf oops fix - typo 2016-04-17 16:57:33 -07:00
Ken Roberts b2ed6bb84c Fix split in string formatting 2016-04-17 16:47:44 -07:00
Chris Hill a38daf9779 natural sort for theme in edit song form 2016-04-17 22:41:29 +01:00
Chris Hill 2dd3cdc5ea Remove theme natural sort - already done by filename 2016-04-17 22:32:42 +01:00
Chris Hill 66fc2ff7c3 merge w/ trunk 2016-04-17 22:23:50 +01:00
Chris Hill 0c8f9e3b71 Removed auto-select for searches where multiple IDs selected, added tests to hide temporary songs 2016-04-17 22:22:30 +01:00
Tim Bentley 1942a8ac14 fix 2016-04-17 21:11:55 +01:00
Tim Bentley bdeff60a97 updates 2016-04-17 20:32:15 +01:00
Tim Bentley 34f00cda92 dnd and files 2016-04-17 20:09:46 +01:00
Tim Bentley b2147045b2 colorbutton2 2016-04-17 20:06:17 +01:00
Tim Bentley 6767ba504c colorbutton 2016-04-17 19:57:03 +01:00
Ken Roberts f6cb085b0d "- Update string format to Python3 style 
- Added projector lamp values test

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

--------------------------------
lp:~alisonken1/openlp/strings_projector_pjlink (revision 2642)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1442/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1359/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1297/
..."

bzr-revno: 2645
 2016-04-17 17:33:08 +02:00
suutari-olli 518dde5d2d - Removed _ from end of one setting name. 
- Fixed ident on replace_service_manager
 2016-04-17 15:40:34 +03:00
Ken Roberts 278ec2bed2 Update projector UI strings to Python3 format 2016-04-17 02:15:23 -07:00
suutari-olli c046ba95d9 Made a better fix for fixing bug where display is unblanked on editing current live item. 
This now sets a hidden setting to true while processing Live item and then changes it back to false.
Display is thus not unblanked at all during the process. (Old fix showed the edited slide for a small time)

Downside: All the new tests were based on the old method and thus they were removed.
 2016-04-17 06:50:54 +03:00
suutari-olli 0563c6372f Made a better fix for fixing bug where display is unblanked on editing current live item. 
This now sets a hidden setting to true while processing Live item and then changes it back to false.
Display is thus not unblanked at all during the process. (Old fix showed the edited slide for a small time)

Downside: All the new tests were based on the old method and thus they were removed.
 2016-04-17 06:43:25 +03:00
suutari-olli bf3cad050c Turned the new setting into question. 2016-04-17 04:52:45 +03:00
suutari-olli 5dbb69430f Fixed bug 1462420 (Double click on the preview duplicated the element in the service manger) 
- Added a hidden setting for controlling this behaviour. 
 It is reset if any item is sent to preview from library.
 Sending the same item to service multiple times is still possible by using the "Add icon"
 2016-04-17 04:36:53 +03:00
suutari-olli 69af91edef - Fixed bug 1462420 - Double clicking Preview adds item to Service countless times 
(Added hidden setting for controlling this, it is set to True once double clicking
  has added item to Service and gets reset to False once new item is sent to preview.
 2016-04-17 04:13:39 +03:00
Ken Roberts 37bae16307 String formatting 2016-04-16 14:32:56 -07:00
ian@knightly.xyz dadff3c4de Allows users to change the automatic scrolling behaviour for when a new slide is selected. 
Currently on selecting a new slide, the next slide will be scrolled into view.
The changes provide a combo-box in the advanced settings that allow users to select additional options (see branch description for details).

Additional bounds checking and unit tests have been added to support this.

This latest proposal also contains additional input validation and testing thereof for values from Settings(...

bzr-revno: 2644
Fixes: https://launchpad.net/bugs/1550858
 2016-04-16 22:01:22 +01:00
suutari.olli@gmail.com 6df9cbeb47 "In this re-proposal: 
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

--------------------------------------------------------------------------------------------------------------

- Merged to trunk on 13.4.16, tests are now passing.

lp:~suutari-olli/openlp/show-no-log..."

bzr-revno: 2643
Fixes: https://launchpad.net/bugs/1512038
 2016-04-16 21:51:35 +02:00
Ian Knight f8718ee1cb Added extra validation checks and matching tests to __recalculate_layout(), row_resized(), replace_service_item() & change_slide() 2016-04-17 02:05:08 +09:30
Ian Knight 665a35b085 Cleaned up extra brackets 2016-04-17 01:20:58 +09:30
Tim Bentley 40981701e9 fix checks 2016-04-16 15:43:31 +01:00
suutari-olli 49dca3a0f9 - Changed how preset enabled setting is called 
- Changed the Projectors desription
- Changed Show .ppt .odp and pdf presentations to files.
 2016-04-16 16:58:28 +03:00
Tim Bentley b8bbb4391c move code from presentations 2016-04-16 14:51:42 +01:00
Ken Roberts d92757af97 Convert strings to format() method 2016-04-16 01:08:45 -07:00
Ian Knight ae6e6baeca Added comments 2016-04-16 16:44:04 +09:30
Ian Knight c8172d882f Merged from trunk 2016-04-16 16:32:36 +09:30
Ian Knight 26e8dde0ea Implemented feature, cleaned pep8 errors 2016-04-16 16:30:48 +09:30
Ian Knight 17d9bf0adc Implemented auto-scroll-choice 2016-04-16 16:23:01 +09:30
Tomas Groth 6f975654cc Added tests. 2016-04-15 22:34:20 +02:00
suutari-olli 9f5426abdc Added short descriptions for enabling/disabling plugins, improved the messages. 2016-04-15 21:48:27 +03:00
suutari-olli 4520403387 - Added checkbox for controlling the visibility of Projectors panel in 1st time wiz. 2016-04-15 19:06:14 +03:00
Gabriel Loo 3bca28fa0f fixed bug #1570228 'App crashes on SongSelect Importer search' 
Fixes: https://launchpad.net/bugs/1570228
 2016-04-14 04:18:53 -04:00
suutari-olli c9065a286a Added a setting that hides/shows Projectors panel after first time wizard. 
This still needs a visual UI (Aka checkbox to wizard)
 2016-04-14 10:19:59 +03:00
suutari-olli 2b35156931 - Changed default setting from False to True for 'user interface/lock panel': True 
(This has caused countless cases of users messing up their UI and not knowing how to fix it)
 2016-04-14 04:17:36 +03:00
suutari-olli 217ecbbfb0 - Removed # Banana and # Cherry comments, which I created to find parts of the code. 
(Cherry was replaced with actual comment)
 2016-04-14 04:10:59 +03:00
suutari-olli d51910b6a0 In this commit: 
- Fixed bug 1565447 (Unable to save panel visibility if View mode is used)
- Locking panel visibility now makes the Mode menu unavailable.
 2016-04-14 03:59:24 +03:00
Tim Bentley 317364ca7e pep8 2016-04-13 20:15:53 +01:00
Tim Bentley 6bac0cee26 pep8 2016-04-13 19:39:39 +01:00
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 cc9f89bfdb Splitted mail adress away expection error text, now inserting it with %s 2016-04-13 19:49:30 +03:00
suutari-olli feb549a8e7 - Capitalized references to plugin/panel names in settings. (Live etc.) 
- Added: self.BackgroundColorColon = translate('OpenLP.Ui', 'Background color:') to uistrings.
  This is now used in players tab, alerts tab and images tab.
- Added space before "s" and "pt" units.
 2016-04-13 19:14:35 +03: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 5fa0687762 Changed spelling of live back to Live (Capitalized) on settings. 2016-04-13 17:22:56 +03:00
suutari-olli 2f6870ed8a Merged trunk on 13.4.16 2016-04-13 17:12:28 +03:00
suutari-olli 33078b426f - Reverted the Powerpoint > PowerPoint changes. 2016-04-13 17:10:47 +03:00
suutari-olli bb43a6b417 Merged trunk on 13.4.16 2016-04-13 00:12:49 +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 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
suutari-olli 6a0108ced1 - Changed: Clicking on selected slide in live advances to the next effect to Clicking on current slide in live advances to the next effect 2016-04-12 15:58:00 +03:00
suutari-olli 42b72ab3a6 Added back the last missing * 2016-04-12 06:08:47 +03:00
suutari-olli 4af785bf1d - Re-did some of the changes. 
- Fixed Powerpoint to PowerPoint in presentation controllers and one error.
 2016-04-12 05:29:10 +03:00
suutari-olli 6273cc911d Merged trunk on 11.4.2016 2016-04-11 00:17:03 +03: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 cb421a8fd7 In this commit: 
- Cleanup of the scripture reference error. (Now using full names, removed one un-needed line)
- Added more comments
- Removed def get_verses_combined, now triggering the error message on mediaitem based on search mode instead.
 2016-04-10 21:50:22 +03:00
suutari-olli c5f0f86cbb In this commit: 
- Removed version number from main window name
- Removed version number from remote window names
- Reworked the traceback error message (New text, added margin to right)
- Changed typing of "Live" to live in start live items automatically on media tab.
- This is the actual changelog for last rev, commited it by mistake before removing one comment.
 2016-04-10 02:55:24 +03:00
suutari-olli dafbc3f054 In this commit: 
- Removed version number from main window name
- Removed version number from remote window names
- Reworked the traceback error message (New text, added margin to right)
 2016-04-10 02:51:41 +03:00
suutari-olli c0311ed8c9 Noticed the identification for scripture reference error got messed at some point, fixed it. 
Also renamed "Interval" to "gap" to make constructing the message less painful.
 2016-04-10 00:08:49 +03:00
suutari-olli e233631c3d Merge to trunk on 9.4.16 2016-04-09 23:06:10 +03:00
suutari-olli 074ed7e3b9 - Fixed layout for the new setting, cleanup for biblestab.py from process. 2016-04-09 22:53:32 +03:00
suutari-olli eca11970f8 Added "Search Settings" > "Don't show error fofr no results in combined quick search" checkbox 
for controlling whetever no results message is shown or not.
 2016-04-09 22:29:44 +03:00
suutari-olli 34231003ce Noticed "No bibles available" was defined 3 times > Moved it to uistrings. 
Added "Must have bibles" condition for other error messages in combined search.

To do:

Add a setting for controlling visibility of the no results error, it may be of annoyance.
Tests...
 2016-04-09 17:43:02 +03: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
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
suutari-olli 54f720e5a2 In this merge: 
Splitted scripture reference error into small pieces, built error from them.
This still needs to be moved away from uistrings.py
 2016-04-06 07:09:35 +03:00
Tim Bentley 31a2b37a88 pep8 2016-04-05 21:07:57 +01:00
Tim Bentley 7c88006c7b fix tests 2016-04-05 19:44:50 +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 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
suutari-olli e94bf8acd9 - Noticed I had left an old comment to a wrong place. (Moved it to def on_quick_reference_search) 2016-04-04 04:11:42 +03:00
suutari-olli edcf0379ee Noticed one line was longer than 120, splitted it. 2016-04-04 03:43:29 +03:00
suutari-olli 1d67072dfd In this merge: 
Refactored the code for combined search.
- Added: def on_quick_reference_search(self): and moved definition of reference search there.
- Added: def on_quick_text_search(self): and moved definition of text search there.
- Removed some un-needed code duplicates (Double finalizing, 3rd normalizing of mouse cursor)
- Searching scripture ref with shorter than 3 char search is now possible (G1 = Genesis 1)

Also removed “Search” from “Search Text or Reference…” since it does not fit the box properly.
 2016-04-04 02:55:10 +03: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
suutari-olli 447f7a9ead Merging to trunk on 3.4.16 2016-04-03 23:58:06 +03:00
Tim Bentley a0bfc7d069 move methods 2016-04-03 20:44:09 +01:00
suutari-olli 6ad51f2b0b Added new icon for Preview. (Provided by superfly) 2016-04-03 22:12:37 +03:00
Tim Bentley 6fa0f07e32 head 2016-04-03 20:07:09 +01:00
Tim Bentley d7e2e0e839 remove import 2016-04-03 20:06:48 +01:00
chris@minkus.me.uk 5a3e5c655c Fixes bug #1280295 - 'Enable natural sorting for song book searches' using get_natural_key 
Now also includes natural sorting for author, topic, theme & CCLI number as well
Also refactors Songbook Search to make the database do filtering for performance rather than querying all then filtering
I've tested it on my database of 500-odd songs and it seems a little faster
Includes unit tests

--------------------------------
lp:~minkus/openlp/naturalsortsongs (revision 2519)
[SUCCESS] https://ci.op...

bzr-revno: 2637
Fixes: https://launchpad.net/bugs/1280295
 2016-04-03 16:57:52 +01:00
ian@knightly.xyz a0e004b68f Adds the ability to choose a maximum height for non-text slides in the list-preview-widget in slide controllers. See branch description for further details. May require sanity check. 
Changes since last proposal:
- Fixed copy-paste error in comments
- Shifted common test code into setup function as recommended.
- Testing max height doesn't exceed settings spin-box (as requested) not changed as any positive int is valid & spin-box values are arbitrary. (See reply to diff comments on r2630 for ...

bzr-revno: 2636
Fixes: https://launchpad.net/bugs/891860, https://launchpad.net/bugs/1550856
 2016-04-03 16:55:55 +01:00
suutari-olli 1739492520 This branch includes the following UI string changes: 
These changes mainly take place on mainwindow.py but few other strings are changed as well.

Media Manager, Projector Manager, Service Manager, Theme Manager, Preview Panel and Live Panel. 
have been renamed to:  ”Library, Projectors, Service, Themes, Preview and Live."
Tooltips/texts for these have been changed.

In "Configurate OpenLP":

- Changed typing for all labels to lowercase 
(Expect for starting videos automatically, that string may needs to be changed once bug related to that is fixed)

- Removed "Manager" from some strings since it's no longer used.

- Added dots to various tooltips / descriptions.

In advanced tab: Number of recent files to display: has been changed to Number of recent Service files to display:
 2016-04-03 18:54:39 +03:00
Tim Bentley 7424d6be8b More refactoring 
bzr-revno: 2635
 2016-04-03 16:54:13 +01:00
ian@knightly.xyz dd0ef0a17c Adds support for importing ProPresenter 5 and 6 files. See branch description for further details. 
lp:~knightrider0xd/openlp/propresenter_5-6_import (revision 2634)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1352/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1271/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1210/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1044/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface...

bzr-revno: 2634
Fixes: https://launchpad.net/bugs/1358601
 2016-04-03 16:44:04 +01:00
suutari-olli e8e893c842 Changed Live to live (lowercaps) for controlling this setting to match other settings. 2016-04-03 14:26:48 +03:00
Chris Hill 33cbda294d Coding standards fixes 2016-04-03 12:14:17 +01:00
Chris Hill ae394cf028 Minor fixes 2016-04-03 12:02:53 +01:00
Chris Hill efb71b4f31 Merge w/ trunk 2016-04-03 11:58:35 +01:00
Chris Hill 38c9ed1fd0 Merge w/ trunk 2016-04-03 11:57:57 +01:00
Chris Hill 330a1758c8 Use get_natural_key instead of _natural_sort_key 2016-04-03 11:57:39 +01:00
Ken Roberts 6bca1fc455 Fix decode() string error in about text - fix qt try/except error in projector 2016-04-01 20:04:15 -07:00
suutari-olli 7ef33d4715 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 easily distinguishable from blank to icons.

Replace Live background icon now uses Blank to theme icon. 
I feel like this describes it much better than “Blank to black”
 2016-04-01 21:59:51 +03:00
Tim Bentley ec30c560a7 move tests and code 2016-04-01 18:28:40 +01:00
Tim Bentley dbb07db257 fix PEP8 2016-04-01 18:15:45 +01:00
Tim Bentley 0678155400 fix PEP8 2016-04-01 18:09:47 +01:00
Tim Bentley abd2c16ccd fix links 2016-04-01 18:02:14 +01:00
Tim Bentley 203c7b9dd8 move historycombo 2016-04-01 17:56:54 +01:00
suutari-olli 10d68dad3f - Fixed issue where PPT/Impress is not unblanked on "Previous/Next" (Green arrows). 2016-04-01 18:12:19 +03:00
suutari-olli 12b63f8e71 Merged to trunk (1.4.2016) 2016-04-01 16:10:23 +03:00
suutari-olli 36d15615d1 - Changed comments related to "default image" to match "logo". 
- Removed one default_
 2016-04-01 05:32:36 +03:00
suutari-olli 4f5bb4f5eb Added empty newline to the end of generaltab.py 2016-04-01 04:45:46 +03:00
suutari-olli eee1301f4e In this branch: 
- Removed old "Default image" settings from advanced tab.
- Removed related imports and functions.
- Renamed def on_background_color_changed to on_logo_background_color_changed
 2016-04-01 04:11:28 +03:00
suutari-olli 79724872fd In this branch: 
- Renamed "Default image" and related settings to "Logo" etc.
- Moved these settings to General tab from Advanced tab
- Re-wired these settings to code functions

To do:

- Remove these from advanced tab.
- Verify tests still work
 2016-04-01 03:54:33 +03:00
suutari-olli 3aa7851c7d Added two tests for this. 
The other to check if visibility is changed to "True" for logo, the other for the opposite.

To do:

How to name this new setting? / Old "Default image" settings.
 2016-03-31 23:35:04 +03:00
Tim Bentley cd239fe802 fixes 2016-03-31 17:47:42 +01:00
Tim Bentley 4362ff63f8 language manager 2016-03-31 17:42:42 +01:00
Tim Bentley ba6d66497c actions 2016-03-31 17:34:22 +01:00
Tim Bentley 3693cf331d fix string in natural sort and move db 2016-03-31 17:14:28 +01:00
Ian Knight 184b0e538a Implemented recommended changes 2016-03-31 16:09:13 +10:30
suutari-olli 005cf54116 Removed duplicate check for this setting from def setup, 
realized it is overridden by later check anyways.
 2016-03-30 20:33:56 +03:00
Ian Knight 9516588f62 Housekeeping, pep8 errors 2016-03-31 03:50:33 +10:30
Ian Knight 573bc510ff Added ProPresenter 5 & 6 support 2016-03-31 03:41:52 +10:30
suutari-olli 16077a855f Removed # which was added in search for solution from: 
Registry().execute('live_display_active')
(This was noticed while looking at the diff)
 2016-03-30 20:04:10 +03:00
suutari-olli 19862a69a3 Merged to trunk. 2016-03-30 19:54:20 +03:00
suutari-olli a95f72c93a Now using self.setVisible(False) instead of transparency for hiding the logo. 
Renamed the visual text for the setting to: "Don't show Logo"
 2016-03-30 19:50:12 +03:00
Tomas Groth fa282cd103 pep8 fix 2016-03-29 22:45:57 +02:00
Tomas Groth 147e142d3f Fix traceback when searching for book that doesn't exists in second bible. Fixes bug 1553863. 
Fixes: https://launchpad.net/bugs/1553863
 2016-03-29 22:34:50 +02:00
Tim Bentley d11cb1d622 Only set tab_visited when the tab is visited and not on loading 2016-03-29 17:55:33 +01:00
Tim Bentley be8bdcf1f3 remove print 2016-03-29 17:00:55 +01:00
Tim Bentley 2433efdfd0 Update themes in service manager when themes are set in settings 2016-03-29 16:45:59 +01:00
Chris Hill 8de2f013eb merge w/ trunk 2016-03-28 12:52:59 +01:00
Tomas Groth 6b75148e34 Disable importer if pysword is missing. Pep8 fixes. 2016-03-25 20:58:43 +01:00
Tomas Groth 8442ec0b5b Set progress bar steps to number of chapters. 2016-03-25 20:33:26 +01:00
Tomas Groth a86ef7e4d5 import both OT and NT... 2016-03-25 20:28:33 +01:00
Tomas Groth 12a8481e14 Use standard button text in the FTW, if possible. Fixes bug 1554554. 
Fixes: https://launchpad.net/bugs/1554554
 2016-03-23 12:55:54 +01:00
Tomas Groth dc0924fbbb Translation fixes. Fixes bug 1545072 
Fixes: https://launchpad.net/bugs/1545072
 2016-03-22 22:11:12 +01:00
Tomas Groth 7c6e1902c4 Fix tag detection. Fixes bug 1549549. 
Fixes: https://launchpad.net/bugs/1549549
 2016-03-22 22:08:56 +01:00
second@tgc.dk b74221daff Add support for importing OPS Pro song DB. Translations are supported using a {translation} tag. 
Fix bug that prevents song book entries to be imported.

bzr-revno: 2631
 2016-03-22 17:45:23 +00:00
Tomas Groth c9a8e2cf59 trunk 2016-03-22 15:14:16 +01:00
Tomas Groth 2c8e0b4dfa update year 2016-03-22 15:13:59 +01:00
Tomas Groth 66cea24673 some more fixes 2016-03-20 21:23:01 +01:00