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
a71505a10c
Bible can add verses to service item
2010-03-17 19:09:09 +00:00
Tim Bentley
13608bedae
Alter form removal complete
2010-03-17 19:04:39 +00:00
Jon Tibble
a81c39ca65
Import fix
2010-03-16 21:13:23 +00:00
Tim Bentley
60a3468edb
remove alert dialog
2010-03-16 21:03:10 +00:00
Jon Tibble
ed370650f8
Head r744
2010-03-16 20:58:34 +00:00
Jon Tibble
98a5dcd1b4
Some head
2010-03-16 20:57:57 +00:00
Raoul Snyman
dc6c6bec31
- Removed commented code (just for you, TRB143!)
...
- Removed any non-alphanumeric character for Bible names, just to be safe, since we don't actually use the filenames anymore.
2010-03-16 22:43:41 +02: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
Raoul Snyman
c63c09017e
Merge to head.
2010-03-16 21:47:48 +02:00
Raoul Snyman
9044ed3a4a
Fixed a bug where Bible names were being used for file names, and causing issues on various operating systems.
2010-03-16 21:46:19 +02:00
Raoul Snyman
223393e38b
Fix a problem introduced per ongeluk.
2010-03-15 21:23:07 +02:00
Raoul Snyman
1835a922e5
Merged in some translation fixes.
...
bzr-revno: 743
2010-03-15 20:54:09 +02:00
Raoul Snyman
90d2282e08
First attempt at fixing the Bible file name issue.
2010-03-15 20:47:07 +02:00
Jon Tibble
366fe2f508
Head r742 and import fix
2010-03-14 23:22:44 +00:00
Tim Bentley
ba21b15214
Fix blank screen color
...
Fix save and cancel of services
Fix tool shortcut
add a filter to the save dialog - "OpenLP Service Files (*.osz)
bzr-revno: 742
2010-03-14 18:00:56 +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
d0f3322aa5
Fix ServiceManager drag and drop`
...
Fix rendering size issues
Fix screen sizes following display changes
bzr-revno: 741
2010-03-14 14:36:48 +00:00
Tim Bentley
df8ffa53b2
Fix DND for service items
2010-03-14 07:56:39 +00:00
Raoul Snyman
5d8c1e42ba
Fixed up an error in the Bibles plugin where OpenSong imports would be programmatically canceled.
2010-03-14 00:35:17 +02:00
Raoul Snyman
7da00bc26f
Attempt to get Bibles to work properly.
...
Merge from HEAD
2010-03-13 23:48:04 +02: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
Tim Bentley
601abab854
Text string fixes
...
bzr-revno: 739
2010-03-13 13:02:50 +00:00
Jon Tibble
af74e1d295
Head r738
2010-03-13 12:11:44 +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
Raoul Snyman
881c4cea18
Fixed locations to use the AppLocation class.
2010-03-12 23:55:52 +02: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
Tim Bentley
80da6c5c61
Head
2010-03-12 16:55:21 +00:00
Tim Bentley
4c9bd6d34b
Fix text
2010-03-12 16:55:01 +00:00
Raoul Snyman
c7c1a9c06a
Added icons for:
...
- Blank Screen
- Show Desktop
- Show Theme Background
2010-03-12 17:38:56 +02:00
Tim Bentley
cd873b9196
add full stops
2010-03-12 07:31:59 +00:00
Tim Bentley
2607d23c00
String more strings and song edit error
2010-03-11 21:01:19 +00:00
Tim Bentley
68287b9604
String fixes
2010-03-11 19:28:49 +00: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
Jonathan Corwin
9308669ec5
Fix issues regarding the blank button for presentations and added methods to extract presentation text and notes for use in the future.
...
bzr-revno: 733
2010-03-11 13:43:22 +02: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
Raoul Snyman
142f679098
Fix "red letter" versions of Crosswalk Bibles.
2010-03-11 08:15:29 +02:00
Jonathan Corwin
bfee664c94
fixes
2010-03-10 23:00:48 +00:00
Jonathan Corwin
1613610853
Good idea to test conflict resolutions before committing
2010-03-10 22:32:27 +00:00
Jonathan Corwin
99a963e509
Head
2010-03-10 22:28:19 +00:00
Jonathan Corwin
d48046c0c3
Blanking issues
2010-03-10 22:24:09 +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
47bf6252bb
Head 728
2010-03-09 18:49:28 +00:00
Tim Bentley
0b1ce89017
Fix translation
2010-03-09 18:19:58 +00:00
Raoul Snyman
0ef8005b52
Fixed up some problems and inadvertant bugs from the move to the scripts directory.
2010-03-09 08:07:42 +02: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
88289475ec
Head 724
2010-03-06 08:01:30 +00:00
Tim Bentley
1932ed886e
Fix up service notes
2010-03-06 08:00:36 +00:00
Jonathan Corwin
a33a6d53ca
coding standards
2010-03-05 22:10:53 +00:00
Jon Tibble
d4b77873fb
Head r724
2010-03-05 21:54:29 +00:00
Jonathan Corwin
edad400a73
Minor fixes
2010-03-05 19:50:51 +00:00
Jonathan Corwin
851f5a4e47
head
2010-03-05 19:39:30 +00:00
Raoul Snyman
250fb09737
Merged head in.
2010-03-05 20:37:52 +02:00
Tim Bentley
56f8d3befb
Cleaned up logging code
...
Added code to stop themes in use being deleted
Added Service Notes to service items
Fixed ServiceManager context menu so it works based on the item selected
Various minor bug fixes
Fix up bug for Theme savings and OOS
bzr-revno: 723
2010-03-05 13:27:42 +00: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
Jonathan Corwin
77838615b3
Presentations - close app down correctly, and mode to automatically detect file type
2010-03-05 08:36:32 +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
Raoul Snyman
977e896a21
Create the config directory if it doesn't exist yet, in order to save the log file.
...
bzr-revno: 722
2010-03-04 21:47:17 +02:00
Tim Bentley
9ada2f00b0
Theme Deletes only work for unused themes
2010-03-04 19:03:09 +00:00
Jon Tibble
132022205e
None tests redux
2010-03-04 18:43:53 +00:00
Jon Tibble
0baa0e6884
Head r721
2010-03-04 18:34:53 +00:00
Tim Bentley
bb0a3f7293
Head 721
2010-03-03 17:51:19 +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
Raoul Snyman
e0acec1274
A fix to the OSIS importer, and added the version file.
...
bzr-revno: 721
2010-03-03 15:28:14 +02:00
Raoul Snyman
98cd78c7b2
Merged to head.
2010-03-03 12:19:01 +02:00
Jonathan Corwin
5863541a61
Split live/preview presentation documents, plus fixes for Windows
...
bzr-revno: 720
2010-03-03 08:28:39 +02:00
Jonathan Corwin
aa5f21b50d
Live/Preview presentation changes for Windows
2010-03-02 23:15:13 +00:00
Jonathan Corwin
743ae230a8
Split live/preview presentation documents
2010-03-02 21:01:23 +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
Raoul Snyman
e37ab565ad
A fix to the OSIS importer, and added the version file.
2010-02-28 22:50:14 +02:00
Jon Tibble
0c97973469
Head r718
2010-02-27 19:29:57 +00: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
065986c33c
Automate Media type list from phonon
2010-02-27 14:57:33 +00:00
Tim Bentley
86e03f0c11
Move editing to line 2
2010-02-27 10:10:03 +00:00
Tim Bentley
1979f24502
Fix song editing where text is lost
2010-02-27 09:55:44 +00:00
Tim Bentley
4a83e572e9
Fix bugs in last merge and fix comments
2010-02-27 09:18:26 +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
Tim Bentley
8e2efcb183
Fix spelllling
2010-02-23 19:19:06 +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
Jonathan Corwin
357c1e6a20
A few more small presentation fixes/cosmetics.
...
bzr-revno: 708
2010-02-19 21:38:56 +02:00
Jonathan Corwin
cf62d6187f
More presentation fixes/tidies
2010-02-17 22:57:59 +00:00
Tim Bentley
516b05e0ad
Fix URF8, copyright and alert error
2010-02-17 20:17:33 +00:00
Jon Tibble
711bd3cf00
Import fixes and copyright insertion
2010-02-17 19:13:04 +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
Jonathan Corwin
959c2469a5
Fix PowerPoint and PowerPoint viewer screen lookup
2010-02-16 22:28:35 +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
04d79f72a1
Fix typos
2010-02-16 18:51:41 +00:00
Tim Bentley
e0b7c54ddc
Minor fixes and unicode changes
2010-02-16 18:47:26 +00:00
Tim Bentley
fef8986550
Fix theme import bug
2010-02-16 17:40:41 +00:00
Tim Bentley
2fefcef09d
Alerts editing now work - history and pre determined
2010-02-14 20:19:57 +00:00
Tim Bentley
acc97f3c79
Alerts now have history
2010-02-14 13:27:32 +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
8240605839
Head r702
2010-02-09 12:20:56 +00:00
Jon Tibble
6dfa580613
r701
2010-02-09 12:20:16 +00:00
Tim Bentley
be4c40b401
Cleaner fix
2010-02-09 11:20:19 +00:00
Tim Bentley
fc9b8fcdad
fix presentation import values
2010-02-09 08:28:34 +00:00
Tim Bentley
18760262ab
Edit Cancel updating song by accident
2010-02-07 20:11:37 +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
Tim Bentley
8992f410a5
Bible fixes part 2
2010-02-06 16:51:18 +00:00
Jon Tibble
f30136924f
Head r700 and import fixes
2010-02-06 16:23:47 +00:00
Tim Bentley
f5229ffaa4
Bible fixes
2010-02-06 15:33:23 +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
Raoul Snyman
bd4d2daa74
Removed now unnecessary file.
2010-02-06 15:23:38 +02:00
Raoul Snyman
f81968e62b
Mis-named variable in QuickSearch click.
2010-02-06 15:22:26 +02:00
Raoul Snyman
92ef1f0d57
Fixed multi-verse dual bible.
2010-02-06 15:05:45 +02:00
Raoul Snyman
cf95b81a49
Last few fixes
2010-02-06 12:42:47 +02:00
Tim Bentley
a5dc0bd75d
Set plugins up for alpha release
2010-02-06 10:33:33 +00:00
Raoul Snyman
78c525ab76
Moved data for web bibles to am SQLite database.
2010-02-06 12:22:20 +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
Raoul Snyman
ce6738a976
Fixed up searching for non-latin characters in Bible book names.
...
Removed an annoying exception to do with debug logging.
2010-02-04 21:34:12 +02:00
Tim Bentley
079c9a4679
Key handling changes
2010-02-04 19:25:32 +00:00
Raoul Snyman
e465264630
Standardised manager name to "manager"
2010-02-04 19:38:21 +02:00
Tim Bentley
5838495bb4
Update remote client
2010-02-03 18:53:31 +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
Tim Bentley
377f3ad6ea
Put the messagelistener back
2010-02-01 20:06:50 +00:00
Tim Bentley
17a08e3847
latest hacking
2010-02-01 19:42:52 +00:00
Raoul Snyman
01ec0f407f
Fixed up some of the Bible loading
2010-01-31 22:36:54 +02:00
Raoul Snyman
db534dc2e8
Removed signals while they're still not working.
2010-01-31 21:51:23 +02:00
Raoul Snyman
2b5ddb13a4
An attempt to fix the problems some folks are having.
2010-01-31 21:49:01 +02:00
Raoul Snyman
ab7125c98e
Make the progress bar only pop up when we *actually* fetch a verse from the Internet
2010-01-30 10:42:03 +02:00
Raoul Snyman
d45a9733af
Fixed a bug in Windows and other versions of PyQt4 where "setProperty" was not available. Changed it to "setValue" which is what it's meant to be anyways.
2010-01-30 00:26:30 +02:00
Raoul Snyman
baabcba290
Changed the value of the progress bar to look a little more "active"
2010-01-29 23:35:02 +02:00
Raoul Snyman
0cbb079aa3
Added the little progress bar back in.
2010-01-29 23:26:24 +02: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
04d7a9227e
Automate Presentation filters
2010-01-29 11:59:13 +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