Commit Graph

4381 Commits

Author SHA1 Message Date
Samuel Findlay a9f97bf771 r1981 2012-06-05 19:34:00 +10:00
Samuel Findlay 2fb09b2462 Working ZionWorxImport 2012-06-05 19:16:24 +10:00
Stevan Pettit 1c53207a77 Changed variable names 2012-06-04 09:18:46 -04:00
Andreas Preikschat ad3edd4e10 changed attributes to camelCase 2012-06-04 12:51:50 +02: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
Andreas Preikschat 8f0ddfac9d r1979 2012-06-04 11:53:34 +02:00
Samuel Findlay 6dba01ea23 2012-06-04 01:13:23 +10:00
Samuel Findlay 501107c840 r1979 2012-06-03 23:53:20 +10:00
Edwin Lunando b05774e672 Fixed bug #902492: the theme wizard now uses the current output display geometry when creating a thumbnail for a theme.
bzr-revno: 1979
Fixes: https://launchpad.net/bugs/902492
2012-06-03 00:01:52 +02:00
Stevan Pettit de15cf85a3 Changed some labels. Fixed GUI buttons 2012-06-01 14:36:53 -04:00
Samuel Findlay 78c4906b55 2012-06-01 17:32:58 +10:00
Samuel Findlay 5b7bc879ac r1978 2012-05-31 22:45:00 +10:00
Samuel Findlay d86caecbbf Refactored sourcePage validation: reimplemented QWizardPage.isComplete() so that Next button is disabled until source(s) are selected. validateCurrentPage gives each song format class chance to validate its input. 2012-05-31 19:15:45 +10:00
Tim Bentley ab0be0006a Cache theme backgrounds earlier
bzr-revno: 1978
2012-05-30 20:58:33 +01:00
Tim Bentley cdb6859edf Add space 2012-05-30 20:50:24 +01:00
Samuel Findlay 2b51e7fcdc r1977 2012-05-31 01:01:25 +10:00
Samuel Findlay e882607360 Completed refactor of importer.py 2012-05-30 19:11:44 +10:00
Tim Bentley 14bdc5ca7a Remove blank lines 2012-05-29 20:13:02 +01:00
Stevan Pettit 394a02c696 Merged trunk 2012-05-29 08:59:11 -04:00
Edwin Lunando faebbc1f5d comment reformatting 2012-05-28 09:43:00 +07:00
Andreas Preikschat 4943e6681d - fixed crash on chancel if thread is still running in FTW
bzr-revno: 1977
2012-05-27 19:58:58 +02:00
Andreas Preikschat d5f1c54669 do some of the clean ups even when we just imported settings 2012-05-27 12:58:10 +02:00
Edwin Lunando 749a90b9da merge with trunk. 2012-05-27 17:02:03 +07:00
Edwin Lunando 32ee1ec343 refactor code 2012-05-27 16:41:53 +07:00
Tim Bentley 3bc0fc7de5 cache images sooner 2012-05-27 07:06:18 +01:00
Andreas Preikschat 612500c677 r1976 2012-05-26 19:53:03 +02:00
Andreas Preikschat 51d69a28ce stop imageManager thread on shutdown 2012-05-26 19:51:27 +02:00
Andreas Preikschat 56b02b02b1 attribute instead of method 2012-05-26 19:12:01 +02:00
Andreas Preikschat f96073000f fixed crash on cancel when thread is still running 2012-05-26 18:52:34 +02:00
Andreas Preikschat fc577afda2 little clean up, doc string 2012-05-24 21:05:15 +02:00
Andreas Preikschat 71e8a7a2eb fixes and doc string 2012-05-24 20:00:43 +02:00
Stevan Pettit ec27884d39 Removed last Qtcore.Qsetting usage 2012-05-24 07:02:01 -04:00
Andreas Preikschat 45a9b5f615 clean ups 2012-05-23 23:02:34 +02:00
Stevan Pettit 7bc4c5f318 Settings to set default as ini format 2012-05-23 13:13:22 -04:00
Andreas Preikschat 0517f3d8d7 renamed attribute 2012-05-23 18:59:28 +02:00
Andreas Preikschat 28930a9c32 added missing docstring 2012-05-23 18:55:41 +02:00
Andreas Preikschat 8a90476f89 added missing line 2012-05-23 18:53:08 +02:00
Andreas Preikschat 45c05e700d clean ups 2012-05-23 18:53:04 +02:00
Andreas Preikschat ded1e82659 r1975 2012-05-23 18:49:24 +02:00
Andreas Preikschat 1604d863eb clean ups 2012-05-23 18:46:54 +02:00
Andreas Preikschat 4a6697f5a1 r1975 2012-05-23 18:31:25 +02:00
Andreas Preikschat 2745406038 removed test code 2012-05-23 18:28:35 +02:00
Samuel Findlay bda1a0c420 Changes PowerSong importer to import a folder, rather than a selection of files. This involved implementing a getFolder method in core.ui.OpenLPWizard.
bzr-revno: 1975
2012-05-23 18:26:47 +02:00
Andreas Preikschat c15ac3a84e last fixes 2012-05-23 18:14:03 +02:00
Stevan Pettit 357f876331 Removed unused import qtcore 2012-05-21 08:41:33 -04:00
Stevan Pettit 968674a659 Merged with trunk, fixed conflicts and other changes 2012-05-20 23:06:17 -04:00
Stevan Pettit 0548bfb345 Modified code to use the directory choosen by user, don't append a sub-dir 2012-05-20 21:23:50 -04:00
Raoul Snyman 1c57abf8ab Refactored ScreenList into a true Pythonic singleton, though I sadly had to go with a "create" classmethod in order to retain the functionality of the previous constructor.. 2012-05-20 22:56:11 +02:00
Stevan Pettit f239cdcdad Various changes 2012-05-20 15:29:08 -04:00
Andreas Preikschat a5fa986bdd continued work 2012-05-20 21:11:27 +02:00
Andreas Preikschat 060718be32 (experimental) attempt to imporve renderer (to be fixed) 2012-05-20 20:26:24 +02:00
Andreas Preikschat 9fa14f3e3a attempt to fix bug 923496
Fixes: https://launchpad.net/bugs/923496
2012-05-20 17:52:21 +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 0ba3ccf199 random clean ups 2012-05-19 20:56:28 +02:00
Edwin Lunando 41d1ea3590 added comment 2012-05-19 23:50:45 +07:00
Samuel Findlay e28f654b0f r1972 2012-05-19 20:49:05 +10:00
Edwin Lunando b9aaaf05f6 Using the renderer.py calculation 2012-05-19 15:46:22 +07: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
Stevan Pettit aa5805863a Moved location of settings ini file to ..\Data 2012-05-17 23:24:49 -04:00
Andreas Preikschat 779a1201fc reverted some changes to avoid conflicts + clean up 2012-05-17 22:26:31 +02:00
Stevan Pettit a7fc64f0c3 Fixed problem with Import settings. 2012-05-17 15:23:58 -04:00
Andreas Preikschat 0b9923742e trivial clean ups 2012-05-17 14:59:57 +02:00
Edwin Lunando a251522ef3 #902492 resolved 2012-05-16 20:14:32 +07:00
Stevan Pettit eb58ee10e8 Changed name of settings INI to conform to PortableApps Standards
Disabled data path change when running portable
2012-05-14 23:17:20 -04:00
Stevan Pettit 2f38d55261 Changes to accomodate correct directory structure 2012-05-11 14:37:57 -04:00
Stevan Pettit f1586052a6 Added code to allow OpenLP to run portable 2012-05-11 08:22:34 -04:00
Stevan Pettit cf0e8c184e Fixed code per comments. Fixed misc syntax errors. 2012-05-10 19:23:45 -04:00
Tim Bentley 01ed8e4ed8 Fix delete key for services
bzr-revno: 1970
2012-05-07 18:07:34 +01:00
Tim Bentley 7cb1603d12 Fix traceback 2012-05-07 17:01:53 +01:00
Andreas Preikschat 5f1afcf9de show shortcuts in service item menu 2012-05-07 17:49:22 +02:00
Samuel Findlay a03af240df Minor fixes 2012-05-07 23:38:02 +10:00
Samuel Findlay 28d9a05731 Adapted all PowerSong import widgets for select folder 2012-05-07 21:24:46 +10:00
Samuel Findlay bf4dcdde92 Added getFolder to OpenLPWizard 2012-05-07 20:36:39 +10:00
Tim Bentley f9247078bc more Delete clean ups 2012-05-07 09:35:52 +01:00
Tim Bentley bcb6668792 Delete clean ups 2012-05-07 09:21:21 +01:00
Tim Bentley 5815d637a7 Add Service delete to Shortcuts and allow from keyboard 2012-05-07 08:40:34 +01:00
Andreas Preikschat be26adc0b8 added secondary priority for the image queue to privilege images which were added earlier over images which were added later, when both have the same priority
bzr-revno: 1968
2012-05-05 21:53:34 +02:00
Samuel Findlay fc8c5598aa Changed 'PowerSong' to 'PowerSong 1.0 and Code tidy ups.
bzr-revno: 1967
2012-05-05 19:51:31 +01:00
Andreas Preikschat 2680cc7cda - fixed regression which I have introduced in r1962 (user defined formatting tags were not considered any longer); - reworked staticmethods (merged functions etc); - changed saveButton behaviour to reflect the internal things happening (the button is now only enabled when you can save a change)
bzr-revno: 1966
2012-05-05 20:38:59 +02:00
Andreas Preikschat 8b08fbbe32 docs and class variable fix 2012-05-05 20:34:26 +02:00
Andreas Preikschat 265b703ba9 fixed bug 885874 (Song with mis matched formatting tags abends on render); fixed one extra new lines added before and after an optional break
bzr-revno: 1965
Fixes: https://launchpad.net/bugs/885874
2012-05-05 20:15:13 +02:00
Andreas Preikschat 5959ee5158 fixed regression, reworked staticmethods, changed button behaviour to reflect the internal actions 2012-05-05 18:03:40 +02:00
Andreas Preikschat b72101c724 fixed formatting tag not being present on slides 2012-05-05 16:36:47 +02:00
Andreas Preikschat a9c1443cc5 r1963 2012-05-05 15:59:27 +02:00
Andreas Preikschat 34b3173988 fixed bug 885874 (Song with mis matched formatting tags abends on render)
Fixes: https://launchpad.net/bugs/885874
2012-05-05 15:59:04 +02:00
Andreas Preikschat 7f7ac0c54e extended doc string 2012-05-05 14:40:31 +02:00
Andreas Preikschat aa917e7aba fixed cap 2012-05-05 14:38:06 +02:00
Andreas Preikschat baf1c792e5 clean ups 2012-05-05 14:24:25 +02:00
Andreas Preikschat 785787d7f3 added secondary criterion for the image queue to privilege images which were added earlier over images which were added later, when both have the same priority 2012-05-05 14:23:42 +02:00
Stevan Pettit 3f62cc16bb Merged with trunk. Resolved a conflict 2012-05-03 20:19:11 -04:00
Andreas Preikschat 554df1e363 Improved renderer performance: 0.11 vs. 0.29 (average time needed)
bzr-revno: 1962
Fixes: https://launchpad.net/bugs/856296
2012-05-03 22:51:04 +02:00
Stevan Pettit e86272f4d5 Fixed dialogues. Made changes to GUI. 2012-05-03 14:30:30 -04:00
Samuel Findlay 416cbe465e Changed 'PowerSong' to 'PowerSong 1.0' 2012-05-03 22:50:10 +10:00
Samuel Findlay 76de0f0c60 Merge trunk r1961 2012-05-03 14:25:31 +10:00
Andreas Preikschat 6915fb9d0d improved renderer performance 2012-05-02 20:25:37 +02:00
Andreas Preikschat 63997aa7b2 - repla- replaced numScreens by screenCount; - removed 0 in range()
bzr-revno: 1961
2012-05-01 22:35:42 +02:00
Raoul Snyman c03403f103 HEAD 2012-05-01 20:42:34 +02:00
Samuel Findlay ecc943ae20 Update to trunk r1960 2012-05-02 00:00:53 +10:00
Andreas Preikschat dbe85abb84 updated vlc.py
bzr-revno: 1960
2012-05-01 15:11:24 +02:00
Andreas Preikschat 99314e762d refactor version comparison code; removed dead code
bzr-revno: 1959
2012-05-01 14:58:22 +02:00
Meinert Jordan da46ec470a pythonifying code:
bzr-revno: 1957
2012-05-01 12:21:57 +01:00
M2j eafd3a20ae revert openlp/core/ui/media/mediacontroller.py to prevent merge conflict 2012-05-01 13:03:31 +02:00
Andreas Preikschat a0225d790a replaced numScreens by screenCount; removed 0 in range() 2012-05-01 13:00:02 +02:00
Andreas Preikschat bd4cded398 updated vlc.py 2012-05-01 12:38:19 +02: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
Samuel Findlay 21a88085e3 First attempt at class openlp.plugins.songs.lib.PowerSongImport 2012-04-30 00:08:25 +10:00
Andreas Preikschat f6177c62b2 fixed LooseVersion usage 2012-04-28 18:22:37 +02:00
Andreas Preikschat 76c004bb9a fixed LooseVersion usage 2012-04-28 18:19:02 +02:00
Andreas Preikschat 69affcc059 removed dead code, refactor version comparison code 2012-04-28 15:51:05 +02:00
Andreas Preikschat 38e5635901 r1955 2012-04-28 15:19:26 +02:00
Andreas Preikschat 9668b22f85 shorter solution 2012-04-28 15:10:54 +02:00
Andreas Preikschat 9dc7d1a795 fixed cap 2012-04-28 14:28:38 +02:00
Andreas Preikschat 42bc12f3fb try to prevent traceback when vlc too old
Fixes: https://launchpad.net/bugs/966086
2012-04-28 14:27:18 +02:00
Andreas Preikschat 1869fd7593 fixed clean up mistake 2012-04-28 13:37:39 +02:00
Andreas Preikschat f01252c23b fixed missing word 2012-04-28 13:31:42 +02:00
Andreas Preikschat cbbfa8c23b clean ups 2012-04-28 13:13:16 +02:00
Philip Ridout 7b99c97174 Adds DreamBeam song importer.
Small fix for SongShowPlus importer.

