Re: [Openlp-core] [Merge] lp:~sam92/openlp/fix-songbeamer-import into lp:openlp

2013-09-26 Thread Meinert Jordan
@ sam92: The first open() call opens the file already in ascii mode with the systems standard encoding. Therefore chardet makes no sense as it does not get the raw data. This open() call crashes even before chardet is doing anything because the encoding is wrong. Accessing the file in byte mode

Re: [Openlp-core] [Merge] lp:~sam92/openlp/fix-songbeamer-import into lp:openlp

2013-09-26 Thread Meinert Jordan
Ah, now I see, what was the issue. I did not look for the line number and expected the other open() to fail. So just adding the tiny “b” is the sufficient fix. -- https://code.launchpad.net/~sam92/openlp/fix-songbeamer-import/+merge/187815 Your team OpenLP Core is subscribed to branch lp:openlp.

Re: [Openlp-core] [Merge] lp:~sam92/openlp/fix-songbeamer-import into lp:openlp

2013-09-26 Thread Meinert Jordan
I guess the reason is, that chardet does not test the whole file, but just the leading xx bytes. In this case you can catch the exception and either ask chardet to analze the whole data (if possible) or ask the user (there should be such a dialog for the OLP1 importer). -- https://code.launchp

Re: [Openlp-core] [Merge] lp:~sam92/openlp/fix-songbeamer-import into lp:openlp

2013-09-26 Thread Meinert Jordan
The encoding of the SongBeamer files are determined by the system encoding of the Windows installation. So it can be almost everything. Even different for multiple files you import in one run. -- https://code.launchpad.net/~sam92/openlp/fix-songbeamer-import/+merge/187815 Your team OpenLP Core i

Re: [Openlp-core] [Merge] lp:~sam92/openlp/fix-songbeamer-import into lp:openlp

2013-09-26 Thread Meinert Jordan
What means: chardet failed? Was there some crash, or wrong detection? Removing chrdet is no solution. SongBeamer files come in abriatary encoding. I've seen Latin-1 as well as UTF-8 and UTF-16. -- https://code.launchpad.net/~sam92/openlp/fix-songbeamer-import/+merge/187815 Your team OpenLP Core i

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-06 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-1094342 into lp:openlp. Requested reviews: Andreas Preikschat (googol) Tim Bentley (trb143) Raoul Snyman (raoul-snyman) Related bugs: Bug #1094342 in OpenLP: "Natural sorting broken on windows" https://bugs.launchpad.net/o

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-06 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-1094342 into lp:openlp. Requested reviews: Andreas Preikschat (googol) Raoul Snyman (raoul-snyman) Tim Bentley (trb143) Related bugs: Bug #1094342 in OpenLP: "Natural sorting broken on windows" https://bugs.launchpad.net/o

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-05 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-1094342 into lp:openlp. Requested reviews: Tim Bentley (trb143) Raoul Snyman (raoul-snyman) Andreas Preikschat (googol) Related bugs: Bug #1094342 in OpenLP: "Natural sorting broken on windows" https://bugs.launchpad.net/o

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-05 Thread Meinert Jordan
Thanks the approves and the "locale" hint. -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/156691 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-02 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-1094342 into lp:openlp. Requested reviews: Andreas Preikschat (googol) Related bugs: Bug #1094342 in OpenLP: "Natural sorting broken on windows" https://bugs.launchpad.net/openlp/+bug/1094342 For more details,

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-02 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-1094342 into lp:openlp. Requested reviews: Andreas Preikschat (googol) Related bugs: Bug #1094342 in OpenLP: "Natural sorting broken on windows" https://bugs.launchpad.net/openlp/+bug/1094342 For more details,

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-31 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-1094342 into lp:openlp. Requested reviews: Andreas Preikschat (googol) Related bugs: Bug #1094342 in OpenLP: "Natural sorting broken on windows" https://bugs.launchpad.net/openlp/+bug/1094342 For more details,

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-31 Thread Meinert Jordan
I will compile the regexp in a variable called DIGITS_OR_NONDIGITS. I will use list compression. I used a loop before, as there were originally more code in the loop. About the memory usage: It is approximately same as before. The only difference is, that we are storing keys for the strings inst

[Openlp-core] [Bug 1094342] Re: Natural sorting broken on windows

2013-03-31 Thread Meinert Jordan
** Changed in: openlp/trunk Status: Confirmed => Fix Committed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1094342 Title: Natural sorting broken on windows Status in OpenLP - Worship Prese

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-31 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-1094342 into lp:openlp. Requested reviews: Andreas Preikschat (googol) Related bugs: Bug #1094342 in OpenLP: "Natural sorting broken on windows" https://bugs.launchpad.net/openlp/+bug/1094342 For more details,

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-31 Thread Meinert Jordan
The proposal to merge lp:~m2j/openlp/bug-1094342 into lp:openlp has been updated. Description changed to: This branch replaces the "cmp=" argument when sorting a list of strings. This is necessary for Python3 transition. Additionally it uses ICU for locale aware string sorting. For Windows thi

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-31 Thread Meinert Jordan
> Works on windows and one linux. I tested the sorting only with py2. On py3 I > only tested if it starts. > > I haven't reviewed the code nor did performance tests yet. Hi, I've looked to the Song class, and realized, that it makes sence to buffer the whole key generation for song titles. This

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-30 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-1094342 into lp:openlp. Commit message: - use ICU for string sorting - switch to Python 3 style sorting Requested reviews: Andreas Preikschat (googol) Related bugs: Bug #1094342 in OpenLP: "Natural sorting broken on windows&quo

[Openlp-core] [Bug 1094342] Re: Natural sorting broken on windows

2013-03-30 Thread Meinert Jordan
** Branch linked: lp:~m2j/openlp/bug-1094342 -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1094342 Title: Natural sorting broken on windows Status in OpenLP - Worship Presentation Software: Confi

Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/version-files into lp:openlp

2013-01-08 Thread Meinert Jordan
54: you could just check for: if int(version_parts[1]) % 2: and swarp the next lines -- https://code.launchpad.net/~raoul-snyman/openlp/version-files/+merge/142402 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launc

Re: [Openlp-core] [Merge] lp:~sam92/openlp/fix-import-non-ascii-path into lp:openlp/2.0

2013-01-05 Thread Meinert Jordan
Samuel Mehrbrodt: Congratulation to your first merged code contribution. -- https://code.launchpad.net/~sam92/openlp/fix-import-non-ascii-path/+merge/141892 Your team OpenLP Core is subscribed to branch lp:openlp/2.0. ___ Mailing list: https://launchpad

Re: [Openlp-core] [Merge] lp:~arjan-i/openlp/check_dependencies_fix into lp:openlp

2013-01-05 Thread Meinert Jordan
from distutils.version import StrictVersion -- https://code.launchpad.net/~arjan-i/openlp/check_dependencies_fix/+merge/141931 Your team OpenLP Core is requested to review the proposed merge of lp:~arjan-i/openlp/check_dependencies_fix into lp:openlp.

[Openlp-core] [Bug 1093184] Re: UnicodeError, when importing presentation files with non-ASCII in file name

2013-01-05 Thread Meinert Jordan
This was a QString > unicode conversion error. So it has been fixed by Andreas' sip-patch. I was asked to file a bug report to support Samuels OpenLP/2.0 merge request. -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launc

Re: [Openlp-core] [Merge] lp:~sam92/openlp/fix-import-non-ascii-path into lp:openlp/2.0

2012-12-22 Thread Meinert Jordan
Samuel: I encourage you, to finish it, as you're almost there. - The current line 10 would be completely fine as patch - You may add the comment of line 9 as well (in my own changes, I wouldn't mention that, but feel free to do it anyhow) - As 2.0 is stable, the changes should be limited to the ab

[Openlp-core] [Bug 1093184] [NEW] UnicodeError, when importing presentation files with non-ASCII in file name

2012-12-22 Thread Meinert Jordan
Public bug reported: *OpenLP Bug Report* Version: {u'full': u'2.0', u'version': u'2.0', u'build': None} --- Details of the Exception. --- When importing presentations, with a file name containing non-ASCII characters, a exception is thrown. Reproducable: always Reason: file list of the open dia

Re: [Openlp-core] [Merge] lp:~sam92/openlp/fix-import-non-ascii-path into lp:openlp/2.0

