diff --git a/linphone-desktop/assets/languages/en.ts b/linphone-desktop/assets/languages/en.ts index 6fff54350..d138f06ab 100644 --- a/linphone-desktop/assets/languages/en.ts +++ b/linphone-desktop/assets/languages/en.ts @@ -698,6 +698,21 @@ Server url not configured. autoAnswerStatus auto + + menuTooltip + Access to your contact list and add new contacts. + + + smartSearchBarTooltip + Use the search bar to directly start audio and video +calls, start a chat or add a new contact. Just enter +your friend's SIP address or username. + + + timelineTooltip + Click on one of your last exchange +to chat or see the conversation history. + MainWindowMenuBar diff --git a/linphone-desktop/assets/languages/fr.ts b/linphone-desktop/assets/languages/fr.ts index 9ad1a7a34..fe8ec7d80 100644 --- a/linphone-desktop/assets/languages/fr.ts +++ b/linphone-desktop/assets/languages/fr.ts @@ -698,6 +698,20 @@ Url du serveur non configurée. autoAnswerStatus auto + + menuTooltip + Accéder à votre liste de contacts, en ajouter... + + + smartSearchBarTooltip + Utiliser la barre de recherche intelligente pour lancer des appels audio et vidéo, +un chat ou ajouter un contact. + + + timelineTooltip + Cliquer sur une entrée pour voir vos derniers échanges, +chatter ou voir l'historique de conversation. + MainWindowMenuBar diff --git a/linphone-desktop/ui/modules/Common/Form/SearchBox.qml b/linphone-desktop/ui/modules/Common/Form/SearchBox.qml index 401218c34..6e4c5585e 100644 --- a/linphone-desktop/ui/modules/Common/Form/SearchBox.qml +++ b/linphone-desktop/ui/modules/Common/Form/SearchBox.qml @@ -15,6 +15,7 @@ Item { // --------------------------------------------------------------------------- readonly property alias filter: searchField.text + readonly property alias isOpen: searchBox._isOpen property alias delegate: list.delegate property alias header: list.header diff --git a/linphone-desktop/ui/modules/Common/Tooltip/TooltipArea.qml b/linphone-desktop/ui/modules/Common/Tooltip/TooltipArea.qml index 9cfa8b3b3..fe01f3777 100644 --- a/linphone-desktop/ui/modules/Common/Tooltip/TooltipArea.qml +++ b/linphone-desktop/ui/modules/Common/Tooltip/TooltipArea.qml @@ -4,7 +4,8 @@ import QtQuick 2.7 MouseArea { property alias text: tooltip.text - property var tooltipParent: this + property bool force: false + property var tooltipParent: parent property bool _visible: false @@ -23,6 +24,16 @@ MouseArea { id: tooltip parent: tooltipParent - visible: _visible + visible: _visible || force + + delay: -1 + timeout: -1 + + // Workaround to always display tooltip. + onVisibleChanged: { + if (!visible && force) { + tooltip.visible = true + } + } } } diff --git a/linphone-desktop/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml b/linphone-desktop/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml index 99372595f..2b9afdf42 100644 --- a/linphone-desktop/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml +++ b/linphone-desktop/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml @@ -16,6 +16,8 @@ SearchBox { searchBox.filter ) + readonly property alias isOpen: searchBox._isOpen + // --------------------------------------------------------------------------- signal addContact (string sipAddress) diff --git a/linphone-desktop/ui/views/App/Main/Home.qml b/linphone-desktop/ui/views/App/Main/Home.qml index a49bb66b5..3702b8ab5 100644 --- a/linphone-desktop/ui/views/App/Main/Home.qml +++ b/linphone-desktop/ui/views/App/Main/Home.qml @@ -12,6 +12,17 @@ import App.Styles 1.0 Rectangle { color: HomeStyle.color + // TODO: Remove me when smart tooltip will be available. + Component { + Item { + property var i18n: [ + QT_TR_NOOP('showTooltips'), + QT_TR_NOOP('howToDescription'), + QT_TR_NOOP('howToTitle') + ] + } + } + ListView { anchors.horizontalCenter: parent.horizontalCenter boundsBehavior: Flickable.StopAtBounds @@ -26,13 +37,14 @@ Rectangle { } model: ListModel { - ListElement { - $component: 'checkBox' - $componentText: qsTr('showTooltips') - $description: qsTr('howToDescription') - $icon: 'home_use_linphone' - $title: qsTr('howToTitle') - } + // TODO: Uncomment me when smart tooltip will be available. + // ListElement { + // $component: 'checkBox' + // $componentText: qsTr('showTooltips') + // $description: qsTr('howToDescription') + // $icon: 'home_use_linphone' + // $title: qsTr('howToTitle') + // } ListElement { $component: 'button' diff --git a/linphone-desktop/ui/views/App/Main/MainWindow.qml b/linphone-desktop/ui/views/App/Main/MainWindow.qml index 781bb8aa3..ff585725c 100644 --- a/linphone-desktop/ui/views/App/Main/MainWindow.qml +++ b/linphone-desktop/ui/views/App/Main/MainWindow.qml @@ -177,6 +177,11 @@ ApplicationWindow { }) onLaunchVideoCall: CallsListModel.launchVideoCall(sipAddress) + + TooltipArea { + text: qsTr('smartSearchBarTooltip') + visible: !smartSearchBar.isOpen + } } } } @@ -213,6 +218,10 @@ ApplicationWindow { }] onEntrySelected: !entry ? setView('Home') : setView('Contacts') + + TooltipArea { + text: qsTr('menuTooltip') + } } // History. @@ -224,6 +233,10 @@ ApplicationWindow { model: TimelineModel onEntrySelected: setView('Conversation', { sipAddress: entry }) + + TooltipArea { + text: qsTr('timelineTooltip') + } } }