Commit e690bfc7 authored by Camilo higuita's avatar Camilo higuita

remove submodules and add them to giignore file

parent 31d689c4
*.*~
*.properties
mauikit/
3rdparty/kirigami
3rdparty/breeze-icons
.directory
*.*~
~*.*
......@@ -48,3 +50,7 @@ target_wrapper.*
# QtCreator CMake
CMakeLists.txt.user*
# build folders and output
build/
vvave
breeze-icons @ a54611fa
Subproject commit a54611fafe2c47d2f2ff2bbe21dbcf234a855ec2
kirigami @ 70c025ef
Subproject commit 70c025ef6f6dc63c85180867f70f5e00ba5a8dba
Subproject commit a89b6421a0115317a1128a2216cea40ecf9c0742
......@@ -5,7 +5,7 @@ import "../widgets/views/Viewer/Viewer.js" as VIEWER
import "../widgets/views/Pix.js" as PIX
import org.kde.kirigami 2.0 as Kirigami
import org.kde.mauikit 1.0 as Maui
import QtQml.Models 2.1
Maui.Page
{
id: gridPage
......@@ -16,7 +16,7 @@ Maui.Page
property int itemRadius : Kirigami.Units.devicePixelRatio * 6
property bool showLabels : pix.loadSettings("SHOW_LABELS", "GRID", !isMobile) === "true" ? true : false
property bool fitPreviews : pix.loadSettings("PREVIEWS_FIT", "GRID", false) === "false" ? false : true
property alias model: gridModel
property alias grid: grid
property alias holder: holder
......@@ -57,7 +57,7 @@ Maui.Page
onTriggered:
{
fitPreviews = !fitPreviews
grid.model = gridModel
//model = gridModel
pix.saveSettings("PREVIEWS_FIT", fitPreviews, "GRID")
}
......@@ -69,7 +69,7 @@ Maui.Page
onTriggered:
{
showLabels = !showLabels
grid.model = gridModel
// model = gridModel
pix.saveSettings("SHOW_LABELS", showLabels, "GRID")
}
......@@ -108,6 +108,8 @@ Maui.Page
}
]
footBar.colorScheme.backgroundColor: accentColor
footBar.colorScheme.textColor: altColorText
footBar.visible: !holder.visible
footBar.middleContent: [
Maui.ToolButton
......@@ -126,31 +128,37 @@ Maui.Page
}
]
Maui.GridView
{
id: grid
height: parent.height
width: parent.width
adaptContent: true
itemSize: gridPage.itemSize
spacing: itemSpacing
cellWidth: itemSize
cellHeight: itemSize
model: ListModel {id: gridModel}
// highlightMoveDuration: 0
// highlightFollowsCurrentItem: true
// highlight: Rectangle
// {
// width: itemSize + itemSpacing
// height: itemSize + itemSpacing
// color: highlightColor
// radius: 4
// }
ListModel {id: gridModel}
DelegateModel
{
id: displayDelegateModel
delegate: gridDelegate
model: gridModel
groups: [
DelegateModelGroup {
includeByDefault: true
name: "label"
}
]
filterOnGroup: "label"
// Component.onCompleted: {
// var rowCount = folderModel.count;
// items.remove(0,rowCount);
// for( var i = 0;i < rowCount;i++ ) {
// var entry = folderModel.get(i);
// if(entry.role_display !== undefined) {
// items.insert(entry, "displayField");
// }
// }
// }
}
Component
{
id: gridDelegate
delegate: PixPic
PixPic
{
id: delegate
......@@ -211,6 +219,30 @@ Maui.Page
}
}
Maui.GridView
{
id: grid
height: parent.height
width: parent.width
adaptContent: true
itemSize: gridPage.itemSize
spacing: itemSpacing
cellWidth: itemSize
cellHeight: itemSize
// highlightMoveDuration: 0
// highlightFollowsCurrentItem: true
// highlight: Rectangle
// {
// width: itemSize + itemSpacing
// height: itemSize + itemSpacing
// color: highlightColor
// radius: 4
// }
model: displayDelegateModel
}
function clear()
{
gridModel.clear()
......@@ -218,7 +250,7 @@ Maui.Page
function openPic(index)
{
VIEWER.open(grid.model, index)
VIEWER.open(model, index)
}
function zoomIn()
......
......@@ -154,7 +154,7 @@ Kirigami.PageRow
if(pics.length > 0)
for(var i in pics)
picsView.grid.model.append(pics[i])
picsView.model.append(pics[i])
}
......
......@@ -35,6 +35,6 @@ PixGrid
{
var map = pix.get(Q.Query.picLikeUrl_.arg(url))
for(var i in map)
grid.model.append(map[i])
model.append(map[i])
}
}
......@@ -22,6 +22,6 @@ PixGrid
clear()
var map = pix.get(Q.Query.allPics)
for(var i in map)
grid.model.append(map[i])
model.append(map[i])
}
}
......@@ -72,6 +72,6 @@ Maui.Page
{
if(data.length > 0)
for(var i in data)
searchResults.grid.model.append(data[i])
searchResults.model.append(data[i])
}
}
......@@ -68,19 +68,19 @@ Kirigami.PageRow
if(!wideMode && currentIndex === 0)
currentIndex = 1
tagsGrid.grid.model.clear()
tagsGrid.model.clear()
var tags = tag.getUrls(myTag);
if(tags.length > 0)
for(var i in tags)
tagsGrid.grid.model.append(tags[i])
tagsGrid.model.append(tags[i])
}
function clear()
{
tagsSidebar.list.model.clear()
tagsGrid.grid.model.clear()
tagsGrid.model.clear()
}
function append(myTag)
......
......@@ -111,6 +111,9 @@ Maui.Page
floatingBar: true
headBarVisible: false
footBar.colorScheme.backgroundColor: accentColor
footBar.colorScheme.textColor: altColorText
footBar.leftContent: Maui.ToolButton
{
iconName: "document-share"
......
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