Commit 9049159b authored by camilo higuita's avatar camilo higuita

style ux ui migration

parent 60e6ed86
import QtQuick 2.9
import QtQuick.Controls 2.2
import org.kde.kirigami 2.4 as Kirigami
import org.kde.kirigami 2.6 as Kirigami
import org.kde.mauikit 1.0 as Maui
import "src/widgets"
......@@ -17,11 +17,11 @@ Maui.ApplicationWindow
floatingBar: true
footBarOverlap: true
allowRiseContent: false
// altToolBars: false
// altToolBars: false
/**** BRANDING COLORS ****/
menuButton.colorScheme.highlightColor: accentColor
searchButton.colorScheme.highlightColor: accentColor
// menuButton.colorScheme.highlightColor: accentColor
// searchButton.colorScheme.highlightColor: accentColor
headBarBGColor: viewBackgroundColor
headBarFGColor: textColor
accentColor : "#ff9494"
......@@ -42,50 +42,50 @@ Maui.ApplicationWindow
})
property color headBarTint : Qt.lighter(headBarBGColor, 1.25)
headBar.middleContent: [
Maui.ToolButton
{
onClicked: currentView = views.notes
iconColor: active ? accentColor : textColor
colorScheme.highlightColor: accentColor
iconName: "view-notes"
text: qsTr("Notes")
active: currentView === views.notes
showIndicator: true
},
Maui.ToolButton
{
onClicked: currentView = views.links
iconColor: active ? accentColor : textColor
colorScheme.highlightColor: accentColor
iconName: "view-links"
text: qsTr("Links")
active: currentView === views.links
showIndicator: true
},
Maui.ToolButton
{
onClicked: currentView = views.books
iconColor: active? accentColor : textColor
colorScheme.highlightColor: accentColor
iconName: "view-books"
text: qsTr("Books")
active: currentView === views.books
showIndicator: true
},
Maui.ToolButton
{
iconColor: active ? accentColor : textColor
colorScheme.highlightColor: accentColor
iconName: "tag"
text: qsTr("Tags")
active: currentView === views.tags
showIndicator: true
}
]
headBar.middleContent: Kirigami.ActionToolBar
{
actions: [
Kirigami.Action
{
onTriggered: currentView = views.notes
icon.color: checked ? accentColor : textColor
Kirigami.Theme.highlightColor: accentColor
Kirigami.Theme.textColor: accentColor
icon.name: "view-notes"
text: qsTr("Notes")
checked: currentView === views.notes
},
Kirigami.Action
{
onTriggered: currentView = views.links
icon.color: checked ? accentColor : textColor
Kirigami.Theme.highlightColor: accentColor
icon.name: "view-links"
text: qsTr("Links")
checked: currentView === views.links
},
Kirigami.Action
{
onTriggered: currentView = views.books
icon.color: checked? accentColor : textColor
Kirigami.Theme.highlightColor: accentColor
icon.name: "view-books"
text: qsTr("Books")
checked: currentView === views.books
},
Kirigami.Action
{
icon.color: checked ? accentColor : textColor
Kirigami.Theme.highlightColor: accentColor
icon.name: "tag"
text: qsTr("Tags")
checked: currentView === views.tags
}
]
}
// headBar.colorScheme.borderColor: Qt.darker(accentColor, 1.4)
headBar.drawBorder: false
......
......@@ -36,16 +36,16 @@ Maui.Page
onClicked: cardsView.gridView = !cardsView.gridView
},
Maui.ToolButton
ToolButton
{
iconName: "view-sort"
icon.name: "view-sort"
onClicked: sortMenu.open();
Menu
{
id: sortMenu
Maui.MenuItem
MenuItem
{
text: qsTr("Ascedent")
checkable: true
......@@ -53,7 +53,7 @@ Maui.Page
onTriggered: linksList.order = Links.ASC
}
Maui.MenuItem
MenuItem
{
text: qsTr("Descendent")
checkable: true
......@@ -63,32 +63,32 @@ Maui.Page
MenuSeparator{}
Maui.MenuItem
MenuItem
{
text: qsTr("Title")
onTriggered: KEY.TITLE
}
Maui.MenuItem
MenuItem
{
text: qsTr("Color")
onTriggered: linksList.sortBy = KEY.COLOR
}
Maui.MenuItem
MenuItem
{
text: qsTr("Add date")
onTriggered: linksList.sortBy = KEY.ADD_DATE
}
Maui.MenuItem
MenuItem
{
text: qsTr("Updated")
onTriggered: linksList.sortBy = KEY.UPDATED
}
Maui.MenuItem
MenuItem
{
text: qsTr("Fav")
onTriggered: linksList.sortBy = KEY.FAV
......@@ -98,19 +98,19 @@ Maui.Page
]
headBar.rightContent: [
Maui.ToolButton
ToolButton
{
iconName: "tag-recents"
icon.name: "tag-recents"
},
Maui.ToolButton
ToolButton
{
iconName: "edit-pin"
icon.name: "edit-pin"
},
Maui.ToolButton
ToolButton
{
iconName: "view-calendar"
icon.name: "view-calendar"
}
]
......
......@@ -41,43 +41,43 @@ Maui.Page
]
headBar.rightContent: [
Maui.ToolButton
ToolButton
{
iconName: "view-sort"
icon.name: "view-sort"
onClicked: sortMenu.open();
Maui.Menu
Menu
{
id: sortMenu
parent: parent
Maui.MenuItem
MenuItem
{
text: qsTr("Ascedent")
checkable: true
checkable: false
checked: notesList.order === Notes.ASC
onTriggered: notesList.order = Notes.ASC
}
Maui.MenuItem
MenuItem
{
text: qsTr("Descendent")
checkable: true
checkable: false
checked: notesList.order === Notes.DESC
onTriggered: notesList.order = Notes.DESC
}
MenuSeparator{}
Maui.MenuItem
MenuItem
{
text: qsTr("Title")
checkable: true
checkable: false
checked: notesList.sortBy === KEY.TITLE
onTriggered: notesList.sortBy = KEY.TITLE
}
Maui.MenuItem
MenuItem
{
text: qsTr("Color")
checkable: true
......@@ -85,37 +85,37 @@ Maui.Page
onTriggered: notesList.sortBy = KEY.COLOR
}
Maui.MenuItem
MenuItem
{
text: qsTr("Add date")
checkable: true
checkable: false
checked: notesList.sortBy === KEY.ADD_DATE
onTriggered: notesList.sortBy = KEY.ADD_DATE
}
Maui.MenuItem
MenuItem
{
text: qsTr("Updated")
checkable: true
checkable: false
checked: notesList.sortBy === KEY.UPDATED
onTriggered: notesList.sortBy = KEY.UPDATED
}
Maui.MenuItem
MenuItem
{
text: qsTr("Fav")
checkable: true
checkable: false
checked: notesList.sortBy === KEY.FAV
onTriggered: notesList.sortBy = KEY.FAV
}
}
},
Maui.ToolButton
ToolButton
{
id: pinButton
iconName: "edit-pin"
icon.name: "edit-pin"
checkable: true
iconColor: checked ? highlightColor : textColor
icon.color: checked ? highlightColor : textColor
}
]
......
......@@ -2,7 +2,7 @@ import QtQuick 2.9
import QtQuick.Controls 2.3
import org.kde.mauikit 1.0 as Maui
Maui.Menu
Menu
{
implicitWidth: colorBar.implicitWidth + space.medium
property bool isFav : false
......@@ -14,7 +14,7 @@ Maui.Menu
signal pinClicked(int pin)
signal copyClicked()
Maui.MenuItem
MenuItem
{
text: qsTr(isFav? "UnFav" : "Fav")
onTriggered:
......@@ -24,7 +24,7 @@ Maui.Menu
}
}
Maui.MenuItem
MenuItem
{
text: qsTr(isPin? "UnPin" : "Pin")
onTriggered:
......@@ -34,7 +34,7 @@ Maui.Menu
}
}
Maui.MenuItem
MenuItem
{
text: qsTr("Export")
onTriggered:
......@@ -43,7 +43,7 @@ Maui.Menu
}
}
Maui.MenuItem
MenuItem
{
text: qsTr("Copy")
onTriggered:
......@@ -53,7 +53,7 @@ Maui.Menu
}
}
Maui.MenuItem
MenuItem
{
text: qsTr("Delete")
onTriggered:
......@@ -68,7 +68,7 @@ Maui.Menu
}
Maui.MenuItem
MenuItem
{
width: parent.width
height: rowHeight
......
......@@ -2,6 +2,7 @@ import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.0
import org.kde.mauikit 1.0 as Maui
import org.kde.kirigami 2.6 as Kirigami
Maui.Dialog
{
......@@ -187,8 +188,8 @@ Maui.Dialog
list.key: "notes"
onTagsEdited: list.updateToAbstract(tags)
onTagRemovedClicked: list.removeFromAbstract(index)
colorScheme.backgroundColor: "transparent"
colorScheme.textColor: control.colorScheme.textColor
Kirigami.Theme.backgroundColor: "transparent"
Kirigami.Theme.textColor: control.colorScheme.textColor
}
}
......
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