raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
9,756 Commits 5 Branches 0 Tags 296 MiB
e79250c06b
Commit Graph

3378 Commits

Author SHA1 Message Date
Tim Bentley
bcb6668792 Delete clean ups 2012-05-07 09:21:21 +01:00
Tim Bentley
5815d637a7 Add Service delete to Shortcuts and allow from keyboard 2012-05-07 08:40:34 +01:00
Samuel Findlay
fc8c5598aa Changed 'PowerSong' to 'PowerSong 1.0 and Code tidy ups. 
bzr-revno: 1967
 2012-05-05 19:51:31 +01:00
Andreas Preikschat
2680cc7cda - fixed regression which I have introduced in r1962 (user defined formatting tags were not considered any longer); - reworked staticmethods (merged functions etc); - changed saveButton behaviour to reflect the internal things happening (the button is now only enabled when you can save a change) 
bzr-revno: 1966
 2012-05-05 20:38:59 +02:00
Andreas Preikschat
5959ee5158 fixed regression, reworked staticmethods, changed button behaviour to reflect the internal actions 2012-05-05 18:03:40 +02:00
Andreas Preikschat
baf1c792e5 clean ups 2012-05-05 14:24:25 +02:00
Stevan Pettit
3f62cc16bb Merged with trunk. Resolved a conflict 2012-05-03 20:19:11 -04:00
Andreas Preikschat
554df1e363 Improved renderer performance: 0.11 vs. 0.29 (average time needed) 
bzr-revno: 1962
Fixes: https://launchpad.net/bugs/856296
 2012-05-03 22:51:04 +02:00
Stevan Pettit
e86272f4d5 Fixed dialogues. Made changes to GUI. 2012-05-03 14:30:30 -04:00
Samuel Findlay
416cbe465e Changed 'PowerSong' to 'PowerSong 1.0' 2012-05-03 22:50:10 +10:00
Samuel Findlay
76de0f0c60 Merge trunk r1961 2012-05-03 14:25:31 +10:00
Andreas Preikschat
6915fb9d0d improved renderer performance 2012-05-02 20:25:37 +02:00
Andreas Preikschat
63997aa7b2 - repla- replaced numScreens by screenCount; - removed 0 in range() 
bzr-revno: 1961
 2012-05-01 22:35:42 +02:00
Raoul Snyman
c03403f103 HEAD 2012-05-01 20:42:34 +02:00
Samuel Findlay
ecc943ae20 Update to trunk r1960 2012-05-02 00:00:53 +10:00
Andreas Preikschat
dbe85abb84 updated vlc.py 
bzr-revno: 1960
 2012-05-01 15:11:24 +02:00
Meinert Jordan
da46ec470a pythonifying code: 
bzr-revno: 1957
 2012-05-01 12:21:57 +01:00
M2j
eafd3a20ae revert openlp/core/ui/media/mediacontroller.py to prevent merge conflict 2012-05-01 13:03:31 +02:00
Andreas Preikschat
a0225d790a replaced numScreens by screenCount; removed 0 in range() 2012-05-01 13:00:02 +02:00
Andreas Preikschat
bd4cded398 updated vlc.py 2012-05-01 12:38:19 +02:00
M2j
c6c62bdcad pythonifying code: 
- replace has_key() by key in dict
- remove len() method from sequence and mapping types when mapping to bool
 2012-04-29 17:31:56 +02:00
Samuel Findlay
21a88085e3 First attempt at class openlp.plugins.songs.lib.PowerSongImport 2012-04-30 00:08:25 +10:00
Andreas Preikschat
f6177c62b2 fixed LooseVersion usage 2012-04-28 18:22:37 +02:00
Andreas Preikschat
9668b22f85 shorter solution 2012-04-28 15:10:54 +02:00
Andreas Preikschat
9dc7d1a795 fixed cap 2012-04-28 14:28:38 +02:00
Andreas Preikschat
42bc12f3fb try to prevent traceback when vlc too old 
Fixes: https://launchpad.net/bugs/966086
 2012-04-28 14:27:18 +02:00
Andreas Preikschat
1869fd7593 fixed clean up mistake 2012-04-28 13:37:39 +02:00
Andreas Preikschat
f01252c23b fixed missing word 2012-04-28 13:31:42 +02:00
Andreas Preikschat
cbbfa8c23b clean ups 2012-04-28 13:13:16 +02:00
Philip Ridout
7b99c97174 Adds DreamBeam song importer. 
Small fix for SongShowPlus importer.

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

bzr-revno: 1933
Fixes: https://launchpad.net/bugs/960386
 2012-04-03 18:15:52 +01:00
M2j
9a68ce898a string fix: behaviour > behavior 2012-04-03 18:15:17 +02:00
Meinert Jordan
a57289da8c Bug #967522: Don't drag from empty service manager area 
bzr-revno: 1929
Fixes: https://launchpad.net/bugs/967522
 2012-04-02 23:12:51 +02:00
Meinert Jordan
22d29e7d62 Bug #959760: Change theme manager delete button visibility on default theme change. 
bzr-revno: 1927
Fixes: https://launchpad.net/bugs/959760
 2012-04-02 23:06:16 +02:00
M2j
dded8ee569 Bring back NextTrack 2012-04-02 23:00:24 +02:00
M2j
45e4d2c77d string changes 2012-04-02 21:52:47 +02:00
M2j
b97445eaab string changed 2012-04-02 20:44:07 +02:00
M2j
40774f6375 Bug #923500: Do not mark service changed when accepting settings dialog. 2012-04-02 17:33:54 +02:00
M2j
f876898033 Bug #959760: Change theme manager delete button visibility on default theme change. 2012-04-02 15:46:41 +02:00
M2j
3fc81ea230 Bug #967522: Don't drag from empty service manager area 2012-04-02 14:25:55 +02:00
M2j
352ee8e041 Bug #960386: string fixes 
fix missalignment of theme level selection labels
change default theme level to song level
 2012-04-02 12:32:52 +02:00
M2j
c747baa2ea Trigger push button actions with click signal instead of push signal 2012-04-02 02:19:16 +02:00
M2j
6657e27694 add objectName parameter to create_button_box method 
remove QMetaObject.connectSlotsByName() calls as they do nothing in our code
 2012-04-02 00:44:09 +02:00
M2j
d7ab06cc7e - reorganisation of methods in openlp.core.lib.ui to make them more comprehensive 
- some small restatements of some code in bibles parse_reference() method
 2012-04-01 23:19:56 +02:00
Edwin Lunando
49dbda7476 themeform.py line 426 at function setPositionPageValues(self): 
added main and footer page width and height based on the screen size
 2012-03-25 19:37:22 +07:00
Philip Ridout
b68300bdc6 New importer for DreamBeam song files. 
One small fix to SongShowPlus importer
 2012-03-24 16:41:29 +00:00
rimach
210f0e693b little corrections 2012-03-21 20:30:18 +01:00
rimach
8a029daf11 Head 2012-03-20 22:21:47 +01:00
rimach
527f4cc00c change camelcase variables 2012-03-19 20:27:02 +01:00
Jon Tibble
a21ab3859b Head r1910 2012-03-18 21:20:58 +00:00
Raoul Snyman
7f6ed27040 Shortened some translation comments, as Qt says that the entire context of a translation may be no longer than 255 characters. 
Updated the translation files while I was at it.
 2012-03-17 23:30:53 +02:00
Jon Tibble
086a32d7b1 Head r1908 2012-03-17 16:42:53 +00:00
Jon Tibble
a9d70a2d2e Bugs #888815 #941966 2012-03-17 14:44:23 +00:00
Jonathan Corwin
7872ea03b1 Fix the next slide keypress action to call its own routine, since the interface is different to the other next slide event. 
bzr-revno: 1908
Fixes: https://launchpad.net/bugs/957129
 2012-03-17 08:59:45 +02:00
Jonathan Corwin
8bca20a48c Create wrapper routine due to incorrect parameter to slidenext 2012-03-16 23:05:06 +00:00
rimach
360df826e1 correct overridden media option 2012-03-16 22:52:15 +01:00
rimach
7464d0f9fc correct pause check, correct signal names 2012-03-16 22:09:27 +01:00
rimach
09e7e16b12 fix issue, that video slider doesnt go back at video end 2012-03-13 20:54:16 +01:00
Jon Tibble
8e7eca36c7 Head r1903 2012-03-12 22:16:52 +00:00
Jon Tibble
6133e6a840 Unused variables 2012-03-12 22:12:16 +00:00
Jon Tibble
9785e7f1be Cleanups 2012-03-12 19:35:29 +00:00
Mattias Põldaru
9e4cdf1a74 Merge. 2012-03-12 10:25:48 +02:00
Mattias Põldaru
f188e21391 Fix mediaPlayer override ComboBox items case. 2012-03-12 10:17:20 +02:00
Philip Ridout
0dd0a9b821 Warn before importing a theme with a name that already exists 
bzr-revno: 1900
 2012-03-11 16:41:24 +00:00
Philip Ridout
2c5fa20154 Disable monitor selection drop down list when "Override display postition" is checked 
bzr-revno: 1899
 2012-03-11 16:37:59 +00:00
Jonathan Corwin
e3d523042b Fix a couple of spelling mistakes 
bzr-revno: 1897
 2012-03-10 23:00:14 +00:00
Philip Ridout
bad057e725 Added Raouls fix 2012-03-10 22:59:38 +00:00
Christian Richter
69d961666c Media player configuration changes: 
Change the layout of the up/down buttons
Fix issue: if choose down button without selecting any item before the settings dialog were broken

bzr-revno: 1895
 2012-03-10 22:56:57 +00:00
Meinert Jordan
77b8f84ed2 Tidyups: 
Unify all QAction creation methods.
Derive OpenLPToolbar().actions keys from object names.
Use Python methods instead of Qt for file path manipulations.
Bug #943919: Shortcuts for "Move to Previous/Next" in live slide controller.

bzr-revno: 1894
 2012-03-10 22:50:38 +00:00
Philip Ridout
8f0e2ba8ec Fixed mainwindow bug 2012-03-10 22:18:52 +00:00
Jonathan Corwin
e8a1d7591e Fix a few typos 2012-03-10 18:36:59 +00:00
Philip Ridout
f8021d315e fixed mainWindow this time! 2012-03-10 17:13:19 +00:00
Philip Ridout
df54470988 Few more minor fixes 2012-03-10 16:44:58 +00:00
Philip Ridout
24b817cccf More minor fixes 2012-03-10 16:14:07 +00:00
Philip Ridout
7d7e76fd9b renaming variables, if your going to open a can of worms, might as well eat them all! 2012-03-10 16:03:58 +00:00
Philip Ridout
a40717c16f Fixed up to Raouls guidelines 2012-03-10 08:22:52 +00:00
Philip Ridout
bb4c6a4e16 A few minor fixes, and modifications to Wowimport: 
Fixes 439 on the support tracker

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

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

bzr-revno: 1893
 2012-03-10 07:03:46 +00:00
Philip Ridout
e9caa194f5 Adds a dialouge asking if the user wants to replace an existing theme when importing. 
It works, but I dont know, it just feels like my code is a little bit "rough 'n' ready" let me know what you think!
 2012-03-09 21:43:27 +00:00
Philip Ridout
74db5acaa3 Re-ordered group boxes as per Raouls request, and applied his radiobox code 2012-03-09 21:41:13 +00:00
Mattias Põldaru
67cd90d5bf Don't translate player names. Added some keyboard shortcuts. 2012-03-09 08:09:19 +02:00
rimach
499f51bd2b change Button layout, fix issue if no item selected and choose down button 2012-03-08 23:14:59 +01:00
Philip Ridout
5d8c2aae17 Fixes bug https://bugs.launchpad.net/openlp/+bug/883056 
Adds radio buttons, and disables monitor selection when override display is on.
 2012-03-07 22:14:58 +00:00
Jonathan Corwin
a2e40543ea Fix phonon video for opaque themes 
bzr-revno: 1892
 2012-03-06 19:37:27 +00:00
Philip Ridout
0e95ffe55f remove .encode hopefully to fix http://support.openlp.org/issues/442 2012-03-05 22:22:36 +00:00
Mattias Põldaru
1600e002cb Make media backend names translatable. 
Fixes: https://launchpad.net/bugs/903683
 2012-03-05 23:09:31 +02:00
Jonathan Corwin
e5a316ba2d Transparency fixes 2012-03-05 19:40:16 +00:00
M2j
9aaafdf108 Merge with lp:~raoul-snyman/openlp/bug-845692 to forestall merge conflicts. 2012-03-05 11:09:07 +01:00
M2j
970e6c5564 correct parenting of shortcut actions in slide controller 2012-03-04 20:06:49 +01:00
Raoul Snyman
d6b14b39f8 HEAD 2012-03-04 20:05:29 +02:00
Raoul Snyman
e59e717480 Hopefully fix the next button when things are on repeat. 2012-03-04 20:05:15 +02:00
M2j
b952b2cdbc Merge differing trees and remove whitspaces 2012-03-04 15:52:09 +01:00
rimach
5d6db957e1 fix 2012-03-03 23:36:46 +01:00
M2j
587850bb59 Bug #943919: Make shortcuts for "Move to Previous/Next" in live slide controller 
configurable.
 2012-03-03 14:52:57 +01:00
M2j
277de83b68 Bug #943919: Make shortcuts for "Move to Previous/Next" in live slide controller 
configurable.
 2012-03-03 14:38:20 +01:00
rimach
87e70fa2dc fix 2012-03-03 00:08:24 +01:00
M2j
45de016abb derive OpenLPToolbar().actions keys from object names to prevent collisions in 
case translators translate different strings same.
 2012-03-02 13:11:13 +01:00
M2j
6d909c64eb unified remaining action creation methods (addToolbarButton, context_menu_action, context_menu_separator) 2012-03-02 11:22:52 +01:00
M2j
fe2966ac9e make slideShortcutActivated private 2012-02-28 10:47:34 +01:00
M2j
d13ec2184a concentrate action creation in slide controller 2012-02-28 10:24:42 +01:00
M2j
95c8f8fe5a removed base_action, checkable_action, icon_action, and shortcut_action 2012-02-28 00:44:35 +01:00
M2j
3a6a402b56 use Python methods instead of Qt 2012-02-26 22:09:22 +01:00
Raoul Snyman
ef4b69c50f Fixed some long lines. 2012-02-25 15:39:12 +02:00
Raoul Snyman
476ba8eb1b Fixed the copyright in the patch file which someone else missed. 
Regenerated the resource file.
Fixed the copyright in the translation_utils.py script which someone else missed.
Removed an unnecessary comment.
 2012-02-25 13:11:59 +02:00
Raoul Snyman
d4aab974d2 HEAD 2012-02-25 13:02:43 +02:00
Raoul Snyman
d681afb2b4 Added an icon in for the Next button, and added in direct-to-track skipping too. 
Fixes: https://launchpad.net/bugs/845692
 2012-02-25 02:01:24 +02:00
Raoul Snyman
8fa7dcf080 Add the last two remaining outstanding items, the "next track" and the time remaining. 
Fixes: https://launchpad.net/bugs/845692
 2012-02-25 01:26:10 +02:00
Raoul Snyman
d14a316309 Added repeating of the background audio track list. 
Migrated the songs plugin configuration tab to use the proper camelCase names.
 2012-02-16 23:08:30 +02:00
Jonathan Stafford
4016038d33 Fixes bug 932610 where OpenLP crashes if the "Service Item Slide Limits" was set to "Next Item" and the user tries to advance beyond the ends of a service item in the preview pane using the up/down arrow keys. 
bzr-revno: 1880
Fixes: https://launchpad.net/bugs/932610
 2012-02-16 19:02:11 +00:00
Jonathan Stafford
d57905f9d8 Fixed Preview Crash Bug 932610 
Fixes: https://launchpad.net/bugs/932610
 2012-02-15 18:37:42 +08:00
Mattias Põldaru
d4efbfe122 Moved two items over to right columns. 2012-02-13 13:10:27 +02:00
Mattias Põldaru
d09cfa4a57 Merge trunk. 2012-02-08 00:07:24 +02:00
Mattias Põldaru
62e2616ace Code cleanup. 2012-02-07 12:54:13 +02:00
Jonathan Stafford
13ab688518 Changing the "Wrap Slide" option into a three-way radio button selection to allow the option of the up/down arrow keys to jump between service items at the end of each song, etc. 
bzr-revno: 1876
 2012-02-06 17:35:41 +00:00
Jonathan Stafford
e6f1ed20a9 Moved Setting to Advanced Tab 2012-02-06 21:28:16 +08:00
Andreas Preikschat
f9fb2bea5b fix ZeroDivisionError 
bzr-revno: 1875
 2012-02-05 16:22:21 +01:00
Christian Richter
863a9f9129 Added VLC support to OpenLP 
bzr-revno: 1874
 2012-02-05 16:39:46 +02:00
Andreas Preikschat
bedb2d833d fix ZeroDivisionError 2012-02-04 18:11:35 +01:00
Mattias Põldaru
dedb85b0cf Merge trunk. 2012-02-04 09:48:55 +02:00
Mattias Põldaru
51ee117a48 More function name changes. 2012-02-04 09:46:10 +02:00
Mattias Põldaru
6f219e175f Name changes to camelCase where appropriate. 2012-02-02 14:42:52 +02:00
Mattias Põldaru
7fca26dd0e Remove a leftover line which causes trouble on OSX. 2012-02-01 01:47:33 +02:00
Mattias Põldaru
6da181834c Meinert's suggestions taken into account about syntax and removed unnecessary variables. 2012-01-30 01:16:12 +02:00
Jonathan Stafford
d26de263f3 Fixed missing u and tidied up blank lines between class definitions 2012-01-30 06:07:06 +08:00
Mattias Põldaru
90332e60d3 Prevent several updates to service name example when launching OpenLP. 2012-01-29 23:14:27 +02:00
Mattias Põldaru
01d42e0f11 Use note text as tooltip. 2012-01-29 18:47:15 +02:00
Jonathan Stafford
02975a61bf Renamed and moved both enumerations to lib/__init__.py 2012-01-28 16:07:54 +08:00
Mattias Põldaru
b03295584b Addresses Meinert's concern about a hidden exception. 2012-01-28 01:13:35 +02:00
Mattias Põldaru
83155d45ea Text changes, thanks to Raoul. 2012-01-28 00:10:12 +02:00
Jonathan Stafford
312a02f14b Fixed typo 
Fixes: https://launchpad.net/bugs/900727
 2012-01-26 10:51:25 +08:00
Jonathan Stafford
7b180a4c67 Fixed bug #900727: Phonon backend no longer plays .mp4 video files 
Fixes: https://launchpad.net/bugs/900727
 2012-01-26 10:46:17 +08:00
