From 7bd7b2e9ee9f96a17613d9e64d225ef2bba02a56 Mon Sep 17 00:00:00 2001
From: ababi <albert.babi@savoirfairelinux.com>
Date: Sat, 5 Dec 2020 14:05:57 +0100
Subject: [PATCH] misc: move JamiTheme and JamiStrings to net.jami.Constants
namespace
Change-Id: Ief728a8bd36f6c29a906686988b28b0640b2065c
---
src/MainApplicationWindow.qml | 1 +
src/commoncomponents/AccountMigrationDialog.qml | 2 +-
src/commoncomponents/AvatarImage.qml | 2 +-
src/commoncomponents/BaseContextMenu.qml | 2 +-
src/commoncomponents/BaseDialog.qml | 2 --
src/commoncomponents/DeleteAccountDialog.qml | 2 +-
src/commoncomponents/ElidedTextLabel.qml | 3 +--
src/commoncomponents/GeneralMenuItem.qml | 2 +-
src/commoncomponents/GeneralMenuSeparator.qml | 2 +-
src/commoncomponents/InfoLineEdit.qml | 3 +--
src/commoncomponents/JamiFileDialog.qml | 2 +-
src/commoncomponents/ListViewJami.qml | 2 +-
src/commoncomponents/LookupStatusLabel.qml | 1 +
src/commoncomponents/MaterialButton.qml | 3 +--
src/commoncomponents/MaterialLineEdit.qml | 3 +--
src/commoncomponents/ModalPopup.qml | 2 +-
src/commoncomponents/PasswordDialog.qml | 4 +---
src/commoncomponents/PhotoboothView.qml | 1 +
src/commoncomponents/PreferenceItemDelegate.qml | 1 +
src/commoncomponents/PresenceIndicator.qml | 1 +
src/commoncomponents/PushButton.qml | 2 +-
src/commoncomponents/SettingParaCombobox.qml | 3 +--
src/commoncomponents/SimpleMessageDialog.qml | 2 +-
src/commoncomponents/SpinnerButton.qml | 2 +-
src/commoncomponents/TintedButton.qml | 1 -
src/constant/JamiStrings.qml | 2 +-
src/mainview/MainView.qml | 1 +
src/mainview/components/AboutPopUp.qml | 4 ++--
src/mainview/components/AccountComboBox.qml | 1 +
src/mainview/components/AccountComboBoxPopup.qml | 1 +
src/mainview/components/AudioCallPage.qml | 1 +
src/mainview/components/CallAdvancedOptions.qml | 1 +
src/mainview/components/CallOverlay.qml | 1 +
src/mainview/components/CallOverlayButtonGroup.qml | 1 +
src/mainview/components/CallViewContextMenu.qml | 1 +
src/mainview/components/ContactPicker.qml | 1 +
src/mainview/components/ContactPickerItemDelegate.qml | 1 +
src/mainview/components/ContactSearchBar.qml | 1 +
.../components/ConversationSmartListContextMenu.qml | 1 +
.../ConversationSmartListViewItemDelegate.qml | 1 +
src/mainview/components/IncomingCallPage.qml | 2 ++
src/mainview/components/MediaHandlerItemDelegate.qml | 1 +
src/mainview/components/MediaHandlerPicker.qml | 1 +
src/mainview/components/MessageWebView.qml | 1 +
src/mainview/components/MessageWebViewHeader.qml | 1 +
src/mainview/components/OutgoingCallPage.qml | 1 +
src/mainview/components/ParticipantContextMenu.qml | 1 +
src/mainview/components/ParticipantOverlay.qml | 1 +
src/mainview/components/ProjectCreditsScrollView.qml | 1 +
src/mainview/components/RecordBox.qml | 1 +
src/mainview/components/ScreenRubberBand.qml | 2 +-
src/mainview/components/SelectScreen.qml | 1 +
src/mainview/components/SidePanel.qml | 1 +
src/mainview/components/SidePanelTabBar.qml | 2 ++
src/mainview/components/SipInputPanel.qml | 1 +
src/mainview/components/UserInfoCallPage.qml | 1 +
src/mainview/components/UserProfile.qml | 2 +-
src/mainview/components/VideoCallPage.qml | 1 +
.../components/VideoCallPageContextMenuDeviceItem.qml | 1 +
src/mainview/components/WelcomePage.qml | 1 +
src/mainview/components/WelcomePageQrDialog.qml | 1 -
src/qmlregister.cpp | 10 +++++-----
src/settingsview/SettingsView.qml | 1 +
src/settingsview/components/AccountProfile.qml | 3 ++-
src/settingsview/components/AdvancedCallSettings.qml | 2 +-
.../components/AdvancedConnectivitySettings.qml | 2 +-
.../components/AdvancedJamiSecuritySettings.qml | 2 +-
src/settingsview/components/AdvancedMediaSettings.qml | 2 +-
.../components/AdvancedNameServerSettings.qml | 1 +
.../components/AdvancedOpenDHTSettings.qml | 2 +-
.../components/AdvancedPublicAddressSettings.qml | 2 +-
src/settingsview/components/AdvancedSDPSettings.qml | 2 +-
.../components/AdvancedSIPSecuritySettings.qml | 1 +
src/settingsview/components/AdvancedSettings.qml | 2 +-
.../components/AdvancedVoiceMailSettings.qml | 2 +-
src/settingsview/components/AudioSettings.qml | 1 +
src/settingsview/components/AvSettingPage.qml | 1 +
src/settingsview/components/BannedContacts.qml | 1 +
src/settingsview/components/BannedItemDelegate.qml | 1 +
src/settingsview/components/ChatviewSettings.qml | 3 ++-
src/settingsview/components/CurrentAccountSettings.qml | 2 +-
src/settingsview/components/DeviceItemDelegate.qml | 1 +
src/settingsview/components/GeneralSettingsPage.qml | 1 +
src/settingsview/components/JamiUserIdentity.qml | 1 +
src/settingsview/components/KeyBoardShortcutKey.qml | 2 +-
src/settingsview/components/KeyBoardShortcutTable.qml | 2 +-
src/settingsview/components/LinkDeviceDialog.qml | 2 +-
src/settingsview/components/LinkedDevices.qml | 1 +
src/settingsview/components/MediaCodecDelegate.qml | 1 +
src/settingsview/components/MediaSettings.qml | 2 +-
src/settingsview/components/NameRegistrationDialog.qml | 2 +-
src/settingsview/components/PluginItemDelegate.qml | 1 +
.../components/PluginListPreferencesView.qml | 2 ++
src/settingsview/components/PluginListSettingsView.qml | 1 +
src/settingsview/components/PluginSettingsPage.qml | 1 +
src/settingsview/components/RecordingSettings.qml | 3 ++-
.../components/RevokeDevicePasswordDialog.qml | 2 +-
src/settingsview/components/SIPUserIdentity.qml | 1 +
src/settingsview/components/SettingMaterialButton.qml | 4 ++--
src/settingsview/components/SettingSpinBox.qml | 2 +-
src/settingsview/components/SettingsComboBox.qml | 2 +-
src/settingsview/components/SettingsHeader.qml | 1 +
.../components/SettingsMaterialLineEdit.qml | 2 +-
src/settingsview/components/SettingsMenu.qml | 1 +
src/settingsview/components/SystemSettings.qml | 3 ++-
src/settingsview/components/ToggleSwitch.qml | 2 +-
src/settingsview/components/UpdateSettings.qml | 2 ++
src/settingsview/components/UserIdentity.qml | 1 +
src/settingsview/components/VideoSettings.qml | 1 +
src/wizardview/WizardView.qml | 2 +-
.../components/AccountCreationStepIndicator.qml | 2 +-
src/wizardview/components/BackupKeyPage.qml | 3 ++-
.../components/CollapsiblePasswordWidget.qml | 2 +-
.../components/ConnectToAccountManagerPage.qml | 3 ++-
src/wizardview/components/CreateAccountPage.qml | 3 ++-
src/wizardview/components/CreateSIPAccountPage.qml | 2 +-
src/wizardview/components/ImportFromBackupPage.qml | 2 +-
src/wizardview/components/ImportFromDevicePage.qml | 3 ++-
src/wizardview/components/ProfilePage.qml | 2 +-
src/wizardview/components/WelcomePage.qml | 2 +-
120 files changed, 135 insertions(+), 76 deletions(-)
diff --git a/src/MainApplicationWindow.qml b/src/MainApplicationWindow.qml
index fd673a843..821dc8665 100644
--- a/src/MainApplicationWindow.qml
+++ b/src/MainApplicationWindow.qml
@@ -7,6 +7,7 @@ import QtGraphicalEffects 1.14
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Enums 1.0
+import net.jami.Constants 1.0
import "mainview"
import "wizardview"
diff --git a/src/commoncomponents/AccountMigrationDialog.qml b/src/commoncomponents/AccountMigrationDialog.qml
index e9e8aae43..b1bba5356 100644
--- a/src/commoncomponents/AccountMigrationDialog.qml
+++ b/src/commoncomponents/AccountMigrationDialog.qml
@@ -24,8 +24,8 @@ 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
-import "../constant"
import "../wizardview/components"
// Account Migration Dialog for migrating account
diff --git a/src/commoncomponents/AvatarImage.qml b/src/commoncomponents/AvatarImage.qml
index 715350128..d59177bb7 100644
--- a/src/commoncomponents/AvatarImage.qml
+++ b/src/commoncomponents/AvatarImage.qml
@@ -19,7 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Window 2.14
-import net.jami.Models 1.0
+import net.jami.Constants 1.0
Item {
id: root
diff --git a/src/commoncomponents/BaseContextMenu.qml b/src/commoncomponents/BaseContextMenu.qml
index 09b016af8..c0f59b296 100644
--- a/src/commoncomponents/BaseContextMenu.qml
+++ b/src/commoncomponents/BaseContextMenu.qml
@@ -19,7 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
-import net.jami.Models 1.0
+import net.jami.Constants 1.0
Menu {
id: root
diff --git a/src/commoncomponents/BaseDialog.qml b/src/commoncomponents/BaseDialog.qml
index 2441f1cd3..b30983d2f 100644
--- a/src/commoncomponents/BaseDialog.qml
+++ b/src/commoncomponents/BaseDialog.qml
@@ -19,8 +19,6 @@
import QtQuick 2.14
import QtQuick.Dialogs 1.3
-import "../constant"
-
Dialog {
id: root
diff --git a/src/commoncomponents/DeleteAccountDialog.qml b/src/commoncomponents/DeleteAccountDialog.qml
index c7040cc3d..ba3a9608b 100644
--- a/src/commoncomponents/DeleteAccountDialog.qml
+++ b/src/commoncomponents/DeleteAccountDialog.qml
@@ -22,8 +22,8 @@ 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
-import "../constant"
import "../commoncomponents"
BaseDialog {
diff --git a/src/commoncomponents/ElidedTextLabel.qml b/src/commoncomponents/ElidedTextLabel.qml
index 5c6648f66..3d334b501 100644
--- a/src/commoncomponents/ElidedTextLabel.qml
+++ b/src/commoncomponents/ElidedTextLabel.qml
@@ -18,8 +18,7 @@
import QtQuick 2.14
import QtQuick.Controls 1.4
-
-import "../constant"
+import net.jami.Constants 1.0
Label {
id: root
diff --git a/src/commoncomponents/GeneralMenuItem.qml b/src/commoncomponents/GeneralMenuItem.qml
index fa226d570..d87a6b38c 100644
--- a/src/commoncomponents/GeneralMenuItem.qml
+++ b/src/commoncomponents/GeneralMenuItem.qml
@@ -20,7 +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
// General menu item.
// Can control top, bottom, left, right border width.
diff --git a/src/commoncomponents/GeneralMenuSeparator.qml b/src/commoncomponents/GeneralMenuSeparator.qml
index 9eca4f1b9..f719a2d5a 100644
--- a/src/commoncomponents/GeneralMenuSeparator.qml
+++ b/src/commoncomponents/GeneralMenuSeparator.qml
@@ -18,7 +18,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
-import net.jami.Models 1.0
+import net.jami.Constants 1.0
MenuSeparator {
id: menuSeparator
diff --git a/src/commoncomponents/InfoLineEdit.qml b/src/commoncomponents/InfoLineEdit.qml
index f5ed6f295..752139313 100644
--- a/src/commoncomponents/InfoLineEdit.qml
+++ b/src/commoncomponents/InfoLineEdit.qml
@@ -2,8 +2,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Styles 1.4
-
-import "../constant"
+import net.jami.Constants 1.0
TextField{
enum BorderColorMode{
diff --git a/src/commoncomponents/JamiFileDialog.qml b/src/commoncomponents/JamiFileDialog.qml
index 6313a955c..0ba09a6bd 100644
--- a/src/commoncomponents/JamiFileDialog.qml
+++ b/src/commoncomponents/JamiFileDialog.qml
@@ -18,7 +18,7 @@
import QtQuick 2.14
import Qt.labs.platform 1.1
-import "../constant"
+import net.jami.Constants 1.0
FileDialog {
id: root
diff --git a/src/commoncomponents/ListViewJami.qml b/src/commoncomponents/ListViewJami.qml
index c395ece66..be6e24aab 100644
--- a/src/commoncomponents/ListViewJami.qml
+++ b/src/commoncomponents/ListViewJami.qml
@@ -22,7 +22,7 @@ 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
Rectangle {
id: listViewBackground
diff --git a/src/commoncomponents/LookupStatusLabel.qml b/src/commoncomponents/LookupStatusLabel.qml
index daeee45b3..e44a7f83c 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 {
id: lookupStatusLabel
diff --git a/src/commoncomponents/MaterialButton.qml b/src/commoncomponents/MaterialButton.qml
index b43bbadc7..08dda0403 100644
--- a/src/commoncomponents/MaterialButton.qml
+++ b/src/commoncomponents/MaterialButton.qml
@@ -20,8 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
import QtQuick.Window 2.14
-
-import "../constant"
+import net.jami.Constants 1.0
Button {
id: root
diff --git a/src/commoncomponents/MaterialLineEdit.qml b/src/commoncomponents/MaterialLineEdit.qml
index 085c52893..31323dfab 100644
--- a/src/commoncomponents/MaterialLineEdit.qml
+++ b/src/commoncomponents/MaterialLineEdit.qml
@@ -20,8 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-
-import "../constant"
+import net.jami.Constants 1.0
TextField {
enum BorderColorMode {
diff --git a/src/commoncomponents/ModalPopup.qml b/src/commoncomponents/ModalPopup.qml
index 6d171a80c..7534204a8 100644
--- a/src/commoncomponents/ModalPopup.qml
+++ b/src/commoncomponents/ModalPopup.qml
@@ -19,7 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
-import net.jami.Models 1.0
+import net.jami.Constants 1.0
Popup {
id: root
diff --git a/src/commoncomponents/PasswordDialog.qml b/src/commoncomponents/PasswordDialog.qml
index 48a47ee52..ccb56719d 100644
--- a/src/commoncomponents/PasswordDialog.qml
+++ b/src/commoncomponents/PasswordDialog.qml
@@ -20,10 +20,8 @@ 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 "../constant"
+import net.jami.Constants 1.0
// PasswordDialog for changing password and exporting account
BaseDialog {
diff --git a/src/commoncomponents/PhotoboothView.qml b/src/commoncomponents/PhotoboothView.qml
index 21434e3d3..dec922ad6 100644
--- a/src/commoncomponents/PhotoboothView.qml
+++ b/src/commoncomponents/PhotoboothView.qml
@@ -6,6 +6,7 @@ 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
ColumnLayout {
property int photoState: PhotoboothView.PhotoState.Default
diff --git a/src/commoncomponents/PreferenceItemDelegate.qml b/src/commoncomponents/PreferenceItemDelegate.qml
index 0a453456a..f59c8d264 100644
--- a/src/commoncomponents/PreferenceItemDelegate.qml
+++ b/src/commoncomponents/PreferenceItemDelegate.qml
@@ -26,6 +26,7 @@ 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
import "../commoncomponents"
diff --git a/src/commoncomponents/PresenceIndicator.qml b/src/commoncomponents/PresenceIndicator.qml
index 1bc69bb28..d3e95c935 100644
--- a/src/commoncomponents/PresenceIndicator.qml
+++ b/src/commoncomponents/PresenceIndicator.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import net.jami.Models 1.0
+import net.jami.Constants 1.0
// Serves as either account or contact presence indicator.
// TODO: this should be part of an avatar component at some point.
diff --git a/src/commoncomponents/PushButton.qml b/src/commoncomponents/PushButton.qml
index 118e2e817..a75f5a71a 100644
--- a/src/commoncomponents/PushButton.qml
+++ b/src/commoncomponents/PushButton.qml
@@ -20,7 +20,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
-import "../constant"
+import net.jami.Constants 1.0
//
// PushButton contains the following configurable properties:
diff --git a/src/commoncomponents/SettingParaCombobox.qml b/src/commoncomponents/SettingParaCombobox.qml
index 8c842f095..f52cb93cf 100644
--- a/src/commoncomponents/SettingParaCombobox.qml
+++ b/src/commoncomponents/SettingParaCombobox.qml
@@ -22,8 +22,7 @@ import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
import QtQuick.Controls.Styles 1.4
-
-import "../constant"
+import net.jami.Constants 1.0
ComboBox {
id: root
diff --git a/src/commoncomponents/SimpleMessageDialog.qml b/src/commoncomponents/SimpleMessageDialog.qml
index 9e453b91a..c542796de 100644
--- a/src/commoncomponents/SimpleMessageDialog.qml
+++ b/src/commoncomponents/SimpleMessageDialog.qml
@@ -19,8 +19,8 @@
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
BaseDialog {
id: root
diff --git a/src/commoncomponents/SpinnerButton.qml b/src/commoncomponents/SpinnerButton.qml
index 44326d5a8..a6a6cb299 100644
--- a/src/commoncomponents/SpinnerButton.qml
+++ b/src/commoncomponents/SpinnerButton.qml
@@ -18,7 +18,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
-import net.jami.Models 1.0
+import net.jami.Constants 1.0
MaterialButton {
id: root
diff --git a/src/commoncomponents/TintedButton.qml b/src/commoncomponents/TintedButton.qml
index c4bc719d1..fba4737d2 100644
--- a/src/commoncomponents/TintedButton.qml
+++ b/src/commoncomponents/TintedButton.qml
@@ -18,7 +18,6 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
-import net.jami.Models 1.0
Button {
id: tintedButton
diff --git a/src/constant/JamiStrings.qml b/src/constant/JamiStrings.qml
index 1a7ee0811..97c17cb06 100644
--- a/src/constant/JamiStrings.qml
+++ b/src/constant/JamiStrings.qml
@@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-// JamiTheme as a singleton is to provide global strings entries.
+// JamiStrings as a singleton is to provide global strings entries.
pragma Singleton
import QtQuick 2.14
diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index 22bf96b3d..163c2bab8 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -24,6 +24,7 @@ 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
// Import qml component files.
import "components"
diff --git a/src/mainview/components/AboutPopUp.qml b/src/mainview/components/AboutPopUp.qml
index a5a80d8e8..94c96de7e 100644
--- a/src/mainview/components/AboutPopUp.qml
+++ b/src/mainview/components/AboutPopUp.qml
@@ -19,10 +19,10 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
-import net.jami.Models 1.0
+import net.jami.Models 1.0 //Albert
import net.jami.Adapters 1.0
+import net.jami.Constants 1.0
-import "../../constant"
import "../../commoncomponents"
ModalPopup {
diff --git a/src/mainview/components/AccountComboBox.qml b/src/mainview/components/AccountComboBox.qml
index 9544fd108..28dfbcbf4 100644
--- a/src/mainview/components/AccountComboBox.qml
+++ b/src/mainview/components/AccountComboBox.qml
@@ -23,6 +23,7 @@ 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
import "../../commoncomponents"
diff --git a/src/mainview/components/AccountComboBoxPopup.qml b/src/mainview/components/AccountComboBoxPopup.qml
index e744d3e60..257b33d06 100644
--- a/src/mainview/components/AccountComboBoxPopup.qml
+++ b/src/mainview/components/AccountComboBoxPopup.qml
@@ -22,6 +22,7 @@ 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
import "../../commoncomponents"
diff --git a/src/mainview/components/AudioCallPage.qml b/src/mainview/components/AudioCallPage.qml
index 645b4e611..0005a1fe6 100644
--- a/src/mainview/components/AudioCallPage.qml
+++ b/src/mainview/components/AudioCallPage.qml
@@ -22,6 +22,7 @@ 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
import "../../commoncomponents"
diff --git a/src/mainview/components/CallAdvancedOptions.qml b/src/mainview/components/CallAdvancedOptions.qml
index cfa621677..d67f03616 100644
--- a/src/mainview/components/CallAdvancedOptions.qml
+++ b/src/mainview/components/CallAdvancedOptions.qml
@@ -22,6 +22,7 @@ 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.Constants 1.0
import "../../commoncomponents"
diff --git a/src/mainview/components/CallOverlay.qml b/src/mainview/components/CallOverlay.qml
index ae0ee8723..05bbe0dab 100644
--- a/src/mainview/components/CallOverlay.qml
+++ b/src/mainview/components/CallOverlay.qml
@@ -25,6 +25,7 @@ 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
import "../js/contactpickercreation.js" as ContactPickerCreation
import "../js/mediahandlerpickercreation.js" as MediaHandlerPickerCreation
diff --git a/src/mainview/components/CallOverlayButtonGroup.qml b/src/mainview/components/CallOverlayButtonGroup.qml
index 6770b157e..f8bfc0e85 100644
--- a/src/mainview/components/CallOverlayButtonGroup.qml
+++ b/src/mainview/components/CallOverlayButtonGroup.qml
@@ -23,6 +23,7 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
import QtQml 2.14
import net.jami.Models 1.0
+import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/mainview/components/CallViewContextMenu.qml b/src/mainview/components/CallViewContextMenu.qml
index 6f99864ef..a0dbdfed0 100644
--- a/src/mainview/components/CallViewContextMenu.qml
+++ b/src/mainview/components/CallViewContextMenu.qml
@@ -23,6 +23,7 @@ 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
import "../../commoncomponents"
import "../../commoncomponents/js/contextmenugenerator.js" as ContextMenuGenerator
diff --git a/src/mainview/components/ContactPicker.qml b/src/mainview/components/ContactPicker.qml
index 2618e088b..9d767d079 100644
--- a/src/mainview/components/ContactPicker.qml
+++ b/src/mainview/components/ContactPicker.qml
@@ -21,6 +21,7 @@ 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.Constants 1.0
import "../../commoncomponents"
diff --git a/src/mainview/components/ContactPickerItemDelegate.qml b/src/mainview/components/ContactPickerItemDelegate.qml
index 6094cdf40..681ac42e5 100644
--- a/src/mainview/components/ContactPickerItemDelegate.qml
+++ b/src/mainview/components/ContactPickerItemDelegate.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.Constants 1.0
import "../../commoncomponents"
diff --git a/src/mainview/components/ContactSearchBar.qml b/src/mainview/components/ContactSearchBar.qml
index 56f7b19ef..359a38dd4 100644
--- a/src/mainview/components/ContactSearchBar.qml
+++ b/src/mainview/components/ContactSearchBar.qml
@@ -21,6 +21,7 @@ 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
Rectangle {
id: contactSearchBarRect
diff --git a/src/mainview/components/ConversationSmartListContextMenu.qml b/src/mainview/components/ConversationSmartListContextMenu.qml
index 40056518e..1d22d1b76 100644
--- a/src/mainview/components/ConversationSmartListContextMenu.qml
+++ b/src/mainview/components/ConversationSmartListContextMenu.qml
@@ -21,6 +21,7 @@ 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
import "../../commoncomponents"
import "../../commoncomponents/js/contextmenugenerator.js" as ContextMenuGenerator
diff --git a/src/mainview/components/ConversationSmartListViewItemDelegate.qml b/src/mainview/components/ConversationSmartListViewItemDelegate.qml
index e51fd11a8..0cd9eb97c 100644
--- a/src/mainview/components/ConversationSmartListViewItemDelegate.qml
+++ b/src/mainview/components/ConversationSmartListViewItemDelegate.qml
@@ -21,6 +21,7 @@ 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
import "../../commoncomponents"
diff --git a/src/mainview/components/IncomingCallPage.qml b/src/mainview/components/IncomingCallPage.qml
index ac01b7901..dfc4b95c7 100644
--- a/src/mainview/components/IncomingCallPage.qml
+++ b/src/mainview/components/IncomingCallPage.qml
@@ -20,8 +20,10 @@ import QtQuick 2.14
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
import "../../commoncomponents"
diff --git a/src/mainview/components/MediaHandlerItemDelegate.qml b/src/mainview/components/MediaHandlerItemDelegate.qml
index 75f98dad3..914a576b6 100644
--- a/src/mainview/components/MediaHandlerItemDelegate.qml
+++ b/src/mainview/components/MediaHandlerItemDelegate.qml
@@ -23,6 +23,7 @@ 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
import "../../commoncomponents"
diff --git a/src/mainview/components/MediaHandlerPicker.qml b/src/mainview/components/MediaHandlerPicker.qml
index 9d72189e3..bc7b8b6b5 100644
--- a/src/mainview/components/MediaHandlerPicker.qml
+++ b/src/mainview/components/MediaHandlerPicker.qml
@@ -22,6 +22,7 @@ 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
import "../../commoncomponents"
diff --git a/src/mainview/components/MessageWebView.qml b/src/mainview/components/MessageWebView.qml
index afaab3e27..f29742602 100644
--- a/src/mainview/components/MessageWebView.qml
+++ b/src/mainview/components/MessageWebView.qml
@@ -23,6 +23,7 @@ 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
import "../../commoncomponents"
diff --git a/src/mainview/components/MessageWebViewHeader.qml b/src/mainview/components/MessageWebViewHeader.qml
index 640a75c4d..608279af3 100644
--- a/src/mainview/components/MessageWebViewHeader.qml
+++ b/src/mainview/components/MessageWebViewHeader.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.Constants 1.0
import "../../commoncomponents"
diff --git a/src/mainview/components/OutgoingCallPage.qml b/src/mainview/components/OutgoingCallPage.qml
index 2870a6f9f..d418f81af 100644
--- a/src/mainview/components/OutgoingCallPage.qml
+++ b/src/mainview/components/OutgoingCallPage.qml
@@ -22,6 +22,7 @@ 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
import "../../commoncomponents"
diff --git a/src/mainview/components/ParticipantContextMenu.qml b/src/mainview/components/ParticipantContextMenu.qml
index dfd397083..637a038dc 100644
--- a/src/mainview/components/ParticipantContextMenu.qml
+++ b/src/mainview/components/ParticipantContextMenu.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.Constants 1.0
import "../../commoncomponents"
import "../../commoncomponents/js/contextmenugenerator.js" as ContextMenuGenerator
diff --git a/src/mainview/components/ParticipantOverlay.qml b/src/mainview/components/ParticipantOverlay.qml
index e952bc524..530a61ba6 100644
--- a/src/mainview/components/ParticipantOverlay.qml
+++ b/src/mainview/components/ParticipantOverlay.qml
@@ -22,6 +22,7 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
import net.jami.Models 1.0
+import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/mainview/components/ProjectCreditsScrollView.qml b/src/mainview/components/ProjectCreditsScrollView.qml
index 0f71e6463..99bfcea99 100644
--- a/src/mainview/components/ProjectCreditsScrollView.qml
+++ b/src/mainview/components/ProjectCreditsScrollView.qml
@@ -20,6 +20,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
ScrollView {
id: projectCreditsScrollView
diff --git a/src/mainview/components/RecordBox.qml b/src/mainview/components/RecordBox.qml
index 9fbf42c78..0d7fb8ca0 100644
--- a/src/mainview/components/RecordBox.qml
+++ b/src/mainview/components/RecordBox.qml
@@ -24,6 +24,7 @@ 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
import "../../commoncomponents"
diff --git a/src/mainview/components/ScreenRubberBand.qml b/src/mainview/components/ScreenRubberBand.qml
index a9599aed9..0115351a5 100644
--- a/src/mainview/components/ScreenRubberBand.qml
+++ b/src/mainview/components/ScreenRubberBand.qml
@@ -22,7 +22,7 @@ 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.Constants 1.0
// ScreenRubberBand as a seperate frameless window,
// is to simulate the whole screen area and provide the user
diff --git a/src/mainview/components/SelectScreen.qml b/src/mainview/components/SelectScreen.qml
index e69de8492..04f3cfcd2 100644
--- a/src/mainview/components/SelectScreen.qml
+++ b/src/mainview/components/SelectScreen.qml
@@ -22,6 +22,7 @@ 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.Constants 1.0
import "../js/screenrubberbandcreation.js" as ScreenRubberBandCreation
import "../../commoncomponents"
diff --git a/src/mainview/components/SidePanel.qml b/src/mainview/components/SidePanel.qml
index 60a902421..4a1b396a0 100644
--- a/src/mainview/components/SidePanel.qml
+++ b/src/mainview/components/SidePanel.qml
@@ -22,6 +22,7 @@ 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
import "../../commoncomponents"
diff --git a/src/mainview/components/SidePanelTabBar.qml b/src/mainview/components/SidePanelTabBar.qml
index 78f25fd68..329ff0aa8 100644
--- a/src/mainview/components/SidePanelTabBar.qml
+++ b/src/mainview/components/SidePanelTabBar.qml
@@ -23,6 +23,8 @@ 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
+
import "../../commoncomponents"
TabBar {
diff --git a/src/mainview/components/SipInputPanel.qml b/src/mainview/components/SipInputPanel.qml
index c5cad9d71..cd8969015 100644
--- a/src/mainview/components/SipInputPanel.qml
+++ b/src/mainview/components/SipInputPanel.qml
@@ -21,6 +21,7 @@ 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.Constants 1.0
import "../../commoncomponents"
diff --git a/src/mainview/components/UserInfoCallPage.qml b/src/mainview/components/UserInfoCallPage.qml
index 98598f280..80460bcc2 100644
--- a/src/mainview/components/UserInfoCallPage.qml
+++ b/src/mainview/components/UserInfoCallPage.qml
@@ -22,6 +22,7 @@ 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
import "../../commoncomponents"
diff --git a/src/mainview/components/UserProfile.qml b/src/mainview/components/UserProfile.qml
index 2b95112d6..33aed722d 100644
--- a/src/mainview/components/UserProfile.qml
+++ b/src/mainview/components/UserProfile.qml
@@ -20,8 +20,8 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+import net.jami.Constants 1.0
-import "../../constant"
import "../../commoncomponents"
BaseDialog {
diff --git a/src/mainview/components/VideoCallPage.qml b/src/mainview/components/VideoCallPage.qml
index 0ae2eec41..a834c29ba 100644
--- a/src/mainview/components/VideoCallPage.qml
+++ b/src/mainview/components/VideoCallPage.qml
@@ -24,6 +24,7 @@ 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
import "../../commoncomponents"
diff --git a/src/mainview/components/VideoCallPageContextMenuDeviceItem.qml b/src/mainview/components/VideoCallPageContextMenuDeviceItem.qml
index 868950b57..9443c9664 100644
--- a/src/mainview/components/VideoCallPageContextMenuDeviceItem.qml
+++ b/src/mainview/components/VideoCallPageContextMenuDeviceItem.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import net.jami.Models 1.0
+import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/mainview/components/WelcomePage.qml b/src/mainview/components/WelcomePage.qml
index a736c36cf..9fbf71ec4 100644
--- a/src/mainview/components/WelcomePage.qml
+++ b/src/mainview/components/WelcomePage.qml
@@ -21,6 +21,7 @@ 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
import "../../commoncomponents"
diff --git a/src/mainview/components/WelcomePageQrDialog.qml b/src/mainview/components/WelcomePageQrDialog.qml
index 7c979c090..337d4c451 100644
--- a/src/mainview/components/WelcomePageQrDialog.qml
+++ b/src/mainview/components/WelcomePageQrDialog.qml
@@ -22,7 +22,6 @@ import QtQuick.Layouts 1.14
import net.jami.Models 1.0
import net.jami.Adapters 1.0
-import "../../constant"
import "../../commoncomponents"
ModalPopup {
diff --git a/src/qmlregister.cpp b/src/qmlregister.cpp
index 80a53afab..416bdc251 100644
--- a/src/qmlregister.cpp
+++ b/src/qmlregister.cpp
@@ -72,8 +72,8 @@
return P; \
});
-#define QML_REGISTERSINGLETONTYPE_URL(URL, T, MAJ, MIN) \
- qmlRegisterSingletonType(QUrl(QStringLiteral(URL)), "net.jami.Models", MAJ, MIN, #T);
+#define QML_REGISTERSINGLETONTYPE_URL(N, URL, T, MAJ, MIN) \
+ qmlRegisterSingletonType(QUrl(QStringLiteral(URL)), N, MAJ, MIN, #T);
#define QML_REGISTERTYPE(N, T, MAJ, MIN) qmlRegisterType<T>(N, MAJ, MIN, #T);
@@ -144,9 +144,9 @@ registerTypes()
/*
* Qml singleton components
*/
- QML_REGISTERSINGLETONTYPE_URL("qrc:/src/constant/JamiTheme.qml", JamiTheme, 1, 0);
- QML_REGISTERSINGLETONTYPE_URL("qrc:/src/constant/JamiQmlUtils.qml", JamiQmlUtils, 1, 0);
- QML_REGISTERSINGLETONTYPE_URL("qrc:/src/constant/JamiStrings.qml", JamiStrings, 1, 0);
+ QML_REGISTERSINGLETONTYPE_URL("net.jami.Constants", "qrc:/src/constant/JamiTheme.qml", JamiTheme, 1, 0);
+ QML_REGISTERSINGLETONTYPE_URL("net.jami.Models", "qrc:/src/constant/JamiQmlUtils.qml", JamiQmlUtils, 1, 0);
+ QML_REGISTERSINGLETONTYPE_URL("net.jami.Constants", "qrc:/src/constant/JamiStrings.qml", JamiStrings, 1, 0);
/*
* C++ singletons
diff --git a/src/settingsview/SettingsView.qml b/src/settingsview/SettingsView.qml
index 23129a1d2..578eec29c 100644
--- a/src/settingsview/SettingsView.qml
+++ b/src/settingsview/SettingsView.qml
@@ -24,6 +24,7 @@ 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
import "components"
diff --git a/src/settingsview/components/AccountProfile.qml b/src/settingsview/components/AccountProfile.qml
index f78b6d867..068fa04e7 100644
--- a/src/settingsview/components/AccountProfile.qml
+++ b/src/settingsview/components/AccountProfile.qml
@@ -22,9 +22,10 @@ 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 Qt.labs.platform 1.1
+import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/settingsview/components/AdvancedCallSettings.qml b/src/settingsview/components/AdvancedCallSettings.qml
index a0fec6389..d396227c8 100644
--- a/src/settingsview/components/AdvancedCallSettings.qml
+++ b/src/settingsview/components/AdvancedCallSettings.qml
@@ -25,9 +25,9 @@ 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
import "../../commoncomponents"
-import "../../constant"
ColumnLayout {
id: root
diff --git a/src/settingsview/components/AdvancedConnectivitySettings.qml b/src/settingsview/components/AdvancedConnectivitySettings.qml
index 1ea4164e7..9e0d1776a 100644
--- a/src/settingsview/components/AdvancedConnectivitySettings.qml
+++ b/src/settingsview/components/AdvancedConnectivitySettings.qml
@@ -25,9 +25,9 @@ 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
import "../../commoncomponents"
-import "../../constant"
ColumnLayout {
id: root
diff --git a/src/settingsview/components/AdvancedJamiSecuritySettings.qml b/src/settingsview/components/AdvancedJamiSecuritySettings.qml
index 787a9a8c0..d860ee2fe 100644
--- a/src/settingsview/components/AdvancedJamiSecuritySettings.qml
+++ b/src/settingsview/components/AdvancedJamiSecuritySettings.qml
@@ -25,9 +25,9 @@ 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
import "../../commoncomponents"
-import "../../constant"
ColumnLayout {
id: root
diff --git a/src/settingsview/components/AdvancedMediaSettings.qml b/src/settingsview/components/AdvancedMediaSettings.qml
index 8ded627b8..9d1c0c208 100644
--- a/src/settingsview/components/AdvancedMediaSettings.qml
+++ b/src/settingsview/components/AdvancedMediaSettings.qml
@@ -25,9 +25,9 @@ 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
import "../../commoncomponents"
-import "../../constant"
ColumnLayout {
id: root
diff --git a/src/settingsview/components/AdvancedNameServerSettings.qml b/src/settingsview/components/AdvancedNameServerSettings.qml
index 641bc2211..282f96807 100644
--- a/src/settingsview/components/AdvancedNameServerSettings.qml
+++ b/src/settingsview/components/AdvancedNameServerSettings.qml
@@ -25,6 +25,7 @@ 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
import "../../commoncomponents"
diff --git a/src/settingsview/components/AdvancedOpenDHTSettings.qml b/src/settingsview/components/AdvancedOpenDHTSettings.qml
index 3e95b6b61..771587a3a 100644
--- a/src/settingsview/components/AdvancedOpenDHTSettings.qml
+++ b/src/settingsview/components/AdvancedOpenDHTSettings.qml
@@ -25,9 +25,9 @@ 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
import "../../commoncomponents"
-import "../../constant"
ColumnLayout {
id: root
diff --git a/src/settingsview/components/AdvancedPublicAddressSettings.qml b/src/settingsview/components/AdvancedPublicAddressSettings.qml
index bf1268b61..6a4b7905a 100644
--- a/src/settingsview/components/AdvancedPublicAddressSettings.qml
+++ b/src/settingsview/components/AdvancedPublicAddressSettings.qml
@@ -25,9 +25,9 @@ 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
import "../../commoncomponents"
-import "../../constant"
ColumnLayout {
id: root
diff --git a/src/settingsview/components/AdvancedSDPSettings.qml b/src/settingsview/components/AdvancedSDPSettings.qml
index 9ddb63cf0..dba6180fb 100644
--- a/src/settingsview/components/AdvancedSDPSettings.qml
+++ b/src/settingsview/components/AdvancedSDPSettings.qml
@@ -26,9 +26,9 @@ 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
import "../../commoncomponents"
-import "../../constant"
ColumnLayout {
id: root
diff --git a/src/settingsview/components/AdvancedSIPSecuritySettings.qml b/src/settingsview/components/AdvancedSIPSecuritySettings.qml
index 04d992bea..4a61839db 100644
--- a/src/settingsview/components/AdvancedSIPSecuritySettings.qml
+++ b/src/settingsview/components/AdvancedSIPSecuritySettings.qml
@@ -25,6 +25,7 @@ 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
import "../../commoncomponents"
diff --git a/src/settingsview/components/AdvancedSettings.qml b/src/settingsview/components/AdvancedSettings.qml
index 50458c9c9..c3b830422 100644
--- a/src/settingsview/components/AdvancedSettings.qml
+++ b/src/settingsview/components/AdvancedSettings.qml
@@ -25,9 +25,9 @@ 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
import "../../commoncomponents"
-import "../../constant"
ColumnLayout {
id: root
diff --git a/src/settingsview/components/AdvancedVoiceMailSettings.qml b/src/settingsview/components/AdvancedVoiceMailSettings.qml
index 2df131aed..8c83d4ece 100644
--- a/src/settingsview/components/AdvancedVoiceMailSettings.qml
+++ b/src/settingsview/components/AdvancedVoiceMailSettings.qml
@@ -25,9 +25,9 @@ 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
import "../../commoncomponents"
-import "../../constant"
ColumnLayout {
id: root
diff --git a/src/settingsview/components/AudioSettings.qml b/src/settingsview/components/AudioSettings.qml
index c5740d3c8..df8a1b74b 100644
--- a/src/settingsview/components/AudioSettings.qml
+++ b/src/settingsview/components/AudioSettings.qml
@@ -26,6 +26,7 @@ import Qt.labs.platform 1.1
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Enums 1.0
+import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/settingsview/components/AvSettingPage.qml b/src/settingsview/components/AvSettingPage.qml
index 02e11587e..fcddecbdf 100644
--- a/src/settingsview/components/AvSettingPage.qml
+++ b/src/settingsview/components/AvSettingPage.qml
@@ -24,6 +24,7 @@ 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
import "../../commoncomponents"
diff --git a/src/settingsview/components/BannedContacts.qml b/src/settingsview/components/BannedContacts.qml
index 81df34133..26fa8bb02 100644
--- a/src/settingsview/components/BannedContacts.qml
+++ b/src/settingsview/components/BannedContacts.qml
@@ -25,6 +25,7 @@ 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
import "../../commoncomponents"
diff --git a/src/settingsview/components/BannedItemDelegate.qml b/src/settingsview/components/BannedItemDelegate.qml
index 8cee4cf76..d83e88946 100644
--- a/src/settingsview/components/BannedItemDelegate.qml
+++ b/src/settingsview/components/BannedItemDelegate.qml
@@ -23,6 +23,7 @@ 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
import "../../commoncomponents"
diff --git a/src/settingsview/components/ChatviewSettings.qml b/src/settingsview/components/ChatviewSettings.qml
index 8b4d7e732..a10952916 100644
--- a/src/settingsview/components/ChatviewSettings.qml
+++ b/src/settingsview/components/ChatviewSettings.qml
@@ -22,10 +22,11 @@ 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
-import Qt.labs.platform 1.1
+import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/settingsview/components/CurrentAccountSettings.qml b/src/settingsview/components/CurrentAccountSettings.qml
index 0fbc48cc9..f522cd761 100644
--- a/src/settingsview/components/CurrentAccountSettings.qml
+++ b/src/settingsview/components/CurrentAccountSettings.qml
@@ -26,9 +26,9 @@ 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
import "../../commoncomponents"
-import "../../constant"
Rectangle {
id: root
diff --git a/src/settingsview/components/DeviceItemDelegate.qml b/src/settingsview/components/DeviceItemDelegate.qml
index 6561681e5..e270618ce 100644
--- a/src/settingsview/components/DeviceItemDelegate.qml
+++ b/src/settingsview/components/DeviceItemDelegate.qml
@@ -24,6 +24,7 @@ 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
import "../../commoncomponents"
diff --git a/src/settingsview/components/GeneralSettingsPage.qml b/src/settingsview/components/GeneralSettingsPage.qml
index d985a8909..c7d807e21 100644
--- a/src/settingsview/components/GeneralSettingsPage.qml
+++ b/src/settingsview/components/GeneralSettingsPage.qml
@@ -25,6 +25,7 @@ import QtGraphicalEffects 1.14
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Enums 1.0
+import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/settingsview/components/JamiUserIdentity.qml b/src/settingsview/components/JamiUserIdentity.qml
index fba4c6a07..11b041d08 100644
--- a/src/settingsview/components/JamiUserIdentity.qml
+++ b/src/settingsview/components/JamiUserIdentity.qml
@@ -25,6 +25,7 @@ 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
import "../../commoncomponents"
diff --git a/src/settingsview/components/KeyBoardShortcutKey.qml b/src/settingsview/components/KeyBoardShortcutKey.qml
index b54b9fab6..1def1f817 100644
--- a/src/settingsview/components/KeyBoardShortcutKey.qml
+++ b/src/settingsview/components/KeyBoardShortcutKey.qml
@@ -1,6 +1,6 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
-import net.jami.Models 1.0
+import net.jami.Constants 1.0
Item {
property alias text: shortcutText.text
diff --git a/src/settingsview/components/KeyBoardShortcutTable.qml b/src/settingsview/components/KeyBoardShortcutTable.qml
index 84b18bf61..c83b89d5e 100644
--- a/src/settingsview/components/KeyBoardShortcutTable.qml
+++ b/src/settingsview/components/KeyBoardShortcutTable.qml
@@ -22,8 +22,8 @@ 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
-import "../../constant"
import "../../commoncomponents"
BaseDialog {
diff --git a/src/settingsview/components/LinkDeviceDialog.qml b/src/settingsview/components/LinkDeviceDialog.qml
index e21c3f6cf..4639cd904 100644
--- a/src/settingsview/components/LinkDeviceDialog.qml
+++ b/src/settingsview/components/LinkDeviceDialog.qml
@@ -23,8 +23,8 @@ 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
-import "../../constant"
import "../../commoncomponents"
BaseDialog {
diff --git a/src/settingsview/components/LinkedDevices.qml b/src/settingsview/components/LinkedDevices.qml
index 3d1375536..242c422cb 100644
--- a/src/settingsview/components/LinkedDevices.qml
+++ b/src/settingsview/components/LinkedDevices.qml
@@ -26,6 +26,7 @@ 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
import "../../commoncomponents"
diff --git a/src/settingsview/components/MediaCodecDelegate.qml b/src/settingsview/components/MediaCodecDelegate.qml
index fa9e9ad9b..baefc207d 100644
--- a/src/settingsview/components/MediaCodecDelegate.qml
+++ b/src/settingsview/components/MediaCodecDelegate.qml
@@ -23,6 +23,7 @@ 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
ItemDelegate {
id: root
diff --git a/src/settingsview/components/MediaSettings.qml b/src/settingsview/components/MediaSettings.qml
index 27a4d8811..cc01d66f5 100644
--- a/src/settingsview/components/MediaSettings.qml
+++ b/src/settingsview/components/MediaSettings.qml
@@ -25,9 +25,9 @@ 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
import "../../commoncomponents"
-import "../../constant"
ColumnLayout {
id: root
diff --git a/src/settingsview/components/NameRegistrationDialog.qml b/src/settingsview/components/NameRegistrationDialog.qml
index 87b7d5f7a..d6ca3e17b 100644
--- a/src/settingsview/components/NameRegistrationDialog.qml
+++ b/src/settingsview/components/NameRegistrationDialog.qml
@@ -23,8 +23,8 @@ 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
-import "../../constant"
import "../../commoncomponents"
BaseDialog {
diff --git a/src/settingsview/components/PluginItemDelegate.qml b/src/settingsview/components/PluginItemDelegate.qml
index 7380e2c7e..a07a36d13 100644
--- a/src/settingsview/components/PluginItemDelegate.qml
+++ b/src/settingsview/components/PluginItemDelegate.qml
@@ -23,6 +23,7 @@ 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
import "../../commoncomponents"
diff --git a/src/settingsview/components/PluginListPreferencesView.qml b/src/settingsview/components/PluginListPreferencesView.qml
index 2654dae0c..8a50d3a1e 100644
--- a/src/settingsview/components/PluginListPreferencesView.qml
+++ b/src/settingsview/components/PluginListPreferencesView.qml
@@ -24,6 +24,8 @@ import Qt.labs.platform 1.1
import QtQuick.Dialogs 1.3
import QtGraphicalEffects 1.14
import net.jami.Models 1.0
+import net.jami.Constants 1.0
+
import "../../commoncomponents"
Rectangle {
diff --git a/src/settingsview/components/PluginListSettingsView.qml b/src/settingsview/components/PluginListSettingsView.qml
index a87d06ff7..89ded92ea 100644
--- a/src/settingsview/components/PluginListSettingsView.qml
+++ b/src/settingsview/components/PluginListSettingsView.qml
@@ -24,6 +24,7 @@ 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
import "../../commoncomponents"
diff --git a/src/settingsview/components/PluginSettingsPage.qml b/src/settingsview/components/PluginSettingsPage.qml
index 886e8d824..4581f4032 100644
--- a/src/settingsview/components/PluginSettingsPage.qml
+++ b/src/settingsview/components/PluginSettingsPage.qml
@@ -23,6 +23,7 @@ import QtQuick.Layouts 1.14
import Qt.labs.platform 1.1
import QtGraphicalEffects 1.14
import net.jami.Models 1.0
+import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/settingsview/components/RecordingSettings.qml b/src/settingsview/components/RecordingSettings.qml
index 836ae3a4c..fcdd4e5c6 100644
--- a/src/settingsview/components/RecordingSettings.qml
+++ b/src/settingsview/components/RecordingSettings.qml
@@ -22,9 +22,10 @@ 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 Qt.labs.platform 1.1
+import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/settingsview/components/RevokeDevicePasswordDialog.qml b/src/settingsview/components/RevokeDevicePasswordDialog.qml
index 8da343f3d..d78bb1765 100644
--- a/src/settingsview/components/RevokeDevicePasswordDialog.qml
+++ b/src/settingsview/components/RevokeDevicePasswordDialog.qml
@@ -21,8 +21,8 @@ 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 "../../constant"
import "../../commoncomponents"
BaseDialog {
diff --git a/src/settingsview/components/SIPUserIdentity.qml b/src/settingsview/components/SIPUserIdentity.qml
index 32f6752f3..5f8e57895 100644
--- a/src/settingsview/components/SIPUserIdentity.qml
+++ b/src/settingsview/components/SIPUserIdentity.qml
@@ -25,6 +25,7 @@ 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
import "../../commoncomponents"
diff --git a/src/settingsview/components/SettingMaterialButton.qml b/src/settingsview/components/SettingMaterialButton.qml
index 5e584bb50..cf3b7421f 100644
--- a/src/settingsview/components/SettingMaterialButton.qml
+++ b/src/settingsview/components/SettingMaterialButton.qml
@@ -23,11 +23,11 @@ import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
import QtQuick.Controls.Styles 1.4
import net.jami.Models 1.0
-import net.jami.Adapters 1.0
import Qt.labs.platform 1.1
+import net.jami.Adapters 1.0
+import net.jami.Constants 1.0
import "../../commoncomponents"
-import "../../constant"
RowLayout {
id: root
diff --git a/src/settingsview/components/SettingSpinBox.qml b/src/settingsview/components/SettingSpinBox.qml
index 47278eae5..d7cd17d7f 100644
--- a/src/settingsview/components/SettingSpinBox.qml
+++ b/src/settingsview/components/SettingSpinBox.qml
@@ -25,9 +25,9 @@ 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
import "../../commoncomponents"
-import "../../constant"
RowLayout {
id: root
diff --git a/src/settingsview/components/SettingsComboBox.qml b/src/settingsview/components/SettingsComboBox.qml
index 4ca752de2..bfc37e1d0 100644
--- a/src/settingsview/components/SettingsComboBox.qml
+++ b/src/settingsview/components/SettingsComboBox.qml
@@ -23,9 +23,9 @@ 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"
-import "../../constant"
RowLayout {
id: root
diff --git a/src/settingsview/components/SettingsHeader.qml b/src/settingsview/components/SettingsHeader.qml
index ccc577e81..c6dd4b8e3 100644
--- a/src/settingsview/components/SettingsHeader.qml
+++ b/src/settingsview/components/SettingsHeader.qml
@@ -23,6 +23,7 @@ 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
import "../../commoncomponents"
diff --git a/src/settingsview/components/SettingsMaterialLineEdit.qml b/src/settingsview/components/SettingsMaterialLineEdit.qml
index e21884314..d98501ece 100644
--- a/src/settingsview/components/SettingsMaterialLineEdit.qml
+++ b/src/settingsview/components/SettingsMaterialLineEdit.qml
@@ -25,9 +25,9 @@ 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
import "../../commoncomponents"
-import "../../constant"
RowLayout {
id: root
diff --git a/src/settingsview/components/SettingsMenu.qml b/src/settingsview/components/SettingsMenu.qml
index c4f1bd455..4da59c755 100644
--- a/src/settingsview/components/SettingsMenu.qml
+++ b/src/settingsview/components/SettingsMenu.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.Constants 1.0
// TODO: these includes should generally be resource uris
import "../../commoncomponents"
diff --git a/src/settingsview/components/SystemSettings.qml b/src/settingsview/components/SystemSettings.qml
index aa9d00990..e9520a583 100644
--- a/src/settingsview/components/SystemSettings.qml
+++ b/src/settingsview/components/SystemSettings.qml
@@ -22,10 +22,11 @@ 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
-import Qt.labs.platform 1.1
+import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/settingsview/components/ToggleSwitch.qml b/src/settingsview/components/ToggleSwitch.qml
index beaa891ff..052bd4e6d 100644
--- a/src/settingsview/components/ToggleSwitch.qml
+++ b/src/settingsview/components/ToggleSwitch.qml
@@ -22,9 +22,9 @@ 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"
-import "../../constant"
RowLayout {
id: root
diff --git a/src/settingsview/components/UpdateSettings.qml b/src/settingsview/components/UpdateSettings.qml
index 4eca90e3d..3005c7c80 100644
--- a/src/settingsview/components/UpdateSettings.qml
+++ b/src/settingsview/components/UpdateSettings.qml
@@ -26,6 +26,8 @@ import net.jami.Adapters 1.0
import net.jami.Enums 1.0
import net.jami.Models 1.0
import net.jami.Helpers 1.0
+import net.jami.Constants 1.0
+
import "../../commoncomponents"
ColumnLayout {
diff --git a/src/settingsview/components/UserIdentity.qml b/src/settingsview/components/UserIdentity.qml
index bdf2b837a..dc901b25a 100644
--- a/src/settingsview/components/UserIdentity.qml
+++ b/src/settingsview/components/UserIdentity.qml
@@ -25,6 +25,7 @@ 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
import "../../commoncomponents"
diff --git a/src/settingsview/components/VideoSettings.qml b/src/settingsview/components/VideoSettings.qml
index d05cee32b..1840d1adb 100644
--- a/src/settingsview/components/VideoSettings.qml
+++ b/src/settingsview/components/VideoSettings.qml
@@ -26,6 +26,7 @@ import Qt.labs.platform 1.1
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Enums 1.0
+import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/wizardview/WizardView.qml b/src/wizardview/WizardView.qml
index 96f249a3d..47c994737 100644
--- a/src/wizardview/WizardView.qml
+++ b/src/wizardview/WizardView.qml
@@ -23,9 +23,9 @@ 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
import "../commoncomponents"
-import "../constant"
import "components"
Rectangle {
diff --git a/src/wizardview/components/AccountCreationStepIndicator.qml b/src/wizardview/components/AccountCreationStepIndicator.qml
index ffd0fdf92..c81a92e8c 100644
--- a/src/wizardview/components/AccountCreationStepIndicator.qml
+++ b/src/wizardview/components/AccountCreationStepIndicator.qml
@@ -19,8 +19,8 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
+import net.jami.Constants 1.0
-import "../../constant"
import "../../commoncomponents"
Row {
diff --git a/src/wizardview/components/BackupKeyPage.qml b/src/wizardview/components/BackupKeyPage.qml
index c0d9f2bc5..fbbdf765c 100644
--- a/src/wizardview/components/BackupKeyPage.qml
+++ b/src/wizardview/components/BackupKeyPage.qml
@@ -20,8 +20,9 @@ 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
-import "../../constant"
import "../../commoncomponents"
import "../../settingsview/components"
diff --git a/src/wizardview/components/CollapsiblePasswordWidget.qml b/src/wizardview/components/CollapsiblePasswordWidget.qml
index 37e546a89..5a34ca5e3 100644
--- a/src/wizardview/components/CollapsiblePasswordWidget.qml
+++ b/src/wizardview/components/CollapsiblePasswordWidget.qml
@@ -19,8 +19,8 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
+import net.jami.Constants 1.0
-import "../../constant"
import "../../commoncomponents"
// An independent widget that keeps the password's textfields, including password field and confirm password field
diff --git a/src/wizardview/components/ConnectToAccountManagerPage.qml b/src/wizardview/components/ConnectToAccountManagerPage.qml
index 2f6e5ab17..bf4d69c77 100644
--- a/src/wizardview/components/ConnectToAccountManagerPage.qml
+++ b/src/wizardview/components/ConnectToAccountManagerPage.qml
@@ -19,8 +19,9 @@
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
-import "../../constant"
import "../../commoncomponents"
Rectangle {
diff --git a/src/wizardview/components/CreateAccountPage.qml b/src/wizardview/components/CreateAccountPage.qml
index 1e13963e6..47c2060e0 100644
--- a/src/wizardview/components/CreateAccountPage.qml
+++ b/src/wizardview/components/CreateAccountPage.qml
@@ -20,9 +20,10 @@ 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
import "../"
-import "../../constant"
import "../../commoncomponents"
import "../../settingsview/components"
diff --git a/src/wizardview/components/CreateSIPAccountPage.qml b/src/wizardview/components/CreateSIPAccountPage.qml
index bd5fd117a..81eae576b 100644
--- a/src/wizardview/components/CreateSIPAccountPage.qml
+++ b/src/wizardview/components/CreateSIPAccountPage.qml
@@ -19,8 +19,8 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
+import net.jami.Constants 1.0
-import "../../constant"
import "../../commoncomponents"
Rectangle {
diff --git a/src/wizardview/components/ImportFromBackupPage.qml b/src/wizardview/components/ImportFromBackupPage.qml
index ae5b6ab41..454dbbab3 100644
--- a/src/wizardview/components/ImportFromBackupPage.qml
+++ b/src/wizardview/components/ImportFromBackupPage.qml
@@ -22,8 +22,8 @@ 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
-import "../../constant"
import "../../commoncomponents"
Rectangle {
diff --git a/src/wizardview/components/ImportFromDevicePage.qml b/src/wizardview/components/ImportFromDevicePage.qml
index 02f49097f..66886d62e 100644
--- a/src/wizardview/components/ImportFromDevicePage.qml
+++ b/src/wizardview/components/ImportFromDevicePage.qml
@@ -19,8 +19,9 @@
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
-import "../../constant"
import "../../commoncomponents"
Rectangle {
diff --git a/src/wizardview/components/ProfilePage.qml b/src/wizardview/components/ProfilePage.qml
index 590d8f0dc..91e0acbe2 100644
--- a/src/wizardview/components/ProfilePage.qml
+++ b/src/wizardview/components/ProfilePage.qml
@@ -19,8 +19,8 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
+import net.jami.Constants 1.0
-import "../../constant"
import "../../commoncomponents"
Rectangle {
diff --git a/src/wizardview/components/WelcomePage.qml b/src/wizardview/components/WelcomePage.qml
index d9c1ab91a..bbd08f59e 100644
--- a/src/wizardview/components/WelcomePage.qml
+++ b/src/wizardview/components/WelcomePage.qml
@@ -23,8 +23,8 @@ 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
-import "../../constant"
import "../../commoncomponents"
Rectangle {
--
GitLab