Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed QML errors preventing the widget to be displayed properly (if at all) #65

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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 plasmoid/contents/ui/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Rectangle {
Code.getDistroInfo(function(info) {
distroName = info['name']
distroId = info['id']
distroVersion = info['version']
distroVersion = (info['version'] !== undefined)?info['version']:""
}, this);

Code.getKernelInfo(function(info){
Expand Down Expand Up @@ -226,7 +226,7 @@ Rectangle {
onSourceAdded: tryAddSource(source)

onNewData: {
if (data.value === undefined || delegate === undefined)
if (data.value === undefined || data.value == null || delegate === undefined || delegate == null)
return;

// cpu load
Expand Down
3 changes: 1 addition & 2 deletions plasmoid/contents/ui/monitorWidgets/CoreTempList.qml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ ListView {
delegate: Item {
id: coreListTemp
implicitHeight: 25 * units.devicePixelRatio
implicitWidth: coreLabel.implicitWidth + unitLabel.implicitWidth
width: parent.width
width: coreTempList.width
height: (20 + indicatorHeight) * units.devicePixelRatio
Text {
id: coreLabel
Expand Down
1 change: 0 additions & 1 deletion plasmoid/contents/ui/monitorWidgets/CpuWidget.qml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ ListView {
width: parent.width
height: (20 + indicatorHeight) * units.devicePixelRatio
Row {
spacing: 0
spacing: 5 * units.devicePixelRatio
anchors.left: parent.left
Text {
Expand Down
8 changes: 1 addition & 7 deletions plasmoid/contents/ui/skins/DefaultSkin.qml
Original file line number Diff line number Diff line change
Expand Up @@ -152,15 +152,9 @@ BaseSkin {
Layout.leftMargin: 2 * units.devicePixelRatio
}

GridLayout {
ColumnLayout {
id: tempLayout

model: coreTempModel
highTemp: cpuHighTemp
criticalTemp: criticalTemp
tempUnit: root.tempUnit
direction: root.direction

Layout.leftMargin: 5 * units.devicePixelRatio
Layout.rightMargin: 5 * units.devicePixelRatio
Layout.topMargin: 5 * units.devicePixelRatio
Expand Down