Merge pull request #970 from RumovZ/cleanup-967

Cleanup 967

ftl/core/browsing.ftl

@@ -24,8 +24,6 @@ browsing-change-to = Change { $val } to:
 browsing-clear-unused = Clear Unused
 browsing-clear-unused-tags = Clear Unused Tags
 browsing-created = Created
-browsing-create-filtered-deck = Create Filtered Deck...
-browsing-create-filtered-deck_2 = Create Filtered Deck (2nd Filter)...
 browsing-ctrlandshiftande = Ctrl+Shift+E
 browsing-current-deck = Current Deck
 browsing-current-note-type = Current note type:

qt/aqt/browser.py

@@ -450,6 +450,11 @@ class Browser(QMainWindow):
         card: Optional[Card] = None,
         search: Optional[Tuple[Union[str, SearchTerm]]] = None,
     ) -> None:
+        """
+        card  : try to search for its note and select it
+        search: set and perform search; caller must ensure validity
+        """
+
         QMainWindow.__init__(self, None, Qt.Window)
         self.mw = mw
         self.col = self.mw.col
@@ -489,9 +494,7 @@ class Browser(QMainWindow):
         if not isMac:
             f.actionClose.setVisible(False)
         qconnect(f.actionCreateFilteredDeck.triggered, self.createFilteredDeck)
-        qconnect(f.actionCreateFilteredDeck2.triggered, self.createFilteredDeck2)
-        if self.mw.col.schedVer() == 1:
-            f.menuEdit.removeAction(f.actionCreateFilteredDeck2)
+        f.actionCreateFilteredDeck.setShortcuts(["Ctrl+G", "Ctrl+Alt+G"])
         # notes
         qconnect(f.actionAdd.triggered, self.mw.onAddCard)
         qconnect(f.actionAdd_Tags.triggered, lambda: self.addTags())
@@ -1201,11 +1204,13 @@ where id in %s"""
 
     def createFilteredDeck(self) -> None:
         search = self.form.searchEdit.lineEdit().text()
-        aqt.dialogs.open("DynDeckConfDialog", self.mw, search=search)
-
-    def createFilteredDeck2(self) -> None:
-        search = self.form.searchEdit.lineEdit().text()
-        aqt.dialogs.open("DynDeckConfDialog", self.mw, search_2=search)
+        if (
+            self.mw.col.schedVer() != 1
+            and self.mw.app.keyboardModifiers() & Qt.AltModifier
+        ):
+            aqt.dialogs.open("DynDeckConfDialog", self.mw, search_2=search)
+        else:
+            aqt.dialogs.open("DynDeckConfDialog", self.mw, search=search)
 
     # Preview
     ######################################################################

qt/aqt/dyndeckconf.py

@@ -84,10 +84,6 @@ class DeckConf(QDialog):
             without_unicode_isolation(tr(TR.ACTIONS_OPTIONS_FOR, val=self.deck["name"]))
         )
         self.form.buttonBox.button(QDialogButtonBox.Ok).setText(label)
-        self.form.buttonBox.button(QDialogButtonBox.Cancel).setText(
-            tr(TR.ACTIONS_CANCEL)
-        )
-        self.form.buttonBox.button(QDialogButtonBox.Help).setText(tr(TR.ACTIONS_HELP))
         if self.mw.col.schedVer() == 1:
             self.form.secondFilter.setVisible(False)
         restoreGeom(self, "dyndeckconf")

qt/aqt/forms/browser.ui

@@ -232,7 +232,6 @@
     <addaction name="actionClose"/>
     <addaction name="separator"/>
     <addaction name="actionCreateFilteredDeck"/>
-    <addaction name="actionCreateFilteredDeck2"/>
    </widget>
    <widget class="QMenu" name="menuJump">
     <property name="title">
@@ -588,20 +587,12 @@
   </action>
   <action name="actionCreateFilteredDeck">
    <property name="text">
-    <string>BROWSING_CREATE_FILTERED_DECK</string>
+    <string>QT_MISC_CREATE_FILTERED_DECK</string>
    </property>
    <property name="shortcut">
     <string notr="true">Ctrl+G</string>
    </property>
   </action>
-  <action name="actionCreateFilteredDeck2">
-   <property name="text">
-    <string>BROWSING_CREATE_FILTERED_DECK_2</string>
-   </property>
-   <property name="shortcut">
-    <string notr="true">Ctrl+Shift+G</string>
-   </property>
-  </action>
  </widget>
  <resources>
   <include location="icons.qrc"/>

qt/mypy.ini

@@ -16,6 +16,8 @@ disallow_untyped_defs=true
 disallow_untyped_defs=true
 [mypy-aqt.utils]
 disallow_untyped_defs=true
+[mypy-aqt.dyndeckconf]
+disallow_untyped_defs=true
 
 
 [mypy-aqt.mpv]