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

1910 Commits

Author SHA1 Message Date
Andreas Preikschat 3136ee475c remove not needed import 2012-03-25 23:36:09 +02:00
Andreas Preikschat 9a53a8211e removed not needed import 2012-03-25 23:34:02 +02:00
Andreas Preikschat 7f4664b69b each search 'type' has its own place holder text instead of the generic 'Search...' place holder 2012-03-25 23:09:44 +02:00
Andreas Preikschat 384d61b302 use try instead of version sting checking 2012-03-24 12:26:37 +01:00
Andreas Preikschat 8dca5b4647 add placeholder text to the search edit 2012-03-24 12:08:30 +01:00
Jonathan Corwin 6eff57d17b Fix missing tails for bottom alignment 2012-03-21 22:27:04 +00:00
Jon Tibble 025a81d553 Head r1909 2012-03-18 09:33:05 +00:00
Jon Tibble a9d70a2d2e Bugs #888815 #941966 2012-03-17 14:44:23 +00:00
Tim Bentley bc4cc7adb9 Remove print 2012-03-17 10:54:33 +00:00
Tim Bentley 83629a1b22 Get it working this time 2012-03-17 10:51:04 +00:00
Tim Bentley 9cdec0e3d3 Minor fixes 2012-03-17 10:46:08 +00:00
Tim Bentley d00840d1e0 Make plugin config updates generic 
Fix up some copyright issues missed
 2012-03-17 10:40:06 +00:00
Jon Tibble 5ded814527 Head r1906 2012-03-16 22:56:06 +00:00
Tim Bentley b092f19606 Fix remote Search displaying errors on UI 2012-03-15 06:15:21 +00:00
Jon Tibble 1882ea59f2 Head r1904 2012-03-13 22:19:14 +00:00
Jon Tibble 6133e6a840 Unused variables 2012-03-12 22:12:16 +00:00
Raoul Snyman ccba9e7df5 Fixed bug #888815 where the files were not being loaded into the audio player because their paths were not absolute. Now when the files are loaded from the saved service file, the paths recreated properly. 
Fixes: https://launchpad.net/bugs/888815
 2012-03-12 23:05:39 +02:00
Jon Tibble 9785e7f1be Cleanups 2012-03-12 19:35:29 +00:00
M2j 9aaafdf108 Merge with lp:~raoul-snyman/openlp/bug-845692 to forestall merge conflicts. 2012-03-05 11:09:07 +01:00
Raoul Snyman d6b14b39f8 HEAD 2012-03-04 20:05:29 +02:00
M2j b952b2cdbc Merge differing trees and remove whitspaces 2012-03-04 15:52:09 +01: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 277de83b68 Bug #943919: Make shortcuts for "Move to Previous/Next" in live slide controller 
configurable.
 2012-03-03 14:38:20 +01:00
M2j 45de016abb derive OpenLPToolbar().actions keys from object names to prevent collisions in 
case translators translate different strings same.
 2012-03-02 13:11:13 +01:00
M2j 6d909c64eb unified remaining action creation methods (addToolbarButton, context_menu_action, context_menu_separator) 2012-03-02 11:22:52 +01:00
Rastislav Pecik 8818256b2a Fixed code according to mrege proposal comments 2012-02-28 15:06:14 +01:00
Rastislav Pecik 271c4ef1a4 using QtCore.QVariant object as a second argument in settings.value method 2012-02-28 12:30:30 +01:00
Rastislav Pecik 6ec167ed83 QSettings.value() now uses second argument for default value, which is utf8 2012-02-28 12:12:52 +01:00
M2j d13ec2184a concentrate action creation in slide controller 2012-02-28 10:24:42 +01:00
M2j 95c8f8fe5a removed base_action, checkable_action, icon_action, and shortcut_action 2012-02-28 00:44:35 +01:00
M2j fe5f3c8874 make use of **kwargs in action creation methods 2012-02-27 19:58:34 +01:00
Rastislav Pecik c024e9e47d Exported mysql charset settings to configuration files and cleaned up the code 2012-02-27 19:18:52 +01:00
Rastislav Pecik b56d8d2a06 Fixed connection to mysql to use UTF8 encoding. 
Fixes: https://launchpad.net/bugs/941692
 2012-02-27 01:42:35 +01:00
M2j 44a5784315 Merge all QAction creation methods in openlp.core.lib.ui 2012-02-26 21:43:59 +01:00
M2j ee3da31682 Check for Qt version before calling QtCore.QLocale().createSeparatedList 2012-02-26 16:15:00 +01:00
Tim Bentley 025fe7e145 Correct brackets 2012-02-25 18:31:02 +00:00
Tim Bentley 3e1ba89a41 Fix locale test 2012-02-25 17:44:21 +00:00
Tim Bentley c1c1de5472 Fix Impress and OpenLP so it now starts . 
Fix Spelling
Remove QLocale code for now as not supported by PyQt

Fixes: https://launchpad.net/bugs/902115
 2012-02-25 13:01:47 +00:00
Raoul Snyman d4aab974d2 HEAD 2012-02-25 13:02:43 +02:00
Raoul Snyman 8fa7dcf080 Add the last two remaining outstanding items, the "next track" and the time remaining. 
Fixes: https://launchpad.net/bugs/845692
 2012-02-25 01:26:10 +02:00
Raoul Snyman 3e726f453f Attempted to fix bug #927473 by catching operational errors and redoing the action. 
bzr-revno: 1883
Fixes: https://launchpad.net/bugs/927473
 2012-02-19 22:56:06 +02:00
Meinert Jordan 5b4b48a61c Displayed listed items are shown more natural type (Jack, René and Maria) 
bzr-revno: 1881
 2012-02-19 22:53:41 +02:00
M2j 9e03cf0715 use Qt method if available 2012-02-17 19:51:01 +01:00
M2j ce7029776a localize separated item list format 2012-02-16 21:36:35 +01:00
Raoul Snyman bcad2c171f Added exception logging in case we need to confirm that we are actually getting the exception we think we are. 2012-02-16 21:05:16 +02:00
Raoul Snyman f8a8185eb0 Attempt to catch the OperationalError which is thrown when MySQL closes the connection without telling us. 2012-02-12 11:24:06 +02:00
Jonathan Stafford 21d0e93505 Tidied up blank lines between class definitions (again) 2012-01-30 06:13:51 +08:00
Jonathan Stafford d26de263f3 Fixed missing u and tidied up blank lines between class definitions 2012-01-30 06:07:06 +08:00
Jonathan Stafford 02975a61bf Renamed and moved both enumerations to lib/__init__.py 2012-01-28 16:07:54 +08:00
Jonathan Stafford 6487a3248a Moved Service Item Advance enumeration to slidecontroller 2012-01-25 20:34:13 +08:00
Jonathan Stafford d686799035 Created Service Item Advance enumeration class 2012-01-25 18:03:57 +08:00
Jonathan Stafford 210d88ac79 Documented signal in Receiver class 2012-01-21 16:11:41 +08:00
Jonathan Stafford 360b744e7c Basic Service Item Slide Advance Settings working 2012-01-15 16:27:35 +08:00
Jonathan Corwin f413ad2d30 Prevent selection of text on maindisplay 2012-01-07 23:03:14 +00:00
Jonathan Corwin 46a4bade8c Transparent themes 2012-01-04 17:19:49 +00:00
Jon Tibble 89f3929bf7 Dedupe media search 2011-12-30 21:40:13 +00:00
Tim Bentley 2a5e8935bb New year merge 2011-12-27 10:33:55 +00:00
Mattias Põldaru 3d278d51a7 Fix BOM mess for utf-8 files. We assume no other file would begin with BOM, whatever encoding they have (they really shouldn't since BOM is used to detect unicode on Windows and at least by wiki nobody is opposed). 
bzr-revno: 1836
 2011-12-14 12:47:52 +02:00
Mattias Põldaru 2959235335 Fix for bug #802159, not decoding of utf8 decoded values of custom display tags, resulting in the re-encoding of the same string on every save which makes the string wrong. 
bzr-revno: 1835
Fixes: https://launchpad.net/bugs/802159
 2011-12-13 22:34:30 +02:00
Mattias Põldaru 9f5c0645aa No silly name abbreviations anymore. 2011-12-13 12:58:33 +02:00
Mattias Põldaru e70ca4fa06 Fix for bug #802159, not decoding of utf8 decoded values of custom display tags. 2011-12-13 00:58:43 +02:00
Jonathan Corwin d2659a64fc Add a couple of keywords for the SOF5 importer to capitalize correctly. 
When a presentation controller is not enabled, only check if the app is available when necessary to prevent it loading.
Fix so LibreOffice 3.4 will close down correctly at the end when no other docs are open.

bzr-revno: 1834
 2011-12-12 19:20:51 +00:00
Tim Bentley 4430deb207 Head 2011-12-12 17:21:23 +00:00
Jonathan Corwin 6a8f54b5f8 Start disabled presentations only when necessary. Try and shutdown Impress at the end correctly 2011-12-11 21:59:10 +00:00
Mattias Põldaru c2397af633 Ensure that action category names are unicode, to prevent warnings on comparison. Also a fix for a path problem. 
bzr-revno: 1830
 2011-12-10 20:31:16 +00:00
Mattias Põldaru ca6250ae3b Supposedly fix BOM mess for utf-8 files. We assume no other file would begin with BOM, whatever encoding they have. 2011-12-10 20:21:18 +02:00
Tim Bentley b07e10282d clean up service 2011-12-10 14:34:28 +00:00
Jonathan Corwin 4949f88f28 Fix problem with the outline alignment when the theme is using Justify. 
bzr-revno: 1829
Fixes: https://launchpad.net/bugs/859950
 2011-12-10 10:14:13 +00:00
Tim Bentley 39bc9238bf Lost temporary edit flag 2011-12-10 08:52:18 +00:00
Tim Bentley 1d673caff4 Fixes and notifications 2011-12-10 08:45:17 +00:00
Jonathan Corwin 6f77ee1351 Handle   and other white space too 2011-12-09 18:52:24 +00:00
Mattias Põldaru e471edca89 Convert strings unicode as soon as possible and assume they are in unicode later. 2011-12-09 13:50:25 +02:00
Jonathan Corwin c36a13d0a8 Remove webkit version in js 2011-12-08 19:49:43 +00:00
Jonathan Corwin 15d5b97075 Remove version check and js tidyups 2011-12-08 19:24:25 +00:00
Andreas Preikschat fe8f5fb963 fixed plugins 2011-12-08 18:55:12 +01:00
Andreas Preikschat 95aedfa5d9 assign variables in methods instead of returning them 2011-12-08 18:45:33 +01:00
Andreas Preikschat 4f9a801966 set settings_tab to None if plugin is disabled 2011-12-08 17:34:18 +01:00
Jonathan Corwin 44eb1fb024 Remove comment 2011-12-07 22:24:13 +00:00
Jonathan Corwin 1c79b28461 Workaround justify and outline alignment problems 2011-12-07 21:56:06 +00:00
Andreas Preikschat 66c183a6b8 break instead of continue 2011-12-07 21:41:19 +01:00
Andreas Preikschat 12547fad2a doc clean up, removed method with a one liner, fixed media item recreation bug 2011-12-07 21:25:12 +01:00
Tim Bentley 17bca693c6 Block song exports 2011-12-04 16:36:18 +00:00
Tim Bentley 456d7ec68e remove print 2011-12-04 07:27:49 +00:00
Tim Bentley 6698ce578d Change Data type 2011-12-03 19:08:02 +00:00
Tim Bentley add75e9c7f Head 1815 2011-12-03 17:02:11 +00:00
Tim Bentley 8c4397d380 Head 2011-12-03 17:01:57 +00:00
Tim Bentley 13ec25eef5 Fix the plugin Disabled route as it has never been tested 
Stop plugins being available if the database is more advanced than the code.

bzr-revno: 1815
 2011-12-03 14:42:44 +00:00
Tim Bentley 1239cd707c Fix database versions 2011-12-03 12:51:40 +00:00
Tim Bentley 624216a1b8 add field and usage 2011-12-03 09:05:01 +00:00
Jon Tibble bba6d6730f Head r1812 2011-12-02 20:17:57 +00:00
Jon Tibble ac365e5b6a Cleanups 2011-11-26 21:26:50 +00:00
rimach dcbff07f29 sync 2011-11-24 22:09:26 +01:00
Tim Bentley ddc6c26f33 Head 2011-11-13 08:58:07 +00:00
Tim Bentley 516dda5ec3 Fixes 2011-11-13 08:57:29 +00:00
rimach 870a70ab3a rename media_player.py 2011-11-12 16:30:41 +01:00
rimach 7077d5cda6 sync 2011-11-11 17:47:26 +01:00
rimach 087a1f7600 bugfixing 2011-11-11 17:45:25 +01:00
Raoul Snyman 46643ab832 Added the quoting to database fields. 2011-11-07 23:22:35 -07:00
Tim Bentley d71f059433 Fix impress and service theme problems 2011-11-04 20:09:35 +00:00
rimach 2ed85a2bb9 bugfixing 2011-11-02 21:27:53 +01:00
Tim Bentley 0304057e00 remove # 2011-11-02 20:09:06 +00:00
Tim Bentley 3bd0ad9181 Fix crash with two soft breaks 2011-11-02 18:58:46 +00:00
Tim Bentley 8e853f10b1 Fix crash with alerts over video 
Change default to bottom from middle
Remove unused from from previous merge

Fixes: https://launchpad.net/bugs/875798, https://launchpad.net/bugs/883414
 2011-10-29 10:33:48 +01:00
rimach dc327e2385 bugfixing 2011-10-26 22:11:15 +02:00
rimach a2ebf30b68 bugfixing 2011-10-24 22:04:29 +02:00
Andreas Preikschat acac723b09 copy error 2011-10-22 13:28:47 +02:00
Andreas Preikschat 49569746ea fixed doc 2011-10-22 13:16:25 +02:00
Andreas Preikschat 05bf2ec6fa removed obsolete signals and rearranged the docs 2011-10-22 13:09:01 +02:00
Tim Bentley 9603fcd1cc Fix bug 836897 to allow Alerts to be amended without changing the slide 
Refactored the CSS,Javascript,Html load code for alerts and provided a framework for other things.

bzr-revno: 1779
Fixes: https://launchpad.net/bugs/836897
 2011-10-19 19:25:08 +01:00
Tim Bentley 4d3dd6dbb5 Rename signal 2011-10-19 18:53:07 +01:00
rimach 599573b5ce Sync 2011-10-17 23:51:24 +02:00
Tim Bentley bdcf15d87b Fix comments 2011-10-17 19:01:07 +01:00
Meinert Jordan 972d917c8a Remove mailto code and use QT code 
bzr-revno: 1777
Fixes: https://launchpad.net/bugs/863841
 2011-10-17 17:46:35 +01:00
Tim Bentley bf2ada0b67 Fix up review comments 2011-10-16 16:39:49 +01:00
Andreas Preikschat a75e0156cc fixed docstrings 2011-10-16 16:40:46 +02:00
Tim Bentley 2f36c33f62 Review fixes 2011-10-16 09:25:27 +01:00
M2j 1527704c03 - exception dialog uses Qt call instead of external library 
- unicode support in report and attached filename was broken
 2011-10-15 22:18:49 +02:00
Andreas Preikschat 9259eed4a6 -fixed bug 871272 
-clean ups

Fixes: https://launchpad.net/bugs/871272
 2011-10-15 13:30:39 +02:00
Tim Bentley 9652a690b3 More cleanups and start of updates 2011-10-15 07:32:01 +01:00
Tim Bentley bb8b0cd435 Move the Alert web code back to the plugin 2011-10-13 06:14:03 +01:00
Tim Bentley 0e1361b533 Fix footer position 2011-10-12 05:51:03 +01:00
Tim Bentley 9176911810 Try 1 2011-10-11 19:10:53 +01:00
Tim Bentley 161300fe73 Number of changes 
- Allow time (24/12) hour for sage view
- Add pictorial display of the lay out in theme manage
- Fix bug where remote edit removes an overridden theme.

bzr-revno: 1770
 2011-10-05 19:20:54 +01:00
Andreas Preikschat 201ec584a8 removed dead code + minor clean up 2011-10-03 20:51:32 +02:00
Andreas Preikschat 360e117918 removed dead code 2011-10-03 20:14:39 +02:00
Andreas Preikschat 88c0a22ac4 improve performance of preview 
Fixes: https://launchpad.net/bugs/856296
 2011-10-03 19:27:34 +02:00
Tim Bentley 5053e27c76 Fix up review comments 2011-10-03 17:53:54 +01:00
Tim Bentley 9f9f2186ae Minor performance improvement 2011-10-02 20:57:42 +01:00
Tim Bentley c5a7127aec Copy theme during remote edit. 
Fixes: https://launchpad.net/bugs/864822
 2011-10-02 20:49:29 +01:00
Andreas Preikschat 8f3f09eef9 r1765 + resolved conflict 2011-10-01 09:28:45 +02:00
rimach 33d9ce07ac sync with head 2011-09-28 22:57:01 +02:00
Tim Bentley 9142ffb488 more visible lines 2011-09-28 21:43:30 +01:00
Tim Bentley ff32139b2e refactor code to stop duplicate code 2011-09-28 18:39:26 +01:00
Andreas Preikschat 0a7ba097a8 shorter code 2011-09-26 20:48:47 +02:00
Andreas Preikschat d27a75287f - improved render performance for service items with the CanSoftBreak capability 
- added HTML5 doctype

bzr-revno: 1763
 2011-09-26 20:28:23 +02:00
Andreas Preikschat 70a7f1bf9f r1763 2011-09-26 20:26:40 +02:00
Andreas Preikschat 947a58dbbe improved line counting 2011-09-26 20:26:13 +02:00
Andreas Preikschat 9a40b27672 fix for theme editing 2011-09-26 18:57:32 +02:00
Andreas Preikschat c9b7b55a87 reverted some changes 2011-09-26 18:46:11 +02:00
Andreas Preikschat 3a2be026f5 reverted some changes 2011-09-26 18:25:22 +02:00
Tim Bentley fb3f001c26 Add Justify theme option 
bzr-revno: 1762
Fixes: https://launchpad.net/bugs/802252
 2011-09-26 17:07:30 +01:00
Andreas Preikschat 9841406071 minor improvement for such cases where [---] was used 2011-09-24 14:54:27 +02:00
Andreas Preikschat b776015ae9 r1759 2011-09-24 14:19:28 +02:00
Martin Zibricky 3492681ca2 [merge] merge with truk r1756 2011-09-23 02:43:51 +02:00
Martin Zibricky 354bec8b33 Fix - do not save temporary key by formatting tags into openlp configuration 2011-09-22 22:30:15 +02:00
rimach 11aae0bb82 sync with trunnk 2011-09-22 20:54:05 +02:00
rimach 18bda31ee9 correct merge proposal issues 2011-09-22 20:22:35 +02:00
Martin Zibricky 8b6887036b Fix regressions with users tags in preview and import/export in openlyrics 2011-09-22 16:23:51 +02:00
Tim Bentley 0e2d6cb45f Replace u'' for None 
bzr-revno: 1755
Fixes: https://launchpad.net/bugs/855368
 2011-09-21 18:48:22 +01:00
Tim Bentley 58695ac6f6 Change None to u'' for printing 
Fixes: https://launchpad.net/bugs/855368
 2011-09-21 18:23:04 +01:00
Martin Zibricky c47f936fd5 [merge] Merge with trunk r1754 2011-09-21 01:08:46 +02:00
Raoul Snyman 854cdf2c83 Fixed bug #803342. 
bzr-revno: 1754
Fixes: https://launchpad.net/bugs/803342
 2011-09-20 20:03:42 +02:00
Raoul Snyman b0dc146043 Added the default background colour back in so that the rest of the app that is not expecting to have to supply a background colour doesn't have to be changed. 
Fixes: https://launchpad.net/bugs/803342
 2011-09-20 19:53:09 +02:00
Andreas Preikschat 9cab0f223c Fixed bug 805088 (Display tags do not work on second slide when slide is split) 
bzr-revno: 1753
 2011-09-20 18:34:33 +02:00
Andreas Preikschat 920a65b4e1 fix detection when tag exists more than once 2011-09-20 17:50:43 +02:00
Tim Bentley 47b7379967 Fix spelling and remove print statement 2011-09-20 16:41:04 +01:00
Tim Bentley 834ed570ce Fix bug where string is added to image instead of QColor. 
Fix issue where queue has records to process but it is not running.

Fixes: https://launchpad.net/bugs/854171
 2011-09-20 16:23:29 +01:00
Andreas Preikschat 240d612948 fixed doc 2011-09-19 18:13:38 +02:00
Andreas Preikschat 724e2be04f close tags 2011-09-19 18:00:27 +02:00
Martin Zibricky fa9287c11b [merge] Merge with trunk r1750 2011-09-19 00:45:19 +02:00
Andreas Preikschat 734c868223 removed semicolon 2011-09-18 17:39:12 +02:00
Andreas Preikschat ceec3d6f3a reverted not necessary change 2011-09-18 12:32:27 +02:00
Andreas Preikschat d856e957b4 removed FIXME 2011-09-18 12:30:14 +02:00
Andreas Preikschat 2dad85f4c5 r1749 2011-09-18 12:28:53 +02:00
Andreas Preikschat d62876b411 r1749 2011-09-18 12:28:27 +02:00
Andreas Preikschat 3c3339f114 final fixes and clean ups 2011-09-18 12:26:47 +02:00
Tim Bentley 11424c8a7a Only load list if changed 2011-09-17 09:28:33 +01:00
Tim Bentley 62979a0062 Sort for added items in Images, Media and Presentations 
Fixes: https://launchpad.net/bugs/827027
 2011-09-17 09:20:03 +01:00
Tim Bentley 6a901f2de9 Add justify to theme options 
Fixes: https://launchpad.net/bugs/802252
 2011-09-16 18:23:39 +01:00
Martin Zibricky 50e1964795 Remove the db_file_path option from db.Manager init function 2011-09-11 22:39:33 +02:00
Martin Zibricky a3ff14d337 [merge] merge with trunk r1742 2011-09-10 19:28:11 +02:00
Tim Bentley a328d1c7c7 Bypass message if requested from remote plugin 
Fixes: https://launchpad.net/bugs/796195
 2011-09-06 18:53:43 +01:00
Andreas Preikschat c7ab79f987 fixed bug 805088 2011-09-06 13:56:52 +02:00
Martin Zibricky bd503f5c7d [merge] merge with trunk r1739 2011-09-05 12:48:46 +02:00
Martin Zibricky 4cf750ce9d Wrap db.Manager to a function arg for automated tests 2011-09-03 16:21:36 +02:00
Martin Zibricky 9a74b05a1f [merge] merge with trunk r1735 2011-09-02 23:31:42 +02:00
Raoul Snyman e8aae98e09 Fixed up a few things. 2011-09-02 21:04:07 +02:00
Raoul Snyman 79123e7df3 Tidied up some method and variable names. 2011-09-01 21:45:36 +02:00
Raoul Snyman abc2f3e89f Some minor fixes. 2011-08-31 13:29:04 +02:00
Raoul Snyman 4d66954d62 - Fixed re-playing of previous audio file. 
- Fixed left-over files from previous song.
- Renamed a few more enumerations.
- Fixed some exception handling.
 2011-08-31 09:49:57 +02:00
Raoul Snyman 8b8b4fbf51 HEAD 2011-08-30 21:42:12 +02:00
Andreas Preikschat d85128829e Fix Renderer - again 
bzr-revno: 1735
 2011-08-30 19:10:52 +01:00
Mattias Põldaru af10011c0c This seems to fix 
819271, web NIV download from Bibleserver crash.
No crash (257) and performance jump and reduced memory usage on loading services with huge files.
Fixed filename comparison on drag and drop.

bzr-revno: 1734
 2011-08-30 19:06:45 +01:00
rimach 38e08a5c8b Head 2011-08-30 18:56:52 +02:00
rimach 2c5bc34968 review changes part 2 2011-08-30 18:54:45 +02:00
Andreas Preikschat 71bdaf0708 comments 2011-08-30 17:15:39 +02:00
Andreas Preikschat 25ce484fb1 hopefully fixed it now completely 2011-08-30 17:12:16 +02:00
Andreas Preikschat 88704fbc68 fix soft break 2011-08-30 15:35:06 +02:00
rimach c608301b0b review changes 2011-08-29 23:51:03 +02:00
Andreas Preikschat 6c7527349d do not use the same name twice 2011-08-29 22:58:32 +02:00
Andreas Preikschat ccd0a46e2b do not expand the tags 2011-08-29 22:56:07 +02:00
rimach 20c9813d26 Head 2011-08-29 21:56:46 +02:00
rimach c547db5462 bugfixing 2011-08-29 21:55:58 +02:00
Raoul Snyman bbc8e04a3f HEAD 2011-08-29 20:46:01 +02:00
Mattias Põldaru 44c4febd29 Merge with upstream 2011-08-29 16:08:50 +03:00
Andreas Preikschat f046edc615 - fixed bug #796528 (Renderer splits slides twice even when the there is enough space) 
- fixed method confusion

bzr-revno: 1729
Fixes: https://launchpad.net/bugs/796528
 2011-08-29 08:21:24 +02:00
Andreas Preikschat fc71905735 append text to the last slide (if more than one) 2011-08-28 19:46:52 +02:00
Raoul Snyman 0b81824430 HEAD 2011-08-28 19:45:31 +02:00
Raoul Snyman 015249407d Renamed some of the ItemCapabilities. 2011-08-28 19:45:13 +02:00
Andreas Preikschat bc1f2d2977 removed wrong line 2011-08-28 18:59:09 +02:00