Andreas Preikschat
1da64528f5
removed the ZIP support for the OpenSong importer (bug #795027 )
...
bzr-revno: 1688
Fixes: https://launchpad.net/bugs/795027
2011-07-17 13:34:33 +02:00
Andreas Preikschat
47e43404aa
- added doctype to html
...
- added encoding to html
- changed <br /> to <br>
- removed obsolete language attribute
2011-07-16 11:00:30 +02:00
Andreas Preikschat
b51f9b2a0c
- do not set a service modified when using the up/down arrows to change the selected service item
...
- only set the service modified when an item is selected while using the 'move button' and 'delete button'
2011-07-16 09:20:13 +02:00
Andreas Preikschat
69b0f264d0
r1686
2011-07-15 20:34:08 +02:00
Andreas Preikschat
bc5d2cce46
removed zip support for OpenSong importer
...
Fixes: https://launchpad.net/bugs/795027
2011-07-15 20:18:11 +02:00
Jon Tibble
40d31106b3
Head r1686
2011-07-14 19:42:38 +01:00
Andreas Preikschat
822db59c4f
- use map instead of list comprehension
...
- make some instance variables (in connection with re) constants
- removed some blank lines
bzr-revno: 1686
2011-07-14 17:20:25 +01:00
Tim Bentley
72cd870e48
Fix 1.9.6 String errors
...
bzr-revno: 1685
2011-07-14 17:18:23 +01:00
Jon Tibble
42acff98ab
Unused import
2011-07-13 22:00:35 +01:00
Tim Bentley
f1cf256d99
Fix
2011-07-13 18:41:37 +01:00
Andreas Preikschat
b98e36aff2
regex clean ups
2011-07-13 15:32:19 +02:00
Jon Tibble
8d4369adb8
Head r1684
2011-07-12 20:06:37 +01:00
Andreas Preikschat
84d1a0d35d
- Fixed bug #805082
...
- Removed trailing "Help"
bzr-revno: 1684
2011-07-12 16:49:19 +02:00
Jon Tibble
a5dedf5b8e
Head 1683
2011-07-11 19:35:20 +01:00
Tim Bentley
b83048ff4e
Fix outstanding strings in Error for translations
...
Fixes: https://launchpad.net/bugs/796440
2011-07-11 17:32:25 +01:00
Tim Bentley
d58ed2da56
Add visual button to status bar for Song usage active / inactive and connect to F4 button.
...
Code cleanups
bzr-revno: 1682
2011-07-10 16:04:55 +01:00
Tim Bentley
2bf6dbafeb
Improve ServiceManager tool tips to include theme.
...
Fix change of theme in servicemanager to allow live to be updated.
bzr-revno: 1681
Fixes: https://launchpad.net/bugs/806829 , https://launchpad.net/bugs/806834
2011-07-10 16:03:47 +01:00
Tim Bentley
77a055a304
Head
2011-07-10 13:07:10 +01:00
Tim Bentley
7d21d45764
missing :
2011-07-10 13:02:58 +01:00
Tim Bentley
4651ec35b6
Fixes
2011-07-10 12:59:23 +01:00
Andreas Preikschat
50bc672f59
removed the trailing 'help'
2011-07-10 12:52:30 +02:00
Andreas Preikschat
3c63ffd4a6
fixed bug 805082
...
Fixes: https://launchpad.net/bugs/805082
2011-07-10 12:45:52 +02:00
Tim Bentley
dd302537ec
Fix code
2011-07-10 07:58:15 +01:00
Tim Bentley
e9fb8e59c1
Allow service item themes to change and be added back to slide controller
...
Break object link between saved item in slide controller and service manager.
Fixes: https://launchpad.net/bugs/806829
2011-07-09 08:43:35 +01:00
Tim Bentley
cf9355d725
Add some formatting
2011-07-09 07:03:52 +01:00
Tim Bentley
b94115d4b2
Amend tooltips so show theme for service item if present.
...
Fixes: https://launchpad.net/bugs/806834
2011-07-08 21:55:18 +01:00
Tim Bentley
f264cc4c4e
correct tooltip text
2011-07-08 16:07:53 +01:00
Andreas Preikschat
2c2000f488
r1680 + conflicts
2011-07-08 15:20:14 +02:00
Raoul Snyman
b4358a2005
Fixed bug #794971 by typecasting the title and lyrics fields to unicode objects if they are buffer objects.
...
bzr-revno: 1679
2011-07-08 14:53:36 +02:00
Raoul Snyman
2ddcd717bf
Fixed bug #803031 : If UTF-8 decoding fails, try the standard Windows codepage.
...
bzr-revno: 1678
2011-07-08 14:52:36 +02:00
Andreas Preikschat
5ff8d9d326
- small image queue fix
...
- refactoring
bzr-revno: 1677
2011-07-08 14:41:44 +02:00
Tim Bentley
5efe717137
Head
2011-07-08 08:46:25 +01:00
Stevan Pettit
6a612ee107
Modified slidecontroller to change loop button icons and captions when user select a loop to run.
...
Lines 1060-1061 and 1081-1082 cover the case if the user uses the dropdown to change the loop type (continuous or once)
Added the translated button captions to ui.py
in slidecontroller, changed Qicon to build_icon
bzr-revno: 1676
2011-07-08 07:41:30 +01:00
Raoul Snyman
5581a74034
Changed typecast to rather check for buffer.
2011-07-08 08:40:50 +02:00
Raoul Snyman
897f7a7dbb
Fixed bug #794971 : Typecast the buffer object to a unicode object.
2011-07-08 08:31:34 +02:00
Tim Bentley
1a611dcd60
Add tooltip
2011-07-08 07:03:09 +01:00
Raoul Snyman
ce1abaf332
Fixed bug #803031 : If UTF-8 decoding fails, try the standard Windows codepage.
2011-07-08 07:57:39 +02:00
Jon Tibble
1ec41056ca
Head r1675
2011-07-07 22:24:22 +01:00
Jon Tibble
1899961965
Long lines
2011-07-07 22:22:41 +01:00
Tim Bentley
d02ee451f2
Add ability to clone a song with a full copy of it.
...
Add missing build_icon and line wrap error.
Slow down event generation to stop flood of messages which crash the system. UI does not notice the change.
Changes for 795980 also included
bzr-revno: 1675
Fixes: https://launchpad.net/bugs/795980 , https://launchpad.net/bugs/752374 , https://launchpad.net/bugs/763583
2011-07-07 21:14:12 +01:00
Jon Tibble
3ab1c606e5
Head r1674
2011-07-07 19:04:26 +01:00
Jon Tibble
623b56742c
Cleanups
2011-07-07 19:03:12 +01:00
Stevan Pettit
856d44270f
Changed use of Qicon to build_icon in slidecontroller
2011-07-07 13:38:13 -04:00
Tim Bentley
37fdcc62a4
Fix comment
2011-07-07 18:03:38 +01:00
Andreas Preikschat
f7ab82518b
doc
2011-07-07 17:37:43 +02:00
Stevan Pettit
1ffd5713b0
Modified slide controller to change loop button icons when selecting slide loops
2011-07-07 11:23:55 -04:00
Andreas Preikschat
2b419d8a4e
implementation fix: set priority to low instead of lowerest when the image was requested
2011-07-07 17:15:48 +02:00
Andreas Preikschat
3e8c91cbd5
refactor some code
2011-07-07 16:53:05 +02:00
Andreas Preikschat
b68751835f
r1673
2011-07-06 16:00:32 +02:00
Benny
1876d520ae
review fixes
2011-07-05 14:00:34 +02:00
Benny
6436b05240
changes from review (cosmetic & regex performance)
2011-07-05 12:50:55 +02:00
Benny
ae8ac35d2c
merge head
2011-07-05 01:02:49 +02:00
Benny
3c0c9c5b78
EasyWorship importer: some work to create more reasonable verse numbers if EW tags are missing or without numbers
2011-07-05 00:55:57 +02:00
Benny
4bf45ad2de
ewimport: workaround for RTF stripping bug
2011-07-04 22:51:43 +02:00
Tim Bentley
b2b8dd1d4d
Extra fix
2011-07-03 19:33:04 +01:00
Tim Bentley
4d82e55ca0
Correct code
2011-07-03 18:45:48 +01:00
Tim Bentley
1c454b606f
Fix fullstop and add icon
2011-07-03 13:43:31 +01:00
Tim Bentley
2a73f1b188
Prevent Images and Media backgrounds being added when No service Item is present in the live controller.
...
Fixes: https://launchpad.net/bugs/795980
2011-07-03 09:13:48 +01:00
Tim Bentley
222d4c228c
Method fix
2011-07-03 06:43:32 +01:00
Tim Bentley
091cdbbc24
Slow down slidecontroller events to allow buffers to clear.
...
Line wrap incorrect and fix object name
Fixes: https://launchpad.net/bugs/752374
2011-07-02 07:48:17 +01:00
Tim Bentley
6a259e0489
Correct build icon
2011-07-02 06:51:03 +01:00
Benny
bc808ade93
EasyWorshipSongImport: use tag from previous slide for slides without tag, fix regex for notes
2011-07-02 00:45:27 +02:00
Tim Bentley
219218161b
6am spelling fix
2011-07-01 17:59:56 +01:00
Tim Bentley
bddf91ddcb
Add ability to clone songs
...
Amend framework for plugins to add non toolbar context items
Fixes: https://launchpad.net/bugs/763583
2011-07-01 17:55:07 +01:00
Andreas Preikschat
418c3b9c18
- use the functions context_menu_action and context_menu_separator from core/lib/ui
...
bzr-revno: 1672
2011-07-01 10:26:26 +02:00
Raoul Snyman
dcd10f0b8f
A couple of minor UI tweaks.
...
bzr-revno: 1671
2011-07-01 10:09:36 +02:00
Tim Bentley
43f4b30d02
Head
2011-06-30 20:00:03 +01:00
Tim Bentley
0b41274f8e
Fix up button
2011-06-30 19:59:51 +01:00
Andreas Preikschat
a60fc8ea23
- When creating/editing a custom slide give the title edit the focus (and not only when creating a new)
...
- fixed long lines
- simplification
bzr-revno: 1670
2011-06-30 16:59:30 +02:00
Andreas Preikschat
54f8ae82e7
- improved collapse/expand all buttons in the service manager
...
bzr-revno: 1669
2011-06-30 16:57:42 +02:00
Andreas Preikschat
deddee5668
- fixed theme copy
...
bzr-revno: 1668
2011-06-30 16:56:55 +02:00
Stevan Pettit
ab993842ff
Added code to create a main window menu item to display the Windows help file (openlp.chm) if it exists on the users machine:
...
- If it exists, F1 will display the local file, Alt-F1 will display the online help.
- If the help file does not exist, F1 will display the Online help (as it currently does).
bzr-revno: 1667
2011-06-30 09:48:20 +02:00
Tim Bentley
870d0b51e9
Move SongUsage active to toolbar
2011-06-29 22:04:08 +01:00
Benny
306826bbeb
merge with trunk
2011-06-29 21:33:48 +02:00
Benny
5df77e4ed6
Easyworship importer: improved recognition of slide divisions
...
merged with trunk
2011-06-29 21:26:14 +02:00
Stevan Pettit
97a76369bf
Changed Windows test to os.name
2011-06-29 13:30:53 -04:00
Tim Bentley
b77094beb6
Head
2011-06-29 17:11:37 +01:00
Tim Bentley
143e697281
Add middle splitter
2011-06-29 17:11:19 +01:00
Stevan Pettit
0612a93964
Changed helpfile check to Windows condition check. Modified build script to create OpenLP.chm
2011-06-29 10:42:14 -04:00
Andreas Preikschat
c2fb73dde6
do not regenerate all service items when collapsing/expanding all items
2011-06-29 16:28:10 +02:00
Andreas Preikschat
6980299697
use help function
2011-06-29 11:23:42 +02:00
Andreas Preikschat
6e3343c606
fixed theme copy
2011-06-29 11:08:53 +02:00
Andreas Preikschat
bb5d8f74c4
r1665
2011-06-29 10:04:55 +02:00
Andreas Preikschat
8bb96b97bf
- When creating/editing a custom slide give the title edit the focus (and not only when creating a new)
...
- fixed long lines
- simplification
2011-06-29 10:04:14 +02:00
Andreas Preikschat
95743de19f
more html fixes
2011-06-29 09:38:04 +02:00
Andreas Preikschat
795aae2277
r1665
2011-06-29 09:27:38 +02:00
Stevan Pettit
a0e0746ed8
- Ask for delete confirmation when attempting to delete custom slide(s)
...
- Changed dialog heading to "Confirm Delete"
bzr-revno: 1665
2011-06-29 08:53:15 +02:00
Tim Bentley
30df723358
Fixes
2011-06-29 07:12:32 +01:00
Stevan Pettit
da45d09e48
Moved delete dialog heading translate to ui.py
2011-06-28 16:35:28 -04:00
Raoul Snyman
486a427794
Minor UI tweaks.
2011-06-28 21:24:29 +02:00
Stevan Pettit
334bf4ab44
Changed dialog heading. Changed Songs delete confirm to match Custom Slides
2011-06-28 15:05:05 -04:00
Tim Bentley
a167f6ef86
Make progressbar smaller
2011-06-28 17:40:17 +01:00
Tim Bentley
75550b505b
Save Controller Toolbars
...
Fixes: https://launchpad.net/bugs/765239
2011-06-28 17:35:50 +01:00
Tim Bentley
70709e9b12
Add ability to lock toolbar
...
bzr-revno: 1664
2011-06-28 17:12:41 +01:00
Stevan Pettit
f14fa78081
Modified delete message and dialog buttons
2011-06-28 09:29:36 -04:00
Stevan Pettit
c363165925
Removed some whitespace
2011-06-28 00:59:26 -04:00
Stevan Pettit
231c47db53
Remove settings for confirm delete
2011-06-28 00:52:46 -04:00
Tim Bentley
2d60f3842a
review comment
2011-06-27 16:56:48 +01:00
Tim Bentley
372dcedb88
Head
2011-06-27 16:54:21 +01:00
Andreas Preikschat
86c0eea473
changed theme_manager to themeManager as it is Qt based
2011-06-27 13:51:25 +02:00
Andreas Preikschat
74d2b2d25c
replaced <br> by <br />
2011-06-27 13:44:57 +02:00
Andreas Preikschat
e50ca971d6
change queue name; remove image from queue when deleted from cache
2011-06-27 13:28:58 +02:00
Andreas Preikschat
efe256c42a
r1662
2011-06-27 10:57:19 +02:00
Andreas Preikschat
c1e4ff0231
- removed not needed lists
...
- some translation fixes
- remove close button on print dialog
bzr-revno: 1662
2011-06-27 10:32:41 +02:00
Andreas Preikschat
7ac53156fb
When you copy a theme the suggested theme name will be 'Copy of <theme name>'
...
bzr-revno: 1661
2011-06-27 10:31:16 +02:00
Andreas Preikschat
c92e292518
- now you can resize the display tag dialog
...
- changed the column widths
- make sure we always use the space available
- scroll to the bottom when adding a new tag
bzr-revno: 1659
2011-06-27 10:26:15 +02:00
Stevan Pettit
f7f20f9722
Add link to Windows help file from main window
2011-06-27 00:05:25 -04:00
Andreas Preikschat
943f2e1cb2
rearranged lines
2011-06-26 21:34:01 +02:00
Andreas Preikschat
f2a243cfb4
change theme name to 'Copy of <theme name>' when copying a theme
2011-06-26 19:33:22 +02:00
Andreas Preikschat
a05d9098ef
- removed not needed code
...
- some translation fixes
- remove close button on print dialog
2011-06-26 18:15:13 +02:00
Andreas Preikschat
ee985fde7d
fixed margin; scroll to the bottom when adding a new tag
2011-06-26 16:37:38 +02:00
Andreas Preikschat
cd3798573a
improved display tag dialog resizing
2011-06-26 16:12:19 +02:00
Tim Bentley
217510281c
Fix comments
2011-06-26 07:49:10 +01:00
Andreas Preikschat
a077d83000
fixed saving 'Setup' mode shortcut
2011-06-26 07:58:29 +02:00
Andreas Preikschat
f979233787
renamed method
2011-06-25 21:37:23 +02:00
Andreas Preikschat
b1b29e9abf
comment fix
2011-06-25 08:20:02 +02:00
Andreas Preikschat
1730f5a99f
added new priority and fixed comments
2011-06-25 07:34:07 +02:00
Andreas Preikschat
356ea8fff8
- added an 'intelligent' image queue with priorities
...
- resize image in the thread
- change instances variables (based on qt)
2011-06-25 06:42:49 +02:00
Tim Bentley
94aae25333
1.9.6
2011-06-24 20:15:16 +01:00
Raoul Snyman
e6cab2ce84
Fixed bug #791050 by hiding and then showing the toolbar.
...
bzr-revno: 1657
2011-06-24 14:25:31 +02:00
Raoul Snyman
509f739684
Fixed bug #791050 by hiding and then showing the toolbar.
2011-06-24 08:53:56 +02:00
Jonathan Corwin
4e216bdd13
Indent
2011-06-24 00:05:06 +01:00
Jonathan Corwin
d58682ad6b
SOF UNO constants too
2011-06-23 23:53:24 +01:00
Jonathan Corwin
e1dc332be4
Trap meta key combinations for bug 743273. (Tested with Win key on Windows, don't have OS-X to test CMD key)
2011-06-23 23:30:56 +01:00
Jonathan Corwin
212103ce7b
Some uno constants missing on some systems
2011-06-23 23:26:36 +01:00
Raoul Snyman
fd1f4265ed
Fix bug #801000 where Enchant falls over in one or two situations where there is no locale set or it encounters some other problem and generates a generic Error.
...
bzr-revno: 1655
Fixes: https://launchpad.net/bugs/801000
2011-06-23 22:04:40 +02:00
Raoul Snyman
fb320569cf
Half of bug #795068 fixed. Just figured I might as well get this in before the release.
...
bzr-revno: 1654
Fixes: https://launchpad.net/bugs/795068
2011-06-23 22:02:03 +02:00
Andreas Preikschat
39caaca8d9
comment fixes
2011-06-23 16:34:43 +02:00
Andreas Preikschat
4d20334cce
changed instance variable to camelCase as the class is Qt based
2011-06-23 15:32:32 +02:00
Raoul Snyman
1d648f9df6
Removed commented line.
2011-06-23 15:27:06 +02:00
Raoul Snyman
114412e169
Fix bug #801000 where Enchant falls over in one or two situations where there is no locale set or it encounters some other problem and generates a generic Error.
2011-06-23 07:26:20 +02:00
Andreas Preikschat
25fcdc2600
r1652
2011-06-22 21:23:21 +02:00
Jonathan Corwin
cb60e6e9ef
1. In the import wizard, if user goes back and next again, ensure a disabled button stays disabled.
...
2. Check for missing attributes in the easislides import XML
bzr-revno: 1652
2011-06-21 22:09:33 +01:00
Jonathan Corwin
6be7a1e06e
When the maindisplay has a parent, the Phonon video only shows a white screen. Remove the parent and the video works again. This also means minimizing the mainwindow (or pressing Win+D) no longer minimizes the maindisplay.
...
bzr-revno: 1651
2011-06-21 22:08:30 +01:00
Jonathan Corwin
488fc4831c
1. For openlyrics export, restrict the length of the filename to ensure it isn't too long for the filesystem.
...
2. When adding a song from a loaded service file, the author list string was being split by comma and the count compared to the number of authors against the db song. This gave a false negative if one of the individual authors contained a comma. Change the author comparison technique.
bzr-revno: 1650
2011-06-21 22:07:21 +01:00
Raoul Snyman
faa9aca78b
Fixed bug #800047 where the Preferences menu item in OS X was incorrect.
2011-06-21 08:10:03 +02:00
Benny
31dd4945ba
fixed line endings
2011-06-21 07:55:11 +02:00
Benny
2939151ff1
EasyWorship importer: added conversion of Tags - basically working, but some issues remain
2011-06-21 07:40:53 +02:00
Jonathan Corwin
6c3190528d
Fix easislides import when xml elements are missing
2011-06-20 23:11:05 +01:00
Jonathan Corwin
59280d10b7
Preserve greyed out of next button in import wizard
2011-06-20 22:57:34 +01:00
Jonathan Corwin
cd75b33a4d
Partial fix for the Unity top panel showing problem. However this doesn't fully fix it, since it appears the only way for a window to cover that bar is for it to have focus. This isn't possible in OpenLP, since the controlling window will have focus.
...
bzr-revno: 1647
2011-06-20 21:14:30 +01:00
Jonathan Corwin
d692b11254
Fixing main display kerning problem for qtwebkit v534.3
...
bzr-revno: 1646
2011-06-20 21:13:20 +01:00
Jonathan Corwin
5082091426
Remove parent from live maindisplay, so videos work. Also means the display won't minimize when the main window is, or when the Windows show desktop facility is used
2011-06-20 20:44:56 +01:00
Jonathan Corwin
f3b7e609e9
Don't duplicate songs if a single author contains a comma
2011-06-19 23:18:06 +01:00
Jonathan Corwin
099b62f233
Filename too long in openlyrics export
2011-06-19 22:11:29 +01:00
Jonathan Corwin
20522740f9
Shadow
2011-06-18 19:35:53 +01:00
Jonathan Corwin
fe3278146d
Kerning problems on maindisplay
2011-06-18 19:27:04 +01:00
Jonathan Corwin
658d4c2ecf
Preserve service item notes between edits
2011-06-18 14:36:29 +01:00
Jonathan Corwin
f3c83a19e1
maindisplay on top of X11 taskbar
2011-06-18 12:44:40 +01:00
Stevan Pettit
6f24d50316
Fixed problem with preview edit button not working for custom slides.
...
Also restores backwards compatability with custom plugin settings with 1.9.5
bzr-revno: 1644
2011-06-18 09:59:03 +01:00