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 Jun 24, 2021
2 parents 558286c + 2acd8b9 commit c3ea09d
Show file tree
Hide file tree
Showing 39 changed files with 1,616 additions and 1,086 deletions.
12 changes: 12 additions & 0 deletions NEWS.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,15 @@ Description:
- "Breadcrumb: adapt to small size"
- "Navigation: fix Sort Alphabetically action"
- "Navigation: Fix cut, copy, paste"
---
Version: 1.9.26
Date: 2021-06-24
Type: stable
Description:
- "Plugin: create plugin interface for importer"
- "Navigation: fix restore"
- "Icons: fix some icons not following the theme"
- "Distraction free: header bar can now hide"
- "Writing games: forbid Ctrl+Z"


2 changes: 1 addition & 1 deletion cmake/Superbuild/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ExternalProject_Add(zlib

ExternalProject_Add(quazip
GIT_REPOSITORY https://github.com/jacquetc/quazip.git
GIT_TAG de8125cf8cf8422dae5df87ed6b5be9305219594
GIT_TAG v1.1
CMAKE_ARGS
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
Expand Down
11 changes: 11 additions & 0 deletions eu.skribisto.skribisto.appdata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,17 @@
</screenshot>
</screenshots>
<releases>
<release type="stable" version="1.9.26" date="2021-06-24T00:00:00Z">
<description>
<ul>
<li>Plugin: create plugin interface for importer</li>
<li>Navigation: fix restore</li>
<li>Icons: fix some icons not following the theme</li>
<li>Distraction free: header bar can now hide</li>
<li>Writing games: forbid Ctrl+Z</li>
</ul>
</description>
</release>
<release type="stable" version="1.9.25" date="2021-06-22T00:00:00Z">
<description>
<ul>
Expand Down
5 changes: 1 addition & 4 deletions package/windows/packaging.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
$env:Path += ";C:\Qt\5.15.2\mingw81_64\bin;C:\Qt\Tools\mingw810_64\bin;C:\Qt\Tools\CMake_64\bin"


# clean
Remove-Item -Recurse -Force -Path ../../../build_skribisto_Release
mkdir ../../../build_skribisto_Release
mkdir ../../../build_skribisto_Release/package

# prepare
cmake.exe -B../../../build_skribisto_Release -GNinja `
Expand All @@ -21,9 +21,6 @@ cmake.exe -B../../../build_skribisto_Release -GNinja `
cd ../../../build_skribisto_Release
C:/Qt/Tools/Ninja/ninja.exe

# clean
Remove-Item -Recurse -Path package

# copy
mkdir package
mkdir package/plugins
Expand Down
1 change: 1 addition & 0 deletions src/app/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ set(app_SRCS
skrshortcutmanager.h
skrshortcutmanager.cpp
skrprojectpageinterface.h
skrimporterinterface.h
)

set(QML qml.qrc
Expand Down
2 changes: 0 additions & 2 deletions src/app/src/qml.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,7 @@
<file>qml/WelcomePage/About.qml</file>
<file>qml/WelcomePage/ImporterPage.qml</file>
<file>qml/WelcomePage/FileMenuPageForm.ui.qml</file>
<file>qml/WelcomePage/PlumeImporterForm.ui.qml</file>
<file>qml/WelcomePage/ProjectPageForm.ui.qml</file>
<file>qml/WelcomePage/PlumeImporter.qml</file>
<file>qml/WelcomePage/ImporterPageForm.ui.qml</file>
<file>qml/Commons/NewItemPopup.qml</file>
<file>qml/Commons/NewItemPopupForm.ui.qml</file>
Expand Down
73 changes: 44 additions & 29 deletions src/app/src/qml/Commons/NewItemPopup.qml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import "../Items"

NewItemPopupForm {
id: root
Expand Down Expand Up @@ -44,18 +45,18 @@ NewItemPopupForm {

listView.delegate: delegateComponent

//--------------------------------------------------------- createButton.enabled: chosenPageType !== ""
//--------------------------------------------------------- createButton.enabled: chosenPageType !== ""

createButton.onClicked: {
pageTypeChosen(chosenPageType)
root.close()
}
//---------------------------------------------------------
//---------------------------------------------------------
cancelButton.onClicked: {
root.close()
}

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

listView.onCurrentIndexChanged: {
chosenPageType = listView.currentItem.type
Expand All @@ -65,42 +66,56 @@ NewItemPopupForm {
Component{
id: delegateComponent

ItemDelegate {
SkrListItemPane {
id: itemDelegate
width: parent.width
text: getPageTypeText(type)
height: 40
property string type: modelData
icon.source: getIconUrlFromPageType(type)
onClicked: {
itemDelegate.ListView.view.currentIndex = model.index
detailsTextArea.text = skrTreeManager.getPageDetailText(type)
chosenPageType = itemDelegate.type
}
onDoubleClicked: {
itemDelegate.ListView.view.currentIndex = model.index
pageTypeChosen(modelData)
root.close()

Item{
anchors.fill: parent
z:1
TapHandler{
onTapped: function(eventPoint){
itemDelegate.ListView.view.currentIndex = model.index
detailsTextArea.text = skrTreeManager.getPageDetailText(type)
chosenPageType = itemDelegate.type
}
onDoubleTapped: function(eventPoint){
itemDelegate.ListView.view.currentIndex = model.index
pageTypeChosen(modelData)
root.close()
}

}
}


RowLayout {
id: rowLayout
spacing: 2
anchors.fill: parent
Rectangle {
id: currentItemIndicator
color: "#cccccc"
Layout.fillHeight: true
Layout.preferredWidth: 5
visible: listView.currentIndex === model.index
}

Item{
id: stretcher
Layout.fillHeight: true
Layout.fillWidth: true

}
Rectangle {
id: currentItemIndicator
color: "#cccccc"
Layout.fillHeight: true
Layout.preferredWidth: 5
visible: listView.currentIndex === model.index
}

RowLayout{
Layout.fillHeight: true
Layout.fillWidth: true

SkrToolButton{
icon.source: getIconUrlFromPageType(type)
}

SkrLabel{
text: getPageTypeText(type)
}

}
}

}
Expand Down
1 change: 1 addition & 0 deletions src/app/src/qml/Commons/NewItemPopupForm.ui.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ SkrPopup {
focus: true
Layout.preferredWidth: 150
Layout.fillHeight: true
spacing: 2
}


Expand Down
144 changes: 75 additions & 69 deletions src/app/src/qml/Commons/RelationshipPanel.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,97 +594,103 @@ RelationshipPanelForm {

property string tip

SkrToolTip {
text: control.tip ? control.tip : text
visible: hoverHandler.hovered && text.length !== 0
}

Item {
anchors.fill: parent
z: 1

SkrToolTip {
text: control.tip ? control.tip : text
visible: hoverHandler.hovered && text.length !== 0
}

HoverHandler{
id: hoverHandler
}

HoverHandler{
id: hoverHandler
}

TapHandler{
id: tapHandler

onSingleTapped: function(eventPoint) {
control.forceActiveFocus()
gridView.currentIndex = model.index
TapHandler{
id: tapHandler

root.openTreeItemInPanel(projectId, model.treeItemId)
onSingleTapped: function(eventPoint) {
control.forceActiveFocus()
gridView.currentIndex = model.index

}
root.openTreeItemInPanel(projectId, model.treeItemId)

}


onDoubleTapped: function(eventPoint) {
control.forceActiveFocus()
gridView.currentIndex = model.index
priv.currentTreeItemId = model.treeItemId
viewManager.loadTreeItem(root.projectId, model.treeItemId)
}

grabPermissions: PointerHandler.TakeOverForbidden
onDoubleTapped: function(eventPoint) {
control.forceActiveFocus()
gridView.currentIndex = model.index
priv.currentTreeItemId = model.treeItemId
viewManager.loadTreeItem(root.projectId, model.treeItemId)
}

}
TapHandler{
id: middleClickTapHandler
acceptedDevices: PointerDevice.Mouse | PointerDevice.Stylus
acceptedButtons: Qt.MiddleButton
grabPermissions: PointerHandler.TakeOverForbidden

onSingleTapped: function(eventPoint) {
control.forceActiveFocus()
gridView.currentIndex = model.index
priv.currentTreeItemId = model.treeItemId
viewManager.loadTreeItemAtAnotherView(root.projectId, model.treeItemId)
}
TapHandler{
id: middleClickTapHandler
acceptedDevices: PointerDevice.Mouse | PointerDevice.Stylus
acceptedButtons: Qt.MiddleButton

grabPermissions: PointerHandler.TakeOverForbidden
onSingleTapped: function(eventPoint) {
control.forceActiveFocus()
gridView.currentIndex = model.index
priv.currentTreeItemId = model.treeItemId
viewManager.loadTreeItemAtAnotherView(root.projectId, model.treeItemId)
}

}
grabPermissions: PointerHandler.TakeOverForbidden

}

TapHandler {
id: rightClickTapHandler
acceptedDevices: PointerDevice.Mouse | PointerDevice.Stylus
acceptedButtons: Qt.RightButton
onSingleTapped: function(eventPoint) {
control.forceActiveFocus()
gridView.currentIndex = model.index
priv.currentTreeItemId = model.treeItemId
TapHandler {
id: rightClickTapHandler
acceptedDevices: PointerDevice.Mouse | PointerDevice.Stylus
acceptedButtons: Qt.RightButton
onSingleTapped: function(eventPoint) {
control.forceActiveFocus()
gridView.currentIndex = model.index
priv.currentTreeItemId = model.treeItemId

if (menu.visible) {
menu.close()
return
if (menu.visible) {
menu.close()
return
}

menu.open()
eventPoint.accepted = true
}

menu.open()
eventPoint.accepted = true
grabPermissions: PointerHandler.TakeOverForbidden
}

grabPermissions: PointerHandler.TakeOverForbidden
}
//----------------------------------------------------------------------
//-----------touch handler--------------------------------------------------
//----------------------------------------------------------------------
TapHandler {
id: touchHandler
acceptedDevices: PointerDevice.TouchScreen
acceptedPointerTypes: PointerDevice.Finger

//----------------------------------------------------------------------
//-----------touch handler--------------------------------------------------
//----------------------------------------------------------------------
TapHandler {
id: touchHandler
acceptedDevices: PointerDevice.TouchScreen
acceptedPointerTypes: PointerDevice.Finger
onLongPressed: {
control.forceActiveFocus()
gridView.currentIndex = model.index
priv.currentTreeItemId = model.treeItemId

onLongPressed: {
control.forceActiveFocus()
gridView.currentIndex = model.index
priv.currentTreeItemId = model.treeItemId
if (menu.visible) {
menu.close()
return
}

if (menu.visible) {
menu.close()
return
menu.open()
eventPoint.accepted = true
}

menu.open()
eventPoint.accepted = true
}
}

Expand Down Expand Up @@ -913,11 +919,11 @@ RelationshipPanelForm {
anchors.fill: parent
focus: true

Image {
source: skrTreeManager.getIconUrlFromPageType(type)
SkrToolButton {
icon.source: skrTreeManager.getIconUrlFromPageType(type)
Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
Layout.preferredHeight: 30
Layout.preferredWidth: 30
Layout.preferredHeight: 40
Layout.preferredWidth: 40
}
SkrLabel {
text: title
Expand Down
1 change: 1 addition & 0 deletions src/app/src/qml/Commons/TextContextMenu.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ TextContextMenuForm {

ColumnLayout{
anchors.fill: parent
spacing: 20

GridLayout{
columns: 4
Expand Down
Loading

0 comments on commit c3ea09d

Please sign in to comment.