Simplify loading of image in buttons

merge-requests/64/head
Hugo Posnic 2017-05-25 16:59:03 +02:00
parent c9d6e7287d
commit ad4f65374e
2 changed files with 12 additions and 13 deletions

View File

@ -41,13 +41,23 @@ class Hello():
# Subtitle of headerbar # Subtitle of headerbar
self.builder.get_object("headerbar").props.subtitle = self.preferences["system"] self.builder.get_object("headerbar").props.subtitle = self.preferences["system"]
# Load logo # Load images
if os.path.isfile(self.preferences["logo_path"]): if os.path.isfile(self.preferences["logo_path"]):
logo = GdkPixbuf.Pixbuf.new_from_file(self.preferences["logo_path"]) logo = GdkPixbuf.Pixbuf.new_from_file(self.preferences["logo_path"])
self.window.set_icon(logo) self.window.set_icon(logo)
self.builder.get_object("distriblogo").set_from_pixbuf(logo) self.builder.get_object("distriblogo").set_from_pixbuf(logo)
self.builder.get_object("aboutdialog").set_logo(logo) self.builder.get_object("aboutdialog").set_logo(logo)
for btn in self.builder.get_object("social").get_children():
icon_path = self.preferences["data_path"] + "img/" + btn.get_name() + ".png"
self.builder.get_object(btn.get_name()).set_from_file(icon_path)
for widget in self.builder.get_object("homepage").get_children():
if isinstance(widget, Gtk.Button) and widget.get_image_position() is Gtk.PositionType.RIGHT:
img = Gtk.Image.new_from_file(self.preferences["data_path"] + "img/external-link.png")
img.set_margin_left(2)
widget.set_image(img)
# Create pages # Create pages
self.pages = os.listdir("{}/pages/{}".format(self.preferences["data_path"], self.pages = os.listdir("{}/pages/{}".format(self.preferences["data_path"],
self.preferences["default_locale"])) self.preferences["default_locale"]))
@ -66,16 +76,6 @@ class Hello():
gettext.textdomain(self.app) gettext.textdomain(self.app)
self.builder.get_object("languages").set_active_id(self.get_best_locale()) self.builder.get_object("languages").set_active_id(self.get_best_locale())
# Load images
for btn in self.builder.get_object("social").get_children():
icon_path = self.preferences["data_path"] + "img/" + btn.get_name() + ".png"
self.builder.get_object(btn.get_name()).set_from_file(icon_path)
for btn in ("wiki", "forum", "chat", "mailling", "development", "donate"):
img = Gtk.Image.new_from_file(self.preferences["data_path"] + "img/external-link.png")
img.set_margin_left(2)
self.builder.get_object(btn).set_image(img)
# Set autostart switcher state # Set autostart switcher state
self.autostart = os.path.isfile(self.preferences["autostart_path"]) self.autostart = os.path.isfile(self.preferences["autostart_path"])
self.builder.get_object("autostart").set_active(self.autostart) self.builder.get_object("autostart").set_active(self.autostart)

View File

@ -25,7 +25,7 @@
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="transition_type">crossfade</property> <property name="transition_type">crossfade</property>
<child> <child>
<object class="GtkGrid"> <object class="GtkGrid" id="homepage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">10</property> <property name="margin_left">10</property>
@ -144,7 +144,6 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="image_position">right</property>
<property name="always_show_image">True</property> <property name="always_show_image">True</property>
<signal name="clicked" handler="on_btn_clicked" swapped="no"/> <signal name="clicked" handler="on_btn_clicked" swapped="no"/>
</object> </object>