From bb03f2785b49f569db1dd692af4f89b33dc82802 Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Wed, 18 Sep 2024 15:26:28 +0200 Subject: [PATCH] new file tree --- Linphone/core/App.cpp | 4 +- Linphone/core/notifier/Notifier.cpp | 2 +- Linphone/view/CMakeLists.txt | 242 ++++++++---------- .../view/{Item => Control/Button}/Button.qml | 0 .../Button}/CalendarComboBox.qml | 0 .../{Item => Control/Button}/CheckBox.qml | 0 .../Button}/CheckableButton.qml | 0 .../{Item => Control/Button}/ComboBox.qml | 0 .../Button}/HelpIconLabelButton.qml | 0 .../Button}/IconLabelButton.qml | 0 .../{Item => Control/Button}/MediumButton.qml | 0 .../Button}/PhoneNumberComboBox.qml | 0 .../{Item => Control/Button}/PopupButton.qml | 0 .../{Item => Control/Button}/RadioButton.qml | 0 .../Button}/SecurityRadioButton.qml | 0 .../Button}/Settings/ComboSetting.qml | 2 +- .../Button}/Settings/SwitchSetting.qml | 0 .../view/{Item => Control/Button}/Slider.qml | 0 .../view/{Item => Control/Button}/Switch.qml | 0 .../Container}/Call/ActiveSpeakerLayout.qml | 0 .../Container}/Call/CallLayout.qml | 0 .../Container}/Call/GridLayout.qml | 0 .../Container/Call}/Mosaic.qml | 0 .../{Item => Control/Container}/Carousel.qml | 0 .../Container}/Contact/ContactLayout.qml | 0 .../Container}/FormItemLayout.qml | 0 .../Container/Main}/RightPanelLayout.qml | 0 .../{Item => Control/Container}/ScrollBar.qml | 0 .../{Layout => Control/Container}/Section.qml | 0 .../{Item => Control/Container}/TabBar.qml | 0 .../Container}/VerticalTabBar.qml | 0 .../Display}/BusyIndicator.qml | 0 .../Display}/Contact/Avatar.qml | 0 .../Display}/Contact/Contact.qml | 0 .../Display}/Contact/ContactsList.qml | 0 .../Display}/Contact/Voicemail.qml | 0 .../{Item => Control/Display}/EffectImage.qml | 0 .../{Item => Control/Display}/ErrorText.qml | 0 .../Display}/Meeting/MeetingList.qml | 0 .../Participant/ParticipantDeviceListView.qml | 0 .../Participant/ParticipantListView.qml | 0 .../{Item => Control/Display}/ProgressBar.qml | 0 .../Display}/RoundedBackgroundControl.qml | 0 .../Display/Settings}/MasterDetailFamily.qml | 0 .../Contact => Control/Display}/Sticker.qml | 0 .../view/{Item => Control/Display}/Text.qml | 0 .../{Item => Control/Display}/ToolTip.qml | 0 .../Form => Control/Form/Login}/LoginForm.qml | 1 - .../Form/Settings}/InCallSettingsPanel.qml | 0 .../Form/Settings}/ScreencastPanel.qml | 0 .../view/{Item => Control/Input}/Calendar.qml | 0 .../{Item => Control/Input}/DigitInput.qml | 0 .../{Item => Control/Input}/NumericPad.qml | 0 .../Input}/PhoneNumberInput.qml | 0 .../{Item => Control/Input}/SearchBar.qml | 0 .../view/{Item => Control/Input}/TextArea.qml | 0 .../{Item => Control/Input}/TextField.qml | 0 .../{Item => Control/Input}/TimeComboBox.qml | 0 .../Input}/ValidatedTextField.qml | 0 .../{Item => Control/Popup}/DesktopPopup.qml | 0 .../Popup/Dialog}/AuthenticationDialog.qml | 0 .../{Item => Control/Popup/Dialog}/Dialog.qml | 0 .../Dialog}/ZrtpTokenAuthenticationDialog.qml | 0 .../Popup}/InformationPopup.qml | 0 .../Popup/Loading}/LoadingPopup.qml | 0 .../Popup}/Notification/Notification.qml | 0 .../Notification/NotificationReceivedCall.qml | 0 .../Notification/TemporaryNotification.qml | 0 .../view/{Item => Control/Popup}/Popup.qml | 0 .../{Tool => Control/Tool/Helper}/utils.js | 0 .../Tool}/MovableMouseArea.qml | 0 .../Tool}/Prototype/AccountsPrototype.qml | 0 .../Tool}/Prototype/CallPrototype.qml | 0 .../Tool}/Prototype/CameraPrototype.qml | 0 .../Tool}/Prototype/CanvasCircle.qml | 0 .../Tool}/Prototype/FriendPrototype.qml | 0 .../Tool}/Prototype/ItemPrototype.qml | 0 .../Tool}/Prototype/PhoneNumberPrototype.qml | 0 .../Form/Call/CallContactsList.qml} | 0 .../Form}/Contact/ContactDescription.qml | 0 .../Form}/Contact/ContactEdition.qml | 0 .../view/Page/{ => Form}/Login/LoginPage.qml | 0 .../Page/{ => Form}/Login/SIPLoginPage.qml | 2 +- .../Form}/Meeting/AddParticipantsLayout.qml | 0 .../Form}/Meeting/MeetingSetUp.qml | 0 .../Register}/RegisterCheckingPage.qml | 0 .../{Login => Form/Register}/RegisterPage.qml | 0 .../Security}/SecurityModePage.qml | 0 .../Settings}/AbstractMasterDetailPage.qml | 0 .../Settings}/AccountSettingsPage.qml | 2 +- .../{Main => Form/Settings}/SettingsPage.qml | 2 +- .../Layout/Login}/LoginLayout.qml | 0 .../Layout/Main}/MainLayout.qml | 0 .../Settings}/AbstractDetailsLayout.qml | 0 .../AccountSettingsGeneralLayout.qml | 0 .../AccountSettingsParametersLayout.qml | 0 .../Layout/Settings/CallSettingsLayout.qml | 0 .../Settings/ContactsSettingsLayout.qml | 0 .../Layout/Settings/DebugSettingsLayout.qml | 0 .../Layout/Settings/LdapSettingsLayout.qml | 0 .../Settings/SecuritySettingsLayout.qml | 0 .../{Item => Page/Main}/Account/Accounts.qml | 0 .../view/Page/Main/{ => Call}/CallPage.qml | 2 +- .../Main}/Call/OngoingCallRightPanel.qml | 0 .../{Item => Page/Main}/Call/WaitingRoom.qml | 0 .../Page/Main/{ => Contact}/ContactPage.qml | 0 .../view/Page/Main/{ => Help}/HelpPage.qml | 2 +- .../Page/Main/{ => Meeting}/MeetingPage.qml | 0 .../{Login => Main/Start}/WelcomePage.qml | 0 .../view/{App => Page/Window}/AppWindow.qml | 0 .../{App => Page/Window/Call}/CallsWindow.qml | 2 +- .../view/{App => Page/Window/Main}/Main.qml | 0 Linphone/view/{Item => }/Test/ItemsTest.qml | 0 .../view/{Item => Test}/RectangleTest.qml | 0 114 files changed, 123 insertions(+), 140 deletions(-) rename Linphone/view/{Item => Control/Button}/Button.qml (100%) rename Linphone/view/{Item => Control/Button}/CalendarComboBox.qml (100%) rename Linphone/view/{Item => Control/Button}/CheckBox.qml (100%) rename Linphone/view/{Item => Control/Button}/CheckableButton.qml (100%) rename Linphone/view/{Item => Control/Button}/ComboBox.qml (100%) rename Linphone/view/{Item/Help => Control/Button}/HelpIconLabelButton.qml (100%) rename Linphone/view/{Item => Control/Button}/IconLabelButton.qml (100%) rename Linphone/view/{Item => Control/Button}/MediumButton.qml (100%) rename Linphone/view/{Item => Control/Button}/PhoneNumberComboBox.qml (100%) rename Linphone/view/{Item => Control/Button}/PopupButton.qml (100%) rename Linphone/view/{Item => Control/Button}/RadioButton.qml (100%) rename Linphone/view/{Item => Control/Button}/SecurityRadioButton.qml (100%) rename Linphone/view/{Item => Control/Button}/Settings/ComboSetting.qml (89%) rename Linphone/view/{Item => Control/Button}/Settings/SwitchSetting.qml (100%) rename Linphone/view/{Item => Control/Button}/Slider.qml (100%) rename Linphone/view/{Item => Control/Button}/Switch.qml (100%) rename Linphone/view/{Layout => Control/Container}/Call/ActiveSpeakerLayout.qml (100%) rename Linphone/view/{Layout => Control/Container}/Call/CallLayout.qml (100%) rename Linphone/view/{Layout => Control/Container}/Call/GridLayout.qml (100%) rename Linphone/view/{Layout => Control/Container/Call}/Mosaic.qml (100%) rename Linphone/view/{Item => Control/Container}/Carousel.qml (100%) rename Linphone/view/{Layout => Control/Container}/Contact/ContactLayout.qml (100%) rename Linphone/view/{Layout => Control/Container}/FormItemLayout.qml (100%) rename Linphone/view/{Layout => Control/Container/Main}/RightPanelLayout.qml (100%) rename Linphone/view/{Item => Control/Container}/ScrollBar.qml (100%) rename Linphone/view/{Layout => Control/Container}/Section.qml (100%) rename Linphone/view/{Item => Control/Container}/TabBar.qml (100%) rename Linphone/view/{Item => Control/Container}/VerticalTabBar.qml (100%) rename Linphone/view/{Item => Control/Display}/BusyIndicator.qml (100%) rename Linphone/view/{Item => Control/Display}/Contact/Avatar.qml (100%) rename Linphone/view/{Item => Control/Display}/Contact/Contact.qml (100%) rename Linphone/view/{Item => Control/Display}/Contact/ContactsList.qml (100%) rename Linphone/view/{Item => Control/Display}/Contact/Voicemail.qml (100%) rename Linphone/view/{Item => Control/Display}/EffectImage.qml (100%) rename Linphone/view/{Item => Control/Display}/ErrorText.qml (100%) rename Linphone/view/{Item => Control/Display}/Meeting/MeetingList.qml (100%) rename Linphone/view/{Item => Control/Display}/Participant/ParticipantDeviceListView.qml (100%) rename Linphone/view/{Item => Control/Display}/Participant/ParticipantListView.qml (100%) rename Linphone/view/{Item => Control/Display}/ProgressBar.qml (100%) rename Linphone/view/{Item => Control/Display}/RoundedBackgroundControl.qml (100%) rename Linphone/view/{Item => Control/Display/Settings}/MasterDetailFamily.qml (100%) rename Linphone/view/{Item/Contact => Control/Display}/Sticker.qml (100%) rename Linphone/view/{Item => Control/Display}/Text.qml (100%) rename Linphone/view/{Item => Control/Display}/ToolTip.qml (100%) rename Linphone/view/{Item/Form => Control/Form/Login}/LoginForm.qml (99%) rename Linphone/view/{Item/Call => Control/Form/Settings}/InCallSettingsPanel.qml (100%) rename Linphone/view/{Item/Call/Menu => Control/Form/Settings}/ScreencastPanel.qml (100%) rename Linphone/view/{Item => Control/Input}/Calendar.qml (100%) rename Linphone/view/{Item => Control/Input}/DigitInput.qml (100%) rename Linphone/view/{Item => Control/Input}/NumericPad.qml (100%) rename Linphone/view/{Item => Control/Input}/PhoneNumberInput.qml (100%) rename Linphone/view/{Item => Control/Input}/SearchBar.qml (100%) rename Linphone/view/{Item => Control/Input}/TextArea.qml (100%) rename Linphone/view/{Item => Control/Input}/TextField.qml (100%) rename Linphone/view/{Item => Control/Input}/TimeComboBox.qml (100%) rename Linphone/view/{Layout => Control/Input}/ValidatedTextField.qml (100%) rename Linphone/view/{Item => Control/Popup}/DesktopPopup.qml (100%) rename Linphone/view/{Item/Account => Control/Popup/Dialog}/AuthenticationDialog.qml (100%) rename Linphone/view/{Item => Control/Popup/Dialog}/Dialog.qml (100%) rename Linphone/view/{Item => Control/Popup/Dialog}/ZrtpTokenAuthenticationDialog.qml (100%) rename Linphone/view/{Item => Control/Popup}/InformationPopup.qml (100%) rename Linphone/view/{Item => Control/Popup/Loading}/LoadingPopup.qml (100%) rename Linphone/view/{Item => Control/Popup}/Notification/Notification.qml (100%) rename Linphone/view/{Item => Control/Popup}/Notification/NotificationReceivedCall.qml (100%) rename Linphone/view/{Item => Control/Popup}/Notification/TemporaryNotification.qml (100%) rename Linphone/view/{Item => Control/Popup}/Popup.qml (100%) rename Linphone/view/{Tool => Control/Tool/Helper}/utils.js (100%) rename Linphone/view/{Item => Control/Tool}/MovableMouseArea.qml (100%) rename Linphone/view/{ => Control/Tool}/Prototype/AccountsPrototype.qml (100%) rename Linphone/view/{ => Control/Tool}/Prototype/CallPrototype.qml (100%) rename Linphone/view/{ => Control/Tool}/Prototype/CameraPrototype.qml (100%) rename Linphone/view/{Item => Control/Tool}/Prototype/CanvasCircle.qml (100%) rename Linphone/view/{ => Control/Tool}/Prototype/FriendPrototype.qml (100%) rename Linphone/view/{ => Control/Tool}/Prototype/ItemPrototype.qml (100%) rename Linphone/view/{ => Control/Tool}/Prototype/PhoneNumberPrototype.qml (100%) rename Linphone/view/{Item/Call/CallContactsLists.qml => Page/Form/Call/CallContactsList.qml} (100%) rename Linphone/view/{Item => Page/Form}/Contact/ContactDescription.qml (100%) rename Linphone/view/{Item => Page/Form}/Contact/ContactEdition.qml (100%) rename Linphone/view/Page/{ => Form}/Login/LoginPage.qml (100%) rename Linphone/view/Page/{ => Form}/Login/SIPLoginPage.qml (99%) rename Linphone/view/{Layout => Page/Form}/Meeting/AddParticipantsLayout.qml (100%) rename Linphone/view/{Item => Page/Form}/Meeting/MeetingSetUp.qml (100%) rename Linphone/view/Page/{Login => Form/Register}/RegisterCheckingPage.qml (100%) rename Linphone/view/Page/{Login => Form/Register}/RegisterPage.qml (100%) rename Linphone/view/Page/{Login => Form/Security}/SecurityModePage.qml (100%) rename Linphone/view/Page/{Main => Form/Settings}/AbstractMasterDetailPage.qml (100%) rename Linphone/view/Page/{Main => Form/Settings}/AccountSettingsPage.qml (92%) rename Linphone/view/Page/{Main => Form/Settings}/SettingsPage.qml (93%) rename Linphone/view/{App/Layout => Page/Layout/Login}/LoginLayout.qml (100%) rename Linphone/view/{App/Layout => Page/Layout/Main}/MainLayout.qml (100%) rename Linphone/view/{App/Layout => Page/Layout/Settings}/AbstractDetailsLayout.qml (100%) rename Linphone/view/{App/Layout/Account => Page/Layout/Settings}/AccountSettingsGeneralLayout.qml (100%) rename Linphone/view/{App/Layout/Account => Page/Layout/Settings}/AccountSettingsParametersLayout.qml (100%) rename Linphone/view/{App => Page}/Layout/Settings/CallSettingsLayout.qml (100%) rename Linphone/view/{App => Page}/Layout/Settings/ContactsSettingsLayout.qml (100%) rename Linphone/view/{App => Page}/Layout/Settings/DebugSettingsLayout.qml (100%) rename Linphone/view/{App => Page}/Layout/Settings/LdapSettingsLayout.qml (100%) rename Linphone/view/{App => Page}/Layout/Settings/SecuritySettingsLayout.qml (100%) rename Linphone/view/{Item => Page/Main}/Account/Accounts.qml (100%) rename Linphone/view/Page/Main/{ => Call}/CallPage.qml (99%) rename Linphone/view/{Item => Page/Main}/Call/OngoingCallRightPanel.qml (100%) rename Linphone/view/{Item => Page/Main}/Call/WaitingRoom.qml (100%) rename Linphone/view/Page/Main/{ => Contact}/ContactPage.qml (100%) rename Linphone/view/Page/Main/{ => Help}/HelpPage.qml (95%) rename Linphone/view/Page/Main/{ => Meeting}/MeetingPage.qml (100%) rename Linphone/view/Page/{Login => Main/Start}/WelcomePage.qml (100%) rename Linphone/view/{App => Page/Window}/AppWindow.qml (100%) rename Linphone/view/{App => Page/Window/Call}/CallsWindow.qml (99%) rename Linphone/view/{App => Page/Window/Main}/Main.qml (100%) rename Linphone/view/{Item => }/Test/ItemsTest.qml (100%) rename Linphone/view/{Item => Test}/RectangleTest.qml (100%) diff --git a/Linphone/core/App.cpp b/Linphone/core/App.cpp index 6f3f070ac..969bf150d 100644 --- a/Linphone/core/App.cpp +++ b/Linphone/core/App.cpp @@ -466,7 +466,7 @@ void App::initCore() { mAccountList = AccountList::create(); mCallList = CallList::create(); - const QUrl url(u"qrc:/Linphone/view/App/Main.qml"_qs); + const QUrl url(u"qrc:/Linphone/view/Page/Window/Main/Main.qml"_qs); QObject::connect( mEngine, &QQmlApplicationEngine::objectCreated, this, [this, url](QObject *obj, const QUrl &objUrl) { @@ -669,7 +669,7 @@ bool App::notify(QObject *receiver, QEvent *event) { QQuickWindow *App::getCallsWindow(QVariant callGui) { mustBeInMainThread(getClassName()); if (!mCallsWindow) { - const QUrl callUrl("qrc:/Linphone/view/App/CallsWindow.qml"); + const QUrl callUrl("qrc:/Linphone/view/Page/Window/Call/CallsWindow.qml"); lInfo() << log().arg("Creating subwindow: `%1`.").arg(callUrl.toString()); diff --git a/Linphone/core/notifier/Notifier.cpp b/Linphone/core/notifier/Notifier.cpp index a6c81bfe0..396e288e0 100644 --- a/Linphone/core/notifier/Notifier.cpp +++ b/Linphone/core/notifier/Notifier.cpp @@ -45,7 +45,7 @@ DEFINE_ABSTRACT_OBJECT(Notifier) using namespace std; namespace { -constexpr char NotificationsPath[] = "qrc:/Linphone/view/Item/Notification/"; +constexpr char NotificationsPath[] = "qrc:/Linphone/view/Control/Popup/Notification/"; // --------------------------------------------------------------------------- // Notifications QML properties/methods. diff --git a/Linphone/view/CMakeLists.txt b/Linphone/view/CMakeLists.txt index dc0826d95..878f20d53 100644 --- a/Linphone/view/CMakeLists.txt +++ b/Linphone/view/CMakeLists.txt @@ -1,141 +1,125 @@ list(APPEND _LINPHONEAPP_QML_FILES - view/App/Main.qml - view/App/CallsWindow.qml - view/App/AppWindow.qml - view/App/Layout/LoginLayout.qml - view/App/Layout/MainLayout.qml - - view/Layout/Call/ActiveSpeakerLayout.qml - view/Layout/Call/CallLayout.qml - view/Layout/Call/GridLayout.qml - - view/Layout/Contact/ContactLayout.qml - view/Layout/Meeting/AddParticipantsLayout.qml + view/Control/Button/Button.qml + view/Control/Button/CalendarComboBox.qml + view/Control/Button/CheckableButton.qml + view/Control/Button/CheckBox.qml + view/Control/Button/ComboBox.qml + view/Control/Button/HelpIconLabelButton.qml + view/Control/Button/IconLabelButton.qml + view/Control/Button/MediumButton.qml + view/Control/Button/PhoneNumberComboBox.qml + view/Control/Button/PopupButton.qml + view/Control/Button/RadioButton.qml + view/Control/Button/SecurityRadioButton.qml + view/Control/Button/Slider.qml + view/Control/Button/Switch.qml + view/Control/Button/Settings/ComboSetting.qml + view/Control/Button/Settings/SwitchSetting.qml - view/Layout/FormItemLayout.qml - view/Layout/ValidatedTextField.qml - view/Layout/Mosaic.qml - view/Layout/RightPanelLayout.qml - view/Layout/Section.qml - - view/App/Layout/AbstractDetailsLayout.qml - view/App/Layout/Settings/SecuritySettingsLayout.qml - view/App/Layout/Settings/CallSettingsLayout.qml - view/App/Layout/Settings/DebugSettingsLayout.qml - view/App/Layout/Settings/ContactsSettingsLayout.qml - view/App/Layout/Settings/LdapSettingsLayout.qml + view/Control/Container/Carousel.qml + view/Control/Container/FormItemLayout.qml + view/Control/Container/ScrollBar.qml + view/Control/Container/Section.qml + view/Control/Container/TabBar.qml + view/Control/Container/VerticalTabBar.qml + view/Control/Container/Call/ActiveSpeakerLayout.qml + view/Control/Container/Call/CallLayout.qml + view/Control/Container/Call/GridLayout.qml + view/Control/Container/Call/Mosaic.qml + view/Control/Container/Contact/ContactLayout.qml + view/Control/Container/Main/RightPanelLayout.qml - view/App/Layout/Account/AccountSettingsGeneralLayout.qml - view/App/Layout/Account/AccountSettingsParametersLayout.qml + view/Control/Display/BusyIndicator.qml + view/Control/Display/EffectImage.qml + view/Control/Display/ErrorText.qml + view/Control/Display/ProgressBar.qml + view/Control/Display/RoundedBackgroundControl.qml + view/Control/Display/Sticker.qml + view/Control/Display/Text.qml + view/Control/Display/ToolTip.qml + view/Control/Display/Contact/Avatar.qml + view/Control/Display/Contact/Contact.qml + view/Control/Display/Contact/ContactsList.qml + view/Control/Display/Contact/Voicemail.qml + view/Control/Display/Meeting/MeetingList.qml + view/Control/Display/Participant/ParticipantDeviceListView.qml + view/Control/Display/Participant/ParticipantListView.qml + view/Control/Display/Settings/MasterDetailFamily.qml - view/Item/Account/Accounts.qml - view/Item/Account/AuthenticationDialog.qml - - view/Item/Call/CallContactsLists.qml - view/Item/Call/InCallSettingsPanel.qml - view/Item/Call/OngoingCallRightPanel.qml - view/Item/Call/WaitingRoom.qml + view/Control/Form/Login/LoginForm.qml + view/Control/Form/Settings/InCallSettingsPanel.qml + view/Control/Form/Settings/ScreencastPanel.qml - view/Item/Call/Menu/ScreencastPanel.qml - - view/Item/Notification/Notification.qml - view/Item/Notification/NotificationReceivedCall.qml - view/Item/Notification/TemporaryNotification.qml + view/Control/Input/Calendar.qml + view/Control/Input/DigitInput.qml + view/Control/Input/NumericPad.qml + view/Control/Input/PhoneNumberInput.qml + view/Control/Input/SearchBar.qml + view/Control/Input/TextArea.qml + view/Control/Input/TextField.qml + view/Control/Input/TimeComboBox.qml + view/Control/Input/ValidatedTextField.qml - view/Item/Participant/ParticipantDeviceListView.qml - view/Item/Participant/ParticipantListView.qml + view/Control/Popup/DesktopPopup.qml + view/Control/Popup/InformationPopup.qml + view/Control/Popup/Popup.qml + view/Control/Popup/Dialog/AuthenticationDialog.qml + view/Control/Popup/Dialog/Dialog.qml + view/Control/Popup/Dialog/ZrtpTokenAuthenticationDialog.qml + view/Control/Popup/Loading/LoadingPopup.qml + view/Control/Popup/Notification/Notification.qml + view/Control/Popup/Notification/NotificationReceivedCall.qml - view/Item/Prototype/CanvasCircle.qml - - view/Item/Contact/Avatar.qml - view/Item/Contact/Contact.qml - view/Item/Contact/ContactDescription.qml - view/Item/Contact/ContactEdition.qml - view/Item/Contact/ContactsList.qml - view/Item/Contact/Sticker.qml - view/Item/Contact/Voicemail.qml - - view/Item/Meeting/MeetingList.qml - view/Item/Meeting/MeetingSetUp.qml - - view/Item/BusyIndicator.qml - view/Item/Button.qml - view/Item/MediumButton.qml - view/Item/Calendar.qml - view/Item/CalendarComboBox.qml - view/Item/Carousel.qml - view/Item/CheckableButton.qml - view/Item/CheckBox.qml - view/Item/ComboBox.qml - view/Item/DesktopPopup.qml - view/Item/Dialog.qml - view/Item/DigitInput.qml - view/Item/EffectImage.qml - view/Item/ErrorText.qml - view/Item/IconLabelButton.qml - view/Item/InformationPopup.qml - view/Item/LoadingPopup.qml - view/Item/MovableMouseArea.qml - view/Item/NumericPad.qml - view/Item/PhoneNumberComboBox.qml - view/Item/PhoneNumberInput.qml - view/Item/Popup.qml - view/Item/PopupButton.qml - view/Item/ProgressBar.qml - view/Item/SecurityRadioButton.qml - view/Item/RadioButton.qml - view/Item/RectangleTest.qml - view/Item/RoundedBackgroundControl.qml - view/Item/ScrollBar.qml - view/Item/SearchBar.qml - view/Item/Slider.qml - view/Item/Switch.qml - view/Item/TabBar.qml - view/Item/Text.qml - view/Item/TextArea.qml - view/Item/TextField.qml - view/Item/TimeComboBox.qml - view/Item/ToolTip.qml - view/Item/VerticalTabBar.qml - view/Item/ZrtpTokenAuthenticationDialog.qml - - view/Item/Form/LoginForm.qml - - view/Item/Test/ItemsTest.qml - - view/Item/MasterDetailFamily.qml - view/Item/Settings/SwitchSetting.qml - view/Item/Settings/ComboSetting.qml - - view/Item/Help/HelpIconLabelButton.qml - - view/Page/Login/LoginPage.qml - view/Page/Login/RegisterPage.qml - view/Page/Login/RegisterCheckingPage.qml - view/Page/Login/SIPLoginPage.qml - view/Page/Login/SecurityModePage.qml - view/Page/Login/WelcomePage.qml - - view/Page/Main/AbstractMainPage.qml - view/Page/Main/CallPage.qml - view/Page/Main/ContactPage.qml - view/Page/Main/MeetingPage.qml - - view/Page/Main/AbstractMasterDetailPage.qml - view/Page/Main/SettingsPage.qml - view/Page/Main/HelpPage.qml - view/Page/Main/AccountSettingsPage.qml - - - view/Tool/utils.js + view/Control/Tool/MovableMouseArea.qml + view/Control/Tool/Helper/utils.js # Prototypes - view/Prototype/PhoneNumberPrototype.qml - view/Prototype/AccountsPrototype.qml - view/Prototype/CallPrototype.qml - view/Prototype/CameraPrototype.qml - view/Prototype/FriendPrototype.qml - view/Prototype/ItemPrototype.qml + view/Control/Tool/Prototype/AccountsPrototype.qml + view/Control/Tool/Prototype/CallPrototype.qml + view/Control/Tool/Prototype/CameraPrototype.qml + view/Control/Tool/Prototype/CanvasCircle.qml + view/Control/Tool/Prototype/FriendPrototype.qml + view/Control/Tool/Prototype/ItemPrototype.qml + view/Control/Tool/Prototype/PhoneNumberPrototype.qml + + view/Page/Form/Call/CallContactsList.qml + view/Page/Form/Contact/ContactDescription.qml + view/Page/Form/Contact/ContactEdition.qml + view/Page/Form/Login/LoginPage.qml + view/Page/Form/Login/SIPLoginPage.qml + view/Page/Form/Meeting/AddParticipantsLayout.qml + view/Page/Form/Meeting/MeetingSetUp.qml + view/Page/Form/Register/RegisterCheckingPage.qml + view/Page/Form/Register/RegisterPage.qml + view/Page/Form/Security/SecurityModePage.qml + view/Page/Form/Settings/AbstractMasterDetailPage.qml + view/Page/Form/Settings/AccountSettingsPage.qml + view/Page/Form/Settings/SettingsPage.qml + + view/Page/Layout/Login/LoginLayout.qml + view/Page/Layout/Main/MainLayout.qml + view/Page/Layout/Settings/AbstractDetailsLayout.qml + view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml + view/Page/Layout/Settings/AccountSettingsParametersLayout.qml + view/Page/Layout/Settings/CallSettingsLayout.qml + view/Page/Layout/Settings/ContactsSettingsLayout.qml + view/Page/Layout/Settings/DebugSettingsLayout.qml + view/Page/Layout/Settings/LdapSettingsLayout.qml + view/Page/Layout/Settings/SecuritySettingsLayout.qml + + view/Page/Main/AbstractMainPage.qml + view/Page/Main/Account/Accounts.qml + view/Page/Main/Call/CallPage.qml + view/Page/Main/Call/OngoingCallRightPanel.qml + view/Page/Main/Call/WaitingRoom.qml + view/Page/Main/Contact/ContactPage.qml + view/Page/Main/Help/HelpPage.qml + view/Page/Main/Meeting/MeetingPage.qml + view/Page/Main/Start/WelcomePage.qml + + view/Page/Window/AppWindow.qml + view/Page/Window/Call/CallsWindow.qml + view/Page/Window/Main/Main.qml ) list(APPEND _LINPHONEAPP_QML_SINGLETONS diff --git a/Linphone/view/Item/Button.qml b/Linphone/view/Control/Button/Button.qml similarity index 100% rename from Linphone/view/Item/Button.qml rename to Linphone/view/Control/Button/Button.qml diff --git a/Linphone/view/Item/CalendarComboBox.qml b/Linphone/view/Control/Button/CalendarComboBox.qml similarity index 100% rename from Linphone/view/Item/CalendarComboBox.qml rename to Linphone/view/Control/Button/CalendarComboBox.qml diff --git a/Linphone/view/Item/CheckBox.qml b/Linphone/view/Control/Button/CheckBox.qml similarity index 100% rename from Linphone/view/Item/CheckBox.qml rename to Linphone/view/Control/Button/CheckBox.qml diff --git a/Linphone/view/Item/CheckableButton.qml b/Linphone/view/Control/Button/CheckableButton.qml similarity index 100% rename from Linphone/view/Item/CheckableButton.qml rename to Linphone/view/Control/Button/CheckableButton.qml diff --git a/Linphone/view/Item/ComboBox.qml b/Linphone/view/Control/Button/ComboBox.qml similarity index 100% rename from Linphone/view/Item/ComboBox.qml rename to Linphone/view/Control/Button/ComboBox.qml diff --git a/Linphone/view/Item/Help/HelpIconLabelButton.qml b/Linphone/view/Control/Button/HelpIconLabelButton.qml similarity index 100% rename from Linphone/view/Item/Help/HelpIconLabelButton.qml rename to Linphone/view/Control/Button/HelpIconLabelButton.qml diff --git a/Linphone/view/Item/IconLabelButton.qml b/Linphone/view/Control/Button/IconLabelButton.qml similarity index 100% rename from Linphone/view/Item/IconLabelButton.qml rename to Linphone/view/Control/Button/IconLabelButton.qml diff --git a/Linphone/view/Item/MediumButton.qml b/Linphone/view/Control/Button/MediumButton.qml similarity index 100% rename from Linphone/view/Item/MediumButton.qml rename to Linphone/view/Control/Button/MediumButton.qml diff --git a/Linphone/view/Item/PhoneNumberComboBox.qml b/Linphone/view/Control/Button/PhoneNumberComboBox.qml similarity index 100% rename from Linphone/view/Item/PhoneNumberComboBox.qml rename to Linphone/view/Control/Button/PhoneNumberComboBox.qml diff --git a/Linphone/view/Item/PopupButton.qml b/Linphone/view/Control/Button/PopupButton.qml similarity index 100% rename from Linphone/view/Item/PopupButton.qml rename to Linphone/view/Control/Button/PopupButton.qml diff --git a/Linphone/view/Item/RadioButton.qml b/Linphone/view/Control/Button/RadioButton.qml similarity index 100% rename from Linphone/view/Item/RadioButton.qml rename to Linphone/view/Control/Button/RadioButton.qml diff --git a/Linphone/view/Item/SecurityRadioButton.qml b/Linphone/view/Control/Button/SecurityRadioButton.qml similarity index 100% rename from Linphone/view/Item/SecurityRadioButton.qml rename to Linphone/view/Control/Button/SecurityRadioButton.qml diff --git a/Linphone/view/Item/Settings/ComboSetting.qml b/Linphone/view/Control/Button/Settings/ComboSetting.qml similarity index 89% rename from Linphone/view/Item/Settings/ComboSetting.qml rename to Linphone/view/Control/Button/Settings/ComboSetting.qml index 94ab741ef..606cba337 100644 --- a/Linphone/view/Item/Settings/ComboSetting.qml +++ b/Linphone/view/Control/Button/Settings/ComboSetting.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls.Material import QtQuick.Layouts import Linphone -import 'qrc:/Linphone/view/Tool/utils.js' as Utils +import 'qrc:/Linphone/view/Control/Tool/Helper/utils.js' as Utils ComboBox { id: comboBox diff --git a/Linphone/view/Item/Settings/SwitchSetting.qml b/Linphone/view/Control/Button/Settings/SwitchSetting.qml similarity index 100% rename from Linphone/view/Item/Settings/SwitchSetting.qml rename to Linphone/view/Control/Button/Settings/SwitchSetting.qml diff --git a/Linphone/view/Item/Slider.qml b/Linphone/view/Control/Button/Slider.qml similarity index 100% rename from Linphone/view/Item/Slider.qml rename to Linphone/view/Control/Button/Slider.qml diff --git a/Linphone/view/Item/Switch.qml b/Linphone/view/Control/Button/Switch.qml similarity index 100% rename from Linphone/view/Item/Switch.qml rename to Linphone/view/Control/Button/Switch.qml diff --git a/Linphone/view/Layout/Call/ActiveSpeakerLayout.qml b/Linphone/view/Control/Container/Call/ActiveSpeakerLayout.qml similarity index 100% rename from Linphone/view/Layout/Call/ActiveSpeakerLayout.qml rename to Linphone/view/Control/Container/Call/ActiveSpeakerLayout.qml diff --git a/Linphone/view/Layout/Call/CallLayout.qml b/Linphone/view/Control/Container/Call/CallLayout.qml similarity index 100% rename from Linphone/view/Layout/Call/CallLayout.qml rename to Linphone/view/Control/Container/Call/CallLayout.qml diff --git a/Linphone/view/Layout/Call/GridLayout.qml b/Linphone/view/Control/Container/Call/GridLayout.qml similarity index 100% rename from Linphone/view/Layout/Call/GridLayout.qml rename to Linphone/view/Control/Container/Call/GridLayout.qml diff --git a/Linphone/view/Layout/Mosaic.qml b/Linphone/view/Control/Container/Call/Mosaic.qml similarity index 100% rename from Linphone/view/Layout/Mosaic.qml rename to Linphone/view/Control/Container/Call/Mosaic.qml diff --git a/Linphone/view/Item/Carousel.qml b/Linphone/view/Control/Container/Carousel.qml similarity index 100% rename from Linphone/view/Item/Carousel.qml rename to Linphone/view/Control/Container/Carousel.qml diff --git a/Linphone/view/Layout/Contact/ContactLayout.qml b/Linphone/view/Control/Container/Contact/ContactLayout.qml similarity index 100% rename from Linphone/view/Layout/Contact/ContactLayout.qml rename to Linphone/view/Control/Container/Contact/ContactLayout.qml diff --git a/Linphone/view/Layout/FormItemLayout.qml b/Linphone/view/Control/Container/FormItemLayout.qml similarity index 100% rename from Linphone/view/Layout/FormItemLayout.qml rename to Linphone/view/Control/Container/FormItemLayout.qml diff --git a/Linphone/view/Layout/RightPanelLayout.qml b/Linphone/view/Control/Container/Main/RightPanelLayout.qml similarity index 100% rename from Linphone/view/Layout/RightPanelLayout.qml rename to Linphone/view/Control/Container/Main/RightPanelLayout.qml diff --git a/Linphone/view/Item/ScrollBar.qml b/Linphone/view/Control/Container/ScrollBar.qml similarity index 100% rename from Linphone/view/Item/ScrollBar.qml rename to Linphone/view/Control/Container/ScrollBar.qml diff --git a/Linphone/view/Layout/Section.qml b/Linphone/view/Control/Container/Section.qml similarity index 100% rename from Linphone/view/Layout/Section.qml rename to Linphone/view/Control/Container/Section.qml diff --git a/Linphone/view/Item/TabBar.qml b/Linphone/view/Control/Container/TabBar.qml similarity index 100% rename from Linphone/view/Item/TabBar.qml rename to Linphone/view/Control/Container/TabBar.qml diff --git a/Linphone/view/Item/VerticalTabBar.qml b/Linphone/view/Control/Container/VerticalTabBar.qml similarity index 100% rename from Linphone/view/Item/VerticalTabBar.qml rename to Linphone/view/Control/Container/VerticalTabBar.qml diff --git a/Linphone/view/Item/BusyIndicator.qml b/Linphone/view/Control/Display/BusyIndicator.qml similarity index 100% rename from Linphone/view/Item/BusyIndicator.qml rename to Linphone/view/Control/Display/BusyIndicator.qml diff --git a/Linphone/view/Item/Contact/Avatar.qml b/Linphone/view/Control/Display/Contact/Avatar.qml similarity index 100% rename from Linphone/view/Item/Contact/Avatar.qml rename to Linphone/view/Control/Display/Contact/Avatar.qml diff --git a/Linphone/view/Item/Contact/Contact.qml b/Linphone/view/Control/Display/Contact/Contact.qml similarity index 100% rename from Linphone/view/Item/Contact/Contact.qml rename to Linphone/view/Control/Display/Contact/Contact.qml diff --git a/Linphone/view/Item/Contact/ContactsList.qml b/Linphone/view/Control/Display/Contact/ContactsList.qml similarity index 100% rename from Linphone/view/Item/Contact/ContactsList.qml rename to Linphone/view/Control/Display/Contact/ContactsList.qml diff --git a/Linphone/view/Item/Contact/Voicemail.qml b/Linphone/view/Control/Display/Contact/Voicemail.qml similarity index 100% rename from Linphone/view/Item/Contact/Voicemail.qml rename to Linphone/view/Control/Display/Contact/Voicemail.qml diff --git a/Linphone/view/Item/EffectImage.qml b/Linphone/view/Control/Display/EffectImage.qml similarity index 100% rename from Linphone/view/Item/EffectImage.qml rename to Linphone/view/Control/Display/EffectImage.qml diff --git a/Linphone/view/Item/ErrorText.qml b/Linphone/view/Control/Display/ErrorText.qml similarity index 100% rename from Linphone/view/Item/ErrorText.qml rename to Linphone/view/Control/Display/ErrorText.qml diff --git a/Linphone/view/Item/Meeting/MeetingList.qml b/Linphone/view/Control/Display/Meeting/MeetingList.qml similarity index 100% rename from Linphone/view/Item/Meeting/MeetingList.qml rename to Linphone/view/Control/Display/Meeting/MeetingList.qml diff --git a/Linphone/view/Item/Participant/ParticipantDeviceListView.qml b/Linphone/view/Control/Display/Participant/ParticipantDeviceListView.qml similarity index 100% rename from Linphone/view/Item/Participant/ParticipantDeviceListView.qml rename to Linphone/view/Control/Display/Participant/ParticipantDeviceListView.qml diff --git a/Linphone/view/Item/Participant/ParticipantListView.qml b/Linphone/view/Control/Display/Participant/ParticipantListView.qml similarity index 100% rename from Linphone/view/Item/Participant/ParticipantListView.qml rename to Linphone/view/Control/Display/Participant/ParticipantListView.qml diff --git a/Linphone/view/Item/ProgressBar.qml b/Linphone/view/Control/Display/ProgressBar.qml similarity index 100% rename from Linphone/view/Item/ProgressBar.qml rename to Linphone/view/Control/Display/ProgressBar.qml diff --git a/Linphone/view/Item/RoundedBackgroundControl.qml b/Linphone/view/Control/Display/RoundedBackgroundControl.qml similarity index 100% rename from Linphone/view/Item/RoundedBackgroundControl.qml rename to Linphone/view/Control/Display/RoundedBackgroundControl.qml diff --git a/Linphone/view/Item/MasterDetailFamily.qml b/Linphone/view/Control/Display/Settings/MasterDetailFamily.qml similarity index 100% rename from Linphone/view/Item/MasterDetailFamily.qml rename to Linphone/view/Control/Display/Settings/MasterDetailFamily.qml diff --git a/Linphone/view/Item/Contact/Sticker.qml b/Linphone/view/Control/Display/Sticker.qml similarity index 100% rename from Linphone/view/Item/Contact/Sticker.qml rename to Linphone/view/Control/Display/Sticker.qml diff --git a/Linphone/view/Item/Text.qml b/Linphone/view/Control/Display/Text.qml similarity index 100% rename from Linphone/view/Item/Text.qml rename to Linphone/view/Control/Display/Text.qml diff --git a/Linphone/view/Item/ToolTip.qml b/Linphone/view/Control/Display/ToolTip.qml similarity index 100% rename from Linphone/view/Item/ToolTip.qml rename to Linphone/view/Control/Display/ToolTip.qml diff --git a/Linphone/view/Item/Form/LoginForm.qml b/Linphone/view/Control/Form/Login/LoginForm.qml similarity index 99% rename from Linphone/view/Item/Form/LoginForm.qml rename to Linphone/view/Control/Form/Login/LoginForm.qml index 98adff99e..809a4420f 100644 --- a/Linphone/view/Item/Form/LoginForm.qml +++ b/Linphone/view/Control/Form/Login/LoginForm.qml @@ -101,7 +101,6 @@ ColumnLayout { function trigger() { username.errorMessage = "" password.errorMessage = "" - errorText.clear() if (usernameEdit.text.length == 0 || passwordEdit.text.length == 0) { if (usernameEdit.text.length == 0) diff --git a/Linphone/view/Item/Call/InCallSettingsPanel.qml b/Linphone/view/Control/Form/Settings/InCallSettingsPanel.qml similarity index 100% rename from Linphone/view/Item/Call/InCallSettingsPanel.qml rename to Linphone/view/Control/Form/Settings/InCallSettingsPanel.qml diff --git a/Linphone/view/Item/Call/Menu/ScreencastPanel.qml b/Linphone/view/Control/Form/Settings/ScreencastPanel.qml similarity index 100% rename from Linphone/view/Item/Call/Menu/ScreencastPanel.qml rename to Linphone/view/Control/Form/Settings/ScreencastPanel.qml diff --git a/Linphone/view/Item/Calendar.qml b/Linphone/view/Control/Input/Calendar.qml similarity index 100% rename from Linphone/view/Item/Calendar.qml rename to Linphone/view/Control/Input/Calendar.qml diff --git a/Linphone/view/Item/DigitInput.qml b/Linphone/view/Control/Input/DigitInput.qml similarity index 100% rename from Linphone/view/Item/DigitInput.qml rename to Linphone/view/Control/Input/DigitInput.qml diff --git a/Linphone/view/Item/NumericPad.qml b/Linphone/view/Control/Input/NumericPad.qml similarity index 100% rename from Linphone/view/Item/NumericPad.qml rename to Linphone/view/Control/Input/NumericPad.qml diff --git a/Linphone/view/Item/PhoneNumberInput.qml b/Linphone/view/Control/Input/PhoneNumberInput.qml similarity index 100% rename from Linphone/view/Item/PhoneNumberInput.qml rename to Linphone/view/Control/Input/PhoneNumberInput.qml diff --git a/Linphone/view/Item/SearchBar.qml b/Linphone/view/Control/Input/SearchBar.qml similarity index 100% rename from Linphone/view/Item/SearchBar.qml rename to Linphone/view/Control/Input/SearchBar.qml diff --git a/Linphone/view/Item/TextArea.qml b/Linphone/view/Control/Input/TextArea.qml similarity index 100% rename from Linphone/view/Item/TextArea.qml rename to Linphone/view/Control/Input/TextArea.qml diff --git a/Linphone/view/Item/TextField.qml b/Linphone/view/Control/Input/TextField.qml similarity index 100% rename from Linphone/view/Item/TextField.qml rename to Linphone/view/Control/Input/TextField.qml diff --git a/Linphone/view/Item/TimeComboBox.qml b/Linphone/view/Control/Input/TimeComboBox.qml similarity index 100% rename from Linphone/view/Item/TimeComboBox.qml rename to Linphone/view/Control/Input/TimeComboBox.qml diff --git a/Linphone/view/Layout/ValidatedTextField.qml b/Linphone/view/Control/Input/ValidatedTextField.qml similarity index 100% rename from Linphone/view/Layout/ValidatedTextField.qml rename to Linphone/view/Control/Input/ValidatedTextField.qml diff --git a/Linphone/view/Item/DesktopPopup.qml b/Linphone/view/Control/Popup/DesktopPopup.qml similarity index 100% rename from Linphone/view/Item/DesktopPopup.qml rename to Linphone/view/Control/Popup/DesktopPopup.qml diff --git a/Linphone/view/Item/Account/AuthenticationDialog.qml b/Linphone/view/Control/Popup/Dialog/AuthenticationDialog.qml similarity index 100% rename from Linphone/view/Item/Account/AuthenticationDialog.qml rename to Linphone/view/Control/Popup/Dialog/AuthenticationDialog.qml diff --git a/Linphone/view/Item/Dialog.qml b/Linphone/view/Control/Popup/Dialog/Dialog.qml similarity index 100% rename from Linphone/view/Item/Dialog.qml rename to Linphone/view/Control/Popup/Dialog/Dialog.qml diff --git a/Linphone/view/Item/ZrtpTokenAuthenticationDialog.qml b/Linphone/view/Control/Popup/Dialog/ZrtpTokenAuthenticationDialog.qml similarity index 100% rename from Linphone/view/Item/ZrtpTokenAuthenticationDialog.qml rename to Linphone/view/Control/Popup/Dialog/ZrtpTokenAuthenticationDialog.qml diff --git a/Linphone/view/Item/InformationPopup.qml b/Linphone/view/Control/Popup/InformationPopup.qml similarity index 100% rename from Linphone/view/Item/InformationPopup.qml rename to Linphone/view/Control/Popup/InformationPopup.qml diff --git a/Linphone/view/Item/LoadingPopup.qml b/Linphone/view/Control/Popup/Loading/LoadingPopup.qml similarity index 100% rename from Linphone/view/Item/LoadingPopup.qml rename to Linphone/view/Control/Popup/Loading/LoadingPopup.qml diff --git a/Linphone/view/Item/Notification/Notification.qml b/Linphone/view/Control/Popup/Notification/Notification.qml similarity index 100% rename from Linphone/view/Item/Notification/Notification.qml rename to Linphone/view/Control/Popup/Notification/Notification.qml diff --git a/Linphone/view/Item/Notification/NotificationReceivedCall.qml b/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml similarity index 100% rename from Linphone/view/Item/Notification/NotificationReceivedCall.qml rename to Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml diff --git a/Linphone/view/Item/Notification/TemporaryNotification.qml b/Linphone/view/Control/Popup/Notification/TemporaryNotification.qml similarity index 100% rename from Linphone/view/Item/Notification/TemporaryNotification.qml rename to Linphone/view/Control/Popup/Notification/TemporaryNotification.qml diff --git a/Linphone/view/Item/Popup.qml b/Linphone/view/Control/Popup/Popup.qml similarity index 100% rename from Linphone/view/Item/Popup.qml rename to Linphone/view/Control/Popup/Popup.qml diff --git a/Linphone/view/Tool/utils.js b/Linphone/view/Control/Tool/Helper/utils.js similarity index 100% rename from Linphone/view/Tool/utils.js rename to Linphone/view/Control/Tool/Helper/utils.js diff --git a/Linphone/view/Item/MovableMouseArea.qml b/Linphone/view/Control/Tool/MovableMouseArea.qml similarity index 100% rename from Linphone/view/Item/MovableMouseArea.qml rename to Linphone/view/Control/Tool/MovableMouseArea.qml diff --git a/Linphone/view/Prototype/AccountsPrototype.qml b/Linphone/view/Control/Tool/Prototype/AccountsPrototype.qml similarity index 100% rename from Linphone/view/Prototype/AccountsPrototype.qml rename to Linphone/view/Control/Tool/Prototype/AccountsPrototype.qml diff --git a/Linphone/view/Prototype/CallPrototype.qml b/Linphone/view/Control/Tool/Prototype/CallPrototype.qml similarity index 100% rename from Linphone/view/Prototype/CallPrototype.qml rename to Linphone/view/Control/Tool/Prototype/CallPrototype.qml diff --git a/Linphone/view/Prototype/CameraPrototype.qml b/Linphone/view/Control/Tool/Prototype/CameraPrototype.qml similarity index 100% rename from Linphone/view/Prototype/CameraPrototype.qml rename to Linphone/view/Control/Tool/Prototype/CameraPrototype.qml diff --git a/Linphone/view/Item/Prototype/CanvasCircle.qml b/Linphone/view/Control/Tool/Prototype/CanvasCircle.qml similarity index 100% rename from Linphone/view/Item/Prototype/CanvasCircle.qml rename to Linphone/view/Control/Tool/Prototype/CanvasCircle.qml diff --git a/Linphone/view/Prototype/FriendPrototype.qml b/Linphone/view/Control/Tool/Prototype/FriendPrototype.qml similarity index 100% rename from Linphone/view/Prototype/FriendPrototype.qml rename to Linphone/view/Control/Tool/Prototype/FriendPrototype.qml diff --git a/Linphone/view/Prototype/ItemPrototype.qml b/Linphone/view/Control/Tool/Prototype/ItemPrototype.qml similarity index 100% rename from Linphone/view/Prototype/ItemPrototype.qml rename to Linphone/view/Control/Tool/Prototype/ItemPrototype.qml diff --git a/Linphone/view/Prototype/PhoneNumberPrototype.qml b/Linphone/view/Control/Tool/Prototype/PhoneNumberPrototype.qml similarity index 100% rename from Linphone/view/Prototype/PhoneNumberPrototype.qml rename to Linphone/view/Control/Tool/Prototype/PhoneNumberPrototype.qml diff --git a/Linphone/view/Item/Call/CallContactsLists.qml b/Linphone/view/Page/Form/Call/CallContactsList.qml similarity index 100% rename from Linphone/view/Item/Call/CallContactsLists.qml rename to Linphone/view/Page/Form/Call/CallContactsList.qml diff --git a/Linphone/view/Item/Contact/ContactDescription.qml b/Linphone/view/Page/Form/Contact/ContactDescription.qml similarity index 100% rename from Linphone/view/Item/Contact/ContactDescription.qml rename to Linphone/view/Page/Form/Contact/ContactDescription.qml diff --git a/Linphone/view/Item/Contact/ContactEdition.qml b/Linphone/view/Page/Form/Contact/ContactEdition.qml similarity index 100% rename from Linphone/view/Item/Contact/ContactEdition.qml rename to Linphone/view/Page/Form/Contact/ContactEdition.qml diff --git a/Linphone/view/Page/Login/LoginPage.qml b/Linphone/view/Page/Form/Login/LoginPage.qml similarity index 100% rename from Linphone/view/Page/Login/LoginPage.qml rename to Linphone/view/Page/Form/Login/LoginPage.qml diff --git a/Linphone/view/Page/Login/SIPLoginPage.qml b/Linphone/view/Page/Form/Login/SIPLoginPage.qml similarity index 99% rename from Linphone/view/Page/Login/SIPLoginPage.qml rename to Linphone/view/Page/Form/Login/SIPLoginPage.qml index 4322794b1..60a28d696 100644 --- a/Linphone/view/Page/Login/SIPLoginPage.qml +++ b/Linphone/view/Page/Form/Login/SIPLoginPage.qml @@ -4,7 +4,7 @@ import QtQuick.Controls as Control import Linphone import ConstantsCpp import SettingsCpp -import 'qrc:/Linphone/view/Tool/utils.js' as Utils +import 'qrc:/Linphone/view/Control/Tool/Helper/utils.js' as Utils LoginLayout { id: mainItem diff --git a/Linphone/view/Layout/Meeting/AddParticipantsLayout.qml b/Linphone/view/Page/Form/Meeting/AddParticipantsLayout.qml similarity index 100% rename from Linphone/view/Layout/Meeting/AddParticipantsLayout.qml rename to Linphone/view/Page/Form/Meeting/AddParticipantsLayout.qml diff --git a/Linphone/view/Item/Meeting/MeetingSetUp.qml b/Linphone/view/Page/Form/Meeting/MeetingSetUp.qml similarity index 100% rename from Linphone/view/Item/Meeting/MeetingSetUp.qml rename to Linphone/view/Page/Form/Meeting/MeetingSetUp.qml diff --git a/Linphone/view/Page/Login/RegisterCheckingPage.qml b/Linphone/view/Page/Form/Register/RegisterCheckingPage.qml similarity index 100% rename from Linphone/view/Page/Login/RegisterCheckingPage.qml rename to Linphone/view/Page/Form/Register/RegisterCheckingPage.qml diff --git a/Linphone/view/Page/Login/RegisterPage.qml b/Linphone/view/Page/Form/Register/RegisterPage.qml similarity index 100% rename from Linphone/view/Page/Login/RegisterPage.qml rename to Linphone/view/Page/Form/Register/RegisterPage.qml diff --git a/Linphone/view/Page/Login/SecurityModePage.qml b/Linphone/view/Page/Form/Security/SecurityModePage.qml similarity index 100% rename from Linphone/view/Page/Login/SecurityModePage.qml rename to Linphone/view/Page/Form/Security/SecurityModePage.qml diff --git a/Linphone/view/Page/Main/AbstractMasterDetailPage.qml b/Linphone/view/Page/Form/Settings/AbstractMasterDetailPage.qml similarity index 100% rename from Linphone/view/Page/Main/AbstractMasterDetailPage.qml rename to Linphone/view/Page/Form/Settings/AbstractMasterDetailPage.qml diff --git a/Linphone/view/Page/Main/AccountSettingsPage.qml b/Linphone/view/Page/Form/Settings/AccountSettingsPage.qml similarity index 92% rename from Linphone/view/Page/Main/AccountSettingsPage.qml rename to Linphone/view/Page/Form/Settings/AccountSettingsPage.qml index bebc3e5d5..553643401 100644 --- a/Linphone/view/Page/Main/AccountSettingsPage.qml +++ b/Linphone/view/Page/Form/Settings/AccountSettingsPage.qml @@ -8,7 +8,7 @@ import SettingsCpp 1.0 import LinphoneAccountsCpp AbstractMasterDetailPage { - layoutsPath: "qrc:/Linphone/view/App/Layout/Account" + layoutsPath: "qrc:/Linphone/view/Page/Layout/Settings/" titleText: qsTr("Mon compte") property AccountProxy accounts: AccountProxy {id: accountProxy} property AccountGui account: accountProxy.defaultAccount diff --git a/Linphone/view/Page/Main/SettingsPage.qml b/Linphone/view/Page/Form/Settings/SettingsPage.qml similarity index 93% rename from Linphone/view/Page/Main/SettingsPage.qml rename to Linphone/view/Page/Form/Settings/SettingsPage.qml index 379fd196a..be4b41c91 100644 --- a/Linphone/view/Page/Main/SettingsPage.qml +++ b/Linphone/view/Page/Form/Settings/SettingsPage.qml @@ -5,7 +5,7 @@ import QtQuick.Controls as Control import SettingsCpp AbstractMasterDetailPage { - layoutsPath: "qrc:/Linphone/view/App/Layout/Settings" + layoutsPath: "qrc:/Linphone/view/Page/Layout/Settings/" titleText: qsTr("Paramètres") families: [ {title: qsTr("Appels"), layout: "CallSettingsLayout"}, diff --git a/Linphone/view/App/Layout/LoginLayout.qml b/Linphone/view/Page/Layout/Login/LoginLayout.qml similarity index 100% rename from Linphone/view/App/Layout/LoginLayout.qml rename to Linphone/view/Page/Layout/Login/LoginLayout.qml diff --git a/Linphone/view/App/Layout/MainLayout.qml b/Linphone/view/Page/Layout/Main/MainLayout.qml similarity index 100% rename from Linphone/view/App/Layout/MainLayout.qml rename to Linphone/view/Page/Layout/Main/MainLayout.qml diff --git a/Linphone/view/App/Layout/AbstractDetailsLayout.qml b/Linphone/view/Page/Layout/Settings/AbstractDetailsLayout.qml similarity index 100% rename from Linphone/view/App/Layout/AbstractDetailsLayout.qml rename to Linphone/view/Page/Layout/Settings/AbstractDetailsLayout.qml diff --git a/Linphone/view/App/Layout/Account/AccountSettingsGeneralLayout.qml b/Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml similarity index 100% rename from Linphone/view/App/Layout/Account/AccountSettingsGeneralLayout.qml rename to Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml diff --git a/Linphone/view/App/Layout/Account/AccountSettingsParametersLayout.qml b/Linphone/view/Page/Layout/Settings/AccountSettingsParametersLayout.qml similarity index 100% rename from Linphone/view/App/Layout/Account/AccountSettingsParametersLayout.qml rename to Linphone/view/Page/Layout/Settings/AccountSettingsParametersLayout.qml diff --git a/Linphone/view/App/Layout/Settings/CallSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/CallSettingsLayout.qml similarity index 100% rename from Linphone/view/App/Layout/Settings/CallSettingsLayout.qml rename to Linphone/view/Page/Layout/Settings/CallSettingsLayout.qml diff --git a/Linphone/view/App/Layout/Settings/ContactsSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/ContactsSettingsLayout.qml similarity index 100% rename from Linphone/view/App/Layout/Settings/ContactsSettingsLayout.qml rename to Linphone/view/Page/Layout/Settings/ContactsSettingsLayout.qml diff --git a/Linphone/view/App/Layout/Settings/DebugSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/DebugSettingsLayout.qml similarity index 100% rename from Linphone/view/App/Layout/Settings/DebugSettingsLayout.qml rename to Linphone/view/Page/Layout/Settings/DebugSettingsLayout.qml diff --git a/Linphone/view/App/Layout/Settings/LdapSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/LdapSettingsLayout.qml similarity index 100% rename from Linphone/view/App/Layout/Settings/LdapSettingsLayout.qml rename to Linphone/view/Page/Layout/Settings/LdapSettingsLayout.qml diff --git a/Linphone/view/App/Layout/Settings/SecuritySettingsLayout.qml b/Linphone/view/Page/Layout/Settings/SecuritySettingsLayout.qml similarity index 100% rename from Linphone/view/App/Layout/Settings/SecuritySettingsLayout.qml rename to Linphone/view/Page/Layout/Settings/SecuritySettingsLayout.qml diff --git a/Linphone/view/Item/Account/Accounts.qml b/Linphone/view/Page/Main/Account/Accounts.qml similarity index 100% rename from Linphone/view/Item/Account/Accounts.qml rename to Linphone/view/Page/Main/Account/Accounts.qml diff --git a/Linphone/view/Page/Main/CallPage.qml b/Linphone/view/Page/Main/Call/CallPage.qml similarity index 99% rename from Linphone/view/Page/Main/CallPage.qml rename to Linphone/view/Page/Main/Call/CallPage.qml index 1d9d63ad0..4de64ddcb 100644 --- a/Linphone/view/Page/Main/CallPage.qml +++ b/Linphone/view/Page/Main/Call/CallPage.qml @@ -490,7 +490,7 @@ AbstractMainPage { ColumnLayout { anchors.fill: parent - CallContactsLists { + CallContactsList { id: callContactsList Layout.fillWidth: true Layout.fillHeight: true diff --git a/Linphone/view/Item/Call/OngoingCallRightPanel.qml b/Linphone/view/Page/Main/Call/OngoingCallRightPanel.qml similarity index 100% rename from Linphone/view/Item/Call/OngoingCallRightPanel.qml rename to Linphone/view/Page/Main/Call/OngoingCallRightPanel.qml diff --git a/Linphone/view/Item/Call/WaitingRoom.qml b/Linphone/view/Page/Main/Call/WaitingRoom.qml similarity index 100% rename from Linphone/view/Item/Call/WaitingRoom.qml rename to Linphone/view/Page/Main/Call/WaitingRoom.qml diff --git a/Linphone/view/Page/Main/ContactPage.qml b/Linphone/view/Page/Main/Contact/ContactPage.qml similarity index 100% rename from Linphone/view/Page/Main/ContactPage.qml rename to Linphone/view/Page/Main/Contact/ContactPage.qml diff --git a/Linphone/view/Page/Main/HelpPage.qml b/Linphone/view/Page/Main/Help/HelpPage.qml similarity index 95% rename from Linphone/view/Page/Main/HelpPage.qml rename to Linphone/view/Page/Main/Help/HelpPage.qml index 73af0c081..5c7e9eeb8 100644 --- a/Linphone/view/Page/Main/HelpPage.qml +++ b/Linphone/view/Page/Main/Help/HelpPage.qml @@ -117,7 +117,7 @@ AbstractMainPage { title: qsTr("Dépannage") onClicked: { rightPanelStackView.clear() - rightPanelStackView.push("qrc:/Linphone/view/App/Layout/Settings/DebugSettingsLayout.qml", { titleText: troubleShooting.title, container: rightPanelStackView }) + rightPanelStackView.push("qrc:/Linphone/view/Page/Layout/Settings/DebugSettingsLayout.qml", { titleText: troubleShooting.title, container: rightPanelStackView }) } } Item { diff --git a/Linphone/view/Page/Main/MeetingPage.qml b/Linphone/view/Page/Main/Meeting/MeetingPage.qml similarity index 100% rename from Linphone/view/Page/Main/MeetingPage.qml rename to Linphone/view/Page/Main/Meeting/MeetingPage.qml diff --git a/Linphone/view/Page/Login/WelcomePage.qml b/Linphone/view/Page/Main/Start/WelcomePage.qml similarity index 100% rename from Linphone/view/Page/Login/WelcomePage.qml rename to Linphone/view/Page/Main/Start/WelcomePage.qml diff --git a/Linphone/view/App/AppWindow.qml b/Linphone/view/Page/Window/AppWindow.qml similarity index 100% rename from Linphone/view/App/AppWindow.qml rename to Linphone/view/Page/Window/AppWindow.qml diff --git a/Linphone/view/App/CallsWindow.qml b/Linphone/view/Page/Window/Call/CallsWindow.qml similarity index 99% rename from Linphone/view/App/CallsWindow.qml rename to Linphone/view/Page/Window/Call/CallsWindow.qml index 72d24ecf4..6782b6862 100644 --- a/Linphone/view/App/CallsWindow.qml +++ b/Linphone/view/Page/Window/Call/CallsWindow.qml @@ -562,7 +562,7 @@ AppWindow { event.accepted = true; } } - CallContactsLists { + CallContactsList { id: callcontactslist anchors.fill: parent anchors.topMargin: 21 * DefaultStyle.dp diff --git a/Linphone/view/App/Main.qml b/Linphone/view/Page/Window/Main/Main.qml similarity index 100% rename from Linphone/view/App/Main.qml rename to Linphone/view/Page/Window/Main/Main.qml diff --git a/Linphone/view/Item/Test/ItemsTest.qml b/Linphone/view/Test/ItemsTest.qml similarity index 100% rename from Linphone/view/Item/Test/ItemsTest.qml rename to Linphone/view/Test/ItemsTest.qml diff --git a/Linphone/view/Item/RectangleTest.qml b/Linphone/view/Test/RectangleTest.qml similarity index 100% rename from Linphone/view/Item/RectangleTest.qml rename to Linphone/view/Test/RectangleTest.qml