Merge Stable Changesto Master #9
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -1,3 +1,4 @@
 | 
				
			|||||||
 | 
					docs/
 | 
				
			||||||
.idea/
 | 
					.idea/
 | 
				
			||||||
*.zip
 | 
					*.zip
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -140,4 +141,3 @@ dmypy.json
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
# Cython debug symbols
 | 
					# Cython debug symbols
 | 
				
			||||||
cython_debug/
 | 
					cython_debug/
 | 
				
			||||||
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,7 +9,7 @@ from gi.repository import GLib
 | 
				
			|||||||
# Application imports
 | 
					# Application imports
 | 
				
			||||||
from trasher.xdgtrash import XDGTrash
 | 
					from trasher.xdgtrash import XDGTrash
 | 
				
			||||||
from shellfm.windows.controller import WindowController
 | 
					from shellfm.windows.controller import WindowController
 | 
				
			||||||
from plugins.plugins import Plugins
 | 
					from plugins.plugins_controller import PluginsController
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@dataclass(slots=True)
 | 
					@dataclass(slots=True)
 | 
				
			||||||
@@ -36,7 +36,7 @@ class Controller_Data:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        self.trashman            = XDGTrash()
 | 
					        self.trashman            = XDGTrash()
 | 
				
			||||||
        self.fm_controller       = WindowController()
 | 
					        self.fm_controller       = WindowController()
 | 
				
			||||||
        self.plugins             = Plugins(_settings)
 | 
					        self.plugins             = PluginsController(_settings)
 | 
				
			||||||
        self.fm_controller_data  = self.fm_controller.get_state_from_file()
 | 
					        self.fm_controller_data  = self.fm_controller.get_state_from_file()
 | 
				
			||||||
        self.trashman.regenerate()
 | 
					        self.trashman.regenerate()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,8 +17,8 @@ class InvalidPluginException(Exception):
 | 
				
			|||||||
    ...
 | 
					    ...
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Plugins:
 | 
					class PluginsController:
 | 
				
			||||||
    """Plugins controller"""
 | 
					    """PluginsController controller"""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def __init__(self, settings: type):
 | 
					    def __init__(self, settings: type):
 | 
				
			||||||
        path                      = os.path.dirname(os.path.realpath(__file__))
 | 
					        path                      = os.path.dirname(os.path.realpath(__file__))
 | 
				
			||||||
		Reference in New Issue
	
	Block a user