From c6110235c0d2ff1e44f6f6e725328c9880d4885b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Mon, 19 Mar 2012 23:38:57 +0100 Subject: [PATCH] New component: Paragraph completes the Text Layout components for now. Also add a page to Gallery.qml to test these new component. --- .../plasmaextracomponents/CMakeLists.txt | 1 + .../plasmaextracomponents/qml/Heading.qml | 2 +- .../plasmaextracomponents/qml/qmldir | 3 +- declarativeimports/test/gallery/Extras.qml | 48 +++++++++++++++++++ declarativeimports/test/gallery/Gallery.qml | 4 ++ 5 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 declarativeimports/test/gallery/Extras.qml diff --git a/declarativeimports/plasmaextracomponents/CMakeLists.txt b/declarativeimports/plasmaextracomponents/CMakeLists.txt index 9bbf1e664..83e84be65 100644 --- a/declarativeimports/plasmaextracomponents/CMakeLists.txt +++ b/declarativeimports/plasmaextracomponents/CMakeLists.txt @@ -39,6 +39,7 @@ install(TARGETS plasmaextracomponentsplugin DESTINATION ${PLUGIN_INSTALL_DIR}/pl install(FILES qml/App.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/extras) install(FILES qml/Heading.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/extras) +install(FILES qml/Paragraph.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/extras) install(FILES qml/Title.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/extras) #install platform overrides -- enable as we use this feature for plasmaextras diff --git a/declarativeimports/plasmaextracomponents/qml/Heading.qml b/declarativeimports/plasmaextracomponents/qml/Heading.qml index ed165b350..ca7cdb3f7 100644 --- a/declarativeimports/plasmaextracomponents/qml/Heading.qml +++ b/declarativeimports/plasmaextracomponents/qml/Heading.qml @@ -54,8 +54,8 @@ Label { property int level: 1 property int step: 2 - anchors.topMargin: 8 font.pointSize: headerPointSize(level) + wrapMode: Text.WordWrap function headerPointSize(l) { var n = theme.defaultFont.pointSize; diff --git a/declarativeimports/plasmaextracomponents/qml/qmldir b/declarativeimports/plasmaextracomponents/qml/qmldir index db159b0f7..1eeb9dc04 100644 --- a/declarativeimports/plasmaextracomponents/qml/qmldir +++ b/declarativeimports/plasmaextracomponents/qml/qmldir @@ -1,5 +1,6 @@ plugin plasmaextracomponentsplugin App 0.1 App.qml -Title 0.1 Title.qml Heading 0.1 Heading.qml +Paragraph 0.1 Paragraph.qml +Title 0.1 Title.qml diff --git a/declarativeimports/test/gallery/Extras.qml b/declarativeimports/test/gallery/Extras.qml new file mode 100644 index 000000000..a34e4a7cf --- /dev/null +++ b/declarativeimports/test/gallery/Extras.qml @@ -0,0 +1,48 @@ +/* +* Copyright 2012 by Sebastian Kügler +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU Library General Public License as +* published by the Free Software Foundation; either version 2, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Library General Public License for more details +* +* You should have received a copy of the GNU Library General Public +* License along with this program; if not, write to the +* Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +import QtQuick 1.1 +import org.kde.plasma.components 0.1 +import org.kde.plasma.extras 0.1 as PlasmaExtras + +Column { + anchors.fill: parent + spacing: 12 + PlasmaExtras.Title { + text: "PlasmaExtras" + } + PlasmaExtras.Heading { + level: 2 + text: "Additional Plasma Quick components for Apps" + } + PlasmaExtras.Paragraph { + text: "Lorem Ipsum is slechts een proeftekst uit het drukkerij- en zetterijwezen. Lorem Ipsum is de standaard proeftekst in deze bedrijfstak sinds de 16e eeuw, toen een onbekende drukker een zethaak met letters nam en ze door elkaar husselde om een font-catalogus te maken. Het heeft niet alleen vijf eeuwen overleefd maar is ook, vrijwel onveranderd, overgenomen in elektronische letterzetting. Het is in de jaren '60 populair geworden met de introductie van Letraset vellen met Lorem Ipsum passages en meer recentelijk door desktop publishing software zoals Aldus PageMaker die versies van Lorem Ipsum bevatten." + } + PlasmaExtras.Heading { + level: 3 + text: "Heading at level " + level + } + PlasmaExtras.Paragraph { + text: "Lorem Ipsum is slechts een proeftekst uit het drukkerij- en zetterijwezen. Lorem Ipsum is de standaard proeftekst in deze bedrijfstak sinds de 16e eeuw, toen een onbekende drukker een zethaak met letters nam en ze door elkaar husselde om een font-catalogus te maken. Het heeft niet alleen vijf eeuwen overleefd maar is ook, vrijwel onveranderd, overgenomen in elektronische letterzetting. Het is in de jaren '60 populair geworden met de introductie van Letraset vellen met Lorem Ipsum passages en meer recentelijk door desktop publishing software zoals Aldus PageMaker die versies van Lorem Ipsum bevatten." + } + PlasmaExtras.Heading { + level: 5 + text: "Heading at level " + level + } +} \ No newline at end of file diff --git a/declarativeimports/test/gallery/Gallery.qml b/declarativeimports/test/gallery/Gallery.qml index 484a1209b..8b4a87899 100644 --- a/declarativeimports/test/gallery/Gallery.qml +++ b/declarativeimports/test/gallery/Gallery.qml @@ -77,6 +77,10 @@ Rectangle { page: "Misc.qml" title: "Misc stuff" } + ListElement { + page: "Extras.qml" + title: "Extras" + } } delegate: ListItem { enabled: true