diff --git a/install-station b/install-station index b2e5c9c..9500cd4 100755 --- a/install-station +++ b/install-station @@ -8,6 +8,7 @@ gi.require_version('Gtk', '3.0') from gi.repository import Gtk installer = "/usr/local/lib/gbi/" sys.path.append(installer) +from welcome_live import Welcome from installType import Types from use_ufs import use_ufs from partition import Partitions @@ -15,6 +16,8 @@ from use_zfs import ZFS from boot_manager import bootManager from partition_handler import create_disk_partition_db from install import installProgress, installSlide +from network_setup import network_setup + logo = "/usr/local/lib/gbi/logo.png" tmp = "/tmp/.gbi/" if not os.path.exists(tmp): @@ -37,12 +40,30 @@ class MainWindow(): Gtk.main_quit() return False - def next_page(self, widget, notebook): + def next_button(self, widget): + if self.welcome.get_what() == "install": + self.next_install_page() + else: + self.next_setup_page() + + def next_install_page(self): """Go to the next window.""" page = self.notebook.get_current_page() if page == 0: + typebox = Gtk.VBox(False, 0) + typebox.show() + self.types = Types() + get_types = self.types.get_model() + typebox.pack_start(get_types, True, True, 0) + label = Gtk.Label("Types") + self.notebook.insert_page(typebox, label, 1) + self.notebook.next_page() + self.notebook.show_all() + self.button2.show() + self.button3.show() + elif page == 1: create_disk_partition_db() - self.button1.set_sensitive(True) + self.button1.show() if self.types.get_type() == "ufs": udbox = Gtk.VBox(False, 0) udbox.show() @@ -50,9 +71,9 @@ class MainWindow(): get_ud = self.partition.get_model() udbox.pack_start(get_ud, True, True, 0) label = Gtk.Label("UFS Disk Configuration") - self.notebook.insert_page(udbox, label, 1) - self.window.show_all() + self.notebook.insert_page(udbox, label, 2) self.notebook.next_page() + self.notebook.show_all() self.button3.set_sensitive(False) elif self.types.get_type() == "custom": Pbox = Gtk.VBox(False, 0) @@ -61,9 +82,9 @@ class MainWindow(): get_part = self.partition.get_model() Pbox.pack_start(get_part, True, True, 0) label = Gtk.Label("UFS Custom Configuration") - self.notebook.insert_page(Pbox, label, 1) - self.window.show_all() + self.notebook.insert_page(Pbox, label, 2) self.notebook.next_page() + self.notebook.show_all() self.button3.set_sensitive(False) elif self.types.get_type() == "zfs": Zbox = Gtk.VBox(False, 0) @@ -72,11 +93,11 @@ class MainWindow(): get_ZFS = self.partition.get_model() Zbox.pack_start(get_ZFS, True, True, 0) label = Gtk.Label("ZFS Configuration") - self.notebook.insert_page(Zbox, label, 1) - self.window.show_all() + self.notebook.insert_page(Zbox, label, 2) self.notebook.next_page() + self.notebook.show_all() self.button3.set_sensitive(False) - elif page == 1: + elif page == 2: self.partition.save_selection() Mbox = Gtk.VBox(False, 0) Mbox.show() @@ -84,12 +105,12 @@ class MainWindow(): get_root = self.bootmanager.get_model() Mbox.pack_start(get_root, True, True, 0) label = Gtk.Label("Boot Option") - self.notebook.insert_page(Mbox, label, 2) + self.notebook.insert_page(Mbox, label, 3) self.button3.set_label("Install") - self.window.show_all() self.notebook.next_page() + self.notebook.show_all() self.button3.set_sensitive(True) - elif page == 2: + elif page == 3: self.adduser.save_selection() Ibox = Gtk.VBox(False, 0) Ibox.show() @@ -105,16 +126,31 @@ class MainWindow(): box1.show() label = Gtk.Label("Progress Bar") box1.pack_end(progressBar, False, False, 0) - self.nbButton.insert_page(box1, label, 3) + self.nbButton.insert_page(box1, label, 4) self.nbButton.next_page() self.window.show_all() + def next_setup_page(self): + page = self.notebook.get_current_page() + if page == 0: + self.window.set_title("Setup GhostBSD") + net_setup_box = Gtk.VBox(False, 0) + net_setup_box.show() + self.net_setup = network_setup() + model = self.net_setup.get_model() + net_setup_box.pack_start(model, True, True, 0) + label = Gtk.Label("Network Setup") + self.notebook.insert_page(net_setup_box, label, 1) + self.notebook.next_page() + self.notebook.show_all() + self.button3.show() + def back_page(self, widget): """Go back to the previous window.""" current_page = self.notebook.get_current_page() - if current_page == 1: - self.button1.set_sensitive(False) - elif current_page == 2: + if current_page == 2: + self.button1.hide() + elif current_page == 3: self.button3.set_label("Next") self.notebook.prev_page() new_page = self.notebook.get_current_page() @@ -148,7 +184,7 @@ class MainWindow(): self.window.set_border_width(0) self.window.set_default_size(800, 500) self.window.set_size_request(800, 500) - self.window.set_title("GhostBSD Installer") + self.window.set_title("Install GhostBSD") self.window.set_border_width(0) self.window.set_icon_from_file(logo) mainHBox = Gtk.HBox(False, 0) @@ -163,13 +199,13 @@ class MainWindow(): self.notebook.show() self.notebook.set_show_tabs(False) self.notebook.set_show_border(False) - typebox = Gtk.VBox(False, 0) - typebox.show() - self.types = Types() - get_types = self.types.get_model() - typebox.pack_start(get_types, True, True, 0) - label = Gtk.Label("Types") - self.notebook.insert_page(typebox, label, 0) + welcome_box = Gtk.VBox(False, 0) + welcome_box.show() + self.welcome = Welcome(self.next_install_page, self.next_setup_page) + get_types = self.welcome.get_model() + welcome_box.pack_start(get_types, True, True, 0) + label = Gtk.Label("Welcome") + self.notebook.insert_page(welcome_box, label, 0) # Set what page to start at type of installation self.notebook.set_current_page(0) @@ -178,19 +214,14 @@ class MainWindow(): self.button1 = Gtk.Button(label='Back') self.button1.connect("clicked", self.back_page) self.table.attach(self.button1, 3, 4, 0, 1) - self.button1.show() - self.button1.set_sensitive(False) self.button2 = Gtk.Button(label='Cancel') self.button2.connect("clicked", self.delete) self.table.attach(self.button2, 4, 5, 0, 1) - self.button2.show() self.button3 = Gtk.Button(label='Next') - self.button3.connect("clicked", self.next_page, self.notebook) + self.button3.connect("clicked", self.next_button) self.table.attach(self.button3, 5, 6, 0, 1) - self.button3.show() self.table.set_col_spacings(5) self.table.show() - # Create a new notebook self.nbButton = Gtk.Notebook() mainVbox.pack_end(self.nbButton, False, False, 5) self.nbButton.show() @@ -199,6 +230,9 @@ class MainWindow(): label = Gtk.Label("Button") self.nbButton.insert_page(self.table, label, 0) self.window.show_all() + self.button1.hide() + self.button2.hide() + self.button3.hide() MainWindow()