join-room-dialog: Rename to RoomPreviewDialog

po/POTFILES.in

@@ -23,9 +23,9 @@ src/components/dialogs/auth/in_browser_page.ui
 src/components/dialogs/auth/mod.rs
 src/components/dialogs/auth/mod.ui
 src/components/dialogs/auth/password_page.ui
-src/components/dialogs/join_room.rs
-src/components/dialogs/join_room.ui
 src/components/dialogs/message_dialogs.rs
+src/components/dialogs/room_preview.rs
+src/components/dialogs/room_preview.ui
 src/components/dialogs/user_profile.ui
 src/components/offline_banner.rs
 src/components/media/content_viewer.rs

src/components/dialogs/mod.rs

@@ -1,13 +1,13 @@
 mod auth;
-mod join_room;
 mod message_dialogs;
+mod room_preview;
 mod toastable;
 mod user_profile;
 
 pub(crate) use self::{
     auth::{AuthDialog, AuthError},
-    join_room::JoinRoomDialog,
     message_dialogs::*,
+    room_preview::RoomPreviewDialog,
     toastable::{ToastableDialog, ToastableDialogExt, ToastableDialogImpl},
     user_profile::UserProfileDialog,
 };

src/components/dialogs/room_preview.rs

@@ -24,9 +24,9 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/components/dialogs/join_room.ui")]
-    #[properties(wrapper_type = super::JoinRoomDialog)]
-    pub struct JoinRoomDialog {
+    #[template(resource = "/org/gnome/Fractal/ui/components/dialogs/room_preview.ui")]
+    #[properties(wrapper_type = super::RoomPreviewDialog)]
+    pub struct RoomPreviewDialog {
         #[template_child]
         go_back_btn: TemplateChild<gtk::Button>,
         #[template_child]
@@ -64,9 +64,9 @@ mod imp {
     }
 
     #[glib::object_subclass]
-    impl ObjectSubclass for JoinRoomDialog {
-        const NAME: &'static str = "JoinRoomDialog";
-        type Type = super::JoinRoomDialog;
+    impl ObjectSubclass for RoomPreviewDialog {
+        const NAME: &'static str = "RoomPreviewDialog";
+        type Type = super::RoomPreviewDialog;
         type ParentType = ToastableDialog;
 
         fn class_init(klass: &mut Self::Class) {
@@ -80,7 +80,7 @@ mod imp {
     }
 
     #[glib::derived_properties]
-    impl ObjectImpl for JoinRoomDialog {
+    impl ObjectImpl for RoomPreviewDialog {
         fn constructed(&self) {
             self.parent_constructed();
             let obj = self.obj();
@@ -107,12 +107,12 @@ mod imp {
         }
     }
 
-    impl WidgetImpl for JoinRoomDialog {}
-    impl AdwDialogImpl for JoinRoomDialog {}
-    impl ToastableDialogImpl for JoinRoomDialog {}
+    impl WidgetImpl for RoomPreviewDialog {}
+    impl AdwDialogImpl for RoomPreviewDialog {}
+    impl ToastableDialogImpl for RoomPreviewDialog {}
 
     #[gtk::template_callbacks]
-    impl JoinRoomDialog {
+    impl RoomPreviewDialog {
         /// Set the current session.
         fn set_session(&self, session: Option<&Session>) {
             self.session.set(session);
@@ -361,13 +361,14 @@ mod imp {
 }
 
 glib::wrapper! {
-    /// Dialog to join a room.
-    pub struct JoinRoomDialog(ObjectSubclass<imp::JoinRoomDialog>)
-        @extends gtk::Widget, adw::Dialog, ToastableDialog, @implements gtk::Accessible;
+    /// Dialog to preview a room and eventually join it.
+    pub struct RoomPreviewDialog(ObjectSubclass<imp::RoomPreviewDialog>)
+        @extends gtk::Widget, adw::Dialog, ToastableDialog,
+        @implements gtk::Accessible;
 }
 
 #[gtk::template_callbacks]
-impl JoinRoomDialog {
+impl RoomPreviewDialog {
     pub fn new(session: &Session) -> Self {
         glib::Object::builder().property("session", session).build()
     }

src/components/dialogs/room_preview.ui

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="JoinRoomDialog" parent="ToastableDialog">
+  <template class="RoomPreviewDialog" parent="ToastableDialog">
     <property name="title" translatable="yes">Join a Room</property>
     <property name="content-width">480</property>
     <property name="content-height">500</property>

src/components/pill/mod.rs

@@ -12,7 +12,7 @@ pub use self::{
     source::{PillSource, PillSourceExt, PillSourceImpl},
     source_row::PillSourceRow,
 };
-use super::{Avatar, JoinRoomDialog, UserProfileDialog};
+use super::{Avatar, RoomPreviewDialog, UserProfileDialog};
 use crate::{
     prelude::*,
     session::{
@@ -207,7 +207,7 @@ mod imp {
                     return;
                 };
 
-                let dialog = JoinRoomDialog::new(&session);
+                let dialog = RoomPreviewDialog::new(&session);
                 dialog.set_room(room);
                 dialog.present(Some(&*obj));
             }

src/session/view/session_view.rs

@@ -5,7 +5,7 @@ use tracing::{error, warn};
 
 use super::{Content, CreateDirectChatDialog, CreateRoomDialog, MediaViewer, Sidebar};
 use crate::{
-    components::{JoinRoomDialog, UserProfileDialog},
+    components::{RoomPreviewDialog, UserProfileDialog},
     intent::SessionIntent,
     prelude::*,
     session::model::{
@@ -89,8 +89,8 @@ mod imp {
                 obj.imp().create_room();
             });
 
-            klass.install_action("session.show-join-room", None, |obj, _, _| {
-                obj.imp().show_join_room_dialog(None);
+            klass.install_action("session.join-room", None, |obj, _, _| {
+                obj.imp().preview_room(None);
             });
 
             klass.install_action("session.create-direct-chat", None, |obj, _, _| {
@@ -476,10 +476,10 @@ mod imp {
             dialog.present(Some(&*self.obj()));
         }
 
-        /// Show the dialog to join a room.
+        /// Show the dialog to preview a room.
         ///
         /// If no room URI is provided, the user will have to enter one.
-        pub(super) fn show_join_room_dialog(&self, room_uri: Option<MatrixRoomIdUri>) {
+        pub(super) fn preview_room(&self, room_uri: Option<MatrixRoomIdUri>) {
             let Some(session) = self.session.upgrade() else {
                 return;
             };
@@ -490,7 +490,7 @@ mod imp {
                 }
             }
 
-            let dialog = JoinRoomDialog::new(&session);
+            let dialog = RoomPreviewDialog::new(&session);
 
             if let Some(uri) = room_uri {
                 dialog.set_uri(uri);
@@ -546,7 +546,7 @@ mod imp {
             match uri {
                 MatrixIdUri::Room(room_uri)
                 | MatrixIdUri::Event(MatrixEventIdUri { room_uri, .. }) => {
-                    self.show_join_room_dialog(Some(room_uri));
+                    self.preview_room(Some(room_uri));
                 }
                 MatrixIdUri::User(user_id) => {
                     self.show_user_profile_dialog(user_id);

src/session/view/sidebar/mod.ui

@@ -12,7 +12,7 @@
       </item>
       <item>
         <attribute name="label" translatable="yes">_Join Room…</attribute>
-        <attribute name="action">session.show-join-room</attribute>
+        <attribute name="action">session.join-room</attribute>
       </item>
     </section>
     <section>

src/ui-resources.gresource.xml

@@ -17,7 +17,7 @@
     <file compressed="true" preprocess="xml-stripblanks">components/dialogs/auth/in_browser_page.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">components/dialogs/auth/mod.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">components/dialogs/auth/password_page.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">components/dialogs/join_room.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">components/dialogs/room_preview.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">components/dialogs/toastable.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">components/dialogs/user_profile.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">components/loading/bin.ui</file>