marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-03 10:14:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

taskpanel: Remove keyboard button setting, only show when unsupported

Browse source
This commit is contained in:
Devin Lin 2022-09-12 08:12:24 -04:00
parent 336f35a235
commit c6feac9ce0
4 changed files with 2 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
components/mobileshell/mobileshellsettings.cpp
View file

@ -107,19 +107,6 @@ void MobileShellSettings::setNavigationPanelEnabled(bool navigationPanelEnabled)
m_config->sync(); m_config->sync();
} }
bool MobileShellSettings::keyboardButtonEnabled() const
{
auto group = KConfigGroup{m_config, GENERAL_CONFIG_GROUP};
return group.readEntry("keyboardButtonEnabled", false);
}
void MobileShellSettings::setKeyboardButtonEnabled(bool keyboardButtonEnabled)
{
auto group = KConfigGroup{m_config, GENERAL_CONFIG_GROUP};
group.writeEntry("keyboardButtonEnabled", keyboardButtonEnabled, KConfigGroup::Notify);
m_config->sync();
}
bool MobileShellSettings::taskSwitcherPreviewsEnabled() const bool MobileShellSettings::taskSwitcherPreviewsEnabled() const
{ {
auto group = KConfigGroup{m_config, GENERAL_CONFIG_GROUP}; auto group = KConfigGroup{m_config, GENERAL_CONFIG_GROUP};

13
components/mobileshell/mobileshellsettings.h
View file

@ -28,7 +28,6 @@ class MobileShellSettings : public QObject
// navigation panel // navigation panel
Q_PROPERTY(bool navigationPanelEnabled READ navigationPanelEnabled WRITE setNavigationPanelEnabled NOTIFY navigationPanelEnabledChanged) Q_PROPERTY(bool navigationPanelEnabled READ navigationPanelEnabled WRITE setNavigationPanelEnabled NOTIFY navigationPanelEnabledChanged)
Q_PROPERTY(bool keyboardButtonEnabled READ keyboardButtonEnabled WRITE setKeyboardButtonEnabled NOTIFY keyboardButtonEnabledChanged)
// task switcher // task switcher
Q_PROPERTY(bool taskSwitcherPreviewsEnabled READ taskSwitcherPreviewsEnabled WRITE setTaskSwitcherPreviewsEnabled NOTIFY taskSwitcherPreviewsEnabledChanged) Q_PROPERTY(bool taskSwitcherPreviewsEnabled READ taskSwitcherPreviewsEnabled WRITE setTaskSwitcherPreviewsEnabled NOTIFY taskSwitcherPreviewsEnabledChanged)
@ -116,18 +115,6 @@ public:
*/ */
void setNavigationPanelEnabled(bool navigationPanelEnabled); void setNavigationPanelEnabled(bool navigationPanelEnabled);
/**
* Whether the keyboard toggle button on the navigation panel is enabled.
*/
bool keyboardButtonEnabled() const;
/**
* Set whether the keyboard toggle button on the navigation panel is enabled.
*
* @param keyboardButtonEnabled Whether the keyboard button on the navigation panel should be enabled.
*/
void setKeyboardButtonEnabled(bool keyboardButtonEnabled);
/** /**
* Whether task switcher application previews are enabled. * Whether task switcher application previews are enabled.
*/ */

4
containments/taskpanel/package/contents/ui/NavigationPanelComponent.qml
View file

@ -107,8 +107,8 @@ MobileShell.NavigationPanel {
rightCornerAction: MobileShell.NavigationPanelAction { rightCornerAction: MobileShell.NavigationPanelAction {
id: keyboardToggleAction id: keyboardToggleAction
visible: MobileShell.MobileShellSettings.keyboardButtonEnabled visible: Keyboards.KWinVirtualKeyboard.available && !Keyboards.KWinVirtualKeyboard.activeClientSupportsTextInput
enabled: Keyboards.KWinVirtualKeyboard.available enabled: true
iconSource: "input-keyboard-virtual-symbolic" iconSource: "input-keyboard-virtual-symbolic"
iconSizeFactor: 0.75 iconSizeFactor: 0.75

19
kcms/mobileshell/package/contents/ui/main.qml
View file

@ -80,25 +80,6 @@ KCM.SimpleKCM {
} }
} }
} }
MobileForm.FormDelegateSeparator {
visible: MobileShell.MobileShellSettings.navigationPanelEnabled
above: gestureDelegate
below: keyboardButtonDelegate
}
MobileForm.FormSwitchDelegate {
id: keyboardButtonDelegate
visible: MobileShell.MobileShellSettings.navigationPanelEnabled
text: i18n("Keyboard Toggle")
description: i18n("Whether to show a keyboard button on the navigation panel.")
checked: MobileShell.MobileShellSettings.keyboardButtonEnabled
onCheckedChanged: {
if (checked != MobileShell.MobileShellSettings.keyboardButtonEnabled) {
MobileShell.MobileShellSettings.keyboardButtonEnabled = checked;
}
}
}
} }
} }