Commit Graph

3023 Commits

Author SHA1 Message Date
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
Tim Bentley 6474c99a85 Settings Layout Ok ish 2011-04-13 05:55:00 +01:00
Andreas Preikschat 28dec27ed2 fixed bug #758206
Fixes: https://launchpad.net/bugs/758206
2011-04-12 23:12:07 +02:00
Andreas Preikschat 1968991239 r1456 + resolved conflict 2011-04-12 23:07:08 +02:00
Andreas Preikschat c683300385 fixed weight 2011-04-12 23:01:27 +02:00
Tim Bentley 20fbe4d28d Settings Cleanup part2 2011-04-12 20:32:17 +01:00
Tim Bentley e00eaba884 Settings Cleanup part1 2011-04-12 18:45:32 +01:00
Andreas Preikschat f24a8f1365 fixed bug #754484
bzr-revno: 1455
Fixes: https://launchpad.net/bugs/754484
2011-04-11 20:16:35 +02:00
Tim Bentley 4aee585351 Clean up bible Tab code to standards
Sort out find_in_combo.
Fix bugs:
  - Save last used bible
  - Remove stray comma
  - Allow layout to be selected from Quick Tab. (Advanced has no real estate left so has been left in settings).

bzr-revno: 1453
Fixes: https://launchpad.net/bugs/756545, https://launchpad.net/bugs/745218, https://launchpad.net/bugs/748960, https://launchpad.net/bugs/755687
2011-04-11 17:51:16 +01:00
Tim Bentley d99a78837c Head r1452 2011-04-11 17:49:11 +01:00
Andreas Preikschat 2060fecbca footer font/size are now not reset when the footer colour has changed 2011-04-11 15:15:47 +02:00
Jonathan Corwin 1ce94d1c20 Fix theme image appearing between media images. Try and do same for ppt, but not yet. Broken the blank button... (it'll get worse before it gets better!) 2011-04-10 23:10:23 +01: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 1882c5366d Review fixes 2011-04-10 19:54:26 +01:00
Andreas Preikschat 9dbd54bf8f more fixes 2011-04-10 20:44:27 +02:00
Tim Bentley c8d2baff7c Add bible verse layout to Quick tab.
Not moved to Advanced tab as no real estate.

Fixes: https://launchpad.net/bugs/745218
2011-04-10 08:32:15 +01:00
Andreas Preikschat b7a1554abd fixed objectName 2011-04-10 09:07:02 +02:00
Tim Bentley 29ef34b569 Add saving of selected Bible names in Quick and Advanced.
Clean up combo box selection code (General)

Fixes: https://launchpad.net/bugs/755687
2011-04-10 07:18:31 +01:00
Andreas Preikschat a54a3eb792 make first column wider; added description label back; removed Qt = Qt.QCore; fixed litte bug which left the shortcut text on the buttons 2011-04-09 20:14:51 +02:00
Andreas Preikschat 9011c85a6b removed static methods 2011-04-09 18:11:02 +02:00
Andreas Preikschat 283171e296 use weight to sort categories 2011-04-09 16:50:44 +02:00
Tim Bentley 501235a695 Looking better 2011-04-09 09:11:46 +01:00
Tim Bentley 9ce234598a Humm 2011-04-08 20:40:18 +01:00
Andreas Preikschat bea272ca7d implemented the custom/default radio button; clean ups 2011-04-08 18:53:11 +02:00
Tim Bentley e159d87c2a r1449 2011-04-08 16:35:46 +01:00
Tim Bentley 34348c8465 More changes 2011-04-08 16:35:33 +01:00
Andreas Preikschat 9c526081d8 fixed bug #754484
Fixes: https://launchpad.net/bugs/754484
2011-04-08 15:50:54 +02:00
Andreas Preikschat ea5e0d65cc 2011-04-08 08:25:02 +02:00
Jonathan Corwin 78a9c89025 Fix stuttering powerpoint start 2011-04-07 23:57:12 +01:00
Andreas Preikschat c939a81cfe added basic css support, added option to add a page break after each text item 2011-04-07 21:10:19 +02:00
Andreas Preikschat def7567933 easier check 2011-04-07 19:54:17 +02:00
Andreas Preikschat e553cd959b do not try to load en_US when the default dictionary could not be loaded to fix bug #747206
Fixes: https://launchpad.net/bugs/747206
2011-04-07 19:34:49 +02:00
Andreas Preikschat dab699371c integrated second button(s), clean ups 2011-04-07 17:37:07 +02:00
Andreas Preikschat 9b84319c24 added new dialog from superfly + few own changes 2011-04-07 16:26:29 +02:00
Andreas Preikschat db616bfe1a 2011-04-07 10:45:49 +02:00
Jonathan Corwin 9b04385f34 Blanking and switching between song and ppt and back 2011-04-06 23:54:47 +01:00
Andreas Preikschat 3bfe9ec77c 2011-04-06 21:14:02 +02:00
Andreas Preikschat 38c9393624 expand categories 2011-04-04 19:33:42 +02:00
Andreas Preikschat 4a6be382ff fixed empty texts 2011-04-04 18:15:38 +02:00
Andreas Preikschat 84605fb430 fixed wrong context of shortcuts; moved functions 2011-04-04 16:38:17 +02:00
Andreas Preikschat dfc2eed1f4 adapted latest merge 2011-04-03 16:20:55 +02:00
Andreas Preikschat 9c39f57d5a r1443 2011-04-03 15:37:53 +02:00
Andreas Preikschat 65f134ab1b removed fix (I'll deal with this in another branch) 2011-04-03 15:36:59 +02:00
Andreas Preikschat 94ff1a5edc added cancel button; do not save changes when cancelling; added labels and tooltip 2011-04-03 15:32:51 +02:00
Andreas Preikschat 0a5b3b2c2d 2011-04-03 15:24:51 +02:00
Andreas Preikschat 28b83aadae translate categories 2011-04-03 13:36:43 +02:00
Tim Bentley 6445964646 r1442 2011-04-03 07:19:28 +01:00
Tim Bentley 63bfac4b7e Changes continue 2011-04-03 07:19:03 +01:00
Andreas Preikschat 61068e26a6 removed cancel button 2011-04-02 18:14:43 +02:00
Andreas Preikschat 958155e7d7 fixed alternate shortcut 2011-04-02 17:45:00 +02:00
Andreas Preikschat e3d822f07a fixed strange save bug 2011-04-02 17:37:14 +02:00
Andreas Preikschat 7260f91825 restore butto nnow works 2011-04-02 16:22:08 +02:00
Andreas Preikschat 4badce0205 fixed actions which did not have a parent which caused the check to fail 2011-04-02 15:08:54 +02:00
Jonathan Corwin 27fbd9594b Head 2011-04-02 10:53:08 +01:00
Jonathan Corwin db68c0419f Fix bug when hit service live button, but nothing to go live. Add option to preview immediately in media manager. Add keyboard shortcuts to media manager 2011-04-02 10:52:32 +01:00
Andreas Preikschat 1a493b1fc8 possible fix for not working 'move selection down' 2011-04-01 18:53:39 +02:00
Andreas Preikschat df4de23df0 Added Theme, Blank, Desktop shortcuts, further clean ups
Fixes: https://launchpad.net/bugs/739779
2011-04-01 16:28:25 +02:00
Tim Bentley fbc94dda3a 1441 2011-04-01 05:48:21 +01:00
Tim Bentley 3155bde0b2 inprogress 2011-04-01 05:48:09 +01:00
Andreas Preikschat dee95a2f57 r1441 2011-03-31 21:06:09 +02:00
Andreas Preikschat b17ad26672 make sure we save the default shortcut 2011-03-31 20:53:50 +02:00
Andreas Preikschat 0c9b839e91 check if shortcut is already assigned, refreshing list, double click event, started resetting the selected action 2011-03-31 14:50:38 +02:00
Andreas Preikschat 4ca738e9b3 staticmethod for adding/removing actions 2011-03-31 10:43:19 +02:00
Mattias Põldaru beffd0c25c Text fixes by superfly. 2011-03-31 10:31:08 +03:00
Mattias Põldaru f73577d708 Undo 2011-03-30 21:52:58 +03:00
Andreas Preikschat bba2f2c604 docs 2011-03-30 20:52:21 +02:00
Mattias Põldaru df1db913cd merge 2011-03-30 21:35:48 +03:00
Andreas Preikschat 369a539970 r1439 2011-03-30 20:12:34 +02:00
Andreas Preikschat bf2a9d338b clean up 2011-03-30 20:12:05 +02:00
Andreas Preikschat 772bd8eb66 basic saving and loading of shortcuts 2011-03-30 19:50:36 +02:00
Andreas Preikschat 5ef0cc12c0 started working on saving/loading shortcuts 2011-03-30 18:34:40 +02:00
Andreas Preikschat fe92842c6b added ability to remove actions 2011-03-30 12:27:27 +02:00
Andreas Preikschat 9b939bb962 fixed reloading 2011-03-30 12:12:39 +02:00
Raoul Snyman 211b20486e Updated hungarian translation and fixed a translator's name. 2011-03-30 07:37:56 +02:00
Tim Bentley ea6f90fc74 Change === and --- around 2011-03-29 21:38:10 +01:00
Tim Bentley 857756e20f Change ### to ==== 2011-03-29 21:06:18 +01:00
Andreas Preikschat e20fd7d85d clean up 2011-03-29 21:58:04 +02:00
Andreas Preikschat b9b0cbbe9c removed things, as this did not work 2011-03-29 21:52:21 +02:00
Andreas Preikschat 6f3fd53419 automatically add to actionList where possible 2011-03-29 19:47:24 +02:00
Andreas Preikschat d9c2d92c8c 2011-03-29 18:44:36 +02:00
Tim Bentley 8790f17afa Fix theme editing 2011-03-29 17:25:48 +01:00
Tim Bentley 2640decffc r1437 2011-03-29 16:49:57 +01:00
Andreas Preikschat 32240f7bbe r1437 + resolved conflict 2011-03-29 16:14:05 +02:00
Andreas Preikschat 19138cd9e5 started reworking shortcuts 2011-03-29 15:56:49 +02:00
Andreas Preikschat d6462a56a4 - fixed forgotten applicationVersion
bzr-revno: 1437
2011-03-29 14:41:43 +02:00
Jonathan Corwin d220669e9b head 2011-03-28 21:56:36 +01:00
Jonathan Corwin ad25d42fb5 If I'm going to make changes, I should really start from a clean slate... 2011-03-28 21:53:26 +01:00
Jonathan Corwin 221fa3b8b6 Disable commandline parsing for Windows, it don't work 2011-03-28 21:46:31 +01:00
Jonathan Corwin 2cce748d20 Change superscript so it still works in print. Fix problem with openlp not closing 2011-03-28 21:18:55 +01:00
Tim Bentley 2ba0d410fc More Cleanups 2011-03-28 19:56:39 +01:00
Tim Bentley c8a7594685 Bye Bye RenderManager 2011-03-28 19:12:46 +01:00
Tim Bentley 9aa6bba3a2 Virtual Splits now work 2011-03-28 19:01:58 +01:00
Andreas Preikschat 3aaaa8895b fixed a bug in the exception form 2011-03-28 19:29:25 +02:00
Tim Bentley 239b62a488 Render Ester 8:9 on more than 1 page 2011-03-28 18:04:31 +01:00
Jonathan Corwin 1e973c6c8d Attempt superscript without affecting line spacing 2011-03-27 23:28:20 +01:00
Matthias Hub ea16d11011 Fix OS X language selection and update .version in OS X build
bzr-revno: 1432
2011-03-27 22:36:00 +01:00
Tim Bentley b84c4a0a3d r1430 2011-03-27 18:03:48 +01:00
Tim Bentley d3e2fe79e9 wot not print 2011-03-27 17:39:04 +01:00
Tim Bentley fc3f35f0f9 Question mark 2011-03-27 17:30:40 +01:00
Tim Bentley c93b073da8 Renderer Cleanups - started 2011-03-27 09:19:00 +01:00
Tim Bentley 7cf329422b Fix minor errors 2011-03-26 20:28:05 +00:00