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

509 Commits

Author SHA1 Message Date
Andreas Preikschat
80604f7729 - removed not needed 'QtCore.Qt.OtherFocusReason' from setFocus calls 
- fixed 'short' lines
- changed addItem to addItems when possible
- other clean ups
- refactored class
- removed not needed parameters

bzr-revno: 2121
 2012-12-05 06:12:07 +00:00
Andreas Preikschat
fc38f62a17 trunk + conflicts 2012-12-04 22:50:14 +01:00
Andreas Preikschat
ea4e271e21 r2118 2012-12-02 21:29:21 +01:00
Tim Bentley
a7294a8e8b Copyright and Translation updates from 2.0 2012-12-01 07:57:54 +00:00
Tim Bentley
5646183803 Fixes 2012-11-11 21:16:14 +00:00
Tim Bentley
55f4bc3a73 Fix name and add spearator 2012-11-11 19:33:53 +00:00
Tim Bentley
47c9af348c Fix spelling - oops 2012-11-07 21:37:01 +00:00
Andreas Preikschat
3629c8a535 r2098 + conflict 2012-11-01 16:56:03 +01:00
Tim Bentley
716dc9ccf0 More updates 2012-10-21 15:07:57 +01:00
Tim Bentley
cdbc1fd82e Copyrights 2012-10-21 14:16:22 +01:00
Andreas Preikschat
57e844cc12 r2093 2012-10-18 20:13:54 +02:00
Andreas Preikschat
f84c089938 fixed bug #1066296 (Renaming theme keeps old/new theme in Theme manager) 
Fixes: https://launchpad.net/bugs/1066296
 2012-10-16 10:25:54 +02:00
Martin Zibricky
4427d4168e Bug #687638: use locale aware comparison in other places too. 2012-10-12 15:00:56 +02:00
Andreas Preikschat
159f3ea9a2 r2074 + conflicts 2012-10-03 18:38:06 +02:00
Andreas Preikschat
4ad88e18f9 r2068 2012-09-24 17:12:50 +02:00
Andreas Preikschat
195608f39e do not reload theme list twice when renaming a theme; fixed not reloading list after adding a new theme 2012-09-19 20:43:02 +02:00
Martin Zibricky
9ecca162bd Additional translate() substitution fixes in openlp.core modules. 2012-09-06 15:49:47 +02:00
Andreas Preikschat
5792f8405f fixed bug #1046508 
Fixes: https://launchpad.net/bugs/1046508
 2012-09-06 00:00:26 +02:00
Andreas Preikschat
978cc3bc36 - removed not needed 'QtCore.Qt.OtherFocusReason' from setFocus calls 
- fixed 'short' lines
- changed addItem to addItems when possible
- other clean ups
 2012-07-12 18:48:28 +02:00
Andreas Preikschat
25177adce6 - update the image cache when the image timestamp changes 
- reworked image manager's _cache

bzr-revno: 2013
 2012-07-02 20:45:03 +02:00
Andreas Preikschat
44161ebee9 Clean ups 
bzr-revno: 2011
 2012-07-02 19:32:41 +02:00
