Merge upstream changes into instrument-nav-btns

LMMS · May 1, 2015 · 06ae8a1 · 06ae8a1
2 parents f6be405 + 9888cb9
commit 06ae8a1
Show file tree

Hide file tree

Showing 59 changed files with 562 additions and 396 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ matrix:
         - env: TARGET_OS=win64
         - os: osx
 before_install:
-    - sh ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.before_install.sh
+   - sh ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.before_install.sh
 install:
     - sh ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.install.sh
 before_script:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ INCLUDE(FindPkgConfig)
 
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "1")
-SET(VERSION_PATCH "0")
+SET(VERSION_PATCH "3")
 #SET(VERSION_SUFFIX "")
 SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 IF(VERSION_SUFFIX)

diff --git a/data/locale/ca.ts b/data/locale/ca.ts
@@ -3435,7 +3435,7 @@ Per favor, comprova que tens permís d&apos;escriptura per a aquest fitxer i tor
         <translation type="unfinished">Obre projecte existent</translation>
     </message>
     <message>
-        <source>Recently opened project</source>
+        <source>Recently opened projects</source>
         <translation type="unfinished">Projecte obert recentment</translation>
     </message>
     <message>
@@ -5936,7 +5936,7 @@ Latència: %2 ms</translation>
 <context>
     <name>Track</name>
     <message>
-        <source>Muted</source>
+        <source>Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/data/locale/cs.ts b/data/locale/cs.ts
@@ -3435,7 +3435,7 @@ Ujistěte se prosím, že máte k souboru právo zápisu a zkuste to znovu.</tra
         <translation type="unfinished">Otevřít existující projekt</translation>
     </message>
     <message>
-        <source>Recently opened project</source>
+        <source>Recently opened projects</source>
         <translation type="unfinished">Naposledy otevřené projekty</translation>
     </message>
     <message>
@@ -5938,7 +5938,7 @@ Zpoždění %2 ms</translation>
 <context>
     <name>Track</name>
     <message>
-        <source>Muted</source>
+        <source>Mute</source>
         <translation type="unfinished">Ztlumený</translation>
     </message>
     <message>

diff --git a/data/locale/de.ts b/data/locale/de.ts
@@ -3456,7 +3456,7 @@ Bitte überprüfen Sie Ihre Rechte und versuchen es erneut.</translation>
         <translation>Existierendes Projekt öffnen</translation>
     </message>
     <message>
-        <source>Recently opened project</source>
+        <source>Recently opened projects</source>
         <translation>Zuletzt geöffnete Projekte</translation>
     </message>
     <message>
@@ -5974,7 +5974,7 @@ Latenz: %2 ms</translation>
 <context>
     <name>Track</name>
     <message>
-        <source>Muted</source>
+        <source>Mute</source>
         <translation type="unfinished">Stumm</translation>
     </message>
     <message>

diff --git a/data/locale/en.ts b/data/locale/en.ts
@@ -3433,7 +3433,7 @@ Please make sure you have write-access to the file and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recently opened project</source>
+        <source>Recently opened projects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5927,7 +5927,7 @@ Latency: %2 ms</source>
 <context>
     <name>Track</name>
     <message>
-        <source>Muted</source>
+        <source>Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/data/locale/es.ts b/data/locale/es.ts
@@ -3433,7 +3433,7 @@ Please make sure you have write-access to the file and try again.</source>
         <translation type="unfinished">Abrir proyecto existente</translation>
     </message>
     <message>
-        <source>Recently opened project</source>
+        <source>Recently opened projects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5927,7 +5927,7 @@ Latency: %2 ms</source>
 <context>
     <name>Track</name>
     <message>
-        <source>Muted</source>
+        <source>Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/data/locale/fa.ts b/data/locale/fa.ts
@@ -3433,7 +3433,7 @@ Please make sure you have write-access to the file and try again.</source>
         <translation type="unfinished">باز کردن پروژه ی موجود</translation>
     </message>
     <message>
-        <source>Recently opened project</source>
+        <source>Recently opened projects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5927,7 +5927,7 @@ Latency: %2 ms</source>
 <context>
     <name>Track</name>
     <message>
-        <source>Muted</source>
+        <source>Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/data/locale/fr.ts b/data/locale/fr.ts
@@ -3448,7 +3448,7 @@ Veuillez vérifier que vous avez les droits d&apos;accès en écriture pour ce f
         <translation>Ouvrir un projet existant</translation>
     </message>
     <message>
-        <source>Recently opened project</source>
+        <source>Recently opened projects</source>
         <translation>Projets ouverts récemment</translation>
     </message>
     <message>
@@ -5947,7 +5947,7 @@ Veuillez vérifier que vous avez les droits en lecture pour ce fichier et le ré
 <context>
     <name>Track</name>
     <message>
-        <source>Muted</source>
+        <source>Mute</source>
         <translation type="unfinished">Coupée</translation>
     </message>
     <message>

diff --git a/data/locale/gl.ts b/data/locale/gl.ts
@@ -3448,7 +3448,7 @@ Please make sure you have write-access to the file and try again.</source>
         <translation>Abrir un projecto existente</translation>
     </message>
     <message>
-        <source>Recently opened project</source>
+        <source>Recently opened projects</source>
         <translation>Proxecto aberto recentemente</translation>
     </message>
     <message>
@@ -5946,7 +5946,7 @@ Latencia: %2 ms</translation>
 <context>
     <name>Track</name>
     <message>
-        <source>Muted</source>
+        <source>Mute</source>
         <translation type="unfinished">Silenciado</translation>
     </message>
     <message>

diff --git a/data/locale/it.ts b/data/locale/it.ts
@@ -3456,7 +3456,7 @@ Assicurati di avere i permessi in scrittura per il file e riprova.</translation>
         <translation>Apri un progetto esistente</translation>
     </message>
     <message>
-        <source>Recently opened project</source>
+        <source>Recently opened projects</source>
         <translation>Progetti aperti di recente</translation>
     </message>
     <message>
@@ -5971,7 +5971,7 @@ Assicurati di avere almeno i permessi di lettura del file e prova di nuovo.</tra
 <context>
     <name>Track</name>
     <message>
-        <source>Muted</source>
+        <source>Mute</source>
         <translation type="unfinished">Muto</translation>
     </message>
     <message>

diff --git a/data/locale/ja.ts b/data/locale/ja.ts
@@ -3450,7 +3450,7 @@ Please make sure you have write-access to the file and try again.</source>
         <translation type="unfinished">既存プロジェクトを開く</translation>
     </message>
     <message>
-        <source>Recently opened project</source>
+        <source>Recently opened projects</source>
         <translation type="unfinished">最近開いたプロジェクト</translation>
     </message>
     <message>
@@ -5950,7 +5950,7 @@ Latency: %2 ms</source>
 <context>
     <name>Track</name>
     <message>
-        <source>Muted</source>
+        <source>Mute</source>
         <translation type="unfinished">ミュート</translation>
     </message>
     <message>

diff --git a/data/locale/ko.ts b/data/locale/ko.ts
@@ -3433,7 +3433,7 @@ Please make sure you have write-access to the file and try again.</source>
         <translation type="unfinished">기존 프로젝트 열기</translation>
     </message>
     <message>
-        <source>Recently opened project</source>
+        <source>Recently opened projects</source>
         <translation type="unfinished">최근 열린 프로젝트</translation>
     </message>
     <message>
@@ -5932,7 +5932,7 @@ Latency: %2 ms</source>
 <context>
     <name>Track</name>
     <message>
-        <source>Muted</source>
+        <source>Mute</source>
         <translation type="unfinished">무음</translation>
     </message>
     <message>

diff --git a/data/locale/nl.ts b/data/locale/nl.ts
@@ -3433,7 +3433,7 @@ Please make sure you have write-access to the file and try again.</source>
         <translation type="unfinished">Open bestaand project</translation>
     </message>
     <message>
-        <source>Recently opened project</source>
+        <source>Recently opened projects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5929,7 +5929,7 @@ Vertraging: %2 ms</translation>
 <context>
     <name>Track</name>
     <message>
-        <source>Muted</source>
+        <source>Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/data/locale/pl.ts b/data/locale/pl.ts
@@ -3453,7 +3453,7 @@ Upewnij się, że masz prawo zapisu do tego pliku i spróbuj ponownie.</translat
         <translation>Otwórz istniejący projekt</translation>
     </message>
     <message>
-        <source>Recently opened project</source>
+        <source>Recently opened projects</source>
         <translation>Ostatnio otwierane projekty</translation>
     </message>
     <message>
@@ -5952,7 +5952,7 @@ Upewnij się, że masz przynajmniej uprawnienia odczytu tego pliku a następnie
 <context>
     <name>Track</name>
     <message>
-        <source>Muted</source>
+        <source>Mute</source>
         <translation type="unfinished">Wyciszone</translation>
     </message>
     <message>

diff --git a/data/locale/pt.ts b/data/locale/pt.ts
@@ -3489,7 +3489,7 @@ Double click to pick a file.</source>
         <translation>Mostrar/esconder Editor de Automação</translation>
     </message>
     <message>
-        <source>Recently opened project</source>
+        <source>Recently opened projects</source>
         <translation>Projetos usados recentemente</translation>
     </message>
     <message>
@@ -5950,7 +5950,7 @@ Latência: %2 ms</translation>
 <context>
     <name>Track</name>
     <message>
-        <source>Muted</source>
+        <source>Mute</source>
         <translation type="unfinished">Mudo</translation>
     </message>
     <message>

diff --git a/data/locale/ru.ts b/data/locale/ru.ts
@@ -3477,7 +3477,7 @@ Please make sure you have write-access to the file and try again.</source>
         <translation>Открыть существующий проект</translation>
     </message>
     <message>
-        <source>Recently opened project</source>
+        <source>Recently opened projects</source>
         <translation>Недавние проекты</translation>
     </message>
     <message>
@@ -6003,7 +6003,7 @@ Latency: %2 ms</source>
 <context>
     <name>Track</name>
     <message>
-        <source>Muted</source>
+        <source>Mute</source>
         <translation>Тихо</translation>
     </message>
     <message>

diff --git a/data/locale/sv.ts b/data/locale/sv.ts
@@ -3433,7 +3433,7 @@ Please make sure you have write-access to the file and try again.</source>
         <translation type="unfinished">Öppna existerande projekt</translation>
     </message>
     <message>
-        <source>Recently opened project</source>
+        <source>Recently opened projects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5928,7 +5928,7 @@ Latency: %2 ms</source>
 <context>
     <name>Track</name>
     <message>
-        <source>Muted</source>
+        <source>Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/data/locale/zh.ts b/data/locale/zh.ts
@@ -3443,7 +3443,7 @@ Please make sure you have write-access to the file and try again.</source>
         <translation>打开已有工程</translation>
     </message>
     <message>
-        <source>Recently opened project</source>
+        <source>Recently opened projects</source>
         <translation>最近打开的工程</translation>
     </message>
     <message>
@@ -5942,7 +5942,7 @@ Latency: %2 ms</source>
 <context>
     <name>Track</name>
     <message>
-        <source>Muted</source>
+        <source>Mute</source>
         <translation type="unfinished">静音</translation>
     </message>
     <message>

diff --git a/include/AutomatableModel.h b/include/AutomatableModel.h
@@ -255,7 +255,7 @@ class EXPORT AutomatableModel : public Model, public JournallingObject
 	// has to be accessed by more than one object, then this function shouldn't be used.
 	bool isValueChanged()
 	{
-		if( m_valueChanged )
+		if( m_valueChanged || valueBuffer() )
 		{
 			m_valueChanged = false;
 			return true;

diff --git a/include/Engine.h b/include/Engine.h
@@ -27,6 +27,9 @@
 #define ENGINE_H
 
 #include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QObject>
+
 
 #include "export.h"
 
@@ -39,8 +42,9 @@ class Song;
 class Ladspa2LMMS;
 
 
-class EXPORT Engine
+class EXPORT Engine : public QObject
 {
+	Q_OBJECT
 public:
 	static void init();
 	static void destroy();
@@ -94,6 +98,18 @@ class EXPORT Engine
 		return s_pluginFileHandling;
 	}
 
+	static inline Engine * inst()
+	{
+		if( s_instanceOfMe == NULL )
+		{
+			s_instanceOfMe = new Engine();
+		}
+		return s_instanceOfMe;
+	}
+
+signals:
+	void initProgress(const QString &msg);
+
 
 private:
 	// small helper function which sets the pointer to NULL before actually deleting
@@ -120,6 +136,9 @@ class EXPORT Engine
 
 	static QMap<QString, QString> s_pluginFileHandling;
 
+	// even though most methods are static, an instance is needed for Qt slots/signals
+	static Engine * s_instanceOfMe;
+
 	static void initPluginFileHandling();
 
 	friend class GuiApplication;

diff --git a/include/FileBrowser.h b/include/FileBrowser.h
@@ -58,6 +58,8 @@ public slots:
 	void filterItems( const QString & filter );
 	void reloadTree( void );
 
+private slots:
+	void giveFocusToFilter();
 
 private:
 	bool filterItems( QTreeWidgetItem * item, const QString & filter );