Commit 014f18e8 authored by Camilo higuita's avatar Camilo higuita

fixes for new mauikit framework workflow

parent 9972178a
breeze-icons @ a54611fa
Subproject commit a54611fafe2c47d2f2ff2bbe21dbcf234a855ec2
kirigami @ 70c025ef
Subproject commit 70c025ef6f6dc63c85180867f70f5e00ba5a8dba
......@@ -35,9 +35,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef STATIC_KIRIGAMI
#include "./3rdparty/kirigami/src/kirigamiplugin.h"
#include "./mauikit/src/mauikit.h"
#endif
#ifdef STATIC_MAUIKIT
#include "./mauikit/src/mauikit.h"
#endif
QStringList getFolderImages(const QString &path)
{
......
Subproject commit 49aeaa274206bea6b8438f75ae5efa2b14d88fa7
Subproject commit a8fb900e19c2c08172bad5a0b84f3cded7c0c3c0
......@@ -21,9 +21,9 @@ linux:unix:!android {
message(Building helpers for Android)
include(android/Android.pri)
include(3rdparty/kirigami/kirigami.pri)
include($$PWD/android/Android.pri)
include($$PWD/mauikit/mauikit.pri)
include($$PWD/3rdparty/kirigami/kirigami.pri)
DEFINES += STATIC_KIRIGAMI
......
......@@ -19,7 +19,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "dbactions.h"
#ifdef STATIC_MAUIKIT
#include "fm.h"
#else
#include <MauiKit/fm.h>
#endif
DBActions::DBActions(QObject *parent) : DB(parent)
{
......
......@@ -23,7 +23,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QObject>
#include "db.h"
#ifdef STATIC_MAUIKIT
#include "tagging.h"
#else
#include <MauiKit/tagging.h>
#endif
#include "../utils/pic.h"
class DBActions : public DB
......
......@@ -49,8 +49,8 @@ Maui.ApplicationWindow
title: qsTr("Pix")
// visibility: fullScreen ? ApplicationWindow.FullScreen : ApplicationWindow.Windowed
// altToolBars: true
// visibility: fullScreen ? ApplicationWindow.FullScreen : ApplicationWindow.Windowed
// altToolBars: true
/*READONLY PROPS*/
readonly property var views : ({
......@@ -75,9 +75,14 @@ Maui.ApplicationWindow
highlightColor : "#00abaa"
altColor : "#545c6e"
accentColor: altColor
accentColor: "#2e2f30"
altColorText: "#fafafa"
colorSchemeName: "pix"
bgColor: pixViewer.viewerBackgroundColor
headBarBGColor: currentView === views.viewer ? accentColor : Maui.Style.backgroundColor
headBarFGColor: currentView === views.viewer ? altColorText : Maui.Style.textColor
backgroundColor: currentView === views.viewer ? "#3c3e3f" : Maui.Style.backgroundColor
textColor: headBarFGColor
/***************************************************/
/**************************************************/
......@@ -85,7 +90,7 @@ Maui.ApplicationWindow
onSearchButtonClicked: currentView = views.search
// menuDrawer.bannerImageSource: "qrc:/img/assets/banner.png"
// menuDrawer.bannerImageSource: "qrc:/img/assets/banner.png"
menuDrawer.actions: [
Kirigami.Action
{
......@@ -211,9 +216,9 @@ Maui.ApplicationWindow
onTagged: tagsView.populate()
}
// Component.onCompleted:
// {
// if(isAndroid)
// switchColorScheme(colorScheme.Dark)
// }
// Component.onCompleted:
// {
// if(isAndroid)
// switchColorScheme(colorScheme.Dark)
// }
}
......@@ -12,7 +12,7 @@ Row
Maui.ToolButton
{
visible: !pixViewer.holder.visible
iconColor: currentView === views.viewer? accentColor : textColor
iconColor: currentView === views.viewer? accentColor : headBarFGColor
iconName: "image"
onClicked: currentView = views.viewer
}
......@@ -20,40 +20,32 @@ Row
Maui.ToolButton
{
display: root.isWide ? ToolButton.TextBesideIcon : ToolButton.IconOnly
text: qsTr("Gallery")
iconColor: currentView === views.gallery? accentColor : textColor
iconColor: currentView === views.gallery? accentColor : headBarFGColor
iconName: "image-multiple"
onClicked: currentView = views.gallery
}
Maui.ToolButton
{
display: root.isWide ? ToolButton.TextBesideIcon : ToolButton.IconOnly
text: qsTr("Folders")
iconColor: currentView === views.folders? accentColor : textColor
iconColor: currentView === views.folders? accentColor : headBarFGColor
iconName: "image-folder-view"
onClicked: currentView = views.folders
}
Maui.ToolButton
{
display: root.isWide ? ToolButton.TextBesideIcon : ToolButton.IconOnly
text: qsTr("Albums")
iconColor: currentView === views.albums? accentColor : textColor
iconColor: currentView === views.albums? accentColor : headBarFGColor
iconName: "image-frames"
onClicked: currentView = views.albums
}
Maui.ToolButton
{
display: root.isWide ? ToolButton.TextBesideIcon : ToolButton.IconOnly
text: qsTr("Tags")
iconColor: currentView === views.tags? accentColor : textColor
iconColor: currentView === views.tags? accentColor : headBarFGColor
iconName: "tag"
onClicked: currentView = views.tags
}
......
......@@ -26,7 +26,6 @@ Maui.Page
property string viewerForegroundColor : pix.loadSettings("VIEWER_FG_COLOR", "PIX", textColor)
margins: 0
floatingBar: true
headBarVisible: false
background: Rectangle
......@@ -62,35 +61,6 @@ Maui.Page
}
}
footBar.leftContent: Maui.ToolButton
{
iconName: "document-share"
iconColor: altColorText
onClicked: isAndroid ? Maui.Android.shareDialog(pixViewer.currentPic.url) :
shareDialog.show(pixViewer.currentPic.url)
}
footBar.middleContent: PixFooter
{
id: pixFooter
}
// footBar.rightContent : Maui.ToolButton
// {
// iconName: fullScreen? "window-close" : "view-fullscreen"
// iconColor: altColorText
// onClicked: fullScreen = !fullScreen
// }
footBar.rightContent : Maui.ToolButton
{
iconName: "document-save-as"
iconColor: altColorText
onClicked: editTools.visible ? editTools.close() : editTools.open()
}
Connections
{
......@@ -138,6 +108,40 @@ Maui.Page
Layout.fillHeight: true
Layout.fillWidth: true
floatingBar: true
headBarVisible: false
footBar.leftContent: Maui.ToolButton
{
iconName: "document-share"
iconColor: altColorText
onClicked: isAndroid ? Maui.Android.shareDialog(pixViewer.currentPic.url) :
shareDialog.show(pixViewer.currentPic.url)
}
footBar.middleContent: PixFooter
{
id: pixFooter
}
// footBar.rightContent : Maui.ToolButton
// {
// iconName: fullScreen? "window-close" : "view-fullscreen"
// iconColor: altColorText
// onClicked: fullScreen = !fullScreen
// }
footBar.rightContent : Maui.ToolButton
{
iconName: "document-save-as"
iconColor: altColorText
onClicked: editTools.visible ? editTools.close() : editTools.open()
}
Maui.Holder
{
id: holder
......
import QtQuick 2.9
import QtQuick.Controls 2.2
import org.kde.mauikit 1.0 as Maui
import "../../"
import "Viewer.js" as VIEWER
Pane
Maui.Page
{
property bool autoSaveTransformation : false
property real picContrast : 0
......@@ -17,6 +17,11 @@ Pane
clip: true
focus: true
background: Rectangle
{
color: viewerBackgroundColor
}
ListView
{
id: viewerList
......
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