misc: move JamiTheme and JamiStrings to net.jami.Constants namespace

Change-Id: Ief728a8bd36f6c29a906686988b28b0640b2065c

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"

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

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

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

src/commoncomponents/BaseDialog.qml

@@ -19,8 +19,6 @@
 import QtQuick 2.14
 import QtQuick.Dialogs 1.3
 
-import "../constant"
-
 Dialog {
     id: root
 

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 {

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

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.

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

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{

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

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

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

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

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 {

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

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 {

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

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"
 

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.

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:

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

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

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

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

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

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"

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 {

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"
 

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"
 

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"
 

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"
 

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

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"
 

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

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"
 

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"
 

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

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

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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

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"
 

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

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"
 

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

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"

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"
 

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 {

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"
 

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"
 

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 {

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"
 

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"
 

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"
 

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 {

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

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"
 

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"
 

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

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

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

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

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"
 

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

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

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

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"
 

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

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

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"
 

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"
 

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"
 

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"
 

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"
 

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

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"
 

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"
 

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"
 

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

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 {

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 {

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"
 

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

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

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 {

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"
 

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 {

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"
 

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"
 

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"
 

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 {

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"
 

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

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