diff --git a/src/qml/elements/FileChooser.qml b/src/qml/elements/FileChooser.qml index 13598e4..2cda632 100644 --- a/src/qml/elements/FileChooser.qml +++ b/src/qml/elements/FileChooser.qml @@ -1,46 +1,46 @@ /* * Kaidan - A user-friendly XMPP client for every device! * * Copyright (C) 2016-2020 Kaidan developers and contributors * (see the LICENSE file for a full list of copyright authors) * * Kaidan is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * In addition, as a special exception, the author of Kaidan gives * permission to link the code of its release with the OpenSSL * project's "OpenSSL" library (or with modified versions of it that * use the same license as the "OpenSSL" library), and distribute the * linked executables. You must obey the GNU General Public License in * all respects for all of the code used other than "OpenSSL". If you * modify this file, you may extend this exception to your version of * the file, but you are not obligated to do so. If you do not wish to * do so, delete this exception statement from your version. * * Kaidan is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with Kaidan. If not, see . */ -import QtQuick.Dialogs 1.12 +import QtQuick.Dialogs 1.3 FileDialog { id: fileDialog folder: shortcuts.home nameFilters: [ "Images (*.jpg *.jpeg *.png *.gif)", "Videos (*.mp4 *.mkv *.avi *.webm)", "Audio files (*.mp3 *.wav *.flac *.ogg *.m4a *.mka)", "Documents (*.doc *.docx *.odt)", "All files (*)", selectedNameFilter ] // TODO: support multiple files // Currently the problem is that the fileUrls list isn't cleared } diff --git a/utils/upgrade-qml-imports.sh b/utils/upgrade-qml-imports.sh index 1760fc9..795e24a 100755 --- a/utils/upgrade-qml-imports.sh +++ b/utils/upgrade-qml-imports.sh @@ -1,63 +1,63 @@ #!/bin/bash SCRIPT_DIR=$(dirname "${0}") if [ "${SCRIPT_DIR:0:1}" != "/" ]; then SCRIPT_DIR=${PWD}/${SCRIPT_DIR} fi SOURCE_DIR="${SCRIPT_DIR}/../src" # Force early exit on issue set -e # Force debug traces of executed commands #set -o xtrace # To see current imports: # find "${SOURCE_DIR}" -iname '*.qml' -exec grep 'import ' {} \; | sort -u declare -A QT QT["QtGraphicalEffects"]="1.12" QT["Qt.labs.folderlistmodel"]="2.1" QT["QtLocation"]="5.12" QT["QtMultimedia"]="5.12" QT["QtPositioning"]="5.12" QT["QtQml"]="2.12" QT["QtQuick"]="2.12" QT["QtQuick.Controls"]="2.12" QT["QtQuick.Controls.Material"]="2.12" -QT["QtQuick.Dialogs"]="1.12" +QT["QtQuick.Dialogs"]="1.3" QT["QtQuick.Layouts"]="1.12" declare -A KIRIGAMI KIRIGAMI["org.kde.kirigami"]="2.8" declare -A KAIDAN KAIDAN["EmojiModel"]="0.1" KAIDAN["MediaUtils"]="0.1" KAIDAN["StatusBar"]="0.1" KAIDAN["im.kaidan.kaidan"]="1.0" SED_REPLACES= for key in "${!QT[@]}" do SED_REPLACES="${SED_REPLACES} -e 's/[[:space:]]*import[[:space:]]+${key//./\\.}[[:space:]]+[0-9]+\.[0-9]+/import ${key} ${QT[${key}]}/'" done for key in "${!KIRIGAMI[@]}" do SED_REPLACES="${SED_REPLACES} -e 's/[[:space:]]*import[[:space:]]+${key//./\\.}[[:space:]]+[0-9]+\.[0-9]+/import ${key} ${KIRIGAMI[${key}]}/'" done for key in "${!KAIDAN[@]}" do SED_REPLACES="${SED_REPLACES} -e 's/[[:space:]]*import[[:space:]]+${key//./\\.}[[:space:]]+[0-9]+\.[0-9]+/import ${key} ${KAIDAN[${key}]}/'" done SED_CMD="sed -Ei'' ${SED_REPLACES}" while IFS= read -r qml_file; do echo "Updating ${qml_file}..." eval ${SED_CMD} "${qml_file}" done < <( find "${SOURCE_DIR}" -type f -iname '*.qml' )