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

3023 Commits

Author SHA1 Message Date
Jonathan Corwin
03380fb40f head 2011-05-06 23:00:52 +01:00
Jonathan Corwin
5c6639e95b Fix remote bug if same item in service twice. More stage view tweaks 2011-05-06 23:00:18 +01:00
Andreas Preikschat
25a697e03e removed more old code 2011-05-06 21:55:16 +02:00
Andreas Preikschat
9a16666639 removed blank line 2011-05-06 21:31:29 +02:00
Andreas Preikschat
a81a43c15e clean up 2011-05-06 21:19:09 +02:00
Andreas Preikschat
80f7aa2cc9 r1522 + resolved conflicts 2011-05-06 21:15:08 +02:00
Andreas Preikschat
090e8378ae - allow negative x and y values 
- fixes
- removed redundant variables
 2011-05-06 21:09:40 +02:00
Andreas Preikschat
7854c664e8 added blank lines 2011-05-06 09:41:29 +02:00
Andreas Preikschat
82a509c012 fixed strings 2011-05-06 09:38:51 +02:00
Andreas Preikschat
68c1236a2a 2011-05-06 07:17:13 +02:00
Gerald Britton
f85ce8dc91 Change a series of "if" into if/elif 
bzr-revno: 1519
 2011-05-05 22:00:12 +02:00
Andreas Preikschat
e1b1f7c6d0 fixed alert bug 2011-05-05 20:40:04 +02:00
Gerald Britton
d9afa8ec2d Change series of ifs into if/elif/elif 2011-05-05 14:23:54 -04:00
Andreas Preikschat
2a7c5bd4de names changes 2011-05-05 17:16:55 +02:00
Andreas Preikschat
0c9bea3b50 - removed obsolete code 
- fixes
 2011-05-05 15:02:12 +02:00
Andreas Preikschat
e25145a81b 2011-05-05 13:51:47 +02:00
Tim Bentley
b0a0f1c877 head 2011-05-04 18:35:41 +01:00
Tim Bentley
bec35e6138 Fix change of display to correct size. 
Fixes: https://launchpad.net/bugs/775534
 2011-05-04 18:35:24 +01:00
Andreas Preikschat
cbd7ae2afc - make start up smoother by setting up the displays correct the first time 
- do not pass screens as argument
 2011-05-04 19:31:02 +02:00
Andreas Preikschat
307ef744dd - fixed not closed file 
- attempt to make FRW avoiding tracebacks when running more than once
- clean ups
 2011-05-04 09:29:16 +02:00
Andreas Preikschat
f2ee6ae8eb - fixed a traceback when pressing the delete button in the theme manager when no theme has been selected 
- fixed the delete button being hidden/visible although a theme was selected (using the down/up keys)

bzr-revno: 1515
 2011-05-04 07:02:33 +02:00
Gerald Britton
37a68a4b87 Minor optimization in translate function: Save redundant lookups 2011-05-03 13:36:20 -04:00
Andreas Preikschat
96f4f2f747 fixed traceback when deleting theme; fixed delete button being visible/hidden 2011-05-03 19:05:17 +02:00
Andreas Preikschat
3dd30f5e93 also check for osx 2011-05-02 20:24:28 +02:00
Andreas Preikschat
1dd4e6e1d5 r1511 2011-05-02 19:29:39 +02:00
Andreas Preikschat
52822e119e use qm files from /usr/share/qt4/translation 2011-05-02 19:25:12 +02:00
Andreas Preikschat
a6790e60c1 - When you are capturing a shortcut, "space" won't uncheck the button (so you can use "space" as shortcut as well) (lines 8-26, 64-66) 
- Now you can remove a shortcut (just abort the capturing)

bzr-revno: 1511
 2011-05-01 20:03:08 +02:00
Tim Bentley
da996844b7 Prevent duplicate images 
bzr-revno: 1509
Fixes: https://launchpad.net/bugs/772080
 2011-05-01 18:55:33 +01:00
Andreas Preikschat
9a997afd81 fixed wording 2011-05-01 18:03:42 +02:00
Andreas Preikschat
76bd824114 added comment 2011-05-01 17:54:05 +02:00
Andreas Preikschat
6c1e66de99 do not check the button 2011-05-01 17:50:48 +02:00
Tim Bentley
19bd7536c3 Need Glasses 2011-05-01 16:15:08 +01:00
Tim Bentley
7436621316 Fix incorrect colour specification 
Fixes: https://launchpad.net/bugs/774853
 2011-05-01 14:58:28 +01:00
Andreas Preikschat
f8fdcf8fba allow to empty shortcuts; allow 'space' to be used as shortcut 2011-05-01 09:17:30 +02:00
Tim Bentley
f6537acbf4 Updates 2011-04-30 18:36:13 +01:00
Tim Bentley
54a3dd8412 Remove not needed var and fix 195 strings 2011-04-30 09:37:28 +01:00
Tim Bentley
3b805f6374 Add new thread at startup time 2011-04-30 08:42:20 +01:00
Tim Bentley
ddf9c3b61b Remove Var from last merge 2011-04-29 20:24:21 +01:00
Tim Bentley
0f7f03da30 Clean up Phonon media Object creation 
bzr-revno: 1503
 2011-04-29 20:22:20 +01:00
Tim Bentley
9e721a4824 More improvements 2011-04-29 19:43:29 +01:00
Andreas Preikschat
15d0087a1a - fixed wrong use of strip() 
- fixed soft break not working, when used within a line.
- removed redundant code

bzr-revno: 1502
 2011-04-29 18:46:10 +02:00
Tim Bentley
08b6d7cee1 Fixes for Jon 2011-04-29 17:27:27 +01:00
Andreas Preikschat
0f51c47d9e fixed spelling 2011-04-29 16:36:29 +02:00
Andreas Preikschat
640815ada3 removed re 2011-04-29 16:31:17 +02:00
Tim Bentley
4304d111f1 Live Initialisation Delayed 2011-04-29 12:55:49 +01:00
Tim Bentley
e6f69c01f4 Remove 2 phonon initialisations 2011-04-29 12:21:14 +01:00
Tim Bentley
acb4f12ac9 remove comments 2011-04-29 10:07:41 +01:00
Tim Bentley
e4c0d1227e Fix timer 2011-04-29 09:54:11 +01:00
Tim Bentley
7908ac4f67 Fix large Service Files 2011-04-29 09:45:36 +01:00
Andreas Preikschat
547a7ac14d fix and clean up 2011-04-29 10:28:41 +02:00
Andreas Preikschat
e76421190b removed redundant code 2011-04-29 09:40:44 +02:00
Tim Bentley
f83d52621a Fixes 2011-04-29 08:40:19 +01:00
Tim Bentley
79dc4948fa Head 2011-04-29 08:11:19 +01:00
Tim Bentley
188431ce37 Fix up Service Save 2011-04-29 07:21:31 +01:00
Andreas Preikschat
d478395ae0 also split when [---] is within a line 2011-04-29 08:15:09 +02:00
Andreas Preikschat
3ded22fc47 - added Start Loop and Stop Loop to the list of available shortcut actions 
- added a new (hidden) action to toggle the loop

bzr-revno: 1497
Fixes: https://launchpad.net/bugs/771966
 2011-04-29 07:26:20 +02:00
Tim Bentley
c7e07bdbd5 r1496 2011-04-28 21:11:11 +01:00
Tim Bentley
dd597e472f Head 2011-04-28 19:13:48 +01:00
Tim Bentley
17d74a8d9a Add Load service Progress Bar 2011-04-28 19:13:19 +01:00
Tim Bentley
7cb23485ae with render 2011-04-28 17:53:27 +01:00
Tim Bentley
e50dc0cfbf head1945 2011-04-28 17:52:46 +01:00
Andreas Preikschat
aea4909201 added missing space 2011-04-28 18:36:53 +02:00
Andreas Preikschat
e9ec8aaaaf added shorcuts for start/stop/toggle loop (#771966) 
Fixes: https://launchpad.net/bugs/771966
 2011-04-28 18:32:37 +02:00
Andreas Preikschat
9996320522 fixed verse splitting where not necessary 2011-04-28 08:44:48 +02:00
Andreas Preikschat
9aa1f580d2 fixed right/left shortcuts 2011-04-28 08:36:04 +02:00
Tim Bentley
b081c20128 Fix blank line 2011-04-27 20:44:21 +01:00
Tim Bentley
c9d69c55cd Fix soft break 2011-04-27 18:41:03 +01:00
Raoul Snyman
35cb2b2fa6 Fix up the multicolouredness. 2011-04-27 12:30:29 +02:00
Raoul Snyman
86a05a38b5 Fixed bug #752212. Added a revert button to revert the image to the default OpenLP image. Also moved things slightly to for the dialog to look a little better on other platforms/DEs. 2011-04-27 11:00:37 +02:00
Tim Bentley
0476fe8b27 Minor cleanups 2011-04-26 20:09:56 +01:00
Tim Bentley
1d830ee1f0 Merged with head and Andreas 2011-04-26 19:52:46 +01:00
Tim Bentley
3923c14d0c Head 2011-04-26 19:39:32 +01:00
Tim Bentley
772c9cb2ca Chnages 2011-04-26 19:39:21 +01:00
Tim Bentley
a1f4d5cd2b Fix error in Theme Wizard backgrounds 
bzr-revno: 1491
Fixes: https://launchpad.net/bugs/769988
 2011-04-26 19:25:52 +01:00
Meinert Jordan
62d55814d2 - fix the recreation of the song order to work with single character verse references 
- rename 'type' variable to avoid the function name (and unify the naming)
- fix: remove unicode string in a translate() call

bzr-revno: 1489
 2011-04-26 19:16:13 +01:00
Andreas Preikschat
68fdc7dee9 fixed virtue breaks, fixed word break 2011-04-26 19:03:19 +02:00
Andreas Preikschat
9c6a400634 merged with lp:~trb143/openlp/beta1 2011-04-26 17:34:25 +02:00
Jonathan Corwin
5887033238 Changes to the service print html/css 
serviceprint.css can now be deleted and has been replaced by service-print.css. There have been changes to the css/html which will be documented on the wiki

bzr-revno: 1486
 2011-04-25 17:22:16 +01:00
Tim Bentley
100fb77456 Fix double edit 2011-04-25 11:26:21 +01:00
Jonathan Corwin
504a471491 o123hallo points 2011-04-25 11:13:13 +01:00
Andreas Preikschat
f89e362b5d mark service as modified when item notes have been edited 2011-04-25 10:35:48 +02:00
Tim Bentley
abf44320c3 Set correct field to blank 2011-04-25 08:56:13 +01:00
Tim Bentley
a173bce047 Minor fix 2011-04-25 08:13:17 +01:00
Tim Bentley
10fca2dd05 Remove theme image if moving from image to solid or gradient. 
Fixes: https://launchpad.net/bugs/769988
 2011-04-25 08:06:35 +01:00
Andreas Preikschat
c12b4bc28f - improved the song importers by allowing to provide feedback to the user. 
- Do not abort a song import, always try to continue and log which songs could not be imported.
- Clean ups (close files, deduplication, ...)

bzr-revno: 1483
 2011-04-25 09:06:16 +02:00
Tim Bentley
6e9459b63d r1482 2011-04-25 07:44:04 +01:00
Jonathan Corwin
81c63146f5 remove print statement 2011-04-24 20:54:48 +01:00
Jonathan Corwin
8965e4a730 head 2011-04-24 20:50:58 +01:00
Jonathan Corwin
ae874f09bf Print Service cleanups 2011-04-24 20:50:28 +01:00
Andreas Preikschat
f7e81ad70a fixe possible bug when using the clear buttons 2011-04-24 16:44:40 +02:00
Andreas Preikschat
03e9aeda84 changed name 2011-04-23 17:40:07 +02:00
Andreas Preikschat
2167a697dd log empty default_translator 2011-04-23 17:15:01 +02:00
Andreas Preikschat
5a54a82345 r1480 2011-04-23 16:42:12 +02:00
Andreas Preikschat
70ae7d119d fixed another translation bug 2011-04-23 16:40:37 +02:00
Andreas Preikschat
c66ffbd725 removed import 2011-04-22 09:06:38 +02:00
Andreas Preikschat
65925efd25 fixed logo pixelation 2011-04-22 08:30:07 +02:00
M2j
a80a953980 Head 1477 2011-04-21 10:51:32 +02:00
M2j
073e68e8d5 translation string fixes 2011-04-21 10:47:52 +02:00
Andreas Preikschat
8cd3742c87 added textEdit and buttons for better feedback 2011-04-20 19:36:16 +02:00
Andreas Preikschat
3166e8e07b - fixed bug #763309 
bzr-revno: 1477
Fixes: https://launchpad.net/bugs/763309
 2011-04-18 21:58:53 +02:00
Andreas Preikschat
0fa4bee842 r1476 2011-04-18 21:27:02 +02:00
Tim Bentley
f0f77a0dd9 Head 2011-04-18 16:31:32 +01:00
Tim Bentley
133145d5c2 Fix comment 2011-04-18 16:31:20 +01:00
Tim Bentley
3c8568443b Delete the correct item 
Fixes: https://launchpad.net/bugs/764651
 2011-04-18 16:30:32 +01:00
Andreas Preikschat
c7843012e9 fixed bug #76330 
Fixes: https://launchpad.net/bugs/7633099
 2011-04-18 16:57:37 +02: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
6fb421825c r1471 2011-04-17 15:31:13 +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
Andreas Preikschat
946d74372d 2011-04-17 13:00:44 +02:00
Andreas Preikschat
19b2e0bede - added a missing space 
bzr-revno: 1471
 2011-04-16 22:10:21 +02:00
Tim Bentley
f94ae1a9c5 Head r 1469 2011-04-16 12:42:35 +01:00
Tim Bentley
24ec1abb56 more changes 2011-04-16 12:36:20 +01:00
Andreas Preikschat
de8e8ee422 fixed missing space 2011-04-16 09:23:00 +02:00
Raoul Snyman
64823a943a Add a bit of spacing around the edges of the settings form to make it feel a little less crowded. 
bzr-revno: 1469
 2011-04-16 09:17:01 +02:00
Raoul Snyman
b46aa38ce9 Add a bit of spacing around the edges of the settings form to make it feel a little less crowded. 2011-04-16 00:46:24 +02:00
Raoul Snyman
7fdd4bb1c1 Line length cleanups. 2011-04-15 23:55:11 +02:00
Raoul Snyman
8090adf1bc Made UiStrings a Singleton, and updated all usage of it. 2011-04-15 23:43:59 +02:00
Tim Bentley
7476b37ba4 Refactor the SettingsTab to be more KDE like. 
Sort out the Tabs parentage
Clean up the code paths to stop the Tab being loaded twice at startup.
Clean up the TAB Hide/Unhide code. Removed it and rebuild the UI if required.
Fix Bible Quick text to say right things.

bzr-revno: 1467
Fixes: https://launchpad.net/bugs/739762
 2011-04-15 21:47:19 +01:00
Jonathan Corwin
78b3b04afa Fix blanking between ppt and songs 
Fix stutter when timed powerpoint starts

bzr-revno: 1466
 2011-04-15 21:38:47 +01:00
Tim Bentley
269c4fa044 Fixups 2011-04-15 18:17:51 +01:00
Andreas Preikschat
b8db8807fd r1464 2011-04-15 18:15:37 +02:00
Andreas Preikschat
a13cf49940 idea to improve song import feedback 2011-04-15 18:01:15 +02:00
Andreas Preikschat
14a2e8e4c2 finished work on restoring current search methods 2011-04-15 14:55:56 +02:00
Jonathan Corwin
4a74230c6d Head 2011-04-14 22:34:35 +01:00
Jonathan Corwin
4286f6389d Switching from ppt to songs now fine 2011-04-14 22:34:01 +01:00
Andreas Preikschat
77559e0210 started to implement #746243 
Fixes: https://launchpad.net/bugs/746243
 2011-04-14 23:32:21 +02:00
Tim Bentley
4dd70d454f Fix Postsetup 2011-04-14 19:55:41 +01:00
Tim Bentley
e1bc312eb1 r1463 2011-04-14 19:35:47 +01:00
Andreas Preikschat
11e9f980e2 - remoed the up/down shortcuts from the shortcut list 
bzr-revno: 1463
 2011-04-14 20:34:08 +02:00
Tim Bentley
0468a39dd2 r1462 2011-04-14 19:31:09 +01:00
Tim Bentley
206cd90639 Finished 2011-04-14 19:30:53 +01:00
Andreas Preikschat
8eeffdd063 - fixed a wrong parentage which can lead to a traceback when you enter a custom service notes, but the service order does not contain any item 
bzr-revno: 1462
 2011-04-14 20:09:29 +02:00
Andreas Preikschat
83e06b6eb1 don't allow to change the up/down shortcuts in the slidecontrollers 2011-04-14 20:05:00 +02:00
Andreas Preikschat
27e9edad51 fixed wrong parentage 2011-04-14 16:51:05 +02:00
Andreas Preikschat
f2f49acd39 added ability to change language in a spelledit 2011-04-14 15:53:02 +02:00
Jonathan Corwin
d45423569f Head 2011-04-13 23:11:21 +01:00
Jonathan Corwin
5f93ff657e PPT's are getting there. Going from blank ppt to song broken now 2011-04-13 23:10:41 +01:00
Tim Bentley
6454b88a83 Fix Tab parentage 2011-04-13 20:12:47 +01:00
Tim Bentley
3a6b1def4a r1460 2011-04-13 19:42:01 +01:00
Tim Bentley
79ed96648f More cleanups 2011-04-13 19:40:09 +01:00
Andreas Preikschat
e1b723270d - added an option to add page breaks after text items 
- rewrite the updatePreviewText method using lxml
- the layout can now be modified with CSS (see .local/share/openlp/servicePrint.css)

bzr-revno: 1460
 2011-04-13 20:38:08 +02:00
Tim Bentley
0b4fd3c585 r1458 2011-04-13 19:20:09 +01:00
Tim Bentley
a22bb2e0bc Active/inactive fixes 2011-04-13 19:14:38 +01:00
Andreas Preikschat
01c286e50e fixed crash 2011-04-13 20:01:28 +02:00
Andreas Preikschat
8451d52f27 fixed _fromstring; changed setting name in config 2011-04-13 12:22:26 +02:00
Andreas Preikschat
7d5ee8adf6 spelling 2011-04-13 11:53:57 +02:00
Andreas Preikschat
7d2719288a extended helper methods 2011-04-13 11:42:18 +02:00
Andreas Preikschat
004bbc8865 r1457 2011-04-13 11:20:27 +02:00
Andreas Preikschat
d207cf2243 clean ups 2011-04-13 11:19:16 +02:00
Tim Bentley
5f228a69d1 Minor fixes and Bible Label corrections 2011-04-13 06:12:31 +01:00