2012-12-22 Thread Meinert Jordan
> Is there a bug this relates to? Yes: A exception triggered on importing presentations with non-ASCII chars. But there's no bug report on Launchpad. -- https://code.launchpad.net/~sam92/openlp/fix-import-non-ascii-path/+merge/140779 Your team OpenLP Core is subscribed to branch lp:openlp/2.0. _

Re: [Openlp-core] [Merge] lp:~sam92/openlp/fix-import-non-ascii-path into lp:openlp/2.0

2012-12-22 Thread Meinert Jordan
Have you carefully checked all possible calls of loadList()? I would feel better, if we limit the change to the bug fix, and do not include cleanups. -- https://code.launchpad.net/~sam92/openlp/fix-import-non-ascii-path/+merge/140779 Your team OpenLP Core is subscribed to branch lp:openlp/2.0. _

Re: [Openlp-core] [Merge] lp:~m2j/openlp/argument_name_fix into lp:openlp

2012-12-20 Thread Meinert Jordan
> does this occur in 2.0 too? Yes: https://code.launchpad.net/~m2j/openlp/argument_name_fix/+merge/140663 -- https://code.launchpad.net/~m2j/openlp/argument_name_fix/+merge/140804 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list

[Openlp-core] [Merge] lp:~m2j/openlp/argument_name_fix into lp:openlp

2012-12-19 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/argument_name_fix into lp:openlp. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~m2j/openlp/argument_name_fix/+merge/140804 Minor fix for initial disabeling of up and down arrow. -- https

Re: [Openlp-core] [Merge] lp:~m2j/openlp/formattingtags into lp:openlp

2012-12-19 Thread Meinert Jordan
Andreas Preikschat (googol) wrote: > I had a chat with the other devs about your proposal. > And most of us found your solution better than the old dialog, > but also less intuitive. Do you have any suggest to improve this? First: Do you have seen versions with additional "new" and "delete" button

Re: [Openlp-core] [Merge] lp:~m2j/openlp/formattingtags into lp:openlp

2012-12-19 Thread Meinert Jordan
> Had 5 mins to have a look and I must say it is better but still cannot > understand why it needed a re-write. Well, the initial reason was to add some validation. Especially to enforce correct opening and closing tags. Without this it is not clear, how to handle custom tags in my new lyrics edi

Re: [Openlp-core] [Merge] lp:~sam92/openlp/fix-import-non-ascii-path into lp:openlp/2.0

2012-12-19 Thread Meinert Jordan
type() will be correct for sure. I knew, that there is no QList in PyQt, but I missed, that they still use QStringList. So I remembered wrong. -- https://code.launchpad.net/~sam92/openlp/fix-import-non-ascii-path/+merge/140651 Your team OpenLP Core is requested to review the proposed merge of lp

[Openlp-core] [Merge] lp:~m2j/openlp/argument_name_fix into lp:openlp/2.0

2012-12-19 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/argument_name_fix into lp:openlp/2.0. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~m2j/openlp/argument_name_fix/+merge/140663 Minor fix for initial disabeling of up and down arrow. -- https

Re: [Openlp-core] [Merge] lp:~sam92/openlp/fix-import-non-ascii-path into lp:openlp/2.0

2012-12-19 Thread Meinert Jordan
IIRC QtGui.QFileDialog.getOpenFileNames() returns a PYTHON list of QStrings. -- https://code.launchpad.net/~sam92/openlp/fix-import-non-ascii-path/+merge/140651 Your team OpenLP Core is requested to review the proposed merge of lp:~sam92/openlp/fix-import-non-ascii-path into lp:openlp/2.0. _

[Openlp-core] [Merge] lp:~m2j/openlp/formattingtags into lp:openlp

2012-12-19 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/formattingtags into lp:openlp. Requested reviews: Tim Bentley (trb143) For more details, see: https://code.launchpad.net/~m2j/openlp/formattingtags/+merge/140652 I forgot about this branch, and didn't realized, that it was never merged

Re: [Openlp-core] [Merge] lp:~m2j/openlp/formattingtags into lp:openlp

2012-12-19 Thread Meinert Jordan
I don't want to argue with you and I can only lose. But you bypassed my question: Two days ago I asked you to post the falsely verified HTML, you already tested. No more testing. It doesn't help to tag a merge request as "need fixing" in first place, without explaining what's going wrong. I've

Re: [Openlp-core] [Merge] lp:~sam92/openlp/fix-import-presentation into lp:openlp

2012-12-19 Thread Meinert Jordan
Modify it. The problem might get triggered in other plugins as well. -- https://code.launchpad.net/~sam92/openlp/fix-import-presentation/+merge/140540 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~open

Re: [Openlp-core] [Merge] lp:~sam92/openlp/fix-import-presentation into lp:openlp

2012-12-19 Thread Meinert Jordan
Phill: Tim is right. I guess there should be a merge request towards lp:openlp/2.0 branch. -- https://code.launchpad.net/~sam92/openlp/fix-import-presentation/+merge/140540 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: http

Re: [Openlp-core] [Merge] lp:~m2j/openlp/formattingtags into lp:openlp

2012-12-18 Thread Meinert Jordan
> Sorry but limited time this week big production at church over the weekend > id taking up my time. For the fact, that you are answering other merge requests, and just have to state, which string you've tested, it's hard for me to understand. I'm pretty sure, that there is no such problem. --

Re: [Openlp-core] [Merge] lp:~m2j/openlp/formattingtags into lp:openlp

2012-12-18 Thread Meinert Jordan
> Tim: It would be great to get any response. > I still don't know, which HTML setting you can not realize. Oh, just realized: Which one you CAN realize. Still: I need a example. -- https://code.launchpad.net/~m2j/openlp/formattingtags/+merge/140195 Your team OpenLP Core is subscribed to branch l

Re: [Openlp-core] [Merge] lp:~m2j/openlp/formattingtags into lp:openlp

2012-12-18 Thread Meinert Jordan
Tim: It would be great to get any response. I still don't know, which HTML setting you can not realize. -- https://code.launchpad.net/~m2j/openlp/formattingtags/+merge/140195 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: htt

Re: [Openlp-core] [Merge] lp:~sam92/openlp/fix-import-presentation into lp:openlp

2012-12-18 Thread Meinert Jordan
Review: Needs Fixing The error happens in openlp/core/lib/mediamanageritem.py:341 At this point, a list of QString is catched and forwarded without conversion to unicode. Please make the fix at this position. -- https://code.launchpad.net/~sam92/openlp/fix-import-presentation/+merge/140540 Your

Re: [Openlp-core] [Merge] lp:~m2j/openlp/formattingtags into lp:openlp

2012-12-17 Thread Meinert Jordan
Can you give some example for a setting, you can not realize (and which mases sense of cause)? According to the realization of the editor: I may add some "new" push button, which focuses on the corresponding cell, and some "delete" button, which removes the current row. That are the only points

[Openlp-core] [Merge] lp:~m2j/openlp/formattingtags into lp:openlp

2012-12-17 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/formattingtags into lp:openlp. Requested reviews: Tim Bentley (trb143) For more details, see: https://code.launchpad.net/~m2j/openlp/formattingtags/+merge/140195 I forgot about this branch, and didn't realized, that it was never merged

Re: [Openlp-core] [Merge] lp:~m2j/openlp/formattingtags into lp:openlp

2012-12-17 Thread Meinert Jordan
> As a general point we should not mix reformatting and code changes but that > needs to be ratified!. It is rather a complete rewrite. I can submitt this in the old style, but I don't see the point. > 241-242 and 243-244 should be one line. This is done for purpose, as I think it is nicer to ma

[Openlp-core] [Merge] lp:~m2j/openlp/formattingtags into lp:openlp

2012-12-17 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/formattingtags into lp:openlp. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~m2j/openlp/formattingtags/+merge/140176 I forgot about this branch, and didn't realized, that it was never m

[Openlp-core] [Merge] lp:~m2j/openlp/formattingtags into lp:openlp

2012-12-17 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/formattingtags into lp:openlp. Commit message: formatting tag editor reworked Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~m2j/openlp/formattingtags/+merge/140132 I forgot about this branch

Re: [Openlp-core] [Merge] lp:~googol/openlp/bug-779201 into lp:openlp

2012-12-08 Thread Meinert Jordan
I just realized, that I the merge request with my comments is superseeded: https://code.launchpad.net/~googol/openlp/bug-779201/+merge/138308 As you still break string sorting on Windows: Have you seen my comments? -- https://code.launchpad.net/~googol/openlp/bug-779201/+merge/138581 Your team Op

Re: [Openlp-core] [Merge] lp:~googol/openlp/bug-779201 into lp:openlp

2012-12-05 Thread Meinert Jordan
Oh, and the guess " and probably somewhere else" in line 3536 is just wrong. Windows is the only platform with a broken implementation. Details about this are linked here: https://code.launchpad.net/~m2j/openlp/bug-687638/+merge/89098 -- https://code.launchpad.net/~googol/openlp/bug-779201/+merge

Re: [Openlp-core] [Merge] lp:~googol/openlp/bug-779201 into lp:openlp

2012-12-05 Thread Meinert Jordan
Explanation to lines 3534ff: Windows internal implementation of the POSIX locale.strcoll() does only work with ASCII. Python uses the Windows internal call. So it is broken, and we have to use a different commend. Possible candidates are ICU (extremely fast, but adds some megabytes of data) and

[Openlp-core] [Bug 1071170] [NEW] Exception on missing theme background image

2012-10-25 Thread Meinert Jordan
Public bug reported: I spotted the "Update Theme Images" menu item. So I just gave it a trial and it turned out, that there is a missing background image file in one of my themes. The same exception is also risen, if I set the theme as default, or edit it. I suggest to replace missing background

Re: [Openlp-core] [Merge] lp:~mzibricky/openlp/bug-687638 into lp:openlp

2012-10-13 Thread Meinert Jordan
Well, not on the bug report, but here: https://code.launchpad.net/~m2j/openlp/bug-687638/+merge/89098/comments/278985 -- https://code.launchpad.net/~mzibricky/openlp/bug-687638/+merge/129501 Your team OpenLP Core is subscribed to branch lp:openlp. ___ M

Re: [Openlp-core] [Merge] lp:~mzibricky/openlp/bug-687638 into lp:openlp

2012-10-13 Thread Meinert Jordan
Was this patch tested for big databases on Windows? (see my lost comment on the bug report) -- https://code.launchpad.net/~mzibricky/openlp/bug-687638/+merge/129501 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://laun

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-687638 into lp:openlp

2012-10-13 Thread Meinert Jordan
I suggested the use of Qt comparision as well, but as it was reported to have a poor performance, I delayed this until I had time to test the performance under Windows. For long time I did not take the time, to setup Windows and make a test. So please test the performance on Windows for big dat

Re: [Openlp-core] [Merge] lp:~smpettit/openlp/portable into lp:openlp

2012-05-22 Thread Meinert Jordan
Install "qbzr". Then you have a even nicer layout with "bzr qdiff". If you prefer gtk, I guess bzr-gtk will do the same. In case you use launchpad, you should uncheck "Needs review" in the extra options. -- https://code.launchpad.net/~smpettit/openlp/portable/+merge/106555 Your team OpenLP Core

[Openlp-core] [Merge] lp:~m2j/openlp/cleanups into lp:openlp

2012-05-01 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/cleanups into lp:openlp. Requested reviews: Andreas Preikschat (googol) For more details, see: https://code.launchpad.net/~m2j/openlp/cleanups/+merge/104232 pythonifying code: - replace has_key() by key in dict - remove len() method from

[Openlp-core] [Merge] lp:~m2j/openlp/cleanups into lp:openlp

2012-04-29 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/cleanups into lp:openlp. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~m2j/openlp/cleanups/+merge/104021 pythonifying code: - replace has_key() by key in dict - remove len() method from

[Openlp-core] [Merge] lp:~m2j/openlp/cleanups into lp:openlp

2012-04-29 Thread Meinert Jordan
The proposal to merge lp:~m2j/openlp/cleanups into lp:openlp has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~m2j/openlp/cleanups/+merge/104019 -- https://code.launchpad.net/~m2j/openlp/cleanups/+merge/104019 Your team OpenLP Core

[Openlp-core] [Merge] lp:~m2j/openlp/cleanups into lp:openlp

2012-04-29 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/cleanups into lp:openlp. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~m2j/openlp/cleanups/+merge/104019 pythonifying code: - replace has_key() by key in dict - remove len() method from

Re: [Openlp-core] [Merge] lp:~smpettit/openlp/data-path into lp:openlp

2012-04-11 Thread Meinert Jordan
I think the general approach is right. I'd also like to see this implemented in OpenLP. It has to be discussed, if we can accept this feature in OpenLP before 2.0 release. While it does not touch a lot of code, your code has to be very reliable, as it may make OpenLP complete unusable. -- https

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles into lp:openlp

2012-04-11 Thread Meinert Jordan
> No I couldn't. > Otherwise if I have a bible which only contain the New Testament, there will > be much space before the first Label & LineEdit is visible. > And at the End the same. If the bible doesn't contain apocrypha. > I tried it before you ask me to change it and after. > That's why I use

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles into lp:openlp

2012-04-11 Thread Meinert Jordan
Combo Box strings are title case: http://wiki.openlp.org/Development:String_Standards And you could replace the other occurence of .removeWidget() && .setParent(None) with .hide() as well. -- https://code.launchpad.net/~orangeshirt/openlp/bibles/+merge/101138 Your team OpenLP Core is subscribed

[Openlp-core] [Merge] lp:~m2j/openlp/cleanups into lp:openlp

2012-04-04 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/cleanups into lp:openlp. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~m2j/openlp/cleanups/+merge/100891 fix: wrong method name -- https://code.launchpad.net/~m2j/openlp/cleanups/+merge

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles into lp:openlp

2012-04-04 Thread Meinert Jordan
> 330ff.: If a bible doesn't contain all books it removes all unnecessary ones, > so that the user only see bookname that could be changed. > 317f: If it is a webbible the hole scrollarea is obsolete and removed, > because it is not possible to change the booknames. Well, I understood that so fa

[Openlp-core] [Bug 876211] Re: OpenLyrics export non-compliant for split verses

2012-04-04 Thread Meinert Jordan
break attribute? ** Changed in: openlp Assignee: (unassigned) => Meinert Jordan (m2j) -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/876211 Title: OpenLyrics export non-compliant for split ver

[Openlp-core] [Bug 970436] Re: "Display if a single screen" always in effect

2012-04-04 Thread Meinert Jordan
** Changed in: openlp Assignee: (unassigned) => Meinert Jordan (m2j) ** Changed in: openlp Status: Confirmed => In Progress -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/970436

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles into lp:openlp

2012-04-04 Thread Meinert Jordan
153: it should be bookNameWidget 159ff: QFormLayout::addRow ( QWidget * label, QWidget * field ) 178ff: The spacer takes place, if the scrollArea is visible. use: addStretch() 317f, 330ff: What is that supposed to do? 357: White is the wrong color. It does not work on dark themes. Implement so

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles into lp:openlp

2012-04-03 Thread Meinert Jordan
What is this? 285 +# can this be automated? 286 +self.width = 400 "self.width" is not used. Other than that you can access width() and height of the dialog after setupUi(). Width would be 600 in that case. -- https://code.launchpad.net/~orangeshirt/openlp/bibles/+merge/10

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles into lp:openlp

2012-04-03 Thread Meinert Jordan
I've not read each single line, but the code looks nice. There are some small things (spaces and u''s) you've missed at a lot of places 184 Greate, that you're already using it ;) 207 book name (with space) 211, 214 Combo box items shouls be title case 355, 175, 210, 215, 309, 468 spaces missing 3

Re: [Openlp-core] [Merge] lp:~m2j/openlp/cleanups into lp:openlp

2012-04-03 Thread Meinert Jordan
I've just tried to merge against HEAD. there are no conflicts. -- https://code.launchpad.net/~m2j/openlp/cleanups/+merge/100501 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : o

[Openlp-core] [Merge] lp:~m2j/openlp/bug-960386 into lp:openlp

2012-04-03 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-960386 into lp:openlp. Requested reviews: Raoul Snyman (raoul-snyman) Tim Bentley (trb143) Jonathan Corwin (j-corwin) For more details, see: https://code.launchpad.net/~m2j/openlp/bug-960386/+merge/100644 Bug #960386: string fixes fix

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-953240 into lp:openlp

2012-04-02 Thread Meinert Jordan
Yes. It should. It crops the additional data, and in case there are multiple subverses, they are merged with a [---] separator in between. -- https://code.launchpad.net/~m2j/openlp/bug-953240/+merge/100517 Your team OpenLP Core is requested to review the proposed merge of lp:~m2j/openlp/bug-9532

