Changes - SailfishOS Open Build Service

Changes of Revision 2

[-] [+]	Changed	_service:tar_git:valuelogger.spec
@@ -10,7 +10,7 @@ %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Value Logger -Version: 1.0.9 +Version: 1.0.11 Release: 1 License: LICENSE URL: https://github.com/monich/valuelogger
[-] [+]	Changed	_service ^
@@ -2,6 +2,6 @@ <service name="tar_git"> <param name="url">https://github.com/monich/valuelogger.git</param> <param name="branch">master</param> - <param name="revision">89a4ade</param> + <param name="revision">ef5767c</param> </service> </services> \ No newline at end of file
[-] [+]	Changed	_service:tar_git:harbour-valuelogger2-1.0.11.tar.bz2/harbour-valuelogger2.desktop ^
@@ -6,5 +6,8 @@ Exec=harbour-valuelogger2 [X-HarbourBackup] -BackupPathList = .local/share/harbour-valuelogger/ -BackupConfigList = /apps/harbour-valuelogger2/ +BackupPathList=.local/share/harbour-valuelogger/ +BackupConfigList=/apps/harbour-valuelogger2/ + +[X-Sailjail] +Sandboxing=Disabled
[-] [+]	Changed	_service:tar_git:harbour-valuelogger2-1.0.11.tar.bz2/qml/pages/ColorEditor.qml ^
@@ -5,12 +5,14 @@ import "../components" Dialog { - readonly property color selectedColor: sample.color - property color initialColor + id: thisDialog + + readonly property color selectedColor: sampleItem.color + property color initialColor: Theme.highlightColor canAccept: hexText.acceptableInput - forwardNavigation: !colorPanel.pressed - backNavigation: !colorPanel.pressed + forwardNavigation: !hueItem.pressed + backNavigation: !hueItem.pressed DialogHeader { id: header @@ -18,12 +20,14 @@ acceptText: forwardNavigation ? qsTr("Add color") : "" } + Component.onCompleted: hexText.text = initialColor.toString().substr(1) + // Otherwise width is changing with a delay, causing visible layout changes onIsLandscapeChanged: width = isLandscape ? Screen.height : Screen.width SilicaFlickable { clip: true - interactive: !colorPanel.pressed + interactive: !hueItem.pressed anchors { left: parent.left right: parent.right @@ -32,7 +36,7 @@ } ColorPanel { - id: colorPanel + id: hueItem x: Theme.horizontalPageMargin width: parent.width - 2 * x @@ -119,7 +123,6 @@ textLeftMargin: 0 textRightMargin: 0 label: qsTr("Hex notation") - text: initialColor.toString().substr(1) validator: RegExpValidator { regExp: /^[0-9a-fA-F]{6}$/ } inputMethodHints: Qt.ImhNoPredictiveText \| Qt.ImhNoAutoUppercase EnterKey.iconSource: "image://theme/icon-m-enter-close" @@ -130,8 +133,8 @@ tmpColor = "#" + text Debug.log(tmpColor) ignoreTextUpdates++ - brightnessSlider.value = colorPanel.getV(tmpColor) - hueSlider.value = colorPanel.getH(tmpColor) + brightnessSlider.value = hueItem.getV(tmpColor) + hueSlider.value = hueItem.getH(tmpColor) ignoreTextUpdates-- } } @@ -145,7 +148,7 @@ function updateText() { if (!ignoreTextUpdates) { ignoreTextUpdates++ - var s = colorPanel.getColor(hueSlider.sliderValue).toString() + var s = hueItem.getColor(hueSlider.sliderValue).toString() text = (s.length > 0 && s.charAt(0) === '#') ? s.substr(1) : s ignoreTextUpdates-- } @@ -154,15 +157,25 @@ } } - Rectangle { + MouseArea { id: sample y: Theme.paddingLarge width: 2 * height height: hexText.height - 2 * Theme.paddingLarge anchors.right: parent.right - color: "#" + hexText.text - visible: hexText.acceptableInput + + onClicked: thisDialog.accept() + + Rectangle { + id: sampleItem + + anchors.fill: parent + color: "#" + hexText.text + visible: hexText.acceptableInput + layer.enabled: sample.pressed && sample.containsMouse + layer.effect: PressEffect { source: sampleItem } + } } } }
[-] [+]	Changed	_service:tar_git:harbour-valuelogger2-1.0.11.tar.bz2/qml/pages/ColorPicker.qml ^
@@ -11,7 +11,7 @@ property color color property alias colors: colorModel.colors - canAccept: false + forwardNavigation: false signal resetColors() @@ -56,7 +56,6 @@ readonly property bool highlighted: (pressed && containsMouse) readonly property bool dragging: grid.dragItem === colorDelegate - readonly property int index: model.index Rectangle { id: colorItem @@ -70,6 +69,7 @@ layer.effect: PressEffect { source: colorItem } readonly property bool isTrashed: model.itemType === ColorModel.TrashedItem + readonly property int index: model.index property real returnX property real returnY property bool snappingBack @@ -147,7 +147,7 @@ } ] - onStateChanged: Debug.log(colorDelegate.index, colorDelegate.dragging, state) + onStateChanged: Debug.log(colorItem.index, colorDelegate.dragging, state) Connections { target: colorDelegate.dragging ? colorItem : null @@ -193,13 +193,25 @@ var row = Math.floor((grid.contentY + y + height/2)/grid.cellHeight) colorModel.dragPos = grid.cellsPerRow * row + Math.floor((grid.contentX + x + width/2)/grid.cellWidth) } + + Rectangle { + border { + width: Theme.paddingSmall + color: Theme.highlightBackgroundColor + } + anchors.fill: parent + color: "transparent" + visible: colorModel.dragPos < 0 && + colorItem.color === thisDialog.color && + colorItem.index === colorModel.indexOf(thisDialog.color) + } } Rectangle { anchors.fill: parent visible: model.itemType === ColorModel.AddItem color: colorDelegate.highlighted ? highlightColor : "transparent" - property color highlightColor: Theme.rgba(Theme.highlightBackgroundColor, Theme.highlightBackgroundOpacity) + readonly property color highlightColor: Theme.rgba(Theme.highlightBackgroundColor, Theme.highlightBackgroundOpacity) Image { anchors.centerIn: parent @@ -211,7 +223,7 @@ onClicked: { if (model.itemType === ColorModel.ColorItem) { thisDialog.color = model.color - thisDialog.canAccept = true + thisDialog.forwardNavigation = true thisDialog.accept() } else { var editor = pageStack.push(Qt.resolvedUrl("ColorEditor.qml"), {
[-] [+]	Changed	_service:tar_git:harbour-valuelogger2-1.0.11.tar.bz2/src/colormodel.cpp ^
@@ -194,3 +194,8 @@ } } } + +int ColorModel::indexOf(QColor color) const +{ + return m_colors.indexOf(color); +}
[-] [+]	Changed	_service:tar_git:harbour-valuelogger2-1.0.11.tar.bz2/src/colormodel.h ^
@@ -51,6 +51,7 @@ void setDragPos(int pos); Q_INVOKABLE void addColor(QColor color); + Q_INVOKABLE int indexOf(QColor color) const; // QAbstractListModel QHash<int,QByteArray> roleNames() const Q_DECL_OVERRIDE;
[-] [+]	Changed	_service:tar_git:harbour-valuelogger2-1.0.11.tar.bz2/translations/harbour-valuelogger2_pl.ts ^
@@ -16,7 +16,7 @@ </message> <message> <source>Pair</source> - <translation type="unfinished">Paruj</translation> + <translation>Paruj</translation> </message> </context> <context> @@ -54,19 +54,19 @@ <name>ColorEditor</name> <message> <source>Add color</source> - <translation type="unfinished">Dodaj kolor</translation> + <translation>Dodaj kolor</translation> </message> <message> <source>Color</source> - <translation type="unfinished">Kolor</translation> + <translation>Kolor</translation> </message> <message> <source>Brightness</source> - <translation type="unfinished">Jasność</translation> + <translation>Jasność</translation> </message> <message> <source>Hex notation</source> - <translation type="unfinished">Format szesnastkowy</translation> + <translation>Format szesnastkowy</translation> </message> </context> <context> @@ -77,7 +77,7 @@ </message> <message> <source>Reset colors</source> - <translation type="unfinished">Zresetuj kolory</translation> + <translation>Resetuj kolory</translation> </message> </context> <context>
[-] [+]	Changed	_service:tar_git:harbour-valuelogger2-1.0.11.tar.bz2/valuelogger.pro ^
@@ -11,7 +11,7 @@ QMAKE_CXXFLAGS += -Wno-unused-parameter -Wno-psabi isEmpty(SPECVERSION) { - SPECVERSION=1.0.9 + SPECVERSION=1.0.11 } DEFINES += "APPVERSION=\\\"$${SPECVERSION}\\\""