Release/v0.6.2

XmlData.xml

@@ -6,6 +6,7 @@
         <icon>SingleNoPrint.svg</icon>
         <background>WhiteBackground.png</background>
         <foreground>ExampleForeground.png</foreground>
+        <size width="3570" height="2380"/>
         <images>
             <image><position x="0.0" y="0.0"/><size width="1.0" height="1.0"/></image>
         </images>
@@ -14,6 +15,7 @@
         <name>Single Image</name>
         <icon>Single.svg</icon>
         <background>WhiteBackground.png</background>
+        <size width="3570" height="2380"/>
         <images>
             <image><position x="0.0" y="0.0"/><size width="1.0" height="1.0"/></image>
         </images>
@@ -22,6 +24,7 @@
         <name>Two Images</name>
         <icon>Double.svg</icon>
         <background>WhiteBackground.png</background>
+        <size width="3570" height="2380"/>
         <images>
             <image>
                 <position x="0.0" y="0.0"/><size width="0.5" height="1.0"/>
@@ -38,17 +41,31 @@
         <name>Four Images</name>
         <icon>Four.svg</icon>
         <background>WhiteBackground.png</background>
+        <size width="3570" height="2380"/>
         <images>
             <image><position x="0.0" y="0.0"/><size width="0.5" height="0.5"/></image>
             <image><position x="0.5" y="0.0"/><size width="0.5" height="0.5"/></image>
             <image><position x="0.0" y="0.5"/><size width="0.5" height="0.5"/></image>
             <image><position x="0.5" y="0.5"/><size width="0.5" height="0.5"/></image>
         </images>
     </collage>
+    <collage>
+        <name>Four Images Rotation</name>
+        <icon>Four.svg</icon>
+        <background>WhiteBackground.png</background>
+        <size width="3570" height="2380"/>
+        <images>
+            <image><position x="0.02" y="0.02"/><size width="0.46" height="0.46"/><rotation>0.0</rotation></image>
+            <image><position x="0.5" y="0.06"/><size width="0.45" height="0.45"/><rotation>10.0</rotation></image>
+            <image><position x="0.05" y="0.5"/><size width="0.4" height="0.4"/><rotation>20.0</rotation></image>
+            <image><position x="0.5" y="0.47"/><size width="0.4" height="0.4"/><rotation>30.0</rotation></image>
+        </images>
+    </collage>
     <collage>
         <name>Four Images with Background</name>
         <icon>FourStars.svg</icon>
         <background>StarsBackground.jpg</background>
+        <size width="3570" height="2380"/>
         <images>
             <image><position x="0.05" y="0.05"/><size width="0.4" height="0.4"/></image>
             <image><position x="0.55" y="0.05"/><size width="0.4" height="0.4"/></image>
@@ -60,6 +77,7 @@
         <name>Four Images Border</name>
         <icon>FourBorder.svg</icon>
         <background>WhiteBackground.png</background>
+        <size width="3570" height="2380"/>
         <images>
             <image>
                 <position x="0.0" y="0.0"/><size width="0.5" height="0.5"/>

qml.qrc

@@ -74,5 +74,9 @@
         <file>qml/content/PrinterPopup.qml</file>
         <file>images/ExampleForeground.png</file>
         <file>images/icon/SingleNoPrint.svg</file>
+        <file>qml/GalleryMenu.qml</file>
+        <file>qml/GalleryMenuForm.ui.qml</file>
+        <file>qml/content/DelegateGalleryItem.qml</file>
+        <file>qml/styles/RoundProgressBarStyle.qml</file>
     </qresource>
 </RCC>

qml/Application.qml

@@ -66,6 +66,7 @@ ApplicationWindow {
     onPrinterChanged:
     {
         flow.collageMenu.printer = printer
+        flow.galleryMenu.printer = printer
     }
 
     ApplicationFlow
@@ -85,6 +86,11 @@ ApplicationWindow {
             applicationSettings.multiplePrints = mainMenu.settingsPopup.switchMultiplePrints.checked
         }
 
+        mainMenu.settingsPopup.switchPrintFromGallery.onCheckedChanged:
+        {
+            applicationSettings.printFromGallery = mainMenu.settingsPopup.switchPrintFromGallery.checked
+        }
+
         mainMenu.settingsPopup.switchHideSnapshotSettings.onCheckedChanged:
         {
             applicationSettings.disableSnapshotSettingsPane = mainMenu.settingsPopup.switchHideSnapshotSettings.checked
@@ -136,7 +142,12 @@ ApplicationWindow {
             applicationSettings.cameraName = mainMenu.settingsPopup.comboBoxCamera.currentText
         }
 
-        mainMenu.printerBusy: printer.busy
+        mainMenu.settingsPopup.switchEnableSettingsPassword.onCheckedChanged:
+        {
+            applicationSettings.enableSettingsPassword = mainMenu.settingsPopup.switchEnableSettingsPassword.checked
+        }
+
+        mainMenu.printerBusy: printer ? printer.busy : false
     }
 
     Settings
@@ -154,15 +165,19 @@ ApplicationWindow {
         property bool disableSnapshotSettingsPane: false
         property bool disableEffectPopup: false
         property string cameraName: ""
+        property bool printFromGallery: true
+        property bool enableSettingsPassword: true
 
         Component.onCompleted:
         {
             flow.mainMenu.settingsPopup.printerEnabled.checked = printEnable
+            flow.mainMenu.settingsPopup.switchPrintFromGallery.checked = printFromGallery
             flow.mainMenu.settingsPopup.switchMultiplePrints.checked = multiplePrints
             flow.mainMenu.settingsPinCode = password
             flow.mainMenu.settingsPopup.mirrorCamera.checked = cameraMirrored
             flow.mainMenu.settingsPopup.switchHideSnapshotSettings.checked = disableSnapshotSettingsPane
             flow.mainMenu.settingsPopup.switchHideEffectPopup.checked = disableEffectPopup
+            flow.mainMenu.settingsPopup.switchEnableSettingsPassword.checked = enableSettingsPassword
             flow.mainMenuModel.setShowPrintable(printEnable)
             flow.collageMenu.multiplePrints = multiplePrints
             flow.snapshotMenu.hideSnapshotSettingsPane = disableSnapshotSettingsPane

qml/ApplicationFlow.qml

@@ -29,6 +29,11 @@ ApplicationFlowForm {
         mainMenu.selectedCollageName = ""
     }
 
+    mainMenu.onGalleryEnter:
+    {
+        state = "gallery"
+    }
+
     snapshotMenu.onCaptured:
     {
         state = "imagePreview"
@@ -79,6 +84,16 @@ ApplicationFlowForm {
         state = "collageSelection"
     }
 
+    collageMenu.collageImage.onCollageImagesChanged:
+    {
+        snapshotMenu.snapshotTimeoutEnable = (count == 0)
+    }
+
+    galleryMenu.onExitGallery:
+    {
+        state = "collageSelection"
+    }
+
     Behavior on slideValueCollageSelection {
         PropertyAnimation {
             duration: flow.animationDuration
@@ -106,6 +121,13 @@ ApplicationFlowForm {
             easing.type: Easing.InOutQuad
         }
     }
+
+    Behavior on slideValueGalleryMenu {
+        PropertyAnimation {
+            duration: flow.animationDuration
+            easing.type: Easing.InOutQuad
+        }
+    }
 }
 
 

qml/ApplicationFlowForm.ui.qml

@@ -9,11 +9,13 @@ Item {
     property alias snapshotMenu: snapshotMenu
     property alias imagePreview: imagePreview
     property alias collageMenu: collageMenu
+    property alias galleryMenu: galleryMenu
 
     property real slideValueCollageSelection: 0.0
     property real slideValueSnapshotMenu: 1.0
     property real slideValuePreviewMenu: 1.0
     property real slideValueCollageMenu: 1.0
+    property real slideValueGalleryMenu: 1.0
 
     MainMenu {
         id: mainMenu
@@ -47,6 +49,16 @@ Item {
         width: root.width
         height: root.height
     }
+
+    GalleryMenu
+    {
+        id: galleryMenu
+        x: root.width * slideValueGalleryMenu
+        y: 0
+        width: root.width
+        height: root.height
+    }
+
     states: [
         State {
             name: "collageSelection"
@@ -108,6 +120,33 @@ Item {
                 target: snapshotMenu
                 visible: false
             }
+        },
+        State {
+            name: "gallery"
+
+            PropertyChanges {
+                target: root
+                slideValueCollageSelection: -1.0
+                slideValueSnapshotMenu: -1.0
+                slideValuePreviewMenu: -1.0
+                slideValueCollageMenu: -1.0
+                slideValueGalleryMenu: 0.0
+            }
+
+            PropertyChanges {
+                target: snapshotMenu
+                visible: false
+            }
+
+            PropertyChanges {
+                target: imagePreview
+                visible: false
+            }
+
+            PropertyChanges {
+                target: collageMenu
+                visible: false
+            }
         }
     ]
 }

qml/CollageMenu.qml

@@ -12,9 +12,9 @@ CollageMenuForm {
     signal next
     signal exit
 
-    printButton.enabled: !printer.busy
-    property real printerHeight : printer.getPrintSize().height
-    property real printerWidth : printer.getPrintSize().width
+    printButton.enabled: printer ? !printer.busy : false
+    property real printerHeight : form.collageImage.imageModel ? form.collageImage.imageModel.collagePixelSize.height : 0
+    property real printerWidth : form.collageImage.imageModel ? form.collageImage.imageModel.collagePixelSize.width : 0
     printerRatio:  printerHeight / printerWidth
 
     nextButton.onClicked:
@@ -31,10 +31,11 @@ CollageMenuForm {
         var path = applicationSettings.foldername.toString()
         path = path.replace(/^(file:\/{2})/,"");
         var cleanPath = decodeURIComponent(path);
-        console.log(cleanPath)
         var filename = cleanPath + "/collage/Coll_"+ new Date().toLocaleString(locale, "dd_MM_yyyy_hh_mm_ss") + ".png"
-        collageRenderer.saveImage(filename, printer.getPrintSize())
-        console.log("Collage rendered")
+        console.log("Save files to: " + filename)
+        collageRenderer.saveImage(filename, form.collageImage.imageModel.collagePixelSize)
+        console.log("Collage rendered width: " + Number(form.collageImage.imageModel.collagePixelSize.width).toString()
+                    + " height: " + form.collageImage.imageModel.collagePixelSize.height)
     }
 
     collageRenderer.onSavingChanged:

qml/CollageMenuForm.ui.qml

@@ -35,8 +35,11 @@ Item {
         property double aimedRatio: printerRatio
 
         // SIZING
-        property double availableWidth: parent.width - rightMargin - leftMargin
-        property double availableHeight: parent.height - bottomMargin - topMargin
+        property double calculatedWidth: parent.width - rightMargin - leftMargin
+        property double calculatedHeight: parent.height - bottomMargin - topMargin
+
+        property double availableWidth: calculatedWidth > 10 ? calculatedWidth : 10
+        property double availableHeight: calculatedHeight > 10 ? calculatedHeight : 10
 
         property bool parentIsLarge: parentRatio > aimedRatio
 

qml/GalleryMenu.qml

@@ -0,0 +1,55 @@
+import QtQuick 2.5
+import Printer 1.0
+
+GalleryMenuForm {
+    property alias foldermodel: galleryForm.foldermodel
+    signal exitGallery
+    property alias printer: galleryForm.printer
+
+    id: galleryForm
+
+
+    scrollDownButton.onPressed:
+    {
+        scrollBar.increase()
+    }
+
+    scrollUpButton.onPressed:
+    {
+        scrollBar.decrease()
+    }
+
+    photosGrid.onCurrentIndexChanged: {
+        photoView.positionViewAtIndex(photosGrid.currentIndex, ListView.Contain)
+    }
+
+    photoView.onCurrentIndexChanged: {
+        photosGrid.positionViewAtIndex(photoView.currentIndex, GridView.Contain)
+    }
+
+    function resetGallery()
+    {
+        viewState = "inGrid"
+    }
+
+    exitButton.onClicked:
+    {
+        exitGallery()
+    }
+
+    photoButton.onClicked:
+    {
+        foldermodel.folder = applicationSettings.foldername
+    }
+
+    collageButton.onClicked:
+    {
+        foldermodel.folder = applicationSettings.foldername + "/collage"
+    }
+}
+
+
+/*##^## Designer {
+    D{i:0;autoSize:true;height:480;width:640}
+}
+ ##^##*/