kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-21 10:50:30 +03:00
Code Issues Projects Releases Wiki Activity

update settings window to LatteComponents

Browse Source
This commit is contained in:
Michail Vourlakos 2019-03-18 20:06:52 +02:00
parent ca80a7932f
commit 22c67c4df1
23 changed files with 225 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
declarativeimports/components/BadgeText.qml
View File

@ -1,7 +1,5 @@
/*
* Copyright 2016 Smith AR <audoban@openmailbox.org>
* Michail Vourlakos <mvourlakos@gmail.com>
* Copyright 2019 Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*

26
declarativeimports/components/CheckBox.qml Normal file
View File

@ -0,0 +1,26 @@
/*
* Copyright 2019 Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*
* Latte-Dock 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 2 of
* the License, or (at your option) any later version.
*
* Latte-Dock 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 this program. If not, see <http://www.gnu.org/licenses/>.
*/
import org.kde.plasma.components 2.0 as PlasmaComponents
import "private" as Private
PlasmaComponents.CheckBox {
style: Private.CheckBoxStyle {}
}

3
declarativeimports/components/ExternalShadow.qml
View File

@ -1,6 +1,5 @@
/*
* Copyright 2016 Smith AR <audoban@openmailbox.org>
* Michail Vourlakos <mvourlakos@gmail.com>
* Copyright 2019 Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*

3
declarativeimports/components/GlowPoint.qml
View File

@ -1,6 +1,5 @@
/*
* Copyright 2016 Smith AR <audoban@openmailbox.org>
* Michail Vourlakos <mvourlakos@gmail.com>
* Copyright 2019 Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*

3
shell/package/contents/controls/Header.qml → declarativeimports/components/Header.qml
View File

@ -1,6 +1,5 @@
/*
* Copyright 2016 Smith AR <audoban@openmailbox.org>
* Michail Vourlakos <mvourlakos@gmail.com>
* Copyright 2019 Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*

0
shell/package/contents/controls/HeaderSwitch.qml → declarativeimports/components/HeaderSwitch.qml
View File

34
shell/package/contents/controls/Slider.qml → declarativeimports/components/Slider.qml
View File

@ -1,21 +1,21 @@
/*
* Copyright 2016 Marco Martin <mart@kde.org>
*
* 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.
*/
* Copyright 2019 Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*
* Latte-Dock 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 2 of
* the License, or (at your option) any later version.
*
* Latte-Dock 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 this program. If not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.7
import QtQuick.Templates 2.0 as T

23
shell/package/contents/controls/SpinBox.qml → declarativeimports/components/SpinBox.qml
View File

@ -1,3 +1,22 @@
/*
* Copyright 2019 Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*
* Latte-Dock 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 2 of
* the License, or (at your option) any later version.
*
* Latte-Dock 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 this program. If not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick.Controls 1.4 as Controls
import QtQuick.Controls.Styles.Plasma 2.0 as Styles
@ -5,8 +24,8 @@ import org.kde.plasma.core 2.0 as PlasmaCore
Controls.SpinBox {
implicitWidth: theme.mSize(theme.defaultFont).width * 10
style: Styles.SpinBoxStyle {
style: Styles.SpinBoxStyle {
PlasmaCore.Svg {
id: arrowSvg
imagePath: "widgets/arrows"

0
shell/package/contents/controls/SubHeader.qml → declarativeimports/components/SubHeader.qml
View File

25
declarativeimports/components/Switch.qml Normal file
View File

@ -0,0 +1,25 @@
/*
* Copyright 2019 Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*
* Latte-Dock 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 2 of
* the License, or (at your option) any later version.
*
* Latte-Dock 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 this program. If not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick.Controls 1.4
import "private" as Private
Switch {
style: Private.SwitchStyle {}
}

4
shell/package/contents/controls/TextField.qml → declarativeimports/components/TextField.qml
View File

@ -1,6 +1,5 @@
/*
* Copyright 2016 Smith AR <audoban@openmailbox.org>
* Michail Vourlakos <mvourlakos@gmail.com>
* Copyright 2019 Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*
@ -17,7 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick.Layouts 1.3
import QtQuick.Controls 1.4

35
shell/package/contents/controls/ToolTip.qml → declarativeimports/components/ToolTip.qml
View File

@ -1,22 +1,21 @@
/*
* Copyright 2016 Marco Martin <mart@kde.org>
* Copyright (C) 2016 The Qt Company Ltd.
*
* 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.
*/
* Copyright 2019 Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*
* Latte-Dock 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 2 of
* the License, or (at your option) any later version.
*
* Latte-Dock 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 this program. If not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import QtQuick.Controls 1.4

