Merge pull request mixxxdj#21 from uklotzde/jmigual-library-redesign-…

…merge Merge from 'master'
gramanas · Jun 16, 2017 · 6e1f42d · 6e1f42d
2 parents 94ad1d5 + a8693d7
commit 6e1f42d
Show file tree

Hide file tree

Showing 117 changed files with 2,355 additions and 1,767 deletions.
diff --git a/build/depends.py b/build/depends.py
@@ -895,6 +895,10 @@ def sources(self, build):
                    "widget/wlibrarytableview.cpp",
                    "widget/wanalysislibrarytableview.cpp",
                    "widget/wlibrarytextbrowser.cpp",
+
+                   "database/mixxxdb.cpp",
+                   "database/schemamanager.cpp",
+
                    "library/trackcollection.cpp",
                    "library/basesqltablemodel.cpp",
                    "library/basetrackcache.cpp",
@@ -994,7 +998,6 @@ def sources(self, build):
                    "library/dao/autodjcratesdao.cpp",
 
                    "library/librarycontrol.cpp",
-                   "library/schemamanager.cpp",
                    "library/songdownloader.cpp",
                    "library/starrating.cpp",
                    "library/stardelegate.cpp",
@@ -1142,6 +1145,9 @@ def sources(self, build):
                    "util/movinginterquartilemean.cpp",
                    "util/console.cpp",
                    "util/db/dbconnection.cpp",
+                   "util/db/dbconnectionpool.cpp",
+                   "util/db/dbconnectionpooler.cpp",
+                   "util/db/dbconnectionpooled.cpp",
                    "util/db/dbid.cpp",
                    "util/db/fwdsqlquery.cpp",
                    "util/db/fwdsqlqueryselectresult.cpp",

diff --git a/build/wix/Localization/mixxx_ca-ES.wxl b/build/wix/Localization/mixxx_ca-ES.wxl
@@ -42,8 +42,8 @@
   <String Id="FeatureCompleteDescription">El paquet complet.</String>
   <String Id="FeatureMainProgramTitle">L'aplicació.</String>
   <String Id="FeatureMainProgramDescription">L'aplicació Mixxx incloent les configuracions per defecte de diversos controladors.</String>
-  <String Id="FeaturePDBTitle">PDB debug files</String>
-  <String Id="FeaturePDBDescription">Install Mixxx PDB files to use with a debugger. This is useful to debug Mixxx and provide readable backtraces to the development team.</String>
+  <String Id="FeaturePDBTitle">Fitxers PDB de depuració</String>
+  <String Id="FeaturePDBDescription">Instal·la els fitxers PDB del Mixxx per utilitzar-los amb un depurador. Això és útil per depurar el Mixxx i poder enviar traces entenedores a l'equip de desenvolupadors.</String>
   <String Id="FeatureDesktopShortcutTitle">Crea una icona a l'escriptori</String>
   <String Id="FeatureDesktopShortcutDescription">Afegeix un accés directe al Mixxx a l'escriptori</String>
   <String Id="FeatureManualTitle">Manual d'usuari</String>

diff --git a/build/wix/Localization/mixxx_cs-CZ.wxl b/build/wix/Localization/mixxx_cs-CZ.wxl
@@ -36,14 +36,14 @@
   <String Id="WarningDlgTitle">{\WixUI_Font_Title}Varování</String>
 
   <!-- Custom exit dialog -->
-  <String Id="StartOnExit">Launch Mixxx when setup exits.</String>
+  <String Id="StartOnExit">Spustit Mixxx, když existuje nastavení.</String>
 
   <!-- Features translations -->
   <String Id="FeatureCompleteDescription">Úplný balíček.</String>
   <String Id="FeatureMainProgramTitle">Hlavní aplikace</String>
   <String Id="FeatureMainProgramDescription">Hlavní aplikace Mixxxu včetně přednastavení ovladačů.</String>
-  <String Id="FeaturePDBTitle">PDB debug files</String>
-  <String Id="FeaturePDBDescription">Install Mixxx PDB files to use with a debugger. This is useful to debug Mixxx and provide readable backtraces to the development team.</String>
+  <String Id="FeaturePDBTitle">Soubory ladění PDB</String>
+  <String Id="FeaturePDBDescription">Nainstalujte soubory PDB Mixxxu k použití s ladičem. Toto je užitečné na ladění Mixxxu a poskytuje vývojářskému družstvu čitelné stopy.</String>
   <String Id="FeatureDesktopShortcutTitle">Klávesová zkratka</String>
   <String Id="FeatureDesktopShortcutDescription">Přidat klávesovou zkratku pro Mixxx na pracovní plochu</String>
   <String Id="FeatureManualTitle">Uživatelská příručka</String>

diff --git a/build/wix/Localization/mixxx_de-DE.wxl b/build/wix/Localization/mixxx_de-DE.wxl
@@ -42,8 +42,8 @@
   <String Id="FeatureCompleteDescription">Das Komplettpaket.</String>
   <String Id="FeatureMainProgramTitle">Kernanwendung</String>
   <String Id="FeatureMainProgramDescription">Die Mixxx Kernanwendung einschließlich Controller-Voreinstellungen.</String>
-  <String Id="FeaturePDBTitle">PDB debug files</String>
-  <String Id="FeaturePDBDescription">Install Mixxx PDB files to use with a debugger. This is useful to debug Mixxx and provide readable backtraces to the development team.</String>
+  <String Id="FeaturePDBTitle">PDB-Debug-Dateien</String>
+  <String Id="FeaturePDBDescription">Installiere Mixxx PDB-Dateien für die Verwendung mit einem Debugger. Dies ist nützlich, um Mixxx zu debuggen und dem Entwicklungsteam lesbare Backtraces zur Verfügung zu stellen.</String>
   <String Id="FeatureDesktopShortcutTitle">Desktop-Verknüpfung</String>
   <String Id="FeatureDesktopShortcutDescription">Auf Ihrem Desktop eine Verknüpfung zu Mixxx hinzufügen</String>
   <String Id="FeatureManualTitle">Benutzerhandbuch</String>

diff --git a/build/wix/Localization/mixxx_es-ES.wxl b/build/wix/Localization/mixxx_es-ES.wxl
@@ -42,8 +42,8 @@
   <String Id="FeatureCompleteDescription">El paquete completo.</String>
   <String Id="FeatureMainProgramTitle">El núcleo de la aplicación.</String>
   <String Id="FeatureMainProgramDescription">El núcleo de la aplicación, incluyendo las plantillas para los controladores.</String>
-  <String Id="FeaturePDBTitle">PDB debug files</String>
-  <String Id="FeaturePDBDescription">Install Mixxx PDB files to use with a debugger. This is useful to debug Mixxx and provide readable backtraces to the development team.</String>
+  <String Id="FeaturePDBTitle">Ficheros PDB de depuración</String>
+  <String Id="FeaturePDBDescription">Instalar los ficheros PDB de Mixxx para uso con un depurador. Esto es útil para depurar Mixxx y enviar trazas de error comprensibles al equipo de desarrollo.</String>
   <String Id="FeatureDesktopShortcutTitle">Acceso Directo</String>
   <String Id="FeatureDesktopShortcutDescription">Añadir un acceso directo a Mixxx en su escritorio</String>
   <String Id="FeatureManualTitle">Manual de Usuario</String>

diff --git a/build/wix/Localization/mixxx_pt-BR.wxl b/build/wix/Localization/mixxx_pt-BR.wxl
@@ -36,14 +36,14 @@
   <String Id="WarningDlgTitle">{\WixUI_Font_Title}Atenção</String>
 
   <!-- Custom exit dialog -->
