Commit Graph

3042 Commits

Author SHA1 Message Date
Raoul Snyman
cff333ddc2 Added a shortcut list dialog shell. 2010-10-07 23:27:26 +02:00
Tim Bentley
75d35cf182 Fix duplicate file saving bug
Fix drag and drop service item bug

Fixes: https://launchpad.net/bugs/656177
2010-10-07 18:52:40 +01:00
Tim Bentley
681b6dc60f Head 2010-10-07 06:16:14 +01:00
Tim Bentley
749eb51dd4 Theme xml fixes 2010-10-07 06:15:02 +01:00
Tim Bentley
bccc3c56ca Fix text issues 2010-10-06 21:30:49 +01:00
Tim Bentley
7863a2ebfc Add Service Item update from edit with config flag 2010-10-06 20:27:30 +01:00
Tim Bentley
39f1aa2e09 Head1071 2010-10-06 05:55:00 +01:00
Tim Bentley
85dd394e25 Head1071 2010-10-06 05:47:29 +01:00
Jonathan Corwin
9a744119d3 Alerts over Phonon videos. Fix blank to theme bug for image backgrounds. 2010-10-05 23:23:46 +01:00
Tim Bentley
368bc2647f Head 2010-10-05 20:53:20 +01:00
Tim Bentley
4e8a7f47eb Fix up theme xml handling to new schema 2010-10-05 20:52:28 +01:00
rimach
f869e0d979 replace self.text_strings with self.textStrings, fix doc string 2010-10-05 18:09:48 +02:00
Tim Bentley
fc092ed919 Theme wizard start 2010-10-03 08:42:02 +01:00
Jonathan Corwin
f331f13278 Optional phonon videos, start 2010-10-01 23:47:37 +01:00
Tim Bentley
4d3a473e91 Service Manager loading - finished 2010-09-30 21:21:45 +01:00
Tim Bentley
68b38aa88c fix up rest of service load updates 2010-09-30 18:07:27 +01:00
Tim Bentley
bdc924093e Update service items on service load 2010-09-30 06:12:06 +01:00
rimach
2e72e2cbe7 add missing function content 2010-09-30 07:04:31 +02:00
rimach
ec16298908 add missing newlines, simplify getString function, wrap long lines 2010-09-29 23:06:59 +02:00
rimach
3eaf7a0738 Head 2010-09-29 22:39:15 +02:00
Tim Bentley
0f480a6dd5 Fix loading of service items bug
Fixes: https://launchpad.net/bugs/651076
2010-09-29 17:48:45 +01:00
Tim Bentley
882e4679f4 Head1066 2010-09-28 18:41:33 +01:00
Tim Bentley
f6a02fa6fa Fix blank line
Fixes: https://launchpad.net/bugs/649999
2010-09-28 18:41:14 +01:00
rimach
a76dd15fbe resolve diverged branches 2010-09-27 20:34:40 +02:00
rimach
f265c552ea replace strings with text_strings 2010-09-27 20:15:55 +02:00
Tim Bentley
25a4ff7880 Fix errors in merge 2010-09-26 15:01:27 +01:00
Tim Bentley
0d5fc3c980 Style Fixups 2010-09-26 13:23:50 +01:00
Tim Bentley
2f75087e40 Merge request cleanups 2010-09-26 09:38:11 +01:00
Tim Bentley
e33e4cb7ff Replace Context menu with smart context menu 2010-09-26 09:07:47 +01:00
Tim Bentley
cc42dc34d8 Basic Theme copy and rename working 2010-09-26 08:39:50 +01:00
Tim Bentley
6351e65c1c Head193 2010-09-26 07:20:37 +01:00
Tim Bentley
271d3b4af5 More updates 2010-09-26 07:20:24 +01:00
Tim Bentley
451f08db9f Spaces 2010-09-25 17:16:36 +01:00
Tim Bentley
fb5a481da5 Update preview song 2010-09-25 17:14:14 +01:00
Tim Bentley
83334a19e9 New Manifest file 2010-09-25 11:07:40 +01:00
Tim Bentley
a5367b647f Head 2010-09-25 08:48:02 +01:00
Tim Bentley
8f98ae9d2e Add Image cache 2010-09-25 08:45:21 +01:00
Tim Bentley
6a171899f5 Remove visible lag on displaying first picture of background 2010-09-25 07:29:03 +01:00
Tim Bentley
dabc04c7dd Fix replacement backgrounds 2010-09-25 07:11:00 +01:00
Christian Richter
70f8795d61 Fixed exception thrown on unchecking 'Auto detect' in languages menu
Fixed saving of language setting
Added pinging of review page in translation_util.py

bzr-revno: 1056
2010-09-24 19:51:21 +02:00
Tim Bentley
f62ac45a29 Head1054 2010-09-24 12:30:10 +01:00
Tim Bentley
d3e8da302c More cleanups 2010-09-24 12:29:52 +01:00
Tim Bentley
17132f0505 Remove line breaks in ServiceManager
bzr-revno: 1054
Fixes: https://launchpad.net/bugs/642788
2010-09-23 18:45:49 +01:00
rimach
7a7a4795f4 correct english sentense 2010-09-23 19:13:57 +02:00
rimach
ef6845dad8 Head 2010-09-23 19:12:04 +02:00
Tim Bentley
8ab9299814 remove line break before truncation.
Fixes: https://launchpad.net/bugs/642788
2010-09-23 17:45:17 +01:00
Tim Bentley
983c2012fd Update plugin list
Fix ServiceManager 
Put splash image back 
Fix hide screen bug.

bzr-revno: 1052
Fixes: https://launchpad.net/bugs/641644, https://launchpad.net/bugs/642754
2010-09-22 19:50:55 +01:00
Jonathan Corwin
ba78b7372b Speed up video loop, and adjust left margin for outline
bzr-revno: 1051
2010-09-22 19:43:55 +01:00
rimach
d1172e14c1 fix click/unclick 'Auto detect', fix saving of language setting 2010-09-22 20:03:10 +02:00
Tim Bentley
47b359a313 Fix issues with other merges 2010-09-22 06:03:10 +01:00
Tim Bentley
5e38d34997 Fix issues with other merges 2010-09-22 05:57:50 +01:00
Jonathan Corwin
050d1478c9 Attempt to speed up video restart when looping. Make sure outlined fonts don't vanish off left hand side 2010-09-21 23:22:05 +01:00
rimach
395fe85d42 update 2010-09-21 21:53:46 +02:00
Tim Bentley
e790f9aedc Move display fixes 2010-09-21 20:08:23 +01:00
Tim Bentley
3e0a3f799b Fix bug 642754 in service manager 2010-09-21 20:05:45 +01:00
Tim Bentley
8e94d87e65 Put the display image back after it was lost 2010-09-21 18:35:26 +01:00
Tim Bentley
d50ffbafa3 Fix review comments 2010-09-21 18:24:01 +01:00
Tim Bentley
419008d4b7 Head 2010-09-20 19:36:56 +01:00
Tim Bentley
56297a1cce fixes for 641644
Fixes: https://launchpad.net/bugs/641644
2010-09-20 19:01:32 +01:00
Tim Bentley
5675eba314 Fix local variable issues 2010-09-20 17:43:36 +01:00
Tim Bentley
fe6a3af42c Explicit error type 2010-09-20 17:33:38 +01:00
Tim Bentley
293443ba61 Fixed but untested
Fixes: https://launchpad.net/bugs/642778
2010-09-20 06:06:18 +01:00
Tim Bentley
b73a921dbc Fix bug if no lanuagage files 2010-09-20 05:59:51 +01:00
Tim Bentley
551bf3c41f r1044 2010-09-20 05:39:46 +01:00
Jonathan Corwin
827eb93c67 r1044 2010-09-19 22:07:26 +01:00
Jonathan Corwin
ad51cb8040 Remove top/left border on maindisplay. QGraphicsWebView only appeared in Qt4.6 2010-09-19 21:59:00 +01:00
rimach
23099261bd Head 2010-09-19 10:47:00 +02:00
Raoul Snyman
3ff6d4da16 Fix for bug #640697
bzr-revno: 1043
2010-09-18 21:32:34 +02:00
Raoul Snyman
bf35338c99 Fix some typos. 2010-09-18 20:15:54 +02:00
Raoul Snyman
7f5a6411d6 Fix for bug #640697 2010-09-18 19:14:27 +02:00
Jonathan Corwin
93b2d54c92 String fixes 2010-09-18 16:24:39 +01:00
Jonathan Corwin
2837c36553 tweaks 2010-09-17 21:32:00 +01:00
Raoul Snyman
fdc0d14790 Fixed a spelling error.
bzr-revno: 1038
2010-09-17 18:38:21 +02:00
Raoul Snyman
c8d9fd97df Fixed a spelling error. 2010-09-17 08:20:51 +02:00
rimach
d69f077f53 Head 2010-09-16 23:27:46 +02:00
Jonathan Corwin
2ad441e883 Speedups 2010-09-16 22:19:51 +01:00
rimach
8bf0b34d22 Head 2010-09-16 23:12:51 +02:00
rimach
399813e6aa fix for the merge comments, add correct translations for settings window 2010-09-16 23:10:36 +02:00
Raoul Snyman
22774b880a - Fixed up the QM file locations for static builds.
- Added PyEnchant to the build process.
- Fixed LanguageManager to be complaint with the coding standards.
2010-09-16 22:40:12 +02:00
rimach
ad6294ffcc simplify icon name settings 2010-09-15 22:23:03 +02:00
Tim Bentley
bc537365bd Speed up render 2010-09-15 19:03:54 +01:00
rimach
3bc527e4fc bugfixing 2010-09-15 19:55:27 +02:00
rimach
c53731d74b media items' __init__ methods 2010-09-14 20:34:39 +02:00
rimach
2d47e2523c remove executable flag 2010-09-14 20:18:47 +02:00
rimach
33f49f7d4a Head 2010-09-14 19:46:39 +02:00
rimach
22304d491d correct coding rules, some optimizations 2010-09-14 19:46:21 +02:00
Tim Bentley
627ba9626c Fix errors in merge 2010-09-14 18:29:56 +01:00
Tim Bentley
fe21b6be12 Fix video crashing
Fixes: https://launchpad.net/bugs/637886
2010-09-14 18:06:08 +01:00
Tim Bentley
d476e63621 fix service editing crashing
Fixes: https://launchpad.net/bugs/637547
2010-09-14 18:05:05 +01:00
Jon Tibble
1968803619 More cleanups 2010-09-14 15:43:21 +01:00
Jon Tibble
5fe753c833 Cleanups 2010-09-14 15:21:44 +01:00
Jon Tibble
23859bb241 Head r1030 2010-09-14 14:04:04 +01:00
rimach
8e8a6e42ff Head 2010-09-13 21:08:26 +02:00
Raoul Snyman
a1f7c9c5a0 Various string-related fixes:
- Removed a bunch of double spaces.
- Renamed the translation files.
- Updated the translation files.
- Fixed up a few widgets.
Also fixed up the layout on the Edit Song form.

bzr-revno: 1030
2010-09-13 08:17:07 +02:00
Tim Bentley
317a4ea8c6 Fix code so translations can be found
bzr-revno: 1029
2010-09-13 07:05:24 +01:00
Raoul Snyman
d4a0171203 HEAD 2010-09-13 07:16:16 +02:00
rimach
9546c338fc Head 2010-09-12 23:03:45 +02:00
rimach
e2c8ee11f2 Fix removing dock with translation 2010-09-12 23:03:16 +02:00
Tim Bentley
37aecbefaf Lanugages now work 2010-09-12 10:14:02 +01:00
Jonathan Corwin
15c868568f Head 2010-09-11 22:40:26 +01:00
Jonathan Corwin
0d36cba0bb Video background loop/change 2010-09-11 22:40:14 +01:00
Tim Bentley
7b46f33cde Space 2010-09-11 16:58:03 +01:00
Tim Bentley
8d51128e0c Fix translation code to find qm files 2010-09-11 15:03:10 +01:00
Tim Bentley
beedfb78e6 Change version checking code 2010-09-11 12:11:19 +01:00
Tim Bentley
36b3446d2c Theme Cleanup up 2010-09-11 07:59:36 +01:00
rimach
d542e2762a hopefully Line ending corrected part3 2010-09-10 21:47:33 +02:00
rimach
5b32a9f6a9 Head 2010-09-10 21:23:20 +02:00
rimach
6d7e7d7ad2 hopefully Line ending corrected and resolve merge conflict, part2 2010-09-10 21:21:14 +02:00
rimach
2b700c481f hopefully Line ending corrected and resolve merge conflict 2010-09-10 20:46:04 +02:00
Jonathan Corwin
d549935fa8 Bug 634771 - Check for no recent files 2010-09-10 18:49:22 +01:00
rimach
d4cabf9693 move translations from mediamanager to plugins with dict 2010-09-10 17:50:30 +02:00
rimach
fa328945d3 Head 2010-09-09 23:12:02 +02:00
Jonathan Corwin
15a155044f Left+Bottom align footer, and prevent wrapping
bzr-revno: 1021
2010-09-09 19:05:08 +01:00
Jonathan Corwin
dd2136774b Remove height, so fix actually works 2010-09-09 08:30:14 +01:00
Jonathan Corwin
58dc96b124 Anchor footer from bottom, and prevent footer line wrapping 2010-09-08 22:55:24 +01:00
Tim Bentley
0eea3f40f3 Head 2010-09-08 20:39:39 +01:00
Tim Bentley
3bfea1c715 Proper fix for 632674 2010-09-08 20:36:39 +01:00
Tim Bentley
472da0cf27 Short term fix for 633354
Fix display and text bugs

bzr-revno: 1019
Fixes: https://launchpad.net/bugs/594808, https://launchpad.net/bugs/632674
2010-09-08 20:13:58 +01:00
Tim Bentley
ccb75ad3b6 Fix display to work on 1024x768 resolution without nasty slider movements
Fixes: https://launchpad.net/bugs/594808
2010-09-08 19:12:16 +01:00
Tim Bentley
b39136782e Quick hack to get songs back 2010-09-08 19:00:48 +01:00
Tim Bentley
cfca50ff25 Fix setText bug when null list item
Fixes: https://launchpad.net/bugs/632674
2010-09-08 18:51:19 +01:00
rimach
8bdedae911 Head 2010-09-07 23:04:13 +02:00
Raoul Snyman
7c2da6e2e3 Added a global exception catcher, so that our poor n00bs can see what happened. 2010-09-07 22:42:33 +02:00
rimach
44806ff859 Head 2010-09-05 23:04:25 +02:00
Tim Bentley
91eff095a5 Fix hiding of screen and adding items behind it and showing them.
Fixes: https://launchpad.net/bugs/630285
2010-09-05 20:52:49 +01:00
Tim Bentley
a4d8e225c0 Allow images to blank to theme.
As none defined cos it's an image use global

Fixes: https://launchpad.net/bugs/630254
2010-09-05 17:11:50 +01:00
Tim Bentley
2617e8d67b Fix bug for song CCLI setting
Fix bug for dual bible tab which was a general settings bug.

