Commit cbd2e3ec authored by camilo higuita's avatar camilo higuita

make it work again wiht recent changes from mauikit

parent 0969762d
...@@ -87,19 +87,18 @@ Maui.ApplicationWindow ...@@ -87,19 +87,18 @@ Maui.ApplicationWindow
/******************** UI COLORS *******************/ /******************** UI COLORS *******************/
/*************************************************/ /*************************************************/
highlightColor : "#00abaa" // highlightColor : "#00abaa"
altColor : "#2e2f30" // "#545c6e" // altColor : "#2e2f30" // "#545c6e"
accentColor: altColor // accentColor: altColor
altColorText: "#fafafa" // altColorText: "#fafafa"
colorSchemeName: "pix" // colorSchemeName: "pix"
bgColor: backgroundColor // bgColor: backgroundColor
headBar.drawBorder: false // headBar.drawBorder: false
headBarBGColor: backgroundColor // headBarBGColor: backgroundColor
headBarFGColor: currentView === views.viewer ? altColorText : Maui.Style.textColor // headBarFGColor: currentView === views.viewer ? altColorText : Maui.Style.textColor
backgroundColor: currentView === views.viewer ? "#3c3e3f" : viewBackgroundColor // backgroundColor: currentView === views.viewer ? "#3c3e3f" : viewBackgroundColor
viewBackgroundColor: currentView === views.viewer ? backgroundColor : Maui.Style.viewBackgroundColor // viewBackgroundColor: currentView === views.viewer ? backgroundColor : Maui.Style.viewBackgroundColor
textColor: headBarFGColor
/***************************************************/ /***************************************************/
/**************************************************/ /**************************************************/
...@@ -233,84 +232,71 @@ Maui.ApplicationWindow ...@@ -233,84 +232,71 @@ Maui.ApplicationWindow
} }
content: Item ColumnLayout
{ {
anchors.fill: parent anchors.fill: parent
Rectangle SwipeView
{ {
anchors.fill: parent id: swipeView
color: bgColor Layout.fillHeight: true
} Layout.fillWidth: true
interactive: isMobile
ColumnLayout currentIndex: currentView
{
anchors.fill: parent
onCurrentIndexChanged: currentView = currentIndex
PixViewer
SwipeView
{ {
id: swipeView id: pixViewer
Layout.fillHeight: true }
Layout.fillWidth: true
interactive: isMobile
currentIndex: currentView
onCurrentIndexChanged: currentView = currentIndex
PixViewer
{
id: pixViewer
}
GalleryView
{
id: galleryView
}
FoldersView
{
id: foldersView
}
AlbumsView GalleryView
{ {
id: albumsView id: galleryView
} }
TagsView FoldersView
{ {
id: tagsView id: foldersView
} }
AlbumsView
{
id: albumsView
}
// Loader TagsView
// { {
// id: cloudViewLoader id: tagsView
// } }
// Loader
// {
// id: storeViewLoader
// }
SearchView // Loader
{ // {
id: searchView // id: cloudViewLoader
} // }
} // Loader
// {
// id: storeViewLoader
// }
SelectionBar SearchView
{ {
id: selectionBox id: searchView
Layout.fillWidth : true
Layout.leftMargin: space.big
Layout.rightMargin: space.big
Layout.bottomMargin: space.big
Layout.topMargin: space.small
} }
}
SelectionBar
{
id: selectionBox
Layout.fillWidth : true
Layout.leftMargin: space.big
Layout.rightMargin: space.big
Layout.bottomMargin: space.big
Layout.topMargin: space.small
} }
} }
...@@ -386,7 +372,7 @@ Maui.ApplicationWindow ...@@ -386,7 +372,7 @@ Maui.ApplicationWindow
maxHeight: 500 maxHeight: 500
maxWidth: 500 maxWidth: 500
headBarTitle: qsTr("Sources") page.title: qsTr("Sources")
headBar.rightContent: [ headBar.rightContent: [
ToolButton ToolButton
......
...@@ -145,13 +145,13 @@ Maui.Page ...@@ -145,13 +145,13 @@ Maui.Page
// footBar.colorScheme.textColor: altColorText // footBar.colorScheme.textColor: altColorText
// footBar.visible: false // footBar.visible: false
// footBar.middleContent: [ // footBar.middleContent: [
// Maui.ToolButton // ToolButton
// { // {
// iconName: "zoom-in" // iconName: "zoom-in"
// iconColor: altColorText // iconColor: altColorText
// onClicked: zoomIn() // onClicked: zoomIn()
// }, // },
// Maui.ToolButton // ToolButton
// { // {
// iconName: "zoom-out" // iconName: "zoom-out"
// iconColor: altColorText // iconColor: altColorText
......
...@@ -122,12 +122,12 @@ ItemDelegate ...@@ -122,12 +122,12 @@ ItemDelegate
} }
} }
Maui.ToolButton ToolButton
{ {
visible: img.status !== Image.Ready visible: img.status !== Image.Ready
iconName: "image-x-generic" icon.name: "image-x-generic"
size: Math.min(picSize, iconSizes.huge) icon.width: Math.min(picSize, iconSizes.huge)
isMask: false // isMask: false
enabled: false enabled: false
anchors.centerIn: parent anchors.centerIn: parent
......
...@@ -18,7 +18,7 @@ Maui.SelectionBar ...@@ -18,7 +18,7 @@ Maui.SelectionBar
visible: selectionList.count > 0 && currentView !== views.viewer visible: selectionList.count > 0 && currentView !== views.viewer
onIconClicked: _menu.popup() onIconClicked: _menu.popup()
onExitClicked: clear() onExitClicked: clear()
colorScheme.backgroundColor: "#212121" // colorScheme.backgroundColor: "#212121"
Menu Menu
{ {
......
...@@ -37,19 +37,15 @@ StackView ...@@ -37,19 +37,15 @@ StackView
{ {
id: albumsPage id: albumsPage
headBar.visible: false headBar.visible: false
floatingBar: true
footBarOverlap: true
allowRiseContent: false // footBar.colorScheme.backgroundColor: altColor
footBarAligment: Qt.AlignRight // footBar.colorScheme.borderColor: Qt.darker(altColor, 1.4)
footBarMargins: space.huge footBar.middleContent: ToolButton
footBar.colorScheme.backgroundColor: altColor
footBar.colorScheme.borderColor: Qt.darker(altColor, 1.4)
footBar.middleContent: Maui.ToolButton
{ {
iconName: "list-add" icon.name: "list-add"
onClicked: newAlbumDialog.open() onClicked: newAlbumDialog.open()
iconColor: altColorText icon.color: altColorText
} }
AlbumsGrid AlbumsGrid
...@@ -71,11 +67,11 @@ StackView ...@@ -71,11 +67,11 @@ StackView
holder.emojiSize: iconSizes.huge holder.emojiSize: iconSizes.huge
holder.emoji: "qrc:/img/assets/MoonSki.png" holder.emoji: "qrc:/img/assets/MoonSki.png"
headBarExit: true // headBarExit: true
headBarExitIcon: "go-previous" // headBarExitIcon: "go-previous"
headBarTitle: albumGrid.currentAlbum title: albumGrid.currentAlbum
onExit: stackView.pop() // onExit: stackView.pop()
footer: Maui.TagsBar footer: Maui.TagsBar
{ {
......
...@@ -86,9 +86,9 @@ StackView ...@@ -86,9 +86,9 @@ StackView
id: picsView id: picsView
headBar.visible: true headBar.visible: true
headBarExit: _stackView.currentItem === picsView // headBarExit: _stackView.currentItem === picsView
headBarExitIcon: "go-previous" // headBarExitIcon: "go-previous"
onExit: _stackView.pop() // onExit: _stackView.pop()
holder.emoji: "qrc:/img/assets/Electricity.png" holder.emoji: "qrc:/img/assets/Electricity.png"
holder.isMask: false holder.isMask: false
......
...@@ -5,7 +5,6 @@ import "../../../view_models" ...@@ -5,7 +5,6 @@ import "../../../view_models"
PixGrid PixGrid
{ {
id: galleryViewRoot id: galleryViewRoot
headBarExit: false
list.query: "select * from images" list.query: "select * from images"
visible: true visible: true
holder.emoji: "qrc:/img/assets/ElectricPlug.png" holder.emoji: "qrc:/img/assets/ElectricPlug.png"
......
...@@ -13,9 +13,9 @@ import org.kde.mauikit 1.0 as Maui ...@@ -13,9 +13,9 @@ import org.kde.mauikit 1.0 as Maui
id: searchResults id: searchResults
property string currentQuery : "" property string currentQuery : ""
headBar.visible: true // headBar.visible: true
headBarExitIcon: "edit-clear" // headBarExitIcon: "edit-clear"
headBarTitle: searchResults.grid.count + qsTr(" results") title: searchResults.grid.count + qsTr(" results")
holder.emoji: "qrc:/img/assets/BugSearch.png" holder.emoji: "qrc:/img/assets/BugSearch.png"
holder.isMask: false holder.isMask: false
holder.title : "No Results!" holder.title : "No Results!"
......
...@@ -52,7 +52,7 @@ Maui.Page ...@@ -52,7 +52,7 @@ Maui.Page
} }
footBar.middleContent: [ footBar.middleContent: [
Maui.ToolButton ToolButton
{ {
id: _previousPageButton id: _previousPageButton
iconName: "go-previous" iconName: "go-previous"
...@@ -76,7 +76,7 @@ Maui.Page ...@@ -76,7 +76,7 @@ Maui.Page
anchors.verticalCenter: _previousPageButton.verticalCenter anchors.verticalCenter: _previousPageButton.verticalCenter
}, },
Maui.ToolButton ToolButton
{ {
id: _nextPageButton id: _nextPageButton
iconName: "go-next" iconName: "go-next"
...@@ -98,7 +98,7 @@ Maui.Page ...@@ -98,7 +98,7 @@ Maui.Page
} }
footBar.leftContent: [ footBar.leftContent: [
Maui.ToolButton ToolButton
{ {
id:_filterButton id:_filterButton
iconName: "view-filter" iconName: "view-filter"
...@@ -109,7 +109,7 @@ Maui.Page ...@@ -109,7 +109,7 @@ Maui.Page
footBar.rightContent: [ footBar.rightContent: [
Maui.ToolButton ToolButton
{ {
id:_sortButton id:_sortButton
iconName: "view-sort" iconName: "view-sort"
......
import QtQuick 2.9 import QtQuick 2.9
import QtQuick.Controls 2.2
import "../../../view_models" import "../../../view_models"
import org.kde.mauikit 1.0 as Maui import org.kde.mauikit 1.0 as Maui
import org.kde.kirigami 2.7 as Kirigami
Maui.Page Maui.Page
{ {
id: control id: control
margins:0 padding:0
headBarExit: false title: qsTr("Tags")
headBarTitle: qsTr("Tags")
headBar.plegable: false
headBar.drawBorder: false
colorScheme.backgroundColor: backgroundColor Kirigami.Theme.backgroundColor: backgroundColor
clip: true clip: true
headBar.leftContent: Maui.ToolButton headBar.leftContent: ToolButton
{ {
iconName: "list-add" icon.name: "list-add"
onClicked: newTagDialog.open() onClicked: newTagDialog.open()
} }
headBar.rightContent: Maui.ToolButton headBar.rightContent: ToolButton
{ {
iconName: "list-remove" icon.name: "list-remove"
} }
Maui.Holder Maui.Holder
......
...@@ -38,9 +38,9 @@ Kirigami.PageRow ...@@ -38,9 +38,9 @@ Kirigami.PageRow
PixGrid PixGrid
{ {
id: tagsGrid id: tagsGrid
headBarExit: !wideMode // headBarExit: !wideMode
headBarExitIcon: "go-previous" // headBarExitIcon: "go-previous"
onExit: if(!wideMode) currentIndex = 0 // onExit: if(!wideMode) currentIndex = 0
holder.title: "No Pics!" holder.title: "No Pics!"
holder.body: "There's no pics associated with the tag" holder.body: "There's no pics associated with the tag"
holder.isMask: false holder.isMask: false
......
...@@ -23,13 +23,13 @@ Maui.Drawer ...@@ -23,13 +23,13 @@ Maui.Drawer
position: ToolBar.Header position: ToolBar.Header
middleContent: [ middleContent: [
Maui.ToolButton ToolButton
{ {
iconName: "object-rotate-left" iconName: "object-rotate-left"
onClicked: viewer.list.currentItem.rotateLeft() onClicked: viewer.list.currentItem.rotateLeft()
} }
, ,
Maui.ToolButton ToolButton
{ {
iconName: "object-rotate-right" iconName: "object-rotate-right"
onClicked: viewer.list.currentItem.rotateRight() onClicked: viewer.list.currentItem.rotateRight()
......
...@@ -6,6 +6,7 @@ import "../../../widgets/views/Viewer/Viewer.js" as VIEWER ...@@ -6,6 +6,7 @@ import "../../../widgets/views/Viewer/Viewer.js" as VIEWER
import "../../../widgets/views/Pix.js" as PIX import "../../../widgets/views/Pix.js" as PIX
import "../../../db/Query.js" as Q import "../../../db/Query.js" as Q
import "../.." import "../.."
import org.kde.kirigami 2.7 as Kirigami
import org.kde.mauikit 1.0 as Maui import org.kde.mauikit 1.0 as Maui
import PixModel 1.0 import PixModel 1.0
...@@ -30,8 +31,8 @@ Maui.Page ...@@ -30,8 +31,8 @@ Maui.Page
property string viewerBackgroundColor : Maui.FM.loadSettings("VIEWER_BG_COLOR", "PIX", backgroundColor) property string viewerBackgroundColor : Maui.FM.loadSettings("VIEWER_BG_COLOR", "PIX", backgroundColor)
property string viewerForegroundColor : Maui.FM.loadSettings("VIEWER_FG_COLOR", "PIX", textColor) property string viewerForegroundColor : Maui.FM.loadSettings("VIEWER_FG_COLOR", "PIX", textColor)
margins: 0 padding: 0
colorScheme.backgroundColor: viewerBackgroundColor Kirigami.Theme.backgroundColor: viewerBackgroundColor
// Connections // Connections
...@@ -68,17 +69,13 @@ Maui.Page ...@@ -68,17 +69,13 @@ Maui.Page
list: GalleryList {} list: GalleryList {}
} }
floatingBar: false
footBarOverlap: true
allowRiseContent: false
headBar.visible: false headBar.visible: false
headBarExit: false
footBar.rightContent: [ footBar.rightContent: [
Maui.ToolButton ToolButton
{ {
iconName: "document-share" icon.name: "document-share"
onClicked: onClicked:
{ {
if(isAndroid) if(isAndroid)
...@@ -91,52 +88,52 @@ Maui.Page ...@@ -91,52 +88,52 @@ Maui.Page
} }
}, },
Maui.ToolButton ToolButton
{ {
iconName: "object-rotate-left" icon.name: "object-rotate-left"
onClicked: viewer.currentItem.rotateLeft() onClicked: viewer.currentItem.rotateLeft()
}, },
Maui.ToolButton ToolButton
{ {
iconName: "object-rotate-right" icon.name: "object-rotate-right"
onClicked: viewer.currentItem.rotateRight() onClicked: viewer.currentItem.rotateRight()
}, },
Maui.ToolButton ToolButton
{ {
iconName: "overflow-menu" icon.name: "overflow-menu"
onClicked: viewerMenu.popup() onClicked: viewerMenu.popup()
} }
] ]
footBar.colorScheme.backgroundColor: accentColor // footBar.colorScheme.backgroundColor: accentColor
footBar.colorScheme.textColor: altColorText // footBar.colorScheme.textColor: altColorText
// footBar.colorScheme.borderColor: accentColor // footBar.colorScheme.borderColor: accentColor
footBar.leftContent: [ footBar.leftContent: [
Maui.ToolButton ToolButton
{ {
iconName: "go-previous"