From 45dd2c2c582f0d41d14b40194545b212a51d7089 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Thu, 4 Dec 2008 01:53:43 +0900
Subject: [PATCH] remove redundant audio commands & toolbar, fix tag bug

---
 ankiqt/ui/cardlist.py   |  1 +
 ankiqt/ui/facteditor.py |  2 ++
 ankiqt/ui/main.py       | 24 +++++-------------------
 designer/main.ui        |  2 --
 4 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/ankiqt/ui/cardlist.py b/ankiqt/ui/cardlist.py
index 23647c050..03f4c2394 100644
--- a/ankiqt/ui/cardlist.py
+++ b/ankiqt/ui/cardlist.py
@@ -546,6 +546,7 @@ where id in (%s)""" % ",".join([
             self.deck.addCards(self.deck.s.query(Fact).get(id),
                                d.selectedCms)
         self.deck.flushMod()
+        self.deck.updateAllPriorities()
         self.deck.setUndoEnd(n)
         self.updateSearch()
 
diff --git a/ankiqt/ui/facteditor.py b/ankiqt/ui/facteditor.py
index 2f4607896..2c1e3a58d 100644
--- a/ankiqt/ui/facteditor.py
+++ b/ankiqt/ui/facteditor.py
@@ -391,6 +391,8 @@ class FactEditor(object):
             self.factState = "invalid"
 
     def onTagChange(self):
+        if not self.fact:
+            return
         self.fact.tags = canonifyTags(unicode(self.tags.text()))
         if self.onChange:
             self.onChange()
diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index 5534c7999..677756dda 100644
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -847,10 +847,9 @@ Error was:\n%s\n...\n%s""") % (fmt1, fmt2))
             mw.toolBar.addAction(mw.actionAddcards)
             mw.toolBar.addAction(mw.actionEditCurrent)
             mw.toolBar.addAction(mw.actionEditdeck)
-            mw.toolBar.addAction(mw.actionRepeatAudio)
             mw.toolBar.addAction(mw.actionMarkCard)
             mw.toolBar.addAction(mw.actionGraphs)
-            mw.toolBar.addAction(mw.actionDisplayProperties)
+            mw.toolBar.addAction(mw.actionRepeatAudio)
             self.addToolBar(Qt.TopToolBarArea, mw.toolBar)
         mw.toolBar.setIconSize(QSize(self.config['iconSize'],
                                      self.config['iconSize']))
@@ -1309,8 +1308,6 @@ Error was:\n%s\n...\n%s""") % (fmt1, fmt2))
         self.connect(m.actionMarkCard, SIGNAL("toggled(bool)"), self.onMark)
         self.connect(m.actionSuspendCard, s, self.onSuspend)
         self.connect(m.actionModelProperties, s, self.onModelProperties)
-        self.connect(m.actionRepeatQuestionAudio, s, self.onRepeatQuestion)
-        self.connect(m.actionRepeatAnswerAudio, s, self.onRepeatAnswer)
         self.connect(m.actionRepeatAudio, s, self.onRepeatAudio)
         self.connect(m.actionUndo, s, self.onUndo)
         self.connect(m.actionRedo, s, self.onRedo)
@@ -1379,8 +1376,6 @@ Error was:\n%s\n...\n%s""") % (fmt1, fmt2))
         self.maybeEnableUndo()
         self.mainWin.actionMarkCard.setEnabled(False)
         self.mainWin.actionSuspendCard.setEnabled(False)
-        self.mainWin.actionRepeatQuestionAudio.setEnabled(False)
-        self.mainWin.actionRepeatAnswerAudio.setEnabled(False)
         self.mainWin.actionRepeatAudio.setEnabled(False)
         self.mainWin.actionEditCurrent.setEnabled(False)
 
@@ -1388,13 +1383,10 @@ Error was:\n%s\n...\n%s""") % (fmt1, fmt2))
         self.maybeEnableUndo()
         self.mainWin.actionMarkCard.setEnabled(True)
         self.mainWin.actionSuspendCard.setEnabled(True)
-        self.mainWin.actionRepeatQuestionAudio.setEnabled(
-            hasSound(self.currentCard.question))
-        self.mainWin.actionRepeatAnswerAudio.setEnabled(
-            hasSound(self.currentCard.answer) and self.state != "getQuestion")
-        self.mainWin.actionRepeatAudio.setEnabled(
-            self.mainWin.actionRepeatQuestionAudio.isEnabled() or
-            self.mainWin.actionRepeatAnswerAudio.isEnabled())
+        snd = (hasSound(self.currentCard.question) or
+               (hasSound(self.currentCard.answer) and
+                self.state != "getQuestion"))
+        self.mainWin.actionRepeatAudio.setEnabled(snd)
         self.mainWin.actionEditCurrent.setEnabled(True)
 
     def maybeEnableUndo(self):
@@ -1550,12 +1542,6 @@ Error was:\n%s\n...\n%s""") % (fmt1, fmt2))
     # Sounds
     ##########################################################################
 
-    def onRepeatQuestion(self):
-        playFromText(self.currentCard.question)
-
-    def onRepeatAnswer(self):
-        playFromText(self.currentCard.answer)
-
     def onRepeatAudio(self):
         playFromText(self.currentCard.question)
         if self.state != "showQuestion":
diff --git a/designer/main.ui b/designer/main.ui
index b4e7b60b7..325761052 100644
--- a/designer/main.ui
+++ b/designer/main.ui
@@ -695,8 +695,6 @@
     <addaction name="actionSuspendCard" />
     <addaction name="separator" />
     <addaction name="actionRepeatAudio" />
-    <addaction name="actionRepeatQuestionAudio" />
-    <addaction name="actionRepeatAnswerAudio" />
     <addaction name="separator" />
     <addaction name="actionGraphs" />
     <addaction name="actionDstats" />