Commit 1e80b948 authored by Camilo higuita's avatar Camilo higuita

add testing sotre control until it be moved to mauikit

parent 2cc6b759
......@@ -62,10 +62,10 @@ if (ANDROID)
target_link_libraries(vvave Qt5::AndroidExtras)
kde_source_files_enable_exceptions(pix src/pix.cpp)
else()
find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Notifications Config KIO)
find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Notifications Config KIO Attica)
find_package(Qt5 REQUIRED COMPONENTS WebEngine)
target_link_libraries(pix KF5::ConfigCore KF5::Notifications KF5::KIOCore KF5::I18n)
target_link_libraries(pix KF5::ConfigCore KF5::Notifications KF5::KIOCore KF5::I18n KF5::Attica)
endif()
if (TARGET create-apk-pix)
......
......@@ -36,6 +36,7 @@ import "widgets/views/Tags"
import "widgets/views/Viewer"
import "widgets/views/Search"
import "widgets/views/Cloud"
import "widgets/views/Store"
import "view_models"
import "widgets/dialogs/Albums"
......@@ -73,7 +74,8 @@ Maui.ApplicationWindow
albums: 3,
tags: 4,
cloud: 5,
search: 6
store: 6,
search: 7
})
/*PROPS*/
......@@ -81,7 +83,6 @@ Maui.ApplicationWindow
property bool fullScreen : false
property bool selectionMode : false
property alias currentAccount: _accountCombobox.currentText
/***************************************************/
/******************** UI COLORS *******************/
......@@ -119,17 +120,6 @@ Maui.ApplicationWindow
]
headBar.visible: !fullScreen
headBar.leftContent:[
Maui.ComboBox
{
id: _accountCombobox
visible: count > 1
textRole: "user"
flat: true
model: accounts.model
iconButton.iconName: "list-add-user"
}
]
headBar.middleContent: [
Maui.ToolButton
......@@ -179,6 +169,14 @@ Maui.ApplicationWindow
iconColor: currentView === views.cloud? highlightColor : headBarFGColor
iconName: "folder-cloud"
onClicked: currentView = views.cloud
},
Maui.ToolButton
{
// text: qsTr("Cloud")
iconColor: currentView === views.store? highlightColor : headBarFGColor
iconName: "nx-software-center"
onClicked: currentView = views.store
}
]
......@@ -228,6 +226,11 @@ Maui.ApplicationWindow
id: cloudView
}
StoreView
{
id: storeView
}
SearchView
{
id: searchView
......
......@@ -30,5 +30,6 @@
<file>view_models/PixMenu.qml</file>
<file>widgets/SelectionBar.qml</file>
<file>widgets/views/Cloud/CloudView.qml</file>
<file>widgets/views/Store/StoreView.qml</file>
</qresource>
</RCC>
......@@ -13,6 +13,7 @@ PixGrid
{
id: control
property alias list : _cloudList
property alias currentAccount: _accountCombobox.currentText
headBarExit: false
visible: true
......@@ -34,6 +35,18 @@ PixGrid
else
qsTr("Make sure you're online and your cloud account is working")
headBar.leftContent:[
Maui.ComboBox
{
id: _accountCombobox
visible: count > 1
textRole: "user"
flat: true
model: accounts.model
iconButton.iconName: "list-add-user"
}
]
grid.delegate: PixPic
{
id: delegate
......
import QtQuick 2.0
import org.kde.mauikit 1.0 as Maui
import StoreModel 1.0
import StoreList 1.0
Item {
StoreModel
{
id: model
}
StoreList
{
id: list
}
}
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