diff --git a/src/MainApplicationWindow.qml b/src/MainApplicationWindow.qml index d92f9972..9d89dd46 100644 --- a/src/MainApplicationWindow.qml +++ b/src/MainApplicationWindow.qml @@ -26,6 +26,7 @@ import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Enums 1.0 diff --git a/src/commoncomponents/AccountMigrationDialog.qml b/src/commoncomponents/AccountMigrationDialog.qml index 8ef5fd97..536257de 100644 --- a/src/commoncomponents/AccountMigrationDialog.qml +++ b/src/commoncomponents/AccountMigrationDialog.qml @@ -22,6 +22,7 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/commoncomponents/BaseContextMenu.qml b/src/commoncomponents/BaseContextMenu.qml index c0f59b29..da0b9639 100644 --- a/src/commoncomponents/BaseContextMenu.qml +++ b/src/commoncomponents/BaseContextMenu.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtGraphicalEffects 1.14 + import net.jami.Constants 1.0 Menu { diff --git a/src/commoncomponents/DaemonReconnectPopup.qml b/src/commoncomponents/DaemonReconnectPopup.qml index 631f9318..9520e3a2 100644 --- a/src/commoncomponents/DaemonReconnectPopup.qml +++ b/src/commoncomponents/DaemonReconnectPopup.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 + import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/commoncomponents/DeleteAccountDialog.qml b/src/commoncomponents/DeleteAccountDialog.qml index ba3a9608..41093d42 100644 --- a/src/commoncomponents/DeleteAccountDialog.qml +++ b/src/commoncomponents/DeleteAccountDialog.qml @@ -19,7 +19,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls.Styles 1.4 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/commoncomponents/ElidedTextLabel.qml b/src/commoncomponents/ElidedTextLabel.qml index 3d334b50..44e6b2dd 100644 --- a/src/commoncomponents/ElidedTextLabel.qml +++ b/src/commoncomponents/ElidedTextLabel.qml @@ -17,7 +17,8 @@ */ import QtQuick 2.14 -import QtQuick.Controls 1.4 +import QtQuick.Controls 2.14 + import net.jami.Constants 1.0 Label { diff --git a/src/commoncomponents/GeneralMenuItem.qml b/src/commoncomponents/GeneralMenuItem.qml index d87a6b38..57701221 100644 --- a/src/commoncomponents/GeneralMenuItem.qml +++ b/src/commoncomponents/GeneralMenuItem.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 + import net.jami.Constants 1.0 // General menu item. diff --git a/src/commoncomponents/GeneralMenuSeparator.qml b/src/commoncomponents/GeneralMenuSeparator.qml index f719a2d5..6ccac22e 100644 --- a/src/commoncomponents/GeneralMenuSeparator.qml +++ b/src/commoncomponents/GeneralMenuSeparator.qml @@ -18,6 +18,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 + import net.jami.Constants 1.0 MenuSeparator { diff --git a/src/commoncomponents/InfoLineEdit.qml b/src/commoncomponents/InfoLineEdit.qml index 75213931..07b16f68 100644 --- a/src/commoncomponents/InfoLineEdit.qml +++ b/src/commoncomponents/InfoLineEdit.qml @@ -1,7 +1,25 @@ +/* + * Copyright (C) 2019-2020 by Savoir-faire Linux + * Author: Yang Wang + * + * This program 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. + * + * This program 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 this program. If not, see . + */ + import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls.Styles 1.4 + import net.jami.Constants 1.0 TextField{ diff --git a/src/commoncomponents/JamiFileDialog.qml b/src/commoncomponents/JamiFileDialog.qml index 0ba09a6b..491d1a71 100644 --- a/src/commoncomponents/JamiFileDialog.qml +++ b/src/commoncomponents/JamiFileDialog.qml @@ -18,6 +18,7 @@ import QtQuick 2.14 import Qt.labs.platform 1.1 + import net.jami.Constants 1.0 FileDialog { diff --git a/src/commoncomponents/ListViewJami.qml b/src/commoncomponents/ListViewJami.qml index be6e24aa..926555ad 100644 --- a/src/commoncomponents/ListViewJami.qml +++ b/src/commoncomponents/ListViewJami.qml @@ -21,7 +21,7 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 + import net.jami.Constants 1.0 Rectangle { diff --git a/src/commoncomponents/LookupStatusLabel.qml b/src/commoncomponents/LookupStatusLabel.qml index e44a7f83..5cc64d21 100644 --- a/src/commoncomponents/LookupStatusLabel.qml +++ b/src/commoncomponents/LookupStatusLabel.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 + import net.jami.Constants 1.0 Label { diff --git a/src/commoncomponents/MaterialButton.qml b/src/commoncomponents/MaterialButton.qml index 08dda040..1e61e370 100644 --- a/src/commoncomponents/MaterialButton.qml +++ b/src/commoncomponents/MaterialButton.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtGraphicalEffects 1.14 import QtQuick.Window 2.14 + import net.jami.Constants 1.0 Button { diff --git a/src/commoncomponents/MaterialLineEdit.qml b/src/commoncomponents/MaterialLineEdit.qml index 31323dfa..5cf627ee 100644 --- a/src/commoncomponents/MaterialLineEdit.qml +++ b/src/commoncomponents/MaterialLineEdit.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 + import net.jami.Constants 1.0 TextField { diff --git a/src/commoncomponents/ModalPopup.qml b/src/commoncomponents/ModalPopup.qml index 7534204a..95a3ae48 100644 --- a/src/commoncomponents/ModalPopup.qml +++ b/src/commoncomponents/ModalPopup.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtGraphicalEffects 1.14 + import net.jami.Constants 1.0 Popup { diff --git a/src/commoncomponents/PasswordDialog.qml b/src/commoncomponents/PasswordDialog.qml index ccb56719..082f2684 100644 --- a/src/commoncomponents/PasswordDialog.qml +++ b/src/commoncomponents/PasswordDialog.qml @@ -19,7 +19,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls.Styles 1.4 + import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/commoncomponents/PhotoboothView.qml b/src/commoncomponents/PhotoboothView.qml index 35876c31..69b0b504 100644 --- a/src/commoncomponents/PhotoboothView.qml +++ b/src/commoncomponents/PhotoboothView.qml @@ -1,9 +1,27 @@ +/* + * Copyright (C) 2020 by Savoir-faire Linux + * Author: Mingrui Zhang + * + * This program 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. + * + * This program 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 this program. If not, see . + */ + import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 import QtGraphicalEffects 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/commoncomponents/PreferenceItemDelegate.qml b/src/commoncomponents/PreferenceItemDelegate.qml index 0a18830f..752d885b 100644 --- a/src/commoncomponents/PreferenceItemDelegate.qml +++ b/src/commoncomponents/PreferenceItemDelegate.qml @@ -21,9 +21,9 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 import QtQuick.Dialogs 1.3 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/commoncomponents/PresenceIndicator.qml b/src/commoncomponents/PresenceIndicator.qml index d3e95c93..d7baf769 100644 --- a/src/commoncomponents/PresenceIndicator.qml +++ b/src/commoncomponents/PresenceIndicator.qml @@ -18,6 +18,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 + import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/commoncomponents/PushButton.qml b/src/commoncomponents/PushButton.qml index a75f5a71..314d5df1 100644 --- a/src/commoncomponents/PushButton.qml +++ b/src/commoncomponents/PushButton.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtGraphicalEffects 1.14 + import net.jami.Constants 1.0 // diff --git a/src/commoncomponents/SettingParaCombobox.qml b/src/commoncomponents/SettingParaCombobox.qml index 9e821e1d..157e6d71 100644 --- a/src/commoncomponents/SettingParaCombobox.qml +++ b/src/commoncomponents/SettingParaCombobox.qml @@ -21,7 +21,7 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 +import QtQml 2.14 import net.jami.Constants 1.0 diff --git a/src/commoncomponents/SimpleMessageDialog.qml b/src/commoncomponents/SimpleMessageDialog.qml index ca3857d3..f1c904be 100644 --- a/src/commoncomponents/SimpleMessageDialog.qml +++ b/src/commoncomponents/SimpleMessageDialog.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 + import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/commoncomponents/SpinnerButton.qml b/src/commoncomponents/SpinnerButton.qml index a6a6cb29..05c7737f 100644 --- a/src/commoncomponents/SpinnerButton.qml +++ b/src/commoncomponents/SpinnerButton.qml @@ -18,6 +18,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 + import net.jami.Constants 1.0 MaterialButton { diff --git a/src/commoncomponents/UsernameLineEdit.qml b/src/commoncomponents/UsernameLineEdit.qml index 6b0aeaa4..c454af95 100644 --- a/src/commoncomponents/UsernameLineEdit.qml +++ b/src/commoncomponents/UsernameLineEdit.qml @@ -18,6 +18,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 + import net.jami.Models 1.0 MaterialLineEdit { diff --git a/src/constant/JamiStrings.qml b/src/constant/JamiStrings.qml index e08372c3..00ae1aa9 100644 --- a/src/constant/JamiStrings.qml +++ b/src/constant/JamiStrings.qml @@ -20,6 +20,7 @@ pragma Singleton import QtQuick 2.14 + import net.jami.Helpers 1.0 Item { diff --git a/src/constant/JamiTheme.qml b/src/constant/JamiTheme.qml index 5bc49f02..5552d29b 100644 --- a/src/constant/JamiTheme.qml +++ b/src/constant/JamiTheme.qml @@ -19,11 +19,11 @@ // JamiTheme as a singleton is to provide global theme property entry. pragma Singleton +import QtQuick 2.14 + import net.jami.Adapters 1.0 import net.jami.Enums 1.0 -import QtQuick 2.14 - Item { property bool darkTheme: SettingsAdapter.getAppValue(Settings.EnableDarkTheme) diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml index 35857a6f..960c22a6 100644 --- a/src/mainview/MainView.qml +++ b/src/mainview/MainView.qml @@ -22,6 +22,7 @@ import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/AboutPopUp.qml b/src/mainview/components/AboutPopUp.qml index 8b684d6b..0919791f 100644 --- a/src/mainview/components/AboutPopUp.qml +++ b/src/mainview/components/AboutPopUp.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/AccountComboBox.qml b/src/mainview/components/AccountComboBox.qml index 09994b88..499f0f85 100644 --- a/src/mainview/components/AccountComboBox.qml +++ b/src/mainview/components/AccountComboBox.qml @@ -21,6 +21,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/AccountComboBoxPopup.qml b/src/mainview/components/AccountComboBoxPopup.qml index 31c3d080..a100ba42 100644 --- a/src/mainview/components/AccountComboBoxPopup.qml +++ b/src/mainview/components/AccountComboBoxPopup.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/AudioCallPage.qml b/src/mainview/components/AudioCallPage.qml index 0005a1fe..b9fcbad0 100644 --- a/src/mainview/components/AudioCallPage.qml +++ b/src/mainview/components/AudioCallPage.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls.Universal 2.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/CallOverlay.qml b/src/mainview/components/CallOverlay.qml index fd0e9d7c..aca0ae87 100644 --- a/src/mainview/components/CallOverlay.qml +++ b/src/mainview/components/CallOverlay.qml @@ -23,6 +23,7 @@ import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls.Universal 2.14 import QtQml 2.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/CallOverlayButtonGroup.qml b/src/mainview/components/CallOverlayButtonGroup.qml index 583d0cf2..34455392 100644 --- a/src/mainview/components/CallOverlayButtonGroup.qml +++ b/src/mainview/components/CallOverlayButtonGroup.qml @@ -22,6 +22,7 @@ import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls.Universal 2.14 import QtQml 2.14 + import net.jami.Adapters 1.0 import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/CallStackView.qml b/src/mainview/components/CallStackView.qml index 265948fd..ac48bc73 100644 --- a/src/mainview/components/CallStackView.qml +++ b/src/mainview/components/CallStackView.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls.Universal 2.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 diff --git a/src/mainview/components/CallViewContextMenu.qml b/src/mainview/components/CallViewContextMenu.qml index 012fc9aa..408deb0f 100644 --- a/src/mainview/components/CallViewContextMenu.qml +++ b/src/mainview/components/CallViewContextMenu.qml @@ -21,6 +21,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtGraphicalEffects 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/ContactPicker.qml b/src/mainview/components/ContactPicker.qml index 4419a43f..9bf98af6 100644 --- a/src/mainview/components/ContactPicker.qml +++ b/src/mainview/components/ContactPicker.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls.Universal 2.14 + import net.jami.Adapters 1.0 import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/ContactPickerItemDelegate.qml b/src/mainview/components/ContactPickerItemDelegate.qml index 2dae40ee..bd3aa237 100644 --- a/src/mainview/components/ContactPickerItemDelegate.qml +++ b/src/mainview/components/ContactPickerItemDelegate.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 + import net.jami.Adapters 1.0 import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/ContactSearchBar.qml b/src/mainview/components/ContactSearchBar.qml index 359a38dd..96aba472 100644 --- a/src/mainview/components/ContactSearchBar.qml +++ b/src/mainview/components/ContactSearchBar.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 + import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/ConversationSmartListContextMenu.qml b/src/mainview/components/ConversationSmartListContextMenu.qml index 9f600940..3a50fe36 100644 --- a/src/mainview/components/ConversationSmartListContextMenu.qml +++ b/src/mainview/components/ConversationSmartListContextMenu.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtGraphicalEffects 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/ConversationSmartListView.qml b/src/mainview/components/ConversationSmartListView.qml index 4256c330..7fe91f76 100644 --- a/src/mainview/components/ConversationSmartListView.qml +++ b/src/mainview/components/ConversationSmartListView.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 diff --git a/src/mainview/components/ConversationSmartListViewItemDelegate.qml b/src/mainview/components/ConversationSmartListViewItemDelegate.qml index a5c349b8..a7a4bc16 100644 --- a/src/mainview/components/ConversationSmartListViewItemDelegate.qml +++ b/src/mainview/components/ConversationSmartListViewItemDelegate.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/IncomingCallPage.qml b/src/mainview/components/IncomingCallPage.qml index dfc4b95c..5efb7308 100644 --- a/src/mainview/components/IncomingCallPage.qml +++ b/src/mainview/components/IncomingCallPage.qml @@ -21,6 +21,7 @@ import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls.Universal 2.14 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/MessageWebView.qml b/src/mainview/components/MessageWebView.qml index e55d2853..bf8a33eb 100644 --- a/src/mainview/components/MessageWebView.qml +++ b/src/mainview/components/MessageWebView.qml @@ -21,6 +21,7 @@ import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtWebEngine 1.10 import QtWebChannel 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/MessageWebViewHeader.qml b/src/mainview/components/MessageWebViewHeader.qml index 282bbe94..d6192c80 100644 --- a/src/mainview/components/MessageWebViewHeader.qml +++ b/src/mainview/components/MessageWebViewHeader.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 + import net.jami.Models 1.0 import net.jami.Constants 1.0 import net.jami.Adapters 1.0 diff --git a/src/mainview/components/OutgoingCallPage.qml b/src/mainview/components/OutgoingCallPage.qml index d418f81a..72023a0d 100644 --- a/src/mainview/components/OutgoingCallPage.qml +++ b/src/mainview/components/OutgoingCallPage.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls.Universal 2.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/ParticipantOverlay.qml b/src/mainview/components/ParticipantOverlay.qml index 922c6214..d74c9dd3 100644 --- a/src/mainview/components/ParticipantOverlay.qml +++ b/src/mainview/components/ParticipantOverlay.qml @@ -23,6 +23,7 @@ import QtQuick.Layouts 1.14 import QtQuick.Shapes 1.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 + import net.jami.Adapters 1.0 import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/ParticipantOverlayMenu.qml b/src/mainview/components/ParticipantOverlayMenu.qml index 7d11c32f..78249d5f 100644 --- a/src/mainview/components/ParticipantOverlayMenu.qml +++ b/src/mainview/components/ParticipantOverlayMenu.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtGraphicalEffects 1.14 import QtQuick.Layouts 1.14 + import net.jami.Adapters 1.0 import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/PluginHandlerItemDelegate.qml b/src/mainview/components/PluginHandlerItemDelegate.qml index 82d6a486..19bdf469 100644 --- a/src/mainview/components/PluginHandlerItemDelegate.qml +++ b/src/mainview/components/PluginHandlerItemDelegate.qml @@ -21,7 +21,7 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 + import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/PluginHandlerPicker.qml b/src/mainview/components/PluginHandlerPicker.qml index d553de6d..8ea38e20 100644 --- a/src/mainview/components/PluginHandlerPicker.qml +++ b/src/mainview/components/PluginHandlerPicker.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls.Universal 2.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/ProjectCreditsScrollView.qml b/src/mainview/components/ProjectCreditsScrollView.qml index 99bfcea9..2d53614b 100644 --- a/src/mainview/components/ProjectCreditsScrollView.qml +++ b/src/mainview/components/ProjectCreditsScrollView.qml @@ -18,6 +18,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/RecordBox.qml b/src/mainview/components/RecordBox.qml index 3c5cddb2..f9412e69 100644 --- a/src/mainview/components/RecordBox.qml +++ b/src/mainview/components/RecordBox.qml @@ -19,9 +19,9 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls.Styles 1.4 import QtGraphicalEffects 1.14 import QtQuick.Shapes 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/ScreenRubberBand.qml b/src/mainview/components/ScreenRubberBand.qml index 04704f9a..a20ec53b 100644 --- a/src/mainview/components/ScreenRubberBand.qml +++ b/src/mainview/components/ScreenRubberBand.qml @@ -21,6 +21,7 @@ import QtQuick.Window 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls.Universal 2.14 + import net.jami.Adapters 1.0 import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/SelectScreen.qml b/src/mainview/components/SelectScreen.qml index 4c5c1001..dcb262f4 100644 --- a/src/mainview/components/SelectScreen.qml +++ b/src/mainview/components/SelectScreen.qml @@ -21,6 +21,7 @@ import QtQuick.Window 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls.Universal 2.14 + import net.jami.Adapters 1.0 import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/SidePanel.qml b/src/mainview/components/SidePanel.qml index 7ccf9f0f..9686a761 100644 --- a/src/mainview/components/SidePanel.qml +++ b/src/mainview/components/SidePanel.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/SidePanelTabBar.qml b/src/mainview/components/SidePanelTabBar.qml index dca27459..980efbf6 100644 --- a/src/mainview/components/SidePanelTabBar.qml +++ b/src/mainview/components/SidePanelTabBar.qml @@ -21,6 +21,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/SipInputPanel.qml b/src/mainview/components/SipInputPanel.qml index 20b2c1a3..b319b030 100644 --- a/src/mainview/components/SipInputPanel.qml +++ b/src/mainview/components/SipInputPanel.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls.Universal 2.14 + import net.jami.Adapters 1.0 import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/UserInfoCallPage.qml b/src/mainview/components/UserInfoCallPage.qml index 8cd9cebf..133d8a0d 100644 --- a/src/mainview/components/UserInfoCallPage.qml +++ b/src/mainview/components/UserInfoCallPage.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls.Universal 2.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/UserProfile.qml b/src/mainview/components/UserProfile.qml index 33aed722..ac0690dc 100644 --- a/src/mainview/components/UserProfile.qml +++ b/src/mainview/components/UserProfile.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 + import net.jami.Constants 1.0 import "../../commoncomponents" diff --git a/src/mainview/components/VideoCallFullScreenWindowContainer.qml b/src/mainview/components/VideoCallFullScreenWindowContainer.qml index 2c76179f..cae72835 100644 --- a/src/mainview/components/VideoCallFullScreenWindowContainer.qml +++ b/src/mainview/components/VideoCallFullScreenWindowContainer.qml @@ -18,6 +18,7 @@ import QtQuick 2.14 import QtQuick.Window 2.14 + import net.jami.Models 1.0 Window { diff --git a/src/mainview/components/VideoCallPage.qml b/src/mainview/components/VideoCallPage.qml index e2e61062..f600f18f 100644 --- a/src/mainview/components/VideoCallPage.qml +++ b/src/mainview/components/VideoCallPage.qml @@ -22,6 +22,7 @@ import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/VideoCallPageContextMenuDeviceItem.qml b/src/mainview/components/VideoCallPageContextMenuDeviceItem.qml index 4b13a430..85754663 100644 --- a/src/mainview/components/VideoCallPageContextMenuDeviceItem.qml +++ b/src/mainview/components/VideoCallPageContextMenuDeviceItem.qml @@ -18,6 +18,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 + import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/WelcomePage.qml b/src/mainview/components/WelcomePage.qml index 582b4114..5b6c178b 100644 --- a/src/mainview/components/WelcomePage.qml +++ b/src/mainview/components/WelcomePage.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/mainview/components/WelcomePageQrDialog.qml b/src/mainview/components/WelcomePageQrDialog.qml index 337d4c45..00be782d 100644 --- a/src/mainview/components/WelcomePageQrDialog.qml +++ b/src/mainview/components/WelcomePageQrDialog.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 diff --git a/src/settingsview/SettingsView.qml b/src/settingsview/SettingsView.qml index 87af87a0..4ac5b063 100644 --- a/src/settingsview/SettingsView.qml +++ b/src/settingsview/SettingsView.qml @@ -22,6 +22,7 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/AccountProfile.qml b/src/settingsview/components/AccountProfile.qml index 070b5170..8ce48df6 100644 --- a/src/settingsview/components/AccountProfile.qml +++ b/src/settingsview/components/AccountProfile.qml @@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/AdvancedCallSettings.qml b/src/settingsview/components/AdvancedCallSettings.qml index d3032e45..fb567b14 100644 --- a/src/settingsview/components/AdvancedCallSettings.qml +++ b/src/settingsview/components/AdvancedCallSettings.qml @@ -22,8 +22,8 @@ import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/AdvancedConnectivitySettings.qml b/src/settingsview/components/AdvancedConnectivitySettings.qml index 9e0d1776..21a1adb7 100644 --- a/src/settingsview/components/AdvancedConnectivitySettings.qml +++ b/src/settingsview/components/AdvancedConnectivitySettings.qml @@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/AdvancedJamiSecuritySettings.qml b/src/settingsview/components/AdvancedJamiSecuritySettings.qml index d860ee2f..75ad2bd2 100644 --- a/src/settingsview/components/AdvancedJamiSecuritySettings.qml +++ b/src/settingsview/components/AdvancedJamiSecuritySettings.qml @@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/AdvancedMediaSettings.qml b/src/settingsview/components/AdvancedMediaSettings.qml index 9d1c0c20..52d23290 100644 --- a/src/settingsview/components/AdvancedMediaSettings.qml +++ b/src/settingsview/components/AdvancedMediaSettings.qml @@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/AdvancedNameServerSettings.qml b/src/settingsview/components/AdvancedNameServerSettings.qml index 282f9680..c44a907f 100644 --- a/src/settingsview/components/AdvancedNameServerSettings.qml +++ b/src/settingsview/components/AdvancedNameServerSettings.qml @@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/AdvancedOpenDHTSettings.qml b/src/settingsview/components/AdvancedOpenDHTSettings.qml index 771587a3..30d8e666 100644 --- a/src/settingsview/components/AdvancedOpenDHTSettings.qml +++ b/src/settingsview/components/AdvancedOpenDHTSettings.qml @@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/AdvancedPublicAddressSettings.qml b/src/settingsview/components/AdvancedPublicAddressSettings.qml index 6a4b7905..b9be1abc 100644 --- a/src/settingsview/components/AdvancedPublicAddressSettings.qml +++ b/src/settingsview/components/AdvancedPublicAddressSettings.qml @@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/AdvancedSDPSettings.qml b/src/settingsview/components/AdvancedSDPSettings.qml index dba6180f..57252b71 100644 --- a/src/settingsview/components/AdvancedSDPSettings.qml +++ b/src/settingsview/components/AdvancedSDPSettings.qml @@ -21,9 +21,9 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.3 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/AdvancedSIPSecuritySettings.qml b/src/settingsview/components/AdvancedSIPSecuritySettings.qml index 4a61839d..bd56dc9a 100644 --- a/src/settingsview/components/AdvancedSIPSecuritySettings.qml +++ b/src/settingsview/components/AdvancedSIPSecuritySettings.qml @@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/AdvancedSettings.qml b/src/settingsview/components/AdvancedSettings.qml index b7141824..f5b6eba5 100644 --- a/src/settingsview/components/AdvancedSettings.qml +++ b/src/settingsview/components/AdvancedSettings.qml @@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/AdvancedVoiceMailSettings.qml b/src/settingsview/components/AdvancedVoiceMailSettings.qml index 8c83d4ec..07c3856d 100644 --- a/src/settingsview/components/AdvancedVoiceMailSettings.qml +++ b/src/settingsview/components/AdvancedVoiceMailSettings.qml @@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/AvSettingPage.qml b/src/settingsview/components/AvSettingPage.qml index fa5e692c..352d1108 100644 --- a/src/settingsview/components/AvSettingPage.qml +++ b/src/settingsview/components/AvSettingPage.qml @@ -21,7 +21,7 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/BannedContacts.qml b/src/settingsview/components/BannedContacts.qml index 9c995d9f..6ffd49fa 100644 --- a/src/settingsview/components/BannedContacts.qml +++ b/src/settingsview/components/BannedContacts.qml @@ -21,8 +21,8 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/ChatviewSettings.qml b/src/settingsview/components/ChatviewSettings.qml index f62de089..9796e150 100644 --- a/src/settingsview/components/ChatviewSettings.qml +++ b/src/settingsview/components/ChatviewSettings.qml @@ -21,8 +21,8 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Enums 1.0 diff --git a/src/settingsview/components/ContactItemDelegate.qml b/src/settingsview/components/ContactItemDelegate.qml index 029a764f..92a8ce1c 100644 --- a/src/settingsview/components/ContactItemDelegate.qml +++ b/src/settingsview/components/ContactItemDelegate.qml @@ -22,7 +22,7 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 + import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/CurrentAccountSettings.qml b/src/settingsview/components/CurrentAccountSettings.qml index f642d949..cb8bc785 100644 --- a/src/settingsview/components/CurrentAccountSettings.qml +++ b/src/settingsview/components/CurrentAccountSettings.qml @@ -21,9 +21,9 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.3 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/DeviceItemDelegate.qml b/src/settingsview/components/DeviceItemDelegate.qml index e270618c..ebc15bf6 100644 --- a/src/settingsview/components/DeviceItemDelegate.qml +++ b/src/settingsview/components/DeviceItemDelegate.qml @@ -21,7 +21,7 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/GeneralSettingsPage.qml b/src/settingsview/components/GeneralSettingsPage.qml index c7d807e2..e08d8c9e 100644 --- a/src/settingsview/components/GeneralSettingsPage.qml +++ b/src/settingsview/components/GeneralSettingsPage.qml @@ -22,6 +22,7 @@ import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import Qt.labs.platform 1.1 import QtGraphicalEffects 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Enums 1.0 diff --git a/src/settingsview/components/JamiUserIdentity.qml b/src/settingsview/components/JamiUserIdentity.qml index 11b041d0..b4ec1dd9 100644 --- a/src/settingsview/components/JamiUserIdentity.qml +++ b/src/settingsview/components/JamiUserIdentity.qml @@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/KeyBoardShortcutKey.qml b/src/settingsview/components/KeyBoardShortcutKey.qml index 1def1f81..6652b21b 100644 --- a/src/settingsview/components/KeyBoardShortcutKey.qml +++ b/src/settingsview/components/KeyBoardShortcutKey.qml @@ -1,5 +1,24 @@ +/* + * Copyright (C) 2019-2020 by Savoir-faire Linux + * Author: Mingrui Zhang + * + * This program 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. + * + * This program 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 this program. If not, see . + */ + import QtQuick 2.14 import QtQuick.Controls 2.14 + import net.jami.Constants 1.0 Item { diff --git a/src/settingsview/components/KeyBoardShortcutTable.qml b/src/settingsview/components/KeyBoardShortcutTable.qml index 240d2191..cbdc1ae9 100644 --- a/src/settingsview/components/KeyBoardShortcutTable.qml +++ b/src/settingsview/components/KeyBoardShortcutTable.qml @@ -21,6 +21,7 @@ import QtQuick.Controls 2.14 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Layouts 1.14 + import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/LevelMeter.qml b/src/settingsview/components/LevelMeter.qml index b14b18df..be3ed8c8 100644 --- a/src/settingsview/components/LevelMeter.qml +++ b/src/settingsview/components/LevelMeter.qml @@ -18,6 +18,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 diff --git a/src/settingsview/components/LinkDeviceDialog.qml b/src/settingsview/components/LinkDeviceDialog.qml index 3e152345..f0de02c3 100644 --- a/src/settingsview/components/LinkDeviceDialog.qml +++ b/src/settingsview/components/LinkDeviceDialog.qml @@ -20,7 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls.Styles 1.4 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/LinkedDevices.qml b/src/settingsview/components/LinkedDevices.qml index 35fe2722..fbf803c5 100644 --- a/src/settingsview/components/LinkedDevices.qml +++ b/src/settingsview/components/LinkedDevices.qml @@ -22,8 +22,8 @@ import QtQuick.Controls.Universal 2.14 import QtQuick.Dialogs 1.3 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/MediaCodecDelegate.qml b/src/settingsview/components/MediaCodecDelegate.qml index 0774e519..278386d1 100644 --- a/src/settingsview/components/MediaCodecDelegate.qml +++ b/src/settingsview/components/MediaCodecDelegate.qml @@ -21,7 +21,7 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 + import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/MediaSettings.qml b/src/settingsview/components/MediaSettings.qml index cf451fed..1463c0a3 100644 --- a/src/settingsview/components/MediaSettings.qml +++ b/src/settingsview/components/MediaSettings.qml @@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/NameRegistrationDialog.qml b/src/settingsview/components/NameRegistrationDialog.qml index 9c39a075..83768c58 100644 --- a/src/settingsview/components/NameRegistrationDialog.qml +++ b/src/settingsview/components/NameRegistrationDialog.qml @@ -20,7 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls.Styles 1.4 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/PluginItemDelegate.qml b/src/settingsview/components/PluginItemDelegate.qml index 8db65967..5c254fd8 100644 --- a/src/settingsview/components/PluginItemDelegate.qml +++ b/src/settingsview/components/PluginItemDelegate.qml @@ -21,7 +21,7 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 + import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/PluginListPreferencesView.qml b/src/settingsview/components/PluginListPreferencesView.qml index bf986ca0..a7ee6f0f 100644 --- a/src/settingsview/components/PluginListPreferencesView.qml +++ b/src/settingsview/components/PluginListPreferencesView.qml @@ -23,6 +23,7 @@ import QtQuick.Layouts 1.14 import Qt.labs.platform 1.1 import QtQuick.Dialogs 1.3 import QtGraphicalEffects 1.14 + import net.jami.Adapters 1.0 import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/PluginListSettingsView.qml b/src/settingsview/components/PluginListSettingsView.qml index 6c1fc640..9b311085 100644 --- a/src/settingsview/components/PluginListSettingsView.qml +++ b/src/settingsview/components/PluginListSettingsView.qml @@ -22,6 +22,7 @@ import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import Qt.labs.platform 1.1 import QtGraphicalEffects 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/PluginSettingsPage.qml b/src/settingsview/components/PluginSettingsPage.qml index 0a4260e2..111ecc71 100644 --- a/src/settingsview/components/PluginSettingsPage.qml +++ b/src/settingsview/components/PluginSettingsPage.qml @@ -22,6 +22,7 @@ import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import Qt.labs.platform 1.1 import QtGraphicalEffects 1.14 + import net.jami.Adapters 1.0 import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/RecordingSettings.qml b/src/settingsview/components/RecordingSettings.qml index fcdd4e5c..d3d999c0 100644 --- a/src/settingsview/components/RecordingSettings.qml +++ b/src/settingsview/components/RecordingSettings.qml @@ -21,8 +21,8 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/RevokeDevicePasswordDialog.qml b/src/settingsview/components/RevokeDevicePasswordDialog.qml index d78bb176..32e827a9 100644 --- a/src/settingsview/components/RevokeDevicePasswordDialog.qml +++ b/src/settingsview/components/RevokeDevicePasswordDialog.qml @@ -20,7 +20,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls.Styles 1.4 + import net.jami.Constants 1.0 import "../../commoncomponents" diff --git a/src/settingsview/components/SIPUserIdentity.qml b/src/settingsview/components/SIPUserIdentity.qml index 5f8e5789..76684329 100644 --- a/src/settingsview/components/SIPUserIdentity.qml +++ b/src/settingsview/components/SIPUserIdentity.qml @@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/SettingMaterialButton.qml b/src/settingsview/components/SettingMaterialButton.qml index cf3b7421..187c8326 100644 --- a/src/settingsview/components/SettingMaterialButton.qml +++ b/src/settingsview/components/SettingMaterialButton.qml @@ -21,9 +21,9 @@ import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 -import net.jami.Models 1.0 import Qt.labs.platform 1.1 + +import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/SettingSpinBox.qml b/src/settingsview/components/SettingSpinBox.qml index d7cd17d7..58d4d67c 100644 --- a/src/settingsview/components/SettingSpinBox.qml +++ b/src/settingsview/components/SettingSpinBox.qml @@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/SettingsComboBox.qml b/src/settingsview/components/SettingsComboBox.qml index 5fc1a1a6..5b95b24c 100644 --- a/src/settingsview/components/SettingsComboBox.qml +++ b/src/settingsview/components/SettingsComboBox.qml @@ -22,7 +22,7 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 + import net.jami.Constants 1.0 import "../../commoncomponents" diff --git a/src/settingsview/components/SettingsHeader.qml b/src/settingsview/components/SettingsHeader.qml index 0dc8be3a..f7b6b60f 100644 --- a/src/settingsview/components/SettingsHeader.qml +++ b/src/settingsview/components/SettingsHeader.qml @@ -21,7 +21,7 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 + import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/SettingsMaterialLineEdit.qml b/src/settingsview/components/SettingsMaterialLineEdit.qml index d98501ec..2a31b873 100644 --- a/src/settingsview/components/SettingsMaterialLineEdit.qml +++ b/src/settingsview/components/SettingsMaterialLineEdit.qml @@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/SettingsMenu.qml b/src/settingsview/components/SettingsMenu.qml index 4da59c75..cb820a96 100644 --- a/src/settingsview/components/SettingsMenu.qml +++ b/src/settingsview/components/SettingsMenu.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 + import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/SystemSettings.qml b/src/settingsview/components/SystemSettings.qml index e9520a58..4737cdea 100644 --- a/src/settingsview/components/SystemSettings.qml +++ b/src/settingsview/components/SystemSettings.qml @@ -21,8 +21,8 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Enums 1.0 diff --git a/src/settingsview/components/ToggleSwitch.qml b/src/settingsview/components/ToggleSwitch.qml index 052bd4e6..9fc1dc33 100644 --- a/src/settingsview/components/ToggleSwitch.qml +++ b/src/settingsview/components/ToggleSwitch.qml @@ -21,7 +21,7 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 + import net.jami.Constants 1.0 import "../../commoncomponents" diff --git a/src/settingsview/components/UpdateSettings.qml b/src/settingsview/components/UpdateSettings.qml index 3005c7c8..0df5bf11 100644 --- a/src/settingsview/components/UpdateSettings.qml +++ b/src/settingsview/components/UpdateSettings.qml @@ -19,9 +19,9 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 + import net.jami.Adapters 1.0 import net.jami.Enums 1.0 import net.jami.Models 1.0 diff --git a/src/settingsview/components/UserIdentity.qml b/src/settingsview/components/UserIdentity.qml index dc901b25..c9732a3d 100644 --- a/src/settingsview/components/UserIdentity.qml +++ b/src/settingsview/components/UserIdentity.qml @@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/settingsview/components/VideoSettings.qml b/src/settingsview/components/VideoSettings.qml index 6e3c301f..8680ae48 100644 --- a/src/settingsview/components/VideoSettings.qml +++ b/src/settingsview/components/VideoSettings.qml @@ -21,8 +21,8 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import QtQuick.Controls.Styles 1.4 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Enums 1.0 diff --git a/src/wizardview/WizardView.qml b/src/wizardview/WizardView.qml index 655fd652..c1e7f7a8 100644 --- a/src/wizardview/WizardView.qml +++ b/src/wizardview/WizardView.qml @@ -21,6 +21,7 @@ import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/wizardview/components/AccountCreationStepIndicator.qml b/src/wizardview/components/AccountCreationStepIndicator.qml index c81a92e8..37daaf0e 100644 --- a/src/wizardview/components/AccountCreationStepIndicator.qml +++ b/src/wizardview/components/AccountCreationStepIndicator.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 + import net.jami.Constants 1.0 import "../../commoncomponents" diff --git a/src/wizardview/components/BackupKeyPage.qml b/src/wizardview/components/BackupKeyPage.qml index fbbdf765..cf69527f 100644 --- a/src/wizardview/components/BackupKeyPage.qml +++ b/src/wizardview/components/BackupKeyPage.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/wizardview/components/CollapsiblePasswordWidget.qml b/src/wizardview/components/CollapsiblePasswordWidget.qml index 5a34ca5e..c9bf8f64 100644 --- a/src/wizardview/components/CollapsiblePasswordWidget.qml +++ b/src/wizardview/components/CollapsiblePasswordWidget.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 + import net.jami.Constants 1.0 import "../../commoncomponents" diff --git a/src/wizardview/components/ConnectToAccountManagerPage.qml b/src/wizardview/components/ConnectToAccountManagerPage.qml index bf4d69c7..ae2610ae 100644 --- a/src/wizardview/components/ConnectToAccountManagerPage.qml +++ b/src/wizardview/components/ConnectToAccountManagerPage.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 + import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/wizardview/components/CreateAccountPage.qml b/src/wizardview/components/CreateAccountPage.qml index 2a45f80f..af6426f8 100644 --- a/src/wizardview/components/CreateAccountPage.qml +++ b/src/wizardview/components/CreateAccountPage.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/wizardview/components/CreateSIPAccountPage.qml b/src/wizardview/components/CreateSIPAccountPage.qml index 81eae576..a6b8d389 100644 --- a/src/wizardview/components/CreateSIPAccountPage.qml +++ b/src/wizardview/components/CreateSIPAccountPage.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 + import net.jami.Constants 1.0 import "../../commoncomponents" diff --git a/src/wizardview/components/ImportFromBackupPage.qml b/src/wizardview/components/ImportFromBackupPage.qml index 454dbbab..f1078d52 100644 --- a/src/wizardview/components/ImportFromBackupPage.qml +++ b/src/wizardview/components/ImportFromBackupPage.qml @@ -20,6 +20,7 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import Qt.labs.platform 1.1 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0 diff --git a/src/wizardview/components/ImportFromDevicePage.qml b/src/wizardview/components/ImportFromDevicePage.qml index 66886d62..3f15c661 100644 --- a/src/wizardview/components/ImportFromDevicePage.qml +++ b/src/wizardview/components/ImportFromDevicePage.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 + import net.jami.Models 1.0 import net.jami.Constants 1.0 diff --git a/src/wizardview/components/ProfilePage.qml b/src/wizardview/components/ProfilePage.qml index cd7e72f2..79b6c164 100644 --- a/src/wizardview/components/ProfilePage.qml +++ b/src/wizardview/components/ProfilePage.qml @@ -19,6 +19,7 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 + import net.jami.Constants 1.0 import "../../commoncomponents" diff --git a/src/wizardview/components/WelcomePage.qml b/src/wizardview/components/WelcomePage.qml index f44a9968..48ba545b 100644 --- a/src/wizardview/components/WelcomePage.qml +++ b/src/wizardview/components/WelcomePage.qml @@ -21,6 +21,7 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 import QtGraphicalEffects 1.14 + import net.jami.Models 1.0 import net.jami.Adapters 1.0 import net.jami.Constants 1.0