Commit 60e6ed86 authored by camilo higuita's avatar camilo higuita

Merge branch 'master' of invent.kde.org:kde/buho into development

parents 2de677e8 1c388ebd
...@@ -46,54 +46,73 @@ Maui.ApplicationWindow ...@@ -46,54 +46,73 @@ Maui.ApplicationWindow
Maui.ToolButton Maui.ToolButton
{ {
onClicked: currentView = views.notes onClicked: currentView = views.notes
iconColor: currentView === views.notes? accentColor : textColor iconColor: active ? accentColor : textColor
colorScheme.highlightColor: accentColor colorScheme.highlightColor: accentColor
iconName: "view-notes" iconName: "view-notes"
text: qsTr("Notes") text: qsTr("Notes")
active: currentView === views.notes
showIndicator: true
}, },
Maui.ToolButton Maui.ToolButton
{ {
onClicked: currentView = views.links onClicked: currentView = views.links
iconColor: currentView === views.links? accentColor : textColor iconColor: active ? accentColor : textColor
colorScheme.highlightColor: accentColor colorScheme.highlightColor: accentColor
iconName: "view-links" iconName: "view-links"
text: qsTr("Links") text: qsTr("Links")
active: currentView === views.links
showIndicator: true
}, },
Maui.ToolButton Maui.ToolButton
{ {
onClicked: currentView = views.books onClicked: currentView = views.books
iconColor: currentView === views.books? accentColor : textColor iconColor: active? accentColor : textColor
colorScheme.highlightColor: accentColor colorScheme.highlightColor: accentColor
iconName: "view-books" iconName: "view-books"
text: qsTr("Books") text: qsTr("Books")
active: currentView === views.books
showIndicator: true
}, },
Maui.ToolButton Maui.ToolButton
{ {
iconColor: currentView === views.tags? accentColor : textColor iconColor: active ? accentColor : textColor
colorScheme.highlightColor: accentColor colorScheme.highlightColor: accentColor
iconName: "tag" iconName: "tag"
text: qsTr("Tags") text: qsTr("Tags")
active: currentView === views.tags
showIndicator: true
} }
] ]
// headBar.colorScheme.borderColor: Qt.darker(accentColor, 1.4) // headBar.colorScheme.borderColor: Qt.darker(accentColor, 1.4)
headBar.drawBorder: false headBar.drawBorder: false
headBar.implicitHeight: toolBarHeight * 1.5 headBar.implicitHeight: toolBarHeight * 1.5
footBar.colorScheme.backgroundColor: accentColor
footBar.colorScheme.borderColor: Qt.darker(accentColor, 1.4)
footBarMargins: space.huge Rectangle
footBarAligment: Qt.AlignRight {
footBar.middleContent: [ z: 999
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.margins: space.medium
anchors.bottomMargin: toolBarHeight
height: toolBarHeight
width: height
color: accentColor
radius: radiusV
Maui.PieButton Maui.PieButton
{ {
id: addButton id: addButton
anchors.fill : parent
iconName: "list-add" iconName: "list-add"
iconColor: altColorText iconColor: altColorText
barHeight: footBar.height barHeight: parent.height
alignment: Qt.AlignLeft alignment: Qt.AlignLeft
content: [ content: [
Maui.ToolButton Maui.ToolButton
...@@ -112,8 +131,7 @@ Maui.ApplicationWindow ...@@ -112,8 +131,7 @@ Maui.ApplicationWindow
} }
] ]
} }
] }
Maui.SyncDialog Maui.SyncDialog
{ {
...@@ -174,12 +192,14 @@ Maui.ApplicationWindow ...@@ -174,12 +192,14 @@ Maui.ApplicationWindow
{ {
id: notesView id: notesView
onNoteClicked: setNote(note) onNoteClicked: setNote(note)
altToolBars: !isMobile
} }
LinksView LinksView
{ {
id: linksView id: linksView
onLinkClicked: previewLink(link) onLinkClicked: previewLink(link)
altToolBars: !isMobile
} }
BooksView BooksView
......
...@@ -25,7 +25,7 @@ Maui.Page ...@@ -25,7 +25,7 @@ Maui.Page
signal linkClicked(var link) signal linkClicked(var link)
headBar.visible: !cardsView.holder.visible headBar.visible: !cardsView.holder.visible
headBar.drawBorder: false
margins: space.big margins: space.big
headBarExit: false headBarExit: false
headBarTitle : cardsView.count + " links" headBarTitle : cardsView.count + " links"
......
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