4
shell/package/contents/controls/LatteCheckBoxStyle.qml → declarativeimports/components/private/CheckBoxStyle.qml
View File

@ -1,6 +1,5 @@
/*
* Copyright 2016 Smith AR <audoban@openmailbox.org>
* Michail Vourlakos <mvourlakos@gmail.com>
* Copyright 2019 Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*
@ -17,6 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick.Controls 1.4
import QtQuick.Layouts 1.3

35
shell/package/contents/controls/private/RoundShadow.qml → declarativeimports/components/private/RoundShadow.qml
View File

@ -1,22 +1,21 @@
/*
* Copyright (C) 2011 by Daker Fernandes Pinheiro <dakerfp@gmail.com>
* Copyright (C) 2011 by Marco Martin <mart@kde.org>
*
* 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 2.010-1301, USA.
*/
* Copyright 2019 Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*
* Latte-Dock 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 2 of
* the License, or (at your option) any later version.
*
* Latte-Dock 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 this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**Documented API
Inherits:

34
shell/package/contents/controls/private/SwitchStyle.qml → declarativeimports/components/private/SwitchStyle.qml
View File

@ -1,21 +1,21 @@
/*
* Copyright 2014 Marco Martin <mart@kde.org>
*
* 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 2.010-1301, USA.
*/
* Copyright 2019 Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*
* Latte-Dock 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 2 of
* the License, or (at your option) any later version.
*
* Latte-Dock 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 this program. If not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.2
import QtQuick.Controls.Styles 1.2 as QtQuickControlStyle

11
declarativeimports/components/qmldir
View File

@ -1,5 +1,14 @@
module org.kde.latte.components
BadgeText 1.0 BadgeText.qml
CheckBox 1.0 CheckBox.qml
ExternalShadow 1.0 ExternalShadow.qml
GlowPoint 1.0 GlowPoint.qml
GlowPoint 1.0 GlowPoint.qml
Header 1.0 Header.qml
HeaderSwitch 1.0 HeaderSwitch.qml
Slider 1.0 Slider.qml
SpinBox 1.0 SpinBox.qml
SubHeader 1.0 SubHeader.qml
Switch 1.0 Switch.qml
TextField 1.0 TextField.qml
ToolTip 1.0 ToolTip.qml

8
shell/package/contents/configuration/LatteDockConfiguration.qml
View File

@ -35,10 +35,10 @@ import org.kde.plasma.plasmoid 2.0
import org.kde.kquickcontrolsaddons 2.0 as KQuickControlAddons
import org.kde.latte 0.2 as Latte
import org.kde.latte.components 1.0 as LatteComponents
import "pages" as Pages
import "../controls" as LatteExtraControls
import "../controls/private" as LatteExtraControlsPrivate
FocusScope {
id: dialog
@ -207,7 +207,7 @@ FocusScope {
width: Qt.application.layoutDirection !== Qt.RightToLeft ? logo.width + latteTxt.width + units.smallSpacing : logo.width + units.smallSpacing
height: logo.height
LatteExtraControls.ToolTip{
LatteComponents.ToolTip{
parent: logo
text: i18n("Open Latte settings window")
visible: aboutMouseArea.containsMouse
@ -344,7 +344,7 @@ FocusScope {
}
}
Switch {
LatteComponents.Switch {
id: complexitySwitch
checked: dialog.expertLevel
@ -357,8 +357,6 @@ FocusScope {
}
}
}
style: LatteExtraControlsPrivate.SwitchStyle {}
}
}
}

55
shell/package/contents/configuration/pages/AppearanceConfig.qml
View File

@ -30,8 +30,7 @@ import org.kde.plasma.components 3.0 as PlasmaComponents3
import org.kde.plasma.plasmoid 2.0
import org.kde.latte 0.2 as Latte
import "../../controls" as LatteExtraControls
import org.kde.latte.components 1.0 as LatteComponents
PlasmaComponents.Page {
Layout.maximumWidth: content.width + content.Layout.leftMargin * 2
@ -62,7 +61,7 @@ PlasmaComponents.Page {
spacing: units.smallSpacing
visible: false //dialog.highLevel
LatteExtraControls.Header {
LatteComponents.Header {
text: i18n("Layout")
}
@ -144,11 +143,11 @@ PlasmaComponents.Page {
Layout.rightMargin: units.smallSpacing * 2
spacing: units.smallSpacing
LatteExtraControls.Header {
LatteComponents.Header {
text: i18n("Items")
}
LatteExtraControls.SubHeader {
LatteComponents.SubHeader {
text: i18nc("items effects", "Size")
isFirstSubCategory: true
}
@ -164,7 +163,7 @@ PlasmaComponents.Page {
horizontalAlignment: Text.AlignLeft
}
LatteExtraControls.Slider {
LatteComponents.Slider {
id: appletsSizeSlider
Layout.fillWidth: true
value: plasmoid.configuration.iconSize
@ -219,7 +218,7 @@ PlasmaComponents.Page {
enabled: proportionSizeSlider.value !== proportionSizeSlider.from
}
LatteExtraControls.Slider {
LatteComponents.Slider {
id: proportionSizeSlider
Layout.fillWidth: true
value: plasmoid.configuration.proportionIconSize
@ -261,7 +260,7 @@ PlasmaComponents.Page {
}
}
LatteExtraControls.SubHeader {
LatteComponents.SubHeader {
text: i18nc("items effects", "Effects")
//isFirstSubCategory: true
}
@ -277,7 +276,7 @@ PlasmaComponents.Page {
horizontalAlignment: Text.AlignLeft
}
LatteExtraControls.Slider {
LatteComponents.Slider {
Layout.fillWidth: true
id: zoomSlider
@ -343,7 +342,7 @@ PlasmaComponents.Page {
Layout.rightMargin: units.smallSpacing * 2
spacing: units.smallSpacing
LatteExtraControls.Header {
LatteComponents.Header {
text: i18n("Length")
}
@ -357,7 +356,7 @@ PlasmaComponents.Page {
horizontalAlignment: Text.AlignLeft
}
LatteExtraControls.Slider {
LatteComponents.Slider {
Layout.fillWidth: true
id: maxLengthSlider
@ -431,7 +430,7 @@ PlasmaComponents.Page {
horizontalAlignment: Text.AlignLeft
}
LatteExtraControls.Slider {
LatteComponents.Slider {
Layout.fillWidth: true
id: offsetSlider
@ -493,7 +492,7 @@ PlasmaComponents.Page {
readonly property int maxMargin: 25
LatteExtraControls.Header {
LatteComponents.Header {
text: i18n("Margins")
}
@ -507,7 +506,7 @@ PlasmaComponents.Page {
horizontalAlignment: Text.AlignLeft
}
LatteExtraControls.Slider {
LatteComponents.Slider {
id: lengthExtMarginSlider
Layout.fillWidth: true
@ -532,7 +531,7 @@ PlasmaComponents.Page {
}
}
LatteExtraControls.HeaderSwitch {
LatteComponents.HeaderSwitch {
id: shrinkThickMargins
Layout.fillWidth: true
Layout.minimumHeight: implicitHeight
@ -558,7 +557,7 @@ PlasmaComponents.Page {
horizontalAlignment: Text.AlignLeft
}
LatteExtraControls.Slider {
LatteComponents.Slider {
id: thickMarginSlider
Layout.fillWidth: true
@ -591,7 +590,7 @@ PlasmaComponents.Page {
Layout.rightMargin: units.smallSpacing * 2
visible: dialog.expertLevel
LatteExtraControls.Header {
LatteComponents.Header {
Layout.columnSpan: 4
text: i18n("Colors")
}
@ -624,7 +623,7 @@ PlasmaComponents.Page {
}
}
LatteExtraControls.SubHeader {
LatteComponents.SubHeader {
Layout.columnSpan: 3
isFirstSubCategory: true
text: i18n("Theme")
@ -663,7 +662,7 @@ PlasmaComponents.Page {
readonly property int colors: Latte.Types.SmartThemeColors
}
LatteExtraControls.SubHeader {
LatteComponents.SubHeader {
Layout.columnSpan: 3
text: i18n("From Window")
}
@ -711,7 +710,7 @@ PlasmaComponents.Page {
spacing: units.smallSpacing
enabled: Latte.WindowSystem.compositingActive
LatteExtraControls.HeaderSwitch {
LatteComponents.HeaderSwitch {
id: showBackground
Layout.fillWidth: true
Layout.minimumHeight: implicitHeight
@ -736,7 +735,7 @@ PlasmaComponents.Page {
horizontalAlignment: Text.AlignLeft
}
LatteExtraControls.Slider {
LatteComponents.Slider {
id: panelSizeSlider
Layout.fillWidth: true
enabled: showBackground.checked
@ -784,7 +783,7 @@ PlasmaComponents.Page {
enabled: transparencySlider.enabled
}
LatteExtraControls.Slider {
LatteComponents.Slider {
id: transparencySlider
Layout.fillWidth: true
enabled: showBackground.checked //&& !blockOpacityAdjustment
@ -827,7 +826,7 @@ PlasmaComponents.Page {
}
}
LatteExtraControls.SubHeader {
LatteComponents.SubHeader {
visible: dialog.expertLevel
isFirstSubCategory: true
text: i18n("Options")
@ -882,19 +881,18 @@ PlasmaComponents.Page {
}
}
LatteExtraControls.SubHeader {
LatteComponents.SubHeader {
visible: dialog.expertLevel
text: i18nc("dynamic visibility for background", "Dynamic Visibility")
}
PlasmaComponents.CheckBox {
LatteComponents.CheckBox {
id: solidForMaximizedChk
Layout.leftMargin: units.smallSpacing * 2
Layout.maximumWidth: (dialog.appliedWidth - units.smallSpacing * 2) - 3*units.smallSpacing
text: i18n("Prefer opaque background when touching any window")
checked: plasmoid.configuration.solidBackgroundForMaximized
tooltip: i18n("Background removes its transparency setting when a window is touching")
style: LatteExtraControls.LatteCheckBoxStyle{}
enabled: showBackground.checked
visible: dialog.expertLevel
@ -931,19 +929,18 @@ PlasmaComponents.Page {
}
}
LatteExtraControls.SubHeader {
LatteComponents.SubHeader {
visible: dialog.expertLevel
text: i18n("Exceptions")
}
PlasmaComponents.CheckBox {
LatteComponents.CheckBox {
id: solidForPopupsChk
Layout.leftMargin: units.smallSpacing * 2
Layout.maximumWidth: (dialog.appliedWidth - units.smallSpacing * 2) - 3*units.smallSpacing
text: i18n("Prefer Plasma background and colors for expanded applets")
checked: plasmoid.configuration.plasmaBackgroundForPopups
tooltip: i18n("Background becomes opaque in plasma style when applets are expanded")
style: LatteExtraControls.LatteCheckBoxStyle{}
enabled: showBackground.checked
visible: dialog.expertLevel

23
shell/package/contents/configuration/pages/BehaviorConfig.qml
View File

@ -29,6 +29,7 @@ import org.kde.plasma.components 3.0 as PlasmaComponents3
import org.kde.plasma.plasmoid 2.0
import org.kde.latte 0.2 as Latte
import org.kde.latte.components 1.0 as LatteComponents
import "../../controls" as LatteExtraControls
@ -53,7 +54,7 @@ PlasmaComponents.Page {
visible: dialog.highLevel && viewConfig.showInlineProperties
LatteExtraControls.Header {
LatteComponents.Header {
text: i18n("Type")
}
@ -71,7 +72,7 @@ PlasmaComponents.Page {
spacing: units.smallSpacing
Layout.topMargin: units.smallSpacing
LatteExtraControls.Header {
LatteComponents.Header {
text: i18n("Location")
}
@ -281,7 +282,7 @@ PlasmaComponents.Page {
Layout.fillWidth: true
spacing: units.smallSpacing
LatteExtraControls.Header {
LatteComponents.Header {
text: i18n("Alignment")
}
@ -366,7 +367,7 @@ PlasmaComponents.Page {
Layout.fillWidth: true
spacing: units.smallSpacing
LatteExtraControls.Header {
LatteComponents.Header {
text: i18n("Visibility")
}
@ -455,7 +456,7 @@ PlasmaComponents.Page {
enabled: !(latteView.visibility.mode === Latte.Types.AlwaysVisible
|| latteView.visibility.mode === Latte.Types.WindowsGoBelow)
LatteExtraControls.Header {
LatteComponents.Header {
Layout.fillWidth: true
text: i18n("Delay")
}
@ -475,7 +476,7 @@ PlasmaComponents.Page {
horizontalAlignment: Text.AlignRight
text: i18n("Show")
}
LatteExtraControls.TextField {
LatteComponents.TextField {
Layout.preferredWidth: width
text: latteView.visibility.timerShow
@ -493,7 +494,7 @@ PlasmaComponents.Page {
horizontalAlignment: Text.AlignRight
text: i18n("Hide")
}
LatteExtraControls.TextField{
LatteComponents.TextField{
Layout.preferredWidth: width
text: latteView.visibility.timerHide
@ -511,7 +512,7 @@ PlasmaComponents.Page {
Layout.rightMargin: units.smallSpacing * 2
visible: dialog.expertLevel
LatteExtraControls.Header {
LatteComponents.Header {
text: i18n("Actions")
}
@ -519,7 +520,7 @@ PlasmaComponents.Page {
Layout.leftMargin: units.smallSpacing * 2
spacing: 0
LatteExtraControls.SubHeader {
LatteComponents.SubHeader {
text: i18n("Empty Area")
}
@ -559,7 +560,7 @@ PlasmaComponents.Page {
}
}
LatteExtraControls.SubHeader {
LatteComponents.SubHeader {
text: i18n("Items")
}
@ -609,7 +610,7 @@ PlasmaComponents.Page {
Layout.rightMargin: units.smallSpacing * 2
visible: dialog.expertLevel
LatteExtraControls.Header {
LatteComponents.Header {
text: i18n("Environment")
}

31
shell/package/contents/configuration/pages/EffectsConfig.qml
View File

@ -28,11 +28,8 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.components 3.0 as PlasmaComponents3
import org.kde.plasma.plasmoid 2.0
import QtQuick.Controls.Styles.Plasma 2.0 as Styles
import org.kde.latte 0.2 as Latte
import "../../controls" as LatteExtraControls
import org.kde.latte.components 1.0 as LatteComponents
PlasmaComponents.Page {
Layout.maximumWidth: content.width + content.Layout.leftMargin * 2
@ -53,7 +50,7 @@ PlasmaComponents.Page {
Layout.rightMargin: units.smallSpacing * 2
spacing: units.smallSpacing
LatteExtraControls.HeaderSwitch {
LatteComponents.HeaderSwitch {
id: showAppletShadow
Layout.fillWidth: true
Layout.minimumHeight: implicitHeight
@ -84,7 +81,7 @@ PlasmaComponents.Page {
horizontalAlignment: Text.AlignLeft
}
LatteExtraControls.Slider {
LatteComponents.Slider {
id: shadowSizeSlider
Layout.fillWidth: true
enabled: showAppletShadow.checked
@ -132,7 +129,7 @@ PlasmaComponents.Page {
horizontalAlignment: Text.AlignLeft
}
LatteExtraControls.Slider {
LatteComponents.Slider {
id: shadowOpacitySlider
Layout.fillWidth: true
@ -170,7 +167,7 @@ PlasmaComponents.Page {
}
}
LatteExtraControls.SubHeader {
LatteComponents.SubHeader {
isFirstSubCategory: true
text: i18n("Color")
}
@ -312,7 +309,7 @@ PlasmaComponents.Page {
Layout.rightMargin: units.smallSpacing * 2
spacing: units.smallSpacing
LatteExtraControls.HeaderSwitch {
LatteComponents.HeaderSwitch {
id: animationsHeader
Layout.fillWidth: true
Layout.minimumHeight: implicitHeight
@ -331,7 +328,7 @@ PlasmaComponents.Page {
spacing: 0
enabled: plasmoid.configuration.animationsEnabled
LatteExtraControls.SubHeader {
LatteComponents.SubHeader {
Layout.leftMargin: units.smallSpacing * 2
isFirstSubCategory: true
text: i18n("Speed")
@ -389,7 +386,7 @@ PlasmaComponents.Page {
spacing: units.smallSpacing
visible: latteView.latteTasksPresent()
LatteExtraControls.SubHeader {
LatteComponents.SubHeader {
Layout.leftMargin: units.smallSpacing * 2
text: i18n("Tasks")
}
@ -449,7 +446,7 @@ PlasmaComponents.Page {
spacing: units.smallSpacing
Layout.rightMargin: units.smallSpacing * 2
LatteExtraControls.HeaderSwitch {
LatteComponents.HeaderSwitch {
id: indicatorsSwitch
Layout.fillWidth: true
Layout.minimumHeight: implicitHeight
@ -468,7 +465,7 @@ PlasmaComponents.Page {
spacing: units.smallSpacing
enabled: indicatorsSwitch.checked
LatteExtraControls.SubHeader {
LatteComponents.SubHeader {
text: i18n("Style")
}
@ -521,7 +518,7 @@ PlasmaComponents.Page {
}
}
LatteExtraControls.SubHeader {
LatteComponents.SubHeader {
Layout.topMargin: units.smallSpacing
isFirstSubCategory: true
text: i18n("Paddings")
@ -536,7 +533,7 @@ PlasmaComponents.Page {
horizontalAlignment: Text.AlignLeft
}
LatteExtraControls.Slider {
LatteComponents.Slider {
id: lengthIntMarginSlider
Layout.fillWidth: true
@ -563,7 +560,7 @@ PlasmaComponents.Page {
}
}
LatteExtraControls.SubHeader {
LatteComponents.SubHeader {
Layout.topMargin: units.smallSpacing
isFirstSubCategory: true
text: i18n("Options")
@ -601,7 +598,7 @@ PlasmaComponents.Page {
visible: plasmoid.configuration.indicatorStyle === Latte.Types.LatteIndicator
enabled: indicatorsSwitch.checked
LatteExtraControls.Header {
LatteComponents.Header {
text: i18n("%0 Indicator Options").arg(indicatorStyleGroup.current.text)
}

17
shell/package/contents/configuration/pages/TasksConfig.qml
View File

@ -28,8 +28,7 @@ import org.kde.plasma.components 3.0 as PlasmaComponents3
import org.kde.plasma.plasmoid 2.0
import org.kde.latte 0.2 as Latte
import "../../controls" as LatteExtraControls
import org.kde.latte.components 1.0 as LatteComponents
PlasmaComponents.Page {
Layout.maximumWidth: content.width + content.Layout.leftMargin * 2
@ -54,7 +53,7 @@ PlasmaComponents.Page {
Layout.rightMargin: units.smallSpacing * 2
visible: dialog.highLevel
LatteExtraControls.Header {
LatteComponents.Header {
text: i18n("Badges")
}
@ -110,7 +109,7 @@ PlasmaComponents.Page {
spacing: units.smallSpacing
Layout.rightMargin: units.smallSpacing * 2
LatteExtraControls.Header {
LatteComponents.Header {
text: i18n("Interaction")
}
@ -159,7 +158,7 @@ PlasmaComponents.Page {
spacing: units.smallSpacing
Layout.rightMargin: units.smallSpacing * 2
LatteExtraControls.Header {
LatteComponents.Header {
text: i18n("Filters")
}
@ -228,11 +227,11 @@ PlasmaComponents.Page {
spacing: units.smallSpacing
Layout.rightMargin: units.smallSpacing * 2
LatteExtraControls.Header {
LatteComponents.Header {
text: i18n("Launchers")
}
LatteExtraControls.SubHeader {
LatteComponents.SubHeader {
isFirstSubCategory: true
text: i18nc("launchers group", "Group");
}
@ -298,7 +297,7 @@ PlasmaComponents.Page {
Layout.rightMargin: units.smallSpacing * 2
visible: dialog.expertLevel
LatteExtraControls.Header {
LatteComponents.Header {
text: i18n("Actions")
}
@ -466,7 +465,7 @@ PlasmaComponents.Page {
Layout.rightMargin: units.smallSpacing * 2
visible: dialog.expertLevel
LatteExtraControls.Header {
LatteComponents.Header {
text: i18n("Recycling")
}

14
shell/package/contents/configuration/pages/indicator/LatteOptions.qml
View File

@ -27,15 +27,11 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.components 3.0 as PlasmaComponents3
import org.kde.plasma.plasmoid 2.0
import QtQuick.Controls.Styles.Plasma 2.0 as Styles
import org.kde.latte 0.2 as Latte
import "../../../controls" as LatteExtraControls
import org.kde.latte.components 1.0 as LatteComponents
ColumnLayout {
LatteExtraControls.SubHeader {
LatteComponents.SubHeader {
text: i18nc("active indicator style","Style For Active")
}
@ -79,7 +75,7 @@ ColumnLayout {
}
}
LatteExtraControls.HeaderSwitch {
LatteComponents.HeaderSwitch {
id: showGlow
Layout.fillWidth: true
Layout.minimumHeight: implicitHeight
@ -146,7 +142,7 @@ ColumnLayout {
text: i18n("Opacity")
}
LatteExtraControls.Slider {
LatteComponents.Slider {
id: glowOpacitySlider
Layout.fillWidth: true
@ -187,7 +183,7 @@ ColumnLayout {
spacing: 0
visible: latteView.latteTasksPresent()
LatteExtraControls.SubHeader {
LatteComponents.SubHeader {
enabled: plasmoid.configuration.glowOption!==Latte.Types.GlowNone
text: i18n("Tasks")
}

1
shell/package/contents/controls/InnerShadow.qml
View File

@ -22,7 +22,6 @@ import QtQuick 2.1
import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.latte 0.2 as Latte
import org.kde.latte.components 1.0 as LatteComponents