diff --git a/README.md b/README.md
index 18dc13f..3e39741 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# SolarFM
# SolarFM
-SolarFM is a Gtk + Python file manager.
+SolarFM is a Gtk+ Python file manager.
# Notes
```sudo apt-get install python3 wget steamcmd```
@@ -11,7 +11,8 @@ SolarFM is a Gtk + Python file manager.
Add prompt guards for actions.
Add path bar search dropdown.
Add "execute" and "execute in terminal" context options.
-Add "go to trash" and "delete all trash" options.
+Add "go to trash", "clear trash", "restore from trash" options.
+Add drive size free and consumed info to bottom bar.
Add simpleish plugin system to run bash/python scripts.
Add DnD context awareness for over folder drop.
diff --git a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/utils/Settings.py b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/utils/Settings.py
index 46296b1..566e876 100644
--- a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/utils/Settings.py
+++ b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/utils/Settings.py
@@ -1,5 +1,6 @@
# Python imports
import os
+from os import path
# Gtk imports
import gi, cairo
@@ -16,30 +17,38 @@ from . import Logger
class Settings:
def __init__(self):
- self.SCRIPT_PTH = os.path.dirname(os.path.realpath(__file__))
- self.gladefile = self.SCRIPT_PTH + "/../resources/Main_Window.glade"
- self.cssFile = self.SCRIPT_PTH + '/../resources/stylesheet.css'
- self.logger = Logger().get_logger()
+ self.SCRIPT_PTH = os.path.dirname(os.path.realpath(__file__))
+ self.USER_HOME = path.expanduser('~')
+ self.CONFIG_PATH = self.USER_HOME + "/.config/solarfm"
- self.builder = gtk.Builder()
+ self.gladefile = self.CONFIG_PATH + "/Main_Window.glade"
+ self.cssFile = self.CONFIG_PATH + '/stylesheet.css'
+ self.logger = Logger().get_logger()
+
+ self.builder = gtk.Builder()
self.builder.add_from_file(self.gladefile)
- self.mainWindow = None
+
+ self.DEFAULT_ICONS = self.CONFIG_PATH + "/icons"
+ self.window_icon = self.DEFAULT_ICONS + "/solarfm.png"
+ self.main_window = None
+
def createWindow(self):
# Get window and connect signals
- self.mainWindow = self.builder.get_object("Main_Window")
+ self.main_window = self.builder.get_object("Main_Window")
self.setWindowData()
def setWindowData(self):
- screen = self.mainWindow.get_screen()
+ self.main_window.set_icon_from_file(self.window_icon)
+ screen = self.main_window.get_screen()
visual = screen.get_rgba_visual()
if visual != None and screen.is_composited():
- self.mainWindow.set_visual(visual)
- self.mainWindow.set_app_paintable(True)
- self.mainWindow.connect("draw", self.area_draw)
+ self.main_window.set_visual(visual)
+ self.main_window.set_app_paintable(True)
+ self.main_window.connect("draw", self.area_draw)
# bind css file
cssProvider = gtk.CssProvider()
@@ -54,7 +63,7 @@ class Settings:
cr.paint()
cr.set_operator(cairo.OPERATOR_OVER)
- def getMainWindow(self): return self.mainWindow
+ def getMainWindow(self): return self.main_window
def getMonitorData(self):
diff --git a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/resources/Main_Window.glade b/user_config/solarfm/Main_Window.glade
similarity index 98%
rename from src/versions/solarfm-0.0.1/SolarFM/new/solarfm/resources/Main_Window.glade
rename to user_config/solarfm/Main_Window.glade
index 36f0336..cb63f5f 100644
--- a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/resources/Main_Window.glade
+++ b/user_config/solarfm/Main_Window.glade
@@ -797,7 +797,6 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
center
1670
830
- solarfm.png
center
@@ -1137,7 +1136,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
True
True
Path...
-
+
True
@@ -1474,6 +1473,11 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
False
user-trash
+