Skip to content
Snippets Groups Projects
Verified Commit 2bfd4475 authored by Joe Donofry's avatar Joe Donofry
Browse files

Try to fix format script and fix linting

parent 08dbdac3
No related branches found
No related tags found
1 merge request!6Chat Privacy screen
Pipeline #562 failed
......@@ -14,13 +14,13 @@ do
clang-format -i "$f"
done;
QMLFORMAT_PATH=$(which qmlformat)
QMLFORMAT_PATH=$(command -v qmlformat)
if [ -n "$QMLFORMAT_PATH" ]; then
QML_FILES=$(find resources -type f -iname "*.qml")
for f in $QML_FILES
do
qmlformat -i "$f"
$QMLFORMAT_PATH -i "$f"
done;
else
echo "qmlformat not found; skipping qml formatting"
......
......@@ -18,9 +18,9 @@ Item {
screenSaverTimer.stop();
screenSaver.state = "Invisible";
} else {
if (timelineRoot.visible) {
if (timelineRoot.visible)
screenSaverTimer.start();
}
}
}
}
......@@ -31,12 +31,12 @@ Item {
interval: screenTimeout * 1000
running: true
onTriggered: {
if (MainWindow.visible) {
if (MainWindow.visible)
timelineRoot.grabToImage(function(result) {
screenSaver.state = "Visible";
imageSource = result.url;
}, Qt.size(width, height));
}
}
}
......
......@@ -53,10 +53,9 @@ ApplicationWindow {
font.bold: true
Layout.alignment: Qt.AlignHCenter
selectByMouse: true
onAccepted: {
profile.changeUsername(displayUsername.text)
displayUsername.isUsernameEditingAllowed = false
profile.changeUsername(displayUsername.text);
displayUsername.isUsernameEditingAllowed = false;
}
ImageButton {
......@@ -65,18 +64,18 @@ ApplicationWindow {
anchors.left: displayUsername.right
anchors.verticalCenter: displayUsername.verticalCenter
image: displayUsername.isUsernameEditingAllowed ? ":/icons/icons/ui/checkmark.png" : ":/icons/icons/ui/edit.png"
onClicked: {
if (displayUsername.isUsernameEditingAllowed) {
profile.changeUsername(displayUsername.text)
displayUsername.isUsernameEditingAllowed = false
profile.changeUsername(displayUsername.text);
displayUsername.isUsernameEditingAllowed = false;
} else {
displayUsername.isUsernameEditingAllowed = true
displayUsername.focus = true
displayUsername.selectAll()
displayUsername.isUsernameEditingAllowed = true;
displayUsername.focus = true;
displayUsername.selectAll();
}
}
}
}
MatrixText {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment