Commit Graph

362 Commits

Author SHA1 Message Date
Jon Tibble e40cdf792f Fix theme export breakage and lack of feedback 2010-06-10 00:28:02 +01:00
M2j b022fef955 combining two import statements 2010-06-10 01:03:08 +02:00
M2j 88930d3600 fix: Collecting files for theme export was broken 2010-06-10 00:18:07 +02:00
M2j 940c6fd44f Set theme and service file content to UTF-8
Replaced replaced all non-ASCII chars in the sources (exept of comments)
Fixed theme background images bug
2010-06-09 21:10:57 +02:00
Jon Tibble 0b1621923a PEP8 type checking and cleanups 2010-06-09 18:09:32 +01:00
Jon Tibble 559e4c4d63 Cleanups 2010-06-08 16:38:09 +01:00
Frode Woldsund 2df6bf5ef5 Fixed some wrong translate context and some indentation errors 2010-06-07 23:36:22 +02:00
Frode Woldsund b7d4f537e5 . 2010-06-07 00:44:49 +02:00
Frode Woldsund 23ac93019a Merged the trunk into my tree 2010-06-07 00:30:11 +02:00
Frode Woldsund dc35faf1ae Fixed all errors from the feedback I got from IRC 2010-06-06 12:07:48 +02:00
Frode Woldsund e88c05bd58 Added unicon symbol to all arguments in the translate() function. And fixed missing "spaces" and other smal error regarding the coding standar 2010-06-06 11:52:11 +02:00
Frode Woldsund 3be909c5c0 Replaced { self.trUtf8() } with { translate() } which is the new standar. I also imported the translate library on the following files. I did not remove any import sinse I do not know how this { self.trUtf8() } does work. 2010-06-01 00:06:16 +02:00
Jon Tibble fb1e222422 Moar whitespace, exceptions and naming 2010-05-29 20:50:50 +01:00
Jon Tibble 4616bbcb36 Explicitly declare exceptions 2010-05-27 17:00:51 +01:00
Jon Tibble dc96d471e6 Variable cleanup 2010-05-27 15:41:47 +01:00
Jon Tibble 871640c374 Whitespace 2010-05-25 17:16:43 +01:00
Jon Tibble a2448e36da Remove redundant code 2010-05-25 15:20:05 +01:00
Jon Tibble 5a7e36b5bc Correct settingsSection naming convention 2010-04-30 23:38:15 +01:00
Jon Tibble b81160768b Coding style fixes 2010-04-30 22:00:17 +01:00
Tim Bentley 61a1693ce0 Head 802 2010-04-30 15:27:05 +01:00
Jon Tibble 22b00a130f Make settings_sections consistent 2010-04-30 02:31:41 +01:00
Tim Bentley b25b8ea590 Head 800 and fix fall out part 1 2010-04-28 18:07:36 +01:00
Jon Tibble bc74bc0335 Cleanup settings saving 2010-04-28 15:17:42 +01:00
Jon Tibble 507cd19739 Cleanups and diff reading fixes 2010-04-28 02:28:37 +01:00
Jon Tibble 9605183812 Config file to QSettings conversion 2010-04-27 17:27:57 +01:00
Tim Bentley a29ea3f861 Add line spacing adjustment to renderer
Remove .thumbnail directories
2010-04-24 08:21:35 +01:00
Jonathan Corwin 29e4d4cf1a event fixes 2010-04-20 23:00:55 +01:00
Jonathan Corwin bc6b7a8488 signal/slot refactor part 1 2010-04-16 08:31:01 +01:00
Raoul Snyman 2c325d718b Changes:
- Consolidated common icons for a slightly smaller resource file.
- Changed the Import Bible icon to an import icon.
- Merge from head.
2010-03-23 21:04:15 +02:00
Raoul Snyman ea5ceaf00a Updated copyright.
Updated credits.
2010-03-22 01:58:01 +02:00
Tim Bentley 47dc69b194 More text fixes 2010-03-13 08:43:54 +00:00
Tim Bentley db84256a20 Fix yet more text 2010-03-12 19:39:15 +00:00
Jon Tibble e40f1b41ef Truth tests and some style fixes 2010-03-09 19:43:11 +00:00
Tim Bentley 9ada2f00b0 Theme Deletes only work for unused themes 2010-03-04 19:03:09 +00:00
Tim Bentley 325fab92da Clean up all the Gloab log statements 2010-02-27 15:31:23 +00:00
Jon Tibble d02fc68a72 Fix unzipping theme files 2010-02-22 16:57:08 +00:00
Jon Tibble 0337127985 Fix theme import alignment 2010-02-22 15:53:23 +00:00
Jon Tibble 45c7fad1d6 Fix theme import colours 2010-02-21 23:40:16 +00:00
Jon Tibble 962f1364e4 Fix v2 theme importing 2010-02-21 23:05:03 +00:00
Jon Tibble f7d95a8fdb Remove debug prints 2010-02-21 21:41:30 +00:00
Jon Tibble ab43741dcb Head r709 and initial fix for theme importing 2010-02-21 13:20:39 +00:00
Jon Tibble 60236d98a1 Head r706 2010-02-17 19:05:39 +00:00
Tim Bentley fef8986550 Fix theme import bug 2010-02-16 17:40:41 +00:00
Jon Tibble f30136924f Head r700 and import fixes 2010-02-06 16:23:47 +00:00
Tim Bentley af5bfe3066 Clean up SongUsage so it now works again 2010-01-28 07:15:23 +00:00
Jon Tibble 9239c0cdf3 Cleanups 2010-01-24 23:16:15 +00:00
Tim Bentley 56275fbc21 Remove prints for merge 2010-01-22 17:54:08 +00:00
Tim Bentley af3f69afce Finish off Theme thumbnail performance improvements 2010-01-21 19:41:17 +00:00
Tim Bentley a69ba0a151 Fix themes loading performance by storing small icons. 2010-01-18 19:56:02 +00:00
Raoul Snyman b4b075c961 Updated copyright year. 2009-12-31 14:52:01 +02:00
Tim Bentley aaba983805 Fix up Bible plugin and Theme manager 2009-12-11 17:40:18 +00:00
Tim Bentley 9893a887ab Add slideTransition Flag to theme to allow for transitions to be turned off at theme level 2009-12-08 17:52:45 +00:00
Raoul Snyman f5bee07341 Added Michael to the copyright notice.
Fixed a bug where Media Manager item toolbar buttons were becoming toggle buttons.
Cleaned up config settings.
Miscellaneous other bugfixes.
2009-11-30 22:29:26 +02:00
Raoul Snyman a6d8813a50 Merge from HEAD, started changing the copyright to include Michael Gorven. 2009-11-29 22:30:41 +02:00
Raoul Snyman 910a61ce3f Merged in HEAD 2009-11-29 22:01:23 +02:00
Raoul Snyman ce63999383 Various configuration option cleanups and changes. 2009-11-27 23:37:01 +02:00
Raoul Snyman d0832a2c86 Changed all the trUtf8(u'...') to trUtf8('...') 2009-11-26 20:43:49 +02:00
Raoul Snyman 2054d38cae Merged in lp:~raoul-snyman/openlp/bitsandbobs
bzr-revno: 671
2009-11-15 09:02:27 +02:00
Raoul Snyman 1d80bb6229 Attempt to fix recursion in blanking.
Fixed all the Receiver.send_message instances to stop instantiating the Receiver class.
2009-11-13 23:24:59 +02:00
Jon Tibble b79d535e04 Fix theme loading logic and missing item from cleaning 2009-11-12 23:49:35 +00:00
Jon Tibble 1c92f157c7 Refactor file_to_xml => get_text_file_string 2009-11-12 23:43:47 +00:00
Tim Bentley 5b154b5941 Fix bugs in previous merges with icons and themes 2009-11-08 13:56:25 +00:00
meths@btinternet.com eba4115490 Fix file handling
bzr-revno: 660
2009-11-07 06:45:25 +00:00
Jon Tibble ecb0e3db8b Truth and file handling fixes 2009-11-07 00:00:36 +00:00
Tim Bentley 38e3ca66cb Fix error in previous merge for ThemeManager
Get Custom Working with remote editing
2009-11-06 18:50:46 +00:00
Jon Tibble 74b08cb9c4 Clean theme loading 2009-11-06 02:12:56 +00:00
Jon Tibble 62031c24b9 Fix last theme.parse() without a cleanTheme() 2009-11-05 00:09:19 +00:00
Jon Tibble 2136155f48 Fix theme loading and song editing 2009-11-04 01:16:15 +00:00
Jon Tibble 5b4ce8124d Fix theme loading 2009-11-03 20:04:38 +00:00
Jon Tibble 84ce96f989 More truth testing cleanup - core 2009-11-03 18:14:25 +00:00
Jon Tibble 51915d0e97 Truth testing cleanup 2009-11-03 15:13:52 +00:00
Tim Bentley dd919d4ccf Headr633 and merge resolution 2009-10-29 13:58:03 +00:00
Jon Tibble 2a0e5d6726 Fix i18n for New Theme typo 2009-10-29 13:19:31 +00:00
Jon Tibble c6f6624605 Fix i18n for New Theme 2009-10-29 13:11:45 +00:00
Tim Bentley 0ffbc050de Songs now have remote edit working 2009-10-29 09:18:26 +00:00
Tim Bentley 68bc9bf526 Audit report work 2009-10-25 14:41:15 +00:00
Jon Tibble aeb75d2056 Fix imports and typo 2009-10-24 17:40:36 +01:00
Tim Bentley 76fa3438c4 Headr621 2009-10-24 10:55:25 +01:00
Tim Bentley 2c1c202e5b Fixed edit theme to preview render bug 2009-10-24 08:22:44 +01:00
Raoul Snyman 90280b7117 Finished up the initial conversion to "trUtf8()" 2009-10-23 20:48:49 +02:00
Raoul Snyman 8d4cdc71ba Initial go at i18n 2009-10-23 15:17:43 +02:00
Tim Bentley 979ba02b02 Add Lines per slide and wrap indentation 2009-10-22 20:03:08 +01:00
Jon Tibble 7f773a314b General fixes
bzr-revno: 610
2009-10-19 18:17:38 +01:00
Jon Tibble fc61d7fe55 Fixups 2009-10-19 15:56:44 +01:00
Tim Bentley 3c9ffae002 Fix name standards 2009-10-17 20:13:11 +01:00
Tim Bentley e9800d8ecc Fix theme saving 2009-10-17 19:20:07 +01:00
Tim Bentley 0f54bb81e7 Save Theme import directory 2009-10-16 05:46:32 +01:00
Tim Bentley 56930f1e65 Correct Theme name for Export if default 2009-10-11 07:25:37 +01:00
Tim Bentley 268aadde4c Theme improvements 2009-10-10 19:36:58 +01:00
Jon Tibble e5db2456e7 Remove unused imports 2009-09-25 01:43:42 +01:00
Jon Tibble 26bd337f7d Remove duplicate and redundant Theme code 2009-09-24 02:37:21 +01:00
Jon Tibble 873e16f3a6 Double space cleanup 2009-09-22 00:11:50 +01:00
Jon Tibble 98ea9141f4 More white space and line length fixes 2009-09-21 18:56:36 +01:00
Tim Bentley 03d9ac85d5 Add Theme export handling and error handling 2009-09-14 19:53:56 +01:00
Jon Tibble df7016c22d dos2unix run on trunk r535 2009-09-13 16:14:45 +01:00
Jon Tibble 54057730f7 Complete Theme breakage fixing 2009-09-13 15:12:38 +01:00
Jon Tibble 417d8c3725 Fix theme break 2009-09-13 14:24:58 +01:00
Raoul Snyman 43dc7e6b90 Merged in lp:~raoul-snyman/openlp/docstrings
bzr-revno: 532
2009-09-12 19:24:16 +02:00
Raoul Snyman fb9914fb08 Changed the license info from docstrings to normal comments. 2009-09-08 21:58:05 +02:00
Jon Tibble 78b553ac23 Refactor theme loading 2009-09-07 14:05:53 +01:00
Jon Tibble a037c3ee2b Fix theme loading mess 2009-09-07 03:17:36 +01:00
Jon Tibble cda62a2617 Save themes in formatted XML and clean touched files 2009-09-04 23:27:53 +01:00
Tim Bentley 0f1ac7cfb2 Sort out SlideController
bzr-revno: 515
2009-08-29 19:18:24 +01:00
Tim Bentley eca69df868 Slide Controller rewrite complete 2009-08-29 08:17:56 +01:00
Maikel Stuivenberg ec68413cec fixed the theme code 2009-08-28 20:34:33 +02:00
Maikel Stuivenberg 0c53783acd Theme manager will ask for save if theme already exists 2009-08-27 18:21:00 +02:00
Tim Bentley 63f67ea756 EventManager Removal - complete 2009-08-26 06:00:19 +01:00
Tim Bentley 49a424abd1 EventManager Removal part 3 - Theme handling 2009-08-25 21:04:58 +01:00
Tim Bentley 7226d4a232 EventManager Removal part 1 2009-08-24 21:05:46 +01:00
Tim Bentley b774cc10be Clean up Event Handling and remove call the ThemeManager from plugins 2009-08-15 08:33:01 +01:00
Tim Bentley 46cf6c763c Clean up event structure and add calling names
Clean up Remote client to remove qt dependancy
2009-08-12 05:57:24 +01:00
Raoul Snyman 29389bde13 Merge from trunk; A few bugfixes. 2009-08-09 19:58:37 +02:00
Tim Bentley 26a1658724 finish Theme handling corrections
Set Global Theme back in settings tab
2009-08-07 20:05:00 +01:00
Tim Bentley 23b13ede2d Default handling allows editing and blocks deletes 2009-08-07 18:30:12 +01:00
Tim Bentley 06ff5ec618 New bible import form
Start of default theme handling
Add Transparent backgrounds
2009-08-07 18:19:32 +01:00
Tim Bentley 9b5f844afa Standardize row hight in renderer
Various theme fixes and cleanups
2009-08-06 18:43:53 +01:00
Tim Bentley 13f016cf5f Minor bug fixes 2009-08-02 17:13:59 +01:00
Tim Bentley 209f92439c Remove Not used files and References
Fixes from Last Merge
ThemeManager Cleanup MVC.
2009-07-06 17:34:13 +01:00
Tim Bentley 3c71e91498 Fix up rendering a bit
Re-write the slide controller so it looks better (big clean up)
Fix themes where backgrounds are png files so they do not become phantom themes
start to sort out conversions
Hide openoffice at startup
2009-07-02 20:04:50 +01:00
Tim Bentley 560584d8f6 Added ImageToolBar to show what I am thinking
Cleanup mainwindow from mark 1 attempt.
Fix bug in Thememanager so themes are not deleted
2009-06-29 06:07:32 +01:00
Tim Bentley d1b9b5b218 Fix bugs from unicode migration in theme
Correct errors in Theme handling
More code style fixes on route
2009-06-24 06:17:41 +01:00
Tim Bentley 03904d7502 Finish OOS work with Images
Correct errors with existing oos 
Correct bugs in Bible HTTP code for unicode conversions
2009-06-20 20:11:17 +01:00
Tim Bentley 3a65ef4dca Add Menu Items which are finished
Correct last merge spelling errors
2009-06-19 20:49:00 +01:00
Tim Bentley e2b8af7073 Mass Unicode migration
Fix bugs found in retesting the app.
2009-06-16 19:21:24 +01:00
Raoul Snyman a8307e430b Changed QPixmaps to QImages to see the difference. 2009-06-10 17:37:33 +02:00
Tim Bentley 30154f2127 Lots for fixes:
- General Tab now saves and retrieves
- Alert Dialogs now alerts
- Renderer - More fixes
- SlideController looks better.
- Removal of poked in Managers all accessed via Parent.
2009-06-01 18:50:37 +01:00
Tim Bentley 4c76ffdbaa More cleanups
Fix Rendering bugs with images
Fix Theme choice bugs
2009-05-22 06:14:55 +01:00
Tim Bentley da0acea229 Phase1 operation superfly 2009-05-20 21:17:20 +01:00
Tim Bentley 3ba6733f14 Theme Preview in ThemeTab 2009-05-18 20:47:18 +01:00
Tim Bentley df0fd5b618 hook up themes to combo boxes 2009-05-17 09:25:15 +01:00
Tim Bentley 46efe3188e Add Images to the themes
Fix MainDisplay to record change of frame when blanked out.
2009-05-16 20:47:30 +01:00
Tim Bentley 2969c3641d More code cleanups 2009-05-16 17:38:03 +01:00
Tim Bentley b2d2de6ad8 Add Preformance Monitoring for Renderer
Fix Pixmap problems with pixelation
Remove duplicate image plugin issue.
2009-05-11 06:09:43 +01:00
Tim Bentley ce3d1cffc6 Add Buttonsbar to slidecontroller and add actions
Add Buttons to ServiceManager
Add Slide up/Down to slidecontroller.py
Fix missing data on selection in bibles and custom plugins
2009-05-04 09:15:48 +01:00
Tim Bentley 183a7e54c7 Add servicemanager access from Plugins
Add bibles to preview , live and servicemanager.py
Add icons to servicemanager lists
Fix thememanager to work with missing theme
2009-05-02 19:56:27 +01:00
Raoul Snyman 55cd0b90cd Replaced the old logos and graphics with the new ones, did some coding-standards-cleanup, and fixed a bug in the OpenLPToolbar code where it discarded Unicode strings. 2009-05-02 00:26:43 +02:00
Tim Bentley ba6e581223 Start to clean up rendermanger
fix bugs in rendereing 
fix thememanager to allow new themes to be created
2009-04-29 20:07:13 +01:00
Tim Bentley 2dbe7d99a2 Changes to code to fix review comments. 2009-04-28 20:20:03 +01:00
Tim Bentley 0facad72d6 Remove Print statement
Fix missing Theme bug
2009-04-25 07:38:21 +01:00
Tim Bentley 2457da9d88 Add version number to splash screem
Add ability to preview to preview controller
Add render manager to control rendering
Fix bugs in renderer
Add inital rendering to custom and bible plugins
2009-04-25 07:11:15 +01:00
Tim Bentley 4696564c09 Add update to ServiceManager of Themes from ThemeManager 2009-04-23 19:22:54 +01:00
Tim Bentley a3e2bce831 now we can save the theme as new or overrite 2009-04-23 19:12:36 +01:00
Tim Bentley d85a0ba293 Fix renderer name
Introduce rendermanager
2009-04-22 20:46:10 +01:00
Tim Bentley 852e24ab35 More Theme Changes
State corrections 
XML boolean fixes
2009-04-21 20:45:50 +01:00
Tim Bentley c8094b717f Add more controls and fix xml errors 2009-04-20 21:03:04 +01:00
Tim Bentley cf2ad84e74 More renderer cleanups
More ThemeManager fixes
Sortout XML tag name errors
2009-04-19 21:07:52 +01:00
Tim Bentley 570a35ae65 Renderer cleanups
Remove code duplication and simplifications
2009-04-19 20:12:18 +01:00
Tim Bentley 79e7e09d65 Add theme delete functionality 2009-04-19 19:17:17 +01:00
Tim Bentley a02835f0f8 Add new dialog and fix the Theme import code not to include old style preview code 2009-04-19 09:15:40 +01:00
Tim Bentley a662404122 Fix XML schema for naming
Fix ThemeManager and Renderer to cover changes
Move code for Boolean Config issues
Various code style fixes
2009-04-15 05:58:51 +01:00
Tim Bentley 6b4a5ff5d9 Allow existing themes to be edited (well at least viewed) 2009-04-11 16:16:02 +01:00
Tim Bentley 9b29d2b668 Change ThemeManager to use new XML format and renderer API's
Put in Propper logging for Screen resolution detection.
2009-04-10 06:59:40 +01:00
Tim Bentley 1fb2b366b2 Fix ThemeXML class as per review comments
Change all references to it
2009-04-07 20:45:21 +01:00
Tim Bentley 0dfe60ef9f Fix Problems from last merge review
Get Custom Plugin theme combo working following event post from ThemeManager
2009-04-07 20:03:36 +01:00
Tim Bentley 0e7dfb9fc4 Combine patch from previous tree which I messed up. Here is a summary of the changes.
444. By Tim Bentley 23 hours ago

    Add new event for Theme Loading
