Commit ecaab0f7 authored by Ronan's avatar Ronan
Browse files

fix(SettingsWindow): rename icon property of TabButton to iconName (issue with...

fix(SettingsWindow): rename icon property of TabButton to iconName (issue with Qt 5.10 and new icon property)
parent ffa24e1e
...@@ -12,8 +12,8 @@ Controls.TabButton { ...@@ -12,8 +12,8 @@ Controls.TabButton {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
property string icon
property int iconSize: TabButtonStyle.icon.size property int iconSize: TabButtonStyle.icon.size
property string iconName
readonly property bool _isSelected: parent.parent.currentItem === button readonly property bool _isSelected: parent.parent.currentItem === button
...@@ -66,9 +66,9 @@ Controls.TabButton { ...@@ -66,9 +66,9 @@ Controls.TabButton {
Layout.leftMargin: TabButtonStyle.text.leftPadding Layout.leftMargin: TabButtonStyle.text.leftPadding
icon: { icon: {
var icon = button.icon var iconName = button.iconName
return icon.length return iconName.length
? (icon + '_' + (button._isSelected ? 'selected' : 'normal')) ? (iconName + '_' + (button._isSelected ? 'selected' : 'normal'))
: '' : ''
} }
iconSize: button.iconSize iconSize: button.iconSize
......
...@@ -48,43 +48,43 @@ ApplicationWindow { ...@@ -48,43 +48,43 @@ ApplicationWindow {
id: tabBar id: tabBar
TabButton { TabButton {
icon: 'settings_sip_accounts' iconName: 'settings_sip_accounts'
text: qsTr('sipAccountsTab') text: qsTr('sipAccountsTab')
width: implicitWidth width: implicitWidth
} }
TabButton { TabButton {
icon: 'settings_audio' iconName: 'settings_audio'
text: qsTr('audioTab') text: qsTr('audioTab')
width: implicitWidth width: implicitWidth
} }
TabButton { TabButton {
icon: 'settings_video' iconName: 'settings_video'
text: qsTr('videoTab') text: qsTr('videoTab')
width: implicitWidth width: implicitWidth
} }
TabButton { TabButton {
icon: 'settings_call' iconName: 'settings_call'
text: qsTr('callsAndChatTab') text: qsTr('callsAndChatTab')
width: implicitWidth width: implicitWidth
} }
TabButton { TabButton {
icon: 'settings_network' iconName: 'settings_network'
text: qsTr('networkTab') text: qsTr('networkTab')
width: implicitWidth width: implicitWidth
} }
TabButton { TabButton {
icon: 'settings_advanced' iconName: 'settings_advanced'
text: qsTr('uiTab') text: qsTr('uiTab')
width: implicitWidth width: implicitWidth
} }
TabButton { TabButton {
icon: 'settings_advanced' iconName: 'settings_advanced'
text: qsTr('uiAdvanced') text: qsTr('uiAdvanced')
width: implicitWidth width: implicitWidth
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment