Merge 6c63ba45b6 into 160402e1d0

a

icons/README.txt

@@ -1,79 +1,79 @@
-issue: https://github.com/goldendict/goldendict/issues/1441
-
-http://tango.freedesktop.org/Tango_Desktop_Project GPLv3
-list:
-internet.svg
-home.svg
-configure.svg
-fileopen.svg
-addtab.svg
-wizard.svg
-fulltext
-text2speech
-reload 
-icons/print.svg
-icons/programs.svg
-error
-star.svg
-star_blue.svg
-network.svg
-hotkeys
-previous
-next
-advanced
-windows-list
-filesave
-playsound_color
-interface
-webdict
-transliteration
-closetab
-folder
-reload
-menu.svg
-
-https://packages.debian.org/bullseye/gnome-icon-theme GPLv3
-lists:
-clear
-
-https://commons.wikimedia.org/wiki/File:Accessories-dictionary.svg
-lists:
-icon32_sdict.svg 
-
-
-https://freesvg.org/pushpin-vector-image  public domain 
-lists:
-pushbin
-
-
-https://commons.wikimedia.org/wiki/File:Arrow_bottom_svg.svg  license:public domain
-lists:
-1downarrow
-
-
-these two icons from sertoli @  https://forum.freemdict.com/u/sertoli/summary
-playsound.png
-playsound_full.png
-
-
-LGPL
-icon32_zoombase.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-page-zoom-icon.png
-icon32_zoomout.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-zoom-out-icon.png
-icon32_zoomin.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-zoom-in-icon.png
-reload.png https://iconarchive.com/show/oxygen-icons-by-oxygen-icons.org/Actions-edit-redo-icon.html
-advanced.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-system-run-icon.png
-sources.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Apps-plasma-icon.png
-
-book.svg https://github.com/johnfactotum/foliate
-
-
-lingualibre.svg https://en.m.wikipedia.org/wiki/File:Lingualibre-logo-no-text.svg
-
-
-Apache License Version 2.0
-1downarrow.svg
-system-search.svg
-Modified from  https://github.com/google/material-design-icons
-
-add-anki-icon.svg   MIT license
+issue: https://github.com/goldendict/goldendict/issues/1441
+
+http://tango.freedesktop.org/Tango_Desktop_Project GPLv3
+list:
+internet.svg
+home.svg
+configure.svg
+fileopen.svg
+addtab.svg
+wizard.svg
+fulltext
+text2speech
+reload 
+icons/print.svg
+icons/programs.svg
+error
+star.svg
+star_blue.svg
+network.svg
+hotkeys
+previous
+next
+advanced
+windows-list
+filesave
+playsound_color
+interface
+webdict
+transliteration
+closetab
+folder
+reload
+menu.svg
+
+https://packages.debian.org/bullseye/gnome-icon-theme GPLv3
+lists:
+clear
+
+https://commons.wikimedia.org/wiki/File:Accessories-dictionary.svg
+lists:
+icon32_sdict.svg 
+
+
+https://freesvg.org/pushpin-vector-image  public domain 
+lists:
+pushbin
+
+
+https://commons.wikimedia.org/wiki/File:Arrow_bottom_svg.svg  license:public domain
+lists:
+1downarrow
+
+
+these two icons from sertoli @  https://forum.freemdict.com/u/sertoli/summary
+playsound.png
+playsound_full.png
+
+
+LGPL
+icon32_zoombase.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-page-zoom-icon.png
+icon32_zoomout.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-zoom-out-icon.png
+icon32_zoomin.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-zoom-in-icon.png
+reload.png https://iconarchive.com/show/oxygen-icons-by-oxygen-icons.org/Actions-edit-redo-icon.html
+advanced.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-system-run-icon.png
+sources.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Apps-plasma-icon.png
+
+book.svg https://github.com/johnfactotum/foliate
+
+
+lingualibre.svg https://en.m.wikipedia.org/wiki/File:Lingualibre-logo-no-text.svg
+
+
+Apache License Version 2.0
+1downarrow.svg
+system-search.svg
+Modified from  https://github.com/google/material-design-icons
+
+add-anki-icon.svg   MIT license
 https://www.svgrepo.com/svg/435992/add-card

src/audio/README.md

@@ -0,0 +1,3 @@
+Code to support GD's internal/external audio players.
+
+Only `audioplayerinterface.hh` is supposed to be used outside this folder.

src/ui/articleview.hh

@@ -10,7 +10,7 @@
 #include <QWebEngineView>
 #include <list>
 #include "article_netmgr.hh"
-#include "audioplayerinterface.hh"
+#include "audio/audioplayerinterface.hh"
 #include "instances.hh"
 #include "groupcombobox.hh"
 #include "globalbroadcaster.hh"

src/ui/mainwindow.hh

@@ -14,7 +14,7 @@
 #include "config.hh"
 #include "dict/dictionary.hh"
 #include "article_netmgr.hh"
-#include "audioplayerfactory.hh"
+#include "audio/audioplayerfactory.hh"
 #include "instances.hh"
 #include "article_maker.hh"
 #include "scanpopup.hh"