diff --git a/data/img/facebook.png b/data/img/facebook.png index f94aaae..456f138 100644 Binary files a/data/img/facebook.png and b/data/img/facebook.png differ diff --git a/data/img/google+.png b/data/img/google+.png deleted file mode 100644 index cc84c4a..0000000 Binary files a/data/img/google+.png and /dev/null differ diff --git a/data/img/reddit.png b/data/img/reddit.png index 4375c61..d35c047 100644 Binary files a/data/img/reddit.png and b/data/img/reddit.png differ diff --git a/data/img/telegram.png b/data/img/telegram.png index 333d5b4..dc35411 100644 Binary files a/data/img/telegram.png and b/data/img/telegram.png differ diff --git a/data/img/twitter.png b/data/img/twitter.png index 2fe88ee..9d581b1 100644 Binary files a/data/img/twitter.png and b/data/img/twitter.png differ diff --git a/src/manjaro_hello.py b/src/manjaro_hello.py index 020c3ba..5a5174c 100644 --- a/src/manjaro_hello.py +++ b/src/manjaro_hello.py @@ -121,11 +121,7 @@ class Hello(Gtk.Window): self.builder = Gtk.Builder.new_from_file(self.preferences["ui_path"]) self.builder.connect_signals(self) self.window = self.builder.get_object("window") - self.window.set_decorated(True) - hb = Gtk.HeaderBar() - hb.set_show_close_button(True) - hb.props.title = "Convert2Html" - self.set_titlebar(hb) + # Subtitle of headerbar self.builder.get_object("headerbar").props.subtitle = ' '.join(get_lsb_infos()) @@ -155,7 +151,12 @@ class Hello(Gtk.Window): scrolled_window = Gtk.ScrolledWindow() viewport = Gtk.Viewport(border_width=10) label = Gtk.Label(wrap=True) - viewport.add(label) + image = Gtk.Image(stock=Gtk.STOCK_GO_BACK) + backBtn=Gtk.Button(label=None, image=image) + grid = Gtk.Grid() + grid.attach (backBtn, 0, 1, 1, 1) + grid.attach(label, 1, 2, 1, 1) + viewport.add(grid) scrolled_window.add(viewport) scrolled_window.show_all() self.builder.get_object("stack").add_named(scrolled_window, page + "page") @@ -251,7 +252,6 @@ class Hello(Gtk.Window): }, "tooltip_text": { "about", - "home", "development", "discover", "donate", @@ -272,7 +272,7 @@ class Hello(Gtk.Window): # Change content of pages for page in self.pages: child = self.builder.get_object("stack").get_child_by_name(page + "page") - label = child.get_children()[0].get_children()[0] + label = child.get_children()[0].get_children()[0].get_children()[0] label.set_markup(self.get_page(page)) def set_autostart(self, autostart): diff --git a/ui/manjaro-hello.glade b/ui/manjaro-hello.glade index 28ef19f..61abdce 100644 --- a/ui/manjaro-hello.glade +++ b/ui/manjaro-hello.glade @@ -447,7 +447,7 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we False center end - 15 + 10 telegram @@ -528,6 +528,9 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we 3 + 1