diff --git a/ankiqt/ui/facteditor.py b/ankiqt/ui/facteditor.py index ed35a1c07..c08965532 100644 --- a/ankiqt/ui/facteditor.py +++ b/ankiqt/ui/facteditor.py @@ -602,7 +602,15 @@ class FactEditor(object): def onRecSound(self): self.initMedia() w = self.focusedEdit() - file = getAudio(self.parent) + try: + file = getAudio(self.parent) + except: + if sys.platform.startswith("darwin"): + ui.utils.showInfo(_('''\ +Please install lame +to enable recording.'''), parent=self.parent) + return + raise if file: self._addSound(unicode(file), widget=w) diff --git a/ankiqt/ui/modelchooser.py b/ankiqt/ui/modelchooser.py index 6ae8fb8e1..7a7af7136 100644 --- a/ankiqt/ui/modelchooser.py +++ b/ankiqt/ui/modelchooser.py @@ -4,7 +4,7 @@ from PyQt4.QtGui import * from PyQt4.QtCore import * from operator import attrgetter -import anki +import anki, sys from anki import stdmodels from anki.models import * from ankiqt import ui @@ -34,7 +34,8 @@ class ModelChooser(QHBoxLayout): self.models.setSizePolicy(sizePolicy) self.addWidget(self.models) self.edit = QPushButton() - self.edit.setFixedWidth(32) + if not sys.platform.startswith("darwin"): + self.edit.setFixedWidth(32) self.edit.setIcon(QIcon(":/icons/configure.png")) self.edit.setShortcut(_("Shift+Alt+e")) self.edit.setToolTip(_("Customize Models")) diff --git a/mac/make.sh b/mac/make.sh index 59f467ea6..adcfd7d34 100755 --- a/mac/make.sh +++ b/mac/make.sh @@ -1,6 +1,8 @@ #!/bin/bash cd /Volumes/Two/anki +echo "cleaning up..." +rm -rf build dist echo "syncing updates..." rsync -av reflex:Lib/code/libanki --exclude .git --exclude build --exclude dist --delete . rsync -av reflex:Lib/code/ankiqt --exclude .git --exclude build --exclude dist --delete . @@ -10,6 +12,9 @@ mkdir -p kakasi cp -Rvf /usr/local/bin/kakasi kakasi cp -Rvf /usr/local/share/kakasi/kanwadict kakasi cp -Rvf /usr/local/share/kakasi/itaijidict kakasi +# echo "updating audio..." +# mkdir -p audio +# cp -Rvf /usr/local/bin/lamex audio echo "adding image formats..." cp -Rvf imageformats ankiqt echo "building..." diff --git a/mac/setup.py b/mac/setup.py index 48c5bd255..efb6ad460 100644 --- a/mac/setup.py +++ b/mac/setup.py @@ -42,12 +42,13 @@ DATA_FILES = [ 'libanki/anki/locale', 'ankiqt/ankiqt/locale', 'kakasi', + #'audio', 'libanki/samples', 'ankiqt/imageformats', 'libanki/anki/features/chinese/unihan.db', ] PLIST = dict( - CFBundleIdentifier = 'cx.repose.anki', + CFBundleIdentifier = 'net.ichi2.anki', CFBundleName = 'Anki', CFBundleDocumentTypes = [], CFBundleLocalizations = ['en', 'ja', 'fr', 'de'] @@ -64,6 +65,7 @@ OPTIONS = { 'excludes': ['_gtkagg', '_tkagg', "_wxagg", "wx", "_wx", "Tkconstants", "Tkinter", "tcl", "pygame"], + #'frameworks': ['libmp3lame.dylib'], 'dylib_excludes': ['libncurses.5.dylib', '_wxagg.so', '_tkagg.so',