Commit 09000800 authored by camilo higuita's avatar camilo higuita

bringing up to date

parent 11df418b
......@@ -91,21 +91,20 @@ Maui.ApplicationWindow
}
// headBar.colorScheme.borderColor: Qt.darker(accentColor, 1.4)
headBar.drawBorder: false
// headBar.implicitHeight: toolBarHeight * 1.5
// headBar.implicitHeight: Maui.Style.toolBarHeight * 1.5
Rectangle
{
z: 999
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.margins: toolBarHeight
anchors.bottomMargin: toolBarHeight
height: toolBarHeight
anchors.margins: Maui.Style.toolBarHeight
anchors.bottomMargin: Maui.Style.toolBarHeight
height: Maui.Style.toolBarHeight
width: height
color: Kirigami.Theme.highlightColor
radius: radiusV
radius: Maui.Style.radiusV
Maui.PieButton
{
......
......@@ -3,9 +3,10 @@ Name=Buho
Comment=Note taking app
TryExec=buho
Exec=buho %U
Keywords=notes;todo;nextcloud;maui;
Terminal=false
Type=Application
Categories=Qt;KDE;Utility;TextTools;X-KDE-Utilities-Desktop;
Categories=Qt;KDE;Utility;TextTools;TextEditor;Todo;X-KDE-Utilities-Desktop;
StartupNotify=true
Icon=buho
......
......@@ -53,11 +53,11 @@ Item
id: title
Layout.fillWidth: true
Layout.fillHeight: true
// Layout.margins: space.medium
// Layout.margins: Maui.Style.space.medium
placeholderText: qsTr("New chapter...")
font.weight: Font.Bold
font.bold: true
font.pointSize: fontSizes.large
font.pointSize: Maui.Style.fontSizes.large
text: currentBooklet.title
// Kirigami.Theme.backgroundColor: selectedColor
// Kirigami.Theme.textColor: Qt.darker(selectedColor, 2.5)
......@@ -75,7 +75,7 @@ Item
id: _holder
visible: !_listView.count || !currentBooklet
emoji: "qrc:/Type.png"
emojiSize: iconSizes.huge
emojiSize: Maui.Style.iconSizes.huge
isMask: false
title : "Nothing to edit!"
body: "Select a chapter or create a new one"
......@@ -135,10 +135,10 @@ Item
Maui.Holder
{
anchors.margins: space.huge
anchors.margins: Maui.Style.space.huge
visible: !_listView.count
emoji: "qrc:/E-reading.png"
emojiSize: iconSizes.huge
emojiSize: Maui.Style.iconSizes.huge
isMask: false
title : "This book is empty!"
body: "Start by creating a new chapter for your book by clicking the + icon"
......@@ -179,13 +179,13 @@ Item
{
z: 999
anchors.bottom: parent.bottom
anchors.margins: space.huge
anchors.margins: Maui.Style.space.huge
anchors.horizontalCenter: parent.horizontalCenter
height: toolBarHeight
height: Maui.Style.toolBarHeight
width: height
color: Kirigami.Theme.positiveTextColor
radius: radiusV
radius: Maui.Style.radiusV
ToolButton
{
......
......@@ -49,7 +49,7 @@ StackView
Maui.Page
{
id: _booksPage
padding: showDetails ? 0 : space.big
padding: showDetails ? 0 : Maui.Style.space.big
title : cardsView.count + " books"
// headBar.leftContent: [
......@@ -76,7 +76,7 @@ StackView
id: _holder
visible: !cardsView.count
emoji: "qrc:/notepad.png"
emojiSize: iconSizes.huge
emojiSize: Maui.Style.iconSizes.huge
isMask: false
title : "There are not Books!"
body: "You can create new books and organize your notes"
......@@ -89,9 +89,9 @@ StackView
id: cardsView
anchors.fill: parent
adaptContent: !showDetails
itemSize: showDetails ? iconSizes.big : iconSizes.huge
itemSize: showDetails ? Maui.Style.iconSizes.big : Maui.Style.iconSizes.huge
// centerContent: true
spacing: space.huge
spacing: Maui.Style.space.huge
cellWidth: showDetails ? parent.width : itemSize * 1.5
cellHeight: itemSize * 1.5
......@@ -137,7 +137,7 @@ StackView
Layout.fillHeight: true
color: hovered ? Kirigami.Theme.highlightColor : "transparent"
radius: radiusV
radius: Maui.Style.radiusV
Label
{
width: parent.width
......@@ -157,7 +157,7 @@ StackView
{
left: parent.left
top: parent.top
margins: space.small
margins: Maui.Style.space.small
}
Kirigami.Theme.backgroundColor: Kirigami.Theme.neutralTextColor
......
......@@ -22,8 +22,7 @@ Maui.Page
signal linkClicked(var link)
headBar.visible: !cardsView.holder.visible
headBar.drawBorder: false
padding: space.big
padding: Maui.Style.space.big
title : cardsView.count + " links"
headBar.leftContent: [
ToolButton
......@@ -135,8 +134,8 @@ Maui.Page
holder.isMask: false
holder.title : "No Links!"
holder.body: "Click here to save a new link"
holder.emojiSize: iconSizes.huge
itemHeight: unit * 250
holder.emojiSize: Maui.Style.iconSizes.huge
itemHeight: Maui.Style.unit * 250
model: linksModel
......
......@@ -10,7 +10,7 @@ Maui.Dialog
parent: parent
heightHint: 0.97
widthHint: 0.97
maxWidth: 800*unit
maxWidth: 800* Maui.Style.unit
maxHeight: maxWidth
page.padding: 0
property color selectedColor : "transparent"
......@@ -92,7 +92,7 @@ Maui.Dialog
// Item
// {
// Layout.fillWidth: true
// height: rowHeightAlt
// height: Maui.Style.rowHeightAlt
// Label
// {
......@@ -103,7 +103,7 @@ Maui.Dialog
// horizontalAlignment: Qt.AlignHCenter
// verticalAlignment: Qt.AlignVCenter
// font.bold: true
// font.pointSize: fontSizes.big
// font.pointSize: Maui.Style.fontSizes.big
// font.weight: Font.Bold
// elide: Label.ElideRight
// }
......
......@@ -18,9 +18,8 @@ Maui.Page
signal noteClicked(var note)
padding: space.big
padding: Maui.Style.space.big
headBar.drawBorder: false
headBar.visible: !cardsView.holder.visible
title : cardsView.count + " notes"
......@@ -150,7 +149,7 @@ Maui.Page
}
color: Kirigami.Theme.backgroundColor
radius: radiusV
radius: Maui.Style.radiusV
border.color: Qt.darker(Kirigami.Theme.backgroundColor, 1.4)
}
......@@ -163,7 +162,7 @@ Maui.Page
Layout.fillWidth: true
width: parent.width
holder.emoji: "qrc:/Type.png"
holder.emojiSize: iconSizes.huge
holder.emojiSize: Maui.Style.iconSizes.huge
holder.isMask: false
holder.title : "No notes!"
holder.body: "Click here to create a new note"
......
......@@ -4,14 +4,15 @@ import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import org.kde.kirigami 2.2 as Kirigami
import org.kde.mauikit 1.0 as Maui
ItemDelegate
{
id: control
property string noteColor : model.color ? model.color : Kirigami.Theme.backgroundColor
property int cardWidth: visible ? unit * 200 : 0
property int cardHeight: visible ? unit * 120 : 0
property int cardRadius: radiusV
property int cardWidth: visible ? Maui.Style.unit * 200 : 0
property int cardHeight: visible ? Maui.Style.unit * 120 : 0
property int cardRadius: Maui.Style.radiusV
property bool condition : true
......@@ -72,9 +73,9 @@ ItemDelegate
id: date
padding: 0
visible: date.text.length > 0
Layout.leftMargin: space.medium
Layout.topMargin: space.medium
Layout.rightMargin: space.medium
Layout.leftMargin: Maui.Style.space.medium
Layout.topMargin: Maui.Style.space.medium
Layout.rightMargin: Maui.Style.space.medium
Layout.alignment: Qt.AlignLeft
Layout.fillWidth: true
......@@ -84,7 +85,7 @@ ItemDelegate
wrapMode: TextEdit.WrapAnywhere
font.weight: Font.Bold
font.bold: true
font.pointSize: fontSizes.small
font.pointSize: Maui.Style.fontSizes.small
}
Label
......@@ -92,9 +93,9 @@ ItemDelegate
id: title
padding: 0
visible: title.text.length > 0
Layout.leftMargin: space.medium
Layout.bottomMargin: space.medium
Layout.rightMargin: space.medium
Layout.leftMargin: Maui.Style.space.medium
Layout.bottomMargin: Maui.Style.space.medium
Layout.rightMargin: Maui.Style.space.medium
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
Layout.preferredHeight: if(model.preview) parent.height * 0.4
......@@ -106,7 +107,7 @@ ItemDelegate
wrapMode: TextEdit.WrapAnywhere
font.weight: Font.Bold
font.bold: true
font.pointSize: fontSizes.large
font.pointSize: Maui.Style.fontSizes.large
clip: true
}
......@@ -114,10 +115,10 @@ ItemDelegate
Loader
{
id: bodyLoader
Layout.leftMargin: space.medium
Layout.bottomMargin: space.medium
Layout.rightMargin: space.medium
Layout.topMargin: title.visible ? 0 : space.medium
Layout.leftMargin: Maui.Style.space.medium
Layout.bottomMargin: Maui.Style.space.medium
Layout.rightMargin: Maui.Style.space.medium
Layout.topMargin: title.visible ? 0 : Maui.Style.space.medium
Layout.alignment: Qt.AlignLeft
Layout.fillHeight: true
Layout.fillWidth: true
......@@ -131,10 +132,10 @@ ItemDelegate
id: imgLoader
Layout.fillHeight: true
Layout.fillWidth: true
Layout.margins: unit
Layout.margins: Maui.Style.unit
Layout.alignment: Qt.AlignCenter
clip: true
Layout.topMargin: space.medium
Layout.topMargin: Maui.Style.space.medium
sourceComponent: typeof model.preview !== 'undefined' ? imgComponent : undefined
}
}
......@@ -154,7 +155,7 @@ ItemDelegate
wrapMode: TextEdit.WrapAnywhere
textFormat : TextEdit.AutoText
font.pointSize: fontSizes.big
font.pointSize: Maui.Style.fontSizes.big
background: Rectangle
{
color: "transparent"
......
......@@ -5,7 +5,7 @@ import org.kde.kirigami 2.7 as Kirigami
Menu
{
implicitWidth: colorBar.implicitWidth + space.medium
implicitWidth: colorBar.implicitWidth + Maui.Style.space.medium
property bool isFav : false
property bool isPin: false
......@@ -73,7 +73,7 @@ Menu
MenuItem
{
width: parent.width
height: rowHeight
height: Maui.Style.rowHeight
ColorsBar
{
......
......@@ -6,8 +6,8 @@ ListView
id: control
clip: true
property int itemWidth: unit * 300
property int itemHeight: unit * 200
property int itemWidth: Maui.Style.unit * 300
property int itemHeight: Maui.Style.unit * 200
signal itemClicked(int index)
boundsBehavior: !isMobile? Flickable.StopAtBounds : Flickable.DragAndOvershootBounds
......@@ -19,7 +19,7 @@ ListView
// id: holder
// visible: control.count > 0
// emoji: "qrc:/Type.png"
// emojiSize: iconSizes.big
// emojiSize: Maui.Style.iconSizes.big
// isMask: false
// title : "No pinned notes!"
// body: "You can pin your notes to see them here"
......
......@@ -10,11 +10,11 @@ GridView
property alias holder : holder
property alias menu : cardMenu
readonly property int defaultSize : unit * 200
readonly property int defaultSize : Maui.Style.unit * 200
property int itemWidth : !gridView ? width :
(isMobile ? width * 0.5 : unit * 400)
property int itemHeight: unit * 180
property int itemSpacing: space.huge
(isMobile ? width * 0.5 : Maui.Style.unit * 400)
property int itemHeight: Maui.Style.unit * 180
property int itemSpacing: Maui.Style.space.huge
signal itemClicked(int index)
boundsBehavior: !isMobile? Flickable.StopAtBounds : Flickable.DragAndOvershootBounds
......
import QtQuick 2.0
import QtQuick.Controls 2.2
import org.kde.kirigami 2.7 as Kirigami
import org.kde.mauikit 1.0 as Maui
Row
{
signal colorPicked(color color)
anchors.verticalCenter: parent.verticalCenter
spacing: space.medium
spacing: Maui.Style.space.medium
property string currentColor
property int size : iconSizes.medium
property int size : Maui.Style.iconSizes.medium
Rectangle
{
......@@ -16,7 +17,7 @@ Row
anchors.verticalCenter: parent.verticalCenter
height: size
width: height
radius: radiusV
radius: Maui.Style.radiusV
border.color: Qt.darker(color, 1.7)
MouseArea
......@@ -36,7 +37,7 @@ Row
anchors.verticalCenter: parent.verticalCenter
height: size
width: height
radius: radiusV
radius: Maui.Style.radiusV
border.color: Qt.darker(color, 1.7)
MouseArea
......@@ -56,7 +57,7 @@ Row
anchors.verticalCenter: parent.verticalCenter
height: size
width: height
radius: radiusV
radius: Maui.Style.radiusV
border.color: Qt.darker(color, 1.7)
MouseArea
......@@ -76,7 +77,7 @@ Row
anchors.verticalCenter: parent.verticalCenter
height: size
width: height
radius: radiusV
radius: Maui.Style.radiusV
border.color: Qt.darker(color, 1.7)
MouseArea
......@@ -96,7 +97,7 @@ Row
anchors.verticalCenter: parent.verticalCenter
height: size
width: height
radius: radiusV
radius: Maui.Style.radiusV
border.color: Qt.darker(color, 1.7)
MouseArea
......@@ -118,7 +119,7 @@ Row
anchors.verticalCenter: parent.verticalCenter
height: size
width: height
radius: radiusV
radius: Maui.Style.radiusV
border.color: Qt.darker(color, 1.7)
MouseArea
......
......@@ -9,9 +9,9 @@ ItemDelegate
{
id: control
property string noteColor : model.color ? model.color : viewBackgroundColor
property int cardWidth: visible ? unit * 200 : 0
property int cardHeight: visible ? unit * 120 : 0
property int cardRadius: radiusV
property int cardWidth: visible ? Maui.Style.unit * 200 : 0
property int cardHeight: visible ? Maui.Style.unit * 120 : 0
property int cardRadius: Maui.Style.radiusV
property bool condition : true
......@@ -53,7 +53,7 @@ ItemDelegate
{
id: imgLoader
anchors.fill: parent
anchors.margins: space.small
anchors.margins: Maui.Style.space.small
clip: true
sourceComponent: typeof model.preview !== 'undefined' ? imgComponent : undefined
}
......@@ -71,18 +71,18 @@ ItemDelegate
Item
{
visible: title.text.length > 0
height: layout.implicitHeight + space.big
height: layout.implicitHeight + Maui.Style.space.big
anchors.right: parent.right
anchors.left: parent.left
anchors.bottom: parent.bottom
anchors.margins: unit
anchors.margins: Maui.Style.unit
clip: true
ColumnLayout
{
id: layout
anchors.fill: parent
anchors.margins: space.small
anchors.margins: Maui.Style.space.small
spacing: 0
Label
{
......@@ -98,7 +98,7 @@ ItemDelegate
wrapMode: TextEdit.WrapAnywhere
font.weight: Font.Bold
font.bold: true
font.pointSize: fontSizes.small
font.pointSize: Maui.Style.fontSizes.small
clip: true
}
......@@ -115,7 +115,7 @@ ItemDelegate
wrapMode: TextEdit.WrapAnywhere
font.weight: Font.Bold
font.bold: true
font.pointSize: fontSizes.large
font.pointSize: Maui.Style.fontSizes.large
clip: true
}
}
......@@ -145,7 +145,7 @@ ItemDelegate
wrapMode: TextEdit.WrapAnywhere
textFormat: TextEdit.RichText
font.pointSize: fontSizes.big
font.pointSize: Maui.Style.fontSizes.big
background: Rectangle
{
......
......@@ -9,8 +9,8 @@ Maui.Dialog
parent: parent
heightHint: 0.95
widthHint: 0.95
maxHeight: previewReady ? unit * 800 : contentLayout.implicitHeight
maxWidth: unit *700
maxHeight: previewReady ? Maui.Style.unit * 800 : contentLayout.implicitHeight
maxWidth: Maui.Style.unit *700
signal linkSaved(var link)
property string selectedColor : "#ffffe6"
......@@ -50,12 +50,12 @@ Maui.Dialog
id: title
visible: previewReady
Layout.fillWidth: true
Layout.margins: space.medium
Layout.margins: Maui.Style.space.medium
height: 24
placeholderText: qsTr("Title")
font.weight: Font.Bold
font.bold: true
font.pointSize: fontSizes.large
font.pointSize: Maui.Style.fontSizes.large
color: fgColor
background: Rectangle
......@@ -112,13 +112,13 @@ Maui.Dialog
{
id: link
Layout.fillWidth: true
Layout.margins: space.medium
height: rowHeight
Layout.margins: Maui.Style.space.medium
height: Maui.Style.rowHeight
verticalAlignment: Qt.AlignVCenter
placeholderText: qsTr("URL")
font.weight: Font.Bold
font.bold: true
font.pointSize: fontSizes.large
font.pointSize: Maui.Style.fontSizes.large
color: fgColor
Layout.alignment: Qt.AlignCenter
......
......@@ -10,7 +10,7 @@ Maui.Dialog
parent: parent
heightHint: 0.95
widthHint: 0.95
maxWidth: 700*unit
maxWidth: 700 * Maui.Style.unit
maxHeight: maxWidth
property string selectedColor : Kirigami.Theme.backgroundColor
......@@ -27,11 +27,11 @@ Maui.Dialog
{
id: title
Layout.fillWidth: true
Layout.margins: space.medium
Layout.margins: Maui.Style.space.medium
placeholderText: qsTr("Title")
font.weight: Font.Bold
font.bold: true
font.pointSize: fontSizes.large
font.pointSize: Maui.Style.fontSizes.large
// Kirigami.Theme.backgroundColor: selectedColor
// Kirigami.Theme.textColor: Qt.darker(selectedColor, 2.5)
// color: fgColor
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment