drop semicolon from qml files, update CONTRIBUTING guide accordingly

This commit is contained in:
Evgenii Alekseev 2016-09-15 07:26:00 +03:00
parent 87652eb774
commit f9ddf690c7
13 changed files with 31 additions and 21 deletions

View File

@ -91,6 +91,7 @@ for more details. To avoid manual labor there is automatic cmake target named
* 'true ? foo : bar' construction is allowed and recommended for one-line assignment. * 'true ? foo : bar' construction is allowed and recommended for one-line assignment.
* Any global pointer should be assign to `nullptr` after deletion and before * Any global pointer should be assign to `nullptr` after deletion and before
initialization. Exception: if object is deleted into class destructor. initialization. Exception: if object is deleted into class destructor.
* Do not use semicolon in qml files unless it is required.
Comments Comments
-------- --------

View File

@ -70,7 +70,7 @@ Item {
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
textFormat: Text.RichText textFormat: Text.RichText
text: awActions.getAboutText("links") text: awActions.getAboutText("links")
onLinkActivated: Qt.openUrlExternally(link); onLinkActivated: Qt.openUrlExternally(link)
} }
QtControls.Label { QtControls.Label {
@ -103,7 +103,7 @@ Item {
horizontalAlignment: Text.AlignJustify horizontalAlignment: Text.AlignJustify
textFormat: Text.RichText textFormat: Text.RichText
text: awActions.getAboutText("3rdparty") text: awActions.getAboutText("3rdparty")
onLinkActivated: Qt.openUrlExternally(link); onLinkActivated: Qt.openUrlExternally(link)
} }
QtControls.Label { QtControls.Label {
@ -114,7 +114,7 @@ Item {
verticalAlignment: Text.AlignTop verticalAlignment: Text.AlignTop
textFormat: Text.RichText textFormat: Text.RichText
text: awActions.getAboutText("thanks") text: awActions.getAboutText("thanks")
onLinkActivated: Qt.openUrlExternally(link); onLinkActivated: Qt.openUrlExternally(link)
} }
} }
} }

View File

@ -288,7 +288,7 @@ Item {
for (var i = 0; i < model.length; i++) { for (var i = 0; i < model.length; i++) {
if (model[i]["name"] == plasmoid.configuration.tempUnits) { if (model[i]["name"] == plasmoid.configuration.tempUnits) {
if (debug) console.info("Found", model[i]["name"], "on", i) if (debug) console.info("Found", model[i]["name"], "on", i)
tempUnits.currentIndex = i; tempUnits.currentIndex = i
} }
} }
} }

View File

@ -138,7 +138,7 @@ Item {
for (var i = 0; i < model.length; i++) { for (var i = 0; i < model.length; i++) {
if (model[i]["name"] == plasmoid.configuration.fontWeight) { if (model[i]["name"] == plasmoid.configuration.fontWeight) {
if (debug) console.info("Found", model[i]["name"], "on", i) if (debug) console.info("Found", model[i]["name"], "on", i)
fontWeight.currentIndex = i; fontWeight.currentIndex = i
} }
} }
} }
@ -175,7 +175,7 @@ Item {
for (var i = 0; i < model.length; i++) { for (var i = 0; i < model.length; i++) {
if (model[i]["name"] == plasmoid.configuration.fontStyle) { if (model[i]["name"] == plasmoid.configuration.fontStyle) {
if (debug) console.info("Found", model[i]["name"], "on", i) if (debug) console.info("Found", model[i]["name"], "on", i)
fontStyle.currentIndex = i; fontStyle.currentIndex = i
} }
} }
} }

View File

