-
Notifications
You must be signed in to change notification settings - Fork 11
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
1232 redesigned top level structure for the settings #1815
base: main
Are you sure you want to change the base?
1232 redesigned top level structure for the settings #1815
Conversation
c4f60d8
to
7d35c97
Compare
NB: The design has 'Console Password' and 'Enable console on VRM', these are no longer required https://victrondevelopment.slack.com/archives/C020QG3JVEW/p1734675975736589 |
405018f
to
b71436d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great work! The settings are looking so much better. Nice work on refactoring into components as well.
For each commit message, could you:
- Add a reference to the task number in each commit message
- Make the commit message more descriptive - e.g. "Move Date & Time to General settings" instead of just "Date & Time", or "Add PageSettingsDisplayAndAppearance" instead of just "PageSettingsDisplayAndAppearance".
Also it would be nice to squash some of the smaller related commits, e.g. the four separate commits that add the extra bottom items to the Device List page.
id: root | ||
|
||
GradientListView { | ||
id: settingsListView |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The existing PageSettingsGeneral
contains the magic up/down key combinations and list drag feature to change access level. Now that the access level is shown on this page instead, those features should be moved into this page instead.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
import QtQuick | ||
import Victron.VenusOS | ||
|
||
Item { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updated as suggested
pages/settings/PageSettingsVrm.qml
Outdated
|
||
|
||
GradientListView { | ||
id: settingsListView |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unnecessary id
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removed
|
||
ListMqttAccessSwitch { | ||
id: mqtt | ||
} | ||
|
||
Column { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like PageSettingsServices can be removed now, though "CAN-bus over TCP/IP (Debug)" also needs to be moved to the connectivity page alongside the other VE.Can list items.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do you have a way of detecting unused qml files in a project?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No :(
ListNavigation { | ||
//% "Modbus TCP Server" | ||
text: qsTrId("pagesettingsintegrations_modbus_tcp_server") | ||
onClicked: Global.pageManager.pushPage("/pages/settings/PageSettingsModbusTcp.qml", {"title": text}) // TODO - is this correct? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The list item seems correctly placed according to the new design structure - is there something else that needs to be resolved for this TODO?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was a leftover comment, removed now.
} | ||
} | ||
|
||
ListMqttAccessSwitch { } // TODO - is this correct? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Regarding the TODO, this seems correctly placed according to the new design structure? Though in the design it says "MQTT server" instead of "MQTT access".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The naming was switched with the security update made a while ago. Probably it was not updated in the Figma. MQTT Access
is the correct one.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, thanks!
} | ||
} | ||
|
||
ListNavigation { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if "Tailscale" should go below "Mobile network", seems more related to that group than to GPS and CAN devices
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would put it under Access & Security
, since it‘s for remote access.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Moved "Tailscale" below "Mobile network"
6fa6e4a
to
35311d5
Compare
ListItem { | ||
id: root | ||
|
||
property alias text: primary.text |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks pretty much the same as ListSwitch
but with a caption? Can the caption just be added to ListSwitch
using bottomContent
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I couldn't do it using bottomContent
, it didn't look right. Done a different way, removed SettingsListSwitch.
35311d5
to
f133bb1
Compare
Done |
keyEvents.downCount = 0 | ||
} | ||
} | ||
boundsBehavior: Flickable.DragOverBounds |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This boundsBehavior: Flickable.DragOverBounds
needs to move to the listview in PageSettingsAccessAndSecurity, otherwise that list view cannot be dragged to change to superuser.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
} | ||
//% "Incorrect password" | ||
return Utils.validationResult(VenusOS.InputValidation_Result_Error, qsTrId("settings_access_incorrect_password")) | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"Network security profile" doesn't make sense here anymore, should it be moved to the "Access and security" page, e.g. as the second item?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
allowed: tailscale.isValid | ||
|
||
VeQuickItem { | ||
id: tailscale |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm getting this error when trying to open the page:
qml: Aborted attempt to push page with errors: /pages/settings/PageSettingsConnectivity.qml: qrc:/qt/qml/Victron/VenusOS/pages/settings/PageSettingsConnectivity.qml:119 id is not unique
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whoops, fixed
pages/settings/debug/PageDebug.qml
Outdated
text: "System data" | ||
onClicked: Global.pageManager.pushPage("/pages/settings/debug/PageSystemData.qml", { title: text }) | ||
} | ||
|
||
ListNavigation { | ||
text: "Test" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you rename "Test" to "UI library" while you're at it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
f133bb1
to
a4ea0b4
Compare
No description provided.