Skip to content
Snippets Groups Projects
Commit dd8bf92f authored by Franck Laurent's avatar Franck Laurent Committed by Sébastien Blin
Browse files

ChatViewFooter: add shortcut tooltip 

Change-Id: Iceea3bda86ebfcc9c9b5f2b5039187dac9661add
parent 668e6dbe
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 142 additions and 21 deletions
src/app/commoncomponents/MarkdownPopup.qml
+ 3
− 1
View file @ dd8bf92f
......@@ -57,7 +57,9 @@ Popup {
imageContainerHeight: 20
radius: 5
toolTipText: modelData.toolTip
toolTipText: modelData.shortcutText
shortcutKey: modelData.shortcutKey
hasShortcut: true
source: modelData.iconSrc
focusPolicy: Qt.TabFocus
......
src/app/commoncomponents/MaterialToolTip.qml
+ 52
− 6
View file @ dd8bf92f
/*
* Copyright (C) 2021-2023 Savoir-faire Linux Inc.
* Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
* Author: Franck Laurent <franck.laurent@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -17,6 +18,7 @@
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import net.jami.Constants 1.1
ToolTip {
......@@ -24,22 +26,49 @@ ToolTip {
property alias backGroundColor: background.color
property alias textColor: label.color
property bool hasShortcut: false
property string shortcutKey
onVisibleChanged: {
if (visible)
animation.start();
}
contentItem: Text {
id: label
text: root.text
font.pixelSize: 13
color: "white"
contentItem: ColumnLayout {
Text {
id: label
text: root.text
font.pixelSize: 13
color: "white"
Layout.alignment: Qt.AlignHCenter
Layout.preferredHeight: label.contentHeight
Layout.preferredWidth: label.contentWidth
}
Rectangle {
id: shortcutTextRect
Layout.preferredWidth: shortcutText.contentWidth + 10
Layout.preferredHeight: shortcutText.contentHeight + 10
visible: hasShortcut
color: JamiTheme.tooltipShortCutBackgroundColor
radius: JamiTheme.primaryRadius
Text {
id: shortcutText
anchors.centerIn: parent
font.pixelSize: 13
font.weight: Font.DemiBold
color: JamiTheme.tooltipShortCutTextColor
text: root.shortcutKey
}
}
}
background: Rectangle {
id: background
color: "#c4272727"
color: JamiTheme.tooltipBackgroundColor
radius: 5
}
......@@ -52,6 +81,15 @@ ToolTip {
to: 1.0
duration: JamiTheme.shortFadeDuration
}
NumberAnimation {
target: shortcutTextRect
properties: "opacity"
from: 0
to: 1.0
duration: JamiTheme.shortFadeDuration
}
NumberAnimation {
target: background
properties: "scale"
......@@ -59,5 +97,13 @@ ToolTip {
to: 1.0
duration: JamiTheme.shortFadeDuration * 0.5
}
NumberAnimation {
target: shortcutTextRect
properties: "scale"
from: 0.5
to: 1.0
duration: JamiTheme.shortFadeDuration * 0.5
}
}
}
src/app/commoncomponents/PushButton.qml
+ 2
− 1
View file @ dd8bf92f
......@@ -50,8 +50,9 @@ AbstractButton {
property alias textHAlign: textContent.horizontalAlignment
property bool buttonTextEnableElide: false
property alias alignement: textContent.horizontalAlignment
property alias toolTipText: toolTip.text
property alias hasShortcut: toolTip.hasShortcut
property alias shortcutKey: toolTip.shortcutKey
// State colors
property string pressedColor: JamiTheme.pressedButtonColor
......
src/app/constant/JamiStrings.qml
+ 2
− 1
View file @ dd8bf92f
......@@ -572,6 +572,7 @@ Item {
property string conversationKeyboardShortcuts: qsTr("Conversation")
property string callKeyboardShortcuts: qsTr("Call")
property string settings: qsTr("Settings")
property string markdownKeyboardShortcuts: qsTr("Markdown")
property string openAccountList: qsTr("Open account list")
property string focusConversationsList: qsTr("Focus conversations list")
property string requestsList: qsTr("Requests list")
......@@ -795,7 +796,7 @@ Item {
property string bold: qsTr("Bold")
property string italic: qsTr("Italic")
property string barre: qsTr("Barre")
property string barre: qsTr("Strikethrough")
property string title: qsTr("Title")
property string link: qsTr("Link")
property string code: qsTr("Code")
......
src/app/constant/JamiTheme.qml
+ 3
− 0
View file @ dd8bf92f
......@@ -545,6 +545,9 @@ Item {
property real tipBoxContentFontSize: calcSize(12)
property color tipBoxBackgroundColor: darkTheme ? blackColor : whiteColor
property color tipBoxBorderColor: darkTheme ? "#123F4A" : "#A3C2DA"
property color tooltipBackgroundColor: darkTheme ? "#66000000" : "#c4272727"
property color tooltipShortCutBackgroundColor: darkTheme ? blackColor : "#2c2c2c"
property color tooltipShortCutTextColor: "#a7a7a7"
//sharePosition
property real timerButtonsFontSize: calcSize(11)
......
src/app/mainview/components/KeyboardShortcutTable.qml
+ 55
− 1
View file @ dd8bf92f
......@@ -207,6 +207,56 @@ Window {
}
}
ListModel {
id: keyboardMarkdownShortcutsModel
ListElement {
shortcut: "Ctrl + B"
shortcut2: ""
description: qsTr("Bold")
}
ListElement {
shortcut: "Ctrl + I"
shortcut2: ""
description: qsTr("Italic")
}
ListElement {
shortcut: "Shift + Alt + X"
shortcut2: ""
description: qsTr("Strikethrough")
}
ListElement {
shortcut: "Ctrl + Alt + H"
shortcut2: ""
description: qsTr("Heading")
}
ListElement {
shortcut: "Ctrl + Alt + K"
shortcut2: ""
description: qsTr("Link")
}
ListElement {
shortcut: "Ctrl + Alt + C"
shortcut2: ""
description: qsTr("Code")
}
ListElement {
shortcut: "Shift + Alt + 9"
shortcut2: ""
description: qsTr("Quote")
}
ListElement {
shortcut: "Shift + Alt + 8"
shortcut2: ""
description: qsTr("Bulleted List")
}
ListElement {
shortcut: "Shift + Alt + 7"
shortcut2: ""
description: qsTr("Numbered List")
}
}
Rectangle {
id: windowRect
......@@ -243,6 +293,8 @@ Window {
return JamiStrings.callKeyboardShortcuts;
case 3:
return JamiStrings.settings;
case 4:
return JamiStrings.markdownKeyboardShortcuts;
}
}
color: JamiTheme.textColor
......@@ -269,6 +321,8 @@ Window {
return keyboardCallsShortcutsModel;
case 3:
return keyboardSettingsShortcutsModel;
case 4:
return keyboardMarkdownShortcutsModel;
}
}
delegate: KeyboardShortcutKeyDelegate {
......@@ -292,7 +346,7 @@ Window {
}
Repeater {
model: ["1", "2", "3", "4"]
model: ["1", "2", "3", "4", "5"]
KeyboardShortcutTabButton {
currentIndex: selectionBar.currentIndex
......
src/app/mainview/components/MessageBar.qml
+ 25
− 11
View file @ dd8bf92f
......@@ -403,7 +403,8 @@ ColumnLayout {
Action {
id: boldAction
property var iconSrc: JamiResources.bold_black_24dp_svg
property var toolTip: JamiStrings.bold
property var shortcutText: JamiStrings.bold
property string shortcutKey: "Ctrl+B"
onTriggered: function clickAction() {
listViewTypo.addStyle(root.text, textArea.selectionStart, textArea.selectionEnd, "**", "**");
......@@ -412,7 +413,8 @@ ColumnLayout {
Action {
id: italicAction
property var iconSrc: JamiResources.italic_black_24dp_svg
property var toolTip: JamiStrings.italic
property var shortcutText: JamiStrings.italic
property string shortcutKey: "Ctrl+I"
onTriggered: function clickAction() {
listViewTypo.addStyle(root.text, textArea.selectionStart, textArea.selectionEnd, "*", "*");
}
......@@ -420,7 +422,8 @@ ColumnLayout {
Action {
id: barreAction
property var iconSrc: JamiResources.s_barre_black_24dp_svg
property var toolTip: JamiStrings.barre
property var shortcutText: JamiStrings.barre
property string shortcutKey: "Shift+Alt+X"
onTriggered: function clickAction() {
listViewTypo.addStyle(root.text, textArea.selectionStart, textArea.selectionEnd, "~~", "~~");
}
......@@ -428,7 +431,8 @@ ColumnLayout {
Action {
id: titleAction
property var iconSrc: JamiResources.title_black_24dp_svg
property var toolTip: JamiStrings.title
property var shortcutText: JamiStrings.title
property string shortcutKey: "Ctrl+Alt+H"
onTriggered: function clickAction() {
listViewTypo.addPrefixStyle(root.text, textArea.selectionStart, textArea.selectionEnd, "### ", false);
}
......@@ -445,7 +449,10 @@ ColumnLayout {
imageContainerHeight: 15
radius: 5
toolTipText: modelData.toolTip
toolTipText: modelData.shortcutText
shortcutKey: modelData.shortcutKey
hasShortcut: true
source: modelData.iconSrc
focusPolicy: Qt.TabFocus
......@@ -563,7 +570,8 @@ ColumnLayout {
Action {
id: linkAction
property var iconSrc: JamiResources.link_web_black_24dp_svg
property var toolTip: JamiStrings.link
property var shortcutText: JamiStrings.link
property string shortcutKey: "Ctrl+Alt+K"
onTriggered: function clickAction() {
listViewTypo.addStyle(root.text, textArea.selectionStart, textArea.selectionEnd, "[", "](url)");
}
......@@ -571,7 +579,8 @@ ColumnLayout {
Action {
id: codeAction
property var iconSrc: JamiResources.code_black_24dp_svg
property var toolTip: JamiStrings.code
property var shortcutText: JamiStrings.code
property string shortcutKey: "Ctrl+Alt+C"
onTriggered: function clickAction() {
listViewTypo.addStyle(root.text, textArea.selectionStart, textArea.selectionEnd, "```", "```");
}
......@@ -579,7 +588,8 @@ ColumnLayout {
Action {
id: quoteAction
property var iconSrc: JamiResources.quote_black_24dp_svg
property var toolTip: JamiStrings.quote
property var shortcutText: JamiStrings.quote
property string shortcutKey: "Shift+Alt+9"
onTriggered: function clickAction() {
listViewTypo.addPrefixStyle(root.text, textArea.selectionStart, textArea.selectionEnd, "> ", false);
}
......@@ -587,7 +597,8 @@ ColumnLayout {
Action {
id: bulletPointAction
property var iconSrc: JamiResources.bullet_point_black_24dp_svg
property var toolTip: JamiStrings.bulletPoint
property var shortcutText: JamiStrings.bulletPoint
property string shortcutKey: "Shift+Alt+8"
onTriggered: function clickAction() {
listViewTypo.addPrefixStyle(root.text, textArea.selectionStart, textArea.selectionEnd, "- ", false);
}
......@@ -595,7 +606,8 @@ ColumnLayout {
Action {
id: bulletNumberAction
property var iconSrc: JamiResources.bullet_number_black_24dp_svg
property var toolTip: JamiStrings.bulletNumber
property var shortcutText: JamiStrings.bulletNumber
property string shortcutKey: "Shift+Alt+7"
onTriggered: function clickAction() {
listViewTypo.addPrefixStyle(root.text, textArea.selectionStart, textArea.selectionEnd, "", true);
}
......@@ -612,7 +624,9 @@ ColumnLayout {
imageContainerHeight: 20
radius: 5
toolTipText: modelData.toolTip
toolTipText: modelData.shortcutText
shortcutKey: modelData.shortcutKey
hasShortcut: true
source: modelData.iconSrc
focusPolicy: Qt.TabFocus
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment