Skip to content

Commit

Permalink
Updated Licenses.
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrTall committed Jun 9, 2024
1 parent d74a30d commit 41c778c
Show file tree
Hide file tree
Showing 14 changed files with 192 additions and 340 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# SPDX-FileCopyrightText: 2024 Christian Tallner <[email protected]>
#
# SPDX-License-Identifier: GPL-2.0-or-later
# Created by https://www.toptal.com/developers/gitignore/api/cmake,clion
# Edit at https://www.toptal.com/developers/gitignore?templates=cmake,clion

Expand Down
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# SPDX-FileCopyrightText: 2024 Christian Tallner <[email protected]>
#
# SPDX-License-Identifier: GPL-2.0-or-later
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
project(org.chrtall.kppleMenu)

Expand Down
117 changes: 117 additions & 0 deletions LICENSES/GPL-2.0-or-later.txt

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions install-plasmoid.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
#!/bin/bash
# SPDX-FileCopyrightText: 2024 Christian Tallner <[email protected]>
#
# SPDX-License-Identifier: GPL-2.0-or-later
kpackagetool5 -t "Plasma/Applet" -i package/
311 changes: 0 additions & 311 deletions package/LICENSES/GPL-2.0-or-later.txt

This file was deleted.

4 changes: 2 additions & 2 deletions package/contents/config/config.qml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/

import QtQuick 2.0
import org.kde.plasma.configuration 2.0 as PlasmaConfig
import QtQuick
import org.kde.plasma.configuration as PlasmaConfig

PlasmaConfig.ConfigModel {

Expand Down
2 changes: 0 additions & 2 deletions package/contents/ui/ListDelegate.qml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
import QtQuick
import QtQuick.Layouts

import org.kde.plasma.plasmoid
import org.kde.plasma.core as PlasmaCore
import org.kde.plasma.components as PlasmaComponents
import org.kde.kirigami as Kirigami

Expand Down
17 changes: 13 additions & 4 deletions package/contents/ui/code/tools.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
/*
* SPDX-FileCopyrightText: 2024 Christian Tallner <[email protected]>
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
SPDX-FileCopyrightText: 2013 Aurélien Gâteau <[email protected]>
SPDX-FileCopyrightText: 2013-2015 Eike Hein <[email protected]>
SPDX-FileCopyrightText: 2017 Ivan Cukic <[email protected]>
SPDX-FileCopyrightText: 2022 ivan tkachenko <[email protected]>
SPDX-License-Identifier: GPL-2.0-or-later
Begin: code from plasma-desktop/applets/kickoff/contents/ui/code/tool.js
*/

const defaultIconName = "start-here-kde-symbolic";

function iconOrDefault(formFactor, preferredIconName) {
// Vertical panels must have an icon, at least a default one.
return (formFactor === PlasmaCore.Types.Vertical && preferredIconName === "")
? defaultIconName : preferredIconName;
}
/*
* End: code from plasma-desktop/applets/kickoff/contents/ui/code/tool.js
*/
25 changes: 14 additions & 11 deletions package/contents/ui/config/configGeneral.qml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-FileCopyrightText: 2024 Christian Tallner <[email protected]>
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
*/

import QtQuick
import QtQuick.Layouts
Expand Down Expand Up @@ -37,7 +37,15 @@ KCM.SimpleKCM {


Kirigami.FormLayout {

/*
* Begin: code from plasma-desktop/applets/kickoff/contents/ui/ConfigGeneral.qml
* SPDX-FileCopyrightText: 2013 David Edmundson <[email protected]>
* SPDX-FileCopyrightText: 2021 Mikel Johnson <[email protected]>
* SPDX-FileCopyrightText: 2022 Nate Graham <[email protected]>
* SPDX-FileCopyrightText: 2022 ivan tkachenko <[email protected]>
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
QQC2.Button {
id: iconButton

Expand All @@ -57,7 +65,7 @@ KCM.SimpleKCM {

KIconThemes.IconDialog {
id: iconDialog
onIconNameChanged: {
onIconNameChanged: (iconName) => {
root.cfg_icon = iconName || Tools.defaultIconName;
}
}
Expand Down Expand Up @@ -106,14 +114,9 @@ KCM.SimpleKCM {
}
}
}

// Text {
// text: i18n("Adapt the links with your own command lines")
// }
// Text {
// color: "red"
// text: i18n("( Warning : This is the expert mode, do not change anything if the application is working properly. )")
// }
/*
End: code from plasma-desktop/applets/kickoff/contents/ui/ConfigGeneral.qml
*/

QQC2.CheckBox {
id: showAdvancedMode
Expand Down
33 changes: 25 additions & 8 deletions package/contents/ui/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,15 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/

import QtQuick 2.2
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.1
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls

import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core as PlasmaCore
import org.kde.plasma.plasmoid
import org.kde.plasma.components as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.plasma.extras as PlasmaExtras
import org.kde.plasma.plasma5support as Plasma5Support
import org.kde.kirigami 2.5 as Kirigami
import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.kirigami as Kirigami

PlasmoidItem {
id: root
Expand Down Expand Up @@ -63,6 +61,9 @@ PlasmoidItem {
}
}

KeyNavigation.up: aboutThisComputerItem
KeyNavigation.down: aboutThisComputerItem

fullRepresentation: Item {
id: fullRoot

Expand Down Expand Up @@ -97,6 +98,8 @@ PlasmoidItem {
executable.exec(aboutThisComputerCMD); // cmd exec
}
activeFocusOnTab: true
KeyNavigation.up: logOutItem
KeyNavigation.down: systemPreferencesItem
}

MenuSeparator {
Expand All @@ -120,6 +123,8 @@ PlasmoidItem {
executable.exec(systemPreferencesCMD); // cmd exec
}
activeFocusOnTab: true
KeyNavigation.up: aboutThisComputerItem
KeyNavigation.down: appStoreItem
}

ListDelegate {
Expand All @@ -130,6 +135,8 @@ PlasmoidItem {
executable.exec(appStoreCMD); // cmd exec
}
activeFocusOnTab: true
KeyNavigation.up: systemPreferencesItem
KeyNavigation.down: sleepItem
}

MenuSeparator {
Expand All @@ -152,6 +159,8 @@ PlasmoidItem {
executable.exec(sleepCMD); // cmd exec
}
activeFocusOnTab: true
KeyNavigation.up: appStoreItem
KeyNavigation.down: restartItem
}

ListDelegate {
Expand All @@ -162,6 +171,8 @@ PlasmoidItem {
executable.exec(restartCMD); // cmd exec
}
activeFocusOnTab: true
KeyNavigation.up: sleepItem
KeyNavigation.down: shutDownItem
}

ListDelegate {
Expand All @@ -172,6 +183,8 @@ PlasmoidItem {
executable.exec(shutDownCMD); // cmd exec
}
activeFocusOnTab: true
KeyNavigation.up: restartItem
KeyNavigation.down: lockScreenItem
}

MenuSeparator {
Expand Down Expand Up @@ -200,6 +213,8 @@ PlasmoidItem {
executable.exec(lockScreenCMD); // cmd exec
}
activeFocusOnTab: true
KeyNavigation.up: shutDownItem
KeyNavigation.down: logOutItem
}

ListDelegate {
Expand All @@ -216,6 +231,8 @@ PlasmoidItem {
executable.exec(logOutCMD); // cmd exec
}
activeFocusOnTab: true
KeyNavigation.up: lockScreenItem
KeyNavigation.down: aboutThisComputerItem
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion package/translate/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@

#!/bin/sh
# SPDX-FileCopyrightText: 2020 Kpple <[email protected]>
#
# SPDX-License-Identifier: GPL-2.0-or-later
# Version: 5

# This script will convert the *.po files to *.mo files, rebuilding the package/contents/locale folder.
Expand Down
4 changes: 3 additions & 1 deletion package/translate/merge.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@

#!/bin/sh
# SPDX-FileCopyrightText: 2020 Kpple <[email protected]>
#
# SPDX-License-Identifier: GPL-2.0-or-later
# Version: 15

# https://techbase.kde.org/Development/Tutorials/Localization/i18n_Build_Systems
Expand Down
3 changes: 3 additions & 0 deletions reinstall-plasmoid.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#!/bin/bash
# SPDX-FileCopyrightText: 2024 Christian Tallner <[email protected]>
#
# SPDX-License-Identifier: GPL-2.0-or-later
kpackagetool5 -t "Plasma/Applet" -r package/
kpackagetool5 -t "Plasma/Applet" -i package/
3 changes: 3 additions & 0 deletions test-plasmoid.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
#!/bin/bash
# SPDX-FileCopyrightText: 2024 Christian Tallner <[email protected]>
#
# SPDX-License-Identifier: GPL-2.0-or-later
QT_LOGGING_RULES="qml.debug=true" plasmoidviewer -s 800x800 -f horizontal -x 2200 -y 200 -a package/

0 comments on commit 41c778c

Please sign in to comment.