bzr-revno: 1955
2012-04-25 20:50:08 +02:00
Raoul Snyman 948186c45c A bunch of refactoring, including more sensible naming conventions.
bzr-revno: 1953
2012-04-25 20:43:57 +02:00
Raoul Snyman ad84097547 Added a generic except to catch other UNO problems.
Fixes: https://launchpad.net/bugs/987568
2012-04-24 18:50:12 +02:00
Raoul Snyman 640e12d85e Some more refactoring and renaming.
Changed the Bible upgrade to leave the old values behind so that older versions of OpenLP don't delete the "corrupted" databases.
2012-04-23 21:19:13 +02:00
Raoul Snyman 0f1bca77b4 Some small coding standards things. 2012-04-22 21:50:18 +02:00
Raoul Snyman 070ed7fcb5 Merged HEAD from trunk and fixed a conflict.
Some more refactoring.
2012-04-22 21:37:11 +02:00
Andreas Preikschat baf758e45d trivial cleanups part 2
bzr-revno: 1950
2012-04-22 08:32:13 +01:00
Raoul Snyman 4452d4834c Refactored various variable names.
Refactored the names of the fields in the "metadata" table of Bibles, and provided an upgrade script to upgrade the Bibles seamlessly.
Refactored the name of a setting, and wrote some code to migrate it seamlessly.
2012-04-22 00:29:08 +02:00
Raoul Snyman 7d5d7d7116 Changed the 'Split' button to say 'Optional Split' instead.
bzr-revno: 1945
2012-04-20 21:32:34 +02:00
Tim Bentley 44a7c32baf Updates to web to allow Android to poll
bzr-revno: 1944
2012-04-19 21:19:02 +01:00
Raoul Snyman 489f19cf39 Renamed all instances (i.e. comments) of 'virtual' to 'optional' 2012-04-18 23:55:44 +02:00
Andreas Preikschat 0fdf3b7f7c trivial clean ups 2012-04-16 09:02:24 +02:00
Raoul Snyman 70d75b0f80 Removed an unused import.
Changed the "Split" button to say "Optional Split" instead.
2012-04-13 22:08:05 +02:00
Andreas Preikschat 620d858d68 clean ups 2012-04-12 16:16:12 +02:00
Tim Bentley 2052387a91 head 2012-04-10 20:39:20 +01:00
Tim Bentley 04b4a34c68 Add service count for remotes 2012-04-10 20:38:25 +01:00
Andreas Preikschat 4ec49627db fixed comments, simplification, removed not needed attribute 2012-04-09 12:22:47 +02:00
Andreas Preikschat aa8457dd6e reverted changes and fixed the bug differently 2012-04-09 12:01:06 +02:00
Andreas Preikschat 6ad7a867cc fixed bug 970436 ('Display if a single screen' always in effect)
Fixes: https://launchpad.net/bugs/970436
2012-04-08 14:53:11 +02:00
M2j bca06c4a7a fix: wrong method name 2012-04-05 00:41:18 +02:00
M2j 3185e0b101 removed whitespaces at line ends 2012-04-04 09:26:51 +02:00
M2j 5ee446f694 Head 1933 2012-04-03 19:59:34 +02:00
M2j 7175902e6d removed whitespaces 2012-04-03 19:58:42 +02:00
Meinert Jordan 6a4edea071 Change default theme level to song level.
String fixes.
Fix missalignment of theme level selection labels.

bzr-revno: 1933
Fixes: https://launchpad.net/bugs/960386
2012-04-03 18:15:52 +01:00
M2j 9a68ce898a string fix: behaviour > behavior 2012-04-03 18:15:17 +02:00
Meinert Jordan a57289da8c Bug #967522: Don't drag from empty service manager area
bzr-revno: 1929
Fixes: https://launchpad.net/bugs/967522
2012-04-02 23:12:51 +02:00
Meinert Jordan 22d29e7d62 Bug #959760: Change theme manager delete button visibility on default theme change.
bzr-revno: 1927
Fixes: https://launchpad.net/bugs/959760
2012-04-02 23:06:16 +02:00
M2j dded8ee569 Bring back NextTrack 2012-04-02 23:00:24 +02:00
M2j 45e4d2c77d string changes 2012-04-02 21:52:47 +02:00
M2j 41ff5b04df small fixes 2012-04-02 21:34:49 +02:00
M2j b97445eaab string changed 2012-04-02 20:44:07 +02:00
M2j 40774f6375 Bug #923500: Do not mark service changed when accepting settings dialog. 2012-04-02 17:33:54 +02:00
M2j f876898033 Bug #959760: Change theme manager delete button visibility on default theme change. 2012-04-02 15:46:41 +02:00
M2j 3fc81ea230 Bug #967522: Don't drag from empty service manager area 2012-04-02 14:25:55 +02:00
M2j 352ee8e041 Bug #960386: string fixes
fix missalignment of theme level selection labels
change default theme level to song level
2012-04-02 12:32:52 +02:00
M2j c747baa2ea Trigger push button actions with click signal instead of push signal 2012-04-02 02:19:16 +02:00
M2j 6657e27694 add objectName parameter to create_button_box method
remove QMetaObject.connectSlotsByName() calls as they do nothing in our code
2012-04-02 00:44:09 +02:00
M2j d7ab06cc7e - reorganisation of methods in openlp.core.lib.ui to make them more comprehensive
- some small restatements of some code in bibles parse_reference() method
2012-04-01 23:19:56 +02:00
Andreas Preikschat 390def1f61 fixed 'Search Themes...' string 2012-03-26 11:41:59 +02:00
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
Edwin Lunando 49dbda7476 themeform.py line 426 at function setPositionPageValues(self):
added main and footer page width and height based on the screen size
2012-03-25 19:37:22 +07:00
Philip Ridout b68300bdc6 New importer for DreamBeam song files.
One small fix to SongShowPlus importer
2012-03-24 16:41:29 +00: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
Philip Ridout b4e8b48c6d Fixed bug #952533: Invalid file name characters in song name causes OpenLyrics to crash.
bzr-revno: 1916
Fixes: https://launchpad.net/bugs/952533
2012-03-23 13:09:51 +02:00
Philip Ridout cb38c0acd7 corrected the raw strings and back slashes 2012-03-23 06:36:24 +00:00
Philip Ridout 61ecf629cd added + 2012-03-22 21:09:20 +00:00
Jonathan Corwin d6e3ed6ae1 Fixed bug #891775: When the theme is bottom-aligned, stop the tails of y and g from being chopped off.
bzr-revno: 1914
Fixes: https://launchpad.net/bugs/891775
2012-03-22 23:02:23 +02:00
Philip Ridout 77f283c182 added the plus 2012-03-22 20:37:38 +00:00
Philip Ridout d4bfda2ade Made modifications according to merge request 2012-03-22 17:22:01 +00:00
Philip Ridout 1fd08401bf Fix for bug 952533 2012-03-22 06:50:54 +00:00
Jonathan Corwin 6eff57d17b Fix missing tails for bottom alignment 2012-03-21 22:27:04 +00:00
rimach 210f0e693b little corrections 2012-03-21 20:30:18 +01:00
rimach 8a029daf11 Head 2012-03-20 22:21:47 +01:00
rimach 527f4cc00c change camelcase variables 2012-03-19 20:27:02 +01:00
Jon Tibble a21ab3859b Head r1910 2012-03-18 21:20:58 +00:00
Raoul Snyman aa9ab19e38 Shortened some translation comments, as Qt says that the entire context of a translation may be no longer than 255 characters.
Updated the translation files while I was at it.

