From 1774b401c805257e2662bdbf462f7a065d93326e Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Tue, 22 May 2018 10:24:04 -0700 Subject: [PATCH 1/3] allowing file dialogs to show hidden files/folders via showHidden property --- interface/resources/qml/dialogs/+android/FileDialog.qml | 2 +- interface/resources/qml/dialogs/FileDialog.qml | 2 +- interface/resources/qml/dialogs/TabletFileDialog.qml | 2 +- .../qml/hifi/tablet/tabletWindows/TabletFileDialog.qml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/resources/qml/dialogs/+android/FileDialog.qml b/interface/resources/qml/dialogs/+android/FileDialog.qml index 548ab453a7..a39b6896df 100644 --- a/interface/resources/qml/dialogs/+android/FileDialog.qml +++ b/interface/resources/qml/dialogs/+android/FileDialog.qml @@ -57,7 +57,7 @@ ModalWindow { property int iconSize: 40 property bool selectDirectory: false; - property bool showHidden: false; + property bool showHidden: folderListModel.showHidden // FIXME implement property bool multiSelect: false; property bool saveDialog: false; diff --git a/interface/resources/qml/dialogs/FileDialog.qml b/interface/resources/qml/dialogs/FileDialog.qml index 154d66378b..752cf969cb 100644 --- a/interface/resources/qml/dialogs/FileDialog.qml +++ b/interface/resources/qml/dialogs/FileDialog.qml @@ -58,7 +58,7 @@ ModalWindow { property int iconSize: 40 property bool selectDirectory: false; - property bool showHidden: false; + property bool showHidden: folderListModel.showHidden // FIXME implement property bool multiSelect: false; property bool saveDialog: false; diff --git a/interface/resources/qml/dialogs/TabletFileDialog.qml b/interface/resources/qml/dialogs/TabletFileDialog.qml index db15337913..6221d97dae 100644 --- a/interface/resources/qml/dialogs/TabletFileDialog.qml +++ b/interface/resources/qml/dialogs/TabletFileDialog.qml @@ -55,7 +55,7 @@ TabletModalWindow { property int iconSize: 40 property bool selectDirectory: false; - property bool showHidden: false; + property bool showHidden: folderListModel.showHidden // FIXME implement property bool multiSelect: false; property bool saveDialog: false; diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml b/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml index 08b0104fce..5b57fce101 100644 --- a/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml +++ b/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml @@ -52,7 +52,7 @@ Rectangle { property int iconSize: 40 property bool selectDirectory: false; - property bool showHidden: false; + property bool showHidden: folderListModel.showHidden // FIXME implement property bool multiSelect: false; property bool saveDialog: false; From e3414c320ec6b6bdf7a5ac974c6c820b27f43f4f Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Tue, 22 May 2018 11:03:31 -0700 Subject: [PATCH 2/3] changing property to alias to reflect folderListModel --- interface/resources/qml/dialogs/+android/FileDialog.qml | 2 +- interface/resources/qml/dialogs/FileDialog.qml | 2 +- interface/resources/qml/dialogs/TabletFileDialog.qml | 2 +- .../qml/hifi/tablet/tabletWindows/TabletFileDialog.qml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/resources/qml/dialogs/+android/FileDialog.qml b/interface/resources/qml/dialogs/+android/FileDialog.qml index a39b6896df..d967844565 100644 --- a/interface/resources/qml/dialogs/+android/FileDialog.qml +++ b/interface/resources/qml/dialogs/+android/FileDialog.qml @@ -57,7 +57,7 @@ ModalWindow { property int iconSize: 40 property bool selectDirectory: false; - property bool showHidden: folderListModel.showHidden + property alias showHidden: folderListModel.showHidden // FIXME implement property bool multiSelect: false; property bool saveDialog: false; diff --git a/interface/resources/qml/dialogs/FileDialog.qml b/interface/resources/qml/dialogs/FileDialog.qml index 752cf969cb..dbcd7ccee5 100644 --- a/interface/resources/qml/dialogs/FileDialog.qml +++ b/interface/resources/qml/dialogs/FileDialog.qml @@ -58,7 +58,7 @@ ModalWindow { property int iconSize: 40 property bool selectDirectory: false; - property bool showHidden: folderListModel.showHidden + property alias showHidden: folderListModel.showHidden // FIXME implement property bool multiSelect: false; property bool saveDialog: false; diff --git a/interface/resources/qml/dialogs/TabletFileDialog.qml b/interface/resources/qml/dialogs/TabletFileDialog.qml index 6221d97dae..8b1d2d78b5 100644 --- a/interface/resources/qml/dialogs/TabletFileDialog.qml +++ b/interface/resources/qml/dialogs/TabletFileDialog.qml @@ -55,7 +55,7 @@ TabletModalWindow { property int iconSize: 40 property bool selectDirectory: false; - property bool showHidden: folderListModel.showHidden + property alias showHidden: folderListModel.showHidden // FIXME implement property bool multiSelect: false; property bool saveDialog: false; diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml b/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml index 5b57fce101..4ba7843027 100644 --- a/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml +++ b/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml @@ -52,7 +52,7 @@ Rectangle { property int iconSize: 40 property bool selectDirectory: false; - property bool showHidden: folderListModel.showHidden + property alias showHidden: folderListModel.showHidden // FIXME implement property bool multiSelect: false; property bool saveDialog: false; From 345138f4ff98fb1de79fd2eab3a3e55b48bdefbd Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Wed, 23 May 2018 10:30:08 -0700 Subject: [PATCH 3/3] Changing showHidden property to be always true --- interface/resources/qml/dialogs/+android/FileDialog.qml | 4 +++- interface/resources/qml/dialogs/FileDialog.qml | 4 +++- interface/resources/qml/dialogs/TabletFileDialog.qml | 4 +++- .../qml/hifi/tablet/tabletWindows/TabletFileDialog.qml | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/interface/resources/qml/dialogs/+android/FileDialog.qml b/interface/resources/qml/dialogs/+android/FileDialog.qml index d967844565..86e6e1ef6c 100644 --- a/interface/resources/qml/dialogs/+android/FileDialog.qml +++ b/interface/resources/qml/dialogs/+android/FileDialog.qml @@ -57,7 +57,7 @@ ModalWindow { property int iconSize: 40 property bool selectDirectory: false; - property alias showHidden: folderListModel.showHidden + property bool showHidden: true; // FIXME implement property bool multiSelect: false; property bool saveDialog: false; @@ -324,8 +324,10 @@ ModalWindow { showDirsFirst: true showDotAndDotDot: false showFiles: !root.selectDirectory + showHidden: root.showHidden Component.onCompleted: { showFiles = !root.selectDirectory + showHidden = root.showHidden } onFolderChanged: { diff --git a/interface/resources/qml/dialogs/FileDialog.qml b/interface/resources/qml/dialogs/FileDialog.qml index dbcd7ccee5..49bfe78434 100644 --- a/interface/resources/qml/dialogs/FileDialog.qml +++ b/interface/resources/qml/dialogs/FileDialog.qml @@ -58,7 +58,7 @@ ModalWindow { property int iconSize: 40 property bool selectDirectory: false; - property alias showHidden: folderListModel.showHidden + property bool showHidden: true; // FIXME implement property bool multiSelect: false; property bool saveDialog: false; @@ -325,8 +325,10 @@ ModalWindow { showDirsFirst: true showDotAndDotDot: false showFiles: !root.selectDirectory + showHidden: root.showHidden Component.onCompleted: { showFiles = !root.selectDirectory + showHidden = root.showHidden } onFolderChanged: { diff --git a/interface/resources/qml/dialogs/TabletFileDialog.qml b/interface/resources/qml/dialogs/TabletFileDialog.qml index 8b1d2d78b5..e7c93e6d8e 100644 --- a/interface/resources/qml/dialogs/TabletFileDialog.qml +++ b/interface/resources/qml/dialogs/TabletFileDialog.qml @@ -55,7 +55,7 @@ TabletModalWindow { property int iconSize: 40 property bool selectDirectory: false; - property alias showHidden: folderListModel.showHidden + property bool showHidden: true; // FIXME implement property bool multiSelect: false; property bool saveDialog: false; @@ -288,8 +288,10 @@ TabletModalWindow { showDirsFirst: true showDotAndDotDot: false showFiles: !root.selectDirectory + showHidden: root.showHidden Component.onCompleted: { showFiles = !root.selectDirectory + showHidden = root.showHidden } onFolderChanged: { diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml b/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml index 4ba7843027..f3f98f24e5 100644 --- a/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml +++ b/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml @@ -52,7 +52,7 @@ Rectangle { property int iconSize: 40 property bool selectDirectory: false; - property alias showHidden: folderListModel.showHidden + property bool showHidden: true; // FIXME implement property bool multiSelect: false; property bool saveDialog: false; @@ -280,8 +280,10 @@ Rectangle { showDirsFirst: true showDotAndDotDot: false showFiles: !root.selectDirectory + showHidden: root.showHidden Component.onCompleted: { showFiles = !root.selectDirectory + showHidden = root.showHidden } onFolderChanged: {