diff --git a/.github/scripts/contrib.sh b/.github/scripts/contrib.sh index 691d475ba..8ae2aed0a 100755 --- a/.github/scripts/contrib.sh +++ b/.github/scripts/contrib.sh @@ -2,5 +2,13 @@ set -e +echo "All contributors:" +git log --pretty=format:' - %ae' CONTRIBUTORS |sort |uniq |sort -f + headAuthor=$(git log -1 --pretty=format:'%ae') -git log --pretty=format:'%ae' CONTRIBUTORS | grep -q "$headAuthor" +if git log --pretty=format:'%ae' CONTRIBUTORS | grep -q "$headAuthor"; then + echo "Author $headAuthor found in CONTRIBUTORS" +else + echo "Author $headAuthor NOT found in list" + exit 1 +fi diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 07c521850..28bd03e12 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -18,9 +18,9 @@ support site, it would be great if you could add your name below as well. ******************** -Erez Volk -Aristotelis P. AMBOSS MD Inc. +Aristotelis P. +Erez Volk zjosua ******************** diff --git a/qt/aqt/about.py b/qt/aqt/about.py index 53952e311..e4416148d 100644 --- a/qt/aqt/about.py +++ b/qt/aqt/about.py @@ -150,6 +150,7 @@ system. It's free and open source." "Arthur Milchior", "Rai (Michael Pokorny)", "AMBOSS MD Inc.", + "Erez Volk", ) ) diff --git a/qt/aqt/importing.py b/qt/aqt/importing.py index 1696abb74..e206c764a 100644 --- a/qt/aqt/importing.py +++ b/qt/aqt/importing.py @@ -93,6 +93,8 @@ class ImportDialog(QDialog): self.frm.allowHTML.setChecked(self.mw.pm.profile.get("allowHTML", True)) self.frm.importMode.currentIndexChanged.connect(self.importModeChanged) self.frm.importMode.setCurrentIndex(self.mw.pm.profile.get("importMode", 1)) + self.frm.tagModified.setText(self.mw.pm.profile.get("tagModified", "")) + self.frm.tagModified.setCol(self.mw.col) # import button b = QPushButton(_("Import")) self.frm.buttonBox.addButton(b, QDialogButtonBox.AcceptRole) @@ -180,8 +182,7 @@ you can enter it here. Use \\t to represent tab.""" self.mw.pm.profile["importMode"] = self.importer.importMode self.importer.allowHTML = self.frm.allowHTML.isChecked() self.mw.pm.profile["allowHTML"] = self.importer.allowHTML - if self.frm.tagModifiedCheck.isChecked(): - self.importer.tagModified = self.frm.tagModifiedTag.text() + self.importer.tagModified = self.frm.tagModified.text() self.mw.pm.profile["tagModified"] = self.importer.tagModified did = self.deck.selectedId() if did != self.importer.model["did"]: @@ -289,11 +290,9 @@ you can enter it here. Use \\t to represent tab.""" def importModeChanged(self, newImportMode): if newImportMode == 0: - allowTagModified = True + self.frm.tagModified.setEnabled(True) else: - allowTagModified = False - self.frm.tagModifiedCheck.setEnabled(allowTagModified) - self.frm.tagModifiedTag.setEnabled(allowTagModified) + self.frm.tagModified.setEnabled(False) def showUnicodeWarning(): diff --git a/qt/designer/importing.ui b/qt/designer/importing.ui index 07dd178be..e63ee22b7 100644 --- a/qt/designer/importing.ui +++ b/qt/designer/importing.ui @@ -80,14 +80,14 @@ - + Tag modified notes: - + @@ -157,6 +157,13 @@ + + + TagEdit + QLineEdit +
aqt/tagedit.h
+
+
buttonBox