Commit Graph

68 Commits

Author SHA1 Message Date
Philip Ridout 24358337e7 Pathlib changes 2017-09-06 22:36:31 +01:00
Tim Bentley c2321e7c10 Merge head 2017-08-03 18:54:40 +01:00
Raoul Snyman 7c0157ed4b Remove all instances of 'OpenLP 2' and 'OpenLP 2.4' and fix one entry to be more descriptive 2017-07-04 15:30:41 -07:00
Tim Bentley 33fe52cae1 tidy ups 2017-06-11 20:41:34 +01:00
Tim Bentley da51b046b2 Head 2017-06-09 16:56:40 +01:00
Tim Bentley fbcef30044 settings tab 2017-06-09 16:55:39 +01:00
Philip Ridout a24d5f8f15 TODO's TODOne, and a few other cleanups 2017-05-30 19:42:35 +01:00
Tim Bentley ef6252bf4b FTW working and UI Strings 2017-03-05 10:02:22 +00:00
Tim Bentley 5d917de2f8 Head 2017-03-03 19:27:31 +00:00
Olli Suutari 1c2ea31112 - Merged trunk on 8.1.17 2017-01-08 21:12:12 +02:00
Tim Bentley 74ca42e220 Yet another year goes by 2016-12-31 11:01:36 +00:00
Tim Bentley 126c5462a0 Head 2016-12-22 15:12:03 +00:00
Olli Suutari f3ce137233 - Merged trunk on 4.12.16 2016-12-04 00:48:30 +02:00
Philip Ridout 6a3982bab9 Moved over to using UiStrings 2016-11-12 10:00:36 +00:00
Olli Suutari 2edf579ec3 - Added the placeholder texts to uistrings
- Added placeholder texts for Bible importer & Edit.
2016-09-17 01:24:27 +03:00
Tim Bentley 098697a2cc more endpoint moves 2016-08-10 21:52:27 +01:00
suutari.olli@gmail.com ae81497fe3 This branch includes various UI string changes, such as:
- 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.
- Removed version from window title
- Removed version from web remote page window names.
- Re-did the trace back message.
-  etc...

In "Configurate OpenLP":
- Changed typing for all labels to lowercase
- Remove...

bzr-revno: 2688
2016-08-10 19:31:33 +01:00
Ken Roberts c35a2d1430 String conversions with templates part 1
- Fix string format key error in first time wizard from previous string conversion
- Fix projector pjlink1 test to use MagicMock
- Part 1 string conversions where format template is a string variable that's filled later
- Update projectordb test
- Fix a test on htmlbuilder string formatting
- Revert openlp/core/lib/htmlbuilder.py
- Convert renderer to use Template()
- Added test for renderer css
- Merge trunk and fix conflict
- Fix formatting in excep...
2016-08-10 19:29:21 +01:00
Ken Roberts a89495063e merge trunk 2016-08-07 13:52:42 -07:00
Tim Bentley cade36a332 Head 2016-08-07 19:37:15 +01:00
Ken Roberts 2f7a1ab456 Merge trunk 2016-08-05 12:41:22 -07:00
Ken Roberts b41b4a5918 Fix some todo notes 2016-08-05 12:18:47 -07:00
suutari-olli aa1cd8fa91 - Merged trunk on 24.7.16
- Added superflys startup traceback fix to my code
- Resolved conflicts
2016-07-24 23:20:25 +03:00
suutari-olli b364bb5cf0 - merged trunk on 24.7.16 2016-07-24 21:56:13 +03:00
Tim Bentley ca2ceba972 Head 2016-07-23 05:59:26 +01:00
Tim Bentley 6e5070316c next prev 2016-07-17 08:12:42 +01:00
Tomas Groth 8aa917c89c A bunch of fixes suggested by pylint. 2016-07-01 23:17:20 +02: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
Ken Roberts 598d715de6 Initial string conversions for variable templates 2016-06-03 17:15:19 -07:00
suutari-olli dcfcd3e576 - Merged trunk on 21.5.16 2016-05-21 00:45:14 +03:00
suutari-olli 165d8cd4ba - Merged trunk on 18.5.2016 20:57 2016-05-18 20:56:50 +03:00
suutari-olli 45798e67f0 Removed 2nd blank line from end of the uistrings. 2016-05-15 23:41:58 +03:00
suutari-olli 334d16d81c - Noticed this had a conflict, fixed it, improved comments 2016-05-15 22:41:13 +03:00
Ken Roberts f51132e876 core/common convert strings to python3 format 2016-05-13 21:24:46 -07:00
suutari-olli 46e7ad4983 - Changes based on comments by TRB143 2016-05-10 14:06:00 +03:00
suutari-olli e4bce11a03 Commiting for merging trunk, some new changes. 2016-05-10 03:53:14 +03:00
suutari-olli f5e7e932d1 Improved a bunch of comments. 2016-05-02 09:54:15 +03:00
Tim Bentley c80f45320b video theme creation 2016-04-30 16:40:23 +01:00
suutari-olli 09a084be18 - Removed un-needed import that was added earlier
- Pep8 fixes
2016-04-30 03:07:36 +03:00
suutari-olli aa2720da40 Merged trunk on 28.4.16, removed broken test. 2016-04-28 23:12:34 +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 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 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 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 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
suutari-olli 87cdde1575 Merging trunk on 15/3/16 2016-03-15 21:14:40 +02:00
suutari-olli a78565568f Pep8 fixes
To do:
Test(s)
2016-03-15 12:30:37 +02:00
suutari-olli d61ded487e In this Merge:
- Min. search lenght no longer counts spaces.
- Bolded part of "Empty or too short" error message
- Modified some comments 

To do:
- Write tests

Optional fixes that are not yet done/may not be done.
- Listing search results when typing for Text search
2016-03-09 02:25:07 +02:00
suutari-olli 6de4a5c923 In this commit:
- Replace '. ' with ' ' in Reference search, so for an example Gen. 1 works
- Modified related error messages

To do:
- Write tests

Optional fixes that are not yet done/may not be done.
- Block spaces + single character combos since they kind of break the search.
- Listing search results when typing for Text search
2016-03-09 00:46:47 +02:00