napcok
/
manjaro-hello
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't use self sometimes

merge-requests/64/head
Hugo Posnic 2017-05-09 19:11:24 +02:00
parent 5a66b41d03
commit b43e13499a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/manjaro_hello.py
View File

@ -25,30 +25,30 @@ class ManjaroHello():
share_path = "/usr/share/" share_path = "/usr/share/"
self.data_path = "data/" self.data_path = "data/"
self.locale_path = "locale/" self.locale_path = "locale/"
self.ui_path = "ui/" ui_path = "ui/"
self.desktop_path = self.app + ".desktop" self.desktop_path = self.app + ".desktop"
if os.path.basename(sys.argv[0]) == self.app: if os.path.basename(sys.argv[0]) == self.app:
self.data_path = share_path + self.app + "/" + self.data_path self.data_path = share_path + self.app + "/" + self.data_path
self.locale_path = share_path + self.locale_path self.locale_path = share_path + self.locale_path
self.ui_path = share_path + self.app + "/" + self.ui_path ui_path = share_path + self.app + "/" + ui_path
self.desktop_path = share_path + "applications/" + self.desktop_path self.desktop_path = share_path + "applications/" + self.desktop_path
else: else:
self.desktop_path = os.getcwd() + "/" + self.desktop_path self.desktop_path = os.getcwd() + "/" + self.desktop_path
self.logo_path = share_path + "icons/hicolor/64x64/apps/manjaro.png" logo_path = share_path + "icons/hicolor/64x64/apps/manjaro.png"
self.preferences_path = self.config_path + self.app + ".json" self.preferences_path = self.config_path + self.app + ".json"
self.urls_path = self.data_path + "urls.json" urls_path = self.data_path + "urls.json"
self.autostart_path = self.config_path + "autostart/" + self.app + ".desktop" self.autostart_path = self.config_path + "autostart/" + self.app + ".desktop"
self.live_path = "/run/miso/bootmnt/manjaro" self.live_path = "/run/miso/bootmnt/manjaro"
# Load important vars # Load important vars
self.preferences = self.get_preferences() self.preferences = self.get_preferences()
self.infos = self.get_infos() self.infos = self.get_infos()
self.urls = read_json(self.urls_path) self.urls = read_json(urls_path)
# Init window # Init window
self.builder = Gtk.Builder.new_from_file(self.ui_path + self.app + ".glade") self.builder = Gtk.Builder.new_from_file(ui_path + self.app + ".glade")
self.builder.connect_signals(self) self.builder.connect_signals(self)
self.window = self.builder.get_object("window") self.window = self.builder.get_object("window")
subtitle = self.infos["arch"] subtitle = self.infos["arch"]
@ -57,8 +57,8 @@ class ManjaroHello():
self.builder.get_object("headerbar").props.subtitle = subtitle self.builder.get_object("headerbar").props.subtitle = subtitle
# Load logo # Load logo
if os.path.isfile(self.logo_path): if os.path.isfile(logo_path):
logo = GdkPixbuf.Pixbuf.new_from_file(self.logo_path) logo = GdkPixbuf.Pixbuf.new_from_file(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)