mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-19 20:48:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(SettingsWindow): rename icon property of TabButton to iconName (issue with Qt 5.10 and new icon property)

Browse source
This commit is contained in:
Ronan Abhamon 2018-01-19 14:42:01 +01:00
parent ffa24e1ea4
commit ecaab0f73d
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ui/modules/Common/Form/Tab/TabButton.qml
View file

@ -12,8 +12,8 @@ Controls.TabButton {
// ---------------------------------------------------------------------------
property string icon
property int iconSize: TabButtonStyle.icon.size
property string iconName
readonly property bool _isSelected: parent.parent.currentItem === button
@ -66,9 +66,9 @@ Controls.TabButton {
Layout.leftMargin: TabButtonStyle.text.leftPadding
icon: {
var icon = button.icon
return icon.length
? (icon + '_' + (button._isSelected ? 'selected' : 'normal'))
var iconName = button.iconName
return iconName.length
? (iconName + '_' + (button._isSelected ? 'selected' : 'normal'))
: ''
}
iconSize: button.iconSize

14
ui/views/App/Settings/SettingsWindow.qml
View file

@ -48,43 +48,43 @@ ApplicationWindow {
id: tabBar
TabButton {
icon: 'settings_sip_accounts'
iconName: 'settings_sip_accounts'
text: qsTr('sipAccountsTab')
width: implicitWidth
}
TabButton {
icon: 'settings_audio'
iconName: 'settings_audio'
text: qsTr('audioTab')
width: implicitWidth
}
TabButton {
icon: 'settings_video'
iconName: 'settings_video'
text: qsTr('videoTab')
width: implicitWidth
}
TabButton {
icon: 'settings_call'
iconName: 'settings_call'
text: qsTr('callsAndChatTab')
width: implicitWidth
}
TabButton {
icon: 'settings_network'
iconName: 'settings_network'
text: qsTr('networkTab')
width: implicitWidth
}
TabButton {
icon: 'settings_advanced'
iconName: 'settings_advanced'
text: qsTr('uiTab')
width: implicitWidth
}
TabButton {
icon: 'settings_advanced'
iconName: 'settings_advanced'
text: qsTr('uiAdvanced')
width: implicitWidth
}