-  <String Id="StartOnExit">Launch Mixxx when setup exits.</String>
+  <String Id="StartOnExit">Executar o Mixxx quando a instalação acabar.</String>
 
   <!-- Features translations -->
   <String Id="FeatureCompleteDescription">O pacote inteiro.</String>
   <String Id="FeatureMainProgramTitle">Núcleo da aplicação</String>
   <String Id="FeatureMainProgramDescription">O núcleo da aplicação MIxxx incluindo pré-definições de controlador.</String>
-  <String Id="FeaturePDBTitle">PDB debug files</String>
-  <String Id="FeaturePDBDescription">Install Mixxx PDB files to use with a debugger. This is useful to debug Mixxx and provide readable backtraces to the development team.</String>
+  <String Id="FeaturePDBTitle">Arquivos PDB para debugar</String>
+  <String Id="FeaturePDBDescription">Instalar os arquivos PDB do Mixxx para usar com um debugger.  isso é útil para debugar o Mixxx e fornece backtraces legíveis para a equipe de desenvolvimento.</String>
   <String Id="FeatureDesktopShortcutTitle">Atalho na Área de Trabalho</String>
   <String Id="FeatureDesktopShortcutDescription">Cria um atalho do Mixxx na sua área de trabalho</String>
   <String Id="FeatureManualTitle">Manual do Usuário</String>

diff --git a/build/wix/Localization/mixxx_ru-RU.wxl b/build/wix/Localization/mixxx_ru-RU.wxl
@@ -36,14 +36,14 @@
   <String Id="WarningDlgTitle">{\WixUI_Font_Title}Предупреждение</String>
 
   <!-- Custom exit dialog -->
-  <String Id="StartOnExit">Launch Mixxx when setup exits.</String>
+  <String Id="StartOnExit">Запуск Mixxx, и выход из режима настройки</String>
 
   <!-- Features translations -->
   <String Id="FeatureCompleteDescription">Полный пакет.</String>
   <String Id="FeatureMainProgramTitle">Основная программа</String>
   <String Id="FeatureMainProgramDescription">Основная программа Mixxx включает настройки контроллера.</String>
-  <String Id="FeaturePDBTitle">PDB debug files</String>
-  <String Id="FeaturePDBDescription">Install Mixxx PDB files to use with a debugger. This is useful to debug Mixxx and provide readable backtraces to the development team.</String>
+  <String Id="FeaturePDBTitle">PDB файлы отладки</String>
+  <String Id="FeaturePDBDescription">Установите Mixxx PDB файлы для использования с помощью отладчика. Это полезно для отладки Mixxx и обеспечит считывание у цепочек вызова команды разработчиков.</String>
   <String Id="FeatureDesktopShortcutTitle">Ярлык на Рабочем столе</String>
   <String Id="FeatureDesktopShortcutDescription">Добавляет ярлык Mixxx на Рабочий стол</String>
   <String Id="FeatureManualTitle">Руководство пользователя</String>

diff --git a/build/wix/Localization/mixxx_sv-SE.wxl b/build/wix/Localization/mixxx_sv-SE.wxl
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="sv-se" Codepage="1252"
+                 xmlns="http://schemas.microsoft.com/wix/2006/localization">
+
+  <!-- ..................................................... -->
+  <!-- This wxl file has been auto generated from a po file  -->
+  <!-- using https://github.com/sblaisot/wxl-po-tools        -->
+  <!-- Source File: po/sv-SE.po                              -->
+  <!-- ..................................................... -->
+
+  <!-- This contains the LangID and should be translated to reflect the correct LangID. -->
+  <!-- Supported language and codepage codes can be found here: https://msdn.microsoft.com/en-us/goglobal/bb964664.aspx -->
+  <String Id="Language">1053</String>
+
+
+  <!-- Programm informations -->
+  <String Id="ApplicationName">Mixxx</String>
+  <String Id="ManufacturerName">Mixxx</String>
+  <String Id="ManufacturerFullName">Mixxx-utvecklingsteamet</String>
+  <String Id="ProductDescription">Open-source digital DJ-mjukvara</String>
+  <String Id="Comments">Installerar Mixxx</String>
+
+  <!-- Error messages -->
+  <!-- DO NOT BREAK LINES BECAUSE LINE BREAKS WILL SHOW UP AS-IS IN THE INTERFACE -->
+  <String Id="OS2Old">Denna produkt kräver Windows XP eller högre.</String>
+  <String Id="NewerInstalled">Samma eller en nyare version av denna produkt är redan installerad.</String>
+  <String Id="x64VersionRequired">Du behöver installera 64-bitars-versionen utav denna produkt på 64-bitars Windows.</String>
+  <String Id="x86VersionRequired">Du behöver installera 32-bitars-versionen utav denna produkt på 32-bitars Windows.</String>
+  <String Id="x86VersionWarning">You are about to install the 32-bit version on a 64-bit operating system.&#13;&#10;We recommend using the 64-bit version for better performance.&#13;&#10;You can download the 64-bit installation package from http://mixxx.org/download/</String>
+  <String Id="XPWarning">You are installing Mixxx on an outdated operating system. Some functions may not work well or at all. We recommend upgrading your operating system.</String>
+  <String Id="bitWidthMismatch32">You are about to install the 32-bit version but a 64-bit one is already installed. This can lead to undesired behavior. Please un-install the existing Mixxx first, or download the 64-bit installation package to upgrade (unless you know exactly what you are doing.)</String>
+  <String Id="bitWidthMismatch64">You are about to install the 64-bit version but a 32-bit one is already installed. This can lead to undesired behavior. Please un-install the existing Mixxx first, or download the 32-bit installation package to upgrade (unless you know exactly what you are doing.)</String>
+  <String Id="OlderVersionFound">An older version of Mixxx has been detected. As we changed installer, we can not smoothly upgrade. Please uninstall older version before installing this one.</String>
+
+  <!-- Custom Warning Dialog -->
+  <String Id="WarningDlgTitle">{\WixUI_Font_Title}Varning</String>
+
+  <!-- Custom exit dialog -->
+  <String Id="StartOnExit">Starta Mixxx när installationen avslutar.</String>
+
+  <!-- Features translations -->
+  <String Id="FeatureCompleteDescription">Hela paketet.</String>
+  <String Id="FeatureMainProgramTitle">Kärnapplikation</String>
+  <String Id="FeatureMainProgramDescription">Kärn-Mixxx-applikationen inklusive controller-förval.</String>
+  <String Id="FeaturePDBTitle">PDB-debugfiler</String>
+  <String Id="FeaturePDBDescription">Install Mixxx PDB files to use with a debugger. This is useful to debug Mixxx and provide readable backtraces to the development team.</String>
+  <String Id="FeatureDesktopShortcutTitle">Skrivbordsgenväg</String>
+  <String Id="FeatureDesktopShortcutDescription">Lägg till en genväg till Mixxx på ditt skrivbord</String>
+  <String Id="FeatureManualTitle">Användarmanual</String>
+  <String Id="FeatureManualDescription">Mixxx användarmanual i PDF-format, även tillgänglig på http://mixxx.org/manual/</String>
+  <String Id="FeatureTranslationsTitle">Översättningar</String>
+  <String Id="FeatureTranslationsDescription">Resursfiler som tillåter Mixxx att visas i alternativa språk, andra än amerikansk engelska</String>
+</WixLocalization>
diff --git a/build/wix/Localization/mixxx_zh-CN.wxl b/build/wix/Localization/mixxx_zh-CN.wxl
@@ -42,8 +42,8 @@
   <String Id="FeatureCompleteDescription">完整软件包</String>
   <String Id="FeatureMainProgramTitle">核心程序</String>
   <String Id="FeatureMainProgramDescription">核心Mixxx程序包含控制器预设</String>
-  <String Id="FeaturePDBTitle">PDB debug files</String>
-  <String Id="FeaturePDBDescription">Install Mixxx PDB files to use with a debugger. This is useful to debug Mixxx and provide readable backtraces to the development team.</String>
+  <String Id="FeaturePDBTitle">PDB 调试符号文件</String>
+  <String Id="FeaturePDBDescription">安装用于辅助调试的 PDB 文件。这些文件在调试 Mixxx 时会非常有用，有了这些文件就能向开发团队提供人类可读的回溯信息。</String>
   <String Id="FeatureDesktopShortcutTitle">桌面快捷方式</String>
   <String Id="FeatureDesktopShortcutDescription">添加Mixxx的快捷方式到您的桌面</String>
   <String Id="FeatureManualTitle">用户手册</String>

diff --git a/build/wix/Localization/po/ca-ES.po b/build/wix/Localization/po/ca-ES.po
@@ -2,14 +2,14 @@
 # Translators:
 # Benny Beat <bennybeat@gmail.com>, 2016
 # Ferran Pujol Camins <ferranpujolcamins@gmail.com>, 2016
-# Josep Maria Antolin <josepma@gmail.com>, 2016
+# Josep Maria Antolin <josepma@gmail.com>, 2016-2017
 # Josep Maria Antolin <josepma@gmail.com>, 2016
 # S.Brandt <s.brandt@mixxx.org>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Mixxx DJ Windows installer\n"
-"PO-Revision-Date: 2017-01-22 20:14+0000\n"
-"Last-Translator: Sebastien BLAISOT <sebastien@blaisot.org>\n"
+"PO-Revision-Date: 2017-05-03 19:38+0000\n"
+"Last-Translator: Benny Beat <bennybeat@gmail.com>\n"
 "Language-Team: Catalan (Spain) (http://www.transifex.com/mixxx-dj-software/mixxxdj-windows-installer/language/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -119,13 +119,13 @@ msgstr "L'aplicació Mixxx incloent les configuracions per defecte de diversos c
 
 msgctxt "FeaturePDBTitle"
 msgid "PDB debug files"
-msgstr ""
+msgstr "Fitxers PDB de depuració"
 
 msgctxt "FeaturePDBDescription"
 msgid ""
 "Install Mixxx PDB files to use with a debugger. This is useful to debug "
 "Mixxx and provide readable backtraces to the development team."
-msgstr ""
+msgstr "Instal·la els fitxers PDB del Mixxx per utilitzar-los amb un depurador. Això és útil per depurar el Mixxx i poder enviar traces entenedores a l'equip de desenvolupadors."
 
 msgctxt "FeatureDesktopShortcutTitle"
 msgid "Desktop Shortcut"

diff --git a/build/wix/Localization/po/cs-CZ.po b/build/wix/Localization/po/cs-CZ.po
@@ -1,12 +1,12 @@
 # 
 # Translators:
-# fri, 2016
+# fri, 2016-2017
 # Sebastien BLAISOT <sebastien@blaisot.org>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Mixxx DJ Windows installer\n"
-"PO-Revision-Date: 2017-01-22 20:14+0000\n"
-"Last-Translator: Sebastien BLAISOT <sebastien@blaisot.org>\n"
+"PO-Revision-Date: 2017-04-21 17:42+0000\n"
+"Last-Translator: fri\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/mixxx-dj-software/mixxxdj-windows-installer/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -99,7 +99,7 @@ msgstr "{\\WixUI_Font_Title}Varování"
 #.  Custom exit dialog
 msgctxt "StartOnExit"
 msgid "Launch Mixxx when setup exits."
-msgstr ""
+msgstr "Spustit Mixxx, když existuje nastavení."
 
 #.  Features translations
 msgctxt "FeatureCompleteDescription"
@@ -116,13 +116,13 @@ msgstr "Hlavní aplikace Mixxxu včetně přednastavení ovladačů."
 
 msgctxt "FeaturePDBTitle"
 msgid "PDB debug files"
-msgstr ""
+msgstr "Soubory ladění PDB"
 
 msgctxt "FeaturePDBDescription"
 msgid ""
 "Install Mixxx PDB files to use with a debugger. This is useful to debug "
 "Mixxx and provide readable backtraces to the development team."