@ -93,7 +93,7 @@ Item {
for (var i=0; i<model.length; i++) { for (var i=0; i<model.length; i++) {
if (model[i] == cfg_dataengine["GPUDEV"]) { if (model[i] == cfg_dataengine["GPUDEV"]) {
if (debug) console.info("Found", model[i], "on", i) if (debug) console.info("Found", model[i], "on", i)
currentIndex = i; currentIndex = i
} }
} }
} }
@ -189,7 +189,7 @@ Item {
for (var i=0; i<model.length; i++) { for (var i=0; i<model.length; i++) {
if (model[i] == cfg_dataengine["PLAYER"]) { if (model[i] == cfg_dataengine["PLAYER"]) {
if (debug) console.info("Found", model[i], "on", i) if (debug) console.info("Found", model[i], "on", i)
player.currentIndex = i; player.currentIndex = i
} }
} }
} }
@ -345,7 +345,7 @@ Item {
for (var i=0; i<hdd.model.length; i++) { for (var i=0; i<hdd.model.length; i++) {
if (hdd.model[i] == cfg_dataengine["HDDDEV"]) { if (hdd.model[i] == cfg_dataengine["HDDDEV"]) {
if (debug) console.info("Found", hdd.model[i], "on", i) if (debug) console.info("Found", hdd.model[i], "on", i)
hdd.currentIndex = i; hdd.currentIndex = i
} }
} }
} }

View File

@ -36,6 +36,9 @@ Item {
AWActions { AWActions {
id: awActions id: awActions
} }
AWTelemetryHandler {
id: awTelemetryHandler
}
BugReport { BugReport {
id: bugReport id: bugReport
} }
@ -204,6 +207,9 @@ Item {
awKeys.setAggregatorProperty("customUptime", plasmoid.configuration.customUptime) awKeys.setAggregatorProperty("customUptime", plasmoid.configuration.customUptime)
awKeys.setAggregatorProperty("tempUnits", plasmoid.configuration.tempUnits) awKeys.setAggregatorProperty("tempUnits", plasmoid.configuration.tempUnits)
awKeys.setAggregatorProperty("translate", plasmoid.configuration.translateStrings) awKeys.setAggregatorProperty("translate", plasmoid.configuration.translateStrings)
// save telemetry
if (awTelemetryHandler.put("awwidgetconfig", plasmoid.configuration.text))
awTelemetryHandler.uploadTelemetry("awwidgetconfig", plasmoid.configuration.text)
} }

View File

@ -34,6 +34,9 @@ Item {
AWFormatterConfigFactory { AWFormatterConfigFactory {
id: awFormatter id: awFormatter
} }
AWTelemetryHandler {
id: awTelemetryHandler
}
width: childrenRect.width width: childrenRect.width
height: childrenRect.height height: childrenRect.height
@ -57,7 +60,7 @@ Item {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: i18n("Detailed information may be found on <a href=\"https://arcanis.me/projects/awesome-widgets/\">project homepage</a>") text: i18n("Detailed information may be found on <a href=\"https://arcanis.me/projects/awesome-widgets/\">project homepage</a>")
onLinkActivated: Qt.openUrlExternally(link); onLinkActivated: Qt.openUrlExternally(link)
} }
Row { Row {
@ -380,6 +383,6 @@ Item {
compiledText.text = newText.replace(/&nbsp;/g, " ") compiledText.text = newText.replace(/&nbsp;/g, " ")
compiledText.open() compiledText.open()
lock = true; lock = true
} }
} }

View File

@ -71,7 +71,7 @@ Item {
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
textFormat: Text.RichText textFormat: Text.RichText
text: dpAdds.getAboutText("links") text: dpAdds.getAboutText("links")
onLinkActivated: Qt.openUrlExternally(link); onLinkActivated: Qt.openUrlExternally(link)
} }
QtControls.Label { QtControls.Label {
@ -104,7 +104,7 @@ Item {
horizontalAlignment: Text.AlignJustify horizontalAlignment: Text.AlignJustify
textFormat: Text.RichText textFormat: Text.RichText
text: dpAdds.getAboutText("3rdparty") text: dpAdds.getAboutText("3rdparty")
onLinkActivated: Qt.openUrlExternally(link); onLinkActivated: Qt.openUrlExternally(link)
} }
QtControls.Label { QtControls.Label {
@ -115,7 +115,7 @@ Item {
verticalAlignment: Text.AlignTop verticalAlignment: Text.AlignTop
textFormat: Text.RichText textFormat: Text.RichText
text: dpAdds.getAboutText("thanks") text: dpAdds.getAboutText("thanks")
onLinkActivated: Qt.openUrlExternally(link); onLinkActivated: Qt.openUrlExternally(link)
} }
} }
} }

