diff --git a/aqt/about.py b/aqt/about.py index 72e9fb49b..84d2e4af5 100644 --- a/aqt/about.py +++ b/aqt/about.py @@ -23,7 +23,7 @@ def show(mw): mw.setupDialogGC(dialog) abt = aqt.forms.about.Ui_About() abt.setupUi(dialog) - abouttext = "
" + abouttext = "
" abouttext += '

' + _("Anki is a friendly, intelligent spaced learning \ system. It's free and open source.") abouttext += "

"+_("Anki is licensed under the AGPL3 license. Please see " @@ -119,9 +119,6 @@ system. It's free and open source.") abouttext += '

' + _("Written by Damien Elmes, with patches, translation,\ testing and design from:

%(cont)s") % {'cont': ", ".join(allusers)} - abouttext += '

' + _("""\ -The icons were obtained from various sources; please see the Anki source -for credits.""") abouttext += '

' + _("If you have contributed and are not on this list, \ please get in touch.") abouttext += '

' + _("A big thanks to all the people who have provided \ diff --git a/aqt/browser.py b/aqt/browser.py index 03bd8a057..57943343b 100644 --- a/aqt/browser.py +++ b/aqt/browser.py @@ -1169,13 +1169,12 @@ where id in %s""" % ids2str(sf)) self._previewWindow = self._previewPrev = self._previewNext = None def _setupPreviewWebview(self): - base = self.mw.baseHTML() jsinc = ["jquery.js","browsersel.js", "mathjax/conf.js", "mathjax/MathJax.js", "reviewer.js"] self._previewWeb.stdHtml(self.mw.reviewer.revHtml(), css=["reviewer.css"], - head=base, js=jsinc) + js=jsinc) def _renderPreview(self, cardChanged=False): diff --git a/aqt/clayout.py b/aqt/clayout.py index 24a991fed..49f08dac2 100644 --- a/aqt/clayout.py +++ b/aqt/clayout.py @@ -170,16 +170,15 @@ class CardLayout(QDialog): pform.frontPrevBox.addWidget(pform.frontWeb) pform.backWeb = AnkiWebView() pform.backPrevBox.addWidget(pform.backWeb) - base = self.mw.baseHTML() jsinc = ["jquery.js","browsersel.js", "mathjax/conf.js", "mathjax/MathJax.js", "reviewer.js"] pform.frontWeb.stdHtml(self.mw.reviewer.revHtml(), css=["reviewer.css"], - head=base, js=jsinc) + js=jsinc) pform.backWeb.stdHtml(self.mw.reviewer.revHtml(), css=["reviewer.css"], - head=base, js=jsinc) + js=jsinc) def updateMainArea(self): if self._isCloze(): diff --git a/aqt/deckbrowser.py b/aqt/deckbrowser.py index b1a678c46..d2d21bdf8 100644 --- a/aqt/deckbrowser.py +++ b/aqt/deckbrowser.py @@ -188,7 +188,7 @@ where id > ?""", (self.mw.col.sched.dayCutoff-86400)*1000) nonzeroColour(new, "#000099")) # options buf += ("" - "" % did) + "" % did) # children buf += self._renderDeckTree(children, depth+1) return buf @@ -196,15 +196,6 @@ where id > ?""", (self.mw.col.sched.dayCutoff-86400)*1000) def _topLevelDragRow(self): return " " - def _dueImg(self, due, new): - if due: - i = "clock-icon" - elif new: - i = "plus-circle" - else: - i = "none" - return '' % i - # Options ########################################################################## diff --git a/aqt/deckconf.py b/aqt/deckconf.py index 6784acfe8..c176b5fdf 100644 --- a/aqt/deckconf.py +++ b/aqt/deckconf.py @@ -26,7 +26,6 @@ class DeckConf(QDialog): self.setWindowModality(Qt.WindowModal) self.form.buttonBox.helpRequested.connect(lambda: openHelp("deckoptions")) self.form.confOpts.clicked.connect(self.confOpts) - self.form.confOpts.setText(downArrow()) self.form.buttonBox.button(QDialogButtonBox.RestoreDefaults).clicked.connect(self.onRestore) self.setWindowTitle(_("Options for %s") % self.deck['name']) # qt doesn't size properly with altered fonts otherwise diff --git a/aqt/editor.py b/aqt/editor.py index befcd86eb..5c52da657 100644 --- a/aqt/editor.py +++ b/aqt/editor.py @@ -106,7 +106,7 @@ class Editor: self.web.stdHtml(_html % ( bgcol, bgcol, topbuts, - _("Show Duplicates")), head=self.mw.baseHTML(), + _("Show Duplicates")), css=["editor.css"], js=["jquery.js", "editor.js"]) @@ -127,7 +127,7 @@ class Editor: if os.path.isabs(icon): iconstr = self.resourceToData(icon) else: - iconstr = "qrc:/icons/{}.png".format(icon) + iconstr = "/_anki/imgs/{}.png".format(icon) if id: idstr = 'id={}'.format(id) else: diff --git a/aqt/reviewer.py b/aqt/reviewer.py index f341dda1f..79e64def8 100644 --- a/aqt/reviewer.py +++ b/aqt/reviewer.py @@ -120,17 +120,15 @@ class Reviewer: def revHtml(self): extra = self.mw.col.conf.get("reviewExtra", "") return f""" - +

{extra} """ def _initWeb(self): self._reps = 0 - base = self.mw.baseHTML() # main window self.web.stdHtml(self.revHtml(), - head=base, css=["reviewer.css"], js=["jquery.js", "browsersel.js", diff --git a/aqt/sound.py b/aqt/sound.py index 2c8fb39b6..904e4f663 100644 --- a/aqt/sound.py +++ b/aqt/sound.py @@ -14,7 +14,6 @@ def getAudio(parent, encode=True): mb = QMessageBox(parent) restoreGeom(mb, "audioRecorder") mb.setWindowTitle("Anki") - mb.setIconPixmap(QPixmap(":/icons/media-record.png")) but = QPushButton(_("Save")) mb.addButton(but, QMessageBox.AcceptRole) but = QPushButton(_("Cancel")) diff --git a/aqt/taglimit.py b/aqt/taglimit.py index 77edd7999..a7ab95101 100644 --- a/aqt/taglimit.py +++ b/aqt/taglimit.py @@ -30,13 +30,12 @@ class TagLimit(QDialog): noHash[n] = True groupedTags = [] usertags.sort() - icon = QIcon(":/icons/Anki_Fact.png") - groupedTags.append([icon, usertags]) + groupedTags.append(usertags) self.tags = [] - for (icon, tags) in groupedTags: + for tags in groupedTags: for t in tags: self.tags.append(t) - item = QListWidgetItem(icon, t.replace("_", " ")) + item = QListWidgetItem(t.replace("_", " ")) self.dialog.activeList.addItem(item) if t in yesHash: mode = QItemSelectionModel.Select @@ -46,7 +45,7 @@ class TagLimit(QDialog): idx = self.dialog.activeList.indexFromItem(item) self.dialog.activeList.selectionModel().select(idx, mode) # inactive - item = QListWidgetItem(icon, t.replace("_", " ")) + item = QListWidgetItem(t.replace("_", " ")) self.dialog.inactiveList.addItem(item) if t in noHash: mode = QItemSelectionModel.Select diff --git a/aqt/utils.py b/aqt/utils.py index 191832ddf..44863843e 100644 --- a/aqt/utils.py +++ b/aqt/utils.py @@ -353,11 +353,6 @@ def applyStyles(widget): if os.path.exists(p): widget.setStyleSheet(open(p).read()) -# this will go away in the future - please use mw.baseHTML() instead -def getBase(col): - from aqt import mw - return mw.baseHTML() - def openFolder(path): if isWin: subprocess.Popen(["explorer", "file://"+path]) @@ -405,7 +400,6 @@ def tooltip(msg, period=3000, parent=None): lab = CustomLabel("""\ -
%s
""" % msg, aw) diff --git a/aqt/webview.py b/aqt/webview.py index fd2e489e0..1f0641ac0 100644 --- a/aqt/webview.py +++ b/aqt/webview.py @@ -58,6 +58,10 @@ class AnkiWebPage(QWebEnginePage): def acceptNavigationRequest(self, url, navType, isMainFrame): if not isMainFrame: return True + from aqt import mw + # ignore href=# + if url.toString().startswith(mw.serverURL()): + return False # load all other links in browser openLink(url) return False @@ -179,8 +183,8 @@ border-radius:5px; font-family: Helvetica }""" [self.bundledCSS(fname) for fname in css]) jstxt = "\n".join([self.bundledScript("webview.js")]+ [self.bundledScript(fname) for fname in js]) - head += csstxt + jstxt - + from aqt import mw + head = mw.baseHTML() + head + csstxt + jstxt html=f""" diff --git a/designer/addcards.ui b/designer/addcards.ui index 1331a417c..a3bd0d452 100644 --- a/designer/addcards.ui +++ b/designer/addcards.ui @@ -13,10 +13,6 @@ Add - - - :/icons/list-add.png:/icons/list-add.png - 3 diff --git a/designer/browser.ui b/designer/browser.ui index 2f803d200..11a7ec125 100644 --- a/designer/browser.ui +++ b/designer/browser.ui @@ -19,10 +19,6 @@ Browser - - - :/icons/find.png:/icons/find.png - diff --git a/designer/dconf.ui b/designer/dconf.ui index fb5dca656..0ee12aa5b 100644 --- a/designer/dconf.ui +++ b/designer/dconf.ui @@ -39,11 +39,7 @@ - - - - - :/icons/gears.png:/icons/gears.png + Manage... Qt::ToolButtonTextBesideIcon diff --git a/designer/icons.qrc b/designer/icons.qrc index 61e0c110e..c48a65e67 100644 --- a/designer/icons.qrc +++ b/designer/icons.qrc @@ -1,121 +1,5 @@ - icons/paperclip.png - icons/more.png - icons/text_cloze.png - icons/arrow-up.png - icons/arrow-down.png - icons/gears.png - icons/green.png - icons/clock-icon.png - icons/plus-circle.png - icons/text_clear.png - icons/none.png - icons/edit-find 2.png - icons/edit-find-replace.png - icons/user-identity.png - icons/layout.png - icons/view-sort-descending.png - icons/view-refresh.png - icons/emblem-important.png - icons/view-sort-ascending.png - icons/media-playback-start2.png - icons/anki-logo-thin.png - icons/download.png - icons/preferences-plugin.png - icons/system-software-update.png - icons/media-playback-stop.png - icons/media-record.png - icons/view-calendar-tasks.png - icons/help-hint.png - icons/go-first.png - icons/go-jump-today.png - icons/go-last.png - icons/go-next.png - icons/go-previous.png - icons/player-time.png - icons/find.png - icons/editclear.png - icons/view-statistics.png - icons/emblem-favorite.png - icons/emblem-favorite-dark.png - icons/emblem-favorite-off.png - icons/view-pim-calendar.png - icons/anki-tag.png - icons/edit-redo.png - icons/text-xml.png - icons/media-record.png - icons/edit-rename.png - icons/kblogger.png - icons/khtml_kget.png - icons/edit-find.png - icons/colors.png icons/anki.png - icons/ankibw.png - icons/addtag.png - icons/deletetag.png - icons/application-exit.png - icons/configure.png - icons/contents.png - icons/contents2.png - icons/document-export.png - icons/document-import.png - icons/document-new.png - icons/edit-undo.png - icons/edit.png - icons/editdelete.png - icons/fileclose.png - icons/folder_image.png - icons/folder_sound.png - icons/format-stroke-color.png - icons/games-solve.png - icons/help-contents.png - icons/help.png - icons/image.png - icons/kbugbuster.png - icons/kexi.png - icons/kpersonalizer.png - icons/list-add.png - icons/math_matrix.png - icons/math_sqrt.png - icons/media-playback-pause.png - icons/media-playback-start.png - icons/media-playback-stop.png - icons/package_games_card.png - icons/preferences-desktop-font.png - icons/rating.png - icons/speaker.png - icons/spreadsheet.png - icons/sqlitebrowser.png - icons/system-shutdown.png - icons/tex.png - icons/text-speak.png - icons/text_bold.png - icons/text_italic.png - icons/text_under.png - icons/view-pim-news.png - icons/view_text.png - icons/text_sub.png - icons/text_super.png - icons/text_remove.png - icons/product_design.png - icons/stock_new_template.png - icons/stock_new_template_blue.png - icons/stock_new_template_green.png - icons/stock_new_template_red.png - icons/stock_group.png - icons/star16.png - icons/star_off16.png - icons/pause16.png - icons/pause_off16.png - icons/info.png - icons/add16.png - icons/delete16.png - icons/addtag16.png - icons/deletetag16.png - icons/mail-attachment.png - icons/deck16.png - icons/clock16.png - icons/plus16.png diff --git a/designer/icons/_sources.txt b/designer/icons/_sources.txt deleted file mode 100644 index 9fdaab34c..000000000 --- a/designer/icons/_sources.txt +++ /dev/null @@ -1,9 +0,0 @@ --Anki icon by Alex Fraser (CC GNU GPL) --Deck icon: Be Box Icons (non-commercial use) --Deck due/new icons from: - http://led24.de/iconset - http://p.yusukekamiyamane.com/ --Other icons obtained from KDE themes (GPL/LGPL) - -Note that some of the icons have been modified to fit in with Anki better -(grayscaled, cropped, etc). diff --git a/designer/icons/add16.png b/designer/icons/add16.png deleted file mode 100644 index 27822a8dc..000000000 Binary files a/designer/icons/add16.png and /dev/null differ diff --git a/designer/icons/addtag.png b/designer/icons/addtag.png deleted file mode 100644 index 286a6d449..000000000 Binary files a/designer/icons/addtag.png and /dev/null differ diff --git a/designer/icons/addtag16.png b/designer/icons/addtag16.png deleted file mode 100644 index e2d5fb08b..000000000 Binary files a/designer/icons/addtag16.png and /dev/null differ diff --git a/designer/icons/anki-logo.svg b/designer/icons/anki-logo.svg deleted file mode 100644 index 5641528c7..000000000 --- a/designer/icons/anki-logo.svg +++ /dev/null @@ -1,992 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - f - - - - - - - c - - - - - - - ! - - - - - - - - fc! - - - - - fc! - - - diff --git a/designer/icons/anki-logo2.svg b/designer/icons/anki-logo2.svg deleted file mode 100644 index 474cf969a..000000000 --- a/designer/icons/anki-logo2.svg +++ /dev/null @@ -1,1303 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - f - - - - - - - c - - - - - - - ! - - - - - - - - fc! - - - - - - - - - - - fc! - - - - - - - - - - - - - Anki - - - - - - Anki - - - diff --git a/designer/icons/anki-logo_BW.svg b/designer/icons/anki-logo_BW.svg deleted file mode 100644 index 5cfb69403..000000000 --- a/designer/icons/anki-logo_BW.svg +++ /dev/null @@ -1,352 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/designer/icons/anki-logo_black.png b/designer/icons/anki-logo_black.png deleted file mode 100644 index 6eeadb641..000000000 Binary files a/designer/icons/anki-logo_black.png and /dev/null differ diff --git a/designer/icons/anki-logo_white.png b/designer/icons/anki-logo_white.png deleted file mode 100644 index e6b4e5aa4..000000000 Binary files a/designer/icons/anki-logo_white.png and /dev/null differ diff --git a/designer/icons/anki-tag.png b/designer/icons/anki-tag.png deleted file mode 100644 index a7b02bd00..000000000 Binary files a/designer/icons/anki-tag.png and /dev/null differ diff --git a/designer/icons/anki.svg b/designer/icons/anki.svg deleted file mode 100644 index ecd779767..000000000 --- a/designer/icons/anki.svg +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/designer/icons/ankibw.png b/designer/icons/ankibw.png deleted file mode 100644 index c839abaf9..000000000 Binary files a/designer/icons/ankibw.png and /dev/null differ diff --git a/designer/icons/application-exit.png b/designer/icons/application-exit.png deleted file mode 100644 index dd76354c4..000000000 Binary files a/designer/icons/application-exit.png and /dev/null differ diff --git a/designer/icons/arrow-down-double.png b/designer/icons/arrow-down-double.png deleted file mode 100644 index 7748c0114..000000000 Binary files a/designer/icons/arrow-down-double.png and /dev/null differ diff --git a/designer/icons/arrow-down.png b/designer/icons/arrow-down.png deleted file mode 100644 index 7c9274f30..000000000 Binary files a/designer/icons/arrow-down.png and /dev/null differ diff --git a/designer/icons/arrow-up-double.png b/designer/icons/arrow-up-double.png deleted file mode 100644 index 843194fa7..000000000 Binary files a/designer/icons/arrow-up-double.png and /dev/null differ diff --git a/designer/icons/arrow-up.png b/designer/icons/arrow-up.png deleted file mode 100644 index 758a0d1af..000000000 Binary files a/designer/icons/arrow-up.png and /dev/null differ diff --git a/designer/icons/clock-icon.png b/designer/icons/clock-icon.png deleted file mode 100644 index f502e454a..000000000 Binary files a/designer/icons/clock-icon.png and /dev/null differ diff --git a/designer/icons/clock16.png b/designer/icons/clock16.png deleted file mode 100644 index 787808d5c..000000000 Binary files a/designer/icons/clock16.png and /dev/null differ diff --git a/designer/icons/colors.png b/designer/icons/colors.png deleted file mode 100644 index e5aa87cbd..000000000 Binary files a/designer/icons/colors.png and /dev/null differ diff --git a/designer/icons/configure.png b/designer/icons/configure.png deleted file mode 100644 index 17905c734..000000000 Binary files a/designer/icons/configure.png and /dev/null differ diff --git a/designer/icons/contents.png b/designer/icons/contents.png deleted file mode 100644 index 2e86079c0..000000000 Binary files a/designer/icons/contents.png and /dev/null differ diff --git a/designer/icons/contents2.png b/designer/icons/contents2.png deleted file mode 100644 index 6b00ccd58..000000000 Binary files a/designer/icons/contents2.png and /dev/null differ diff --git a/designer/icons/deck16.png b/designer/icons/deck16.png deleted file mode 100644 index 44345718e..000000000 Binary files a/designer/icons/deck16.png and /dev/null differ diff --git a/designer/icons/delete16.png b/designer/icons/delete16.png deleted file mode 100644 index 81961e04c..000000000 Binary files a/designer/icons/delete16.png and /dev/null differ diff --git a/designer/icons/deletetag.png b/designer/icons/deletetag.png deleted file mode 100644 index a7d9a5358..000000000 Binary files a/designer/icons/deletetag.png and /dev/null differ diff --git a/designer/icons/deletetag16.png b/designer/icons/deletetag16.png deleted file mode 100644 index 6275171ee..000000000 Binary files a/designer/icons/deletetag16.png and /dev/null differ diff --git a/designer/icons/document-export.png b/designer/icons/document-export.png deleted file mode 100644 index 999a415b4..000000000 Binary files a/designer/icons/document-export.png and /dev/null differ diff --git a/designer/icons/document-import.png b/designer/icons/document-import.png deleted file mode 100644 index 6680f2416..000000000 Binary files a/designer/icons/document-import.png and /dev/null differ diff --git a/designer/icons/document-new.png b/designer/icons/document-new.png deleted file mode 100644 index 3d0f5cc1d..000000000 Binary files a/designer/icons/document-new.png and /dev/null differ diff --git a/designer/icons/download.png b/designer/icons/download.png deleted file mode 100644 index 3f2169268..000000000 Binary files a/designer/icons/download.png and /dev/null differ diff --git a/designer/icons/edit-find 2.png b/designer/icons/edit-find 2.png deleted file mode 100644 index 64a1e28d3..000000000 Binary files a/designer/icons/edit-find 2.png and /dev/null differ diff --git a/designer/icons/edit-find-replace.png b/designer/icons/edit-find-replace.png deleted file mode 100644 index 3df5daa3b..000000000 Binary files a/designer/icons/edit-find-replace.png and /dev/null differ diff --git a/designer/icons/edit-find.png b/designer/icons/edit-find.png deleted file mode 100644 index 1e2b2e0b3..000000000 Binary files a/designer/icons/edit-find.png and /dev/null differ diff --git a/designer/icons/edit-redo.png b/designer/icons/edit-redo.png deleted file mode 100644 index d759f1367..000000000 Binary files a/designer/icons/edit-redo.png and /dev/null differ diff --git a/designer/icons/edit-rename.png b/designer/icons/edit-rename.png deleted file mode 100644 index 5f089f584..000000000 Binary files a/designer/icons/edit-rename.png and /dev/null differ diff --git a/designer/icons/edit-undo.png b/designer/icons/edit-undo.png deleted file mode 100644 index c893a1a65..000000000 Binary files a/designer/icons/edit-undo.png and /dev/null differ diff --git a/designer/icons/edit.png b/designer/icons/edit.png deleted file mode 100644 index 1d6914515..000000000 Binary files a/designer/icons/edit.png and /dev/null differ diff --git a/designer/icons/editclear.png b/designer/icons/editclear.png deleted file mode 100644 index 774071c84..000000000 Binary files a/designer/icons/editclear.png and /dev/null differ diff --git a/designer/icons/editdelete.png b/designer/icons/editdelete.png deleted file mode 100644 index 6606ee378..000000000 Binary files a/designer/icons/editdelete.png and /dev/null differ diff --git a/designer/icons/emblem-favorite-dark.png b/designer/icons/emblem-favorite-dark.png deleted file mode 100644 index 740209965..000000000 Binary files a/designer/icons/emblem-favorite-dark.png and /dev/null differ diff --git a/designer/icons/emblem-favorite-off.png b/designer/icons/emblem-favorite-off.png deleted file mode 100644 index b7fdbbd0d..000000000 Binary files a/designer/icons/emblem-favorite-off.png and /dev/null differ diff --git a/designer/icons/emblem-favorite.png b/designer/icons/emblem-favorite.png deleted file mode 100644 index 1b96fc8ec..000000000 Binary files a/designer/icons/emblem-favorite.png and /dev/null differ diff --git a/designer/icons/emblem-important.png b/designer/icons/emblem-important.png deleted file mode 100644 index 6e5f28451..000000000 Binary files a/designer/icons/emblem-important.png and /dev/null differ diff --git a/designer/icons/fileclose.png b/designer/icons/fileclose.png deleted file mode 100644 index 8acc84d11..000000000 Binary files a/designer/icons/fileclose.png and /dev/null differ diff --git a/designer/icons/find.png b/designer/icons/find.png deleted file mode 100644 index 4aaf8b2fb..000000000 Binary files a/designer/icons/find.png and /dev/null differ diff --git a/designer/icons/folder_image.png b/designer/icons/folder_image.png deleted file mode 100644 index a856a401c..000000000 Binary files a/designer/icons/folder_image.png and /dev/null differ diff --git a/designer/icons/folder_sound.png b/designer/icons/folder_sound.png deleted file mode 100644 index b5f8992d6..000000000 Binary files a/designer/icons/folder_sound.png and /dev/null differ diff --git a/designer/icons/format-stroke-color.png b/designer/icons/format-stroke-color.png deleted file mode 100644 index 9ce772d11..000000000 Binary files a/designer/icons/format-stroke-color.png and /dev/null differ diff --git a/designer/icons/games-solve.png b/designer/icons/games-solve.png deleted file mode 100644 index 6ed4c8654..000000000 Binary files a/designer/icons/games-solve.png and /dev/null differ diff --git a/designer/icons/gears.png b/designer/icons/gears.png deleted file mode 100644 index 3c2bc3336..000000000 Binary files a/designer/icons/gears.png and /dev/null differ diff --git a/designer/icons/go-first.png b/designer/icons/go-first.png deleted file mode 100644 index 68498491c..000000000 Binary files a/designer/icons/go-first.png and /dev/null differ diff --git a/designer/icons/go-jump-today.png b/designer/icons/go-jump-today.png deleted file mode 100644 index 764247d28..000000000 Binary files a/designer/icons/go-jump-today.png and /dev/null differ diff --git a/designer/icons/go-last.png b/designer/icons/go-last.png deleted file mode 100644 index fca58e3fb..000000000 Binary files a/designer/icons/go-last.png and /dev/null differ diff --git a/designer/icons/go-next.png b/designer/icons/go-next.png deleted file mode 100644 index c4da8a9a3..000000000 Binary files a/designer/icons/go-next.png and /dev/null differ diff --git a/designer/icons/go-previous.png b/designer/icons/go-previous.png deleted file mode 100644 index 68ed8a13e..000000000 Binary files a/designer/icons/go-previous.png and /dev/null differ diff --git a/designer/icons/green.png b/designer/icons/green.png deleted file mode 100644 index 59d747cae..000000000 Binary files a/designer/icons/green.png and /dev/null differ diff --git a/designer/icons/help-contents.png b/designer/icons/help-contents.png deleted file mode 100644 index 7579eefba..000000000 Binary files a/designer/icons/help-contents.png and /dev/null differ diff --git a/designer/icons/help-hint.png b/designer/icons/help-hint.png deleted file mode 100644 index 209f1d28c..000000000 Binary files a/designer/icons/help-hint.png and /dev/null differ diff --git a/designer/icons/help.png b/designer/icons/help.png deleted file mode 100644 index 93bf094a1..000000000 Binary files a/designer/icons/help.png and /dev/null differ diff --git a/designer/icons/image.png b/designer/icons/image.png deleted file mode 100644 index d6a9bc31b..000000000 Binary files a/designer/icons/image.png and /dev/null differ diff --git a/designer/icons/info.png b/designer/icons/info.png deleted file mode 100644 index ad64bc094..000000000 Binary files a/designer/icons/info.png and /dev/null differ diff --git a/designer/icons/kblogger.png b/designer/icons/kblogger.png deleted file mode 100644 index 3d9e249e3..000000000 Binary files a/designer/icons/kblogger.png and /dev/null differ diff --git a/designer/icons/kbugbuster.png b/designer/icons/kbugbuster.png deleted file mode 100644 index c7ace707e..000000000 Binary files a/designer/icons/kbugbuster.png and /dev/null differ diff --git a/designer/icons/kexi.png b/designer/icons/kexi.png deleted file mode 100644 index 35980860e..000000000 Binary files a/designer/icons/kexi.png and /dev/null differ diff --git a/designer/icons/khtml_kget.png b/designer/icons/khtml_kget.png deleted file mode 100644 index 5cb665528..000000000 Binary files a/designer/icons/khtml_kget.png and /dev/null differ diff --git a/designer/icons/kpersonalizer.png b/designer/icons/kpersonalizer.png deleted file mode 100644 index cc3e98698..000000000 Binary files a/designer/icons/kpersonalizer.png and /dev/null differ diff --git a/designer/icons/layout.png b/designer/icons/layout.png deleted file mode 100644 index 2ad40bd84..000000000 Binary files a/designer/icons/layout.png and /dev/null differ diff --git a/designer/icons/list-add.png b/designer/icons/list-add.png deleted file mode 100644 index f98e2a8ca..000000000 Binary files a/designer/icons/list-add.png and /dev/null differ diff --git a/designer/icons/mail-attachment.png b/designer/icons/mail-attachment.png deleted file mode 100644 index 1ca5cf244..000000000 Binary files a/designer/icons/mail-attachment.png and /dev/null differ diff --git a/designer/icons/math_matrix.png b/designer/icons/math_matrix.png deleted file mode 100644 index e30804f03..000000000 Binary files a/designer/icons/math_matrix.png and /dev/null differ diff --git a/designer/icons/math_sqrt.png b/designer/icons/math_sqrt.png deleted file mode 100644 index 69df3f61e..000000000 Binary files a/designer/icons/math_sqrt.png and /dev/null differ diff --git a/designer/icons/media-playback-pause.png b/designer/icons/media-playback-pause.png deleted file mode 100644 index 5c7d128ee..000000000 Binary files a/designer/icons/media-playback-pause.png and /dev/null differ diff --git a/designer/icons/media-playback-start.png b/designer/icons/media-playback-start.png deleted file mode 100644 index 6bef018a8..000000000 Binary files a/designer/icons/media-playback-start.png and /dev/null differ diff --git a/designer/icons/media-playback-start2.png b/designer/icons/media-playback-start2.png deleted file mode 100644 index 71906857c..000000000 Binary files a/designer/icons/media-playback-start2.png and /dev/null differ diff --git a/designer/icons/media-playback-stop.png b/designer/icons/media-playback-stop.png deleted file mode 100644 index 650874f67..000000000 Binary files a/designer/icons/media-playback-stop.png and /dev/null differ diff --git a/designer/icons/none.png b/designer/icons/none.png deleted file mode 100644 index 86d14a7a7..000000000 Binary files a/designer/icons/none.png and /dev/null differ diff --git a/designer/icons/package_games_card.png b/designer/icons/package_games_card.png deleted file mode 100644 index bae6de614..000000000 Binary files a/designer/icons/package_games_card.png and /dev/null differ diff --git a/designer/icons/pause16.png b/designer/icons/pause16.png deleted file mode 100644 index 1ece3cbbd..000000000 Binary files a/designer/icons/pause16.png and /dev/null differ diff --git a/designer/icons/pause_off16.png b/designer/icons/pause_off16.png deleted file mode 100644 index 81ae20367..000000000 Binary files a/designer/icons/pause_off16.png and /dev/null differ diff --git a/designer/icons/player-time.png b/designer/icons/player-time.png deleted file mode 100644 index bbca4fada..000000000 Binary files a/designer/icons/player-time.png and /dev/null differ diff --git a/designer/icons/plus-circle.png b/designer/icons/plus-circle.png deleted file mode 100644 index e1b390f3e..000000000 Binary files a/designer/icons/plus-circle.png and /dev/null differ diff --git a/designer/icons/plus16.png b/designer/icons/plus16.png deleted file mode 100644 index 38a31137c..000000000 Binary files a/designer/icons/plus16.png and /dev/null differ diff --git a/designer/icons/preferences-desktop-font.png b/designer/icons/preferences-desktop-font.png deleted file mode 100644 index 9ace98c25..000000000 Binary files a/designer/icons/preferences-desktop-font.png and /dev/null differ diff --git a/designer/icons/preferences-plugin.png b/designer/icons/preferences-plugin.png deleted file mode 100644 index 5c8af7d21..000000000 Binary files a/designer/icons/preferences-plugin.png and /dev/null differ diff --git a/designer/icons/product_design.png b/designer/icons/product_design.png deleted file mode 100644 index 6f6b3b462..000000000 Binary files a/designer/icons/product_design.png and /dev/null differ diff --git a/designer/icons/rating.png b/designer/icons/rating.png deleted file mode 100644 index c6acf90aa..000000000 Binary files a/designer/icons/rating.png and /dev/null differ diff --git a/designer/icons/speaker.png b/designer/icons/speaker.png deleted file mode 100644 index 539003aaf..000000000 Binary files a/designer/icons/speaker.png and /dev/null differ diff --git a/designer/icons/spreadsheet.png b/designer/icons/spreadsheet.png deleted file mode 100644 index b9b8d564b..000000000 Binary files a/designer/icons/spreadsheet.png and /dev/null differ diff --git a/designer/icons/sqlitebrowser.png b/designer/icons/sqlitebrowser.png deleted file mode 100644 index 87be207dd..000000000 Binary files a/designer/icons/sqlitebrowser.png and /dev/null differ diff --git a/designer/icons/star16.png b/designer/icons/star16.png deleted file mode 100644 index 6402f6c06..000000000 Binary files a/designer/icons/star16.png and /dev/null differ diff --git a/designer/icons/star_off16.png b/designer/icons/star_off16.png deleted file mode 100644 index 9146a976c..000000000 Binary files a/designer/icons/star_off16.png and /dev/null differ diff --git a/designer/icons/stock_group.png b/designer/icons/stock_group.png deleted file mode 100644 index 9244fbdb9..000000000 Binary files a/designer/icons/stock_group.png and /dev/null differ diff --git a/designer/icons/stock_new_template.png b/designer/icons/stock_new_template.png deleted file mode 100644 index 479adde4f..000000000 Binary files a/designer/icons/stock_new_template.png and /dev/null differ diff --git a/designer/icons/stock_new_template_blue.png b/designer/icons/stock_new_template_blue.png deleted file mode 100644 index d77a9e4ba..000000000 Binary files a/designer/icons/stock_new_template_blue.png and /dev/null differ diff --git a/designer/icons/stock_new_template_green.png b/designer/icons/stock_new_template_green.png deleted file mode 100644 index 55c283b2e..000000000 Binary files a/designer/icons/stock_new_template_green.png and /dev/null differ diff --git a/designer/icons/stock_new_template_red.png b/designer/icons/stock_new_template_red.png deleted file mode 100644 index c8a96a120..000000000 Binary files a/designer/icons/stock_new_template_red.png and /dev/null differ diff --git a/designer/icons/system-shutdown.png b/designer/icons/system-shutdown.png deleted file mode 100644 index b0123b423..000000000 Binary files a/designer/icons/system-shutdown.png and /dev/null differ diff --git a/designer/icons/system-software-update.png b/designer/icons/system-software-update.png deleted file mode 100644 index 00bb4480c..000000000 Binary files a/designer/icons/system-software-update.png and /dev/null differ diff --git a/designer/icons/tex.png b/designer/icons/tex.png deleted file mode 100644 index 7f9ecd901..000000000 Binary files a/designer/icons/tex.png and /dev/null differ diff --git a/designer/icons/text-speak.png b/designer/icons/text-speak.png deleted file mode 100644 index 15299b138..000000000 Binary files a/designer/icons/text-speak.png and /dev/null differ diff --git a/designer/icons/text-xml.png b/designer/icons/text-xml.png deleted file mode 100644 index 2f3bdb731..000000000 Binary files a/designer/icons/text-xml.png and /dev/null differ diff --git a/designer/icons/text_remove.png b/designer/icons/text_remove.png deleted file mode 100644 index 5870ca42a..000000000 Binary files a/designer/icons/text_remove.png and /dev/null differ diff --git a/designer/icons/user-identity.png b/designer/icons/user-identity.png deleted file mode 100644 index f0728b401..000000000 Binary files a/designer/icons/user-identity.png and /dev/null differ diff --git a/designer/icons/view-calendar-tasks.png b/designer/icons/view-calendar-tasks.png deleted file mode 100644 index 1f09147b4..000000000 Binary files a/designer/icons/view-calendar-tasks.png and /dev/null differ diff --git a/designer/icons/view-pim-calendar.png b/designer/icons/view-pim-calendar.png deleted file mode 100644 index ba31d18f2..000000000 Binary files a/designer/icons/view-pim-calendar.png and /dev/null differ diff --git a/designer/icons/view-pim-news.png b/designer/icons/view-pim-news.png deleted file mode 100644 index c603c3ac0..000000000 Binary files a/designer/icons/view-pim-news.png and /dev/null differ diff --git a/designer/icons/view-refresh.png b/designer/icons/view-refresh.png deleted file mode 100644 index 389c1c8ac..000000000 Binary files a/designer/icons/view-refresh.png and /dev/null differ diff --git a/designer/icons/view-sort-ascending.png b/designer/icons/view-sort-ascending.png deleted file mode 100644 index 88bc4b333..000000000 Binary files a/designer/icons/view-sort-ascending.png and /dev/null differ diff --git a/designer/icons/view-sort-descending.png b/designer/icons/view-sort-descending.png deleted file mode 100644 index 879a698e3..000000000 Binary files a/designer/icons/view-sort-descending.png and /dev/null differ diff --git a/designer/icons/view-statistics.png b/designer/icons/view-statistics.png deleted file mode 100644 index 41e07e8b6..000000000 Binary files a/designer/icons/view-statistics.png and /dev/null differ diff --git a/designer/icons/view_text.png b/designer/icons/view_text.png deleted file mode 100644 index ea06f93b1..000000000 Binary files a/designer/icons/view_text.png and /dev/null differ diff --git a/web/deckbrowser.css b/web/deckbrowser.css index 1910138d1..bb3f1d3e1 100644 --- a/web/deckbrowser.css +++ b/web/deckbrowser.css @@ -57,3 +57,10 @@ body { .filtered { color: #00a !important; } + +.gears { + width: 1em; + height: 1em; + opacity: .5; + padding-top: 0.2em; +} diff --git a/designer/icons/anki-logo-thin.png b/web/imgs/anki-logo-thin.png similarity index 100% rename from designer/icons/anki-logo-thin.png rename to web/imgs/anki-logo-thin.png diff --git a/web/imgs/gears.png b/web/imgs/gears.png new file mode 100644 index 000000000..8a39b21df Binary files /dev/null and b/web/imgs/gears.png differ diff --git a/designer/icons/media-record.png b/web/imgs/media-record.png similarity index 100% rename from designer/icons/media-record.png rename to web/imgs/media-record.png diff --git a/designer/icons/more.png b/web/imgs/more.png similarity index 100% rename from designer/icons/more.png rename to web/imgs/more.png diff --git a/designer/icons/paperclip.png b/web/imgs/paperclip.png similarity index 100% rename from designer/icons/paperclip.png rename to web/imgs/paperclip.png diff --git a/web/imgs/rating.png b/web/imgs/rating.png new file mode 100644 index 000000000..4613cfae6 Binary files /dev/null and b/web/imgs/rating.png differ diff --git a/designer/icons/text_bold.png b/web/imgs/text_bold.png similarity index 100% rename from designer/icons/text_bold.png rename to web/imgs/text_bold.png diff --git a/designer/icons/text_clear.png b/web/imgs/text_clear.png similarity index 100% rename from designer/icons/text_clear.png rename to web/imgs/text_clear.png diff --git a/designer/icons/text_cloze.png b/web/imgs/text_cloze.png similarity index 100% rename from designer/icons/text_cloze.png rename to web/imgs/text_cloze.png diff --git a/designer/icons/text_italic.png b/web/imgs/text_italic.png similarity index 100% rename from designer/icons/text_italic.png rename to web/imgs/text_italic.png diff --git a/designer/icons/text_sub.png b/web/imgs/text_sub.png similarity index 100% rename from designer/icons/text_sub.png rename to web/imgs/text_sub.png diff --git a/designer/icons/text_super.png b/web/imgs/text_super.png similarity index 100% rename from designer/icons/text_super.png rename to web/imgs/text_super.png diff --git a/designer/icons/text_under.png b/web/imgs/text_under.png similarity index 100% rename from designer/icons/text_under.png rename to web/imgs/text_under.png diff --git a/web/reviewer.css b/web/reviewer.css index de11ceb83..ad40c1c52 100644 --- a/web/reviewer.css +++ b/web/reviewer.css @@ -1,7 +1,7 @@ hr { background-color:#ccc; margin: 1em; } body { margin:1.5em; } img { max-width: 95%; max-height: 95%; } -.marked { position:fixed; right: 7px; top: 7px; display: none; } +.marked { position:fixed; right: 7px; top: 7px; width: 24px; height: 24px; display: none; } #typeans { width: 100%; } .typeGood { background: #0f0; } .typeBad { background: #f00; }