Merge master and fix conflicts

1 files changed, 14 insertions, 3 deletions

diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h

index 15b4f523..54e3a935 100644
--- a/src/timeline/TimelineViewManager.h
+++ b/src/timeline/TimelineViewManager.h
@@ -33,6 +33,7 @@ class ColorImageProvider;
 class UserSettings;
 class ChatPage;
 class DeviceVerificationFlow;
+class ImagePackListModel;
 
 class TimelineViewManager : public QObject
 {
@@ -57,6 +58,7 @@ public:
         Q_INVOKABLE bool isInitialSync() const { return isInitialSync_; }
         bool isWindowFocused() const { return isWindowFocused_; }
         Q_INVOKABLE void openImageOverlay(QString mxcUrl, QString eventId);
+        Q_INVOKABLE void openImagePackSettings(QString roomid);
         Q_INVOKABLE QColor userColor(QString id, QColor background);
         Q_INVOKABLE QString escapeEmoji(QString str) const;
         Q_INVOKABLE QString htmlEscape(QString str) const { return str.toHtmlEscaped(); }
@@ -64,9 +66,12 @@ public:
         Q_INVOKABLE QString userPresence(QString id) const;
         Q_INVOKABLE QString userStatus(QString id) const;
 
+        Q_INVOKABLE void openRoomMembers(QString room_id);
+        Q_INVOKABLE void openRoomSettings(QString room_id);
+        Q_INVOKABLE void openInviteUsers(QString roomId);
+        Q_INVOKABLE void openGlobalUserProfile(QString userId);
+
         Q_INVOKABLE void focusMessageInput();
-        Q_INVOKABLE void openInviteUsersDialog();
-        Q_INVOKABLE void openMemberListDialog(QString roomid) const;
         Q_INVOKABLE void openLeaveRoomDialog(QString roomid) const;
         Q_INVOKABLE void removeVerificationFlow(DeviceVerificationFlow *flow);
 
@@ -81,11 +86,17 @@ signals:
         void replyingEventChanged(QString replyingEvent);
         void replyClosed();
         void newDeviceVerificationRequest(DeviceVerificationFlow *flow);
-        void inviteUsers(QStringList users);
+        void inviteUsers(QString roomId, QStringList users);
+        void showRoomList();
+        void narrowViewChanged();
         void focusChanged();
         void focusInput();
         void openImageOverlayInternalCb(QString eventId, QImage img);
+        void openRoomMembersDialog(MemberList *members);
+        void openRoomSettingsDialog(RoomSettings *settings);
+        void openInviteUsersDialog(InviteesModel *invitees);
         void openProfile(UserProfile *profile);
+        void showImagePackSettings(ImagePackListModel *packlist);
 
 public slots:
         void updateReadReceipts(const QString &room_id, const std::vector<QString> &event_ids);