github-forks
/
latte-dock
mirror of https://github.com/KDE/latte-dock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bring back Settings::inAdvancedMode

Browse Source 
--ViewSettings::complexityLevel is not needed
any more... View::Settings will keep only two
states, Basic and Advanced mode
pull/15/head
Michail Vourlakos
parent a4e9b51b2b
commit 9919952239
9 changed files with 92 additions and 105 deletions

42
app/view/settings/primaryconfigview.cpp
Unescape Escape View File

@ -83,11 +83,11 @@ PrimaryConfigView::PrimaryConfigView(Plasma::Containment *containment, Latte::Vi
connect(this, &QQuickView::heightChanged, this, &PrimaryConfigView::updateEffects); connect(this, &QQuickView::heightChanged, this, &PrimaryConfigView::updateEffects);
connect(this, &PrimaryConfigView::availableScreenGeometryChanged, this, &PrimaryConfigView::syncGeometry); connect(this, &PrimaryConfigView::availableScreenGeometryChanged, this, &PrimaryConfigView::syncGeometry);
connect(this, &PrimaryConfigView::complexityChanged, this, &PrimaryConfigView::saveConfig); connect(this, &PrimaryConfigView::inAdvancedModeChanged, this, &PrimaryConfigView::saveConfig);
connect(this, &PrimaryConfigView::complexityChanged, this, &PrimaryConfigView::updateShowInlineProperties); connect(this, &PrimaryConfigView::inAdvancedModeChanged, this, &PrimaryConfigView::updateShowInlineProperties);
connect(this, &PrimaryConfigView::complexityChanged, this, &PrimaryConfigView::syncGeometry); connect(this, &PrimaryConfigView::inAdvancedModeChanged, this, &PrimaryConfigView::syncGeometry);
connect(this, &PrimaryConfigView::complexityChanged, m_latteView, &Latte::View::settingsLevelChanged); connect(this, &PrimaryConfigView::inAdvancedModeChanged, m_latteView, &Latte::View::inSettingsAdvancedModeChanged);
connect(this, &QQuickView::statusChanged, [&](QQuickView::Status status) { connect(this, &QQuickView::statusChanged, [&](QQuickView::Status status) {
if (status == QQuickView::Ready) { if (status == QQuickView::Ready) {
@ -153,7 +153,7 @@ void PrimaryConfigView::init()
loadConfig(); loadConfig();
//! inform view about the current settings level //! inform view about the current settings level
emit m_latteView->settingsLevelChanged(); emit m_latteView->inSettingsAdvancedModeChanged();
setDefaultAlphaBuffer(true); setDefaultAlphaBuffer(true);
setColor(Qt::transparent); setColor(Qt::transparent);
@ -290,7 +290,7 @@ void PrimaryConfigView::syncGeometry()
switch (m_latteView->formFactor()) { switch (m_latteView->formFactor()) {
case Plasma::Types::Horizontal: { case Plasma::Types::Horizontal: {
if (m_complexity == Latte::Types::ExpertSettings) { if (m_inAdvancedMode) {
if (qApp->isLeftToRight()) { if (qApp->isLeftToRight()) {
xPos = availGeometry.x() + availGeometry.width() - size.width(); xPos = availGeometry.x() + availGeometry.width() - size.width();
} else { } else {
@ -546,13 +546,11 @@ void PrimaryConfigView::updateShowInlineProperties()
} }
bool showSecWindow{false}; bool showSecWindow{false};
bool complexityApprovedSecWindow{false}; bool advancedApprovedSecWindow{false};
if (m_inAdvancedMode && m_latteView->formFactor() != Plasma::Types::Vertical) {
if (m_complexity != Latte::Types::BasicSettings
&& !(m_complexity == Latte::Types::ExpertSettings && m_latteView->formFactor() == Plasma::Types::Vertical)) {
showSecWindow = true; showSecWindow = true;
complexityApprovedSecWindow = true; advancedApprovedSecWindow = true;
} }
//! consider screen geometry for showing or not the secondary window //! consider screen geometry for showing or not the secondary window
@ -561,7 +559,7 @@ void PrimaryConfigView::updateShowInlineProperties()
if (m_secConfigView->geometryWhenVisible().intersects(geometryWhenVisible())) { if (m_secConfigView->geometryWhenVisible().intersects(geometryWhenVisible())) {
showSecWindow = false; showSecWindow = false;
} else if (complexityApprovedSecWindow) { } else if (advancedApprovedSecWindow) {
showSecWindow = true; showSecWindow = true;
} }
} }
@ -595,20 +593,19 @@ void PrimaryConfigView::updateWaylandId()
} }
} }
int PrimaryConfigView::complexity() const bool PrimaryConfigView::inAdvancedMode() const
{ {
return (int)m_complexity; return m_inAdvancedMode;
} }
void PrimaryConfigView::setComplexity(int complexity) void PrimaryConfigView::setInAdvancedMode(bool advanced)
{ {
if ((int)m_complexity == complexity) { if (m_inAdvancedMode == advanced) {
return; return;
} }
m_complexity = static_cast<Latte::Types::SettingsComplexity>(complexity); m_inAdvancedMode = advanced;
emit inAdvancedModeChanged();
emit complexityChanged();
} }
void PrimaryConfigView::hideConfigWindow() void PrimaryConfigView::hideConfigWindow()
@ -768,8 +765,8 @@ void PrimaryConfigView::loadConfig()
return; return;
} }
auto config = m_latteView->containment()->config(); auto config = m_latteView->containment()->config();
int complexity = config.readEntry("settingsComplexity", (int)Latte::Types::BasicSettings); int complexity = config.readEntry("settingsComplexity", 0);
setComplexity(static_cast<Latte::Types::SettingsComplexity>(complexity)); setInAdvancedMode(complexity>0);
} }
void PrimaryConfigView::saveConfig() void PrimaryConfigView::saveConfig()
@ -779,7 +776,8 @@ void PrimaryConfigView::saveConfig()
} }
auto config = m_latteView->containment()->config(); auto config = m_latteView->containment()->config();
config.writeEntry("settingsComplexity", (int)m_complexity); int complexity = m_inAdvancedMode ? 1 : 0;
config.writeEntry("settingsComplexity", complexity);
config.sync(); config.sync();
} }
//!END configuration //!END configuration

