----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/103677/ -----------------------------------------------------------
Review request for Calligra. Description ------- Merge request. Merge branch textshape_stylesWidget_pierreSt into master. The branch provides a replacement for the style selection widgets. The new provided widgets are a subclass of QComboBox. They provide a style preview both in the main area and in the dropdown menu. The dropdown menu provides a "show style manager" button, which call the whole style management dialog. The dropdown also provides a "delete style" button, although this is for the moment disabled/commented out, because deleting a style is not currently really supported. The combo also allows to create a style based on the current text format if it does not correspond to the original style (ie. the user changed a property). Diffs ----- libs/kotext/KoTextEditor.h 94bf433 libs/kotext/KoTextEditor.cpp 9f242e6 libs/kotext/styles/KoCharacterStyle.cpp f9e0741 libs/kotext/styles/KoParagraphStyle.h 12ab672 libs/textlayout/CMakeLists.txt af6d64a libs/textlayout/FrameIterator.h c73d580 libs/textlayout/KoStyleThumbnailer.h 8645089 libs/textlayout/KoStyleThumbnailer.cpp 3529bbb plugins/textshape/CMakeLists.txt fad7c04 plugins/textshape/TextTool.h f8de126 plugins/textshape/TextTool.cpp f6822bd plugins/textshape/dialogs/SimpleCharacterWidget.h ad944a5 plugins/textshape/dialogs/SimpleCharacterWidget.cpp 6b2bb66 plugins/textshape/dialogs/SimpleCharacterWidget.ui e4f6d3b plugins/textshape/dialogs/SimpleParagraphWidget.h bc167b4 plugins/textshape/dialogs/SimpleParagraphWidget.cpp cbfacfe plugins/textshape/dialogs/SimpleParagraphWidget.ui b2e9adf plugins/textshape/dialogs/StylesCombo.h PRE-CREATION plugins/textshape/dialogs/StylesCombo.cpp PRE-CREATION plugins/textshape/dialogs/StylesComboPreview.h PRE-CREATION plugins/textshape/dialogs/StylesComboPreview.cpp PRE-CREATION plugins/textshape/dialogs/StylesDelegate.h f5d216f plugins/textshape/dialogs/StylesDelegate.cpp d1021f5 plugins/textshape/dialogs/StylesModel.h dbd17b4 plugins/textshape/dialogs/StylesModel.cpp 94deb24 plugins/textshape/dialogs/StylesWidget.cpp 4f31a01 plugins/textshape/dialogs/TableOfContentsStyleModel.cpp 48ee7c3 Diff: http://git.reviewboard.kde.org/r/103677/diff/diff Testing ------- The functionality exclusively linked to the comboBox seems to be working properly. Some defects have been identified (like no paragraph style is selected at startup), but these are actually outside the scope of this widget and affecting the current widget also. Thanks, Pierre Stirnweiss
_______________________________________________ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel
