diff --git a/containment/package/contents/config/main.xml b/containment/package/contents/config/main.xml
index 648068ec..b6fd9f08 100644
--- a/containment/package/contents/config/main.xml
+++ b/containment/package/contents/config/main.xml
@@ -1,337 +1,346 @@
0
10
64
15
true
-1
true
0
true
false
100
false
true
true
true
true
false
false
false
0
0
-1
-1
2
0
70
30
080808
false
0
true
30
2
+
+
+
+
+
+
+
+ 0
+
0
100
0
6
2
0
0
1
0
false
100
100
false
false
false
2
0
false
false
true
false
false
true
true
true
true
true
true
true
true
diff --git a/liblatte2/types.h b/liblatte2/types.h
index 786451aa..62dbde99 100644
--- a/liblatte2/types.h
+++ b/liblatte2/types.h
@@ -1,196 +1,204 @@
/*
* Copyright 2016 Smith AR
* Michail Vourlakos
*
* 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 .
*/
#ifndef TYPES_H
#define TYPES_H
// Qt
#include
#include
#include
namespace Latte {
class Types
{
Q_GADGET
public:
Types() = delete;
~Types() {}
enum Visibility
{
None = -1,
AlwaysVisible = 0,
AutoHide,
DodgeActive,
DodgeMaximized,
DodgeAllWindows,
WindowsGoBelow
};
Q_ENUM(Visibility);
enum Alignment
{
Center = 0,
Left,
Right,
Top,
Bottom,
Justify = 10
};
Q_ENUM(Alignment);
enum SessionType
{
DefaultSession = 0,
AlternativeSession
};
Q_ENUM(SessionType)
enum Modifier
{
Shift = 0,
Ctrl,
Alt,
Meta
};
Q_ENUM(Modifier);
enum ClickAction
{
LeftClick = 0,
MiddleClick,
RightClick
};
Q_ENUM(ClickAction);
enum TaskAction
{
NoneAction = 0,
Close,
NewInstance,
ToggleMinimized,
CycleThroughTasks,
ToggleGrouping,
PresentWindows,
PreviewWindows,
HighlightWindows,
PreviewAndHighlightWindows
};
Q_ENUM(TaskAction);
+ enum IndicatorStyle
+ {
+ LatteIndicator = 0,
+ PlasmaIndicator,
+ UnityIndicator
+ };
+ Q_ENUM(IndicatorStyle);
+
enum ActiveAppletIndicator
{
NoneIndicator = 0,
InternalsIndicator = 1,
AllIndicator = 2
};
Q_ENUM(ActiveAppletIndicator)
enum ActiveIndicatorType
{
LineIndicator = 0,
DotIndicator = 1
};
Q_ENUM(ActiveIndicatorType);
enum LaunchersGroup
{
UniqueLaunchers = 0,
LayoutLaunchers = 1,
GlobalLaunchers = 2
};
Q_ENUM(LaunchersGroup);
enum GlowGroup
{
GlowNone = -1,
GlowOnlyOnActive = 0,
GlowAll = 1
};
Q_ENUM(GlowGroup);
enum ShadowGroup
{
NoneAppletShadow = 0,
LockedAppletsShadow, /* DEPRECATED, apply shadow only to locked applets */
AllAppletsShadow
};
Q_ENUM(ShadowGroup);
enum ShadowColorGroup
{
DefaultColorShadow = 0,
ThemeColorShadow,
UserColorShadow
};
Q_ENUM(ShadowColorGroup);
enum ThemeColorsGroup
{
PlasmaThemeColors = 0,
ReverseThemeColors,
SmartThemeColors
};
Q_ENUM(ThemeColorsGroup);
enum WindowColorsGroup
{
NoneWindowColors = 0,
ActiveWindowColors,
TouchingWindowColors
};
Q_ENUM(WindowColorsGroup);
enum LayoutsMemoryUsage
{
SingleLayout = 0, /* a single Layout is loaded in each time */
MultipleLayouts /* multiple layouts are loaded on runtime,based on Activities and one central layout for the rest unassigned Activities */
};
Q_ENUM(LayoutsMemoryUsage);
enum MouseSensitivity
{
LowSensitivity = 0,
MediumSensitivity,
HighSensitivity
};
Q_ENUM(MouseSensitivity);
enum LatteConfigPage
{
LayoutPage = 0,
PreferencesPage
};
Q_ENUM(LatteConfigPage);
enum SettingsComplexity
{
BasicSettings = 0,
AdvancedSettings = 2,
ExpertSettings = 4
};
Q_ENUM(SettingsComplexity);
};
}//end of namespace
#endif
diff --git a/shell/package/contents/configuration/pages/EffectsConfig.qml b/shell/package/contents/configuration/pages/EffectsConfig.qml
index fee16060..fead4c43 100644
--- a/shell/package/contents/configuration/pages/EffectsConfig.qml
+++ b/shell/package/contents/configuration/pages/EffectsConfig.qml
@@ -1,576 +1,637 @@
/*
* Copyright 2018 Michail Vourlakos
*
* 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 .
*/
import QtQuick 2.7
import QtQuick.Controls 1.4
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import QtQuick.Dialogs 1.2
import org.kde.plasma.core 2.0 as PlasmaCore
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
PlasmaComponents.Page {
Layout.maximumWidth: content.width + content.Layout.leftMargin * 2
Layout.maximumHeight: content.height + units.smallSpacing * 2
ColumnLayout {
id: content
width: (dialog.appliedWidth - units.smallSpacing * 2) - Layout.leftMargin * 2
spacing: dialog.subGroupSpacing
anchors.horizontalCenter: parent.horizontalCenter
Layout.leftMargin: units.smallSpacing * 2
//! BEGIN: Shadows
ColumnLayout {
Layout.fillWidth: true
Layout.topMargin: units.smallSpacing
spacing: units.smallSpacing
LatteExtraControls.HeaderSwitch {
id: showAppletShadow
Layout.fillWidth: true
Layout.minimumHeight: implicitHeight
Layout.rightMargin: units.smallSpacing * 2
checked: plasmoid.configuration.shadows !== Latte.Types.NoneShadow
text: i18n("Shadows")
tooltip: i18n("Enable/disable applet shadows")
onPressed: {
if(plasmoid.configuration.shadows !== Latte.Types.AllAppletsShadow){
plasmoid.configuration.shadows = Latte.Types.AllAppletsShadow;
} else {
plasmoid.configuration.shadows = Latte.Types.NoneShadow;
}
}
}
ColumnLayout {
Layout.leftMargin: units.smallSpacing * 2
Layout.rightMargin: units.smallSpacing * 2
RowLayout{
enabled: showAppletShadow.checked
PlasmaComponents.Label {
enabled: showAppletShadow.checked
text: i18n("Size")
horizontalAlignment: Text.AlignLeft
}
LatteExtraControls.Slider {
id: shadowSizeSlider
Layout.fillWidth: true
enabled: showAppletShadow.checked
value: plasmoid.configuration.shadowSize
from: 0
to: 100
stepSize: 5
wheelEnabled: false
function updateShadowSize() {
if (!pressed)
plasmoid.configuration.shadowSize = value;
}
onPressedChanged: {
updateShadowSize();
}
Component.onCompleted: {
valueChanged.connect(updateShadowSize);
}
Component.onDestruction: {
valueChanged.disconnect(updateShadowSize);
}
}
PlasmaComponents.Label {
enabled: showAppletShadow.checked
text: shadowSizeSlider.value + " %"
horizontalAlignment: Text.AlignRight
Layout.minimumWidth: theme.mSize(theme.defaultFont).width * 4
Layout.maximumWidth: theme.mSize(theme.defaultFont).width * 4
}
}
RowLayout{
enabled: showAppletShadow.checked
PlasmaComponents.Label {
enabled: showAppletShadow.checked
text: i18n("Opacity")
horizontalAlignment: Text.AlignLeft
}
LatteExtraControls.Slider {
id: shadowOpacitySlider
Layout.fillWidth: true
value: plasmoid.configuration.shadowOpacity
from: 0
to: 100
stepSize: 5
wheelEnabled: false
function updateShadowOpacity() {
if (!pressed)
plasmoid.configuration.shadowOpacity = value;
}
onPressedChanged: {
updateShadowOpacity();
}
Component.onCompleted: {
valueChanged.connect(updateShadowOpacity);
}
Component.onDestruction: {
valueChanged.disconnect(updateShadowOpacity);
}
}
PlasmaComponents.Label {
enabled: showAppletShadow.checked
text: shadowOpacitySlider.value + " %"
horizontalAlignment: Text.AlignRight
Layout.minimumWidth: theme.mSize(theme.defaultFont).width * 4
Layout.maximumWidth: theme.mSize(theme.defaultFont).width * 4
}
}
}
LatteExtraControls.SubHeader {
isFirstSubCategory: true
text: i18n("Color")
}
RowLayout {
id: shadowColorRow
Layout.fillWidth: true
Layout.leftMargin: units.smallSpacing * 2
Layout.rightMargin: units.smallSpacing * 2
spacing: 2
enabled: showAppletShadow.checked
readonly property string defaultShadow: "080808"
readonly property string themeShadow: {
var strC = String(theme.textColor);
return strC.indexOf("#") === 0 ? strC.substr(1) : strC;
}
ExclusiveGroup {
id: shadowColorGroup
property bool inStartup: true
onCurrentChanged: {
if (inStartup) {
return;
}
if (current === defaultShadowBtn) {
plasmoid.configuration.shadowColorType = Latte.Types.DefaultColorShadow;
} else if (current === themeShadowBtn) {
plasmoid.configuration.shadowColorType = Latte.Types.ThemeColorShadow;
} else if (current === userShadowBtn) {
plasmoid.configuration.shadowColorType = Latte.Types.UserColorShadow;
}
}
Component.onCompleted: inStartup = false;
}
PlasmaComponents.Button {
id: defaultShadowBtn
Layout.fillWidth: true
text: i18nc("default shadow", "Default")
checked: plasmoid.configuration.shadowColorType === Latte.Types.DefaultColorShadow
checkable: true
exclusiveGroup: shadowColorGroup
tooltip: i18n("Default shadow for applets")
}
PlasmaComponents.Button {
id: themeShadowBtn
Layout.fillWidth: true
text: i18nc("theme shadow", "Theme")
checked: plasmoid.configuration.shadowColorType === Latte.Types.ThemeColorShadow
checkable: true
exclusiveGroup: shadowColorGroup
tooltip: i18n("Shadow from theme color palette")
}
//overlayed button
PlasmaComponents.Button {
id: userShadowBtn
Layout.fillWidth: true
height: parent.height
text: " "
checkable: true
checked: plasmoid.configuration.shadowColorType === Latte.Types.UserColorShadow
tooltip: i18n("Use set shadow color")
exclusiveGroup: shadowColorGroup
Rectangle{
anchors.fill: parent
anchors.margins: 1.5*units.smallSpacing
color: "#" + plasmoid.configuration.shadowColor;
opacity: shadowColorRow.enabled ? 1 : 0.6
Rectangle{
anchors.fill: parent
color: "transparent"
border.width: 1
border.color: theme.textColor
opacity: parent.opacity - 0.4
}
MouseArea{
anchors.fill: parent
onClicked: {
shadowColorGroup.current = userShadowBtn;
viewConfig.setSticker(true);
colorDialogLoader.showDialog = true;
}
}
}
Loader{
id:colorDialogLoader
property bool showDialog: false
active: showDialog
sourceComponent: ColorDialog {
title: i18n("Please choose shadow color")
showAlphaChannel: false
onAccepted: {
//console.log("You chose: " + String(color));
var strC = String(color);
if (strC.indexOf("#") === 0) {
plasmoid.configuration.shadowColor = strC.substr(1);
}
colorDialogLoader.showDialog = false;
viewConfig.setSticker(false);
}
onRejected: {
colorDialogLoader.showDialog = false;
viewConfig.setSticker(false);
}
Component.onCompleted: {
color = String("#" + plasmoid.configuration.shadowColor);
visible = true;
}
}
}
}
}
}
//! END: Shadows
//! BEGIN: Animations
ColumnLayout {
Layout.fillWidth: true
Layout.topMargin: units.smallSpacing
Layout.rightMargin: units.smallSpacing * 2
spacing: units.smallSpacing
LatteExtraControls.Header {
text: i18n("Animations")
}
LatteExtraControls.SubHeader {
Layout.leftMargin: units.smallSpacing * 2
isFirstSubCategory: true
text: i18n("Duration")
}
RowLayout {
Layout.fillWidth: true
Layout.leftMargin: units.smallSpacing * 2
spacing: 2
property int duration: plasmoid.configuration.durationTime
ExclusiveGroup {
id: animationsGroup
onCurrentChanged: {
if (current.checked)
plasmoid.configuration.durationTime = current.duration
}
}
PlasmaComponents.Button {
Layout.fillWidth: true
text: i18n("Instant")
checked: parent.duration === duration
checkable: true
exclusiveGroup: animationsGroup
readonly property int duration: 0
}
PlasmaComponents.Button {
Layout.fillWidth: true
text: i18n("x1")
checked: parent.duration === duration
checkable: true
exclusiveGroup: animationsGroup
readonly property int duration: 1
}
PlasmaComponents.Button {
Layout.fillWidth: true
text: i18n("x2")
checked: parent.duration === duration
checkable: true
exclusiveGroup: animationsGroup
readonly property int duration: 2
}
PlasmaComponents.Button {
Layout.fillWidth: true
text: i18n("x3")
checked: parent.duration === duration
checkable: true
exclusiveGroup: animationsGroup
readonly property int duration: 3
}
}
}
//! END: Animations
//! BEGIN: Active Indicator
ColumnLayout{
spacing: units.smallSpacing
Layout.rightMargin: units.smallSpacing * 2
LatteExtraControls.HeaderSwitch {
id: indicatorsSwitch
Layout.fillWidth: true
Layout.minimumHeight: implicitHeight
checked: plasmoid.configuration.activeIndicator !== Latte.Types.NoneIndicator
text: i18n("Indicators")
tooltip: i18n("Enable/disable applet indicators")
onPressed: {
if(plasmoid.configuration.activeIndicator !== Latte.Types.AllIndicator){
plasmoid.configuration.activeIndicator = Latte.Types.AllIndicator;
} else {
plasmoid.configuration.activeIndicator = Latte.Types.NoneIndicator;
}
}
}
ColumnLayout {
Layout.rightMargin: units.smallSpacing
Layout.leftMargin: units.smallSpacing * 2
spacing: units.smallSpacing
enabled: indicatorsSwitch.checked
+ LatteExtraControls.SubHeader {
+ text: i18n("Style")
+ }
+
+ RowLayout {
+ Layout.fillWidth: true
+ spacing: 2
+
+ property int style: plasmoid.configuration.indicatorStyle
+
+ ExclusiveGroup {
+ id: indicatorStyleGroup
+ onCurrentChanged: {
+ if (current.checked) {
+ plasmoid.configuration.indicatorStyle = current.style
+ }
+ }
+ }
+
+ PlasmaComponents.Button {
+ Layout.fillWidth: true
+ text: i18nc("latte indicator style", "Latte")
+ checked: parent.style === style
+ checkable: true
+ exclusiveGroup: indicatorStyleGroup
+ tooltip: i18n("Use Latte style for your indicators")
+
+ readonly property int style: Latte.Types.LatteIndicator
+ }
+
+ PlasmaComponents.Button {
+ Layout.fillWidth: true
+ text: i18nc("plasma indicator style", "Plasma")
+ checked: parent.style === style
+ checkable: true
+ exclusiveGroup: indicatorStyleGroup
+ tooltip: i18n("Use Plasma style for your indicators")
+
+ readonly property int style: Latte.Types.PlasmaIndicator
+ }
+
+ PlasmaComponents.Button {
+ Layout.fillWidth: true
+ text: i18nc("unity indicator style", "Unity")
+ checked: parent.style === style
+ checkable: true
+ exclusiveGroup: indicatorStyleGroup
+ tooltip: i18n("Use Unity style for your indicators")
+
+ readonly property int style: Latte.Types.UnityIndicator
+ }
+ }
+
LatteExtraControls.SubHeader {
isFirstSubCategory: true
- text: i18nc("active indicator style","Style For Active")
+ text: i18nc("active indicator style","For Active")
+
+ visible: plasmoid.configuration.indicatorStyle === Latte.Types.LatteIndicator
}
RowLayout {
Layout.fillWidth: true
spacing: 2
+ visible: plasmoid.configuration.indicatorStyle === Latte.Types.LatteIndicator
property int indicatorType: plasmoid.configuration.activeIndicatorType
ExclusiveGroup {
id: activeIndicatorTypeGroup
onCurrentChanged: {
if (current.checked) {
plasmoid.configuration.activeIndicatorType = current.indicatorType;
}
}
}
PlasmaComponents.Button {
Layout.fillWidth: true
text: i18nc("line indicator","Line")
checked: parent.indicatorType === indicatorType
checkable: true
exclusiveGroup: activeIndicatorTypeGroup
tooltip: i18n("Show a line indicator for active items")
readonly property int indicatorType: Latte.Types.LineIndicator
}
PlasmaComponents.Button {
Layout.fillWidth: true
text: i18nc("dot indicator", "Dot")
checked: parent.indicatorType === indicatorType
checkable: true
exclusiveGroup: activeIndicatorTypeGroup
tooltip: i18n("Show a dot indicator for active items")
readonly property int indicatorType: Latte.Types.DotIndicator
}
}
LatteExtraControls.SubHeader {
enabled: plasmoid.configuration.glowOption!==Latte.Types.GlowNone
text: i18n("Glow")
+ visible: plasmoid.configuration.indicatorStyle === Latte.Types.LatteIndicator
}
RowLayout {
Layout.fillWidth: true
spacing: 2
+ visible: plasmoid.configuration.indicatorStyle === Latte.Types.LatteIndicator
property int option: plasmoid.configuration.glowOption
ExclusiveGroup {
id: glowGroup
onCurrentChanged: {
if (current.checked)
plasmoid.configuration.glowOption = current.option
}
}
PlasmaComponents.Button {
Layout.fillWidth: true
text: i18nc("none glow", "None")
checked: parent.option === option
checkable: true
exclusiveGroup: glowGroup
tooltip: i18n("Do not show any glow for task/applet indicators")
readonly property int option: Latte.Types.GlowNone
}
PlasmaComponents.Button {
Layout.fillWidth: true
text: i18nc("glow only to active task/applet indicators","On Active")
checked: parent.option === option
checkable: true
exclusiveGroup: glowGroup
tooltip: i18n("Add glow only to active task/applet indicator")
readonly property int option: Latte.Types.GlowOnlyOnActive
}
PlasmaComponents.Button {
Layout.fillWidth: true
text: i18nc("glow to all task/applet indicators","All")
checked: parent.option === option
checkable: true
exclusiveGroup: glowGroup
tooltip: i18n("Add glow to all task/applet indicators")
readonly property int option: Latte.Types.GlowAll
}
}
RowLayout {
Layout.fillWidth: true
Layout.topMargin: units.smallSpacing
spacing: 2
+ visible: plasmoid.configuration.indicatorStyle === Latte.Types.LatteIndicator
enabled: plasmoid.configuration.glowOption !== Latte.Types.GlowNone
PlasmaComponents.Label {
Layout.minimumWidth: implicitWidth
horizontalAlignment: Text.AlignLeft
Layout.rightMargin: units.smallSpacing
text: i18n("Opacity")
}
LatteExtraControls.Slider {
id: glowOpacitySlider
Layout.fillWidth: true
leftPadding: 0
value: plasmoid.configuration.glowOpacity
from: 0
to: 100
stepSize: 5
wheelEnabled: false
function updateGlowOpacity() {
if (!pressed)
plasmoid.configuration.glowOpacity = value;
}
onPressedChanged: {
updateGlowOpacity();
}
Component.onCompleted: {
valueChanged.connect(updateGlowOpacity);
}
Component.onDestruction: {
valueChanged.disconnect(updateGlowOpacity);
}
}
PlasmaComponents.Label {
text: glowOpacitySlider.value + " %"
horizontalAlignment: Text.AlignRight
Layout.minimumWidth: theme.mSize(theme.defaultFont).width * 4
Layout.maximumWidth: theme.mSize(theme.defaultFont).width * 4
}
}
LatteExtraControls.SubHeader {
text: i18n("Placement")
+ visible: plasmoid.configuration.indicatorStyle === Latte.Types.LatteIndicator
}
PlasmaComponents.CheckBox {
Layout.fillWidth: true
text: i18n("Reverse position for all indicators")
tooltip: i18n("Reverse indicators position e.g. from bottom to top")
checked: plasmoid.configuration.reverseLinesPosition
+ visible: plasmoid.configuration.indicatorStyle === Latte.Types.LatteIndicator
onClicked: {
plasmoid.configuration.reverseLinesPosition = checked;
}
}
}
}
//! END: Active Indicator
}
}