13
app/view/settings/primaryconfigview.h
Unescape Escape View File

@ -70,8 +70,7 @@ class PrimaryConfigView : public PlasmaQuick::ConfigView
Q_OBJECT Q_OBJECT
//! used when the secondary config window can not be shown //! used when the secondary config window can not be shown
Q_PROPERTY(bool showInlineProperties READ showInlineProperties NOTIFY showInlinePropertiesChanged) Q_PROPERTY(bool showInlineProperties READ showInlineProperties NOTIFY showInlinePropertiesChanged)
Q_PROPERTY(bool inAdvancedMode READ inAdvancedMode WRITE setInAdvancedMode NOTIFY inAdvancedModeChanged)
Q_PROPERTY(int complexity READ complexity WRITE setComplexity NOTIFY complexityChanged)
Q_PROPERTY(QRect availableScreenGeometry READ availableScreenGeometry NOTIFY availableScreenGeometryChanged) Q_PROPERTY(QRect availableScreenGeometry READ availableScreenGeometry NOTIFY availableScreenGeometryChanged)
@ -92,12 +91,12 @@ public:
Qt::WindowFlags wFlags() const; Qt::WindowFlags wFlags() const;
bool inAdvancedMode() const;
void setInAdvancedMode(bool advanced);
bool showInlineProperties() const; bool showInlineProperties() const;
bool sticker() const; bool sticker() const;
int complexity() const;
void setComplexity(int complexity);
QRect availableScreenGeometry() const; QRect availableScreenGeometry() const;
QRect geometryWhenVisible() const; QRect geometryWhenVisible() const;
@ -116,8 +115,8 @@ public slots:
signals: signals:
void availableScreenGeometryChanged(); void availableScreenGeometryChanged();
void complexityChanged();
void enabledBordersChanged(); void enabledBordersChanged();
void inAdvancedModeChanged();
void raiseDocksTemporaryChanged(); void raiseDocksTemporaryChanged();
void showInlinePropertiesChanged(); void showInlinePropertiesChanged();
void showSignal(); void showSignal();
@ -151,11 +150,11 @@ private:
bool m_blockFocusLost{false}; bool m_blockFocusLost{false};
bool m_blockFocusLostOnStartup{true}; bool m_blockFocusLostOnStartup{true};
bool m_originalByPassWM{false}; bool m_originalByPassWM{false};
bool m_inAdvancedMode{false};
bool m_inReverse{false}; //! it is used by the borders bool m_inReverse{false}; //! it is used by the borders
bool m_showInlineProperties{false}; bool m_showInlineProperties{false};
Latte::Types::Visibility m_originalMode{Latte::Types::DodgeActive}; Latte::Types::Visibility m_originalMode{Latte::Types::DodgeActive};
Latte::Types::SettingsComplexity m_complexity{Latte::Types::BasicSettings};
QRect m_availableScreenGeometry; QRect m_availableScreenGeometry;
QRect m_geometryWhenVisible; QRect m_geometryWhenVisible;

26
app/view/view.cpp
Unescape Escape View File

@ -776,6 +776,19 @@ void View::setLatteTasksArePresent(bool present)
emit latteTasksArePresentChanged(); emit latteTasksArePresentChanged();
} }
bool View::inSettingsAdvancedMode() const
{
if (m_configView) {
auto configView = qobject_cast<ViewPart::PrimaryConfigView *>(m_configView);
if (configView) {
return configView->inAdvancedMode();
}
}
return false;
}
bool View::isTouchingBottomViewAndIsBusy() const bool View::isTouchingBottomViewAndIsBusy() const
{ {
return m_isTouchingBottomViewAndIsBusy; return m_isTouchingBottomViewAndIsBusy;
@ -951,19 +964,6 @@ void View::setScreenEdgeMargin(int margin)
emit screenEdgeMarginChanged(); emit screenEdgeMarginChanged();
} }
int View::settingsLevel() const
{
if (m_configView) {
auto configView = qobject_cast<ViewPart::PrimaryConfigView *>(m_configView);
if (configView) {
return (int)configView->complexity();
}
}
return (int)Latte::Types::BasicSettings;
}
int View::fontPixelSize() const int View::fontPixelSize() const
{ {
return m_fontPixelSize; return m_fontPixelSize;

8
app/view/view.h
Unescape Escape View File

@ -88,6 +88,7 @@ class View : public PlasmaQuick::ContainmentView
Q_PROPERTY(bool byPassWM READ byPassWM WRITE setByPassWM NOTIFY byPassWMChanged) Q_PROPERTY(bool byPassWM READ byPassWM WRITE setByPassWM NOTIFY byPassWMChanged)
Q_PROPERTY(bool containsDrag READ containsDrag NOTIFY containsDragChanged) Q_PROPERTY(bool containsDrag READ containsDrag NOTIFY containsDragChanged)
Q_PROPERTY(bool contextMenuIsShown READ contextMenuIsShown NOTIFY contextMenuIsShownChanged) Q_PROPERTY(bool contextMenuIsShown READ contextMenuIsShown NOTIFY contextMenuIsShownChanged)
Q_PROPERTY(bool inSettingsAdvancedMode READ inSettingsAdvancedMode NOTIFY inSettingsAdvancedModeChanged)
//! Because Latte uses animations, changing to edit mode it may be different than //! Because Latte uses animations, changing to edit mode it may be different than
//! when the isUserConfiguring changes value //! when the isUserConfiguring changes value
@ -112,7 +113,6 @@ class View : public PlasmaQuick::ContainmentView
Q_PROPERTY(int normalThickness READ normalThickness WRITE setNormalThickness NOTIFY normalThicknessChanged) Q_PROPERTY(int normalThickness READ normalThickness WRITE setNormalThickness NOTIFY normalThicknessChanged)
Q_PROPERTY(int offset READ offset WRITE setOffset NOTIFY offsetChanged) Q_PROPERTY(int offset READ offset WRITE setOffset NOTIFY offsetChanged)
Q_PROPERTY(int screenEdgeMargin READ screenEdgeMargin WRITE setScreenEdgeMargin NOTIFY screenEdgeMarginChanged) Q_PROPERTY(int screenEdgeMargin READ screenEdgeMargin WRITE setScreenEdgeMargin NOTIFY screenEdgeMarginChanged)
Q_PROPERTY(int settingsLevel READ settingsLevel NOTIFY settingsLevelChanged)
Q_PROPERTY(float maxLength READ maxLength WRITE setMaxLength NOTIFY maxLengthChanged) Q_PROPERTY(float maxLength READ maxLength WRITE setMaxLength NOTIFY maxLengthChanged)
@ -169,6 +169,8 @@ public:
bool latteTasksArePresent() const; bool latteTasksArePresent() const;
void setLatteTasksArePresent(bool present); void setLatteTasksArePresent(bool present);
bool inSettingsAdvancedMode() const;
bool isTouchingBottomViewAndIsBusy() const; bool isTouchingBottomViewAndIsBusy() const;
void setIsTouchingBottomViewAndIsBusy(bool touchAndBusy); void setIsTouchingBottomViewAndIsBusy(bool touchAndBusy);
@ -202,8 +204,6 @@ public:
int alignment() const; int alignment() const;
void setAlignment(int alignment); void setAlignment(int alignment);
int settingsLevel() const;
QRect absoluteGeometry() const; QRect absoluteGeometry() const;
QRect screenGeometry() const; QRect screenGeometry() const;
@ -292,6 +292,7 @@ signals:
void heightChanged(); void heightChanged();
void inEditModeChanged(); void inEditModeChanged();
void indicatorChanged(); void indicatorChanged();
void inSettingsAdvancedModeChanged();
void isPreferredForShortcutsChanged(); void isPreferredForShortcutsChanged();
void isTouchingBottomViewAndIsBusyChanged(); void isTouchingBottomViewAndIsBusyChanged();
void isTouchingTopViewAndIsBusyChanged(); void isTouchingTopViewAndIsBusyChanged();
@ -304,7 +305,6 @@ signals:
void offsetChanged(); void offsetChanged();
void onPrimaryChanged(); void onPrimaryChanged();
void positionerChanged(); void positionerChanged();
void settingsLevelChanged();
void screenEdgeMarginChanged(); void screenEdgeMarginChanged();
void screenEdgeMarginEnabledChanged(); void screenEdgeMarginEnabledChanged();
void screenGeometryChanged(); void screenGeometryChanged();

6
containment/package/contents/ui/editmode/HeaderSettings.qml
Unescape Escape View File

@ -36,7 +36,7 @@ Item {
readonly property bool containsMouse: rearrangeBtn.containsMouse || stickOnBottomBtn.containsMouse || stickOnTopBtn.containsMouse readonly property bool containsMouse: rearrangeBtn.containsMouse || stickOnBottomBtn.containsMouse || stickOnTopBtn.containsMouse
readonly property int thickness: rearrangeBtn.implicitHeight readonly property int thickness: rearrangeBtn.implicitHeight
readonly property bool inExpertSettingsMode: latteView && (latteView.settingsLevel === LatteCore.Types.ExpertSettings) readonly property bool inSettingsAdvancedMode: latteView && latteView.inSettingsAdvancedMode
rotation: { rotation: {
if (plasmoid.formFactor === PlasmaCore.Types.Horizontal) { if (plasmoid.formFactor === PlasmaCore.Types.Horizontal) {
@ -76,7 +76,7 @@ Item {
SettingsControls.Button{ SettingsControls.Button{
id: stickOnTopBtn id: stickOnTopBtn
visible: root.isVertical && inExpertSettingsMode visible: root.isVertical && inSettingsAdvancedMode
text: i18n("Stick On Top"); text: i18n("Stick On Top");
tooltip: i18n("Stick maximum available space at top screen edge and ignore any top docks or panels") tooltip: i18n("Stick maximum available space at top screen edge and ignore any top docks or panels")
@ -135,7 +135,7 @@ Item {
SettingsControls.Button{ SettingsControls.Button{
id: stickOnBottomBtn id: stickOnBottomBtn
visible: root.isVertical && inExpertSettingsMode visible: root.isVertical && inSettingsAdvancedMode
text: i18n("Stick On Bottom"); text: i18n("Stick On Bottom");
tooltip: i18n("Stick maximum available space at bottom screen edge and ignore any bottom docks or panels") tooltip: i18n("Stick maximum available space at bottom screen edge and ignore any bottom docks or panels")

41
shell/package/contents/configuration/LatteDockConfiguration.qml
Unescape Escape View File

@ -43,11 +43,8 @@ import "../controls" as LatteExtraControls
FocusScope { FocusScope {
id: dialog id: dialog
readonly property bool basicLevel: viewConfig.complexity === LatteCore.Types.BasicSettings readonly property bool basicLevel: !advancedLevel
readonly property bool advancedLevel: viewConfig.complexity === LatteCore.Types.AdvancedSettings readonly property bool advancedLevel: viewConfig.inAdvancedMode
readonly property bool expertLevel: viewConfig.complexity === LatteCore.Types.ExpertSettings
readonly property bool highLevel: advancedLevel || expertLevel
readonly property bool inConfigureAppletsMode: plasmoid.configuration.inConfigureAppletsMode || !LatteCore.WindowSystem.compositingActive readonly property bool inConfigureAppletsMode: plasmoid.configuration.inConfigureAppletsMode || !LatteCore.WindowSystem.compositingActive
@ -74,7 +71,7 @@ FocusScope {
property real userScaleWidth: 1 property real userScaleWidth: 1
property real userScaleHeight: 1 property real userScaleHeight: 1
readonly property real heightLevel: (dialog.expertLevel ? 100 : 1) readonly property real heightLevel: (dialog.advancedLevel ? 100 : 1)
onHeightChanged: viewConfig.syncGeometry(); onHeightChanged: viewConfig.syncGeometry();
@ -100,10 +97,10 @@ FocusScope {
property color bC: theme.backgroundColor property color bC: theme.backgroundColor
property color transparentBackgroundColor: Qt.rgba(bC.r, bC.g, bC.b, 0.7) property color transparentBackgroundColor: Qt.rgba(bC.r, bC.g, bC.b, 0.7)
onHighLevelChanged: { onAdvancedLevelChanged: {
//! switch to appearancePage when effectsPage becomes hidden because //! switch to appearancePage when effectsPage becomes hidden because
//! advancedLevel was disabled by the user //! advancedLevel was disabled by the user
if (!highLevel && tabGroup.currentTab === effectsPage) { if (!advancedLevel && tabGroup.currentTab === effectsPage) {
tabGroup.currentTab = appearancePage; tabGroup.currentTab = appearancePage;
tabBar.currentTab = appearanceTabBtn; tabBar.currentTab = appearanceTabBtn;
} }
@ -152,8 +149,8 @@ FocusScope {
return; return;
} }
updatingWidthScale = metaModifier || (dialog.expertLevel && ctrlModifier); updatingWidthScale = metaModifier || (dialog.advancedLevel && ctrlModifier);
updatingHeightScale = !dialog.expertLevel && ctrlModifier; updatingHeightScale = dialog.basicLevel && ctrlModifier;
blockWheel = true; blockWheel = true;
wheelTriggeredOnce = true; wheelTriggeredOnce = true;
@ -298,7 +295,7 @@ FocusScope {
Item{ Item{
id: headerSpacer id: headerSpacer
Layout.minimumHeight: complexitySettings.height + 2*units.smallSpacing Layout.minimumHeight: advancedSettings.height + 2*units.smallSpacing
} }
ColumnLayout { ColumnLayout {
@ -335,7 +332,7 @@ FocusScope {
} }
RowLayout { RowLayout {
id: complexitySettings id: advancedSettings
Layout.fillWidth: true Layout.fillWidth: true
Layout.rightMargin: units.smallSpacing * 2 Layout.rightMargin: units.smallSpacing * 2
Layout.alignment: Qt.AlignRight | Qt.AlignTop Layout.alignment: Qt.AlignRight | Qt.AlignTop
@ -346,7 +343,7 @@ FocusScope {
} }
PlasmaComponents.Label { PlasmaComponents.Label {
id: complexityLbl id: advancedLbl
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
// opacity: dialog.basicLevel ? basicOpacity : 1 // opacity: dialog.basicLevel ? basicOpacity : 1
@ -377,26 +374,20 @@ FocusScope {
} }
MouseArea { MouseArea {
id: complexityMouseArea id: advancedMouseArea
anchors.fill: parent anchors.fill: parent
hoverEnabled: true hoverEnabled: true
onClicked: { onClicked: {
complexitySwitch.checked = !complexitySwitch.checked; advancedSwitch.checked = !advancedSwitch.checked;
} }
} }
} }
LatteComponents.Switch { LatteComponents.Switch {
id: complexitySwitch id: advancedSwitch
checked: (viewConfig.complexity === LatteCore.Types.ExpertSettings) checked: viewConfig.inAdvancedMode
onCheckedChanged: { onCheckedChanged: viewConfig.inAdvancedMode = checked;
if (checked) {
viewConfig.complexity = LatteCore.Types.ExpertSettings;
} else {
viewConfig.complexity = LatteCore.Types.BasicSettings;
}
}
} }
} }
} }
@ -421,7 +412,7 @@ FocusScope {
id: effectsTabBtn id: effectsTabBtn
text: i18n("Effects") text: i18n("Effects")
tab: effectsPage tab: effectsPage
visible: dialog.highLevel visible: dialog.advancedLevel
} }
Repeater { Repeater {

31
shell/package/contents/configuration/pages/AppearanceConfig.qml
Unescape Escape View File

@ -58,7 +58,7 @@ PlasmaComponents.Page {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: units.smallSpacing Layout.topMargin: units.smallSpacing
spacing: units.smallSpacing spacing: units.smallSpacing
visible: false //dialog.highLevel visible: false
LatteComponents.Header { LatteComponents.Header {
text: i18n("Layout") text: i18n("Layout")
@ -138,7 +138,6 @@ PlasmaComponents.Page {
//! BEGIN: Items //! BEGIN: Items
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
//Layout.topMargin: dialog.highLevel ? 0 : units.smallSpacing
Layout.topMargin: units.smallSpacing Layout.topMargin: units.smallSpacing
spacing: units.smallSpacing spacing: units.smallSpacing
@ -174,7 +173,7 @@ PlasmaComponents.Page {
value: plasmoid.configuration.iconSize value: plasmoid.configuration.iconSize
from: 16 from: 16
to: latteView.visibility.mode === LatteCore.Types.SideBar ? 512 : 256 to: latteView.visibility.mode === LatteCore.Types.SideBar ? 512 : 256
stepSize: dialog.highLevel || (plasmoid.configuration.iconSize % 8 !== 0) || dialog.viewIsPanel ? 1 : 8 stepSize: dialog.advancedLevel || (plasmoid.configuration.iconSize % 8 !== 0) || dialog.viewIsPanel ? 1 : 8
wheelEnabled: false wheelEnabled: false
function updateIconSize() { function updateIconSize() {
@ -209,7 +208,7 @@ PlasmaComponents.Page {
Layout.minimumWidth: dialog.optionsWidth Layout.minimumWidth: dialog.optionsWidth
Layout.maximumWidth: Layout.minimumWidth Layout.maximumWidth: Layout.minimumWidth
spacing: units.smallSpacing spacing: units.smallSpacing
visible: dialog.expertLevel || plasmoid.configuration.proportionIconSize>0 visible: dialog.advancedLevel || plasmoid.configuration.proportionIconSize>0
PlasmaComponents.Label { PlasmaComponents.Label {
text: i18nc("relative size", "Relative") text: i18nc("relative size", "Relative")
@ -424,7 +423,7 @@ PlasmaComponents.Page {
Layout.minimumWidth: dialog.optionsWidth Layout.minimumWidth: dialog.optionsWidth
Layout.maximumWidth: Layout.minimumWidth Layout.maximumWidth: Layout.minimumWidth
spacing: units.smallSpacing spacing: units.smallSpacing
visible: dialog.expertLevel visible: dialog.advancedLevel
enabled: (plasmoid.configuration.alignment !== LatteCore.Types.Justify) enabled: (plasmoid.configuration.alignment !== LatteCore.Types.Justify)
PlasmaComponents.Label { PlasmaComponents.Label {
@ -483,7 +482,7 @@ PlasmaComponents.Page {
Layout.minimumWidth: dialog.optionsWidth Layout.minimumWidth: dialog.optionsWidth
Layout.maximumWidth: Layout.minimumWidth Layout.maximumWidth: Layout.minimumWidth
spacing: units.smallSpacing spacing: units.smallSpacing
visible: dialog.expertLevel visible: dialog.advancedLevel
PlasmaComponents.Label { PlasmaComponents.Label {
id: offsetLbl id: offsetLbl
@ -551,7 +550,7 @@ PlasmaComponents.Page {
Layout.fillWidth: true Layout.fillWidth: true
spacing: units.smallSpacing spacing: units.smallSpacing
visible: dialog.expertLevel visible: dialog.advancedLevel
readonly property int maxMargin: 25 readonly property int maxMargin: 25
@ -701,7 +700,7 @@ PlasmaComponents.Page {
//! BEGIN: Colors //! BEGIN: Colors
ColumnLayout { ColumnLayout {
spacing: units.smallSpacing spacing: units.smallSpacing
visible: dialog.expertLevel visible: dialog.advancedLevel
LatteComponents.Header { LatteComponents.Header {
Layout.columnSpan: 4 Layout.columnSpan: 4
@ -984,7 +983,7 @@ PlasmaComponents.Page {
} }
LatteComponents.SubHeader { LatteComponents.SubHeader {
visible: dialog.expertLevel visible: dialog.advancedLevel
isFirstSubCategory: true isFirstSubCategory: true
text: i18n("Options") text: i18n("Options")
} }
@ -992,7 +991,7 @@ PlasmaComponents.Page {
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 2 spacing: 2
visible: dialog.expertLevel visible: dialog.advancedLevel
readonly property int buttonSize: (dialog.optionsWidth - (spacing*2)) / 3 readonly property int buttonSize: (dialog.optionsWidth - (spacing*2)) / 3
@ -1043,7 +1042,7 @@ PlasmaComponents.Page {
} }
LatteComponents.SubHeader { LatteComponents.SubHeader {
visible: dialog.expertLevel visible: dialog.advancedLevel
text: i18nc("dynamic visibility for background", "Dynamic Visibility") text: i18nc("dynamic visibility for background", "Dynamic Visibility")
enabled: LatteCore.WindowSystem.compositingActive enabled: LatteCore.WindowSystem.compositingActive
} }
@ -1057,7 +1056,7 @@ PlasmaComponents.Page {
checked: plasmoid.configuration.solidBackgroundForMaximized checked: plasmoid.configuration.solidBackgroundForMaximized
tooltip: i18n("Background removes its transparency setting when a window is touching") tooltip: i18n("Background removes its transparency setting when a window is touching")
enabled: showBackground.checked enabled: showBackground.checked
visible: dialog.expertLevel visible: dialog.advancedLevel
onClicked: { onClicked: {
plasmoid.configuration.solidBackgroundForMaximized = checked; plasmoid.configuration.solidBackgroundForMaximized = checked;
@ -1071,7 +1070,7 @@ PlasmaComponents.Page {
checked: plasmoid.configuration.backgroundOnlyOnMaximized checked: plasmoid.configuration.backgroundOnlyOnMaximized
tooltip: i18n("Background becomes hidden except when a window is touching or the desktop background is busy") tooltip: i18n("Background becomes hidden except when a window is touching or the desktop background is busy")
enabled: showBackground.checked enabled: showBackground.checked
visible: dialog.expertLevel visible: dialog.advancedLevel
onClicked: { onClicked: {
plasmoid.configuration.backgroundOnlyOnMaximized = checked; plasmoid.configuration.backgroundOnlyOnMaximized = checked;
@ -1085,7 +1084,7 @@ PlasmaComponents.Page {
checked: plasmoid.configuration.disablePanelShadowForMaximized checked: plasmoid.configuration.disablePanelShadowForMaximized
tooltip: i18n("Background shadows become hidden when an active maximized window is touching the view") tooltip: i18n("Background shadows become hidden when an active maximized window is touching the view")
enabled: showBackground.checked enabled: showBackground.checked
visible: dialog.expertLevel visible: dialog.advancedLevel
onClicked: { onClicked: {
plasmoid.configuration.disablePanelShadowForMaximized = checked; plasmoid.configuration.disablePanelShadowForMaximized = checked;
@ -1094,7 +1093,7 @@ PlasmaComponents.Page {
} }
LatteComponents.SubHeader { LatteComponents.SubHeader {
visible: dialog.expertLevel visible: dialog.advancedLevel
text: i18n("Exceptions") text: i18n("Exceptions")
enabled: LatteCore.WindowSystem.compositingActive enabled: LatteCore.WindowSystem.compositingActive
} }
@ -1106,7 +1105,7 @@ PlasmaComponents.Page {
checked: plasmoid.configuration.plasmaBackgroundForPopups checked: plasmoid.configuration.plasmaBackgroundForPopups
tooltip: i18n("Background becomes opaque in plasma style when applets are expanded") tooltip: i18n("Background becomes opaque in plasma style when applets are expanded")
enabled: showBackground.checked enabled: showBackground.checked
visible: dialog.expertLevel visible: dialog.advancedLevel
onClicked: { onClicked: {
plasmoid.configuration.plasmaBackgroundForPopups = checked; plasmoid.configuration.plasmaBackgroundForPopups = checked;

10
shell/package/contents/configuration/pages/BehaviorConfig.qml
Unescape Escape View File

@ -53,7 +53,7 @@ PlasmaComponents.Page {
spacing: units.smallSpacing spacing: units.smallSpacing
Layout.topMargin: units.smallSpacing Layout.topMargin: units.smallSpacing
visible: dialog.highLevel && viewConfig.showInlineProperties visible: dialog.advancedLevel && viewConfig.showInlineProperties
LatteComponents.Header { LatteComponents.Header {
text: i18n("Type") text: i18n("Type")
@ -88,7 +88,7 @@ PlasmaComponents.Page {
Layout.leftMargin: units.smallSpacing * 2 Layout.leftMargin: units.smallSpacing * 2
Layout.rightMargin: units.smallSpacing * 3 Layout.rightMargin: units.smallSpacing * 3
spacing: 2 spacing: 2
visible: screensCount > 1 || dialog.expertLevel visible: screensCount > 1 || dialog.advancedLevel
property int screensCount: 1 property int screensCount: 1
@ -533,7 +533,7 @@ PlasmaComponents.Page {
//! BEGIN: Actions //! BEGIN: Actions
ColumnLayout { ColumnLayout {
spacing: units.smallSpacing spacing: units.smallSpacing
visible: dialog.expertLevel visible: dialog.advancedLevel
LatteComponents.Header { LatteComponents.Header {
text: i18n("Actions") text: i18n("Actions")
@ -705,7 +705,7 @@ PlasmaComponents.Page {
text: i18n("Expand popup through mouse wheel") text: i18n("Expand popup through mouse wheel")
checked: plasmoid.configuration.mouseWheelActions checked: plasmoid.configuration.mouseWheelActions
tooltip: i18n("Show or Hide applet popup through mouse wheel action") tooltip: i18n("Show or Hide applet popup through mouse wheel action")
visible: dialog.highLevel visible: dialog.advancedLevel
onClicked: { onClicked: {
plasmoid.configuration.mouseWheelActions = checked plasmoid.configuration.mouseWheelActions = checked
@ -773,7 +773,7 @@ PlasmaComponents.Page {
ColumnLayout { ColumnLayout {
spacing: units.smallSpacing spacing: units.smallSpacing
visible: dialog.expertLevel visible: dialog.advancedLevel
enabled: !(latteView.visibility.mode === LatteCore.Types.AlwaysVisible enabled: !(latteView.visibility.mode === LatteCore.Types.AlwaysVisible
|| latteView.visibility.mode === LatteCore.Types.WindowsGoBelow || latteView.visibility.mode === LatteCore.Types.WindowsGoBelow
|| latteView.visibility.mode === LatteCore.Types.WindowsCanCover || latteView.visibility.mode === LatteCore.Types.WindowsCanCover

18
shell/package/contents/configuration/pages/TasksConfig.qml
Unescape Escape View File

@ -52,7 +52,7 @@ PlasmaComponents.Page {
ColumnLayout { ColumnLayout {
spacing: units.smallSpacing spacing: units.smallSpacing
Layout.topMargin: units.smallSpacing Layout.topMargin: units.smallSpacing
visible: dialog.highLevel visible: dialog.advancedLevel
LatteComponents.Header { LatteComponents.Header {
text: i18n("Badges") text: i18n("Badges")
@ -151,7 +151,7 @@ PlasmaComponents.Page {
Layout.maximumWidth: dialog.optionsWidth Layout.maximumWidth: dialog.optionsWidth
text: i18n("Window actions in the context menu") text: i18n("Window actions in the context menu")
checked: tasks.configuration.showWindowActions checked: tasks.configuration.showWindowActions
visible: dialog.highLevel visible: dialog.advancedLevel
enabled: !disableAllWindowsFunctionality enabled: !disableAllWindowsFunctionality
onClicked: { onClicked: {
@ -165,7 +165,7 @@ PlasmaComponents.Page {
text: i18n("➊ Based on position shortcuts apply only for tasks") text: i18n("➊ Based on position shortcuts apply only for tasks")
checked: !plasmoid.configuration.unifiedGlobalShortcuts checked: !plasmoid.configuration.unifiedGlobalShortcuts
tooltip: i18n("Based on position global shortcuts are enabled only for tasks and not for applets") tooltip: i18n("Based on position global shortcuts are enabled only for tasks and not for applets")
visible: dialog.highLevel visible: dialog.advancedLevel
enabled: latteView.isPreferredForShortcuts || (!latteView.layout.preferredForShortcutsTouched && latteView.isHighestPriorityView()) enabled: latteView.isPreferredForShortcuts || (!latteView.layout.preferredForShortcutsTouched && latteView.isHighestPriorityView())
onClicked: { onClicked: {
@ -223,7 +223,7 @@ PlasmaComponents.Page {
Layout.maximumWidth: dialog.optionsWidth Layout.maximumWidth: dialog.optionsWidth
text: i18n("Show only tasks from launchers") text: i18n("Show only tasks from launchers")
checked: tasks.configuration.showWindowsOnlyFromLaunchers checked: tasks.configuration.showWindowsOnlyFromLaunchers
visible: dialog.highLevel visible: dialog.advancedLevel
onClicked: { onClicked: {
tasks.configuration.showWindowsOnlyFromLaunchers = checked tasks.configuration.showWindowsOnlyFromLaunchers = checked
@ -235,7 +235,7 @@ PlasmaComponents.Page {
text: i18n("Group tasks of the same application") text: i18n("Group tasks of the same application")
checked: tasks.configuration.groupTasksByDefault checked: tasks.configuration.groupTasksByDefault
tooltip: i18n("By default group tasks of the same application") tooltip: i18n("By default group tasks of the same application")
visible: dialog.highLevel visible: dialog.advancedLevel
onClicked: { onClicked: {
tasks.configuration.groupTasksByDefault = checked tasks.configuration.groupTasksByDefault = checked
@ -250,7 +250,7 @@ PlasmaComponents.Page {
ColumnLayout { ColumnLayout {
spacing: units.smallSpacing spacing: units.smallSpacing
enabled: plasmoid.configuration.animationsEnabled enabled: plasmoid.configuration.animationsEnabled
visible: dialog.highLevel visible: dialog.advancedLevel
LatteComponents.Header { LatteComponents.Header {
text: i18n("Animations") text: i18n("Animations")
@ -399,7 +399,7 @@ PlasmaComponents.Page {
//! BEGIN: Scrolling //! BEGIN: Scrolling
ColumnLayout { ColumnLayout {
spacing: units.smallSpacing spacing: units.smallSpacing
visible: dialog.expertLevel visible: dialog.advancedLevel
LatteComponents.HeaderSwitch { LatteComponents.HeaderSwitch {
id: scrollingHeader id: scrollingHeader
@ -481,7 +481,7 @@ PlasmaComponents.Page {
//! BEGIN: Actions //! BEGIN: Actions
ColumnLayout { ColumnLayout {
spacing: units.smallSpacing spacing: units.smallSpacing
visible: dialog.expertLevel visible: dialog.advancedLevel
LatteComponents.Header { LatteComponents.Header {
text: i18n("Actions") text: i18n("Actions")
@ -693,7 +693,7 @@ PlasmaComponents.Page {
//! BEGIN: Recycling //! BEGIN: Recycling
/* ColumnLayout { /* ColumnLayout {
spacing: units.smallSpacing spacing: units.smallSpacing
visible: dialog.expertLevel visible: dialog.advancedLevel
LatteComponents.Header { LatteComponents.Header {
text: i18n("Recycling") text: i18n("Recycling")

Write Preview
Loading…
Cancel
Save