From 92134af645a2e07f791f560bc4f355536659bbfb Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 19 Jul 2018 09:36:48 +0200 Subject: [PATCH] chore(Assistant): rename linphone files to app files --- CMakeLists.txt | 4 ++-- ...eate-linphone-sip-account.rc => create-app-sip-account.rc} | 0 .../{use-linphone-sip-account.rc => use-app-sip-account.rc} | 0 cmake_builder/linphone_package/CMakeLists.txt | 4 ++-- src/components/settings/AccountSettingsModel.cpp | 2 +- ui/views/App/Main/Assistant/CreateAppSipAccountWithEmail.qml | 2 +- .../App/Main/Assistant/CreateAppSipAccountWithPhoneNumber.qml | 2 +- ui/views/App/Main/Assistant/UseAppSipAccount.qml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename assets/assistant/{create-linphone-sip-account.rc => create-app-sip-account.rc} (100%) rename assets/assistant/{use-linphone-sip-account.rc => use-app-sip-account.rc} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 63968b86b..22ddb1f6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -455,10 +455,10 @@ set(ASSISTANT_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/${EXECUTABLE_NAME}/assis install(FILES "${ASSETS_ASSISTANT_DIR}/use-other-sip-account.rc" DESTINATION "${ASSISTANT_INSTALL_DATADIR}" ) -install(FILES "${ASSETS_ASSISTANT_DIR}/create-linphone-sip-account.rc" +install(FILES "${ASSETS_ASSISTANT_DIR}/create-app-sip-account.rc" DESTINATION "${ASSISTANT_INSTALL_DATADIR}" ) -install(FILES "${ASSETS_ASSISTANT_DIR}/use-linphone-sip-account.rc" +install(FILES "${ASSETS_ASSISTANT_DIR}/use-app-sip-account.rc" DESTINATION "${ASSISTANT_INSTALL_DATADIR}" ) diff --git a/assets/assistant/create-linphone-sip-account.rc b/assets/assistant/create-app-sip-account.rc similarity index 100% rename from assets/assistant/create-linphone-sip-account.rc rename to assets/assistant/create-app-sip-account.rc diff --git a/assets/assistant/use-linphone-sip-account.rc b/assets/assistant/use-app-sip-account.rc similarity index 100% rename from assets/assistant/use-linphone-sip-account.rc rename to assets/assistant/use-app-sip-account.rc diff --git a/cmake_builder/linphone_package/CMakeLists.txt b/cmake_builder/linphone_package/CMakeLists.txt index eb4997f62..06c5bd96c 100644 --- a/cmake_builder/linphone_package/CMakeLists.txt +++ b/cmake_builder/linphone_package/CMakeLists.txt @@ -212,8 +212,8 @@ elseif (APPLE) file(COPY "${LINPHONE_OUTPUT_DIR}/share/${APPLICATION_NAME}/linphonerc-factory" DESTINATION "${APPLICATION_NAME}.app/Contents/Resources/share/${EXECUTABLE_NAME}") file(COPY "${LINPHONE_OUTPUT_DIR}/share/${APPLICATION_NAME}/assistant/use-other-sip-account.rc" DESTINATION "${APPLICATION_NAME}.app/Contents/Resources/share/${EXECUTABLE_NAME}/assistant") - file(COPY "${LINPHONE_OUTPUT_DIR}/share/${APPLICATION_NAME}/assistant/create-linphone-sip-account.rc" DESTINATION "${APPLICATION_NAME}.app/Contents/Resources/share/${EXECUTABLE_NAME}/assistant") - file(COPY "${LINPHONE_OUTPUT_DIR}/share/${APPLICATION_NAME}/assistant/use-linphone-sip-account.rc" DESTINATION "${APPLICATION_NAME}.app/Contents/Resources/share/${EXECUTABLE_NAME}/assistant") + file(COPY "${LINPHONE_OUTPUT_DIR}/share/${APPLICATION_NAME}/assistant/create-app-sip-account.rc" DESTINATION "${APPLICATION_NAME}.app/Contents/Resources/share/${EXECUTABLE_NAME}/assistant") + file(COPY "${LINPHONE_OUTPUT_DIR}/share/${APPLICATION_NAME}/assistant/use-app-sip-account.rc" DESTINATION "${APPLICATION_NAME}.app/Contents/Resources/share/${EXECUTABLE_NAME}/assistant") file(GLOB SHARED_LIBRARIES "${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_NAME}.app/Contents/Frameworks/lib*.dylib") foreach (_library ${SHARED_LIBRARIES}) diff --git a/src/components/settings/AccountSettingsModel.cpp b/src/components/settings/AccountSettingsModel.cpp index 325e7a291..def515399 100644 --- a/src/components/settings/AccountSettingsModel.cpp +++ b/src/components/settings/AccountSettingsModel.cpp @@ -221,7 +221,7 @@ shared_ptr AccountSettingsModel::createProxyConfig () { shared_ptr core = CoreManager::getInstance()->getCore(); core->getConfig()->loadFromXmlFile( - Paths::getAssistantConfigDirPath() + "create-linphone-sip-account.rc" + Paths::getAssistantConfigDirPath() + "create-app-sip-account.rc" ); return core->createProxyConfig(); diff --git a/ui/views/App/Main/Assistant/CreateAppSipAccountWithEmail.qml b/ui/views/App/Main/Assistant/CreateAppSipAccountWithEmail.qml index 6069ef59f..dede18afb 100644 --- a/ui/views/App/Main/Assistant/CreateAppSipAccountWithEmail.qml +++ b/ui/views/App/Main/Assistant/CreateAppSipAccountWithEmail.qml @@ -116,7 +116,7 @@ AssistantAbstractView { : '' } - configFilename: 'create-linphone-sip-account.rc' + configFilename: 'create-app-sip-account.rc' onEmailChanged: emailError = error onPasswordChanged: passwordError = error diff --git a/ui/views/App/Main/Assistant/CreateAppSipAccountWithPhoneNumber.qml b/ui/views/App/Main/Assistant/CreateAppSipAccountWithPhoneNumber.qml index 97295a8b0..625b61d5f 100644 --- a/ui/views/App/Main/Assistant/CreateAppSipAccountWithPhoneNumber.qml +++ b/ui/views/App/Main/Assistant/CreateAppSipAccountWithPhoneNumber.qml @@ -108,7 +108,7 @@ AssistantAbstractView { AssistantModel { id: assistantModel - configFilename: 'create-linphone-sip-account.rc' + configFilename: 'create-app-sip-account.rc' Component.onCompleted: view.setCountryCode(country.model.defaultIndex) diff --git a/ui/views/App/Main/Assistant/UseAppSipAccount.qml b/ui/views/App/Main/Assistant/UseAppSipAccount.qml index 5cea23fa7..db55a6a89 100644 --- a/ui/views/App/Main/Assistant/UseAppSipAccount.qml +++ b/ui/views/App/Main/Assistant/UseAppSipAccount.qml @@ -68,7 +68,7 @@ AssistantAbstractView { assistantModel.countryCode = model.data(model.index(index, 0)).countryCode } - configFilename: 'use-linphone-sip-account.rc' + configFilename: 'use-app-sip-account.rc' countryCode: setCountryCode(telephoneNumbersModel.defaultIndex)