Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/bash
# Version 4

plasmoidName=$(kreadconfig5 --file="$PWD/package/metadata.desktop" --group="Desktop Entry" --key="X-KDE-PluginInfo-Name")
plasmoidName=$(jq -r '.KPlugin.Id' "$PWD/package/metadata.json")
plasmoidName="${plasmoidName##*.}" # Strip namespace (Eg: "org.kde.plasma.")
plasmoidVersion=$(kreadconfig5 --file="$PWD/package/metadata.desktop" --group="Desktop Entry" --key="X-KDE-PluginInfo-Version")
plasmoidVersion=$(jq -r '.KPlugin.Version' "$PWD/package/metadata.json")
rm ${plasmoidName}-v*.plasmoid
cd package
filename=${plasmoidName}-v${plasmoidVersion}.plasmoid
Expand Down
2 changes: 1 addition & 1 deletion install
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
# Version 2

kpackagetool5 -t Plasma/Applet -i package
kpackagetool6 -t Plasma/Applet -i package
4 changes: 2 additions & 2 deletions package/contents/config/config.qml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
***************************************************************************/

import QtQuick 2.0
import QtQuick

import org.kde.plasma.configuration 2.0
import org.kde.plasma.configuration

ConfigModel {
ConfigCategory {
Expand Down
27 changes: 17 additions & 10 deletions package/contents/ui/config/ConfigGeneral.qml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import QtQuick 2.0
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import QtQuick.Dialogs 1.2
import org.kde.plasma.components 2.0 as PlasmaComponents
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Dialogs
import org.kde.plasma.components as PlasmaComponents

import ".."

Expand Down Expand Up @@ -93,9 +93,13 @@ ConfigPage {

SpinBox {
id: fontsize
suffix: i18n(" px")
property string suffix: i18n(" px")
value: plasmoid.configuration.fontsize
maximumValue: 1000
to: 1000
property string valuews: textFromValue(value)
textFromValue: function(value) {
return Number(value) + suffix
}
}

PlasmaComponents.Label {
Expand Down Expand Up @@ -127,10 +131,13 @@ ConfigPage {
SpinBox {
id: opacity_spin
value: plasmoid.configuration.opacity
suffix: i18n(" %")
minimumValue: 0
maximumValue: 100
property string suffix: i18n(" %")
from: 0
to: 100
stepSize: 1
textFromValue: function(value) {
return Number(value) + suffix
}
}

PlasmaComponents.Label {
Expand Down
4 changes: 2 additions & 2 deletions package/contents/ui/config/ConfigPage.qml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.0
import QtQuick.Layouts 1.0
import QtQuick
import QtQuick.Layouts

ColumnLayout {
id: page
Expand Down
21 changes: 11 additions & 10 deletions package/contents/ui/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,21 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
***************************************************************************/

import QtQuick 2.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls

import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.plasmoid
import org.kde.plasma.core as PlasmaCore
import org.kde.plasma.components as PlasmaComponents
import org.kde.plasma.plasma5support as Plasma5Support

import QMLTermWidget 1.0
import QMLTermWidget


import "../code/utils.js" as Utils

Item{
PlasmoidItem {
id: main

width: plasmoid.configuration.width
Expand All @@ -39,10 +40,10 @@ Item{
Layout.minimumWidth: units.gridUnit * 10
Layout.minimumHeight: units.gridUnit * 10

Plasmoid.preferredRepresentation: Plasmoid.fullRepresentation
preferredRepresentation: fullRepresentation
Plasmoid.backgroundHints: plasmoid.configuration.showBackground ? PlasmaCore.Types.DefaultBackground : PlasmaCore.Types.NoBackground

PlasmaCore.DataSource {
Plasma5Support.DataSource {
id: executeSource
engine: "executable"
connectedSources: []
Expand Down
19 changes: 0 additions & 19 deletions package/metadata.desktop

This file was deleted.

23 changes: 23 additions & 0 deletions package/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"KPlugin": {
"Authors": [
{
"Email": "",
"Name": "Bhaskar Divya"
}
],
"Category": "Utilities",
"Dependencies": [
"qtermwidget"
],
"Description": "Terminal in a plasmoid",
"Icon": "utilities-terminal",
"Id": "com.koldbyte.kde.termoid",
"License": "GPL v2+",
"Name": "Termoid",
"KPackageStructure": "Plasma/Applet",
"Version": "0.4",
"Website": "https://github.com/koldbyte/termoid"
},
"X-Plasma-API-Minimum-Version": "6.0"
}
4 changes: 2 additions & 2 deletions reinstall
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# Version 2

kpackagetool5 -t Plasma/Applet -u package
kpackagetool6 -t Plasma/Applet -u package
killall plasmashell
kstart5 plasmashell
kstart plasmashell