Version 6.0.1

.gitignore

@@ -2,6 +2,35 @@
 .thumbnail/
 *.orig
 bin/
+./gen/*
+./bin/*
+./bin/langs/*
+gen/*
+obj/*
+hgversion.h
+bin/*
+QBook.pro.user
+qbookapp.creator.user
+bqUtils/obj/*
+bqUtils/gen/*
+bqUtils/lib/*
+ConnectionManager/connect/gen/*
+ConnectionManager/connect/bin/*
+ConnectionManager/connect/obj/*
+ConnectionManager/lib/*
+ConnectionManager/offline/bin/*
+ConnectionManager/offline/gen/*
+ConnectionManager/offline/obj/*
+model/gen/*
+model/obj/*
+model/lib/*
+model/Makefile
+bqUtils/Makefile
+Makefile
+ConnectionManager/Makefile
+ConnectionManager/connect/Makefile
+ConnectionManager/offline/Makefile
+ConnectionManager/test/Makefile
 Makefile
 fwUpgrade/usr/
 gen/
@@ -39,3 +68,4 @@ libbqModelLibrary.so*
 *.rej
 *.bak
 *~
+!QHome/bin

QBook.pro

@@ -184,11 +184,13 @@ FAKE_WIFI = $$(FAKE_WIFI)
 
 
 
-QRC_FILES += res/common800.qrc res/common1024.qrc
+QRC_FILES += res/common800.qrc res/common1024.qrc res/common1448.qrc
 
 OTHER_FILES += \
     res/common_styles_generic.qss \
     res/800/common_styles.qss \
     res/1024/common_styles.qss \
-    QBookApp.files
+    res/1448/common_styles.qss \
+    QBookApp.files \
+    build.sh
 

QBookApp/QBookApp.pri

@@ -58,4 +58,4 @@ TRANSLATIONS += ./tr/qbookapp_es.ts \
 
 INCLUDEPATH += ./ConnectionManager/lib ./bqUtils/inc ./model/inc
 
-QRC_FILES += QBookApp800.qrc QBookApp1024.qrc
+QRC_FILES += QBookApp800.qrc QBookApp1024.qrc QBookApp1448.qrc

QBookApp/QBookApp1448.qrc

@@ -0,0 +1,31 @@
+<RCC>
+    <qresource prefix="/">
+        <file alias="res/qbookapp_styles.qss">res/1448/qbookapp_styles.qss</file>
+        <file alias="restDeviceImage.png">res/1448/restDeviceImage.png</file>
+        <file alias="factoryReset.png">res/1448/factoryReset.png</file>
+        <file alias="lowBatteryImage.png">res/1448/lowBatteryImage.png</file>
+        <file alias="powerOffDeviceImage.png">res/1448/powerOffDeviceImage.png</file>
+        <file alias="restoring_screen_ca.png">res/1448/restoring_screen_ca.png</file>
+        <file alias="restoring_screen_en.png">res/1448/restoring_screen_en.png</file>
+        <file alias="restoring_screen_es.png">res/1448/restoring_screen_es.png</file>
+        <file alias="restoring_screen_eu.png">res/1448/restoring_screen_eu.png</file>
+        <file alias="restoring_screen_pt.png">res/1448/restoring_screen_pt.png</file>
+        <file alias="emptyBatteryImage.png">res/1448/emptyBatteryImage.png</file>
+        <file alias="restoring_screen_gl.png">res/1448/restoring_screen_gl.png</file>
+        <file alias="recoverError_ca.png">res/1448/recoverError_ca.png</file>
+        <file alias="recoverError_en.png">res/1448/recoverError_en.png</file>
+        <file alias="recoverError_es.png">res/1448/recoverError_es.png</file>
+        <file alias="recoverError_eu.png">res/1448/recoverError_eu.png</file>
+        <file alias="recoverError_pt.png">res/1448/recoverError_pt.png</file>
+        <file alias="recoverError_gl.png">res/1448/recoverError_gl.png</file>
+        <file alias="factoryReset_E60Q22.png">res/1448/factoryReset_E60Q22.png</file>
+        <file alias="batteryChargingImage.png">res/1448/batteryChargingImage.png</file>
+        <file alias="batteryCompleteImage.png">res/1448/batteryCompleteImage.png</file>
+        <file alias="recoverError_de.png">res/1448/recoverError_de.png</file>
+        <file alias="recoverError_fr.png">res/1448/recoverError_fr.png</file>
+        <file alias="recoverError_it.png">res/1448/recoverError_it.png</file>
+        <file alias="restoring_screen_de.png">res/1448/restoring_screen_de.png</file>
+        <file alias="restoring_screen_fr.png">res/1448/restoring_screen_fr.png</file>
+        <file alias="restoring_screen_it.png">res/1448/restoring_screen_it.png</file>
+    </qresource>
+</RCC>

QBookApp/QBookApp800.qrc

@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file alias="res/qbookapp_styles.qss">res/800/qbookapp_styles.qss</file>
         <file alias="restoring_screen_ca.png">res/800/restoring_screen_ca.png</file>
         <file alias="restoring_screen_en.png">res/800/restoring_screen_en.png</file>
         <file alias="restoring_screen_es.png">res/800/restoring_screen_es.png</file>
@@ -27,5 +26,6 @@
         <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>
+        <file>res/800/qbookapp_styles.qss</file>
     </qresource>
 </RCC>

QBookApp/inc/PowerManager.h

@@ -1,7 +1,7 @@
 /*************************************************************************
 
 bq Cervantes e-book reader application
-Copyright (C) 2011-2013  Mundoreader, S.L
+Copyright (C) 2011-2016  Mundoreader, S.L
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License
@@ -48,6 +48,7 @@ class PowerManager : public QObject
     static void releaseLock(PowerManagerLock*);
     static void removeLock(PowerManagerLock*);
     void cancelSleep();
+    void wakeUpFromSleep();
 
 public slots:
     static void powerOffDevice(bool defaultSettings = false);

QBookApp/inc/QBookApp.h

@@ -1,7 +1,7 @@
 /*************************************************************************
 
 bq Cervantes e-book reader application
-Copyright (C) 2011-2013  Mundoreader, S.L
+Copyright (C) 2011-2016  Mundoreader, S.L
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License
@@ -187,12 +187,15 @@ class QBookApp : public QWidget, protected Ui::QBookApp
     void                                                        resumeThumbnailGeneration                       ( );
     QSize                                                       getHomeThumbnailSize                            ( );
     bool                                                        isResumingWifi                                  ( );
+    bool                                                        isSleptShown                                    ( );
     void                                                        closeSleep                                      ( );
     void                                                        enablePowerKeyWatcher                           (bool);
     void                                                        shuttingDown                                    ( );
     QString                                                     getImageResource                                (const QString& path, bool isLine = false);
     void                                                        generateBookCover                               ( BookInfo* );
     QList<QByteArray>                                           getSupportedImageslist                          ( );
+    bool                                                        accidentalHomePress                             ( );
+    void                                                        resetCancelWakeUp                               ( );
 
 signals:
     void popupForm();
@@ -307,6 +310,7 @@ protected slots:
     void confirmFwUpgrade();
     void askPowerOffDevice();
     void powerLight();
+    void handleSpecialKeyPress();
     void checkStartupDebugOpts();
     void firstChecksAfterStartup();
     void connectDialogSlots();
@@ -452,6 +456,7 @@ private slots:
     QTimer m_timer_powerButton;
     QTimer m_sleepSyncTimer;
     QTimer m_timer_light;
+    QTimer m_timer_doubleHomeClick;
     QTimer m_connectAfterSleepTimer;
     QTimer m_afterWifiOnTimer;
     QTimer m_powerKeyWatcher;
@@ -498,6 +503,7 @@ private slots:
     bool b_isSleeping;
     bool b_isBuying;
     bool b_wizardFromStore;
+    bool b_cancelWakeUp;
     QProcess *offlineHelper;
     QList<QByteArray> supportedImageslist;
 };

QBookApp/res/1024/qbookapp_styles.qss

@@ -66,7 +66,4 @@ max-width:190px;
 }
 #versionLutLbl, #modelLbl, #mdeviceIDLbl, #edpTypeLbl,#edpTemperatureLbl, #internalMemLbl, #auxLbl, #diccioLbl, #bateryLbl, #tconLbl, #softwareLbl, #MACadressLbl, #externalMemLbl, #panelTypeLbl{
 }
-#DeviceInfoDialog #settingsMenuListCont QWidget #internalVersionValLbl{
-margin-left:0px;
-font-size:18px;
-}
+

QBookApp/res/1448/qbookapp_styles.qss

@@ -0,0 +1,69 @@
+/*************************************************************************
+
+bq Cervantes e-book reader application
+Copyright (C) 2011-2013  Mundoreader, S.L
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with the source code.  If not, see <http://www.gnu.org/licenses/>.
+
+*************************************************************************/
+
+/*QBookApp
+----------------------------*/
+#QBookApp{
+min-width: 1072px;
+max-width: 1072px;
+min-height: 1448px;
+max-height: 1448px;
+}
+#QBookApp #titleBar{
+min-width: 1072px;
+max-width: 1072px;
+min-height: 89px;
+max-height: 89px;
+}
+
+#DeviceInfoDialog{
+min-width: 1072px;
+max-width: 1072px;
+min-height: 1448px;
+max-height: 1448px;
+}
+#DeviceInfoDialog QCheckBox::indicator {
+width: 91px;
+height: 91px;
+}
+#DeviceInfoDialog #settingsMenuListCont{
+margin: 0px 31px;
+}
+#DeviceInfoDialog #okButton{
+min-width: 184px;
+max-width: 184px;
+min-height: 82px;
+max-height: 82px;
+}
+#DeviceInfoDialog #settingsMenuListCont QWidget{
+margin: 0px 42px;
+border-width: 3px;
+}
+#DeviceInfoDialog #settingsMenuListCont QWidget QLabel{
+padding: 0px 14px;
+font-size: 33px;
+}
+#versionLutLbl, #modelLbl, #mdeviceIDLbl, #edpTypeLbl,#edpTemperatureLbl, #internalMemLbl, #auxLbl, #diccioLbl, #bateryLbl, #tconLbl, #softwareLbl, #MACadressLbl, #externalMemLbl, #panelTypeLbl, #idDeviceLbl,#internalVersionLbl,#rootFsLbl, #kernelVersionLbl{
+min-width: 269px;
+max-width: 269px;
+}
+#versionLutLbl, #modelLbl, #mdeviceIDLbl, #edpTypeLbl,#edpTemperatureLbl, #internalMemLbl, #auxLbl, #diccioLbl, #bateryLbl, #tconLbl, #softwareLbl, #MACadressLbl, #externalMemLbl, #panelTypeLbl{
+}
+

