Commit 6fc9545b authored by Ivan Čukić's avatar Ivan Čukić 👁
Browse files

Merge branch 'ivan/vertical-panel-activity-switcher' into master

parents 07631c72 32d34280
...@@ -30,7 +30,6 @@ Kirigami.FormLayout { ...@@ -30,7 +30,6 @@ Kirigami.FormLayout {
property alias cfg_showActivityIcon: radioCurrentActivityIcon.checked property alias cfg_showActivityIcon: radioCurrentActivityIcon.checked
property alias cfg_showActivityName: checkShowActivityName.checked property alias cfg_showActivityName: checkShowActivityName.checked
property bool disableSetting: plasmoid.formFactor === PlasmaCore.Types.Vertical
Item { Kirigami.FormData.isSection: true } Item { Kirigami.FormData.isSection: true }
...@@ -39,13 +38,11 @@ Kirigami.FormLayout { ...@@ -39,13 +38,11 @@ Kirigami.FormLayout {
Kirigami.FormData.label: i18n("Icon:") Kirigami.FormData.label: i18n("Icon:")
enabled: !disableSetting
text: i18n("Show the current activity icon") text: i18n("Show the current activity icon")
} }
RadioButton { RadioButton {
id: radioGenericActivityIcon id: radioGenericActivityIcon
enabled: !disableSetting
checked: !radioCurrentActivityIcon.checked checked: !radioCurrentActivityIcon.checked
text: i18n("Show the generic activity icon") text: i18n("Show the generic activity icon")
} }
...@@ -55,6 +52,8 @@ Kirigami.FormLayout { ...@@ -55,6 +52,8 @@ Kirigami.FormLayout {
CheckBox { CheckBox {
id: checkShowActivityName id: checkShowActivityName
enabled: plasmoid.formFactor !== PlasmaCore.Types.Vertical
Kirigami.FormData.label: i18n("Title:") Kirigami.FormData.label: i18n("Title:")
text: i18n("Show the current activity name") text: i18n("Show the current activity name")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment