Skip to content

Commit 2503fed

Browse files
santiagomayoralsantiagomayoral
committed
Version 6.0.1
1 parent cac3257 commit 2503fed

File tree

1,026 files changed

+19506
-11753
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,026 files changed

+19506
-11753
lines changed

‎.gitignore‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,35 @@
22
.thumbnail/
33
*.orig
44
bin/
5+
./gen/*
6+
./bin/*
7+
./bin/langs/*
8+
gen/*
9+
obj/*
10+
hgversion.h
11+
bin/*
12+
QBook.pro.user
13+
qbookapp.creator.user
14+
bqUtils/obj/*
15+
bqUtils/gen/*
16+
bqUtils/lib/*
17+
ConnectionManager/connect/gen/*
18+
ConnectionManager/connect/bin/*
19+
ConnectionManager/connect/obj/*
20+
ConnectionManager/lib/*
21+
ConnectionManager/offline/bin/*
22+
ConnectionManager/offline/gen/*
23+
ConnectionManager/offline/obj/*
24+
model/gen/*
25+
model/obj/*
26+
model/lib/*
27+
model/Makefile
28+
bqUtils/Makefile
29+
Makefile
30+
ConnectionManager/Makefile
31+
ConnectionManager/connect/Makefile
32+
ConnectionManager/offline/Makefile
33+
ConnectionManager/test/Makefile
534
Makefile
635
fwUpgrade/usr/
736
gen/
@@ -39,3 +68,4 @@ libbqModelLibrary.so*
3968
*.rej
4069
*.bak
4170
*~
71+
!QHome/bin

‎.hgignore‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎QBook.pro‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,13 @@ FAKE_WIFI = $$(FAKE_WIFI)
184184

185185

186186

187-
QRC_FILES += res/common800.qrc res/common1024.qrc
187+
QRC_FILES += res/common800.qrc res/common1024.qrc res/common1448.qrc
188188

189189
OTHER_FILES += \
190190
res/common_styles_generic.qss \
191191
res/800/common_styles.qss \
192192
res/1024/common_styles.qss \
193-
QBookApp.files
193+
res/1448/common_styles.qss \
194+
QBookApp.files \
195+
build.sh
194196

‎QBookApp/QBookApp.pri‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ TRANSLATIONS += ./tr/qbookapp_es.ts \
5858

5959
INCLUDEPATH += ./ConnectionManager/lib ./bqUtils/inc ./model/inc
6060

61-
QRC_FILES += QBookApp800.qrc QBookApp1024.qrc
61+
QRC_FILES += QBookApp800.qrc QBookApp1024.qrc QBookApp1448.qrc

‎QBookApp/QBookApp1448.qrc‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<RCC>
2+
<qresource prefix="/">
3+
<file alias="res/qbookapp_styles.qss">res/1448/qbookapp_styles.qss</file>
4+
<file alias="restDeviceImage.png">res/1448/restDeviceImage.png</file>
5+
<file alias="factoryReset.png">res/1448/factoryReset.png</file>
6+
<file alias="lowBatteryImage.png">res/1448/lowBatteryImage.png</file>
7+
<file alias="powerOffDeviceImage.png">res/1448/powerOffDeviceImage.png</file>
8+
<file alias="restoring_screen_ca.png">res/1448/restoring_screen_ca.png</file>
9+
<file alias="restoring_screen_en.png">res/1448/restoring_screen_en.png</file>
10+
<file alias="restoring_screen_es.png">res/1448/restoring_screen_es.png</file>
11+
<file alias="restoring_screen_eu.png">res/1448/restoring_screen_eu.png</file>
12+
<file alias="restoring_screen_pt.png">res/1448/restoring_screen_pt.png</file>
13+
<file alias="emptyBatteryImage.png">res/1448/emptyBatteryImage.png</file>
14+
<file alias="restoring_screen_gl.png">res/1448/restoring_screen_gl.png</file>
15+
<file alias="recoverError_ca.png">res/1448/recoverError_ca.png</file>
16+
<file alias="recoverError_en.png">res/1448/recoverError_en.png</file>
17+
<file alias="recoverError_es.png">res/1448/recoverError_es.png</file>
18+
<file alias="recoverError_eu.png">res/1448/recoverError_eu.png</file>
19+
<file alias="recoverError_pt.png">res/1448/recoverError_pt.png</file>
20+
<file alias="recoverError_gl.png">res/1448/recoverError_gl.png</file>
21+
<file alias="factoryReset_E60Q22.png">res/1448/factoryReset_E60Q22.png</file>
22+
<file alias="batteryChargingImage.png">res/1448/batteryChargingImage.png</file>
23+
<file alias="batteryCompleteImage.png">res/1448/batteryCompleteImage.png</file>
24+
<file alias="recoverError_de.png">res/1448/recoverError_de.png</file>
25+
<file alias="recoverError_fr.png">res/1448/recoverError_fr.png</file>
26+
<file alias="recoverError_it.png">res/1448/recoverError_it.png</file>
27+
<file alias="restoring_screen_de.png">res/1448/restoring_screen_de.png</file>
28+
<file alias="restoring_screen_fr.png">res/1448/restoring_screen_fr.png</file>
29+
<file alias="restoring_screen_it.png">res/1448/restoring_screen_it.png</file>
30+
</qresource>
31+
</RCC>

‎QBookApp/QBookApp800.qrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<RCC>
22
<qresource prefix="/">
3-
<file alias="res/qbookapp_styles.qss">res/800/qbookapp_styles.qss</file>
43
<file alias="restoring_screen_ca.png">res/800/restoring_screen_ca.png</file>
54
<file alias="restoring_screen_en.png">res/800/restoring_screen_en.png</file>
65
<file alias="restoring_screen_es.png">res/800/restoring_screen_es.png</file>
@@ -27,5 +26,6 @@
2726
<file alias="recoverError_de.png">res/800/recoverError_de.png</file>
2827
<file alias="recoverError_fr.png">res/800/recoverError_fr.png</file>
2928
<file alias="recoverError_it.png">res/800/recoverError_it.png</file>
29+
<file>res/800/qbookapp_styles.qss</file>
3030
</qresource>
3131
</RCC>

‎QBookApp/inc/PowerManager.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*************************************************************************
22
33
bq Cervantes e-book reader application
4-
Copyright (C) 2011-2013 Mundoreader, S.L
4+
Copyright (C) 2011-2016 Mundoreader, S.L
55
66
This program is free software: you can redistribute it and/or modify
77
it under the terms of the GNU General Public License
@@ -48,6 +48,7 @@ class PowerManager : public QObject
4848
static void releaseLock(PowerManagerLock*);
4949
static void removeLock(PowerManagerLock*);
5050
void cancelSleep();
51+
void wakeUpFromSleep();
5152

5253
public slots:
5354
static void powerOffDevice(bool defaultSettings = false);

‎QBookApp/inc/QBookApp.h‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*************************************************************************
22
33
bq Cervantes e-book reader application
4-
Copyright (C) 2011-2013 Mundoreader, S.L
4+
Copyright (C) 2011-2016 Mundoreader, S.L
55
66
This program is free software: you can redistribute it and/or modify
77
it under the terms of the GNU General Public License
@@ -187,12 +187,15 @@ class QBookApp : public QWidget, protected Ui::QBookApp
187187
void resumeThumbnailGeneration ( );
188188
QSize getHomeThumbnailSize ( );
189189
bool isResumingWifi ( );
190+
bool isSleptShown ( );
190191
void closeSleep ( );
191192
void enablePowerKeyWatcher (bool);
192193
void shuttingDown ( );
193194
QString getImageResource (const QString& path, bool isLine = false);
194195
void generateBookCover ( BookInfo* );
195196
QList<QByteArray> getSupportedImageslist ( );
197+
bool accidentalHomePress ( );
198+
void resetCancelWakeUp ( );
196199

197200
signals:
198201
void popupForm();
@@ -307,6 +310,7 @@ protected slots:
307310
void confirmFwUpgrade();
308311
void askPowerOffDevice();
309312
void powerLight();
313+
void handleSpecialKeyPress();
310314
void checkStartupDebugOpts();
311315
void firstChecksAfterStartup();
312316
void connectDialogSlots();
@@ -452,6 +456,7 @@ private slots:
452456
QTimer m_timer_powerButton;
453457
QTimer m_sleepSyncTimer;
454458
QTimer m_timer_light;
459+
QTimer m_timer_doubleHomeClick;
455460
QTimer m_connectAfterSleepTimer;
456461
QTimer m_afterWifiOnTimer;
457462
QTimer m_powerKeyWatcher;
@@ -498,6 +503,7 @@ private slots:
498503
bool b_isSleeping;
499504
bool b_isBuying;
500505
bool b_wizardFromStore;
506+
bool b_cancelWakeUp;
501507
QProcess *offlineHelper;
502508
QList<QByteArray> supportedImageslist;
503509
};

‎QBookApp/res/1024/qbookapp_styles.qss‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,4 @@ max-width:190px;
6666
}
6767
#versionLutLbl, #modelLbl, #mdeviceIDLbl, #edpTypeLbl,#edpTemperatureLbl, #internalMemLbl, #auxLbl, #diccioLbl, #bateryLbl, #tconLbl, #softwareLbl, #MACadressLbl, #externalMemLbl, #panelTypeLbl{
6868
}
69-
#DeviceInfoDialog #settingsMenuListCont QWidget #internalVersionValLbl{
70-
margin-left:0px;
71-
font-size:18px;
72-
}
69+

‎QBookApp/res/1448/batteryChargingImage.png‎

20.6 KB
Loading

0 commit comments

Comments
 (0)