[fractal/unfrctlize] Remove Frctl prefix
- From: Alexandre Franke <afranke src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [fractal/unfrctlize] Remove Frctl prefix
- Date: Tue, 13 Apr 2021 18:25:33 +0000 (UTC)
commit 4f9e1726a6b148d1380e4c02313149be83280bfb
Author: Alexandre Franke <afranke gnome org>
Date: Tue Apr 13 20:21:45 2021 +0200
Remove Frctl prefix
data/resources/ui/content.ui | 4 +--
data/resources/ui/login.ui | 2 +-
data/resources/ui/session.ui | 6 ++--
data/resources/ui/sidebar-category-item.ui | 8 ++---
data/resources/ui/sidebar-category-row.ui | 2 +-
data/resources/ui/sidebar-room-item.ui | 10 +++---
data/resources/ui/sidebar-room-row.ui | 2 +-
data/resources/ui/sidebar.ui | 6 ++--
data/resources/ui/window.ui | 4 +--
src/application.rs | 32 +++++++++----------
src/login.rs | 46 +++++++++++++--------------
src/main.rs | 10 +++---
src/session/content.rs | 20 ++++++------
src/session/mod.rs | 40 +++++++++++------------
src/session/sidebar/category.rs | 51 +++++++++++++++---------------
src/session/sidebar/category_list.rs | 38 +++++++++++-----------
src/session/sidebar/category_row.rs | 20 ++++++------
src/session/sidebar/mod.rs | 48 ++++++++++++++--------------
src/session/sidebar/room.rs | 27 ++++++++--------
src/session/sidebar/room_row.rs | 20 ++++++------
src/window.rs | 42 ++++++++++++------------
21 files changed, 218 insertions(+), 220 deletions(-)
---
diff --git a/data/resources/ui/content.ui b/data/resources/ui/content.ui
index 411aa691..d59ed88b 100644
--- a/data/resources/ui/content.ui
+++ b/data/resources/ui/content.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <template class="FrctlContent" parent="AdwBin">
+ <template class="Content" parent="AdwBin">
<property name="vexpand">True</property>
<property name="hexpand">True</property>
<child>
@@ -8,7 +8,7 @@
<property name="orientation">vertical</property>
<child>
<object class="AdwHeaderBar" id="headerbar">
- <property name="show-start-title-buttons" bind-source="FrctlContent" bind-property="compact"
bind-flags="sync-create" />
+ <property name="show-start-title-buttons" bind-source="Content" bind-property="compact"
bind-flags="sync-create" />
<child type="end">
<object class="GtkMenuButton" id="room_menu">
<property name="icon-name">view-more-symbolic</property>
diff --git a/data/resources/ui/login.ui b/data/resources/ui/login.ui
index 0a0efc4e..f2c0eef8 100644
--- a/data/resources/ui/login.ui
+++ b/data/resources/ui/login.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <template class="FrctlLogin" parent="AdwBin">
+ <template class="Login" parent="AdwBin">
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
diff --git a/data/resources/ui/session.ui b/data/resources/ui/session.ui
index 0f0c5968..33b35007 100644
--- a/data/resources/ui/session.ui
+++ b/data/resources/ui/session.ui
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <template class="FrctlSession" parent="AdwBin">
+ <template class="Session" parent="AdwBin">
<child>
<object class="AdwLeaflet" id="session">
<child>
- <object class="FrctlSidebar" id="sidebar">
+ <object class="Sidebar" id="sidebar">
<property name="compact" bind-source="session" bind-property="folded" bind-flags="sync-create" />
</object>
</child>
<child>
- <object class="FrctlContent" id="content">
+ <object class="Content" id="content">
<property name="compact" bind-source="session" bind-property="folded" bind-flags="sync-create" />
</object>
</child>
diff --git a/data/resources/ui/sidebar-category-item.ui b/data/resources/ui/sidebar-category-item.ui
index 21668f30..d2609be5 100644
--- a/data/resources/ui/sidebar-category-item.ui
+++ b/data/resources/ui/sidebar-category-item.ui
@@ -7,14 +7,14 @@
<property name="orientation">vertical</property>
<property name="focusable">False</property>
<child>
- <object class="FrctlSidebarCategoryRow">
+ <object class="SidebarCategoryRow">
<binding name="display-name">
- <lookup type="FrctlCategory" name="display-name">
+ <lookup type="Category" name="display-name">
<lookup name="item">GtkListItem</lookup>
</lookup>
</binding>
<binding name="expanded">
- <lookup type="FrctlCategory" name="expanded">
+ <lookup type="Category" name="expanded">
<lookup name="item">GtkListItem</lookup>
</lookup>
</binding>
@@ -23,7 +23,7 @@
<child>
<object class="GtkRevealer">
<binding name="reveal-child">
- <lookup type="FrctlCategory" name="expanded">
+ <lookup type="Category" name="expanded">
<lookup name="item">GtkListItem</lookup>
</lookup>
</binding>
diff --git a/data/resources/ui/sidebar-category-row.ui b/data/resources/ui/sidebar-category-row.ui
index 93fdcd91..358c8724 100644
--- a/data/resources/ui/sidebar-category-row.ui
+++ b/data/resources/ui/sidebar-category-row.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <template class="FrctlSidebarCategoryRow" parent="AdwBin">
+ <template class="SidebarCategoryRow" parent="AdwBin">
<child>
<object class="GtkBox">
<property name="spacing">6</property>
diff --git a/data/resources/ui/sidebar-room-item.ui b/data/resources/ui/sidebar-room-item.ui
index 0a195609..b4b36dd7 100644
--- a/data/resources/ui/sidebar-room-item.ui
+++ b/data/resources/ui/sidebar-room-item.ui
@@ -2,24 +2,24 @@
<interface>
<template class="GtkListItem">
<property name="child">
- <object class="FrctlSidebarRoomRow">
+ <object class="SidebarRoomRow">
<binding name="avatar">
- <lookup type="FrctlRoom" name="avatar">
+ <lookup type="Room" name="avatar">
<lookup name="item">GtkListItem</lookup>
</lookup>
</binding>
<binding name="display-name">
- <lookup type="FrctlRoom" name="display-name">
+ <lookup type="Room" name="display-name">
<lookup name="item">GtkListItem</lookup>
</lookup>
</binding>
<binding name="notification-count">
- <lookup type="FrctlRoom" name="notification-count">
+ <lookup type="Room" name="notification-count">
<lookup name="item">GtkListItem</lookup>
</lookup>
</binding>
<binding name="highlight">
- <lookup type="FrctlRoom" name="highlight">
+ <lookup type="Room" name="highlight">
<lookup name="item">GtkListItem</lookup>
</lookup>
</binding>
diff --git a/data/resources/ui/sidebar-room-row.ui b/data/resources/ui/sidebar-room-row.ui
index 589578f4..7adad266 100644
--- a/data/resources/ui/sidebar-room-row.ui
+++ b/data/resources/ui/sidebar-room-row.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <template class="FrctlSidebarRoomRow" parent="AdwBin">
+ <template class="SidebarRoomRow" parent="AdwBin">
<child>
<object class="GtkBox">
<property name="spacing">6</property>
diff --git a/data/resources/ui/sidebar.ui b/data/resources/ui/sidebar.ui
index 14b82ace..3bf94c9f 100644
--- a/data/resources/ui/sidebar.ui
+++ b/data/resources/ui/sidebar.ui
@@ -16,7 +16,7 @@
</item>
</section>
</menu>
- <template class="FrctlSidebar" parent="AdwBin">
+ <template class="Sidebar" parent="AdwBin">
<style>
<class name="sidebar"/>
</style>
@@ -25,7 +25,7 @@
<property name="orientation">vertical</property>
<child>
<object class="AdwHeaderBar" id="headerbar">
- <property name="show-end-title-buttons" bind-source="FrctlSidebar" bind-property="compact"
bind-flags="sync-create"/>
+ <property name="show-end-title-buttons" bind-source="Sidebar" bind-property="compact"
bind-flags="sync-create"/>
<child type="start">
<object class="GtkToggleButton" id="search_button">
<property name="icon-name">system-search-symbolic</property>
@@ -56,7 +56,7 @@
<property name="model">
<object class="GtkNoSelection">
<property name="model">
- <object class="FrctlCategoryList" />
+ <object class="CategoryList" />
</property>
</object>
</property>
diff --git a/data/resources/ui/window.ui b/data/resources/ui/window.ui
index 3a83e4e6..d9ac02a1 100644
--- a/data/resources/ui/window.ui
+++ b/data/resources/ui/window.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <template class="FrctlWindow" parent="AdwApplicationWindow">
+ <template class="Window" parent="AdwApplicationWindow">
<property name="default-width">600</property>
<property name="default-height">400</property>
<child>
@@ -8,7 +8,7 @@
<property name="visible-child">login</property>
<property name="transition-type">crossfade</property>
<child>
- <object class="FrctlLogin" id="login" />
+ <object class="Login" id="login" />
</child>
</object>
</child>
diff --git a/src/application.rs b/src/application.rs
index c9e7f897..cbc05853 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -1,5 +1,5 @@
use crate::config;
-use crate::FrctlWindow;
+use crate::Window;
use gettextrs::gettext;
use gio::ApplicationFlags;
use glib::clone;
@@ -16,14 +16,14 @@ mod imp {
use super::*;
#[derive(Debug)]
- pub struct FrctlApplication {
- pub window: OnceCell<WeakRef<FrctlWindow>>,
+ pub struct Application {
+ pub window: OnceCell<WeakRef<Window>>,
}
#[glib::object_subclass]
- impl ObjectSubclass for FrctlApplication {
- const NAME: &'static str = "FrctlApplication";
- type Type = super::FrctlApplication;
+ impl ObjectSubclass for Application {
+ const NAME: &'static str = "Application";
+ type Type = super::Application;
type ParentType = gtk::Application;
fn new() -> Self {
@@ -33,11 +33,11 @@ mod imp {
}
}
- impl ObjectImpl for FrctlApplication {}
+ impl ObjectImpl for Application {}
- impl ApplicationImpl for FrctlApplication {
+ impl ApplicationImpl for Application {
fn activate(&self, app: &Self::Type) {
- debug!("GtkApplication<FrctlApplication>::activate");
+ debug!("GtkApplication<Application>::activate");
if let Some(window) = self.window.get() {
let window = window.upgrade().unwrap();
@@ -49,7 +49,7 @@ mod imp {
app.set_resource_base_path(Some("/org/gnome/FractalNext/"));
app.setup_css();
- let window = FrctlWindow::new(app);
+ let window = Window::new(app);
self.window
.set(window.downgrade())
.expect("Window already set.");
@@ -61,20 +61,20 @@ mod imp {
}
fn startup(&self, app: &Self::Type) {
- debug!("GtkApplication<FrctlApplication>::startup");
+ debug!("GtkApplication<Application>::startup");
self.parent_startup(app);
}
}
- impl GtkApplicationImpl for FrctlApplication {}
+ impl GtkApplicationImpl for Application {}
}
glib::wrapper! {
- pub struct FrctlApplication(ObjectSubclass<imp::FrctlApplication>)
+ pub struct Application(ObjectSubclass<imp::Application>)
@extends gio::Application, gtk::Application, @implements gio::ActionMap, gio::ActionGroup;
}
-impl FrctlApplication {
+impl Application {
pub fn new() -> Self {
glib::Object::new(&[
("application-id", &Some(config::APP_ID)),
@@ -83,8 +83,8 @@ impl FrctlApplication {
.expect("Application initialization failed...")
}
- fn get_main_window(&self) -> FrctlWindow {
- imp::FrctlApplication::from_instance(self)
+ fn get_main_window(&self) -> Window {
+ imp::Application::from_instance(self)
.window
.get()
.unwrap()
diff --git a/src/login.rs b/src/login.rs
index 1c689f97..1459a468 100644
--- a/src/login.rs
+++ b/src/login.rs
@@ -1,5 +1,5 @@
use crate::secret;
-use crate::FrctlSession;
+use crate::Session;
use adw;
use adw::subclass::prelude::BinImpl;
@@ -16,7 +16,7 @@ mod imp {
#[derive(Debug, Default, CompositeTemplate)]
#[template(resource = "/org/gnome/FractalNext/login.ui")]
- pub struct FrctlLogin {
+ pub struct Login {
#[template_child]
pub next_stack: TemplateChild<gtk::Stack>,
#[template_child]
@@ -36,9 +36,9 @@ mod imp {
}
#[glib::object_subclass]
- impl ObjectSubclass for FrctlLogin {
- const NAME: &'static str = "FrctlLogin";
- type Type = super::FrctlLogin;
+ impl ObjectSubclass for Login {
+ const NAME: &'static str = "Login";
+ type Type = super::Login;
type ParentType = adw::Bin;
fn class_init(klass: &mut Self::Class) {
@@ -52,12 +52,12 @@ mod imp {
}
}
- impl ObjectImpl for FrctlLogin {
+ impl ObjectImpl for Login {
fn signals() -> &'static [Signal] {
static SIGNALS: Lazy<Vec<Signal>> = Lazy::new(|| {
vec![Signal::builder(
"new-session",
- &[FrctlSession::static_type().into()],
+ &[Session::static_type().into()],
<()>::static_type().into(),
)
.build()]
@@ -79,23 +79,23 @@ mod imp {
}
}
- impl WidgetImpl for FrctlLogin {}
+ impl WidgetImpl for Login {}
- impl BinImpl for FrctlLogin {}
+ impl BinImpl for Login {}
}
glib::wrapper! {
- pub struct FrctlLogin(ObjectSubclass<imp::FrctlLogin>)
+ pub struct Login(ObjectSubclass<imp::Login>)
@extends gtk::Widget, adw::Bin, @implements gtk::Accessible;
}
-impl FrctlLogin {
+impl Login {
pub fn new() -> Self {
- glib::Object::new(&[]).expect("Failed to create FrctlLogin")
+ glib::Object::new(&[]).expect("Failed to create Login")
}
fn enable_next_action(&self) {
- let priv_ = imp::FrctlLogin::from_instance(&self);
+ let priv_ = imp::Login::from_instance(&self);
let homeserver = priv_.homeserver_entry.get_text();
let username = priv_.username_entry.get_text_length();
let password = priv_.password_entry.get_text().len();
@@ -114,14 +114,14 @@ impl FrctlLogin {
}
fn login(&self) {
- let priv_ = imp::FrctlLogin::from_instance(&self);
+ let priv_ = imp::Login::from_instance(&self);
let homeserver = priv_.homeserver_entry.get_text().to_string();
let username = priv_.username_entry.get_text().to_string();
let password = priv_.password_entry.get_text().to_string();
self.freeze();
- let session = FrctlSession::new(homeserver);
+ let session = Session::new(homeserver);
self.setup_session(&session);
session.login_with_password(username, password);
}
@@ -130,7 +130,7 @@ impl FrctlLogin {
let sessions = secret::restore_sessions()?;
for (homeserver, stored_session) in sessions {
- let session = FrctlSession::new(homeserver.to_string());
+ let session = Session::new(homeserver.to_string());
self.setup_session(&session);
session.login_with_previous_session(stored_session);
}
@@ -138,10 +138,10 @@ impl FrctlLogin {
Ok(())
}
- fn setup_session(&self, session: &FrctlSession) {
+ fn setup_session(&self, session: &Session) {
session.connect_ready(clone!(@weak self as obj, @strong session => move |_| {
if let Some(error) = session.get_error() {
- let error_message = &imp::FrctlLogin::from_instance(&obj).error_message;
+ let error_message = &imp::Login::from_instance(&obj).error_message;
// TODO: show more specific error
error_message.set_text(&gettext("⚠️ The Login failed."));
error_message.show();
@@ -157,7 +157,7 @@ impl FrctlLogin {
}
fn clean(&self) {
- let priv_ = imp::FrctlLogin::from_instance(&self);
+ let priv_ = imp::Login::from_instance(&self);
priv_.homeserver_entry.set_text("");
priv_.username_entry.set_text("");
priv_.password_entry.set_text("");
@@ -165,7 +165,7 @@ impl FrctlLogin {
}
fn freeze(&self) {
- let priv_ = imp::FrctlLogin::from_instance(&self);
+ let priv_ = imp::Login::from_instance(&self);
self.action_set_enabled("login.next", false);
priv_
@@ -175,20 +175,20 @@ impl FrctlLogin {
}
fn unfreeze(&self) {
- let priv_ = imp::FrctlLogin::from_instance(&self);
+ let priv_ = imp::Login::from_instance(&self);
self.action_set_enabled("login.next", true);
priv_.next_stack.set_visible_child(&priv_.next_label.get());
priv_.main_stack.set_sensitive(true);
}
- pub fn connect_new_session<F: Fn(&Self, &FrctlSession) + 'static>(
+ pub fn connect_new_session<F: Fn(&Self, &Session) + 'static>(
&self,
f: F,
) -> glib::SignalHandlerId {
self.connect_local("new-session", true, move |values| {
let obj = values[0].get::<Self>().unwrap().unwrap();
- let session = values[1].get::<FrctlSession>().unwrap().unwrap();
+ let session = values[1].get::<Session>().unwrap().unwrap();
f(&obj, &session);
diff --git a/src/main.rs b/src/main.rs
index d88fe89b..a8a194a4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,10 +7,10 @@ mod secret;
mod session;
mod window;
-use self::application::FrctlApplication;
-use self::login::FrctlLogin;
-use self::session::FrctlSession;
-use self::window::FrctlWindow;
+use self::application::Application;
+use self::login::Login;
+use self::session::Session;
+use self::window::Window;
use adw;
use config::{GETTEXT_PACKAGE, LOCALEDIR, RESOURCES_FILE};
@@ -47,6 +47,6 @@ fn main() {
.unwrap()
.add_resource_path("/org/gnome/FractalNext/icons");
- let app = FrctlApplication::new();
+ let app = Application::new();
app.run();
}
diff --git a/src/session/content.rs b/src/session/content.rs
index eab6b0b9..1aaedd3b 100644
--- a/src/session/content.rs
+++ b/src/session/content.rs
@@ -12,7 +12,7 @@ mod imp {
#[derive(Debug, CompositeTemplate)]
#[template(resource = "/org/gnome/FractalNext/content.ui")]
- pub struct FrctlContent {
+ pub struct Content {
pub compact: Cell<bool>,
#[template_child]
pub headerbar: TemplateChild<adw::HeaderBar>,
@@ -21,9 +21,9 @@ mod imp {
}
#[glib::object_subclass]
- impl ObjectSubclass for FrctlContent {
- const NAME: &'static str = "FrctlContent";
- type Type = super::FrctlContent;
+ impl ObjectSubclass for Content {
+ const NAME: &'static str = "Content";
+ type Type = super::Content;
type ParentType = adw::Bin;
fn new() -> Self {
@@ -43,7 +43,7 @@ mod imp {
}
}
- impl ObjectImpl for FrctlContent {
+ impl ObjectImpl for Content {
fn properties() -> &'static [glib::ParamSpec] {
use once_cell::sync::Lazy;
static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
@@ -90,18 +90,18 @@ mod imp {
}
}
- impl WidgetImpl for FrctlContent {}
- impl BinImpl for FrctlContent {}
+ impl WidgetImpl for Content {}
+ impl BinImpl for Content {}
}
glib::wrapper! {
- pub struct FrctlContent(ObjectSubclass<imp::FrctlContent>)
+ pub struct Content(ObjectSubclass<imp::Content>)
@extends gtk::Widget, adw::Bin, @implements gtk::Accessible;
}
-impl FrctlContent {
+impl Content {
pub fn new() -> Self {
- glib::Object::new(&[]).expect("Failed to create FrctlContent")
+ glib::Object::new(&[]).expect("Failed to create Content")
}
/// Sets up the required channel to recive async updates from the `Client`
diff --git a/src/session/mod.rs b/src/session/mod.rs
index bcc01650..34410c35 100644
--- a/src/session/mod.rs
+++ b/src/session/mod.rs
@@ -2,8 +2,8 @@ mod content;
mod sidebar;
mod supervisor;
-use self::content::FrctlContent;
-use self::sidebar::FrctlSidebar;
+use self::content::Content;
+use self::sidebar::Sidebar;
use self::supervisor::Supervisor;
use crate::secret;
@@ -31,11 +31,11 @@ mod imp {
#[derive(Debug, CompositeTemplate)]
#[template(resource = "/org/gnome/FractalNext/session.ui")]
- pub struct FrctlSession {
+ pub struct Session {
#[template_child]
- pub sidebar: TemplateChild<FrctlSidebar>,
+ pub sidebar: TemplateChild<Sidebar>,
#[template_child]
- pub content: TemplateChild<FrctlContent>,
+ pub content: TemplateChild<Content>,
pub homeserver: OnceCell<String>,
/// Contains the error if something went wrong
pub error: RefCell<Option<matrix_sdk::Error>>,
@@ -43,9 +43,9 @@ mod imp {
}
#[glib::object_subclass]
- impl ObjectSubclass for FrctlSession {
- const NAME: &'static str = "FrctlSession";
- type Type = super::FrctlSession;
+ impl ObjectSubclass for Session {
+ const NAME: &'static str = "Session";
+ type Type = super::Session;
type ParentType = adw::Bin;
fn new() -> Self {
@@ -67,7 +67,7 @@ mod imp {
}
}
- impl ObjectImpl for FrctlSession {
+ impl ObjectImpl for Session {
fn properties() -> &'static [glib::ParamSpec] {
static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
vec![glib::ParamSpec::string(
@@ -123,11 +123,11 @@ mod imp {
self.parent_constructed(obj);
}
}
- impl WidgetImpl for FrctlSession {}
- impl BinImpl for FrctlSession {}
+ impl WidgetImpl for Session {}
+ impl BinImpl for Session {}
}
-/// Enum containing the supported methods to create a `FrctlSession`.
+/// Enum containing the supported methods to create a `Session`.
#[derive(Clone, Debug)]
enum CreationMethod {
/// Restore a previous session: `matrix_sdk::Session`
@@ -137,13 +137,13 @@ enum CreationMethod {
}
glib::wrapper! {
- pub struct FrctlSession(ObjectSubclass<imp::FrctlSession>)
+ pub struct Session(ObjectSubclass<imp::Session>)
@extends gtk::Widget, adw::Bin, @implements gtk::Accessible;
}
-impl FrctlSession {
+impl Session {
pub fn new(homeserver: String) -> Self {
- glib::Object::new(&[("homeserver", &homeserver)]).expect("Failed to create FrctlSession")
+ glib::Object::new(&[("homeserver", &homeserver)]).expect("Failed to create Session")
}
pub fn login_with_password(&self, username: String, password: String) {
@@ -157,7 +157,7 @@ impl FrctlSession {
}
fn login(&self, method: CreationMethod) {
- let priv_ = &imp::FrctlSession::from_instance(self);
+ let priv_ = &imp::Session::from_instance(self);
let homeserver = priv_.homeserver.get().unwrap();
let sender = self.setup();
@@ -228,7 +228,7 @@ impl FrctlSession {
clone!(@weak self as obj => move |result| {
match result {
Err(error) => {
- let priv_ = &imp::FrctlSession::from_instance(&obj);
+ let priv_ = &imp::Session::from_instance(&obj);
priv_.error.replace(Some(error));
}
Ok(Some(response)) => {
@@ -257,7 +257,7 @@ impl FrctlSession {
/// Note that the `Store` currently doesn't store all events, therefore, we arn't really
/// loading much via this function.
pub fn load(&self) {
- let priv_ = imp::FrctlSession::from_instance(self);
+ let priv_ = imp::Session::from_instance(self);
priv_.sidebar.load(&priv_.client.get().unwrap());
}
@@ -265,7 +265,7 @@ impl FrctlSession {
/// on a successful login this will be `None`.
/// Unfortunatly it's not possible to connect the Error direclty to the `ready` signals.
pub fn get_error(&self) -> Option<matrix_sdk::Error> {
- let priv_ = &imp::FrctlSession::from_instance(self);
+ let priv_ = &imp::Session::from_instance(self);
priv_.error.take()
}
@@ -281,7 +281,7 @@ impl FrctlSession {
}
fn store_session(&self, session: matrix_sdk::Session) -> Result<(), secret_service::Error> {
- let priv_ = &imp::FrctlSession::from_instance(self);
+ let priv_ = &imp::Session::from_instance(self);
let homeserver = priv_.homeserver.get().unwrap();
secret::store_session(homeserver, session)
}
diff --git a/src/session/sidebar/category.rs b/src/session/sidebar/category.rs
index b7f1e098..81422e44 100644
--- a/src/session/sidebar/category.rs
+++ b/src/session/sidebar/category.rs
@@ -1,9 +1,9 @@
-use crate::session::sidebar::FrctlRoom;
+use crate::session::sidebar::Room;
use gettextrs::gettext;
use gtk::subclass::prelude::*;
use gtk::{self, gio, glib, prelude::*};
use matrix_sdk::{identifiers::RoomId, Client};
-use matrix_sdk::{room::Room, RoomType};
+use matrix_sdk::{room::Room as MatrixRoom, RoomType};
// TODO: do we also want the categorie `People` and a custom categorie support?
#[derive(Debug, Eq, PartialEq, Clone, Copy, glib::GEnum)]
@@ -55,9 +55,9 @@ mod imp {
use std::collections::HashMap;
#[derive(Debug)]
- pub struct FrctlCategory {
+ pub struct Category {
pub client: OnceCell<Client>,
- pub map: RefCell<HashMap<RoomId, (u32, FrctlRoom)>>,
+ pub map: RefCell<HashMap<RoomId, (u32, Room)>>,
pub list: RefCell<Vec<RoomId>>,
pub name: Cell<CategoryName>,
pub expanded: Cell<bool>,
@@ -65,9 +65,9 @@ mod imp {
}
#[glib::object_subclass]
- impl ObjectSubclass for FrctlCategory {
- const NAME: &'static str = "FrctlCategory";
- type Type = super::FrctlCategory;
+ impl ObjectSubclass for Category {
+ const NAME: &'static str = "Category";
+ type Type = super::Category;
type ParentType = glib::Object;
type Interfaces = (gio::ListModel, gtk::SelectionModel);
@@ -83,7 +83,7 @@ mod imp {
}
}
- impl ObjectImpl for FrctlCategory {
+ impl ObjectImpl for Category {
fn properties() -> &'static [glib::ParamSpec] {
use once_cell::sync::Lazy;
static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
@@ -147,9 +147,9 @@ mod imp {
}
}
- impl ListModelImpl for FrctlCategory {
+ impl ListModelImpl for Category {
fn get_item_type(&self, _list_model: &Self::Type) -> glib::Type {
- FrctlRoom::static_type()
+ Room::static_type()
}
fn get_n_items(&self, _list_model: &Self::Type) -> u32 {
self.list.borrow().len() as u32
@@ -167,7 +167,7 @@ mod imp {
}
}
}
- impl SelectionModelImpl for FrctlCategory {
+ impl SelectionModelImpl for Category {
fn get_selection_in_range(
&self,
_model: &Self::Type,
@@ -193,23 +193,22 @@ mod imp {
}
glib::wrapper! {
- pub struct FrctlCategory(ObjectSubclass<imp::FrctlCategory>)
+ pub struct Category(ObjectSubclass<imp::Category>)
@implements gio::ListModel, gtk::SelectionModel;
}
-// TODO: sort the rooms in FrctlCategory, i guess we want last active room first
-impl FrctlCategory {
+// TODO: sort the rooms in Category, i guess we want last active room first
+impl Category {
pub fn new(client: Client, name: CategoryName) -> Self {
- let obj =
- glib::Object::new(&[("display-name", &name)]).expect("Failed to create FrctlCategory");
+ let obj = glib::Object::new(&[("display-name", &name)]).expect("Failed to create Category");
// We don't need to set the client as a GObject property since it's used only internally
- let priv_ = imp::FrctlCategory::from_instance(&obj);
+ let priv_ = imp::Category::from_instance(&obj);
priv_.client.set(client).unwrap();
obj
}
pub fn select(&self, position: u32) {
- let priv_ = imp::FrctlCategory::from_instance(self);
+ let priv_ = imp::Category::from_instance(self);
let old_position = priv_.selected.get();
if position == old_position {
@@ -234,10 +233,10 @@ impl FrctlCategory {
}
pub fn update(&self, room_id: &RoomId) {
- let priv_ = imp::FrctlCategory::from_instance(self);
+ let priv_ = imp::Category::from_instance(self);
let category_type = priv_.name.get().get_room_type();
let client = priv_.client.get().unwrap();
- let room: Option<Room> = match category_type {
+ let room: Option<MatrixRoom> = match category_type {
RoomType::Invited => client.get_invited_room(room_id).map(Into::into),
RoomType::Joined => client.get_joined_room(room_id).map(Into::into),
RoomType::Left => client.get_left_room(room_id).map(Into::into),
@@ -263,10 +262,10 @@ impl FrctlCategory {
}
}
- pub fn append(&self, room: &Room) {
- let priv_ = imp::FrctlCategory::from_instance(self);
+ pub fn append(&self, room: &MatrixRoom) {
+ let priv_ = imp::Category::from_instance(self);
let room_id = room.room_id();
- let room_obj = FrctlRoom::new(room);
+ let room_obj = Room::new(room);
let index = {
let mut map = priv_.map.borrow_mut();
let mut list = priv_.list.borrow_mut();
@@ -278,8 +277,8 @@ impl FrctlCategory {
self.items_changed(index as u32, 0, 1);
}
- pub fn append_batch(&self, rooms: Vec<Room>) {
- let priv_ = imp::FrctlCategory::from_instance(self);
+ pub fn append_batch(&self, rooms: Vec<MatrixRoom>) {
+ let priv_ = imp::Category::from_instance(self);
let index = {
let mut map = priv_.map.borrow_mut();
let mut list = priv_.list.borrow_mut();
@@ -287,7 +286,7 @@ impl FrctlCategory {
let mut position = index;
for room in &rooms {
let room_id = room.room_id();
- let room_obj = FrctlRoom::new(room);
+ let room_obj = Room::new(room);
map.insert(room_id.clone(), (position as u32, room_obj));
list.push(room_id.clone());
position += 1;
diff --git a/src/session/sidebar/category_list.rs b/src/session/sidebar/category_list.rs
index 95c06af0..feb24648 100644
--- a/src/session/sidebar/category_list.rs
+++ b/src/session/sidebar/category_list.rs
@@ -1,4 +1,4 @@
-use crate::session::sidebar::FrctlCategory;
+use crate::session::sidebar::Category;
use gtk::subclass::prelude::*;
use gtk::{self, gio, glib, glib::clone, prelude::*};
use matrix_sdk::identifiers::RoomId;
@@ -9,23 +9,23 @@ mod imp {
use std::cell::RefCell;
#[derive(Debug, Default)]
- pub struct FrctlCategoryList {
- pub list: RefCell<Vec<FrctlCategory>>,
+ pub struct CategoryList {
+ pub list: RefCell<Vec<Category>>,
}
#[glib::object_subclass]
- impl ObjectSubclass for FrctlCategoryList {
- const NAME: &'static str = "FrctlCategoryList";
- type Type = super::FrctlCategoryList;
+ impl ObjectSubclass for CategoryList {
+ const NAME: &'static str = "CategoryList";
+ type Type = super::CategoryList;
type ParentType = glib::Object;
type Interfaces = (gio::ListModel,);
}
- impl ObjectImpl for FrctlCategoryList {}
+ impl ObjectImpl for CategoryList {}
- impl ListModelImpl for FrctlCategoryList {
+ impl ListModelImpl for CategoryList {
fn get_item_type(&self, _list_model: &Self::Type) -> glib::Type {
- FrctlCategory::static_type()
+ Category::static_type()
}
fn get_n_items(&self, _list_model: &Self::Type) -> u32 {
self.list.borrow().len() as u32
@@ -41,27 +41,27 @@ mod imp {
}
glib::wrapper! {
- pub struct FrctlCategoryList(ObjectSubclass<imp::FrctlCategoryList>)
+ pub struct CategoryList(ObjectSubclass<imp::CategoryList>)
@implements gio::ListModel;
}
// TODO allow moving between categories
// TODO allow selection only in one category
-impl FrctlCategoryList {
+impl CategoryList {
pub fn new() -> Self {
- glib::Object::new(&[]).expect("Failed to create FrctlCategoryList")
+ glib::Object::new(&[]).expect("Failed to create CategoryList")
}
pub fn update(&self, room_id: &RoomId) {
- let priv_ = imp::FrctlCategoryList::from_instance(self);
+ let priv_ = imp::CategoryList::from_instance(self);
let list = priv_.list.borrow();
for category in list.iter() {
category.update(room_id);
}
}
- pub fn append(&self, category: FrctlCategory) {
- let priv_ = imp::FrctlCategoryList::from_instance(self);
+ pub fn append(&self, category: Category) {
+ let priv_ = imp::CategoryList::from_instance(self);
let index = {
let mut list = priv_.list.borrow_mut();
category.connect_selection_changed(
@@ -77,8 +77,8 @@ impl FrctlCategoryList {
self.items_changed(index as u32, 0, 1);
}
- fn unselect_other_lists(&self, category: &FrctlCategory) {
- let priv_ = imp::FrctlCategoryList::from_instance(self);
+ fn unselect_other_lists(&self, category: &Category) {
+ let priv_ = imp::CategoryList::from_instance(self);
let list = priv_.list.borrow();
for item in list.iter() {
@@ -88,8 +88,8 @@ impl FrctlCategoryList {
}
}
- pub fn append_batch(&self, batch: &[FrctlCategory]) {
- let priv_ = imp::FrctlCategoryList::from_instance(self);
+ pub fn append_batch(&self, batch: &[Category]) {
+ let priv_ = imp::CategoryList::from_instance(self);
let index = {
let mut list = priv_.list.borrow_mut();
let index = list.len();
diff --git a/src/session/sidebar/category_row.rs b/src/session/sidebar/category_row.rs
index 936d6e5d..fa57de62 100644
--- a/src/session/sidebar/category_row.rs
+++ b/src/session/sidebar/category_row.rs
@@ -11,7 +11,7 @@ mod imp {
#[derive(Debug, CompositeTemplate)]
#[template(resource = "/org/gnome/FractalNext/sidebar-category-row.ui")]
- pub struct FrctlSidebarCategoryRow {
+ pub struct SidebarCategoryRow {
#[template_child]
pub display_name: TemplateChild<gtk::Label>,
#[template_child]
@@ -19,9 +19,9 @@ mod imp {
}
#[glib::object_subclass]
- impl ObjectSubclass for FrctlSidebarCategoryRow {
- const NAME: &'static str = "FrctlSidebarCategoryRow";
- type Type = super::FrctlSidebarCategoryRow;
+ impl ObjectSubclass for SidebarCategoryRow {
+ const NAME: &'static str = "SidebarCategoryRow";
+ type Type = super::SidebarCategoryRow;
type ParentType = adw::Bin;
fn new() -> Self {
@@ -40,7 +40,7 @@ mod imp {
}
}
- impl ObjectImpl for FrctlSidebarCategoryRow {
+ impl ObjectImpl for SidebarCategoryRow {
fn properties() -> &'static [glib::ParamSpec] {
use once_cell::sync::Lazy;
static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
@@ -101,17 +101,17 @@ mod imp {
}
}
- impl WidgetImpl for FrctlSidebarCategoryRow {}
- impl BinImpl for FrctlSidebarCategoryRow {}
+ impl WidgetImpl for SidebarCategoryRow {}
+ impl BinImpl for SidebarCategoryRow {}
}
glib::wrapper! {
- pub struct FrctlSidebarCategoryRow(ObjectSubclass<imp::FrctlSidebarCategoryRow>)
+ pub struct SidebarCategoryRow(ObjectSubclass<imp::SidebarCategoryRow>)
@extends gtk::Widget, adw::Bin, @implements gtk::Accessible;
}
-impl FrctlSidebarCategoryRow {
+impl SidebarCategoryRow {
pub fn new() -> Self {
- glib::Object::new(&[]).expect("Failed to create FrctlSidebarCategoryRow")
+ glib::Object::new(&[]).expect("Failed to create SidebarCategoryRow")
}
}
diff --git a/src/session/sidebar/mod.rs b/src/session/sidebar/mod.rs
index 5f892cb2..36ccf604 100644
--- a/src/session/sidebar/mod.rs
+++ b/src/session/sidebar/mod.rs
@@ -4,11 +4,11 @@ mod category_row;
mod room;
mod room_row;
-use self::category::{CategoryName, FrctlCategory};
-use self::category_list::FrctlCategoryList;
-use self::category_row::FrctlSidebarCategoryRow;
-use self::room::{FrctlRoom, HighlightFlags};
-use self::room_row::FrctlSidebarRoomRow;
+use self::category::{Category, CategoryName};
+use self::category_list::CategoryList;
+use self::category_row::SidebarCategoryRow;
+use self::room::{HighlightFlags, Room};
+use self::room_row::SidebarRoomRow;
use adw;
use adw::subclass::prelude::BinImpl;
@@ -24,7 +24,7 @@ mod imp {
#[derive(Debug, CompositeTemplate)]
#[template(resource = "/org/gnome/FractalNext/sidebar.ui")]
- pub struct FrctlSidebar {
+ pub struct Sidebar {
pub compact: Cell<bool>,
#[template_child]
pub headerbar: TemplateChild<adw::HeaderBar>,
@@ -33,9 +33,9 @@ mod imp {
}
#[glib::object_subclass]
- impl ObjectSubclass for FrctlSidebar {
- const NAME: &'static str = "FrctlSidebar";
- type Type = super::FrctlSidebar;
+ impl ObjectSubclass for Sidebar {
+ const NAME: &'static str = "Sidebar";
+ type Type = super::Sidebar;
type ParentType = adw::Bin;
fn new() -> Self {
@@ -47,9 +47,9 @@ mod imp {
}
fn class_init(klass: &mut Self::Class) {
- FrctlCategoryList::static_type();
- FrctlSidebarRoomRow::static_type();
- FrctlSidebarCategoryRow::static_type();
+ CategoryList::static_type();
+ SidebarRoomRow::static_type();
+ SidebarCategoryRow::static_type();
Self::bind_template(klass);
}
@@ -58,7 +58,7 @@ mod imp {
}
}
- impl ObjectImpl for FrctlSidebar {
+ impl ObjectImpl for Sidebar {
fn properties() -> &'static [glib::ParamSpec] {
use once_cell::sync::Lazy;
static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
@@ -105,18 +105,18 @@ mod imp {
}
}
- impl WidgetImpl for FrctlSidebar {}
- impl BinImpl for FrctlSidebar {}
+ impl WidgetImpl for Sidebar {}
+ impl BinImpl for Sidebar {}
}
glib::wrapper! {
- pub struct FrctlSidebar(ObjectSubclass<imp::FrctlSidebar>)
+ pub struct Sidebar(ObjectSubclass<imp::Sidebar>)
@extends gtk::Widget, adw::Bin, @implements gtk::Accessible;
}
-impl FrctlSidebar {
+impl Sidebar {
pub fn new() -> Self {
- glib::Object::new(&[]).expect("Failed to create FrctlSidebar")
+ glib::Object::new(&[]).expect("Failed to create Sidebar")
}
/// Sets up the required channel to recive async updates from the `Client`
@@ -137,9 +137,9 @@ impl FrctlSidebar {
pub fn load(&self, client: &Client) {
let list = self.get_list_model();
// TODO: Add list for user defined categories e.g. favorite
- let invited = FrctlCategory::new(client.clone(), CategoryName::Invited);
- let joined = FrctlCategory::new(client.clone(), CategoryName::Normal);
- let left = FrctlCategory::new(client.clone(), CategoryName::Left);
+ let invited = Category::new(client.clone(), CategoryName::Invited);
+ let joined = Category::new(client.clone(), CategoryName::Normal);
+ let left = Category::new(client.clone(), CategoryName::Left);
invited.append_batch(client.invited_rooms().into_iter().map(Into::into).collect());
joined.append_batch(client.joined_rooms().into_iter().map(Into::into).collect());
@@ -148,8 +148,8 @@ impl FrctlSidebar {
list.append_batch(&[invited, joined, left]);
}
- fn get_list_model(&self) -> FrctlCategoryList {
- imp::FrctlSidebar::from_instance(self)
+ fn get_list_model(&self) -> CategoryList {
+ imp::Sidebar::from_instance(self)
.listview
.get_model()
.unwrap()
@@ -157,7 +157,7 @@ impl FrctlSidebar {
.unwrap()
.get_model()
.unwrap()
- .downcast::<FrctlCategoryList>()
+ .downcast::<CategoryList>()
.unwrap()
}
}
diff --git a/src/session/sidebar/room.rs b/src/session/sidebar/room.rs
index 5b53cd6d..4b1f09ac 100644
--- a/src/session/sidebar/room.rs
+++ b/src/session/sidebar/room.rs
@@ -2,7 +2,7 @@ use gtk::subclass::prelude::*;
use gtk::{self, prelude::*};
use gtk::{gio, glib};
use gtk_macros::spawn;
-use matrix_sdk::room::Room;
+use matrix_sdk::room::Room as MatrixRoom;
#[glib::gflags("HighlightFlags")]
pub enum HighlightFlags {
@@ -28,16 +28,16 @@ mod imp {
use std::cell::RefCell;
#[derive(Debug)]
- pub struct FrctlRoom {
- pub room: OnceCell<Room>,
+ pub struct Room {
+ pub room: OnceCell<MatrixRoom>,
pub name: RefCell<Option<String>>,
pub avatar: RefCell<Option<gio::LoadableIcon>>,
}
#[glib::object_subclass]
- impl ObjectSubclass for FrctlRoom {
- const NAME: &'static str = "FrctlRoom";
- type Type = super::FrctlRoom;
+ impl ObjectSubclass for Room {
+ const NAME: &'static str = "Room";
+ type Type = super::Room;
type ParentType = glib::Object;
fn new() -> Self {
@@ -49,7 +49,7 @@ mod imp {
}
}
- impl ObjectImpl for FrctlRoom {
+ impl ObjectImpl for Room {
fn properties() -> &'static [glib::ParamSpec] {
use once_cell::sync::Lazy;
static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
@@ -157,17 +157,16 @@ mod imp {
}
glib::wrapper! {
- pub struct FrctlRoom(ObjectSubclass<imp::FrctlRoom>);
+ pub struct Room(ObjectSubclass<imp::Room>);
}
#[derive(Clone, Debug, glib::GBoxed)]
#[gboxed(type_name = "BoxedRoom")]
-struct BoxedRoom(Room);
+struct BoxedRoom(MatrixRoom);
-impl FrctlRoom {
- pub fn new(room: &Room) -> Self {
- glib::Object::new(&[("room", &BoxedRoom(room.clone()))])
- .expect("Failed to create FrctlRoom")
+impl Room {
+ pub fn new(room: &MatrixRoom) -> Self {
+ glib::Object::new(&[("room", &BoxedRoom(room.clone()))]).expect("Failed to create Room")
}
/// This should be called when any field on the Room has changed
@@ -182,7 +181,7 @@ impl FrctlRoom {
let obj = self.downgrade();
spawn!(async move {
if let Some(obj) = obj.upgrade() {
- let priv_ = imp::FrctlRoom::from_instance(&obj);
+ let priv_ = imp::Room::from_instance(&obj);
let name = &priv_.name;
let new_name = priv_.room.get().unwrap().display_name().await.ok();
diff --git a/src/session/sidebar/room_row.rs b/src/session/sidebar/room_row.rs
index 90a8f911..beff53f8 100644
--- a/src/session/sidebar/room_row.rs
+++ b/src/session/sidebar/room_row.rs
@@ -11,7 +11,7 @@ mod imp {
#[derive(Debug, CompositeTemplate)]
#[template(resource = "/org/gnome/FractalNext/sidebar-room-row.ui")]
- pub struct FrctlSidebarRoomRow {
+ pub struct SidebarRoomRow {
#[template_child]
pub avatar: TemplateChild<adw::Avatar>,
#[template_child]
@@ -21,9 +21,9 @@ mod imp {
}
#[glib::object_subclass]
- impl ObjectSubclass for FrctlSidebarRoomRow {
- const NAME: &'static str = "FrctlSidebarRoomRow";
- type Type = super::FrctlSidebarRoomRow;
+ impl ObjectSubclass for SidebarRoomRow {
+ const NAME: &'static str = "SidebarRoomRow";
+ type Type = super::SidebarRoomRow;
type ParentType = adw::Bin;
fn new() -> Self {
@@ -43,7 +43,7 @@ mod imp {
}
}
- impl ObjectImpl for FrctlSidebarRoomRow {
+ impl ObjectImpl for SidebarRoomRow {
fn properties() -> &'static [glib::ParamSpec] {
use once_cell::sync::Lazy;
static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
@@ -148,17 +148,17 @@ mod imp {
}
}
- impl WidgetImpl for FrctlSidebarRoomRow {}
- impl BinImpl for FrctlSidebarRoomRow {}
+ impl WidgetImpl for SidebarRoomRow {}
+ impl BinImpl for SidebarRoomRow {}
}
glib::wrapper! {
- pub struct FrctlSidebarRoomRow(ObjectSubclass<imp::FrctlSidebarRoomRow>)
+ pub struct SidebarRoomRow(ObjectSubclass<imp::SidebarRoomRow>)
@extends gtk::Widget, adw::Bin, @implements gtk::Accessible;
}
-impl FrctlSidebarRoomRow {
+impl SidebarRoomRow {
pub fn new() -> Self {
- glib::Object::new(&[]).expect("Failed to create FrctlSidebarRoomRow")
+ glib::Object::new(&[]).expect("Failed to create SidebarRoomRow")
}
}
diff --git a/src/window.rs b/src/window.rs
index 05d56a3c..4ae633ee 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -1,7 +1,7 @@
use crate::config::{APP_ID, PROFILE};
-use crate::FrctlApplication;
-use crate::FrctlLogin;
-use crate::FrctlSession;
+use crate::Application;
+use crate::Login;
+use crate::Session;
use adw::subclass::prelude::AdwApplicationWindowImpl;
use glib::signal::Inhibit;
use gtk::subclass::prelude::*;
@@ -15,18 +15,18 @@ mod imp {
#[derive(Debug, CompositeTemplate)]
#[template(resource = "/org/gnome/FractalNext/window.ui")]
- pub struct FrctlWindow {
+ pub struct Window {
#[template_child]
pub main_stack: TemplateChild<gtk::Stack>,
#[template_child]
- pub login: TemplateChild<FrctlLogin>,
+ pub login: TemplateChild<Login>,
pub settings: gio::Settings,
}
#[glib::object_subclass]
- impl ObjectSubclass for FrctlWindow {
- const NAME: &'static str = "FrctlWindow";
- type Type = super::FrctlWindow;
+ impl ObjectSubclass for Window {
+ const NAME: &'static str = "Window";
+ type Type = super::Window;
type ParentType = adw::ApplicationWindow;
fn new() -> Self {
@@ -46,7 +46,7 @@ mod imp {
}
}
- impl ObjectImpl for FrctlWindow {
+ impl ObjectImpl for Window {
fn constructed(&self, obj: &Self::Type) {
self.parent_constructed(obj);
@@ -73,7 +73,7 @@ mod imp {
}
}
- impl WindowImpl for FrctlWindow {
+ impl WindowImpl for Window {
// save window state on delete event
fn close_request(&self, obj: &Self::Type) -> Inhibit {
if let Err(err) = obj.save_window_size() {
@@ -83,30 +83,30 @@ mod imp {
}
}
- impl WidgetImpl for FrctlWindow {}
- impl ApplicationWindowImpl for FrctlWindow {}
- impl AdwApplicationWindowImpl for FrctlWindow {}
+ impl WidgetImpl for Window {}
+ impl ApplicationWindowImpl for Window {}
+ impl AdwApplicationWindowImpl for Window {}
}
glib::wrapper! {
- pub struct FrctlWindow(ObjectSubclass<imp::FrctlWindow>)
+ pub struct Window(ObjectSubclass<imp::Window>)
@extends gtk::Widget, gtk::Window, gtk::ApplicationWindow, adw::ApplicationWindow, @implements
gio::ActionMap, gio::ActionGroup;
}
-impl FrctlWindow {
- pub fn new(app: &FrctlApplication) -> Self {
+impl Window {
+ pub fn new(app: &Application) -> Self {
glib::Object::new(&[("application", &Some(app)), ("icon-name", &Some(APP_ID))])
- .expect("Failed to create FrctlWindow")
+ .expect("Failed to create Window")
}
- pub fn add_session(&self, session: &FrctlSession) {
- let priv_ = &imp::FrctlWindow::from_instance(self);
+ pub fn add_session(&self, session: &Session) {
+ let priv_ = &imp::Window::from_instance(self);
priv_.main_stack.add_child(session);
priv_.main_stack.set_visible_child(session);
}
pub fn save_window_size(&self) -> Result<(), glib::BoolError> {
- let settings = &imp::FrctlWindow::from_instance(self).settings;
+ let settings = &imp::Window::from_instance(self).settings;
let size = self.get_default_size();
@@ -119,7 +119,7 @@ impl FrctlWindow {
}
fn load_window_size(&self) {
- let settings = &imp::FrctlWindow::from_instance(self).settings;
+ let settings = &imp::Window::from_instance(self).settings;
let width = settings.get_int("window-width");
let height = settings.get_int("window-height");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
