Version 5.2.2.

.gitignore

@@ -0,0 +1,41 @@
+.info/
+.thumbnail/
+*.orig
+bin/
+Makefile
+fwUpgrade/usr/
+gen/
+obj/
+x86-bin/
+x86-obj/
+x86-gen/
+target/
+.current_project*
+testing/runner/runner
+testing/capture/capture
+*.includes
+*.files
+*.user
+*.creator
+*.config
+*.cap
+*.DS_Store
+ConnectionManager/lib/lib/
+ConnectionManager/lib/x86-lib/
+area_tree.txt
+layout.txt
+La Yenca.mp3
+model/lib/
+bqClientServices/lib/
+bqClientServices/x86-lib/
+model/x86-lib/
+*.o
+uft_asserts\.txt$
+bqUtils/x86-lib/
+bqUtils/lib/
+moc_*.cpp
+library/lib/
+libbqModelLibrary.so*
+*.rej
+*.bak
+*~

QBookApp/QBookApp.pri

@@ -51,7 +51,10 @@ TRANSLATIONS += ./tr/qbookapp_es.ts \
     ./tr/qbookapp_pt.ts \
     ./tr/qbookapp_gl.ts \
     ./tr/qbookapp_ca.ts \
-    ./tr/qbookapp_eu.ts
+    ./tr/qbookapp_eu.ts \
+    ./tr/qbookapp_fr.ts \
+    ./tr/qbookapp_de.ts \
+    ./tr/qbookapp_it.ts
 
 INCLUDEPATH += ./ConnectionManager/lib ./bqUtils/inc ./model/inc
 

QBookApp/QBookApp1024.qrc

@@ -21,5 +21,11 @@
         <file alias="factoryReset_E60Q22.png">res/1024/factoryReset_E60Q22.png</file>
         <file alias="batteryChargingImage.png">res/1024/batteryChargingImage.png</file>
         <file alias="batteryCompleteImage.png">res/1024/batteryCompleteImage.png</file>
+        <file alias="recoverError_de.png">res/1024/recoverError_de.png</file>
+        <file alias="recoverError_fr.png">res/1024/recoverError_fr.png</file>
+        <file alias="recoverError_it.png">res/1024/recoverError_it.png</file>
+        <file alias="restoring_screen_de.png">res/1024/restoring_screen_de.png</file>
+        <file alias="restoring_screen_fr.png">res/1024/restoring_screen_fr.png</file>
+        <file alias="restoring_screen_it.png">res/1024/restoring_screen_it.png</file>
     </qresource>
 </RCC>

QBookApp/QBookApp800.qrc

@@ -21,5 +21,11 @@
         <file alias="factoryReset_E60Q22.png">res/800/factoryReset_E60Q22.png</file>
         <file alias="batteryChargingImage.png">res/800/batteryChargingImage.png</file>
         <file alias="batteryCompleteImage.png">res/800/batteryCompleteImage.png</file>
+        <file alias="restoring_screen_fr.png">res/800/restoring_screen_fr.png</file>
+        <file alias="restoring_screen_it.png">res/800/restoring_screen_it.png</file>
+        <file alias="restoring_screen_de.png">res/800/restoring_screen_de.png</file>
+        <file alias="recoverError_de.png">res/800/recoverError_de.png</file>
+        <file alias="recoverError_fr.png">res/800/recoverError_fr.png</file>
+        <file alias="recoverError_it.png">res/800/recoverError_it.png</file>
     </qresource>
 </RCC>

QBookApp/inc/AfterUpdateWorker.h

@@ -42,6 +42,7 @@ class AfterUpdateWorker : public QObject
     void                                            copyNewImages                   ( );
     void                                            setActivated                    ();
     void                                            migrationFromBqToNubico         ( );
+    void                                            migrationFromLiberdracToLibelista();
     void                                            removeExpiredDictionaries       ( );
 };
 

QBookApp/inc/QBookApp.h

@@ -139,7 +139,7 @@ class QBookApp : public QWidget, protected Ui::QBookApp
     void                popAllForms         ();
 
     Keyboard*           showKeyboard        ( const QString& text,bool showUp = false, Keyboard::MODE keyboardMode = Keyboard::NORMAL );
-    inline StatusBar*   getStatusBar        ();
+    StatusBar*          getStatusBar        ();
     Viewer*             getViewer           ();
 
     SettingsWiFiList *      m_wifiSelection;

QBookApp/src/AfterUpdateWorker.cpp

@@ -62,6 +62,7 @@ void AfterUpdateWorker::work()
     copyNewImages();
 
     migrationFromBqToNubico();
+    migrationFromLiberdracToLibelista();
 
     setActivated();
 
@@ -94,6 +95,27 @@ void AfterUpdateWorker::migrationFromBqToNubico()
 
 }
 
+void AfterUpdateWorker::migrationFromLiberdracToLibelista()
+{
+    qDebug() << Q_FUNC_INFO;
+
+    const QString shopName = QBook::settings().value("shopName", "").toString();
+
+    if(!shopName.size() || shopName != "liberdrac")
+        return;
+
+    qDebug() << Q_FUNC_INFO << "unlinking device";
+    QBook::settings().setValue("setting/linked",false);
+    QBook::settings().setValue("setting/activated",true);
+    QBook::settings().setValue("setting/initial",true);
+    QBook::settings().setValue("setting/initial_lang_selection",true);
+    QBook::settings().setValue("eMail", "");
+    QBook::settings().setValue("shopName", "Tienda");
+    QBook::settings().setValue("readerPartitionName", "reader");
+    QBook::settings().setValue("deviceModelName", "reader");
+
+}
+
 void AfterUpdateWorker::copyNewImages()
 {
     QString imagePath = "../res/newImages";

QBookApp/src/QBookApp.cpp

@@ -2043,6 +2043,20 @@ void QBookApp::openContent(const BookInfo* content)
     if (content == NULL)
         return;
 
+    QFileInfo checkFile(content->path);
+    if(!checkFile.exists()||!checkFile.isFile())
+    {
+        InfoDialog* noFileDialog = new InfoDialog(this);
+        noFileDialog->setTimeLasts(3000);
+        noFileDialog->hideSpinner();
+        //FIXME: Get proper text for this and translated
+        noFileDialog->setText(tr("Cannot open book. File doesn't exist"));
+        noFileDialog->hideSpinner();
+        noFileDialog->showForSpecifiedTime();
+        delete noFileDialog;
+        return;
+    }
+
     disconnect(fwDwld, SIGNAL(checkOTAAvailableFinished(int)), this, SLOT(gotOTACheckResult(int)));
     disconnect(ConnectionManager::getInstance(), SIGNAL(connected()), this, SLOT(checkFwVersion()));
 

QBookApp/src/QBookDevel.cpp

@@ -39,7 +39,7 @@ along with the source code.  If not, see <http://www.gnu.org/licenses/>.
 #include <QBook.h>
 #include <PowerManager.h>
 #include <PowerManagerLock.h>
-#include <hgversion.h>
+#include <gitversion.h>
 
 
 #include "QBookDevel.h"
@@ -213,7 +213,7 @@ void QBookDevel::enableCores(void) {
        qDebug() << "Cannot prlimit for cores";
     }
 
-    QString command = QString("echo '/mnt/sd/core.%e.%p.%h.%t_rev") + HG_VERSION + QString("' > /proc/sys/kernel/core_pattern");
+    QString command = QString("echo '/mnt/sd/core.%e.%p.%h.%t_rev") + GIT_VERSION + QString("' > /proc/sys/kernel/core_pattern");
 
     qDebug() << Q_FUNC_INFO << "command" << command;
     char * cmd = command.toLatin1().data();

QBookApp/src/main.cpp

@@ -30,7 +30,7 @@ along with the source code.  If not, see <http://www.gnu.org/licenses/>.
 #include "ADConverter.h"
 #include "DeviceInfo.h"
 #include "FrontLight.h"
-#include "hgversion.h"
+#include "gitversion.h"
 #include "AfterUpdateWorker.h"
 #include "SleeperThread.h"
 
@@ -110,7 +110,7 @@ int main(int argc, char* argv[])
     app->setOverrideCursor(QCursor(Qt::BlankCursor));
 #endif
 
-    qDebug() << "Starting QBookApp version:" << HG_VERSION;
+    qDebug() << "Starting QBookApp version:" << GIT_VERSION;
 
     // Singletons
     loadRccs();

QBookApp/tr/qbookapp_ca.ts

@@ -507,7 +507,7 @@ Si us plau, no extreguis la SD.</translation>
     <name>QBookScreenSaver</name>
     <message>
         <source>Battery level</source>
-        <translation>Nivell de bateria</translation>
+        <translation type="obsolete">Nivell de bateria</translation>
     </message>
     <message>
         <source>Press the Power button to resume</source>