luneko/SweetTokyoNight
1
0
Fork 0
mirror of https://github.com/luneko/SweetTokyoNight.git synced 2025-12-15 16:09:53 +01:00
Code Issues Projects Releases Wiki Activity

Fix KeyboardLayoutButton in LockScreen

Browse Source
This commit is contained in:
Oleg Yakovenko
2021-05-07 01:45:40 +03:00
parent 2ac30625d1
commit e924c85895
2 changed files with 16 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
kde/look-and-feel/contents/components/KeyboardLayoutButton.qml
View File

@@ -32,21 +32,31 @@ PlasmaComponents.ToolButton {
iconName: "input-keyboard" iconName: "input-keyboard"
implicitWidth: minimumWidth implicitWidth: minimumWidth
text: layout.currentLayoutDisplayName text: layout.layoutName()
font.pointSize: Math.max(fontSize,theme.defaultFont.pointSize) font.pointSize: Math.max(fontSize,theme.defaultFont.pointSize)
Accessible.name: i18ndc("plasma_lookandfeel_org.kde.lookandfeel", "Button to change keyboard layout", "Switch layout") Accessible.name: i18ndc("plasma_lookandfeel_org.kde.lookandfeel", "Button to change keyboard layout", "Switch layout")
visible: layout.layouts.length > 1 visible: layout.shouldBeVisible()
onClicked: layout.nextLayout() onClicked: layout.nextLayout()
KeyboardLayout { KeyboardLayout {
id: layout id: layout
function nextLayout() { function nextLayout() {
var layouts = layout.layouts; layout.layout = (layout.layout + 1) % layout.layoutsList.length;
var index = (layouts.indexOf(layout.currentLayout)+1) % layouts.length; }
layout.currentLayout = layouts[index];
function shouldBeVisible() {
return layout.layoutsList.length > 1;
}
function layoutName() {
return (layout.isInitialized() && layout.layoutsList[layout.layout].displayName) || '';
}
function isInitialized() {
return layout.layoutsList.length > 0;
} }
} }
} }

48
kde/sddm/components/KeyboardLayoutButton.qml
View File

@@ -1,48 +0,0 @@
/***************************************************************************
* Copyright (C) 2014 by Daniel Vrátil <dvratil@redhat.com> *
* *
* This program 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. *
* *
* 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 General Public License for more details. *
* *
* You should have received a copy of the GNU 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 . *
***************************************************************************/
import QtQuick 2.1
import QtQuick.Controls 1.1 as QQC
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.workspace.keyboardlayout 1.0
PlasmaComponents.ToolButton {
id: kbLayoutButton
iconName: "input-keyboard"
implicitWidth: minimumWidth
text: layout.currentLayoutDisplayName
Accessible.name: i18ndc("plasma_lookandfeel_org.kde.lookandfeel", "Button to change keyboard layout", "Switch layout")
visible: layout.layouts.length > 1
onClicked: layout.nextLayout()
KeyboardLayout {
id: layout
function nextLayout() {
var layouts = layout.layouts;
var index = (layouts.indexOf(layout.currentLayout)+1) % layouts.length;
layout.currentLayout = layouts[index];
}
}
}