QBookApp/res/800/qbookapp_styles.qss

@@ -64,16 +64,7 @@ font-size:18px;
 min-width:160px;
 max-width:160px;
 }
-#internalVersionLbl{
-padding:0px 0px 0px 10px;
-margin:0px 10px 0px 0px;
-max-width:130px;
-}
-#DeviceInfoDialog #settingsMenuListCont QWidget #internalVersionValLbl{
-margin:0px 24px 0px 0px;
-padding:0px 10px 0px 0px;
-font-size:10px;
-}
+
 #DeviceInfoDialog #settingsMenuListCont QWidget #kernelVersionVaLbl{
 font-size:12px;
 }

QBookApp/src/AfterUpdateWorker.cpp

@@ -1,7 +1,7 @@
 /*************************************************************************
 
 bq Cervantes e-book reader application
-Copyright (C) 2011-2013  Mundoreader, S.L
+Copyright (C) 2011-2016  Mundoreader, S.L
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License
@@ -122,15 +122,22 @@ void AfterUpdateWorker::copyNewImages()
     QString shopName = QBook::settings().value("shopName", "").toString();
 
     QString resolution;
-
-    int res = QBook::getInstance()->getResolution();
-    switch (res){
-    case 0:
-        resolution = "800";
-    break;
-    case 1:
-        resolution = "1024";
-    break;
+    QString scriptName;
+
+    switch (QBook::getInstance()->getResolution())
+    {
+        case QBook::RES1072x1448:
+            resolution = "1448";
+            scriptName = "./changeStartingImage1448.sh";
+            break;
+        case QBook::RES758x1024:
+            resolution = "1024";
+            scriptName = "./changeStartingImage1024.sh";
+            break;
+        case QBook::RES600x800: default:
+            resolution = "800";
+            scriptName = "./changeStartingImage800.sh";
+            break;
     }
 
     /** In order to replace customization images in initial versions (before 4.1.1)
@@ -170,12 +177,9 @@ void AfterUpdateWorker::copyNewImages()
         }
     }
 
-    ////// WARNING This Scipt execute dd ///////////////
+    ////// WARNING This Script execute dd ///////////////
 
-    if(resolution == "800")
-        system("./changeStartingImage800.sh");
-    else if(resolution == "1024")
-        system("./changeStartingImage1024.sh");
+    system(scriptName.toUtf8().constData());
 
     /////////////////////////////////////////////////////