Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 20:23:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #15292 from thoys/fix/avatarTools/fbxCasing

Browse source 
Case 20625: On avatar project creation, the .fbx filter for selecting an FBX is case-sensitive.
This commit is contained in:
Shannon Romano 2019-03-29 17:04:37 -07:00 committed by GitHub
commit dbecf1f611
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/qml/dialogs/FileDialog.qml
View file

@ -9,7 +9,7 @@
// //
import QtQuick 2.7 import QtQuick 2.7
import Qt.labs.folderlistmodel 2.1 import Qt.labs.folderlistmodel 2.2
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import QtQuick.Dialogs 1.2 as OriginalDialogs import QtQuick.Dialogs 1.2 as OriginalDialogs
import QtQuick.Controls 1.4 as QQC1 import QtQuick.Controls 1.4 as QQC1
@ -320,6 +320,7 @@ ModalWindow {
FolderListModel { FolderListModel {
id: folderListModel id: folderListModel
nameFilters: selectionType.currentFilter nameFilters: selectionType.currentFilter
caseSensitive: false
showDirsFirst: true showDirsFirst: true
showDotAndDotDot: false showDotAndDotDot: false
showFiles: !root.selectDirectory showFiles: !root.selectDirectory

3
interface/resources/qml/dialogs/TabletFileDialog.qml
View file

@ -9,7 +9,7 @@
// //
import QtQuick 2.7 import QtQuick 2.7
import Qt.labs.folderlistmodel 2.1 import Qt.labs.folderlistmodel 2.2
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import QtQuick.Dialogs 1.2 as OriginalDialogs import QtQuick.Dialogs 1.2 as OriginalDialogs
import QtQuick.Controls 1.4 as QQC1 import QtQuick.Controls 1.4 as QQC1
@ -285,6 +285,7 @@ TabletModalWindow {
FolderListModel { FolderListModel {
id: folderListModel id: folderListModel
nameFilters: selectionType.currentFilter nameFilters: selectionType.currentFilter
caseSensitive: false
showDirsFirst: true showDirsFirst: true
showDotAndDotDot: false showDotAndDotDot: false
showFiles: !root.selectDirectory showFiles: !root.selectDirectory

3
interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
View file

@ -9,7 +9,7 @@
// //
import QtQuick 2.7 import QtQuick 2.7
import Qt.labs.folderlistmodel 2.1 import Qt.labs.folderlistmodel 2.2
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import QtQuick.Dialogs 1.2 as OriginalDialogs import QtQuick.Dialogs 1.2 as OriginalDialogs
import QtQuick.Controls 1.4 as QQC1 import QtQuick.Controls 1.4 as QQC1
@ -279,6 +279,7 @@ Rectangle {
FolderListModel { FolderListModel {
id: folderListModel id: folderListModel
nameFilters: selectionType.currentFilter nameFilters: selectionType.currentFilter
caseSensitive: false
showDirsFirst: true showDirsFirst: true
showDotAndDotDot: false showDotAndDotDot: false
showFiles: !root.selectDirectory showFiles: !root.selectDirectory

2
interface/src/avatar/AvatarDoctor.cpp
View file

@ -92,7 +92,7 @@ void AvatarDoctor::startDiagnosing() {
_model = resource; _model = resource;
const auto model = resource.data(); const auto model = resource.data();
const auto avatarModel = resource.data()->getHFMModel(); const auto avatarModel = resource.data()->getHFMModel();
if (!avatarModel.originalURL.endsWith(".fbx")) { if (!avatarModel.originalURL.toLower().endsWith(".fbx")) {
addError("Unsupported avatar model format.", "unsupported-format"); addError("Unsupported avatar model format.", "unsupported-format");
emit complete(getErrors()); emit complete(getErrors());
return; return;