rename files
This commit is contained in:
parent
bb03f2785b
commit
ca346da033
43 changed files with 76 additions and 78 deletions
|
|
@ -466,13 +466,13 @@ void App::initCore() {
|
||||||
mAccountList = AccountList::create();
|
mAccountList = AccountList::create();
|
||||||
mCallList = CallList::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(
|
QObject::connect(
|
||||||
mEngine, &QQmlApplicationEngine::objectCreated, this,
|
mEngine, &QQmlApplicationEngine::objectCreated, this,
|
||||||
[this, url](QObject *obj, const QUrl &objUrl) {
|
[this, url](QObject *obj, const QUrl &objUrl) {
|
||||||
if (url == objUrl) {
|
if (url == objUrl) {
|
||||||
if (!obj) {
|
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);
|
exit(-1);
|
||||||
}
|
}
|
||||||
setMainWindow(qobject_cast<QQuickWindow *>(obj));
|
setMainWindow(qobject_cast<QQuickWindow *>(obj));
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,6 @@ constexpr char Constants::LanguagePath[];
|
||||||
// The main windows of Linphone desktop.
|
// The main windows of Linphone desktop.
|
||||||
constexpr char Constants::QmlViewMainWindow[];
|
constexpr char Constants::QmlViewMainWindow[];
|
||||||
constexpr char Constants::QmlViewCallsWindow[];
|
constexpr char Constants::QmlViewCallsWindow[];
|
||||||
constexpr char Constants::QmlViewSettingsWindow[];
|
|
||||||
|
|
||||||
#ifdef ENABLE_UPDATE_CHECK
|
#ifdef ENABLE_UPDATE_CHECK
|
||||||
constexpr int Constants::VersionUpdateCheckInterval;
|
constexpr int Constants::VersionUpdateCheckInterval;
|
||||||
|
|
|
||||||
|
|
@ -154,9 +154,8 @@ public:
|
||||||
static constexpr char LanguagePath[] = ":/languages/";
|
static constexpr char LanguagePath[] = ":/languages/";
|
||||||
|
|
||||||
// The main windows of Linphone desktop.
|
// The main windows of Linphone desktop.
|
||||||
static constexpr char QmlViewMainWindow[] = "qrc:/ui/views/App/Main/MainWindow.qml";
|
static constexpr char QmlViewMainWindow[] = "qrc:/Linphone/view/Page/Window/Main/MainWindow.qml";
|
||||||
static constexpr char QmlViewCallsWindow[] = "qrc:/ui/views/App/Calls/CallsWindow.qml";
|
static constexpr char QmlViewCallsWindow[] = "qrc:/Linphone/view/Page/Window/Call/CallsWindow.qml";
|
||||||
static constexpr char QmlViewSettingsWindow[] = "qrc:/ui/views/App/Settings/SettingsWindow.qml";
|
|
||||||
|
|
||||||
static constexpr char MainQmlUri[] = "Linphone";
|
static constexpr char MainQmlUri[] = "Linphone";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ list(APPEND _LINPHONEAPP_QML_FILES
|
||||||
view/Control/Button/HelpIconLabelButton.qml
|
view/Control/Button/HelpIconLabelButton.qml
|
||||||
view/Control/Button/IconLabelButton.qml
|
view/Control/Button/IconLabelButton.qml
|
||||||
view/Control/Button/MediumButton.qml
|
view/Control/Button/MediumButton.qml
|
||||||
view/Control/Button/PhoneNumberComboBox.qml
|
view/Control/Button/CountryIndicatorCombobox.qml
|
||||||
view/Control/Button/PopupButton.qml
|
view/Control/Button/PopupButton.qml
|
||||||
view/Control/Button/RadioButton.qml
|
view/Control/Button/RadioButton.qml
|
||||||
view/Control/Button/SecurityRadioButton.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/GridLayout.qml
|
||||||
view/Control/Container/Call/Mosaic.qml
|
view/Control/Container/Call/Mosaic.qml
|
||||||
view/Control/Container/Contact/ContactLayout.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/BusyIndicator.qml
|
||||||
view/Control/Display/EffectImage.qml
|
view/Control/Display/EffectImage.qml
|
||||||
view/Control/Display/ErrorText.qml
|
view/Control/Display/TemporaryText.qml
|
||||||
view/Control/Display/ProgressBar.qml
|
view/Control/Display/ProgressBar.qml
|
||||||
view/Control/Display/RoundedBackgroundControl.qml
|
view/Control/Display/RoundedPane.qml
|
||||||
view/Control/Display/Sticker.qml
|
view/Control/Display/Sticker.qml
|
||||||
view/Control/Display/Text.qml
|
view/Control/Display/Text.qml
|
||||||
view/Control/Display/ToolTip.qml
|
view/Control/Display/ToolTip.qml
|
||||||
view/Control/Display/Contact/Avatar.qml
|
view/Control/Display/Contact/Avatar.qml
|
||||||
view/Control/Display/Contact/Contact.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/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/ParticipantDeviceListView.qml
|
||||||
view/Control/Display/Participant/ParticipantListView.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/Login/LoginForm.qml
|
||||||
view/Control/Form/Settings/InCallSettingsPanel.qml
|
view/Control/Form/Settings/MultimediaSettings.qml
|
||||||
view/Control/Form/Settings/ScreencastPanel.qml
|
view/Control/Form/Settings/ScreencastSettings.qml
|
||||||
|
|
||||||
view/Control/Input/Calendar.qml
|
view/Control/Input/Calendar.qml
|
||||||
view/Control/Input/DigitInput.qml
|
view/Control/Input/DigitInput.qml
|
||||||
|
|
@ -66,7 +66,7 @@ list(APPEND _LINPHONEAPP_QML_FILES
|
||||||
view/Control/Popup/Popup.qml
|
view/Control/Popup/Popup.qml
|
||||||
view/Control/Popup/Dialog/AuthenticationDialog.qml
|
view/Control/Popup/Dialog/AuthenticationDialog.qml
|
||||||
view/Control/Popup/Dialog/Dialog.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/Loading/LoadingPopup.qml
|
||||||
view/Control/Popup/Notification/Notification.qml
|
view/Control/Popup/Notification/Notification.qml
|
||||||
view/Control/Popup/Notification/NotificationReceivedCall.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/ItemPrototype.qml
|
||||||
view/Control/Tool/Prototype/PhoneNumberPrototype.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/ContactDescription.qml
|
||||||
view/Page/Form/Contact/ContactEdition.qml
|
view/Page/Form/Contact/ContactEdition.qml
|
||||||
view/Page/Form/Login/LoginPage.qml
|
view/Page/Form/Login/LoginPage.qml
|
||||||
view/Page/Form/Login/SIPLoginPage.qml
|
view/Page/Form/Login/SIPLoginPage.qml
|
||||||
view/Page/Form/Meeting/AddParticipantsLayout.qml
|
view/Page/Form/Meeting/AddParticipantsForm.qml
|
||||||
view/Page/Form/Meeting/MeetingSetUp.qml
|
view/Page/Form/Meeting/MeetingForm.qml
|
||||||
view/Page/Form/Register/RegisterCheckingPage.qml
|
view/Page/Form/Register/RegisterCheckingPage.qml
|
||||||
view/Page/Form/Register/RegisterPage.qml
|
view/Page/Form/Register/RegisterPage.qml
|
||||||
view/Page/Form/Security/SecurityModePage.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/AccountSettingsPage.qml
|
||||||
view/Page/Form/Settings/SettingsPage.qml
|
view/Page/Form/Settings/SettingsPage.qml
|
||||||
|
|
||||||
view/Page/Layout/Login/LoginLayout.qml
|
view/Page/Layout/Login/LoginLayout.qml
|
||||||
view/Page/Layout/Main/MainLayout.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/AccountSettingsGeneralLayout.qml
|
||||||
view/Page/Layout/Settings/AccountSettingsParametersLayout.qml
|
view/Page/Layout/Settings/AccountSettingsParametersLayout.qml
|
||||||
view/Page/Layout/Settings/CallSettingsLayout.qml
|
view/Page/Layout/Settings/CallSettingsLayout.qml
|
||||||
|
|
@ -108,18 +108,18 @@ list(APPEND _LINPHONEAPP_QML_FILES
|
||||||
view/Page/Layout/Settings/SecuritySettingsLayout.qml
|
view/Page/Layout/Settings/SecuritySettingsLayout.qml
|
||||||
|
|
||||||
view/Page/Main/AbstractMainPage.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/CallPage.qml
|
||||||
view/Page/Main/Call/OngoingCallRightPanel.qml
|
view/Page/Main/Call/CallSettingsPanel.qml
|
||||||
view/Page/Main/Call/WaitingRoom.qml
|
view/Page/Main/Call/WaitingRoom.qml
|
||||||
view/Page/Main/Contact/ContactPage.qml
|
view/Page/Main/Contact/ContactPage.qml
|
||||||
view/Page/Main/Help/HelpPage.qml
|
view/Page/Main/Help/HelpPage.qml
|
||||||
view/Page/Main/Meeting/MeetingPage.qml
|
view/Page/Main/Meeting/MeetingPage.qml
|
||||||
view/Page/Main/Start/WelcomePage.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/Call/CallsWindow.qml
|
||||||
view/Page/Window/Main/Main.qml
|
view/Page/Window/Main/MainWindow.qml
|
||||||
)
|
)
|
||||||
|
|
||||||
list(APPEND _LINPHONEAPP_QML_SINGLETONS
|
list(APPEND _LINPHONEAPP_QML_SINGLETONS
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@ FocusScope{
|
||||||
height: childrenRect.height
|
height: childrenRect.height
|
||||||
width: childrenRect.width
|
width: childrenRect.width
|
||||||
}
|
}
|
||||||
ErrorText {
|
TemporaryText {
|
||||||
id: errorText
|
id: errorText
|
||||||
anchors.top: contentItem.bottom
|
anchors.top: contentItem.bottom
|
||||||
color: DefaultStyle.danger_500main
|
color: DefaultStyle.danger_500main
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ErrorText {
|
TemporaryText {
|
||||||
id: errorText
|
id: errorText
|
||||||
anchors.top: password.bottom
|
anchors.top: password.bottom
|
||||||
Connections {
|
Connections {
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ ColumnLayout {
|
||||||
property alias micVolume: microVolume.value
|
property alias micVolume: microVolume.value
|
||||||
property string microDevice: inputAudioDeviceCBox.currentText
|
property string microDevice: inputAudioDeviceCBox.currentText
|
||||||
|
|
||||||
RoundedBackgroundControl {
|
RoundedPane {
|
||||||
Layout.alignment: Qt.AlignHCenter
|
Layout.alignment: Qt.AlignHCenter
|
||||||
Control.StackView.onActivated: {
|
Control.StackView.onActivated: {
|
||||||
rightPanelTitle.text = qsTr("Paramètres")
|
rightPanelTitle.text = qsTr("Paramètres")
|
||||||
|
|
@ -44,7 +44,7 @@ ColumnLayout {
|
||||||
: DefaultStyle.grey_200
|
: DefaultStyle.grey_200
|
||||||
RowLayout {
|
RowLayout {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
PhoneNumberComboBox {
|
CountryIndicatorCombobox {
|
||||||
id: combobox
|
id: combobox
|
||||||
implicitWidth: 110 * DefaultStyle.dp
|
implicitWidth: 110 * DefaultStyle.dp
|
||||||
defaultCallingCode: mainItem.defaultCallingCode
|
defaultCallingCode: mainItem.defaultCallingCode
|
||||||
|
|
@ -66,7 +66,7 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ErrorText {
|
TemporaryText {
|
||||||
id: errorText
|
id: errorText
|
||||||
anchors.top: contentBackground.bottom
|
anchors.top: contentBackground.bottom
|
||||||
// visible: mainItem.enableErrorText
|
// visible: mainItem.enableErrorText
|
||||||
|
|
|
||||||
|
|
@ -120,7 +120,7 @@ FocusScope {
|
||||||
weight: 800 * DefaultStyle.dp
|
weight: 800 * DefaultStyle.dp
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ContactsList{
|
ContactListView{
|
||||||
id: contactList
|
id: contactList
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.preferredHeight: contentHeight
|
Layout.preferredHeight: contentHeight
|
||||||
|
|
@ -142,7 +142,7 @@ FocusScope {
|
||||||
weight: 800 * DefaultStyle.dp
|
weight: 800 * DefaultStyle.dp
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ContactsList{
|
ContactListView{
|
||||||
id: searchList
|
id: searchList
|
||||||
contactMenuVisible: false
|
contactMenuVisible: false
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
@ -8,7 +8,7 @@ import Linphone
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
import SettingsCpp
|
import SettingsCpp
|
||||||
|
|
||||||
RightPanelLayout {
|
MainRightPanel {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
||||||
property FriendGui contact
|
property FriendGui contact
|
||||||
|
|
@ -422,7 +422,7 @@ RightPanelLayout {
|
||||||
Layout.preferredHeight: 24 * DefaultStyle.dp
|
Layout.preferredHeight: 24 * DefaultStyle.dp
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ErrorText {
|
TemporaryText {
|
||||||
id: addressesErrorText
|
id: addressesErrorText
|
||||||
wrapMode: Text.WordWrap
|
wrapMode: Text.WordWrap
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
|
|
|
||||||
|
|
@ -254,7 +254,7 @@ LoginLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ErrorText {
|
TemporaryText {
|
||||||
id: errorText
|
id: errorText
|
||||||
Connections {
|
Connections {
|
||||||
target: LoginPageCpp
|
target: LoginPageCpp
|
||||||
|
|
|
||||||
|
|
@ -139,7 +139,7 @@ FocusScope{
|
||||||
weight: 800 * DefaultStyle.dp
|
weight: 800 * DefaultStyle.dp
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ContactsList {
|
ContactListView {
|
||||||
id: contactList
|
id: contactList
|
||||||
visible: contentHeight > 0 || searchbar.text.length > 0
|
visible: contentHeight > 0 || searchbar.text.length > 0
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
@ -183,7 +183,7 @@ LoginLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ErrorText {
|
TemporaryText {
|
||||||
id: otherErrorText
|
id: otherErrorText
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.topMargin: 5 * DefaultStyle.dp
|
Layout.topMargin: 5 * DefaultStyle.dp
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,7 @@ AbstractMainPage {
|
||||||
property int selectedIndex: 0
|
property int selectedIndex: 0
|
||||||
activeFocusOnTab: true
|
activeFocusOnTab: true
|
||||||
|
|
||||||
delegate: MasterDetailFamily {
|
delegate: SettingsMenuItem {
|
||||||
titleText: modelData.title
|
titleText: modelData.title
|
||||||
visible: modelData.visible != undefined ? modelData.visible : true
|
visible: modelData.visible != undefined ? modelData.visible : true
|
||||||
isSelected: familiesList.selectedIndex == index
|
isSelected: familiesList.selectedIndex == index
|
||||||
|
|
@ -7,8 +7,8 @@ import UtilsCpp 1.0
|
||||||
import SettingsCpp 1.0
|
import SettingsCpp 1.0
|
||||||
import LinphoneAccountsCpp
|
import LinphoneAccountsCpp
|
||||||
|
|
||||||
AbstractMasterDetailPage {
|
AbstractSettingsMenu {
|
||||||
layoutsPath: "qrc:/Linphone/view/Page/Layout/Settings/"
|
layoutsPath: "qrc:/Linphone/view/Page/Layout/Settings"
|
||||||
titleText: qsTr("Mon compte")
|
titleText: qsTr("Mon compte")
|
||||||
property AccountProxy accounts: AccountProxy {id: accountProxy}
|
property AccountProxy accounts: AccountProxy {id: accountProxy}
|
||||||
property AccountGui account: accountProxy.defaultAccount
|
property AccountGui account: accountProxy.defaultAccount
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@ import QtQuick.Layouts
|
||||||
import QtQuick.Controls as Control
|
import QtQuick.Controls as Control
|
||||||
import SettingsCpp
|
import SettingsCpp
|
||||||
|
|
||||||
AbstractMasterDetailPage {
|
AbstractSettingsMenu {
|
||||||
layoutsPath: "qrc:/Linphone/view/Page/Layout/Settings/"
|
layoutsPath: "qrc:/Linphone/view/Page/Layout/Settings"
|
||||||
titleText: qsTr("Paramètres")
|
titleText: qsTr("Paramètres")
|
||||||
families: [
|
families: [
|
||||||
{title: qsTr("Appels"), layout: "CallSettingsLayout"},
|
{title: qsTr("Appels"), layout: "CallSettingsLayout"},
|
||||||
|
|
|
||||||
|
|
@ -250,7 +250,7 @@ Item {
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
contentItem: ContactsList {
|
contentItem: ContactListView {
|
||||||
id: contactList
|
id: contactList
|
||||||
visible: magicSearchBar.text.length != 0
|
visible: magicSearchBar.text.length != 0
|
||||||
Layout.preferredHeight: contentHeight
|
Layout.preferredHeight: contentHeight
|
||||||
|
|
@ -444,7 +444,7 @@ Item {
|
||||||
account: accountProxy.defaultAccount
|
account: accountProxy.defaultAccount
|
||||||
}
|
}
|
||||||
popup.contentItem: ColumnLayout {
|
popup.contentItem: ColumnLayout {
|
||||||
Accounts {
|
AccountListView {
|
||||||
id: accounts
|
id: accounts
|
||||||
onAddAccountRequest: mainItem.addAccountRequest()
|
onAddAccountRequest: mainItem.addAccountRequest()
|
||||||
onEditAccount: function(account) {
|
onEditAccount: function(account) {
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ import Linphone
|
||||||
import SettingsCpp 1.0
|
import SettingsCpp 1.0
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
|
|
||||||
AbstractDetailsLayout {
|
AbstractSettingsLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
contentComponent: content
|
contentComponent: content
|
||||||
property alias account: mainItem.model
|
property alias account: mainItem.model
|
||||||
|
|
@ -267,7 +267,7 @@ AbstractDetailsLayout {
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
RoundedBackgroundControl {
|
RoundedPane {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: 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
|
// Layout.minimumHeight: account.core.devices.length * 133 * DefaultStyle.dp + (account.core.devices.length - 1) * 15 * DefaultStyle.dp + 2 * 21 * DefaultStyle.dp
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ import Linphone
|
||||||
import SettingsCpp 1.0
|
import SettingsCpp 1.0
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
|
|
||||||
AbstractDetailsLayout {
|
AbstractSettingsLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
contentComponent: content
|
contentComponent: content
|
||||||
property alias account: mainItem.model
|
property alias account: mainItem.model
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ import QtQuick.Controls as Control
|
||||||
import Linphone
|
import Linphone
|
||||||
import SettingsCpp 1.0
|
import SettingsCpp 1.0
|
||||||
|
|
||||||
AbstractDetailsLayout {
|
AbstractSettingsLayout {
|
||||||
contentComponent: content
|
contentComponent: content
|
||||||
width: parent.width
|
width: parent.width
|
||||||
Component {
|
Component {
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ import QtQuick.Controls as Control
|
||||||
import SettingsCpp 1.0
|
import SettingsCpp 1.0
|
||||||
import Linphone
|
import Linphone
|
||||||
|
|
||||||
AbstractDetailsLayout {
|
AbstractSettingsLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
contentComponent: content
|
contentComponent: content
|
||||||
function layoutUrl(name) {
|
function layoutUrl(name) {
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ import Linphone
|
||||||
import SettingsCpp 1.0
|
import SettingsCpp 1.0
|
||||||
import UtilsCpp 1.0
|
import UtilsCpp 1.0
|
||||||
|
|
||||||
AbstractDetailsLayout {
|
AbstractSettingsLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ import Linphone
|
||||||
import SettingsCpp 1.0
|
import SettingsCpp 1.0
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
|
|
||||||
AbstractDetailsLayout {
|
AbstractSettingsLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
contentComponent: content
|
contentComponent: content
|
||||||
topbarOptionalComponent: topBar
|
topbarOptionalComponent: topBar
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ import QtQuick.Controls as Control
|
||||||
import SettingsCpp 1.0
|
import SettingsCpp 1.0
|
||||||
import Linphone
|
import Linphone
|
||||||
|
|
||||||
AbstractDetailsLayout {
|
AbstractSettingsLayout {
|
||||||
contentComponent: content
|
contentComponent: content
|
||||||
Component {
|
Component {
|
||||||
id: content
|
id: content
|
||||||
|
|
|
||||||
|
|
@ -490,7 +490,7 @@ AbstractMainPage {
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
CallContactsList {
|
NewCallForm {
|
||||||
id: callContactsList
|
id: callContactsList
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
|
|
@ -602,7 +602,7 @@ AbstractMainPage {
|
||||||
titleLoader.sourceComponent = groupCallTitle
|
titleLoader.sourceComponent = groupCallTitle
|
||||||
addParticipantsLayout.forceActiveFocus()
|
addParticipantsLayout.forceActiveFocus()
|
||||||
}
|
}
|
||||||
AddParticipantsLayout {
|
AddParticipantsForm {
|
||||||
id: addParticipantsLayout
|
id: addParticipantsLayout
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
onSelectedParticipantsCountChanged: mainItem.selectedParticipantsCount = selectedParticipantsCount
|
onSelectedParticipantsCountChanged: mainItem.selectedParticipantsCount = selectedParticipantsCount
|
||||||
|
|
@ -721,7 +721,7 @@ AbstractMainPage {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
detailContent: RoundedBackgroundControl {
|
detailContent: RoundedPane {
|
||||||
id: detailControl
|
id: detailControl
|
||||||
Layout.preferredWidth: 360 * DefaultStyle.dp
|
Layout.preferredWidth: 360 * DefaultStyle.dp
|
||||||
implicitHeight: 430 * DefaultStyle.dp + topPadding + bottomPadding
|
implicitHeight: 430 * DefaultStyle.dp + topPadding + bottomPadding
|
||||||
|
|
|
||||||
|
|
@ -266,7 +266,7 @@ AbstractMainPage {
|
||||||
KeyNavigation.down: favoriteList
|
KeyNavigation.down: favoriteList
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ContactsList{
|
ContactListView{
|
||||||
id: favoriteList
|
id: favoriteList
|
||||||
onActiveFocusChanged: if (activeFocus) console.log("favorite list focus")
|
onActiveFocusChanged: if (activeFocus) console.log("favorite list focus")
|
||||||
hoverEnabled: mainItem.leftPanelEnabled
|
hoverEnabled: mainItem.leftPanelEnabled
|
||||||
|
|
@ -318,7 +318,7 @@ AbstractMainPage {
|
||||||
KeyNavigation.down: contactList
|
KeyNavigation.down: contactList
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ContactsList{
|
ContactListView{
|
||||||
id: contactList
|
id: contactList
|
||||||
onActiveFocusChanged: if (activeFocus) console.log("contact list focus")
|
onActiveFocusChanged: if (activeFocus) console.log("contact list focus")
|
||||||
onCountChanged: {
|
onCountChanged: {
|
||||||
|
|
@ -409,7 +409,7 @@ AbstractMainPage {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
RoundedBackgroundControl {
|
RoundedPane {
|
||||||
Layout.preferredHeight: Math.min(226 * DefaultStyle.dp, addrList.contentHeight + topPadding + bottomPadding)
|
Layout.preferredHeight: Math.min(226 * DefaultStyle.dp, addrList.contentHeight + topPadding + bottomPadding)
|
||||||
height: Math.min(226 * DefaultStyle.dp, addrList.contentHeight)
|
height: Math.min(226 * DefaultStyle.dp, addrList.contentHeight)
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
@ -491,7 +491,7 @@ AbstractMainPage {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
RoundedBackgroundControl {
|
RoundedPane {
|
||||||
visible: companyText.text.length != 0 || jobText.text.length != 0
|
visible: companyText.text.length != 0 || jobText.text.length != 0
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
topPadding: 17 * DefaultStyle.dp
|
topPadding: 17 * DefaultStyle.dp
|
||||||
|
|
@ -588,7 +588,7 @@ AbstractMainPage {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
RoundedBackgroundControl {
|
RoundedPane {
|
||||||
Layout.preferredWidth: 360 * DefaultStyle.dp
|
Layout.preferredWidth: 360 * DefaultStyle.dp
|
||||||
contentItem: ColumnLayout {
|
contentItem: ColumnLayout {
|
||||||
spacing: 13 * DefaultStyle.dp
|
spacing: 13 * DefaultStyle.dp
|
||||||
|
|
@ -675,7 +675,7 @@ AbstractMainPage {
|
||||||
weight: 800 * DefaultStyle.dp
|
weight: 800 * DefaultStyle.dp
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
RoundedBackgroundControl {
|
RoundedPane {
|
||||||
Layout.preferredWidth: 360 * DefaultStyle.dp
|
Layout.preferredWidth: 360 * DefaultStyle.dp
|
||||||
contentItem: ColumnLayout {
|
contentItem: ColumnLayout {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
|
|
|
||||||
|
|
@ -184,7 +184,7 @@ AbstractMainPage {
|
||||||
restoreMode: Binding.RestoreBindingOrValue
|
restoreMode: Binding.RestoreBindingOrValue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
MeetingList {
|
MeetingListView {
|
||||||
id: conferenceList
|
id: conferenceList
|
||||||
// Remove 24 from first section padding because we cannot know that it is the first section. 24 is the margins between sections.
|
// 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
|
Layout.topMargin: 38 * DefaultStyle.dp - 24 * DefaultStyle.dp
|
||||||
|
|
@ -295,7 +295,7 @@ AbstractMainPage {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
MeetingSetUp {
|
MeetingForm {
|
||||||
id: meetingSetup
|
id: meetingSetup
|
||||||
conferenceInfoGui: createConfLayout.conferenceInfoGui
|
conferenceInfoGui: createConfLayout.conferenceInfoGui
|
||||||
isCreation: createConfLayout.isCreation
|
isCreation: createConfLayout.isCreation
|
||||||
|
|
@ -420,7 +420,7 @@ AbstractMainPage {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
MeetingSetUp {
|
MeetingForm {
|
||||||
id: conferenceEdit
|
id: conferenceEdit
|
||||||
property bool isCreation
|
property bool isCreation
|
||||||
isCreation: editFocusScope.isCreation
|
isCreation: editFocusScope.isCreation
|
||||||
|
|
@ -519,7 +519,7 @@ AbstractMainPage {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
AddParticipantsLayout {
|
AddParticipantsForm {
|
||||||
id: addParticipantLayout
|
id: addParticipantLayout
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ import SettingsCpp 1.0
|
||||||
import DesktopToolsCpp 1.0
|
import DesktopToolsCpp 1.0
|
||||||
import LinphoneCallsCpp
|
import LinphoneCallsCpp
|
||||||
|
|
||||||
AppWindow {
|
AbstractWindow {
|
||||||
id: mainWindow
|
id: mainWindow
|
||||||
flags: Qt.Window
|
flags: Qt.Window
|
||||||
// modality: Qt.WindowModal
|
// modality: Qt.WindowModal
|
||||||
|
|
@ -191,7 +191,7 @@ AppWindow {
|
||||||
icon.height: 32 * DefaultStyle.dp
|
icon.height: 32 * DefaultStyle.dp
|
||||||
contentImageColor: DefaultStyle.grey_0
|
contentImageColor: DefaultStyle.grey_0
|
||||||
}
|
}
|
||||||
ZrtpTokenAuthenticationDialog {
|
ZrtpAuthenticationDialog {
|
||||||
id: zrtpValidation
|
id: zrtpValidation
|
||||||
call: mainWindow.call
|
call: mainWindow.call
|
||||||
modal: true
|
modal: true
|
||||||
|
|
@ -537,7 +537,7 @@ AppWindow {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
}
|
}
|
||||||
OngoingCallRightPanel {
|
CallSettingsPanel {
|
||||||
id: rightPanel
|
id: rightPanel
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
Layout.preferredWidth: 393 * DefaultStyle.dp
|
Layout.preferredWidth: 393 * DefaultStyle.dp
|
||||||
|
|
@ -562,7 +562,7 @@ AppWindow {
|
||||||
event.accepted = true;
|
event.accepted = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
CallContactsList {
|
NewCallForm {
|
||||||
id: callcontactslist
|
id: callcontactslist
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.topMargin: 21 * DefaultStyle.dp
|
anchors.topMargin: 21 * DefaultStyle.dp
|
||||||
|
|
@ -649,7 +649,7 @@ AppWindow {
|
||||||
font.pixelSize: 14 * DefaultStyle.dp
|
font.pixelSize: 14 * DefaultStyle.dp
|
||||||
color: DefaultStyle.main2_500main
|
color: DefaultStyle.main2_500main
|
||||||
}
|
}
|
||||||
RoundedBackgroundControl {
|
RoundedPane {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
contentItem: ColumnLayout {
|
contentItem: ColumnLayout {
|
||||||
spacing: 0
|
spacing: 0
|
||||||
|
|
@ -740,7 +740,7 @@ AppWindow {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
RoundedBackgroundControl {
|
RoundedPane {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.maximumHeight: rightPanel.height
|
Layout.maximumHeight: rightPanel.height
|
||||||
visible: callList.contentHeight > 0
|
visible: callList.contentHeight > 0
|
||||||
|
|
@ -885,7 +885,7 @@ AppWindow {
|
||||||
event.accepted = true;
|
event.accepted = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
InCallSettingsPanel {
|
MultimediaSettings {
|
||||||
id: inSettingsPanel
|
id: inSettingsPanel
|
||||||
call: mainWindow.call
|
call: mainWindow.call
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
@ -906,7 +906,7 @@ AppWindow {
|
||||||
event.accepted = true;
|
event.accepted = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ScreencastPanel {
|
ScreencastSettings {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.topMargin: 16 * DefaultStyle.dp
|
anchors.topMargin: 16 * DefaultStyle.dp
|
||||||
anchors.bottomMargin: 16 * DefaultStyle.dp
|
anchors.bottomMargin: 16 * DefaultStyle.dp
|
||||||
|
|
@ -997,7 +997,7 @@ AppWindow {
|
||||||
}
|
}
|
||||||
Component {
|
Component {
|
||||||
id: addParticipantComp
|
id: addParticipantComp
|
||||||
AddParticipantsLayout {
|
AddParticipantsForm {
|
||||||
id: addParticipantLayout
|
id: addParticipantLayout
|
||||||
searchBarColor: DefaultStyle.grey_0
|
searchBarColor: DefaultStyle.grey_0
|
||||||
searchBarBorderColor: DefaultStyle.grey_200
|
searchBarBorderColor: DefaultStyle.grey_200
|
||||||
|
|
@ -1025,7 +1025,7 @@ AppWindow {
|
||||||
Control.StackView.onActivated: {
|
Control.StackView.onActivated: {
|
||||||
rightPanel.headerTitleText = qsTr("Chiffrement")
|
rightPanel.headerTitleText = qsTr("Chiffrement")
|
||||||
}
|
}
|
||||||
RoundedBackgroundControl {
|
RoundedPane {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
leftPadding: 16 * DefaultStyle.dp
|
leftPadding: 16 * DefaultStyle.dp
|
||||||
rightPadding: 16 * DefaultStyle.dp
|
rightPadding: 16 * DefaultStyle.dp
|
||||||
|
|
@ -1128,7 +1128,7 @@ AppWindow {
|
||||||
Control.StackView.onActivated: {
|
Control.StackView.onActivated: {
|
||||||
rightPanel.headerTitleText = qsTr("Statistiques")
|
rightPanel.headerTitleText = qsTr("Statistiques")
|
||||||
}
|
}
|
||||||
RoundedBackgroundControl {
|
RoundedPane {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
leftPadding: 16 * DefaultStyle.dp
|
leftPadding: 16 * DefaultStyle.dp
|
||||||
rightPadding: 16 * DefaultStyle.dp
|
rightPadding: 16 * DefaultStyle.dp
|
||||||
|
|
@ -1172,7 +1172,7 @@ AppWindow {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
RoundedBackgroundControl {
|
RoundedPane {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
leftPadding: 16 * DefaultStyle.dp
|
leftPadding: 16 * DefaultStyle.dp
|
||||||
rightPadding: 16 * DefaultStyle.dp
|
rightPadding: 16 * DefaultStyle.dp
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ import UtilsCpp 1.0
|
||||||
import SettingsCpp 1.0
|
import SettingsCpp 1.0
|
||||||
import LinphoneAccountsCpp
|
import LinphoneAccountsCpp
|
||||||
|
|
||||||
AppWindow {
|
AbstractWindow {
|
||||||
id: mainWindow
|
id: mainWindow
|
||||||
// height: 982 * DefaultStyle.dp
|
// height: 982 * DefaultStyle.dp
|
||||||
visible: true
|
visible: true
|
||||||
Loading…
Reference in a new issue