diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index df9907975..e304f4bf4 100644
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -602,8 +602,6 @@ To upgrade an old deck, download Anki 0.9.8.7."""))
os.path.split(ankiqt.runningDir)[0])[0]
elif sys.platform.startswith("darwin"):
path = ankiqt.runningDir + "/../../.."
- else:
- path = os.path.join(path, "anki")
path = os.path.join(path, "samples")
path = os.path.normpath(path)
if os.path.exists(path):
@@ -781,9 +779,11 @@ To upgrade an old deck, download Anki 0.9.8.7."""))
return False
if samples:
# we need to copy into a writeable location
- new = DeckStorage.newDeckPath()
- shutil.copyfile(file, new)
- file = new
+ d = unicode(
+ os.path.join(self.documentDir, os.path.basename(file)))
+ if not os.path.exists(d):
+ shutil.copy(file, d)
+ file = d
ret = self.loadDeck(file, interactive=True)
if not ret:
if ret is None:
@@ -976,6 +976,8 @@ To upgrade an old deck, download Anki 0.9.8.7."""))
def updateStudyStats(self):
initial = self.deck.sessionStartTime == 0
+ sessionColour = '%s'
+ cardColour = '%s'
if initial:
# deck just opened, or screen triggered manually
top = _("
Welcome Back!
")
@@ -986,9 +988,9 @@ To upgrade an old deck, download Anki 0.9.8.7."""))
# top label
h = {}
s = self.deck.getStats()
- h['ret'] = '%s' % (s['rev']+s['failed'])
- h['new'] = '%s' % s['new']
- h['newof'] = '%s' % self.deck.newCount
+ h['ret'] = cardColour % (s['rev']+s['failed'])
+ h['new'] = cardColour % s['new']
+ h['newof'] = str(self.deck.newCount)
dtoday = s['dTotal']
yesterday = self.deck._dailyStats.day - datetime.timedelta(1)
res = self.deck.s.first("""
@@ -998,8 +1000,8 @@ day = :d""", d=yesterday)
(dyest, tyest) = res
else:
dyest = 0; tyest = 0
- h['repsToday'] = '%s' % dtoday
- h['repsTodayChg'] = '%s' % dyest
+ h['repsToday'] = sessionColour % dtoday
+ h['repsTodayChg'] = str(dyest)
limit = self.deck.sessionTimeLimit
start = self.deck.sessionStartTime or time.time() - limit
start2 = self.deck.lastSessionStart or start - limit
@@ -1010,29 +1012,30 @@ day = :d""", d=yesterday)
"select count(*) from reviewHistory where "
"time >= :t and time < :t2",
t=start2, t2=start)
- h['repsInSes'] = '%s' % last10
- h['repsInSesChg'] = '%s' % last20
+ h['repsInSes'] = sessionColour % last10
+ h['repsInSesChg'] = str(last20)
ttoday = s['dReviewTime']
- h['timeToday'] = '%s' % (
+ h['timeToday'] = sessionColour % (
anki.utils.fmtTimeSpan(ttoday, short=True, point=1))
- h['timeTodayChg'] = '%s' % (
- anki.utils.fmtTimeSpan(tyest, short=True, point=1))
+ h['timeTodayChg'] = str(anki.utils.fmtTimeSpan(
+ tyest, short=True, point=1))
self.mainWin.optionsLabel.setText(top + _("""\
-
-Session reps: | %(repsInSes)s |
+
+Cards/session: | %(repsInSes)s |
%(repsInSesChg)s |
-Day reps: | %(repsToday)s |
+ Cards/day: | %(repsToday)s |
%(repsTodayChg)s |
-Time: | %(timeToday)s |
+ Time/day: | %(timeToday)s |
%(timeTodayChg)s |
|
Reviews today: | %(ret)s |
-New today: | %(new)s | (of %(newof)s) |
+New today: | %(new)s |
+New total: | %(newof)s |
| """) % h)
|