From e55978a106cd91dfaa4864fb6d5fe3cf289dcc77 Mon Sep 17 00:00:00 2001 From: luxick Date: Thu, 16 Feb 2017 22:06:59 +0100 Subject: [PATCH] Restructure project --- .gitignore | 92 ++++++++++++++++++ collection.py => mtg-collector/collection.py | 6 +- config.py => mtg-collector/config.py | 4 +- details.py => mtg-collector/details.py | 0 gui.py => mtg-collector/gui.py | 10 +- mtg-collector/mtg-collector | 3 + .../resources}/images/demo.jpg | Bin .../resources}/mana_icons/0.png | Bin .../resources}/mana_icons/1.png | Bin .../resources}/mana_icons/10.png | Bin .../resources}/mana_icons/11.png | Bin .../resources}/mana_icons/12.png | Bin .../resources}/mana_icons/13.png | Bin .../resources}/mana_icons/14.png | Bin .../resources}/mana_icons/15.png | Bin .../resources}/mana_icons/16.png | Bin .../resources}/mana_icons/17.png | Bin .../resources}/mana_icons/18.png | Bin .../resources}/mana_icons/19.png | Bin .../resources}/mana_icons/2.png | Bin .../resources}/mana_icons/20.png | Bin .../resources}/mana_icons/2b.png | Bin .../resources}/mana_icons/2g.png | Bin .../resources}/mana_icons/2r.png | Bin .../resources}/mana_icons/2u.png | Bin .../resources}/mana_icons/2w.png | Bin .../resources}/mana_icons/3.png | Bin .../resources}/mana_icons/4.png | Bin .../resources}/mana_icons/5.png | Bin .../resources}/mana_icons/6.png | Bin .../resources}/mana_icons/7.png | Bin .../resources}/mana_icons/8.png | Bin .../resources}/mana_icons/9.png | Bin .../resources}/mana_icons/B.png | Bin .../resources}/mana_icons/G.png | Bin .../resources}/mana_icons/R.png | Bin .../resources}/mana_icons/U.png | Bin .../resources}/mana_icons/X.png | Bin .../resources}/mana_icons/Y.png | Bin .../resources}/mana_icons/Z.png | Bin .../resources}/mana_icons/bg.png | Bin .../resources}/mana_icons/bp.png | Bin .../resources}/mana_icons/br.png | Bin .../resources}/mana_icons/flip.png | Bin .../resources}/mana_icons/gp.png | Bin .../resources}/mana_icons/gu.png | Bin .../resources}/mana_icons/gw.png | Bin .../resources}/mana_icons/half.png | Bin .../resources}/mana_icons/infinite.png | Bin .../resources}/mana_icons/rg.png | Bin .../resources}/mana_icons/rp.png | Bin .../resources}/mana_icons/rw.png | Bin .../resources}/mana_icons/s.png | Bin .../resources}/mana_icons/tap.png | Bin .../resources}/mana_icons/tap_old.png | Bin .../resources}/mana_icons/ub.png | Bin .../resources}/mana_icons/untap.png | Bin .../resources}/mana_icons/up.png | Bin .../resources}/mana_icons/ur.png | Bin .../resources}/mana_icons/w.png | Bin .../resources}/mana_icons/wb.png | Bin .../resources}/mana_icons/wp.png | Bin .../resources}/mana_icons/wu.png | Bin search.py => mtg-collector/search.py | 0 util.py => mtg-collector/util.py | 7 +- start.py | 3 + 66 files changed, 113 insertions(+), 12 deletions(-) create mode 100644 .gitignore rename collection.py => mtg-collector/collection.py (90%) rename config.py => mtg-collector/config.py (63%) rename details.py => mtg-collector/details.py (100%) rename gui.py => mtg-collector/gui.py (91%) create mode 100644 mtg-collector/mtg-collector rename {resources => mtg-collector/resources}/images/demo.jpg (100%) rename {resources => mtg-collector/resources}/mana_icons/0.png (100%) rename {resources => mtg-collector/resources}/mana_icons/1.png (100%) rename {resources => mtg-collector/resources}/mana_icons/10.png (100%) rename {resources => mtg-collector/resources}/mana_icons/11.png (100%) rename {resources => mtg-collector/resources}/mana_icons/12.png (100%) rename {resources => mtg-collector/resources}/mana_icons/13.png (100%) rename {resources => mtg-collector/resources}/mana_icons/14.png (100%) rename {resources => mtg-collector/resources}/mana_icons/15.png (100%) rename {resources => mtg-collector/resources}/mana_icons/16.png (100%) rename {resources => mtg-collector/resources}/mana_icons/17.png (100%) rename {resources => mtg-collector/resources}/mana_icons/18.png (100%) rename {resources => mtg-collector/resources}/mana_icons/19.png (100%) rename {resources => mtg-collector/resources}/mana_icons/2.png (100%) rename {resources => mtg-collector/resources}/mana_icons/20.png (100%) rename {resources => mtg-collector/resources}/mana_icons/2b.png (100%) rename {resources => mtg-collector/resources}/mana_icons/2g.png (100%) rename {resources => mtg-collector/resources}/mana_icons/2r.png (100%) rename {resources => mtg-collector/resources}/mana_icons/2u.png (100%) rename {resources => mtg-collector/resources}/mana_icons/2w.png (100%) rename {resources => mtg-collector/resources}/mana_icons/3.png (100%) rename {resources => mtg-collector/resources}/mana_icons/4.png (100%) rename {resources => mtg-collector/resources}/mana_icons/5.png (100%) rename {resources => mtg-collector/resources}/mana_icons/6.png (100%) rename {resources => mtg-collector/resources}/mana_icons/7.png (100%) rename {resources => mtg-collector/resources}/mana_icons/8.png (100%) rename {resources => mtg-collector/resources}/mana_icons/9.png (100%) rename {resources => mtg-collector/resources}/mana_icons/B.png (100%) rename {resources => mtg-collector/resources}/mana_icons/G.png (100%) rename {resources => mtg-collector/resources}/mana_icons/R.png (100%) rename {resources => mtg-collector/resources}/mana_icons/U.png (100%) rename {resources => mtg-collector/resources}/mana_icons/X.png (100%) rename {resources => mtg-collector/resources}/mana_icons/Y.png (100%) rename {resources => mtg-collector/resources}/mana_icons/Z.png (100%) rename {resources => mtg-collector/resources}/mana_icons/bg.png (100%) rename {resources => mtg-collector/resources}/mana_icons/bp.png (100%) rename {resources => mtg-collector/resources}/mana_icons/br.png (100%) rename {resources => mtg-collector/resources}/mana_icons/flip.png (100%) rename {resources => mtg-collector/resources}/mana_icons/gp.png (100%) rename {resources => mtg-collector/resources}/mana_icons/gu.png (100%) rename {resources => mtg-collector/resources}/mana_icons/gw.png (100%) rename {resources => mtg-collector/resources}/mana_icons/half.png (100%) rename {resources => mtg-collector/resources}/mana_icons/infinite.png (100%) rename {resources => mtg-collector/resources}/mana_icons/rg.png (100%) rename {resources => mtg-collector/resources}/mana_icons/rp.png (100%) rename {resources => mtg-collector/resources}/mana_icons/rw.png (100%) rename {resources => mtg-collector/resources}/mana_icons/s.png (100%) rename {resources => mtg-collector/resources}/mana_icons/tap.png (100%) rename {resources => mtg-collector/resources}/mana_icons/tap_old.png (100%) rename {resources => mtg-collector/resources}/mana_icons/ub.png (100%) rename {resources => mtg-collector/resources}/mana_icons/untap.png (100%) rename {resources => mtg-collector/resources}/mana_icons/up.png (100%) rename {resources => mtg-collector/resources}/mana_icons/ur.png (100%) rename {resources => mtg-collector/resources}/mana_icons/w.png (100%) rename {resources => mtg-collector/resources}/mana_icons/wb.png (100%) rename {resources => mtg-collector/resources}/mana_icons/wp.png (100%) rename {resources => mtg-collector/resources}/mana_icons/wu.png (100%) rename search.py => mtg-collector/search.py (100%) rename util.py => mtg-collector/util.py (90%) create mode 100755 start.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7d35891 --- /dev/null +++ b/.gitignore @@ -0,0 +1,92 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*,cover +.hypothesis/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# IPython Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# dotenv +.env + +# virtualenv +.venv/ +venv/ +ENV/ + +# Spyder project settings +.spyderproject + +# Rope project settings +.ropeproject + +.idea \ No newline at end of file diff --git a/collection.py b/mtg-collector/collection.py similarity index 90% rename from collection.py rename to mtg-collector/collection.py index 482e110..6f1d32d 100644 --- a/collection.py +++ b/mtg-collector/collection.py @@ -1,3 +1,5 @@ +import os + import gi from psutil._compat import xrange @@ -44,7 +46,7 @@ class CollectionView(Gtk.Grid): # Big Picture of the selected Card self.image_area = Gtk.Box() self.bigCard = Gtk.Image() - self.pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size('./resources/images/demo.jpg', 63 * 4, 88 * 4) + self.pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(os.path.dirname(__file__) + '/resources/images/demo.jpg', 63 * 4, 88 * 4) self.bigCard.set_from_pixbuf(self.pixbuf) self.image_area.add(self.bigCard) self.detailBox.add(self.image_area) @@ -69,7 +71,7 @@ class CollectionView(Gtk.Grid): def add_test_image(self): image = Gtk.Image() - pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size('./resources/images/demo.jpg', 63*2, 88*2) + pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(os.path.dirname(__file__) + '/resources/images/demo.jpg', 63*2, 88*2) image.set_from_pixbuf(pixbuf) return image diff --git a/config.py b/mtg-collector/config.py similarity index 63% rename from config.py rename to mtg-collector/config.py index d5f5e6e..73d77bd 100644 --- a/config.py +++ b/mtg-collector/config.py @@ -1,5 +1,7 @@ # Title of the Program Window +import os + applicationtitle="MTG Collector (working title) v0.1" # Path of image cache -cachepath=".cache/" \ No newline at end of file +cachepath= os.path.dirname(__file__) + "/.cache/" diff --git a/details.py b/mtg-collector/details.py similarity index 100% rename from details.py rename to mtg-collector/details.py diff --git a/gui.py b/mtg-collector/gui.py similarity index 91% rename from gui.py rename to mtg-collector/gui.py index 62da124..67946d1 100644 --- a/gui.py +++ b/mtg-collector/gui.py @@ -13,6 +13,10 @@ class MainWindow(Gtk.Window): self.set_border_width(2) self.set_size_request(1000, 700) + # Load local image Data + util.reload_image_cache() + util.load_mana_icons() + self.notebook = Gtk.Notebook() self.add(self.notebook) @@ -29,13 +33,7 @@ class MainWindow(Gtk.Window): self.notebook.append_page(self.collectionView, Gtk.Label("Collection")) self.notebook.append_page(self.deckView, Gtk.Label("Decks")) - - - win = MainWindow() -# Load local image Data -util.reload_image_cache() -util.load_mana_icons() win.connect('delete-event', Gtk.main_quit) win.show_all() Gtk.main() diff --git a/mtg-collector/mtg-collector b/mtg-collector/mtg-collector new file mode 100644 index 0000000..8dd3de3 --- /dev/null +++ b/mtg-collector/mtg-collector @@ -0,0 +1,3 @@ +#! /usr/bin/env python +import os +os.s.path.dirname(__file__) + "/mtg-collector/gui.py" \ No newline at end of file diff --git a/resources/images/demo.jpg b/mtg-collector/resources/images/demo.jpg similarity index 100% rename from resources/images/demo.jpg rename to mtg-collector/resources/images/demo.jpg diff --git a/resources/mana_icons/0.png b/mtg-collector/resources/mana_icons/0.png similarity index 100% rename from resources/mana_icons/0.png rename to mtg-collector/resources/mana_icons/0.png diff --git a/resources/mana_icons/1.png b/mtg-collector/resources/mana_icons/1.png similarity index 100% rename from resources/mana_icons/1.png rename to mtg-collector/resources/mana_icons/1.png diff --git a/resources/mana_icons/10.png b/mtg-collector/resources/mana_icons/10.png similarity index 100% rename from resources/mana_icons/10.png rename to mtg-collector/resources/mana_icons/10.png diff --git a/resources/mana_icons/11.png b/mtg-collector/resources/mana_icons/11.png similarity index 100% rename from resources/mana_icons/11.png rename to mtg-collector/resources/mana_icons/11.png diff --git a/resources/mana_icons/12.png b/mtg-collector/resources/mana_icons/12.png similarity index 100% rename from resources/mana_icons/12.png rename to mtg-collector/resources/mana_icons/12.png diff --git a/resources/mana_icons/13.png b/mtg-collector/resources/mana_icons/13.png similarity index 100% rename from resources/mana_icons/13.png rename to mtg-collector/resources/mana_icons/13.png diff --git a/resources/mana_icons/14.png b/mtg-collector/resources/mana_icons/14.png similarity index 100% rename from resources/mana_icons/14.png rename to mtg-collector/resources/mana_icons/14.png diff --git a/resources/mana_icons/15.png b/mtg-collector/resources/mana_icons/15.png similarity index 100% rename from resources/mana_icons/15.png rename to mtg-collector/resources/mana_icons/15.png diff --git a/resources/mana_icons/16.png b/mtg-collector/resources/mana_icons/16.png similarity index 100% rename from resources/mana_icons/16.png rename to mtg-collector/resources/mana_icons/16.png diff --git a/resources/mana_icons/17.png b/mtg-collector/resources/mana_icons/17.png similarity index 100% rename from resources/mana_icons/17.png rename to mtg-collector/resources/mana_icons/17.png diff --git a/resources/mana_icons/18.png b/mtg-collector/resources/mana_icons/18.png similarity index 100% rename from resources/mana_icons/18.png rename to mtg-collector/resources/mana_icons/18.png diff --git a/resources/mana_icons/19.png b/mtg-collector/resources/mana_icons/19.png similarity index 100% rename from resources/mana_icons/19.png rename to mtg-collector/resources/mana_icons/19.png diff --git a/resources/mana_icons/2.png b/mtg-collector/resources/mana_icons/2.png similarity index 100% rename from resources/mana_icons/2.png rename to mtg-collector/resources/mana_icons/2.png diff --git a/resources/mana_icons/20.png b/mtg-collector/resources/mana_icons/20.png similarity index 100% rename from resources/mana_icons/20.png rename to mtg-collector/resources/mana_icons/20.png diff --git a/resources/mana_icons/2b.png b/mtg-collector/resources/mana_icons/2b.png similarity index 100% rename from resources/mana_icons/2b.png rename to mtg-collector/resources/mana_icons/2b.png diff --git a/resources/mana_icons/2g.png b/mtg-collector/resources/mana_icons/2g.png similarity index 100% rename from resources/mana_icons/2g.png rename to mtg-collector/resources/mana_icons/2g.png diff --git a/resources/mana_icons/2r.png b/mtg-collector/resources/mana_icons/2r.png similarity index 100% rename from resources/mana_icons/2r.png rename to mtg-collector/resources/mana_icons/2r.png diff --git a/resources/mana_icons/2u.png b/mtg-collector/resources/mana_icons/2u.png similarity index 100% rename from resources/mana_icons/2u.png rename to mtg-collector/resources/mana_icons/2u.png diff --git a/resources/mana_icons/2w.png b/mtg-collector/resources/mana_icons/2w.png similarity index 100% rename from resources/mana_icons/2w.png rename to mtg-collector/resources/mana_icons/2w.png diff --git a/resources/mana_icons/3.png b/mtg-collector/resources/mana_icons/3.png similarity index 100% rename from resources/mana_icons/3.png rename to mtg-collector/resources/mana_icons/3.png diff --git a/resources/mana_icons/4.png b/mtg-collector/resources/mana_icons/4.png similarity index 100% rename from resources/mana_icons/4.png rename to mtg-collector/resources/mana_icons/4.png diff --git a/resources/mana_icons/5.png b/mtg-collector/resources/mana_icons/5.png similarity index 100% rename from resources/mana_icons/5.png rename to mtg-collector/resources/mana_icons/5.png diff --git a/resources/mana_icons/6.png b/mtg-collector/resources/mana_icons/6.png similarity index 100% rename from resources/mana_icons/6.png rename to mtg-collector/resources/mana_icons/6.png diff --git a/resources/mana_icons/7.png b/mtg-collector/resources/mana_icons/7.png similarity index 100% rename from resources/mana_icons/7.png rename to mtg-collector/resources/mana_icons/7.png diff --git a/resources/mana_icons/8.png b/mtg-collector/resources/mana_icons/8.png similarity index 100% rename from resources/mana_icons/8.png rename to mtg-collector/resources/mana_icons/8.png diff --git a/resources/mana_icons/9.png b/mtg-collector/resources/mana_icons/9.png similarity index 100% rename from resources/mana_icons/9.png rename to mtg-collector/resources/mana_icons/9.png diff --git a/resources/mana_icons/B.png b/mtg-collector/resources/mana_icons/B.png similarity index 100% rename from resources/mana_icons/B.png rename to mtg-collector/resources/mana_icons/B.png diff --git a/resources/mana_icons/G.png b/mtg-collector/resources/mana_icons/G.png similarity index 100% rename from resources/mana_icons/G.png rename to mtg-collector/resources/mana_icons/G.png diff --git a/resources/mana_icons/R.png b/mtg-collector/resources/mana_icons/R.png similarity index 100% rename from resources/mana_icons/R.png rename to mtg-collector/resources/mana_icons/R.png diff --git a/resources/mana_icons/U.png b/mtg-collector/resources/mana_icons/U.png similarity index 100% rename from resources/mana_icons/U.png rename to mtg-collector/resources/mana_icons/U.png diff --git a/resources/mana_icons/X.png b/mtg-collector/resources/mana_icons/X.png similarity index 100% rename from resources/mana_icons/X.png rename to mtg-collector/resources/mana_icons/X.png diff --git a/resources/mana_icons/Y.png b/mtg-collector/resources/mana_icons/Y.png similarity index 100% rename from resources/mana_icons/Y.png rename to mtg-collector/resources/mana_icons/Y.png diff --git a/resources/mana_icons/Z.png b/mtg-collector/resources/mana_icons/Z.png similarity index 100% rename from resources/mana_icons/Z.png rename to mtg-collector/resources/mana_icons/Z.png diff --git a/resources/mana_icons/bg.png b/mtg-collector/resources/mana_icons/bg.png similarity index 100% rename from resources/mana_icons/bg.png rename to mtg-collector/resources/mana_icons/bg.png diff --git a/resources/mana_icons/bp.png b/mtg-collector/resources/mana_icons/bp.png similarity index 100% rename from resources/mana_icons/bp.png rename to mtg-collector/resources/mana_icons/bp.png diff --git a/resources/mana_icons/br.png b/mtg-collector/resources/mana_icons/br.png similarity index 100% rename from resources/mana_icons/br.png rename to mtg-collector/resources/mana_icons/br.png diff --git a/resources/mana_icons/flip.png b/mtg-collector/resources/mana_icons/flip.png similarity index 100% rename from resources/mana_icons/flip.png rename to mtg-collector/resources/mana_icons/flip.png diff --git a/resources/mana_icons/gp.png b/mtg-collector/resources/mana_icons/gp.png similarity index 100% rename from resources/mana_icons/gp.png rename to mtg-collector/resources/mana_icons/gp.png diff --git a/resources/mana_icons/gu.png b/mtg-collector/resources/mana_icons/gu.png similarity index 100% rename from resources/mana_icons/gu.png rename to mtg-collector/resources/mana_icons/gu.png diff --git a/resources/mana_icons/gw.png b/mtg-collector/resources/mana_icons/gw.png similarity index 100% rename from resources/mana_icons/gw.png rename to mtg-collector/resources/mana_icons/gw.png diff --git a/resources/mana_icons/half.png b/mtg-collector/resources/mana_icons/half.png similarity index 100% rename from resources/mana_icons/half.png rename to mtg-collector/resources/mana_icons/half.png diff --git a/resources/mana_icons/infinite.png b/mtg-collector/resources/mana_icons/infinite.png similarity index 100% rename from resources/mana_icons/infinite.png rename to mtg-collector/resources/mana_icons/infinite.png diff --git a/resources/mana_icons/rg.png b/mtg-collector/resources/mana_icons/rg.png similarity index 100% rename from resources/mana_icons/rg.png rename to mtg-collector/resources/mana_icons/rg.png diff --git a/resources/mana_icons/rp.png b/mtg-collector/resources/mana_icons/rp.png similarity index 100% rename from resources/mana_icons/rp.png rename to mtg-collector/resources/mana_icons/rp.png diff --git a/resources/mana_icons/rw.png b/mtg-collector/resources/mana_icons/rw.png similarity index 100% rename from resources/mana_icons/rw.png rename to mtg-collector/resources/mana_icons/rw.png diff --git a/resources/mana_icons/s.png b/mtg-collector/resources/mana_icons/s.png similarity index 100% rename from resources/mana_icons/s.png rename to mtg-collector/resources/mana_icons/s.png diff --git a/resources/mana_icons/tap.png b/mtg-collector/resources/mana_icons/tap.png similarity index 100% rename from resources/mana_icons/tap.png rename to mtg-collector/resources/mana_icons/tap.png diff --git a/resources/mana_icons/tap_old.png b/mtg-collector/resources/mana_icons/tap_old.png similarity index 100% rename from resources/mana_icons/tap_old.png rename to mtg-collector/resources/mana_icons/tap_old.png diff --git a/resources/mana_icons/ub.png b/mtg-collector/resources/mana_icons/ub.png similarity index 100% rename from resources/mana_icons/ub.png rename to mtg-collector/resources/mana_icons/ub.png diff --git a/resources/mana_icons/untap.png b/mtg-collector/resources/mana_icons/untap.png similarity index 100% rename from resources/mana_icons/untap.png rename to mtg-collector/resources/mana_icons/untap.png diff --git a/resources/mana_icons/up.png b/mtg-collector/resources/mana_icons/up.png similarity index 100% rename from resources/mana_icons/up.png rename to mtg-collector/resources/mana_icons/up.png diff --git a/resources/mana_icons/ur.png b/mtg-collector/resources/mana_icons/ur.png similarity index 100% rename from resources/mana_icons/ur.png rename to mtg-collector/resources/mana_icons/ur.png diff --git a/resources/mana_icons/w.png b/mtg-collector/resources/mana_icons/w.png similarity index 100% rename from resources/mana_icons/w.png rename to mtg-collector/resources/mana_icons/w.png diff --git a/resources/mana_icons/wb.png b/mtg-collector/resources/mana_icons/wb.png similarity index 100% rename from resources/mana_icons/wb.png rename to mtg-collector/resources/mana_icons/wb.png diff --git a/resources/mana_icons/wp.png b/mtg-collector/resources/mana_icons/wp.png similarity index 100% rename from resources/mana_icons/wp.png rename to mtg-collector/resources/mana_icons/wp.png diff --git a/resources/mana_icons/wu.png b/mtg-collector/resources/mana_icons/wu.png similarity index 100% rename from resources/mana_icons/wu.png rename to mtg-collector/resources/mana_icons/wu.png diff --git a/search.py b/mtg-collector/search.py similarity index 100% rename from search.py rename to mtg-collector/search.py diff --git a/util.py b/mtg-collector/util.py similarity index 90% rename from util.py rename to mtg-collector/util.py index bfd501c..cadedbe 100644 --- a/util.py +++ b/mtg-collector/util.py @@ -13,7 +13,7 @@ manaicons ={} def load_mana_icons(): - path = "resources/mana_icons/" + path = os.path.dirname(__file__) + "/resources/mana_icons/" if not os.path.exists(path): print("ERROR: Directory for mana icons not found") return @@ -37,7 +37,8 @@ def reload_image_cache(): def add_test_image(sizex, sizey): - return GdkPixbuf.Pixbuf.new_from_file_at_size('./resources/images/demo.jpg', sizex, sizey) + return GdkPixbuf.Pixbuf.new_from_file_at_size(os.path.dirname(__file__) + + '/resources/images/demo.jpg', sizex, sizey) def load_card_image_online(card): @@ -45,7 +46,7 @@ def load_card_image_online(card): if url is None: print("No Image URL provided") return add_test_image() - filename = ".cache/" + card.multiverse_id.__str__() + ".PNG" + filename = config.cachepath + card.multiverse_id.__str__() + ".PNG" print("Loading image from: " + url) response = request.urlretrieve(url, filename) return GdkPixbuf.Pixbuf.new_from_file_at_size(filename, 63 * 2, 88 * 2) diff --git a/start.py b/start.py new file mode 100755 index 0000000..a082299 --- /dev/null +++ b/start.py @@ -0,0 +1,3 @@ +#!/usr/bin/python +import os +os.system("python "+os.path.dirname(__file__)+"/mtg-collector/gui.py") \ No newline at end of file