Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@jacquetc
jacquetc committed Aug 8, 2021
2 parents f968e95 + d9770f8 commit c7fd0c6
Show file tree
Hide file tree
Showing 78 changed files with 5,575 additions and 3,549 deletions.
21 changes: 20 additions & 1 deletion NEWS.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,23 @@ Description:
- "Section: add Section page type"
- "Parameters: add a way to add custom parameters to new pages"


Version: 1.9.28
Date: 2021-08-09
Type: stable
Description:
- "Fix Windows support"
- "Save: add a save button at the top of the window"
- "Shortcuts: display shortcuts in tips"
- "Minimap: fix wobbling of minimap width and text area width"
- "Navigation: disable animation for side lists"
- "Navigation: better navigation with cleaner code and more usable"
- "Navigation: fix keyboard navigation"
- "Navigation: add visual clue when Cut and Copy items"
- "Navigation: set a smoother transition between lists"
- "Navigation: fix clicking in side popups doing nothing"
- "Plume Creator importer: fix completely importer with new approach"
- "Drag Drop: switch to a new way to drag drop in and from the navigation list"
- "Notes: fix setting a note folder in Project page"
- "Section : fix section icons not displaying correctly"
- "Tags: forbid clicks passing through a color square"
- "View: fix lack of drop visual clue"
28 changes: 17 additions & 11 deletions eu.skribisto.skribisto.appdata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,25 @@
</screenshot>
</screenshots>
<releases>
<release type="stable" version="1.9.27" date="2021-08-02T00:00:00Z">
<release type="stable" version="1.9.28" date="2021-08-09T00:00:00Z">
<description>
<ul>
<li>Minimap: new minimap scrollbar</li>
<li>Icons: use bigger and sharper icons</li>
<li>Pages: creation list of items is sorted</li>
<li>Druide Antidote: add plugin to use Druide Antidote with text page</li>
<li>Breadcrumb: make buttons action to go to the beginning/end smoother</li>
<li>Docks: toolbox top buttons are now in a list</li>
<li>Notes: fix set note folder does nothing</li>
<li>Notes: add a quick button to add Notes folder</li>
<li>Section: add Section page type</li>
<li>Parameters: add a way to add custom parameters to new pages</li>
<li>Fix Windows support</li>
<li>Save: add a save button at the top of the window</li>
<li>Shortcuts: display shortcuts in tips</li>
<li>Minimap: fix wobbling of minimap width and text area width</li>
<li>Navigation: disable animation for side lists</li>
<li>Navigation: better navigation with cleaner code and more usable</li>
<li>Navigation: fix keyboard navigation</li>
<li>Navigation: add visual clue when Cut and Copy items</li>
<li>Navigation: set a smoother transition between lists</li>
<li>Navigation: fix clicking in side popups doing nothing</li>
<li>Plume Creator importer: fix completely importer with new approach</li>
<li>Drag Drop: switch to a new way to drag drop in and from the navigation list</li>
<li>Notes: fix setting a note folder in Project page</li>
<li>Section : fix section icons not displaying correctly</li>
<li>Tags: forbid clicks passing through a color square</li>
<li>View: fix lack of drop visual clue</li>
</ul>
</description>
</release>
Expand Down
Binary file modified resources/test/skribisto_test_project.skrib
View file
Binary file not shown.
1 change: 1 addition & 0 deletions src/app/src/qml.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,5 +107,6 @@
<file>qml/Commons/RelationshipPanelForm.ui.qml</file>
<file>qml/Items/SkrBusyIndicator.qml</file>
<file>qml/Commons/OutlineWritingZone.qml</file>
<file>qml/Items/SkrFlickable.qml</file>
</qresource>
</RCC>
2 changes: 2 additions & 0 deletions src/app/src/qml/Commons/CheckableTree.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@ ListView {
}

text: "Open document"
property string shortcutText: ""
onTriggered: {
//console.log("model.openedProjectId", openedProjectId)
//console.log("model.projectId", model.projectId)
Expand All @@ -455,6 +456,7 @@ ListView {
Action {
id: openDocumentInAnotherViewAction
//shortcut: "Alt+Return"
property string shortcutText: ""
enabled: {
if (root.focus === true
&& titleTextField.visible === false
Expand Down
6 changes: 6 additions & 0 deletions src/app/src/qml/Commons/ColorChooser.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ Item {
priv.textColorCode = model.textColorCode
priv.colorCode = model.colorCode
}

onGrabChanged: function(transition, point) {
point.accepted = false
}

grabPermissions: PointerHandler.TakeOverForbidden
}

HoverHandler{
Expand Down
3 changes: 2 additions & 1 deletion src/app/src/qml/Commons/NewItemPopup.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ NewItemPopupForm {

//---------------------------------------------------------

listView.onCurrentIndexChanged: {
listView.onCurrentItemChanged: {

chosenPageType = listView.currentItem.type
detailsTextArea.text = skrTreeManager.getPageDetailText(listView.currentItem.type)
parametersLoader.source = skrTreeManager.getCreationParametersQmlUrlFromPageType(chosenPageType)
Expand Down
20 changes: 13 additions & 7 deletions src/app/src/qml/Commons/RelationshipPanel.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,6 @@ RelationshipPanelForm {
action: Action {
id: renameAction
text: qsTr("Rename")
shortcut: "F2"
icon {
source: "qrc:///icons/backup/edit-rename.svg"
}
Expand Down Expand Up @@ -850,7 +849,7 @@ RelationshipPanelForm {
property int projectId: model.projectId
property int treeItemId: model.treeItemId
property string treeItemTitle: model.title
title: qsTr("Rename an item")
title: qsTr("Rename a linked item")
contentItem: SkrTextField {
id: inner_renameTextField
text: renameDialog.treeItemTitle
Expand Down Expand Up @@ -975,23 +974,30 @@ RelationshipPanelForm {


keys: ["application/skribisto-tree-item"]
onEntered: {
onEntered: function(drag) {

if(drag.source.projectId !== root.projectId){
drag.accepted = false
return
}
if(drag.source.treeItemId === root.treeItemId){
drag.accepted = false
return
}

dropIndicator.visible = true
}
onExited: {
dropIndicator.visible = false

}

onDropped: {
onDropped: function(drop) {
if(drop.proposedAction === Qt.MoveAction){
skrData.treeHub().setTreeRelationship(drag.source.projectId, drag.source.treeItemId, root.treeItemId)
}
dropIndicator.visible = false
}



}


Expand Down
89 changes: 0 additions & 89 deletions src/app/src/qml/Commons/WritingZone.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -659,95 +659,6 @@ WritingZoneForm {
}
}

//-----------------------------------------------------------------------------
// left scroll area :

//textArea.onCursorRectangleChanged: flickable.ensureVisible(textArea.cursorRectangle)
leftScrollTouchArea.onUpdated: {
var deltaY = touchPoints[0].y - touchPoints[0].previousY

// console.log("deltaY :", deltaY)
if (flickable.atYBeginning && deltaY > 0) {
flickable.returnToBounds()
return
}
if (flickable.atYEnd && deltaY < 0) {
flickable.returnToBounds()
return
}

flickable.flick(0, deltaY * 50)

// for (var touch in touchPoints)
// console.log("Multitouch updated touch", touchPoints[touch].pointId,
// "at", touchPoints[touch].x, ",", touchPoints[touch].y,
// ",", touchPoints[touch].previousY, ",",
// touchPoints[touch].startY)
}

// leftScrollMouseArea.onPressAndHold: {

// }
// leftScrollMouseArea.onWheel: function(event) {

// var deltaY = wheel.angleDelta.y *10

// flickable.flick(0, deltaY)

// if (flickable.atYBeginning && wheel.angleDelta.y > 0) {
// flickable.returnToBounds()
// return
// }
// if (flickable.atYEnd && wheel.angleDelta.y < 0) {
// flickable.returnToBounds()
// return
// }
// }

// right scroll area :

//textArea.onCursorRectangleChanged: flickable.ensureVisible(textArea.cursorRectangle)
rightScrollTouchArea.onUpdated: {
var deltaY = touchPoints[0].y - touchPoints[0].previousY

// console.log("deltaY :", deltaY)
if (flickable.atYBeginning && deltaY > 0) {
flickable.returnToBounds()
return
}
if (flickable.atYEnd && deltaY < 0) {
flickable.returnToBounds()
return
}

flickable.flick(0, deltaY * 50)

// for (var touch in touchPoints)
// console.log("Multitouch updated touch", touchPoints[touch].pointId,
// "at", touchPoints[touch].x, ",", touchPoints[touch].y,
// ",", touchPoints[touch].previousY, ",",
// touchPoints[touch].startY)
}

// rightScrollMouseArea.onPressAndHold: {

// }
// rightScrollMouseArea.onWheel: function(event) {

// var deltaY = wheel.angleDelta.y *10

// flickable.flick(0, deltaY)

// if (flickable.atYBeginning && wheel.angleDelta.y > 0) {
// flickable.returnToBounds()
// return
// }
// if (flickable.atYEnd && wheel.angleDelta.y < 0) {
// flickable.returnToBounds()
// return
// }
// }

// scrollView :

//--------------------------------------------------------------------------------
Expand Down
83 changes: 60 additions & 23 deletions src/app/src/qml/Commons/WritingZoneForm.ui.qml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import QtQuick 2.15
import QtQml 2.15
import QtQuick.Controls 2.15
import QtQuick.Controls.Material 2.15
import QtQuick.Layouts 1.15
Expand All @@ -14,12 +15,11 @@ FocusScope {
property alias scrollView: scrollView
property alias textArea: textArea
property alias flickable: textAreaFlickable
readonly property bool flicking: textAreaFlickable.flicking || leftScrollFlickable.flicking || rightScrollFlickable.flicking
readonly property bool dragging: textAreaFlickable.dragging || leftScrollFlickable.dragging || rightScrollFlickable.dragging
property alias internalScrollBar: internalScrollBar
property int scrollBarVerticalPolicy: ScrollBar.AsNeeded
property alias leftScrollItem: leftScrollItem
property alias leftTouch1: leftTouch1
property alias leftScrollTouchArea: leftScrollTouchArea
property alias rightScrollTouchArea: rightScrollTouchArea
property alias rightScrollItem: rightScrollItem
property alias placeholderText: textArea.placeholderText

Expand Down Expand Up @@ -50,17 +50,35 @@ FocusScope {
id: leftScrollItem
Layout.fillHeight: true
Layout.fillWidth: true
MultiPointTouchArea {
id: leftScrollTouchArea
z: 1


Flickable{
id: leftScrollFlickable
anchors.fill: parent
mouseEnabled: false
maximumTouchPoints: 1
touchPoints: [
TouchPoint {
id: leftTouch1
}
]
clip: true
flickableDirection: Flickable.VerticalFlick
boundsBehavior: Flickable.StopAtBounds

contentHeight: textAreaFlickable.contentHeight
contentWidth: width

maximumFlickVelocity: 200
flickDeceleration: 0
Binding{
target: leftScrollFlickable
property: "contentY"
value: textAreaFlickable.contentY
restoreMode: Binding.RestoreBindingOrValue
}


Binding{
target: textAreaFlickable
property: "contentY"
value: leftScrollFlickable.contentY
restoreMode: Binding.RestoreBindingOrValue
delayed: true
}
}


Expand All @@ -85,6 +103,8 @@ FocusScope {
flickableDirection: Flickable.VerticalFlick
boundsBehavior: Flickable.StopAtBounds
interactive: true
maximumFlickVelocity: 200
flickDeceleration: 0
//clip: true
ScrollBar.vertical: ScrollBar {
id: internalScrollBar
Expand Down Expand Up @@ -116,17 +136,34 @@ FocusScope {
id: rightScrollItem
Layout.fillHeight: true
Layout.fillWidth: true
MultiPointTouchArea {
id: rightScrollTouchArea
z: 1

Flickable{
id: rightScrollFlickable
anchors.fill: parent
mouseEnabled: false
maximumTouchPoints: 1
touchPoints: [
TouchPoint {
id: rightTouch1
}
]
clip: true
flickableDirection: Flickable.VerticalFlick
boundsBehavior: Flickable.StopAtBounds

contentHeight: textAreaFlickable.contentHeight
contentWidth: width
maximumFlickVelocity: 200
flickDeceleration: 0

Binding{
target: rightScrollFlickable
property: "contentY"
value: textAreaFlickable.contentY
restoreMode: Binding.RestoreBindingOrValue
}


Binding{
target: textAreaFlickable
property: "contentY"
value: rightScrollFlickable.contentY
restoreMode: Binding.RestoreBindingOrValue
delayed: true
}
}
}
}
Expand Down
Loading

0 comments on commit c7fd0c6

Please sign in to comment.