diff --git a/src/gui/PredefinedStatusButton.qml b/src/gui/PredefinedStatusButton.qml
index b44147103a8e..66a48f5af8fb 100644
--- a/src/gui/PredefinedStatusButton.qml
+++ b/src/gui/PredefinedStatusButton.qml
@@ -36,7 +36,8 @@ AbstractButton {
background: Rectangle {
color: root.hovered || root.checked ? palette.highlight : palette.base
- radius: Style.slightlyRoundedButtonRadius
+ // TODO: fix radius borders - they were showing for each item
+ // radius: Style.slightlyRoundedButtonRadius
}
contentItem: Row {
diff --git a/src/gui/UserStatusSelector.qml b/src/gui/UserStatusSelector.qml
index 3d2452c6c82f..2c2dcbf0d8f6 100644
--- a/src/gui/UserStatusSelector.qml
+++ b/src/gui/UserStatusSelector.qml
@@ -186,7 +186,7 @@ ColumnLayout {
anchors.centerIn: Overlay.overlay
background: Rectangle {
- color: palette.toolTipBase
+ color: palette.window
border.width: Style.normalBorderWidth
border.color: palette.dark
radius: Style.slightlyRoundedButtonRadius
diff --git a/src/gui/filedetails/FileDetailsPage.qml b/src/gui/filedetails/FileDetailsPage.qml
index 231d4fc9e1ef..2c495bf6004c 100644
--- a/src/gui/filedetails/FileDetailsPage.qml
+++ b/src/gui/filedetails/FileDetailsPage.qml
@@ -224,7 +224,6 @@ Page {
NCTabButton {
svgCustomColorSource: "image://svgimage-custom-color/activity.svg"
text: qsTr("Activity")
- accentColor: root.accentColor
checked: swipeView.currentIndex === fileActivityView.swipeIndex
onClicked: swipeView.currentIndex = fileActivityView.swipeIndex
}
@@ -234,7 +233,6 @@ Page {
height: visible ? implicitHeight : 0
svgCustomColorSource: "image://svgimage-custom-color/share.svg"
text: qsTr("Sharing")
- accentColor: root.accentColor
checked: swipeView.currentIndex === shareViewLoader.swipeIndex
onClicked: swipeView.currentIndex = shareViewLoader.swipeIndex
visible: root.fileDetails.sharingAvailable
diff --git a/src/gui/filedetails/FileDetailsView.qml b/src/gui/filedetails/FileDetailsView.qml
index c7b7104dfa37..3572c66f4990 100644
--- a/src/gui/filedetails/FileDetailsView.qml
+++ b/src/gui/filedetails/FileDetailsView.qml
@@ -37,8 +37,8 @@ StackView {
initialItem: FileDetailsPage {
id: fileDetailsPage
- width: parent.width
- height: parent.height
+ width: root.width
+ height: root.height
backgroundsVisible: root.backgroundsVisible
rootStackView: root
onCloseButtonClicked: root.closeButtonClicked()
diff --git a/src/gui/filedetails/NCInputTextEdit.qml b/src/gui/filedetails/NCInputTextEdit.qml
index 8a16a4a6d781..d002caf26961 100644
--- a/src/gui/filedetails/NCInputTextEdit.qml
+++ b/src/gui/filedetails/NCInputTextEdit.qml
@@ -22,7 +22,7 @@ import Style
TextEdit {
id: root
- readonly property color accentColor: Style.ncBlue
+ readonly property color accentColor: palette.highlight
readonly property color secondaryColor: palette.dark
readonly property alias submitButton: submitButton
@@ -33,6 +33,16 @@ TextEdit {
selectByMouse: true
height: Math.max(Style.talkReplyTextFieldPreferredHeight, contentHeight)
+ Rectangle {
+ id: textFieldBorder
+ anchors.fill: parent
+ radius: Style.trayWindowRadius
+ border.width: Style.normalBorderWidth
+ border.color: root.activeFocus ? root.accentColor : root.secondaryColor
+ color: palette.window
+ z: -1
+ }
+
Button {
id: submitButton
diff --git a/src/gui/filedetails/NCInputTextField.qml b/src/gui/filedetails/NCInputTextField.qml
index a67d69734998..27c4236aa164 100644
--- a/src/gui/filedetails/NCInputTextField.qml
+++ b/src/gui/filedetails/NCInputTextField.qml
@@ -27,7 +27,7 @@ TextField {
readonly property alias submitButton: submitButton
property bool validInput: true
- implicitHeight: Style.talkReplyTextFieldPreferredHeight
+ implicitHeight: Math.max(Style.talkReplyTextFieldPreferredHeight, contentHeight)
rightPadding: submitButton.width
@@ -52,5 +52,12 @@ TextField {
onClicked: root.accepted()
}
+
+ verticalAlignment: Qt.AlignVCenter
+ background: Rectangle {
+ border.color: palette.dark
+ radius: Style.trayWindowRadius
+ color: palette.window
+ }
}
diff --git a/src/gui/filedetails/NCTabButton.qml b/src/gui/filedetails/NCTabButton.qml
index c06f73ff233a..2f53254489e0 100644
--- a/src/gui/filedetails/NCTabButton.qml
+++ b/src/gui/filedetails/NCTabButton.qml
@@ -25,7 +25,6 @@ TabButton {
id: tabButton
property string svgCustomColorSource: ""
- property color accentColor: Style.ncBlue
padding: Style.smallSpacing
background: Rectangle {
@@ -36,7 +35,7 @@ TabButton {
contentItem: ColumnLayout {
id: tabButtonLayout
- property var elementColors: tabButton.checked || tabButton.hovered ? palette.buttonText : palette.midlight
+ property var elementColors: tabButton.checked || tabButton.hovered ? palette.buttonText : palette.windowText
// We'd like to just set the height of the Image, but this causes crashing.
// So we use a wrapping Item and use anchors to adjust the size.
@@ -82,7 +81,7 @@ TabButton {
implicitWidth: textWidth + Style.standardSpacing * 2
implicitHeight: 2
- color: tabButton.checked ? tabButton.accentColor : tabButton.hovered ? palette.highlight : palette.base
+ color: tabButton.checked || tabButton.hovered ? palette.highlight : palette.base
}
}
}
diff --git a/src/gui/filedetails/ShareeSearchField.qml b/src/gui/filedetails/ShareeSearchField.qml
index 233466770a48..6017eea72f55 100644
--- a/src/gui/filedetails/ShareeSearchField.qml
+++ b/src/gui/filedetails/ShareeSearchField.qml
@@ -47,6 +47,14 @@ TextField {
placeholderText: enabled ? qsTr("Search for users or groups…") : qsTr("Sharing is not available for this folder")
placeholderTextColor: placeholderColor
+ verticalAlignment: Qt.AlignVCenter
+ implicitHeight: Math.max(Style.talkReplyTextFieldPreferredHeight, contentHeight)
+
+ background: Rectangle {
+ border.color: palette.dark
+ radius: Style.trayWindowRadius
+ color: palette.window
+ }
onActiveFocusChanged: triggerSuggestionsVisibility()
onTextChanged: triggerSuggestionsVisibility()
diff --git a/src/gui/iconutils.cpp b/src/gui/iconutils.cpp
index 22ce38f85aab..9fef22d57417 100644
--- a/src/gui/iconutils.cpp
+++ b/src/gui/iconutils.cpp
@@ -111,7 +111,7 @@ QImage createSvgImageWithCustomColor(const QString &fileName,
const auto sizeToUse = requestedSize.isValid() || originalSize == nullptr ? requestedSize : *originalSize;
// some icons are present in white or black only, so, we need to check both when needed
- const auto iconBaseColors = QStringList{QStringLiteral("black"), QStringLiteral("white")};
+ const auto iconBaseColors = QStringList{QStringLiteral("black"), QStringLiteral("white"), QStringLiteral("colored")};
const auto customColorImage = findImageWithCustomColor(fileName, customColor, iconBaseColors, sizeToUse);
if (!customColorImage.isNull()) {
diff --git a/src/gui/tray/CallNotificationDialog.qml b/src/gui/tray/CallNotificationDialog.qml
index 0ea9cb0f8273..c2ab360273d8 100644
--- a/src/gui/tray/CallNotificationDialog.qml
+++ b/src/gui/tray/CallNotificationDialog.qml
@@ -75,11 +75,10 @@ ApplicationWindow {
onStopNotifying: root.closeNotification()
}
- Audio {
+ SoundEffect {
id: ringSound
source: root.ringtonePath
loops: 9 // about 45 seconds of audio playing
- audioRole: Audio.RingtoneRole
}
Rectangle {
diff --git a/src/gui/tray/TalkReplyTextField.qml b/src/gui/tray/TalkReplyTextField.qml
index 259e28154ed6..9e67629af95b 100644
--- a/src/gui/tray/TalkReplyTextField.qml
+++ b/src/gui/tray/TalkReplyTextField.qml
@@ -17,6 +17,13 @@ TextField {
onAccepted: sendReplyMessage()
+ verticalAlignment: Qt.AlignVCenter
+ background: Rectangle {
+ border.color: palette.dark
+ radius: Style.trayWindowRadius
+ color: palette.window
+ }
+
Button {
id: sendReplyMessageButton
diff --git a/src/gui/tray/TrayFolderListItem.qml b/src/gui/tray/TrayFolderListItem.qml
index e44be380f283..13cc5fa0ec05 100644
--- a/src/gui/tray/TrayFolderListItem.qml
+++ b/src/gui/tray/TrayFolderListItem.qml
@@ -37,6 +37,7 @@ MenuItem {
anchors.fill: parent
anchors.margins: Style.normalBorderWidth
color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.window
+ radius: Style.halfTrayWindowRadius
}
}
diff --git a/src/gui/tray/TrayFoldersMenuButton.qml b/src/gui/tray/TrayFoldersMenuButton.qml
index 85a930f34cdc..020f6398acff 100644
--- a/src/gui/tray/TrayFoldersMenuButton.qml
+++ b/src/gui/tray/TrayFoldersMenuButton.qml
@@ -114,7 +114,7 @@ HeaderButton {
cache: true
- source: "image://svgimage-custom-color/folder.svg/"
+ source: "image://svgimage-custom-color/folder.svg/" + palette.windowText
sourceSize {
width: imageWidth
height: imageHeight
@@ -144,7 +144,7 @@ HeaderButton {
cache: true
- source: "image://svgimage-custom-color/caret-down.svg/"
+ source: "image://svgimage-custom-color/caret-down.svg/" + palette.windowText
sourceSize {
width: openLocalFolderButtonCaretIconLoader.imageWidth
height: openLocalFolderButtonCaretIconLoader.imageHeight
@@ -178,6 +178,12 @@ HeaderButton {
height: implicitHeight + y > Style.trayWindowHeight ? Style.trayWindowHeight - y : implicitHeight
closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape
+ background: Rectangle {
+ border.color: palette.dark
+ color: palette.window
+ radius: Style.trayWindowRadius
+ }
+
contentItem: ScrollView {
id: foldersMenuScrollView
@@ -208,9 +214,9 @@ HeaderButton {
subline: model.modelData.parentPath
width: foldersMenuListView.width
height: Style.standardPrimaryButtonHeight
- backgroundIconSource: "image://svgimage-custom-color/folder.svg/"
+ backgroundIconSource: "image://svgimage-custom-color/folder.svg/" + palette.windowText
iconSource: isGroupFolder
- ? "image://svgimage-custom-color/account-group.svg/"
+ ? "image://svgimage-custom-color/account-group.svg/" + palette.windowText
: ""
onTriggered: {
diff --git a/src/gui/tray/UnifiedSearchInputContainer.qml b/src/gui/tray/UnifiedSearchInputContainer.qml
index ab30760d106f..b1c11b8f2b55 100644
--- a/src/gui/tray/UnifiedSearchInputContainer.qml
+++ b/src/gui/tray/UnifiedSearchInputContainer.qml
@@ -41,9 +41,16 @@ TextField {
rightPadding: trayWindowUnifiedSearchTextFieldClearTextButton.width + trayWindowUnifiedSearchTextFieldClearTextButton.anchors.rightMargin + textFieldHorizontalPaddingOffset
placeholderText: qsTr("Search files, messages, events …")
+ verticalAlignment: Qt.AlignVCenter
selectByMouse: true
+ background: Rectangle {
+ border.color: palette.dark
+ radius: Style.trayWindowRadius
+ color: palette.window
+ }
+
Image {
id: trayWindowUnifiedSearchTextFieldSearchIcon
width: Style.trayListItemIconSize - anchors.leftMargin
diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
index ea2d222b1574..e6f5ef800c21 100644
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -40,6 +40,7 @@ AbstractButton {
color: (userLine.hovered || userLine.visualFocus) &&
!(userMoreButton.hovered || userMoreButton.visualFocus) ?
palette.highlight : palette.window
+ radius: Style.halfTrayWindowRadius
}
contentItem: RowLayout {
@@ -48,7 +49,7 @@ AbstractButton {
Image {
id: accountAvatar
- Layout.leftMargin: 7
+ Layout.leftMargin: Style.accountIconsMenuMargin
verticalAlignment: Qt.AlignCenter
cache: false
source: model.avatar !== "" ? model.avatar : Theme.darkMode ? "image://avatars/fallbackWhite" : "image://avatars/fallbackBlack"
@@ -62,7 +63,7 @@ AbstractButton {
height: width
anchors.bottom: accountAvatar.bottom
anchors.right: accountAvatar.right
- radius: width*0.5
+ radius: width * Style.trayFolderStatusIndicatorRadiusFactor
}
Image {
@@ -148,14 +149,21 @@ AbstractButton {
Image {
anchors.fill: parent
- source: "image://svgimage-custom-color/more.svg/"
+ source: "image://svgimage-custom-color/more.svg/" + palette.windowText
fillMode: Image.PreserveAspectFit
+ anchors.rightMargin: Style.accountLabelsAnchorsMargin
}
AutoSizingMenu {
id: userMoreButtonMenu
closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape
+ background: Rectangle {
+ border.color: palette.dark
+ radius: Style.halfTrayWindowRadius
+ color: palette.window
+ }
+
MenuItem {
visible: model.isConnected && model.serverHasUserStatus
height: visible ? implicitHeight : 0
@@ -163,6 +171,11 @@ AbstractButton {
font.pixelSize: Style.topLinePixelSize
hoverEnabled: true
onClicked: showUserStatusSelector(index)
+
+ background: Rectangle {
+ radius: Style.halfTrayWindowRadius
+ color: parent.hovered ? palette.highlight : palette.window
+ }
}
MenuItem {
@@ -185,6 +198,11 @@ AbstractButton {
}
accountMenu.close()
}
+
+ background: Rectangle {
+ radius: Style.halfTrayWindowRadius
+ color: parent.hovered ? palette.highlight : palette.window
+ }
}
MenuItem {
@@ -200,6 +218,11 @@ AbstractButton {
Accessible.role: Accessible.Button
Accessible.name: text
Accessible.onPressAction: removeAccountButton.clicked()
+
+ background: Rectangle {
+ radius: Style.halfTrayWindowRadius
+ color: parent.hovered ? palette.highlight : palette.window
+ }
}
}
}
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index ccb192781597..9ec57f16c287 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -243,7 +243,7 @@ ApplicationWindow {
anchors.right: trayWindowMainItem.right
anchors.top: trayWindowMainItem.top
height: Style.trayWindowHeaderHeight
- color: Style.currentUserHeaderColor
+ color: palette.window
RowLayout {
id: trayWindowHeaderLayout
@@ -289,7 +289,7 @@ ApplicationWindow {
background: Rectangle {
border.color: palette.dark
color: palette.window
- radius: Style.currentAccountButtonRadius
+ radius: Style.halfTrayWindowRadius
}
onClosed: {
@@ -324,11 +324,12 @@ ApplicationWindow {
spacing: 0
Image {
- Layout.leftMargin: 12
- verticalAlignment: Qt.AlignCenter
- source: "image://svgimage-custom-color/add.svg"
- sourceSize.width: Style.headerButtonIconSize
- sourceSize.height: Style.headerButtonIconSize
+ Layout.leftMargin: Style.accountIconsMenuMargin
+ verticalAlignment: Qt.AlignVCenter
+ horizontalAlignment: Qt.AlignCenter
+ source: "image://svgimage-custom-color/add.svg/" + palette.windowText
+ sourceSize.width: Style.addButtonIconSize
+ sourceSize.height: Style.addButtonIconSize
}
EnforcedPlainTextLabel {
Layout.leftMargin: 14
@@ -346,6 +347,12 @@ ApplicationWindow {
Accessible.role: Accessible.MenuItem
Accessible.name: qsTr("Add new account")
Accessible.onPressAction: addAccountButton.clicked()
+
+ background: Rectangle {
+ radius: Style.halfTrayWindowRadius
+ color: palette.highlight
+ visible: addAccountButton.hovered
+ }
}
Rectangle {
@@ -363,6 +370,12 @@ ApplicationWindow {
Accessible.role: Accessible.MenuItem
Accessible.name: Systray.syncIsPaused ? qsTr("Resume sync for all") : qsTr("Pause sync for all")
Accessible.onPressAction: syncPauseButton.clicked()
+
+ background: Rectangle {
+ radius: Style.halfTrayWindowRadius
+ color: palette.highlight
+ visible: syncPauseButton.hovered
+ }
}
MenuItem {
@@ -374,6 +387,12 @@ ApplicationWindow {
Accessible.role: Accessible.MenuItem
Accessible.name: text
Accessible.onPressAction: settingsButton.clicked()
+
+ background: Rectangle {
+ radius: Style.halfTrayWindowRadius
+ color: palette.highlight
+ visible: settingsButton.hovered
+ }
}
MenuItem {
@@ -385,6 +404,12 @@ ApplicationWindow {
Accessible.role: Accessible.MenuItem
Accessible.name: text
Accessible.onPressAction: exitButton.clicked()
+
+ background: Rectangle {
+ radius: Style.halfTrayWindowRadius
+ color: palette.highlight
+ visible: exitButton.hovered
+ }
}
}
@@ -416,22 +441,22 @@ ApplicationWindow {
height: width
anchors.bottom: currentAccountAvatar.bottom
anchors.right: currentAccountAvatar.right
- color: Style.currentUserHeaderColor
radius: width * Style.trayFolderStatusIndicatorRadiusFactor
}
- Rectangle {
- id: currentAccountStatusIndicatorMouseHover
- visible: UserModel.currentUser && UserModel.currentUser.isConnected
- && UserModel.currentUser.serverHasUserStatus
- width: Style.accountAvatarStateIndicatorSize + + Style.trayFolderStatusIndicatorSizeOffset
- height: width
- anchors.bottom: currentAccountAvatar.bottom
- anchors.right: currentAccountAvatar.right
- color: currentAccountButton.hovered ? Style.currentUserHeaderTextColor : palette.window
- opacity: Style.trayFolderStatusIndicatorMouseHoverOpacityFactor
- radius: width * Style.trayFolderStatusIndicatorRadiusFactor
- }
+ // TODO: check if we want add any hover effect
+ // Rectangle {
+ // id: currentAccountStatusIndicatorMouseHover
+ // visible: UserModel.currentUser && UserModel.currentUser.isConnected
+ // && UserModel.currentUser.serverHasUserStatus
+ // width: Style.accountAvatarStateIndicatorSize + + Style.trayFolderStatusIndicatorSizeOffset
+ // height: width
+ // anchors.bottom: currentAccountAvatar.bottom
+ // anchors.right: currentAccountAvatar.right
+ // color: currentAccountButton.hovered ? palette.highlight : palette.window
+ // opacity: Style.trayFolderStatusIndicatorMouseHoverOpacityFactor
+ // radius: width * Style.trayFolderStatusIndicatorRadiusFactor
+ // }
Image {
id: currentAccountStatusIndicator
@@ -505,20 +530,16 @@ ApplicationWindow {
}
}
- ColorOverlay {
- cached: true
- width: source.width
- height: source.height
- source: Image {
- Layout.alignment: Qt.AlignRight
- verticalAlignment: Qt.AlignCenter
- Layout.margins: Style.accountDropDownCaretMargin
- source: "image://svgimage-custom-color/caret-down.svg/"
- sourceSize.width: Style.accountDropDownCaretSize
- sourceSize.height: Style.accountDropDownCaretSize
- Accessible.role: Accessible.PopupMenu
- Accessible.name: qsTr("Account switcher and settings menu")
- }
+ Image {
+ Layout.alignment: Qt.AlignRight
+ verticalAlignment: Qt.AlignCenter
+ horizontalAlignment: Qt.AlignRight
+ Layout.leftMargin: Style.accountDropDownCaretMargin
+ source: "image://svgimage-custom-color/caret-down.svg/" + palette.windowText
+ sourceSize.width: Style.accountDropDownCaretSize
+ sourceSize.height: Style.accountDropDownCaretSize
+ Accessible.role: Accessible.PopupMenu
+ Accessible.name: qsTr("Account switcher and settings menu")
}
}
}
@@ -564,7 +585,7 @@ ApplicationWindow {
HeaderButton {
id: trayWindowAppsButton
- icon.source: "image://svgimage-custom-color/more-apps.svg/"
+ icon.source: "image://svgimage-custom-color/more-apps.svg/" + palette.windowText
onClicked: {
if(appsMenuListView.count <= 0) {
@@ -590,8 +611,8 @@ ApplicationWindow {
background: Rectangle {
border.color: palette.dark
+ radius: Style.halfTrayWindowRadius
color: palette.window
- radius: 2
}
contentItem: ScrollView {
@@ -615,11 +636,19 @@ ApplicationWindow {
text: model.appName
font.pixelSize: Style.topLinePixelSize
icon.source: model.appIconUrl
+ icon.color: palette.windowText
onTriggered: UserAppsModel.openAppUrl(appUrl)
hoverEnabled: true
Accessible.role: Accessible.MenuItem
Accessible.name: qsTr("Open %1 in browser").arg(model.appName)
Accessible.onPressAction: appEntry.triggered()
+
+ background: Rectangle {
+ anchors.fill: parent
+ anchors.margins: 1
+ color: appEntry.hovered ? palette.highlight : palette.window
+ radius: Style.halfTrayWindowRadius
+ }
}
}
}
@@ -630,7 +659,7 @@ ApplicationWindow {
UnifiedSearchInputContainer {
id: trayWindowUnifiedSearchInputContainer
- height: Style.trayWindowHeaderHeight * 0.65
+ height: Math.max(Style.talkReplyTextFieldPreferredHeight, contentHeight)
anchors {
top: trayWindowHeaderBackground.bottom
@@ -648,17 +677,18 @@ ApplicationWindow {
onTextEdited: { UserModel.currentUser.unifiedSearchResultsListModel.searchTerm = trayWindowUnifiedSearchInputContainer.text }
onClearText: { UserModel.currentUser.unifiedSearchResultsListModel.searchTerm = "" }
- Rectangle {
- id: bottomUnifiedSearchInputSeparator
+ // TODO: consult designers, this line looks weird atm
+ // Rectangle {
+ // id: bottomUnifiedSearchInputSeparator
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.bottom: parent.bottom
+ // anchors.left: parent.left
+ // anchors.right: parent.right
+ // anchors.bottom: parent.bottom
- height: 1
- color: Style.menuBorder
- visible: trayWindowMainItem.isUnifiedSearchActive
- }
+ // height: 1
+ // color: Style.menuBorder
+ // visible: trayWindowMainItem.isUnifiedSearchActive
+ // }
}
ErrorBox {
diff --git a/src/gui/tray/activitylistmodel.cpp b/src/gui/tray/activitylistmodel.cpp
index d200ecf7cb8c..03422c5f9fef 100644
--- a/src/gui/tray/activitylistmodel.cpp
+++ b/src/gui/tray/activitylistmodel.cpp
@@ -226,19 +226,17 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
};
const auto generateIconPath = [&]() {
- auto colorIconPath = QStringLiteral("image://svgimage-custom-color/");//role == DarkIconRole ? QStringLiteral("qrc:///client/theme/white/") : QStringLiteral("qrc:///client/theme/black/");
+ auto colorIconPath = role == DarkIconRole ? QStringLiteral("image://svgimage-custom-color/%1/white") : QStringLiteral("image://svgimage-custom-color/%1/black");
if (a._type == Activity::NotificationType && !a._talkNotificationData.userAvatar.isEmpty()) {
- return QStringLiteral("image://svgimage-custom-color/talk-app.svg");
+ return QStringLiteral("image://svgimage-custom-color/talk-bordered.svg");
} else if (a._type == Activity::SyncResultType) {
- colorIconPath.append("state-error.svg");
- return colorIconPath;
+ return colorIconPath.arg("state-error.svg");
} else if (a._type == Activity::SyncFileItemType) {
if (a._syncFileItemStatus == SyncFileItem::NormalError
|| a._syncFileItemStatus == SyncFileItem::FatalError
|| a._syncFileItemStatus == SyncFileItem::DetailError
|| a._syncFileItemStatus == SyncFileItem::BlacklistedError) {
- colorIconPath.append("state-error.svg");
- return colorIconPath;
+ return colorIconPath.arg("state-error.svg");
} else if (a._syncFileItemStatus == SyncFileItem::SoftError
|| a._syncFileItemStatus == SyncFileItem::Conflict
|| a._syncFileItemStatus == SyncFileItem::Restoration
@@ -246,29 +244,26 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
|| a._syncFileItemStatus == SyncFileItem::FileNameInvalid
|| a._syncFileItemStatus == SyncFileItem::FileNameInvalidOnServer
|| a._syncFileItemStatus == SyncFileItem::FileNameClash) {
- colorIconPath.append("state-warning.svg");
- return colorIconPath;
+ return colorIconPath.arg("state-warning.svg");
} else if (a._syncFileItemStatus == SyncFileItem::FileIgnored) {
- colorIconPath.append("state-info.svg");
- return colorIconPath;
+ return colorIconPath.arg("state-info.svg");
} else {
// File sync successful
if (a._fileAction == "file_created") {
- return a._previews.empty() ? QStringLiteral("image://svgimage-custom-color/add.svg")
- : QStringLiteral("image://svgimage-custom-color/add-bordered.svg");
+ return a._previews.empty() ? QStringLiteral("image://svgimage-custom-color/add.svg/")
+ : QStringLiteral("image://svgimage-custom-color/add-bordered.svg/");
} else if (a._fileAction == "file_deleted") {
- return a._previews.empty() ? QStringLiteral("image://svgimage-custom-color/delete.svg")
- : QStringLiteral("image://svgimage-custom-color/delete-bordered.svg");
+ return a._previews.empty() ? QStringLiteral("image://svgimage-custom-color/delete.svg/")
+ : QStringLiteral("image://svgimage-custom-color/delete-bordered.svg/");
} else {
- return a._previews.empty() ? colorIconPath % QStringLiteral("change.svg")
- : QStringLiteral("image://svgimage-custom-color/change-bordered.svg");
+ return a._previews.empty() ? colorIconPath.arg(QStringLiteral("change.svg"))
+ : QStringLiteral("image://svgimage-custom-color/change-bordered.svg/");
}
}
} else {
// We have an activity
if (a._icon.isEmpty()) {
- colorIconPath.append("activity.svg");
- return colorIconPath;
+ return colorIconPath.arg("activity.svg");
}
const QString basePath = QStringLiteral("image://tray-image-provider/") % a._icon % QStringLiteral("/");
@@ -302,8 +297,9 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
}
case DarkIconRole:
- case LightIconRole:
+ case LightIconRole: {
return generateIconPath();
+ }
case ObjectTypeRole:
return a._objectType;
case ObjectIdRole:
@@ -511,7 +507,7 @@ void ActivityListModel::insertOrRemoveDummyFetchingActivity()
_dummyFetchingActivities._objectType = dummyFetchingActivityObjectType;
_dummyFetchingActivities._subject = tr("Fetching activities …");
_dummyFetchingActivities._dateTime = QDateTime::currentDateTime();
- _dummyFetchingActivities._icon = QLatin1String("image://svgimage-custom-color/change-bordered.svg");
+ _dummyFetchingActivities._icon = QLatin1String("image://svgimage-custom-color/change-bordered.svg/");
addEntriesToActivityList({_dummyFetchingActivities});
} else if (!_finalList.isEmpty() && _finalList.first()._objectType == dummyFetchingActivityObjectType) {
diff --git a/theme.qrc.in b/theme.qrc.in
index 137b3c90ccf3..9bb04975573f 100644
--- a/theme.qrc.in
+++ b/theme.qrc.in
@@ -236,10 +236,10 @@
theme/colored/user-status-dnd.svg
theme/black/email.svg
theme/black/edit.svg
+ theme/black/more-apps.svg
theme/delete.svg
theme/send.svg
theme/call-notification.wav
- theme/more-apps.svg
theme/talk-app.svg
diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index 7370e6a71b1c..f48f885e97c7 100644
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -50,7 +50,10 @@ QtObject {
// Dimensions and sizes
property int trayWindowWidth: variableSize(400)
property int trayWindowHeight: variableSize(510)
+ // text input and main windows radius
property int trayWindowRadius: 10
+ // dropdown menus radius
+ property int halfTrayWindowRadius: 5
property int trayWindowBorderWidth: variableSize(1)
property int trayWindowHeaderHeight: variableSize(60)
property int trayHorizontalMargin: 10
@@ -93,7 +96,7 @@ QtObject {
property int folderStateIndicatorSize: 16
property int accountLabelWidth: 128
- property int accountDropDownCaretSize: 20
+ property int accountDropDownCaretSize: 10
property int accountDropDownCaretMargin: 8
property int trayFoldersMenuButtonStateIndicatorBottomOffset: 5
@@ -103,9 +106,12 @@ QtObject {
property int addAccountButtonHeight: 50
property int headerButtonIconSize: 32
+ property int addButtonIconSize: 26
property int dismissButtonSize: 26
property int minimumActivityItemHeight: 24
+ property int accountIconsMenuMargin: 7
+
property int activityLabelBaseWidth: 240
property int talkReplyTextFieldPreferredHeight: 34
diff --git a/theme/black/more-apps.svg b/theme/black/more-apps.svg
new file mode 100644
index 000000000000..a6d0414e52a0
--- /dev/null
+++ b/theme/black/more-apps.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/theme/more-apps.svg b/theme/more-apps.svg
deleted file mode 100644
index 15cce602baba..000000000000
--- a/theme/more-apps.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/theme/white/more-apps.svg b/theme/white/more-apps.svg
index c17578c40704..d477d48756d7 100644
--- a/theme/white/more-apps.svg
+++ b/theme/white/more-apps.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file