Skip to content

GitLab

Commit cbd2e3ec authored by camilo higuita's avatar camilo higuita
Browse files
Options

make it work again wiht recent changes from mauikit

parent 0969762d
Show whitespace changes
Inline Side-by-side
Showing with 130 additions and 152 deletions
src/main.qml
View file @ cbd2e3ec
......@@ -87,19 +87,18 @@ Maui.ApplicationWindow
/******************** UI COLORS *******************/
/*************************************************/
highlightColor : "#00abaa"
altColor : "#2e2f30" // "#545c6e"
accentColor: altColor
altColorText: "#fafafa"
colorSchemeName: "pix"
bgColor: backgroundColor
headBar.drawBorder: false
headBarBGColor: backgroundColor
headBarFGColor: currentView === views.viewer ? altColorText : Maui.Style.textColor
backgroundColor: currentView === views.viewer ? "#3c3e3f" : viewBackgroundColor
viewBackgroundColor: currentView === views.viewer ? backgroundColor : Maui.Style.viewBackgroundColor
textColor: headBarFGColor
// highlightColor : "#00abaa"
// altColor : "#2e2f30" // "#545c6e"
// accentColor: altColor
// altColorText: "#fafafa"
// colorSchemeName: "pix"
// bgColor: backgroundColor
// headBar.drawBorder: false
// headBarBGColor: backgroundColor
// headBarFGColor: currentView === views.viewer ? altColorText : Maui.Style.textColor
// backgroundColor: currentView === views.viewer ? "#3c3e3f" : viewBackgroundColor
// viewBackgroundColor: currentView === views.viewer ? backgroundColor : Maui.Style.viewBackgroundColor
/***************************************************/
/**************************************************/
......@@ -233,22 +232,10 @@ Maui.ApplicationWindow
}
content: Item
{
anchors.fill: parent
Rectangle
{
anchors.fill: parent
color: bgColor
}
ColumnLayout
{
anchors.fill: parent
SwipeView
{
id: swipeView
......@@ -312,7 +299,6 @@ Maui.ApplicationWindow
Layout.topMargin: space.small
}
}
}
/*** Components ***/
......@@ -386,7 +372,7 @@ Maui.ApplicationWindow
maxHeight: 500
maxWidth: 500
headBarTitle: qsTr("Sources")
page.title: qsTr("Sources")
headBar.rightContent: [
ToolButton
......
src/view_models/PixGrid.qml
View file @ cbd2e3ec
......@@ -145,13 +145,13 @@ Maui.Page
// footBar.colorScheme.textColor: altColorText
// footBar.visible: false
// footBar.middleContent: [
// Maui.ToolButton
// ToolButton
// {
// iconName: "zoom-in"
// iconColor: altColorText
// onClicked: zoomIn()
// },
// Maui.ToolButton
// ToolButton
// {
// iconName: "zoom-out"
// iconColor: altColorText
......
src/view_models/PixPic.qml
View file @ cbd2e3ec
......@@ -122,12 +122,12 @@ ItemDelegate
}
}
Maui.ToolButton
ToolButton
{
visible: img.status !== Image.Ready
iconName: "image-x-generic"
size: Math.min(picSize, iconSizes.huge)
isMask: false
icon.name: "image-x-generic"
icon.width: Math.min(picSize, iconSizes.huge)
// isMask: false
enabled: false
anchors.centerIn: parent
......
src/widgets/SelectionBar.qml
View file @ cbd2e3ec
......@@ -18,7 +18,7 @@ Maui.SelectionBar
visible: selectionList.count > 0 && currentView !== views.viewer
onIconClicked: _menu.popup()
onExitClicked: clear()
colorScheme.backgroundColor: "#212121"
// colorScheme.backgroundColor: "#212121"
Menu
{
......
src/widgets/views/Albums/AlbumsView.qml
View file @ cbd2e3ec
......@@ -37,19 +37,15 @@ StackView
{
id: albumsPage
headBar.visible: false
floatingBar: true
footBarOverlap: true
allowRiseContent: false
footBarAligment: Qt.AlignRight
footBarMargins: space.huge
footBar.colorScheme.backgroundColor: altColor
footBar.colorScheme.borderColor: Qt.darker(altColor, 1.4)
footBar.middleContent: Maui.ToolButton
// footBar.colorScheme.backgroundColor: altColor
// footBar.colorScheme.borderColor: Qt.darker(altColor, 1.4)
footBar.middleContent: ToolButton
{
iconName: "list-add"
icon.name: "list-add"
onClicked: newAlbumDialog.open()
iconColor: altColorText
icon.color: altColorText
}
AlbumsGrid
......@@ -71,11 +67,11 @@ StackView
holder.emojiSize: iconSizes.huge
holder.emoji: "qrc:/img/assets/MoonSki.png"
headBarExit: true
headBarExitIcon: "go-previous"
headBarTitle: albumGrid.currentAlbum
// headBarExit: true
// headBarExitIcon: "go-previous"
title: albumGrid.currentAlbum
onExit: stackView.pop()
// onExit: stackView.pop()
footer: Maui.TagsBar
{
......
src/widgets/views/Folders/FoldersView.qml
View file @ cbd2e3ec
......@@ -86,9 +86,9 @@ StackView
id: picsView
headBar.visible: true
headBarExit: _stackView.currentItem === picsView
headBarExitIcon: "go-previous"
onExit: _stackView.pop()
// headBarExit: _stackView.currentItem === picsView
// headBarExitIcon: "go-previous"
// onExit: _stackView.pop()
holder.emoji: "qrc:/img/assets/Electricity.png"
holder.isMask: false
......
src/widgets/views/Gallery/GalleryView.qml
View file @ cbd2e3ec
......@@ -5,7 +5,6 @@ import "../../../view_models"
PixGrid
{
id: galleryViewRoot
headBarExit: false
list.query: "select * from images"
visible: true
holder.emoji: "qrc:/img/assets/ElectricPlug.png"
......
src/widgets/views/Search/SearchView.qml
View file @ cbd2e3ec
......@@ -13,9 +13,9 @@ import org.kde.mauikit 1.0 as Maui
id: searchResults
property string currentQuery : ""
headBar.visible: true
headBarExitIcon: "edit-clear"
headBarTitle: searchResults.grid.count + qsTr(" results")
// headBar.visible: true
// headBarExitIcon: "edit-clear"
title: searchResults.grid.count + qsTr(" results")
holder.emoji: "qrc:/img/assets/BugSearch.png"
holder.isMask: false
holder.title : "No Results!"
......
src/widgets/views/Store/StoreView.qml
View file @ cbd2e3ec
......@@ -52,7 +52,7 @@ Maui.Page
}
footBar.middleContent: [
Maui.ToolButton
ToolButton
{
id: _previousPageButton
iconName: "go-previous"
......@@ -76,7 +76,7 @@ Maui.Page
anchors.verticalCenter: _previousPageButton.verticalCenter
},
Maui.ToolButton
ToolButton
{
id: _nextPageButton
iconName: "go-next"
......@@ -98,7 +98,7 @@ Maui.Page
}
footBar.leftContent: [
Maui.ToolButton
ToolButton
{
id:_filterButton
iconName: "view-filter"
......@@ -109,7 +109,7 @@ Maui.Page
footBar.rightContent: [
Maui.ToolButton
ToolButton
{
id:_sortButton
iconName: "view-sort"
......
src/widgets/views/Tags/TagsSidebar.qml
View file @ cbd2e3ec
import QtQuick 2.9
import QtQuick.Controls 2.2
import "../../../view_models"
import org.kde.mauikit 1.0 as Maui
import org.kde.kirigami 2.7 as Kirigami
Maui.Page
{
id: control
margins:0
headBarExit: false
headBarTitle: qsTr("Tags")
headBar.plegable: false
headBar.drawBorder: false
padding:0
title: qsTr("Tags")
colorScheme.backgroundColor: backgroundColor
Kirigami.Theme.backgroundColor: backgroundColor
clip: true
headBar.leftContent: Maui.ToolButton
headBar.leftContent: ToolButton
{
iconName: "list-add"
icon.name: "list-add"
onClicked: newTagDialog.open()
}
headBar.rightContent: Maui.ToolButton
headBar.rightContent: ToolButton
{
iconName: "list-remove"
icon.name: "list-remove"
}
Maui.Holder
......
src/widgets/views/Tags/TagsView.qml
View file @ cbd2e3ec
......@@ -38,9 +38,9 @@ Kirigami.PageRow
PixGrid
{
id: tagsGrid
headBarExit: !wideMode
headBarExitIcon: "go-previous"
onExit: if(!wideMode) currentIndex = 0
// headBarExit: !wideMode
// headBarExitIcon: "go-previous"
// onExit: if(!wideMode) currentIndex = 0
holder.title: "No Pics!"
holder.body: "There's no pics associated with the tag"
holder.isMask: false
......
src/widgets/views/Viewer/EditTools.qml
View file @ cbd2e3ec
......@@ -23,13 +23,13 @@ Maui.Drawer
position: ToolBar.Header
middleContent: [
Maui.ToolButton
ToolButton
{
iconName: "object-rotate-left"
onClicked: viewer.list.currentItem.rotateLeft()
}
,
Maui.ToolButton
ToolButton
{
iconName: "object-rotate-right"
onClicked: viewer.list.currentItem.rotateRight()
......
src/widgets/views/Viewer/PixViewer.qml
View file @ cbd2e3ec
......@@ -6,6 +6,7 @@ import "../../../widgets/views/Viewer/Viewer.js" as VIEWER
import "../../../widgets/views/Pix.js" as PIX
import "../../../db/Query.js" as Q
import "../.."
import org.kde.kirigami 2.7 as Kirigami
import org.kde.mauikit 1.0 as Maui
import PixModel 1.0
......@@ -30,8 +31,8 @@ Maui.Page
property string viewerBackgroundColor : Maui.FM.loadSettings("VIEWER_BG_COLOR", "PIX", backgroundColor)
property string viewerForegroundColor : Maui.FM.loadSettings("VIEWER_FG_COLOR", "PIX", textColor)
margins: 0
colorScheme.backgroundColor: viewerBackgroundColor
padding: 0
Kirigami.Theme.backgroundColor: viewerBackgroundColor
// Connections
......@@ -68,17 +69,13 @@ Maui.Page
list: GalleryList {}
}
floatingBar: false
footBarOverlap: true
allowRiseContent: false
headBar.visible: false
headBarExit: false
footBar.rightContent: [
Maui.ToolButton
ToolButton
{
iconName: "document-share"
icon.name: "document-share"
onClicked:
{
if(isAndroid)
......@@ -91,52 +88,52 @@ Maui.Page
}
},
Maui.ToolButton
ToolButton
{
iconName: "object-rotate-left"
icon.name: "object-rotate-left"
onClicked: viewer.currentItem.rotateLeft()
},
Maui.ToolButton
ToolButton
{
iconName: "object-rotate-right"
icon.name: "object-rotate-right"
onClicked: viewer.currentItem.rotateRight()
},
Maui.ToolButton
ToolButton
{
iconName: "overflow-menu"
icon.name: "overflow-menu"
onClicked: viewerMenu.popup()
}
]
footBar.colorScheme.backgroundColor: accentColor
footBar.colorScheme.textColor: altColorText
// footBar.colorScheme.backgroundColor: accentColor
// footBar.colorScheme.textColor: altColorText
// footBar.colorScheme.borderColor: accentColor
footBar.leftContent: [
Maui.ToolButton
ToolButton
{
iconName: "go-previous"
iconColor: altColorText
icon.name: "go-previous"
// icon.color: altColorText
onClicked: VIEWER.previous()
},
Maui.ToolButton
ToolButton
{
iconName: "love"
colorScheme.highlightColor: "#ff557f";
iconColor: pixViewer.currentPicFav ? colorScheme.highlightColor : colorScheme.textColor
icon.name: "love"
// colorScheme.highlightColor: "#ff557f";
icon.color: pixViewer.currentPicFav ? Kirigami.Theme.highlightColor : Kirigami.Theme.textColor
onClicked: pixViewer.currentPicFav = VIEWER.fav([pixViewer.currentPic.url])
},
Maui.ToolButton
ToolButton
{
iconName: "go-next"
iconColor: altColorText
icon.name: "go-next"
// icon.color: altColorText
onClicked: VIEWER.next()
}
]
......@@ -162,7 +159,7 @@ Maui.Page
body: viewer.count === 0 ? qsTr("Open an image from your collection") : qsTr("Your pic is almost ready")
emojiSize: isGif ? iconSizes.enormous : iconSizes.huge
visible: viewer.count === 0 /*|| viewer.currentItem.status !== Image.Ready*/
colorScheme.backgroundColor: viewerForegroundColor
Kirigami.Theme.backgroundColor: viewerForegroundColor
}
footer: Maui.TagsBar
......
src/widgets/views/Viewer/Viewer.qml
View file @ cbd2e3ec
import QtQuick 2.9
import QtQuick.Controls 2.2
import org.kde.mauikit 1.0 as Maui
import org.kde.kirigami 2.7 as Kirigami
import "../../"
import "Viewer.js" as VIEWER
......@@ -20,7 +22,7 @@ Maui.Page
clip: true
focus: true
colorScheme.backgroundColor: viewerBackgroundColor
Kirigami.Theme.backgroundColor: viewerBackgroundColor
ListView
{
......
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