diff --git a/sources/awesome-widget/package/contents/ui/about.qml b/sources/awesome-widget/package/contents/ui/about.qml index e33237d..9df5a3d 100644 --- a/sources/awesome-widget/package/contents/ui/about.qml +++ b/sources/awesome-widget/package/contents/ui/about.qml @@ -30,99 +30,8 @@ Item { width: childrenRect.width height: childrenRect.height - implicitWidth: pageColumn.implicitWidth - implicitHeight: pageColumn.implicitHeight - property bool debug: awActions.isDebugEnabled() - - - Column { - id: pageColumn - anchors.fill: parent - QtControls.TabView { - height: parent.height - width: parent.width - QtControls.Tab { - anchors.margins: 10.0 - title: i18n("About") - - QtLayouts.ColumnLayout { - QtControls.Label { - QtLayouts.Layout.fillWidth: true - horizontalAlignment: Text.AlignHCenter - text: awActions.getAboutText("header") - } - - QtControls.Label { - QtLayouts.Layout.fillWidth: true - horizontalAlignment: Text.AlignHCenter - text: awActions.getAboutText("version") - } - - QtControls.Label { - QtLayouts.Layout.fillWidth: true - horizontalAlignment: Text.AlignJustify - text: awActions.getAboutText("description") - } - - QtControls.Label { - QtLayouts.Layout.fillWidth: true - horizontalAlignment: Text.AlignLeft - textFormat: Text.RichText - text: awActions.getAboutText("links") - onLinkActivated: Qt.openUrlExternally(link) - } - - QtControls.Label { - QtLayouts.Layout.fillHeight: true - QtLayouts.Layout.fillWidth: true - font.capitalization: Font.SmallCaps - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignBottom - textFormat: Text.RichText - text: awActions.getAboutText("copy") - } - } - } - - QtControls.Tab { - anchors.margins: 10.0 - title: i18n("Acknowledgment") - - QtLayouts.ColumnLayout { - QtControls.Label { - QtLayouts.Layout.fillWidth: true - wrapMode: Text.WordWrap - horizontalAlignment: Text.AlignJustify - text: awActions.getAboutText("translators") - } - - QtControls.Label { - QtLayouts.Layout.fillWidth: true - wrapMode: Text.WordWrap - horizontalAlignment: Text.AlignJustify - textFormat: Text.RichText - text: awActions.getAboutText("3rdparty") - onLinkActivated: Qt.openUrlExternally(link) - } - - QtControls.Label { - QtLayouts.Layout.fillHeight: true - QtLayouts.Layout.fillWidth: true - wrapMode: Text.WordWrap - horizontalAlignment: Text.AlignJustify - verticalAlignment: Text.AlignTop - textFormat: Text.RichText - text: awActions.getAboutText("thanks") - onLinkActivated: Qt.openUrlExternally(link) - } - } - } - } - } - - - Component.onCompleted: { - if (debug) console.debug() + AboutTab { + textProvider: awActions } } diff --git a/sources/awesome-widget/package/contents/ui/qmldir b/sources/awesome-widget/package/contents/ui/qmldir index f627c3a..ee187d3 100644 --- a/sources/awesome-widget/package/contents/ui/qmldir +++ b/sources/awesome-widget/package/contents/ui/qmldir @@ -1,5 +1,6 @@ singleton general 1.0 general.qml +AboutTab file:///usr/share/awesomewidgets/qml/AboutTab.qml BugReport file:///usr/share/awesomewidgets/qml/BugReport.qml ButtonSelector file:///usr/share/awesomewidgets/qml/ButtonSelector.qml CheckBoxSelector file:///usr/share/awesomewidgets/qml/CheckBoxSelector.qml diff --git a/sources/desktop-panel/package/contents/ui/qmldir b/sources/desktop-panel/package/contents/ui/qmldir index f627c3a..ee187d3 100644 --- a/sources/desktop-panel/package/contents/ui/qmldir +++ b/sources/desktop-panel/package/contents/ui/qmldir @@ -1,5 +1,6 @@ singleton general 1.0 general.qml +AboutTab file:///usr/share/awesomewidgets/qml/AboutTab.qml BugReport file:///usr/share/awesomewidgets/qml/BugReport.qml ButtonSelector file:///usr/share/awesomewidgets/qml/ButtonSelector.qml CheckBoxSelector file:///usr/share/awesomewidgets/qml/CheckBoxSelector.qml diff --git a/sources/qml/AboutTab.qml b/sources/qml/AboutTab.qml new file mode 100644 index 0000000..0f6eae0 --- /dev/null +++ b/sources/qml/AboutTab.qml @@ -0,0 +1,109 @@ +/*************************************************************************** + * This file is part of awesome-widgets * + * * + * awesome-widgets is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * awesome-widgets 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * + ***************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 1.3 as QtControls +import QtQuick.Layouts 1.0 as QtLayouts + + +Column { + anchors.fill: parent + + property var textProvider + + QtControls.TabView { + height: parent.height + width: parent.width + + QtControls.Tab { + anchors.margins: 10.0 + title: i18n("About") + + QtLayouts.ColumnLayout { + QtControls.Label { + QtLayouts.Layout.fillWidth: true + horizontalAlignment: Text.AlignHCenter + text: textProvider.getAboutText("header") + } + + QtControls.Label { + QtLayouts.Layout.fillWidth: true + horizontalAlignment: Text.AlignHCenter + text: textProvider.getAboutText("version") + } + + QtControls.Label { + QtLayouts.Layout.fillWidth: true + horizontalAlignment: Text.AlignJustify + text: textProvider.getAboutText("description") + } + + QtControls.Label { + QtLayouts.Layout.fillWidth: true + horizontalAlignment: Text.AlignLeft + textFormat: Text.RichText + text: textProvider.getAboutText("links") + onLinkActivated: Qt.openUrlExternally(link) + } + + QtControls.Label { + QtLayouts.Layout.fillHeight: true + QtLayouts.Layout.fillWidth: true + font.capitalization: Font.SmallCaps + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignBottom + textFormat: Text.RichText + text: textProvider.getAboutText("copy") + } + } + } + + QtControls.Tab { + anchors.margins: 10.0 + title: i18n("Acknowledgment") + + QtLayouts.ColumnLayout { + QtControls.Label { + QtLayouts.Layout.fillWidth: true + wrapMode: Text.WordWrap + horizontalAlignment: Text.AlignJustify + text: textProvider.getAboutText("translators") + } + + QtControls.Label { + QtLayouts.Layout.fillWidth: true + wrapMode: Text.WordWrap + horizontalAlignment: Text.AlignJustify + textFormat: Text.RichText + text: textProvider.getAboutText("3rdparty") + onLinkActivated: Qt.openUrlExternally(link) + } + + QtControls.Label { + QtLayouts.Layout.fillHeight: true + QtLayouts.Layout.fillWidth: true + wrapMode: Text.WordWrap + horizontalAlignment: Text.AlignJustify + verticalAlignment: Text.AlignTop + textFormat: Text.RichText + text: textProvider.getAboutText("thanks") + onLinkActivated: Qt.openUrlExternally(link) + } + } + } + } +} diff --git a/sources/qml/qmldir.in b/sources/qml/qmldir.in index 02a5f57..cab0867 100644 --- a/sources/qml/qmldir.in +++ b/sources/qml/qmldir.in @@ -1,5 +1,6 @@ singleton general 1.0 general.qml +AboutTab file://@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/qml/AboutTab.qml BugReport file://@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/qml/BugReport.qml ButtonSelector file://@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/qml/ButtonSelector.qml CheckBoxSelector file://@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/qml/CheckBoxSelector.qml