Jonathan Stafford
6487a3248a Moved Service Item Advance enumeration to slidecontroller 2012-01-25 20:34:13 +08:00
Jonathan Stafford
d686799035 Created Service Item Advance enumeration class 2012-01-25 18:03:57 +08:00
Mattias Põldaru
8c483a58b3 Added checkbox for to disable default service name, just as suggested. 2012-01-25 11:32:20 +02:00
Jonathan Stafford
2c472ff38e Small Fixes 2012-01-23 17:33:12 +08:00
Jonathan Stafford
4f0cd62f63 Fix typo 2012-01-22 17:14:50 +08:00
Jonathan Stafford
cc04a82c08 Changed up arrow to jump to last slide of previous service item (when applicable) 2012-01-22 17:07:59 +08:00
Stevan Pettit
ce230df91d Added code to allow user to change the location of the OpenLP data directory 2012-01-19 15:25:53 -05:00
rimach
88ce7a906d reactivate vlc 2012-01-19 20:13:19 +01:00
Mattias Põldaru
62a5578528 Make % acceptable character for filenames again. 2012-01-18 21:18:18 +02:00
Mattias Põldaru
62d4db0c82 Added a comment for translators. 2012-01-18 21:16:50 +02:00
Mattias Põldaru
8601a47dce Remove obsolete import. Fix saving wrong syntax and % bugs. 2012-01-18 13:20:15 +02:00
Jonathan Stafford
6543bbafb6 Changed slide_advance variable to be set only in SlideController initialisation or when settings are changed. 2012-01-18 17:52:51 +08:00
Mattias Põldaru
e4f983e6ca Label back with new text. Also element Labels to the right place as Meinert suggested. 2012-01-17 10:50:29 +02:00
Mattias Põldaru
df60a89121 Change default name and remove now obsolete string. 2012-01-16 15:59:23 +02:00
Mattias Põldaru
982bfbbd55 Fix labels according to Meinert's comment. 2012-01-16 15:50:17 +02:00
Jonathan Stafford
1dbcc18c7e Reintroduced slide_advance variable so that settings are only read once. Reverted language files. 2012-01-16 17:50:15 +08:00
Jonathan Stafford
c1604b64ff Fixed camelCase, indentation, extra spaces, and slide timer 2012-01-15 21:11:10 +08:00
Jonathan Stafford
01f7244db7 Removed unnecessary slide_advance 2012-01-15 18:05:12 +08:00
Mattias Põldaru
e6f2fd67c3 Disable QTimeEdit box, when it is not used. 2012-01-15 11:58:02 +02:00
Jonathan Stafford
87775f164a Migrate Wrap Setting to Slide Advance Setting 2012-01-15 17:08:08 +08:00
Jonathan Stafford
360b744e7c Basic Service Item Slide Advance Settings working 2012-01-15 16:27:35 +08:00
Mattias Põldaru
ba0ab63149 Merge trunk. 2012-01-15 03:34:08 +02:00
Mattias Põldaru
b70f95c825 Added possibility to choose one day time in next week or now as the datetime. Also took Meinert's comment about too restricted filename characters into account. 2012-01-15 03:21:35 +02:00
rimach
edf4ac75c8 move phonon and vlc to own windows 2012-01-12 22:45:07 +01:00
rimach
3e6d1e7962 update vlc code 2012-01-11 21:51:11 +01:00
rimach
b834371d5c Sync with head 2012-01-09 22:30:31 +01:00
Jonathan Corwin
75359ac361 Helps if we load the right setting 2012-01-07 12:09:17 +00:00
Jonathan Corwin
3ebe38f7e1 Setting for X11 bypass flag. Don't open Impress unnecessarily if not enabled 2012-01-07 11:22:53 +00:00
Mattias Põldaru
8be4f309f5 Escape html tags and support formatting tags in Alerts 
bzr-revno: 1866
Fixes: https://launchpad.net/bugs/908197
 2012-01-06 18:44:12 +00:00
Stevan Pettit
11d63c6607 If the save location is unavailable, the "Save As" dialog is used. 
bzr-revno: 1865
Fixes: https://launchpad.net/bugs/905040
 2012-01-06 18:42:09 +00:00
Jonathan Corwin
fcf2eb17f0 Fix controller/theme wizard displays if transparent 2012-01-04 18:37:27 +00:00
Jonathan Corwin
46a4bade8c Transparent themes 2012-01-04 17:19:49 +00:00
Mattias Põldaru
6263a0c999 Merge trunk. 2012-01-03 02:12:09 +02:00
Mattias Põldaru
1cf246940d A few fixes, useful when default service name is wrong. 2012-01-03 02:08:08 +02:00
Mattias Põldaru
85a92455d1 Apply formatting tags to alerts. 2012-01-03 01:43:59 +02:00
Stevan Pettit
34eb37a4f4 Modified statement to avoid duplicate code execution 2012-01-01 08:43:43 -05:00
Stevan Pettit
3b58fe88f2 Added test to open save-as dialog if save location is unavailable 2011-12-31 23:09:49 -05:00
Mattias Põldaru
14dde1f0c4 Rename EasiSlides to EasySlides 
bzr-revno: 1863
 2011-12-31 19:17:54 +00:00
Jon Tibble
e1a4837a19 Long line 2011-12-31 17:36:23 +00:00
Mattias Põldaru
a0ecae3f47 Rename EasiSlides to EasySlides. 
Fixes: https://launchpad.net/bugs/904384
 2011-12-31 16:18:05 +02:00
Mattias Põldaru
185cc5487a Use cgi.escape instead of simply replacing tags, also escaping & was missing. 2011-12-30 15:00:08 +02:00
Andreas Preikschat
68ee74f72f - download theme screenshots in a thread to speed up the FTW 
bzr-revno: 1860
 2011-12-30 08:59:02 +01:00
Andreas Preikschat
214bd37057 fixed method name 2011-12-29 20:41:25 +01:00
Tim Bentley
93a59d560f Another year has passed by 
bzr-revno: 1859
 2011-12-29 17:50:42 +00:00
Andreas Preikschat
20ef9b9730 download theme screenshots in a thread 2011-12-29 13:26:37 +01:00
Tim Bentley
2a5e8935bb New year merge 2011-12-27 10:33:55 +00:00
Jonathan Corwin
2b9f09b32a Minor fixes 2011-12-23 21:52:54 +00:00
Mattias Põldaru
b48dda3c74 Converts <> marks to &lt;&gt; to make it impossible to insert HTML to alerts. 
Fixes: https://launchpad.net/bugs/908197
 2011-12-23 21:14:49 +02:00
Jonathan Corwin
70ffa5b988 Head 2011-12-23 18:37:27 +00:00
Jonathan Corwin
5600946e0e divergences 2011-12-23 17:35:58 +00:00
Jonathan Corwin
ec035d6d37 Set correct monitor in wizard 2011-12-23 17:25:05 +00:00
Jonathan Corwin
3a5723cbaa Don't show initial display window if on same screen as application window, override or not. 2011-12-23 14:38:02 +00:00
Martin Zibricky
5f6962f4c7 This fixes bug #906926. 
bzr-revno: 1854
Fixes: https://launchpad.net/bugs/906926
 2011-12-22 23:36:22 +02:00
Jonathan Corwin
69490c8f2c Ensure visible flags correct, and display if single screen works on Windows 2011-12-22 20:11:52 +00:00
Martin Zibricky
79c5a3a4d4 refactoring: merge with trunk and use sys.platform 2011-12-22 19:29:55 +01:00
Martin Zibricky
4071bc8deb remove disabling opengl - done in new branch 2011-12-22 19:21:22 +01:00
Martin Zibricky
6828fc9ef5 fixed bug 907857: opengl rendering disabled for mac 2011-12-22 19:17:35 +01:00
Martin Zibricky
82728e148e #906926 fix stay on top for OS X 2011-12-22 15:46:47 +01:00
Jonathan Corwin
1cd3206f96 Redundant imports 2011-12-22 13:23:04 +00:00
Jonathan Corwin
16043527fc Check for Unity instead 2011-12-22 12:27:54 +00:00
Jonathan Corwin
b9c1da189a Head 2011-12-21 21:19:52 +00:00
Jonathan Corwin
febf40884f Just remove X11 bypass 2011-12-21 21:19:35 +00:00
Meinert Jordan
e974df4c54 recover v1.x theme file names from XML info 
bzr-revno: 1847
 2011-12-20 20:25:27 +00:00
Meinert Jordan
d94816d481 recover v1.x theme file names from XML info 
bzr-revno: 1846
 2011-12-20 20:23:36 +00:00
M2j
cc37336ec5 make mediacontroller sliders reacting on scroll wheel (Bug #899312) 2011-12-19 23:46:31 +01:00
Andreas Preikschat
8bfaa22535 added missing ) 2011-12-18 20:46:56 +01:00
Andreas Preikschat
9e03e18653 added floft to the list of packagers 2011-12-18 20:44:41 +01:00
Tim Bentley
0a9ea54bf8 Fix remote hiding of screen and updating UI buttons 
bzr-revno: 1841
 2011-12-16 15:06:14 +00:00
Andreas Preikschat
36d6a9003d Shortcut can be assigned twice in certain circumstances) 
Description of the fix:
1) Create a dict with the shortcuts as keys and a list of actions using this shortcut as value.
2) When we add a new action/shortcut we check if the shortcut is valid. If this is the case we add it to the dict and if not we remove the shortcut.

bzr-revno: 1840
 2011-12-16 15:04:51 +00:00
M2j
99fc7dea18 v1 theme import moved to seperate method 2011-12-15 21:14:12 +01:00
Tim Bentley
55353e54f0 yet more changes 2011-12-15 18:59:25 +00:00
Mattias Põldaru
cd565fe4a9 First almost working example. I suppose someone suggest to make specific class now. You may be right :) 2011-12-15 20:13:45 +02:00
Tim Bentley
acebb85055 more changes 2011-12-15 17:19:54 +00:00
Jonathan Corwin
3874363e54 Add a more specific test for gnome shell 2011-12-14 22:44:41 +00:00
Tim Bentley
58f7649cca Fix elif 2011-12-14 20:04:38 +00:00
Tim Bentley
e450ea476d Remove blank line 2011-12-14 19:19:26 +00:00
Tim Bentley
fa1a721c26 Head 2011-12-14 19:07:56 +00:00
Tim Bentley
c1ca990a2b Fix up methods to do the changes 2011-12-14 19:07:40 +00:00
M2j
f733db0e5a Head 1834 2011-12-13 01:15:39 +01:00
M2j
0c06569dc5 Bug #882819 - recover v1.x theme file names from XML info 2011-12-13 00:46:04 +01:00
Jonathan Corwin
16f798e404 Attempt to check for gnome version 2011-12-12 22:10:37 +00:00
Jonathan Corwin
d2659a64fc Add a couple of keywords for the SOF5 importer to capitalize correctly. 
When a presentation controller is not enabled, only check if the app is available when necessary to prevent it loading.
Fix so LibreOffice 3.4 will close down correctly at the end when no other docs are open.

bzr-revno: 1834
 2011-12-12 19:20:51 +00:00
Tim Bentley
143f65f476 Fix review comments 2011-12-12 18:00:12 +00:00
Tim Bentley
4211f196cd Fix review comments 2011-12-12 17:22:40 +00:00
Tim Bentley
4430deb207 Head 2011-12-12 17:21:23 +00:00
Jonathan Corwin
6a8f54b5f8 Start disabled presentations only when necessary. Try and shutdown Impress at the end correctly 2011-12-11 21:59:10 +00:00
Jon Tibble
85e2967854 Fix logging theme names 2011-12-11 16:23:24 +00:00
Jon Tibble
e5d1fca74d Previous fix broke on non-Windows, try again 2011-12-11 15:31:44 +00:00
Jon Tibble
26df14e43c Fix v1 theme importing 2011-12-11 14:53:44 +00:00
Andreas Preikschat
f1485aba47 r1830 + resolved conflict 2011-12-10 21:35:11 +01:00
Mattias Põldaru
c2397af633 Ensure that action category names are unicode, to prevent warnings on comparison. Also a fix for a path problem. 
bzr-revno: 1830
 2011-12-10 20:31:16 +00:00
Tim Bentley
b07e10282d clean up service 2011-12-10 14:34:28 +00:00
Andreas Preikschat
08743f147c replaced has_key 2011-12-10 15:10:56 +01:00
Andreas Preikschat
3cde99d9d9 update map when shortcuts change 2011-12-10 15:03:41 +01:00
Tim Bentley
1d673caff4 Fixes and notifications 2011-12-10 08:45:17 +00:00
Andreas Preikschat
4eee13430e -Fixed media item recreation (which caused bug #900399) 
- Doc/method clean up
- Replaced continue with break
- Replaced method with one-liner

bzr-revno: 1827
 2011-12-09 17:32:17 +01:00
Mattias Põldaru
1538d0b3bf More earlier conversions to unicode. 2011-12-09 14:35:18 +02:00
Mattias Põldaru
e471edca89 Convert strings unicode as soon as possible and assume they are in unicode later. 2011-12-09 13:50:25 +02:00
rimach
1cffe2bffa add freeBSD vlc support 2011-12-08 21:51:44 +01:00
Christian Richter
b0f0d8030d Fixed a traceback when replaying live video background when no service item has been sent live before. 
bzr-revno: 1826
Fixes: https://launchpad.net/bugs/899665
 2011-12-08 22:27:22 +02:00
Andreas Preikschat
12547fad2a doc clean up, removed method with a one liner, fixed media item recreation bug 2011-12-07 21:25:12 +01:00
rimach
f1bc18c33c remove print statement from webkitplayer.py 2011-12-07 21:20:23 +01:00
rimach
b5dfba86fb bugfixing 2011-12-06 22:42:34 +01:00
rimach
bb4f2fd113 correct import check 2011-12-06 22:19:37 +01:00
Jon Tibble
04d7669948 Fix non-ascii file check on Macs 2011-12-05 21:40:56 +00:00
rimach
2df4a1903e bugfixing 2011-12-05 19:48:32 +01:00
rimach
ae5998e2dc sync 2011-12-05 18:43:54 +01:00
Jon Tibble
a54e7ff709 Fix non-ascii service filename loading 2011-12-04 20:57:58 +00:00
Jon Tibble
5804dade74 Reduce recent file list duplication (Bug #892668) 2011-12-04 14:42:39 +00:00
Andreas Preikschat
b78bb1c7e6 fixed tooltip strings 2011-12-03 21:35:53 +01:00
Andreas Preikschat
f34ae80eec fixed bug 887313 
Fixes: https://launchpad.net/bugs/887313
 2011-12-03 19:01:36 +01:00
Tim Bentley
13ec25eef5 Fix the plugin Disabled route as it has never been tested 
Stop plugins being available if the database is more advanced than the code.

bzr-revno: 1815
 2011-12-03 14:42:44 +00:00
Jon Tibble
9c0bde098f Fix spacing 2011-12-03 13:40:48 +00:00
Tim Bentley
1239cd707c Fix database versions 2011-12-03 12:51:40 +00:00
rimach
8412caf006 new version of vlc.py 2011-12-03 00:45:05 +01:00
Jon Tibble
02f5e819fb Revert broken old incomplete thought 2011-12-02 22:23:37 +00:00
rimach
2c225c19a0 bugfixing 2011-12-02 23:00:28 +01:00
Jon Tibble
bd02fb5f30 Whitespace 2011-12-02 21:49:20 +00:00
Jon Tibble
e526687c71 Cleanup fix 2011-12-02 21:33:11 +00:00
Jon Tibble
f970d9462d Cleanups 2011-12-02 21:13:05 +00:00
Jon Tibble
bba6d6730f Head r1812 2011-12-02 20:17:57 +00:00
rimach
11acf005e2 add empty line 2011-12-02 16:15:31 +01:00
rimach
cc2c58d9dc sync with trunk 2011-12-02 16:12:59 +01:00
Raoul Snyman
24095edc2b Added a missing import. 
Fixes: https://launchpad.net/bugs/898876
 2011-12-02 08:59:32 +02:00
Christian Richter
e8f0bf5cd1 Rewrite of the multimedia stuff. 
bzr-revno: 1810
 2011-12-02 08:56:57 +02:00
rimach
4fc4bacfa7 bugfixing 2011-12-01 19:08:12 +01:00
rimach
e627960391 bugfixing 2011-12-01 19:07:15 +01:00
Tim Bentley
8fee84d052 Stop keyboard floods getting the slide controller and service manager out of set. 
bzr-revno: 1808
Fixes: https://launchpad.net/bugs/892571
 2011-11-30 22:27:54 +02:00
rimach
af63888e31 sync 2011-11-30 21:16:05 +01:00
rimach
6ed1342f95 sync 2011-11-30 21:14:18 +01:00
rimach
44d71dcee7 bugfixing 2011-11-30 18:10:57 +01:00
rimach
58035f505d bugfixing 2011-11-30 18:06:57 +01:00
rimach
3570e48732 remove unused function 2011-11-30 09:29:32 +01:00
Tim Bentley
8b8a67c1f7 Fix double loop entry 2011-11-28 18:03:38 +00:00
Tim Bentley
4f629dfd3b Implement a queue to process the requests 2011-11-28 17:10:00 +00:00
Tim Bentley
ef884792ac Move to reference counting 2011-11-27 16:08:42 +00:00
Jon Tibble
ac365e5b6a Cleanups 2011-11-26 21:26:50 +00:00
Jon Tibble
fb6403f003 Head r1804 2011-11-26 20:32:47 +00:00
M2j
047477c236 layout fix in exceptionform 
bug fix triggerd by searching for nonexistend book numbers
 2011-11-26 20:13:51 +01:00
rimach
7e0337a00d sync 2011-11-24 22:12:32 +01:00
rimach
d104671a4c bugfixing 2011-11-24 22:11:41 +01:00
rimach
d7f38caccd bugfixing 2011-11-24 22:10:37 +01:00
rimach
dcbff07f29 sync 2011-11-24 22:09:26 +01:00
Tim Bentley
5e702c1782 Fixes keyboard flood where events are switched order by PYQT. 
Now a keyboard press is only handled if the previous is finished.  

Fixes: https://launchpad.net/bugs/892571
 2011-11-23 06:05:42 +00:00
Andreas Preikschat
0320f88d72 do not load the list twice when copying a theme 2011-11-19 13:00:36 +01:00
Tim Bentley
d5331f50b3 Amend check for files and delete if not used any more 
Fixes: https://launchpad.net/bugs/891781
 2011-11-18 19:34:04 +00:00
Tim Bentley
ddc6c26f33 Head 2011-11-13 08:58:07 +00:00
rimach
acffe7a66a rename media_player.py 2011-11-12 16:31:58 +01:00
rimach
870a70ab3a rename media_player.py 2011-11-12 16:30:41 +01:00
rimach
7077d5cda6 sync 2011-11-11 17:47:26 +01:00
rimach
a113c64464 bugfixing 2011-11-11 17:46:46 +01:00
rimach
087a1f7600 bugfixing 2011-11-11 17:45:25 +01:00
rimach
c0cc590c71 sync 2011-11-11 17:42:01 +01:00
Andreas Preikschat
48354ec8ef - fixed bug #827862 (Add Shortcut to change verse, chorus, ... in the live controller) 
bzr-revno: 1797
Fixes: https://launchpad.net/bugs/827862
 2011-11-05 20:39:51 +01:00
Tim Bentley
d71f059433 Fix impress and service theme problems 2011-11-04 20:09:35 +00:00
rimach
4779a3f21a Head and bugfixing 2011-11-02 21:44:44 +01:00
rimach
1c35195f6a sync 2011-11-02 21:39:18 +01:00
rimach
2ed85a2bb9 bugfixing 2011-11-02 21:27:53 +01:00
Tim Bentley
d4eeb4136a stop alerts crashing with splash screen 
bzr-revno: 1793
 2011-11-01 06:09:21 +00:00
Tim Bentley
14527bf357 Fix my stupidity 2011-10-31 18:20:10 +00:00
Andreas Preikschat
71c6a7315c fixed comment 2011-10-31 10:14:07 +01:00
Andreas Preikschat
94c99d1b3d fixed detection for more than one match 2011-10-31 10:13:25 +01:00
Andreas Preikschat
e856fa9aed r1790 2011-10-31 09:56:48 +01:00
Andreas Preikschat
5348139cfe fixed spelling 2011-10-31 09:55:59 +01:00
Andreas Preikschat
cac0728d0b fixed spelling 2011-10-31 09:54:04 +01:00
Andreas Preikschat
f346ebebe0 fixed import and added note 2011-10-31 09:53:18 +01:00
Andreas Preikschat
ffafcaaadc fix for translated verse tags 2011-10-31 09:44:38 +01:00
Andreas Preikschat
2458ffc3bc completed detection + cleaned detection 2011-10-31 08:41:28 +01:00
Andreas Preikschat
eb7b7a19d8 r1790 2011-10-31 08:09:48 +01:00
Andreas Preikschat
d1030a7c2d Corrected comment 2011-10-31 08:08:51 +01:00
Tim Bentley
c37ffbe3e2 Pass in plugins 2011-10-31 06:03:03 +00:00
Tim Bentley
c8e9496db1 Fix up review comments 2011-10-29 20:13:11 +01:00
Tim Bentley
ea4cb7f7ed Add Class instead of magic numbers 2011-10-29 14:21:54 +01:00
Tim Bentley
8e853f10b1 Fix crash with alerts over video 
Change default to bottom from middle
Remove unused from from previous merge

Fixes: https://launchpad.net/bugs/875798, https://launchpad.net/bugs/883414
 2011-10-29 10:33:48 +01:00
rimach
01ff00dcf9 bugfixing and sync 2011-10-26 22:13:30 +02:00
rimach
dc327e2385 bugfixing 2011-10-26 22:11:15 +02:00
Andreas Preikschat
360843baf7 fixed spelling mistake 2011-10-26 21:19:42 +02:00
Andreas Preikschat
c9c31990e2 fixed detection 2011-10-26 16:53:51 +02:00
Andreas Preikschat
33960f9eb4 allow all possible 'shortcut' combinations 2011-10-25 18:31:22 +02:00
rimach
a2ebf30b68 bugfixing 2011-10-24 22:04:29 +02:00
Andreas Preikschat
ee960bb88c use '1' etc shortcuts for bible verses, images, etc 2011-10-24 18:13:30 +02:00
Andreas Preikschat
a42940b6bb - shortcuts only for live controller 
- removed v shortcut
 2011-10-24 17:36:59 +02:00
Andreas Preikschat
cc186aff9d clean ups + fixes 2011-10-23 20:28:42 +02:00
Andreas Preikschat
b603017b1c started work on shortcuts allowing jumping between different verses 
Fixes: https://launchpad.net/bugs/827862
 2011-10-23 19:47:15 +02:00
Tim Bentley
5f9ed32bfe Fix assignment error 2011-10-23 18:22:11 +01:00
Meinert Jordan
f25cd069ab add version information for mako, migrate and uno to exceptionform 
bzr-revno: 1784
 2011-10-22 15:32:04 +02:00
M2j
5a415311a5 Correction for Migrate version smaller than 0.7 2011-10-22 14:30:21 +02:00
Andreas Preikschat
05bf2ec6fa removed obsolete signals and rearranged the docs 2011-10-22 13:09:01 +02:00
M2j
aa0b49290d add version information for mako, migrate and uno to exceptionform 2011-10-20 22:11:06 +02:00
Andreas Preikschat
e5401c7eac - fixed bug 871441 (Live Preview image is not updated when you "Replace live background") 
- removed dead code
- fixed docstrings
- removed 'maindisplay_active' signal in same places

bzr-revno: 1781
 2011-10-19 19:30:32 +01:00
Tim Bentley
9603fcd1cc Fix bug 836897 to allow Alerts to be amended without changing the slide 
Refactored the CSS,Javascript,Html load code for alerts and provided a framework for other things.

bzr-revno: 1779
Fixes: https://launchpad.net/bugs/836897
 2011-10-19 19:25:08 +01:00
Tim Bentley
4d3dd6dbb5 Rename signal 2011-10-19 18:53:07 +01:00
rimach
2d870bd90c bugfixing and sync 2011-10-17 23:54:06 +02:00
rimach
599573b5ce Sync 2011-10-17 23:51:24 +02:00
rimach
dbf77e2fb4 bugfixing 2011-10-17 23:35:44 +02:00
Meinert Jordan
972d917c8a Remove mailto code and use QT code 
bzr-revno: 1777
Fixes: https://launchpad.net/bugs/863841
 2011-10-17 17:46:35 +01:00
Tim Bentley
bf2ada0b67 Fix up review comments 2011-10-16 16:39:49 +01:00
Andreas Preikschat
406ea9fe0a r1776 + resolved conflict 2011-10-16 17:21:25 +02:00
Andreas Preikschat
004472baa8 reverted alert change 2011-10-16 16:53:39 +02:00
Tim Bentley
8ebf7ff131 Finish dynamic Alert updates 2011-10-16 08:59:21 +01:00
M2j
525658ae8b better readable coding style 2011-10-15 23:21:22 +02:00
M2j
1527704c03 - exception dialog uses Qt call instead of external library 
- unicode support in report and attached filename was broken
 2011-10-15 22:18:49 +02:00
Andreas Preikschat
9259eed4a6 -fixed bug 871272 
-clean ups

Fixes: https://launchpad.net/bugs/871272
 2011-10-15 13:30:39 +02:00
Andreas Preikschat
a1a79c98d1 overwrite parent method 2011-10-15 09:52:25 +02:00
Andreas Preikschat
ec5991a197 removed dead code§ 2011-10-15 09:36:51 +02:00
Tim Bentley
9652a690b3 More cleanups and start of updates 2011-10-15 07:32:01 +01:00
Tim Bentley
bb8b0cd435 Move the Alert web code back to the plugin 2011-10-13 06:14:03 +01:00
Tim Bentley
e87b4658d8 fix up alert changing triggers 2011-10-11 20:54:18 +01:00
Tim Bentley
9176911810 Try 1 2011-10-11 19:10:53 +01:00
Andreas Preikschat
76f47a4f62 - clean ups 
- only display alert when the screen is not hidden
 2011-10-10 18:54:01 +02:00
Andreas Preikschat
658e8f234b clean ups 2011-10-10 18:37:46 +02:00
Andreas Preikschat
6883427cbd fixed bug 871441 
Fixes: https://launchpad.net/bugs/871441
 2011-10-10 18:22:41 +02:00
Andreas Preikschat
06068eedce fixed bug 863846 
Fixes: https://launchpad.net/bugs/863846
 2011-10-08 15:29:35 +02:00
Tim Bentley
161300fe73 Number of changes 
- Allow time (24/12) hour for sage view
- Add pictorial display of the lay out in theme manage
- Fix bug where remote edit removes an overridden theme.

bzr-revno: 1770
 2011-10-05 19:20:54 +01:00
Tim Bentley
575aa02022 Amend text 2011-10-05 18:18:56 +01:00
Andreas Preikschat
45b296b741 clean up 2011-10-05 19:04:59 +02:00
Tim Bentley
159a95855f Change Text 2011-10-05 17:14:21 +01:00
Andreas Preikschat
1967951061 attempt to prevent calling updatePreview more than once 2011-10-04 20:01:13 +02:00
Andreas Preikschat
201ec584a8 removed dead code + minor clean up 2011-10-03 20:51:32 +02:00
Andreas Preikschat
360e117918 removed dead code 2011-10-03 20:14:39 +02:00
Andreas Preikschat
88c0a22ac4 improve performance of preview 
Fixes: https://launchpad.net/bugs/856296
 2011-10-03 19:27:34 +02:00
Tim Bentley
5053e27c76 Fix up review comments 2011-10-03 17:53:54 +01:00
Tim Bentley
9f9f2186ae Minor performance improvement 2011-10-02 20:57:42 +01:00
Tim Bentley
6426d9aac4 Display is now big enough 2011-10-02 17:38:05 +01:00
Tim Bentley
297a250010 Display works but bigggggggggg 2011-10-02 08:52:28 +01:00
Tim Bentley
9b5074991c Add new dialog 2011-10-01 21:33:53 +01:00
Andreas Preikschat
8f3f09eef9 r1765 + resolved conflict 2011-10-01 09:28:45 +02:00
Tim Bentley
128b6b80bf Display now works 2011-09-29 18:57:48 +01:00
rimach
3261dc01f1 sync with head and update 2011-09-28 23:00:43 +02:00
rimach
33d9ce07ac sync with head 2011-09-28 22:57:01 +02:00
rimach
c299efab1a update 2011-09-28 22:54:43 +02:00
Tim Bentley
9142ffb488 more visible lines 2011-09-28 21:43:30 +01:00
Tim Bentley
ff32139b2e refactor code to stop duplicate code 2011-09-28 18:39:26 +01:00
Tim Bentley
632e2ce2dd More fixes 2011-09-28 05:50:56 +01:00
Tim Bentley
3e2e87bb2c Initial stab 
Fixes: https://launchpad.net/bugs/814201
 2011-09-27 20:37:34 +01:00
Tim Bentley
276d4045e3 Fix edit for tags loaded for song which is not saved 
bzr-revno: 1765
 2011-09-27 18:23:21 +01:00
Tim Bentley
695e08a63a get the right field 2011-09-26 19:56:52 +01:00
Tim Bentley
7fe57a9a5d Make Int 2011-09-26 19:12:27 +01:00
Tim Bentley
fb3f001c26 Add Justify theme option 
bzr-revno: 1762
Fixes: https://launchpad.net/bugs/802252
 2011-09-26 17:07:30 +01:00
Tim Bentley
682e822d21 Clean up 2011-09-25 08:27:09 +01:00
Tim Bentley
88c09d8981 Correct problem it tags not being used on song load 2011-09-25 07:37:40 +01:00
Raoul Snyman
0aadc32d4f Fixed the last part of bug #855342 where when you save a file a few times, it throws an exception. 
Fixes: https://launchpad.net/bugs/855342
 2011-09-24 00:14:23 +02:00
Martin Zibricky
3492681ca2 [merge] merge with truk r1756 2011-09-23 02:43:51 +02:00
Martin Zibricky
7d016dd6a6 Fix regressions with formattingtagsform 2011-09-23 02:41:01 +02:00
Martin Zibricky
354bec8b33 Fix - do not save temporary key by formatting tags into openlp configuration 2011-09-22 22:30:15 +02:00
rimach
81be1f36ae bugfixing and sync with trunk 2011-09-22 21:21:34 +02:00
rimach
d88f437ffc bugfixing 2011-09-22 21:20:25 +02:00
rimach
11aae0bb82 sync with trunnk 2011-09-22 20:54:05 +02:00
rimach
18bda31ee9 correct merge proposal issues 2011-09-22 20:22:35 +02:00
Martin Zibricky
8b6887036b Fix regressions with users tags in preview and import/export in openlyrics 2011-09-22 16:23:51 +02:00
Raoul Snyman
e3ecee8ae5 Fixed bug #855342 where saving an already-saved service file with an audio file in it caused an exception. 
Fixes: https://launchpad.net/bugs/855342
 2011-09-21 22:47:30 +02:00
Martin Zibricky
c47f936fd5 [merge] Merge with trunk r1754 2011-09-21 01:08:46 +02:00
Raoul Snyman
429a1a4541 Remove reference to the non-existent __del__ method. 
Fixes: https://launchpad.net/bugs/854125
 2011-09-19 20:55:34 +02:00
Martin Zibricky
fa9287c11b [merge] Merge with trunk r1750 2011-09-19 00:45:19 +02:00
Stevan Pettit
0b6cc6134a Added a "Finish" button to the "No-internet" window of the First Time Wizard. 
Added code to this button to process any changes made in the plugin screen.

bzr-revno: 1749
 2011-09-18 14:09:32 +01:00
Stevan Pettit
c44b4dccf2 Fixed import statements 2011-09-17 18:33:03 -04:00