-msgstr ""
+msgstr "Nainstalujte soubory PDB Mixxxu k použití s ladičem. Toto je užitečné na ladění Mixxxu a poskytuje vývojářskému družstvu čitelné stopy."
 
 msgctxt "FeatureDesktopShortcutTitle"
 msgid "Desktop Shortcut"

diff --git a/build/wix/Localization/po/de-DE.po b/build/wix/Localization/po/de-DE.po
@@ -1,12 +1,13 @@
 # 
 # Translators:
 # Inpromtu <kmbredt@gmail.com>, 2016
+# S.Brandt <s.brandt@mixxx.org>, 2017
 # Sebastien BLAISOT <sebastien@blaisot.org>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Mixxx DJ Windows installer\n"
-"PO-Revision-Date: 2017-01-22 20:14+0000\n"
-"Last-Translator: Sebastien BLAISOT <sebastien@blaisot.org>\n"
+"PO-Revision-Date: 2017-03-15 20:57+0000\n"
+"Last-Translator: S.Brandt <s.brandt@mixxx.org>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/mixxx-dj-software/mixxxdj-windows-installer/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -116,13 +117,13 @@ msgstr "Die Mixxx Kernanwendung einschließlich Controller-Voreinstellungen."
 
 msgctxt "FeaturePDBTitle"
 msgid "PDB debug files"
-msgstr ""
+msgstr "PDB-Debug-Dateien"
 
 msgctxt "FeaturePDBDescription"
 msgid ""
 "Install Mixxx PDB files to use with a debugger. This is useful to debug "
 "Mixxx and provide readable backtraces to the development team."
-msgstr ""
+msgstr "Installiere Mixxx PDB-Dateien für die Verwendung mit einem Debugger. Dies ist nützlich, um Mixxx zu debuggen und dem Entwicklungsteam lesbare Backtraces zur Verfügung zu stellen."
 
 msgctxt "FeatureDesktopShortcutTitle"
 msgid "Desktop Shortcut"

diff --git a/build/wix/Localization/po/es-ES.po b/build/wix/Localization/po/es-ES.po
@@ -1,14 +1,14 @@
 # 
 # Translators:
 # Jorge Marcos (Jorgeelalto) <jormarchav@gmail.com>, 2016
-# Josep Maria Antolin <josepma@gmail.com>, 2016
+# Josep Maria Antolin <josepma@gmail.com>, 2016-2017
 # Josep Maria Antolin <josepma@gmail.com>, 2016
 # Sebastien BLAISOT <sebastien@blaisot.org>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Mixxx DJ Windows installer\n"
-"PO-Revision-Date: 2017-01-22 20:14+0000\n"
-"Last-Translator: Sebastien BLAISOT <sebastien@blaisot.org>\n"
+"PO-Revision-Date: 2017-02-05 00:59+0000\n"
+"Last-Translator: Josep Maria Antolin <josepma@gmail.com>\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/mixxx-dj-software/mixxxdj-windows-installer/language/es_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -118,13 +118,13 @@ msgstr "El núcleo de la aplicación, incluyendo las plantillas para los control
 
 msgctxt "FeaturePDBTitle"
 msgid "PDB debug files"
-msgstr ""
+msgstr "Ficheros PDB de depuración"
 
 msgctxt "FeaturePDBDescription"
 msgid ""
 "Install Mixxx PDB files to use with a debugger. This is useful to debug "
 "Mixxx and provide readable backtraces to the development team."
-msgstr ""
+msgstr "Instalar los ficheros PDB de Mixxx para uso con un depurador. Esto es útil para depurar Mixxx y enviar trazas de error comprensibles al equipo de desarrollo."
 
 msgctxt "FeatureDesktopShortcutTitle"
 msgid "Desktop Shortcut"

diff --git a/build/wix/Localization/po/pl-PL.po b/build/wix/Localization/po/pl-PL.po
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #.  Programm informations
 msgctxt "ApplicationName"