Andreas Preikschat
fb59eab8e7 removed fix because another branch fixes this differently 2012-07-01 20:45:51 +02:00
Andreas Preikschat
bc3173966a clean ups 2012-07-01 20:41:59 +02:00
Andreas Preikschat
9da23266c6 reworked image manager _cache to contain unique images (to be cleaned up) 2012-06-30 17:19:33 +02:00
Andreas Preikschat
78753d03dc r2005 2012-06-30 12:46:24 +02:00
Andreas Preikschat
0f8054c1fd removed fixmes 2012-06-27 19:00:02 +02:00
Andreas Preikschat
39916e4232 fixed code, fixed long lines 2012-06-23 19:21:27 +02:00
Samuel Findlay
4510fdbede Added three names in Copyright headers and About window (Samuel Findlay, Edwin Lunando, Dave Warnock). Fixed consistency issues. 2012-06-23 00:14:53 +10:00
Andreas Preikschat
f2884f0593 update image in cache when timestamp changed; docs 2012-06-18 14:07:26 +02:00
Andreas Preikschat
2095a6d0d0 fixed wrong image being kept in cache when aborting the themeform 2012-06-17 18:25:56 +02:00
Andreas Preikschat
8eacb2c50b - fixed ticket 695 2012-06-15 18:19:46 +02:00
Stevan Pettit
245c0acd89 Merge with trunk, resolve conflicts 2012-06-09 19:14:28 -04:00
Stevan Pettit
cb50427af1 Merge branch. Fixed conflict 2012-06-09 00:23:24 -04:00
Andreas Preikschat
b43004aced r1981 + conflict 2012-06-04 12:47:36 +02:00
Andreas Preikschat
81b4d84c1f changed attributes and arguments to camelCase 2012-06-04 12:22:47 +02:00
Edwin Lunando
749a90b9da merge with trunk. 2012-05-27 17:02:03 +07:00
Andreas Preikschat
45a9b5f615 clean ups 2012-05-23 23:02:34 +02:00
Andreas Preikschat
c15ac3a84e last fixes 2012-05-23 18:14:03 +02:00
Andreas Preikschat
a5fa986bdd continued work 2012-05-20 21:11:27 +02:00
Edwin Lunando
fb8519694e updated the set_default_header_footer method on lib/theme.py 
all the works and the import is inside the method.
 2012-05-20 21:05:06 +07:00
Andreas Preikschat
a085694be1 removed toString(), toPyObject() 2012-05-19 17:10:05 +02:00
Edwin Lunando
3fdb3b2991 I've resolved the bug #902492 
I got the primary screen resolution from the ScreenList class.
 2012-05-18 17:44:28 +07:00
Edwin Lunando
81f0ff3870 #902492 resolved. All the working code is a placed at theme.py. 2012-05-18 17:38:05 +07:00
Andreas Preikschat
ed3b7660fa removed not neede unicode calls 2012-05-17 20:57:01 +02:00
Andreas Preikschat
4a979b49d9 continued to implement QString v2 api 2012-05-17 18:19:06 +02:00
Andreas Preikschat
2d99f59c84 started to use QString v2 api 2012-05-17 17:13:09 +02:00
Edwin Lunando
a251522ef3 #902492 resolved 2012-05-16 20:14:32 +07:00
Stevan Pettit
f1586052a6 Added code to allow OpenLP to run portable 2012-05-11 08:22:34 -04:00
M2j
c6c62bdcad pythonifying code: 
- replace has_key() by key in dict
- remove len() method from sequence and mapping types when mapping to bool
 2012-04-29 17:31:56 +02:00
M2j
f876898033 Bug #959760: Change theme manager delete button visibility on default theme change. 2012-04-02 15:46:41 +02:00
Jon Tibble
6133e6a840 Unused variables 2012-03-12 22:12:16 +00:00
Philip Ridout
0dd0a9b821 Warn before importing a theme with a name that already exists 
bzr-revno: 1900
 2012-03-11 16:41:24 +00:00
Meinert Jordan
77b8f84ed2 Tidyups: 
Unify all QAction creation methods.
Derive OpenLPToolbar().actions keys from object names.
Use Python methods instead of Qt for file path manipulations.
Bug #943919: Shortcuts for "Move to Previous/Next" in live slide controller.

bzr-revno: 1894
 2012-03-10 22:50:38 +00:00
Philip Ridout
8f0e2ba8ec Fixed mainwindow bug 2012-03-10 22:18:52 +00:00
Philip Ridout
f8021d315e fixed mainWindow this time! 2012-03-10 17:13:19 +00:00
Philip Ridout
df54470988 Few more minor fixes 2012-03-10 16:44:58 +00:00
Philip Ridout
24b817cccf More minor fixes 2012-03-10 16:14:07 +00:00
Philip Ridout
7d7e76fd9b renaming variables, if your going to open a can of worms, might as well eat them all! 2012-03-10 16:03:58 +00:00
Philip Ridout
a40717c16f Fixed up to Raouls guidelines 2012-03-10 08:22:52 +00:00
Philip Ridout
e9caa194f5 Adds a dialouge asking if the user wants to replace an existing theme when importing. 
It works, but I dont know, it just feels like my code is a little bit "rough 'n' ready" let me know what you think!
 2012-03-09 21:43:27 +00:00
Philip Ridout
0e95ffe55f remove .encode hopefully to fix http://support.openlp.org/issues/442 2012-03-05 22:22:36 +00:00
M2j
587850bb59 Bug #943919: Make shortcuts for "Move to Previous/Next" in live slide controller 
configurable.
 2012-03-03 14:52:57 +01:00
M2j
6d909c64eb unified remaining action creation methods (addToolbarButton, context_menu_action, context_menu_separator) 2012-03-02 11:22:52 +01:00
M2j
3a6a402b56 use Python methods instead of Qt 2012-02-26 22:09:22 +01:00
Jonathan Corwin
46a4bade8c Transparent themes 2012-01-04 17:19:49 +00:00
Tim Bentley
2a5e8935bb New year merge 2011-12-27 10:33:55 +00:00
M2j
99fc7dea18 v1 theme import moved to seperate method 2011-12-15 21:14:12 +01:00
M2j
f733db0e5a Head 1834 2011-12-13 01:15:39 +01:00
M2j
0c06569dc5 Bug #882819 - recover v1.x theme file names from XML info 2011-12-13 00:46:04 +01:00
Jon Tibble
85e2967854 Fix logging theme names 2011-12-11 16:23:24 +00:00
Jon Tibble
e5d1fca74d Previous fix broke on non-Windows, try again 2011-12-11 15:31:44 +00:00
Jon Tibble
26df14e43c Fix v1 theme importing 2011-12-11 14:53:44 +00:00
Andreas Preikschat
0320f88d72 do not load the list twice when copying a theme 2011-11-19 13:00:36 +01:00
Tim Bentley
d5331f50b3 Amend check for files and delete if not used any more 
Fixes: https://launchpad.net/bugs/891781
 2011-11-18 19:34:04 +00:00
Andreas Preikschat
8f3f09eef9 r1765 + resolved conflict 2011-10-01 09:28:45 +02:00
Tim Bentley
21bf34c436 Theme fix 2011-08-21 06:33:07 +01:00
Tim Bentley
3c17af592d Fix autoupdates 2011-08-20 16:02:57 +01:00
Andreas Preikschat
418c3b9c18 - use the functions context_menu_action and context_menu_separator from core/lib/ui 
bzr-revno: 1672
 2011-07-01 10:26:26 +02:00
Andreas Preikschat
6980299697 use help function 2011-06-29 11:23:42 +02:00
Andreas Preikschat
6e3343c606 fixed theme copy 2011-06-29 11:08:53 +02:00
Andreas Preikschat
943f2e1cb2 rearranged lines 2011-06-26 21:34:01 +02:00
Andreas Preikschat
f2a243cfb4 change theme name to 'Copy of <theme name>' when copying a theme 2011-06-26 19:33:22 +02:00
Andreas Preikschat
3616554a17 r1645 2011-06-20 21:57:08 +02:00
Tim Bentley
608910a098 Fix name 2011-06-12 17:02:52 +01:00
Tim Bentley
c812770153 Copyright fixes 2011-06-12 16:41:01 +01:00
Andreas Preikschat
1cc95fddb6 general thumb clean ups 2011-06-12 17:17:01 +02:00
Andreas Preikschat
c63382e41c - hide the theme menu when theme level is not 'Song' 
- clean ups
 2011-05-27 12:17:59 +02:00
Tim Bentley
acdbefd922 Fixes 2011-05-26 18:11:22 +01:00
Tim Bentley
8f6ed366a1 Copyright updates 2011-05-26 17:25:54 +01:00
M2j
6f0bdad784 all lower() for theme sorting to consider Windows 2011-05-25 20:47:13 +02:00
M2j
7a1a83a98a Head 1570 2011-05-25 20:42:03 +02:00
Andreas Preikschat
981c2f8c5b more name fixes 2011-05-25 10:32:37 +02:00
Raoul Snyman
7669643774 Updated the copyright notice, adding Jeffrey Smith back in after he accidentally got removed somewhere somehow. 2011-05-24 22:47:05 +02:00
M2j
06d561f9fc localized string sorting 2011-05-23 22:42:07 +02:00
Andreas Preikschat
383670e446 use the awesome mainwindow progress bar 2011-05-20 17:00:27 +02:00
Andreas Preikschat
304f4ff732 added menu entry to update the theme images 2011-05-20 13:45:39 +02:00
Andreas Preikschat
875202deca reverted changes 2011-05-19 08:01:28 +02:00
Andreas Preikschat
55738636d9 render the themes when the screen size changed 2011-05-16 13:41:43 +02:00
Andreas Preikschat
96f4f2f747 fixed traceback when deleting theme; fixed delete button being visible/hidden 2011-05-03 19:05:17 +02:00
Tim Bentley
6e9459b63d r1482 2011-04-25 07:44:04 +01:00
Andreas Preikschat
f183215ecc - do not show the error message when you "rename" a theme, but you do not change the theme name 
- fixed a bug, where a theme "lost" its background image when you renamed or copied the theme

bzr-revno: 1475
 2011-04-17 19:57:47 +02:00
Andreas Preikschat
d3a0952d66 fixed a bug, where themes 'lost' their background image; fixed theme re name when the name has not been changed 2011-04-17 14:36:35 +02:00
Tim Bentley
f94ae1a9c5 Head r 1469 2011-04-16 12:42:35 +01:00
Raoul Snyman
8090adf1bc Made UiStrings a Singleton, and updated all usage of it. 2011-04-15 23:43:59 +02:00
Tim Bentley
20dc7846ce Take new count after loading files works better 
Fixes: https://launchpad.net/bugs/756545
 2011-04-10 19:59:29 +01:00
Tim Bentley
2ba0d410fc More Cleanups 2011-03-28 19:56:39 +01:00
Tim Bentley
cc66c91569 r1421 2011-03-25 17:49:26 +00:00
Tim Bentley
55ab5eb4e1 r1416 2011-03-24 19:51:35 +00:00
Raoul Snyman
efbcfd0772 Updated copyright information. 2011-03-24 21:04:02 +02:00
Tim Bentley
d26c8fce86 Clean up initial theme setup 2011-03-20 07:37:44 +00:00
Tim Bentley
45034c1b8b Force default theme if no theme present 2011-03-19 19:45:22 +00:00
Andreas Preikschat
a12dd5722c typo 2011-03-19 16:51:03 +01:00
Andreas Preikschat
4c4dfcc6c5 fixed BadZipfile exception 2011-03-19 16:43:25 +01:00
Andreas Preikschat
aff94e1b8d fixed Bug #738207 
Fixes: https://launchpad.net/bugs/738207
 2011-03-19 16:38:26 +01:00
Tim Bentley
cb661bf1ce bibles and themes work 2011-03-05 09:23:47 +00:00
Andreas Preikschat
0ed7e259fc removed white spaces 2011-02-25 18:05:01 +01:00
Raoul Snyman
780a87e840 Updated copyright information. Removed .eric4project directory from version control. 2011-02-24 07:47:38 +02:00
Jon Tibble
dc41ce5ab4 Enumerations and magic numbers 2011-02-18 03:15:09 +00:00
Jon Tibble
0d498bc3f0 UiStrings 2011-02-18 01:07:55 +00:00
Jon Tibble
9b48761590 Head r1308 2011-02-17 17:42:28 +00:00
Andreas Preikschat
9d88cec9d3 fixed creating theme preview image too early, fixed indents 2011-02-17 13:53:07 +01:00
Jon Tibble
1fbc873a8c Cleanups 2011-02-16 03:28:06 +00:00
Raoul Snyman
8ca735fe8e Removed "All Files" as per request. 2011-02-15 21:09:07 +02:00
Raoul Snyman
32272d6599 Amalgamated OpenLP theme filters into one. 2011-02-15 20:36:52 +02:00
Jon Tibble
d9a26ae4d9 Cleanups 2011-02-14 20:32:19 +00:00
Jon Tibble
ba8918a1ea Fixes 2011-02-14 18:20:59 +00:00
Jon Tibble
531e50a417 Fix translation breaking strings 2011-02-14 17:25:51 +00:00
Jon Tibble
12607020be Cleanup magic numbers and more UiStrings 2011-02-10 22:49:30 +00:00
Jon Tibble
0b83c7180f UiStrings updates 2011-02-10 04:06:16 +00:00
Jon Tibble
660028fd1e More button boxes and translations 2011-02-10 00:36:00 +00:00
Jon Tibble
45f9fa8f2f More translation refactors 2011-02-09 17:30:38 +00:00
Jon Tibble
d4e91ed553 Head r1273 2011-02-05 23:02:59 +00:00
Jon Tibble
1bae9b520f Fix typo 2011-02-05 20:10:08 +00:00
Tim Bentley
668419190c Theme fixes 2011-02-05 17:31:13 +00:00
Tim Bentley
5c3c7e0c70 Remove line 2011-02-05 09:40:04 +00:00
Tim Bentley
fecad94099 Fix up theme handing with rename and copy 2011-02-05 09:30:59 +00:00
Tim Bentley
c7d3193762 Lets not delete the image before we copy it. Doh 
Fixes: https://launchpad.net/bugs/712097
 2011-02-05 07:54:23 +00:00
Jon Tibble
f4d25560e9 UI library - critical_error_message_box 2011-02-02 23:12:31 +00:00
Jon Tibble
a064ad1b05 Head r1218 and fixes 2011-01-15 20:06:25 +00:00
Jon Tibble
284402b7b2 Refactor in existing error framework 2011-01-15 19:24:50 +00:00
Tim Bentley
0461cf0258 Fix Transitions in Bibles 
Fix Blank at start Bible slide
Fix Blank display on restart so the correct blanking method is used.

bzr-revno: 1218
Fixes: https://launchpad.net/bugs/701353
 2011-01-15 12:28:49 +00:00
Tim Bentley
e33628e049 Merge fixes 2011-01-15 11:56:40 +00:00
Jon Tibble
ee6412e2a0 Refactor error messages 2011-01-15 00:53:12 +00:00
Jon Tibble
ecb97881a1 Refactor file deleting, cleanups 2011-01-14 18:58:47 +00:00
Jon Tibble
7f5293c4c8 Cleanup and refactor file unicode check 2011-01-13 01:14:38 +00:00
Tim Bentley
46e18871aa Head 2011-01-11 17:45:22 +00:00
Tim Bentley
2feefa95f4 Fixes 2011-01-11 17:44:13 +00:00
Jon Tibble
8af1756274 Long lines 2011-01-10 19:13:40 +00:00
Tim Bentley
e216356ed8 Remove Theme Delete button on Golbal theme 2011-01-10 17:40:47 +00:00
Tim Bentley
5ba888c520 Correct File Filter and Cleanup 
bzr-revno: 1204
 2011-01-10 16:59:45 +00:00