No visually observable changes, again. But it replaces most of the
anchors tweaking with a simple QtQuick.Layout interface.
You might've noticed how
topMargin: PlasmaCore.Units.gridUnit
got replaced with a different-looking
Layout.topMargin: PlasmaCore.Units.smallSpacing * 2
but that's all according to the plan, since this ScrollView is now
inside a ColumnLayout which has its own spacing that adds up.
Also, settingsColumn id is removed because it became unused.
Would you ever polish something before dividing it by zero?
Well, at least this is somehow justifiable. Anchors were too horrible to
deal with, even for a rewriting. Now they are all in one place, sorted
out, and no more manual width setting.
Replaces Math.round(PlasmaCore.Units.gridUnit / 2) with smallSpacing * 2
for better performance. This is not equal to largeSpacing, which is
deprecated for this very same reason anyway.
This change may result in slightly more dense layout on your system,
because the wrong formula was used before.
Apparently, `plasmoid` context property can turn into /dev/null before
its action does. Fixes the following error:
plasmoids/org.kde.plasma.battery/contents/ui/main.qml:166:
TypeError: Cannot read property 'configuration' of null
Fixes the following error:
plasmoids/org.kde.plasma.battery/contents/ui/PowerProfileItem.qml:137:
TypeError: Cannot read property 'label' of undefined
Profile data was moved to the root component where it makes most sense.
Other chunks of code were aggregated into read-only properties nearby.
It greatly simplified the rest of code in the file.
Took a while to figure out actual structure of the data that comes from
plasma data engine, so now it's somehow documented for future reference.
Moved aforementioned component's source code directly to the only place
of its instantiation left.
Boolean property `inListView` which was responsible exclusively for the
font size selection, got totally abolished and replaced with font
bindings themselves.
Other boolean properties of the grid were marked as `readonly` which
they should've been from the beginning; and {Left,Right}Labels' binding
to them had to be qualified with property access by id, which --
again -- was just an oversight, and worked only because it was a
top-level(even though an 'inline') component.
Renamed GridLayout's `id` to simply "details" for better readability.
It remained always hidden ever since
df2469e7d2, and there were no plans to
revive it anyway. I did some cleanup and layout refactoring before
dropping it though, just in case, so this removed code pretty much
worked and looked good.
It was necessary to drop the `required` qualifier from inListView
property due to a bug in Qt/QML compiler which somehow considers
`required` properties of inline components for named roles resolution,
but only when they are also directly instantiated somewhere in the file
as opposed to deferred instantiation via `Loader::sourceComponent`.
ToolTipArea::active is now bound to just false, which was the case ever
since df2469e7d2. It's going to be removed
completely soon.
The code is not consistent on how do we access properties (role names)
of rows/models of Plasma Data Engine's Data Source. This is obviously
due to the fact that some properties (role names) contain literal
spaces, and thus -- as explained in previous commit -- are currently
inexpressible in terms of QML properties.
However, even at the cost of inconsistency, `battery.State` reads better
than `battery["State"]`; while `battery["Is Power Supply"]` reads the
way it is, just because there's literally no other way around it.
(Actually, we could create a ECMAScript class, and deserialize data
source's row into sanely named fields. But that's a good proposal for
another patch.)
Top level item's `property var battery` is unambiguously set to the
`model` value itself in the ListView's delegate declaration in
PopupDialog.qml component. The fact that there were used two equivalent
methods is strange, but likely happened due to an incomplete
refactoring some time in past.
The intention is to make it as short as meaningfully possible, as it is
used a lot in expressions, and will be used even more after porting the
rest of accesses to the dynamically scoped `model` variable to the
equivalent `root.battery` property lookup.
They were supposed to be in the column on the right this whole time, as
was indicated by an artificial Layout.leftMargin (ex-anchors.leftMargin).
Cons: Now the ToolTip pops up anywhere over a possibly lengthy details
and inhibition hint's text.
Pros: The ToolTip is never active.
This is a direct translation of anchors to QtQuick.Layouts, except
gridUnit in leftMargin is replaced with something it was really meant
to be: the value of a margin on the right side of the batteryIcon,
which happens to be the RowLayout's spacing.
But once we yeet the ToolTipArea (or even before that), those
BatteryDetails and InhibitionHint components should be placed inside
the infoRow's ColumnLayout.
Replaces Row/Column with RowLayout/ColumnLayout, and x/y/width/height
with appropriate Layout.margins and preferrewWidth bindings.
Layout.* properties of the mainItem itself are now greatly simplified,
because top-level RowLayout manages its implicit width just fine.
Maximum width for BatteryDetails component is back, after it was lost
in 44ed25e521 refactoring.
We still get user complaints that this UI is confusing because of the
terminology used and the visual proximity between the checkbox and the
inhibitions list. This commit attempts to improve that by:
- Make the checkbox text shorter, have less jargon, and say the word
"manual" in it instead of "automatic", which was confusing
- Adding the word "currently" to app-initiated inhibitions, to textually
distinguish transient app-initiated inhibitions from user-initiated
manual inhibition
- Separating the checkbox from the inhibitions list with a subtle line
separator
GridLayout no longer crashes was described in an old comment and
nowadays is pretty safe to use. Repeater, however, still doesn't
support instantiating multiple top-level items at once, which is
unfortunate but can be worked around; see upstream Qt bug below.
In this case, however, simple is better than smart-ish; the entire
at-most-two-rows table-like grid can be recreated entirely without
Repeaters and clever models. Just do it.
See also: QTBUG-38098
However weird that title might sound, a lowercase `component A : B`
syntax allows us internalize any property, and even make it required
for an instantiator to provide. This no longer relies on implicit
scoping of QML.
GIT_SILENT
This is still borken as hell, because x/y were not supposed to work
inside Row/Column anyway.
PlasmaCore.Units.largeSpacing is inconsistent with Kirigami, and
actually equals to gridUnit, and 4 times as big as smallSpacing. So,
the proper replacement for a `largeSpacing / 2` (which also properly
takes care of rounding to an integer) is `smallSpacing * 2`. And the
largeSpacing itself shall be replaced with gridUnit to avoid confusion.
GIT_SILENT
Optimize previous patch that introduced extra margins for the battery's
progress bar in order to make its labels visually match the distance of
brightness sliders on top of it.
This patch moves `referenceSlider` property to the root component of
BatteryItem.qml, so that an existing item can be passed from the
outside. It keeps the default value there just in case, but it won't be
instantiated by QML engine when the property is overriden at component
declaration. (Note: this won't be true if the slider had an id set.)
Since we are defining some properties on the top-level component, we
might as well move the `extraMargin` here, so that the actual
ProgressBar component now won't have any properties on its own, and
thus QML engine won't create an extra runtime QML type just for it.
Add vertical margins to the battery progress bar, so that the distance
between colored bar and labels on top of it is the same as for the
sliders. This patch bases on assumption that sliders are always thicker
than progress bars, but guards against surprises by clamping from 0.
This also means that custom spacing of the parent ColumnLayout is no
longer needed, as it has only two children, and the equivalent Column
in BrightnessItem also has spacing set to zero.
This is done because QtQuick.Layout types are more convenient to work
with, and to avoid `with: parent.width` kind of boilerplate.
Nested RowLayout does not need Layout.fillWidth property, as that is the
default behavior for nested layout types.
GIT_SILENT
ivan tkachenko
Nate Graham
Fushan Wen
Méven Car