fix partition editor

src/db_partition.py

@@ -34,13 +34,13 @@ from subprocess import Popen, PIPE, STDOUT, call
 import pickle
 from time import sleep
 
-tmp = "/tmp/.gbi/"
+tmp = "/tmp/.gbinstall/"
 if not os.path.exists(tmp):
     os.makedirs(tmp)
-installer = "/usr/local/lib/gbi/"
+installer = "/usr/local/lib/gbinstall/"
 sysinstall = "/usr/local/sbin/pc-sysinstall"
 partitiondb = "%spartitiondb/" % tmp
-query = "sh /usr/local/lib/gbi/backend-query/"
+query = "sh /usr/local/lib/gbinstall/backend-query/"
 query_disk = '%sdisk-list.sh' % query
 detect_sheme = '%sdetect-sheme.sh' % query
 diskdb = "%sdisk" % partitiondb

src/install.py

@@ -15,7 +15,7 @@ import threading
 import os
 from subprocess import Popen, PIPE, STDOUT, call
 from time import sleep
-from partition_handler import rDeleteParttion, destroyParttion, makingParttion
+from db_partition import rDeleteParttion, destroyParttion, makingParttion
 from create_cfg import gbsd_cfg
 from slides import gbsdSlides
 # from slides import dbsdSlides

src/partition.py

@@ -64,7 +64,7 @@ disk_label = '%sdisk-label.sh' % query
 disk_schem = '%sscheme' % tmp
 disk_file = '%sdisk' % tmp
 psize = '%spart_size' % tmp
-logo = "/usr/local/lib/gbi/logo.png"
+logo = "/usr/local/lib/gbinstall/logo.png"
 Part_label = '%spartlabel' % tmp
 part_schem = '%sscheme' % tmp
 partitiondb = "%spartitiondb/" % tmp
@@ -73,11 +73,7 @@ ufs_Partiton_list = []
 
 
 cssProvider = Gtk.CssProvider()
-# if os.path.exists(rcconfgbsd):
-#     print(True)
 cssProvider.load_from_path('/usr/local/lib/gbinstall/ghostbsd-style.css')
-# elif os.path.exists(rcconfdbsd):
-#     cssProvider.load_from_path('/usr/local/lib/gbi/desktopbsd-style.css')
 screen = Gdk.Screen.get_default()
 styleContext = Gtk.StyleContext()
 styleContext.add_provider_for_screen(screen, cssProvider,
@@ -272,7 +268,7 @@ class Partitions():
         self.window.set_title("Partition Scheme")
         self.window.set_border_width(0)
         self.window.set_size_request(400, 150)
-        self.window.set_icon_from_file("/usr/local/lib/gbi/logo.png")
+        self.window.set_icon_from_file(logo)
         box1 = Gtk.VBox(False, 0)
         self.window.add(box1)
         box1.show()
@@ -324,7 +320,7 @@ class Partitions():
         self.window.set_title("Add Partition")
         self.window.set_border_width(0)
         self.window.set_size_request(400, 150)
-        self.window.set_icon_from_file("/usr/local/lib/gbi/logo.png")
+        self.window.set_icon_from_file(logo)
         box1 = Gtk.VBox(False, 0)
         self.window.add(box1)
         box1.show()
@@ -461,7 +457,9 @@ class Partitions():
 
     def partition_selection(self, widget):
         model, self.iter, = widget.get_selected()
-        if self.iter is not None:
+        print(self.iter)
+        if self.iter is None:
+            return
         self.path = model.get_path(self.iter)
         tree_iter3 = model.get_iter(self.path[0])
         self.scheme = model.get_value(tree_iter3, 3)