View File

@ -138,7 +138,7 @@ Item {
for (var i = 0; i < model.length; i++) { for (var i = 0; i < model.length; i++) {
if (model[i]["name"] == plasmoid.configuration.currentFontWeight) { if (model[i]["name"] == plasmoid.configuration.currentFontWeight) {
if (debug) console.info("Found", model[i]["name"], "on", i) if (debug) console.info("Found", model[i]["name"], "on", i)
fontWeight.currentIndex = i; fontWeight.currentIndex = i
} }
} }
} }
@ -175,7 +175,7 @@ Item {
for (var i = 0; i < model.length; i++) { for (var i = 0; i < model.length; i++) {
if (model[i]["name"] == plasmoid.configuration.currentFontStyle) { if (model[i]["name"] == plasmoid.configuration.currentFontStyle) {
if (debug) console.info("Found", model[i]["name"], "on", i) if (debug) console.info("Found", model[i]["name"], "on", i)
fontStyle.currentIndex = i; fontStyle.currentIndex = i
} }
} }
} }

View File

@ -188,7 +188,7 @@ Item {
for (var i = 0; i < model.length; i++) { for (var i = 0; i < model.length; i++) {
if (model[i]["name"] == plasmoid.configuration.tooltipType) { if (model[i]["name"] == plasmoid.configuration.tooltipType) {
if (debug) console.info("Found", model[i]["name"], "on", i) if (debug) console.info("Found", model[i]["name"], "on", i)
tooltipType.currentIndex = i; tooltipType.currentIndex = i
} }
} }
} }

View File

@ -138,7 +138,7 @@ Item {
for (var i = 0; i < model.length; i++) { for (var i = 0; i < model.length; i++) {
if (model[i]["name"] == plasmoid.configuration.fontWeight) { if (model[i]["name"] == plasmoid.configuration.fontWeight) {
if (debug) console.info("Found", model[i]["name"], "on", i) if (debug) console.info("Found", model[i]["name"], "on", i)
fontWeight.currentIndex = i; fontWeight.currentIndex = i
} }
} }
} }
@ -175,7 +175,7 @@ Item {
for (var i = 0; i < model.length; i++) { for (var i = 0; i < model.length; i++) {
if (model[i]["name"] == plasmoid.configuration.fontStyle) { if (model[i]["name"] == plasmoid.configuration.fontStyle) {
if (debug) console.info("Found", model[i]["name"], "on", i) if (debug) console.info("Found", model[i]["name"], "on", i)
fontStyle.currentIndex = i; fontStyle.currentIndex = i
} }
} }
} }

View File

@ -83,7 +83,7 @@ Item {
MouseArea { MouseArea {
hoverEnabled: true hoverEnabled: true
anchors.fill: parent anchors.fill: parent
onClicked: dpAdds.setCurrentDesktop(index + 1); onClicked: dpAdds.setCurrentDesktop(index + 1)
onEntered: needTooltipUpdate() onEntered: needTooltipUpdate()
} }

View File

@ -48,7 +48,7 @@ Item {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: i18n("Detailed information may be found on <a href=\"https://arcanis.me/projects/awesome-widgets/\">project homepage</a>") text: i18n("Detailed information may be found on <a href=\"https://arcanis.me/projects/awesome-widgets/\">project homepage</a>")
onLinkActivated: Qt.openUrlExternally(link); onLinkActivated: Qt.openUrlExternally(link)
} }
Row { Row {