Merge pull request #42 from Vanilla-OS/misc_changes

Misc changes
main
Mirko Brombin 2 years ago committed by GitHub
commit c2576a7519
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -15,11 +15,23 @@
<property name="allow_long_swipes">False</property> <property name="allow_long_swipes">False</property>
</object> </object>
</child> </child>
<child>
<object class="GtkLabel" id="progressbar_text">
<property name="wrap">True</property>
<property name="wrap-mode">word-char</property>
<property name="halign">start</property>
<property name="valign">center</property>
<property name="margin-top">40</property>
<property name="margin-start">40</property>
<property name="label" translatable="true">The changes are being applied. Please Wait…</property>
<style>
<class name="title-4"/>
</style>
</object>
</child>
<child> <child>
<object class="GtkProgressBar" id="progressbar"> <object class="GtkProgressBar" id="progressbar">
<property name="text" translatable="true">The changes are being applied. Please Wait…</property> <property name="margin-top">12</property>
<property name="show-text">true</property>
<property name="margin-top">40</property>
<property name="margin-start">40</property> <property name="margin-start">40</property>
<property name="margin-bottom">40</property> <property name="margin-bottom">40</property>
<property name="margin-end">40</property> <property name="margin-end">40</property>

@ -10,12 +10,12 @@
<object class="GtkBox"> <object class="GtkBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="AdwHeaderBar"> <object class="AdwHeaderBar" id="headerbar">
<style> <style>
<class name="flat" /> <class name="flat" />
</style> </style>
<property name="title_widget"> <property name="title_widget">
<object class="AdwCarouselIndicatorDots"> <object class="AdwCarouselIndicatorDots" id="carousel_indicator_dots">
<property name="carousel">carousel</property> <property name="carousel">carousel</property>
<property name="orientation">horizontal</property> <property name="orientation">horizontal</property>
</object> </object>

@ -31,6 +31,8 @@ class VanillaWindow(Adw.ApplicationWindow):
__gtype_name__ = 'VanillaWindow' __gtype_name__ = 'VanillaWindow'
carousel = Gtk.Template.Child() carousel = Gtk.Template.Child()
carousel_indicator_dots = Gtk.Template.Child()
headerbar = Gtk.Template.Child()
btn_back = Gtk.Template.Child() btn_back = Gtk.Template.Child()
toasts = Gtk.Template.Child() toasts = Gtk.Template.Child()
@ -85,9 +87,13 @@ class VanillaWindow(Adw.ApplicationWindow):
if page not in [self.__view_progress, self.__view_done]: if page not in [self.__view_progress, self.__view_done]:
self.btn_back.set_visible(cur_index != 0.0) self.btn_back.set_visible(cur_index != 0.0)
self.carousel_indicator_dots.set_visible(cur_index != 0.0)
self.headerbar.set_show_end_title_buttons(cur_index != 0.0)
return return
self.btn_back.set_visible(False) self.btn_back.set_visible(False)
self.carousel_indicator_dots.set_visible(False)
self.headerbar.set_show_end_title_buttons(False)
# keep the btn_back button locked if this is the last page # keep the btn_back button locked if this is the last page
if page == self.__view_done: if page == self.__view_done:

Loading…
Cancel
Save