Commit Graph

14410 Commits

Author SHA1 Message Date
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
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
6858a7cfb5 Added 3 tests for replacing Live item from service manager while display is blanked. (One for each) 2016-04-01 16:08:44 +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
cd77486e32 Start to refactor code structure
bzr-revno: 2632
2016-03-31 19:54:10 +01:00
Tim Bentley
2e58e45068 fixes more 2016-03-31 17:56:32 +01: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
946d9ee3d5 fix tests 2016-03-31 17:24:44 +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
77fca59e57 add new line 2016-03-29 17:07:40 +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
Ian Knight
1667363abd Shifted common test code into setup. 2016-03-24 00:44:37 +10:30
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
Tim Bentley
73358f80e8 Refactor remote to use directories
bzr-revno: 2630
2016-03-22 17:44:17 +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
Ian Knight
a98e62ed5d Corrected comments 2016-03-21 16:11:46 +10:30