[Openlp-core] [Merge] lp:~m2j/openlp/bug-969282 into lp:openlp

2012-04-02 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-969282 into lp:openlp. Requested reviews: Tim Bentley (trb143) For more details, see: https://code.launchpad.net/~m2j/openlp/bug-969282/+merge/100520 Bug #969282: Remove control characters from song copyright string -- https

[Openlp-core] [Merge] lp:~m2j/openlp/bug-960386 into lp:openlp

2012-04-02 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-960386 into lp:openlp. Requested reviews: Raoul Snyman (raoul-snyman) Tim Bentley (trb143) For more details, see: https://code.launchpad.net/~m2j/openlp/bug-960386/+merge/100518 Bug #960386: string fixes fix missalignment of theme level

[Openlp-core] [Bug 953240] Re: OpenSong importer crashes at v1a verse markup

2012-04-02 Thread Meinert Jordan
** Changed in: openlp Assignee: (unassigned) => Meinert Jordan (m2j) ** Changed in: openlp Status: Confirmed => Fix Committed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/953240

[Openlp-core] [Merge] lp:~m2j/openlp/bug-953240 into lp:openlp

2012-04-02 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-953240 into lp:openlp. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~m2j/openlp/bug-953240/+merge/100517 Bug #953240: Merging subverse entries (e.g. v1a) at OpenSong import -- https

[Openlp-core] [Merge] lp:~m2j/openlp/bug-960386 into lp:openlp

2012-04-02 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-960386 into lp:openlp. Requested reviews: Tim Bentley (trb143) For more details, see: https://code.launchpad.net/~m2j/openlp/bug-960386/+merge/100504 Bug #960386: string fixes fix missalignment of theme level selection labels change

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-960386 into lp:openlp

2012-04-02 Thread Meinert Jordan
Sorry missed the "missing" one. Will apply all three changes -- https://code.launchpad.net/~m2j/openlp/bug-960386/+merge/100500 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : o

[Openlp-core] [Merge] lp:~m2j/openlp/bug-960386 into lp:openlp

2012-04-02 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-960386 into lp:openlp. Requested reviews: Tim Bentley (trb143) For more details, see: https://code.launchpad.net/~m2j/openlp/bug-960386/+merge/100500 Bug #960386: string fixes fix missalignment of theme level selection labels change

[Openlp-core] [Bug 917164] Re: Bible upgrade wizard - not localized language list

2012-04-02 Thread Meinert Jordan
So we have add some code to the translation_utils.py script, which extracts the strings from bibles_resources.sqlite and feed them into the *.ts file. So they can be translated. -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://b

[Openlp-core] [Bug 923500] Re: Service marked as changed when saving settings

2012-04-02 Thread Meinert Jordan
** Changed in: openlp Assignee: (unassigned) => Meinert Jordan (m2j) ** Changed in: openlp Status: Confirmed => Fix Committed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/923500

[Openlp-core] [Merge] lp:~m2j/openlp/bug-923500 into lp:openlp

2012-04-02 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-923500 into lp:openlp. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~m2j/openlp/bug-923500/+merge/100452 Bug #923500: Do not mark service changed when accepting settings dialog. -- https

[Openlp-core] [Bug 959116] Re: Split slide button should insert tag on its own line

2012-04-02 Thread Meinert Jordan
** Changed in: openlp Assignee: (unassigned) => Meinert Jordan (m2j) ** Changed in: openlp Status: Confirmed => Fix Committed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/959116

[Openlp-core] [Merge] lp:~m2j/openlp/bug-959116 into lp:openlp

2012-04-02 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-959116 into lp:openlp. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~m2j/openlp/bug-959116/+merge/100422 Bug #959116: Split slide button inserts tag on its own line -- https

[Openlp-core] [Merge] lp:~m2j/openlp/bug-959760 into lp:openlp

2012-04-02 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-959760 into lp:openlp. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~m2j/openlp/bug-959760/+merge/100414 Bug #959760: Change theme manager delete button visibility on default theme change

[Openlp-core] [Bug 959760] Re: Changing default theme does not change theme manager tool buttons

2012-04-02 Thread Meinert Jordan
** Changed in: openlp Assignee: (unassigned) => Meinert Jordan (m2j) ** Changed in: openlp Status: New => Fix Committed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/959760

[Openlp-core] [Merge] lp:~m2j/openlp/bug-795068 into lp:openlp

2012-04-02 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-795068 into lp:openlp. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~m2j/openlp/bug-795068/+merge/100409 Bug #795068: Verse List in Song Editor did not resize properly -- https

[Openlp-core] [Bug 795068] Re: Verse List in Song Editor does not resize properly

2012-04-02 Thread Meinert Jordan
** Changed in: openlp Assignee: Raoul Snyman (raoul-snyman) => Meinert Jordan (m2j) ** Changed in: openlp Status: In Progress => Fix Committed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchp

[Openlp-core] [Bug 967522] Re: HIghlighted item in service will move if dragging a blank area

2012-04-02 Thread Meinert Jordan
** Changed in: openlp Assignee: (unassigned) => Meinert Jordan (m2j) ** Changed in: openlp Importance: Undecided => Low ** Changed in: openlp Status: New => Fix Committed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed

[Openlp-core] [Merge] lp:~m2j/openlp/bug-967522 into lp:openlp

2012-04-02 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-967522 into lp:openlp. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~m2j/openlp/bug-967522/+merge/100399 Bug #967522: Don't drag from empty service manager area --

[Openlp-core] [Bug 969282] Re: Title, copyright and author are not shown

2012-04-02 Thread Meinert Jordan
** Changed in: openlp Assignee: (unassigned) => Meinert Jordan (m2j) ** Changed in: openlp Status: New => Fix Committed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/969282

[Openlp-core] [Merge] lp:~m2j/openlp/bug-969282 into lp:openlp

2012-04-02 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-969282 into lp:openlp. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~m2j/openlp/bug-969282/+merge/100395 Bug #969282: Remove control characters from song copyright string -- https

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-960386 into lp:openlp

2012-04-02 Thread Meinert Jordan
Lines 62-63: For me the sentence makes complete sense. Other than that some native speaker has to suggest some other string, as the problem seems to be my limites in English grammar. -- https://code.launchpad.net/~m2j/openlp/bug-960386/+merge/100383 Your team OpenLP Core is subscribed to branch

[Openlp-core] [Bug 960386] Re: String fixes after 1.9.9 release

2012-04-02 Thread Meinert Jordan
** Changed in: openlp Status: New => Fix Committed ** Changed in: openlp Assignee: (unassigned) => Meinert Jordan (m2j) -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/960386

[Openlp-core] [Merge] lp:~m2j/openlp/bug-960386 into lp:openlp

2012-04-02 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-960386 into lp:openlp. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~m2j/openlp/bug-960386/+merge/100383 Bug #960386: string fixes fix missalignment of theme level selection labels change

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/DreamBeam into lp:openlp

2012-04-02 Thread Meinert Jordan
Just had a short look to the sources: The version differences for the current formats are well documented in FileTypes/Song.cs:905-929. There is a older format until v0.5 which is handled via FileTypes/SongOld.cs. As they do not just handle this in the current file, I expect it to have major dif

Re: [Openlp-core] [Merge] lp:~m2j/openlp/cleanups into lp:openlp

2012-04-02 Thread Meinert Jordan
As I said: No features added, no functional change. Using the wrong button signal can be rated as bug, but I don't want to argue about it, as there is no point to argue about the categorisation. For usual releases such changes are permitted until the very end of the merge window. -- https://co

Re: [Openlp-core] [Merge] lp:~googol/openlp/bibles into lp:openlp

2012-04-01 Thread Meinert Jordan
Oh, something more: If you filter bibles before sorting it, you've less data to sort (of cause this is a low advantage for such short lists) -- https://code.launchpad.net/~googol/openlp/bibles/+merge/100333 Your team OpenLP Core is subscribed to branch lp:openlp.

Re: [Openlp-core] [Merge] lp:~googol/openlp/bibles into lp:openlp

2012-04-01 Thread Meinert Jordan
This would be another option (I prefere): line 39: tmp_bibles = filter(None, bibles) -- https://code.launchpad.net/~googol/openlp/bibles/+merge/100333 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~open

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/bug952533 into lp:openlp

2012-03-22 Thread Meinert Jordan
The plus is still missing. -- https://code.launchpad.net/~phill-ridout/openlp/bug952533/+merge/98885 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.

  1   2   3   >