diff --git a/jade_gui/classes/install_prefs.py b/jade_gui/classes/install_prefs.py index 164b05d..cc83ad8 100644 --- a/jade_gui/classes/install_prefs.py +++ b/jade_gui/classes/install_prefs.py @@ -33,7 +33,6 @@ class InstallPrefs: enable_sudo, disk, hostname, - ipv_enabled, timeshift_enabled, zramd_enabled, desktop, @@ -52,7 +51,6 @@ class InstallPrefs: else: self.disk = "" self.hostname = hostname if len(hostname) != 0 else "crystal" - self.ipv_enabled = ipv_enabled self.timeshift_enabled = timeshift_enabled self.zramd_enabled = zramd_enabled self.desktop = desktop @@ -79,7 +77,7 @@ class InstallPrefs: "keymap": self.layout.country_shorthand, "timezone": self.timezone.region + "/" + self.timezone.location, }, - "networking": {"hostname": self.hostname, "ipv6": self.ipv_enabled}, + "networking": {"hostname": self.hostname, "ipv6": False}, "users": [ { "name": self.username, diff --git a/jade_gui/functions/misc_screen.py b/jade_gui/functions/misc_screen.py index 58bfb08..0794724 100644 --- a/jade_gui/functions/misc_screen.py +++ b/jade_gui/functions/misc_screen.py @@ -27,7 +27,7 @@ class MiscScreen(JadeScreen, Adw.Bin): __gtype_name__ = "MiscScreen" hostname_entry = Gtk.Template.Child() - ipv_switch = Gtk.Template.Child() + #ipv_switch = Gtk.Template.Child() timeshift_switch = Gtk.Template.Child() zramd_switch = Gtk.Template.Child() @@ -46,6 +46,6 @@ class MiscScreen(JadeScreen, Adw.Bin): def on_complete(self, *_): self.hostname = self.hostname_entry.get_text() - self.ipv_enabled = self.ipv_switch.get_state() + #self.ipv_enabled = self.ipv_switch.get_state() self.zramd_enabled = self.zramd_switch.get_state() self.timeshift_enabled = self.timeshift_switch.get_state() diff --git a/jade_gui/functions/summary_screen.py b/jade_gui/functions/summary_screen.py index 77a8b35..12b2b18 100644 --- a/jade_gui/functions/summary_screen.py +++ b/jade_gui/functions/summary_screen.py @@ -46,8 +46,6 @@ class SummaryScreen(JadeScreen, Adw.Bin): partition_label = Gtk.Template.Child() partition_button = Gtk.Template.Child() uefi_label = Gtk.Template.Child() - ipv_label = Gtk.Template.Child() - ipv_button = Gtk.Template.Child() timeshift_label = Gtk.Template.Child() timeshift_button = Gtk.Template.Child() zramd_label = Gtk.Template.Child() @@ -92,9 +90,6 @@ class SummaryScreen(JadeScreen, Adw.Bin): self.partition_button.connect( "clicked", self.window.show_page, self.window.partition_screen ) - self.ipv_button.connect( - "clicked", self.window.show_page, self.window.misc_screen - ) self.timeshift_button.connect( "clicked", self.window.show_page, self.window.misc_screen ) @@ -149,9 +144,6 @@ class SummaryScreen(JadeScreen, Adw.Bin): ) self.uefi_label.set_title("UEFI" if disks.get_uefi() else "Legacy BIOS") - self.ipv_label.set_title( - "ipv6 enabled" if self.window.misc_screen.ipv_enabled else "ipv6 disabled" - ) self.timeshift_label.set_title( "timeshift enabled" if self.window.misc_screen.timeshift_enabled @@ -181,7 +173,6 @@ class SummaryScreen(JadeScreen, Adw.Bin): enable_sudo=self.window.user_screen.sudo_enabled, disk=self.window.partition_screen.selected_partition, hostname=self.window.misc_screen.hostname, - ipv_enabled=self.window.misc_screen.ipv_enabled, timeshift_enabled=self.window.misc_screen.timeshift_enabled, zramd_enabled=self.window.misc_screen.zramd_enabled, desktop=self.window.desktop_screen.chosen_desktop, diff --git a/jade_gui/pages/misc_screen.ui b/jade_gui/pages/misc_screen.ui index 7d5300e..1e4da26 100644 --- a/jade_gui/pages/misc_screen.ui +++ b/jade_gui/pages/misc_screen.ui @@ -32,24 +32,6 @@ - - - false - false - IPv6 loopback - This can fix IPv6 connectivity issues with some ISPs. - - - center - false - - - - false diff --git a/jade_gui/pages/summary_screen.ui b/jade_gui/pages/summary_screen.ui index d74703a..2ed29b5 100644 --- a/jade_gui/pages/summary_screen.ui +++ b/jade_gui/pages/summary_screen.ui @@ -223,21 +223,6 @@ none - - - ipv6 enabled/disabled - - - center - center - document-edit-symbolic - - - -