Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonzalo Odiard <godiard@gmail.com>2014-07-11 19:11:36 (GMT)
committer Gonzalo Odiard <godiard@gmail.com>2014-07-14 11:00:10 (GMT)
commit1ee2ceade4b1a5bf52fab23011137809e2bffa3e (patch)
treedca051a5c0f00f136b637ec4adabde54e7e79da3
parent9d81894f8155120a5e1570edcbb9b0b1e458d5c5 (diff)
Fix add a image to a card
-rw-r--r--cardlist.py7
-rw-r--r--model.py2
2 files changed, 7 insertions, 2 deletions
diff --git a/cardlist.py b/cardlist.py
index 4825cc5..ded3a9c 100644
--- a/cardlist.py
+++ b/cardlist.py
@@ -383,9 +383,12 @@ class CardPair(Gtk.EventBox):
def get_image_name(self, card):
if card == 1:
- return self.aimg_name
+ name = self.aimg_name
else:
- return self.bimg_name
+ name = self.bimg_name
+ if name is None:
+ name = 'img%d' % card
+ return name
def get_sound(self, card):
if card == 1:
diff --git a/model.py b/model.py
index b9ab160..b80f1d0 100644
--- a/model.py
+++ b/model.py
@@ -439,6 +439,8 @@ class Model(object):
def create_temp_directories(self):
temp_img_folder = join(self.temp_folder, 'images')
temp_snd_folder = join(self.temp_folder, 'sounds')
+ self.data['pathimg'] = temp_img_folder
+ self.data['pathsnd'] = temp_snd_folder
if not exists(temp_img_folder):
makedirs(temp_img_folder)