mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-29 04:08:54 +03:00
Use same tooltip component everywhere
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
This commit is contained in:
parent
bb4efae42e
commit
5acb0b272a
9 changed files with 43 additions and 69 deletions
|
@ -34,5 +34,6 @@
|
||||||
<file>src/gui/tray/TalkReplyTextField.qml</file>
|
<file>src/gui/tray/TalkReplyTextField.qml</file>
|
||||||
<file>src/gui/tray/CallNotificationDialog.qml</file>
|
<file>src/gui/tray/CallNotificationDialog.qml</file>
|
||||||
<file>src/gui/tray/NCBusyIndicator.qml</file>
|
<file>src/gui/tray/NCBusyIndicator.qml</file>
|
||||||
|
<file>src/gui/tray/NCToolTip.qml</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|
|
@ -40,19 +40,9 @@ MouseArea {
|
||||||
color: (parent.containsMouse ? Style.lightHover : "transparent")
|
color: (parent.containsMouse ? Style.lightHover : "transparent")
|
||||||
}
|
}
|
||||||
|
|
||||||
ToolTip {
|
NCToolTip {
|
||||||
id: activityMouseAreaTooltip
|
visible: root.containsMouse && !activityContent.childHovered && model.displayLocation !== ""
|
||||||
visible: containsMouse && !activityContent.childHovered && model.displayLocation !== ""
|
|
||||||
delay: Qt.styleHints.mousePressAndHoldInterval
|
|
||||||
text: qsTr("In %1").arg(model.displayLocation)
|
text: qsTr("In %1").arg(model.displayLocation)
|
||||||
contentItem: Label {
|
|
||||||
text: activityMouseAreaTooltip.text
|
|
||||||
color: Style.ncTextColor
|
|
||||||
}
|
|
||||||
background: Rectangle {
|
|
||||||
border.color: Style.menuBorder
|
|
||||||
color: Style.backgroundColor
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
|
|
|
@ -77,19 +77,9 @@ RowLayout {
|
||||||
radius: width / 2
|
radius: width / 2
|
||||||
}
|
}
|
||||||
|
|
||||||
ToolTip {
|
NCToolTip {
|
||||||
id: moreActionsButtonTooltip
|
|
||||||
visible: parent.hovered
|
visible: parent.hovered
|
||||||
delay: Qt.styleHints.mousePressAndHoldInterval
|
|
||||||
text: qsTr("Show more actions")
|
text: qsTr("Show more actions")
|
||||||
contentItem: Label {
|
|
||||||
text: moreActionsButtonTooltip.text
|
|
||||||
color: Style.ncTextColor
|
|
||||||
}
|
|
||||||
background: Rectangle {
|
|
||||||
border.color: Style.menuBorder
|
|
||||||
color: Style.backgroundColor
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Accessible.name: qsTr("Show more actions")
|
Accessible.name: qsTr("Show more actions")
|
||||||
|
|
|
@ -185,19 +185,9 @@ RowLayout {
|
||||||
|
|
||||||
Layout.margins: Style.roundButtonBackgroundVerticalMargins
|
Layout.margins: Style.roundButtonBackgroundVerticalMargins
|
||||||
|
|
||||||
ToolTip {
|
NCToolTip {
|
||||||
id: dismissActionButtonTooltip
|
|
||||||
visible: parent.hovered
|
visible: parent.hovered
|
||||||
delay: Qt.styleHints.mousePressAndHoldInterval
|
|
||||||
text: qsTr("Dismiss")
|
text: qsTr("Dismiss")
|
||||||
contentItem: Label {
|
|
||||||
text: dismissActionButtonTooltip.text
|
|
||||||
color: Style.ncTextColor
|
|
||||||
}
|
|
||||||
background: Rectangle {
|
|
||||||
border.color: Style.menuBorder
|
|
||||||
color: Style.backgroundColor
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Accessible.name: qsTr("Dismiss")
|
Accessible.name: qsTr("Dismiss")
|
||||||
|
|
|
@ -31,19 +31,9 @@ Button {
|
||||||
leftPadding: root.text === "" ? 5 : 10
|
leftPadding: root.text === "" ? 5 : 10
|
||||||
rightPadding: root.text === "" ? 5 : 10
|
rightPadding: root.text === "" ? 5 : 10
|
||||||
|
|
||||||
ToolTip {
|
NCToolTip {
|
||||||
id: customButtonTooltip
|
|
||||||
text: root.toolTipText
|
text: root.toolTipText
|
||||||
delay: Qt.styleHints.mousePressAndHoldInterval
|
|
||||||
visible: root.toolTipText !== "" && root.hovered
|
visible: root.toolTipText !== "" && root.hovered
|
||||||
contentItem: Label {
|
|
||||||
text: customButtonTooltip.text
|
|
||||||
color: Style.ncTextColor
|
|
||||||
}
|
|
||||||
background: Rectangle {
|
|
||||||
border.color: Style.menuBorder
|
|
||||||
color: Style.backgroundColor
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
contentItem: RowLayout {
|
contentItem: RowLayout {
|
||||||
|
|
|
@ -32,19 +32,9 @@ Label {
|
||||||
signal pressed(QtObject mouse)
|
signal pressed(QtObject mouse)
|
||||||
signal clicked(QtObject mouse)
|
signal clicked(QtObject mouse)
|
||||||
|
|
||||||
ToolTip {
|
NCToolTip {
|
||||||
id: customTextButtonTooltip
|
|
||||||
text: root.toolTipText
|
text: root.toolTipText
|
||||||
delay: Qt.styleHints.mousePressAndHoldInterval
|
|
||||||
visible: root.toolTipText !== "" && root.hovered
|
visible: root.toolTipText !== "" && root.hovered
|
||||||
contentItem: Label {
|
|
||||||
text: customTextButtonTooltip.text
|
|
||||||
color: Style.ncTextColor
|
|
||||||
}
|
|
||||||
background: Rectangle {
|
|
||||||
border.color: Style.menuBorder
|
|
||||||
color: Style.backgroundColor
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
|
|
34
src/gui/tray/NCToolTip.qml
Normal file
34
src/gui/tray/NCToolTip.qml
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2022 by Claudio Cambra <claudio.cambra@nextcloud.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
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||||
|
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
* for more details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import QtQml 2.15
|
||||||
|
import QtQuick 2.15
|
||||||
|
import QtQuick.Controls 2.15
|
||||||
|
|
||||||
|
import Style 1.0
|
||||||
|
|
||||||
|
ToolTip {
|
||||||
|
id: toolTip
|
||||||
|
clip: true
|
||||||
|
delay: Qt.styleHints.mousePressAndHoldInterval
|
||||||
|
contentItem: Label {
|
||||||
|
text: toolTip.text
|
||||||
|
color: Style.ncTextColor
|
||||||
|
wrapMode: Text.Wrap
|
||||||
|
}
|
||||||
|
background: Rectangle {
|
||||||
|
border.color: Style.menuBorder
|
||||||
|
color: Style.backgroundColor
|
||||||
|
}
|
||||||
|
}
|
|
@ -48,9 +48,8 @@ TextField {
|
||||||
top: replyMessageTextField.top
|
top: replyMessageTextField.top
|
||||||
}
|
}
|
||||||
|
|
||||||
ToolTip {
|
NCToolTip {
|
||||||
visible: sendReplyMessageButton.hovered
|
visible: sendReplyMessageButton.hovered
|
||||||
delay: Qt.styleHints.mousePressAndHoldInterval
|
|
||||||
text: qsTr("Send reply to chat message")
|
text: qsTr("Send reply to chat message")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,19 +24,9 @@ MouseArea {
|
||||||
|
|
||||||
height: Style.unifiedSearchItemHeight
|
height: Style.unifiedSearchItemHeight
|
||||||
|
|
||||||
ToolTip {
|
NCToolTip {
|
||||||
id: unifiedSearchResultMouseAreaTooltip
|
|
||||||
visible: unifiedSearchResultMouseArea.containsMouse
|
visible: unifiedSearchResultMouseArea.containsMouse
|
||||||
text: isFetchMoreTrigger ? qsTr("Load more results") : model.resultTitle + "\n\n" + model.subline
|
text: isFetchMoreTrigger ? qsTr("Load more results") : model.resultTitle + "\n\n" + model.subline
|
||||||
delay: Qt.styleHints.mousePressAndHoldInterval
|
|
||||||
contentItem: Label {
|
|
||||||
text: unifiedSearchResultMouseAreaTooltip.text
|
|
||||||
color: Style.ncTextColor
|
|
||||||
}
|
|
||||||
background: Rectangle {
|
|
||||||
border.color: Style.menuBorder
|
|
||||||
color: Style.backgroundColor
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
|
|
Loading…
Reference in a new issue