Commit b4af310e authored by Camilo higuita's avatar Camilo higuita

remove old luv icon submodule

parent adaa7a5e
luv @ f122a48f
Subproject commit f122a48f265667eec9ab0e90727fca08b6ddf6ae
...@@ -118,11 +118,10 @@ int main(int argc, char *argv[]) ...@@ -118,11 +118,10 @@ int main(int argc, char *argv[])
#ifdef STATIC_KIRIGAMI #ifdef STATIC_KIRIGAMI
KirigamiPlugin::getInstance().registerTypes(); KirigamiPlugin::getInstance().registerTypes();
MauiKit::getInstance().registerTypes();
#endif #endif
#ifdef Q_OS_ANDROID #ifdef STATIC_MAUIKIT
QIcon::setThemeName("Luv"); MauiKit::getInstance().registerTypes();
#endif #endif
engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
......
Subproject commit 91d4ed7d55424aada62d4c6153fd041ccfcda23c Subproject commit 5c26575378798fe50b1ce2789aa573c5e6e997dc
...@@ -20,8 +20,6 @@ linux:unix:!android { ...@@ -20,8 +20,6 @@ linux:unix:!android {
} else:android { } else:android {
message(Building helpers for Android) message(Building helpers for Android)
include($$PWD/android/Android.pri)
include($$PWD/mauikit/mauikit.pri) include($$PWD/mauikit/mauikit.pri)
include($$PWD/3rdparty/kirigami/kirigami.pri) include($$PWD/3rdparty/kirigami/kirigami.pri)
......
...@@ -68,22 +68,21 @@ Maui.ApplicationWindow ...@@ -68,22 +68,21 @@ Maui.ApplicationWindow
property bool selectionMode : false property bool selectionMode : false
/***************************************************/ /***************************************************/
/******************** 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: pixViewer.viewerBackgroundColor // bgColor: pixViewer.viewerBackgroundColor
headBarBGColor: currentView === views.viewer ? accentColor : Maui.Style.backgroundColor // headBarBGColor: currentView === views.viewer ? accentColor : Maui.Style.backgroundColor
headBarFGColor: currentView === views.viewer ? altColorText : Maui.Style.textColor // headBarFGColor: currentView === views.viewer ? altColorText : Maui.Style.textColor
backgroundColor: currentView === views.viewer ? "#3c3e3f" : Maui.Style.backgroundColor // backgroundColor: currentView === views.viewer ? "#3c3e3f" : Maui.Style.backgroundColor
viewBackgroundColor: currentView === views.viewer ? backgroundColor : Maui.Style.backgroundColor // viewBackgroundColor: currentView === views.viewer ? backgroundColor : Maui.Style.viewBackgroundColor
textColor: headBarFGColor // textColor: headBarFGColor
/***************************************************/ /***************************************************/
/**************************************************/ /**************************************************/
......
...@@ -76,13 +76,34 @@ Maui.Page ...@@ -76,13 +76,34 @@ Maui.Page
headBarTitle: gridModel.count+" "+qsTr("images") headBarTitle: gridModel.count+" "+qsTr("images")
headBar.rightContent: Maui.ToolButton headBar.rightContent:[
Maui.ToolButton
{
iconName: "edit-select"
onClicked: selectionMode = !selectionMode
iconColor: selectionMode ? highlightColor : textColor
},
Maui.ToolButton
{ {
id: menuBtn id: menuBtn
iconName: "overflow-menu" iconName: "overflow-menu"
onClicked: isMobile? gridMenu.open() : gridMenu.popup() onClicked: isMobile? gridMenu.open() : gridMenu.popup()
} }
]
headBar.leftContent: [
Maui.ToolButton
{
iconName: "view-sort"
},
Maui.ToolButton
{
iconName: "image-frame"
onClicked: fitPreviews = !fitPreviews
iconColor: !fitPreviews ? highlightColor : textColor
}
]
GridView GridView
{ {
id: grid id: grid
......
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