Skip to content

GitLab

Commit 7869df9b authored by camilo higuita's avatar camilo higuita
Browse files
Options

more fixes

parent 67dfa55e
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 31 deletions
src/main.qml
View file @ 7869df9b
......@@ -191,7 +191,7 @@ Maui.ApplicationWindow
checked: currentView === views.viewer
checkable: false
visible: !pixViewer.holder.visible
icon.color: checked ? highlightColor : headBarFGColor
// icon.color: checked ? highlightColor : headBarFGColor
icon.name: "image"
onTriggered: currentView = views.viewer
},
......@@ -201,8 +201,8 @@ Maui.ApplicationWindow
text: qsTr("Gallery")
checked: currentView === views.gallery
// showIndicator: true
icon.color: checked ? highlightColor : headBarFGColor
icon.name: "image-multiple"
// icon.color: checked ? highlightColor : headBarFGColor
icon.name: "folder-image"
onTriggered: currentView = views.gallery
},
......@@ -212,8 +212,8 @@ Maui.ApplicationWindow
checked: currentView === views.folders
checkable: false
// showIndicator: true
icon.color: active ? highlightColor : headBarFGColor
icon.name: "image-folder-view"
// icon.color: active ? highlightColor : headBarFGColor
icon.name: "folder"
onTriggered: currentView = views.folders
},
......@@ -223,7 +223,7 @@ Maui.ApplicationWindow
checked: currentView === views.albums
checkable: false
// showIndicator: true
icon.color: checked ? highlightColor : headBarFGColor
// icon.color: checked ? highlightColor : headBarFGColor
icon.name: "image-frames"
onTriggered: currentView = views.albums
}
......
src/qml.qrc
View file @ 7869df9b
......@@ -31,6 +31,5 @@
<file>widgets/SelectionBar.qml</file>
<file>widgets/views/Cloud/CloudView.qml</file>
<file>widgets/views/Store/StoreView.qml</file>
<file>MainSimple.qml</file>
</qresource>
</RCC>
src/view_models/PixGrid.qml
View file @ 7869df9b
......@@ -32,6 +32,7 @@ Maui.Page
signal picClicked(int index)
headBar.drawBorder: false
padding: space.big
Maui.Holder
{
......@@ -49,7 +50,8 @@ Maui.Page
// headBar.leftSretch: false
headBar.rightContent: Kirigami.ActionToolBar
{
Layout.fillWidth: false
Layout.preferredWidth: implicitWidth
hiddenActions: [
Kirigami.Action
{
......
src/view_models/PixPic.qml
View file @ 7869df9b
......@@ -3,6 +3,7 @@ import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import org.kde.mauikit 1.0 as Maui
import org.kde.kirigami 2.7 as Kirigami
ItemDelegate
{
......@@ -20,10 +21,10 @@ ItemDelegate
property alias source : img.source
property alias label : _label.text
property string indicatorColor: ListView.isCurrentItem ? highlightColor : "transparent"
property string indicatorColor: ListView.isCurrentItem ? Kirigami.Theme.highlightColor : "transparent"
property color labelColor : (GridView.isCurrentItem || (keepEmblemOverlay && emblemAdded)) && !hovered && showSelectionBackground? highlightedTextColor : textColor
property color hightlightedColor : GridView.isCurrentItem || hovered || (keepEmblemOverlay && emblemAdded) ? highlightColor : "transparent"
property color labelColor : (GridView.isCurrentItem || (keepEmblemOverlay && emblemAdded)) && !hovered && showSelectionBackground? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor
property color hightlightedColor : GridView.isCurrentItem || hovered || (keepEmblemOverlay && emblemAdded) ? Kirigami.Theme.highlightColor : "transparent"
property bool showSelectionBackground : true
......
src/widgets/views/Albums/AlbumDelegate.qml
View file @ 7869df9b
......@@ -7,8 +7,8 @@ import org.kde.kirigami 2.2 as Kirigami
ItemDelegate
{
property int albumSize : iconSizes.large
property color hightlightedColor : GridView.isCurrentItem || hovered ? highlightColor : "transparent"
property color labelColor : GridView.isCurrentItem && !hovered ? highlightedTextColor : textColor
property color hightlightedColor : GridView.isCurrentItem || hovered ? Kirigami.Theme.highlightColor : "transparent"
property color labelColor : GridView.isCurrentItem && !hovered ?Kirigami.Theme. highlightedTextColor : Kirigami.Theme.textColor
hoverEnabled: !isMobile
......
src/widgets/views/Albums/AlbumsView.qml
View file @ 7869df9b
......@@ -36,8 +36,7 @@ StackView
initialItem: Maui.Page
{
id: albumsPage
headBar.visible: false
padding: space.big
// footBar.colorScheme.backgroundColor: altColor
// footBar.colorScheme.borderColor: Qt.darker(altColor, 1.4)
......@@ -45,7 +44,7 @@ StackView
{
icon.name: "list-add"
onClicked: newAlbumDialog.open()
icon.color: altColorText
// icon.color: altColorText
}
AlbumsGrid
......
src/widgets/views/Folders/FoldersView.qml
View file @ 7869df9b
......@@ -2,6 +2,7 @@ import QtQuick 2.0
import QtQuick.Controls 2.2
import org.kde.kirigami 2.2 as Kirigami
import org.kde.mauikit 1.0 as Maui
import QtQuick.Layouts 1.3
import "../../../view_models"
import "../../../db/Query.js" as Q
......@@ -26,14 +27,13 @@ StackView
initialItem: Maui.Page
{
id: foldersPage
headBar.visible: false
footBar.drawBorder: false
padding: space.big
headBar.middleContent: Maui.TextField
{
// Layout.fillWidth: true
// Layout.margins: space.medium
// Layout.fillWidth: true
Layout.margins: space.medium
Layout.fillWidth: true
placeholderText: qsTr("Filter...")
onAccepted: filter(text)
onCleared: populate()
......@@ -73,7 +73,7 @@ StackView
onItemClicked:
{
var folder = foldersList.get(index)
picsView.headBarTitle = folder.label
picsView.title = folder.label
currentFolder = folder.path
picsView.list.query = Q.Query.picLikeUrl_.arg(currentFolder)
_stackView.push(picsView)
......@@ -90,6 +90,12 @@ StackView
// headBarExitIcon: "go-previous"
// onExit: _stackView.pop()
headBar.leftContent: ToolButton
{
icon.name:"go-previous"
onClicked: _stackView.pop()
}
holder.emoji: "qrc:/img/assets/Electricity.png"
holder.isMask: false
holder.title : "Folder is empty!"
......
src/widgets/views/Gallery/GalleryView.qml
View file @ 7869df9b
......@@ -13,6 +13,7 @@ PixGrid
holder.body: "Add new image sources"
holder.emojiSize: iconSizes.huge
function refresh()
{
list.refresh()
......
src/widgets/views/Tags/TagsSidebar.qml
View file @ 7869df9b
......@@ -10,10 +10,6 @@ Maui.Page
padding:0
title: qsTr("Tags")
Kirigami.Theme.backgroundColor: backgroundColor
clip: true
headBar.leftContent: ToolButton
{
icon.name: "list-add"
......
src/widgets/views/Viewer/GalleryRoll.qml
View file @ 7869df9b
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import org.kde.kirigami 2.0 as Kirigami
import org.kde.kirigami 2.7 as Kirigami
import "../../../view_models"
Item
......@@ -13,6 +13,8 @@ Item
signal picClicked(int index)
Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
Kirigami.Theme.inherit: false
height: rollHeight
width: parent.width
......@@ -20,7 +22,7 @@ Item
{
anchors.fill: parent
z:-1
color: accentColor
color: Kirigami.Theme.backgroundColor
radius: unit * 3
opacity: 0.8
......@@ -32,7 +34,7 @@ Item
left: parent.left
right: parent.right
}
color: Qt.darker(parent.color, 1.5)
// color: Qt.darker(parent.color, 1.5)
}
Kirigami.Separator
......@@ -43,7 +45,7 @@ Item
left: parent.left
right: parent.right
}
color: Qt.darker(parent.color, 1.5)
// color: Qt.darker(parent.color, 1.5)
}
}
......
src/widgets/views/Viewer/PixViewer.qml
View file @ 7869df9b
......@@ -28,8 +28,8 @@ Maui.Page
property int currentPicIndex : 0
property bool tagBarVisible : Maui.FM.loadSettings("TAGBAR", "PIX", true) === "true" ? true : false
property string viewerBackgroundColor : Maui.FM.loadSettings("VIEWER_BG_COLOR", "PIX", backgroundColor)
property string viewerForegroundColor : Maui.FM.loadSettings("VIEWER_FG_COLOR", "PIX", textColor)
property string viewerBackgroundColor : Maui.FM.loadSettings("VIEWER_BG_COLOR", "PIX", Kirigami.Theme.backgroundColor)
property string viewerForegroundColor : Maui.FM.loadSettings("VIEWER_FG_COLOR", "PIX", Kirigami.Theme.textColor)
padding: 0
Kirigami.Theme.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