[Openlp-core] [Merge] lp:~rapecik/openlp/bug-941692 into lp:openlp

2012-02-28 Thread noreply
The proposal to merge lp:~rapecik/openlp/bug-941692 into lp:openlp has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~rapecik/openlp/bug-941692/+merge/94967 -- https://code.launchpad.net/~rapecik/openlp/bug-941692/+merge/94967 Your team OpenLP Co

[Openlp-core] [Merge] lp:~rapecik/openlp/bug-941692 into lp:openlp

2012-02-28 Thread Raoul Snyman
The proposal to merge lp:~rapecik/openlp/bug-941692 into lp:openlp has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~rapecik/openlp/bug-941692/+merge/94967 -- https://code.launchpad.net/~rapecik/openlp/bug-941692/+merge/94967 Your team Ope

Re: [Openlp-core] [Merge] lp:~rapecik/openlp/bug-941692 into lp:openlp

2012-02-28 Thread Raoul Snyman
Review: Approve -- https://code.launchpad.net/~rapecik/openlp/bug-941692/+merge/94967 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscri

Re: [Openlp-core] [Merge] lp:~rapecik/openlp/bug-941692 into lp:openlp

2012-02-28 Thread Jonathan Corwin
Review: Approve -- https://code.launchpad.net/~rapecik/openlp/bug-941692/+merge/94967 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscri

[Openlp-core] [Merge] lp:~rapecik/openlp/bug-941692 into lp:openlp

2012-02-28 Thread Rastislav Pecik
Rastislav Pecik has proposed merging lp:~rapecik/openlp/bug-941692 into lp:openlp. Requested reviews: Jonathan Corwin (j-corwin) Raoul Snyman (raoul-snyman) Related bugs: Bug #941692 in OpenLP: "Wrong encoding when connecting to mysql database" https://bugs.launchpad.net/openlp/+bug/94169

[Openlp-core] [Merge] lp:~rapecik/openlp/bug-941692 into lp:openlp

2012-02-28 Thread Rastislav Pecik
Rastislav Pecik has proposed merging lp:~rapecik/openlp/bug-941692 into lp:openlp. Requested reviews: Raoul Snyman (raoul-snyman) Jonathan Corwin (j-corwin) Related bugs: Bug #941692 in OpenLP: "Wrong encoding when connecting to mysql database" https://bugs.launchpad.net/openlp/+bug/94169

Re: [Openlp-core] [Merge] lp:~rapecik/openlp/bug-941692 into lp:openlp

2012-02-28 Thread Meinert Jordan
Oh sorry, the toString() is needed, but the default value should not need to be QVariant type. -- https://code.launchpad.net/~rapecik/openlp/bug-941692/+merge/94944 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://laun

Re: [Openlp-core] [Merge] lp:~rapecik/openlp/bug-941692 into lp:openlp

2012-02-28 Thread Meinert Jordan
diff line 9: this is enough: db_encoding = unicode(settings.value(u'db encoding', u'utf8')) diff line 11: you may save the brackets: self.db_url += u'?charset=%s' % urlquote(db_encoding) -- https://code.launchpad.net/~rapecik/openlp/bug-941692/+merge/94944 Your team OpenLP Core is subscribed to

Re: [Openlp-core] [Merge] lp:~rapecik/openlp/bug-941692 into lp:openlp

2012-02-28 Thread Rastislav Pecik
I have changed the code according to your comments. settings.value now uses the second argument as a default one. -- https://code.launchpad.net/~rapecik/openlp/bug-941692/+merge/94944 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing

Re: [Openlp-core] [Merge] lp:~rapecik/openlp/bug-941692 into lp:openlp

2012-02-28 Thread Jonathan Corwin
Review: Needs Fixing When you make changes/fixes, please could you then resubmit your proposal, using the "Resubmit proposal" link on the merge proposal page. Thanks! However regarding your change, it is possible to provide a default value as a second argument to QSettings.value(), so instead o

Re: [Openlp-core] [Merge] lp:~rapecik/openlp/bug-941692 into lp:openlp

2012-02-27 Thread Rastislav Pecik
I have cleaned the code as you have requested and I have also created the functionality, where the encoding is being loaded from configuration file from "db encoding=". If the configuration file does not contain db encoding, then utf8 is used as a default one. Encodings that can be used are foun

Re: [Openlp-core] [Merge] lp:~rapecik/openlp/bug-941692 into lp:openlp

2012-02-27 Thread Jonathan Corwin
Review: Needs Information Would the MySQL database always be utf8, or could a user set it as a different type? I.e. might the charset need to be configurable? -- https://code.launchpad.net/~rapecik/openlp/bug-941692/+merge/94702 Your team OpenLP Core is subscribed to branch lp:openlp.

Re: [Openlp-core] [Merge] lp:~rapecik/openlp/bug-941692 into lp:openlp

2012-02-26 Thread Raoul Snyman
Review: Needs Fixing Thanks for the contribution! We're really glad to see you helping out! This looks good, but there are two fixes I would like you to make: Firstly, according to our style guide, and according to PEP8, you should not have a space before the : in your elif. Secondly, it would

[Openlp-core] [Merge] lp:~rapecik/openlp/bug-941692 into lp:openlp

2012-02-26 Thread Rastislav Pecik
Rastislav Pecik has proposed merging lp:~rapecik/openlp/bug-941692 into lp:openlp. Requested reviews: OpenLP Core (openlp-core) Related bugs: Bug #941692 in OpenLP: "Wrong encoding when connecting to mysql database" https://bugs.launchpad.net/openlp/+bug/941692 For more details, see: https