bzr-revno: 1013
Fixes: https://launchpad.net/bugs/629848, https://launchpad.net/bugs/622894
2010-09-05 07:05:00 +01:00
Jonathan Corwin
301a190483 Size maindisplay to full screen correctly, and eliminate maindisplay scrollbars
bzr-revno: 1012
2010-09-04 22:31:32 +01:00
Tim Bentley
e2c117034a Fix up bug for bible settings of duel drop down
Fixes: https://launchpad.net/bugs/629848
2010-09-04 20:40:28 +01:00
Jonathan Corwin
e54340d8f3 scrollbar attempt 2 2010-09-04 20:13:26 +01:00
Tim Bentley
2cc3b8543c Clean up the renderer
bzr-revno: 1011
2010-09-04 19:12:48 +01:00
Philip Ridout
cefc155441 Rearranged the screen co-ordinate fields.
bzr-revno: 1010
2010-09-04 20:08:13 +02:00
Jonathan Corwin
9c0391fe73 Screen size and scrollbar fix? 2010-09-04 18:55:10 +01:00
Philip Ridout
cd9a7d4951 Changed with and height arround on the general tab. This brings it in line with the standard way of specifing a screen res, as well as bring it in line with the x & y cords before the height and width! 2010-09-04 17:36:07 +01:00
Tim Bentley
b9bb5b8c4f Cleanups 2010-09-04 17:14:56 +01:00
Tim Bentley
e521e986c4 Head1008 2010-09-04 16:51:28 +01:00
Tim Bentley
62a031982e Renderer cleanup 2010-09-04 16:51:18 +01:00
Jonathan Corwin
5dd5e15060 Subtract shadow from width, not add it 2010-09-04 15:23:20 +01:00
Jonathan Corwin
704502b05d Head 2010-09-04 14:35:15 +01:00
Jonathan Corwin
a74af25265 tidy 2010-09-04 14:09:47 +01:00
Jonathan Corwin
1899fc3415 css tidies, attempt to get paging correct, replacing qtextdoc with qwebview 2010-09-04 14:06:06 +01:00
Tim Bentley
26bceb84b9 Sort out spelling highlighting 2010-09-04 11:39:48 +01:00
Tim Bentley
04cfa6a730 Move spell and tag dialog to it"s own file 2010-09-04 09:12:54 +01:00
Tim Bentley
e5b2ff9e06 Move backgrounds to css from images 2010-09-04 08:48:58 +01:00
rimach
95ffc8dd3b add translation code for MediaDocks and PluginList 2010-09-04 00:51:28 +02:00
Jonathan Corwin
1fca6ec81d Italics/Bold theme to CSS. Share css for both QTextDocument and QWebView 2010-09-03 23:03:54 +01:00
Jon Tibble
9fa6039557 Head r1006 2010-09-03 21:08:38 +01:00
Jonathan Corwin
1275fdb35a Fix {} colour substitutions and problems displaying first slide
bzr-revno: 1006
2010-09-03 20:49:09 +01:00
Tim Bentley
27dd493d40 debug cleanups 2010-09-03 19:33:55 +01:00
Jonathan Corwin
e292748b83 Colour and poss blank verse fix? 2010-09-03 19:30:56 +01:00
Tim Bentley
da88990549 Bug 625997 2010-09-03 19:24:11 +01:00
Jonathan Corwin
8be66a0e6f A bit of python crept into the javascript 2010-09-02 22:24:44 +01:00
Jonathan Corwin
96737c0bc0 Use QtGraphicsWebview. Reduce div count where possible 2010-09-02 21:41:24 +01:00
Raoul Snyman
952dfca9fc Updated translation files, removed some more double-spaces 2010-09-02 13:05:48 +02:00
Raoul Snyman
081c66a1ed More extra spaces removed. 2010-09-02 13:00:08 +02:00
Jonathan Corwin
a9281e4cb9 replace evil-tables(tm) with div's 2010-09-01 22:36:02 +01:00
Tim Bentley
b24467d32c cleanup 2010-09-01 20:20:40 +01:00
Raoul Snyman
ad57ee0927 Removed an unnecessary space. 2010-09-01 08:19:45 +02:00
Jonathan Corwin
0c62215bb7 Less interesting, but hopefully slightly faster transitions 2010-08-31 23:15:19 +01:00
Tim Bentley
fbc048e878 Renderer fixes 2010-08-31 18:51:48 +01:00
Raoul Snyman
cafd5fca54 Reduce "Go to Verse" to "Go To" 2010-08-31 15:23:21 +02:00
Raoul Snyman
d116196993 HEAD 2010-08-31 08:41:40 +02:00
Raoul Snyman
b5dc5bafc0 - Fix for "TextLabel" in translation.
- HEAD
2010-08-31 08:41:03 +02:00
Jon Tibble
941ef772a5 Cleanups 2010-08-31 00:19:04 +01:00
Jonathan Corwin
305610ed8e fixes 2010-08-30 21:57:59 +01:00
Jonathan Corwin
3ea9ed2643 Head 2010-08-30 20:07:54 +01:00
Jonathan Corwin
b96a284d9e transition changes 2010-08-30 19:55:59 +01:00
Raoul Snyman
0e919ab903 Only show the display screen on startup if it is not on the primary screen.
bzr-revno: 1000
2010-08-29 21:29:45 +02:00
Raoul Snyman
75d64a165c Removed the commented out line, since this works. 2010-08-29 21:16:17 +02:00
Raoul Snyman
90ac6da839 Don't show the display on startup if there's only one monitor. 2010-08-29 20:12:36 +02:00
Tim Bentley
002b5de1c3 remove slash 2010-08-29 15:44:14 +01:00
Tim Bentley
93c87c396b add space 2010-08-29 15:42:47 +01:00
Tim Bentley
4379004f0e rename theme suffix 2010-08-29 15:27:51 +01:00
Tim Bentley
f065f95d00 Head998 2010-08-29 15:20:21 +01:00
Jon Tibble
9a1ed78fd5 Cleanups 2010-08-29 00:52:10 +01:00
Jon Tibble
168033566a Head r997 2010-08-28 20:40:27 +01:00
Tim Bentley
10aa9432d6 Fix font sizes and performance of previews 2010-08-28 19:44:49 +01:00
Tim Bentley
618813f020 Display and renderer changes
bzr-revno: 997
2010-08-28 17:35:16 +01:00
Tim Bentley
5ba4de64ca String fixes 2010-08-28 16:49:51 +01:00
Jonathan Corwin
c4f3bccb59 Problems with outlines in qtwebkit 533.3. Shadow colour and kerning 2010-08-28 00:19:50 +01:00
Tim Bentley
759019e5eb Fix theme import Redhat Bugzilla 2010-08-27 19:48:06 +01:00
Tim Bentley
a4f1b29cca Fix bug losing transitions 2010-08-27 19:28:19 +01:00
Tim Bentley
3c637f6c2d chnage theme suffix 2010-08-27 17:44:42 +01:00
Tim Bentley
e1afe3be94 Head994 2010-08-27 17:10:15 +01:00
Raoul Snyman
596b49af9e Fixed up some HTML that crept in somewhere. 2010-08-27 11:11:57 +02:00
Tim Bentley
ba4821e5f8 Screen re-sizing now works 2010-08-26 17:51:27 +01:00
Tim Bentley
2e6c06ad1f Screen switching now works 2010-08-26 17:08:26 +01:00
Tim Bentley
ca58541cb5 Head993 2010-08-26 16:50:11 +01:00
Tim Bentley
d6a67e7382 Screen fixes 2010-08-26 16:50:03 +01:00
Raoul Snyman
364940c547 Additional failover for version problems.
bzr-revno: 993
2010-08-26 15:54:05 +02:00
Raoul Snyman
3b1c151e15 Fail silently on version problems.
Renamed a variable to be a little more sensible.
2010-08-26 07:35:34 +02:00
Tim Bentley
adb757cd2f Cleanups and screen fixes 2010-08-26 06:01:29 +01:00
Jon Tibble
06fd68b3d8 Cleanups & fix version check 2010-08-26 01:37:25 +01:00
Tim Bentley
2ec84cc5d9 White Space cleanup 2010-08-25 18:08:24 +01:00
Tim Bentley
fcb62e41b8 Cut paste bug 2010-08-24 18:53:41 +01:00
Tim Bentley
46e35ead28 Spotted video bug 2010-08-24 18:28:13 +01:00
Tim Bentley
7359e91283 Fix bible titles 2010-08-24 18:12:47 +01:00
Tim Bentley
b2234ae269 Remove Unused variables 2010-08-24 17:39:51 +01:00
Jonathan Corwin
5c90fae68d Footer and css fixes 2010-08-23 23:24:42 +01:00
Tim Bentley
9403beb8b8 Fix blinking screen on Settings 2010-08-23 20:14:05 +01:00
Tim Bentley
6ab5447159 Fix up image deletion bug 2010-08-23 18:48:52 +01:00
Tim Bentley
37d1ab68b4 Remove border and handle missing enchant 2010-08-23 05:58:32 +01:00
Tim Bentley
a4e58c3349 Finish off spelling and tags for Custom and Song dialogs 2010-08-22 09:27:08 +01:00
Tim Bentley
ed4801b48a Add Html Tags to context menu 2010-08-22 08:39:23 +01:00
Tim Bentley
f705b69e20 Spellchecking of songs and custom 2010-08-22 08:05:05 +01:00
Tim Bentley
9f4066bf3f More fixes and update song editing 2010-08-21 20:35:32 +01:00
Tim Bentley
076215435b Fix up tags for renderer 2010-08-21 20:17:56 +01:00
Tim Bentley
06901951a6 Bug Fixes 2010-08-21 11:07:59 +01:00
Tim Bentley
3698f4abd9 cleanups for merge 2010-08-21 09:24:14 +01:00
Tim Bentley
58f7f248e3 Remove text indentation 2010-08-21 08:46:00 +01:00
Tim Bentley
8459cf1c25 Fix service item focus bug 2010-08-21 08:25:54 +01:00
Tim Bentley
1e86aa98ba Fix theme text weight and html tag cleanups 2010-08-21 07:00:46 +01:00
Jonathan Corwin
51f35dc9ce Alerts over presentations + tidyups 2010-08-09 22:21:04 +01:00
Tim Bentley
6c3f21dfb0 Theme Editing now previews and RenderManager Cleanups 2010-08-07 14:37:10 +01:00
Tim Bentley
45b12cf462 Theme preview updates 2010-08-07 09:50:58 +01:00
Tim Bentley
efd5c60dfd Display fixes amd theme updates 2010-08-07 07:18:05 +01:00
Tim Bentley
bec051a502 Fade previews now work 2010-08-06 17:38:52 +01:00
Tim Bentley
956017da0e Start to fix preview for fades 2010-08-06 06:09:32 +01:00
Tim Bentley
15c6e47f4e Cleanups 2010-08-05 21:39:20 +01:00
Tim Bentley
b612ece199 Fix theme editing display size 2010-08-05 21:26:39 +01:00
Tim Bentley
9722b4e382 Theme cleanups 2010-08-05 20:01:24 +01:00
Tim Bentley
ab37fdbcf8 Theme blanking works now 2010-08-05 08:49:25 +01:00
Tim Bentley
003d0552eb Theme blanking works 2010-08-05 06:37:26 +01:00
Tim Bentley
6d352df382 Video cleanups 2010-08-04 20:09:43 +01:00
Tim Bentley
821911503e Alerts now work 2010-08-04 05:59:41 +01:00
Tim Bentley
f3e62c9f14 Bible text display cleanups 2010-08-03 20:23:05 +01:00
Tim Bentley
6d5eae7377 Update to alert 2010-08-03 19:30:38 +01:00
Tim Bentley
7152d60a16 Fix up for alerts. 2010-08-03 06:15:50 +01:00
Tim Bentley
9539e5b2a6 Head986 2010-08-03 05:56:33 +01:00
Tim Bentley
bdda14740b More changes 2010-08-03 05:56:21 +01:00
Tim Bentley
197fe4cb08 Fix song usage
Fix 598407

bzr-revno: 986
Fixes: https://launchpad.net/bugs/598407
2010-08-02 20:32:40 +01:00
Tim Bentley
9bdc7db801 Fixes 2010-08-02 20:23:39 +01:00
Tim Bentley
39be81f8b2 Fix bug #598407 2010-08-02 20:08:55 +01:00
Tim Bentley
9da35664bb Fix up songusage 2010-08-02 20:05:40 +01:00
Tim Bentley
929b36705a Remove blank lines 2010-08-02 18:56:50 +01:00
Tim Bentley
4e0a3ca40b Fix song usage missing code 2010-08-02 18:51:44 +01:00
Tim Bentley
82aa9c333a Add Volume slider and document APIs 2010-08-02 06:16:07 +01:00
Jon Tibble
72c2336d84 Work with SQLAlchemy 0.6 (Bug #611889) 2010-08-02 03:53:14 +01:00
Tim Bentley
c10fc012a3 Video starts to work 2010-08-01 17:46:24 +01:00
Tim Bentley
992cebb05c Head984 2010-08-01 16:48:26 +01:00
Jon Tibble
41ed61bfe3 Fix previous fix 2010-08-01 15:28:40 +01:00
Tim Bentley
6787a41eae Fix disply settings again - alerts coded 2010-08-01 14:11:54 +01:00
Tim Bentley
047e8efe1f Head982 2010-08-01 09:44:58 +01:00
Tim Bentley
fb4bd1a8c2 Head981 2010-08-01 09:30:42 +01:00
Tim Bentley
f10e478438 Alert workings 2010-08-01 09:28:31 +01:00
Jon Tibble
4b0093e97b Fix alerts width 2010-07-31 23:23:48 +01:00
Jon Tibble
e815a5ff08 Fix non-updating screen when unchecking override 2010-07-31 22:58:56 +01:00
Jon Tibble
c9edfb9508 Cleanup QMessageBoxes using defaults 2010-07-31 03:06:44 +01:00
Jon Tibble
8f0d30c48b Fix plugin forms 2010-07-31 01:34:37 +01:00
Jon Tibble
ab3efd2b3b Fix issues with plugins (inc. bug #605655) 2010-07-31 01:05:27 +01:00
Jon Tibble
ee80308997 Code sorting, refactoring and cleaning 2010-07-30 23:48:09 +01:00
Tim Bentley
e95ea60d9b Alerts start to work 2010-07-30 20:15:55 +01:00
Tim Bentley
c46dfab8a1 Head979 2010-07-30 19:02:57 +01:00
Tim Bentley
0518f4987a Bibles do not loop 2010-07-30 19:02:03 +01:00
Tim Bentley
50691074b8 Head978 2010-07-30 18:49:55 +01:00
Tim Bentley
f357ed6f84 Cleanups 2010-07-30 18:49:46 +01:00
Tim Bentley
0e7712aecc Code cleanups 2010-07-30 17:36:11 +01:00
Jon Tibble
751d16e2e0 ServiceManager naming 2010-07-30 17:19:32 +01:00
Jon Tibble
003cfd1e68 Fix unused var and standardise loop vars 2010-07-30 17:13:17 +01:00
Tim Bentley
b191f1391c Fixed shadows and added transitions 2010-07-30 06:08:49 +01:00
Tim Bentley
ee7b50a770 Fix html color location 2010-07-29 18:08:01 +01:00
Tim Bentley
ee6f6d0618 Code cleanups and add text colouring for songs etc 2010-07-29 06:05:04 +01:00
Tim Bentley
625e652fcc Line height 2010-07-28 21:29:01 +01:00
Tim Bentley
b7c241cf36 Outline works - Irsh shadow 2010-07-28 18:21:32 +01:00
Tim Bentley
ca0c98e72e Head974 2010-07-28 17:58:34 +01:00
Tim Bentley
353f2c97be Outline changes 2010-07-28 17:53:54 +01:00
Jon Tibble
8838e9563e Naming cleanup fixes 2010-07-28 14:36:29 +01:00
Jon Tibble
2bd442ff4f More naming cleanup 2010-07-28 14:15:39 +01:00
Jon Tibble
3b5c29dc07 Missing space 2010-07-28 13:44:33 +01:00
Philip Ridout
51f47d206d Moved loop settings to a more appropriate tab, removed image tab as a result.
bzr-revno: 976
2010-07-28 12:01:01 +02:00
Philip Ridout
a35fac56da Fix for bug #609442.
bzr-revno: 975
2010-07-28 11:58:11 +02:00
Philip Ridout
73650e6536 Moved loop delay on to the general tab from the image tab, as it was being used in songs and custom slides as well.
Deleted image tab, as the loop delay was the only setting on it!
2010-07-27 21:35:50 +01:00
Tim Bentley
b66287f822 Fix alignment 2010-07-27 20:13:56 +01:00
Tim Bentley
44fd8f31e0 Head974 2010-07-27 19:54:53 +01:00
Tim Bentley
059af571c0 Alerts part 1 2010-07-27 19:42:53 +01:00
Philip Ridout
2b9bc517ae Removal of comment 2010-07-27 17:14:11 +01:00
Jon Tibble
c3594624d3 ServiceNote, Settings & ThemeManager naming 2010-07-27 13:18:10 +01:00
Jon Tibble
62be523f10 PluginForm naming 2010-07-27 12:57:25 +01:00
Jon Tibble
7f6920e220 Missed a few bits 2010-07-27 11:46:39 +01:00
Jon Tibble
41eaa2cd29 AmendTheme naming and missed trailing new line 2010-07-27 11:20:20 +01:00
Jon Tibble
37b2304eeb Trailing new lines 2010-07-27 10:32:52 +01:00
Jon Tibble
c2ee4e842b ServiceItemEditDialog naming 2010-07-27 09:22:01 +01:00
Jon Tibble
468ab12ffc GeneralTab naming 2010-07-27 08:48:23 +01:00
Jon Tibble
16924808bd Fixes and cleanups 2010-07-26 21:31:05 +01:00
Philip Ridout
4344751198 self.screens.display, is always true, no matter which mode you use (single or dual screen)
self.screens.current['primary'] is true, in single screen mode, or when the operator screen is also used as the main display!
2010-07-26 21:14:11 +01:00
Tim Bentley
271a5f598f Head970 2010-07-26 17:42:36 +01:00
Tim Bentley
2cde65ba70 html cleanup - text over video works 2010-07-26 17:42:19 +01:00
Tim Bentley
82acc32b78 Theme editing now works again 2010-07-26 16:51:18 +01:00
Jon Tibble
21eca36576 Fix last commit 2010-07-26 16:48:54 +01:00
Jon Tibble
37d2e910b7 Long lines 2010-07-26 16:19:11 +01:00
Jon Tibble
96033624aa Head r968 2010-07-25 12:47:53 +01:00
Tim Bentley
fbe647b896 Head968 2010-07-25 10:03:01 +01:00
Tim Bentley
ede8ae6f09 Theme updates 2010-07-25 09:58:08 +01:00
Tim Bentley
5814a491c7 Add display update trigger missed in cleanup
bzr-revno: 968
2010-07-25 09:54:58 +01:00
Raoul Snyman
f6c5a9788c Update the copyright notice and the credits.
bzr-revno: 967
2010-07-25 10:21:02 +02:00
Tim Bentley
6421e18bba Themes editing now displays 2010-07-25 08:21:10 +01:00
Tim Bentley
9efad8da66 Head966 - and fix mediaitem 2010-07-25 07:21:29 +01:00
Tim Bentley
8a96d7f87f Fix word uage 2010-07-25 07:14:45 +01:00
Tim Bentley
e4350e982f Head966 2010-07-25 07:12:13 +01:00
Raoul Snyman
da018275af A few more credits. 2010-07-25 00:45:48 +02:00
Raoul Snyman
7303f1de05 Add a few folks to the about dialog. 2010-07-25 00:13:21 +02:00
Raoul Snyman
2f2b339863 Update the copyright notice. 2010-07-25 00:10:47 +02:00
Raoul Snyman
81441f3e79 Remove some unused imports.
Remove an unused variable.
Fix up a couple of strings I missed in the previous string fix merge.
2010-07-24 23:20:02 +02:00
Jon Tibble
6e6d44710f Head r965 2010-07-24 22:03:58 +01:00
Tim Bentley
3801a80d7d Head 964 2010-07-24 20:27:48 +01:00
Tim Bentley
9a519f2ff0 Fix missing code from previous merge 2010-07-24 20:27:25 +01:00
Tim Bentley
4165b94d22 Fix screen size bug and screen changing 2010-07-24 20:19:33 +01:00
Tim Bentley
ec788f33c9 Head964 2010-07-24 17:56:02 +01:00
Tim Bentley
63b4696621 Cleanups and ratio changes 2010-07-24 17:55:06 +01:00
Philip Ridout
5c6f7da055 Hopefully a fix for bug #609442 2010-07-24 11:44:28 +01:00
Raoul Snyman
651ee535f6 Hopefully the last of the string fixes. 2010-07-23 21:17:36 +02:00
Raoul Snyman
3c303365b1 HEAD 2010-07-23 20:07:27 +02:00
Jon Tibble
c8c65120cf Head r963 2010-07-23 17:33:03 +01:00
Raoul Snyman
ea0997c6e0 Tweak the display of the media manager items to make them stand out slightly more.
bzr-revno: 962
2010-07-23 10:35:54 +02:00
Tim Bentley
b76a946bff Head961 2010-07-23 06:06:42 +01:00
Tim Bentley
8219a9c222 Code Cleanup 2010-07-23 06:05:34 +01:00
Jon Tibble
b5ceb59e27 Cleanup getters and setters 2010-07-23 01:01:06 +01:00
Raoul Snyman
f3b44b40be Some newlines to make Jon T happy. 2010-07-22 22:01:03 +02:00
Raoul Snyman
306a403195 Another tweak for Windows. 2010-07-22 21:55:09 +02:00
Raoul Snyman
4263d541dc Minor tweak to make the active tab's text bold in Windows. 2010-07-22 21:30:16 +02:00
Raoul Snyman
b0ad5ea1cd Merge from HEAD, plus Jon T's suggested changes. 2010-07-22 20:25:25 +02:00
Tim Bentley
047cc6205a HTML - sort of fixes 2010-07-22 19:04:48 +01:00
Jonathan Corwin
efdc2bcb0d Presentations no longer startup blanked 2010-07-22 08:32:55 +01:00
Raoul Snyman
2c7fcef2af More string updated. 2010-07-22 08:02:31 +02:00
Raoul Snyman
935d6602e5 HEAD 2010-07-22 07:26:19 +02:00
Raoul Snyman
5665e2af94 HEAD 2010-07-21 23:36:31 +02:00
Raoul Snyman
d105ee8dfb Playing some more with the tabs of the media manager. 2010-07-21 23:27:36 +02:00
Tim Bentley
225ef69b0d Head 2010-07-21 21:07:51 +01:00
Jon Tibble
d368f15713 Import fix 2010-07-21 13:28:41 +01:00
Jon Tibble
42619d455b deleteTheme cleanups 2010-07-21 10:52:00 +01:00
Raoul Snyman
2efb7cd34a Update more strings, and just tweak the display of the remotes plugin settings tab. 2010-07-21 08:24:32 +02:00
Raoul Snyman
33fa1541a7 HEAD 2010-07-21 07:20:30 +02:00
Raoul Snyman
7ec7235676 Updated more strings and things. 2010-07-21 07:20:03 +02:00
Jon Tibble
db025be243 Do not rename when name has not changed 2010-07-21 02:34:27 +01:00
Jon Tibble
5bb55fb63e Form parent cleanup 2010-07-21 01:36:15 +01:00
Raoul Snyman
9c5e9f1443 Some tweaks to the display of the media items. 2010-07-20 23:27:21 +02:00
Jon Tibble
3560277684 Cleanups 2010-07-20 21:43:42 +01:00
Tim Bentley
85c40e4e16 Head956 2010-07-20 21:17:12 +01:00
Jon Tibble
425b80d57a DATABASE SCHEMA CHANGE, fixes and cleanups
bzr-revno: 956
2010-07-20 20:46:04 +01:00
Jon Tibble
cb431fea2a Fix song object creation (Bug #607034) 2010-07-20 16:22:05 +01:00
Tim Bentley
e31a039568 Head952 and cleanups 2010-07-20 06:16:06 +01:00
Tim Bentley
77fbd8ce3d Cleanups - remove more old code 2010-07-20 06:01:40 +01:00
Raoul Snyman
71ee0eff8c HEAD 2010-07-20 06:58:20 +02:00
Raoul Snyman
35bcb8eabd HEAD 2010-07-20 06:58:01 +02:00
Tim Bentley
c5e8a4cdab Tidy up image background workflow and make it work 2010-07-19 21:05:25 +01:00
Tim Bentley
50aea9128d Footers now 2010-07-19 19:03:00 +01:00
Jon Tibble
f71f27c890 Database refactor 2010-07-19 00:37:24 +01:00
Tim Bentley
bf0dad308f More cleanups - page break bibles 2010-07-18 20:04:12 +01:00
Tim Bentley
44592ae579 Html cleanups 2010-07-18 19:01:35 +01:00
Tim Bentley
ea2d0cdb72 Preview Works 2010-07-18 15:08:17 +01:00
Billy Lange
7e12cda88f Add confirm before theme delete
bzr-revno: 950
2010-07-18 08:07:01 +01:00
Billy Lange
ca1d6c8675 Fixed spaces 2010-07-17 21:53:17 +02:00
Tim Bentley
0d7f81c020 Live display for Images 2010-07-17 12:00:36 +01:00
Tim Bentley
996f779602 Text and Previews for Live 2010-07-17 11:25:52 +01:00
Tim Bentley
f45625ac92 Head 2010-07-17 09:59:29 +01:00
Tim Bentley
443ff3fecd More refactoring and improvements 2010-07-17 09:59:15 +01:00
Tim Bentley
885e5d8ea2 Fix bug #606437 2010-07-17 07:04:52 +01:00
Jon Tibble
e83cb035ac Tab Order and Theme fix (Bug #606256)
bzr-revno: 946
2010-07-16 17:43:02 +01:00
Tim Bentley
53c6e93d08 Fix conflict in head945 2010-07-16 17:03:00 +01:00
Jon Tibble
897929967a Add Theme fix and form tab ordering 2010-07-16 13:31:47 +01:00
Philip Ridout
b410590267 Sorted out the show/hide desktop.
bzr-revno: 944
2010-07-16 07:23:14 +02:00
Phill Ridout
42d627ec5b Extra line removed 2010-07-15 19:07:23 +01:00
Billy Lange
d1c41fae7a Confirm deletion of theme 2010-07-15 18:36:09 +02:00
andreas
dd2137bf07 fixed import 2010-07-15 11:34:03 +02:00
Jon Tibble
f8ead8e7c8 Fix service save location (Bug #605649)
bzr-revno: 942
2010-07-15 09:20:40 +01:00
Raoul Snyman
3838a16fdf Removed the display tab, moved options to general tab, plus some cleanups.
bzr-revno: 941
2010-07-15 10:07:48 +02:00
Raoul Snyman
cce709218f Removed comments and now-defunct display tab. 2010-07-15 07:38:23 +02:00
Jon Tibble
c15fb864ec Fix service save location (Bug #605649) 2010-07-15 01:06:20 +01:00
Jon Tibble
afd28025a5 Fix service save icon save method 2010-07-14 23:16:59 +01:00
Raoul Snyman
1d65cc4e6f Renamed "tab_index" to "tabIndex" as well. 2010-07-14 23:28:20 +02:00
Raoul Snyman
dc4f60516f Some modifications to the Configure dialog:
- Moved single display option to General tab
- Removed Display tab
- Renamed variables to be Qt compliant
2010-07-14 22:37:54 +02:00
Phill Ridout
484b1c227e Finally got round to sorting out the show/hide desktop. 2010-07-14 21:34:14 +01:00
Tim Bentley
366c11e15a More updates 2010-07-14 18:36:48 +01:00
Raoul Snyman
38afbbdd5b HEAD 2010-07-14 17:59:13 +02:00
Raoul Snyman
0cf1acf97b Removed an unnecessary import.
Fixed margins.
Moved the "display" tab into the general tab.
2010-07-14 17:58:28 +02:00
Jon Tibble
e1c8aabe0a Fix AdvancedTab layout 2010-07-13 19:45:40 +01:00
Jon Tibble
b5f667fe51 Fix theme editing (Bug #594909 part 1)
bzr-revno: 938
2010-07-13 19:32:29 +01:00
Tim Bentley
84792a779a Head 937 2010-07-13 19:16:23 +01:00
Tim Bentley
957e7294c8 Latest changes parked 2010-07-13 18:23:05 +01:00
Jon Tibble
022935fe58 Fix last merge 2010-07-13 17:31:19 +01:00
Jon Tibble
44506f2c84 AdvancedTab: Double click to live 2010-07-13 17:00:33 +01:00
Jon Tibble
02b33ed660 Theme background images (Bug #594911) 2010-07-12 23:32:46 +01:00
Jon Tibble
767214bb13 Proper theme name editing (Bug #594909) 2010-07-12 22:11:00 +01:00
Tim Bentley
166fabbd5f Output now on main screen 2010-07-12 20:36:42 +01:00
Tim Bentley
4d69120225 Head 2010-07-12 18:14:04 +01:00
Tim Bentley
a071dcc879 Head 2010-07-12 18:13:59 +01:00
Tim Bentley
5989140c0d More updates 2010-07-12 17:49:38 +01:00
Jon Tibble
eac602389c Code layout tweaks 2010-07-12 15:45:55 +01:00
Jon Tibble
46d561b320 Add saving current media plugin (Bug #596540) 2010-07-12 15:32:48 +01:00
Jonathan Corwin
e77d6ec981 Common thumbnails for all presentation types and create when presentation first added
bzr-revno: 932
2010-07-12 08:25:17 +01:00
Jonathan Corwin
bff74507d7 Coding standards 2010-07-11 21:53:53 +01:00
Tim Bentley
19400843d4 Renderer replacement- text now output and pages 2010-07-11 17:02:20 +01:00
Tim Bentley
3d9fca212f Renderer replacement- text now outputs 2010-07-11 16:53:40 +01:00
Tim Bentley
f3b4a1dae5 Renderer replacement- display splash now. 2010-07-11 13:35:41 +01:00
Tim Bentley
c46901cb8a Renderer replacement- screen fix 2010-07-11 12:38:09 +01:00
Tim Bentley
44ae86e82b Renderer replacement humm 2010-07-11 11:58:36 +01:00
Tim Bentley
02c0fe9e89 Renderer replacement started 2010-07-11 08:45:49 +01:00
Tim Bentley
1a2dfc863d Head931 2010-07-11 06:41:17 +01:00
Tim Bentley
0bd6d297c7 Add new renderer code 2010-07-11 06:40:56 +01:00
Jonathan Corwin
968eaad46a Head 2010-07-10 23:28:59 +01:00
Jonathan Corwin
27bccda0b6 Presentation thumbnail changes 2010-07-10 23:21:14 +01:00
Jon Tibble
4eb067343c Fix mismerge 2010-07-10 11:44:23 +01:00
Jon Tibble
f3a56ecee6 Fix service saving (Bug #603798)
bzr-revno: 930
2010-07-10 11:31:36 +01:00
Jon Tibble
4c08162e33 Fix docstring for last commit 2010-07-10 02:21:03 +01:00
Jon Tibble
60b5568979 Fix bug then fix fix! (Bug #603798) 2010-07-10 02:01:14 +01:00
Jon Tibble
9d92f358d4 AdvancedTab: Creation & Recent files 2010-07-09 22:32:32 +01:00
Tim Bentley
9d77444ddf Revert Changes 2010-07-09 21:27:18 +01:00
Tim Bentley
b438cb22a5 Head928 2010-07-09 20:46:40 +01:00
Tim Bentley
341e0a165b Fix bug 594909 2010-07-09 20:46:09 +01:00
Jon Tibble
6e57776884 Icons and naming for aboutdialog 2010-07-08 12:24:45 +01:00
Jon Tibble
a913c47254 Remove initPluginNameVisible hack 2010-07-08 10:14:00 +01:00
Jon Tibble
38977e81ea Cleanups 2010-07-08 09:14:10 +01:00
Jon Tibble
88a739c1d5 Head r925 2010-07-07 18:19:31 +01:00
Jon Tibble
19a831d9cf Naming fixes for toolbar and maindisplay 2010-07-07 18:06:31 +01:00
Jon Tibble
cde04a9218 Naming fixes for mediamanageritem 2010-07-07 17:03:30 +01:00
andreas
bc15cc8104 -coding standard fixes 2010-07-07 18:00:44 +02:00
andreas
03a3d7b3f5 (small) coding standard fixes 2010-07-07 17:40:17 +02:00
Jon Tibble
961df67a33 Cleanups 2010-07-07 15:44:22 +01:00
Raoul Snyman
167c60345b Updated translation files.
Fixed a few more strings.
2010-07-07 14:58:03 +02:00
Jon Tibble
f813c98fdd Refactor view mode code
bzr-revno: 924
2010-07-07 10:51:41 +01:00
Jon Tibble
6de04962bd Head r922 2010-07-06 23:30:02 +01:00
Jon Tibble
09fb6e6dda Parent tweaks 2010-07-06 22:59:52 +01:00
Jon Tibble
8de0de9921 Rename methods to better indicate function 2010-07-06 22:23:09 +01:00
Jon Tibble
b225a96d09 Small modes refactoring 2010-07-06 22:18:55 +01:00
Raoul Snyman
9e7f98e33c Fixed a small bug where the item in the menu would remain checked despite the fact that the element on the form was no longer visible. 2010-07-06 22:27:57 +02:00
Raoul Snyman
4c291bbed0 Added View Modes. 2010-07-06 22:05:48 +02:00
Jon Tibble
e85c39e7a5 Head r920 2010-07-06 18:24:20 +01:00
Raoul Snyman
5c6ab2ee1a Some more fixes. 2010-07-06 17:59:29 +02:00
Raoul Snyman
33be4fe2f6 HEAD 2010-07-06 16:58:25 +02:00
Jon Tibble
6504d74fa0 Rename CheckedBoxen 2010-07-06 13:58:33 +01:00
Tim Bentley
cbe65f921a Head915 2010-07-05 17:01:29 +01:00
Tim Bentley
08f650871a Signature Cleanups 2010-07-05 17:00:48 +01:00
Jon Tibble
4439625013 Fixes and cleanups 2010-07-05 12:39:48 +01:00
Jon Tibble
765cc6ddbe Head r913 2010-07-04 17:15:29 +01:00
Jon Tibble
aa390e9831 Cleanups 2010-07-03 22:50:42 +01:00
Raoul Snyman
0a4c9481bf Add a nice little icon for the plugin list. 2010-07-03 23:07:21 +02:00
Raoul Snyman
3a19271a18 Shuffle the menus. 2010-07-03 22:39:29 +02:00
Phill Ridout
a180c4c321 corrected video tag 2010-07-03 20:45:14 +01:00
Phill Ridout
02f86d0603 hopefully should be go for this one! :-p 2010-07-03 20:02:36 +01:00
Phill Ridout
9b89788b21 removed escapes 2010-07-03 19:55:53 +01:00
Phill Ridout
b58d501e28 removed unecessary escapes! 2010-07-03 19:26:11 +01:00
Jon Tibble
732bf24ef8 XML: Cleanups 2010-07-03 14:26:29 +01:00
Phill Ridout
2b85659031 Removal of HTMLIMAGE at the request of TRB143 2010-07-03 11:46:13 +01:00
Phill Ridout
5f15b2fd7d added missing </head> 2010-07-03 06:41:24 +01:00
Phill Ridout
fda7412f75 added css to remove white space arround background video
adjusted spacing, added escapes to double quotes and moved the > on the body tag to its proper place!
2010-07-03 04:06:02 +01:00
Jon Tibble
497d1c9dc9 XML: Put it where it should be 2010-07-03 02:33:40 +01:00
Jon Tibble
989ffb9fc5 Head r911 2010-07-03 01:24:17 +01:00
Jonathan Corwin
db961c76db Clean up after TRB143's attempts to outclean Meths
Fix pptview plugin when running as exe
2010-07-02 23:18:54 +01:00
Tim Bentley
0656b34df9 Cleanups 2010-07-02 19:21:45 +01:00
Tim Bentley
603c2e7be2 Head907 2010-07-02 17:54:22 +01:00
Tim Bentley
ecbef6a00b Fix up display layers 2010-07-02 17:54:08 +01:00
Jon Tibble
3447c7fed6 XML: Start refactoring 2010-07-02 15:57:48 +01:00
Jon Tibble
45375e7442 Cleanup plugins (Bug #600996) 2010-07-02 13:13:46 +01:00
Tim Bentley
e3e6c82eac Fix up display levels and renames 2010-07-02 06:16:30 +01:00
Tim Bentley
c892f9b38f Fix up transitions so they work 2010-07-02 05:36:13 +01:00
Jon Tibble
f67457c378 Revert bug fix 2010-07-01 20:34:48 +01:00
Jon Tibble
d939a39895 Cleanup signals (Bug #599146) 2010-07-01 16:46:51 +01:00
Jon Tibble
c61121bb51 DB cleanups 2010-07-01 11:31:37 +01:00
Jon Tibble
079d72f93f Database refactoring 2010-06-30 23:05:51 +01:00
Raoul Snyman
eda9093064 Change namespace of other plugin icons and make ServiceItems use the plugin's icon instead of some arb image "prediction" that is prone to failure.
bzr-revno: 903
2010-06-30 21:29:08 +02:00
Raoul Snyman
6038d46a56 Make ServiceItems use the plugin's icon instead of some arb image "prediction" that is prone to failure. 2010-06-30 20:36:57 +02:00
Tim Bentley
8b5931d50c Video and Image updates 2010-06-30 17:30:25 +01:00
Tim Bentley
6cd1e520a1 Head 901 2010-06-30 17:11:09 +01:00
Tim Bentley
7198148a48 Replaceable Backgound images now work 2010-06-30 17:10:54 +01:00
Jon Tibble
912516e8f0 Really fix service loading! 2010-06-30 12:59:09 +01:00
Tim Bentley
56e4e38b99 Head900 2010-06-30 05:53:09 +01:00
Tim Bentley
4767ec08a2 Image display refactoring 2010-06-30 05:52:52 +01:00
Jon Tibble
0b48e66466 Fix service loading
bzr-revno: 899
2010-06-29 17:14:50 +01:00
Jon Tibble
c0a924e304 Fix service loading 2010-06-29 17:07:45 +01:00
Jon Tibble
cede98c0cb Head 897 2010-06-29 16:40:46 +01:00
Jon Tibble
d37b4d1e8d Plugin and other docstrings 2010-06-29 16:25:24 +01:00
Jon Tibble
4a4da4ba2c Naming and docstrings 2010-06-29 08:07:03 +01:00
Tim Bentley
ebb368559f Head894 2010-06-28 20:14:31 +01:00
Tim Bentley
fd09e3d5a0 Tidy up loop icons 2010-06-28 18:54:29 +01:00
Tim Bentley
109ef118c4 Head893 2010-06-28 17:48:36 +01:00
Tim Bentley
eafdf71e5c Fix up screen blanking and videos 2010-06-28 17:48:21 +01:00
Jon Tibble
3be57e57e7 Rename method to save_object() 2010-06-28 14:38:29 +01:00
Jon Tibble
6c182ef70b Head r892 2010-06-28 11:48:58 +01:00
Raoul Snyman
b188592c32 Fixed up problems with version checking. 2010-06-27 14:49:01 +02:00
Tim Bentley
5ba7febc3b Video cleanups for display 2010-06-27 08:19:34 +01:00
andreas
9c4f565776 fixed double spaces 2010-06-26 18:13:52 +02:00
andreas
696c413cee Improved delete button behaviour 2010-06-26 18:08:38 +02:00
Tim Bentley
4b38c22d30 Alerts now work and more hiding cleanups 2010-06-26 15:13:10 +01:00
Tim Bentley
d82f94e326 Refactor Alert code for Html 2010-06-26 09:09:09 +01:00
Tim Bentley
b59b2bdafa Fix bug #596541 hide theme combo for global themes 2010-06-26 08:19:30 +01:00
Tim Bentley
4820d5d15f Head 2010-06-26 07:24:53 +01:00
Tim Bentley
90cf4428c4 Hide buttons to menu part 1 2010-06-26 07:24:38 +01:00
Tim Bentley
89ccc8f390 Head 2010-06-25 21:44:21 +01:00
Tim Bentley
780e45891c More fixes 2010-06-25 21:44:13 +01:00
Jonathan Corwin
e5da1cb5f9 head 2010-06-25 21:21:40 +01:00
Jonathan Corwin
217b40c26f Bug 598361 - Preview presentation error. Ensure presentations close correctly 2010-06-25 21:20:03 +01:00
andreas
5135706761 ListWidget usability improvement
bzr-revno: 886
2010-06-25 19:38:16 +01:00
Jon Tibble
51ca897c77 Docstrings
bzr-revno: 885
2010-06-25 19:34:36 +01:00
andreas
1800ae4ddb improvement in regard to bug #598415 2010-06-25 20:18:52 +02:00
Tim Bentley
7c873ada58 Fix bug #598415 2010-06-25 17:50:35 +01:00
Tim Bentley
4be942efe3 Head 2010-06-25 06:11:01 +01:00
Jon Tibble
585ffbdc6d Head r881 2010-06-25 01:30:26 +01:00
Jon Tibble
3cee3f0f8e Fix grammo 2010-06-25 01:25:21 +01:00
Jon Tibble
6798f3402c Head r881 2010-06-25 01:24:56 +01:00
Jon Tibble
78b1c8d1af Do the fix properly 2010-06-24 20:36:33 +01:00
Jon Tibble
b402cc5639 Fix check_item_selection 2010-06-24 20:04:18 +01:00
Jon Tibble
4ac7ce16c0 Ampersands and item selection checking
bzr-revno: 877
2010-06-24 19:16:43 +01:00
Tim Bentley
b4626d80eb Screen sizes now work 2010-06-24 19:06:34 +01:00
Jon Tibble
2c42aa0289 Refactor check_item_selected 2010-06-24 16:50:40 +01:00
Jon Tibble
ca7f3eb599 Fix and add some ampersands 2010-06-24 16:28:42 +01:00
Tim Bentley
da5ff6c3db Update version numbers and white space 2010-06-23 18:37:01 +01:00
Tim Bentley
d2af535c70 Start to clean up display code.
Make Video Hide / Reappear
Add Audio player to play audio with no display
Replace Labels with QGraphicXXXXItems
2010-06-23 06:13:32 +01:00
Tim Bentley
dc1479e830 Stop screen blanking on 1 display as startup 2010-06-22 18:12:47 +01:00
Jon Tibble
912668c619 Fix version check (Bug #597121) 2010-06-22 17:17:15 +01:00
Jon Tibble
43a4eaed96 Head r872 2010-06-22 15:34:03 +01:00
Jon Tibble
ec87fddf53 * Fix log file location (Bug #596822)
* Script resources generation
* Cleanup long lines

bzr-revno: 872
2010-06-22 14:14:09 +01:00
Jon Tibble
a9e9f334e2 Fix log file location 2010-06-22 13:32:15 +01:00
Frode Woldsund
92776230dd Another translate() bugfix.
bzr-revno: 871
2010-06-22 09:13:29 +02:00
Jon Tibble
70df49476d Long lines 2010-06-22 00:38:54 +01:00
Frode Woldsund
e18a8067c7 switched place on function that did not make sense: translate(unicode -> unicode(translate 2010-06-21 23:57:01 +02:00
Raoul Snyman
d7bd2c5074 Fix up Theme form parentage.
Some new lines?
2010-06-21 22:06:36 +02:00
Tim Bentley
b08707cc80 Head864 2010-06-21 17:21:00 +01:00
Tim Bentley
af5ae6047a Fix bug with Inactive not working 2010-06-21 17:20:41 +01:00
Jon Tibble
700b41390e Head r863 2010-06-20 13:43:09 +01:00
Raoul Snyman
ce79049868 Reverted a change that could introduce a bug! 2010-06-20 14:12:49 +02:00
Raoul Snyman
054ec36e4a Fixed bug #596505 2010-06-20 13:43:16 +02:00
Raoul Snyman
28bb5e519d Fix bug #596506 2010-06-20 13:09:15 +02:00
Jon Tibble
afefd3c45f Head r861 2010-06-20 00:12:00 +01:00
Jon Tibble
e3a07c1e57 Cleanups 2010-06-19 21:21:36 +01:00
Raoul Snyman
ba4b7a9b7f Removed lowercasing of image formats. 2010-06-19 20:42:49 +02:00
Jon Tibble
1005a3c1b1 Cleanup unneeded trailing backslashes 2010-06-19 19:29:18 +01:00
Raoul Snyman
8c6e033c3d Fixed up translate parameters. 2010-06-19 20:29:08 +02:00
Raoul Snyman
38255ffdb6 Merge from trunk 2010-06-19 20:03:21 +02:00
Raoul Snyman
e615401007 Make image formats filter in a central location. 2010-06-19 20:00:50 +02:00
Jon Tibble
a34957297c Cleanups 2010-06-19 18:56:21 +01:00
Jon Tibble
f2836baae4 More docstrings 2010-06-19 18:31:42 +01:00
Jon Tibble
91c0fcb9e7 Head r860 2010-06-19 18:30:41 +01:00
Jon Tibble
685fe0311a Cleanups
bzr-revno: 860
2010-06-19 18:26:34 +01:00
Jon Tibble
0235f251bf Cleanups 2010-06-19 14:18:38 +01:00
M2j
0f7c997214 small fix for unicode Theme names 2010-06-19 14:01:06 +02:00
Jon Tibble
2d050b07db Head r858 2010-06-19 12:53:20 +01:00
M2j
9cdc489735 HEAD 2010-06-19 13:43:05 +02:00
Frode Woldsund
6b1255551a String Cleanup in MainWindow
bzr-revno: 857
2010-06-19 13:32:18 +02:00
M2j
b7ec09cf87 Unicode support for theme XML 2010-06-19 12:41:13 +02:00
Tim Bentley
41789ef5e3 Translate string clean up
core/lib/__init__.py
core/utils/languagemanager.py
core/lib/mediamanageritem.py
core/ui/slidecontroller.py
core/ui/plugin*.py
core/ui/service*.py
2010-06-19 05:05:39 +01:00
Frode Woldsund
77e0e5a397 String Cleanup: replace translate(u'', u'') -> translate('', '') 2010-06-19 01:48:16 +02:00
M2j
b13f9eb74f String cleanup: Themes 2010-06-19 01:18:08 +02:00
Jon Tibble
226277e55d Head r852 2010-06-18 12:57:50 +01:00
Tim Bentley
0d35135945 Fix Bug #595672 2010-06-18 08:42:38 +01:00
Tim Bentley
d143b197a3 Head851 2010-06-18 06:59:31 +01:00
Tim Bentley
e4f77dbacb Bug fixes 2010-06-18 06:58:40 +01:00
Jon Tibble
7f88043177 RFC: Cleanups 2010-06-18 02:26:01 +01:00
Jon Tibble
8382ea5303 Fix service manager DnD (Bug #595671) 2010-06-18 00:17:16 +01:00
Jon Tibble
5dc87d3ede Cleanups 2010-06-17 22:07:01 +01:00
Jon Tibble
d395438173 Head r851 2010-06-17 18:00:14 +01:00
Jon Tibble
035ae84f39 Import translate 2010-06-17 15:23:50 +01:00
Jon Tibble
1af5f700e2 Bible search fix
Edit and Delete feedback for Media Manager Items
Fix Bible Import Wizard setField errors
Fix addToServiceItem locations
Remove unused scripts/get-strings.py

bzr-revno: 850
2010-06-17 15:06:47 +01:00
Frode Woldsund
7c6b5c0b99 translate(pluginName.pluginName) -> translate(pluginName) and removed some spaces 2010-06-17 14:02:18 +02:00
Jon Tibble
143f361f8d Fix translate and remove unused script 2010-06-17 12:43:58 +01:00
Jon Tibble
4683e20860 Fix addToServiceItem location 2010-06-17 02:56:05 +01:00
Frode Woldsund
99d97a95a3 removed a "enter-space" 2010-06-17 00:17:50 +02:00
Frode Woldsund
cc7b6a9ec3 Merged whit current trunk 2010-06-17 00:14:46 +02:00
Frode Woldsund
40fbf5ad63 Fixed syntax in translate() function that contained u'%s' and % stuff 2010-06-17 00:11:11 +02:00
Jon Tibble
5e0ab4a7f6 Fix lack of feedback for edit and delete 2010-06-16 02:23:57 +01:00
Jon Tibble
814a4f023d Fix Bible Import setField errors 2010-06-16 01:31:44 +01:00
Jon Tibble
b7e3ec4441 RFC: Refactor a filter method 2010-06-15 19:08:02 +01:00
Jon Tibble
37dd8888ca Head r847 2010-06-15 16:43:52 +01:00
Jon Tibble
85661fe6e4 RFC: Tweaks 2010-06-15 16:42:52 +01:00
Meinert Jordan
48619f72cc Various i18n fixes.
bzr-revno: 847
2010-06-15 17:22:26 +02:00
Jon Tibble
e92b017348 RFC PT4: The other DB plugins 2010-06-15 03:08:22 +01:00
Jon Tibble
554ab59caf RFC PT3: Bibles 2010-06-15 01:44:06 +01:00
Jon Tibble
e71caf43e7 Head r846 2010-06-14 19:22:08 +01:00
Jon Tibble
754da4c28e Fix PEBKAC 2010-06-14 14:43:04 +01:00
Jon Tibble
a4f0df76cc Fix QColorDialog usage 2010-06-14 14:23:19 +01:00
Frode Woldsund
e94bba463b The translate() function is a static method. Fixed. 2010-06-14 14:24:30 +02:00
Frode Woldsund
7b43146421 merged with current trunk 2010-06-14 08:38:51 +02:00
Jon Tibble
0558900951 Head r843 2010-06-14 03:48:12 +01:00
Tim Bentley
d25d8a9b44 Head842 2010-06-13 20:42:09 +01:00
Tim Bentley
f38d97686e Fix method 2010-06-13 20:41:11 +01:00
Tim Bentley
732ce9555e Fix up blanks screen issues and cleanups 2010-06-13 20:34:25 +01:00
Jon Tibble
54aa8958fe RFC PT2: Refactor Manager 2010-06-13 00:00:14 +01:00
Jon Tibble
ec4d54e66a Fix variable naming 2010-06-12 21:22:58 +01:00
Jon Tibble
55f6197212 RFC: Refactor database setup code
A possible way to refactor database code to remove code duplication and,
I hope, provide a simpler, more intuitive model to be copied by others
2010-06-12 02:52:04 +01:00
M2j
06549eed0d delclare recentFiles as QStringList 2010-06-11 15:26:24 +02:00
M2j
f524c7ff45 On start without configuration recentFiles might become a python list 2010-06-11 15:11:50 +02:00
Frode Woldsund
752e063837 Fixed doublespace in import 2010-06-11 09:36:08 +02:00
Jon Tibble
914a710f95 More docstrings 2010-06-10 22:30:50 +01:00
Jon Tibble
78114b8063 Apply docstrings feedback 2010-06-10 20:45:02 +01:00
Jon Tibble
7ddaff2843 Head r839 2010-06-10 17:36:49 +01:00
M2j
69c6e0ef02 use filesystem char encoding for file operations 2010-06-10 16:42:55 +02:00
Jon Tibble
0e07c0f664 Use reStructuredText in Theme 2010-06-10 15:09:32 +01:00
Jon Tibble
78a6d20bb3 Fix theme migration method parameters 2010-06-10 14:20:43 +01:00
M2j
2dac357fa7 HEAD 2010-06-10 15:17:39 +02:00
Jon Tibble
3a7ca9a185 Fix module name thinkos 2010-06-10 14:12:19 +01:00
M2j
83968d8194 fix: QStringList has no pop() methode 2010-06-10 10:07:58 +02:00
M2j
f51d67cd51 exception and string fix 2010-06-10 09:59:46 +02:00
Jon Tibble
8d059fb84e Add DocStrings 2010-06-10 02:57:59 +01:00
Jon Tibble
1cfcdadbd1 thememanager tweaks 2010-06-10 01:03:38 +01:00
Jon Tibble
e40cdf792f Fix theme export breakage and lack of feedback 2010-06-10 00:28:02 +01:00
M2j
19ca36f946 final fine tuning 2010-06-10 01:08:12 +02: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
8296b8dc84 Additional translatable strings
Removed string_to_unicode and variant_to_unicode
2010-06-09 23:15:37 +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
Frode Woldsund
f5b02659b6 Replaces missed trUtf8('...') -> translate(u'PluginName.ClassName', '...') 2010-06-09 13:11:01 +02:00
Jon Tibble
6792a4cce7 Couple more whitespace cleanups 2010-06-08 16:56:47 +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
Jon Tibble
9bb7343092 Fix incorrect exception 2010-06-07 00:24:45 +01: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
84d8f0f12a ups.. removed a "0" that should not be here.. 2010-06-06 16:46:07 +02:00
Frode Woldsund
d364bcbc2a fixed translate() 'u symbol in Aboutform 2010-06-06 16:26:08 +02:00
Frode Woldsund
7f2c1f04a5 Fixed all translate() function in the project (exept the one in plugin), by adding spaces and make sure on line is longer then 80 char and adding u' in front of all argument is translate() functions 2010-06-06 13:05:35 +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
Tim Bentley
61b4850941 Clean up slidecontroller 2010-06-05 16:31:07 +01:00
Jon Tibble
08f0c1ff49 Cleanup including diff check fixes 2010-06-01 18:13:54 +01:00
Jon Tibble
2d988d9c8a Fix MediaManagerItem after import cleanups 2010-06-01 17:01:03 +01:00
Jon Tibble
d756aacf7a Unused variable 2010-06-01 01:45:20 +01: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
4a4bf00140 Head r829 2010-05-30 16:26:45 +01:00
Jon Tibble
c109b26d22 Cleanup BaseModel key iteration 2010-05-29 21:57:56 +01:00
Jon Tibble
fb1e222422 Moar whitespace, exceptions and naming 2010-05-29 20:50:50 +01:00
Jon Tibble
f41cadd17b CONSTANTS and an exception 2010-05-28 16:01:50 +01:00
Jon Tibble
bbcfd7729c Refactor BaseModel 2010-05-28 01:26:49 +01:00
Jon Tibble
2e3b296d2d Use documented list methods 2010-05-28 01:18:26 +01:00
Jon Tibble
d33a719172 Imports for declared exceptions 2010-05-27 21:56:34 +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
3678ea5ea2 Many varied cleanups
bzr-revno: 826
2010-05-27 09:42:56 +01:00
Jon Tibble
48446a8312 log.error checking 2010-05-26 17:01:45 +01:00
Jon Tibble
f0c03ad2cb Cleanups 2010-05-26 00:07:50 +01:00
Raoul Snyman
5b39ab942a Indented everything to 4 spaces, as per Jon's recommendation. 2010-05-25 20:55:02 +02:00
Raoul Snyman
6b1a6a0638 More intelligent version checking. 2010-05-25 19:12:21 +02:00
Jon Tibble
871640c374 Whitespace 2010-05-25 17:16:43 +01:00
Jon Tibble
c7d420d4b9 Fix class defs and name redefinitions 2010-05-25 15:30:34 +01:00
Jon Tibble
a2448e36da Remove redundant code 2010-05-25 15:20:05 +01:00
Jon Tibble
f75a6fd732 Whitespace 2010-05-25 13:39:12 +01:00
Jon Tibble
a1423dc966 Fix reimport 2010-05-25 01:19:43 +01:00
Jon Tibble
122756eca5 Fix indentations 2010-05-24 23:37:20 +01:00
Tim Bentley
f7987501b9 Stop memory growth, improve verse display 2010-05-23 08:03:28 +01:00
Tim Bentley
d86f0285c9 Song Edit tableisation 2010-05-17 19:39:28 +01:00
Tim Bentley
f78565f241 Display clean up 2010-05-16 16:39:58 +01:00
Tim Bentley
2300b9d0b7 Heads817 2010-05-16 16:33:31 +01:00
rimach@siduxbox
42fbb208df Add translations and update the code to accept them/use them
bzr-revno: 816
2010-05-16 16:22:03 +01:00
Tim Bentley
ac845a93ba Fix screen issues - not sure how though 2010-05-16 16:18:05 +01:00
Tim Bentley
c5b12ffaf3 Screen size fix for Raoul 2010-05-15 07:57:29 +01:00
Tim Bentley
580125ee86 Head815 2010-05-15 07:52:20 +01:00
Tim Bentley
23c3974afd Display fixes 2010-05-15 07:44:36 +01:00
Martin Thompson
cd8377f03d Fixed crash when monitor=<some monitor that doesn't exist> in OpenLP.conf 2010-05-12 21:43:48 +01:00
rimach
294b0abfc0 remove unused imports, correct import order 2010-05-11 23:05:08 +02:00
rimach
e0664a1e88 bugfixing for i18n 2010-05-11 21:00:21 +02:00
rimach
16b202d8b5 Head 2010-05-10 22:44:38 +02:00
Tim Bentley
be85eb8999 Head813 2010-05-10 20:48:29 +01:00
Tim Bentley
f7244c5e6e Remove comments and simplify 2010-05-10 19:29:51 +01:00
Tim Bentley
51728db0b6 Add cache to renderer 2010-05-10 19:19:45 +01:00
rimach
2ee1c5ed9b load correct settings for translation 2010-05-10 19:56:29 +02:00
Martin Thompson
a8a7e675a4 Updated from review comments 2010-05-09 21:02:38 +01:00
rimach
ae36bc2bb9 Head 2010-05-09 10:47:57 +02:00
Tim Bentley
fa99ba64b1 Fix names 2010-05-07 19:29:17 +01:00
Martin Thompson
c613773bfb Merged trunk 2010-05-06 21:30:23 +01:00
Martin Thompson
dbdf681165 More changes to suit pyqt4.4 2010-05-06 21:30:08 +01:00
Tim Bentley
14912955ae Remove ? 2010-05-06 17:51:57 +01:00
Tim Bentley
6c9c9848db Clean up fixes 2010-05-06 17:49:12 +01:00
Martin Thompson
6f8e3f7ea2 Fixed a qt4.5ism 2010-05-05 20:57:20 +01:00
Tim Bentley
0e7fb1c80c minor errors 2010-05-05 20:21:05 +01:00
Tim Bentley
fd22b01e59 Head811 2010-05-05 20:15:09 +01:00
Tim Bentley
27a963a9c2 Validate Service item viewer loading 2010-05-05 20:14:48 +01:00
Tim Bentley
a8bbd540d4 service loading prefix check 2010-05-05 19:07:57 +01:00
Tim Bentley
e1f97fc9b9 Fix initial display 2010-05-05 18:35:11 +01:00
rimach
66ec680e4e remove else from toolbar.py 2010-05-05 19:17:00 +02:00
Tim Bentley
e0bfaf07bc Cleanup and finish bits 2010-05-04 21:01:45 +01:00
Jonathan Corwin
465ce8c7f7 web fixes, allow more file types. Slidecontroller_hide event 2010-05-03 22:49:42 +01:00
rimach
850b4a507f correction for last merge proposal 2010-05-01 22:01:32 +02:00
rimach
4e296bfb5f changes 2010-05-01 21:45:06 +02:00
Tim Bentley
40ad9729ba Head 807 2010-05-01 14:06:22 +01:00
Tim Bentley
4ffb7d8a18 Fix up drag and Drop for service items 2010-05-01 14:05:17 +01:00
Jonathan Corwin
9ef2b13ad6 comments, update client, load html from disk, blanking 2010-05-01 13:10:48 +01:00
Jonathan Corwin
6c52ad359f head again, perhaps I should have waited 2010-05-01 10:02:47 +01:00
Jonathan Corwin
12810ad34a Head 2010-05-01 09:46:06 +01:00
Tim Bentley
13922b0599 Renames for consistancy 2010-05-01 07:58:41 +01:00
Tim Bentley
077933d703 Head 805 2010-05-01 07:50:43 +01:00
Jon Tibble
5a7e36b5bc Correct settingsSection naming convention 2010-04-30 23:38:15 +01:00
rimach
32c635b2f0 resolve merge proposal comments 2010-05-01 00:07:51 +02:00
Jon Tibble
b81160768b Coding style fixes 2010-04-30 22:00:17 +01:00
Tim Bentley
5614e10324 Fix again 2010-04-30 20:56:26 +01:00
Tim Bentley
22c2e4c38e Minor cleanups and add comments to code 2010-04-30 20:37:47 +01:00
rimach
faffe729f8 Head 2010-04-30 21:30:50 +02:00
rimach
b74dec5446 update 2010-04-30 21:23:02 +02:00
Tim Bentley
79180c7f1c Text over video with loop 2010-04-30 17:57:53 +01:00
Tim Bentley
09da62f9cc Text over video 2010-04-30 17:30:25 +01:00
Tim Bentley
387e281da0 Fix up bugs from last merge 2010-04-30 16:41:48 +01:00
Tim Bentley
c42054ec87 Fix up final 802 fallout 2010-04-30 15:30:07 +01:00
Tim Bentley
61a1693ce0 Head 802 2010-04-30 15:27:05 +01:00
Tim Bentley
7491b30be0 Head 801 2010-04-30 10:38:28 +01:00
Tim Bentley
8e630c5adf Fixes 2010-04-30 10:38:17 +01:00
Tim Bentley
d28498611d Fix up video playing so main screen is hidden on start 2010-04-30 06:16:06 +01:00
Jon Tibble
c6a7549d12 Make settings_section/last directory entries consistent 2010-04-30 02:59:15 +01:00
Jon Tibble
22b00a130f Make settings_sections consistent 2010-04-30 02:31:41 +01:00
Jonathan Corwin
72fa923937 update browser if slide changes 2010-04-29 23:52:23 +01:00
Tim Bentley
4e6c56c430 Video clean ups and bug fixes from 800 2010-04-29 21:56:27 +01:00
Tim Bentley
39a4593bd3 Fix up display buttons 2010-04-29 20:33:45 +01:00
Jonathan Corwin
970d66d4ad head 2010-04-29 20:15:49 +01:00
Jon Tibble
32b7bca71e Help -> Website and disable unimplemented options 2010-04-29 13:35:40 +01:00
Jonathan Corwin
f4cc91f529 Show service and song text. Click on service item/song verse to go live 2010-04-28 23:08:37 +01:00
Jonathan Corwin
3d6dc75c23 head 2010-04-28 20:13:48 +01:00
Tim Bentley
92ef8471b0 Add new tab for display sizing 2010-04-28 19:17:51 +01:00
Tim Bentley
b25b8ea590 Head 800 and fix fall out part 1 2010-04-28 18:07:36 +01:00
Tim Bentley
d19d3eb213 Fix video display 2010-04-28 18:00:05 +01:00
Tim Bentley
17ee4f00fa remove plugin 2010-04-28 17:41:04 +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
5a8cd52acf File list refactor 2010-04-28 00:49:21 +01:00
Jon Tibble
c626653092 Fix bible reloading 2010-04-27 23:51:16 +01:00
Jon Tibble
484a76289c Fix presentations a bit more 2010-04-27 23:36:50 +01:00
rimach
181c19d112 futher changes 2010-04-27 22:54:55 +02:00
Tim Bentley
d0c6cf9639 move display to core 2010-04-27 20:59:44 +01:00
Jon Tibble
9605183812 Config file to QSettings conversion 2010-04-27 17:27:57 +01:00
Jon Tibble
ba17d94e77 Import fixes from trivialfixes branch 2010-04-26 23:24:03 +01:00
Jonathan Corwin
75829333c0 Control via web 2010-04-26 22:29:40 +01:00
Jon Tibble
f895c66eb1 Clean up saving UI settings 2010-04-26 17:41:31 +01:00
rimach
95a1419d9c Head 2010-04-25 21:29:39 +02:00
Tim Bentley
b0763714c8 Fix up object copy and get to work. 2010-04-24 20:57:29 +01:00
Tim Bentley
d7e060c503 Start to add ability to set display screen size for a session 2010-04-24 19:42:01 +01:00
Tim Bentley
a29ea3f861 Add line spacing adjustment to renderer
Remove .thumbnail directories
2010-04-24 08:21:35 +01:00
Jon Tibble
471f032b6e Save MainWindow position 2010-04-23 22:31:54 +01:00
Jon Tibble
b23a699a5a Save MainWindow state and geometry 2010-04-23 22:10:25 +01:00
Jon Tibble
b8f940565e Import fixes 2010-04-23 21:39:27 +01:00
Jon Tibble
50e555db40 Head r799 2010-04-23 21:33:48 +01:00
Jon Tibble
fde108d4b4 Warn before loading over unsaved service 2010-04-23 20:55:31 +01:00
Jon Tibble
e640041318 Document separators in add_actions 2010-04-23 20:42:51 +01:00
Jon Tibble
fbc36e3e9a Add recent files functionality 2010-04-23 19:30:53 +01:00
Tim Bentley
b1e8419ee8 head 2010-04-23 17:04:20 +01:00
Tim Bentley
460964c371 fixes 2010-04-23 17:03:12 +01:00
Jon Tibble
37720b9cdb Add add_actions support function 2010-04-23 17:00:32 +01:00
Jonathan Corwin
496b7befce head 2010-04-22 22:23:14 +01:00
Jonathan Corwin
fa54f94905 Finish signal refactor 2010-04-22 22:22:09 +01:00
rimach
b83d115738 Copyright character solution 2010-04-22 19:27:26 +02:00
rimach
b2918fc579 Head 2010-04-22 19:12:33 +02:00
Jonathan Corwin
877af7ea2c More fixes 2010-04-21 22:56:48 +01:00
Jonathan Corwin
68685d1be5 head 2010-04-21 21:26:18 +01:00
Tim Bentley
88f4abf524 head 2010-04-21 18:22:47 +01:00
Jonathan Corwin
40e6289102 head 2010-04-20 23:12:04 +01:00
Jonathan Corwin
29e4d4cf1a event fixes 2010-04-20 23:00:55 +01:00
rimach
707ad60850 reactivate old translate functionality 2010-04-20 21:09:14 +02:00
rimach
fe66e37a57 corrections 2010-04-19 21:12:34 +02:00
Jon Tibble
17ec820b79 Import and typo fixes 2010-04-19 19:43:20 +01:00
Tim Bentley
8242bac82f Presentation icons 2010-04-19 19:20:44 +01:00
Tim Bentley
e463e83ed5 Icon fixes 2010-04-19 17:45:13 +01:00
Tim Bentley
5a311c6f77 Clean up video class 2010-04-18 20:11:28 +01:00
Tim Bentley
d96126ee55 Head 794 2010-04-17 12:28:23 +01:00
Tim Bentley
1948da79ff Comments 2010-04-17 12:27:12 +01:00
Tim Bentley
a766542854 Display Hook cleanups 2010-04-17 08:53:06 +01:00
Tim Bentley
dcd48d1042 Clean up alert dialog with new layout
Alerts over video starting to work 
Fix bug in impress close down
2010-04-17 08:31:15 +01:00
rimach
ea64675d65 update i18n implementation 2010-04-17 00:06:28 +02:00
Jonathan Corwin
bc6b7a8488 signal/slot refactor part 1 2010-04-16 08:31:01 +01:00
rimach
95998f456a Head 2010-04-15 17:04:00 +02:00
Mattias Põldaru
5708528ba0 Fixed up the loading and saving of non-ascii values to the config file.
bzr-revno: 794
2010-04-14 21:58:47 +02:00
Mattias Põldaru
235748a9e9 indentation fix 2010-04-14 20:12:30 +03:00
Mattias Põldaru
57cc60e1bd Config file unicode encoding fix 2010-04-14 19:58:22 +03:00
Tim Bentley
3cc600a67b More changes and attempts 2010-04-13 16:53:00 +01:00
Tim Bentley
571e91b20f Sort out screen display and add comments 2010-04-12 09:13:27 +01:00
Raoul Snyman
f8e3021162 Once and for all, fix the silly version problem! 2010-04-11 00:24:22 +02:00
Tim Bentley
f99b91509c remove prints 2010-04-10 19:08:03 +01:00
Tim Bentley
e0be3b5705 refactor video display 2010-04-10 11:28:57 +01:00
rimach
1a57939c73 Head 2010-04-09 21:27:32 +02:00
rimach
7a9d8c97aa Head 2010-04-09 21:27:22 +02:00
Tim Bentley
b9630907a8 Fixes 2010-04-08 17:00:04 +01:00
Tim Bentley
bc4f31ef93 More fixes and new features 2010-04-08 10:15:40 +01:00
Tim Bentley
cee89eadcd Head 2010-04-08 08:37:18 +01:00
Tim Bentley
150eaf7e56 Video changes and bug fixes part1 2010-04-08 08:37:01 +01:00
Tim Bentley
d74ff3393e head784 2010-04-07 20:10:47 +01:00
Tim Bentley
5c90f4944c remove display background 2010-04-07 20:09:13 +01:00
Tim Bentley
be7ed23c1d and again 2010-04-07 19:32:54 +01:00
Tim Bentley
abb3827817 Style fixes 2010-04-06 20:16:14 +01:00
Tim Bentley
20cdcde1a1 Remove print 2010-04-06 19:34:51 +01:00
Tim Bentley
e934c7e623 Compress Impress previews 2010-04-05 12:06:37 +01:00
Tim Bentley
f5a9f9ed89 Update Image thumbnail if original has changed 2010-04-05 09:13:45 +01:00
Tim Bentley
5a3150a063 Fix up plugins for multiple service item generation 2010-04-05 07:45:01 +01:00
Tim Bentley
b17b83bb27 Add multiple songs to service manager 2010-04-04 14:53:39 +01:00
Tim Bentley
5b9229777d fixes 2010-04-04 14:16:01 +01:00
Tim Bentley
cef6d29a7c Plugin name case issues for additional items 2010-04-03 10:06:05 +01:00
Tim Bentley
89bbdea0b9 Code fixes from last merge and presentation improvements 2010-04-03 09:42:51 +01:00
Tim Bentley
3c2fb96376 File housekeeping all files not touched for over 1 year 2010-04-03 09:10:26 +01:00
Tim Bentley
18eb768f2f Sort out multiple Chorus tags 2010-04-03 09:04:41 +01:00
Tim Bentley
828695ea0e Fix review comments 2010-04-03 08:10:31 +01:00
Tim Bentley
a178ea447e Handle backward compatibility 2010-04-02 20:05:37 +01:00
Tim Bentley
8328a2dabe Replace flags with capibilities 2010-04-02 20:02:38 +01:00
Tim Bentley
3c8c20f2d4 cleanup the screen size code 2010-04-02 19:12:54 +01:00
Tim Bentley
60d7416e69 Fix service path errors 2010-03-30 20:01:23 +01:00
Raoul Snyman
ab9b72dfb5 Fixed a broken import. 2010-03-30 09:05:24 +02:00
Jon Tibble
d7ef6d5f41 Cleanups 2010-03-28 22:57:54 +01:00
Tim Bentley
afc1fbde17 Remove ...s 2010-03-28 17:11:33 +01:00
Tim Bentley
b8f9f21b5d Review comments 2010-03-28 16:56:49 +01:00
Tim Bentley
e67e21f445 Fix loss of slide menu for save services 2010-03-28 15:18:36 +01:00
Tim Bentley
68a0cd06e5 Head775 2010-03-27 20:28:04 +00:00
Tim Bentley
66cd5f042a Stop outlines for footers they are too small 2010-03-27 20:27:33 +00:00
Raoul Snyman
85d44554b0 Bible fixes:
- Red letter text on CrossWalk import.
 - Removed text on web download progress, moved to an "indeterminable" progress style.
 - Some unicode optimisations.

bzr-revno: 775
2010-03-27 22:19:47 +02:00
Raoul Snyman
d2670b1cb0 Bible fixes:
- Red letter text on CrossWalk import.
 - Removed text on web download progress, moved to an "indeterminable" progress style.
 - Some unicode optimisations.
2010-03-27 21:59:35 +02:00
Tim Bentley
fb3abf7f36 Fix date 2010-03-27 16:46:52 +00:00
Raoul Snyman
abfc977b17 Fix to deal with "X.Y.Z" style version (i.e. without the "-bzrXXX"). 2010-03-27 14:37:21 +02:00
Tim Bentley
8df0053409 Fix Copyrights 2010-03-27 10:12:11 +00:00
Tim Bentley
35255c250e Fix up theme bugs 2010-03-26 20:48:46 +00:00
Tim Bentley
92e90b91e5 Fixes and cleanups 2010-03-26 20:20:09 +00:00
Tim Bentley
49ecc162ad Head770 2010-03-26 20:04:04 +00:00
Raoul Snyman
ee879774b8 Update the credits. 2010-03-26 21:44:18 +02:00
Tim Bentley
44f3e02a5c Fix outline rendering bug 2010-03-26 08:49:26 +00:00
Tim Bentley
e4db12423a Add Theme and Hide buttons to slide controller 2010-03-25 21:53:52 +00:00
Tim Bentley
463847c61c Correct image override process 2010-03-25 20:24:52 +00:00
Tim Bentley
51d6d2410b Fix QT4.4 bug in service manager 2010-03-25 19:27:46 +00:00
Tim Bentley
b20c29f45c Add delete to context menu 2010-03-25 18:52:16 +00:00
Tim Bentley
59dd69eee1 Do not display empty list 2010-03-24 19:10:08 +00:00
Tim Bentley
f158044d5e Fix row counts and bad code before superfly spots it 2010-03-24 19:05:45 +00:00
Tim Bentley
33d2de6f9b Heads 2010-03-24 18:59:37 +00: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
Jonathan Corwin
8524bf9174 Remove transparent error: QImage::scaled: Image is a null image 2010-03-22 23:50:32 +00:00
Tim Bentley
fd23dbc030 Head755 2010-03-22 18:33:54 +00:00
Tim Bentley
32086cb877 Fix slide selection so looks nice 2010-03-22 18:31:43 +00:00
Raoul Snyman
19c5c07c54 Add Christian and Phill to the credits
bzr-revno: 755
2010-03-22 10:37:18 +02:00
Raoul Snyman
ea5ceaf00a Updated copyright.
Updated credits.
2010-03-22 01:58:01 +02:00
Raoul Snyman
be598da4f9 Fixed a number of issues in the Bibles:
- Cleaned up unicode handling in BibleGateway import
- Cleaned up unicode handling in the import wizard itself
- Added some more tags to the list of things to be removed in the OSIS import
- Fixed a bug with spaces in book names in the CrossWalk import
- Created a generic QVariant to unicode converter method
2010-03-22 00:16:43 +02:00
Tim Bentley
2ff005cdc0 Add verse tag to live song rows 2010-03-21 19:55:51 +00:00
Tim Bentley
3e4683bd6d Fix up issues and confusion with service item edit 2010-03-21 17:56:56 +00:00
Tim Bentley
2d43cd2d8a Stop double loading of service items 2010-03-21 15:08:46 +00:00
Tim Bentley
8f692d13be Remove prints 2010-03-21 14:30:18 +00:00
Tim Bentley
848eb601af Fix NONE appearing as song verses
Delay the hidden window display
Fix missing add status for custom slides
2010-03-21 14:24:41 +00:00
Tim Bentley
92d39b1d98 Minor tidy ups and add stupidity block 2010-03-20 08:34:36 +00:00
rimach
9169870520 make Blank button workable 2010-03-20 00:02:23 +01:00
Tim Bentley
b011104deb Head747 2010-03-19 08:07:12 +00:00
Tim Bentley
09f18fd96d Clean up maintenance - Complete 2010-03-19 07:23:48 +00:00
Tim Bentley
66b23f6a6f Fix dialog 2010-03-18 22:06:51 +00:00
Tim Bentley
44224b0c73 Fix up maintenance dialog 2010-03-18 21:50:20 +00:00
Raoul Snyman
6414330b2c Reworked the BibleGateway Bibles.
Changed some code to be standards compliant.
2010-03-18 23:36:30 +02:00
Jon Tibble
de767459bd Fix 2 for AppLocation changes 2010-03-18 16:25:25 +00:00
Jon Tibble
5d2fe81d71 Fix for AppLocation changes 2010-03-18 15:52:37 +00:00
Jon Tibble
fea160c5c4 AppLocation.PluginsDir changes 2010-03-18 15:43:27 +00:00
Tim Bentley
ff8145cef1 Add in maintenance page to service manager 2010-03-17 21:25:35 +00:00
Tim Bentley
72d2d8f83d Clean up service item form names 2010-03-17 21:08:18 +00:00
Tim Bentley
c1182aa9cc Add maintain menu item 2010-03-16 20:30:33 +00:00
Tim Bentley
de8d0f4d9c Add add to existing service item 2010-03-16 20:22:28 +00:00
Jon Tibble
366fe2f508 Head r742 and import fix 2010-03-14 23:22:44 +00:00
Tim Bentley
36b9688695 Fix save service file name 2010-03-14 17:53:14 +00:00
Tim Bentley
23236b50e1 remove print 2010-03-14 17:14:38 +00:00
Tim Bentley
af5a52fa62 Fix service saving and cancelling
Fix Red and Bla
2010-03-14 17:05:50 +00:00
Tim Bentley
df8ffa53b2 Fix DND for service items 2010-03-14 07:56:39 +00:00
Tim Bentley
3b59525e98 Renderer screen and font fixes 2010-03-13 20:50:52 +00:00
Tim Bentley
2d934c8ed9 Fix screen size and rendering issues 2010-03-13 15:11:31 +00:00
Jon Tibble
660a35486b Head r737 2010-03-13 12:11:11 +00: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
Raoul Snyman
ccfa7501ce - Fixed up Mac OS X detection
- Removed an unnecessary import
- Fixed an export
2010-03-12 20:31:13 +02:00
Jon Tibble
9196a6b6f6 Head r736 2010-03-12 17:43:17 +00:00
Raoul Snyman
c7c1a9c06a Added icons for:
- Blank Screen
 - Show Desktop
 - Show Theme Background
2010-03-12 17:38:56 +02:00
Jon Tibble
8124f0e8fe Import and weird character cleanups 2010-03-11 14:02:43 +00:00
Tim Bentley
e092dc85cd Song edit bug - save and preview on new song 2010-03-11 12:53:20 +00:00
Tim Bentley
dde75e2288 Head733 2010-03-11 12:48:19 +00:00
Tim Bentley
27d09b8be8 Blank text screens do not have footers 2010-03-11 08:29:32 +00:00
Tim Bentley
b3ce7bf940 Refactor theme outlines 2010-03-11 08:11:36 +00:00
Jonathan Corwin
bfee664c94 fixes 2010-03-10 23:00:48 +00:00
Jonathan Corwin
99a963e509 Head 2010-03-10 22:28:19 +00:00
Tim Bentley
74b288aa6a Head731 2010-03-10 16:58:07 +00:00
Tim Bentley
9bace991fa renderer changes 2010-03-10 16:57:33 +00:00
Jon Tibble
26d33e5fa9 Head r730 2010-03-10 13:45:26 +00:00
Raoul Snyman
32b267fab9 Windows modifications:
- Added Windows build files.
- Added Windows installer files.
- Modified the tabs in the media manager to look a little better on both Windows and Linux.
- Windows icon.

bzr-revno: 730
2010-03-10 07:50:48 +02:00
Raoul Snyman
1e79260c5c Renamed the versionThread class to VersionThread to fit with our coding standards. 2010-03-09 22:29:45 +02:00
Raoul Snyman
16ea5dd0ad Tidied up the tabs on the media manager. 2010-03-09 22:26:12 +02:00
Raoul Snyman
8e5e1dfc36 Merged from HEAD 2010-03-09 21:58:59 +02:00
Jon Tibble
56d2e30fe6 Head r729 2010-03-09 19:45:13 +00:00
Jon Tibble
e40f1b41ef Truth tests and some style fixes 2010-03-09 19:43:11 +00:00
Jon Tibble
51d95b661c Head r728 and truth test 2010-03-09 19:14:23 +00:00
Tim Bentley
b75bc2abbf Remove Print statements 2010-03-08 19:55:13 +00:00
Tim Bentley
55c676dc03 Minor servicemanager fixes 2010-03-08 19:50:35 +00:00
Jon Tibble
54c4bc9c19 Head r727 and C style fix 2010-03-08 19:43:37 +00:00
Tim Bentley
6f87c362d1 Use Icon to show we have Notes 2010-03-07 20:45:27 +00:00
Tim Bentley
5560aac575 Fix expanding service items 2010-03-07 19:22:54 +00:00
Tim Bentley
77e671bd78 Remove unneeded version tagging 2010-03-07 06:42:22 +00:00
Jonathan Corwin
714135a94f presentation text/notes routines. blanking issues 2010-03-06 23:33:10 +00:00
Tim Bentley
d3564b2df7 Fix translation 2010-03-06 14:08:51 +00:00
Tim Bentley
1932ed886e Fix up service notes 2010-03-06 08:00:36 +00:00
Jon Tibble
d4b77873fb Head r724 2010-03-05 21:54:29 +00:00
Raoul Snyman
250fb09737 Merged head in. 2010-03-05 20:37:52 +02:00
Tim Bentley
eec672c944 Fix up bug for Theme savings and OOS 2010-03-05 12:06:19 +00:00
Tim Bentley
d2b4bc4314 Fix up Copyright and utf8 2010-03-05 10:04:49 +00:00
Tim Bentley
763b7cfeed Fix up context menu for serviceitem 2010-03-05 09:24:42 +00:00
Tim Bentley
f4e25bf329 Finish logging cleanup 2010-03-04 22:09:03 +00:00
Tim Bentley
181c7c9946 Event clean ups and fixes 2010-03-04 22:03:43 +00:00
Tim Bentley
9ada2f00b0 Theme Deletes only work for unused themes 2010-03-04 19:03:09 +00:00
Jon Tibble
0baa0e6884 Head r721 2010-03-04 18:34:53 +00:00
Tim Bentley
3084140741 Remove extra line 2010-03-03 17:49:28 +00:00
Tim Bentley
6bff7936eb Add ServiceItemNoteForm and handling 2010-03-03 17:48:37 +00:00
Tim Bentley
b949ab0054 Head719 2010-03-02 19:45:54 +00:00
Tim Bentley
4abcbe86b2 ServiceItem Cleanups 2010-03-02 19:44:55 +00:00
Raoul Snyman
e7f7fe8861 Added Service Edit and Service Notes icons. 2010-03-02 09:01:56 +02:00
Raoul Snyman
024fdd56e6 Added installer stuff. 2010-03-01 20:37:10 +02:00
Tim Bentley
325fab92da Clean up all the Gloab log statements 2010-02-27 15:31:23 +00:00
Jon Tibble
5947f58cf6 Head r717 2010-02-27 15:13:28 +00:00
Tim Bentley
d47fc53b78 Add Alternate rows to slide controller 2010-02-27 07:39:47 +00:00
Jon Tibble
80d54dc1be None tests 2010-02-27 00:11:26 +00:00
Jon Tibble
2185f4e842 Remove C-style semi-colons 2010-02-26 23:47:59 +00:00
Tim Bentley
0ab16fed6b Add Preview option for songs etc fom service manager 2010-02-26 12:18:01 +00:00
Tim Bentley
38a8575989 Sort out startup http gets. 2010-02-25 21:09:27 +00:00
Raoul Snyman
2766081522 Merged from trunk.
Fixed a conflict.
2010-02-24 21:02:39 +02:00
Raoul Snyman
0ddaa2bf4a Some more visual tweaks.
Fixes for older versions of PyQt4.
2010-02-24 20:39:12 +02:00
Tim Bentley
3cf8b491ea Fix field name 2010-02-23 19:37:07 +00:00
Tim Bentley
8f985291ac Head 2010-02-23 19:19:22 +00:00
Jon Tibble
d02fc68a72 Fix unzipping theme files 2010-02-22 16:57:08 +00:00
Jon Tibble
61c7b6479f Fix theme import font colours 2010-02-22 16:42:10 +00:00
Jon Tibble
0337127985 Fix theme import alignment 2010-02-22 15:53:23 +00:00
Tim Bentley
60dd3b36cf Fix presentation tab and repaint service item 2010-02-22 06:14:44 +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
Tim Bentley
20ab9d1ce2 Force regeneration of all changes 2010-02-21 14:12:47 +00:00
Tim Bentley
985ce73dfd Force regeneration of sevice item on theme change 2010-02-21 14:06:56 +00:00
Jon Tibble
5715819e83 Head r710 2010-02-21 13:21:44 +00:00
Jon Tibble
ab43741dcb Head r709 and initial fix for theme importing 2010-02-21 13:20:39 +00:00
Raoul Snyman
6f4b4b2616 Moved all "get_xxxxx_directory" functions into one "AppLocation" class.
Set the plugin manager to use this new AppLocation class as well.
2010-02-21 14:43:03 +02:00
Raoul Snyman
174a85d969 Couple more visual tweaks, to make OpenLP look good in Windows.
Print the location of file OpenLP is logging to in debug mode.
2010-02-21 12:28:35 +02:00
Raoul Snyman
70251a4321 - Created independant "get_config_directory" and "get_data_directory" methods.
- Moved log file to configuration file location for non-root/administrator users.
2010-02-21 08:32:43 +02:00
Tim Bentley
516b05e0ad Fix URF8, copyright and alert error 2010-02-17 20:17:33 +00:00
Jon Tibble
60236d98a1 Head r706 2010-02-17 19:05:39 +00:00
Jon Tibble
2287db11d7 head 2010-02-17 19:04:53 +00:00
Tim Bentley
0335547d73 Fix SongUsage Dialog so should be complete
Minor bug fixes discovered and fixed.
Alerts - Major refactor
* Make a plugin
* Move code from maindisplay into plugin
* Add Location , Font size and History option to Font Tab and fix code to use them
* Add button to Alert Tab to allow History to be edited
* Amend Alert screen to be able to use History if option set
* Build screen to allow alerts to be Added / Edited and Deleted.

bzr-revno: 705
2010-02-16 19:58:10 +00:00
Tim Bentley
fef8986550 Fix theme import bug 2010-02-16 17:40:41 +00:00
Tim Bentley
9c97660b73 Alerts now move between top and bottom 2010-02-13 07:37:03 +00:00
Tim Bentley
973d5e3dd8 Alerts move to top and bottom 2010-02-13 07:30:00 +00:00
Tim Bentley
47a61a6581 Finished moving alert code to plugin structure 2010-02-12 18:42:09 +00:00
Tim Bentley
944f45c8c8 Fix up song usage extract processing 2010-02-11 18:39:28 +00:00
Tim Bentley
edc46f2967 Fix songs so tagging can work > 10 verses. Tested with 100! 2010-02-09 16:09:57 +00:00
Tim Bentley
73d6a24792 Add Fontsize and location to alerts settings 2010-02-09 14:56:31 +00:00
Tim Bentley
643801ae05 New alert tag features and song usage dialog 2010-02-09 14:44:36 +00:00
Jon Tibble
6dfa580613 r701 2010-02-09 12:20:16 +00:00
Tim Bentley
d4668e2ba3 Fix log levels 2010-02-06 17:13:55 +00:00
Tim Bentley
2ffe5af9a3 Fix log levels 2010-02-06 17:12:03 +00:00
Jon Tibble
f30136924f Head r700 and import fixes 2010-02-06 16:23:47 +00:00
Tim Bentley
54f36da76f Head700 and fixes 2010-02-06 15:02:46 +00:00
Raoul Snyman
c1f5a78290 Merge from trunk 2010-02-06 15:39:14 +02:00
Tim Bentley
00e84d40f3 Cleanups and fix alerts for Presentations 2010-02-06 08:04:01 +00:00
Tim Bentley
58894e2afa Update default config file and add version checking option 2010-02-05 19:08:47 +00:00
Tim Bentley
079c9a4679 Key handling changes 2010-02-04 19:25:32 +00:00
Tim Bentley
1164ab9beb Added Extra key events to SlideController 2010-02-03 18:29:02 +00:00
Tim Bentley
b5a4178ca7 Cleanup loggin levels and amend default 2010-02-03 17:23:33 +00:00
Tim Bentley
af58043690 Make startup smoother with a Thread 2010-02-02 20:05:21 +00:00
Tim Bentley
632fae5a76 Remove print statements 2010-02-02 18:16:11 +00:00
Raoul Snyman
965902544f Updated to trunk:HEAD 2010-01-29 23:12:14 +02:00
Raoul Snyman
0e29d0b4af Show a small progress bar rather than a "downloading" message. 2010-01-29 22:20:30 +02:00
Tim Bentley
3610b232bd Fix up saving and loading service items 2010-01-29 16:38:28 +00:00
Tim Bentley
1fd98217ab Pass active presentation types to other controllers 2010-01-29 13:06:47 +00:00
Tim Bentley
dc6be31d1f Move changes to get displays working correctly and sort out Impress 2010-01-28 17:36:13 +00:00
Tim Bentley
dc7148b76e Fix screen display setup when returning from presentations 2010-01-28 11:46:25 +00:00
Tim Bentley
3baf2f2f7b Import the startup showing the update screen 2010-01-28 07:39:34 +00:00
Tim Bentley
af5bfe3066 Clean up SongUsage so it now works again 2010-01-28 07:15:23 +00:00
Tim Bentley
04c68a075e More Image Layer changes 2010-01-26 19:16:47 +00:00
Tim Bentley
9beb6c7db5 Add Image layer and rename text layer 2010-01-25 20:34:47 +00:00
Jon Tibble
9239c0cdf3 Cleanups 2010-01-24 23:16:15 +00:00
Tim Bentley
d6912adbf8 Make display blanking work correctly 2010-01-24 16:28:18 +00:00
Tim Bentley
e6e6eeb7c0 Media and Blank screen now play together nicely. 2010-01-24 15:18:26 +00:00
Tim Bentley
ad40020169 Fix logging to single file
Fix QMessage to displays on correct screen.
2010-01-24 13:58:39 +00:00
Tim Bentley
c35ff6b8d1 Presentation display fixes 2010-01-23 09:49:01 +00:00
Tim Bentley
2d7c9dd402 Fixes from the merge 2010-01-22 18:59:36 +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
Tim Bentley
9dc38cf289 Refactor the screen handling code to try and set the screen sizes correctly. 2010-01-16 07:22:50 +00:00
Tim Bentley
85bada91ba Move towards sorting out renderer text sizes 2010-01-10 19:03:52 +00:00
Tim Bentley
ee8a92b77f fix screen lines calcs so they are correct.
Prints added for rendering size diagnostics.
2010-01-10 11:49:04 +00:00
Tim Bentley
6ef3f6aadc Lots of fixes:
Alerts now stack up a wait correctly
Presentations will run but issue with impress previews
Transparent themes now work
New image for media previews
2010-01-09 09:34:06 +00:00
Raoul Snyman
b4b075c961 Updated copyright year. 2009-12-31 14:52:01 +02:00
Tim Bentley
0cdc827a1d Fix up custom plugin issues 2009-12-16 17:54:45 +00:00
Tim Bentley
a7833f900f Add Outline and Shadow size options and make editable 2009-12-15 20:36:15 +00:00
Tim Bentley
43a99451a3 Add Outline and Shadow size options 2009-12-15 20:11:52 +00:00
Tim Bentley
1271eac76e Correct comment 2009-12-14 16:55:58 +00:00
Tim Bentley
be3fecac20 Sort out Presentation plugin Handler
* Allow 2 presentations to work at same time
* Sort out live / preview issues to stop cross messaging
2009-12-13 22:08:10 +00:00
Tim Bentley
fe959f451f Fix up Alert generation (needs to be tested on duel screen) 2009-12-13 14:20:24 +00:00
Tim Bentley
14837d6efa Fix up preview in 1024x764 so looks sensible 2009-12-12 09:24:12 +00:00
Tim Bentley
231a2fa933 More fixes for bibles 2009-12-11 19:02:45 +00:00
Tim Bentley
aaba983805 Fix up Bible plugin and Theme manager 2009-12-11 17:40:18 +00:00
Tim Bentley
540f63c9de Fix Theme handling so Song level works again
bzr-revno: 686
2009-12-10 17:03:21 +00:00
Tim Bentley
3cc63840f4 Fix up theme string issues to False is matched
Remove any Print statements
2009-12-09 17:09:45 +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
Tim Bentley
4158ae458e Clean up ServiceItem usage in ServiceManager 2009-12-08 17:04:27 +00:00
Tim Bentley
26dd28d083 Remove unneeded code 2009-12-06 19:22:41 +00:00
Tim Bentley
5d79141cfc Verse tagging - combo complete 2009-12-06 16:50:13 +00:00
Tim Bentley
528004df23 Start to add change in toolbar 2009-12-06 13:55:07 +00:00
Tim Bentley
40523ed0f6 Toolbar fixups 2009-12-06 08:39:56 +00:00
Raoul Snyman
583d96b5d1 Song Verses Toolbar: Phase 1
- Convert verse icons to drop-down verse menu.
2009-12-06 09:14:11 +02:00
Tim Bentley
480fc4771f Fix up song tagging so case does not matter
Fix bug in transitions when using images
Remove MediaTab as not wanted
2009-12-05 08:05:11 +00:00
Tim Bentley
b8149cc826 Fix up Icon code to use isinstance
Fix up code to ignore cases when doing tests.
2009-12-04 20:25:48 +00:00
Tim Bentley
1b6ad5814b Verse Tagging complete 2009-12-02 11:22:48 +00:00
Tim Bentley
a2ff6433ba Build Dynamic Icons for SlideController 2009-12-02 10:59:54 +00:00
Tim Bentley
ca7d032aa5 Correct Icon Path 2009-12-02 09:20:40 +00:00
Tim Bentley
250fd4e41b Fix Icons on toolbar 2009-12-02 08:55:15 +00:00
Tim Bentley
156a70208b Add new types to verse editing
Clean up dialog so looks better
Add controls around the editor in terms of validation
2009-12-02 08:35:02 +00:00
Tim Bentley
6ebd1d9e60 Cleanup from rendering changes 2009-12-01 17:02:18 +00:00
Raoul Snyman
17548726a1 Merge from HEAD 2009-11-30 22:34:45 +02: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
Tim Bentley
9f80c5a742 Fix problem with slide controller
soften the renderer transition
2009-11-30 19:51:29 +00:00
Raoul Snyman
47bf4477d4 Fixed up a few configuration settings. 2009-11-30 20:29:22 +02:00
Tim Bentley
6380cc5126 Fix up song verse expansion to handle no verse order
Fix bug in slide controller when no slide and button is pressed
2009-11-30 18:22:43 +00:00
Tim Bentley
939909fdd8 Remove Timer from transitions not needed
Add Code to use the Verse Order to expand songs
2009-11-29 21:03:24 +00: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
Tim Bentley
8036cbf077 Head678 2009-11-29 19:03:20 +00:00
Tim Bentley
77b0da2c41 Tidy ups pre merge 2009-11-29 19:00:10 +00:00
Raoul Snyman
420b0ef68d Merged in Michael's changes from the AST module and resolved some conflicts. 2009-11-29 16:18:42 +02:00
Raoul Snyman
ae905abfde Spruced up the About page. Made a few configuration key changes. 2009-11-29 16:07:25 +02:00
Tim Bentley
829e4976e2 Slide Controller refactoring ready for Verse changes 2009-11-29 08:33:46 +00:00
Tim Bentley
f04e5c078a Head677 2009-11-28 12:39:13 +00:00
Tim Bentley
d0a49ba3a1 Song taagging into Slide Controller 2009-11-28 12:38:48 +00:00
Michael Gorven
2bd1ff755b Merge lp:~mgorven/openlp/get-strings-ast: Use AST module to parse code and extract translation strings.
https://code.launchpad.net/~mgorven/openlp/get-strings-ast/+merge/15328

bzr-revno: 677
2009-11-28 14:09:17 +02:00
Tim Bentley
1c60a29d68 Basic Tranisitions 2009-11-28 09:12:22 +00:00
Tim Bentley
23d945a454 Replace phonon code, add framework for transitions 2009-11-28 06:49:53 +00:00
Tim Bentley
ab5b0ee0d5 Amended plugin to use correct stat values
Fixed bible media item to initialise in correct order
Fixed servicemanager to use correct methods on service loading
Sorted out lots of issues tagging the song verses
2009-11-27 21:54:37 +00:00
Raoul Snyman
ce63999383 Various configuration option cleanups and changes. 2009-11-27 23:37:01 +02:00
Michael Gorven
662962abef Merge from trunk. 2009-11-27 13:00:01 +02:00
Raoul Snyman
d0832a2c86 Changed all the trUtf8(u'...') to trUtf8('...') 2009-11-26 20:43:49 +02:00
Tim Bentley
8dc0742e1e Headr676 2009-11-26 18:42:00 +00:00
Tim Bentley
1d359c7503 More Song tagging fixes 2009-11-26 18:41:39 +00:00
Raoul Snyman
4d715a3d5d Moved i18n to resources (better place for it).
Fixed up openlp-get-strings.py to use the new TS file location.
Started fixing up the trUtf8() strings.
2009-11-24 21:51:41 +02:00
Raoul Snyman
d42a6a53e1 Merged in changes from trunk 2009-11-24 21:10:54 +02:00
Raoul Snyman
a3714e98d1 Lowercased config settings (they are case insensitive).
Made text render antialiased.
2009-11-24 21:08:53 +02:00
Tim Bentley
388a596922 Add verse number code to song plugin 2009-11-22 20:33:39 +00:00
Tim Bentley
56c69bd8e8 Fix up renderer to protect it from Gushie 2009-11-21 14:32:19 +00:00
Raoul Snyman
461acc2bc8 Added a small fix, courtesy of Jon Tibble. 2009-11-14 22:18:14 +02:00
Raoul Snyman
9e96aac849 Make sure screen and button are still black after coming back from media. 2009-11-13 23:37:11 +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
Raoul Snyman
8c599b6707 Fixed up an issue between the display screen and the blank button 2009-11-13 22:10:35 +02:00
Raoul Snyman
262577bd6e Removed an unused parameter from addToolbarButton, and added a "checkable" argument. 2009-11-13 20:46:47 +02:00
Tim Bentley
6df4e5a369 Remove transition code 2009-11-12 19:12:13 +00:00
Tim Bentley
04873758e9 Remove extra Video 2009-11-12 19:05:24 +00:00
Tim Bentley
124c511385 Fix saving and reloading of media items 2009-11-12 18:44:45 +00:00
Tim Bentley
9970ae8281 Transitions between slides 2009-11-12 17:48:49 +00:00
Tim Bentley
7a1f2ee855 Headr668 2009-11-12 17:21:34 +00:00
Tim Bentley
e62c482a2e Slide Controller and Transition changes 2009-11-12 17:21:15 +00:00
Jon Tibble
37e2342a8c Unicode and import fixes
bzr-revno: 668
2009-11-12 17:18:30 +00:00
Jon Tibble
a821179a63 A unicode fix for themes 2009-11-12 00:49:55 +00:00
Jon Tibble
b100731dc4 A unicode fix for songs 2009-11-12 00:44:26 +00:00
Tim Bentley
1eb41aab78 SlideController cleanups 2009-11-11 19:10:38 +00:00
Tim Bentley
ab12f73a21 spacing cleanups 2009-11-10 20:44:02 +00:00
Tim Bentley
f778948abb Reset Preview when exiting media 2009-11-10 06:13:59 +00:00
Tim Bentley
1c3c672e9b Add Media Preview to slideController 2009-11-09 20:27:25 +00:00
Tim Bentley
b6332e7ff5 Fix media previews ti work and not display the extra screens 2009-11-09 16:37:37 +00:00
Tim Bentley
9eb88a4300 Try to hide display screens for previews 2009-11-09 06:11:26 +00:00
Tim Bentley
bf63b2ae2f Fix up toolbar handing to stop toolbar going off screen
Added Media Toolbar for the media items
Added it to Preview 
Added and wired in a volume control
2009-11-09 05:58:45 +00:00
Jon Tibble
95acdbfde0 Fix import 2009-11-09 00:11:01 +00:00
Tim Bentley
bc28e3e78f Clean up slide sizes part 2 2009-11-08 17:40:43 +00:00
Tim Bentley
ebce104f30 Clean up slide sizes part 1 2009-11-08 17:02:46 +00:00
Tim Bentley
f18ba14fc9 remove print for log 2009-11-08 14:16:02 +00:00
Tim Bentley
5b154b5941 Fix bugs in previous merges with icons and themes 2009-11-08 13:56:25 +00:00
Tim Bentley
f3f3906ca0 Add test to stop icons going over the limit 2009-11-08 09:09:23 +00:00
Tim Bentley
66a6dfd42a Add icon to slidecontroller/nAdd inital icons /nFix ToolBar for Media" 2009-11-08 08:58:31 +00:00
Jonathan Corwin
c10b4742be Presentation fixes
bzr-revno: 662
2009-11-07 19:39:52 +00:00
Jonathan Corwin
337df8da9f Fix Impress off-by-one and slow slide update problems Meths found 2009-11-07 16:45:49 +00:00
Tim Bentley
381e91294f Fix blocking for Active/Inactive 2009-11-07 14:58:24 +00:00
Tim Bentley
2e02f1c94f Remove "Can_be_disabled" as no longer require
Sort out status handling in plugin form.
2009-11-07 07:42:18 +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
Tim Bentley
b6602e67d4 Headr658 2009-11-06 17:36:38 +00:00
Jon Tibble
aa8b7c3fe5 Clean theme handling
bzr-revno: 658
2009-11-06 15:38:30 +00:00
Michael Gorven
a89cec05da Change to Unicode string. 2009-11-06 11:52:04 +02:00
Michael Gorven
4ee481ca6e Change to Unicode string. 2009-11-06 11:52:04 +02:00
Tim Bentley
6139f049d4 Refactor Service Item and clean up Slide Controller
bzr-revno: 673
2009-11-15 16:57:11 +00:00
Tim Bentley
365d15050c Head671 and fixes 2009-11-15 07:24:30 +00:00
Tim Bentley
f9f4cc2518 Renderer cleanups and fixes 2009-11-15 07:07:40 +00:00
Raoul Snyman
2054d38cae Merged in lp:~raoul-snyman/openlp/bitsandbobs
bzr-revno: 671
2009-11-15 09:02:27 +02:00
Tim Bentley
98e4b47d91 headr670 2009-11-14 17:01:14 +00:00
Tim Bentley
78fd8efdf7 Remove unneed varables
Move code into serviceItem
Fix up splitter code
2009-11-14 12:24:27 +00:00
Tim Bentley
26b9274604 ServiceItem cleanup - fix presentation issues 2009-11-14 11:47:10 +00:00
Tim Bentley
3ecec95aca ServiceItem cleanup - remove code duplication 2009-11-14 11:44:06 +00:00
Tim Bentley
b0ae4e4ceb ServiceItem cleanup - fix media playing 2009-11-14 10:51:58 +00:00
Tim Bentley
b1766d7ee4 ServiceItem cleanup - sort out name format errors 2009-11-14 09:41:11 +00:00
Tim Bentley
0aca1665be ServiceItem cleanup - remove CommandItem 2009-11-14 09:37:54 +00:00
Tim Bentley
02ad0595d7 ServiceItem cleanup - hide lists 2 2009-11-14 09:06:25 +00:00
Tim Bentley
ad6abb1e9c ServiceItem cleanup - hide lists 2009-11-14 09:02:30 +00:00
Tim Bentley
e618c3061c ServiceItem cleanup - rename arrays 2009-11-14 08:40:14 +00:00
Jon Tibble
f0e2fdd6f5 Fix multiple video plays 2009-11-13 17:43:58 +00:00
Jon Tibble
3defb3b4c5 SPG 2009-11-13 17:42:51 +00:00
Jon Tibble
f764eb7d59 Fix imports 2009-11-12 23:58:19 +00:00
Jon Tibble
b79d535e04 Fix theme loading logic and missing item from cleaning 2009-11-12 23:49:35 +00:00
Jon Tibble
b6eadecb46 isfile test doesn't need try 2009-11-12 23:46:20 +00:00
Jon Tibble
1c92f157c7 Refactor file_to_xml => get_text_file_string 2009-11-12 23:43:47 +00:00
Jon Tibble
1c0a86b17f Simplify OS path setting 2009-11-12 23:33:59 +00:00
Jon Tibble
74b08cb9c4 Clean theme loading 2009-11-06 02:12:56 +00:00
Jonathan Corwin
e931fa023a Address some issues with preview slide controller and presentations 2009-11-05 23:21:23 +00:00
Tim Bentley
cfd5b536c7 Headr657 2009-11-05 17:50:57 +00:00
Raoul Snyman
3853a257b3 Merged in display fixes from lp:~raoul-snyman/openlp/fixes
bzr-revno: 657
2009-11-05 19:33:38 +02:00
Tim Bentley
831281e293 More remote editing cleanups 2009-11-05 17:03:37 +00:00
Raoul snyman
7a359c047a Renamed DisplayLabel to DisplayWidget
Fixed typo in DisplayWidget.__init__
Changed MainDisplay.__init__ to call DisplayWidget.__init__ not QtGui.QWidget.__init__
Fixed issue where the display window was showing up on the primary display.
2009-11-05 08:06:43 +02:00
Jon Tibble
62031c24b9 Fix last theme.parse() without a cleanTheme() 2009-11-05 00:09:19 +00:00
Jon Tibble
3d56391d1c Fix typo 2009-11-04 23:16:33 +00:00
Jon Tibble
c8226bf2fc Fix mismerge 2009-11-04 23:13:17 +00:00
Raoul Snyman
08786fdcec Fixed incorrect showing of image based on splash screen configuration.
Fixed a bug where the display screen's image would not resize when the display screen was set to another desktop.
2009-11-04 22:06:46 +02:00
Jon Tibble
0ea45cd366 Head with correct song edit fix 2009-11-04 18:21:08 +00:00
Tim Bentley
4a05f6e9cf Fix song editing 2009-11-04 17:48:46 +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
85d4466c76 Head r653 2009-11-03 19:21:58 +00:00
Tim Bentley
2d690c209d Fix phantom expansion in Service Manager 2009-11-03 18:39:58 +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
89e0aee373 Headr651 2009-11-03 06:16:27 +00:00
Tim Bentley
8c77de16c4 Cleanup Remote Editing again 2009-11-03 06:15:35 +00:00
Jon Tibble
7f176bf16f Improve iterator use 2009-11-03 01:37:08 +00:00
Jon Tibble
7767746f7a More usability fixes 2009-11-03 01:12:35 +00:00
Jon Tibble
066cfcc830 Single monitor and usability fixes 2009-11-03 00:04:41 +00:00
Jon Tibble
d0145bd1e4 Video on multi-monitor setups 2009-11-02 18:05:52 +00:00
Tim Bentley
e3dd7842d4 Merge it right this time
bzr-revno: 650
2009-11-02 17:37:41 +00:00
Tim Bentley
0a6e3f47c7 Headr468 and fix 2009-11-02 17:24:27 +00:00
Jon Tibble
ad69f754b8 Enable multiple videos without restart 2009-11-02 01:03:27 +00:00
Tim Bentley
8751433da8 Fixes from last few merges 2009-11-01 21:02:31 +00:00
Tim Bentley
d58327435a Media is starting to work - just
bzr-revno: 646
2009-11-01 20:21:49 +00:00
Tim Bentley
8880a1b016 It works as long as you wont to play only 1 thing per service 2009-11-01 19:41:13 +00:00
Tim Bentley
c06b64fdbe Start to add the menu items to slide controller 2009-11-01 19:22:51 +00:00
Tim Bentley
6df0649fbc Video cleanup part1 2009-11-01 16:06:59 +00:00
Tim Bentley
70b04f5821 Headr644 2009-11-01 15:31:22 +00:00
Tim Bentley
201fce5bba Headr642 2009-11-01 15:29:53 +00:00
Tim Bentley
9dae67ac0a Clean up version notifications and checking 2009-11-01 09:07:10 +00:00
Tim Bentley
7a349c998e Fix up handling of service items in the slide controllers and stop editing issues 2009-10-31 20:27:08 +00:00
Tim Bentley
9eeaf98b66 Fix error handling for double exception call. Added debugging for Song XML class 2009-10-31 10:19:30 +00:00
Tim Bentley
258bf403c8 Sort out number of buttons on SlideController to match song and make more KITT like 2009-10-31 09:03:54 +00:00
Tim Bentley
4eaa7a1535 Finish remote editing of ServiceManager by updating live 2009-10-31 08:45:24 +00:00
Tim Bentley
4695d711f8 Fix names before Raoul sees them 2009-10-30 22:03:09 +00:00
Tim Bentley
b16a8cc452 Headr639 2009-10-30 21:47:15 +00:00
Tim Bentley
7b1de0f995 Move version check 2009-10-30 21:45:38 +00:00
Jon Tibble
28a223bc06 Fix double loading 2009-10-30 20:34:11 +00:00
Tim Bentley
2f12c075c2 Fix theme editing where previous image is cached on change of image 2009-10-30 20:21:36 +00:00
Tim Bentley
48e750ded2 Add Save service on New code, and configuration to turn it off. 2009-10-30 20:14:55 +00:00
Jon Tibble
7eb86b1580 Plugin cleanups and more i18n 2009-10-30 17:44:16 +00:00
Tim Bentley
0d959fbfb1 Song Edit Preview button only active from Preview, Reset Theme Editor image text Edit 2009-10-30 06:43:28 +00:00
Jon Tibble
e662b785db Fix font names in theme editing 2009-10-29 23:27:45 +00:00
Jon Tibble
490b19ddc2 Enable media additions to ServiceManager and fixes 2009-10-29 18:25:34 +00:00
Jon Tibble
1db3cda76b Head r637 2009-10-29 17:19:04 +00:00
Jon Tibble
359c2bee42 TRB Fixes 2009-10-29 17:16:24 +00:00
Tim Bentley
2f03004bcd Minor fixes
bzr-revno: 637
2009-10-29 16:21:58 +00:00
Jon Tibble
e519f729f1 Fix unnecessary screen setup 2009-10-29 16:01:33 +00:00
Tim Bentley
81de929460 Minor fixes 2009-10-29 15:57:58 +00:00
Jon Tibble
1cf8b9c1b7 Head r634 2009-10-29 15:20:28 +00:00
Tim Bentley
dd919d4ccf Headr633 and merge resolution 2009-10-29 13:58:03 +00:00
Tim Bentley
472857535f headr632 2009-10-29 13:44:52 +00:00
Tim Bentley
302d29ea85 More remote edit changes 2009-10-29 13:44:33 +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
Jon Tibble
eb61003c8e Fix plugintabs i18n
bzr-revno: 632
2009-10-29 13:00:48 +00:00
Tim Bentley
0ffbc050de Songs now have remote edit working 2009-10-29 09:18:26 +00:00
Tim Bentley
8e4f69383c Style fixes 2009-10-29 06:24:53 +00:00
Jon Tibble
8de21d057f PluginNameVisible without splitting __init__ 2009-10-29 01:48:43 +00:00
Jon Tibble
fcd5836e0f Fix i18n for tabs v3 2009-10-28 21:52:13 +00:00
Jon Tibble
439c3c90ca Fix i18n for visible and non-visible title use 2009-10-28 21:04:14 +00:00
Tim Bentley
19e8682bf8 Add BibleGateway List and access it 2009-10-28 18:35:06 +00:00
Jon Tibble
2eccd57aca Fix mediaitem.pys i18n 2009-10-28 01:36:24 +00:00
Tim Bentley
60649e3624 Move Audit to SongUsage 2009-10-27 08:38:02 +00:00
Tim Bentley
03ba804be7 Biblegateway addition 2009-10-27 07:20:01 +00:00
Jon Tibble
abafa78958 Head r629 2009-10-26 23:51:48 +00:00
Tim Bentley
3ee930f6ae Fix Line split code. Stop SlideController being editied 2009-10-26 16:19:26 +00:00
Tim Bentley
4833f7cd0b Add Song Tab option to remove them 2009-10-26 06:30:08 +00:00
Tim Bentley
19e27dbc95 Add Song verses to menu bar 2009-10-26 06:09:33 +00:00
raoul.snyman@saturnlaboratories.co.za
706db6923b Fix i18n issues
bzr-revno: 629
2009-10-26 05:34:44 +00:00
Raoul Snyman
d54a023611 Merged in Windows changes. 2009-10-25 23:36:04 +02:00
Raoul Snyman
e95eb437e2 Removed the QLabels from text service items. It's nigh impossible to dynamically style QLabels in QTableWdigetItems. 2009-10-25 23:33:07 +02:00
Raoul Snyman
07468597aa Just changed the SlideController selection back for the moment. 2009-10-25 22:20:03 +02:00
Raoul Snyman
8133cea273 Merge from trunk 2009-10-25 21:19:25 +02:00
Tim Bentley
3f69bb7635 "Save and Preview" added to Song editor 2009-10-25 18:07:23 +00:00
Tim Bentley
da4a26ef5f Service Items can now have their theme changes at run time. 2009-10-25 16:26:03 +00:00
Raoul Snyman
8de8638ba9 Merged trunk, Fixed up odd trUtf8 2009-10-25 18:12:41 +02:00
Tim Bentley
5f25ffd267 Headr626 2009-10-25 14:41:29 +00:00
Tim Bentley
68bc9bf526 Audit report work 2009-10-25 14:41:15 +00:00
j@corwin.co.uk
4871acd05c More presentation fixes
bzr-revno: 626
2009-10-25 14:39:45 +00:00
Tim Bentley
bad24ee614 Finally fix redisplaying of correct slide 2009-10-25 08:09:41 +00:00
Jonathan Corwin
60b0120e56 Fix merge conflict 2009-10-24 20:53:49 +01:00
Tim Bentley
7b85b9c7af More Song editing fixes 2009-10-24 20:43:16 +01:00
Jonathan Corwin
e0f9f3f09e Keep item in slidecontroller in sync with presentation, and detect external slide changes. 2009-10-24 20:22:00 +01:00
Tim Bentley
8c86edb0b6 Headr624 2009-10-24 19:16:04 +01:00
Tim Bentley
7b54d89039 Preserve selected slide on editing 2009-10-24 19:11:02 +01:00
Jon Tibble
aeb75d2056 Fix imports and typo 2009-10-24 17:40:36 +01:00
Tim Bentley
abd66af1c4 Fix extra utf8 strings 2009-10-24 17:00:43 +01:00
Tim Bentley
23fd584f63 Add Preview Song Editing 2009-10-24 14:07:41 +01:00
Raoul Snyman
08c852f8ee Fixed problem in "AmendThemForm" 2009-10-24 13:46:57 +02:00
Raoul Snyman
803987d402 Not quite - I needed to cast it to unicode. 2009-10-24 13:14:26 +02:00
Raoul Snyman
47edd31b58 Let's try fix the version check message. 2009-10-24 13:12:10 +02:00
Tim Bentley
4f211d24e0 Fix theme editor 2009-10-24 11:04:35 +01:00
Tim Bentley
76fa3438c4 Headr621 2009-10-24 10:55:25 +01:00
Raoul Snyman
a94f5c9e0d Merge from lp:~raoul-snyman/openlp/i18n
bzr-revno: 621
2009-10-24 11:33:20 +02:00
Tim Bentley
2c1c202e5b Fixed edit theme to preview render bug 2009-10-24 08:22:44 +01:00
Tim Bentley
2181655239 Headr620 2009-10-24 06:59:07 +01:00
Jon Tibble
fac8bb8dd3 Fix ServiceType -> ServiceItemType change 2009-10-23 23:54:29 +01:00
Jonathan Corwin
ee076e306e First stab at showing ppt output in mini-live-display 2009-10-23 23:47:22 +01:00
Raoul Snyman
90280b7117 Finished up the initial conversion to "trUtf8()" 2009-10-23 20:48:49 +02:00
Tim Bentley
4c35fc81a5 Fix rendering bug 2009-10-23 18:09:09 +01:00
Tim Bentley
6c5ccc101b Font Siziing and rendering improvements 2009-10-23 17:10:09 +01:00
Raoul Snyman
8d4cdc71ba Initial go at i18n 2009-10-23 15:17:43 +02:00
Tim Bentley
67ab01df01 Minor corrections 2009-10-22 20:07:32 +01:00
Tim Bentley
979ba02b02 Add Lines per slide and wrap indentation 2009-10-22 20:03:08 +01:00
Jon Tibble
27d92e9202 Head r617 2009-10-22 14:44:24 +01:00
Jon Tibble
b37b95d928 Rename to ServiceItemType and add Video type 2009-10-22 14:43:49 +01:00
Raoul Snyman
2bf6fe0227 Made the dark->lighter selection colour slightly stronger. 2009-10-21 21:39:55 +02:00
Raoul Snyman
5035f79f50 Started working on a non-UI converter (for web-based import). 2009-10-21 18:11:58 +02:00
raoul.snyman@saturnlaboratories.co.za
adc769fff0 Fix Bible Media manager look and feel
bzr-revno: 615
2009-10-21 05:57:45 +01:00
Raoul Snyman
ee6465d8a5 Made highlight colour slightly lighter/darker than background. 2009-10-20 21:41:15 +02:00
Raoul Snyman
8c3370d803 Fixed up the styling on selected items in the slide controllers. 2009-10-20 19:28:34 +02:00
Tim Bentley
44e57316f2 SlideControler UI fixes - take 3 2009-10-20 18:15:37 +01:00
Tim Bentley
791b38e0ef SlideControler UI fixes - take 2 2009-10-20 18:01:12 +01:00
Tim Bentley
ca96d0fda6 SlideControler UI fixes 2009-10-20 17:33:00 +01:00
Jon Tibble
e37ae62079 Initial video fudging! 2009-10-19 18:51:21 +01:00
Tim Bentley
2f153475f9 General Tab Changes
bzr-revno: 611
2009-10-19 18:31:02 +01:00
Jon Tibble
7f773a314b General fixes
bzr-revno: 610
2009-10-19 18:17:38 +01:00
Tim Bentley
a95f4feb83 Blanked out message now works 2009-10-19 18:14:26 +01:00
Tim Bentley
0bbbf8b6b8 General Tab fixes 2009-10-19 17:18:32 +01:00
Jon Tibble
fc61d7fe55 Fixups 2009-10-19 15:56:44 +01:00
Tim Bentley
2004edf876 Head 2009-10-18 16:14:48 +01:00
Tim Bentley
1cfa0e560b Theme Image and Presentation fixes
bzr-revno: 609
2009-10-18 16:12:28 +01:00
Raoul Snyman
2d8073fcb5 Lighten the gradient of the toolbox titles. 2009-10-18 17:09:09 +02:00
Raoul Snyman
a7eadfc70b Merged lp:~raoul-snyman/openlp/uifixes
bzr-revno: 608
2009-10-18 17:02:58 +02:00
Tim Bentley
2f618d8504 Fix Message popup on windows , load last service 2009-10-18 15:53:04 +01:00
Tim Bentley
efec5e1e95 Backgounds now appear in Theme editor 2009-10-18 08:49:47 +01:00
Tim Bentley
486f5ce709 Head 2009-10-18 07:27:15 +01:00
Raoul Snyman
13305ab6bb Some more UI fixes (mostly for Windows). 2009-10-18 00:06:38 +02:00
Jonathan Corwin
c491a19be8 Merged in lp:~j-corwin/openlp/present
bzr-revno: 607
2009-10-17 22:04:12 +02:00
Tim Bentley
2961a8b020 Head 2009-10-17 20:17:44 +01:00
Raoul Snyman
3e4f07be6e Merge from lp:~raoul-snyman/openlp/uifixes
bzr-revno: 606
2009-10-17 21:14:39 +02:00
Tim Bentley
3c9ffae002 Fix name standards 2009-10-17 20:13:11 +01:00
Jonathan Corwin
2ae79a4480 HEAD 2009-10-17 20:06:06 +01:00
Raoul Snyman
c4c8c36e7f Some spacing fixes. 2009-10-17 20:52:42 +02:00
Raoul Snyman
68f8b1e45f Fixed a bug where a warning was generated about layouts.
Made the media manager items stand out a little more, and enhanced the currently selected one.
2009-10-17 20:41:56 +02:00
Tim Bentley
d5b5549ca0 Head 2009-10-17 19:20:55 +01:00
Tim Bentley
e9800d8ecc Fix theme saving 2009-10-17 19:20:07 +01:00
Raoul Snyman
7607d80254 Merged in lp:~raoul-snyman/openlp/uifixes
bzr-revno: 605
2009-10-17 20:16:27 +02:00
Jon Tibble
f4439200b5 Python 2.5 fixes
bzr-revno: 604
2009-10-17 19:14:49 +01:00
Tim Bentley
7273ff3d2f Display Screen handling improvements 2009-10-17 17:11:41 +01:00
Tim Bentley
1082428926 Show Splash screen option now works 2009-10-17 14:29:01 +01:00
Tim Bentley
7ae0e045d3 Rename Alert menu 2009-10-17 14:17:04 +01:00
Raoul Snyman
f2058a516a Playing around with the look and feel of tabs on the ToolBox 2009-10-17 12:55:28 +02:00
Tim Bentley
0828335939 Bible Plugin - Hide Duel verse Combo be default 2009-10-17 07:12:38 +01:00
Tim Bentley
025d7c86d2 Songs Plugin get search as you type 2009-10-17 06:47:17 +01:00
Jonathan Corwin
bb619ce325 Show powerpoint slide thumbnails in slidecontroller 2009-10-17 00:34:56 +01:00
Jon Tibble
770751899c Fix urlopen() and mainDisplay closing 2009-10-16 22:29:38 +01:00
Raoul Snyman
a35d205cea Reducing spacing on media manager items. 2009-10-16 20:41:41 +02:00
Tim Bentley
cbb17039d5 Fix missing serviceitem handling 2009-10-16 19:22:14 +01:00
Tim Bentley
0f54bb81e7 Save Theme import directory 2009-10-16 05:46:32 +01:00
Tim Bentley
aa1830c0b6 head 2009-10-14 19:29:06 +01:00
Tim Bentley
fa6cb6020a fixes from merge 2009-10-14 19:27:44 +01:00
Raoul Snyman
db47de92ad Added in a line to fix the logging. 2009-10-14 19:52:50 +02:00
Tim Bentley
1bca1cf4cf More bible changes 2009-10-14 06:08:36 +01:00
Tim Bentley
0273fd508f Fix Logging exception in check_version 2009-10-13 20:24:27 +01:00
Tim Bentley
cc71923682 Bible plugin clean up and Quick web setup 2009-10-12 11:18:54 +01:00
Tim Bentley
4a1b826e66 Cleanups 2009-10-12 07:21:17 +01:00
Tim Bentley
d0b501bd2f Fixes to last merge request 2009-10-12 05:43:02 +01:00
Tim Bentley
7ee0549df2 Small fix ups and corrections. Plugin list obeys can_be_diabled 2009-10-11 20:31:46 +01:00
Tim Bentley
7431eeb65c Servie Manager DnD part 2 2009-10-11 10:31:27 +01:00
Tim Bentley
aa0450f543 Servie Manager DnD part 1 2009-10-11 08:30:16 +01:00
Tim Bentley
d74b9f6d16 Quick code cleanup and fix test for version checking 2009-10-11 07:29:25 +01:00
Tim Bentley
56930f1e65 Correct Theme name for Export if default 2009-10-11 07:25:37 +01:00
Tim Bentley
f53a6fddeb Latest Version checking added 2009-10-11 06:47:38 +01:00
Tim Bentley
268aadde4c Theme improvements 2009-10-10 19:36:58 +01:00
Tim Bentley
08aec01ce2 Remove all print statements 2009-10-10 15:06:59 +01:00
Tim Bentley
018d217b61 Plugins now hide and reappear correctly 2009-10-10 14:39:32 +01:00
Tim Bentley
3915fc24f1 Head 2009-10-10 14:14:09 +01:00
Tim Bentley
4f1241e60f More hiding changes 2009-10-10 14:13:57 +01:00
Raoul Snyman
855174ce3e Merged in lp:~raoul-snyman/openlp/pluginlist
bzr-revno: 594
2009-10-10 14:10:05 +02:00
Tim Bentley
444e1796cf Head 2009-10-10 05:56:25 +01:00
Tim Bentley
25c730a8f2 More dock hiding work 2009-10-10 05:56:06 +01:00
Jon Tibble
75af51b460 Song theme fix and remove unused variables 2009-10-09 23:46:35 +01:00
Raoul Snyman
7d2a7dda4c Fixed up a bug that caused Active/Inactive inconsistencies. 2009-10-08 21:58:49 +02:00
Raoul Snyman
0c0bc504ac Removed a lone debug. 2009-10-08 21:37:14 +02:00
Raoul Snyman
87b12a1e27 Fixed up lines so that compileall will work. 2009-10-08 21:34:40 +02:00
Raoul Snyman
b4c81a3153 Removed the old plugin list dialog. 2009-10-08 21:17:24 +02:00
Tim Bentley
5d32ce5e66 More cleanups, Bibles and media done 2009-10-08 06:02:39 +01:00
Tim Bentley
85a0c245ea Clean up disenablement 2009-10-07 17:16:21 +01:00
Tim Bentley
34062ab7b9 New file 2009-10-07 06:10:06 +01:00
Tim Bentley
cfc82e7407 Cleanup hinding code and move to disable for now 2009-10-07 06:09:35 +01:00
Raoul Snyman
317fc7875c Reworked the plugin list dialog. 2009-10-06 23:07:12 +02:00
Tim Bentley
9a8c045f2b Add Ability to hide plugins
bzr-revno: 587
2009-10-05 16:14:48 +01:00
Tim Bentley
9325ed0521 Head 2009-10-04 16:01:11 +01:00
Tim Bentley
582dd56ed2 Fix int issue 2009-10-04 16:00:52 +01:00
Jonathan Corwin
1cf3c9a223 Support blank/first/last buttons in presentations 2009-10-03 20:18:59 +01:00
Tim Bentley
b94d1d1b8f Sort out Settings tab items 2009-10-03 20:02:40 +01:00
Tim Bentley
39a9f8efac Media Itmes now hide them selves correctly 2009-10-03 19:39:44 +01:00
Tim Bentley
c4f8fc86cd Sort out Initialistion order and Plugin Status code 2009-10-03 14:08:18 +01:00
Tim Bentley
9ec94494e8 Audit can now be disabled dynamically 2009-10-03 12:07:58 +01:00
Tim Bentley
37a9b5fb4e Plugin List Combo boxhandling finished 2009-10-03 08:25:41 +01:00
Tim Bentley
0408a0a320 Start of Active / Inactive work 2009-10-02 20:06:07 +01:00
Tim Bentley
e25c9937c7 Update UI 2009-10-02 15:19:36 +01:00
Tim Bentley
6c3fd8b096 Sort out text display on dialog 2009-10-02 14:50:45 +01:00
Tim Bentley
1a8ad648ad head 2009-10-02 13:18:21 +01:00
Tim Bentley
9741d0e10a More Plugin list work 2009-10-02 13:16:54 +01:00
Jon Tibble
6d00aef525 Dialogs, Exceptions and Toolbars
bzr-revno: 584
2009-10-02 12:50:57 +01:00
Jon Tibble
ce18ee8e7a Dialogs, Exceptions and PushButtons 2009-10-02 00:43:16 +01:00
Tim Bentley
e0f28ce493 Plugin abouts 2009-10-01 17:56:42 +01:00
Tim Bentley
5185578f24 Fix order of names 2009-09-29 18:18:18 +01:00
Tim Bentley
9efa28ce07 Head 2009-09-29 18:05:34 +01:00
Jon Tibble
b2827d4e25 Use standards for Qt imports 2009-09-29 13:51:38 +01:00
Tim Bentley
a175216cd5 Add comments to correct layout 2009-09-29 05:58:26 +01:00
Tim Bentley
aeba391642 Add Jon to about 2009-09-29 05:51:38 +01:00
Jon Tibble
1a7ad33bf9 Use buildIcon and general fixes all over 2009-09-29 03:54:32 +01:00
Tim Bentley
b11a068a8f Inspired by Jon 2009-09-28 21:45:04 +01:00
Tim Bentley
9ff310eebe Cleanups 2009-09-27 13:56:14 +01:00
Tim Bentley
9c4e5ae137 General cleanups Jon missed 2009-09-26 19:22:10 +01:00
Tim Bentley
6637f88892 Plugin updates
bzr-revno: 574
2009-09-26 13:10:41 +01:00
Tim Bentley
2c64f1186a Plugin standardisation and clanups 2009-09-26 10:11:39 +01:00
Tim Bentley
9f04b6f478 More audit changes and dynamic image backgrounds 2009-09-26 07:46:26 +01:00
Jon Tibble
8a44484aee Fix None testing and general cleanups 2009-09-26 00:06:54 +01:00
Jon Tibble
8777ca29a7 Import fixes 2009-09-25 15:13:33 +01:00
Jon Tibble
e5db2456e7 Remove unused imports 2009-09-25 01:43:42 +01:00