Commit 8c61bb8d authored by camilo higuita's avatar camilo higuita

intial work on global drawer and improve dialogs lists with holder message

parent 5be1d5b7
......@@ -7,5 +7,6 @@
<file>assets/pix.png</file>
<file>assets/tag.svg</file>
<file>assets/album_bg_normal.png</file>
<file>assets/banner.png</file>
</qresource>
</RCC>
......@@ -61,6 +61,7 @@ Kirigami.ApplicationWindow
property string altColor: Kirigami.Theme.complementaryBackgroundColor
property int iconSize : Kirigami.Units.iconSizes.medium
property int rowHeigh : 32
overlay.modal: Rectangle {
color: isMobile ? darkColor : "transparent"
......@@ -72,6 +73,11 @@ Kirigami.ApplicationWindow
color: "transparent"
}
globalDrawer: GlobalDrawer
{
id: globalDrawer
}
header: PixsBar
{
id: toolBar
......@@ -85,6 +91,7 @@ Kirigami.ApplicationWindow
onAlbumsViewClicked: currentView = 3
onTagsViewClicked: currentView = 4
onSearchViewClicked: {}
onMenuClicked: globalDrawer.open()
}
footer: PixFooter
......@@ -103,10 +110,8 @@ Kirigami.ApplicationWindow
currentIndex: currentView
onCurrentIndexChanged:
{
currentView = currentIndex
}
onCurrentIndexChanged: currentView = currentIndex
PixViewer
{
......
......@@ -42,5 +42,6 @@
<file>widgets/dialogs/Albums/AlbumsDialog.qml</file>
<file>widgets/dialogs/Albums/AlbumsList.qml</file>
<file>widgets/dialogs/Albums/NewAlbumDialog.qml</file>
<file>widgets/GlobalDrawer.qml</file>
</qresource>
</RCC>
......@@ -6,7 +6,7 @@ import org.kde.kirigami 2.2 as Kirigami
ItemDelegate
{
width: parent.width
height: 22
height: rowHeigh
property bool isSection : false
property bool boldLabel : false
......
import QtQuick 2.0
import org.kde.kirigami 2.0 as Kirigami
Kirigami.GlobalDrawer
{
handleVisible: false
visible: false
y: header.height
height: parent.height - header.height
modal:true
topPadding: 0
bottomPadding: 0
leftPadding: 0
rightPadding: 0
bannerImageSource: "qrc:/img/assets/banner.png"
}
......@@ -44,6 +44,8 @@ ToolBar
iconName: "application-menu"
onClicked: menuClicked()
iconColor: globalDrawer.visible ? accentColor : textColor
hoverEnabled: !isMobile
ToolTip.delay: 1000
ToolTip.timeout: 5000
......
......@@ -19,6 +19,14 @@ ListView
interactive: true
highlightFollowsCurrentItem: true
PixHolder
{
id: holder
message: "<h2>No Albums!</h2><p>Start creating new albums</p>"
emoji: "qrc:/img/assets/face.png"
visible: count === 0
}
model: ListModel{}
delegate: PixDelegate
{
......
......@@ -19,6 +19,14 @@ ListView
interactive: true
highlightFollowsCurrentItem: true
PixHolder
{
id: holder
message: "<h2>No Tags!</h2><p>Start tagging your pics</p>"
emoji: "qrc:/img/assets/face.png"
visible: count === 0
}
model: ListModel{}
delegate: PixDelegate
{
......
......@@ -48,11 +48,6 @@ PixPage
albumsDialog.picUrl = currentPic.url
albumsDialog.open()
}
},
PixButton
{
iconName: "draw-text"
}
]
......
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