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

260 Commits

Author SHA1 Message Date
Raoul Snyman 6d236e9671 Fixed two issues in FreeBSD. Firstly, the translation files were never being picked up, and secondly, OpenLP is installed into /usr/local, so we need to make provision for that. 2012-07-08 21:27:43 +02:00
Samuel Findlay 4510fdbede Added three names in Copyright headers and About window (Samuel Findlay, Edwin Lunando, Dave Warnock). Fixed consistency issues. 2012-06-23 00:14:53 +10:00
Stevan Pettit 245c0acd89 Merge with trunk, resolve conflicts 2012-06-09 19:14:28 -04:00
Stevan Pettit d00a3898e1 Merge with trunk. Fixed conflict 2012-06-08 19:19:03 -04:00
Stevan Pettit 394a02c696 Merged trunk 2012-05-29 08:59:11 -04:00
Stevan Pettit 968674a659 Merged with trunk, fixed conflicts and other changes 2012-05-20 23:06:17 -04:00
Andreas Preikschat 9fa14f3e3a attempt to fix bug 923496 
Fixes: https://launchpad.net/bugs/923496
 2012-05-20 17:52:21 +02:00
Stevan Pettit f1586052a6 Added code to allow OpenLP to run portable 2012-05-11 08:22:34 -04:00
Stevan Pettit cf0e8c184e Fixed code per comments. Fixed misc syntax errors. 2012-05-10 19:23:45 -04:00
Stevan Pettit 3f62cc16bb Merged with trunk. Resolved a conflict 2012-05-03 20:19:11 -04:00
Stevan Pettit e86272f4d5 Fixed dialogues. Made changes to GUI. 2012-05-03 14:30:30 -04:00
Raoul Snyman c03403f103 HEAD 2012-05-01 20:42:34 +02:00
Andreas Preikschat 99314e762d refactor version comparison code; removed dead code 
bzr-revno: 1959
 2012-05-01 14:58:22 +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
Andreas Preikschat 76c004bb9a fixed LooseVersion usage 2012-04-28 18:19:02 +02:00
Andreas Preikschat 69affcc059 removed dead code, refactor version comparison code 2012-04-28 15:51:05 +02:00
Andreas Preikschat 38e5635901 r1955 2012-04-28 15:19:26 +02:00
M2j 3185e0b101 removed whitespaces at line ends 2012-04-04 09:26:51 +02:00
Philip Ridout cb38c0acd7 corrected the raw strings and back slashes 2012-03-23 06:36:24 +00:00
Philip Ridout 61ecf629cd added + 2012-03-22 21:09:20 +00:00
Philip Ridout 77f283c182 added the plus 2012-03-22 20:37:38 +00:00
Philip Ridout d4bfda2ade Made modifications according to merge request 2012-03-22 17:22:01 +00:00
Philip Ridout 1fd08401bf Fix for bug 952533 2012-03-22 06:50:54 +00:00
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
M2j 970e6c5564 correct parenting of shortcut actions in slide controller 2012-03-04 20:06:49 +01:00
Philip Ridout d77534dc34 Fixes 439 on the support tracker 2012-02-27 18:41:24 +00: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
Jon Tibble 768c099971 Indentation 2011-12-31 17:36:58 +00:00
Tim Bentley 2a5e8935bb New year merge 2011-12-27 10:33:55 +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
Andreas Preikschat 27843ae718 removed space 2011-12-15 16:27:17 +01:00
Andreas Preikschat d2cf6aa684 fixed a i18n bug + remove shortcut from map if removing the action 2011-12-14 16:45:11 +01: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
Andreas Preikschat f1485aba47 r1830 + resolved conflict 2011-12-10 21:35:11 +01:00
Andreas Preikschat 3cde99d9d9 update map when shortcuts change 2011-12-10 15:03:41 +01:00
Andreas Preikschat 9967e34d0a re reverted changes 
Fixes: https://launchpad.net/bugs/768495
 2011-12-10 15:03:08 +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
Mattias Põldaru 97560f6947 The category strings, if not unicode, can only be QStrings. Thanks to superfly. 2011-12-08 14:13:57 +02:00
Andreas Preikschat 32f2dcac59 reverted change 2011-12-07 21:28:26 +01:00
Mattias Põldaru ef3e3252e7 Comparison to None is discouraged 2011-12-07 00:37:56 +02:00
Mattias Põldaru 1830cfbe9e Ensure that action category names are unicode, to prevent warnings on comparison. 2011-12-06 23:25:04 +02:00
Andreas Preikschat 38a2a3dee2 fixed bug 768495 2011-12-06 20:30:39 +01:00
Andreas Preikschat 36e729303c reverted changes 2011-12-06 20:25:12 +01:00
Andreas Preikschat 5bfc101f09 changed name 2011-12-03 16:09:03 +01:00
Andreas Preikschat eb121abb12 attempt to fix bug 768495 
Fixes: https://launchpad.net/bugs/768495
 2011-12-03 15:38:30 +01:00
Martin Zibricky 14e94f8758 RAW code for OpenLyrics import with formatting tags 2011-09-18 01:22:16 +02:00
Martin Zibricky fb664bed0c Remove openlyrics tests for easier merging. They will be merged later. 2011-09-12 22:35:39 +02:00
Martin Zibricky 606e19734c Allow to override data dir for tests 2011-09-11 22:29:25 +02:00