From 7a424fcdb9f69a5136215c6660d34a6a45a0d2fb Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Sat, 18 Aug 2018 06:20:39 +0300 Subject: [PATCH] main_window.ui: Remove unused search widget There is no point to carry this widget in the ui file until such functionality is implemented. --- fractal-gtk/res/ui/main_window.ui | 73 --------------------------- fractal-gtk/src/app/actions.rs | 1 - fractal-gtk/src/app/backend_loop.rs | 3 -- fractal-gtk/src/app/connect/mod.rs | 3 -- fractal-gtk/src/app/connect/search.rs | 21 -------- fractal-gtk/src/appop/room.rs | 25 --------- 6 files changed, 126 deletions(-) delete mode 100644 fractal-gtk/src/app/connect/search.rs diff --git a/fractal-gtk/res/ui/main_window.ui b/fractal-gtk/res/ui/main_window.ui index 8e86cf07..5741d975 100644 --- a/fractal-gtk/res/ui/main_window.ui +++ b/fractal-gtk/res/ui/main_window.ui @@ -117,79 +117,6 @@ True False vertical - - - True - False - - - True - False - 6 - 6 - 6 - - - True - True - edit-find-symbolic - False - False - - - True - True - 0 - - - - - True - False - - - gtk-find - True - True - True - True - - - - normal - normal - - - - - True - False - True - - - searching - Searching - 1 - - - - - False - True - 1 - - - - - - - False - True - 0 - - True diff --git a/fractal-gtk/src/app/actions.rs b/fractal-gtk/src/app/actions.rs index 8211ec2d..0b3c2176 100644 --- a/fractal-gtk/src/app/actions.rs +++ b/fractal-gtk/src/app/actions.rs @@ -63,7 +63,6 @@ impl App { room.connect_activate(clone!(op => move |_, _| op.lock().unwrap().show_room_settings() )); inv.connect_activate(clone!(op => move |_, _| op.lock().unwrap().show_invite_user_dialog() )); chat.connect_activate(clone!(op => move |_, _| op.lock().unwrap().show_direct_chat_dialog() )); - search.connect_activate(clone!(op => move |_, _| op.lock().unwrap().toggle_search() )); leave.connect_activate(clone!(op => move |_, _| op.lock().unwrap().leave_active_room() )); newr.connect_activate(clone!(op => move |_, _| op.lock().unwrap().new_room_dialog() )); joinr.connect_activate(clone!(op => move |_, _| op.lock().unwrap().join_to_room_dialog() )); diff --git a/fractal-gtk/src/app/backend_loop.rs b/fractal-gtk/src/app/backend_loop.rs index cdc4cd10..988c5253 100644 --- a/fractal-gtk/src/app/backend_loop.rs +++ b/fractal-gtk/src/app/backend_loop.rs @@ -185,9 +185,6 @@ pub fn backend_loop(rx: Receiver) { Ok(BKResponse::AttachedFile(msg)) => { APPOP!(attached_file, (msg)); } - Ok(BKResponse::SearchEnd) => { - APPOP!(search_end); - } Ok(BKResponse::NewRoom(r, internal_id)) => { let id = Some(internal_id); APPOP!(new_room, (r, id)); diff --git a/fractal-gtk/src/app/connect/mod.rs b/fractal-gtk/src/app/connect/mod.rs index f7cc495d..0b035a8a 100644 --- a/fractal-gtk/src/app/connect/mod.rs +++ b/fractal-gtk/src/app/connect/mod.rs @@ -18,7 +18,6 @@ mod media_viewer; mod new_room; mod roomlist_search; mod scroll; -mod search; mod send; mod spellcheck; mod stickers; @@ -90,8 +89,6 @@ impl App { self.connect_join_room_dialog(); self.connect_account_settings(); - self.connect_search(); - self.connect_invite_dialog(); self.connect_invite_user(); self.connect_direct_chat(); diff --git a/fractal-gtk/src/app/connect/search.rs b/fractal-gtk/src/app/connect/search.rs deleted file mode 100644 index 947b5c85..00000000 --- a/fractal-gtk/src/app/connect/search.rs +++ /dev/null @@ -1,21 +0,0 @@ -extern crate gtk; -use self::gtk::prelude::*; - -use app::App; - -impl App { - pub fn connect_search(&self) { - let input: gtk::Entry = self.ui.builder - .get_object("search_input") - .expect("Couldn't find search_input in ui file."); - - let btn: gtk::Button = self.ui.builder - .get_object("search") - .expect("Couldn't find search in ui file."); - - let op = self.op.clone(); - input.connect_activate(move |inp| op.lock().unwrap().search(inp.get_text())); - let op = self.op.clone(); - btn.connect_clicked(move |_| op.lock().unwrap().search(input.get_text())); - } -} diff --git a/fractal-gtk/src/appop/room.rs b/fractal-gtk/src/appop/room.rs index 88511800..acde58b3 100644 --- a/fractal-gtk/src/appop/room.rs +++ b/fractal-gtk/src/appop/room.rs @@ -414,31 +414,6 @@ impl AppOp { self.roomlist.filter_rooms(term); } - pub fn toggle_search(&self) { - let r: gtk::Revealer = self.ui.builder - .get_object("search_revealer") - .expect("Couldn't find search_revealer in ui file."); - r.set_reveal_child(!r.get_child_revealed()); - } - - pub fn search(&mut self, term: Option) { - let r = self.active_room.clone().unwrap_or_default(); - self.remove_messages(); - self.backend.send(BKCommand::Search(r, term)).unwrap(); - - self.ui.builder - .get_object::("search_button_stack") - .expect("Can't find search_button_stack in ui file.") - .set_visible_child_name("searching"); - } - - pub fn search_end(&self) { - self.ui.builder - .get_object::("search_button_stack") - .expect("Can't find search_button_stack in ui file.") - .set_visible_child_name("normal"); - } - pub fn new_room_dialog(&self) { let dialog = self.ui.builder .get_object::("new_room_dialog")