Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix[Closes #427]: Only show "Retry connection" button after a failure and skip over connection test page when navigating backwards #446

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix[Closes #427]: Only show "Retry connection" button after a failure and skip over connection test page when navigating backwards #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae24112
fix[#427]: Only show "Retry connection" button after a failure
acerspyro Dec 2, 2024
793369e
fix[#427]: Re-word "Retry connection" button and information messages…
acerspyro Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions vanilla_installer/defaults/conn_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ def callback(res, *args):
return

self.status_page.set_icon_name("network-wired-disconnected-symbolic")
self.status_page.set_title(_("No Internet Connection!"))
self.status_page.set_title(_("No Internet Connection"))
self.status_page.set_description(
_("Installer requires an active internet connection")
_("An active internet connection is required to install Vanilla OS")
)
self.btn_recheck.set_visible(True)

Expand All @@ -112,6 +112,6 @@ def __on_btn_recheck_clicked(self, widget, *args):
self.status_page.set_icon_name("content-loading-symbolic")
self.status_page.set_title(_("Checking Connection"))
self.status_page.set_description(
_("Please wait until the connection check is done")
_("Checking your internet connection, please wait")
)
self.__conn_check()
9 changes: 5 additions & 4 deletions vanilla_installer/gtk/default-conn-check.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="gtk" version="4.0" />
<requires lib="libadwaita" version="1.0" />
<template class="VanillaDefaultConnCheck" parent="AdwBin">
<property name="halign">fill</property>
Expand All @@ -10,10 +10,11 @@
<object class="AdwStatusPage" id="status_page">
<property name="icon-name">content-loading-symbolic</property>
<property name="title" translatable="yes">Checking Connection</property>
<property name="description" translatable="yes">Please wait until the connection check is done</property>
<property name="description" translatable="yes">Checking your internet connection, please wait</property>
<child>
<object class="GtkButton" id="btn_recheck">
<property name="label">Check Again</property>
<property name="visible">false</property>
<property name="label">Retry Connection</property>
<property name="halign">center</property>
<style>
<class name="pill" />
Expand All @@ -23,4 +24,4 @@
</object>
</child>
</template>
</interface>
</interface>