Merge branch 'axtlos/remove-ipv6' into 'main'

Remove ipv6 option from misc screen

See merge request crystal/software/jade-gui!1
main
axtloss 2 years ago
commit ef874176c2

@ -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,

@ -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()

@ -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,

@ -32,24 +32,6 @@
<style>
<class name="boxed-list"/>
</style>
<child>
<object class="AdwActionRow">
<property name="activatable">false</property>
<property name="selectable">false</property>
<property
name="title"
translatable="true">IPv6 loopback</property>
<property
name="subtitle"
translatable="true">This can fix IPv6 connectivity issues with some ISPs.</property>
<child>
<object class="GtkSwitch" id="ipv_switch">
<property name="valign">center</property>
<property name="state">false</property>
</object>
</child>
</object>
</child>
<child>
<object class="AdwActionRow">
<property name="activatable">false</property>

@ -223,21 +223,6 @@
<child>
<object class="GtkListBox" id="misc_listbox">
<property name="selection-mode">none</property>
<child>
<object class="AdwActionRow" id="ipv_label">
<property
name="title"
translatable="true">ipv6 enabled/disabled</property>
<child>
<object class="GtkButton" id="ipv_button">
<property name="valign">center</property>
<property name="halign">center</property>
<property
name="icon-name">document-edit-symbolic</property>
</object>
</child>
</object>
</child>
<child>
<object class="AdwActionRow" id="timeshift_label">
<property

Loading…
Cancel
Save