From 25421facbf13e675478acee0ef8a6157d4e7e043 Mon Sep 17 00:00:00 2001 From: Pascal Precht Date: Thu, 14 Oct 2021 13:09:03 +0200 Subject: [PATCH] refactor: move `InviteFriendsPopup` to ui/shared/popups --- ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml | 1 + ui/app/AppLayouts/Chat/ContactsColumn/EmptyView.qml | 1 + ui/shared/NoFriendsRectangle.qml | 1 + ui/shared/{ => popups}/InviteFriendsPopup.qml | 4 ++-- 4 files changed, 5 insertions(+), 2 deletions(-) rename ui/shared/{ => popups}/InviteFriendsPopup.qml (95%) diff --git a/ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml b/ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml index 762967c21b..d3856195f6 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml @@ -2,6 +2,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import QtQuick.Layouts 1.13 import "../../../../shared" +import "../../../../shared/popups" import utils 1.0 import "../components" diff --git a/ui/app/AppLayouts/Chat/ContactsColumn/EmptyView.qml b/ui/app/AppLayouts/Chat/ContactsColumn/EmptyView.qml index e1d54d6a1d..c7da0f4368 100644 --- a/ui/app/AppLayouts/Chat/ContactsColumn/EmptyView.qml +++ b/ui/app/AppLayouts/Chat/ContactsColumn/EmptyView.qml @@ -5,6 +5,7 @@ import QtGraphicalEffects 1.13 import "../components" import "../data/channelList.js" as ChannelJSON import "../../../../shared" +import "../../../../shared/popups" import "../../../../shared/status" import utils 1.0 diff --git a/ui/shared/NoFriendsRectangle.qml b/ui/shared/NoFriendsRectangle.qml index 1116131352..3b1be2e5ea 100644 --- a/ui/shared/NoFriendsRectangle.qml +++ b/ui/shared/NoFriendsRectangle.qml @@ -3,6 +3,7 @@ import QtQuick 2.13 import utils 1.0 import "." import "./status" +import "./popups" Item { id: noContactsRect diff --git a/ui/shared/InviteFriendsPopup.qml b/ui/shared/popups/InviteFriendsPopup.qml similarity index 95% rename from ui/shared/InviteFriendsPopup.qml rename to ui/shared/popups/InviteFriendsPopup.qml index 7042a18110..03694aa2d4 100644 --- a/ui/shared/InviteFriendsPopup.qml +++ b/ui/shared/popups/InviteFriendsPopup.qml @@ -2,8 +2,8 @@ import QtQuick 2.12 import QtQuick.Controls 2.3 import utils 1.0 -import "./controls" -import "." +import "../controls" +import "../" // TODO: replace with StatusModal ModalPopup {