443. By Tim Bentley 23 hours ago

    Add Eventing after Themes loaded to tell plugins the themes have changed
442. By Tim Bentley on 2009-04-04

    Store Theme name in list for correct display
441. By Tim Bentley on 2009-04-04

    Add ThemeManagerDialog
    More Rendering improvements
440. By Tim Bentley on 2009-04-04

    Add Themes to Bible Tab and default values
439. By Tim Bentley on 2009-04-04

    Add rendering for Circles and amend XML schema accordingly
438. By Tim Bentley on 2009-04-04

    Renderer now supports linear gradients correctly
    Update XML to include direction
    Add Booleans instead of 0/1 to XML schema
437. By Tim Bentley on 2009-04-03

    More ThemeManager changes
    Fix Rendering and theme handling
    Generate PNG theme on conversion
436. By Tim Bentley on 2009-04-01

    Fix up Theme XML code to work with strings and files.
    Fix Render.py to work with new XML schema
435. By Tim Bentley on 2009-04-01

    Import version 2 xml and build object.
2009-04-06 19:45:45 +01:00
Tim Bentley 8aa67b5a8b Fix bugs around ThemeManager
Add themexmlhandler to manage xml marshalling for themes
2009-03-28 20:12:22 +00:00
Tim Bentley 68501479d7 Add Theme Preview to ThemeManager 2009-03-28 07:01:00 +00:00
Tim Bentley 1e32183a2a Add Import functionality to Theme Manager 2009-03-28 05:43:30 +00:00
Tim Bentley ddde031adb Final changes following a revert and removal.
Finish plugin.py
Add getThemes hook to thememanager.py
2009-03-23 20:18:06 +00:00
Tim Bentley 66f13e5ede Clean up Plugin Interface to be more Generic
Clean up Mainwindow for adding plugins
Add ThemeManager to Main window and pass to plugins
Add event Manager code to plugins and define some listners
Revert changes to Alert Form.
2009-03-23 19:17:07 +00:00
Tim Bentley 62f48a33f2 Continue fixing the EventManager usage
Use Mainwindow to trigger the loading of the themes by the ServiceManager
2009-03-22 20:20:45 +00:00
Tim Bentley b8c0ee1d70 Add ThemeManager and EventManager 2009-03-22 07:11:05 +00:00