Updated web-update tool, again.

diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index 389f0a1..43cce1f 100644 (file)
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -646,6 +646,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Encode!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Adding file(s), please wait...</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts
index 4b97936..64a281e 100644 (file)
--- a/etc/Translation/LameXP_DE.ts
+++ b/etc/Translation/LameXP_DE.ts
@@ -1046,6 +1046,10 @@
         <source>Reset Advanced Options </source>
         <translation>Erweiterte Optionen Zurücksetzen</translation>
     </message>
+    <message>
+        <source>Encode!</source>
+        <translation>Kodieren!</translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts
index 2264330..6363d23 100644 (file)
--- a/etc/Translation/LameXP_ES.ts
+++ b/etc/Translation/LameXP_ES.ts
@@ -1046,6 +1046,10 @@
         <source>Reset Advanced Options </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Encode!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts
index 3a3826f..d8525b5 100644 (file)
--- a/etc/Translation/LameXP_FR.ts
+++ b/etc/Translation/LameXP_FR.ts
@@ -1050,6 +1050,10 @@ Votre dossier TEMP est situé ici:</translation>
         <source>Reset Advanced Options </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Encode!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts
index c89f3b2..afa5fc2 100644 (file)
--- a/etc/Translation/LameXP_IT.ts
+++ b/etc/Translation/LameXP_IT.ts
@@ -1046,6 +1046,10 @@
         <source>Reset Advanced Options </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Encode!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 1defd64..c27dcc9 100644 (file)
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -985,7 +985,7 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>604</width>
+               <width>602</width>
                <height>520</height>
               </rect>
              </property>
@@ -1951,6 +1951,8 @@
     <property name="title">
      <string>File</string>
     </property>
+    <addaction name="actionEncodeNow"/>
+    <addaction name="separator"/>
     <addaction name="actionOpen"/>
     <addaction name="actionOpenFolder"/>
     <addaction name="actionClearAll"/>
@@ -2250,6 +2252,15 @@
     <string>From File...</string>
    </property>
   </action>
+  <action name="actionEncodeNow">
+   <property name="icon">
+    <iconset resource="../res/Icons.qrc">
+     <normaloff>:/icons/play.png</normaloff>:/icons/play.png</iconset>
+   </property>
+   <property name="text">
+    <string>Encode!</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="../res/Icons.qrc"/>
@@ -2285,6 +2296,8 @@
   <include location="../res/Icons.qrc"/>
   <include location="../res/Icons.qrc"/>
   <include location="../res/Icons.qrc"/>
+  <include location="../res/Icons.qrc"/>
+  <include location="../res/Icons.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -2671,5 +2684,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>actionEncodeNow</sender>
+   <signal>triggered()</signal>
+   <receiver>buttonStart</receiver>
+   <slot>click()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>69</x>
+     <y>423</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>

diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm
index e37325d..8eabf44 100644 (file)
Binary files a/res/localization/LameXP_DE.qm and b/res/localization/LameXP_DE.qm differ

diff --git a/res/tools/wupdate.exe b/res/tools/wupdate.exe
index 00c296b..569c954 100644 (file)
Binary files a/res/tools/wupdate.exe and b/res/tools/wupdate.exe differ

diff --git a/src/Config.h b/src/Config.h
index 75bf2cb..7d2361c 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -25,7 +25,7 @@
 #define VER_LAMEXP_MAJOR                               4
 #define VER_LAMEXP_MINOR_HI                            0
 #define VER_LAMEXP_MINOR_LO                            0
-#define VER_LAMEXP_BUILD                               258
+#define VER_LAMEXP_BUILD                               259
 #define VER_LAMEXP_SUFFIX                              Beta-1
 
 /*

diff --git a/src/Model_FileList.cpp b/src/Model_FileList.cpp
index 546be17..99bd729 100644 (file)
--- a/src/Model_FileList.cpp
+++ b/src/Model_FileList.cpp
@@ -22,6 +22,7 @@
 #include "Model_FileList.h"
 
 #include <QFileInfo>
+#include <QDir>
 
 ////////////////////////////////////////////////////////////
 // Constructor & Destructor
@@ -61,7 +62,7 @@ QVariant FileListModel::data(const QModelIndex &index, int role) const
                        return m_fileList.at(index.row()).fileName();
                        break;
                case 1:
-                       return m_fileList.at(index.row()).filePath();
+                       return QDir::toNativeSeparators(m_fileList.at(index.row()).filePath());
                        break;
                default:
                        return QVariant();

diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp
index bab15b1..bb69da4 100644 (file)
--- a/src/Thread_Initialization.cpp
+++ b/src/Thread_Initialization.cpp
@@ -71,7 +71,7 @@ g_lamexp_tools[] =
        {"8c842eef65248b46fa6cb9a9e5714f575672d999", "valdec.exe", 31},
        {"8159f4e824b3e343ece95ba6dbb5e16da9c4866e", "volumax.exe", UINT_MAX},
        {"62e2805d1b2eb2a4d86a5ca6e6ea58010d05d2a7", "wget.exe", UINT_MAX},
-       {"f8293dcf0d21dcca2798afaa8e0d1b93b8ced720", "wupdate.exe", UINT_MAX},
+       {"a7e8aad52213e339ad985829722f35eab62be182", "wupdate.exe", UINT_MAX},
        {"b7d14b3540d24df13119a55d97623a61412de6e3", "wvunpack.exe", 4601},
        {NULL, NULL, NULL}
 };