diff --git a/ankiqt/config.py b/ankiqt/config.py index 30342711d..3bb76d476 100644 --- a/ankiqt/config.py +++ b/ankiqt/config.py @@ -44,6 +44,7 @@ class Config(dict): 'addZeroSpace': False, 'alternativeTheme': False, 'checkForUpdates': True, + 'colourTimes': True, 'created': time.time(), 'deckBrowserNameLength': 30, 'deckBrowserOrder': 0, diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py index 1a7619a94..d8372e7b2 100755 --- a/ankiqt/ui/main.py +++ b/ankiqt/ui/main.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- # License: GNU GPL, version 3 or later; http://www.gnu.org/copyleft/gpl.html - import os, sys, re, types, gettext, stat, traceback, inspect, signal import shutil, time, glob, tempfile, datetime, zipfile, locale from operator import itemgetter @@ -672,10 +671,17 @@ new: if self.config['suppressEstimates']: l.setText("") elif i == 1: - l.setText(_("Soon")) + txt = _("Soon") + if self.config['colourTimes']: + txt = '%s' % txt + l.setText(txt) else: - l.setText("" + self.deck.nextIntervalStr( - self.currentCard, i) + "") + txt = self.deck.nextIntervalStr( + self.currentCard, i) + txt = "" + txt + "" + if i == self.defaultEaseButton() and self.config['colourTimes']: + txt = '' + txt + '' + l.setText(txt) # Deck loading & saving: backend ########################################################################## diff --git a/ankiqt/ui/preferences.py b/ankiqt/ui/preferences.py index aea36a807..4b0695b45 100644 --- a/ankiqt/ui/preferences.py +++ b/ankiqt/ui/preferences.py @@ -149,6 +149,7 @@ class Preferences(QDialog): self.config['numBackups'] = self.dialog.numBackups.value() def setupAdvanced(self): + self.dialog.colourTimes.setChecked(self.config['colourTimes']) self.dialog.showEstimates.setChecked(not self.config['suppressEstimates']) self.dialog.showStudyOptions.setChecked(self.config['showStudyScreen']) self.dialog.showTray.setChecked(self.config['showTrayIcon']) @@ -164,6 +165,7 @@ class Preferences(QDialog): self.dialog.deckBrowserLen.setValue(self.config['deckBrowserNameLength']) def updateAdvanced(self): + self.config['colourTimes'] = self.dialog.colourTimes.isChecked() self.config['showTrayIcon'] = self.dialog.showTray.isChecked() self.config['showTimer'] = self.dialog.showTimer.isChecked() self.config['suppressEstimates'] = not self.dialog.showEstimates.isChecked() diff --git a/designer/preferences.ui b/designer/preferences.ui index 5583dda97..5fc1acbf8 100644 --- a/designer/preferences.ui +++ b/designer/preferences.ui @@ -6,7 +6,7 @@ 0 0 - 332 + 365 467 @@ -513,7 +513,7 @@ - + Show timer @@ -543,48 +543,55 @@ - + Show study options on deck load - + Show tray icon - + Add hidden char to text (fixes Thai on OSX) - + Always open last deck on startup - + Show decks with cards due first in browser - + Delete original media on add + + + + Colour next times + + + @@ -693,6 +700,7 @@ saveWhenClosing numBackups alternativeTheme + colourTimes showTimer showTray showStudyOptions diff --git a/mac/make_local.sh b/mac/make_local.sh new file mode 100755 index 000000000..32131dd4b --- /dev/null +++ b/mac/make_local.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +PYTHON=/Library/Frameworks/Python.framework/Versions/2.6/bin/python2.6 + +if [ "x$debug" = "x" ]; then + echo "cleaning up..." + rm -rf build dist +fi +find . -name '*.pyc' -exec rm {} \; +echo "adding image formats..." +rm -rf ankiqt/imageformats +mkdir ankiqt/imageformats +cp -Rvf /Developer/Applications/Qt/plugins/imageformats/libq{gif,jpeg,svg,tiff}* ankiqt/imageformats +echo "building..." +PYTHONPATH=ankiqt:libanki $PYTHON ankiqt/mac/setup.py bdist_dmg +