diff --git a/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml b/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml index 27230d436..06d38f7a7 100644 --- a/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml +++ b/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml @@ -64,8 +64,9 @@ SearchBox { secure: 0, visible: true, handler: function (entry) { + var sipAddress = entry.sipAddress // closeMenu() will remove entry. Keep it in memory searchBox.closeMenu() - searchBox.launchVideoCall(entry.sipAddress) + searchBox.launchVideoCall(sipAddress) }, visible: SettingsModel.videoEnabled && SettingsModel.outgoingCallsEnabled && SettingsModel.showStartVideoCallButton }, { @@ -73,16 +74,18 @@ SearchBox { secure: 0, visible: true, handler: function (entry) { + var sipAddress = entry.sipAddress // closeMenu() will remove entry. Keep it in memory searchBox.closeMenu() - searchBox.launchCall(entry.sipAddress) + searchBox.launchCall(sipAddress) }, visible: SettingsModel.outgoingCallsEnabled }, { colorSet: SettingsModel.getShowStartChatButton() ? SipAddressesViewStyle.chat : SipAddressesViewStyle.history, secure: 0, handler: function (entry) { + var sipAddress = entry.sipAddress // closeMenu() will remove entry. Keep it in memory searchBox.closeMenu() - searchBox.launchChat(entry.sipAddress) + searchBox.launchChat(sipAddress) }, visible: SettingsModel.standardChatEnabled, zz: 'toto' @@ -91,8 +94,9 @@ SearchBox { secure: 1, visible: SettingsModel.secureChatEnabled && AccountSettingsModel.conferenceUri != '', handler: function (entry) { + var sipAddress = entry.sipAddress // closeMenu() will remove entry. Keep it in memory searchBox.closeMenu() - searchBox.launchSecureChat(entry.sipAddress) + searchBox.launchSecureChat(sipAddress) } } @@ -113,8 +117,9 @@ SearchBox { } onEntryClicked: { + var entryBackup = entry searchBox.closeMenu() - searchBox.entryClicked(entry) + searchBox.entryClicked(entryBackup) } } } diff --git a/linphone-app/ui/views/App/Main/Recordings.qml b/linphone-app/ui/views/App/Main/Recordings.qml index 9d7e66792..a5060bcde 100644 --- a/linphone-app/ui/views/App/Main/Recordings.qml +++ b/linphone-app/ui/views/App/Main/Recordings.qml @@ -29,7 +29,7 @@ Item { //: 'No recordings' : Title of an empty list of records. text: qsTr('titleNoRecordings') visible : recordingsProxyModel.count === 0 - color: RecordingsStyle.title.color + color: RecordingsStyle.title.colorModel.color font.pointSize: RecordingsStyle.title.pointSize } Component { @@ -131,7 +131,7 @@ Item { text: lineLoader.title horizontalAlignment: Text.AlignLeft font.pointSize: RecordingsStyle.filename.pointSize - color: RecordingsStyle.filename.color + color: RecordingsStyle.filename.colorModel.color } Text { id: durationText @@ -141,7 +141,7 @@ Item { +Utils.formatElapsedTime($modelData.duration/1000) horizontalAlignment: Text.AlignRight font.pointSize: RecordingsStyle.filename.pointSize - color: RecordingsStyle.filename.color + color: RecordingsStyle.filename.colorModel.color } } Slider { @@ -224,7 +224,7 @@ Item { Layout.leftMargin : 30 text: lineLoader.title font.pointSize: RecordingsStyle.filename.pointSize - color: RecordingsStyle.filename.color + color: RecordingsStyle.filename.colorModel.color } ActionButton { Layout.rightMargin : 30 diff --git a/linphone-app/ui/views/App/Styles/Main/RecordingsStyle.qml b/linphone-app/ui/views/App/Styles/Main/RecordingsStyle.qml index 62e5ccaa2..319ecc148 100644 --- a/linphone-app/ui/views/App/Styles/Main/RecordingsStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/RecordingsStyle.qml @@ -10,12 +10,12 @@ QtObject { property string sectionName : 'Recordings' property QtObject title: QtObject { - property color color: ColorsList.add(sectionName+'_title', 'j').color + property var colorModel: ColorsList.add(sectionName+'_title', 'j') property int pointSize: Units.dp * 12 } property QtObject filename: QtObject { - property color color: ColorsList.add(sectionName+'_filename', 'j').color + property var colorModel: ColorsList.add(sectionName+'_filename', 'j') property int pointSize: Units.dp * 10 } @@ -25,56 +25,56 @@ QtObject { property int iconSize: buttons.size property string name : 'play' property string icon : 'chat_audio_play_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_inv_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_inv_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_inv_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_inv_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_inv_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_inv_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_inv_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_inv_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_inv_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_inv_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_inv_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_inv_fg') } property QtObject pause: QtObject { property int iconSize: buttons.size property string name : 'pause' property string icon : 'chat_audio_pause_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_inv_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_inv_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_inv_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_inv_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_inv_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_inv_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_inv_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_inv_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_inv_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_inv_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_inv_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_inv_fg') } property QtObject remove: QtObject { property int iconSize: buttons.size property string name : 'delete' property string icon : 'delete_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg') } property QtObject openImage: QtObject { property int iconSize: buttons.size/2 property string name : 'openImage' property string icon : 'file_image_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_inv_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_inv_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_inv_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_inv_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_inv_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_inv_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_inv_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_inv_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_inv_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_inv_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_inv_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_inv_fg') } property QtObject openFile: QtObject { property int iconSize: buttons.size/2 property string name : 'openFile' property string icon : 'file_extension_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_inv_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_inv_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_inv_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_inv_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_inv_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_inv_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_inv_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_inv_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_inv_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_inv_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_inv_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_inv_fg') } } }