filedialog refactoring

Author: Skycoder42

AndroidFileDialog.qml

@@ -6,63 +6,16 @@ import de.skycoder42.androidutils 1.1
 FileChooser {
 	id: fileDialog
 
-	property bool linkFileMode: true
+	property var labsDialog: null
+	property alias fileChooser: fileDialog
 
-	default property var data
-	property int flags: Qt.Dialog
-	property int modality: Qt.NonModal
-	property Window parentWindow: null
-	property int result: Dialog.Rejected
-	property bool visible: false
-	property string acceptLabel
-	property string rejectLabel
-	property alias currentFile: fileDialog.contentUrl
-	property var currentFiles: [currentFile]
+	property bool saveFile: false
+	property int dialogFlags: 0
 	property string defaultSuffix
+	property string folder
 	property alias file: fileDialog.contentUrl
-	property int fileMode: FileDialog.OpenFile
-	property var files: [file]
-	property alias folder: fileDialog.contentUrl
 	property var nameFilters
-	property int options
 
-	onAccepted: result = Dialog.Accepted
-	onRejected: result = Dialog.Rejected
-
-	function accept() {}
-	function reject() {}
-	function close() {}
-	function done(result) {
-		fileDialog.result = result;
-	}
-
-	onTypeChanged: {
-		if(!linkFileMode)
-			return;
-
-		switch(type) {
-		case FileChooser.GetContent:
-		case FileChooser.OpenDocument:
-			fileMode = FileDialog.OpenFile;
-			break;
-		case FileChooser.CreateDocument:
-			fileMode = FileDialog.SaveFile
-			break;
-		}
-	}
-
-	onFileModeChanged: {
-		if(!linkFileMode)
-			return;
-
-		switch(fileMode) {
-		case FileDialog.OpenFile:
-		case FileDialog.OpenFiles:
-			fileMode = FileChooser.OpenDocument;
-			break;
-		case FileDialog.SaveFile:
-			fileMode = FileChooser.CreateDocument;
-			break;
-		}
-	}
+	type: saveFile ? FileChooser.CreateDocument : FileChooser.OpenDocument
+	contentUrl: folder + "file" + defaultSuffix
 }

Demo/ContentTab.qml

@@ -6,11 +6,11 @@ import de.skycoder42.androidutils.demo 1.0
 
 Pane {
 	FileDialog {
-		id: chooser
+		id: fileDialog
 
-		type: modeBox.model.get(modeBox.currentIndex).value
+		saveFile: openBox.checked
 
-		onAccepted: AndroidUtils.showToast("File choosen: " + chooser.contentUrl, true)
+		onAccepted: AndroidUtils.showToast("File choosen: " + fileDialog.file, true)
 		onRejected: AndroidUtils.showToast("file choosing aborted!")
 	}
 
@@ -26,51 +26,40 @@ Pane {
 
 		TextField {
 			id: contentField
-			text: chooser.contentUrl
+			text: fileDialog.file
 
 			Layout.fillWidth: true
-			Layout.columnSpan: 3
+			Layout.columnSpan: 2
 
 			onEditingFinished: chooser.contentUrl = contentField.text
 		}
 
-		ComboBox {
-			id: modeBox
-			textRole: "key"
-
-			Layout.fillWidth: true
-			Layout.columnSpan: 3
-
-			model: ListModel {
-				ListElement { key: "GetContent"; value: FileChooser.GetContent }
-				ListElement { key: "OpenDocument"; value: FileChooser.OpenDocument }
-				ListElement { key: "CreateDocument"; value: FileChooser.CreateDocument }
-			}
-
-			currentIndex: 1
+		CheckBox {
+			id: openBox
+			text: "Get save file"
 		}
 
 		Button {
 			id: chooserButton
 			Layout.fillWidth: true
 			text: "Open file chooser"
-			onClicked: chooser.open()
+			onClicked: fileDialog.open()
 		}
 
 		Button {
 			id: editButton
 			Layout.fillWidth: true
 			text: "Display/Edit File"
 
-			onClicked: opener.openFile(chooser.contentUrl)
+			onClicked: opener.openFile(fileDialog.file)
 		}
 
 		Button {
 			id: saveButton
 			Layout.fillWidth: true
 			text: "Save File"
 
-			onClicked: opener.saveFile(chooser.contentUrl, editField.text)
+			onClicked: opener.saveFile(fileDialog.file, editField.text)
 		}
 
 		TextArea {

FileDialog.qml

@@ -1,43 +1,17 @@
-import Qt.labs.platform 1.0
+import Qt.labs.platform 1.0 as Labs
 import de.skycoder42.androidutils 1.1
 
-FileDialog {
+Labs.FileDialog {
 	id: fileDialog
 
-	property bool linkFileMode: true
+	property alias labsDialog: fileDialog
+	property var fileChooser: null
 
-	property alias contentUrl: fileDialog.file
-	property int type: FileChooser.OpenDocument
-	property string mimeType: "*/*"
+	property bool saveFile: false
+	property alias dialogFlags: fileDialog.options
 	property int chooserFlags: FileChooser.OpenableFlag
+	property string mimeType: "*/*"
 
-	onTypeChanged: {
-		if(!linkFileMode)
-			return;
-
-		switch(type) {
-		case FileChooser.GetContent:
-		case FileChooser.OpenDocument:
-			fileMode = FileDialog.OpenFile;
-			break;
-		case FileChooser.CreateDocument:
-			fileMode = FileDialog.SaveFile
-			break;
-		}
-	}
-
-	onFileModeChanged: {
-		if(!linkFileMode)
-			return;
-
-		switch(fileMode) {
-		case FileDialog.OpenFile:
-		case FileDialog.OpenFiles:
-			fileMode = FileChooser.OpenDocument;
-			break;
-		case FileDialog.SaveFile:
-			fileMode = FileChooser.CreateDocument;
-			break;
-		}
-	}
+	fileMode: saveFile ? Labs.FileDialog.SaveFile : Labs.FileDialog.OpenFile
+	modality: Qt.WindowModal
 }

qpm.json

@@ -2,22 +2,22 @@
   "name": "de.skycoder42.androidutils",
   "description": "Utils for easy c++ and qml integration of common android features",
   "author": {
-	"name": "Skycoder",
-	"email": "[email protected]"
+    "name": "Skycoder",
+    "email": "[email protected]"
   },
   "repository": {
-	"type": "GITHUB",
-	"url": "https://github.com/Skycoder42/AndroidUtils.git"
+    "type": "GITHUB",
+    "url": "https://github.com/Skycoder42/AndroidUtils.git"
   },
   "version": {
-	"label": "1.1.1",
-	"revision": "",
-	"fingerprint": ""
+    "label": "1.1.1",
+    "revision": "",
+    "fingerprint": ""
   },
   "dependencies": [
-	"[email protected].4"
+    "[email protected].5"
   ],
   "license": "BSD_3_CLAUSE",
   "pri_filename": "de_skycoder42_androidutils.pri",
   "webpage": "https://github.com/Skycoder42/AndroidUtils"
-}
+}