From 9c0ea510cde6ae827b2c905c92677109c7354ebf Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Tue, 15 Sep 2020 16:40:36 -0400
Subject: [PATCH] smartlist: use qml native placeholder
Change-Id: Iada72f807be439c6033a3b22469f5424b324e1a5
---
src/mainview/components/ContactPicker.qml | 5 -----
src/mainview/components/ContactSearchBar.qml | 21 +++-----------------
src/mainview/components/SidePanel.qml | 2 --
src/mainview/components/SidePanelTabBar.qml | 4 ----
4 files changed, 3 insertions(+), 29 deletions(-)
diff --git a/src/mainview/components/ContactPicker.qml b/src/mainview/components/ContactPicker.qml
index cb93757e3..d3e15d04a 100644
--- a/src/mainview/components/ContactPicker.qml
+++ b/src/mainview/components/ContactPicker.qml
@@ -101,11 +101,6 @@ Popup {
onContactSearchBarTextChanged: {
ContactAdapter.setSearchFilter(text)
}
-
- Component.onCompleted: {
- contactPickerContactSearchBar.setPlaceholderString(
- qsTr("Search contacts"))
- }
}
ListView {
diff --git a/src/mainview/components/ContactSearchBar.qml b/src/mainview/components/ContactSearchBar.qml
index cf16dca86..40704ff84 100644
--- a/src/mainview/components/ContactSearchBar.qml
+++ b/src/mainview/components/ContactSearchBar.qml
@@ -27,11 +27,6 @@ Rectangle {
signal contactSearchBarTextChanged(string text)
- function setPlaceholderString(str) {
- placeholderTextForSearchBar.text = str
- }
-
-
// Hack - there is no real way now to make TextField lose its focus,
// unless transfer it to other component.
function clearFocus() {
@@ -80,22 +75,12 @@ Rectangle {
width: contactSearchBarRect.width - searchIconImage.width - 10
height: contactSearchBarRect.height - 5
- font.pointSize: JamiTheme.textFontSize - 1
+ font.pointSize: JamiTheme.textFontSize
selectByMouse: true
selectionColor: JamiTheme.contactSearchBarPlaceHolderTextFontColor
- Text {
- id: placeholderTextForSearchBar
-
- anchors.verticalCenter: contactSearchBar.verticalCenter
- anchors.left: contactSearchBar.left
- anchors.leftMargin: 10
-
- text: JamiStrings.contactSearchConversation
- font.pointSize: JamiTheme.textFontSize
- color: JamiTheme.contactSearchBarPlaceHolderTextFontColor
- visible: !contactSearchBar.text && !contactSearchBar.activeFocus
- }
+ placeholderText: JamiStrings.contactSearchConversation
+ placeholderTextColor: JamiTheme.contactSearchBarPlaceHolderTextFontColor
background: Rectangle {
id: searchBarBackground
diff --git a/src/mainview/components/SidePanel.qml b/src/mainview/components/SidePanel.qml
index 984ac4c98..5ef32df94 100644
--- a/src/mainview/components/SidePanel.qml
+++ b/src/mainview/components/SidePanel.qml
@@ -68,8 +68,6 @@ Rectangle {
function accountChangedUIReset() {
contactSearchBar.clearText()
- contactSearchBar.setPlaceholderString(
- JamiStrings.contactSearchConversation)
sidePanelTabBar.converstationTabDown = true
sidePanelTabBar.invitationTabDown = false
}
diff --git a/src/mainview/components/SidePanelTabBar.qml b/src/mainview/components/SidePanelTabBar.qml
index 2d85aa67c..e0190b689 100644
--- a/src/mainview/components/SidePanelTabBar.qml
+++ b/src/mainview/components/SidePanelTabBar.qml
@@ -78,8 +78,6 @@ TabBar {
function showConversations() {
ConversationsAdapter.setConversationFilter("")
- contactSearchBar.setPlaceholderString(
- JamiStrings.contactSearchConversation)
pageOne.down = true
pageTwo.down = false
setCurrentUidSmartListModelIndex()
@@ -199,8 +197,6 @@ TabBar {
function showRequests() {
ConversationsAdapter.setConversationFilter("PENDING")
- contactSearchBar.setPlaceholderString(
- JamiStrings.contactSearchInvitations)
pageTwo.down = true
pageOne.down = false
}
--
GitLab