OSDN Git Service

(root) / lamexp / LameXP.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7d36e9d)
Fixed a regression in b00b5278971615fb2601072abd39264cc59b4652.
authorlordmulder <mulder2@gmx.de>
Fri, 4 May 2012 19:43:44 +0000 (21:43 +0200)
committerlordmulder <mulder2@gmx.de>
Fri, 4 May 2012 19:43:44 +0000 (21:43 +0200)
etc/Translation/Blank.ts patch | blob | history
etc/Translation/LameXP_PL.ts patch | blob | history
etc/Translation/LameXP_SV.ts patch | blob | history
src/Config.h patch | blob | history
src/Model_FileList.cpp patch | blob | history

diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index 35b1c94..c3bbb8c 100644 (file)
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -683,32 +683,32 @@
 <context>
     <name>FileListModel</name>
     <message>
-        <location filename="../../src/Model_FileList.cpp" line="100"/>
+        <location filename="../../src/Model_FileList.cpp" line="101"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Model_FileList.cpp" line="103"/>
+        <location filename="../../src/Model_FileList.cpp" line="104"/>
         <source>Full Path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Model_FileList.cpp" line="332"/>
+        <location filename="../../src/Model_FileList.cpp" line="339"/>
         <source>(System Default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Model_FileList.cpp" line="339"/>
+        <location filename="../../src/Model_FileList.cpp" line="346"/>
         <source>Select ANSI Codepage for CSV file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Model_FileList.cpp" line="340"/>
+        <location filename="../../src/Model_FileList.cpp" line="347"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Model_FileList.cpp" line="341"/>
+        <location filename="../../src/Model_FileList.cpp" line="348"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3011,22 +3011,22 @@
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../../src/Global.cpp" line="806"/>
+        <location filename="../../src/Global.cpp" line="810"/>
         <source>Executable &apos;%1&apos; doesn&apos;t support Windows compatibility mode.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="1049"/>
+        <location filename="../../src/Global.cpp" line="1053"/>
         <source>Executable &apos;%1&apos; requires Qt v%2, but found Qt v%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="1054"/>
+        <location filename="../../src/Global.cpp" line="1058"/>
         <source>Executable &apos;%1&apos; was built for Qt &apos;%2&apos;, but found Qt &apos;%3&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="1067"/>
+        <location filename="../../src/Global.cpp" line="1071"/>
         <source>Executable &apos;%1&apos; requires Windows 2000 or later.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts
index 2cdddb2..2540f3e 100644 (file)
--- a/etc/Translation/LameXP_PL.ts
+++ b/etc/Translation/LameXP_PL.ts
@@ -683,32 +683,32 @@
 <context>
     <name>FileListModel</name>
     <message>
-        <location filename="../../src/Model_FileList.cpp" line="100"/>
+        <location filename="../../src/Model_FileList.cpp" line="101"/>
         <source>Title</source>
         <translation type="unfinished">Tytuł</translation>
     </message>
     <message>
-        <location filename="../../src/Model_FileList.cpp" line="103"/>
+        <location filename="../../src/Model_FileList.cpp" line="104"/>
         <source>Full Path</source>
         <translation type="unfinished">Pełna ścieżka</translation>
     </message>
     <message>
-        <location filename="../../src/Model_FileList.cpp" line="332"/>
+        <location filename="../../src/Model_FileList.cpp" line="339"/>
         <source>(System Default)</source>
         <translation type="unfinished">(Domyślne systemowe)</translation>
     </message>
     <message>
-        <location filename="../../src/Model_FileList.cpp" line="339"/>
+        <location filename="../../src/Model_FileList.cpp" line="346"/>
         <source>Select ANSI Codepage for CSV file:</source>
         <translation type="unfinished">Wybierz zestaw znaków ANSI dla pliku CVS:</translation>
     </message>
     <message>
-        <location filename="../../src/Model_FileList.cpp" line="340"/>
+        <location filename="../../src/Model_FileList.cpp" line="347"/>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
-        <location filename="../../src/Model_FileList.cpp" line="341"/>
+        <location filename="../../src/Model_FileList.cpp" line="348"/>
         <source>Cancel</source>
         <translation type="unfinished">Anuluj</translation>
     </message>
@@ -3011,22 +3011,22 @@
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../../src/Global.cpp" line="806"/>
+        <location filename="../../src/Global.cpp" line="810"/>
         <source>Executable &apos;%1&apos; doesn&apos;t support Windows compatibility mode.</source>
         <translation type="unfinished">Plik wykonywalny &apos;%1&apos; nie działa w trybie kompatybilności z Windows.</translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="1049"/>
+        <location filename="../../src/Global.cpp" line="1053"/>
         <source>Executable &apos;%1&apos; requires Qt v%2, but found Qt v%3.</source>
         <translation type="unfinished">Plik wykonywalny &apos;%1&apos; wymaga Qt v%2, znaleziono jednak Qt v%3.</translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="1054"/>
+        <location filename="../../src/Global.cpp" line="1058"/>
         <source>Executable &apos;%1&apos; was built for Qt &apos;%2&apos;, but found Qt &apos;%3&apos;.</source>
         <translation type="unfinished">Plik wykonywalny &quot;%1&quot; został skompilowany dla Qt &quot;%2&quot;, znaleziono &quot;%3&quot;.</translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="1067"/>
+        <location filename="../../src/Global.cpp" line="1071"/>
         <source>Executable &apos;%1&apos; requires Windows 2000 or later.</source>
         <translation type="unfinished">Plik wykonywalny &apos;%1&apos; wymaga do uruchomienia Windows 2000 lub nowszego.</translation>
     </message>
diff --git a/etc/Translation/LameXP_SV.ts b/etc/Translation/LameXP_SV.ts
index 3e0a668..a5c1488 100644 (file)
--- a/etc/Translation/LameXP_SV.ts
+++ b/etc/Translation/LameXP_SV.ts
@@ -683,32 +683,32 @@
 <context>
     <name>FileListModel</name>
     <message>
-        <location filename="../../src/Model_FileList.cpp" line="100"/>
+        <location filename="../../src/Model_FileList.cpp" line="101"/>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
     <message>
-        <location filename="../../src/Model_FileList.cpp" line="103"/>
+        <location filename="../../src/Model_FileList.cpp" line="104"/>
         <source>Full Path</source>
         <translation>Sökväg</translation>
     </message>
     <message>
-        <location filename="../../src/Model_FileList.cpp" line="332"/>
+        <location filename="../../src/Model_FileList.cpp" line="339"/>
         <source>(System Default)</source>
         <translation>(Systemstandard)</translation>
     </message>
     <message>
-        <location filename="../../src/Model_FileList.cpp" line="339"/>
+        <location filename="../../src/Model_FileList.cpp" line="346"/>
         <source>Select ANSI Codepage for CSV file:</source>
         <translation>Välj ANSI som teckentabell för CSV-fil:</translation>
     </message>
     <message>
-        <location filename="../../src/Model_FileList.cpp" line="340"/>
+        <location filename="../../src/Model_FileList.cpp" line="347"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../../src/Model_FileList.cpp" line="341"/>
+        <location filename="../../src/Model_FileList.cpp" line="348"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
@@ -3011,22 +3011,22 @@
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../../src/Global.cpp" line="806"/>
+        <location filename="../../src/Global.cpp" line="810"/>
         <source>Executable &apos;%1&apos; doesn&apos;t support Windows compatibility mode.</source>
         <translation>EXE-filen &apos;%1&apos; stöder inte Windows kompatibilitetsläge.</translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="1049"/>
+        <location filename="../../src/Global.cpp" line="1053"/>
         <source>Executable &apos;%1&apos; requires Qt v%2, but found Qt v%3.</source>
         <translation>EXE-filen &apos;%1&apos; kräver Qt v%2, du har Qt v%3.</translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="1054"/>
+        <location filename="../../src/Global.cpp" line="1058"/>
         <source>Executable &apos;%1&apos; was built for Qt &apos;%2&apos;, but found Qt &apos;%3&apos;.</source>
         <translation>EXE-filen &apos;%1&apos; är byggd för Qt &apos;%2&apos;, du har Qt &apos;%3&apos;.</translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="1067"/>
+        <location filename="../../src/Global.cpp" line="1071"/>
         <source>Executable &apos;%1&apos; requires Windows 2000 or later.</source>
         <translation>EXE-filen &apos;%1&apos; kräver Windows 2000 eller senare.</translation>
     </message>
diff --git a/src/Config.h b/src/Config.h
index 2c3066b..c6e89a3 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -30,7 +30,7 @@
 #define VER_LAMEXP_MINOR_LO                                    5
 #define VER_LAMEXP_TYPE                                                Alpha
 #define VER_LAMEXP_PATCH                                       1
-#define VER_LAMEXP_BUILD                                       1001
+#define VER_LAMEXP_BUILD                                       1002
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tool versions (minimum expected versions!)
diff --git a/src/Model_FileList.cpp b/src/Model_FileList.cpp
index 1b83b05..eee4733 100644 (file)
--- a/src/Model_FileList.cpp
+++ b/src/Model_FileList.cpp
@@ -204,7 +204,7 @@ AudioFileModel FileListModel::getFile(const QModelIndex &index)
 {
        if(index.row() >= 0 && index.row() < m_fileList.count())
        {
-               return m_fileList.at(index.row());
+               return m_fileStore.value(m_fileList.at(index.row()));
        }
        else
        {
LameXP development repository
About OSDN
Find Software
Develop Software
Help