bzr-revno: 1910
2012-03-18 17:33:36 +02:00
Jon Tibble 025a81d553 Head r1909 2012-03-18 09:33:05 +00:00
Raoul Snyman 7f6ed27040 Shortened some translation comments, as Qt says that the entire context of a translation may be no longer than 255 characters.
Updated the translation files while I was at it.
2012-03-17 23:30:53 +02:00
Jon Tibble 086a32d7b1 Head r1908 2012-03-17 16:42:53 +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
Jonathan Corwin 7872ea03b1 Fix the next slide keypress action to call its own routine, since the interface is different to the other next slide event.
bzr-revno: 1908
Fixes: https://launchpad.net/bugs/957129
2012-03-17 08:59:45 +02:00
Jonathan Corwin 8bca20a48c Create wrapper routine due to incorrect parameter to slidenext 2012-03-16 23:05:06 +00:00
Christian Richter 2d18402e0b Fixed bug 900038. Corrected signal names. Corrected pause/stop check.
bzr-revno: 1907
Fixes: https://launchpad.net/bugs/900038
2012-03-17 01:03:05 +02:00
Jon Tibble 5ded814527 Head r1906 2012-03-16 22:56:06 +00:00
rimach 360df826e1 correct overridden media option 2012-03-16 22:52:15 +01:00
rimach 7464d0f9fc correct pause check, correct signal names 2012-03-16 22:09:27 +01: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
Raoul Snyman 44dc84c3cb 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.
bzr-revno: 1904
Fixes: https://launchpad.net/bugs/888815
2012-03-13 22:47:42 +02:00
rimach 09e7e16b12 fix issue, that video slider doesnt go back at video end 2012-03-13 20:54:16 +01:00
Jon Tibble 8e7eca36c7 Head r1903 2012-03-12 22:16:52 +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
Mattias Põldaru 9e4cdf1a74 Merge. 2012-03-12 10:25:48 +02:00
Mattias Põldaru f188e21391 Fix mediaPlayer override ComboBox items case. 2012-03-12 10:17:20 +02: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
Philip Ridout 2c5fa20154 Disable monitor selection drop down list when "Override display postition" is checked
bzr-revno: 1899
2012-03-11 16:37:59 +00:00
Jonathan Corwin e3d523042b Fix a couple of spelling mistakes
bzr-revno: 1897
2012-03-10 23:00:14 +00:00
Philip Ridout bad057e725 Added Raouls fix 2012-03-10 22:59:38 +00:00
Christian Richter 69d961666c Media player configuration changes:
Change the layout of the up/down buttons
Fix issue: if choose down button without selecting any item before the settings dialog were broken

bzr-revno: 1895
2012-03-10 22:56:57 +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
Jonathan Corwin e8a1d7591e Fix a few typos 2012-03-10 18:36:59 +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 bb4c6a4e16 A few minor fixes, and modifications to Wowimport:
Fixes 439 on the support tracker

Remove .encode hopefully to fix http://support.openlp.org/issues/442

Revisited Words of Worship importer. A few tweeks, some to make it more robust, and to provide more information to the user.

bzr-revno: 1893
2012-03-10 07:03:46 +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 74db5acaa3 Re-ordered group boxes as per Raouls request, and applied his radiobox code 2012-03-09 21:41:13 +00:00
Mattias Põldaru 67cd90d5bf Don't translate player names. Added some keyboard shortcuts. 2012-03-09 08:09:19 +02:00
rimach 499f51bd2b change Button layout, fix issue if no item selected and choose down button 2012-03-08 23:14:59 +01:00
Philip Ridout 5d8c2aae17 Fixes bug https://bugs.launchpad.net/openlp/+bug/883056
Adds radio buttons, and disables monitor selection when override display is on.
2012-03-07 22:14:58 +00:00
Jonathan Corwin a2e40543ea Fix phonon video for opaque themes
bzr-revno: 1892
2012-03-06 19:37: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
Mattias Põldaru 1600e002cb Make media backend names translatable.
Fixes: https://launchpad.net/bugs/903683
2012-03-05 23:09:31 +02:00
Jonathan Corwin e5a316ba2d Transparency fixes 2012-03-05 19:40:16 +00:00
M2j 9aaafdf108 Merge with lp:~raoul-snyman/openlp/bug-845692 to forestall merge conflicts. 2012-03-05 11:09:07 +01:00
M2j 970e6c5564 correct parenting of shortcut actions in slide controller 2012-03-04 20:06:49 +01:00
Raoul Snyman d6b14b39f8 HEAD 2012-03-04 20:05:29 +02:00
Raoul Snyman e59e717480 Hopefully fix the next button when things are on repeat. 2012-03-04 20:05:15 +02:00
M2j b952b2cdbc Merge differing trees and remove whitspaces 2012-03-04 15:52:09 +01:00
rimach 5d6db957e1 fix 2012-03-03 23:36:46 +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
rimach 87e70fa2dc fix 2012-03-03 00:08:24 +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 fe2966ac9e make slideShortcutActivated private 2012-02-28 10:47:34 +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
Philip Ridout d77534dc34 Fixes 439 on the support tracker 2012-02-27 18:41:24 +00: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 3a6a402b56 use Python methods instead of Qt 2012-02-26 22:09:22 +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