Commit 7d2092a8 authored by Camilo higuita's avatar Camilo higuita

push latest changes and ui clean up

parent 87666f27
......@@ -95,11 +95,14 @@ Maui.ApplicationWindow
altColor : "#2e2f30" // "#545c6e"
accentColor: altColor
altColorText: "#fafafa"
colorSchemeName: "pix"
bgColor: pixViewer.viewerBackgroundColor
headBarBGColor: currentView === views.viewer ? accentColor : Maui.Style.backgroundColor
bgColor: backgroundColor
headBar.drawBorder: false
headBar.implicitHeight: toolBarHeight * 1.5
headBarBGColor: backgroundColor
headBarFGColor: currentView === views.viewer ? altColorText : Maui.Style.textColor
backgroundColor: currentView === views.viewer ? "#3c3e3f" : Maui.Style.backgroundColor
backgroundColor: currentView === views.viewer ? "#3c3e3f" : viewBackgroundColor
viewBackgroundColor: currentView === views.viewer ? backgroundColor : Maui.Style.viewBackgroundColor
textColor: headBarFGColor
......@@ -112,7 +115,6 @@ Maui.ApplicationWindow
// menuDrawer.bannerImageSource: "qrc:/img/assets/banner.png"
mainMenu: [
Maui.MenuItem
{
id: _storeButton
......@@ -153,33 +155,6 @@ Maui.ApplicationWindow
headBar.visible: !fullScreen
// headBar.leftContent: Maui.ToolButton
// {
// id: _indicatorButton
// iconName: switch(currentView)
// {
// case views.store:
// _storeButton.iconName; break;
// case views.cloud:
// _cloudButton.iconName; break;
// case views.tags:
// _tagsButton.iconName; break;
// }
// onClicked: switch(iconName)
// {
// case _storeButton.iconName:
// currentView = views.store; break;
// case _cloudButton.iconName:
// currentView = views.cloud; break;
// case _tagsButton.iconName:
// currentView = views.tags; break;
// }
// }
headBar.middleContent: [
Maui.ToolButton
{
......@@ -215,96 +190,110 @@ Maui.ApplicationWindow
}
]
content: ColumnLayout
content: Item
{
id: mainPage
anchors.fill: parent
SwipeView
Rectangle
{
id: swipeView
Layout.fillHeight: true
Layout.fillWidth: true
interactive: isMobile
currentIndex: currentView
anchors.fill: parent
color: bgColor
}
onCurrentIndexChanged: currentView = currentIndex
ColumnLayout
{
anchors.fill: parent
PixViewer
{
id: pixViewer
}
GalleryView
{
id: galleryView
}
FoldersView
SwipeView
{
id: foldersView
}
id: swipeView
Layout.fillHeight: true
Layout.fillWidth: true
interactive: isMobile
currentIndex: currentView
onCurrentIndexChanged: currentView = currentIndex
PixViewer
{
id: pixViewer
}
GalleryView
{
id: galleryView
}
FoldersView
{
id: foldersView
}
AlbumsView
{
id: albumsView
}
TagsView
{
id: tagsView
}
Loader
{
id: cloudViewLoader
}
Loader
{
id: storeViewLoader
}
SearchView
{
id: searchView
}
AlbumsView
{
id: albumsView
}
TagsView
SelectionBar
{
id: tagsView
}
id: selectionBox
Layout.fillWidth : true
Layout.leftMargin: space.big
Layout.rightMargin: space.big
Layout.bottomMargin: space.big
Layout.topMargin: space.small
Loader
{
id: cloudViewLoader
}
Loader
{
id: storeViewLoader
}
SearchView
{
id: searchView
}
}
}
/*** Components ***/
/*** Components ***/
Component
Component
{
id: _cloudViewComponent
CloudView
{
id: _cloudViewComponent
CloudView
{
anchors.fill : parent
}
anchors.fill : parent
}
}
Component
{
id: _storeViewComponent
Maui.Store
{
anchors.fill : parent
detailsView: true
list.category: StoreList.WALLPAPERS
list.provider: StoreList.KDELOOK
}
}
Component
{
id: _storeViewComponent
SelectionBar
Maui.Store
{
id: selectionBox
Layout.fillWidth : true
Layout.leftMargin: space.big
Layout.rightMargin: space.big
Layout.bottomMargin: space.big
Layout.topMargin: space.small
anchors.fill : parent
detailsView: true
list.category: StoreList.WALLPAPERS
list.provider: StoreList.KDELOOK
}
}
......
......@@ -33,6 +33,7 @@ Maui.Page
signal picClicked(int index)
floatingBar: true
footBarOverlap: true
headBar.drawBorder: false
Maui.Holder
{
......@@ -52,12 +53,9 @@ Maui.Page
Maui.MenuItem
{
text: qsTr(selectionMode ? "Select all" : "UnSelect all")
}
Maui.MenuItem
{
text: qsTr(fitPreviews ? "Crop previews" : "Fit previews")
checkable: true
checked: fitPreviews
text: qsTr( "Crop previews")
onTriggered:
{
fitPreviews = !fitPreviews
......@@ -67,7 +65,9 @@ Maui.Page
Maui.MenuItem
{
text: qsTr(showLabels ? "Hide labels" : "Show labels")
checkable: true
checked: showLabels
text: qsTr("Show labels")
onTriggered:
{
showLabels = !showLabels
......@@ -158,24 +158,12 @@ Maui.Page
onTriggered: pixList.sortBy = FMList.SIZE
}
}
},
Maui.ToolButton
{
iconName: "image-preview"
onClicked: fitPreviews = !fitPreviews
iconColor: !fitPreviews ? highlightColor : textColor
},
Maui.ToolButton
{
iconName: "filename-space-amarok"
onClicked: showLabels = !showLabels
iconColor: showLabels ? highlightColor : textColor
}
]
footBar.colorScheme.backgroundColor: accentColor
footBar.colorScheme.textColor: altColorText
footBar.visible: !holder.visible
footBar.visible: false
footBar.middleContent: [
Maui.ToolButton
{
......
......@@ -16,6 +16,7 @@ Maui.SelectionBar
visible: selectionList.count > 0 && currentView !== views.viewer
onIconClicked: _menu.popup()
onExitClicked: clear()
colorScheme.backgroundColor: "#212121"
Maui.Menu
{
......
......@@ -7,9 +7,6 @@ Maui.GridView
{
id: albumsGridRoot
width: parent.width
height: parent.height
property string currentAlbum : ""
signal albumClicked(int index)
......@@ -18,7 +15,7 @@ Maui.GridView
spacing: itemSize * 0.5 + (isMobile ? space.big : space.large)
cellWidth: itemSize + spacing
cellHeight: itemSize +spacing
cellHeight: itemSize +spacing
model: albumsModel
......
......@@ -40,20 +40,14 @@ Kirigami.PageRow
Maui.Page
{
id: albumsPage
anchors.fill: parent
headBarTitle: albumGrid.count+qsTr(" Albums")
headBarExit: false
headBar.visible: false
headBar.implicitHeight: 0
floatingBar: true
footBarOverlap: true
allowRiseContent: false
footBarAligment: Qt.AlignRight
footBarMargins: space.huge
headBar.rightContent: Maui.ToolButton
{
iconName: "overflow-menu"
}
footBar.colorScheme.backgroundColor: altColor
footBar.colorScheme.borderColor: Qt.darker(altColor, 1.4)
footBar.middleContent: Maui.ToolButton
......
......@@ -64,8 +64,8 @@ Item
picClicked(index)
}
onPressAndHold: picMenu.show(rollList.model.get(index).url)
onRightClicked: picMenu.show(rollList.model.get(index).url)
onPressAndHold: _picMenu.popup()
onRightClicked: _picMenu.popup()
}
}
}
......
......@@ -33,6 +33,8 @@ Maui.Page
margins: 0
colorScheme.backgroundColor: viewerBackgroundColor
headBarExit: false
allowRiseContent: true
headBar.drawBorder: false
headBarTitle: currentPic.title ? currentPic.title : ""
headBar.rightContent: [
Maui.ToolButton
......@@ -151,6 +153,7 @@ Maui.Page
footBar.colorScheme.backgroundColor: accentColor
footBar.colorScheme.textColor: altColorText
// footBar.colorScheme.borderColor: accentColor
footBar.middleContent: [
......
......@@ -19,6 +19,7 @@ Maui.Page
clip: true
focus: true
headBar.drawBorder: false
colorScheme.backgroundColor: viewerBackgroundColor
......
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