lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-09-10 03:53:23 +02:00
Code Activity

misc: add parametrizable colors for theme support

Browse source 
GitLab: #160
Change-Id: I44e7584af070fd355af623fe12433cdd68d32d30
This commit is contained in:
Sébastien Blin 2020-11-28 16:14:25 -05:00 • committed by Ming Rui Zhang
parent 8296b430eb
commit 56560914bf
73 changed files with 433 additions and 221 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/commoncomponents/BaseContextMenu.qml
View file

@ -43,5 +43,6 @@ Menu {
border.width: commonBorderWidth
border.color: JamiTheme.tabbarBorderColor
color: JamiTheme.backgroundColor
}
}

4
src/commoncomponents/DeleteAccountDialog.qml
View file

@ -56,6 +56,7 @@ BaseDialog {
implicitWidth: JamiTheme.preferredDialogWidth
implicitHeight: JamiTheme.preferredDialogHeight
color: JamiTheme.secondaryBackgroundColor
ColumnLayout {
anchors.centerIn: parent
@ -68,6 +69,7 @@ BaseDialog {
Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: deleteAccountContentRect.width - JamiTheme.preferredMarginSize * 2
color: JamiTheme.textColor
text: JamiStrings.confirmDeleteQuestion
font.pointSize: JamiTheme.textFontSize
@ -84,6 +86,7 @@ BaseDialog {
Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: deleteAccountContentRect.width - JamiTheme.preferredMarginSize * 2
color: JamiTheme.textColor
text: SettingsAdapter.getAccountBestName()
font.pointSize: JamiTheme.textFontSize
@ -101,6 +104,7 @@ BaseDialog {
Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: deleteAccountContentRect.width - JamiTheme.preferredMarginSize * 2
color: JamiTheme.textColor
text: SettingsAdapter.getCurrentAccount_Profile_Info_Uri()
font.pointSize: JamiTheme.textFontSize

2
src/commoncomponents/ElidedTextLabel.qml
View file

@ -36,7 +36,7 @@ Label {
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
color: "black"
color: JamiTheme.textColor
TextMetrics {
id: elided

6
src/commoncomponents/GeneralMenuItem.qml
View file

@ -31,6 +31,7 @@ MenuItem {
property string itemName: ""
property string iconSource: ""
property string iconColor: ""
property int preferredWidth: 220
property int preferredHeight: 48
@ -60,6 +61,7 @@ MenuItem {
width: (visible ? 24 : 0)
height: (visible ? 24 : 0)
color: iconColor !== ""? iconColor : JamiTheme.textColor
visible: false
opacity: 0.7
@ -77,6 +79,7 @@ MenuItem {
height: 30
text: itemName
color: JamiTheme.textColor
wrapMode: Text.WordWrap
font.pointSize: JamiTheme.textFontSize
horizontalAlignment: Text.AlignLeft
@ -92,7 +95,7 @@ MenuItem {
},
State {
name: "normal"; when: !hovered
PropertyChanges { target: background; color: "white" }
PropertyChanges { target: background; color: JamiTheme.backgroundColor }
}
]
}
@ -117,7 +120,6 @@ MenuItem {
implicitHeight: preferredHeight
border.width: 0
color: menuItem.down ? JamiTheme.normalButtonColor : "white"
CustomBorder {
commonBorder: false

1
src/commoncomponents/InfoLineEdit.qml
View file

@ -30,6 +30,7 @@ TextField{
}
wrapMode: Text.Wrap
color: JamiTheme.textColor
readOnly: false
selectByMouse: true
font.pointSize: JamiTheme.settingsFontSize

2
src/commoncomponents/ListViewJami.qml
View file

@ -34,7 +34,7 @@ Rectangle {
border.width: 1
border.color: JamiTheme.hoverColor
color: JamiTheme.normalButtonColor
color: JamiTheme.backgroundColor
ListView {
id: listView

9
src/commoncomponents/MaterialLineEdit.qml
View file

@ -37,8 +37,8 @@ TextField {
property int borderColorMode: MaterialLineEdit.NORMAL
property var iconSource: ""
property var backgroundColor: JamiTheme.rgb256(240,240,240)
property var borderColor: "#333"
property var backgroundColor: JamiTheme.editBackgroundColor
property var borderColor: JamiTheme.greyBorderColor
signal imageClicked
@ -51,11 +51,11 @@ TextField {
switch(borderColorMode){
case MaterialLineEdit.SEARCHING:
iconSource = "qrc:/images/jami_rolling_spinner.gif"
borderColor = "#333"
borderColor = JamiTheme.greyBorderColor
break
case MaterialLineEdit.NORMAL:
iconSource = ""
borderColor = "#333"
borderColor = JamiTheme.greyBorderColor
break
case MaterialLineEdit.RIGHT:
iconSource = "qrc:/images/icons/round-check_circle-24px.svg"
@ -76,6 +76,7 @@ TextField {
font.kerning: true
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
color: JamiTheme.textColor
Image {
id: lineEditImage

3
src/commoncomponents/ModalPopup.qml
View file

@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
import net.jami.Models 1.0
Popup {
id: root
@ -67,7 +68,7 @@ Popup {
verticalOffset: 3.0
radius: container.radius * 2
samples: 16
color: "#80000000"
color: JamiTheme.shadowColor
source: container
}

1
src/commoncomponents/PasswordDialog.qml
View file

@ -123,6 +123,7 @@ BaseDialog {
implicitWidth: JamiTheme.preferredDialogWidth
implicitHeight: JamiTheme.preferredDialogHeight
color: JamiTheme.secondaryBackgroundColor
ColumnLayout {
anchors.centerIn: parent

4
src/commoncomponents/PhotoboothView.qml
View file

@ -177,7 +177,7 @@ ColumnLayout {
anchors.fill: previewWidget
visible: false
color: "#fff"
color: JamiTheme.whiteColor
OpacityAnimator on opacity {
id: flashAnimation
@ -209,6 +209,7 @@ ColumnLayout {
text: ""
font.pointSize: 10
font.kerning: true
imageColor: JamiTheme.textColor
toolTipText: JamiStrings.takePhoto
@ -264,6 +265,7 @@ ColumnLayout {
source: "qrc:/images/icons/round-folder-24px.svg"
toolTipText: JamiStrings.importFromFile
imageColor: JamiTheme.textColor
onClicked: {
importFromFileToAvatar_Dialog.open()

2
src/commoncomponents/PreferenceItemDelegate.qml
View file

@ -95,6 +95,7 @@ ItemDelegate {
Layout.leftMargin: 8
text: preferenceName
color: JamiTheme.textColor
font.pointSize: JamiTheme.settingsFontSize
ToolTip.visible: hovered
ToolTip.text: preferenceSummary
@ -110,6 +111,7 @@ ItemDelegate {
Layout.rightMargin: 8
Layout.preferredWidth: preferredSize
Layout.preferredHeight: preferredSize
imageColor: JamiTheme.textColor
source: "qrc:/images/icons/round-settings-24px.svg"

10
src/commoncomponents/ResponsiveImage.qml
View file

@ -18,6 +18,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
import QtQuick.Window 2.14
Image {
@ -31,6 +32,7 @@ Image {
property string normalSource
property string checkedSource
property string color: "transparent"
property real pixelDensity: Screen.pixelDensity
property bool isSvg: {
@ -50,6 +52,14 @@ Image {
antialiasing: false
asynchronous: true
layer {
enabled: true
effect: ColorOverlay {
id: overlay
color: root.color
}
}
function setSourceSize() {
if (isSvg) {
sourceSize.width = Math.max(24, width)

13
src/commoncomponents/SettingParaCombobox.qml
View file

@ -43,12 +43,15 @@ ComboBox {
var currentItem = root.delegateModel.items.get(index)
return currentItem.model[root.textRole].toString()
}
color: "black"
color: JamiTheme.textColor
font: root.font
elide: Text.ElideRight
verticalAlignment: Text.AlignVCenter
}
highlighted: root.highlightedIndex === index
background: Rectangle {
color: highlighted? JamiTheme.selectedColor : JamiTheme.editBackgroundColor
}
}
indicator: Canvas {
@ -72,7 +75,7 @@ ComboBox {
context.lineTo(width, 0);
context.lineTo(width / 2, height);
context.closePath();
context.fillStyle = root.pressed ? JamiTheme.pressColor : "black";
context.fillStyle = root.pressed ? JamiTheme.pressColor : JamiTheme.textColor;
context.fill();
}
}
@ -83,15 +86,16 @@ ComboBox {
text: root.displayText
font: root.font
color: "black"
color: JamiTheme.textColor
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
}
background: Rectangle {
color: JamiTheme.editBackgroundColor
implicitWidth: 120
implicitHeight: 40
border.color: "white"
border.color: JamiTheme.editBackgroundColor
border.width: root.visualFocus ? 2 : 1
radius: 2
}
@ -112,6 +116,7 @@ ComboBox {
}
background: Rectangle {
color: JamiTheme.editBackgroundColor
border.color: "gray"
radius: 2
}

6
src/commoncomponents/js/contextmenugenerator.js
View file

@ -87,7 +87,8 @@ function addMenuSeparator(separatorHeight, separatorColor) {
function addMenuItem(itemName,
iconSource,
onClickedCallback) {
onClickedCallback,
iconColor="") {
if (!baseContextMenuObject.count){
// Add default separator at the top.
addMenuSeparator(8, "transparent")
@ -99,6 +100,7 @@ function addMenuItem(itemName,
menuItemObject = menuItemComponent.createObject(null,
{itemName: itemName,
iconSource: iconSource,
iconColor: iconColor,
leftBorderWidth: baseContextMenuObject.commonBorderWidth,
rightBorderWidth: baseContextMenuObject.commonBorderWidth})
} else if (menuItemComponent.status === Component.Error)
@ -107,7 +109,7 @@ function addMenuItem(itemName,
if (menuItemObject !== null) {
menuItemObject.clicked.connect(function () {baseContextMenuObject.close()})
menuItemObject.clicked.connect(onClickedCallback)
menuItemObject.icon.color = "black"
menuItemObject.icon.color = "green"
baseContextMenuObject.addItem(menuItemObject)

169
src/constant/JamiTheme.qml
View file

@ -22,106 +22,94 @@ pragma Singleton
import QtQuick 2.14
Item {
// Color strings
property string blackColor: "#000000"
property string whiteColor: "#ffffff"
property string transparentColor: "transparent"
property string primaryForegroundColor: blackColor
property string primaryBackgroundColor: whiteColor
// General
property color blackColor: "#000000"
property color whiteColor: "#ffffff"
property color transparentColor: "transparent"
property color primaryForegroundColor: blackColor
property color primaryBackgroundColor: whiteColor
property color backgroundColor: lightGrey_
property color shadowColor: "#80000000"
property color secondaryBackgroundColor: "white"
property color greyBorderColor: "#333"
property color selectionBlue: "#109ede"
property string pressedButtonColor: "#a0a0a0"
property string hoveredButtonColor: "#c7c7c7"
property string normalButtonColor: "#e0e0e0"
property color hoverColor: "#c7c7c7"
property color pressColor: "#c0c0c0"
property color selectedColor: "#e0e0e0"
property color editBackgroundColor: lightGrey_
property color textColor: primaryForegroundColor
property color tabbarBorderColor: "#e3e3e3"
property string invertedPressedButtonColor: Qt.rgba(0, 0, 0, 0.5)
property string invertedHoveredButtonColor: Qt.rgba(0, 0, 0, 0.6)
property string invertedNormalButtonColor: Qt.rgba(0, 0, 0, 0.75)
// Side panel
property color presenceGreen: "#4cd964"
property color notificationRed: "#ff3b30"
property color unPresenceOrange: "orange"
property color contactSearchBarPlaceHolderTextFontColor: "#767676"
property color draftRed: "#cf5300"
property string hoverColor: "#c7c7c7"
property string pressColor: "#c0c0c0"
// General buttons
property color pressedButtonColor: "#a0a0a0"
property color hoveredButtonColor: "#c7c7c7"
property color normalButtonColor: "#e0e0e0"
property string tabbarBorderColor: "#e3e3e3"
property string presenceGreen: "#4cd964"
property string notificationRed: "#ff3b30"
property string unPresenceOrange: "orange"
property string backgroundColor: lightGrey_
property string backgroundDarkColor: rgb256(220, 220, 220)
property color invertedPressedButtonColor: Qt.rgba(0, 0, 0, 0.5)
property color invertedHoveredButtonColor: Qt.rgba(0, 0, 0, 0.6)
property color invertedNormalButtonColor: Qt.rgba(0, 0, 0, 0.75)
property string screenSelectionBorderGreen: "green"
property color buttonTintedBlue: "#00aaff"
property color buttonTintedBlueHovered: "#0e81c5"
property color buttonTintedBluePressed: "#273261"
property color buttonTintedGrey: "#999"
property color buttonTintedGreyHovered: "#777"
property color buttonTintedGreyPressed: "#777"
property color buttonTintedGreyInactive: "#bbb"
property color buttonTintedBlack: "#333"
property color buttonTintedBlackHovered: "#111"
property color buttonTintedBlackPressed: "#000"
property color buttonTintedRed: "red"
property color buttonTintedRedHovered: "#c00"
property color buttonTintedRedPressed: "#b00"
property string acceptButtonGreen: "#4caf50"
property string acceptButtonHoverGreen: "#5db761"
property string acceptButtonPressedGreen: "#449d48"
property color closeButtonLighterBlack: "#4c4c4c"
property string declineButtonRed: "#f44336"
property string declineButtonHoverRed: "#f5554a"
property string declineButtonPressedRed: "#db3c30"
// Call buttons
property color acceptButtonGreen: "#4caf50"
property color acceptButtonHoverGreen: "#5db761"
property color acceptButtonPressedGreen: "#449d48"
property string hangUpButtonTintedRed: "#ff0000"
property string buttonTintedBlue: "#00aaff"
property string buttonTintedBlueHovered: "#0e81c5"
property string buttonTintedBluePressed: "#273261"
property string buttonTintedGrey: "#999"
property string buttonTintedGreyHovered: "#777"
property string buttonTintedGreyPressed: "#777"
property string buttonTintedGreyInactive: "#bbb"
property string buttonTintedBlack: "#333"
property string buttonTintedBlackHovered: "#111"
property string buttonTintedBlackPressed: "#000"
property string buttonTintedRed: "red"
property string buttonTintedRedHovered: "#c00"
property string buttonTintedRedPressed: "#b00"
property color declineButtonRed: "#f44336"
property color declineButtonHoverRed: "#f5554a"
property color declineButtonPressedRed: "#db3c30"
property string selectionBlue: "#109ede"
property string selectionGreen: "#21be2b"
property string rubberBandSelectionBlue: "steelblue"
property color sipInputButtonBackgroundColor: "#336699"
property color sipInputButtonHoverColor: "#4477aa"
property color sipInputButtonPressColor: "#5588bb"
property string closeButtonLighterBlack: "#4c4c4c"
// Wizard / account manager
property color accountCreationOtherStepColor: "grey"
property color accountCreationCurrentStepColor: "#28b1ed"
property color wizardBlueButtons: "#28b1ed"
property color wizardGreenColor: "#aed581"
property color requiredFieldColor: "#ff1f62"
property color requiredFieldBackgroundColor: "#fee4e9"
property string contactSearchBarPlaceHolderTextFontColor: "#767676"
property string contactSearchBarPlaceHolderGreyBackground: "#dddddd"
property string draftRed: "#cf5300"
property string sipInputButtonBackgroundColor: "#336699"
property string sipInputButtonHoverColor: "#4477aa"
property string sipInputButtonPressColor: "#5588bb"
property string accountCreationOtherStepColor: "grey"
property string accountCreationCurrentStepColor: "#28b1ed"
// Misc
property color recordIconColor: "#dc2719"
property color successLabelColor: "#2b5084"
property color rubberBandSelectionBlue: "steelblue"
property color screenSelectionBorderGreen: "green"
// Font.
property string faddedFontColor: "#c0c0c0"
property string faddedLastInteractionFontColor: "#505050"
property int splitViewHandlePreferredWidth: 4
property int textFontSize: 9
property int tinyFontSize: 7
property int settingsFontSize: 9
property int buttonFontSize: 9
property int headerFontSize: 13
property int titleFontSize: 16
property int menuFontSize: 12
property int maximumWidthSettingsView: 600
property int settingsHeaderpreferredHeight: 64
property int preferredFieldWidth: 256
property int preferredFieldHeight: 32
property int preferredMarginSize: 16
property int preferredDialogWidth: 400
property int preferredDialogHeight: 300
property int minimumPreviewWidth: 120
// Misc.
property color white: "white"
property color darkGrey: rgb256(63, 63, 63)
property color faddedFontColor: "#a0a0a0"
property color faddedLastInteractionFontColor: "#505050"
// Jami theme colors
function rgb256(r, g, b) {
return Qt.rgba(r / 255, g / 255, b / 255, 1.0)
}
property color wizardBlueButtons: "#28b1ed"
property color darkGrey: rgb256(63, 63, 63)
property color blueLogo_: rgb256(0, 7, 71)
property color lightGrey_: rgb256(242, 242, 242)
property color grey_: rgb256(160, 160, 160)
@ -131,4 +119,23 @@ Item {
property color presenceGreen_: rgb256(76, 217, 100)
property int fadeDuration: 150
// Sizes
property int splitViewHandlePreferredWidth: 4
property int tinyFontSize: 7
property int textFontSize: 9
property int settingsFontSize: 9
property int buttonFontSize: 9
property int menuFontSize: 12
property int headerFontSize: 13
property int titleFontSize: 16
property int maximumWidthSettingsView: 600
property int settingsHeaderpreferredHeight: 64
property int preferredFieldWidth: 256
property int preferredFieldHeight: 32
property int preferredMarginSize: 16
property int preferredDialogWidth: 400
property int preferredDialogHeight: 300
property int minimumPreviewWidth: 120
}

4
src/mainview/MainView.qml
View file

@ -239,6 +239,7 @@ Window {
height: mainViewWindowPreferredHeight
minimumWidth: minWidth
minimumHeight: minHeight
color: JamiTheme.backgroundColor
Connections {
target: CallAdapter
@ -282,7 +283,7 @@ Window {
handle: Rectangle {
implicitWidth: JamiTheme.splitViewHandlePreferredWidth
implicitHeight: splitView.height
color:"white"
color: JamiTheme.backgroundColor
Rectangle {
implicitWidth: 1
implicitHeight: splitView.height
@ -299,6 +300,7 @@ Window {
SplitView.maximumWidth: (sidePanelOnly ? splitView.width :
splitView.width - sidePanelViewStackPreferredWidth)
SplitView.fillHeight: true
color: JamiTheme.backgroundColor
// AccountComboBox is always visible
AccountComboBox {

7
src/mainview/components/AboutPopUp.qml
View file

@ -34,6 +34,7 @@ ModalPopup {
id: contentRect
implicitWidth: 400
color: JamiTheme.backgroundColor
ScrollView {
id: aboutPopUpScrollView
@ -83,6 +84,7 @@ ModalPopup {
verticalAlignment: Text.AlignVCenter
text: textMetricsjamiVersionText.text
color: JamiTheme.textColor
TextMetrics {
id: textMetricsjamiVersionText
@ -106,6 +108,7 @@ ModalPopup {
verticalAlignment: Text.AlignVCenter
text: textMetricsjamiSlogansText.text
color: JamiTheme.textColor
TextMetrics {
id: textMetricsjamiSlogansText
@ -124,6 +127,7 @@ ModalPopup {
wrapMode: Text.WordWrap
font.pointSize: JamiTheme.textFontSize
color: JamiTheme.textColor
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
@ -143,6 +147,7 @@ ModalPopup {
Layout.preferredHeight: textMetricsjamiDeclarationHyperText.boundingRect.height
Layout.topMargin: 5
Layout.bottomMargin: 5
color: JamiTheme.textColor
font.pointSize: JamiTheme.textFontSize
horizontalAlignment: Text.AlignHCenter
@ -175,6 +180,7 @@ ModalPopup {
Layout.bottomMargin: 5
font.pointSize: JamiTheme.textFontSize
color: JamiTheme.textColor
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
@ -201,6 +207,7 @@ ModalPopup {
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
color: JamiTheme.textColor
text: textMetricsjamiNoneWarrantyHyperText.text
onLinkActivated: Qt.openUrlExternally(link)

14
src/mainview/components/AccountComboBox.qml
View file

@ -20,6 +20,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
import net.jami.Models 1.0
import net.jami.Adapters 1.0
@ -89,6 +90,7 @@ ComboBox {
text: textMetricsUserAliasRoot.elidedText
font.pointSize: JamiTheme.textFontSize
color: JamiTheme.textColor
TextMetrics {
id: textMetricsUserAliasRoot
@ -110,6 +112,13 @@ ComboBox {
width: 24
height: 24
layer {
enabled: true
effect: ColorOverlay {
color: JamiTheme.textColor
}
}
source: "qrc:/images/icons/round-arrow_drop_down-24px.svg"
}
}
@ -228,6 +237,9 @@ ComboBox {
source: "qrc:/images/icons/qr_code-24px.svg"
normalColor: JamiTheme.backgroundColor
imageColor: JamiTheme.textColor
onClicked: {
if (visible)
qrDialog.open()
@ -241,6 +253,8 @@ ComboBox {
"qrc:/images/icons/round-settings-24px.svg" :
"qrc:/images/icons/round-close-24px.svg"
normalColor: JamiTheme.backgroundColor
imageColor: JamiTheme.textColor
toolTipText: !mainViewWindow.inSettingsView ?
JamiStrings.openSettings :
JamiStrings.closeSettings

16
src/mainview/components/AccountComboBoxPopup.qml
View file

@ -96,6 +96,7 @@ Popup {
text: textMetricsUserAliasPopup.elidedText
font.pointSize: JamiTheme.textFontSize
color: JamiTheme.textColor
TextMetrics {
id: textMetricsUserAliasPopup
@ -154,10 +155,19 @@ Popup {
implicitHeight: accountComboBox.height
background: Rectangle {
color: comboBoxFooterItem.hovered? JamiTheme.normalButtonColor : JamiTheme.backgroundColor
color: comboBoxFooterItem.hovered? JamiTheme.hoverColor : JamiTheme.backgroundColor
}
text: qsTr("Add Account") + "+"
contentItem: Text {
width: parent.width
height: parent.height
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
text: qsTr("Add Account") + "+"
color: JamiTheme.textColor
}
font.pointSize: JamiTheme.textFontSize
onClicked: {
@ -185,7 +195,7 @@ Popup {
layer {
enabled: true
effect: DropShadow {
color: "#80000000"
color: JamiTheme.shadowColor
verticalOffset: 2
horizontalOffset: 2
samples: 16

3
src/mainview/components/CallViewContextMenu.qml
View file

@ -70,7 +70,8 @@ Item {
"qrc:/images/icons/av_icons/fiber_manual_record-24px.svg",
function (){
CallAdapter.recordThisCallToggle()
})
},
JamiTheme.recordIconColor)
if (isAudioOnly && !isPaused)
ContextMenuGenerator.addMenuItem(

5
src/mainview/components/ContactPicker.qml
View file

@ -45,7 +45,6 @@ Popup {
contentItem: Rectangle {
id: contactPickerPopupRect
width: 250
PushButton {
@ -55,6 +54,7 @@ Popup {
anchors.topMargin: 5
anchors.right: contactPickerPopupRect.right
anchors.rightMargin: 5
imageColor: JamiTheme.textColor
source: "qrc:/images/icons/round-close-24px.svg"
@ -78,6 +78,7 @@ Popup {
font.pointSize: JamiTheme.textFontSize
font.bold: true
color: JamiTheme.textColor
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
@ -121,7 +122,7 @@ Popup {
}
radius: 10
color: "white"
color: JamiTheme.backgroundColor
}
onAboutToShow: {

6
src/mainview/components/ContactPickerItemDelegate.qml
View file

@ -66,6 +66,7 @@ ItemDelegate {
text: DisplayName
}
color: JamiTheme.textColor
text: textMetricsContactPickerContactName.elidedText
font.pointSize: JamiTheme.textFontSize
}
@ -95,7 +96,8 @@ ItemDelegate {
background: Rectangle {
id: itemSmartListBackground
color: "white"
color: JamiTheme.backgroundColor
implicitWidth: contactPickerPopupRect.width
implicitHeight: Math.max(
@ -128,7 +130,7 @@ ItemDelegate {
}
onExited: {
itemSmartListBackground.color = "white"
itemSmartListBackground.color = JamiTheme.backgroundColor
}
}
}

3
src/mainview/components/ContactSearchBar.qml
View file

@ -34,7 +34,7 @@ Rectangle {
}
radius: height / 2
color: "white"
color: JamiTheme.secondaryBackgroundColor
FocusScope {
id: fakeFocus
@ -63,6 +63,7 @@ Rectangle {
TextField {
id: contactSearchBar
color: JamiTheme.textColor
anchors.verticalCenter: contactSearchBarRect.verticalCenter
anchors.left: searchIconImage.right

7
src/mainview/components/ConversationSmartListViewItemDelegate.qml
View file

@ -59,7 +59,7 @@ ItemDelegate {
} else {
itemSmartListBackground.color = Qt.binding(function () {
return InCall ? Qt.lighter(JamiTheme.selectionBlue,
1.8) : JamiTheme.normalButtonColor
1.8) : JamiTheme.selectedColor
})
ConversationsAdapter.selectConversation(
AccountAdapter.currentAccountId, UID)
@ -127,6 +127,7 @@ ItemDelegate {
}
text: textMetricsConversationSmartListUserName.elidedText
font.pointSize: JamiTheme.menuFontSize
color: JamiTheme.textColor
}
Text {
@ -202,7 +203,7 @@ ItemDelegate {
}
onReleased: {
if (!InCall) {
itemSmartListBackground.color = JamiTheme.normalButtonColor
itemSmartListBackground.color = JamiTheme.selectionBlue
}
if (mouse.button === Qt.RightButton) {
smartListContextMenu.parent = mouseAreaSmartListItemDelegate
@ -242,7 +243,7 @@ ItemDelegate {
} else {
itemSmartListBackground.color = Qt.binding(function () {
return InCall ? Qt.lighter(JamiTheme.selectionBlue,
1.8) : JamiTheme.normalButtonColor
1.8) : JamiTheme.selectedColor
})
}
}

9
src/mainview/components/MediaHandlerItemDelegate.qml
View file

@ -48,11 +48,13 @@ ItemDelegate {
width: 30
background: Rectangle{
color: "transparent"
Image {
anchors.centerIn: parent
source: "file:" + mediaHandlerIcon
width: 30
height: 30
mipmap: true
}
}
}
@ -62,6 +64,7 @@ ItemDelegate {
Layout.leftMargin: 8
Layout.fillWidth: true
Layout.alignment: Qt.AlignVCenter
color: JamiTheme.textColor
font.pointSize: JamiTheme.settingsFontSize
font.kerning: true
@ -90,6 +93,8 @@ ItemDelegate {
background: Rectangle {
id: switchBackground
color: "transparent"
MouseArea {
id: btnMouseArea
anchors.fill: parent
@ -115,9 +120,9 @@ ItemDelegate {
Layout.alignment: Qt.AlingVCenter | Qt.AlignRight
Layout.rightMargin: 8
normalColor: JamiTheme.primaryBackgroundColor
source: "qrc:/images/icons/round-settings-24px.svg"
normalColor: JamiTheme.primaryBackgroundColor
imageColor: JamiTheme.textColor
toolTipText: qsTr(pluginId)
onClicked: openPreferences()

9
src/mainview/components/MediaHandlerPicker.qml
View file

@ -48,7 +48,7 @@ Popup {
id: mediahandlerPickerPopupRect
width: root.width
height: childrenRect.height + 50
color: "white"
color: JamiTheme.backgroundColor
radius: 10
PushButton {
@ -60,6 +60,7 @@ Popup {
anchors.rightMargin: 5
source: "qrc:/images/icons/round-close-24px.svg"
imageColor: JamiTheme.textColor
onClicked: {
root.close()
@ -85,6 +86,7 @@ Popup {
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
color: JamiTheme.textColor
text: qsTr("Choose plugin")
}
@ -137,7 +139,7 @@ Popup {
id: mediahandlerPreferencePopupRect2
width: root.width
height: childrenRect.height + 50
color: "white"
color: JamiTheme.backgroundColor
radius: 10
PushButton {
@ -147,6 +149,7 @@ Popup {
anchors.left: mediahandlerPreferencePopupRect2.left
anchors.leftMargin: 5
imageColor: JamiTheme.textColor
source: "qrc:/images/icons/ic_arrow_back_24px.svg"
toolTipText: qsTr("Go back to plugins list")
hoverEnabled: true
@ -164,6 +167,7 @@ Popup {
anchors.rightMargin: 5
source: "qrc:/images/icons/round-close-24px.svg"
imageColor: JamiTheme.textColor
onClicked: {
stack.currentIndex = 0
@ -188,6 +192,7 @@ Popup {
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
color: JamiTheme.textColor
text: qsTr("Preferences")
}

4
src/mainview/components/MessageWebView.qml
View file

@ -29,6 +29,8 @@ import "../../commoncomponents"
Rectangle {
id: messageWebViewRect
color: JamiTheme.backgroundColor
property int messageWebViewHeaderPreferredHeight: 64
property string headerUserAliasLabelText: ""
property string headerUserUserNameLabelText: ""
@ -207,6 +209,8 @@ Rectangle {
width: messageWebViewRect.width
height: messageWebViewRect.height - messageWebViewHeaderPreferredHeight
backgroundColor: JamiTheme.backgroundColor
settings.javascriptEnabled: true
settings.javascriptCanOpenWindows: true
settings.fullScreenSupportEnabled: true

14
src/mainview/components/MessageWebViewHeader.qml
View file

@ -43,6 +43,8 @@ Rectangle {
startAVideoCallButton.visible = visible
}
color: JamiTheme.secondaryBackgroundColor
RowLayout {
id: messagingHeaderRectRowLayout
@ -56,7 +58,8 @@ Rectangle {
source: backToWelcomeViewButtonSource
normalColor: JamiTheme.primaryBackgroundColor
normalColor: JamiTheme.secondaryBackgroundColor
imageColor: JamiTheme.chatviewButtonColor
onClicked: {
if (backToWelcomeViewButtonSource === "qrc:/images/icons/ic_arrow_back_24px.svg")
@ -138,7 +141,8 @@ Rectangle {
source: "qrc:/images/icons/ic_phone_24px.svg"
normalColor: JamiTheme.primaryBackgroundColor
normalColor: JamiTheme.secondaryBackgroundColor
imageColor: JamiTheme.chatviewButtonColor
onClicked: {
MessagesAdapter.sendContactRequest()
@ -158,7 +162,8 @@ Rectangle {
source: "qrc:/images/icons/videocam-24px.svg"
normalColor: JamiTheme.primaryBackgroundColor
normalColor: JamiTheme.secondaryBackgroundColor
imageColor: JamiTheme.chatviewButtonColor
onClicked: {
MessagesAdapter.sendContactRequest()
@ -177,7 +182,8 @@ Rectangle {
width: sendContactRequestButton.visible ? preferredSize : 0
source: "qrc:/images/icons/person_add-24px.svg"
normalColor: JamiTheme.primaryBackgroundColor
normalColor: JamiTheme.secondaryBackgroundColor
imageColor: JamiTheme.chatviewButtonColor
onClicked: {
MessagesAdapter.sendContactRequest()

24
src/mainview/components/RecordBox.qml
View file

@ -37,11 +37,11 @@ Rectangle {
}
id: recBox
color: "#FFFFFF"
width: 320
height: 240
radius: 5
border.color: JamiTheme.tabbarBorderColor
color: JamiTheme.backgroundColor
property string pathRecorder: ""
property string timeText: "00:00"
@ -168,7 +168,7 @@ Rectangle {
x: -offset
y: -offset
ShapePath {
fillColor: "white"
fillColor: JamiTheme.backgroundColor
strokeWidth: 1
strokeColor: JamiTheme.tabbarBorderColor
@ -216,7 +216,7 @@ Rectangle {
visible: (isVideo && previewAvailable)
Layout.alignment: Qt.AlignHCenter
anchors.fill: parent
color: "black"
color: JamiTheme.blackColor
radius: 5
PreviewRenderer{
@ -253,7 +253,7 @@ Rectangle {
id: time
visible: true
text: "00:00"
color: (isVideo ? "white" : "black")
color: (isVideo? JamiTheme.whiteColor : JamiTheme.textColor)
font.pointSize: (isVideo ? 12 : 20)
anchors.centerIn: recordButton
@ -270,10 +270,10 @@ Rectangle {
anchors.bottom: recBox.bottom
anchors.bottomMargin: 5
normalColor: isVideo? "#000000cc" : "white"
normalColor: isVideo? "transparent" : JamiTheme.backgroundColor
source: "qrc:/images/icons/av_icons/fiber_manual_record-24px.svg"
imageColor: "#dc2719"
imageColor: JamiTheme.recordIconColor
onClicked: {
updateState(RecordBox.States.RECORDING)
@ -290,10 +290,10 @@ Rectangle {
anchors.bottom: recBox.bottom
anchors.bottomMargin: 5
normalColor: isVideo? "#000000cc" : "white"
normalColor: isVideo? "transparent" : JamiTheme.backgroundColor
source: "qrc:/images/icons/av_icons/stop-24px-red.svg"
imageColor: isVideo? "white" : "black"
imageColor: isVideo? JamiTheme.whiteColor : JamiTheme.textColor
onClicked: {
stopRecording()
@ -311,10 +311,10 @@ Rectangle {
anchors.bottom: recBox.bottom
anchors.bottomMargin: 5
normalColor: isVideo? "#000000cc" : "white"
normalColor: isVideo? "transparent" : JamiTheme.backgroundColor
source: "qrc:/images/icons/av_icons/re-record-24px.svg"
imageColor: isVideo? "white" : "black"
imageColor: isVideo? JamiTheme.whiteColor : JamiTheme.textColor
onClicked: {
stopRecording()
@ -332,10 +332,10 @@ Rectangle {
anchors.bottom: parent.bottom
anchors.bottomMargin: 5
normalColor: isVideo? "#000000cc" : "white"
normalColor: isVideo? "transparent" : JamiTheme.backgroundColor
source: "qrc:/images/icons/av_icons/send-24px.svg"
imageColor: isVideo? "white" : "black"
imageColor: isVideo? JamiTheme.whiteColor : JamiTheme.textColor
onClicked: {
stopRecording()

9
src/mainview/components/SidePanel.qml
View file

@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
import net.jami.Models 1.0
import net.jami.Adapters 1.0
@ -132,6 +133,13 @@ Rectangle {
width: 24
height: 24
layer {
enabled: true
effect: ColorOverlay {
color: JamiTheme.textColor
}
}
fillMode: Image.PreserveAspectFit
mipmap: true
source: "qrc:/images/icons/ic_baseline-search-24px.svg"
@ -145,6 +153,7 @@ Rectangle {
anchors.leftMargin: 24
width: searchStatusRect.width - searchIcon.width - 24*2 - 8
text: ""
color: JamiTheme.textColor
wrapMode: Text.WordWrap
font.pointSize: JamiTheme.menuFontSize
}

6
src/mainview/components/UserProfile.qml
View file

@ -41,6 +41,8 @@ BaseDialog {
implicitWidth: 480
implicitHeight: 400
color: JamiTheme.backgroundColor
GridLayout {
id: userProfileDialogLayout
@ -75,6 +77,7 @@ BaseDialog {
font.pointSize: JamiTheme.titleFontSize
text: textMetricsContactAliasText.elidedText
color: JamiTheme.textColor
visible: aliasText ? (aliasText === idText ? false : true) : false
TextMetrics {
@ -95,6 +98,7 @@ BaseDialog {
Layout.alignment: Qt.AlignRight
font.pointSize: JamiTheme.menuFontSize
text: qsTr("Information")
color: JamiTheme.textColor
}
Item { Layout.fillWidth: true }
@ -115,6 +119,7 @@ BaseDialog {
font.pointSize: JamiTheme.textFontSize
text: textMetricsContactDisplayNameText.elidedText
color: JamiTheme.textColor
visible: registeredNameText ? (registeredNameText === idText ? false : true) : false
TextMetrics {
@ -142,6 +147,7 @@ BaseDialog {
readOnly: true
font.pointSize: JamiTheme.textFontSize
text: textMetricsContactIdText.elidedText
color: JamiTheme.textColor
TextMetrics {
id: textMetricsContactIdText

6
src/mainview/components/WelcomePage.qml
View file

@ -28,6 +28,7 @@ Rectangle {
id: welcomeRect
anchors.fill: parent
color: JamiTheme.secondaryBackgroundColor
Rectangle {
id: welcomeRectComponentsGroup
@ -36,6 +37,7 @@ Rectangle {
width: Math.max(mainViewStackPreferredWidth, welcomeRect.width - 100)
height: mainViewWindow.minimumHeight
color: JamiTheme.secondaryBackgroundColor
ColumnLayout {
id: welcomeRectComponentsGroupColumnLayout
@ -70,6 +72,7 @@ Rectangle {
verticalAlignment: Text.AlignVCenter
text: JamiStrings.description
color: JamiTheme.textColor
}
Label {
@ -98,6 +101,7 @@ Rectangle {
Layout.preferredWidth: welcomeRectComponentsGroup.width
Layout.preferredHeight: 65
Layout.bottomMargin: JamiTheme.preferredMarginSize
color: JamiTheme.secondaryBackgroundColor
visible: AccountAdapter.currentAccountType === Profile.Type.RING
@ -115,6 +119,7 @@ Rectangle {
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
text: textMetricsjamiRegisteredNameText.elidedText
color: JamiTheme.textColor
TextMetrics {
id: textMetricsjamiRegisteredNameText
font: jamiRegisteredNameText.font
@ -131,6 +136,7 @@ Rectangle {
preferredSize: 34
imagePadding: 4
imageColor: JamiTheme.textColor
source: "qrc:/images/icons/content_copy-24px.svg"

1
src/settingsview/SettingsView.qml
View file

@ -118,6 +118,7 @@ Rectangle {
id: settingsViewRect
anchors.fill: root
color: JamiTheme.secondaryBackgroundColor
signal stopPreviewing
signal stopBooth

1
src/settingsview/components/AccountProfile.qml
View file

@ -68,6 +68,7 @@ ColumnLayout {
font.pointSize: JamiTheme.headerFontSize
font.kerning: true
color: JamiTheme.textColor
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter

1
src/settingsview/components/AdvancedMediaSettings.qml
View file

@ -43,6 +43,7 @@ ColumnLayout {
Layout.preferredHeight: JamiTheme.preferredFieldHeight
text: JamiStrings.media
color: JamiTheme.textColor
font.pointSize: JamiTheme.headerFontSize
font.kerning: true

1
src/settingsview/components/AdvancedNameServerSettings.qml
View file

@ -48,6 +48,7 @@ ColumnLayout {
verticalAlignment: Text.AlignVCenter
text: qsTr("Name Server")
color: JamiTheme.textColor
elide: Text.ElideRight
}

2
src/settingsview/components/AdvancedOpenDHTSettings.qml
View file

@ -50,7 +50,7 @@ ColumnLayout {
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
color: JamiTheme.textColor
text: JamiStrings.openDHTConfig
elide: Text.ElideRight
}

1
src/settingsview/components/AdvancedPublicAddressSettings.qml
View file

@ -50,6 +50,7 @@ ColumnLayout {
verticalAlignment: Text.AlignVCenter
text: JamiStrings.publicAddress
color: JamiTheme.textColor
elide: Text.ElideRight
}

2
src/settingsview/components/AdvancedSettings.qml
View file

@ -63,6 +63,7 @@ ColumnLayout {
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
color: JamiTheme.textColor
text: qsTr("Advanced Account Settings")
elide: Text.ElideRight
@ -73,6 +74,7 @@ ColumnLayout {
Layout.preferredHeight: JamiTheme.preferredFieldHeight
Layout.alignment: Qt.AlignHCenter
imageColor: JamiTheme.textColor
toolTipText: JamiStrings.tipAdvancedSettingsDisplay
preferredSize: 32

2
src/settingsview/components/AvSettingPage.qml
View file

@ -45,6 +45,8 @@ Rectangle {
videoSettings.populateVideoSettings()
}
color: JamiTheme.secondaryBackgroundColor
ColumnLayout {
id: avSettingsColumnLayout

1
src/settingsview/components/BannedContacts.qml
View file

@ -99,6 +99,7 @@ ColumnLayout {
Layout.preferredHeight: JamiTheme.preferredFieldHeight
toolTipText: JamiStrings.tipBannedContacts
imageColor: JamiTheme.textColor
source: bannedListWidget.visible?
"qrc:/images/icons/expand_less-24px.svg" :

7
src/settingsview/components/BannedItemDelegate.qml
View file

@ -35,6 +35,9 @@ ItemDelegate {
signal btnReAddContactClicked
highlighted: ListView.isCurrentItem
background: Rectangle {
color: highlighted? JamiTheme.selectedColor : JamiTheme.editBackgroundColor
}
onContactIDChanged: avatarImg.updateImage(contactID)
@ -97,6 +100,7 @@ ItemDelegate {
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
text: contactName === "" ? JamiStrings.name : contactName
color: JamiTheme.textColor
}
Label{
@ -115,6 +119,7 @@ ItemDelegate {
verticalAlignment: Qt.AlignVCenter
elide: Text.ElideRight
text: contactID === "" ? JamiStrings.identifier : contactID
color: JamiTheme.textColor
}
}
@ -127,6 +132,8 @@ ItemDelegate {
Layout.preferredHeight: JamiTheme.preferredFieldHeight
source: "qrc:/images/icons/person_add-24px.svg"
imageColor: JamiTheme.textColor
normalColor: highlighted? JamiTheme.selectedColor : JamiTheme.editBackgroundColor
toolTipText: JamiStrings.reinstateContact

2
src/settingsview/components/CurrentAccountSettings.qml
View file

@ -105,6 +105,8 @@ Rectangle {
JamiStrings.setPassword
}
color: JamiTheme.secondaryBackgroundColor
SimpleMessageDialog {
id: msgDialog

13
src/settingsview/components/DeviceItemDelegate.qml
View file

@ -61,6 +61,9 @@ ItemDelegate {
}
}
background: Rectangle {
color: highlighted? JamiTheme.selectedColor : JamiTheme.editBackgroundColor
}
highlighted: ListView.isCurrentItem
RowLayout {
@ -70,6 +73,12 @@ ItemDelegate {
id: deviceImage
Layout.leftMargin: JamiTheme.preferredMarginSize
Layout.alignment: Qt.AlignVCenter
layer {
enabled: true
effect: ColorOverlay {
color: JamiTheme.textColor
}
}
Layout.preferredWidth: 24
Layout.preferredHeight: 24
@ -92,7 +101,7 @@ ItemDelegate {
wrapMode: Text.NoWrap
readOnly: !editable
backgroundColor: "white"
backgroundColor: JamiTheme.editBackgroundColor
text: elidedTextDeviceName.elidedText
}
@ -122,6 +131,8 @@ ItemDelegate {
Layout.rightMargin: 16
Layout.preferredWidth: JamiTheme.preferredFieldHeight
Layout.preferredHeight: JamiTheme.preferredFieldHeight
imageColor: JamiTheme.textColor
normalColor: highlighted? JamiTheme.selectedColor : JamiTheme.editBackgroundColor
source: {
if(isCurrent) {

2
src/settingsview/components/GeneralSettingsPage.qml
View file

@ -35,6 +35,8 @@ Rectangle {
property int contentWidth: generalSettingsColumnLayout.width
property int preferredHeight: generalSettingsColumnLayout.implicitHeight
color: JamiTheme.secondaryBackgroundColor
ColumnLayout {
id: generalSettingsColumnLayout

3
src/settingsview/components/JamiUserIdentity.qml
View file

@ -68,6 +68,7 @@ ColumnLayout {
anchors.verticalCenter: parent.verticalCenter
text: JamiStrings.identifier
color: JamiTheme.textColor
font.pointSize: JamiTheme.settingsFontSize
font.kerning: true
@ -94,6 +95,7 @@ ColumnLayout {
selectByMouse: true
text: currentRingIDText.elidedText
color: JamiTheme.textColor
horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter
@ -131,6 +133,7 @@ ColumnLayout {
anchors.verticalCenter: parent.verticalCenter
text: JamiStrings.username
color: JamiTheme.textColor
font.pointSize: JamiTheme.settingsFontSize
font.kerning: true

5
src/settingsview/components/KeyBoardShortcutKey.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import net.jami.Models 1.0
Item {
property alias text: shortcutText.text
@ -7,7 +8,7 @@ Item {
id: keyRect
width: t_metrics.tightBoundingRect.width + 10
height: t_metrics.tightBoundingRect.height + 10
color: "#525252"
color: JamiTheme.buttonTintedGrey
radius: 5
anchors.centerIn: parent
Text {
@ -16,7 +17,7 @@ Item {
anchors.leftMargin: 10
font.family: "Arial"
font.pointSize: 12
color: "white"
color: JamiTheme.whiteColor
}
TextMetrics {
id: t_metrics

99
src/settingsview/components/KeyBoardShortcutTable.qml
View file

@ -37,6 +37,7 @@ BaseDialog {
implicitWidth: 800
implicitHeight: 600
color: JamiTheme.backgroundColor
ListModel {
id: keyboardGeneralShortcutsModel
@ -160,8 +161,8 @@ BaseDialog {
implicitHeight: 50
anchors.left: parent.left
anchors.leftMargin: 20
color: "white"
border.color: "white"
color: JamiTheme.backgroundColor
border.color: JamiTheme.backgroundColor
Rectangle {
id: containerRectWithThreeKeys
@ -171,6 +172,7 @@ BaseDialog {
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
color: JamiTheme.backgroundColor
Component.onCompleted: {
var componentKeyOne = Qt.createComponent("KeyBoardShortcutKey.qml")
@ -187,7 +189,7 @@ BaseDialog {
'anchors.verticalCenterOffset: -2;' +
'anchors.left: containerRectWithThreeKeys.left;' +
'anchors.leftMargin: 30;' +
'color: "#525252";' +
'color: "' + JamiTheme.textColor + '";' +
'font.bold: true;' +
'font.pointSize : 12;' +
'text: "+"}',
@ -209,7 +211,7 @@ BaseDialog {
'anchors.verticalCenterOffset: -2;' +
'anchors.left: containerRectWithThreeKeys.left;' +
'anchors.leftMargin: 97;' +
'color: "#525252";' +
'color: "' + JamiTheme.textColor + '";' +
'font.bold: true;' +
'font.pointSize : 12;' +
'text: "+"}',
@ -234,8 +236,8 @@ BaseDialog {
implicitWidth: root.width / 2
implicitHeight: 50
color: "white"
border.color: "white"
color: JamiTheme.backgroundColor
border.color: JamiTheme.backgroundColor
Text {
id : descriptionText
anchors.verticalCenter: parent.verticalCenter
@ -244,6 +246,7 @@ BaseDialog {
font.family: "Arial"
font.pointSize: JamiTheme.textFontSize
text: styleData.value
color: JamiTheme.textColor
}
}
}
@ -275,6 +278,7 @@ BaseDialog {
id: generalTableView
anchors.fill: parent
horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
frameVisible: false
TableViewColumn {
role: "Description"
width: generalTableView.width / 2
@ -294,20 +298,16 @@ BaseDialog {
model: keyboardGeneralShortcutsModel
rowDelegate: Rectangle {
height: 50
color: "white"
color: JamiTheme.backgroundColor
}
style: TableViewStyle {
alternateBackgroundColor: "white"
frame: Rectangle {
border{
color: "transparent" // color of the border
}
}
backgroundColor: JamiTheme.backgroundColor
alternateBackgroundColor: JamiTheme.backgroundColor
headerDelegate: Rectangle {
// Only first column's header is shown
height: [t_metrics_general.tightBoundingRect.height + 10, 0][styleData.column % 2]
width: [parent.width, 0][styleData.column % 2]
color: "white"
color: JamiTheme.backgroundColor
radius: 4
anchors.top: parent.top
anchors.topMargin: 5
@ -319,7 +319,7 @@ BaseDialog {
font.family: "Arial"
font.pointSize: JamiTheme.headerFontSize
text: styleData.column % 2 ? "" : "General"
color: "black"
color: JamiTheme.textColor
}
TextMetrics {
id: t_metrics_general
@ -334,11 +334,11 @@ BaseDialog {
implicitWidth: parent.width / 2
implicitHeight: parent.height
anchors.right: parent.right
TableView {
id: conversationsTableView
anchors.fill: parent
horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
frameVisible: false
TableViewColumn {
role: "Description"
width: conversationsTableView.width / 2
@ -358,20 +358,16 @@ BaseDialog {
model: keyboardConversationShortcutsModel
rowDelegate: Rectangle {
height: 50
color: "white"
color: JamiTheme.backgroundColor
}
style: TableViewStyle {
alternateBackgroundColor: "white"
frame: Rectangle {
border{
color: "transparent" // color of the border
}
}
backgroundColor: JamiTheme.backgroundColor
alternateBackgroundColor: JamiTheme.backgroundColor
headerDelegate: Rectangle {
// Only first column's header is shown
height: [t_metrics_conversations.tightBoundingRect.height + 10, 0][styleData.column % 2]
width: [parent.width, 0][styleData.column % 2]
color: "white"
color: JamiTheme.backgroundColor
radius: 4
anchors.top: parent.top
anchors.topMargin: 5
@ -383,7 +379,7 @@ BaseDialog {
font.family: "Arial"
font.pointSize: JamiTheme.headerFontSize
text: styleData.column % 2 ? "" : JamiStrings.conversations
color: "black"
color: JamiTheme.textColor
}
TextMetrics {
id: t_metrics_conversations
@ -405,6 +401,7 @@ BaseDialog {
id: callsTableView
anchors.fill: parent
horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
frameVisible: false
TableViewColumn {
role: "Description"
width: callsTableView.width / 2
@ -424,20 +421,16 @@ BaseDialog {
model: keyboardCallsShortcutsModel
rowDelegate: Rectangle {
height: 50
color: "white"
color: JamiTheme.backgroundColor
}
style: TableViewStyle {
alternateBackgroundColor: "white"
frame: Rectangle {
border{
color: "transparent" // color of the border
}
}
backgroundColor: JamiTheme.backgroundColor
alternateBackgroundColor: JamiTheme.backgroundColor
headerDelegate: Rectangle {
// Only first column's header is shown
height: [t_metrics_calls.tightBoundingRect.height + 10, 0][styleData.column % 2]
width: [parent.width, 0][styleData.column % 2]
color: "white"
color: JamiTheme.backgroundColor
radius: 4
anchors.top: parent.top
anchors.topMargin: 5
@ -449,7 +442,7 @@ BaseDialog {
font.family: "Arial"
font.pointSize: 12
text: styleData.column % 2 ? "" : "Calls"
color: "black"
color: JamiTheme.textColor
}
// make sure that calls and settings header are parallel
TextMetrics {
@ -469,6 +462,7 @@ BaseDialog {
id: settingsTableView
anchors.fill: parent
horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
frameVisible: false
TableViewColumn {
role: "Description"
width: settingsTableView.width / 2
@ -488,20 +482,16 @@ BaseDialog {
model: keyboardSettingsShortcutsModel
rowDelegate: Rectangle {
height: 50
color: "white"
color: JamiTheme.backgroundColor
}
style: TableViewStyle {
alternateBackgroundColor: "white"
frame: Rectangle {
border{
color: "transparent" // color of the border
}
}
backgroundColor: JamiTheme.backgroundColor
alternateBackgroundColor: JamiTheme.backgroundColor
headerDelegate: Rectangle {
// Only first column's header is shown
height: [t_metrics_settings.tightBoundingRect.height + 10, 0][styleData.column % 2]
width: [parent.width, 0][styleData.column % 2]
color: "white"
color: JamiTheme.backgroundColor
radius: 4
anchors.top: parent.top
anchors.topMargin: 5
@ -513,7 +503,7 @@ BaseDialog {
font.family: "Arial"
font.pointSize: 12
text: styleData.column % 2 ? "" : "Settings"
color: "black"
color: JamiTheme.textColor
}
TextMetrics {
id: t_metrics_settings
@ -537,6 +527,7 @@ BaseDialog {
width: JamiTheme.preferredFieldWidth * 2
height: JamiTheme.preferredFieldHeight
background: Rectangle { color: "transparent" }
currentIndex: 0
TabButton {
@ -552,6 +543,7 @@ BaseDialog {
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
color: JamiTheme.textColor
}
// customize tab button
background: Rectangle {
@ -559,14 +551,14 @@ BaseDialog {
implicitWidth: JamiTheme.preferredFieldWidth
implicitHeight: JamiTheme.preferredFieldHeight
radius: 4
color: pageOne.down ? "#e0e0e0" :"#fdfdfd"
color: pageOne.down ? JamiTheme.selectedColor : "transparent"
MouseArea {
anchors.fill: parent
hoverEnabled: true
onPressed: { buttonRectOne.color = "#c0c0c0"; tabBar.currentIndex = 0; pageOne.down = true; pageTwo.down = false;}
onReleased: { buttonRectOne.color = "#e0e0e0"; }
onEntered: { buttonRectOne.color = "#c7c7c7"; }
onExited: { buttonRectOne.color = Qt.binding(function() { return pageOne.down ? "#e0e0e0" :"#fdfdfd" }); }
onPressed: { buttonRectOne.color = JamiTheme.pressColor; tabBar.currentIndex = 0; pageOne.down = true; pageTwo.down = false;}
onReleased: { buttonRectOne.color = JamiTheme.selectedColor; }
onEntered: { buttonRectOne.color = JamiTheme.hoverColor; }
onExited: { buttonRectOne.color = Qt.binding(function() { return pageOne.down ? JamiTheme.selectedColor : "transparent" }); }
}
}
}
@ -581,6 +573,7 @@ BaseDialog {
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
color: JamiTheme.textColor
}
background: Rectangle {
@ -589,14 +582,14 @@ BaseDialog {
implicitHeight: JamiTheme.preferredFieldHeight
radius: 4
color: pageTwo.down ? "#e0e0e0" :"#fdfdfd"
color: pageTwo.down ? JamiTheme.selectedColor : "transparent"
MouseArea {
anchors.fill: parent
hoverEnabled: true
onPressed: { buttonRectTwo.color = "#c0c0c0"; tabBar.currentIndex = 1; pageTwo.down = true; pageOne.down = false;}
onReleased: { buttonRectTwo.color = "#e0e0e0"; }
onEntered: { buttonRectTwo.color = "#c7c7c7"; }
onExited: { buttonRectTwo.color = Qt.binding(function() { return pageTwo.down ? "#e0e0e0" :"#fdfdfd" }); }
onPressed: { buttonRectTwo.color = JamiTheme.pressColor; tabBar.currentIndex = 1; pageTwo.down = true; pageOne.down = false;}
onReleased: { buttonRectTwo.color = JamiTheme.selectedColor; }
onEntered: { buttonRectTwo.color = JamiTheme.hoverColor; }
onExited: { buttonRectTwo.color = Qt.binding(function() { return pageTwo.down ? JamiTheme.selectedColor : "transparent" }); }
}
}
}

15
src/settingsview/components/LinkDeviceDialog.qml
View file

@ -130,6 +130,7 @@ BaseDialog {
contentItem: Rectangle {
id: linkDeviceContentRect
color: JamiTheme.secondaryBackgroundColor
implicitWidth: JamiTheme.preferredDialogWidth
implicitHeight: JamiTheme.preferredDialogHeight
@ -143,6 +144,7 @@ BaseDialog {
Rectangle {
Layout.fillWidth: true
Layout.fillHeight: true
color: JamiTheme.secondaryBackgroundColor
ColumnLayout {
anchors.centerIn: parent
@ -151,6 +153,7 @@ BaseDialog {
Label {
Layout.alignment: Qt.AlignHCenter
text: JamiStrings.enterAccountPassword
color: JamiTheme.textColor
font.pointSize: JamiTheme.textFontSize
font.kerning: true
horizontalAlignment: Text.AlignHCenter
@ -229,6 +232,7 @@ BaseDialog {
Rectangle {
Layout.fillWidth: true
Layout.fillHeight: true
color: JamiTheme.secondaryBackgroundColor
ColumnLayout {
anchors.centerIn: parent
@ -237,6 +241,7 @@ BaseDialog {
Label {
Layout.alignment: Qt.AlignCenter
text: JamiStrings.backupAccount
color: JamiTheme.textColor
font.pointSize: JamiTheme.headerFontSize
font.kerning: true
horizontalAlignment: Text.AlignLeft
@ -252,6 +257,7 @@ BaseDialog {
Layout.preferredHeight: 96
background: Rectangle {
color: "transparent"
AnimatedImage {
id: spinnerMovie
anchors.fill: parent
@ -270,6 +276,7 @@ BaseDialog {
Rectangle {
Layout.fillWidth: true
Layout.fillHeight: true
color: "transparent"
ColumnLayout {
anchors.centerIn: parent
@ -286,6 +293,7 @@ BaseDialog {
Layout.alignment: Qt.AlignHCenter
text: qsTr("Your PIN is:")
color: JamiTheme.textColor
font.pointSize: JamiTheme.headerFontSize
font.kerning: true
horizontalAlignment: Text.AlignHCenter
@ -296,6 +304,7 @@ BaseDialog {
id: exportedPIN
Layout.alignment: Qt.AlignHCenter
text: qsTr("PIN")
color: JamiTheme.textColor
font.pointSize: JamiTheme.headerFontSize
font.kerning: true
horizontalAlignment: Text.AlignHCenter
@ -311,7 +320,7 @@ BaseDialog {
property int borderRadius : success? 15 : 0
property string backgroundColor : success? "whitesmoke" : "transparent"
property string borderColor : success? "lightgray" : "transparent"
color: success ? "#2b5084" : "black"
color: success ? JamiTheme.successLabelColor: JamiTheme.textColor
padding: success ? 8 : 0
wrapMode: Text.Wrap
@ -325,13 +334,13 @@ BaseDialog {
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
background: Rectangle{
background: Rectangle {
id: infoLabelBackground
anchors.fill: parent
border.width: infoLabel.borderWidth
border.color: infoLabel.borderColor
radius: infoLabel.borderRadius
color: infoLabel.backgroundColor
color: JamiTheme.secondaryBackgroundColor
}
}

1
src/settingsview/components/LinkedDevices.qml
View file

@ -106,6 +106,7 @@ ColumnLayout {
Layout.preferredHeight: JamiTheme.preferredFieldHeight
text: qsTr("Linked Devices")
color: JamiTheme.textColor
font.pointSize: JamiTheme.headerFontSize
font.kerning: true

10
src/settingsview/components/MediaCodecDelegate.qml
View file

@ -37,6 +37,9 @@ ItemDelegate {
signal mediaCodecStateChange(string idToSet , bool isToBeEnabled)
highlighted: ListView.isCurrentItem
background: Rectangle {
color: highlighted? JamiTheme.selectedColor : JamiTheme.editBackgroundColor
}
RowLayout {
anchors.fill: parent
@ -55,6 +58,12 @@ ItemDelegate {
text: ""
indicator: Image {
anchors.centerIn: parent
layer {
enabled: true
effect: ColorOverlay {
color: JamiTheme.textColor
}
}
width: checkBoxWidth
height: checkBoxWidth
source: checkBoxIsEnabled.checked ?
@ -92,6 +101,7 @@ ItemDelegate {
else if (mediaType == MediaSettings.AUDIO)
return mediaCodecName + " " + samplerRate + " Hz"
}
color: JamiTheme.textColor
elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter

2
src/settingsview/components/MediaSettings.qml
View file

@ -98,11 +98,13 @@ ColumnLayout {
PushButton {
source: "qrc:/images/icons/arrow_drop_down-24px.svg"
imageColor: JamiTheme.textColor
onClicked: decreaseCodecPriority()
}
PushButton {
source: "qrc:/images/icons/arrow_drop_up-24px.svg"
imageColor: JamiTheme.textColor
onClicked: increaseCodecPriority()
}
}

5
src/settingsview/components/PluginItemDelegate.qml
View file

@ -47,6 +47,7 @@ ItemDelegate {
width: 30
background: Rectangle {
color: "transparent"
Image {
anchors.centerIn: parent
source: "file:" + pluginIcon
@ -62,6 +63,7 @@ ItemDelegate {
id: labelDeviceId
Layout.fillWidth: true
Layout.leftMargin: 8
color: JamiTheme.textColor
font.pointSize: JamiTheme.settingsFontSize
font.kerning: true
@ -82,6 +84,8 @@ ItemDelegate {
background: Rectangle {
id: switchBackground
color: "transparent"
MouseArea {
id: btnMouseArea
hoverEnabled: true
@ -106,6 +110,7 @@ ItemDelegate {
source: "qrc:/images/icons/round-settings-24px.svg"
normalColor: JamiTheme.primaryBackgroundColor
imageColor: JamiTheme.textColor
toolTipText: JamiStrings.showHidePrefs
onClicked: btnPreferencesPluginClicked()

4
src/settingsview/components/PluginListPreferencesView.qml
View file

@ -41,6 +41,7 @@ Rectangle {
property bool isLoaded: false
visible: false
color: "transparent"
signal uninstalled
@ -124,6 +125,7 @@ Rectangle {
text: qsTr(pluginName + "\npreferences")
font.pointSize: JamiTheme.headerFontSize
font.kerning: true
color: JamiTheme.textColor
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
@ -208,7 +210,7 @@ Rectangle {
background: Rectangle {
anchors.fill: parent
color: "white"
color: JamiTheme.secondaryBackgroundColor
}
}
}

4
src/settingsview/components/PluginListSettingsView.qml
View file

@ -41,6 +41,7 @@ Rectangle {
}
visible: false
color: JamiTheme.secondaryBackgroundColor
function openPluginFileSlot() {
pluginPathDialog.open()
@ -104,6 +105,7 @@ Rectangle {
text: qsTr("Installed plugins")
font.pointSize: JamiTheme.headerFontSize
font.kerning: true
color: JamiTheme.textColor
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
@ -160,7 +162,7 @@ Rectangle {
background: Rectangle {
anchors.fill: parent
color: "white"
color: JamiTheme.secondaryBackgroundColor
}
}
}

2
src/settingsview/components/PluginSettingsPage.qml
View file

@ -41,6 +41,8 @@ Rectangle {
PluginModel.setPluginsEnabled(state)
}
color: JamiTheme.secondaryBackgroundColor
ColumnLayout {
id: pluginSettingsColumnLayout

3
src/settingsview/components/RecordingSettings.qml
View file

@ -107,6 +107,7 @@ ColumnLayout {
Layout.fillWidth: true
Layout.rightMargin: JamiTheme.preferredMarginSize / 2
color: JamiTheme.textColor
text: qsTr("Quality")
font.pointSize: JamiTheme.settingsFontSize
font.kerning: true
@ -123,6 +124,7 @@ ColumnLayout {
Layout.fillWidth: true
Layout.rightMargin: JamiTheme.preferredMarginSize / 2
color: JamiTheme.textColor
text: UtilsAdapter.getRecordQualityString(AVModel.getRecordQuality() / 100)
font.pointSize: JamiTheme.settingsFontSize
@ -163,6 +165,7 @@ ColumnLayout {
Layout.fillHeight: true
text: qsTr("Save in")
color: JamiTheme.textColor
font.pointSize: JamiTheme.settingsFontSize
font.kerning: true

1
src/settingsview/components/SettingMaterialButton.qml
View file

@ -58,6 +58,7 @@ RowLayout {
verticalAlignment: Text.AlignVCenter
text: root.titleField
color: JamiTheme.textColor
elide: Text.ElideRight
}

31
src/settingsview/components/SettingSpinBox.qml
View file

@ -32,6 +32,7 @@ import "../../constant"
RowLayout {
id: root
property string borderColor: JamiTheme.greyBorderColor
property string title: ""
property int itemWidth
property int bottomValue
@ -42,12 +43,12 @@ RowLayout {
signal newValue
function setEnabled(status) {
spinBox.enabled = status
textField.enabled = status
}
function setValue(value) {
root.valueField = value
spinBox.value = value
textField.text = value
}
Text {
@ -55,15 +56,15 @@ RowLayout {
Layout.rightMargin: JamiTheme.preferredMarginSize
Layout.preferredHeight: JamiTheme.preferredFieldHeight
text: root.title
color: JamiTheme.textColor
elide: Text.ElideRight
font.pointSize: JamiTheme.settingsFontSize
font.kerning: true
verticalAlignment: Text.AlignVCenter
}
// TODO: use TextField
SpinBox {
id: spinBox
TextField {
id: textField
Layout.preferredWidth: root.itemWidth
Layout.preferredHeight: JamiTheme.preferredFieldHeight
@ -73,20 +74,18 @@ RowLayout {
font.pointSize: JamiTheme.buttonFontSize
font.kerning: true
from: root.bottomValue
to: root.topValue
validator: IntValidator {bottom: root.bottomValue; top: root.topValue}
editable: true
up.indicator.width: 0
down.indicator.width: 0
textFromValue: function(value, locale) {
return Number(value)
onEditingFinished: {
root.valueField = text
newValue()
}
onValueModified: {
root.valueField = value
newValue()
color: JamiTheme.textColor
background: Rectangle {
border.color: enabled? root.borderColor : "transparent"
color: JamiTheme.editBackgroundColor
}
}
}

1
src/settingsview/components/SettingsHeader.qml
View file

@ -59,6 +59,7 @@ RowLayout {
text: root.title
font.pointSize: JamiTheme.titleFontSize
font.kerning: true
color: JamiTheme.textColor
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter

1
src/settingsview/components/SettingsMaterialLineEdit.qml
View file

@ -60,6 +60,7 @@ RowLayout {
verticalAlignment: Text.AlignVCenter
text: titleField
color: JamiTheme.textColor
elide: Text.ElideRight
}

3
src/settingsview/components/SettingsMenu.qml
View file

@ -72,8 +72,9 @@ Rectangle {
buttonText: name
source: iconSource
imageColor: JamiTheme.textColor
pressedColor: Qt.lighter(JamiTheme.pressedButtonColor, 1.25)
checkedColor: JamiTheme.normalButtonColor
checkedColor: JamiTheme.selectedColor
hoveredColor: JamiTheme.hoverColor
fontPointSize: JamiTheme.textFontSize + 2
duration: 0

2
src/settingsview/components/SystemSettings.qml
View file

@ -56,6 +56,7 @@ ColumnLayout {
Layout.fillWidth: true
text: qsTr("System")
color: JamiTheme.textColor
font.pointSize: JamiTheme.headerFontSize
font.kerning: true
@ -114,6 +115,7 @@ ColumnLayout {
Layout.fillWidth: true
Layout.fillHeight: true
color: JamiTheme.textColor
text: JamiStrings.downloadFolder
font.pointSize: JamiTheme.settingsFontSize
font.kerning: true

2
src/settingsview/components/ToggleSwitch.qml
View file

@ -52,6 +52,8 @@ RowLayout {
elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
color: JamiTheme.textColor
}
Switch {

2
src/settingsview/components/UpdateSettings.qml
View file

@ -236,7 +236,7 @@ ColumnLayout {
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
color: JamiTheme.white
color: JamiTheme.whiteColor
font.bold: true
font.pointSize: JamiTheme.textFontSize + 1
horizontalAlignment: Text.AlignHCenter

5
src/wizardview/components/BackupKeyPage.qml
View file

@ -80,6 +80,7 @@ Rectangle {
Label {
text: JamiStrings.backupAccount
color: JamiTheme.textColor
font.pointSize: JamiTheme.textFontSize + 3
}
@ -91,7 +92,7 @@ Rectangle {
padding: 8
background: Rectangle {
color: "#aed581"
color: JamiTheme.wizardGreenColor
radius: 24
anchors.fill: parent
}
@ -106,6 +107,7 @@ Rectangle {
Layout.preferredHeight: preferredHeight
text: JamiStrings.backupAccountInfos
color: JamiTheme.textColor
wrapMode: Text.WordWrap
font.pointSize: JamiTheme.textFontSize
@ -123,6 +125,7 @@ Rectangle {
Label {
text: JamiStrings.neverShowAgain
color: JamiTheme.textColor
font.pointSize: JamiTheme.textFontSize
}

7
src/wizardview/components/ConnectToAccountManagerPage.qml
View file

@ -76,6 +76,7 @@ Rectangle {
Label {
text: JamiStrings.enterJAMSURL
color: JamiTheme.textColor
font.pointSize: JamiTheme.textFontSize + 3
}
@ -83,11 +84,11 @@ Rectangle {
Layout.alignment: Qt.AlignRight
text: JamiStrings.required
color: "#ff1f62"
color: JamiTheme.requiredFieldColor
padding: 8
background: Rectangle {
color: "#fee4e9"
color: JamiTheme.requiredFieldBackgroundColor
radius: 24
anchors.fill: parent
}
@ -116,6 +117,7 @@ Rectangle {
Layout.preferredWidth: connectBtn.width
text: JamiStrings.jamsCredentials
color: JamiTheme.textColor
wrapMode: Text.Wrap
onTextChanged: Layout.preferredHeight =
@ -204,6 +206,7 @@ Rectangle {
height: 35
normalColor: root.color
imageColor: JamiTheme.primaryForegroundColor
source: "qrc:/images/icons/ic_arrow_back_24px.svg"
toolTipText: JamiStrings.backToWelcome

10
src/wizardview/components/CreateAccountPage.qml
View file

@ -124,6 +124,7 @@ Rectangle {
Label {
text: isRendezVous ? JamiStrings.chooseNameRV : qsTr("Choose a username for your account")
color: JamiTheme.textColor
font.pointSize: JamiTheme.textFontSize + 3
}
@ -131,11 +132,11 @@ Rectangle {
Layout.alignment: Qt.AlignRight
text: JamiStrings.recommended
color: "white"
color: JamiTheme.whiteColor
padding: 8
background: Rectangle {
color: "#aed581"
color: JamiTheme.wizardGreenColor
radius: 24
anchors.fill: parent
}
@ -249,6 +250,7 @@ Rectangle {
Label {
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
text: JamiStrings.createPassword
color: JamiTheme.textColor
font.pointSize: JamiTheme.textFontSize + 3
}
@ -268,7 +270,7 @@ Rectangle {
padding: 8
background: Rectangle {
color: "#28b1ed"
color: JamiTheme.wizardBlueButtons
radius: 24
anchors.fill: parent
}
@ -313,6 +315,7 @@ Rectangle {
Layout.leftMargin: (root.width - createAccountButton.width) / 2
text: JamiStrings.notePasswordRecovery
color: JamiTheme.textColor
wrapMode: Text.WordWrap
font.pointSize: JamiTheme.textFontSize
@ -371,6 +374,7 @@ Rectangle {
height: 35
normalColor: root.color
imageColor: JamiTheme.primaryForegroundColor
source: "qrc:/images/icons/ic_arrow_back_24px.svg"
toolTipText: JamiStrings.back

6
src/wizardview/components/CreateSIPAccountPage.qml
View file

@ -70,6 +70,7 @@ Rectangle {
Label {
text: JamiStrings.configureExistingSIP
color: JamiTheme.textColor
font.pointSize: JamiTheme.textFontSize + 3
}
@ -77,11 +78,11 @@ Rectangle {
Layout.alignment: Qt.AlignRight
text: JamiStrings.optional
color: "white"
color: JamiTheme.whiteColor
padding: 8
background: Rectangle {
color: "#28b1ed"
color: JamiTheme.wizardBlueButtons
radius: 24
anchors.fill: parent
}
@ -171,6 +172,7 @@ Rectangle {
height: 35
normalColor: root.color
imageColor: JamiTheme.primaryForegroundColor
source: "qrc:/images/icons/ic_arrow_back_24px.svg"
toolTipText: JamiStrings.backToWelcome

3
src/wizardview/components/ImportFromBackupPage.qml
View file

@ -85,6 +85,7 @@ Rectangle {
Layout.topMargin: backButtonMargins
text: qsTr("Import from backup")
color: JamiTheme.textColor
font.pointSize: JamiTheme.menuFontSize
}
@ -118,6 +119,7 @@ Rectangle {
Layout.preferredHeight: preferredHeight
text: JamiStrings.importAccountExplanation
color: JamiTheme.textColor
wrapMode: Text.Wrap
onTextChanged: {
@ -195,6 +197,7 @@ Rectangle {
height: 35
normalColor: root.color
imageColor: JamiTheme.primaryForegroundColor
source: "qrc:/images/icons/ic_arrow_back_24px.svg"
toolTipText: qsTr("Back to welcome page")

3
src/wizardview/components/ImportFromDevicePage.qml
View file

@ -70,6 +70,7 @@ Rectangle {
Layout.topMargin: backButtonMargins
text: JamiStrings.mainAccountPassword
color: JamiTheme.textColor
font.pointSize: JamiTheme.menuFontSize
}
@ -99,6 +100,7 @@ Rectangle {
Layout.preferredHeight: preferredHeight
text: JamiStrings.enterPIN
color: JamiTheme.textColor
wrapMode: Text.Wrap
onTextChanged: {
@ -170,6 +172,7 @@ Rectangle {
height: 35
normalColor: root.color
imageColor: JamiTheme.primaryForegroundColor
source: "qrc:/images/icons/ic_arrow_back_24px.svg"
toolTipText: qsTr("Back to welcome page")

5
src/wizardview/components/ProfilePage.qml
View file

@ -75,6 +75,7 @@ Rectangle {
Label {
text: qsTr("Profile is only shared with contacts")
color: JamiTheme.textColor
font.pointSize: JamiTheme.textFontSize + 3
}
@ -82,11 +83,11 @@ Rectangle {
Layout.alignment: Qt.AlignRight
text: qsTr("Optional")
color: "white"
color: JamiTheme.whiteColor
padding: 8
background: Rectangle {
color: "#28b1ed"
color: JamiTheme.wizardBlueButtons
radius: 24
anchors.fill: parent
}

4
src/wizardview/components/WelcomePage.qml
View file

@ -36,7 +36,7 @@ Rectangle {
signal leavePage
signal scrollToBottom
color: JamiTheme.backgroundColor
color: "transparent"
ColumnLayout {
id: welcomePageColumnLayout
@ -53,6 +53,7 @@ Rectangle {
Layout.preferredHeight: contentHeight
text: qsTr("Welcome to")
color: JamiTheme.textColor
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
@ -250,6 +251,7 @@ Rectangle {
visible: UtilsAdapter.getAccountListSize()
normalColor: root.color
imageColor: JamiTheme.primaryForegroundColor
source: "qrc:/images/icons/ic_arrow_back_24px.svg"
toolTipText: JamiStrings.back