rename files

This commit is contained in:
Gaelle Braud 2024-09-18 16:53:44 +02:00
parent bb03f2785b
commit ca346da033
43 changed files with 76 additions and 78 deletions

View file

@ -466,13 +466,13 @@ void App::initCore() {
mAccountList = AccountList::create();
mCallList = CallList::create();
const QUrl url(u"qrc:/Linphone/view/Page/Window/Main/Main.qml"_qs);
const QUrl url(u"qrc:/Linphone/view/Page/Window/Main/MainWindow.qml"_qs);
QObject::connect(
mEngine, &QQmlApplicationEngine::objectCreated, this,
[this, url](QObject *obj, const QUrl &objUrl) {
if (url == objUrl) {
if (!obj) {
lCritical() << log().arg("Main.qml couldn't be load. The app will exit");
lCritical() << log().arg("MainWindow.qml couldn't be load. The app will exit");
exit(-1);
}
setMainWindow(qobject_cast<QQuickWindow *>(obj));

View file

@ -28,7 +28,6 @@ constexpr char Constants::LanguagePath[];
// The main windows of Linphone desktop.
constexpr char Constants::QmlViewMainWindow[];
constexpr char Constants::QmlViewCallsWindow[];
constexpr char Constants::QmlViewSettingsWindow[];
#ifdef ENABLE_UPDATE_CHECK
constexpr int Constants::VersionUpdateCheckInterval;

View file

@ -154,9 +154,8 @@ public:
static constexpr char LanguagePath[] = ":/languages/";
// The main windows of Linphone desktop.
static constexpr char QmlViewMainWindow[] = "qrc:/ui/views/App/Main/MainWindow.qml";
static constexpr char QmlViewCallsWindow[] = "qrc:/ui/views/App/Calls/CallsWindow.qml";
static constexpr char QmlViewSettingsWindow[] = "qrc:/ui/views/App/Settings/SettingsWindow.qml";
static constexpr char QmlViewMainWindow[] = "qrc:/Linphone/view/Page/Window/Main/MainWindow.qml";
static constexpr char QmlViewCallsWindow[] = "qrc:/Linphone/view/Page/Window/Call/CallsWindow.qml";
static constexpr char MainQmlUri[] = "Linphone";

View file

@ -8,7 +8,7 @@ list(APPEND _LINPHONEAPP_QML_FILES
view/Control/Button/HelpIconLabelButton.qml
view/Control/Button/IconLabelButton.qml
view/Control/Button/MediumButton.qml
view/Control/Button/PhoneNumberComboBox.qml
view/Control/Button/CountryIndicatorCombobox.qml
view/Control/Button/PopupButton.qml
view/Control/Button/RadioButton.qml
view/Control/Button/SecurityRadioButton.qml
@ -28,28 +28,28 @@ list(APPEND _LINPHONEAPP_QML_FILES
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/Control/Container/Main/MainRightPanel.qml
view/Control/Display/BusyIndicator.qml
view/Control/Display/EffectImage.qml
view/Control/Display/ErrorText.qml
view/Control/Display/TemporaryText.qml
view/Control/Display/ProgressBar.qml
view/Control/Display/RoundedBackgroundControl.qml
view/Control/Display/RoundedPane.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/ContactListView.qml
view/Control/Display/Contact/Voicemail.qml
view/Control/Display/Meeting/MeetingList.qml
view/Control/Display/Meeting/MeetingListView.qml
view/Control/Display/Participant/ParticipantDeviceListView.qml
view/Control/Display/Participant/ParticipantListView.qml
view/Control/Display/Settings/MasterDetailFamily.qml
view/Control/Display/Settings/SettingsMenuItem.qml
view/Control/Form/Login/LoginForm.qml
view/Control/Form/Settings/InCallSettingsPanel.qml
view/Control/Form/Settings/ScreencastPanel.qml
view/Control/Form/Settings/MultimediaSettings.qml
view/Control/Form/Settings/ScreencastSettings.qml
view/Control/Input/Calendar.qml
view/Control/Input/DigitInput.qml
@ -66,7 +66,7 @@ list(APPEND _LINPHONEAPP_QML_FILES
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/Dialog/ZrtpAuthenticationDialog.qml
view/Control/Popup/Loading/LoadingPopup.qml
view/Control/Popup/Notification/Notification.qml
view/Control/Popup/Notification/NotificationReceivedCall.qml
@ -82,23 +82,23 @@ list(APPEND _LINPHONEAPP_QML_FILES
view/Control/Tool/Prototype/ItemPrototype.qml
view/Control/Tool/Prototype/PhoneNumberPrototype.qml
view/Page/Form/Call/CallContactsList.qml
view/Page/Form/Call/NewCallForm.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/Meeting/AddParticipantsForm.qml
view/Page/Form/Meeting/MeetingForm.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/AbstractSettingsMenu.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/AbstractSettingsLayout.qml
view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml
view/Page/Layout/Settings/AccountSettingsParametersLayout.qml
view/Page/Layout/Settings/CallSettingsLayout.qml
@ -108,18 +108,18 @@ list(APPEND _LINPHONEAPP_QML_FILES
view/Page/Layout/Settings/SecuritySettingsLayout.qml
view/Page/Main/AbstractMainPage.qml
view/Page/Main/Account/Accounts.qml
view/Page/Main/Account/AccountListView.qml
view/Page/Main/Call/CallPage.qml
view/Page/Main/Call/OngoingCallRightPanel.qml
view/Page/Main/Call/CallSettingsPanel.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/AbstractWindow.qml
view/Page/Window/Call/CallsWindow.qml
view/Page/Window/Main/Main.qml
view/Page/Window/Main/MainWindow.qml
)
list(APPEND _LINPHONEAPP_QML_SINGLETONS

View file

@ -44,7 +44,7 @@ FocusScope{
height: childrenRect.height
width: childrenRect.width
}
ErrorText {
TemporaryText {
id: errorText
anchors.top: contentItem.bottom
color: DefaultStyle.danger_500main

View file

@ -37,7 +37,7 @@ ColumnLayout {
}
}
ErrorText {
TemporaryText {
id: errorText
anchors.top: password.bottom
Connections {

View file

@ -12,7 +12,7 @@ ColumnLayout {
property alias micVolume: microVolume.value
property string microDevice: inputAudioDeviceCBox.currentText
RoundedBackgroundControl {
RoundedPane {
Layout.alignment: Qt.AlignHCenter
Control.StackView.onActivated: {
rightPanelTitle.text = qsTr("Paramètres")

View file

@ -44,7 +44,7 @@ ColumnLayout {
: DefaultStyle.grey_200
RowLayout {
anchors.fill: parent
PhoneNumberComboBox {
CountryIndicatorCombobox {
id: combobox
implicitWidth: 110 * DefaultStyle.dp
defaultCallingCode: mainItem.defaultCallingCode
@ -66,7 +66,7 @@ ColumnLayout {
}
}
}
ErrorText {
TemporaryText {
id: errorText
anchors.top: contentBackground.bottom
// visible: mainItem.enableErrorText

View file

@ -120,7 +120,7 @@ FocusScope {
weight: 800 * DefaultStyle.dp
}
}
ContactsList{
ContactListView{
id: contactList
Layout.fillWidth: true
Layout.preferredHeight: contentHeight
@ -142,7 +142,7 @@ FocusScope {
weight: 800 * DefaultStyle.dp
}
}
ContactsList{
ContactListView{
id: searchList
contactMenuVisible: false
Layout.fillWidth: true

View file

@ -8,7 +8,7 @@ import Linphone
import UtilsCpp
import SettingsCpp
RightPanelLayout {
MainRightPanel {
id: mainItem
property FriendGui contact
@ -422,7 +422,7 @@ RightPanelLayout {
Layout.preferredHeight: 24 * DefaultStyle.dp
}
}
ErrorText {
TemporaryText {
id: addressesErrorText
wrapMode: Text.WordWrap
elide: Text.ElideRight

View file

@ -254,7 +254,7 @@ LoginLayout {
}
}
ErrorText {
TemporaryText {
id: errorText
Connections {
target: LoginPageCpp

View file

@ -139,7 +139,7 @@ FocusScope{
weight: 800 * DefaultStyle.dp
}
}
ContactsList {
ContactListView {
id: contactList
visible: contentHeight > 0 || searchbar.text.length > 0
Layout.fillWidth: true

View file

@ -183,7 +183,7 @@ LoginLayout {
}
}
}
ErrorText {
TemporaryText {
id: otherErrorText
Layout.fillWidth: true
Layout.topMargin: 5 * DefaultStyle.dp

View file

@ -67,7 +67,7 @@ AbstractMainPage {
property int selectedIndex: 0
activeFocusOnTab: true
delegate: MasterDetailFamily {
delegate: SettingsMenuItem {
titleText: modelData.title
visible: modelData.visible != undefined ? modelData.visible : true
isSelected: familiesList.selectedIndex == index

View file

@ -7,8 +7,8 @@ import UtilsCpp 1.0
import SettingsCpp 1.0
import LinphoneAccountsCpp
AbstractMasterDetailPage {
layoutsPath: "qrc:/Linphone/view/Page/Layout/Settings/"
AbstractSettingsMenu {
layoutsPath: "qrc:/Linphone/view/Page/Layout/Settings"
titleText: qsTr("Mon compte")
property AccountProxy accounts: AccountProxy {id: accountProxy}
property AccountGui account: accountProxy.defaultAccount

View file

@ -4,8 +4,8 @@ import QtQuick.Layouts
import QtQuick.Controls as Control
import SettingsCpp
AbstractMasterDetailPage {
layoutsPath: "qrc:/Linphone/view/Page/Layout/Settings/"
AbstractSettingsMenu {
layoutsPath: "qrc:/Linphone/view/Page/Layout/Settings"
titleText: qsTr("Paramètres")
families: [
{title: qsTr("Appels"), layout: "CallSettingsLayout"},

View file

@ -250,7 +250,7 @@ Item {
}
}
contentItem: ContactsList {
contentItem: ContactListView {
id: contactList
visible: magicSearchBar.text.length != 0
Layout.preferredHeight: contentHeight
@ -444,7 +444,7 @@ Item {
account: accountProxy.defaultAccount
}
popup.contentItem: ColumnLayout {
Accounts {
AccountListView {
id: accounts
onAddAccountRequest: mainItem.addAccountRequest()
onEditAccount: function(account) {

View file

@ -7,7 +7,7 @@ import Linphone
import SettingsCpp 1.0
import UtilsCpp
AbstractDetailsLayout {
AbstractSettingsLayout {
id: mainItem
contentComponent: content
property alias account: mainItem.model
@ -267,7 +267,7 @@ AbstractDetailsLayout {
Layout.fillHeight: true
}
}
RoundedBackgroundControl {
RoundedPane {
Layout.fillWidth: true
Layout.fillHeight: true
// Layout.minimumHeight: account.core.devices.length * 133 * DefaultStyle.dp + (account.core.devices.length - 1) * 15 * DefaultStyle.dp + 2 * 21 * DefaultStyle.dp

View file

@ -7,7 +7,7 @@ import Linphone
import SettingsCpp 1.0
import UtilsCpp
AbstractDetailsLayout {
AbstractSettingsLayout {
id: mainItem
contentComponent: content
property alias account: mainItem.model

View file

@ -5,7 +5,7 @@ import QtQuick.Controls as Control
import Linphone
import SettingsCpp 1.0
AbstractDetailsLayout {
AbstractSettingsLayout {
contentComponent: content
width: parent.width
Component {

View file

@ -5,7 +5,7 @@ import QtQuick.Controls as Control
import SettingsCpp 1.0
import Linphone
AbstractDetailsLayout {
AbstractSettingsLayout {
id: mainItem
contentComponent: content
function layoutUrl(name) {

View file

@ -7,7 +7,7 @@ import Linphone
import SettingsCpp 1.0
import UtilsCpp 1.0
AbstractDetailsLayout {
AbstractSettingsLayout {
Layout.fillWidth: true
Layout.fillHeight: true
id: mainItem

View file

@ -7,7 +7,7 @@ import Linphone
import SettingsCpp 1.0
import UtilsCpp
AbstractDetailsLayout {
AbstractSettingsLayout {
id: mainItem
contentComponent: content
topbarOptionalComponent: topBar

View file

@ -5,7 +5,7 @@ import QtQuick.Controls as Control
import SettingsCpp 1.0
import Linphone
AbstractDetailsLayout {
AbstractSettingsLayout {
contentComponent: content
Component {
id: content

View file

@ -490,7 +490,7 @@ AbstractMainPage {
ColumnLayout {
anchors.fill: parent
CallContactsList {
NewCallForm {
id: callContactsList
Layout.fillWidth: true
Layout.fillHeight: true
@ -602,7 +602,7 @@ AbstractMainPage {
titleLoader.sourceComponent = groupCallTitle
addParticipantsLayout.forceActiveFocus()
}
AddParticipantsLayout {
AddParticipantsForm {
id: addParticipantsLayout
anchors.fill: parent
onSelectedParticipantsCountChanged: mainItem.selectedParticipantsCount = selectedParticipantsCount
@ -721,7 +721,7 @@ AbstractMainPage {
}
}
}
detailContent: RoundedBackgroundControl {
detailContent: RoundedPane {
id: detailControl
Layout.preferredWidth: 360 * DefaultStyle.dp
implicitHeight: 430 * DefaultStyle.dp + topPadding + bottomPadding

View file

@ -266,7 +266,7 @@ AbstractMainPage {
KeyNavigation.down: favoriteList
}
}
ContactsList{
ContactListView{
id: favoriteList
onActiveFocusChanged: if (activeFocus) console.log("favorite list focus")
hoverEnabled: mainItem.leftPanelEnabled
@ -318,7 +318,7 @@ AbstractMainPage {
KeyNavigation.down: contactList
}
}
ContactsList{
ContactListView{
id: contactList
onActiveFocusChanged: if (activeFocus) console.log("contact list focus")
onCountChanged: {
@ -409,7 +409,7 @@ AbstractMainPage {
}
}
RoundedBackgroundControl {
RoundedPane {
Layout.preferredHeight: Math.min(226 * DefaultStyle.dp, addrList.contentHeight + topPadding + bottomPadding)
height: Math.min(226 * DefaultStyle.dp, addrList.contentHeight)
Layout.fillWidth: true
@ -491,7 +491,7 @@ AbstractMainPage {
}
}
}
RoundedBackgroundControl {
RoundedPane {
visible: companyText.text.length != 0 || jobText.text.length != 0
Layout.fillWidth: true
topPadding: 17 * DefaultStyle.dp
@ -588,7 +588,7 @@ AbstractMainPage {
}
}
}
RoundedBackgroundControl {
RoundedPane {
Layout.preferredWidth: 360 * DefaultStyle.dp
contentItem: ColumnLayout {
spacing: 13 * DefaultStyle.dp
@ -675,7 +675,7 @@ AbstractMainPage {
weight: 800 * DefaultStyle.dp
}
}
RoundedBackgroundControl {
RoundedPane {
Layout.preferredWidth: 360 * DefaultStyle.dp
contentItem: ColumnLayout {
width: parent.width

View file

@ -184,7 +184,7 @@ AbstractMainPage {
restoreMode: Binding.RestoreBindingOrValue
}
}
MeetingList {
MeetingListView {
id: conferenceList
// Remove 24 from first section padding because we cannot know that it is the first section. 24 is the margins between sections.
Layout.topMargin: 38 * DefaultStyle.dp - 24 * DefaultStyle.dp
@ -295,7 +295,7 @@ AbstractMainPage {
}
}
}
MeetingSetUp {
MeetingForm {
id: meetingSetup
conferenceInfoGui: createConfLayout.conferenceInfoGui
isCreation: createConfLayout.isCreation
@ -420,7 +420,7 @@ AbstractMainPage {
}
}
}
MeetingSetUp {
MeetingForm {
id: conferenceEdit
property bool isCreation
isCreation: editFocusScope.isCreation
@ -519,7 +519,7 @@ AbstractMainPage {
}
}
}
AddParticipantsLayout {
AddParticipantsForm {
id: addParticipantLayout
Layout.fillWidth: true
Layout.fillHeight: true

View file

@ -9,7 +9,7 @@ import SettingsCpp 1.0
import DesktopToolsCpp 1.0
import LinphoneCallsCpp
AppWindow {
AbstractWindow {
id: mainWindow
flags: Qt.Window
// modality: Qt.WindowModal
@ -191,7 +191,7 @@ AppWindow {
icon.height: 32 * DefaultStyle.dp
contentImageColor: DefaultStyle.grey_0
}
ZrtpTokenAuthenticationDialog {
ZrtpAuthenticationDialog {
id: zrtpValidation
call: mainWindow.call
modal: true
@ -537,7 +537,7 @@ AppWindow {
Layout.fillWidth: true
Layout.fillHeight: true
}
OngoingCallRightPanel {
CallSettingsPanel {
id: rightPanel
Layout.fillHeight: true
Layout.preferredWidth: 393 * DefaultStyle.dp
@ -562,7 +562,7 @@ AppWindow {
event.accepted = true;
}
}
CallContactsList {
NewCallForm {
id: callcontactslist
anchors.fill: parent
anchors.topMargin: 21 * DefaultStyle.dp
@ -649,7 +649,7 @@ AppWindow {
font.pixelSize: 14 * DefaultStyle.dp
color: DefaultStyle.main2_500main
}
RoundedBackgroundControl {
RoundedPane {
Layout.fillWidth: true
contentItem: ColumnLayout {
spacing: 0
@ -740,7 +740,7 @@ AppWindow {
}
}
}
RoundedBackgroundControl {
RoundedPane {
Layout.fillWidth: true
Layout.maximumHeight: rightPanel.height
visible: callList.contentHeight > 0
@ -885,7 +885,7 @@ AppWindow {
event.accepted = true;
}
}
InCallSettingsPanel {
MultimediaSettings {
id: inSettingsPanel
call: mainWindow.call
anchors.fill: parent
@ -906,7 +906,7 @@ AppWindow {
event.accepted = true;
}
}
ScreencastPanel {
ScreencastSettings {
anchors.fill: parent
anchors.topMargin: 16 * DefaultStyle.dp
anchors.bottomMargin: 16 * DefaultStyle.dp
@ -997,7 +997,7 @@ AppWindow {
}
Component {
id: addParticipantComp
AddParticipantsLayout {
AddParticipantsForm {
id: addParticipantLayout
searchBarColor: DefaultStyle.grey_0
searchBarBorderColor: DefaultStyle.grey_200
@ -1025,7 +1025,7 @@ AppWindow {
Control.StackView.onActivated: {
rightPanel.headerTitleText = qsTr("Chiffrement")
}
RoundedBackgroundControl {
RoundedPane {
Layout.fillWidth: true
leftPadding: 16 * DefaultStyle.dp
rightPadding: 16 * DefaultStyle.dp
@ -1128,7 +1128,7 @@ AppWindow {
Control.StackView.onActivated: {
rightPanel.headerTitleText = qsTr("Statistiques")
}
RoundedBackgroundControl {
RoundedPane {
Layout.fillWidth: true
leftPadding: 16 * DefaultStyle.dp
rightPadding: 16 * DefaultStyle.dp
@ -1172,7 +1172,7 @@ AppWindow {
}
}
}
RoundedBackgroundControl {
RoundedPane {
Layout.fillWidth: true
leftPadding: 16 * DefaultStyle.dp
rightPadding: 16 * DefaultStyle.dp

View file

@ -7,7 +7,7 @@ import UtilsCpp 1.0
import SettingsCpp 1.0
import LinphoneAccountsCpp
AppWindow {
AbstractWindow {
id: mainWindow
// height: 982 * DefaultStyle.dp
visible: true