Review Request: Fix sorting of style names

2012-12-30 Thread Pierre Stirnweiss

---
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/108020/
---

Review request for Calligra and C. Boemann.


Description
---

The style names containing a number were not sorted with natural order : 
Content 1/Content 10/Content 2.
This is because QString::localeAwareCompare does not sort with natural order. 
Use KSTringHandler::naturalCompare instead (it also uses 
QString::localeAwareCompare internally).

Ok to backport?


This addresses bug 288651.
http://bugs.kde.org/show_bug.cgi?id=288651


Diffs
-

  plugins/textshape/dialogs/DockerStylesComboModel.cpp c1ffaa1 
  plugins/textshape/dialogs/StylesModel.cpp 4b1b9f6 

Diff: http://git.reviewboard.kde.org/r/108020/diff/


Testing
---

Styles are sorted in natural order now. I could not test regressions where 
locale comparison would play a role however. But since KStringHandler's 
comparison uses the Qt one, I don't expect a regression there.


Thanks,

Pierre Stirnweiss

___
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel


Re: Review Request: Fix sorting of style names

2012-12-30 Thread C. Boemann

---
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/108020/#review24224
---

Ship it!


yes please backport too

great work

- C. Boemann


On Dec. 30, 2012, 9:08 a.m., Pierre Stirnweiss wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/108020/
> ---
> 
> (Updated Dec. 30, 2012, 9:08 a.m.)
> 
> 
> Review request for Calligra and C. Boemann.
> 
> 
> Description
> ---
> 
> The style names containing a number were not sorted with natural order : 
> Content 1/Content 10/Content 2.
> This is because QString::localeAwareCompare does not sort with natural order. 
> Use KSTringHandler::naturalCompare instead (it also uses 
> QString::localeAwareCompare internally).
> 
> Ok to backport?
> 
> 
> This addresses bug 288651.
> http://bugs.kde.org/show_bug.cgi?id=288651
> 
> 
> Diffs
> -
> 
>   plugins/textshape/dialogs/DockerStylesComboModel.cpp c1ffaa1 
>   plugins/textshape/dialogs/StylesModel.cpp 4b1b9f6 
> 
> Diff: http://git.reviewboard.kde.org/r/108020/diff/
> 
> 
> Testing
> ---
> 
> Styles are sorted in natural order now. I could not test regressions where 
> locale comparison would play a role however. But since KStringHandler's 
> comparison uses the Qt one, I don't expect a regression there.
> 
> 
> Thanks,
> 
> Pierre Stirnweiss
> 
>

___
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel


Re: Review Request: Fix sorting of style names

2012-12-30 Thread Commit Hook

---
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/108020/#review24225
---


This review has been submitted with commit 
36a0bd51606da12659519021c219a778fd77034a by Pierre Stirnweiss to branch 
calligra/2.6.

- Commit Hook


On Dec. 30, 2012, 9:08 a.m., Pierre Stirnweiss wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/108020/
> ---
> 
> (Updated Dec. 30, 2012, 9:08 a.m.)
> 
> 
> Review request for Calligra and C. Boemann.
> 
> 
> Description
> ---
> 
> The style names containing a number were not sorted with natural order : 
> Content 1/Content 10/Content 2.
> This is because QString::localeAwareCompare does not sort with natural order. 
> Use KSTringHandler::naturalCompare instead (it also uses 
> QString::localeAwareCompare internally).
> 
> Ok to backport?
> 
> 
> This addresses bug 288651.
> http://bugs.kde.org/show_bug.cgi?id=288651
> 
> 
> Diffs
> -
> 
>   plugins/textshape/dialogs/DockerStylesComboModel.cpp c1ffaa1 
>   plugins/textshape/dialogs/StylesModel.cpp 4b1b9f6 
> 
> Diff: http://git.reviewboard.kde.org/r/108020/diff/
> 
> 
> Testing
> ---
> 
> Styles are sorted in natural order now. I could not test regressions where 
> locale comparison would play a role however. But since KStringHandler's 
> comparison uses the Qt one, I don't expect a regression there.
> 
> 
> Thanks,
> 
> Pierre Stirnweiss
> 
>

___
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel


Re: Review Request: Fix sorting of style names

2012-12-30 Thread Commit Hook

---
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/108020/#review24226
---


This review has been submitted with commit 
bec31b80838bfbad6237f6d6053228613ed2 by Pierre Stirnweiss to branch master.

- Commit Hook


On Dec. 30, 2012, 9:08 a.m., Pierre Stirnweiss wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/108020/
> ---
> 
> (Updated Dec. 30, 2012, 9:08 a.m.)
> 
> 
> Review request for Calligra and C. Boemann.
> 
> 
> Description
> ---
> 
> The style names containing a number were not sorted with natural order : 
> Content 1/Content 10/Content 2.
> This is because QString::localeAwareCompare does not sort with natural order. 
> Use KSTringHandler::naturalCompare instead (it also uses 
> QString::localeAwareCompare internally).
> 
> Ok to backport?
> 
> 
> This addresses bug 288651.
> http://bugs.kde.org/show_bug.cgi?id=288651
> 
> 
> Diffs
> -
> 
>   plugins/textshape/dialogs/DockerStylesComboModel.cpp c1ffaa1 
>   plugins/textshape/dialogs/StylesModel.cpp 4b1b9f6 
> 
> Diff: http://git.reviewboard.kde.org/r/108020/diff/
> 
> 
> Testing
> ---
> 
> Styles are sorted in natural order now. I could not test regressions where 
> locale comparison would play a role however. But since KStringHandler's 
> comparison uses the Qt one, I don't expect a regression there.
> 
> 
> Thanks,
> 
> Pierre Stirnweiss
> 
>

___
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel


Re: Review Request: Fix sorting of style names

2012-12-30 Thread Commit Hook

---
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/108020/#review24227
---


This review has been submitted with commit 
7ea974af2415e3c4aa4ed6f4f2ce1c02f1e20b38 by Pierre Stirnweiss to branch 
textshape-stylesWidget-PierreSt.

- Commit Hook


On Dec. 30, 2012, 9:08 a.m., Pierre Stirnweiss wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/108020/
> ---
> 
> (Updated Dec. 30, 2012, 9:08 a.m.)
> 
> 
> Review request for Calligra and C. Boemann.
> 
> 
> Description
> ---
> 
> The style names containing a number were not sorted with natural order : 
> Content 1/Content 10/Content 2.
> This is because QString::localeAwareCompare does not sort with natural order. 
> Use KSTringHandler::naturalCompare instead (it also uses 
> QString::localeAwareCompare internally).
> 
> Ok to backport?
> 
> 
> This addresses bug 288651.
> http://bugs.kde.org/show_bug.cgi?id=288651
> 
> 
> Diffs
> -
> 
>   plugins/textshape/dialogs/DockerStylesComboModel.cpp c1ffaa1 
>   plugins/textshape/dialogs/StylesModel.cpp 4b1b9f6 
> 
> Diff: http://git.reviewboard.kde.org/r/108020/diff/
> 
> 
> Testing
> ---
> 
> Styles are sorted in natural order now. I could not test regressions where 
> locale comparison would play a role however. But since KStringHandler's 
> comparison uses the Qt one, I don't expect a regression there.
> 
> 
> Thanks,
> 
> Pierre Stirnweiss
> 
>

___
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel


Re: Review Request: Make the epub filter handle math formulas

2012-12-30 Thread Inge Wallin


> On Dec. 28, 2012, 2:45 p.m., C. Boemann wrote:
> > there is a few places where you have:
> > 
> > if ()
> > {
> > 
> > and one place where there is no {} after if
> > 
> > other than that I've not looked yet - I assume you want moji to review
> 
> Inge Wallin wrote:
> The 
> 
> if ()
> {
> 
> construct is only used where the test is >1 line.  If I put the { at the 
> end of the line, the first statement inside the brackets will be perfectly 
> aligned with the test. I find that a bit difficult to read, hence this way of 
> getting around it.
>
> 
> C. Boemann wrote:
> I'm not arguing against the merrits of it. I have personally always 
> preferred this way of placing braces. However I also think we should follow 
> the hacking style at all times. This way may be easier for you to read but 
> the point of a acking style is that anyone with a minimum of trouble can come 
> in and work on the code. After all we are supposed to be an open community.
> 
> For case like you desribe I personally write like this (knowing full well 
> that this is my personal style as well (though not prohibited by the official 
> style):
> 
> if (bla bla bla bla bla bla bla bla bla
> bla bla bla bla bla bla bla
> bla bla bla bla bla) {
> foo;
> bar;
> }
> 
> another way not against the hacking style would be:
> 
> if (bla bla bla bla bla bla bla bla bla
> bla bla bla bla bla bla bla
> bla bla bla bla bla) {
> foo;
> bar;
> }
> 
> In the end I don't care all that much about this issue, but will close by 
> saying that the day we do sweeping hacking style cleanups your carefully 
> crafted (and special cased) exceptions would be probably be gone. My 
> variations are more likely not to be touched.

You're right.  I would prefer to have one solution we could all agree on and 
use everywhere. Your first example works well too. But are you sure that it 
will survive the sweeping hacking style cleanup, which I suppose will be 
automatic?


- Inge


---
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/107969/#review24105
---


On Dec. 30, 2012, 4:44 a.m., Inge Wallin wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/107969/
> ---
> 
> (Updated Dec. 30, 2012, 4:44 a.m.)
> 
> 
> Review request for Calligra.
> 
> 
> Description
> ---
> 
> This patch implements support for math formulas in the EPUB filter. This is 
> the first one of the EPUB3 features that we want to add to Calligra 2.7.
> 
> This version only supports math formulas saved as an embedded document, like 
> LibreOffice and the OpenOffice variants save it. Calligra saves math formulas 
> as inline mathML in the frame, which is not supported by this version. I 
> thought that I could get some initial feedback while implementing support for 
> the Calligra way too.
> 
> 
> Diffs
> -
> 
>   filters/words/epub/OdfParser.cpp 6069b89 
>   filters/words/epub/OdtHtmlConverter.h 68aaffa 
>   filters/words/epub/OdtHtmlConverter.cpp e5e0edc 
>   filters/words/epub/TODO e634a05 
>   filters/words/epub/exportepub2.cpp cfd50c3 
>   filters/words/epub/exporthtml.cpp 5bb44aa 
> 
> Diff: http://git.reviewboard.kde.org/r/107969/diff/
> 
> 
> Testing
> ---
> 
> Created one simple odt using OOo which has a formula and some text.
> 
> 
> Thanks,
> 
> Inge Wallin
> 
>

___
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel


Re: Review Request: Make the epub filter handle math formulas

2012-12-30 Thread C. Boemann


> On Dec. 28, 2012, 2:45 p.m., C. Boemann wrote:
> > there is a few places where you have:
> > 
> > if ()
> > {
> > 
> > and one place where there is no {} after if
> > 
> > other than that I've not looked yet - I assume you want moji to review
> 
> Inge Wallin wrote:
> The 
> 
> if ()
> {
> 
> construct is only used where the test is >1 line.  If I put the { at the 
> end of the line, the first statement inside the brackets will be perfectly 
> aligned with the test. I find that a bit difficult to read, hence this way of 
> getting around it.
>
> 
> C. Boemann wrote:
> I'm not arguing against the merrits of it. I have personally always 
> preferred this way of placing braces. However I also think we should follow 
> the hacking style at all times. This way may be easier for you to read but 
> the point of a acking style is that anyone with a minimum of trouble can come 
> in and work on the code. After all we are supposed to be an open community.
> 
> For case like you desribe I personally write like this (knowing full well 
> that this is my personal style as well (though not prohibited by the official 
> style):
> 
> if (bla bla bla bla bla bla bla bla bla
> bla bla bla bla bla bla bla
> bla bla bla bla bla) {
> foo;
> bar;
> }
> 
> another way not against the hacking style would be:
> 
> if (bla bla bla bla bla bla bla bla bla
> bla bla bla bla bla bla bla
> bla bla bla bla bla) {
> foo;
> bar;
> }
> 
> In the end I don't care all that much about this issue, but will close by 
> saying that the day we do sweeping hacking style cleanups your carefully 
> crafted (and special cased) exceptions would be probably be gone. My 
> variations are more likely not to be touched.
> 
> Inge Wallin wrote:
> You're right.  I would prefer to have one solution we could all agree on 
> and use everywhere. Your first example works well too. But are you sure that 
> it will survive the sweeping hacking style cleanup, which I suppose will be 
> automatic?

No, not sure at all, but at least it has a chance. 


- C.


---
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/107969/#review24105
---


On Dec. 30, 2012, 4:44 a.m., Inge Wallin wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/107969/
> ---
> 
> (Updated Dec. 30, 2012, 4:44 a.m.)
> 
> 
> Review request for Calligra.
> 
> 
> Description
> ---
> 
> This patch implements support for math formulas in the EPUB filter. This is 
> the first one of the EPUB3 features that we want to add to Calligra 2.7.
> 
> This version only supports math formulas saved as an embedded document, like 
> LibreOffice and the OpenOffice variants save it. Calligra saves math formulas 
> as inline mathML in the frame, which is not supported by this version. I 
> thought that I could get some initial feedback while implementing support for 
> the Calligra way too.
> 
> 
> Diffs
> -
> 
>   filters/words/epub/OdfParser.cpp 6069b89 
>   filters/words/epub/OdtHtmlConverter.h 68aaffa 
>   filters/words/epub/OdtHtmlConverter.cpp e5e0edc 
>   filters/words/epub/TODO e634a05 
>   filters/words/epub/exportepub2.cpp cfd50c3 
>   filters/words/epub/exporthtml.cpp 5bb44aa 
> 
> Diff: http://git.reviewboard.kde.org/r/107969/diff/
> 
> 
> Testing
> ---
> 
> Created one simple odt using OOo which has a formula and some text.
> 
> 
> Thanks,
> 
> Inge Wallin
> 
>

___
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel


Review Request: spellchecking changes

2012-12-30 Thread C. Boemann

---
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/108022/
---

Review request for Calligra.


Description
---

Change the way we draw markings of speeling errors. Instead of using the qt way 
we draw it ourselve
This has the following benefits:
  - we don't have to relayout after finding spelling errors
  - we can have more than one type of marking (spelling, grammar, etc)

This commit also changes the way we ask for spellchecking to be performed. The 
old way had some
shortcommings that could lead to text not being checked at all


Diffs
-

  libs/kotext/KoTextBlockData.h 05db499 
  libs/kotext/KoTextBlockData.cpp b1d7d5c 
  libs/kotext/KoTextEditingPlugin.h 7b7b9dd 
  libs/textlayout/KoTextLayoutArea.h 94c52ec 
  libs/textlayout/KoTextLayoutArea_paint.cpp 2fc2131 
  libs/textlayout/KoTextLayoutRootAreaProvider.h d8c0614 
  libs/textlayout/KoTextLayoutRootAreaProvider.cpp 7d27944 
  plugins/textediting/autocorrection/Autocorrect.h 2a84506 
  plugins/textediting/autocorrection/Autocorrect.cpp e136216 
  plugins/textediting/changecase/Changecase.h 8433be1 
  plugins/textediting/changecase/Changecase.cpp 936957c 
  plugins/textediting/spellcheck/CMakeLists.txt a4dedef 
  plugins/textediting/spellcheck/SpellCheck.h ee2f7bf 
  plugins/textediting/spellcheck/SpellCheck.cpp 4da7e7d 
  plugins/textediting/thesaurus/Thesaurus.h c5de5b0 
  plugins/textediting/thesaurus/Thesaurus.cpp b10a69d 
  plugins/textshape/SimpleRootAreaProvider.h 8daf2f8 
  plugins/textshape/SimpleRootAreaProvider.cpp 1f3b0fe 
  plugins/textshape/TextTool.h a8a525d 
  plugins/textshape/TextTool.cpp 148806c 
  words/part/KWRootAreaProvider.h 1908b11 
  words/part/KWRootAreaProvider.cpp 9e28045 

Diff: http://git.reviewboard.kde.org/r/108022/diff/


Testing
---

played around with it


Thanks,

C. Boemann

___
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel


RR to remove filters/karbon/{applixgraphics,eps/EpsExport}

2012-12-30 Thread Friedrich W. H. Kossebau
Hi,

some filters escaped the Great Filter Cleanup (tm) but now catched my 
attention while grepping for Q3* classes. Having looked at them I propose to 
move the following filters as well to the glory hole which there is git 
history:

filters/karbon/applixgraphics :

not built ATM, also exports to some format which is not understood by the 
karbon1.x filter (output looks like the kontour format which just got a 
s/kontour/karbon/, but then I have no real clue)

filters/karbon/eps/EpsExport :

while the EPS import filter is built, works and thus should stay, the EPS 
export filter is not built ATM because it was not ported (was accessing Karbon 
objects directly)


Okay to remove these and add entries to OBSOLETE.txt ?

Cheers
Friedrich
___
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel


Re: RR to remove filters/karbon/{applixgraphics,eps/EpsExport}

2012-12-30 Thread Boudewijn Rempt
On Sunday 30 December 2012 Dec, Friedrich W. H. Kossebau wrote:
> Hi,
> 
> some filters escaped the Great Filter Cleanup (tm) but now catched my 
> attention while grepping for Q3* classes. Having looked at them I propose to 
> move the following filters as well to the glory hole which there is git 
> history:
> 
> filters/karbon/applixgraphics :
> 
> not built ATM, also exports to some format which is not understood by the 
> karbon1.x filter (output looks like the kontour format which just got a 
> s/kontour/karbon/, but then I have no real clue)
> 
> filters/karbon/eps/EpsExport :
> 
> while the EPS import filter is built, works and thus should stay, the EPS 
> export filter is not built ATM because it was not ported (was accessing 
> Karbon 
> objects directly)
> 
> 
> Okay to remove these and add entries to OBSOLETE.txt ?

As far as I'm concerned, yes -- though let's see what Jan Hambrechts thinks.

-- 
Boudewijn Rempt
http://www.valdyas.org, http://www.krita.org, http://www.boudewijnrempt.nl
___
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel


Re: RR for removing 5 unused files from filters/sheets/csv

2012-12-30 Thread Jaroslaw Staniek
On 29 December 2012 23:16, Friedrich W. H. Kossebau  wrote:
> Hi,
>
> grepping for Q3 I found that these 5 files are no longer used. Seems it was
> forgotten to remove them in the commit
> 038515dfc447d0a3e2a6cfdd872efc67fcc1076d
> Filters CSV Import.
> Switch to the shared KoCsvImportDialog.
>
>
> Anyone objecting to remove these files?

+1 from me

-- 
regards / pozdrawiam, Jaroslaw Staniek
 Kexi & Calligra & KDE | http://calligra.org/kexi | http://kde.org
 Qt Certified Specialist | http://qt-project.org
 http://www.linkedin.com/in/jstaniek
___
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel