From 966a909ab86bc9b252573e296aac7bbab4fad272 Mon Sep 17 00:00:00 2001
From: Nefo Fortressia <nefothingy@hotmail.com>
Date: Thu, 11 Nov 2021 06:20:11 +0700
Subject: [PATCH] refactor: make workspace.rs implements on EchidnaWindow

The code was moved from the EchidnaEditor struct, but we haven't updated
it to implement EchidnaWindow instead of EchidnaEditor.
---
 src/components/window/workspace.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/window/workspace.rs b/src/components/window/workspace.rs
index 9cc5c6c..459973a 100644
--- a/src/components/window/workspace.rs
+++ b/src/components/window/workspace.rs
@@ -1,15 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use super::imp::EchidnaEditor;
+use super::EchidnaWindow;
 use gio::Cancellable;
 use gio::{File, FileQueryInfoFlags, FileType, SimpleAction};
 use glib::clone;
-use glib::subclass::types::ObjectSubclassExt;
 use glib::types::Type;
 use gtk::prelude::*;
-use gtk::{ApplicationWindow, FileChooserAction, FileChooserDialog, ResponseType, TreeStore};
+use gtk::{
+    Application, ApplicationWindow, FileChooserAction, FileChooserDialog, ResponseType, TreeStore,
+    TreeView,
+};
 use relative_path::RelativePath;
 use serde::{Deserialize, Serialize};
 use std::path::Path;
@@ -28,7 +29,7 @@ trait WorkspaceImplementedEditor {
     fn action_open_workspace(
         &self,
         window: ApplicationWindow,
-        app: super::EchidnaEditor,
+        app: Application,
         _action: &SimpleAction,
         _variant: Option<&glib::Variant>,
     );
@@ -38,11 +39,11 @@ trait WorkspaceImplementedEditor {
     fn open_folder(&self, file: File);
 }
 
-impl WorkspaceImplementedEditor for EchidnaEditor {
+impl WorkspaceImplementedEditor for EchidnaWindow {
     fn action_open_workspace(
         &self,
         window: ApplicationWindow,
-        app: super::EchidnaEditor,
+        app: Application,
         _action: &SimpleAction,
         _variant: Option<&glib::Variant>,
     ) {
@@ -56,14 +57,14 @@ impl WorkspaceImplementedEditor for EchidnaEditor {
             ],
         );
         dialog.set_visible(true);
-        dialog.connect_response(clone!(@weak window, @weak app =>
+        dialog.connect_response(clone!(@weak self as win =>
             move |dialog, response| {
                 if response == ResponseType::Accept {
                     let file_option = dialog.file();
                     match file_option {
                         Some(file) => {
                             dialog.destroy();
-                            Self::from_instance(&app).open_workspace(file);
+                            win.open_workspace(file);
                         },
                         None => {}
                     }
@@ -125,7 +126,6 @@ impl WorkspaceImplementedEditor for EchidnaEditor {
             self.open_folder(folder);
         }
     }
-}
 
 /**
  *