| 1 | From ecaab0f73d0b74bbfbf150286305fa6e12970037 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com> |
| 3 | Date: Fri, 19 Jan 2018 14:42:01 +0100 |
| 4 | Subject: [PATCH] fix(SettingsWindow): rename icon property of TabButton to |
| 5 | iconName (issue with Qt 5.10 and new icon property) |
| 6 | |
| 7 | --- |
| 8 | ui/modules/Common/Form/Tab/TabButton.qml | 8 ++++---- |
| 9 | ui/views/App/Settings/SettingsWindow.qml | 14 +++++++------- |
| 10 | 2 files changed, 11 insertions(+), 11 deletions(-) |
| 11 | |
| 12 | diff --git a/ui/modules/Common/Form/Tab/TabButton.qml b/ui/modules/Common/Form/Tab/TabButton.qml |
| 13 | index ad220ab2..a47bb20b 100644 |
| 14 | --- a/ui/modules/Common/Form/Tab/TabButton.qml |
| 15 | +++ b/ui/modules/Common/Form/Tab/TabButton.qml |
| 16 | @@ -12,8 +12,8 @@ Controls.TabButton { |
| 17 | |
| 18 | // --------------------------------------------------------------------------- |
| 19 | |
| 20 | - property string icon |
| 21 | property int iconSize: TabButtonStyle.icon.size |
| 22 | + property string iconName |
| 23 | |
| 24 | readonly property bool _isSelected: parent.parent.currentItem === button |
| 25 | |
| 26 | @@ -66,9 +66,9 @@ Controls.TabButton { |
| 27 | Layout.leftMargin: TabButtonStyle.text.leftPadding |
| 28 | |
| 29 | icon: { |
| 30 | - var icon = button.icon |
| 31 | - return icon.length |
| 32 | - ? (icon + '_' + (button._isSelected ? 'selected' : 'normal')) |
| 33 | + var iconName = button.iconName |
| 34 | + return iconName.length |
| 35 | + ? (iconName + '_' + (button._isSelected ? 'selected' : 'normal')) |
| 36 | : '' |
| 37 | } |
| 38 | iconSize: button.iconSize |
| 39 | diff --git a/ui/views/App/Settings/SettingsWindow.qml b/ui/views/App/Settings/SettingsWindow.qml |
| 40 | index b8f5a80f..58909544 100644 |
| 41 | --- a/ui/views/App/Settings/SettingsWindow.qml |
| 42 | +++ b/ui/views/App/Settings/SettingsWindow.qml |
| 43 | @@ -48,43 +48,43 @@ ApplicationWindow { |
| 44 | id: tabBar |
| 45 | |
| 46 | TabButton { |
| 47 | - icon: 'settings_sip_accounts' |
| 48 | + iconName: 'settings_sip_accounts' |
| 49 | text: qsTr('sipAccountsTab') |
| 50 | width: implicitWidth |
| 51 | } |
| 52 | |
| 53 | TabButton { |
| 54 | - icon: 'settings_audio' |
| 55 | + iconName: 'settings_audio' |
| 56 | text: qsTr('audioTab') |
| 57 | width: implicitWidth |
| 58 | } |
| 59 | |
| 60 | TabButton { |
| 61 | - icon: 'settings_video' |
| 62 | + iconName: 'settings_video' |
| 63 | text: qsTr('videoTab') |
| 64 | width: implicitWidth |
| 65 | } |
| 66 | |
| 67 | TabButton { |
| 68 | - icon: 'settings_call' |
| 69 | + iconName: 'settings_call' |
| 70 | text: qsTr('callsAndChatTab') |
| 71 | width: implicitWidth |
| 72 | } |
| 73 | |
| 74 | TabButton { |
| 75 | - icon: 'settings_network' |
| 76 | + iconName: 'settings_network' |
| 77 | text: qsTr('networkTab') |
| 78 | width: implicitWidth |
| 79 | } |
| 80 | |
| 81 | TabButton { |
| 82 | - icon: 'settings_advanced' |
| 83 | + iconName: 'settings_advanced' |
| 84 | text: qsTr('uiTab') |
| 85 | width: implicitWidth |
| 86 | } |
| 87 | |
| 88 | TabButton { |
| 89 | - icon: 'settings_advanced' |
| 90 | + iconName: 'settings_advanced' |
| 91 | text: qsTr('uiAdvanced') |
| 92 | width: implicitWidth |
| 93 | } |
| 94 | -- |
| 95 | 2.21.0 |
| 96 | |