Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 7 additions & 6 deletions bottles/frontend/ui/onboard.blp
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
using Gtk 4.0;
using Adw 1;

template $OnboardDialog: Adw.Window {
resizable: false;
deletable: true;
modal: true;
default-width: 550;
default-height: 550;
template $OnboardDialog: Adw.Dialog {
content-width: 550;
content-height: 550;
can-close: false;

Box {
orientation: vertical;

Adw.HeaderBar {
show-start-title-buttons: false;
show-end-title-buttons: false;

title-widget: Adw.CarouselIndicatorDots {
carousel: carousel;
orientation: horizontal;
Expand Down
15 changes: 5 additions & 10 deletions bottles/frontend/windows/onboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@


@Gtk.Template(resource_path="/com/usebottles/bottles/onboard.ui")
class OnboardDialog(Adw.Window):
class OnboardDialog(Adw.Dialog):
__gtype_name__ = "OnboardDialog"
__installing = False
__progress_total = 0
Expand Down Expand Up @@ -56,16 +56,14 @@ class OnboardDialog(Adw.Window):

def __init__(self, window, **kwargs):
super().__init__(**kwargs)
self.set_transient_for(window)

# common variables and references
self.window = window
self.manager = window.manager

# connect signals
self.connect("close-request", self.__quit)
self.carousel.connect("page-changed", self.__page_changed)
self.btn_close.connect("clicked", self.__close_window)
self.btn_close.connect("clicked", self.__close_dialog)
self.btn_back.connect("clicked", self.__previous_page)
self.btn_next.connect("clicked", self.__next_page)
self.btn_install.connect("clicked", self.__install_runner)
Expand Down Expand Up @@ -138,7 +136,6 @@ def set_completed(result: Result, error=False):
self.carousel.set_allow_long_swipes(False)
self.carousel.set_allow_mouse_drag(False)
self.carousel.set_allow_scroll_wheel(False)
self.set_deletable(False)

RunAsync(
task_func=self.manager.checks,
Expand Down Expand Up @@ -176,9 +173,7 @@ def __update_progress(
completed_steps = current_step if completed else max(0, current_step - 1)

if self.__progress_total:
self.progressbar.set_fraction(
completed_steps / self.__progress_total
)
self.progressbar.set_fraction(completed_steps / self.__progress_total)
self.progressbar.set_visible(True)
self.label_progress.set_visible(True)
self.label_progress.set_label(
Expand All @@ -191,5 +186,5 @@ def __update_progress(
self.label_status.set_visible(True)
self.label_status.set_label(description)

def __close_window(self, widget):
self.destroy()
def __close_dialog(self, widget):
self.force_close()
2 changes: 1 addition & 1 deletion bottles/frontend/windows/window.py
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ def show_loading_view(self, widget=False):

def show_onboard_view(self, widget=False):
onboard_window = OnboardDialog(self)
onboard_window.present()
onboard_window.present(self)

def show_add_view(self, widget=False):
new_bottle_dialog = BottlesNewBottleDialog()
Expand Down