Merge branch 'oz-config-json' into develop

# Conflicts:
#	scripts/win_compile_example.cmd

8 files changed, 68 insertions, 0 deletions

diff --git a/example/src/Glacier 3000/_DSC5475.jpg b/example/src/Glacier 3000/_DSC5475.jpg
new file mode 100644
index 0000000..9835447
--- /dev/null
+++ b/example/src/Glacier 3000/_DSC5475.jpg
diff --git a/example/src/Glacier 3000/_DSC5475.jpg.yaml b/example/src/Glacier 3000/_DSC5475.jpg.yaml
new file mode 100644
index 0000000..3454a68
--- /dev/null
+++ b/example/src/Glacier 3000/_DSC5475.jpg.yaml
@@ -0,0 +1,15 @@
+title: Fog 3000
+
+datetime: 2019-08-10T14:38:47+01:00
+
+description: >
+  © Philippe NGUYEN
+
+tags:
+  - photographer.nphilou
+  - location.switzerland.ormont-dessus
+  - glacier3000
+  - time.day
+  - weather.foggy
+  - forest
+  - trees
diff --git a/example/src/Glacier 3000/_DSC5542.jpg b/example/src/Glacier 3000/_DSC5542.jpg
new file mode 100644
index 0000000..19a716e
--- /dev/null
+++ b/example/src/Glacier 3000/_DSC5542.jpg
diff --git a/example/src/Glacier 3000/_DSC5542.jpg.yaml b/example/src/Glacier 3000/_DSC5542.jpg.yaml
new file mode 100644
index 0000000..d174911
--- /dev/null
+++ b/example/src/Glacier 3000/_DSC5542.jpg.yaml
@@ -0,0 +1,15 @@
+title: Foggy catwalk
+
+datetime: 2019-08-10T16:00:45+01:00
+
+description: >
+  © Philippe NGUYEN
+
+tags:
+  - photographer.nphilou
+  - location.switzerland.ormont-dessus
+  - glacier3000
+  - time.day
+  - weather.foggy
+  - catwalk
+  - mountain
diff --git a/example/src/Glacier 3000/thumbnail.jpg b/example/src/Glacier 3000/thumbnail.jpg
new file mode 100644
index 0000000..19a716e
--- /dev/null
+++ b/example/src/Glacier 3000/thumbnail.jpg
diff --git a/example/src/_DSC8808-1.jpg b/example/src/_DSC8808-1.jpg
new file mode 100644
index 0000000..51b43b0
--- /dev/null
+++ b/example/src/_DSC8808-1.jpg
diff --git a/example/src/_DSC8808-1.jpg.yaml b/example/src/_DSC8808-1.jpg.yaml
new file mode 100644
index 0000000..b946ff7
--- /dev/null
+++ b/example/src/_DSC8808-1.jpg.yaml
@@ -0,0 +1,12 @@
+title: Book shop
+
+datetime: 2016-12-19T16:48:50+02:00
+
+description: >
+  © Philippe NGUYEN
+
+tags:
+  - photographer.nphilou
+  - location.germany.berlin
+  - books
+  - book-shop
diff --git a/example/src/gallery.yaml b/example/src/gallery.yaml
new file mode 100644
index 0000000..ea23d8a
--- /dev/null
+++ b/example/src/gallery.yaml
@@ -0,0 +1,26 @@
+compiler:
+  galleryName: Example gallery
+
+  #includedDirectories: ["*"]
+  #excludedDirectories: []
+
+  includedFiles:
+  - "*.jpg"
+
+  #excludedFiles:
+  #- "*.md"
+
+  tagsFromDirectories: 0 # default
+
+  thumbnailMaxResolution:
+    width: 400  # default
+    height: 300 # default
+
+  pictureMaxResolution:
+    width: 1024
+    height: 768
+
+  #jpegExportQuality: 80 # default
+
+
+viewer: {}