diff --git a/Linphone/core/App.cpp b/Linphone/core/App.cpp index 8e7453bef..7cd216c9d 100644 --- a/Linphone/core/App.cpp +++ b/Linphone/core/App.cpp @@ -496,6 +496,7 @@ void App::initCore() { else mCallList->lUpdate(); if (!mSettings) { mSettings = settings; + mSettings->setMediaEncryptions(new MediaEncryptionList()); setLocale(settings->getConfigLocale()); setAutoStart(settings->getAutoStart()); setQuitOnLastWindowClosed(settings->getExitOnClose()); diff --git a/Linphone/core/setting/SettingsCore.cpp b/Linphone/core/setting/SettingsCore.cpp index 77a857d53..26a26e298 100644 --- a/Linphone/core/setting/SettingsCore.cpp +++ b/Linphone/core/setting/SettingsCore.cpp @@ -21,7 +21,6 @@ #include "SettingsCore.hpp" #include "core/App.hpp" #include "core/path/Paths.hpp" -#include "model/tool/ToolModel.hpp" #include "tool/Utils.hpp" #include @@ -31,6 +30,40 @@ DEFINE_ABSTRACT_OBJECT(SettingsCore) // ============================================================================= +MediaEncryptionList::MediaEncryptionList(QObject *parent) { + mList = {LinphoneEnums::MediaEncryption::None, LinphoneEnums::MediaEncryption::Srtp, + LinphoneEnums::MediaEncryption::Zrtp, LinphoneEnums::MediaEncryption::Dtls}; +} +MediaEncryptionList::~MediaEncryptionList(){} + +LinphoneEnums::MediaEncryption MediaEncryptionList::getAt(const int& index) const { + if (index < mList.size()) { + return mList[index]; + } + return {}; +} + +QHash MediaEncryptionList::roleNames() const { + QHash roles; + roles[Qt::DisplayRole] = "display_name"; + roles[Qt::DisplayRole+1] = "id"; + return roles; +} +QVariant MediaEncryptionList::data(const QModelIndex &index, int role) const { + if(!checkIndex(index)){ + return QVariant(); + } + auto encryption = mList.at(index.row()); + if(role == Qt::DisplayRole){ + return LinphoneEnums::toString(encryption); + } else if(role == Qt::DisplayRole+1) { + return QVariant::fromValue(encryption); + } + return QVariant(); +} + +// ============================================================================= + QSharedPointer SettingsCore::create() { auto sharedPointer = QSharedPointer(new SettingsCore(), &QObject::deleteLater); sharedPointer->setSelf(sharedPointer); @@ -63,7 +96,6 @@ SettingsCore::SettingsCore(QObject *parent) : QObject(parent) { mConferenceLayout = LinphoneEnums::toVariant(LinphoneEnums::fromLinphone(settingsModel->getDefaultConferenceLayout())); - mMediaEncryptions = LinphoneEnums::mediaEncryptionsToVariant(); mMediaEncryption = LinphoneEnums::toVariant(LinphoneEnums::fromLinphone(settingsModel->getDefaultMediaEncryption())); @@ -444,7 +476,6 @@ void SettingsCore::reset(const SettingsCore &settingsCore) { setConferenceLayouts(settingsCore.mConferenceLayouts); setConferenceLayout(settingsCore.mConferenceLayout); - setMediaEncryptions(settingsCore.mMediaEncryptions); setMediaEncryption(settingsCore.mMediaEncryption); setMediaEncryptionMandatory(settingsCore.mMediaEncryptionMandatory); @@ -571,13 +602,12 @@ void SettingsCore::setConferenceLayouts(QVariantList layouts) { emit conferenceLayoutsChanged(layouts); } -QVariantList SettingsCore::getMediaEncryptions() const { - return mMediaEncryptions; +MediaEncryptionList *SettingsCore::getMediaEncryptions() const { + return mMediaEncryptions.get(); } -void SettingsCore::setMediaEncryptions(QVariantList encryptions) { - mMediaEncryptions = encryptions; - emit mediaEncryptionsChanged(encryptions); +void SettingsCore::setMediaEncryptions(MediaEncryptionList* encryptions) { + mMediaEncryptions = QSharedPointer(encryptions); } bool SettingsCore::isMediaEncryptionMandatory() const { diff --git a/Linphone/core/setting/SettingsCore.hpp b/Linphone/core/setting/SettingsCore.hpp index 9815c37b1..1e8087b13 100644 --- a/Linphone/core/setting/SettingsCore.hpp +++ b/Linphone/core/setting/SettingsCore.hpp @@ -18,9 +18,8 @@ * along with this program. If not, see . */ -#ifndef SETTINGS_CORE_H_ -#define SETTINGS_CORE_H_ +#include "core/proxy/AbstractListProxy.hpp" #include "model/setting/SettingsModel.hpp" #include "tool/thread/SafeConnection.hpp" @@ -29,6 +28,24 @@ #include #include +#ifndef MEDIA_ENCRYPTION_LIST_H_ +#define MEDIA_ENCRYPTION_LIST_H_ + +class MediaEncryptionList : public AbstractListProxy { + Q_OBJECT +public: + MediaEncryptionList(QObject *parent = Q_NULLPTR); + ~MediaEncryptionList(); + + Q_INVOKABLE LinphoneEnums::MediaEncryption getAt(const int& index) const; + virtual QHash roleNames() const override; + virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; +}; +#endif + +#ifndef SETTINGS_CORE_H_ +#define SETTINGS_CORE_H_ + class SettingsCore : public QObject, public AbstractObject { Q_OBJECT @@ -51,7 +68,7 @@ public: Q_PROPERTY(QVariantList playbackDevices READ getPlaybackDevices NOTIFY playbackDevicesChanged) Q_PROPERTY(QVariantList ringerDevices READ getRingerDevices NOTIFY ringerDevicesChanged) Q_PROPERTY(QVariantList conferenceLayouts READ getConferenceLayouts NOTIFY conferenceLayoutsChanged) - Q_PROPERTY(QVariantList mediaEncryptions READ getMediaEncryptions NOTIFY mediaEncryptionsChanged) + Q_PROPERTY(MediaEncryptionList* mediaEncryptions READ getMediaEncryptions NOTIFY mediaEncryptionsChanged) Q_PROPERTY(float playbackGain READ getPlaybackGain WRITE setPlaybackGain NOTIFY playbackGainChanged) Q_PROPERTY(float captureGain READ getCaptureGain WRITE setCaptureGain NOTIFY captureGainChanged) @@ -139,8 +156,8 @@ public: void setRingerDevices(QVariantList devices); QVariantList getConferenceLayouts() const; void setConferenceLayouts(QVariantList layouts); - QVariantList getMediaEncryptions() const; - void setMediaEncryptions(QVariantList encryptions); + MediaEncryptionList* getMediaEncryptions() const; + void setMediaEncryptions(MediaEncryptionList* encryptions); QVariantMap getCaptureDevice() const; void setCaptureDevice(QVariantMap device); @@ -302,7 +319,7 @@ private: // Security bool mVfsEnabled; - QVariantList mMediaEncryptions; + QSharedPointer mMediaEncryptions; QVariantMap mMediaEncryption; bool mMediaEncryptionMandatory; diff --git a/Linphone/data/languages/de.ts b/Linphone/data/languages/de.ts index 3ae4b1747..a0405f3e1 100644 --- a/Linphone/data/languages/de.ts +++ b/Linphone/data/languages/de.ts @@ -189,7 +189,7 @@ manage_account_international_prefix - "Indicatif international*" + Indicatif international* @@ -409,55 +409,55 @@ settings_system_title - "Système" + System settings_remote_provisioning_title - "Configuration distante" + Remote provisioning settings_security_title - "Sécurité / Chiffrement" + Security / Encryption settings_advanced_audio_codecs_title - "Codecs audio" + Audio codecs settings_advanced_video_codecs_title - "Codecs vidéo" + Video codecs settings_advanced_auto_start_title - "Démarrer automatiquement %1" + Auto start %1 settings_advanced_remote_provisioning_url - "URL de configuration distante" + Remote provisioning URL settings_advanced_download_apply_remote_provisioning - "Télécharger et appliquer" + Download and apply information_popup_error_title - "Format d'url invalide" + Invalid URL format @@ -468,17 +468,17 @@ settings_advanced_media_encryption_title - "Chiffrement du média" + Media encryption - + settings_advanced_media_encryption_mandatory_title - "Chiffrement du média obligatoire" + Media encryption mandatory - + settings_advanced_hide_fps_title @@ -513,63 +513,63 @@ - + application_description "A free and open source SIP video-phone." - + command_line_arg_order "Send an order to the application towards a command line" - + command_line_option_show_help - + command_line_option_show_app_version - + command_line_option_config_to_fetch "Specify the linphone configuration file to be fetched. It will be merged with the current configuration." - + command_line_option_config_to_fetch_arg "URL, path or file" - + command_line_option_log_to_stdout - + command_line_option_print_app_logs_only "Print only logs from the application" - + hide_action "Cacher" "Afficher" - + show_action - + quit_action "Quitter" @@ -616,56 +616,80 @@ CallCore - + call_record_end_message "Enregistrement terminé" - + call_record_saved_in_file_message "L'appel a été enregistré dans le fichier : %1" - - + + call_stats_codec_label "Codec: %1 / %2 kHz" - - + + call_stats_bandwidth_label "Bande passante : %1 %2 kbits/s %3 %4 kbits/s" - - + + call_stats_loss_rate_label "Taux de perte: %1% %2%" - + call_stats_jitter_buffer_label "Tampon de gigue: %1 ms" - + call_stats_resolution_label "Définition vidéo : %1 %2 %3 %4" - + call_stats_fps_label "FPS : %1 %2 %3 %4" + + + media_encryption_dtls + DTLS + + + + + media_encryption_none + None + + + + + media_encryption_srtp + SRTP + + + + + media_encryption_post_quantum + "ZRTP - Post quantique" + + CallHistoryLayout @@ -1126,25 +1150,24 @@ - + call_dir - "Appel %1" - + call_ended "Appel terminé" - + conference_paused "Réunion mise en pause" - + call_paused "Appel mis en pause" @@ -1152,299 +1175,306 @@ call_srtp_point_to_point_encrypted - "Appel chiffré de point à point" + Appel chiffré de point à point call_zrtp_sas_validation_required - "Vérification nécessaire" + Vérification nécessaire - - + + call_zrtp_end_to_end_encrypted - "Appel chiffré de bout en bout" + Appel chiffré de bout en bout + + call_waiting_for_encryption_info + "En attente de chiffrement" + + + + call_not_encrypted "Appel non chiffré" - + conference_user_is_recording "Vous enregistrez la réunion" - + call_user_is_recording "Vous enregistrez l'appel" - + conference_remote_is_recording "Un participant enregistre la réunion" - + call_remote_recording "%1 enregistre l'appel" - + call_stop_recording "Arrêter l'enregistrement" - + add - + call_transfer_current_call_title "Transférer %1 à…" - - + + call_transfer_confirm_dialog_tittle "Confirmer le transfert" - - + + call_transfer_confirm_dialog_message "Vous allez transférer %1 à %2." - + call_action_start_new_call "Nouvel appel" - - + + call_action_show_dialer "Pavé numérique" - + call_action_change_layout "Modifier la disposition" - + call_action_go_to_calls_list "Liste d'appel" - + Merger tous les appels call_action_merge_calls - - + + call_action_go_to_settings "Paramètres" - + conference_action_screen_sharing "Partage de votre écran" - + conference_share_link_title Partager le lien de la réunion - + copied Copié - + information_popup_meeting_address_copied_to_clipboard Le lien de la réunion a été copié dans le presse-papier - - - + + + conference_participants_list_title "Participants (%1)" - - + + group_call_participant_selected - + meeting_schedule_add_participants_title - + call_encryption_title Chiffrement - + call_stats_title Statistiques - + call_action_end_call "Terminer l'appel" - + call_action_resume_call "Reprendre l'appel" - + call_action_pause_call "Mettre l'appel en pause" - + call_action_transfer_call "Transférer l'appel" - + call_action_start_new_call_hint "Initier un nouvel appel" - + call_display_call_list_hint "Afficher la liste d'appels" - + call_deactivate_video_hint "Désactiver la vidéo" "Activer la vidéo" - + call_activate_video_hint - + call_activate_microphone "Activer le micro" - + call_deactivate_microphone "Désactiver le micro" - + call_share_screen_hint Partager l'écran… - + call_rise_hand_hint "Lever la main" - + call_send_reaction_hint "Envoyer une réaction" - + call_manage_participants_hint "Gérer les participants" - + call_more_options_hint "Plus d'options…" - + call_action_change_conference_layout "Modifier la disposition" - + call_action_full_screen "Mode Plein écran" - + call_action_stop_recording "Terminer l'enregistrement" - + call_action_record "Enregistrer l'appel" - + call_activate_speaker_hint "Activer le son" - + call_deactivate_speaker_hint "Désactiver le son" @@ -2291,43 +2321,49 @@ - + call_stats_media_encryption - "Chiffrement du média : %1%2" "ZRTP Post Quantique" + Chiffrement du média : %1 - + + call_stats_media_encryption_zrtp_post_quantum + ZRTP Post Quantique + + + + call_stats_zrtp_cipher_algo "Algorithme de chiffrement : %1" - + call_stats_zrtp_key_agreement_algo "Algorithme d'accord de clé : %1" - + call_stats_zrtp_hash_algo "Algorithme de hachage : %1" - + call_stats_zrtp_auth_tag_algo "Algorithme d'authentification : %1" - + call_stats_zrtp_sas_algo "Algorithme SAS : %1" - + call_zrtp_validation_button_label "Validation chiffrement" @@ -2542,33 +2578,6 @@ - - LinphoneEnums - - - media_encryption_dtls - DTLS - - - - - media_encryption_none - None - - - - - media_encryption_srtp - SRTP - - - - - media_encryption_post_quantum - "ZRTP - Post quantique" - - - LoadingPopup @@ -2619,44 +2628,44 @@ LoginLayout - - + + help_about_title À propos de %1 - + help_about_privacy_policy_title "Politique de confidentialité" - + help_about_privacy_policy_link "Visiter notre potilique de confidentialité" - + help_about_version_title "Version" - + help_about_licence_title "Licence" - + help_about_copyright_title "Copyright - + close "Fermer" @@ -2665,60 +2674,60 @@ LoginPage - + assistant_account_login Connexion - + assistant_no_account_yet "Pas encore de compte ?" - + assistant_account_register "S'inscrire" - + assistant_login_third_party_sip_account_title "Compte SIP tiers" - + assistant_login_remote_provisioning "Configuration distante" - + assistant_login_download_remote_config "Télécharger une configuration distante" - + assistant_login_remote_provisioning_url 'Veuillez entrer le lien de configuration qui vous a été fourni :' - + cancel - + validate "Valider" - + settings_advanced_remote_provisioning_url 'Lien de configuration distante' @@ -3203,13 +3212,23 @@ "Le mode d’affichage des participants en réunions" + + + conference_layout_active_speaker + + + + + conference_layout_grid + + MultimediaSettings multimedia_settings_ringer_title - "Sonnerie - Appels entrants" + Ringtone - Incoming calls @@ -3414,6 +3433,30 @@ QObject + + + media_encryption_dtls + DTLS + + + + + media_encryption_none + None + + + + + media_encryption_srtp + SRTP + + + + + media_encryption_post_quantum + "ZRTP - Post quantique" + + incoming @@ -3487,109 +3530,109 @@ RegisterPage - + assistant_account_register "Inscription - + assistant_already_have_an_account - + assistant_account_login - + assistant_account_register_with_phone_number - + assistant_account_register_with_email - + username - - + + phone_number "Numéro de téléphone" - + email - + password - + assistant_account_register_password_confirmation "Confirmation mot de passe" - + assistant_dialog_cgu_and_privacy_policy_message "J'accepte les %1 et la %2" - + assistant_dialog_general_terms_label "conditions d'utilisation" - + assistant_dialog_privacy_policy_label "politique de confidentialité" - + assistant_account_create "Créer" - + assistant_account_create_missing_username_error "Veuillez entrer un nom d'utilisateur" - + assistant_account_create_missing_password_error "Veuillez entrer un mot de passe" - + assistant_account_create_confirm_password_error "Les mots de passe sont différents" - + assistant_account_create_missing_number_error "Veuillez entrer un numéro de téléphone" - + assistant_account_create_missing_email_error "Veuillez entrer un email" @@ -3892,6 +3935,11 @@ Pour les activer dans un projet commercial, merci de nous contacter. "L'appel n'a pas pu être créé" + + + information_popup_error_title + + number_of_years diff --git a/Linphone/data/languages/en.ts b/Linphone/data/languages/en.ts index 66d552fc2..7fc0882d5 100644 --- a/Linphone/data/languages/en.ts +++ b/Linphone/data/languages/en.ts @@ -172,7 +172,7 @@ sip_address - SIP address + SIP address @@ -189,7 +189,7 @@ manage_account_international_prefix - "Indicatif international*" + Indicatif international* International code* @@ -409,55 +409,55 @@ settings_system_title - "Système" + System System settings_remote_provisioning_title - "Configuration distante" + Remote provisioning Remote provisioning settings_security_title - "Sécurité / Chiffrement" + Security / Encryption Security / Encryption settings_advanced_audio_codecs_title - "Codecs audio" + Audio codecs Audio codecs settings_advanced_video_codecs_title - "Codecs vidéo" + Video codecs Video codecs settings_advanced_auto_start_title - "Démarrer automatiquement %1" + Auto start %1 Auto start %1 settings_advanced_remote_provisioning_url - "URL de configuration distante" + Remote provisioning URL Remote provisioning URL settings_advanced_download_apply_remote_provisioning - "Télécharger et appliquer" + Download and apply Download and apply information_popup_error_title - "Format d'url invalide" + Invalid URL format Error @@ -468,17 +468,33 @@ settings_advanced_media_encryption_title - "Chiffrement du média" + Media encryption Media encryption - + media_encryption_none + None + + + media_encryption_srtp + SRTP + + + media_encryption_zrtp + Post quantum ZRTP + + + media_encryption_dtls + DTLS + + + settings_advanced_media_encryption_mandatory_title - "Chiffrement du média obligatoire" + Media encryption mandatory Mandatory media encryption - + settings_advanced_hide_fps_title Hide FPS @@ -513,63 +529,63 @@ Do you want to download and apply remote provisioning from this address ? - + application_description "A free and open source SIP video-phone." A free and open source SIP video-phone. - + command_line_arg_order "Send an order to the application towards a command line" Send an order to the application towards a command line - + command_line_option_show_help Show this help - + command_line_option_show_app_version - Show app version + Show app version - + command_line_option_config_to_fetch "Specify the linphone configuration file to be fetched. It will be merged with the current configuration." Specify the linphone configuration file to be fetched. It will be merged with the current configuration. - + command_line_option_config_to_fetch_arg "URL, path or file" URL, path or file - + command_line_option_log_to_stdout Log to stdout some debug information while running - + command_line_option_print_app_logs_only "Print only logs from the application" Print only logs from the application - + hide_action "Cacher" "Afficher" Hide - + show_action Show - + quit_action "Quitter" Quit @@ -616,56 +632,80 @@ CallCore - + call_record_end_message "Enregistrement terminé" Recording ended - + call_record_saved_in_file_message "L'appel a été enregistré dans le fichier : %1" Recording has been saved in file : %1 - - + + call_stats_codec_label "Codec: %1 / %2 kHz" Codec: %1 / %2 kHz - - + + call_stats_bandwidth_label "Bande passante : %1 %2 kbits/s %3 %4 kbits/s" Bandwidth : %1 %2 kbits/s %3 %4 kbits/s - - + + call_stats_loss_rate_label "Taux de perte: %1% %2%" Loss rate: %1% %2% - + call_stats_jitter_buffer_label "Tampon de gigue: %1 ms" Jitter buffer : %1 ms - + call_stats_resolution_label "Définition vidéo : %1 %2 %3 %4" Video resolution: %1 %2 %3 %4 - + call_stats_fps_label "FPS : %1 %2 %3 %4" FPS : %1 %2 %3 %4 + + + media_encryption_dtls + DTLS + DTLS + + + + media_encryption_none + None + None + + + + media_encryption_srtp + SRTP + SRTP + + + + media_encryption_post_quantum + "ZRTP - Post quantique" + Post quantum ZRTP + CallHistoryLayout @@ -919,7 +959,7 @@ group_call_participant_selected "%n participant(s) sélectionné(s)" - + 1 selected participant %n selected participants @@ -1052,13 +1092,13 @@ settings_call_enable_tones_title Tonalités - Tones + Tones settings_call_enable_tones_subtitle Activer les tonalités - Enable tones + Enable tones @@ -1127,25 +1167,24 @@ Device trusted - + call_dir - "Appel %1" %1 call - + call_ended "Appel terminé" Call ended - + conference_paused "Réunion mise en pause" Meeting paused - + call_paused "Appel mis en pause" Call paused @@ -1153,308 +1192,310 @@ call_srtp_point_to_point_encrypted - "Appel chiffré de point à point" + Appel chiffré de point à point Point-to-point encrypted call call_zrtp_sas_validation_required - "Vérification nécessaire" + Vérification nécessaire Validation required - - + + call_zrtp_end_to_end_encrypted - "Appel chiffré de bout en bout" + Appel chiffré de bout en bout End-to-end encrypted call - + call_not_encrypted "Appel non chiffré" Unencrypted call + + call_waiting_for_encryption_info "En attente de chiffrement" - Waiting for encryption + Waiting for encryption - + conference_user_is_recording "Vous enregistrez la réunion" You are recording the meeting - + call_user_is_recording "Vous enregistrez l'appel" You are recording the call - + conference_remote_is_recording "Un participant enregistre la réunion" Someone is recording the meeting - + call_remote_recording "%1 enregistre l'appel" %1 records the call - + call_stop_recording "Arrêter l'enregistrement" Stop recording - + add Add - + call_transfer_current_call_title "Transférer %1 à…" Transfer %1 to… - - + + call_transfer_confirm_dialog_tittle "Confirmer le transfert" Confirm transfer - - + + call_transfer_confirm_dialog_message "Vous allez transférer %1 à %2." You are going to transfer %1 to %2. - + call_action_start_new_call "Nouvel appel" New call - - + + call_action_show_dialer "Pavé numérique" Dialer - + call_action_change_layout "Modifier la disposition" Change layout - + call_action_go_to_calls_list "Liste d'appel" Call list - + Merger tous les appels call_action_merge_calls Merge all calls - - + + call_action_go_to_settings "Paramètres" Settings - + conference_action_screen_sharing "Partage de votre écran" Share your screen - + conference_share_link_title Partager le lien de la réunion Share meeting link - + copied Copié Copied - + information_popup_meeting_address_copied_to_clipboard Le lien de la réunion a été copié dans le presse-papier Meeting link has been copied to the clipboard - - - + + + conference_participants_list_title "Participants (%1)" Participants (%1) - - + + group_call_participant_selected - + 1 selected participant %n selected participants - + meeting_schedule_add_participants_title Add participants - + call_encryption_title Chiffrement Encryption - + call_stats_title Statistiques Statistics - + call_action_end_call "Terminer l'appel" End call - + call_action_resume_call "Reprendre l'appel" Resume call - + call_action_pause_call "Mettre l'appel en pause" Pause call - + call_action_transfer_call "Transférer l'appel" Transfer call - + call_action_start_new_call_hint "Initier un nouvel appel" Start new call - + call_display_call_list_hint "Afficher la liste d'appels" View call list - + call_deactivate_video_hint "Désactiver la vidéo" "Activer la vidéo" Turn off video - + call_activate_video_hint Enable video - + call_activate_microphone "Activer le micro" Activate microphone - + call_deactivate_microphone "Désactiver le micro" Mute microphone - + call_share_screen_hint Partager l'écran… Share screen… - + call_rise_hand_hint "Lever la main" Rise hand - + call_send_reaction_hint "Envoyer une réaction" Send reaction - + call_manage_participants_hint "Gérer les participants" Manage participants - + call_more_options_hint "Plus d'options…" More options… - + call_action_change_conference_layout "Modifier la disposition" Change layout - + call_action_full_screen "Mode Plein écran" Full screen mode - + call_action_stop_recording "Terminer l'enregistrement" End recording - + call_action_record "Enregistrer l'appel" Record call - + call_activate_speaker_hint "Activer le son" - Activate speaker + Activate speaker - + call_deactivate_speaker_hint "Désactiver le son" - Mute speaker + Mute speaker @@ -1568,32 +1609,32 @@ show_function_description - Show + Show fetch_config_function_description - Fetch configuration + Fetch configuration call_function_description - Call + Call bye_function_description - Hang up + Hang up accept_function_description - Accept + Accept decline_function_description - Decline + Decline @@ -2106,7 +2147,7 @@ settings_contacts_ldap_subtitle "Ajouter vos annuaires LDAP pour pouvoir effectuer des recherches dans la barre de recherche." - Add your LDAP servers to be able to search in the magic search bar. + Add your LDAP servers to be able to search in the magic search bar. @@ -2298,43 +2339,49 @@ Encryption : - + call_stats_media_encryption - "Chiffrement du média : %1%2" "ZRTP Post Quantique" + Chiffrement du média : %1 Media encryption : %1%2 - + + call_stats_media_encryption_zrtp_post_quantum + ZRTP Post Quantique + Post quantum ZRTP + + + call_stats_zrtp_cipher_algo "Algorithme de chiffrement : %1" Encryption algorithm : %1 - + call_stats_zrtp_key_agreement_algo "Algorithme d'accord de clé : %1" Key agreement algorithm: %1 - + call_stats_zrtp_hash_algo "Algorithme de hachage : %1" Hash algorithm : %1 - + call_stats_zrtp_auth_tag_algo "Algorithme d'authentification : %1" Authentication algorithm : %1 - + call_stats_zrtp_sas_algo "Algorithme SAS : %1" SAS algorithm : %1 - + call_zrtp_validation_button_label "Validation chiffrement" Encryption validation @@ -2552,28 +2599,9 @@ LinphoneEnums - - media_encryption_dtls - DTLS - - - - - media_encryption_none - None - - - - - media_encryption_srtp - SRTP - - - - media_encryption_post_quantum "ZRTP - Post quantique" - Post quantum ZRTP + Post quantum ZRTP @@ -2626,44 +2654,44 @@ LoginLayout - - + + help_about_title À propos de %1 About %1 - + help_about_privacy_policy_title "Politique de confidentialité" Privacy Policy - + help_about_privacy_policy_link "Visiter notre potilique de confidentialité" Visit our privacy policy - + help_about_version_title "Version" Version - + help_about_licence_title "Licence" Licence - + help_about_copyright_title "Copyright Copyright - + close "Fermer" Close @@ -2672,60 +2700,60 @@ LoginPage - + assistant_account_login Connexion Connection - + assistant_no_account_yet "Pas encore de compte ?" No account yet ? - + assistant_account_register "S'inscrire" Register - + assistant_login_third_party_sip_account_title "Compte SIP tiers" Third-party SIP account - + assistant_login_remote_provisioning "Configuration distante" Remote provisioning - + assistant_login_download_remote_config "Télécharger une configuration distante" Download a remote configuration - + assistant_login_remote_provisioning_url 'Veuillez entrer le lien de configuration qui vous a été fourni :' Please enter the setup link provided to you : - + cancel Cancel - + validate "Valider" Confirm - + settings_advanced_remote_provisioning_url 'Lien de configuration distante' Remote provisioning link @@ -3023,7 +3051,7 @@ meeting_schedule_delete_action "Supprimer" - Delete + Delete @@ -3155,7 +3183,7 @@ group_call_participant_selected "%n participant(s) sélectionné(s)" - + 1 selected participant %n selected participants @@ -3211,13 +3239,23 @@ "Le mode d’affichage des participants en réunions" How participants are displayed in meetings + + + conference_layout_active_speaker + Active speaker + + + + conference_layout_grid + Grid + MultimediaSettings multimedia_settings_ringer_title - "Sonnerie - Appels entrants" + Ringtone - Incoming calls Ringtone - Incoming calls @@ -3271,7 +3309,7 @@ call_start_group_call_title - Group call + Group call @@ -3300,25 +3338,25 @@ OAuthHttpServerReplyHandler is not listening - + OAuthHttpServerReplyHandler is not listening oidc_authentication_timeout_message Timeout: Not authenticated - + Timeout: Not authenticated oidc_authentication_granted_message Authentication granted - + Authentication granted oidc_authentication_not_authenticated_message Not authenticated - + Not authenticated @@ -3435,9 +3473,28 @@ SRTP + + media_encryption_dtls + DTLS + DTLS + + + + media_encryption_none + None + None + + + + media_encryption_srtp + SRTP + SRTP + + + media_encryption_post_quantum "ZRTP - Post quantique" - Post quantum ZRTP + Post quantum ZRTP @@ -3512,109 +3569,109 @@ RegisterPage - + assistant_account_register "Inscription Register - + assistant_already_have_an_account Already have an account ? - + assistant_account_login Connection - + assistant_account_register_with_phone_number Register with a phone number - + assistant_account_register_with_email Register with email - + username Username - - + + phone_number "Numéro de téléphone" Phone number - + email Email - + password Password - + assistant_account_register_password_confirmation "Confirmation mot de passe" Password confirmation - + assistant_dialog_cgu_and_privacy_policy_message "J'accepte les %1 et la %2" I accept the %1 and the %2 - + assistant_dialog_general_terms_label "conditions d'utilisation" terms of use - + assistant_dialog_privacy_policy_label "politique de confidentialité" privacy policy - + assistant_account_create "Créer" Create - + assistant_account_create_missing_username_error "Veuillez entrer un nom d'utilisateur" Please enter a username - + assistant_account_create_missing_password_error "Veuillez entrer un mot de passe" Please enter a password - + assistant_account_create_confirm_password_error "Les mots de passe sont différents" Passwords do not match - + assistant_account_create_missing_number_error "Veuillez entrer un numéro de téléphone" Please enter a phone number - + assistant_account_create_missing_email_error "Veuillez entrer un email" Please enter an email @@ -3921,6 +3978,11 @@ To enable them in a commercial project, please contact us. "L'appel n'a pas pu être créé" Call could not be created + + + information_popup_error_title + + number_of_years diff --git a/Linphone/data/languages/fr_FR.ts b/Linphone/data/languages/fr_FR.ts index 422e76a1b..aa52d0dcf 100644 --- a/Linphone/data/languages/fr_FR.ts +++ b/Linphone/data/languages/fr_FR.ts @@ -172,7 +172,7 @@ sip_address - Adresse SIP + Adresse SIP @@ -189,7 +189,7 @@ manage_account_international_prefix - "Indicatif international*" + Indicatif international* Indicatif international* @@ -409,55 +409,55 @@ settings_system_title - "Système" + System Système settings_remote_provisioning_title - "Configuration distante" + Remote provisioning Configuration distante settings_security_title - "Sécurité / Chiffrement" + Security / Encryption Sécurité / Chiffrement settings_advanced_audio_codecs_title - "Codecs audio" + Audio codecs Codecs audio settings_advanced_video_codecs_title - "Codecs vidéo" + Video codecs Codecs vidéo settings_advanced_auto_start_title - "Démarrer automatiquement %1" + Auto start %1 Démarrer automatiquement %1 settings_advanced_remote_provisioning_url - "URL de configuration distante" + Remote provisioning URL URL de configuration distante settings_advanced_download_apply_remote_provisioning - "Télécharger et appliquer" + Download and apply Télécharger et appliquer information_popup_error_title - "Format d'url invalide" + Invalid URL format Erreur @@ -468,17 +468,33 @@ settings_advanced_media_encryption_title - "Chiffrement du média" + Media encryption Chiffrement du média - + media_encryption_none + None + + + media_encryption_srtp + SRTP + + + media_encryption_zrtp + ZRTP - Post quantique + + + media_encryption_dtls + DTLS + + + settings_advanced_media_encryption_mandatory_title - "Chiffrement du média obligatoire" + Media encryption mandatory Chiffrement du média obligatoire - + settings_advanced_hide_fps_title Cacher les FPS @@ -513,63 +529,63 @@ Voulez-vous télécharger et appliquer la configuration depuis cette adresse ? - + application_description "A free and open source SIP video-phone." A free and open source SIP video-phone. - + command_line_arg_order "Send an order to the application towards a command line" Send an order to the application towards a command line - + command_line_option_show_help Show this help - + command_line_option_show_app_version - Show app version + Show app version - + command_line_option_config_to_fetch "Specify the linphone configuration file to be fetched. It will be merged with the current configuration." Specify the linphone configuration file to be fetched. It will be merged with the current configuration. - + command_line_option_config_to_fetch_arg "URL, path or file" URL, path or file - + command_line_option_log_to_stdout Log to stdout some debug information while running - + command_line_option_print_app_logs_only "Print only logs from the application" Print only logs from the application - + hide_action "Cacher" "Afficher" Cacher - + show_action Afficher - + quit_action "Quitter" Quitter @@ -616,56 +632,80 @@ CallCore - + call_record_end_message "Enregistrement terminé" Enregistrement terminé - + call_record_saved_in_file_message "L'appel a été enregistré dans le fichier : %1" L'appel a été enregistré dans le fichier : %1 - - + + call_stats_codec_label "Codec: %1 / %2 kHz" Codec: %1 / %2 kHz - - + + call_stats_bandwidth_label "Bande passante : %1 %2 kbits/s %3 %4 kbits/s" Bande passante : %1 %2 kbits/s %3 %4 kbits/s - - + + call_stats_loss_rate_label "Taux de perte: %1% %2%" Taux de perte: %1% %2% - + call_stats_jitter_buffer_label "Tampon de gigue: %1 ms" Tampon de gigue: %1 ms - + call_stats_resolution_label "Définition vidéo : %1 %2 %3 %4" Définition vidéo : %1 %2 %3 %4 - + call_stats_fps_label "FPS : %1 %2 %3 %4" FPS : %1 %2 %3 %4 + + + media_encryption_dtls + DTLS + DTLS + + + + media_encryption_none + None + None + + + + media_encryption_srtp + SRTP + SRTP + + + + media_encryption_post_quantum + "ZRTP - Post quantique" + ZRTP - Post quantique + CallHistoryLayout @@ -1127,25 +1167,24 @@ Appareil authentifié - + call_dir - "Appel %1" Appel %1 - + call_ended "Appel terminé" Appel terminé - + conference_paused "Réunion mise en pause" Réunion mise en pause - + call_paused "Appel mis en pause" Appel mis en pause @@ -1153,161 +1192,163 @@ call_srtp_point_to_point_encrypted - "Appel chiffré de point à point" + Appel chiffré de point à point Appel chiffré de point à point call_zrtp_sas_validation_required - "Vérification nécessaire" + Vérification nécessaire Vérification nécessaire - - + + call_zrtp_end_to_end_encrypted - "Appel chiffré de bout en bout" + Appel chiffré de bout en bout Appel chiffré de bout en bout - + call_not_encrypted "Appel non chiffré" Appel non chiffré + + call_waiting_for_encryption_info "En attente de chiffrement" - En attente de chiffrement + En attente de chiffrement - + conference_user_is_recording "Vous enregistrez la réunion" Vous enregistrez la réunion - + call_user_is_recording "Vous enregistrez l'appel" Vous enregistrez l'appel - + conference_remote_is_recording "Un participant enregistre la réunion" Un participant enregistre la réunion - + call_remote_recording "%1 enregistre l'appel" %1 enregistre l'appel - + call_stop_recording "Arrêter l'enregistrement" Arrêter l'enregistrement - + add Ajouter - + call_transfer_current_call_title "Transférer %1 à…" Transférer %1 à… - - + + call_transfer_confirm_dialog_tittle "Confirmer le transfert" Confirmer le transfert - - + + call_transfer_confirm_dialog_message "Vous allez transférer %1 à %2." Vous allez transférer %1 à %2. - + call_action_start_new_call "Nouvel appel" Nouvel appel - - + + call_action_show_dialer "Pavé numérique" Pavé numérique - + call_action_change_layout "Modifier la disposition" Modifier la disposition - + call_action_go_to_calls_list "Liste d'appel" Liste d'appel - + Merger tous les appels call_action_merge_calls Merger tous les appels - - + + call_action_go_to_settings "Paramètres" Paramètres - + conference_action_screen_sharing "Partage de votre écran" Partage de votre écran - + conference_share_link_title Partager le lien de la réunion Partager le lien de la réunion - + copied Copié Copié - + information_popup_meeting_address_copied_to_clipboard Le lien de la réunion a été copié dans le presse-papier Le lien de la réunion a été copié dans le presse-papier - - - + + + conference_participants_list_title "Participants (%1)" Participants (%1) - - + + group_call_participant_selected un participant sélectionné @@ -1315,146 +1356,146 @@ - + meeting_schedule_add_participants_title Ajouter des participants - + call_encryption_title Chiffrement Chiffrement - + call_stats_title Statistiques Statistiques - + call_action_end_call "Terminer l'appel" Terminer l'appel - + call_action_resume_call "Reprendre l'appel" Reprendre l'appel - + call_action_pause_call "Mettre l'appel en pause" Mettre l'appel en pause - + call_action_transfer_call "Transférer l'appel" Transférer l'appel - + call_action_start_new_call_hint "Initier un nouvel appel" Initier un nouvel appel - + call_display_call_list_hint "Afficher la liste d'appels" Afficher la liste d'appels - + call_deactivate_video_hint "Désactiver la vidéo" "Activer la vidéo" Désactiver la vidéo - + call_activate_video_hint Activer la vidéo - + call_activate_microphone "Activer le micro" Activer le micro - + call_deactivate_microphone "Désactiver le micro" Désactiver le micro - + call_share_screen_hint Partager l'écran… Partager l'écran… - + call_rise_hand_hint "Lever la main" Lever la main - + call_send_reaction_hint "Envoyer une réaction" Envoyer une réaction - + call_manage_participants_hint "Gérer les participants" Gérer les participants - + call_more_options_hint "Plus d'options…" Plus d'options… - + call_action_change_conference_layout "Modifier la disposition" Modifier la disposition - + call_action_full_screen "Mode Plein écran" Mode Plein écran - + call_action_stop_recording "Terminer l'enregistrement" Terminer l'enregistrement - + call_action_record "Enregistrer l'appel" Enregistrer l'appel - + call_activate_speaker_hint "Activer le son" Activer le son - + call_deactivate_speaker_hint "Désactiver le son" - Désactiver le son + Désactiver le son @@ -1568,32 +1609,32 @@ show_function_description - Afficher + Afficher fetch_config_function_description - Récupérer une configuration + Récupérer une configuration call_function_description - Appeler + Appeler bye_function_description - Raccrocher + Raccrocher accept_function_description - Accepter + Accepter decline_function_description - Décliner + Décliner @@ -2298,43 +2339,49 @@ Chiffrement : - + call_stats_media_encryption - "Chiffrement du média : %1%2" "ZRTP Post Quantique" + Chiffrement du média : %1 Chiffrement du média : %1%2 - + + call_stats_media_encryption_zrtp_post_quantum + ZRTP Post Quantique + ZRTP Post Quantique + + + call_stats_zrtp_cipher_algo "Algorithme de chiffrement : %1" Algorithme de chiffrement : %1 - + call_stats_zrtp_key_agreement_algo "Algorithme d'accord de clé : %1" Algorithme d'accord de clé : %1 - + call_stats_zrtp_hash_algo "Algorithme de hachage : %1" Algorithme de hachage : %1 - + call_stats_zrtp_auth_tag_algo "Algorithme d'authentification : %1" Algorithme d'authentification : %1 - + call_stats_zrtp_sas_algo "Algorithme SAS : %1" Algorithme SAS : %1 - + call_zrtp_validation_button_label "Validation chiffrement" Validation chiffrement @@ -2549,33 +2596,6 @@ Débogage - - LinphoneEnums - - - media_encryption_dtls - DTLS - DTLS - - - - media_encryption_none - None - None - - - - media_encryption_srtp - SRTP - SRTP - - - - media_encryption_post_quantum - "ZRTP - Post quantique" - ZRTP - Post quantique - - LoadingPopup @@ -2626,44 +2646,44 @@ LoginLayout - - + + help_about_title À propos de %1 À propos de %1 - + help_about_privacy_policy_title "Politique de confidentialité" Politique de confidentialité - + help_about_privacy_policy_link "Visiter notre potilique de confidentialité" Visiter notre potilique de confidentialité - + help_about_version_title "Version" Version - + help_about_licence_title "Licence" Licence - + help_about_copyright_title "Copyright Copyright - + close "Fermer" Fermer @@ -2672,60 +2692,60 @@ LoginPage - + assistant_account_login Connexion Connexion - + assistant_no_account_yet "Pas encore de compte ?" Pas encore de compte ? - + assistant_account_register "S'inscrire" S'inscrire - + assistant_login_third_party_sip_account_title "Compte SIP tiers" Compte SIP tiers - + assistant_login_remote_provisioning "Configuration distante" Configuration distante - + assistant_login_download_remote_config "Télécharger une configuration distante" Télécharger une configuration distante - + assistant_login_remote_provisioning_url 'Veuillez entrer le lien de configuration qui vous a été fourni :' Veuillez entrer le lien de configuration qui vous a été fourni : - + cancel Annuler - + validate "Valider" Valider - + settings_advanced_remote_provisioning_url 'Lien de configuration distante' Lien de configuration distante @@ -3211,13 +3231,23 @@ "Le mode d’affichage des participants en réunions" Le mode d’affichage des participants en réunions + + + conference_layout_active_speaker + Intervenant actif + + + + conference_layout_grid + Mosaïque + MultimediaSettings multimedia_settings_ringer_title - "Sonnerie - Appels entrants" + Ringtone - Incoming calls Sonnerie - Appels entrants @@ -3306,103 +3336,103 @@ oidc_authentication_timeout_message Timeout: Not authenticated - Timeout : non authentifié + Timeout : non authentifié oidc_authentication_granted_message Authentication granted - Authentification accordée + Authentification accordée oidc_authentication_not_authenticated_message Not authenticated - Non authentifié + Non authentifié oidc_authentication_refresh_message Refreshing token - Token en cours de rafraîchissement + Token en cours de rafraîchissement oidc_authentication_temporary_credentials_message Temporary credentials received - Identifiants temporaires reçus + Identifiants temporaires reçus oidc_authentication_network_error Network error - Erreur réseau + Erreur réseau oidc_authentication_server_error Server error - Erreur de serveur + Erreur de serveur oidc_authentication_token_not_found_error OAuth token not found - Token OAuth non trouvé + Token OAuth non trouvé oidc_authentication_token_secret_not_found_error OAuth token secret not found - Token OAuth secret non trouvé + Token OAuth secret non trouvé oidc_authentication_callback_not_verified_error OAuth callback not verified - Retour OAuth non vérifié + Retour OAuth non vérifié oidc_authentication_request_auth_message Requesting authorization from browser - En attente d'autorisation du navigateur + En attente d'autorisation du navigateur oidc_authentication_request_token_message Requesting access token - En attente du token d'accès + En attente du token d'accès oidc_authentication_refresh_token_message Refreshing access token - Token en cours de rafraîchissement + Token en cours de rafraîchissement oidc_authentication_request_authorization_message Requesting authorization - Autorisation en cours + Autorisation en cours oidc_authentication_request_temporary_credentials_message Requesting temporary credentials - En attente d'identifiants temporaires + En attente d'identifiants temporaires oidc_authentication_no_auth_found_in_config_error No authorization endpoint found in OpenID configuration - Pas d'autorisation trouvé dans la configuration OpenID + Pas d'autorisation trouvé dans la configuration OpenID oidc_authentication_no_token_found_in_config_error No token endpoint found in OpenID configuration - Pas de token trouvé dans la configuration OpenID + Pas de token trouvé dans la configuration OpenID @@ -3422,6 +3452,30 @@ QObject + + + media_encryption_dtls + DTLS + DTLS + + + + media_encryption_none + None + None + + + + media_encryption_srtp + SRTP + SRTP + + + + media_encryption_post_quantum + "ZRTP - Post quantique" + ZRTP - Post quantique + incoming @@ -3495,109 +3549,109 @@ RegisterPage - + assistant_account_register "Inscription Inscription - + assistant_already_have_an_account Déjà un compte ? - + assistant_account_login Connexion - + assistant_account_register_with_phone_number S'inscrire avec un numéro de téléphone - + assistant_account_register_with_email S'inscrire avec un email - + username Nom d'utilisateur - - + + phone_number "Numéro de téléphone" Numéro de téléphone - + email - Email + Email - + password Mot de passe - + assistant_account_register_password_confirmation "Confirmation mot de passe" Confirmation mot de passe - + assistant_dialog_cgu_and_privacy_policy_message "J'accepte les %1 et la %2" J'accepte les %1 et la %2 - + assistant_dialog_general_terms_label "conditions d'utilisation" conditions d'utilisation - + assistant_dialog_privacy_policy_label "politique de confidentialité" politique de confidentialité - + assistant_account_create "Créer" Créer - + assistant_account_create_missing_username_error "Veuillez entrer un nom d'utilisateur" Veuillez entrer un nom d'utilisateur - + assistant_account_create_missing_password_error "Veuillez entrer un mot de passe" Veuillez entrer un mot de passe - + assistant_account_create_confirm_password_error "Les mots de passe sont différents" Les mots de passe sont différents - + assistant_account_create_missing_number_error "Veuillez entrer un numéro de téléphone" Veuillez entrer un numéro de téléphone - + assistant_account_create_missing_email_error "Veuillez entrer un email" Veuillez entrer un email @@ -3904,6 +3958,11 @@ Pour les activer dans un projet commercial, merci de nous contacter."L'appel n'a pas pu être créé" L'appel n'a pas pu être créé + + + information_popup_error_title + Erreur + number_of_years @@ -4550,19 +4609,15 @@ Pour les activer dans un projet commercial, merci de nous contacter.Honduras Honduras - - Hong Kong - HongKong - DemocraticRepublicOfCongo - République démocratique du Congo + République démocratique du Congo HongKong - Hong Kong + Hong Kong diff --git a/Linphone/tool/LinphoneEnums.cpp b/Linphone/tool/LinphoneEnums.cpp index f40030bc7..d702060f7 100644 --- a/Linphone/tool/LinphoneEnums.cpp +++ b/Linphone/tool/LinphoneEnums.cpp @@ -57,11 +57,14 @@ LinphoneEnums::MediaEncryption LinphoneEnums::fromLinphone(const linphone::Media QString LinphoneEnums::toString(LinphoneEnums::MediaEncryption encryption) { switch (encryption) { case LinphoneEnums::MediaEncryption::Dtls: - return QObject::tr("DTLS"); + //: DTLS + return QObject::tr("media_encryption_dtls"); case LinphoneEnums::MediaEncryption::None: - return QObject::tr("None"); + //: None + return QObject::tr("media_encryption_none"); case LinphoneEnums::MediaEncryption::Srtp: - return QObject::tr("SRTP"); + //: SRTP + return QObject::tr("media_encryption_srtp"); case LinphoneEnums::MediaEncryption::Zrtp: //: "ZRTP - Post quantique" return QObject::tr("media_encryption_post_quantum"); @@ -224,11 +227,11 @@ QVariantList LinphoneEnums::conferenceLayoutsToVariant(QList{ if(!mainItem.contentItem.activeFocus && (event.key == Qt.Key_Space || event.key == Qt.Key_Enter || event.key == Qt.Key_Return)){ @@ -168,7 +168,10 @@ Control.ComboBox { height: mainItem.height // anchors.left: listView.left // anchors.right: listView.right - RowLayout{ + property string img: delegateImg.imageSource + property string flag: delegateFlag.text + property string text: delegateText.text + RowLayout{ anchors.fill: parent EffectImage { id: delegateImg @@ -181,6 +184,7 @@ Control.ComboBox { } Text { + id: delegateFlag Layout.preferredWidth: implicitWidth Layout.leftMargin: delegateImg.visible ? 0 : Math.round(5 * DefaultStyle.dp) Layout.alignment: Qt.AlignCenter @@ -197,21 +201,24 @@ Control.ComboBox { : "" } Text { + id: delegateText Layout.fillWidth: true Layout.leftMargin: delegateImg.visible ? 0 : Math.round(5 * DefaultStyle.dp) Layout.rightMargin: Math.round(20 * DefaultStyle.dp) Layout.alignment: Qt.AlignCenter - text: typeof(modelData) != "undefined" - ? mainItem.textRole - ? modelData[mainItem.textRole] - : modelData.text - ? modelData.text - : modelData - : $modelData - ? mainItem.textRole - ? $modelData[mainItem.textRole] - : $modelData - : "" + text: typeof(modelData) != "undefined" + ? mainItem.textRole + ? modelData[mainItem.textRole] + : modelData.text + ? modelData.text + : modelData + : typeof($modelData) != "undefined" + ? mainItem.textRole + ? $modelData[mainItem.textRole] + : $modelData + : mainItem.texRole + ? mainItem.texRole + : "" elide: Text.ElideRight maximumLineCount: 1 wrapMode: Text.WrapAnywhere diff --git a/Linphone/view/Control/Button/Settings/ComboSetting.qml b/Linphone/view/Control/Button/Settings/ComboSetting.qml index a2b30c608..08f7a7eb1 100644 --- a/Linphone/view/Control/Button/Settings/ComboSetting.qml +++ b/Linphone/view/Control/Button/Settings/ComboSetting.qml @@ -19,6 +19,7 @@ ComboBox { else return Utils.equalObject(entry,propertyOwner[propertyName]) }) + onCurrentIndexChanged: console.log("current index changed =======================", currentIndex) onCurrentValueChanged: { if(propertyOwnerGui) { binding.when = !Utils.equalObject(currentValue,propertyOwnerGui.core[propertyName]) diff --git a/Linphone/view/Control/Input/PhoneNumberInput.qml b/Linphone/view/Control/Input/PhoneNumberInput.qml index 32795d218..229a743de 100644 --- a/Linphone/view/Control/Input/PhoneNumberInput.qml +++ b/Linphone/view/Control/Input/PhoneNumberInput.qml @@ -45,6 +45,7 @@ ColumnLayout { RowLayout { anchors.fill: parent CountryIndicatorCombobox { + RectangleTest{anchors.fill: parent} id: combobox implicitWidth: Math.round(110 * DefaultStyle.dp) defaultCallingCode: mainItem.defaultCallingCode diff --git a/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml index cb5a9fb74..4c99ca126 100644 --- a/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml +++ b/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml @@ -120,10 +120,18 @@ AbstractSettingsLayout { ComboSetting { Layout.fillWidth: true Layout.preferredWidth: parent.width - entries: SettingsCpp.mediaEncryptions +// model: SettingsCpp.mediaEncryptions + // Somehow translations do not work when coming from a QVariantList + model: [ + {id: LinphoneEnums.MediaEncryption.None, display_name: qsTr("media_encryption_none")}, + {id: LinphoneEnums.MediaEncryption.Srtp, display_name: qsTr("media_encryption_srtp")}, + {id: LinphoneEnums.MediaEncryption.Zrtp, display_name: qsTr("media_encryption_zrtp")}, + {id: LinphoneEnums.MediaEncryption.Dtls, display_name: qsTr("media_encryption_dtls")} + ] propertyName: "mediaEncryption" - textRole: 'display_name' - propertyOwner: SettingsCpp + textRole: "display_name" + valueRole: "id" + propertyOwner: SettingsCpp } } SwitchSetting { diff --git a/Linphone/view/Page/Layout/Settings/MeetingsSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/MeetingsSettingsLayout.qml index 0bb694f18..37eba7027 100644 --- a/Linphone/view/Page/Layout/Settings/MeetingsSettingsLayout.qml +++ b/Linphone/view/Page/Layout/Settings/MeetingsSettingsLayout.qml @@ -48,10 +48,15 @@ AbstractSettingsLayout { Layout.fillWidth: true Layout.topMargin: Math.round(12 * DefaultStyle.dp) Layout.preferredWidth: parent.width - entries: SettingsCpp.conferenceLayouts + model: [ + {id: LinphoneEnums.ConferenceLayout.ActiveSpeaker, display_name: qsTr("conference_layout_active_speaker")}, + {id: LinphoneEnums.ConferenceLayout.Grid, display_name: qsTr("conference_layout_grid")} + ] +// entries: SettingsCpp.conferenceLayouts propertyName: "conferenceLayout" propertyOwner: SettingsCpp - textRole: 'display_name' + textRole: 'display_name' + valueRole: "id" } } }