diff --git a/.gitignore b/.gitignore index fd4f4cd..a04ebf1 100644 --- a/.gitignore +++ b/.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 diff --git a/.hgignore b/.hgignore deleted file mode 100644 index bc0f11f..0000000 --- a/.hgignore +++ /dev/null @@ -1,51 +0,0 @@ -syntax: glob -re:^\.info/ -re:^\.thumbnail/ -*.orig -bin/ -Makefile -fwUpgrade/usr/ -gen/ -obj/ -x86-bin/ -x86-obj/ -x86-gen/ -hgversion.h -target/ -re:.*\/Makefile$ -.current_project$ -re:testing\/runner\/.*\.o -testing/runner/runner -re:testing\/capture\/.*\.o -testing/capture/capture -re:^.current_project$ -*.includes -*.files -*.user -*.creator -*.config -*.cap -*.DS_Store -.AppleDouble/ -re:^\.current_project$ -re:^ConnectionManager/lib/lib/ -re:^ConnectionManager/lib/x86-lib/ -area_tree.txt -layout.txt -La Yenca.mp3 -re:^model/lib/ -re:^bqClientServices/lib/ - -re:^bqClientServices/x86-lib/ -re:^model/x86-lib/ -*.o -re:^uft_asserts\.txt$ -re:^bqUtils/x86-lib/ -re:^bqUtils/lib/ -moc_*.cpp -re:^library/lib/ -libbqModelLibrary.so* -re:^bqWizard/src/WebWizard\.cpp\.rej$ -*.rej -*.bak -*~ diff --git a/QBook.pro b/QBook.pro index d04570b..7a207e4 100755 --- a/QBook.pro +++ b/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 diff --git a/QBookApp/QBookApp.pri b/QBookApp/QBookApp.pri index 31a3c99..5510ce2 100755 --- a/QBookApp/QBookApp.pri +++ b/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 diff --git a/QBookApp/QBookApp1448.qrc b/QBookApp/QBookApp1448.qrc new file mode 100755 index 0000000..16b1e11 --- /dev/null +++ b/QBookApp/QBookApp1448.qrc @@ -0,0 +1,31 @@ + + + res/1448/qbookapp_styles.qss + res/1448/restDeviceImage.png + res/1448/factoryReset.png + res/1448/lowBatteryImage.png + res/1448/powerOffDeviceImage.png + res/1448/restoring_screen_ca.png + res/1448/restoring_screen_en.png + res/1448/restoring_screen_es.png + res/1448/restoring_screen_eu.png + res/1448/restoring_screen_pt.png + res/1448/emptyBatteryImage.png + res/1448/restoring_screen_gl.png + res/1448/recoverError_ca.png + res/1448/recoverError_en.png + res/1448/recoverError_es.png + res/1448/recoverError_eu.png + res/1448/recoverError_pt.png + res/1448/recoverError_gl.png + res/1448/factoryReset_E60Q22.png + res/1448/batteryChargingImage.png + res/1448/batteryCompleteImage.png + res/1448/recoverError_de.png + res/1448/recoverError_fr.png + res/1448/recoverError_it.png + res/1448/restoring_screen_de.png + res/1448/restoring_screen_fr.png + res/1448/restoring_screen_it.png + + diff --git a/QBookApp/QBookApp800.qrc b/QBookApp/QBookApp800.qrc index 39c354d..2ad7a69 100755 --- a/QBookApp/QBookApp800.qrc +++ b/QBookApp/QBookApp800.qrc @@ -1,6 +1,5 @@ - res/800/qbookapp_styles.qss res/800/restoring_screen_ca.png res/800/restoring_screen_en.png res/800/restoring_screen_es.png @@ -27,5 +26,6 @@ res/800/recoverError_de.png res/800/recoverError_fr.png res/800/recoverError_it.png + res/800/qbookapp_styles.qss diff --git a/QBookApp/inc/PowerManager.h b/QBookApp/inc/PowerManager.h index 2094278..cf65c70 100644 --- a/QBookApp/inc/PowerManager.h +++ b/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); diff --git a/QBookApp/inc/QBookApp.h b/QBookApp/inc/QBookApp.h index 254bb35..6741de1 100644 --- a/QBookApp/inc/QBookApp.h +++ b/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 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 supportedImageslist; }; diff --git a/QBookApp/res/1024/qbookapp_styles.qss b/QBookApp/res/1024/qbookapp_styles.qss index 1d5d98e..fc7a7f4 100644 --- a/QBookApp/res/1024/qbookapp_styles.qss +++ b/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; -} + diff --git a/QBookApp/res/1448/batteryChargingImage.png b/QBookApp/res/1448/batteryChargingImage.png new file mode 100644 index 0000000..8ba04ca Binary files /dev/null and b/QBookApp/res/1448/batteryChargingImage.png differ diff --git a/QBookApp/res/1448/batteryCompleteImage.png b/QBookApp/res/1448/batteryCompleteImage.png new file mode 100644 index 0000000..798fdfd Binary files /dev/null and b/QBookApp/res/1448/batteryCompleteImage.png differ diff --git a/QBookApp/res/1448/emptyBatteryImage.png b/QBookApp/res/1448/emptyBatteryImage.png new file mode 100644 index 0000000..61ba091 Binary files /dev/null and b/QBookApp/res/1448/emptyBatteryImage.png differ diff --git a/QBookApp/res/1448/factoryReset.png b/QBookApp/res/1448/factoryReset.png new file mode 100644 index 0000000..ff070b6 Binary files /dev/null and b/QBookApp/res/1448/factoryReset.png differ diff --git a/QBookApp/res/1448/factoryReset_E60Q22.png b/QBookApp/res/1448/factoryReset_E60Q22.png new file mode 100644 index 0000000..1c22526 Binary files /dev/null and b/QBookApp/res/1448/factoryReset_E60Q22.png differ diff --git a/QBookApp/res/1448/lowBatteryImage.png b/QBookApp/res/1448/lowBatteryImage.png new file mode 100644 index 0000000..d69d7b1 Binary files /dev/null and b/QBookApp/res/1448/lowBatteryImage.png differ diff --git a/QBookApp/res/1448/powerOffDeviceImage.png b/QBookApp/res/1448/powerOffDeviceImage.png new file mode 100644 index 0000000..f33edfb Binary files /dev/null and b/QBookApp/res/1448/powerOffDeviceImage.png differ diff --git a/QBookApp/res/1448/qbookapp_styles.qss b/QBookApp/res/1448/qbookapp_styles.qss new file mode 100644 index 0000000..2c943d6 --- /dev/null +++ b/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 . + +*************************************************************************/ + +/*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{ +} + diff --git a/QBookApp/res/1448/recoverError_ca.png b/QBookApp/res/1448/recoverError_ca.png new file mode 100644 index 0000000..36ab99c Binary files /dev/null and b/QBookApp/res/1448/recoverError_ca.png differ diff --git a/QBookApp/res/1448/recoverError_de.png b/QBookApp/res/1448/recoverError_de.png new file mode 100644 index 0000000..7dbfa60 Binary files /dev/null and b/QBookApp/res/1448/recoverError_de.png differ diff --git a/QBookApp/res/1448/recoverError_en.png b/QBookApp/res/1448/recoverError_en.png new file mode 100644 index 0000000..2afede1 Binary files /dev/null and b/QBookApp/res/1448/recoverError_en.png differ diff --git a/QBookApp/res/1448/recoverError_es.png b/QBookApp/res/1448/recoverError_es.png new file mode 100644 index 0000000..26025c3 Binary files /dev/null and b/QBookApp/res/1448/recoverError_es.png differ diff --git a/QBookApp/res/1448/recoverError_eu.png b/QBookApp/res/1448/recoverError_eu.png new file mode 100644 index 0000000..0219a4b Binary files /dev/null and b/QBookApp/res/1448/recoverError_eu.png differ diff --git a/QBookApp/res/1448/recoverError_fr.png b/QBookApp/res/1448/recoverError_fr.png new file mode 100644 index 0000000..c388ce9 Binary files /dev/null and b/QBookApp/res/1448/recoverError_fr.png differ diff --git a/QBookApp/res/1448/recoverError_gl.png b/QBookApp/res/1448/recoverError_gl.png new file mode 100644 index 0000000..e684b95 Binary files /dev/null and b/QBookApp/res/1448/recoverError_gl.png differ diff --git a/QBookApp/res/1448/recoverError_it.png b/QBookApp/res/1448/recoverError_it.png new file mode 100644 index 0000000..ad88d2e Binary files /dev/null and b/QBookApp/res/1448/recoverError_it.png differ diff --git a/QBookApp/res/1448/recoverError_pt.png b/QBookApp/res/1448/recoverError_pt.png new file mode 100644 index 0000000..1cde1d4 Binary files /dev/null and b/QBookApp/res/1448/recoverError_pt.png differ diff --git a/QBookApp/res/1448/restDeviceImage.png b/QBookApp/res/1448/restDeviceImage.png new file mode 100644 index 0000000..ad2f04c Binary files /dev/null and b/QBookApp/res/1448/restDeviceImage.png differ diff --git a/QBookApp/res/1448/restoring_screen_ca.png b/QBookApp/res/1448/restoring_screen_ca.png new file mode 100644 index 0000000..e773e0b Binary files /dev/null and b/QBookApp/res/1448/restoring_screen_ca.png differ diff --git a/QBookApp/res/1448/restoring_screen_de.png b/QBookApp/res/1448/restoring_screen_de.png new file mode 100644 index 0000000..b8d0541 Binary files /dev/null and b/QBookApp/res/1448/restoring_screen_de.png differ diff --git a/QBookApp/res/1448/restoring_screen_en.png b/QBookApp/res/1448/restoring_screen_en.png new file mode 100644 index 0000000..ceedc40 Binary files /dev/null and b/QBookApp/res/1448/restoring_screen_en.png differ diff --git a/QBookApp/res/1448/restoring_screen_es.png b/QBookApp/res/1448/restoring_screen_es.png new file mode 100644 index 0000000..1b53b3a Binary files /dev/null and b/QBookApp/res/1448/restoring_screen_es.png differ diff --git a/QBookApp/res/1448/restoring_screen_eu.png b/QBookApp/res/1448/restoring_screen_eu.png new file mode 100644 index 0000000..c496def Binary files /dev/null and b/QBookApp/res/1448/restoring_screen_eu.png differ diff --git a/QBookApp/res/1448/restoring_screen_fr.png b/QBookApp/res/1448/restoring_screen_fr.png new file mode 100644 index 0000000..86ba18d Binary files /dev/null and b/QBookApp/res/1448/restoring_screen_fr.png differ diff --git a/QBookApp/res/1448/restoring_screen_gl.png b/QBookApp/res/1448/restoring_screen_gl.png new file mode 100644 index 0000000..cef72cd Binary files /dev/null and b/QBookApp/res/1448/restoring_screen_gl.png differ diff --git a/QBookApp/res/1448/restoring_screen_it.png b/QBookApp/res/1448/restoring_screen_it.png new file mode 100644 index 0000000..e1f964a Binary files /dev/null and b/QBookApp/res/1448/restoring_screen_it.png differ diff --git a/QBookApp/res/1448/restoring_screen_pt.png b/QBookApp/res/1448/restoring_screen_pt.png new file mode 100644 index 0000000..12482ce Binary files /dev/null and b/QBookApp/res/1448/restoring_screen_pt.png differ diff --git a/QBookApp/res/1448/updateDeviceImage.png b/QBookApp/res/1448/updateDeviceImage.png new file mode 100644 index 0000000..fbd93c1 Binary files /dev/null and b/QBookApp/res/1448/updateDeviceImage.png differ diff --git a/QBookApp/res/800/qbookapp_styles.qss b/QBookApp/res/800/qbookapp_styles.qss index 5df7103..5526b80 100644 --- a/QBookApp/res/800/qbookapp_styles.qss +++ b/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; } diff --git a/QBookApp/src/AfterUpdateWorker.cpp b/QBookApp/src/AfterUpdateWorker.cpp index 1fc7c55..b14ba07 100644 --- a/QBookApp/src/AfterUpdateWorker.cpp +++ b/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()); ///////////////////////////////////////////////////// diff --git a/QBookApp/src/PowerManager.cpp b/QBookApp/src/PowerManager.cpp index 146ce81..baf775e 100644 --- a/QBookApp/src/PowerManager.cpp +++ b/QBookApp/src/PowerManager.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 @@ -172,6 +172,8 @@ void PowerManager::goToSleep() else wakeUpAlarmTimer = POWERMANAGER_SLEEP_WAKEUP_PERIOD; + QBookApp::instance()->resetCancelWakeUp(); + ret = Power::getInstance()->sleepCPU(wakeUpAlarmTimer); // Reattempt sleep every 3 seconds @@ -195,27 +197,44 @@ void PowerManager::goToSleep() /*-----------------SLEPT---------------------------------*/ - // Loop to handle auto-shutdown after configurable time of sleep - while(Power::getInstance()->isRTCwakeUp()){ + // Loop to handle "hidden" wakeups + while(true){ #ifdef BATTERY_TEST Power::getInstance()->sleepCPU(SAMPLE_PERIOD); continue; #endif - if(QDateTime::currentDateTime() >= m_scheduledPowerOffTime // Auto-poweroff feature - || Battery::getInstance()->getLevel() <= 0) // Empty battery - { - powerOffDevice(QBook::settings().value("setting/initial_lang_selection", true).toBool()); - return; + // Check auto-shutdown after configurable time of sleep + if(Power::getInstance()->isRTCwakeUp()){ + if (QDateTime::currentDateTime() >= m_scheduledPowerOffTime // Auto-poweroff feature + || Battery::getInstance()->getLevel() <= 0) // Empty battery + { + powerOffDevice(QBook::settings().value("setting/initial_lang_selection", true).toBool()); + return; + } } + // Check Home Hey events + else if(!QBookApp::instance()->accidentalHomePress()) + break; - // Do needed checks + // Do needed checks to show proper battery level screen emit getInstance()->checkWhileSleeping(); sleep(2); // In order to not to interrupt a panel refresh + QBookApp::instance()->resetCancelWakeUp(); + // Go to sleep again Power::getInstance()->sleepCPU(wakeUpAlarmTimer); } + if(QBookApp::instance()->isSleptShown()) + getInstance()->wakeUpFromSleep(); + +} + +void PowerManager::wakeUpFromSleep() +{ + qDebug() << Q_FUNC_INFO; + QBookApp::instance()->closeSleep(); getInstance()->returnFromSleep(); diff --git a/QBookApp/src/QBookApp.cpp b/QBookApp/src/QBookApp.cpp index b04845d..f6b0d22 100644 --- a/QBookApp/src/QBookApp.cpp +++ b/QBookApp/src/QBookApp.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 @@ -106,11 +106,13 @@ along with the source code. If not, see . #include "version.h" #define POWEROFF_BATTERY_LOW_TIMER 30000 -#define POWERBUTTON_LONGPRESS_TIMER 1500 -#define LIGHT_LONGPRESS_TIMER 1200 +#define POWERKEY_LONGPRESS_TIMER 1500 +#define HOMEKEY_LONGPRESS_TIMER 1200 +#define HOMEKEY_DOUBLECLICK_TIMER 300 #define USB_CHANGE_SUSPEND_WAIT_TIME 10 // 10 Seconds -#define POWER_KEY_WATCHER_PERIOD 100 -#define BOOKS_LOADED_TO_SHOW_DIALOG 10 +#define POWERKEY_WATCHER_PERIOD 100 +#define HOMEKEY_WATCHER_PERIOD 10 +#define BOOKS_LOADED_TO_SHOW_DIALOG 10 #ifdef MX508 #define STORE_CERTS_PATH "/etc/ssl/certs/mundoreader/*.pem" @@ -206,10 +208,10 @@ QBookApp::QBookApp(QWidget* parent, Qt::WFlags flags) , m_settingsMenu(NULL) , m_search(NULL) , m_webView(NULL) + , m_pPublicServices(NULL) #ifndef HACKERS_EDITION , m_welcomeWizard(NULL) , m_pServices(NULL) - , m_pPublicServices(NULL) , m_bqDeviceKey(NULL) , m_webStore(NULL) , m_webWizard(NULL) @@ -249,6 +251,7 @@ QBookApp::QBookApp(QWidget* parent, Qt::WFlags flags) , b_isSleeping(false) , b_isBuying(false) , b_wizardFromStore(false) + ,b_cancelWakeUp(false) , offlineHelper(NULL) { #ifndef HACKERS_EDITION @@ -385,15 +388,19 @@ QBookApp::QBookApp(QWidget* parent, Qt::WFlags flags) connect(&m_timer_powerButton, SIGNAL(timeout()), this, SLOT(askPowerOffDevice())); connect(&m_timer_light, SIGNAL(timeout()), this, SLOT(powerLight())); connect(&m_timer_light, SIGNAL(timeout()), &m_timer_light, SLOT(stop())); + connect(&m_timer_doubleHomeClick, SIGNAL(timeout()),this, SLOT(handleSpecialKeyPress())); + connect(&m_timer_doubleHomeClick, SIGNAL(timeout()), &m_timer_doubleHomeClick, SLOT(stop())); connect(&m_powerKeyWatcher, SIGNAL(timeout()),this, SLOT(checkLongPressPowerOff())); // Init timers m_powerKeyWatcher.setSingleShot(false); // Periodic - m_powerKeyWatcher.setInterval(POWER_KEY_WATCHER_PERIOD); + m_powerKeyWatcher.setInterval(POWERKEY_WATCHER_PERIOD); m_timer_powerButton.setSingleShot(true); - m_timer_powerButton.setInterval(POWERBUTTON_LONGPRESS_TIMER); + m_timer_powerButton.setInterval(POWERKEY_LONGPRESS_TIMER); m_timer_light.setSingleShot(true); - m_timer_light.setInterval(LIGHT_LONGPRESS_TIMER); + m_timer_light.setInterval(HOMEKEY_LONGPRESS_TIMER); + m_timer_doubleHomeClick.setSingleShot(true); + m_timer_doubleHomeClick.setInterval(HOMEKEY_DOUBLECLICK_TIMER); if(DeviceInfo::getInstance()->hasFrontLight() && FrontLight::getInstance()->isFrontLightActive()) { @@ -1139,7 +1146,7 @@ void QBookApp::popAllForms() while(!m_activeForms.isEmpty()) { -// qDebug() << Q_FUNC_INFO << "Idx: " << m_activeForms; + qDebug() << Q_FUNC_INFO << "Idx: " << m_activeForms; QBookForm* form = m_activeForms.takeLast(); if(form) { @@ -1291,6 +1298,10 @@ void QBookApp::handleChargerChanged(bool state) if(b_batteryLevel) b_batteryLevel->close(); b_charger_state = state; + if(b_isSleeping) + cancelOnGoingSleep(); + else if(isSleptShown()) + PowerManager::getInstance()->wakeUpFromSleep(); QTimer::singleShot(100, this, SLOT(showChargerDialog())); emit userEvent(); } @@ -1327,6 +1338,11 @@ void QBookApp::handleUsbStateChanged (bool state) m_usbChangeLock->activate(); + if(b_isSleeping) + cancelOnGoingSleep(); + else if(isSleptShown()) + PowerManager::getInstance()->wakeUpFromSleep(); + emit userEvent(); if(link != NULL) @@ -1521,7 +1537,8 @@ void QBookApp::handleRemoveableChanged(bool state, const QString& path) if(Storage::getInstance()->getRemovablePartition() != NULL && path == Storage::getInstance()->getRemovablePartition()->getMountPoint()) { // Entry point for hackers SD check QString updateCheckFile; - if(DeviceInfo::getInstance()->getHwId() == DeviceInfo::E60Q22) //Q22 + int hwid = DeviceInfo::getInstance()->getHwId(); + if(hwid == DeviceInfo::E60Q22 || hwid == DeviceInfo::E60QH2) //Q22 updateCheckFile = HACKERS_UPDATE_CHECK_FILE_Q22; else // 672 and A22 updateCheckFile = HACKERS_UPDATE_CHECK_FILE_672; @@ -1607,7 +1624,7 @@ bool QBookApp::checkDebugMagicFile(const QString& magicFileName, const QString& } }else if(event->key() == QBook::QKEY_HOME){ event->accept(); - if(m_timer_powerButton.isActive()) + if(m_timer_powerButton.isActive()) // Power key pressed -> Screenshot { m_powerKeyLock->release(); m_timer_powerButton.stop(); @@ -1617,6 +1634,15 @@ bool QBookApp::checkDebugMagicFile(const QString& magicFileName, const QString& { m_homeKeyLock->activate(); m_timer_light.start(); + if(!m_timer_doubleHomeClick.isActive()){ // First Home click + m_timer_doubleHomeClick.start(); + } + else{ // Second Home click + m_homeKeyLock->release(); + m_timer_doubleHomeClick.stop(); + m_timer_light.stop(); + goToSleep(); + } } }else QWidget::keyPressEvent(event); @@ -1640,14 +1666,13 @@ bool QBookApp::checkDebugMagicFile(const QString& magicFileName, const QString& m_timer_light.stop(); + // Wizard Settings if(QBook::settings().value("setting/initial",true).toBool()){ QBook::settings().setValue("setting/initial",false); QBook::settings().setValue("setting/initial_lang_selection",false); } - wifiConnectionCanceled(); b_wizardFromStore = false; - goToHome(); } else if( event->key() == QBook::QKEY_MENU) @@ -1761,6 +1786,15 @@ void QBookApp::powerLight() m_homeKeyLock->release(); } +void QBookApp::handleSpecialKeyPress() +{ + qDebug() << Q_FUNC_INFO << b_userEventsBlocked; + + if(!b_userEventsBlocked && !m_timer_light.isActive()) { + goToHome(); + } +} + void QBookApp::askPowerOffDevice() { m_timer_powerButton.stop(); @@ -1824,11 +1858,24 @@ Keyboard* QBookApp::showKeyboard(const QString& actionText, bool showUp, Keyboar if(!m_pKeyboard->isVisible()) { qDebug() << Q_FUNC_INFO << "keyboard not visible"; - if(!showUp){//WorkAround We dont have more time to fix it better - m_pKeyboard->move(0,Screen::getInstance()->screenHeight() - (Screen::getInstance()->screenHeight() == 1024 ? 384 : 300)); - }else - m_pKeyboard->move(0,0); + int offset = 0; //Screen height - keyboard height + if(!showUp) + { + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + offset = 900; //1448 - 548; + break; + case QBook::RES758x1024: + offset = 640; //1024 - 640; + break; + case QBook::RES600x800: default: + offset = 500; //800 - 300; + break; + } + } + m_pKeyboard->move(0,offset); m_pKeyboard->show(keyboardMode); } return m_pKeyboard; @@ -1972,8 +2019,10 @@ void QBookApp::disconnectWifiObserverActivateStore() void QBookApp::goToWizard() { qDebug() << Q_FUNC_INFO; - if(m_welcomeWizard) - delete m_welcomeWizard; + WizardWelcome* oldinstance = NULL; + if(m_welcomeWizard) { + oldinstance = m_welcomeWizard; + } Screen::getInstance()->queueUpdates(); hideKeyboard(); @@ -1982,6 +2031,7 @@ void QBookApp::goToWizard() connect(m_welcomeWizard, SIGNAL(closeWizard()), this,SLOT(closeWizard())); connect(m_welcomeWizard, SIGNAL(closeWizard()), this,SLOT(checkNewDictionaries()), Qt::UniqueConnection); pushTopForm(m_welcomeWizard); + // Apparently, the oldinstance WelcomeWizard is deleted inside pushTopForm. It shouldn't be a leak. Screen::getInstance()->setMode(Screen::MODE_SAFE,true, FLAG_WAITFORCOMPLETION,Q_FUNC_INFO); Screen::getInstance()->flushUpdates(); @@ -2379,25 +2429,53 @@ bool QBookApp::eventFilter(QObject* watched, QEvent* event) // User input events case QEvent::MouseButtonPress: case QEvent::MouseButtonRelease: + emit userEvent(); + if (b_userEventsBlocked) { + qDebug() << Q_FUNC_INFO << "Touch event filtered"; + return true; + } + else + return QWidget::eventFilter(watched, event); + case QEvent::KeyPress: case QEvent::KeyRelease: emit userEvent(); if(b_userEventsBlocked) { + qDebug() << Q_FUNC_INFO << "Key event filtered"; + // POWER KEY RELEASE: // We want to process power key while sleeping so it can be cancelled - if (event->type() == QEvent::KeyRelease && ((QKeyEvent*)event)->key() == QBook::QKEY_POWER) { - if (b_isSleeping) { - qDebug() << Q_FUNC_INFO << "power key released with events disabled while going to sleep. Canceling sleep"; + if (b_isSleeping && event->type() == QEvent::KeyRelease && ((QKeyEvent*)event)->key() == QBook::QKEY_POWER) { + qDebug() << Q_FUNC_INFO << "POWER KEY: Canceling sleep process"; cancelOnGoingSleep(); if(isLedDebuggingOff()) Power::getInstance()->setLed(false); - return true; - } else { - qDebug() << Q_FUNC_INFO << "power key released with event disabled but we are not going to sleep. Could be the poweron one. Ignoring"; + } + + // HOME, BACK OR MENU KEY PRESS: + // We want to process home key while sleeping or waking up to ckeck double click + else if (((QKeyEvent*)event)->key() != QBook::QKEY_POWER){ + if(!m_timer_doubleHomeClick.isActive()){ // Waking up because of some key press (NO POWER) + qDebug() << Q_FUNC_INFO << "FIRST CLICK OF KEY DIFFERENT THAN POWER"; + b_cancelWakeUp = true; + m_timer_doubleHomeClick.start(); + } + else if(event->type() == QEvent::KeyPress + && ((QKeyEvent*)event)->key() == QBook::QKEY_HOME){ + qDebug() << Q_FUNC_INFO << "SECOND Home Key Click"; + b_cancelWakeUp = false; + if(b_isSleeping){ + qDebug() << Q_FUNC_INFO << "DOUBLE HOME KEY: Canceling sleep process"; + cancelOnGoingSleep(); + if(isLedDebuggingOff()) + Power::getInstance()->setLed(false); + } } } - qDebug() << Q_FUNC_INFO << "Touch and key events temporarily blocked"; return true; } + else + return QWidget::eventFilter(watched, event); + default: return QWidget::eventFilter(watched, event); } @@ -2838,6 +2916,13 @@ void QBookApp::syncModel() qDebug() <isVisible()); +} + void QBookApp::showSleep() { qDebug() << Q_FUNC_INFO; @@ -2926,6 +3011,7 @@ void QBookApp::goToSleep() b_isSleeping = true; b_cancelSleep = false; + b_cancelWakeUp = false; disconnect(fwDwld, SIGNAL(checkOTAAvailableFinished(int)), this, SLOT(gotOTACheckResult(int))); disconnect(ConnectionManager::getInstance(), SIGNAL(connected()), this, SLOT(checkFwVersion())); @@ -3449,7 +3535,7 @@ bool QBookApp::isViewerCurrentForm() bool QBookApp::isSynchronizing() { SyncHelper *syncHelper = getSyncHelper(); - return syncHelper && syncHelper->isValid() && syncHelper->IsSynchronizing() || b_synchronizing; + return (syncHelper && syncHelper->isValid() && syncHelper->IsSynchronizing()) || b_synchronizing; } void QBookApp::viewRecentBooks() @@ -3478,7 +3564,8 @@ bool QBookApp::checkSDForHackers() qDebug() << Q_FUNC_INFO; QString updateCheckFile; - if(DeviceInfo::getInstance()->getHwId() == DeviceInfo::E60Q22) //Q22 + int hwid = DeviceInfo::getInstance()->getHwId(); + if(hwid == DeviceInfo::E60Q22 || hwid == DeviceInfo::E60QH2) //Q22 updateCheckFile = HACKERS_UPDATE_CHECK_FILE_Q22; else // 672 and A22 updateCheckFile = HACKERS_UPDATE_CHECK_FILE_672; @@ -3559,7 +3646,7 @@ QString QBookApp::getHackersAuth() // Do some stupid obfuscation. Resulting string should be "Esteesyaunjacker" char *tmp = strdup(salt); char *tmp2 = tmp; - int i; + unsigned int i; for (i=0; i< strlen(salt); i++) { tmp2[i] = (char) ((int)tmp2[i] + i); } @@ -3578,6 +3665,7 @@ bool QBookApp::deviceHackAuthorized(QString auth) return true; else if(auth.compare("DeviceHackNotAuthorized") == 0) return false; + return false; } void QBookApp::requestHackersInstallation() @@ -3586,7 +3674,8 @@ void QBookApp::requestHackersInstallation() disconnect(m_connectManager, SIGNAL(connected()), this, SLOT(requestHackersInstallation())); QString updateCheckFile; - if(DeviceInfo::getInstance()->getHwId() == DeviceInfo::E60Q22) //Q22 + int hwid = DeviceInfo::getInstance()->getHwId(); + if(hwid == DeviceInfo::E60Q22 || hwid == DeviceInfo::E60QH2) //Q22 updateCheckFile = HACKERS_UPDATE_CHECK_FILE_Q22; else // 672 and A22 updateCheckFile = HACKERS_UPDATE_CHECK_FILE_672; @@ -3823,7 +3912,7 @@ void QBookApp::checkLongPressPowerOff(){ i_powerKeySamplesCounter++; qDebug() << Q_FUNC_INFO << "PowerKey pressed," << i_powerKeySamplesCounter << "samples"; - if(i_powerKeySamplesCounter > POWERMANAGER_PWROFF_LONGPRESS/POWER_KEY_WATCHER_PERIOD){ + if(i_powerKeySamplesCounter > POWERMANAGER_PWROFF_LONGPRESS/POWERKEY_WATCHER_PERIOD){ qDebug() << Q_FUNC_INFO << "POWERKEY LONG PRESSED"; emit powerKeyLongPressed(); } @@ -4536,3 +4625,25 @@ void QBookApp::checkBooksChanged() } } +void QBookApp::resetCancelWakeUp(){ + qDebug() << Q_FUNC_INFO; + + for (int i = 0; i < 3; i++) { + qApp->processEvents(); // Allow QBookApp to check key event + usleep(10000); /* 10ms */ + } + + b_cancelWakeUp = false; + m_timer_doubleHomeClick.stop(); +} + +bool QBookApp::accidentalHomePress(){ + qDebug() << Q_FUNC_INFO << "START:" << b_cancelWakeUp; + + for (int i = 0; i*HOMEKEY_WATCHER_PERIOD <= HOMEKEY_DOUBLECLICK_TIMER + HOMEKEY_WATCHER_PERIOD; i++) { + qApp->processEvents(); // Allow QBookApp to check key event + usleep(HOMEKEY_WATCHER_PERIOD*1000); + } + qDebug() << Q_FUNC_INFO << "END:" << b_cancelWakeUp; + return b_cancelWakeUp; +} diff --git a/QBookApp/src/QBookEmu.cpp b/QBookApp/src/QBookEmu.cpp index 55d13c6..c892c1f 100644 --- a/QBookApp/src/QBookEmu.cpp +++ b/QBookApp/src/QBookEmu.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 @@ -18,167 +18,172 @@ along with the source code. If not, see . *************************************************************************/ -#include "QBookEmu.h" -#include "ui_QBookEmu.h" - -#include -#include -#include - -#include "QBookApp.h" -#include "QBook.h" -#include "ADConverter.h" -#include "Battery.h" -#include "BatteryEmu.h" -#include "Storage.h" - - -QBookEmu::QBookEmu(QWidget* parent) - : QMainWindow(0, Qt::Window - | Qt::MSWindowsFixedSizeDialogHint - | Qt::WindowTitleHint - | Qt::WindowMinimizeButtonHint - | Qt::WindowCloseButtonHint) - , m_ui(new Ui::QBookEmu()) -{ - m_ui->setupUi(this); - setWindowIconText("QBookApp"); - - - QVBoxLayout* layout = new QVBoxLayout(m_ui->centralwidget); - layout->setMargin(0); - layout->setSpacing(0); - m_ui->centralwidget->setLayout(layout); - - QBookApp::staticInit(); - m_app = QBookApp::instance(); - -#ifndef Q_WS_QWS - switch(QBook::getResolution()){ - case QBook::RES600x800: - qDebug() << "********** Setting screen size to 825 (800 + menubar)"; - setFixedSize(600,825); - m_ui->centralwidget->setFixedSize(600,800); - break; - case QBook::RES758x1024: - qDebug() << "********* Setting screen size to 1049 (1024 + menubar)"; - setFixedSize(758,1049); - m_ui->centralwidget->setFixedSize(758,1024); - break; - default: - qWarning() << Q_FUNC_INFO << "UNKNOWN SCREEN SIZE"; - } -#endif - - layout->addWidget(m_app); - - connect(m_ui->menubar, SIGNAL(triggered(QAction*)), this, SLOT(handleAction(QAction*))); - - QActionGroup* battery = new QActionGroup(this); - battery->addAction(m_ui->actionBattery0); - battery->addAction(m_ui->actionBattery1); - battery->addAction(m_ui->actionBattery2); - battery->addAction(m_ui->actionBattery3); - battery->addAction(m_ui->actionBatteryWarning); - battery->addAction(m_ui->actionBatteryFull); - - QActionGroup* antenna = new QActionGroup(this); - antenna->addAction(m_ui->actionAntenna0); - antenna->addAction(m_ui->actionAntenna1); - antenna->addAction(m_ui->actionAntenna2); - antenna->addAction(m_ui->actionAntenna3); - antenna->addAction(m_ui->actionAntenna4); - antenna->addAction(m_ui->actionAntennaDisable); - - m_ui->actionBattery3->trigger(); - - m_ui->actionMmc->setChecked(true); - m_ui->actionCharger->setChecked(ADConverter::getInstance()->getStatus() != ADConverter::ADC_STATUS_NO_WIRE); -} - -QBookEmu::~QBookEmu() -{ - QBookApp::staticDone(); - delete m_ui; -} - -QBookApp* QBookEmu::appWidget() -{ - return m_app; -} - -/*-------------------------------------------------------------------------*/ - -void QBookEmu::sendPressKey(int key) -{ - QWidget* focus = QApplication::focusWidget(); - if (!focus) focus = m_app; - QKeyEvent* event = new QKeyEvent(QEvent::KeyPress, key, Qt::NoModifier); - QApplication::postEvent(focus, event); -} - -void QBookEmu::sendKey(int key) -{ - QWidget* focus = QApplication::focusWidget(); - if (!focus) focus = m_app; - QKeyEvent* event = new QKeyEvent(QEvent::KeyRelease, key, Qt::NoModifier); - QApplication::postEvent(focus, event); -} - -void QBookEmu::handleAction(QAction* action) -{ - if (action == m_ui->actionQuit) { - qDebug() << "Quit command not supported"; - } else if (action == m_ui->actionHome) { - sendPressKey(QBook::QKEY_HOME); - sendKey(QBook::QKEY_HOME); - } else if (action == m_ui->actionMenu) { - sendKey(QBook::QKEY_MENU); - } else if (action == m_ui->actionPower) { - sendKey(QBook::QKEY_POWER); - } else if (action == m_ui->actionBattery0) { - ((BatteryEmu*)Battery::getInstance())->setBatteryLevel(10); - } else if (action == m_ui->actionBattery1) { - ((BatteryEmu*)Battery::getInstance())->setBatteryLevel(20); - } else if (action == m_ui->actionBattery2) { - ((BatteryEmu*)Battery::getInstance())->setBatteryLevel(50); - } else if (action == m_ui->actionBattery3) { - ((BatteryEmu*)Battery::getInstance())->setBatteryLevel(100); - } else if (action == m_ui->actionBatteryWarning) { - ((BatteryEmu*)Battery::getInstance())->setBatteryLevel(9); - } else if (action == m_ui->actionBatteryFull) { - ((BatteryEmu*)Battery::getInstance())->setBatteryLevel(100); - } else if (action == m_ui->actionAntennaDisable) { - qDebug() << "Lost connection emulation not supported"; - } else if (action == m_ui->actionCharger) { - if(ADConverter::getInstance()->getStatus() != ADConverter::ADC_STATUS_NO_WIRE){ - //TODO - } else { - //TODO - } - action->setChecked(ADConverter::getInstance()->getStatus() != ADConverter::ADC_STATUS_NO_WIRE); - return; - } else if (action == m_ui->actionMmc) { - if (Storage::getInstance()->getRemovablePartition()->isMounted()) { - Storage::getInstance()->umountStoragePartition(Storage::getInstance()->getRemovablePartition()); - action->setChecked(false); - } else { - Storage::getInstance()->mountStoragePartition(Storage::getInstance()->getRemovablePartition()); - action->setChecked(true); - } - return; - } else if (action == m_ui->actionUsb) { - //TODO - return; - } else if (action == m_ui->actionWakeup) { - //Do Nothing - } else if (action == m_ui->actionSleep) { - qDebug() << "Sleep command not supported"; - } else if (action == m_ui->actionShutdown) { - QApplication::quit(); - } else { - return; - } - - if (action->isCheckable()) action->setChecked(true); -} +#include "QBookEmu.h" +#include "ui_QBookEmu.h" + +#include +#include +#include + +#include "QBookApp.h" +#include "QBook.h" +#include "ADConverter.h" +#include "Battery.h" +#include "BatteryEmu.h" +#include "Storage.h" + + +QBookEmu::QBookEmu(QWidget* parent) + : QMainWindow(0, Qt::Window + | Qt::MSWindowsFixedSizeDialogHint + | Qt::WindowTitleHint + | Qt::WindowMinimizeButtonHint + | Qt::WindowCloseButtonHint) + , m_ui(new Ui::QBookEmu()) +{ + m_ui->setupUi(this); + setWindowIconText("QBookApp"); + + + QVBoxLayout* layout = new QVBoxLayout(m_ui->centralwidget); + layout->setMargin(0); + layout->setSpacing(0); + m_ui->centralwidget->setLayout(layout); + + QBookApp::staticInit(); + m_app = QBookApp::instance(); + +#ifndef Q_WS_QWS + switch(QBook::getInstance()->getResolution()){ + case QBook::RES600x800: + qDebug() << "********** Setting screen size to 825 (800 + menubar)"; + setFixedSize(600,825); + m_ui->centralwidget->setFixedSize(600,800); + break; + case QBook::RES758x1024: + qDebug() << "********* Setting screen size to 1049 (1024 + menubar)"; + setFixedSize(758,1049); + m_ui->centralwidget->setFixedSize(758,1024); + break; + case QBook::RES1072x1448: + qDebug() << "********* Setting screen size to 1473 (1448 + menubar)"; + setFixedSize(1072,1473); + m_ui->centralwidget->setFixedSize(1072,1448); + break; + default: + qWarning() << Q_FUNC_INFO << "UNKNOWN SCREEN SIZE"; + } +#endif + + layout->addWidget(m_app); + + connect(m_ui->menubar, SIGNAL(triggered(QAction*)), this, SLOT(handleAction(QAction*))); + + QActionGroup* battery = new QActionGroup(this); + battery->addAction(m_ui->actionBattery0); + battery->addAction(m_ui->actionBattery1); + battery->addAction(m_ui->actionBattery2); + battery->addAction(m_ui->actionBattery3); + battery->addAction(m_ui->actionBatteryWarning); + battery->addAction(m_ui->actionBatteryFull); + + QActionGroup* antenna = new QActionGroup(this); + antenna->addAction(m_ui->actionAntenna0); + antenna->addAction(m_ui->actionAntenna1); + antenna->addAction(m_ui->actionAntenna2); + antenna->addAction(m_ui->actionAntenna3); + antenna->addAction(m_ui->actionAntenna4); + antenna->addAction(m_ui->actionAntennaDisable); + + m_ui->actionBattery3->trigger(); + + m_ui->actionMmc->setChecked(true); + m_ui->actionCharger->setChecked(ADConverter::getInstance()->getStatus() != ADConverter::ADC_STATUS_NO_WIRE); +} + +QBookEmu::~QBookEmu() +{ + QBookApp::staticDone(); + delete m_ui; +} + +QBookApp* QBookEmu::appWidget() +{ + return m_app; +} + +/*-------------------------------------------------------------------------*/ + +void QBookEmu::sendPressKey(int key) +{ + QWidget* focus = QApplication::focusWidget(); + if (!focus) focus = m_app; + QKeyEvent* event = new QKeyEvent(QEvent::KeyPress, key, Qt::NoModifier); + QApplication::postEvent(focus, event); +} + +void QBookEmu::sendKey(int key) +{ + QWidget* focus = QApplication::focusWidget(); + if (!focus) focus = m_app; + QKeyEvent* event = new QKeyEvent(QEvent::KeyRelease, key, Qt::NoModifier); + QApplication::postEvent(focus, event); +} + +void QBookEmu::handleAction(QAction* action) +{ + if (action == m_ui->actionQuit) { + qDebug() << "Quit command not supported"; + } else if (action == m_ui->actionHome) { + sendPressKey(QBook::QKEY_HOME); + sendKey(QBook::QKEY_HOME); + } else if (action == m_ui->actionMenu) { + sendKey(QBook::QKEY_MENU); + } else if (action == m_ui->actionPower) { + sendKey(QBook::QKEY_POWER); + } else if (action == m_ui->actionBattery0) { + ((BatteryEmu*)Battery::getInstance())->setBatteryLevel(10); + } else if (action == m_ui->actionBattery1) { + ((BatteryEmu*)Battery::getInstance())->setBatteryLevel(20); + } else if (action == m_ui->actionBattery2) { + ((BatteryEmu*)Battery::getInstance())->setBatteryLevel(50); + } else if (action == m_ui->actionBattery3) { + ((BatteryEmu*)Battery::getInstance())->setBatteryLevel(100); + } else if (action == m_ui->actionBatteryWarning) { + ((BatteryEmu*)Battery::getInstance())->setBatteryLevel(9); + } else if (action == m_ui->actionBatteryFull) { + ((BatteryEmu*)Battery::getInstance())->setBatteryLevel(100); + } else if (action == m_ui->actionAntennaDisable) { + qDebug() << "Lost connection emulation not supported"; + } else if (action == m_ui->actionCharger) { + if(ADConverter::getInstance()->getStatus() != ADConverter::ADC_STATUS_NO_WIRE){ + //TODO + } else { + //TODO + } + action->setChecked(ADConverter::getInstance()->getStatus() != ADConverter::ADC_STATUS_NO_WIRE); + return; + } else if (action == m_ui->actionMmc) { + if (Storage::getInstance()->getRemovablePartition()->isMounted()) { + Storage::getInstance()->umountStoragePartition(Storage::getInstance()->getRemovablePartition()); + action->setChecked(false); + } else { + Storage::getInstance()->mountStoragePartition(Storage::getInstance()->getRemovablePartition()); + action->setChecked(true); + } + return; + } else if (action == m_ui->actionUsb) { + //TODO + return; + } else if (action == m_ui->actionWakeup) { + //Do Nothing + } else if (action == m_ui->actionSleep) { + qDebug() << "Sleep command not supported"; + } else if (action == m_ui->actionShutdown) { + QApplication::quit(); + } else { + return; + } + + if (action->isCheckable()) action->setChecked(true); +} diff --git a/QBookApp/src/QBookScreenSaver.cpp b/QBookApp/src/QBookScreenSaver.cpp index b7cd1da..293f3cd 100644 --- a/QBookApp/src/QBookScreenSaver.cpp +++ b/QBookApp/src/QBookScreenSaver.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 @@ -61,7 +61,19 @@ void QBookScreenSaver::paintEvent(QPaintEvent *event) QFont font; font.setFamily(QString::fromUtf8("DejaVu Sans")); - font.setPointSize(16); + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + font.setPointSize(6); + break; + case QBook::RES758x1024: + font.setPointSize(16); + break; + case QBook::RES600x800: default: + font.setPointSize(14); + break; + } + painter.setFont(font); QColor color(255, 255, 255); QBrush brush(color); @@ -292,12 +304,18 @@ void QBookScreenSaver::addFooterMessage(QPainter* painter, QString message) qDebug() << Q_FUNC_INFO << message; // Place the message aligned with standard sleep image - if(QBook::getInstance()->getResolution() == QBook::RES758x1024) - painter->drawText(QPoint(140, 1000), message); - else - painter->drawText(QPoint(111, 782), message); - - + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + painter->drawText(QPoint(198, 1414), message); + break; + case QBook::RES758x1024: + painter->drawText(QPoint(140, 1000), message); + break; + case QBook::RES600x800: default: + painter->drawText(QPoint(111, 782), message); + break; + } } void QBookScreenSaver::addBatteryLevel(QPainter* painter, int batteryLevel) @@ -308,11 +326,18 @@ void QBookScreenSaver::addBatteryLevel(QPainter* painter, int batteryLevel) // Place the message right below the battery QRect t; - if(QBook::getInstance()->getResolution() == QBook::RES758x1024) - t = QRect(51, 990, 50, 16); - - else - t = QRect(37, 772, 40, 18); + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + t = QRect(78, 1400, 57, 25); + break; + case QBook::RES758x1024: + t = QRect(51, 990, 50, 16); + break; + case QBook::RES600x800: default: + t = QRect(37, 772, 40, 18); + break; + } painter->drawText(t, Qt::AlignCenter, message); } diff --git a/QBookApp/src/main.cpp b/QBookApp/src/main.cpp index 3a2e6c7..1e65b34 100644 --- a/QBookApp/src/main.cpp +++ b/QBookApp/src/main.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 @@ -56,15 +56,18 @@ void loadRccs() #endif QStringList rccs; - switch(QBook::getResolution()){ + switch(QBook::getInstance()->getResolution()){ case QBook::RES600x800: - qDebug() << Q_FUNC_INFO << "********** Setting screen size to 600x800"; + qDebug() << Q_FUNC_INFO << "********* Setting screen size to 600x800"; rccs << "QBookApp800.rcc" <<"Browser800.rcc" << "common800.rcc" << "Viewer800.rcc" << "Ui800.rcc" << "Settings800.rcc" << "Library800.rcc" << "Search800.rcc" << "Home800.rcc" << "Wizard800.rcc" << "WebStore800.rcc"; break; case QBook::RES758x1024: - qDebug() << Q_FUNC_INFO << "********* Setting screen size to 1024"; + qDebug() << Q_FUNC_INFO << "********* Setting screen size to 758x1024"; rccs << "QBookApp1024.rcc" << "Browser1024.rcc" << "common1024.rcc" << "Viewer1024.rcc" << "Ui1024.rcc" << "Settings1024.rcc" << "Library1024.rcc" << "Search1024.rcc" << "Home1024.rcc" << "Wizard1024.rcc" << "WebStore1024.rcc"; break; + case QBook::RES1072x1448: + qDebug() << Q_FUNC_INFO << "********* Setting screen size to 1072x1448"; + rccs << "QBookApp1448.rcc" <<"Browser1448.rcc" << "common1448.rcc" << "Viewer1448.rcc" << "Ui1448.rcc" << "Settings1448.rcc" << "Library1448.rcc" << "Search1448.rcc" << "Home1448.rcc" << "Wizard1448.rcc" << "WebStore1448.rcc"; default: qWarning() << Q_FUNC_INFO << "UNKNOWN SCREEN SIZE"; diff --git a/QBookApp/tr/qbookapp_ca.ts b/QBookApp/tr/qbookapp_ca.ts index c1ea8ce..cc69218 100755 --- a/QBookApp/tr/qbookapp_ca.ts +++ b/QBookApp/tr/qbookapp_ca.ts @@ -295,7 +295,7 @@ Si us plau, no extreguis la SD. Mas tarde - Més Tard + Més tard Haz uso de los diccionarios y de las actualizaciones activando tu dispositivo en un solo paso. @@ -303,7 +303,7 @@ Si us plau, no extreguis la SD. Activar - Activar + Activa Critical battery level (%1%). Please plug the device to a charger source. @@ -338,7 +338,7 @@ Si us plau, no extreguis la SD. Cancel - Cancel·lar + Cancel·la Ok diff --git a/QBookApp/tr/qbookapp_en.ts b/QBookApp/tr/qbookapp_en.ts index a3abee9..b6ac239 100755 --- a/QBookApp/tr/qbookapp_en.ts +++ b/QBookApp/tr/qbookapp_en.ts @@ -645,7 +645,7 @@ Please, restart the device if you need to continue using it. Press the Power button to resume - Press the Power button to resume + To wake, press the power button, or press the home button twice diff --git a/QBookApp/tr/qbookapp_es.ts b/QBookApp/tr/qbookapp_es.ts index 4136cb7..5ac530e 100755 --- a/QBookApp/tr/qbookapp_es.ts +++ b/QBookApp/tr/qbookapp_es.ts @@ -334,7 +334,7 @@ Por favor, reinicia el dispositivo si necesitas seguir usándola. Your subscription will be expired in %1 days. - Te quedan %1días para que puedas seguir leyendo offline tus eBooks Premium en el eReader. Más información en la sección "Ayuda" de la tienda. + Te quedan %1 días para que puedas seguir leyendo offline tus eBooks Premium en el eReader. Más información en la sección "Ayuda" de la tienda. @@ -645,7 +645,7 @@ Por favor, reinicia el dispositivo si necesitas seguir usándola. Press the Power button to resume - Pulsa el botón de encendido para reanudar + Pulsa el botón de encendido o dos veces el de inicio para reanudar diff --git a/QBookApp/tr/qbookapp_eu.ts b/QBookApp/tr/qbookapp_eu.ts index be6e8ba..70c50c6 100755 --- a/QBookApp/tr/qbookapp_eu.ts +++ b/QBookApp/tr/qbookapp_eu.ts @@ -518,7 +518,7 @@ Mesedez, ez atera SD-a. Press the Power button to resume - Sakatu Piztu botoia berrekiteko + Berrabiarazteko, sakatu behin pizteko botoia edo bi aldiz hasierakoa diff --git a/QBookApp/tr/qbookapp_gl.ts b/QBookApp/tr/qbookapp_gl.ts index 47e8784..29a1419 100644 --- a/QBookApp/tr/qbookapp_gl.ts +++ b/QBookApp/tr/qbookapp_gl.ts @@ -373,7 +373,7 @@ Por favor, reinicia o dispositivo se necesitas seguir usándoo. Your subscription will be expired in %1 days. - Quédanche %1días para poder seguir lendo offline os teus eBooks Premium no eReader. Máis información na sección "Axuda" da tenda. + Quédanche %1 días para poder seguir lendo offline os teus eBooks Premium no eReader. Máis información na sección "Axuda" da tenda. @@ -641,7 +641,7 @@ Por favor, reinicia o dispositivo se necesitas seguir usándoo. Press the Power button to resume - Preme o botón de encendido para reanudar + Preme o botón de acendido ou dúas veces o de inicio para reanudar diff --git a/QBookApp/tr/qbookapp_pt.ts b/QBookApp/tr/qbookapp_pt.ts index 32774d2..073d9c0 100755 --- a/QBookApp/tr/qbookapp_pt.ts +++ b/QBookApp/tr/qbookapp_pt.ts @@ -630,7 +630,7 @@ Por favor, reinicie o dispositivo se precisa continuar a usá-lo. QBookPowerSaver Press the Power button to resume - Carregue no botão de ligação para reiniciar + Prima o botão ligar/desligar para reiniciar @@ -645,7 +645,7 @@ Por favor, reinicie o dispositivo se precisa continuar a usá-lo. Press the Power button to resume - Carregue no botão de ligação para reiniciar + Prima o botão ligar/desligar para reiniciar diff --git a/QBookApp/ui/DeviceInfoDialog.ui b/QBookApp/ui/DeviceInfoDialog.ui index 2c7f8ba..67bc3e4 100755 --- a/QBookApp/ui/DeviceInfoDialog.ui +++ b/QBookApp/ui/DeviceInfoDialog.ui @@ -6,15 +6,15 @@ 0 0 - 600 - 800 + 849 + 1131 Dialog - + @@ -26,7 +26,7 @@ - + @@ -72,8 +72,8 @@ - 230 - 60 + 325 + 85 @@ -94,8 +94,8 @@ - 10000 - 60 + 14142 + 85 @@ -137,8 +137,8 @@ - 230 - 60 + 325 + 85 @@ -159,8 +159,8 @@ - 10000 - 60 + 14142 + 85 @@ -202,12 +202,12 @@ - 230 - 60 + 325 + 85 - Direción MAC: + Direción MAC: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -224,8 +224,8 @@ - 10000 - 60 + 14142 + 85 @@ -267,8 +267,8 @@ - 230 - 60 + 325 + 85 @@ -289,8 +289,8 @@ - 10000 - 60 + 14142 + 85 @@ -332,8 +332,8 @@ - 230 - 60 + 325 + 85 @@ -354,8 +354,8 @@ - 10000 - 60 + 14142 + 85 @@ -397,8 +397,8 @@ - 200 - 60 + 283 + 85 @@ -419,8 +419,8 @@ - 10000 - 60 + 14142 + 85 @@ -462,8 +462,8 @@ - 230 - 60 + 325 + 85 @@ -484,8 +484,8 @@ - 10000 - 60 + 14142 + 85 @@ -527,8 +527,8 @@ - 230 - 60 + 325 + 85 @@ -549,8 +549,8 @@ - 10000 - 60 + 14142 + 85 @@ -592,12 +592,12 @@ - 230 - 60 + 325 + 85 - Nivel de batería: + Nivel de batería: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -614,8 +614,8 @@ - 10000 - 60 + 14142 + 85 @@ -659,6 +659,6 @@ border-radius: 4px;
SilentQPushButton.h
- - - + + + \ No newline at end of file diff --git a/QBookApp/ui/QBookApp.ui b/QBookApp/ui/QBookApp.ui index 77d7437..fe76314 100755 --- a/QBookApp/ui/QBookApp.ui +++ b/QBookApp/ui/QBookApp.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 800 + 849 + 1131 @@ -101,15 +101,15 @@ QBookApp - + 0 0 - 600 - 50 + 849 + 71 @@ -126,23 +126,23 @@ - 1024 + 1448 16777215 - + - + - + - + - + StatusBar @@ -151,6 +151,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/QBookApp/ui/QBookEmu.ui b/QBookApp/ui/QBookEmu.ui index 0d830e2..4fa48b5 100755 --- a/QBookApp/ui/QBookEmu.ui +++ b/QBookApp/ui/QBookEmu.ui @@ -6,8 +6,8 @@ 0 0 - 758 - 1049 + 1072 + 1484 @@ -28,8 +28,8 @@ - 600 - 800 + 849 + 1131 @@ -38,23 +38,23 @@ 0 0 - 758 - 25 + 1072 + 35 File - + Key - - - + + + @@ -64,40 +64,40 @@ Battery - - - - - - - + + + + + + + Antenna - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + @@ -276,6 +276,6 @@ - - - + + + \ No newline at end of file diff --git a/QBookCore/inc/QBook.h b/QBookCore/inc/QBook.h index d62a19a..61333ee 100644 --- a/QBookCore/inc/QBook.h +++ b/QBookCore/inc/QBook.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 @@ -18,145 +18,146 @@ along with the source code. If not, see . *************************************************************************/ -#ifndef QBOOK_H -#define QBOOK_H - -/*-------------------------------------------------------------------------*/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -class QImage; -class QPoint; -class QBookApp; -class QTranslator; - -#define Q_BOOK_THUMBNAIL_DIR ".thumbnail" -#define Q_BOOK_THUMBNAIL_EXTENSION ".jpg" - -#ifdef Q_WS_QWS -#define Q_BOOK_PDF_DIR "/tmp/.doc/" -#else -#define Q_BOOK_PDF_DIR ".doc/" -#endif - -#define Q_BOOK_MMCPDF_DIR ".mmc" - -/*-------------------------------------------------------------------------*/ - -class QBook : public QObject -{ - Q_OBJECT - -public: - - enum Key - { - QKEY_POWER = Qt::Key_F20, - QKEY_HOME = Qt::Key_F23, - QKEY_BACK = Qt::Key_F24, - QKEY_MENU = Qt::Key_F25 - }; - - enum ScreenResolution { - RES600x800, - RES758x1024 - }; - - static void init(QApplication* app); - - static QString getDebugFilter(); - static void setDebug( const QString& ); - - static QString getThumbnailPath(const QString & ); - - static QDateTime dateTime() { return QDateTime::currentDateTime(); } - static QDateTime rtcDateTime(); - - static void setRtcDateTime(const QDateTime& time); - static bool checkRTCTime(); - - static QString getInfoPath(const QString &bookpath); - static int getResolution(); - - - static QString etcDirPath(); - static QString resDirPath(); - static QString fontsDirPath(); - static QString settingsDirPath(); - static QString langsDirPath(); - static QString tmpDirPath(); - - static QSettings& settings(); - static bool resetSettings(); - - static int screenDpi(); - - static void setProgressBarMaxValue(int max); - static void setProgressBarValue(int value); - static void setProgressBarText(QString str); - static void setProgressBarVisible(bool isVisible); - static void setProgressBarCanceled(); - static void setProgressBarButtonVisible(bool isVisible); - - static void lockScreen(bool onceOnly = false, QString from = ""); - - static QBook *getInstance(); - -signals: - void setKeyboardText(QString); - void sleepStateChanged(bool on); - void sleepRequested(bool deep); - void timeChanged(); - void opmodeStateChanged(int on); - - void screenRotate(int rot); - void progressBarMaxValueChanged(int value); - void progressBarValueChanged(int value); - void progressBarVisibleChanged(bool isVisible); - void progressBarTextChanged(QString text); - void progressBarCanceled(); - void progressBarButtonVisibleChanged(bool isVisible); - - - //Push refresh - void refreshPushed(); - -#ifdef Q_WS_QWS - void requestToGrabScreen(const QRect &rect); - void flushCache(); -#endif //#ifdef Q_WS_QWS - void requestPassword(QString, QString); - -private: - QBook(); - virtual ~QBook(); - - static QBook *s_instance; - - friend class QBookEvent; - -protected: - void setupFonts(); - void setupFallbackFonts(); - void setupLanguage(const QString& locale); - void clearTranslations(); - - QList m_translations; - QStringList m_resources; - QSettings *m_settings; - - int m_qbook_event_type; - -}; - -/*-------------------------------------------------------------------------*/ - -#endif +#ifndef QBOOK_H +#define QBOOK_H + +/*-------------------------------------------------------------------------*/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +class QImage; +class QPoint; +class QBookApp; +class QTranslator; + +#define Q_BOOK_THUMBNAIL_DIR ".thumbnail" +#define Q_BOOK_THUMBNAIL_EXTENSION ".jpg" + +#ifdef Q_WS_QWS +#define Q_BOOK_PDF_DIR "/tmp/.doc/" +#else +#define Q_BOOK_PDF_DIR ".doc/" +#endif + +#define Q_BOOK_MMCPDF_DIR ".mmc" + +/*-------------------------------------------------------------------------*/ + +class QBook : public QObject +{ + Q_OBJECT + +public: + + enum Key + { + QKEY_POWER = Qt::Key_F20, + QKEY_HOME = Qt::Key_F23, + QKEY_BACK = Qt::Key_F24, + QKEY_MENU = Qt::Key_F25 + }; + + enum ScreenResolution { + RES600x800, + RES758x1024, + RES1072x1448 + }; + + static void init(QApplication* app); + + static QString getDebugFilter(); + static void setDebug( const QString& ); + + static QString getThumbnailPath(const QString & ); + + static QDateTime dateTime() { return QDateTime::currentDateTime(); } + static QDateTime rtcDateTime(); + + static void setRtcDateTime(const QDateTime& time); + static bool checkRTCTime(); + + static QString getInfoPath(const QString &bookpath); + static int getResolution(); + + + static QString etcDirPath(); + static QString resDirPath(); + static QString fontsDirPath(); + static QString settingsDirPath(); + static QString langsDirPath(); + static QString tmpDirPath(); + + static QSettings& settings(); + static bool resetSettings(); + + static int screenDpi(); + + static void setProgressBarMaxValue(int max); + static void setProgressBarValue(int value); + static void setProgressBarText(QString str); + static void setProgressBarVisible(bool isVisible); + static void setProgressBarCanceled(); + static void setProgressBarButtonVisible(bool isVisible); + + static void lockScreen(bool onceOnly = false, QString from = ""); + + static QBook *getInstance(); + +signals: + void setKeyboardText(QString); + void sleepStateChanged(bool on); + void sleepRequested(bool deep); + void timeChanged(); + void opmodeStateChanged(int on); + + void screenRotate(int rot); + void progressBarMaxValueChanged(int value); + void progressBarValueChanged(int value); + void progressBarVisibleChanged(bool isVisible); + void progressBarTextChanged(QString text); + void progressBarCanceled(); + void progressBarButtonVisibleChanged(bool isVisible); + + + //Push refresh + void refreshPushed(); + +#ifdef Q_WS_QWS + void requestToGrabScreen(const QRect &rect); + void flushCache(); +#endif //#ifdef Q_WS_QWS + void requestPassword(QString, QString); + +private: + QBook(); + virtual ~QBook(); + + static QBook *s_instance; + + friend class QBookEvent; + +protected: + void setupFonts(); + void setupFallbackFonts(); + void setupLanguage(const QString& locale); + void clearTranslations(); + + QList m_translations; + QStringList m_resources; + QSettings *m_settings; + + int m_qbook_event_type; + +}; + +/*-------------------------------------------------------------------------*/ + +#endif diff --git a/QBookCore/src/QBook.cpp b/QBookCore/src/QBook.cpp index 8787d8b..2783a19 100644 --- a/QBookCore/src/QBook.cpp +++ b/QBookCore/src/QBook.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 @@ -570,22 +570,36 @@ int QBook::getResolution() if (res == 0) { #ifndef Q_WS_QWS foreach (QString arg, QCoreApplication::arguments()) { - if (arg == "-1024") { - res = RES758x1024; - break; - } - if (arg == "-800"){ - res = RES600x800; - break; + switch(arg) + { + case "-1448": + res = RES1072x1448; + break; + case "-1024": + res = RES758x1024; + break; + case "-800": default: + res = RES600x800; + break; } } return res; #else struct ntxhwconfig hwconfig; if (ntx_read_hwconfig("/dev/mmcblk0", &hwconfig) == 0) { - res = (hwconfig.values.display_resolution == 1) ? RES758x1024 : RES600x800; + switch (hwconfig.values.display_resolution) { + case 1: + res = RES758x1024; + break; + case 5: + res = RES1072x1448; + break; + default: + res = RES600x800; + break; + } } else { - qDebug() << "Cannot get resolution from hwconfig, setting to 800"; + qWarning() << "Cannot get resolution from hwconfig, setting to 800"; res = RES600x800; } #endif diff --git a/QDocView/inc/QCREngineDocView.h b/QDocView/inc/QCREngineDocView.h index a3a262e..ceff6ad 100644 --- a/QDocView/inc/QCREngineDocView.h +++ b/QDocView/inc/QCREngineDocView.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 @@ -84,6 +84,7 @@ class QCREngineDocView : public QDocView int highlightId(int, int); void removeHighlight(int); ldomXRange * wordAtRange(int, int); + virtual bool processEventInPoint ( const QPoint& ); virtual QDocView::Location* highlightLocation(int) const; ldomXRange* bookmarkToHighlight(const QString&) const; virtual int pageCount() const; diff --git a/QDocView/src/QAdobeDocView.cpp b/QDocView/src/QAdobeDocView.cpp index e9c6a38..4d81750 100644 --- a/QDocView/src/QAdobeDocView.cpp +++ b/QDocView/src/QAdobeDocView.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 @@ -72,6 +72,8 @@ double PDF_INTERNAL_SIZE = 0.5; #define EPUB_FONT_SIZE_BEST_LEVEL 1 const double EPUB_FONT_SIZE_600[EPUB_FONT_SIZE_MAX_LEVEL+1] = {16.0, 20.0, 24.0, 27.0, 31.0, 36.0, 42.0, 51.0}; const double EPUB_FONT_SIZE_758[EPUB_FONT_SIZE_MAX_LEVEL+1] = {21.0, 27.0, 32.0, 37.0, 42.0, 50.0, 58.0, 66.5}; +//const double EPUB_FONT_SIZE_1072[EPUB_FONT_SIZE_MAX_LEVEL+1] = {30.0, 38.0, 45.0, 52.0, 59.0, 71.0, 82.0, 94.0}; +const double EPUB_FONT_SIZE_1072[EPUB_FONT_SIZE_MAX_LEVEL+1] = {7.0, 9.0, 11.0, 13.0, 14.0, 17.0, 19.0, 23.0}; const double* EPUB_FONT_SIZE = 0; #define Q_REFLOW_SCALE_BEST 2.0 @@ -762,17 +764,23 @@ QAdobeDocView::QAdobeDocView(dpdoc::Document* doc, QAdobeClient* client, QWidget m_noteFont.setPixelSize(15); - if(QBook::getInstance()->getResolution() == QBook::RES600x800) - { - EPUB_FONT_SIZE = EPUB_FONT_SIZE_600; - EPUB_INTERNAL_SIZE = 5.0; - PDF_INTERNAL_SIZE = 0.5; - } - else - { - EPUB_FONT_SIZE = EPUB_FONT_SIZE_758; - EPUB_INTERNAL_SIZE = 6.5;//5.0*1.33;//6.2;//5.0*1.297619048;//6.25; - PDF_INTERNAL_SIZE = 0.5; + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + EPUB_FONT_SIZE = EPUB_FONT_SIZE_1072; + EPUB_INTERNAL_SIZE = 9.0;//5.0*1.33;//6.2;//5.0*1.297619048;//6.25; + PDF_INTERNAL_SIZE = 0.5; + break; + case QBook::RES758x1024: + EPUB_FONT_SIZE = EPUB_FONT_SIZE_758; + EPUB_INTERNAL_SIZE = 6.5;//5.0*1.33;//6.2;//5.0*1.297619048;//6.25; + PDF_INTERNAL_SIZE = 0.5; + break; + case QBook::RES600x800: default: + EPUB_FONT_SIZE = EPUB_FONT_SIZE_600; + EPUB_INTERNAL_SIZE = 5.0; + PDF_INTERNAL_SIZE = 0.5; + break; } Q_FONT_SIZE_BEST = EPUB_FONT_SIZE[EPUB_FONT_SIZE_BEST_LEVEL]; diff --git a/QDocView/src/QCREngineDocView.cpp b/QDocView/src/QCREngineDocView.cpp index 2e02193..3e19ffd 100644 --- a/QDocView/src/QCREngineDocView.cpp +++ b/QDocView/src/QCREngineDocView.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 @@ -53,6 +53,8 @@ const double CR_FONT_SIZE_600_DOC[CR_FONT_SIZE_MAX_LEVEL+1] = {12.0, 16.0, 19 const double CR_FONT_SIZE_600_NO_DOC[CR_FONT_SIZE_MAX_LEVEL+1] = {16.0, 20.0, 24.0, 27.0, 31.0, 36.0, 42.0, 51.0}; const double CR_FONT_SIZE_758_DOC[CR_FONT_SIZE_MAX_LEVEL+1] = {14.0, 18.0, 22.0, 26.0, 30.0, 37.0, 43.0, 49.0}; const double CR_FONT_SIZE_758_NO_DOC[CR_FONT_SIZE_MAX_LEVEL+1] = {21.0, 27.0, 32.0, 37.0, 42.0, 50.0, 58.0, 66.0}; +const double CR_FONT_SIZE_1072_DOC[CR_FONT_SIZE_MAX_LEVEL+1] = {20.0, 25.0, 31.0, 37.0, 42.0, 52.0, 61.0, 69.0}; +const double CR_FONT_SIZE_1072_NO_DOC[CR_FONT_SIZE_MAX_LEVEL+1] = {29.0, 38.0, 45.0, 52.0, 57.0, 70.0, 85.0, 130.0}; const double* CR_FONT_SIZE = 0; @@ -140,15 +142,20 @@ QCREngineDocView::QCREngineDocView(QWidget* parent) : QDocView(parent) , rotViewPortSize(QSize(0,0)) , docReady(false) { + bool isDoc = s_path.toLower().endsWith(".doc"); - if(QBook::getInstance()->getResolution() == QBook::RES758x1024) - { - CR_FONT_SIZE = isDoc ? CR_FONT_SIZE_758_DOC : CR_FONT_SIZE_758_NO_DOC; - } - else //QBook::RES600x800 + switch(QBook::getInstance()->getResolution()) { - CR_FONT_SIZE = isDoc ? CR_FONT_SIZE_600_DOC : CR_FONT_SIZE_600_NO_DOC; + case QBook::RES1072x1448: + CR_FONT_SIZE = isDoc ? CR_FONT_SIZE_1072_DOC : CR_FONT_SIZE_1072_NO_DOC; + break; + case QBook::RES758x1024: + CR_FONT_SIZE = isDoc ? CR_FONT_SIZE_758_DOC : CR_FONT_SIZE_758_NO_DOC; + break; + case QBook::RES600x800: default: + CR_FONT_SIZE = isDoc ? CR_FONT_SIZE_600_DOC : CR_FONT_SIZE_600_NO_DOC; + break; } m_fontSizeStep = 1.5; @@ -188,10 +195,12 @@ QCREngineDocView::QCREngineDocView(QWidget* parent) : QDocView(parent) // stylesheet can be placed to file fb2.css // if not found, default stylesheet will be used - /*lString8 css = readFileToString(CR_CSS_FILE_PATH); + lString8 css = readFileToString(CR_CSS_FILE_PATH); - if (css.length() > 0) - text_view->setStyleSheet( css );*/ + if ((s_path.toLower().endsWith(".htm") || s_path.toLower().endsWith(".html")) + && css.length() > 0){ + text_view->setStyleSheet( css ); + } text_view->setBackgroundColor(0xFFFFFF); text_view->setTextColor(0); @@ -1676,3 +1685,24 @@ double QCREngineDocView::getFinalPosFromRenderer() { return 0; } + +bool QCREngineDocView::processEventInPoint(const QPoint &p) +{ + lString16 href; + + ldomXPointer ptr = text_view->getNodeByPoint( lvPoint( p.x(), p.y() ) ); + if (ptr.isNull()) + return false; + + href = ptr.getHRef(); + QString qsLink = QString::fromWCharArray( href.c_str(), href.length()); + if (qsLink.isEmpty()) + return false; + + qDebug() << Q_FUNC_INFO << "Going to:" << qsLink; + text_view->goLink(href); + update(); + updatePageNumber(); + + return true; +} diff --git a/QHome/bin/changeStartingImage1448.sh b/QHome/bin/changeStartingImage1448.sh new file mode 100755 index 0000000..1b48348 --- /dev/null +++ b/QHome/bin/changeStartingImage1448.sh @@ -0,0 +1,10 @@ +# !!!!! We expect bootlogo inlcuding the magic header for e60qh2 devices + +echo "Executing script to change starting image" +if [ -f ../res/newImages/starting1448.raw4 ]; then + echo "Changing starting image" + dd if=../res/newImages/starting1448.raw4 of=/dev/mmcblk0 bs=512 seek=34815 + sync + echo "Image changed" +fi + diff --git a/QHome/bin/syncHelper.sh b/QHome/bin/syncHelper.sh new file mode 100755 index 0000000..c5854e4 --- /dev/null +++ b/QHome/bin/syncHelper.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +export TSLIB_CONSOLEDEVICE=none +export TSLIB_FBDEVICE=/dev/fb0 +export TSLIB_TSDEVICE=/dev/input/event1 +export TSLIB_CALIBFILE=/usr/etc/pointercal +export TSLIB_CONFFILE=/etc/ts.conf +export TSLIB_PLUGINDIR=/usr/lib/arm-linux-gnueabi/ts0/ +export QWS_DISPLAY=einkfb +export QWS_MOUSE_PROTO=tslib:/dev/input/event1 +export QT_QWS_FONTDIR=/usr/lib/fonts +export POINTERCAL_FILE=/usr/etc/pointercal +export QWS_KEYBOARD=eb600keypad:/dev/input/event0 +export LD_LIBRARY_PATH=/usr/plugins/imageformats:/app/lib + +cd /app/bin +nice -19 ./syncHelper -qws diff --git a/QHome/bin/tsCalibrate.sh b/QHome/bin/tsCalibrate.sh new file mode 100755 index 0000000..1f4a910 --- /dev/null +++ b/QHome/bin/tsCalibrate.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +export TSLIB_CONSOLEDEVICE=none +export TSLIB_FBDEVICE=/dev/fb0 +export TSLIB_TSDEVICE=/dev/input/event1 +export TSLIB_CALIBFILE=/usr/etc/pointercal +export TSLIB_CONFFILE=/etc/ts.conf +export TSLIB_PLUGINDIR=/usr/lib/arm-linux-gnueabi/ts0/ +export POINTERCAL_FILE=/usr/etc/pointercal + +/app/bin/tsRefresh.sh & +bgpid=$! + +ts_calibrate + +kill -9 $bgpid diff --git a/QHome/bin/tsRefresh.sh b/QHome/bin/tsRefresh.sh new file mode 100755 index 0000000..0e4a459 --- /dev/null +++ b/QHome/bin/tsRefresh.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +ntxmxcinit + +while true; do + ntxmxcupdate + sleep 1 +done \ No newline at end of file diff --git a/QHome/res/newImages/starting1448.raw4 b/QHome/res/newImages/starting1448.raw4 new file mode 100755 index 0000000..f98388a Binary files /dev/null and b/QHome/res/newImages/starting1448.raw4 differ diff --git a/QHome/share/userGuides/userGuideTouch_de.epub b/QHome/share/userGuides/userGuideTouch_de.epub index 8075e94..7d05160 100644 Binary files a/QHome/share/userGuides/userGuideTouch_de.epub and b/QHome/share/userGuides/userGuideTouch_de.epub differ diff --git a/QHome/share/userGuides/userGuideTouch_fr.epub b/QHome/share/userGuides/userGuideTouch_fr.epub old mode 100755 new mode 100644 diff --git a/QHome/share/userGuides/userGuide_ca.epub b/QHome/share/userGuides/userGuide_ca.epub index ea1217a..2360dc1 100644 Binary files a/QHome/share/userGuides/userGuide_ca.epub and b/QHome/share/userGuides/userGuide_ca.epub differ diff --git a/QHome/share/userGuides/userGuide_de.epub b/QHome/share/userGuides/userGuide_de.epub index 4b4aa73..9b876d2 100644 Binary files a/QHome/share/userGuides/userGuide_de.epub and b/QHome/share/userGuides/userGuide_de.epub differ diff --git a/QHome/share/userGuides/userGuide_en.epub b/QHome/share/userGuides/userGuide_en.epub index 5d19d8c..ee614fc 100644 Binary files a/QHome/share/userGuides/userGuide_en.epub and b/QHome/share/userGuides/userGuide_en.epub differ diff --git a/QHome/share/userGuides/userGuide_es.epub b/QHome/share/userGuides/userGuide_es.epub old mode 100755 new mode 100644 index 0a30b38..fadbd5f Binary files a/QHome/share/userGuides/userGuide_es.epub and b/QHome/share/userGuides/userGuide_es.epub differ diff --git a/QHome/share/userGuides/userGuide_eu.epub b/QHome/share/userGuides/userGuide_eu.epub index 6acbf94..6853ca2 100644 Binary files a/QHome/share/userGuides/userGuide_eu.epub and b/QHome/share/userGuides/userGuide_eu.epub differ diff --git a/QHome/share/userGuides/userGuide_fr.epub b/QHome/share/userGuides/userGuide_fr.epub index 896c1ff..45cde2d 100644 Binary files a/QHome/share/userGuides/userGuide_fr.epub and b/QHome/share/userGuides/userGuide_fr.epub differ diff --git a/QHome/share/userGuides/userGuide_gl.epub b/QHome/share/userGuides/userGuide_gl.epub index 3511bf8..84c8e53 100644 Binary files a/QHome/share/userGuides/userGuide_gl.epub and b/QHome/share/userGuides/userGuide_gl.epub differ diff --git a/QHome/share/userGuides/userGuide_it.epub b/QHome/share/userGuides/userGuide_it.epub index 350a512..28f8891 100644 Binary files a/QHome/share/userGuides/userGuide_it.epub and b/QHome/share/userGuides/userGuide_it.epub differ diff --git a/QHome/share/userGuides/userGuide_pt.epub b/QHome/share/userGuides/userGuide_pt.epub index 8342636..5216250 100644 Binary files a/QHome/share/userGuides/userGuide_pt.epub and b/QHome/share/userGuides/userGuide_pt.epub differ diff --git a/README b/README index a979a1c..55e7a2c 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ Cervantes e-book reader application -Copyright (C) 2011-2013 Mundoreader, S.L -ssh://hg@bitbucket.org/mundoreader/cervantes +Copyright (C) 2011-2016 Mundoreader, S.L +https://github.com/bq/cervantes.git WHAT IS IT? ----------- diff --git a/bq/src/bqQTextBrowser.cpp b/bq/src/bqQTextBrowser.cpp index fcd87c0..445ad66 100644 --- a/bq/src/bqQTextBrowser.cpp +++ b/bq/src/bqQTextBrowser.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 @@ -45,28 +45,39 @@ bqQTextBrowser::bqQTextBrowser(QWidget* parent) : QTextBrowser(parent) QString css; QFont font("Lato"); - if(QBook::getInstance()->getResolution() == QBook::RES758x1024) + switch(QBook::getInstance()->getResolution()) { - css = "* {" - "font-size: 24pt ;" - "font-family: 'Lato';" - "padding-bottom:5pt;" - "color:#000 !important;" - "}"; - - font.setPointSize(24); - } - else - { - css = "* {" - "font-size: 19pt ;" - "font-family: 'Lato';" - "padding-bottom:3pt;" - "color:#000 !important;" - "}"; - - font.setPointSize(19); - } + case QBook::RES1072x1448: + css = "* {" + "font-size: 8pt ;" + "font-family: 'Lato';" + "padding-bottom:3pt;" + "color:#000 !important;" + "}"; + + font.setPointSize(8); + break; + case QBook::RES758x1024: + css = "* {" + "font-size: 24pt ;" + "font-family: 'Lato';" + "padding-bottom:5pt;" + "color:#000 !important;" + "}"; + + font.setPointSize(24); + break; + case QBook::RES600x800: default: + css = "* {" + "font-size: 19pt ;" + "font-family: 'Lato';" + "padding-bottom:3pt;" + "color:#000 !important;" + "}"; + + font.setPointSize(19); + break; + } // Create a QTextDocument with the defined HTML and CSS m_document = new QTextDocument; diff --git a/bqBrowser/Browser1024.qrc b/bqBrowser/Browser1024.qrc index 04b47cf..3bbbeed 100755 --- a/bqBrowser/Browser1024.qrc +++ b/bqBrowser/Browser1024.qrc @@ -4,7 +4,6 @@ res/1024/bg_next_previous_browser.png res/1024/bg_url_input.png res/1024/browser_styles.qss - res/1024/clear_input.png res/1024/favourite_ico.png res/1024/go.png res/1024/home_browser.png diff --git a/bqBrowser/Browser1448.qrc b/bqBrowser/Browser1448.qrc new file mode 100755 index 0000000..0e6b46b --- /dev/null +++ b/bqBrowser/Browser1448.qrc @@ -0,0 +1,26 @@ + + + res/1448/add_favourite_ico.png + res/1448/bg_next_previous_browser.png + res/1448/bg_url_input.png + res/1448/browser_styles.qss + res/1448/bg_clear_search.png + res/1448/favourite_ico.png + res/1448/go.png + res/1448/home_browser.png + res/1448/next_btn.png + res/1448/next_disabled_btn.png + res/1448/previous_btn.png + res/1448/previous_disabled_btn.png + res/1448/reload_browser.png + res/1448/stop_browser.png + res/1448/zoom_in_disabled_ico.png + res/1448/zoom_in_ico.png + res/1448/zoom_out_disabled_ico.png + res/1448/zoom_out_ico.png + res/browser_styles_generic.qss + res/1448/ckeck-group.png + res/1448/remove-icon.png + res/1448/unckeck-group.png + + diff --git a/bqBrowser/Browser800.qrc b/bqBrowser/Browser800.qrc index 2af710c..05bfe5d 100755 --- a/bqBrowser/Browser800.qrc +++ b/bqBrowser/Browser800.qrc @@ -3,7 +3,6 @@ res/browser_styles_generic.qss res/800/add_favourite_ico.png res/800/browser_styles.qss - res/800/clear_input.png res/800/favourite_ico.png res/800/home_browser.png res/800/zoom_in_disabled_ico.png diff --git a/bqBrowser/bqBrowser.pri b/bqBrowser/bqBrowser.pri index 905a06e..34eb596 100755 --- a/bqBrowser/bqBrowser.pri +++ b/bqBrowser/bqBrowser.pri @@ -44,9 +44,10 @@ TRANSLATIONS = ./tr/bqBrowser_es.ts \ ./tr/bqBrowser_de.ts \ ./tr/bqBrowser_it.ts -QRC_FILES += Browser800.qrc Browser1024.qrc +QRC_FILES += Browser800.qrc Browser1024.qrc Browser1448.qrc OTHER_FILES += \ bqBrowser/res/browser_styles_generic.qss \ bqBrowser/res/800/browser_styles.qss \ - bqBrowser/res/1024/browser_styles.qss + bqBrowser/res/1024/browser_styles.qss \ + bqBrowser/res/1448/browser_styles.qss diff --git a/bqBrowser/res/1024/bg_next_previous_browser.png b/bqBrowser/res/1024/bg_next_previous_browser.png index 2d23894..9657cb0 100755 Binary files a/bqBrowser/res/1024/bg_next_previous_browser.png and b/bqBrowser/res/1024/bg_next_previous_browser.png differ diff --git a/bqBrowser/res/1024/clear_input.png b/bqBrowser/res/1024/clear_input.png deleted file mode 100755 index 782e3d6..0000000 Binary files a/bqBrowser/res/1024/clear_input.png and /dev/null differ diff --git a/bqBrowser/res/1024/next_btn.png b/bqBrowser/res/1024/next_btn.png index f033b0a..89ef215 100755 Binary files a/bqBrowser/res/1024/next_btn.png and b/bqBrowser/res/1024/next_btn.png differ diff --git a/bqBrowser/res/1024/next_disabled_btn.png b/bqBrowser/res/1024/next_disabled_btn.png index adadd1b..135fdd1 100755 Binary files a/bqBrowser/res/1024/next_disabled_btn.png and b/bqBrowser/res/1024/next_disabled_btn.png differ diff --git a/bqBrowser/res/1024/previous_btn.png b/bqBrowser/res/1024/previous_btn.png index ca77005..37d2e67 100755 Binary files a/bqBrowser/res/1024/previous_btn.png and b/bqBrowser/res/1024/previous_btn.png differ diff --git a/bqBrowser/res/1024/previous_disabled_btn.png b/bqBrowser/res/1024/previous_disabled_btn.png index c923432..5289478 100755 Binary files a/bqBrowser/res/1024/previous_disabled_btn.png and b/bqBrowser/res/1024/previous_disabled_btn.png differ diff --git a/bqBrowser/res/1448/add_favourite_ico.png b/bqBrowser/res/1448/add_favourite_ico.png new file mode 100755 index 0000000..2cceb48 Binary files /dev/null and b/bqBrowser/res/1448/add_favourite_ico.png differ diff --git a/bqBrowser/res/1448/bg_clear_search.png b/bqBrowser/res/1448/bg_clear_search.png new file mode 100644 index 0000000..5d4d8bc Binary files /dev/null and b/bqBrowser/res/1448/bg_clear_search.png differ diff --git a/bqBrowser/res/1448/bg_next_previous_browser.png b/bqBrowser/res/1448/bg_next_previous_browser.png new file mode 100644 index 0000000..66cc4c7 Binary files /dev/null and b/bqBrowser/res/1448/bg_next_previous_browser.png differ diff --git a/bqBrowser/res/1448/bg_url_input.png b/bqBrowser/res/1448/bg_url_input.png new file mode 100644 index 0000000..f77eaa9 Binary files /dev/null and b/bqBrowser/res/1448/bg_url_input.png differ diff --git a/bqBrowser/res/1448/browser_styles.qss b/bqBrowser/res/1448/browser_styles.qss new file mode 100644 index 0000000..f21f6f2 --- /dev/null +++ b/bqBrowser/res/1448/browser_styles.qss @@ -0,0 +1,309 @@ +/************************************************************************* + +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 . + +*************************************************************************/ + +/*SettingsBrowser +----------------------------*/ +#Browser{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#navBarBrowser{ +min-height: 109px; +max-height: 109px; +border-width: 1px; +} +#url{ +margin-left: 14px; +padding: 0px 0px 0px 17px; +min-width: 533px; +max-width: 533px; +min-height: 99px; +max-height: 99px; +border-radius:0; +} +#homeBtn{ +margin: 0px 0px 0px 28px; +min-width: 82px; +max-width: 82px; +min-height: 91px; +max-height: 91px; +} +#reloadbtn{ +margin: 0px 11px 0px 0px; +min-width: 88px; +max-width: 88px; +min-height: 91px; +max-height: 91px; +} +#stopbtn{ +margin: 0px 0px 0px 0px; +min-width: 91px; +max-width: 91px; +min-height: 91px; +max-height: 91px; +} +#QbookWebView{ +} +#bottomBrowser{ +min-height: 91px; +max-height: 91px; +border-width: 1px; +} +#pagerBrowserCont{ +margin: 0px 0px 0px 35px; +min-width: 181px; +max-width: 181px; +min-height: 82px; +max-height: 82px; +border-width: 3px; +border-radius:6; +} +#backbtn{ +margin: 0px 0px 0px 35px; +} +#forwardbtn{ +} +#backbtn,#forwardbtn{ +min-width: 91px; +max-width: 91px; +} +#browserBar{ +min-width: 1072px; +max-width: 1072px; +min-height: 99px; +max-height: 99px; +} +#browserBarCont{ +border-width: 3px; +} +#webViewFooterCont{ +border-width: 3px; +min-height: 99px; +max-height: 99px; +} +#webViewFooter{ +min-height: 85px; +max-height: 85px; + +} +#spacerBrowserBottomLeft{ +min-width: 35px; +max-width: 35px; +} +#zoomInBtn{ +margin: 0px 0px 0px 72px; +min-width: 91px; +max-width: 91px; +min-height: 85px; +max-height: 85px; +} +#zoomOutBtn{ +margin: 0px 0px 0px 72px; +min-width: 91px; +max-width: 91px; +min-height: 85px; +max-height: 85px; +} +#favobtn{ +margin: 0px 0px 0px 109px; +min-width: 91px; +max-width: 91px; +min-height: 85px; +max-height: 85px; +} +#addfavobtn{ +margin: 0px 91px 0px 0px; +min-width: 91px; +max-width: 91px; +min-height: 85px; +max-height: 85px; +} +#Browser #Go{ +margin: 0px 8px 0px 0px; +min-width: 95px; +max-width: 95px; +min-height: 91px; +max-height: 91px; +border-width: 1px; +border-radius:6; +} +#Browser #clearSearchBtn{ +margin: 0px 8px 0px 0px; +min-width: 78px; +max-width: 78px; +min-height: 99px; +max-height: 99px; +} +/*BrowserFavo +------------------------------*/ +#verticalFrame{ +margin: 35px; +padding: 0px 0px 21px 0px; +border-width: 21px; +border-radius: 21px; +min-width: 977px; +max-width: 977px; +min-height: 1230px; +max-height: 1230px; +} +#commandbar2 { +} +#commandbar2 #year{ +} +#commandbar2 #closeBtn{ +} +#frame_2 #deleteBtn, #frame_2 #selectBtn{ +} +#stackedWidget{ +} +#frame_2{ +} + +/*BrowserFavo +------------------------------*/ +#BrowserFavo{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#BrowserFavoCont{ +margin: 35px; +padding: 0px 0px 21px 0px; +border-width: 21px; +border-radius: 21px; +min-width: 955px; +max-width: 955px; +min-height: 1230px; +max-height: 1230px; +} +#browserSectionHeader { +margin: 35px 54px 0px 54px; +padding: 0px 0px 21px 27px; +min-height: 91px; +max-height: 91px; +border-width: 3px; +} +#browserSectionHeader #sectionTitleLbl{ +margin: 45px 0px 0px 82px; +} +#browserSectionHeader #year{ +margin: 21px 0px 0px 0px; +} +#browserSectionHeader #closeBtn{ +margin: 54px 82px 0px 0px; +min-width: 91px; +max-width: 91px; +min-height: 91px; +max-height: 91px; +} +#actionCont #deleteBtn{ +margin: 0px 0px 0px 82px; +padding: 0px 27px 0px 78px; +min-height: 72px; +max-height: 72px; +border-width: 1px; +border-radius: 8px; +} +#actionCont #selectBtn{ +margin: 0px 0px 0px 27px; +padding: 0px 27px 0px 78px; +min-width: 325px; +max-width: 325px; +min-height: 72px; +max-height: 72px; +border-width: 1px; +border-radius: 8px; +} +#stackedWidget{ +margin: 0px 35px 35px 35px; +} +#actionCont{ +margin: 0px 57px; +min-height: 99px; +max-height: 99px; +} +#BrowserFavoListCont #Item1, +#BrowserFavoListCont #Item2, +#BrowserFavoListCont #Item3, +#BrowserFavoListCont #Item4, +#BrowserFavoListCont #Item5, +#BrowserFavoListCont #Item6, +#BrowserFavoListCont #Item7, +#BrowserFavoListCont #Item8{ +margin: 0px 54px; +min-width: 964px; +max-width: 964px; +min-height: 117px; +max-height: 117px; +border-width: 3px; +} +#checkBtn{ +margin: 0px 18px 18px 72px; +min-height: 99px; +max-height: 99px; +min-width: 91px; +max-width: 91px; +} +#EventLabel{ +padding-top: 18px; +} +/*BrowserFavoItem +---------------------*/ +#BrowserFavoItem{ +min-width: 976px; +max-width: 976px; +min-height: 148px; +max-height: 148px; +} +#BrowserFavoItemCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 148px; +max-height: 148px; +} +#page_slider{ +} + +#BrowserFavoItemCont{ +background-color:#FFFFFF; +} +#downPageBtn{ +min-width: 82px; +max-width: 82px; +min-height: 82px; +max-height: 82px; +margin: 0px 0px 0px 54px; +} +#upPageBtn{ +min-width: 82px; +max-width: 82px; +min-height: 82px; +max-height: 82px; +margin: 0px 54px 0px 0px; +} +#EventUrl{ +margin-right: 91px; +} +#EventLabel{ +margin-right: 91px; +} diff --git a/bqBrowser/res/1448/ckeck-group.png b/bqBrowser/res/1448/ckeck-group.png new file mode 100644 index 0000000..b1ff5cd Binary files /dev/null and b/bqBrowser/res/1448/ckeck-group.png differ diff --git a/bqBrowser/res/1448/favourite_ico.png b/bqBrowser/res/1448/favourite_ico.png new file mode 100755 index 0000000..84d4c4f Binary files /dev/null and b/bqBrowser/res/1448/favourite_ico.png differ diff --git a/bqBrowser/res/1448/go.png b/bqBrowser/res/1448/go.png new file mode 100644 index 0000000..7c5a4e1 Binary files /dev/null and b/bqBrowser/res/1448/go.png differ diff --git a/bqBrowser/res/1448/home_browser.png b/bqBrowser/res/1448/home_browser.png new file mode 100644 index 0000000..9b10336 Binary files /dev/null and b/bqBrowser/res/1448/home_browser.png differ diff --git a/bqBrowser/res/1448/next_btn.png b/bqBrowser/res/1448/next_btn.png new file mode 100644 index 0000000..927e6c9 Binary files /dev/null and b/bqBrowser/res/1448/next_btn.png differ diff --git a/bqBrowser/res/1448/next_disabled_btn.png b/bqBrowser/res/1448/next_disabled_btn.png new file mode 100644 index 0000000..f68f28a Binary files /dev/null and b/bqBrowser/res/1448/next_disabled_btn.png differ diff --git a/bqBrowser/res/1448/previous_btn.png b/bqBrowser/res/1448/previous_btn.png new file mode 100644 index 0000000..8a01556 Binary files /dev/null and b/bqBrowser/res/1448/previous_btn.png differ diff --git a/bqBrowser/res/1448/previous_disabled_btn.png b/bqBrowser/res/1448/previous_disabled_btn.png new file mode 100644 index 0000000..bd1fbb0 Binary files /dev/null and b/bqBrowser/res/1448/previous_disabled_btn.png differ diff --git a/bqBrowser/res/1448/reload_browser.png b/bqBrowser/res/1448/reload_browser.png new file mode 100644 index 0000000..d01092c Binary files /dev/null and b/bqBrowser/res/1448/reload_browser.png differ diff --git a/bqBrowser/res/1448/remove-icon.png b/bqBrowser/res/1448/remove-icon.png new file mode 100644 index 0000000..4067739 Binary files /dev/null and b/bqBrowser/res/1448/remove-icon.png differ diff --git a/bqBrowser/res/1448/stop_browser.png b/bqBrowser/res/1448/stop_browser.png new file mode 100644 index 0000000..5b63ea5 Binary files /dev/null and b/bqBrowser/res/1448/stop_browser.png differ diff --git a/bqBrowser/res/1448/unckeck-group.png b/bqBrowser/res/1448/unckeck-group.png new file mode 100644 index 0000000..1bcb143 Binary files /dev/null and b/bqBrowser/res/1448/unckeck-group.png differ diff --git a/bqBrowser/res/1448/zoom_in_disabled_ico.png b/bqBrowser/res/1448/zoom_in_disabled_ico.png new file mode 100755 index 0000000..6cba67f Binary files /dev/null and b/bqBrowser/res/1448/zoom_in_disabled_ico.png differ diff --git a/bqBrowser/res/1448/zoom_in_ico.png b/bqBrowser/res/1448/zoom_in_ico.png new file mode 100755 index 0000000..af0778d Binary files /dev/null and b/bqBrowser/res/1448/zoom_in_ico.png differ diff --git a/bqBrowser/res/1448/zoom_out_disabled_ico.png b/bqBrowser/res/1448/zoom_out_disabled_ico.png new file mode 100755 index 0000000..d9a28c9 Binary files /dev/null and b/bqBrowser/res/1448/zoom_out_disabled_ico.png differ diff --git a/bqBrowser/res/1448/zoom_out_ico.png b/bqBrowser/res/1448/zoom_out_ico.png new file mode 100755 index 0000000..a44a567 Binary files /dev/null and b/bqBrowser/res/1448/zoom_out_ico.png differ diff --git a/bqBrowser/res/800/clear_input.png b/bqBrowser/res/800/clear_input.png deleted file mode 100755 index 782e3d6..0000000 Binary files a/bqBrowser/res/800/clear_input.png and /dev/null differ diff --git a/bqBrowser/res/cdl_web_styles.qss b/bqBrowser/res/cdl_web_styles.qss deleted file mode 100644 index 310e0f7..0000000 --- a/bqBrowser/res/cdl_web_styles.qss +++ /dev/null @@ -1,20 +0,0 @@ -/************************************************************************* - -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 . - -*************************************************************************/ - diff --git a/bqBrowser/src/Browser.cpp b/bqBrowser/src/Browser.cpp index c217042..808ef19 100644 --- a/bqBrowser/src/Browser.cpp +++ b/bqBrowser/src/Browser.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 @@ -131,7 +131,7 @@ Browser::Browser(QWidget *parent) connect(reloadbtn, SIGNAL(pressed()), webview, SLOT(reload())); connect(stopbtn, SIGNAL(pressed()), webview, SLOT(stop())); - updateZoomBtnStates(); + mScale = webview->zoomFactor(); initialWebViewBars(); resetScrolls(); @@ -152,6 +152,7 @@ Browser::Browser(QWidget *parent) QString styles = QLatin1String(fileSpecific.readAll() + fileCommons.readAll()); setStyleSheet(styles); + updateZoomBtnStates(); } Browser::~Browser() @@ -340,15 +341,20 @@ void Browser::handleZoomOut() void Browser::updateZoomBtnStates() { qDebug() << Q_FUNC_INFO; - if( (mScale/ZOOM_STEP) < ZOOM_MIN) + if( (mScale/ZOOM_STEP) < ZOOM_MIN){ + zoomOutBtn->setStyleSheet("background-image:url(:/res/zoom_out_disabled_ico.png)"); zoomOutBtn->setEnabled(false); - else + }else{ + zoomOutBtn->setStyleSheet("background-image:url(:/res/zoom_out_ico.png)"); zoomOutBtn->setEnabled(true); - - if( (mScale*ZOOM_STEP) > ZOOM_MAX) + } + if( (mScale*ZOOM_STEP) > ZOOM_MAX){ + zoomInBtn->setStyleSheet("background-image:url(:/res/zoom_in_disabled_ico.png)"); zoomInBtn->setEnabled(false); - else + }else{ + zoomInBtn->setStyleSheet("background-image:url(:/res/zoom_in_ico.png)"); zoomInBtn->setEnabled(true); + } } void Browser::handleVScrollBarValueChanged(int nNewScrollValue) diff --git a/bqBrowser/tr/bqBrowser_ca.ts b/bqBrowser/tr/bqBrowser_ca.ts index dd72d7f..bea4cf8 100755 --- a/bqBrowser/tr/bqBrowser_ca.ts +++ b/bqBrowser/tr/bqBrowser_ca.ts @@ -12,7 +12,7 @@ Go - Anar + Vés @@ -41,7 +41,7 @@ Ir - Anar + Vés @@ -154,7 +154,7 @@ Remove - Eliminar + Elimina diff --git a/bqBrowser/ui/Browser.ui b/bqBrowser/ui/Browser.ui index 550a1c4..32da686 100755 --- a/bqBrowser/ui/Browser.ui +++ b/bqBrowser/ui/Browser.ui @@ -6,20 +6,20 @@ 0 0 - 758 - 960 + 1072 + 1358 - 758 - 960 + 0 + 0 - 758 - 960 + 1072 + 1358 @@ -29,7 +29,7 @@ Form - + @@ -48,8 +48,8 @@ - 758 - 70 + 1072 + 99 @@ -76,7 +76,7 @@ 16777215 - 1000 + 1414 @@ -102,18 +102,18 @@ - 82 - 68 + 116 + 96 Qt::NoFocus - + - + false @@ -151,7 +151,7 @@ Qt::NoFocus - + @@ -165,8 +165,8 @@ - 5 - 20 + 7 + 28 @@ -197,8 +197,8 @@ - 5 - 20 + 7 + 28 @@ -213,8 +213,8 @@ - 68 - 68 + 96 + 96 @@ -227,7 +227,7 @@ Qt::NoFocus - + @@ -241,8 +241,8 @@ - 74 - 68 + 105 + 96 @@ -255,7 +255,7 @@ Qt::NoFocus - + @@ -286,8 +286,8 @@ - 42 - 9999 + 59 + 14141 @@ -301,8 +301,8 @@ 0 19 - 42 - 491 + 59 + 694 @@ -313,7 +313,7 @@ - 42 + 59 16777215 @@ -329,8 +329,8 @@ 0 440 - 40 - 40 + 57 + 57 @@ -341,8 +341,8 @@ - 40 - 40 + 57 + 57 @@ -368,8 +368,8 @@ 0 60 - 40 - 40 + 57 + 57 @@ -380,8 +380,8 @@ - 40 - 40 + 57 + 57 @@ -456,7 +456,7 @@ 16777215 - 42 + 59 @@ -470,8 +470,8 @@ 0 0 - 40 - 40 + 57 + 57 @@ -482,8 +482,8 @@ - 40 - 40 + 57 + 57 @@ -509,8 +509,8 @@ 440 0 - 40 - 40 + 57 + 57 @@ -521,8 +521,8 @@ - 40 - 40 + 57 + 57 @@ -548,8 +548,8 @@ 50 0 - 381 - 42 + 539 + 59 @@ -561,7 +561,7 @@ 16777215 - 42 + 59 @@ -583,15 +583,15 @@ - 42 - 42 + 59 + 59 Qt::NoFocus - + @@ -618,7 +618,7 @@ - + @@ -637,8 +637,8 @@ - 93 - 42 + 132 + 59 @@ -651,10 +651,10 @@ Qt::NoFocus - + - + @@ -668,8 +668,8 @@ - 68 - 42 + 96 + 59 @@ -682,7 +682,7 @@ Qt::NoFocus - + @@ -699,8 +699,8 @@ - 119 - 64 + 168 + 91 @@ -713,10 +713,10 @@ Qt::NoFocus - + - + @@ -730,8 +730,8 @@ - 119 - 64 + 168 + 91 @@ -744,10 +744,10 @@ Qt::NoFocus - + - + @@ -761,8 +761,8 @@ - 145 - 64 + 205 + 91 @@ -774,10 +774,10 @@ Qt::NoFocus - + - + @@ -788,8 +788,8 @@ - 40 - 20 + 57 + 28 @@ -804,18 +804,18 @@ - 132 - 64 + 187 + 91 Qt::NoFocus - + - + true @@ -848,10 +848,6 @@ 1 - - - - - - - + + + \ No newline at end of file diff --git a/bqBrowser/ui/BrowserFavo.ui b/bqBrowser/ui/BrowserFavo.ui index 3ef26f6..5964ca5 100755 --- a/bqBrowser/ui/BrowserFavo.ui +++ b/bqBrowser/ui/BrowserFavo.ui @@ -6,8 +6,8 @@ 0 0 - 758 - 960 + 1072 + 1358 @@ -18,21 +18,21 @@ - 758 - 960 + 0 + 0 - 758 - 960 + 1072 + 1358 Form - + @@ -70,7 +70,7 @@ 16777215 - 10000 + 14142 @@ -85,8 +85,8 @@ - 40 - 20 + 57 + 28 @@ -101,8 +101,8 @@ - 126 - 106 + 178 + 150 @@ -115,7 +115,7 @@ Qt::NoFocus - + @@ -131,7 +131,7 @@ - + @@ -182,8 +182,8 @@ - 40 - 20 + 57 + 28 @@ -192,28 +192,28 @@ - + - + - + - + - + - + - + - + @@ -222,8 +222,8 @@ - 20 - 40 + 28 + 57 @@ -231,7 +231,7 @@ - + @@ -256,8 +256,8 @@ - 20 - 40 + 28 + 57 @@ -281,6 +281,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqBrowser/ui/BrowserFavoItem.ui b/bqBrowser/ui/BrowserFavoItem.ui index 8c8ccee..de72cac 100755 --- a/bqBrowser/ui/BrowserFavoItem.ui +++ b/bqBrowser/ui/BrowserFavoItem.ui @@ -6,15 +6,15 @@ 0 0 - 560 - 116 + 792 + 164 Form - + @@ -26,7 +26,7 @@ - + @@ -63,8 +63,8 @@ - 50 - 20 + 71 + 28 @@ -99,8 +99,8 @@ - 50 - 20 + 71 + 28 @@ -118,6 +118,6 @@
ElidedLabel.h
- - - + + + \ No newline at end of file diff --git a/bqBrowser/ui/BrowserPageSlider.ui b/bqBrowser/ui/BrowserPageSlider.ui index f8eff6b..1a8d15b 100755 --- a/bqBrowser/ui/BrowserPageSlider.ui +++ b/bqBrowser/ui/BrowserPageSlider.ui @@ -1,180 +1,180 @@ - - - BrowserPageSlider - - - - 0 - 0 - 600 - 41 - - - - - DejaVu Sans - - - - Form - - - - - - - 0 - - - 0 - - - 5 - - - 0 - - - 0 - - - - - - 36 - 30 - - - - - 36 - 30 - - - - background-image: url(:/allmark/allmark-hwrnote); - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 60 - 0 - - - - - DejaVu Sans - 16 - - - - Qt::NoFocus - - - - - - 1/1 - - - true - - - - - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - - 36 - 0 - - - - background:none; - - - - - - - - - - - SilentQPushButton - QPushButton -
SilentQPushButton.h
- - - - - - previousPage() - nextPage() - backPressed() - - + + + BrowserPageSlider + + + + 0 + 0 + 849 + 58 + + + + + DejaVu Sans + + + + Form + + + + + + + 0 + + + 0 + + + 5 + + + 0 + + + 0 + + + + + + 36 + 30 + + + + + 51 + 42 + + + + background-image: url(:/allmark/allmark-hwrnote); + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 28 + 28 + + + + + + + + + + + + + + + + 0 + 0 + + + + + 60 + 0 + + + + + DejaVu Sans + 16 + + + + Qt::NoFocus + + + + + + 1/1 + + + true + + + + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 28 + 28 + + + + + + + + + 0 + 0 + + + + + 36 + 0 + + + + background:none; + + + + + + + + + + + SilentQPushButton + QPushButton +
SilentQPushButton.h
+ + + + + + previousPage() + nextPage() + backPressed() + + \ No newline at end of file diff --git a/bqHAL/Battery/mx508/src/BatteryMx508.cpp b/bqHAL/Battery/mx508/src/BatteryMx508.cpp index d7bf58e..8bcac36 100644 --- a/bqHAL/Battery/mx508/src/BatteryMx508.cpp +++ b/bqHAL/Battery/mx508/src/BatteryMx508.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 @@ -19,17 +19,37 @@ along with the source code. If not, see . *************************************************************************/ #include "BatteryMx508.h" +#include "DeviceInfo.h" #include #include #include #include #include +#include +#include #include "cmath" int BatteryMx508::getLevel(){ - qDebug() << "--->" << Q_FUNC_INFO; + + if(DeviceInfo::getInstance()->getHwId() == DeviceInfo::E60QH2) { + int percentage; + std::ifstream infile("/sys/bus/platform/devices/ricoh619-battery/power_supply/mc13892_bat/capacity"); + if (!infile) { + qDebug() << Q_FUNC_INFO << "could not open e60qh2 battery sysfs file"; + return 50; + } + + infile >> percentage; + + if (percentage < 1) // Check battery critical level + emit batteryLevelCritical(); + else + emit batteryLevelChanged(percentage); + + return percentage; + } /* Range of values from the driver: 885 - 1023 Critical level bit: 0x8000 diff --git a/bqHAL/Battery/src/Battery.cpp b/bqHAL/Battery/src/Battery.cpp index 2d87f6b..7247bd4 100644 --- a/bqHAL/Battery/src/Battery.cpp +++ b/bqHAL/Battery/src/Battery.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 @@ -75,8 +75,6 @@ void Battery::staticDone() void Battery::checkBatteryLevel() { - qDebug() << Q_FUNC_INFO; - /* Due to mutex mechanism for I2C access, battery reading level must be skipped when power key pressed @@ -90,8 +88,8 @@ void Battery::checkBatteryLevel() int newLevel = getLevel(); if(newLevel != _currentLevel) { - if(newLevel <= BATTERY_LEVEL_LOW && BATTERY_LEVEL_LOW < _currentLevel - || newLevel <= BATTERY_LEVEL_LOW_2 && BATTERY_LEVEL_LOW_2 < _currentLevel) + if((newLevel <= BATTERY_LEVEL_LOW && BATTERY_LEVEL_LOW < _currentLevel) + || (newLevel <= BATTERY_LEVEL_LOW_2 && BATTERY_LEVEL_LOW_2 < _currentLevel)) { qDebug() << Q_FUNC_INFO << "Battery low" << newLevel; emit batteryLevelLow(newLevel); diff --git a/bqHAL/Devices/inc/DeviceInfo.h b/bqHAL/Devices/inc/DeviceInfo.h index 0da7c90..ccdd321 100644 --- a/bqHAL/Devices/inc/DeviceInfo.h +++ b/bqHAL/Devices/inc/DeviceInfo.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 @@ -38,7 +38,8 @@ class DeviceInfo : public QObject UNKNOWN_HW_MODEL, E606A2, // Cervantes Touch, iMX5 E60672, // Cervantes Touch Light, iMX5 - E60Q22 // Cervantes 2013 + E60Q22, // Cervantes 2013 + E60QH2 // Cervantes 3 }; static DeviceInfo* getInstance(); diff --git a/bqHAL/Devices/mx508/src/DeviceInfoMx508.cpp b/bqHAL/Devices/mx508/src/DeviceInfoMx508.cpp index 9cb8239..13cb0b8 100644 --- a/bqHAL/Devices/mx508/src/DeviceInfoMx508.cpp +++ b/bqHAL/Devices/mx508/src/DeviceInfoMx508.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 @@ -33,6 +33,7 @@ along with the source code. If not, see . #define E606A2_PCBID 22 #define E60672_PCBID 23 #define E60Q22_PCBID 33 +#define E60QH2_PCBID 51 DeviceInfoMx508::DeviceInfoMx508() @@ -137,6 +138,9 @@ int DeviceInfoMx508::getHwId() case E60Q22_PCBID: qDebug() << Q_FUNC_INFO << "E60Q22"; return E60Q22; + case E60QH2_PCBID: + qDebug() << Q_FUNC_INFO << "E60QH2"; + return E60QH2; default: qWarning() << Q_FUNC_INFO << "UNKNOWN_HW_MODEL" << hwc.values.pcb; } diff --git a/bqHAL/Power/inc/RTCManager.h b/bqHAL/Power/inc/RTCManager.h index a7968d0..b9612b9 100644 --- a/bqHAL/Power/inc/RTCManager.h +++ b/bqHAL/Power/inc/RTCManager.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 @@ -26,24 +26,11 @@ along with the source code. If not, see . class QDateTime; -static struct tm * mygmtime(const time_t *timer); -time_t mymktime(struct tm *t); -int rtc_month_days(unsigned int month, unsigned int year); - class RTCManager : public QObject { Q_OBJECT public: - static void setRTCAlarm(int secs); - static void turnOffRTCTimer(); - static bool checkRTCTime(); - static QDateTime rtcDateTime(); - static void setRtcDateTime(const QDateTime&); - static bool setHardwareDateFromSystem(); - static bool setSystemDateFromHw(); - static void syncClock(); - struct rtc_time { int tm_sec; int tm_min; @@ -56,6 +43,16 @@ class RTCManager : public QObject int tm_isdst; }; + static void addSecsToRTCTime(struct rtc_time& rtc_tm, int secs); + static void setRTCAlarm(int secs); + static void turnOffRTCTimer(); + static bool checkRTCTime(); + static QDateTime rtcDateTime(); + static void setRtcDateTime(const QDateTime&); + static bool setHardwareDateFromSystem(); + static bool setSystemDateFromHw(); + static void syncClock(); + struct rtc_time_generic { int tm_sec; int tm_min; diff --git a/bqHAL/Power/mx508/src/PowerMx508.cpp b/bqHAL/Power/mx508/src/PowerMx508.cpp index 2786b19..35277f9 100644 --- a/bqHAL/Power/mx508/src/PowerMx508.cpp +++ b/bqHAL/Power/mx508/src/PowerMx508.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 @@ -49,6 +49,7 @@ static int kbdIndex = 0; static void updateWakeupSources(int sleepFlag, bool wakeOnHome) { + qDebug() << Q_FUNC_INFO << " sleepFlag: " << sleepFlag << ", wakeOnHome: " << wakeOnHome; FILE *output; int i, curFlag; @@ -57,6 +58,7 @@ static void updateWakeupSources(int sleepFlag, bool wakeOnHome) /* set wakeup property */ curFlag = sleepFlag; + qDebug() << Q_FUNC_INFO << "Opening " << wSources[i] + "/device/power/wakeup"; output = fopen(str.toStdString().c_str(), "w"); if (!output) { qDebug() << Q_FUNC_INFO << "wakeup file missing for " << wSources[i]; @@ -74,6 +76,7 @@ static void updateWakeupSources(int sleepFlag, bool wakeOnHome) curFlag = 0; } + qDebug() << Q_FUNC_INFO << "Printing: " << (curFlag ? "disabled" : "enabled"); fprintf(output, curFlag ? "disabled" : "enabled"); fclose(output); } @@ -82,6 +85,9 @@ static void updateWakeupSources(int sleepFlag, bool wakeOnHome) PowerMx508::PowerMx508() : b_debugOn(false) { + /* init wakeonhome feature to default-on */ + setWakeOnHome(true); + /* enable the wakeup property of the wakeup sources by default. * It gets toggled for sleep in setSleepFlag */ @@ -286,7 +292,7 @@ bool PowerMx508::isRTCwakeUp() void PowerMx508::setSleepFlag(int sleepFlag) { - qDebug() << Q_FUNC_INFO; + qDebug() << Q_FUNC_INFO << sleepFlag; FILE *output; output=fopen("/sys/power/state-extended","w"); diff --git a/bqHAL/Power/src/RTCManager.cpp b/bqHAL/Power/src/RTCManager.cpp index fa2718d..16edb2a 100644 --- a/bqHAL/Power/src/RTCManager.cpp +++ b/bqHAL/Power/src/RTCManager.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 @@ -36,6 +36,40 @@ along with the source code. If not, see . #define REQCODE_RTC_SETTIME _IOW('p', 0x0a, struct rtc_time_generic) /* Set RTC time */ #define REQCODE_RTC_READTIME _IOR('p', 0x09, struct rtc_time_generic) /* Read RTC time */ +static const int days_per_month[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; + +#define LEAP_YEAR(year) ((!(year % 4) && (year % 100)) || !(year % 400)) + +// NOTE Precondition +// RTC months: January is 0, December is 11 +// RTC years: start at 1900 + +int daysInMonth(unsigned int month, unsigned int year) +{ + return days_per_month[month] + (LEAP_YEAR(year) && month == 1); +} + +int addModAndForwardDiv(int& lnumber, int addnumber, int modnumber) +{ + int tmpadd = lnumber + addnumber; + lnumber = tmpadd % modnumber; + return tmpadd / modnumber; +} + +void RTCManager::addSecsToRTCTime(struct rtc_time& rtc_tm, int secs) +{ + int toAdd = secs; + int regYear = 1900+rtc_tm.tm_year; + toAdd = addModAndForwardDiv(rtc_tm.tm_sec, toAdd, 60); + toAdd = addModAndForwardDiv(rtc_tm.tm_min, toAdd, 60); + toAdd = addModAndForwardDiv(rtc_tm.tm_hour, toAdd, 24); + addModAndForwardDiv(rtc_tm.tm_wday, toAdd, 7); // No need to keep track of week days offset + addModAndForwardDiv(rtc_tm.tm_yday, toAdd, 365+LEAP_YEAR(regYear)); // No need to keep track of year days offset + toAdd = addModAndForwardDiv(rtc_tm.tm_mday, toAdd, daysInMonth(rtc_tm.tm_mon, regYear)); + toAdd = addModAndForwardDiv(rtc_tm.tm_mon, toAdd, 12); + rtc_tm.tm_year += toAdd; +} + void RTCManager::setRTCAlarm(int secs) { qDebug() << "--->" << Q_FUNC_INFO; @@ -57,16 +91,9 @@ void RTCManager::setRTCAlarm(int secs) } ioctl (fd_rtc, REQCODE_RTC_READTIME, &rtc_tm); - time_t t_secs = mymktime((struct tm *)(void *)&rtc_tm); - - //qDebug("[RTC]read rtc %d/%d/%d %d:%d:%d", rtc_tm.tm_year, rtc_tm.tm_mon, rtc_tm.tm_mday,rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec); - //qDebug("[RTC] t_secs= %d, secs = %d", (int)t_secs, secs); - t_secs = t_secs+secs; - rtc_tm=*( (struct rtc_time*)mygmtime(&t_secs)); - - //qDebug("[RTC] t_secs= %d", (int)t_secs); - //qDebug("[RTC] set rtc %d/%d/%d %d:%d:%d", rtc_tm.tm_year, rtc_tm.tm_mon, rtc_tm.tm_mday,rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec); - + qDebug("[RTC]read rtc %d/%d/%d %d:%d:%d", rtc_tm.tm_year, rtc_tm.tm_mon, rtc_tm.tm_mday,rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec); + addSecsToRTCTime(rtc_tm, secs); + qDebug("[RTC] set rtc %d/%d/%d %d:%d:%d", rtc_tm.tm_year, rtc_tm.tm_mon, rtc_tm.tm_mday,rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec); rtc_alrm.enabled = 1; rtc_alrm.pending = 0; @@ -128,7 +155,7 @@ bool RTCManager::checkRTCTime() (rtc_tm.tm_min >= 60 || rtc_tm.tm_min < 0) || (rtc_tm.tm_mon > 11 || rtc_tm.tm_mon < 0) || (rtc_tm.tm_hour >= 24 || rtc_tm.tm_hour < 0) || - rtc_tm.tm_mday < 1 || rtc_tm.tm_mday > rtc_month_days(rtc_tm.tm_mon, rtc_tm.tm_year + 1900)) + rtc_tm.tm_mday < 1 || rtc_tm.tm_mday > daysInMonth(rtc_tm.tm_mon, rtc_tm.tm_year + 1900)) { return false; } @@ -219,124 +246,3 @@ void RTCManager::syncClock() { system("hwclock"); } - -/** ---- Supporting functions for RTC ---- **/ - -static struct tm _mytm; - -static int _DMonth[13] = { 0,31,59,90,120,151,181,212,243,273,304,334,365 }; -static int _monthCodes[12] = { 6, 2, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4 }; - -static int -mycalcDayOfWeek(const struct tm* nTM) -{ - int day; - - day = (nTM->tm_year%100); - day += day/4; - day += _monthCodes[nTM->tm_mon]; - day += nTM->tm_mday; - while(day>=7) - day -= 7; - - return day; -} - - -static struct tm * -mygmtime(const time_t *timer) -{ - unsigned long x = *timer; - int imin, ihrs, iday, iyrs; - int sec, min, hrs, day, mon, yrs; - int lday, qday, jday, mday; - - - imin = x / 60; // whole minutes since 1/1/70 - sec = x - (60 * imin); // leftover seconds - ihrs = imin / 60; // whole hours since 1/1/70 - min = imin - 60 * ihrs; // leftover minutes - iday = ihrs / 24; // whole days since 1/1/70 - hrs = ihrs - 24 * iday; // leftover hours - iday = iday + 365 + 366; // whole days since 1/1/68 - lday = iday / (( 4* 365) + 1); // quadyr = 4 yr period = 1461 days - qday = iday % (( 4 * 365) + 1); // days since current quadyr began - if(qday >= (31 + 29)) // if past feb 29 then - lday = lday + 1; // add this quadyrs leap day to the - // # of quadyrs (leap days) since 68 - iyrs = (iday - lday) / 365; // whole years since 1968 - jday = iday - (iyrs * 365) - lday; // days since 1 /1 of current year. - if(qday <= 365 && qday >= 60) // if past 2/29 and a leap year then - jday = jday + 1; // add a leap day to the # of whole - // days since 1/1 of current year - yrs = iyrs + 1968; // compute year - mon = 13; // estimate month ( +1) - mday = 366; // max days since 1/1 is 365 - while(jday < mday) // mday = # of days passed from 1/1 - { // until first day of current month - mon = mon - 1; // mon = month (estimated) - mday = _DMonth[mon]; // # elapsed days at first of mon? - if((mon > 2) && (yrs % 4) == 0) // if past 2/29 and leap year then - mday = mday + 1; // add leap day - // compute month by decrementing - } // month until found - - day = jday - mday + 1; // compute day of month - - _mytm.tm_sec = sec; - _mytm.tm_min = min; - _mytm.tm_hour = hrs; - _mytm.tm_mday = day; - _mytm.tm_mon = mon; - _mytm.tm_year = yrs - 1900; - - _mytm.tm_wday = mycalcDayOfWeek(&_mytm); - _mytm.tm_yday = jday; - _mytm.tm_isdst = 0; - - return &_mytm; -} - -static int _month_to_day[12] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; - -time_t mymktime(struct tm *t) -{ - short month, year; - time_t result; - - month = t->tm_mon; - year = t->tm_year + month / 12 + 1900; - month %= 12; - if (month < 0) - { - year -= 1; - month += 12; - } - result = (year - 1970) * 365 + (year - 1969) / 4 + _month_to_day[month]; - result = (year - 1970) * 365 + _month_to_day[month]; - if (month <= 1) - year -= 1; - result += (year - 1968) / 4; - result -= (year - 1900) / 100; - result += (year - 1600) / 400; - result += t->tm_mday; - result -= 1; - result *= 24; - result += t->tm_hour; - result *= 60; - result += t->tm_min; - result *= 60; - result += t->tm_sec; - return(result); -} - -static const unsigned char rtc_days_in_month[] = { - 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 -}; - -#define LEAP_YEAR(year) ((!(year % 4) && (year % 100)) || !(year % 400)) -int rtc_month_days(unsigned int month, unsigned int year) -{ - return rtc_days_in_month[month] + (LEAP_YEAR(year) && month == 1); -} - diff --git a/bqHAL/Screen/emu/src/ScreenEmu.cpp b/bqHAL/Screen/emu/src/ScreenEmu.cpp index 5aba8e3..4c95583 100644 --- a/bqHAL/Screen/emu/src/ScreenEmu.cpp +++ b/bqHAL/Screen/emu/src/ScreenEmu.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 @@ -18,107 +18,122 @@ along with the source code. If not, see . *************************************************************************/ -#include "ScreenEmu.h" -#include "QBook.h" -#include - - -ScreenEmu::ScreenEmu() -{ - qDebug() << "--->" << Q_FUNC_INFO; -} - -void ScreenEmu::setMode(Screen::ScreenMode mode, bool justOnce, QString from) -{ - setMode(mode, justOnce, FLAG_PARTIALSCREEN_UPDATE, from); -} - -void ScreenEmu::setMode(Screen::ScreenMode mode, bool justOnce, int refreshFlags, QString from) -{ -// qDebug() << "--->" << Q_FUNC_INFO << "Mode: " << mode << " once: " << justOnce -// << "flags:" << refreshFlags << "from: " << from; -} - -void ScreenEmu::refreshScreen(Screen::ScreenMode mode, QString from) -{ - qDebug() << "--->" << Q_FUNC_INFO << "Mode: " << mode << "from: " << from; -} - -void ScreenEmu::setUpdateScheme(SchemeMode mode, bool justOnce) -{ - qDebug() << "--->" << Q_FUNC_INFO << "Mode" << mode << "just once" << justOnce; -} - -void ScreenEmu::lockScreen() -{ - qDebug() << "--->" << Q_FUNC_INFO; -} - -void ScreenEmu::releaseScreen() -{ - qDebug() << "--->" << Q_FUNC_INFO; -} - -void ScreenEmu::flushImage(QImage &/*img*/, const QPoint &/*point*/) -{ - qDebug() << "--->" << Q_FUNC_INFO; -} - -void ScreenEmu::restoreMode() -{ - qDebug() << "--->" << Q_FUNC_INFO; -} - -void ScreenEmu::refreshScreen(Screen::ScreenMode, int, QString) -{ - qDebug() << "--->" << Q_FUNC_INFO; -} - -void ScreenEmu::queueUpdates() -{ - qDebug() << "--->" << Q_FUNC_INFO; -} - -void ScreenEmu::flushUpdates() -{ - qDebug() << "--->" << Q_FUNC_INFO; -} - -void ScreenEmu::resetQueue() -{ - qDebug() << "--->" << Q_FUNC_INFO; -} - -void ScreenEmu::resetFlushQueue() -{ - qDebug() << "--->" << Q_FUNC_INFO; -} - -void ScreenEmu::flushColorScreen(Qt::GlobalColor color) -{ - qDebug() << "--->" << Q_FUNC_INFO; -} - -int ScreenEmu::screenWidth() const -{ - qDebug() << "--->" << Q_FUNC_INFO; - if (QBook::getResolution() == QBook::RES600x800) - return 600; - else - return 758; - -} - -int ScreenEmu::screenHeight() const -{ - qDebug() << "--->" << Q_FUNC_INFO; - if (QBook::getResolution() == QBook::RES600x800) - return 800; - else - return 1024; -} - -void ScreenEmu::setScreenOrentation(ScreenOrientation /*orientation*/) -{ - qDebug() << Q_FUNC_INFO; -} +#include "ScreenEmu.h" +#include "QBook.h" +#include + + +ScreenEmu::ScreenEmu() +{ + qDebug() << "--->" << Q_FUNC_INFO; +} + +void ScreenEmu::setMode(Screen::ScreenMode mode, bool justOnce, QString from) +{ + setMode(mode, justOnce, FLAG_PARTIALSCREEN_UPDATE, from); +} + +void ScreenEmu::setMode(Screen::ScreenMode mode, bool justOnce, int refreshFlags, QString from) +{ +// qDebug() << "--->" << Q_FUNC_INFO << "Mode: " << mode << " once: " << justOnce +// << "flags:" << refreshFlags << "from: " << from; +} + +void ScreenEmu::refreshScreen(Screen::ScreenMode mode, QString from) +{ + qDebug() << "--->" << Q_FUNC_INFO << "Mode: " << mode << "from: " << from; +} + +void ScreenEmu::setUpdateScheme(SchemeMode mode, bool justOnce) +{ + qDebug() << "--->" << Q_FUNC_INFO << "Mode" << mode << "just once" << justOnce; +} + +void ScreenEmu::lockScreen() +{ + qDebug() << "--->" << Q_FUNC_INFO; +} + +void ScreenEmu::releaseScreen() +{ + qDebug() << "--->" << Q_FUNC_INFO; +} + +void ScreenEmu::flushImage(QImage &/*img*/, const QPoint &/*point*/) +{ + qDebug() << "--->" << Q_FUNC_INFO; +} + +void ScreenEmu::restoreMode() +{ + qDebug() << "--->" << Q_FUNC_INFO; +} + +void ScreenEmu::refreshScreen(Screen::ScreenMode, int, QString) +{ + qDebug() << "--->" << Q_FUNC_INFO; +} + +void ScreenEmu::queueUpdates() +{ + qDebug() << "--->" << Q_FUNC_INFO; +} + +void ScreenEmu::flushUpdates() +{ + qDebug() << "--->" << Q_FUNC_INFO; +} + +void ScreenEmu::resetQueue() +{ + qDebug() << "--->" << Q_FUNC_INFO; +} + +void ScreenEmu::resetFlushQueue() +{ + qDebug() << "--->" << Q_FUNC_INFO; +} + +void ScreenEmu::flushColorScreen(Qt::GlobalColor color) +{ + qDebug() << "--->" << Q_FUNC_INFO; +} + +int ScreenEmu::screenWidth() const +{ + qDebug() << "--->" << Q_FUNC_INFO; + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + return 1072; + break; + case QBook::RES758x1024: + return 758; + break; + case QBook::RES600x800: default: + return 600; + break; + } +} + +int ScreenEmu::screenHeight() const +{ + qDebug() << "--->" << Q_FUNC_INFO; + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + return 1448; + break; + case QBook::RES758x1024: + return 1024; + break; + case QBook::RES600x800: default: + return 800; + break; + } +} + +void ScreenEmu::setScreenOrentation(ScreenOrientation /*orientation*/) +{ + qDebug() << Q_FUNC_INFO; +} diff --git a/bqHAL/Storage/mx508/src/StorageMx508.cpp b/bqHAL/Storage/mx508/src/StorageMx508.cpp index 7e5f6bd..f040518 100644 --- a/bqHAL/Storage/mx508/src/StorageMx508.cpp +++ b/bqHAL/Storage/mx508/src/StorageMx508.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 @@ -85,7 +85,8 @@ void StorageMx508::init (){ QString publicBlock; QString privateBlock; - if(DeviceInfo::getInstance()->getHwId() == DeviceInfo::E60Q22) + int hwid = DeviceInfo::getInstance()->getHwId(); + if(hwid == DeviceInfo::E60Q22 || hwid == DeviceInfo::E60QH2) { publicBlock = "mmcblk0p4"; privateBlock = "mmcblk0p7"; @@ -203,7 +204,24 @@ bool StorageMx508::startSharingOverUSB() { system("rmmod g_file_storage"); sharedDevices.clear(); - QString command = QString("modprobe g_file_storage stall=0 file=" + publicPartition->getDevice()); + + QString pid = "0xAD77"; + switch (DeviceInfo::getInstance()->getHwId()) { + case DeviceInfo::E606A2: + pid = "0xAD77"; + break; + case DeviceInfo::E60672: + pid = "0xAD76"; + break; + case DeviceInfo::E60Q22: + pid = "0xAD75"; + break; + case DeviceInfo::E60QH2: + pid = "0xAD78"; + break; + } + + QString command = QString("modprobe g_file_storage stall=0 vendor=0x2A47 product=" + pid + " file=" + publicPartition->getDevice()); sharedDevices << publicPartition->getDevice(); for (QMap::iterator it = _devices.begin(); it != _devices.end(); ++it) @@ -294,6 +312,8 @@ bool StorageMx508::restartSharingOverUSB() { QEventLoop waitingLoop; QTimer::singleShot(500, &waitingLoop, SLOT(quit())); waitingLoop.exec(); + + return true; } void StorageMx508::deviceUnshared(QString path) diff --git a/bqHome/Home1448.qrc b/bqHome/Home1448.qrc new file mode 100755 index 0000000..e830a36 --- /dev/null +++ b/bqHome/Home1448.qrc @@ -0,0 +1,29 @@ + + + res/1448/next_book.png + res/1448/next_book_disable.png + res/1448/previous_book.png + res/1448/previous_book_disable.png + res/1448/arrow.png + res/1448/arrow_popup.png + res/1448/help_app.png + res/1448/library_app.png + res/1448/search_app.png + res/1448/settings_app.png + res/1448/store_app.png + res/1448/book_front_bottom_center.png + res/1448/book_front_bottom_left.png + res/1448/book_front_bottom_right.png + res/1448/book_front_center_left.png + res/1448/book_front_center_right.png + res/1448/book_front_top_center.png + res/1448/book_front_top_left.png + res/1448/book_front_top_right.png + res/1448/bg_home.png + res/1448/unknow_book.png + res/1448/home_styles.qss + res/home_styles_generic.qss + res/1448/check_ico.png + res/1448/sample_tag_notext_sup.png + + diff --git a/bqHome/bqHome.pri b/bqHome/bqHome.pri index b2c4340..e27b5ed 100755 --- a/bqHome/bqHome.pri +++ b/bqHome/bqHome.pri @@ -25,9 +25,11 @@ FORMS += ./ui/Home.ui \ -QRC_FILES += Home800.qrc Home1024.qrc +QRC_FILES += Home800.qrc Home1024.qrc Home1448.qrc OTHER_FILES += \ bqHome/res/1024/home_styles.qss \ bqHome/res/home_styles_generic.qss \ - bqHome/res/800/home_styles.qss + bqHome/res/800/home_styles.qss \ + bqHome/res/1448/home_styles.qss + diff --git a/bqHome/res/1024/home_styles.qss b/bqHome/res/1024/home_styles.qss index 5d5ab7d..acc4d72 100644 --- a/bqHome/res/1024/home_styles.qss +++ b/bqHome/res/1024/home_styles.qss @@ -210,6 +210,8 @@ font-size:22px; #HomeBooksList,#homeBooksList,HomeBooksList{ min-height:352px; max-height:352px; +min-width:760px; +max-width:760px; } #previousCont{ min-width:50px; diff --git a/bqHome/res/1448/arrow.png b/bqHome/res/1448/arrow.png new file mode 100644 index 0000000..149873a Binary files /dev/null and b/bqHome/res/1448/arrow.png differ diff --git a/bqHome/res/1448/arrow_popup.png b/bqHome/res/1448/arrow_popup.png new file mode 100644 index 0000000..be89dd8 Binary files /dev/null and b/bqHome/res/1448/arrow_popup.png differ diff --git a/bqHome/res/1448/bg_home.png b/bqHome/res/1448/bg_home.png new file mode 100644 index 0000000..cbe5010 Binary files /dev/null and b/bqHome/res/1448/bg_home.png differ diff --git a/bqHome/res/1448/book_front_bottom_center.png b/bqHome/res/1448/book_front_bottom_center.png new file mode 100644 index 0000000..a13787e Binary files /dev/null and b/bqHome/res/1448/book_front_bottom_center.png differ diff --git a/bqHome/res/1448/book_front_bottom_left.png b/bqHome/res/1448/book_front_bottom_left.png new file mode 100644 index 0000000..6ee1149 Binary files /dev/null and b/bqHome/res/1448/book_front_bottom_left.png differ diff --git a/bqHome/res/1448/book_front_bottom_right.png b/bqHome/res/1448/book_front_bottom_right.png new file mode 100644 index 0000000..14f0397 Binary files /dev/null and b/bqHome/res/1448/book_front_bottom_right.png differ diff --git a/bqHome/res/1448/book_front_center_left.png b/bqHome/res/1448/book_front_center_left.png new file mode 100644 index 0000000..4d71871 Binary files /dev/null and b/bqHome/res/1448/book_front_center_left.png differ diff --git a/bqHome/res/1448/book_front_center_right.png b/bqHome/res/1448/book_front_center_right.png new file mode 100644 index 0000000..cc733a0 Binary files /dev/null and b/bqHome/res/1448/book_front_center_right.png differ diff --git a/bqHome/res/1448/book_front_top_center.png b/bqHome/res/1448/book_front_top_center.png new file mode 100644 index 0000000..273346a Binary files /dev/null and b/bqHome/res/1448/book_front_top_center.png differ diff --git a/bqHome/res/1448/book_front_top_left.png b/bqHome/res/1448/book_front_top_left.png new file mode 100644 index 0000000..9f6fada Binary files /dev/null and b/bqHome/res/1448/book_front_top_left.png differ diff --git a/bqHome/res/1448/book_front_top_right.png b/bqHome/res/1448/book_front_top_right.png new file mode 100644 index 0000000..ad6e1a5 Binary files /dev/null and b/bqHome/res/1448/book_front_top_right.png differ diff --git a/bqHome/res/1448/check_ico.png b/bqHome/res/1448/check_ico.png new file mode 100755 index 0000000..070a695 Binary files /dev/null and b/bqHome/res/1448/check_ico.png differ diff --git a/bqHome/res/1448/help_app.png b/bqHome/res/1448/help_app.png new file mode 100644 index 0000000..491e557 Binary files /dev/null and b/bqHome/res/1448/help_app.png differ diff --git a/bqHome/res/1448/home_styles.qss b/bqHome/res/1448/home_styles.qss new file mode 100644 index 0000000..680716c --- /dev/null +++ b/bqHome/res/1448/home_styles.qss @@ -0,0 +1,500 @@ +/************************************************************************* + +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 . + +*************************************************************************/ + +/*Home +-------------------*/ +#Home{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#mainBookInfoCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 543px; +max-height: 543px; +} +#currentBookCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 543px; +max-height: 543px; +} +#readBookBtn{ +min-width: 1072px; +max-width: 1072px; +min-height: 543px; +max-height: 543px; +} +#currentBookCoverLbl, #currentBookCoverCont{ +min-width: 247px; +max-width: 247px; +min-height: 369px; +max-height: 369px; +} +#currentBookCoverCont #newTagLbl{ +min-width: 247px; +max-width: 247px; +min-height: 379px; +max-height: 379px; +padding: 0px 0px - 4px 0px; +font-size: 27px; +} +#currentBookCoverCont #sampleTagLbl{ +min-width: 122px; +max-width: 122px; +min-height: 122px; +max-height: 122px; +margin: 0px 0px 0px 0px; +padding: 0px 0px 0px 0px; +font-size: 27px; +} +#currentBookCoverCont #subscriptionTagLbl{ +min-width: 122px; +max-width: 122px; +min-height: 122px; +max-height: 122px; +margin: 0px 0px 0px 0px; +padding: 0px 0px 0px 0px; +font-size: 27px; +} +#currentBookTopLeft{ +min-width: 52px; +max-width: 52px; +min-height: 106px; +max-height: 106px; +} +#currentBookTopCenter{ +min-width: 247px; +max-width: 247px; +min-height: 106px; +max-height: 106px; +} +#currentBookTopRight{ +min-width: 72px; +max-width: 72px; +min-height: 106px; +max-height: 106px; +} +#currentBookCenterLeft{ +min-width: 52px; +max-width: 52px; +min-height: 369px; +max-height: 369px; +} +#currentBookCenterRight{ +min-width: 72px; +max-width: 72px; +min-height: 369px; +max-height: 369px; +} +#currentBookBottomLeft{ +min-width: 52px; +max-width: 52px; +min-height: 42px; +max-height: 42px; +} +#currentBookBottomCenter{ +min-width: 247px; +max-width: 247px; +min-height: 42px; +max-height: 42px; +} +#currentBookBottomRight{ +min-width: 72px; +max-width: 72px; +min-height: 42px; +max-height: 42px; +} +#currentBookData{ +min-width: 552px; +max-width: 552px; +} +#currentBookCont #readingLbl{ +margin: 120px 0px 11px 0px; +font-size: 44px; +} +#currentBookCont #bookTitleLbl{ +font-size: 52px; +font-weight:bold; +margin-bottom: 6px; +} +#currentBookCont #authorLbl{ +margin: 14px 0 7px; +font-size: 37px; +} +#currentBookCont #pagLbl,#currentBookCont #currentPagLbl,#currentBookCont #endBracketsLbl,#currentBookCont #separatorLbl,#currentBookCont #totalPagLbl{ +margin: 18px 0px 0px 0px; +font-size: 31px; +} +#currentBookCont #readLbl,#currentBookCont #separatorReadLbl,#currentBookCont #percentLbl{ +margin: 8px 8px 0px 0px; +font-size: 31px; +} +#currentBookCont #readingPercentLbl{ +margin: 8px 8px 0px 3px; +font-size: 31px; +} +#actionsBar{ +min-height: 78px; +max-height: 78px; +} +#homeBooksList{ +min-height: 498px; +max-height: 498px; +} +#actionsBar #recommendedBtn{ +padding: 0px 72px 0px 0px; +min-height: 49px; +max-height: 64px; +font-size: 35px; +} +#showAllBtn{ +min-height: 64px; +max-height: 64px; +font-size: 34px; +} +#appMenu{ +min-height: 238px; +max-height: 238px; +} +#appMenu QPushButton{ +min-height: 163px; +max-height: 163px; +font-size: 35px; +} +#searchBtn{ +} +#libraryBtn{ +} +#storeBtn{ +} +#settingsBtn{ +} +#helpBtn{ +} +/*New styles +------------------*/ +#lastAccessCont{ +} +#dateAccessLbl,#lastAccessLbl{ +margin: 17px 8px 0px - 6px; +font-size: 31px; +} +#bookAccessCont{ +} +#bookAccessLbl,#numberAccessLbl{ +margin: 11px 8px 0px - 6px; +font-size: 31px; +} +/*HomeBookList +------------------*/ +#HomeBooksList,#homeBooksList,HomeBooksList{ +min-height: 498px; +max-height: 498px; +} +#previousCont{ +min-width: 71px; +max-width: 71px; +} +#previousBtn{ +min-width: 71px; +max-width: 71px; +min-height: 99px; +max-height: 99px; +} +#nextCont{ +min-width: 59px; +max-width: 59px; +} +#nextBtn{ +margin: 0px 14px 0px 0px; +min-width: 59px; +max-width: 59px; +min-height: 99px; +max-height: 99px; +} +#cover1Cont{ +} +#cover1Cont #topLeft1Lbl{ +min-width: 14px; +max-width: 14px; +min-height: 14px; +max-height: 14px; +} +#cover1Cont #topCenter1Lbl{ +min-width: 247px; +max-width: 247px; +min-height: 14px; +max-height: 14px; +} +#cover1Cont #topRight1Lbl{ +min-width: 45px; +max-width: 45px; +min-height: 14px; +max-height: 14px; +} +#cover1Cont #centerLeft1Lbl{ +min-width: 14px; +max-width: 14px; +min-height: 369px; +max-height: 369px; +} +#cover1Cont #cover1Lbl, #cover1Cont #cover1, #cover1Cont HomeBooksListItem{ +min-width: 247px; +max-width: 247px; +min-height: 369px; +max-height: 369px; +} +#cover1Cont #centerRight1Lbl{ +min-width: 45px; +max-width: 45px; +min-height: 369px; +max-height: 369px; +} +#cover1Cont #bottomLeft1Lbl{ +min-width: 14px; +max-width: 14px; +min-height: 42px; +max-height: 42px; +} +#cover1Cont #bottomCenter1Lbl{ +min-width: 247px; +max-width: 247px; +min-height: 42px; +max-height: 42px; +} +#cover1Cont #bottomRight1Lbl{ +min-width: 45px; +max-width: 45px; +min-height: 42px; +max-height: 42px; +} +#cover2Cont #topLeft2Lbl{ +min-width: 17px; +max-width: 17px; +min-height: 14px; +max-height: 14px; +} +#cover2Cont #topCenter2Lbl{ +min-width: 247px; +max-width: 247px; +min-height: 14px; +max-height: 14px; +} +#cover2Cont #topRight2Lbl{ +min-width: 45px; +max-width: 45px; +min-height: 14px; +max-height: 14px; +} +#cover2Cont #centerLeft2Lbl{ +min-width: 17px; +max-width: 17px; +min-height: 369px; +max-height: 369px; +} +#cover2Cont #cover2Lbl, #cover2Cont #cover2, #cover2Cont HomeBooksListItem{ +min-width: 247px; +max-width: 247px; +min-height: 369px; +max-height: 369px; +} +#cover2Cont #centerRight2Lbl{ +min-width: 45px; +max-width: 45px; +min-height: 369px; +max-height: 369px; +} +#cover2Cont #bottomLeft2Lbl{ +min-width: 17px; +max-width: 17px; +min-height: 42px; +max-height: 42px; +} +#cover2Cont #bottomCenter2Lbl{ +min-width: 247px; +max-width: 247px; +min-height: 42px; +max-height: 42px; +} +#cover2Cont #bottomRight2Lbl{ +min-width: 45px; +max-width: 45px; +min-height: 42px; +max-height: 42px; +} +#cover3Cont #topLeft3Lbl{ +min-width: 17px; +max-width: 17px; +min-height: 14px; +max-height: 14px; +} +#cover3Cont #topCenter3Lbl{ +min-width: 247px; +max-width: 247px; +min-height: 14px; +max-height: 14px; +} +#cover3Cont #topRight3Lbl{ +min-width: 27px; +max-width: 27px; +min-height: 14px; +max-height: 14px; +} +#cover3Cont #centerLeft3Lbl{ +min-width: 17px; +max-width: 17px; +min-height: 369px; +max-height: 369px; +} +#cover3Cont #cover3Lbl, #cover3Cont #cover3, #cover3Cont HomeBooksListItem{ +min-width: 247px; +max-width: 247px; +min-height: 369px; +max-height: 369px; +} +#cover3Cont #centerRight3Lbl{ +min-width: 27px; +max-width: 27px; +min-height: 369px; +max-height: 369px; +} +#cover3Cont #bottomLeft3Lbl{ +min-width: 17px; +max-width: 17px; +min-height: 42px; +max-height: 42px; +} +#cover3Cont #bottomCenter3Lbl{ +min-width: 247px; +max-width: 247px; +min-height: 42px; +max-height: 42px; +} +#cover3Cont #bottomRight3Lbl{ +min-width: 27px; +max-width: 27px; +min-height: 42px; +max-height: 42px; +} +/*HomeBookList +-------------------------*/ +#HomeBooksListItem{ +min-width: 247px; +max-width: 247px; +min-height: 369px; +max-height: 369px; +} +#HomeBooksListItem #coverLbl,HomeBooksListItem #coverLbl{ +min-width: 247px; +max-width: 247px; +min-height: 369px; +max-height: 369px; +} +#authorLabel, #coverAuthorLbl{ +min-width: 253px; +max-width: 253px; +font-size: 25px; +min-height: 35px; +max-height: 35px; +padding-top: 264px; +} +#titleLabel, #coverTitleLbl{ +min-width: 253px; +max-width: 253px; +min-height: 72px; +max-height: 72px; +padding-top: 209px; +font-size: 28px; +} +/*HomeBooksListOptions +----------------*/ +#HomeBooksListOptions{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#HomeBooksListOptionsCont{ +min-width: 764px; +max-width: 764px; +min-height: 495px; +max-height: 495px; +} +#HomeBooksListOptions #spacerTop{ +min-height: 573px; +max-height: 573px; +} +#HomeBooksListOptions #spacerLeft{ +min-width: 42px; +max-width: 42px; +background:none; +} +#arrowPopupLbl{ +min-height: 24px; +max-height: 24px; +} +#optionsListCont{ +border-width: 7px; +border-radius: 14px; +} +#optionsListCont QPushButton{ +font-size: 38px; +padding: 0px 0px 0px 28px; +border-width: 3px; +} +/*New, sanpled and archived tags +---------------------------------*/ +#newTagLbl{ +min-width: 247px; +max-width: 247px; +min-height: 375px; +max-height: 375px; +padding: 0px 0px - 4px 0px; +font-size: 27px; +} +#archiveTagLbl{ +min-width: 247px; +max-width: 247px; +min-height: 369px; +max-height: 369px; +padding: 0px 0px 0px 0px; +font-size: 27px; +} +#sampleTagLbl{ +min-width: 122px; +max-width: 122px; +min-height: 122px; +max-height: 122px; +margin: 0px 0px 0px 0px; +padding: 0px 0px 0px 0px; +font-size: 27px; +} +#subscriptionTagLbl{ +min-width: 122px; +max-width: 122px; +min-height: 122px; +max-height: 122px; +margin: 0px 0px 0px 0px; +padding: 0px 0px 0px 0px; +font-size: 27px; +} diff --git a/bqHome/res/1448/library_app.png b/bqHome/res/1448/library_app.png new file mode 100644 index 0000000..f0f30bf Binary files /dev/null and b/bqHome/res/1448/library_app.png differ diff --git a/bqHome/res/1448/next_book.png b/bqHome/res/1448/next_book.png new file mode 100755 index 0000000..861112b Binary files /dev/null and b/bqHome/res/1448/next_book.png differ diff --git a/bqHome/res/1448/next_book_disable.png b/bqHome/res/1448/next_book_disable.png new file mode 100755 index 0000000..1227e6c Binary files /dev/null and b/bqHome/res/1448/next_book_disable.png differ diff --git a/bqHome/res/1448/previous_book.png b/bqHome/res/1448/previous_book.png new file mode 100755 index 0000000..5109fc7 Binary files /dev/null and b/bqHome/res/1448/previous_book.png differ diff --git a/bqHome/res/1448/previous_book_disable.png b/bqHome/res/1448/previous_book_disable.png new file mode 100755 index 0000000..6fdbe39 Binary files /dev/null and b/bqHome/res/1448/previous_book_disable.png differ diff --git a/bqHome/res/1448/sample_tag_notext_sup.png b/bqHome/res/1448/sample_tag_notext_sup.png new file mode 100755 index 0000000..2ec89ee Binary files /dev/null and b/bqHome/res/1448/sample_tag_notext_sup.png differ diff --git a/bqHome/res/1448/search_app.png b/bqHome/res/1448/search_app.png new file mode 100644 index 0000000..b5c5079 Binary files /dev/null and b/bqHome/res/1448/search_app.png differ diff --git a/bqHome/res/1448/settings_app.png b/bqHome/res/1448/settings_app.png new file mode 100644 index 0000000..9b2481c Binary files /dev/null and b/bqHome/res/1448/settings_app.png differ diff --git a/bqHome/res/1448/store_app.png b/bqHome/res/1448/store_app.png new file mode 100644 index 0000000..c010b65 Binary files /dev/null and b/bqHome/res/1448/store_app.png differ diff --git a/bqHome/res/1448/unknow_book.png b/bqHome/res/1448/unknow_book.png new file mode 100755 index 0000000..37537f7 Binary files /dev/null and b/bqHome/res/1448/unknow_book.png differ diff --git a/bqHome/src/Home.cpp b/bqHome/src/Home.cpp index 0a59543..f619760 100644 --- a/bqHome/src/Home.cpp +++ b/bqHome/src/Home.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 @@ -71,12 +71,13 @@ Home::Home(QWidget *parent) : QBookForm(parent), QString styles = QLatin1String(fileSpecific.readAll() + fileCommons.readAll()); setStyleSheet(styles); - if(QBook::getResolution() == QBook::RES600x800){ + if(QBook::getInstance()->getResolution() == QBook::RES600x800){ defaultHelpBook = new BookInfo(QString(USERGUIDEPATH) + "/userGuideTouch_" + QBook::settings().value("setting/language", QVariant("es")).toString()+ ".epub"); }else{ //We do it to preserve back compatibility defaultHelpBook = new BookInfo(QString(USERGUIDEPATH) + "/userGuide_" + QBook::settings().value("setting/language", QVariant("es")).toString()+ ".epub"); } + //TODO CERVANTES3?? defaultHelpBook->title = tr("Guia de Ayuda"); defaultHelpBook->thumbnail = ":/res/unknow_book.png"; @@ -416,7 +417,7 @@ void Home::setMostRecentBook(const BookInfo* book){ coverTitleLbl->show(); // Author - if(book->author == "--") + if(book->author == "---") coverAuthorLbl->setText(tr("Autor Desconocido")); else coverAuthorLbl->setText(bqUtils::truncateStringToLength(book->author, ICON_HOME_STRING_MAX_LENGTH)); diff --git a/bqHome/tr/bqHome_ca.ts b/bqHome/tr/bqHome_ca.ts index 18a9be5..0849c3a 100755 --- a/bqHome/tr/bqHome_ca.ts +++ b/bqHome/tr/bqHome_ca.ts @@ -56,7 +56,7 @@ Último acceso: - Últim accés: + Últim accés: @@ -81,7 +81,7 @@ Ver todos > - Veure tots > + Mostra-ho tot > @@ -101,7 +101,7 @@ Ajustes - Ajusts + Configuració diff --git a/bqHome/tr/bqHome_de.ts b/bqHome/tr/bqHome_de.ts index c43bbe2..f054565 100644 --- a/bqHome/tr/bqHome_de.ts +++ b/bqHome/tr/bqHome_de.ts @@ -58,7 +58,7 @@ Último acceso: - Letzter Zugriff: + Letzter Zugriff: diff --git a/bqHome/tr/bqHome_en.ts b/bqHome/tr/bqHome_en.ts index 4ea7664..f038d93 100755 --- a/bqHome/tr/bqHome_en.ts +++ b/bqHome/tr/bqHome_en.ts @@ -56,7 +56,7 @@ Último acceso: - Last opened: + Last opened: diff --git a/bqHome/tr/bqHome_es.ts b/bqHome/tr/bqHome_es.ts index 0ce1891..4a3da21 100755 --- a/bqHome/tr/bqHome_es.ts +++ b/bqHome/tr/bqHome_es.ts @@ -56,7 +56,7 @@ Último acceso: - Último acceso: + Último acceso: diff --git a/bqHome/tr/bqHome_eu.ts b/bqHome/tr/bqHome_eu.ts index 3e01fce..4dffbfc 100755 --- a/bqHome/tr/bqHome_eu.ts +++ b/bqHome/tr/bqHome_eu.ts @@ -109,7 +109,7 @@ Último acceso: - Azken irakurketa: + Azken irakurketa: Fecha de acceso diff --git a/bqHome/tr/bqHome_gl.ts b/bqHome/tr/bqHome_gl.ts index 288aabc..5d083f4 100644 --- a/bqHome/tr/bqHome_gl.ts +++ b/bqHome/tr/bqHome_gl.ts @@ -56,7 +56,7 @@ Último acceso: - Último acceso: + Último acceso: diff --git a/bqHome/tr/bqHome_it.ts b/bqHome/tr/bqHome_it.ts index 7184ed2..4cbdfeb 100644 --- a/bqHome/tr/bqHome_it.ts +++ b/bqHome/tr/bqHome_it.ts @@ -56,7 +56,7 @@ Último acceso: - Ultimo accesso: + Ultimo accesso: diff --git a/bqHome/tr/bqHome_pt.ts b/bqHome/tr/bqHome_pt.ts index ccf094c..2e6fc1c 100755 --- a/bqHome/tr/bqHome_pt.ts +++ b/bqHome/tr/bqHome_pt.ts @@ -56,7 +56,7 @@ Último acceso: - Último acesso: + Último acesso: @@ -86,7 +86,7 @@ Buscador - Pesquisar + Procurar diff --git a/bqHome/ui/Home.ui b/bqHome/ui/Home.ui index 126b330..10cf5b5 100755 --- a/bqHome/ui/Home.ui +++ b/bqHome/ui/Home.ui @@ -6,8 +6,8 @@ 0 0 - 758 - 960 + 1072 + 1358 @@ -18,14 +18,14 @@ - 758 - 960 + 0 + 0 - 758 - 960 + 1072 + 1358 @@ -38,7 +38,7 @@ Form - + @@ -57,8 +57,8 @@ - 758 - 384 + 1072 + 543 @@ -66,8 +66,8 @@ 0 0 - 758 - 384 + 1072 + 543 @@ -86,28 +86,28 @@ 0 - + - + - + - + - + - + - + @@ -116,18 +116,18 @@ - + - + - + - + @@ -136,72 +136,72 @@ - + - + - + - + - + - + Qt::Vertical - 20 - 40 + 28 + 57 - + Qt::Vertical - 5 - 40 + 7 + 57 - + Qt::Vertical - 20 - 40 + 28 + 57 - + 0 0 - 175 - 261 + 247 + 369 @@ -211,7 +211,7 @@ - + Qt::AlignCenter @@ -222,8 +222,8 @@ 0 0 - 86 - 86 + 122 + 122 @@ -234,8 +234,8 @@ - 86 - 86 + 122 + 122 @@ -256,8 +256,8 @@ 0 0 - 175 - 265 + 247 + 375 @@ -268,8 +268,8 @@ - 175 - 265 + 247 + 375 @@ -290,12 +290,12 @@ 0 0 - 179 - 199 + 253 + 281 - + Qt::AlignCenter @@ -309,12 +309,12 @@ 0 0 - 179 - 222 + 253 + 314 - + Qt::AlignHCenter|Qt::AlignTop @@ -331,8 +331,8 @@ 0 0 - 86 - 86 + 122 + 122 @@ -343,12 +343,12 @@ - 86 - 86 + 122 + 122 - Subscripción + Subscripción Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft @@ -418,7 +418,7 @@ - Juan Francisco Ferrándiz + Juan Francisco Ferrándiz Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -456,7 +456,7 @@ - Leído + Leído 0 @@ -470,8 +470,8 @@ - 40 - 20 + 57 + 28 @@ -489,7 +489,7 @@ - Último acceso: + Último acceso: @@ -507,8 +507,8 @@ - 40 - 20 + 57 + 28 @@ -533,7 +533,7 @@ - Número + Número @@ -544,8 +544,8 @@ - 40 - 20 + 57 + 28 @@ -559,8 +559,8 @@ - 20 - 40 + 28 + 57 @@ -578,8 +578,8 @@ - 40 - 20 + 57 + 28 @@ -591,15 +591,15 @@ 0 0 - 762 - 388 + 1078 + 549 Qt::NoFocus - + @@ -613,7 +613,7 @@ - + @@ -632,8 +632,8 @@ - 40 - 20 + 57 + 28 @@ -649,7 +649,7 @@ 16777215 - 49 + 69 @@ -667,8 +667,8 @@ - 40 - 20 + 57 + 28 @@ -684,7 +684,7 @@ 16777215 - 49 + 69 @@ -705,8 +705,8 @@ - 40 - 20 + 57 + 28 @@ -730,8 +730,8 @@ - 20 - 353 + 28 + 499 @@ -804,6 +804,11 @@ + + SilentQPushButton + QPushButton +
SilentQPushButton.h
+ ElidedLabel QLabel @@ -814,11 +819,6 @@ QLabel
DegreesLabel45.h
 - - SilentQPushButton - QPushButton -
SilentQPushButton.h
- HomeBooksList QWidget @@ -826,6 +826,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqHome/ui/HomeBooksList.ui b/bqHome/ui/HomeBooksList.ui index 0e46954..6e8f8da 100755 --- a/bqHome/ui/HomeBooksList.ui +++ b/bqHome/ui/HomeBooksList.ui @@ -1,744 +1,742 @@ - - - HomeBooksList - - - - 0 - 0 - 758 - 352 - - - - - 0 - 0 - - - - - 600 - 352 - - - - - 758 - 352 - - - - Form - - - - - - - 0 - - - 0 - - - - - Qt::NoFocus - - - - - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 10 - 10 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - 10 - 265 - - - - - - - - - - - - 0 - 0 - - - - - 10 - 30 - - - - - - - - - - - - 0 - 0 - - - - - 32 - 30 - - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::Vertical - - - - 2 - 40 - - - - - - - - Qt::Vertical - - - - 5 - 40 - - - - - - - - - 0 - 0 - - - - - - - - - - - - 175 - 265 - - - - - - - - - 0 - 0 - - - - - 32 - 265 - - - - - 32 - 265 - - - - - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 1 - 5 - - - - - - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 32 - 10 - - - - - 32 - 10 - - - - - - - - - - - Qt::Vertical - - - - 5 - 40 - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - 32 - 265 - - - - - 32 - 265 - - - - - - - - - - - - - - - 0 - 0 - - - - - 12 - 30 - - - - - - - - - - - - 0 - 0 - - - - - 12 - 10 - - - - - - - - - - - Qt::Vertical - - - - 5 - 40 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 0 - 0 - - - - - 12 - 265 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - 32 - 30 - - - - - 32 - 30 - - - - - - - - - - - - - - Qt::Horizontal - - - - 1 - 5 - - - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 12 - 10 - - - - - 12 - 10 - - - - - - - - - - - Qt::Vertical - - - - 5 - 40 - - - - - - - - Qt::Vertical - - - - 5 - 40 - - - - - - - - - 0 - 0 - - - - - 19 - 30 - - - - - - - - - - - - 0 - 0 - - - - - 12 - 30 - - - - - 12 - 30 - - - - - - - - - - - - 0 - 0 - - - - - 19 - 10 - - - - - - - - - - - Qt::Vertical - - - - 5 - 40 - - - - - - - - - 0 - 0 - - - - - 19 - 265 - - - - - 19 - 265 - - - - - - - - - - - - 0 - 0 - - - - - 12 - 265 - - - - - 12 - 265 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::NoFocus - - - - - - - - - - - HomeBooksListItem - QWidget -
HomeBooksListItem.h
- 1 - - - - - - - + + + HomeBooksList + + + + 0 + 0 + 1072 + 498 + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 1072 + 498 + + + + Form + + + + + + + 0 + + + 0 + + + + + Qt::NoFocus + + + + + + + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 10 + 10 + + + + + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + + 10 + 265 + + + + + + + + + + + + 0 + 0 + + + + + 10 + 30 + + + + + + + + + + + + 0 + 0 + + + + + 32 + 30 + + + + + + + + + + + + + + Qt::Vertical + + + + 28 + 57 + + + + + + + + Qt::Vertical + + + + 3 + 57 + + + + + + + + Qt::Vertical + + + + 7 + 57 + + + + + + + + + 0 + 0 + + + + + + + + + + + + 175 + 265 + + + + + + + + + 0 + 0 + + + + + 32 + 265 + + + + + 45 + 375 + + + + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 1 + 7 + + + + + + + + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 32 + 10 + + + + + 45 + 14 + + + + + + + + + + + Qt::Vertical + + + + 7 + 57 + + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + + 32 + 265 + + + + + 45 + 375 + + + + + + + + + + + + + + + 0 + 0 + + + + + 12 + 30 + + + + + + + + + + + + 0 + 0 + + + + + 12 + 10 + + + + + + + + + + + Qt::Vertical + + + + 7 + 57 + + + + + + + + Qt::Vertical + + + + 28 + 57 + + + + + + + + + 0 + 0 + + + + + 12 + 265 + + + + + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + + 32 + 30 + + + + + 45 + 42 + + + + + + + + + + + + + + Qt::Horizontal + + + + 1 + 7 + + + + + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 12 + 10 + + + + + 17 + 14 + + + + + + + + + + + Qt::Vertical + + + + 7 + 57 + + + + + + + + Qt::Vertical + + + + 7 + 57 + + + + + + + + + 0 + 0 + + + + + 19 + 30 + + + + + + + + + + + + 0 + 0 + + + + + 12 + 30 + + + + + 17 + 42 + + + + + + + + + + + + 0 + 0 + + + + + 19 + 10 + + + + + + + + + + + Qt::Vertical + + + + 7 + 57 + + + + + + + + + 0 + 0 + + + + + 19 + 265 + + + + + 27 + 375 + + + + + + + + + + + + 0 + 0 + + + + + 12 + 265 + + + + + 17 + 375 + + + + + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + + + + + + + + + + + + + + Qt::Horizontal + + + + 57 + 28 + + + + + + + + Qt::NoFocus + + + + + + + + + + + HomeBooksListItem + QWidget +
HomeBooksListItem.h
+ 1 + + + + + \ No newline at end of file diff --git a/bqHome/ui/HomeBooksListItem.ui b/bqHome/ui/HomeBooksListItem.ui index e0b7fc8..51d3b6a 100755 --- a/bqHome/ui/HomeBooksListItem.ui +++ b/bqHome/ui/HomeBooksListItem.ui @@ -6,23 +6,23 @@ 0 0 - 175 - 261 + 247 + 369 Form - + 0 0 - 175 - 261 + 247 + 369 @@ -32,7 +32,7 @@ - + Qt::AlignCenter @@ -43,8 +43,8 @@ 0 0 - 175 - 262 + 247 + 371 @@ -55,8 +55,8 @@ - 175 - 262 + 247 + 371 @@ -77,8 +77,8 @@ 0 0 - 86 - 86 + 122 + 122 @@ -89,8 +89,8 @@ - 86 - 86 + 122 + 122 @@ -108,8 +108,8 @@ 0 0 - 179 - 222 + 253 + 314 @@ -119,7 +119,7 @@ - + Qt::AlignCenter @@ -133,8 +133,8 @@ 0 0 - 179 - 199 + 253 + 281 @@ -144,7 +144,7 @@ - + Qt::AlignCenter @@ -155,8 +155,8 @@ 0 0 - 86 - 86 + 122 + 122 @@ -167,12 +167,12 @@ - 86 - 86 + 122 + 122 - Subscripción + Subscripción Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft @@ -189,6 +189,6 @@
DegreesLabel45.h
- - - + + + \ No newline at end of file diff --git a/bqHome/ui/HomeBooksListOptions.ui b/bqHome/ui/HomeBooksListOptions.ui index 9c89102..a92c554 100755 --- a/bqHome/ui/HomeBooksListOptions.ui +++ b/bqHome/ui/HomeBooksListOptions.ui @@ -6,27 +6,27 @@ 0 0 - 758 - 960 + 1072 + 1358 - 758 - 960 + 0 + 0 - 758 - 960 + 1072 + 1358 Form - + @@ -38,7 +38,7 @@ - + @@ -60,14 +60,14 @@ - + - + @@ -82,14 +82,14 @@ - + - + @@ -108,8 +108,8 @@ - 20 - 5 + 28 + 7 @@ -123,7 +123,7 @@ - + Recomendados para ti @@ -179,8 +179,8 @@ - 20 - 5 + 28 + 7 @@ -198,8 +198,8 @@ - 40 - 20 + 57 + 28 @@ -214,14 +214,14 @@ - 20 - 40 + 28 + 57 - - - + + + \ No newline at end of file diff --git a/bqLibrary/Library1024.qrc b/bqLibrary/Library1024.qrc index 8ff6ec9..cfced0b 100755 --- a/bqLibrary/Library1024.qrc +++ b/bqLibrary/Library1024.qrc @@ -66,7 +66,6 @@ res/1024/book_summary_front_top_center.png res/1024/book_summary_front_top_left.png res/1024/book_summary_front_top_right.png - res/1024/bg_library_01.png res/1024/arrow_bottom_pager.png res/1024/arrow_top_pager.png res/1024/open_book_small_bottom_center.png @@ -103,7 +102,6 @@ res/1024/search_library_btn.png res/1024/store_btn.png res/1024/bg_sd.png - res/1024/bg_library_new.png res/1024/ckeck-group.png res/1024/edit-icon.png res/1024/export-icon.png diff --git a/bqLibrary/Library1024.qrc~ b/bqLibrary/Library1024.qrc~ deleted file mode 100755 index e1e7b17..0000000 --- a/bqLibrary/Library1024.qrc~ +++ /dev/null @@ -1,93 +0,0 @@ - - - res/1024/bg_footer.png - res/1024/brightness_max.png - res/1024/brightness_min.png - res/1024/check.png - res/1024/checked.png - res/1024/corrupted_file_ico.png - res/1024/doc_file_ico.png - res/1024/down_arrow.png - res/1024/folder_ico.png - res/1024/gif_file_ico.png - res/1024/icon_view.png - res/1024/jpg_file_ico.png - res/1024/list_view.png - res/1024/pdf_file_ico.png - res/1024/png_file_ico.png - res/1024/progress_Indicator.png - res/1024/qsg.png - res/1024/search_ico.png - res/1024/synchronize_cloud.png - res/1024/txt_file_ico.png - res/1024/unknow_file.png - res/1024/up_arrow.png - res/1024/up_level.png - res/1024/new_list.png - res/1024/sample_list.png - res/1024/up_level_list.png - res/1024/bg_library.png - res/1024/arrow.png - res/1024/bg_icon_books.png - res/1024/book_front.png - res/1024/book_front_bottom_center.png - res/1024/book_front_bottom_left.png - res/1024/book_front_bottom_right.png - res/1024/book_front_center_left.png - res/1024/book_front_center_right.png - res/1024/book_front_top_center.png - res/1024/book_front_top_left.png - res/1024/book_front_top_right.png - res/1024/no_cover.png - res/1024/unknow_file_ico.png - res/1024/bookmark_tag.png - res/1024/sample_tag.png - res/1024/new_tag.png - res/1024/arrow_bottom.png - res/1024/arrow_top.png - res/1024/select_book.png - res/library_styles_generic.qss - res/1024/library_styles.qss - res/1024/book_pdf_list_big.png - res/1024/doc_list_big.png - res/1024/epub_list_big.png - res/1024/folder_list_big.png - res/1024/gif_list_big.png - res/1024/img_list_big.png - res/1024/jpg_list_big.png - res/1024/pdf_list_big.png - res/1024/png_list_big.png - res/1024/txt_list_big.png - res/1024/unknow_list_big.png - res/1024/book_summary_front_bottom_center.png - res/1024/book_summary_front_bottom_left.png - res/1024/book_summary_front_bottom_right.png - res/1024/book_summary_front_center_left.png - res/1024/book_summary_front_center_right.png - res/1024/book_summary_front_cover.png - res/1024/book_summary_front_top_center.png - res/1024/book_summary_front_top_left.png - res/1024/book_summary_front_top_right.png - res/1024/bg_library_01.png - res/1024/arrow_bottom_pager.png - res/1024/arrow_top_pager.png - res/1024/open_book_small_bottom_center.png - res/1024/open_book_small_bottom_left.png - res/1024/open_book_small_bottom_right.png - res/1024/open_book_small_center_center.jpg - res/1024/open_book_small_center_left.png - res/1024/open_book_small_center_right.png - res/1024/open_book_small_top_center.png - res/1024/open_book_small_top_left.png - res/1024/open_book_small_top_right.png - res/1024/book_epub_list_big.png - res/1024/doc_book_ico.png - res/1024/pdf_book_ico.png - res/1024/txt_book_ico.png - res/1024/unknown_book_ico.png - res/1024/new_list_notext.png - res/1024/sample_list_notext.png - res/1024/sample_tag_notext.png - res/1024/epub_book_ico.png - - diff --git a/bqLibrary/Library1448.qrc b/bqLibrary/Library1448.qrc new file mode 100755 index 0000000..9695d46 --- /dev/null +++ b/bqLibrary/Library1448.qrc @@ -0,0 +1,119 @@ + + + res/1448/bg_footer.png + res/1448/check.png + res/1448/checked.png + res/1448/corrupted_file_ico.png + res/1448/doc_file_ico.png + res/1448/down_arrow.png + res/1448/folder_ico.png + res/1448/gif_file_ico.png + res/1448/jpg_file_ico.png + res/1448/pdf_file_ico.png + res/1448/png_file_ico.png + res/1448/qsg.png + res/1448/search_ico.png + res/1448/synchronize_cloud.png + res/1448/txt_file_ico.png + res/1448/unknow_file.png + res/1448/up_arrow.png + res/1448/up_level.png + res/1448/up_level_list.png + res/1448/bg_library.png + res/1448/arrow.png + res/1448/book_front_bottom_center.png + res/1448/book_front_bottom_left.png + res/1448/book_front_bottom_right.png + res/1448/book_front_center_left.png + res/1448/book_front_center_right.png + res/1448/book_front_top_center.png + res/1448/book_front_top_left.png + res/1448/book_front_top_right.png + res/1448/no_cover.png + res/1448/unknow_file_ico.png + res/1448/bookmark_tag.png + res/1448/new_tag.png + res/1448/arrow_bottom.png + res/1448/arrow_top.png + res/1448/select_book.png + res/library_styles_generic.qss + res/1448/library_styles.qss + res/1448/book_pdf_list_big.png + res/1448/doc_list_big.png + res/1448/epub_list_big.png + res/1448/folder_list_big.png + res/1448/gif_list_big.png + res/1448/img_list_big.png + res/1448/jpg_list_big.png + res/1448/pdf_list_big.png + res/1448/png_list_big.png + res/1448/txt_list_big.png + res/1448/unknow_list_big.png + res/1448/book_summary_front_bottom_center.png + res/1448/book_summary_front_bottom_left.png + res/1448/book_summary_front_bottom_right.png + res/1448/book_summary_front_center_left.png + res/1448/book_summary_front_center_right.png + res/1448/book_summary_front_top_center.png + res/1448/book_summary_front_top_left.png + res/1448/book_summary_front_top_right.png + res/1448/arrow_bottom_pager.png + res/1448/arrow_top_pager.png + res/1448/book_epub_list_big.png + res/1448/doc_book_ico.png + res/1448/pdf_book_ico.png + res/1448/txt_book_ico.png + res/1448/unknown_book_ico.png + res/1448/new_list_notext.png + res/1448/sample_list_notext.png + res/1448/epub_book_ico.png + res/1448/sample_tag_notext_sup.png + res/1448/sample_tag_notext_sup_big.png + res/1448/archive_tag.png + res/1448/download_btn.png + res/1448/download-list.png + res/1448/spinner.png + res/1448/arrow_n.png + res/1448/grid-btn.png + res/1448/list-btn.png + res/1448/corrupted_book_ico.png + res/1448/corrupted_list.png + res/1448/search_library_btn.png + res/1448/store_btn.png + res/1448/bg_sd.png + res/1448/ckeck-group.png + res/1448/edit-icon.png + res/1448/export-icon.png + res/1448/next-icon.png + res/1448/prev-icon.png + res/1448/purchase-icon.png + res/1448/remove-icon.png + res/1448/save-icons.png + res/1448/sd-icon.png + res/1448/slider_indicator.png + res/1448/unckeck-group.png + res/1448/down-small-btn.png + res/1448/up-small-btn.png + res/1448/add-collection-btn.png + res/1448/archive-icon.png + res/1448/generic_image_file_ico.png + res/1448/save-icons-disabled.png + res/1448/generic_image_list_big.png + res/1448/no_cover_chm.png + res/1448/no_cover_doc.png + res/1448/no_cover_epub.png + res/1448/no_cover_fb2.png + res/1448/no_cover_html.png + res/1448/no_cover_mobi.png + res/1448/no_cover_pdf.png + res/1448/no_cover_rtf.png + res/1448/no_cover_txt.png + res/1448/book_chm_list_big.png + res/1448/book_doc_list_big.png + res/1448/book_fb2_list_big.png + res/1448/book_html_list_big.png + res/1448/book_mobi_list_big.png + res/1448/book_rtf_list_big.png + res/1448/book_txt_list_big.png + + diff --git a/bqLibrary/Library800.qrc b/bqLibrary/Library800.qrc index 4807144..85a4f79 100755 --- a/bqLibrary/Library800.qrc +++ b/bqLibrary/Library800.qrc @@ -68,7 +68,6 @@ res/800/book_summary_front_top_center.png res/800/book_summary_front_top_left.png res/800/book_summary_front_top_right.png - res/800/bg_library_01.png res/800/arrow_bottom_pager.png res/800/arrow_top_pager.png res/800/open_book_small_bottom_center.png @@ -94,7 +93,6 @@ res/800/library_arrow.png res/800/search_library_btn.png res/800/store_btn.png - res/800/bg_library_new.png res/800/grid-btn.png res/800/list-btn.png res/800/bg_sd.png diff --git a/bqLibrary/bqLibrary.pri b/bqLibrary/bqLibrary.pri index 99e2353..50940d8 100755 --- a/bqLibrary/bqLibrary.pri +++ b/bqLibrary/bqLibrary.pri @@ -93,13 +93,13 @@ FORMS += ./ui/Library.ui \ ./ui/LibraryCollectionLayer.ui \ ./ui/LibraryCollectionItem.ui -QRC_FILES += Library800.qrc Library1024.qrc +QRC_FILES += Library800.qrc Library1024.qrc Library1448.qrc OTHER_FILES += \ bqLibrary/res/library_styles_generic_new.qss \ bqLibrary/res/library_styles_generic.qss \ bqLibrary/res/1024/library_styles.qss \ - bqLibrary/res/800/library_styles_new.qss \ + bqLibrary/res/1448/library_styles.qss \ bqLibrary/res/800/library_styles.qss diff --git a/bqLibrary/inc/LibraryGridViewerItem.h b/bqLibrary/inc/LibraryGridViewerItem.h index dbdd60d..0573b54 100644 --- a/bqLibrary/inc/LibraryGridViewerItem.h +++ b/bqLibrary/inc/LibraryGridViewerItem.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 @@ -31,14 +31,21 @@ class LibraryGridViewerItem : public GestureWidget { Q_OBJECT +private: + enum ELibraryGridViewerItemType { + ELGVIT_BOOK, + ELGVIT_FILE, + ELGVIT_ARROW, + ELGVIT_COLLECTION + }; public: LibraryGridViewerItem ( QWidget* parent ); virtual ~LibraryGridViewerItem (); - virtual void setBook ( const BookInfo* book, Library::ELibraryFilterMode filter) = 0; - virtual void setFile ( const QFileInfo* file ) = 0; - virtual void setArrow ( const QString& path ) = 0; - virtual void setCollection ( const QString&, int) = 0; + virtual void setBook ( const BookInfo* book, Library::ELibraryFilterMode filter) { m_iType = ELGVIT_BOOK; } + virtual void setFile ( const QFileInfo* file ) { m_iType = ELGVIT_FILE; } + virtual void setArrow ( const QString& path ) { m_iType = ELGVIT_ARROW; } + virtual void setCollection ( const QString&, int) { m_iType = ELGVIT_COLLECTION; } virtual void select () = 0; virtual void unselect () = 0; @@ -56,6 +63,7 @@ public slots: protected: QString m_path; + ELibraryGridViewerItemType m_iType; }; #endif // LIBRARYGRIDVIEWERITEM_H diff --git a/bqLibrary/inc/LibraryIconGridViewerItem.h b/bqLibrary/inc/LibraryIconGridViewerItem.h index 5519a14..342e368 100644 --- a/bqLibrary/inc/LibraryIconGridViewerItem.h +++ b/bqLibrary/inc/LibraryIconGridViewerItem.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 @@ -39,7 +39,6 @@ class LibraryIconGridViewerItem : public LibraryGridViewerItem, protected Ui::Li virtual void setBook ( const BookInfo* book, Library::ELibraryFilterMode filter); virtual void setFile ( const QFileInfo* file ); virtual void setArrow ( const QString& path ); - virtual void setCollection ( const QString&, int ) {} virtual void select (); virtual void unselect (); diff --git a/bqLibrary/inc/LibraryLineGridCollectionsItem.h b/bqLibrary/inc/LibraryLineGridCollectionsItem.h index dba6b05..f85266e 100644 --- a/bqLibrary/inc/LibraryLineGridCollectionsItem.h +++ b/bqLibrary/inc/LibraryLineGridCollectionsItem.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 @@ -32,10 +32,7 @@ class LibraryLineGridCollectionsItem : public LibraryGridViewerItem, protected U LibraryLineGridCollectionsItem (QWidget * parent = 0); virtual ~LibraryLineGridCollectionsItem(); - void setCollection ( const QString& collectionName, const int booksNumber ); - virtual void setBook ( const BookInfo* book, Library::ELibraryFilterMode filter ) {} - virtual void setFile ( const QFileInfo* file ) {} - virtual void setArrow ( const QString& path ) {} + virtual void setCollection ( const QString& collectionName, const int booksNumber ); virtual void select () {} virtual void unselect () {} diff --git a/bqLibrary/inc/LibraryLineGridViewerItem.h b/bqLibrary/inc/LibraryLineGridViewerItem.h index de2655f..b593891 100644 --- a/bqLibrary/inc/LibraryLineGridViewerItem.h +++ b/bqLibrary/inc/LibraryLineGridViewerItem.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 @@ -39,7 +39,6 @@ class LibraryLineGridViewerItem : public LibraryGridViewerItem, protected Ui::Li virtual void setBook ( const BookInfo* book, Library::ELibraryFilterMode filter ); virtual void setFile ( const QFileInfo* file ); virtual void setArrow ( const QString& path ); - virtual void setCollection ( const QString&, int ) {} virtual void select (); virtual void unselect (); diff --git a/bqLibrary/res/1024/bg_library.png b/bqLibrary/res/1024/bg_library.png index d4a9543..9726fda 100755 Binary files a/bqLibrary/res/1024/bg_library.png and b/bqLibrary/res/1024/bg_library.png differ diff --git a/bqLibrary/res/1024/bg_library_01.png b/bqLibrary/res/1024/bg_library_01.png deleted file mode 100755 index 4e8d9e5..0000000 Binary files a/bqLibrary/res/1024/bg_library_01.png and /dev/null differ diff --git a/bqLibrary/res/1024/bg_library_new.png b/bqLibrary/res/1024/bg_library_new.png deleted file mode 100755 index 9726fda..0000000 Binary files a/bqLibrary/res/1024/bg_library_new.png and /dev/null differ diff --git a/bqLibrary/res/1024/library_styles-old.qss b/bqLibrary/res/1024/library_styles-old.qss deleted file mode 100644 index a8248f6..0000000 --- a/bqLibrary/res/1024/library_styles-old.qss +++ /dev/null @@ -1,950 +0,0 @@ -/************************************************************************* - -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 . - -*************************************************************************/ - -/* Library ---------------------------*/ -#Library{ -min-width:758px; -max-width:758px; -min-height:960px; -max-height:960px; -} -#Library #searchCont{ -margin:0px 25px; -min-height:76px; -max-height:76px; -border-width:2px; -} -#searchCont #sortBooksLbl{ -margin-left:25px; -font-size:24px; -font-weight:bold; -} -#Library #selectAllBooksBtn{ -margin-right:25px; -min-height:58px; -max-height:58px; -padding:0px 38px; -border-width:1px; -border-radius:6px; -} -#Library #editBooksBtn{ -margin-right:25px; -min-height:58px; -max-height:58px; -padding:0px 38px; -border-width:1px; -border-radius:6px; -} -#Library #sortBooksCont #archiveBooksBtn, #Library #sortBooksCont #deleteBooksBtn, #Library #sortBooksCont #closeEditBooksBtn{ -border-color:#808080; -background-color:#FFFFFF; -border-style:solid; -padding:0px 38px; -margin:0px 0px 0px 20px; -min-height:58px; -max-height:58px; -border-width:2px; -border-radius:6px; -} -#searchCont #librarySearchLineEdit{ -margin-left:25px; -padding-left:58px; -min-width:0px; -max-width:660px; -min-height:70px; -max-height:70px; -border-radius:0; -} -#Library #searchCont #clearSearchBtn{ -margin:0px; -min-width:70px; -max-width:70px; -min-height:70px; -max-height:70px; -border-width:0px; -} -#searchCont #closeSearchBtn{ -margin:0px 25px; -min-height:58px; -max-height:58px; -padding:0px 38px; -border-width:2px; -border-radius:6px; -} -#searchCont #synchronizeBtn{ -margin:0px 25px 0px 20px; -min-width:58px; -max-width:58px; -min-height:58px; -max-height:58px; -} -#topActions{ -/*margin:0px 20px;*/ -min-height:67px; -max-height:67px; -border-width:1px; -} -#topActions #bookActionsSelectBtn{ -padding:0px 25px 0px 0px; -margin:0px 0px 0px 25px; -} -#topActions #showResultsLbl{ -margin:0px 0px 0px 25px; -} -#topActions #pathDotsLbl{ -padding:0px 5px 0px 20px; -} -#topActions #pathLbl{ -} -#breadCrumb{ -padding:0px 20px 0px 20px; -} -#booksContainer{ -min-height:730px; -max-height:813px; -} -#sortBooksCont{ -margin:0px 25px; -min-height:81px; -max-height:81px; -border-top-width:2px; -border-top-radius:23px; -} -#sortBooksCont #sortIconBtn{ -margin:0px 0px 0px 25px; -min-width:64px; -max-width:64px; -min-height:51px; -max-height:51px; -border-width:2px; -border-top-left-radius:6px; -border-bottom-left-radius:6px; -} -#sortBooksCont #sortListBtn{ -margin:0px 25px 0px 0px; -min-width:64px; -max-width:64px; -min-height:51px; -max-height:51px; -border-width:2px; -border-top-right-radius:6px; -border-bottom-right-radius:6px; -} -#sortBooksCont #recentSortBtn{ -padding:0px 38px; -min-height:51px; -max-height:51px; -border-width:2px; -border-top-left-radius:6px; -border-bottom-left-radius:6px; -} -#sortBooksCont #titleSortBtn{ -padding:0px 38px; -min-height:51px; -max-height:51px; -border-width:2px; -} -#sortBooksCont #authorSortBtn{ -padding:0px 38px; -min-height:51px; -max-height:51px; -border-width:2px; -border-top-right-radius:6px; -border-bottom-right-radius:6px; -} -#sortBooksCont #fileNameBtn{ -padding:0px 35px; -min-height:51px; -max-height:51px; -border-width:2px; -border-top-left-radius:6px; -border-bottom-left-radius:6px; -} -#sortBooksCont #lastModifyBtn{ -margin:0px 1px 0px 0px; -padding:0px 35px; -min-height:51px; -max-height:51px; -border-width:2px; -border-top-right-radius:6px; -border-bottom-right-radius:6px; -} -/*LibraryIconGridViewer ---------------------------*/ -#LibraryIconGridViewer{ -min-width:758px; -max-width:758px; -min-height:730px; -max-height:730px; -} -#iconGridViewerCont #book1, #iconGridViewerCont #book2, #iconGridViewerCont #book3, #iconGridViewerCont #book4, #iconGridViewerCont #book5, #iconGridViewerCont #book6{ -min-width:243px; -max-width:243px; -min-height:307px; -min-height:307px; -} -/*LibraryIconGridViewerItem -------------------------------------*/ -#fileCont{ -min-width:243px; -max-width:243px; -} -#LibraryIconGridViewerItem { -min-width:243px; -max-width:243px; -min-height:307px; -max-height:307px; -} -#IconGridViewerItemCont { -min-width:243px; -max-width:243px; -min-height:300px; -max-height:300px; -} -#IconBookItemCont{ -min-width:243px; -max-width:243px; -min-height:307px; -max-height:307px; -} -#IconFileItemCont{ -min-width:243px; -max-width:243px; -min-height:307px; -max-height:307px; -} -#currentBookCoverLbl{ -min-width:172px; -max-width:172px; -min-height:260px; -max-height:260px; -} -#currentBookTopLeft{ -min-width:66px; -max-width:66px; -min-height:64px; -max-height:64px; -} -#currentBookTopCenter{ -min-width:172px; -max-width:172px; -min-height:64px; -max-height:64px; -} -#currentBookTopRight{ -min-width:51px; -max-width:51px; -min-height:64px; -max-height:64px; -} -#currentBookCenterLeft{ -min-width:66px; -max-width:66px; -min-height:260px; -max-height:260px; -} -#currentBookCenterRight{ -min-width:51px; -max-width:51px; -min-height:260px; -max-height:260px; -} -#currentBookBottomLeft{ -min-width:66px; -max-width:66px; -min-height:32px; -max-height:32px; -} -#currentBookBottomCenter{ -min-width:172px; -max-width:172px; -min-height:32px; -max-height:32px; -} -#currentBookBottomRight{ -min-width:51px; -max-width:51px; -min-height:32px; -max-height:32px; -} -#IconGridViewerItemCont #coverCont #topLeftLbl{ -min-width:25px; -max-width:25px; -min-height:6px; -max-height:6px; -} -#IconGridViewerItemCont #coverCont #topCenterLbl{ -min-width:172px; -max-width:172px; -min-height:6px; -max-height:6px; -} -#IconGridViewerItemCont #coverCont #topRightLbl{ -min-width:24px; -max-width:24px; -min-height:6px; -max-height:6px; -} -#IconGridViewerItemCont #coverCont #centerLeftLbl{ -min-width:25px; -max-width:25px; -min-height:260px; -max-height:260px; -} -#IconGridViewerItemCont #coverCont #cover, #IconGridViewerItemCont #coverCont #cover #coverLabel{ -min-width:172px; -max-width:172px; -min-height:260px; -max-height:260px; -} -#IconGridViewerItemCont #coverCont #centerRightLbl{ -min-width:24px; -max-width:24px; -min-height:260px; -max-height:260px; -} -#IconGridViewerItemCont #coverCont #bottomLeftLbl{ -min-width:25px; -max-width:25px; -min-height:17px; -max-height:17px; -} -#IconGridViewerItemCont #coverCont #bottomCenterLbl{ -min-width:172px; -max-width:172px; -min-height:17px; -max-height:17px; -} -#IconGridViewerItemCont #coverCont #bottomRightLbl{ -min-width:24px; -max-width:24px; -min-height:17px; -max-height:17px; -} -#coverFileLbl{ -min-width:237px; -max-width:237px; -min-height:243px; -max-height:243px; -} -#coverCont #titleLbl,#cover #titleLbl{ -min-width:179px; -max-width:179px; -min-height:51px; -max-height:51px; -padding-top:148px; -font-size:20px; -} -#coverCont #fileNameLbl,#cover #fileNameLbl{ -min-width:179px; -max-width:179px; -min-height:45px; -max-height:45px; -font-size:21px; -} -#coverCont #authorLbl,#cover #authorLbl{ -min-width:179px; -max-width:179px; -font-size:18px; -min-height:25px; -max-height:25px; -padding-top:197px; -} -#fileTitleLbl{ -font-size:21px; -} -#iconGridViewerCont #newTagLbl, #LibraryIconGridViewerItem #newTagLbl{ -min-width:220px; -max-width:220px; -min-height:288px; -max-height:288px; -padding:0px 0px -3px 0px; -font-size:19px; -} -#iconGridViewerCont #archiveTagLbl,#LibraryIconGridViewerItem #archiveTagLbl{ -min-width:221px; -max-width:221px; -min-height:283px; -max-height:283px; -padding:0px 0px 0px 0px; -font-size:19px; -} -#iconGridViewerCont #downloadBtn, #LibraryIconGridViewerItem #downloadBtn{ -min-width:221px; -max-width:221px; -min-height:283px; -max-height:283px; -padding:0px 0px 0px 0px; -} -#iconGridViewerCont #readingTagLbl, #LibraryIconGridViewerItem #readingTagLbl{ -min-width:237px; -max-width:237px; -min-height:243px; -max-height:243px; -} -#iconGridViewerCont #sampleTagLbl, #LibraryIconGridViewerItem #sampleTagLbl{ -/*min-width:195px; -max-width:195px; -min-height:273px; -max-height:273px;*/ -min-width:86px; -max-width:86px; -min-height:86px; -max-height:86px; -margin:0px 0px 0px 0px; -font-size:19px; -} -#iconGridViewerCont #subscriptionTagLbl, #LibraryIconGridViewerItem #subscriptionTagLbl{ -min-width:243px; -max-width:243px; -min-height:294px; -max-height:294px; -} -#iconGridViewerCont #selectBookLbl{ -min-width:243px; -max-width:243px; -min-height:294px; -max-height:294px; -} -/*IconGridViewer ---------------------------*/ -#LibraryLineGridViewer{ -min-width:758px; -max-width:758px; -min-height:730px; -max-height:813px; -} -#LibraryLineGridViewer #book1, #LibraryLineGridViewer #book2, #LibraryLineGridViewer #book3, #LibraryLineGridViewer #book4, #LibraryLineGridViewer #book5, #LibraryLineGridViewer #book6, #book7{ -margin:0px; -padding:0px; -min-height:110px; -min-height:110px; -border-width:1px; -} -/*LibraryLineGridViewerItem -------------------------*/ -#LibraryReadingLineGridViewer,#LibraryReadingLineGridViewerCont{ -min-width:758px; -max-width:758px; -min-height:723px; -min-height:723px; -} -#LibraryLineGridViewerItemCont,LibraryLineGridViewerItem{ -min-width:758px; -max-width:758px; -min-height:110px; -max-height:110px; -} -#LibraryReadingLineGridViewerCont #book1, #LibraryReadingLineGridViewerCont #book2, #LibraryReadingLineGridViewerCont #book3{ -margin:0px; -padding:0px; -min-height:110px; -max-height:110px; -border-width:1px; -} -#LibraryReadingLineGridViewerCont #VerticalPagerHandler{ -min-height:51px; -min-height:51px; -} -#LibraryReadingLineGridViewerCont #mainBookInfoCont{ -min-height:326px; -max-height:326px; -border-width:1px; -} -#LibraryLineGridViewerItemCont #typeCont,LibraryLineGridViewerItem #typeCont{ -min-width:102px; -max-width:102px; -} -#LibraryLineGridViewerItemCont #titleLbl,LibraryLineGridViewerItem #titleLbl{ -min-width:410px; -max-width:410px; -min-height:51px; -max-height:51px; -font-size:28px; -} -#LibraryLineGridViewerItemCont #authorLbl,LibraryLineGridViewerItem #authorLbl{ -min-width:410px; -max-width:410px; -min-height:25px; -max-height:25px; -font-size:24px; -} -#LibraryLineGridViewerItemCont #typeCont #iconTypeFileLbl,LibraryLineGridViewerItem #typeCont #iconTypeFileLbl{ -margin:15px 0px 0px 0px; -min-width:102px; -max-width:102px; -min-height:64px; -max-height:64px; -} -#LibraryLineGridViewerItemCont #typeCont #readingProgressLbl,LibraryLineGridViewerItem #typeCont #readingProgressLbl{ -font-size:22px; -} -#LibraryLineGridViewerItemCont #newTagLbl,LibraryLineGridViewerItem #newTagLbl{ -min-width:56px; -max-width:56px; -min-height:110px; -max-height:110px; -font-size:20px; -} -#LibraryLineGridViewerItemCont #archiveTagLbl,LibraryLineGridViewerItem #archiveTagLbl{ -min-width:56px; -max-width:56px; -min-height:110px; -max-height:110px; -font-size:18px; -} -#LibraryLineGridViewerItemCont #sampleTagLbl,LibraryLineGridViewerItem #sampleTagLbl{ -min-width:56px; -max-width:56px; -min-height:110px; -max-height:110px; -font-size:20px; -} -#LibraryLineGridViewerItemCont #subscriptionTagLbl,LibraryLineGridViewerItem #subscriptionTagLbl{ -min-width:56px; -max-width:56px; -min-height:110px; -max-height:110px; -font-size:20px; -} -#LibraryLineGridViewerItemCont #downloadBtn,LibraryLineGridViewerItem #downloadBtn{ -min-width:64px; -max-width:64px; -min-height:110px; -max-height:110px; -font-size:20px; -} -#LibraryLineGridViewerItemCont #selectBookLbl ,LibraryLineGridViewerItem #selectBookLbl{ -min-width:89px; -max-width:89px; -min-height:110px; -max-height:110px; -} -#LibraryReadingLineGridViewerCont #coverCont #topLeftLbl{ -min-width:25px; -max-width:25px; -min-height:14px; -max-height:14px; -} -#LibraryReadingLineGridViewerCont #coverCont #topCenterLbl{ -min-width:172px; -max-width:172px; -min-height:14px; -max-height:14px; -} -#LibraryReadingLineGridViewerCont #coverCont #topRightLbl{ -min-width:24px; -max-width:24px; -min-height:14px; -max-height:14px; -} -#LibraryReadingLineGridViewerCont #coverCont #centerLeftLbl{ -min-width:25px; -max-width:25px; -min-height:260px; -max-height:260px; -} -#LibraryReadingLineGridViewerCont #coverCont #coverLbl, #LibraryReadingLineGridViewerCont #coverCont #coverTagsCont{ -min-width:172px; -max-width:172px; -min-height:260px; -max-height:260px; -} -#LibraryReadingLineGridViewerCont #coverCont #newTagLbl{ -min-width:172px; -max-width:172px; -min-height:265px; -max-height:265px; -padding:0px 0px -3px 0px; -font-size:19px; -} -#LibraryReadingLineGridViewerCont #coverCont #sampleTagLbl{ -min-width:86px; -max-width:86px; -min-height:86px; -max-height:86px; -margin:0px 0px 0px 0px; -padding:0px 0px 0px 0px; -font-size:19px; -} -#LibraryReadingLineGridViewerCont #coverCont #centerRightLbl{ -min-width:24px; -max-width:24px; -min-height:260px; -max-height:260px; -} -#LibraryReadingLineGridViewerCont #coverCont #bottomLeftLbl{ -min-width:25px; -max-width:25px; -min-height:20px; -max-height:20px; -} -#LibraryReadingLineGridViewerCont #coverCont #bottomCenterLbl{ -min-width:172px; -max-width:172px; -min-height:20px; -max-height:20px; -} -#LibraryReadingLineGridViewerCont #coverCont #bottomRightLbl{ -min-width:19px; -max-width:19px; -min-height:20px; -max-height:20px; -} -/*LibraryReadingIconGridViewer ------------------------------*/ -#LibraryReadingIconGridViewer,#LibraryReadingIconGridViewerCont{ -min-width:758px; -max-width:758px; -min-height:723px; -max-height:723px; -} -#LibraryReadingIconGridViewerCont #VerticalPagerHandler{ -min-height:51px; -min-height:51px; -} -#LibraryReadingIconGridViewerCont #currentBookData{ -min-width:435px; -max-width:435px; -} -#LibraryReadingIconGridViewerCont #currentBookCoverLbl{ -min-width:150px; -max-width:150px; -min-height:225px; -max-height:225px; -} -#LibraryReadingIconGridViewerCont #currentBookCoverCont #newTagLbl{ -min-width:150px; -max-width:150px; -min-height:230px; -max-height:230px; -padding:0px 0px -3px 0px; -font-size:19px; -} -#LibraryReadingIconGridViewerCont #currentBookCoverCont #sampleTagLbl{ -min-width:86px; -max-width:86px; -min-height:86px; -max-height:86px; -margin:0px 0px 0px 0px; -padding:0px 0px 0px 0px; -font-size:19px; -} -#LibraryReadingIconGridViewerCont #currentBookTopLeft{ -min-width:25px; -max-width:25px; -min-height:48px; -max-height:48px; -} -#LibraryReadingIconGridViewerCont #currentBookTopCenter{ -min-width:150px; -max-width:150px; -min-height:48px; -max-height:48px; -} -#LibraryReadingIconGridViewerCont #currentBookTopRight{ -min-width:24px; -max-width:24px; -min-height:48px; -max-height:48px; -} -#LibraryReadingIconGridViewerCont #currentBookCenterLeft{ -min-width:25px; -max-width:25px; -min-height:225px; -max-height:225px; -} -#LibraryReadingIconGridViewerCont #currentBookCenterRight{ -min-width:24px; -max-width:24px; -min-height:225px; -max-height:225px; -} -#LibraryReadingIconGridViewerCont #currentBookBottomLeft{ -min-width:25px; -max-width:25px; -min-height:29px; -max-height:29px; -} -#LibraryReadingIconGridViewerCont #currentBookBottomCenter{ -min-width:150px; -max-width:150px; -min-height:29px; -max-height:29px; -} -#LibraryReadingIconGridViewerCont #currentBookBottoRight{ -min-width:24px; -max-width:24px; -min-height:29px; -max-height:29px; -} -#mainBookInfoCont{ -min-width:758px; -max-width:758px; -min-height:339px; -max-height:339px; -} -#currentBookCont{ -min-width:758px; -max-width:758px; -min-height:339px; -max-height:339px; -} -#readBookBtn{ -min-width:758px; -max-width:758px; -min-height:339px; -max-height:339px; -} -#currentBookData{ -min-width:390px; -max-width:390px; -} -#currentBookCont #readingLbl{ -margin:45px 0px 19px 0px; -font-size: 32px; -} -#currentBookCont #bookTitleLbl{ -font-size:36px; -} -#currentBookCont #authorLbl{ -font-size:28px; -} -#currentBookCont #pagLbl,#currentBookCont #currentPagLbl,#currentBookCont #endBracketsLbl,#currentBookCont #separatorLbl,#currentBookCont #totalPagLbl, #currentBookCont #percentLbl{ -margin:19px 0px 0px 0px; -font-size:22px; -} -#currentBookCont #readLbl, #currentBookCont #readingPercentLbl, #currentBookCont #separatorReadLbl{ -margin:19px 5px 0px 0px; -font-size:22px; -} -/*Viewer popups ------------------------------------*/ -#popupCont{ -padding:0px; -border-width:12px; -border-radius:12px; -} -#arrowCont, #arrowCont2{ -min-height:24px; -max-height:24px; -} -#topArrowLbl, #bottomArrowLbl{ -min-width:40px; -max-width:40px; -min-height:25px; -max-height:25px; -} -/*LibraryBooksFilterLayer --------------------------------*/ -#LibraryBooksFilterLayer{ -min-width:758px; -max-width:758px; -min-height:960px; -max-height:960px; -} -#LibraryBooksFilterLayerCont{ -min-width:460px; -max-width:460px; -min-height:0px; -max-height:800px; -} -#LibraryBooksFilterLayer #spacerTop{ -min-height:115px; -max-height:115px; -} -#LibraryBooksFilterLayerCont #spacerLeft{ -min-width:50px; -max-width:50px; -} -#LibraryBooksFilterLayer QPushButton { -padding:0px 0px 0px 19px; -border-bottom-width:1px; -min-height:90px; -max-height:90px; -} -#LibraryBooksFilterLayer QPushButton#internalMemoryBtn, #LibraryBooksFilterLayer QPushButton#sdBtn{ -} -/*LibraryBooksSubFilterLayer --------------------------------*/ -#LibraryBooksSubFilterLayer{ -min-width:758px; -max-width:758px; -min-height:960px; -max-height:960px; -} -#HorizontalCont{ -min-height:0px; -max-height:800px; -} -#LibraryBooksFilterLayerCont{ -min-width:460px; -max-width:460px; -min-height:0px; -max-height:800px; -} -#LibraryBooksSubFilterLayer #spacerTop{ -min-height:115px; -max-height:115px; -} -#LibraryBooksSubFilterLayer #spacerLeft{ -min-width:50px; -max-width:50px; -} -#LibraryBooksSubFilterLayer QPushButton { -padding:0px 0px 0px 19px; -border-bottom-width:1px; -min-height:90px; -max-height:90px; -} -#LibraryBooksSubFilterLayer #spacingLayerLbl{ -min-height:12px; -max-height:12px; -} -#LibraryBooksSubFilterLayer QPushButton#allBooksBtn, #LibraryBooksSubFilterLayer QPushButton#activeBooksBtn, #LibraryBooksSubFilterLayer QPushButton#sampleBooksBtn, #LibraryBooksSubFilterLayer QPushButton#subscriptionBooksBtn{ -} -#LibraryBooksSubFilterLayer QPushButton#allBooksBtn{ -border-top-left-radius:12px; -border-top-right-radius:12px; -} -#LibraryBooksSubFilterLayer QPushButton#subscriptionBooksBtn{ -border-bottom-left-radius:12px; -border-bottom-right-radius:12px; -} -#LibraryBooksSubFilterLayer QPushButton#archivedBtn{ -border-radius:12px; -} -/*LibrarySortBooksByLayer --------------------------------*/ -#LibrarySortBooksByLayer{ -min-width:758px; -max-width:758px; -min-height:960px; -max-height:960px; -} -#HorizontalCont{ -min-height:0px; -max-height:800px; -} -#LibrarySortBooksByLayerCont{ -min-width:380px; -max-width:380px; -min-height:0px; -max-height:800px; -} -#LibrarySortBooksByLayer #spacerTop{ -min-height:115px; -max-height:115px; -} -#LibrarySortBooksByLayer #spacerLeft{ -min-width:150px; -max-width:150px; -} -#LibrarySortBooksByLayer QPushButton { -padding:0px 0px 0px 19px; -border-bottom-width:1px; -min-height:50px; -max-height:50px; -} - -/*BookSummaryPopup ----------------------------*/ -#headerPopup #closeBtn{ -min-width:64px; -max-width:64px; -min-height:64px; -max-height:64px; -} -#BookSummaryPopup{ -min-width:691px; -max-width:691px; -min-height:755px; -max-height:755px; -} -#BookSummaryPopup #headerPopup{ -margin:0px 0px 0px 0px; -padding:0px; -} -#BookSummaryPopup #headerPopup #closeBtn{ -min-width:64px; -max-width:64px; -min-height:64px; -max-height:64px; -} -#BookSummaryPopup #popupCont{ -padding:0px 19px 0px 19px; -} -#BookSummaryPopup #synopsisLbl{ -margin:0px 0px 0px 0px; -padding-left:0px; -padding-right:0px; -} -#BookSummaryPopup #summaryTextBrowser{ -min-height:243px; -max-height:243px; -margin-left:0px; -margin-right:0px; -padding-left:0px; -padding-right:0px; -} -/*LibraryBookListActions ----------------------------*/ -#LibraryBookListActions{ -margin-right:1px; -min-width:254px; -max-width:254px; -min-height:64px; -max-height:64px; -border-width:2px; -border-bottom-left-radius:10px; -border-bottom-right-radius:10px; -} -#LibraryBookListActions QPushButton{ -padding:0px 25px; -margin-right:1px; -border-width:1px; -} -/*LibraryPageHandler -----------------------------*/ -#pageLibraryViewerCont{ -min-width:758px; -max-width:758px; -min-height:66px; -max-height:66px; -} -#VerticalPagerHandler{ -min-height:66px; -max-height:66px; -} -#pageLibraryViewerCont #forwardButton{ -margin-top:0px; -min-width:230px; -max-width:230px; -min-height:60px; -max-height:60px; -} -#pageLibraryViewerCont #backButton{ -margin-top:0px; -min-width:230px; -max-width:230px; -min-height:60px; -max-height:60px; -} diff --git a/bqLibrary/res/1024/library_styles.qss b/bqLibrary/res/1024/library_styles.qss index cc5b71f..4dfe74d 100644 --- a/bqLibrary/res/1024/library_styles.qss +++ b/bqLibrary/res/1024/library_styles.qss @@ -112,10 +112,9 @@ max-height:58px; border-width:2px; } #topActions{ -/*margin:0px 20px;*/ margin:0px 25px; -min-height:43px; -max-height:43px; +min-height:42px; +max-height:42px; } #searchCont #bookActionsSelectBtn{ padding:0px 20px 0px 0px; @@ -201,7 +200,7 @@ min-height:57px; max-height:57px; } #sortByBtn{ -padding:0px 35px 0px 20px; +padding:0px 30px 0px 15px; margin:0px 25px 0px 0px; min-height:51px; max-height:51px; @@ -289,20 +288,32 @@ border-bottom-right-radius:6px; #LibraryIconGridViewer{ min-width:758px; max-width:758px; -min-height:772px; -max-height:772px; +min-height:770px; +max-height:770px; } -#iconGridViewerCont #book1, #iconGridViewerCont #book2, #iconGridViewerCont #book3, #iconGridViewerCont #book4, #iconGridViewerCont #book5, #iconGridViewerCont #book6{ +#iconGridViewerCont{ +min-width:758px; +max-width:758px; +min-height:704px; +max-height:704px; +} + +#iconGridViewerCont #book1Cont, #iconGridViewerCont #book2Cont, #iconGridViewerCont #book3Cont, #iconGridViewerCont #book4Cont, #iconGridViewerCont #book5Cont, #iconGridViewerCont #book6Cont{ min-width:243px; max-width:243px; min-height:307px; -min-height:307px; +max-height:307px; +margin-top:18px; +margin-bottom:32px; } -#iconGridViewerCont #book1Cont, #iconGridViewerCont #book2Cont, #iconGridViewerCont #book3Cont, #iconGridViewerCont #book4Cont, #iconGridViewerCont #book5Cont, #iconGridViewerCont #book6Cont{ +#iconGridViewerCont #book4Cont, #iconGridViewerCont #book5Cont, #iconGridViewerCont #book6Cont{ +margin-bottom:0px; +} +#iconGridViewerCont #book1, #iconGridViewerCont #book2, #iconGridViewerCont #book3, #iconGridViewerCont #book4, #iconGridViewerCont #book5, #iconGridViewerCont #book6{ min-width:243px; max-width:243px; min-height:307px; -min-height:307px; +max-height:307px; } /*LibraryIconGridViewerItem @@ -539,8 +550,12 @@ max-height:294px; #LibraryLineGridViewer{ min-width:758px; max-width:758px; -min-height:774px; -max-height:774px; +min-height:770px; +max-height:770px; +} +#LibraryLineGridViewerCont{ +min-height:708px; +max-height:708px; } #LibraryLineGridViewer #book1, #LibraryLineGridViewer #book2, #LibraryLineGridViewer #book3, #LibraryLineGridViewer #book4, #LibraryLineGridViewer #book5, #LibraryLineGridViewer #book6, #book7{ margin:0px; @@ -743,11 +758,18 @@ max-height:20px; } /*LibraryReadingIconGridViewer -----------------------------*/ -#LibraryReadingIconGridViewer,#LibraryReadingIconGridViewerCont{ +#LibraryReadingIconGridViewer{ +min-width:758px; +max-width:758px; +min-height:770px; +max-height:770px; +} + +#LibraryReadingIconGridViewerCont{ min-width:758px; max-width:758px; -min-height:772px; -max-height:772px; +min-height:706px; +max-height:706px; } #LibraryReadingIconGridViewerCont #currentBookData{ min-width:435px; @@ -856,23 +878,29 @@ max-height:17px; margin:12px 6px 0px -4px; font-size:22px; } +#LibraryReadingIconGridViewerCont #iconGridViewerCont{ +min-height:344px; +max-height:344px; +} + #mainBookInfoCont{ min-width:758px; max-width:758px; -min-height:339px; -max-height:339px; +min-height:360px; +max-height:360px; } #currentBookCont{ min-width:758px; max-width:758px; -min-height:339px; -max-height:339px; +min-height:342px; +max-height:342px; +padding-top:18px; } #readBookBtn{ min-width:758px; max-width:758px; -min-height:339px; -max-height:339px; +min-height:330px; +max-height:330px; } #currentBookData{ min-width:390px; @@ -897,8 +925,6 @@ font-size:22px; margin:3px 5px 0px 0px; font-size:22px; font-weight:normal; - - } /*Viewer popups -----------------------------------*/ @@ -1211,50 +1237,49 @@ max-height:64px; #pageLibraryViewerCont{ min-width:758px; max-width:758px; -min-height:65px; -max-height:65px; +min-height:61px; +max-height:61px; } #VerticalPagerHandler{ min-width:758px; max-width:758px; -margin:9px 0px 0px 0px; -min-height:65px; -max-height:65px; +min-height:61px; +max-height:61px; +margin: 0px 0px 0px 0px; border-top:1px solid #808080; } #VerticalPagerHandler #pageLibraryViewerCont{ -min-height:70px; -max-height:70px; +min-height:61px; +max-height:61px; } #VerticalPagerHandler #pageLibraryViewerCont #forwardButton{ min-width:115px; max-width:115px; -min-height:70px; -max-height:70px; +min-height:61px; +max-height:61px; border-left-width:1px; } #VerticalPagerHandler #pageLibraryViewerCont #backButton{ min-width:115px; max-width:115px; -min-height:70px; -max-height:70px; +min-height:61px; +max-height:61px; border-right-width:1px; } #pageLibraryViewerCont #pageLabel{ -margin:2px 0px 0px 23px; -min-height:70px; -max-height:70px; +margin:0px 0px 0px 23px; +min-height:61px; +max-height:61px; min-width:120px; } #VerticalPagerHandler #pageLabel{ -margin-top:2px; -min-height:70px; -max-height:70px; +min-height:61px; +max-height:61px; font-size:24px; } QSlider#pagerSlider{ -min-height:70px; -max-height:70px; +min-height:61px; +max-height:61px; min-width:370px; max-width:370px; } @@ -1538,7 +1563,7 @@ max-height:70px; border-bottom-width:2px; } #collectionContainer #actionsCont QPushButton{ -padding:0px 6px 0px 51px; +padding:0px 15px; margin:0px 13px 0px 0px; min-height:55px; max-height:55px; @@ -1546,8 +1571,12 @@ border-width:2px; border-radius:6px; } #collectionContainer #actionsCont QPushButton#unSelectAllBtn{ -margin-right:38px; +border-width:1px; +} +#collectionContainer #actionsCont QPushButton#selectAllBtn{ +border-width:1px; } + #LibraryEditCollection #closeSearchBtn{ margin:0px 25px 0px 0px; padding:0px 51px 0px 13px; @@ -1666,7 +1695,8 @@ min-width:115px; max-width:115px; min-height:64px; max-height:64px; -border-right-width:1px;} +border-right-width:1px; +} #btnImageNext{ margin-top:1px; @@ -1674,19 +1704,22 @@ min-width:115px; max-width:115px; min-height:64px; max-height:64px; -border-left-width:1px;} +border-left-width:1px; +} #pageHandlerImage #imageTitle{ margin-top:1px; min-height:32px; max-height:32px; text-align:center; -font-size:20px;} +font-size:20px; +} #pageHandlerImage #pageLabel{ margin-top:1px; min-height:32px; max-height:32px; text-align:center; -font-size:18px;} +font-size:18px; +} diff --git a/bqLibrary/res/1448/add-collection-btn.png b/bqLibrary/res/1448/add-collection-btn.png new file mode 100644 index 0000000..483f48f Binary files /dev/null and b/bqLibrary/res/1448/add-collection-btn.png differ diff --git a/bqLibrary/res/1448/archive-icon.png b/bqLibrary/res/1448/archive-icon.png new file mode 100644 index 0000000..9002bdd Binary files /dev/null and b/bqLibrary/res/1448/archive-icon.png differ diff --git a/bqLibrary/res/1448/archive_tag-o.png b/bqLibrary/res/1448/archive_tag-o.png new file mode 100644 index 0000000..e689818 Binary files /dev/null and b/bqLibrary/res/1448/archive_tag-o.png differ diff --git a/bqLibrary/res/1448/archive_tag.png b/bqLibrary/res/1448/archive_tag.png new file mode 100644 index 0000000..5969cd0 Binary files /dev/null and b/bqLibrary/res/1448/archive_tag.png differ diff --git a/bqLibrary/res/1448/arrow.png b/bqLibrary/res/1448/arrow.png new file mode 100644 index 0000000..a730824 Binary files /dev/null and b/bqLibrary/res/1448/arrow.png differ diff --git a/bqLibrary/res/1448/arrow_bottom.png b/bqLibrary/res/1448/arrow_bottom.png new file mode 100644 index 0000000..86ee8ab Binary files /dev/null and b/bqLibrary/res/1448/arrow_bottom.png differ diff --git a/bqLibrary/res/1448/arrow_bottom_pager.png b/bqLibrary/res/1448/arrow_bottom_pager.png new file mode 100755 index 0000000..f10e89b Binary files /dev/null and b/bqLibrary/res/1448/arrow_bottom_pager.png differ diff --git a/bqLibrary/res/1448/arrow_n.png b/bqLibrary/res/1448/arrow_n.png new file mode 100644 index 0000000..149873a Binary files /dev/null and b/bqLibrary/res/1448/arrow_n.png differ diff --git a/bqLibrary/res/1448/arrow_top.png b/bqLibrary/res/1448/arrow_top.png new file mode 100644 index 0000000..74df44f Binary files /dev/null and b/bqLibrary/res/1448/arrow_top.png differ diff --git a/bqLibrary/res/1448/arrow_top_pager.png b/bqLibrary/res/1448/arrow_top_pager.png new file mode 100755 index 0000000..b4ecbfa Binary files /dev/null and b/bqLibrary/res/1448/arrow_top_pager.png differ diff --git a/bqLibrary/res/1448/bg_footer.png b/bqLibrary/res/1448/bg_footer.png new file mode 100755 index 0000000..5224b85 Binary files /dev/null and b/bqLibrary/res/1448/bg_footer.png differ diff --git a/bqLibrary/res/1448/bg_library.png b/bqLibrary/res/1448/bg_library.png new file mode 100644 index 0000000..04bef82 Binary files /dev/null and b/bqLibrary/res/1448/bg_library.png differ diff --git a/bqLibrary/res/1448/bg_sd.png b/bqLibrary/res/1448/bg_sd.png new file mode 100755 index 0000000..84e2154 Binary files /dev/null and b/bqLibrary/res/1448/bg_sd.png differ diff --git a/bqLibrary/res/1448/book_chm_list_big.png b/bqLibrary/res/1448/book_chm_list_big.png new file mode 100644 index 0000000..6b40d63 Binary files /dev/null and b/bqLibrary/res/1448/book_chm_list_big.png differ diff --git a/bqLibrary/res/1448/book_doc_list_big.png b/bqLibrary/res/1448/book_doc_list_big.png new file mode 100644 index 0000000..510bd58 Binary files /dev/null and b/bqLibrary/res/1448/book_doc_list_big.png differ diff --git a/bqLibrary/res/1448/book_epub_list_big.png b/bqLibrary/res/1448/book_epub_list_big.png new file mode 100644 index 0000000..d759681 Binary files /dev/null and b/bqLibrary/res/1448/book_epub_list_big.png differ diff --git a/bqLibrary/res/1448/book_fb2_list_big.png b/bqLibrary/res/1448/book_fb2_list_big.png new file mode 100644 index 0000000..7de6edc Binary files /dev/null and b/bqLibrary/res/1448/book_fb2_list_big.png differ diff --git a/bqLibrary/res/1448/book_front_bottom_center.png b/bqLibrary/res/1448/book_front_bottom_center.png new file mode 100644 index 0000000..a13787e Binary files /dev/null and b/bqLibrary/res/1448/book_front_bottom_center.png differ diff --git a/bqLibrary/res/1448/book_front_bottom_left.png b/bqLibrary/res/1448/book_front_bottom_left.png new file mode 100644 index 0000000..6ee1149 Binary files /dev/null and b/bqLibrary/res/1448/book_front_bottom_left.png differ diff --git a/bqLibrary/res/1448/book_front_bottom_right.png b/bqLibrary/res/1448/book_front_bottom_right.png new file mode 100644 index 0000000..14f0397 Binary files /dev/null and b/bqLibrary/res/1448/book_front_bottom_right.png differ diff --git a/bqLibrary/res/1448/book_front_center.png b/bqLibrary/res/1448/book_front_center.png new file mode 100755 index 0000000..877e7bc Binary files /dev/null and b/bqLibrary/res/1448/book_front_center.png differ diff --git a/bqLibrary/res/1448/book_front_center_left.png b/bqLibrary/res/1448/book_front_center_left.png new file mode 100644 index 0000000..4d71871 Binary files /dev/null and b/bqLibrary/res/1448/book_front_center_left.png differ diff --git a/bqLibrary/res/1448/book_front_center_right.png b/bqLibrary/res/1448/book_front_center_right.png new file mode 100644 index 0000000..cc733a0 Binary files /dev/null and b/bqLibrary/res/1448/book_front_center_right.png differ diff --git a/bqLibrary/res/1448/book_front_top_center.png b/bqLibrary/res/1448/book_front_top_center.png new file mode 100644 index 0000000..273346a Binary files /dev/null and b/bqLibrary/res/1448/book_front_top_center.png differ diff --git a/bqLibrary/res/1448/book_front_top_left.png b/bqLibrary/res/1448/book_front_top_left.png new file mode 100644 index 0000000..9f6fada Binary files /dev/null and b/bqLibrary/res/1448/book_front_top_left.png differ diff --git a/bqLibrary/res/1448/book_front_top_right.png b/bqLibrary/res/1448/book_front_top_right.png new file mode 100644 index 0000000..ad6e1a5 Binary files /dev/null and b/bqLibrary/res/1448/book_front_top_right.png differ diff --git a/bqLibrary/res/1448/book_html_list_big.png b/bqLibrary/res/1448/book_html_list_big.png new file mode 100644 index 0000000..2352c20 Binary files /dev/null and b/bqLibrary/res/1448/book_html_list_big.png differ diff --git a/bqLibrary/res/1448/book_mobi_list_big.png b/bqLibrary/res/1448/book_mobi_list_big.png new file mode 100644 index 0000000..0e98c3e Binary files /dev/null and b/bqLibrary/res/1448/book_mobi_list_big.png differ diff --git a/bqLibrary/res/1448/book_pdf_list_big.png b/bqLibrary/res/1448/book_pdf_list_big.png new file mode 100644 index 0000000..b361843 Binary files /dev/null and b/bqLibrary/res/1448/book_pdf_list_big.png differ diff --git a/bqLibrary/res/1448/book_rtf_list_big.png b/bqLibrary/res/1448/book_rtf_list_big.png new file mode 100644 index 0000000..62d9f71 Binary files /dev/null and b/bqLibrary/res/1448/book_rtf_list_big.png differ diff --git a/bqLibrary/res/1448/book_summary_front_bottom_center.png b/bqLibrary/res/1448/book_summary_front_bottom_center.png new file mode 100755 index 0000000..6a1bb85 Binary files /dev/null and b/bqLibrary/res/1448/book_summary_front_bottom_center.png differ diff --git a/bqLibrary/res/1448/book_summary_front_bottom_left.png b/bqLibrary/res/1448/book_summary_front_bottom_left.png new file mode 100755 index 0000000..a006999 Binary files /dev/null and b/bqLibrary/res/1448/book_summary_front_bottom_left.png differ diff --git a/bqLibrary/res/1448/book_summary_front_bottom_right.png b/bqLibrary/res/1448/book_summary_front_bottom_right.png new file mode 100755 index 0000000..a3fd825 Binary files /dev/null and b/bqLibrary/res/1448/book_summary_front_bottom_right.png differ diff --git a/bqLibrary/res/1448/book_summary_front_center_left.png b/bqLibrary/res/1448/book_summary_front_center_left.png new file mode 100755 index 0000000..ec45412 Binary files /dev/null and b/bqLibrary/res/1448/book_summary_front_center_left.png differ diff --git a/bqLibrary/res/1448/book_summary_front_center_right.png b/bqLibrary/res/1448/book_summary_front_center_right.png new file mode 100755 index 0000000..c06d82c Binary files /dev/null and b/bqLibrary/res/1448/book_summary_front_center_right.png differ diff --git a/bqLibrary/res/1448/book_summary_front_top_center.png b/bqLibrary/res/1448/book_summary_front_top_center.png new file mode 100755 index 0000000..97c312e Binary files /dev/null and b/bqLibrary/res/1448/book_summary_front_top_center.png differ diff --git a/bqLibrary/res/1448/book_summary_front_top_left.png b/bqLibrary/res/1448/book_summary_front_top_left.png new file mode 100755 index 0000000..71c5781 Binary files /dev/null and b/bqLibrary/res/1448/book_summary_front_top_left.png differ diff --git a/bqLibrary/res/1448/book_summary_front_top_right.png b/bqLibrary/res/1448/book_summary_front_top_right.png new file mode 100755 index 0000000..ed2d649 Binary files /dev/null and b/bqLibrary/res/1448/book_summary_front_top_right.png differ diff --git a/bqLibrary/res/1448/book_txt_list_big.png b/bqLibrary/res/1448/book_txt_list_big.png new file mode 100644 index 0000000..5ed2854 Binary files /dev/null and b/bqLibrary/res/1448/book_txt_list_big.png differ diff --git a/bqLibrary/res/1448/bookmark_tag.png b/bqLibrary/res/1448/bookmark_tag.png new file mode 100644 index 0000000..67d3cf6 Binary files /dev/null and b/bqLibrary/res/1448/bookmark_tag.png differ diff --git a/bqLibrary/res/1448/check.png b/bqLibrary/res/1448/check.png new file mode 100755 index 0000000..2b61dcf Binary files /dev/null and b/bqLibrary/res/1448/check.png differ diff --git a/bqLibrary/res/1448/checked.png b/bqLibrary/res/1448/checked.png new file mode 100755 index 0000000..94d6957 Binary files /dev/null and b/bqLibrary/res/1448/checked.png differ diff --git a/bqLibrary/res/1448/ckeck-group.png b/bqLibrary/res/1448/ckeck-group.png new file mode 100644 index 0000000..e6f5796 Binary files /dev/null and b/bqLibrary/res/1448/ckeck-group.png differ diff --git a/bqLibrary/res/1448/corrupted_book_ico.png b/bqLibrary/res/1448/corrupted_book_ico.png new file mode 100644 index 0000000..47ca85d Binary files /dev/null and b/bqLibrary/res/1448/corrupted_book_ico.png differ diff --git a/bqLibrary/res/1448/corrupted_file_ico.png b/bqLibrary/res/1448/corrupted_file_ico.png new file mode 100644 index 0000000..57794d6 Binary files /dev/null and b/bqLibrary/res/1448/corrupted_file_ico.png differ diff --git a/bqLibrary/res/1448/corrupted_list.png b/bqLibrary/res/1448/corrupted_list.png new file mode 100755 index 0000000..7d3e78d Binary files /dev/null and b/bqLibrary/res/1448/corrupted_list.png differ diff --git a/bqLibrary/res/1448/doc_book_ico.png b/bqLibrary/res/1448/doc_book_ico.png new file mode 100644 index 0000000..421ad4b Binary files /dev/null and b/bqLibrary/res/1448/doc_book_ico.png differ diff --git a/bqLibrary/res/1448/doc_file_ico.png b/bqLibrary/res/1448/doc_file_ico.png new file mode 100644 index 0000000..960ec33 Binary files /dev/null and b/bqLibrary/res/1448/doc_file_ico.png differ diff --git a/bqLibrary/res/1448/doc_list_big.png b/bqLibrary/res/1448/doc_list_big.png new file mode 100644 index 0000000..2e00f5a Binary files /dev/null and b/bqLibrary/res/1448/doc_list_big.png differ diff --git a/bqLibrary/res/1448/down-small-btn.png b/bqLibrary/res/1448/down-small-btn.png new file mode 100644 index 0000000..099fa56 Binary files /dev/null and b/bqLibrary/res/1448/down-small-btn.png differ diff --git a/bqLibrary/res/1448/down_arrow.png b/bqLibrary/res/1448/down_arrow.png new file mode 100755 index 0000000..f10e89b Binary files /dev/null and b/bqLibrary/res/1448/down_arrow.png differ diff --git a/bqLibrary/res/1448/download-list.png b/bqLibrary/res/1448/download-list.png new file mode 100755 index 0000000..801204c Binary files /dev/null and b/bqLibrary/res/1448/download-list.png differ diff --git a/bqLibrary/res/1448/download_btn.png b/bqLibrary/res/1448/download_btn.png new file mode 100755 index 0000000..8cd2536 Binary files /dev/null and b/bqLibrary/res/1448/download_btn.png differ diff --git a/bqLibrary/res/1448/edit-icon.png b/bqLibrary/res/1448/edit-icon.png new file mode 100644 index 0000000..c4d7213 Binary files /dev/null and b/bqLibrary/res/1448/edit-icon.png differ diff --git a/bqLibrary/res/1448/epub_book_ico.png b/bqLibrary/res/1448/epub_book_ico.png new file mode 100644 index 0000000..2b431bd Binary files /dev/null and b/bqLibrary/res/1448/epub_book_ico.png differ diff --git a/bqLibrary/res/1448/epub_list_big.png b/bqLibrary/res/1448/epub_list_big.png new file mode 100644 index 0000000..da1bf32 Binary files /dev/null and b/bqLibrary/res/1448/epub_list_big.png differ diff --git a/bqLibrary/res/1448/export-icon.png b/bqLibrary/res/1448/export-icon.png new file mode 100644 index 0000000..5808ae0 Binary files /dev/null and b/bqLibrary/res/1448/export-icon.png differ diff --git a/bqLibrary/res/1448/folder_ico.png b/bqLibrary/res/1448/folder_ico.png new file mode 100644 index 0000000..85ba901 Binary files /dev/null and b/bqLibrary/res/1448/folder_ico.png differ diff --git a/bqLibrary/res/1448/folder_list_big.png b/bqLibrary/res/1448/folder_list_big.png new file mode 100644 index 0000000..a0330c2 Binary files /dev/null and b/bqLibrary/res/1448/folder_list_big.png differ diff --git a/bqLibrary/res/1448/generic_image_file_ico.png b/bqLibrary/res/1448/generic_image_file_ico.png new file mode 100644 index 0000000..f241b55 Binary files /dev/null and b/bqLibrary/res/1448/generic_image_file_ico.png differ diff --git a/bqLibrary/res/1448/generic_image_list_big.png b/bqLibrary/res/1448/generic_image_list_big.png new file mode 100644 index 0000000..e240fe9 Binary files /dev/null and b/bqLibrary/res/1448/generic_image_list_big.png differ diff --git a/bqLibrary/res/1448/gif_file_ico.png b/bqLibrary/res/1448/gif_file_ico.png new file mode 100644 index 0000000..fcb7a91 Binary files /dev/null and b/bqLibrary/res/1448/gif_file_ico.png differ diff --git a/bqLibrary/res/1448/gif_list_big.png b/bqLibrary/res/1448/gif_list_big.png new file mode 100644 index 0000000..69d02e3 Binary files /dev/null and b/bqLibrary/res/1448/gif_list_big.png differ diff --git a/bqLibrary/res/1448/grid-btn.png b/bqLibrary/res/1448/grid-btn.png new file mode 100755 index 0000000..494355f Binary files /dev/null and b/bqLibrary/res/1448/grid-btn.png differ diff --git a/bqLibrary/res/1448/img_list_big.png b/bqLibrary/res/1448/img_list_big.png new file mode 100644 index 0000000..29dcc69 Binary files /dev/null and b/bqLibrary/res/1448/img_list_big.png differ diff --git a/bqLibrary/res/1448/img_list_big_generic.png b/bqLibrary/res/1448/img_list_big_generic.png new file mode 100644 index 0000000..1472665 Binary files /dev/null and b/bqLibrary/res/1448/img_list_big_generic.png differ diff --git a/bqLibrary/res/1448/jpg_file_ico.png b/bqLibrary/res/1448/jpg_file_ico.png new file mode 100644 index 0000000..2b3b8cc Binary files /dev/null and b/bqLibrary/res/1448/jpg_file_ico.png differ diff --git a/bqLibrary/res/1448/jpg_list_big.png b/bqLibrary/res/1448/jpg_list_big.png new file mode 100644 index 0000000..0508ff7 Binary files /dev/null and b/bqLibrary/res/1448/jpg_list_big.png differ diff --git a/bqLibrary/res/1448/library_styles.qss b/bqLibrary/res/1448/library_styles.qss new file mode 100644 index 0000000..9b8c735 --- /dev/null +++ b/bqLibrary/res/1448/library_styles.qss @@ -0,0 +1,1717 @@ +/************************************************************************* + +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 . + +*************************************************************************/ + +/* Library +--------------------------*/ +#Library{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#Library #searchCont{ +margin: 0px 35px; +min-height: 105px; +max-height: 105px; +border-width: 1px; +} +#searchCont #sortBooksLbl{ +margin-left: 35px; +font-size: 34px; +font-weight:bold; +} +#Library #selectAllBooksBtn{ +margin-right: 35px; +min-height: 82px; +max-height: 82px; +padding: 0px 54px; +border-width: 1px; +border-radius: 8px; +} +#Library #editBooksBtn{ +margin-right: 35px; +min-height: 82px; +max-height: 82px; +padding: 0px 54px; +border-width: 1px; +border-radius: 8px; +} +#Library #sortBooksCont #archiveBooksBtn, #Library #sortBooksCont #closeEditBooksBtn{ +border-color:#808080; +background-color:#FFFFFF; +border-style:solid; +padding: 0px 54px; +margin: 0px 0px 0px 28px; +min-height: 82px; +max-height: 82px; +border-width: 3px; +border-radius: 8px; +} +#searchCont #librarySearchLineEdit{ +margin-left: 35px; +padding-left: 82px; +min-width: 537px; +max-width: 537px; +min-height: 99px; +max-height: 99px; +border-radius:0; +} +#Library #searchCont #clearSearchBtn{ +margin: 0px; +min-width: 99px; +max-width: 99px; +min-height: 99px; +max-height: 99px; +border-width: 0px; +} +#searchCont #closeSearchBtn{ +margin: 0px 27px 0px 0px; +min-height: 82px; +max-height: 82px; +padding: 0px 54px; +border-width: 3px; +border-radius: 8px; +} +#searchCont #synchronizeBtn{ +margin: 0px 21px 0px 0px; +min-width: 82px; +max-width: 82px; +min-height: 82px; +max-height: 82px; +} +#searchCont #storeBtn{ +margin: 0px 35px 0px 0px; +min-width: 82px; +max-width: 82px; +min-height: 82px; +max-height: 82px; +} +#searchCont #searchBtn{ +margin: 0px 21px 0px 35px; +min-width: 82px; +max-width: 82px; +min-height: 82px; +max-height: 82px; +border-width: 3px; +} +#topActions{ +/*margin: 0px 28px;*/ +margin: 0px 35px; +min-height: 61px; +max-height: 61px; +} +#searchCont #bookActionsSelectBtn{ +padding: 0px 28px 0px 0px; +margin: 0px 72px 0px 35px; +min-width: 170px; +max-width: 396px; +} +#sortBooksCont #showBooksSelectBtn{ +margin: 0px 35px 0px 35px; +padding: 0px 35px 0px 21px; +min-height: 72px; +max-height: 72px; +border-width: 3px; +border-radius: 8px; +border-radius: 8px; +font-size: 34px; +} +#sortBooksCont #selectBooksLbl{ +padding: 0px 6px 0px 0px; +font-size: 34px; +} +#sortBooksCont #allCollectionsLbl{ +margin: 0px 0px 0px 28px; +padding: 0px 6px 0px 0px; +font-size: 34px; +} + +#sortBooksCont #backToCollectionsBtn{ +margin: 0px 0px 0px 35px; +padding-left: 21px; +min-width: 141px; +max-width: 141px; +min-height: 71px; +max-height: 71px; +} +#sortBooksCont #addColectionBtn{ +margin: 0px 35px 0px 35px; +padding: 0px 68px 0px 18px; +min-height: 72px; +max-height: 72px; +border-width: 4px; +border-radius: 8px; +} +#topActions #showResultsLbl{ +margin: 0px 0px 0px 28px; +} +#topActions #pathDotsLbl{ +padding: 0px 7px 0px 28px; +} +#topActions #pathLbl{ +} +#breadCrumb, LibraryBreadCrumb, #LibraryBreadCrumb{ +margin: 0px 0px 0px 28px; +padding: 0px 28px 0px 28px; +} +LibraryBreadCrumb, #LibraryBreadCrumb{ + min-width: 1072px; + max-width: 1072px; + } +#booksContainer{ +min-height: 1088px; +max-height: 1150px; +} +#sortBooksCont{ +/*margin: 0px 35px;*/ +min-height: 102px; +max-height: 102px; +border-width: 1px; +border-top-radius: 33px; +} +#sortBooksCont #sortIconBtn{ +margin: 0px 11px 0px 28px; +min-width: 91px; +max-width: 91px; +min-height: 81px; +max-height: 81px; +} +#sortBooksCont #sortListBtn{ +margin: 0px 11px 0px 28px; +min-width: 91px; +max-width: 91px; +min-height: 81px; +max-height: 81px; +} +#sortByBtn{ +padding: 0px 49px 0px 28px; +margin: 0px 35px 0px 0px; +min-height: 72px; +max-height: 72px; +border-width: 3px; +border-radius: 8px; +border-radius: 8px; +font-size: 34px; +} +#memoryType{ +margin: 0px 14px 0px 0px; +min-width: 474px; +max-width: 474px; +min-height: 85px; +max-height: 85px; +} +#memoryType #internalMemoryBtn{ +margin: 0px 35px 0px 0px; +min-width: 0px; +max-width: 474px; +min-height: 74px; +max-height: 74px; +font-size: 34px; +border-width: 3px; +border-top-right-radius: 7px; +border-bottom-right-radius: 7px; +} +#memoryType #sdBtn{ +margin: 0px 0px 0px 35px; +min-width: 113px; +max-width: 113px; +min-height: 74px; +max-height: 74px; +font-size: 34px; +border-width: 3px; +border-top-left-radius: 7px; +border-bottom-left-radius: 7px; +} +#sortBooksCont #recentSortBtn{ +padding: 0px 54px; +min-height: 72px; +max-height: 72px; +border-width: 3px; +border-top-left-radius: 8px; +border-bottom-left-radius: 8px; +} +#sortBooksCont #indexSortBtn{ +padding: 0px 54px; +min-height: 72px; +max-height: 72px; +border-width: 3px; +} +#sortBooksCont #titleSortBtn{ +padding: 0px 54px; +min-height: 72px; +max-height: 72px; +border-width: 3px; +} +#sortBooksCont #authorSortBtn{ +padding: 0px 54px; +min-height: 72px; +max-height: 72px; +border-width: 3px; +border-top-right-radius: 8px; +border-bottom-right-radius: 8px; +} +#sortBooksCont #fileNameBtn{ +padding: 0px 49px; +min-height: 72px; +max-height: 72px; +border-width: 3px; +border-top-left-radius: 8px; +border-bottom-left-radius: 8px; +} +#sortBooksCont #lastModifyBtn{ +margin: 0px 1px 0px 0px; +padding: 0px 49px; +min-height: 72px; +max-height: 72px; +border-width: 3px; +border-top-right-radius: 8px; +border-bottom-right-radius: 8px; +} +/*LibraryIconGridViewer +--------------------------*/ +#LibraryIconGridViewer{ +min-width: 1072px; +max-width: 1072px; +min-height: 1088px; +max-height: 1088px; +} +#iconGridViewerCont +{ +min-width: 1072px; +max-width: 1072px; +min-height: 1002px; +max-height: 1002px; +} + +#iconGridViewerCont #book1, #iconGridViewerCont #book2, #iconGridViewerCont #book3, #iconGridViewerCont #book4, #iconGridViewerCont #book5, #iconGridViewerCont #book6{ +min-width: 344px; +max-width: 344px; +min-height: 434px; +min-height: 434px; +} +#iconGridViewerCont #book1Cont, #iconGridViewerCont #book2Cont, #iconGridViewerCont #book3Cont, #iconGridViewerCont #book4Cont, #iconGridViewerCont #book5Cont, #iconGridViewerCont #book6Cont{ +min-width: 344px; +max-width: 344px; +min-height: 434px; +min-height: 434px; +margin-top: 26px; +margin-bottom:50px; +} +#iconGridViewerCont #book4Cont, #iconGridViewerCont #book5Cont, #iconGridViewerCont #book6Cont{ +margin-bottom:0px; +} + +/*LibraryIconGridViewerItem +------------------------------------*/ +#fileCont{ +min-width: 344px; +max-width: 344px; +} +#LibraryIconGridViewerItem { +min-width: 344px; +max-width: 344px; +min-height: 434px; +max-height: 434px; +} +#IconGridViewerItemCont { +min-width: 344px; +max-width: 344px; +min-height: 424px; +max-height: 424px; +} +#IconBookItemCont{ +min-width: 344px; +max-width: 344px; +min-height: 434px; +max-height: 434px; +} +#IconFileItemCont{ +min-width: 344px; +max-width: 344px; +min-height: 434px; +max-height: 434px; +} +#currentBookCoverLbl{ +min-width: 247px; +max-width: 247px; +min-height: 369px; +max-height: 369px; +} +#currentBookTopLeft{ +min-width: 93px; +max-width: 93px; +min-height: 91px; +max-height: 91px; +} +#currentBookTopCenter{ +min-width: 247px; +max-width: 247px; +min-height: 91px; +max-height: 91px; +} +#currentBookTopRight{ +min-width: 72px; +max-width: 72px; +min-height: 91px; +max-height: 91px; +} +#currentBookCenterLeft{ +min-width: 93px; +max-width: 93px; +min-height: 369px; +max-height: 369px; +} +#currentBookCenterRight{ +min-width: 72px; +max-width: 72px; +min-height: 369px; +max-height: 369px; +} +#currentBookBottomLeft{ +min-width: 93px; +max-width: 93px; +min-height: 45px; +max-height: 45px; +} +#currentBookBottomCenter{ +min-width: 247px; +max-width: 247px; +min-height: 45px; +max-height: 45px; +} +#currentBookBottomRight{ +min-width: 72px; +max-width: 72px; +min-height: 45px; +max-height: 45px; +} +#IconGridViewerItemCont #coverCont #topLeftLbl{ +min-width: 35px; +max-width: 35px; +min-height: 7px; +max-height: 7px; +} +#IconGridViewerItemCont #coverCont #topCenterLbl{ +min-width: 247px; +max-width: 247px; +min-height: 7px; +max-height: 7px; +} +#IconGridViewerItemCont #coverCont #topRightLbl{ +min-width: 34px; +max-width: 34px; +min-height: 7px; +max-height: 7px; +} +#IconGridViewerItemCont #coverCont #centerLeftLbl{ +min-width: 35px; +max-width: 35px; +min-height: 369px; +max-height: 369px; +} +#IconGridViewerItemCont #coverCont #cover, #IconGridViewerItemCont #coverCont #cover #coverLabel{ +min-width: 247px; +max-width: 247px; +min-height: 369px; +max-height: 369px; +} +#IconGridViewerItemCont #coverCont #centerRightLbl{ +min-width: 34px; +max-width: 34px; +min-height: 369px; +max-height: 369px; +} +#IconGridViewerItemCont #coverCont #bottomLeftLbl{ +min-width: 35px; +max-width: 35px; +min-height: 14px; +max-height: 14px; +} +#IconGridViewerItemCont #coverCont #bottomCenterLbl{ +min-width: 247px; +max-width: 247px; +min-height: 14px; +max-height: 14px; +} +#IconGridViewerItemCont #coverCont #bottomRightLbl{ +min-width: 34px; +max-width: 34px; +min-height: 14px; +max-height: 14px; +} +#coverFileLbl{ +min-width: 335px; +max-width: 335px; +min-height: 344px; +max-height: 344px; +} +#coverCont #titleLbl,#cover #titleLbl{ +min-width: 253px; +max-width: 253px; +min-height: 72px; +max-height: 72px; +padding-top: 215px; +font-size: 28px; +} +#coverCont #fileNameLbl,#cover #fileNameLbl{ +min-width: 253px; +max-width: 253px; +min-height: 64px; +max-height: 64px; +font-size: 30px; +} +#coverCont #authorLbl,#cover #authorLbl{ +min-width: 253px; +max-width: 253px; +font-size: 25px; +min-height: 35px; +max-height: 35px; +padding-top: 264px; +} +#fileTitleLbl{ +font-size: 30px; +} +#iconGridViewerCont #newTagLbl, #LibraryIconGridViewerItem #newTagLbl{ +min-width: 311px; +max-width: 311px; +min-height: 419px; +max-height: 419px; +padding: 0px 0px - 4px 0px; +font-size: 27px; +} +#iconGridViewerCont #archiveTagLbl,#LibraryIconGridViewerItem #archiveTagLbl{ +min-width: 317px; +max-width: 317px; +min-height: 410px; +max-height: 410px; +padding: 0px 0px 0px 0px; +font-size: 27px; +} +#iconGridViewerCont #downloadBtn, #LibraryIconGridViewerItem #downloadBtn{ +min-width: 313px; +max-width: 313px; +min-height: 400px; +max-height: 400px; +padding: 0px 0px 0px 0px; +} +#iconGridViewerCont #readingTagLbl, #LibraryIconGridViewerItem #readingTagLbl{ +min-width: 335px; +max-width: 335px; +min-height: 431px; +max-height: 431px; +} +#iconGridViewerCont #sampleTagLbl, #LibraryIconGridViewerItem #sampleTagLbl{ +/*min-width: 276px; +max-width: 276px; +min-height: 386px; +max-height: 386px;*/ +min-width: 122px; +max-width: 122px; +min-height: 122px; +max-height: 122px; +margin: 0px 0px 0px 0px; +font-size: 27px; +} +#iconGridViewerCont #subscriptionTagLbl, #LibraryIconGridViewerItem #subscriptionTagLbl{ +/*min-width: 276px; +max-width: 276px; +min-height: 386px; +max-height: 386px;*/ +min-width: 122px; +max-width: 122px; +min-height: 122px; +max-height: 122px; +margin: 0px 0px 0px 0px; +font-size: 27px; +} +#iconGridViewerCont #selectBookLbl{ +min-width: 344px; +max-width: 344px; +min-height: 416px; +max-height: 416px; +} +/*IconGridViewer +--------------------------*/ +#LibraryLineGridViewer{ +min-width: 1072px; +max-width: 1072px; +min-height: 1095px; +max-height: 1095px; +} +#LibraryLineGridViewer #book1, #LibraryLineGridViewer #book2, #LibraryLineGridViewer #book3, #LibraryLineGridViewer #book4, #LibraryLineGridViewer #book5, #LibraryLineGridViewer #book6, #book7{ +margin: 0px; +padding: 0px; +min-height: 156px; +min-height: 156px; +border-width: 1px; +} +/*LibraryLineGridViewerItem +------------------------*/ +#LibraryReadingLineGridViewer,#LibraryReadingLineGridViewerCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 1095px; +max-height: 1095px; +} +#LibraryLineGridViewerItemCont,LibraryLineGridViewerItem{ +min-width: 1072px; +max-width: 1072px; +min-height: 156px; +max-height: 156px; +} +#LibraryReadingLineGridViewerCont #book1, #LibraryReadingLineGridViewerCont #book2, #LibraryReadingLineGridViewerCont #book3{ +margin: 0px; +padding: 0px; +min-height: 156px; +max-height: 156px; +border-width: 1px; +} +#LibraryReadingLineGridViewerCont #mainBookInfoCont{ +min-height: 461px; +max-height: 461px; +border-width: 1px; +} +#LibraryLineGridViewerItemCont #typeCont,LibraryLineGridViewerItem #typeCont{ +min-width: 144px; +max-width: 144px; +} +#LibraryLineGridViewerItemCont #titleLbl,LibraryLineGridViewerItem #titleLbl{ +padding-right: 21px; +min-width: 580px; +max-width: 1004px; +min-height: 72px; +max-height: 100px; +font-size: 40px; +} +#LibraryLineGridViewerItemCont #authorLbl,LibraryLineGridViewerItem #authorLbl{ +min-width: 580px; +max-width: 580px; +min-height: 40px; +max-height: 40px; +font-size: 34px; +} +#LibraryLineGridViewerItemCont #typeCont #iconTypeFileLbl,LibraryLineGridViewerItem #typeCont #iconTypeFileLbl{ +margin: 21px 0px 0px 0px; +min-width: 144px; +max-width: 144px; +min-height: 91px; +max-height: 91px; +} +#LibraryLineGridViewerItemCont #typeCont #readingProgressLbl,LibraryLineGridViewerItem #typeCont #readingProgressLbl{ +font-size: 31px; +} +#LibraryLineGridViewerItemCont #newTagLbl,LibraryLineGridViewerItem #newTagLbl{ +min-width: 79px; +max-width: 79px; +min-height: 156px; +max-height: 156px; +font-size: 28px; +} +#LibraryLineGridViewerItemCont #archiveTagLbl,LibraryLineGridViewerItem #archiveTagLbl{ +min-width: 79px; +max-width: 79px; +min-height: 156px; +max-height: 156px; +font-size: 25px; +} +#LibraryLineGridViewerItemCont #sampleTagLbl,LibraryLineGridViewerItem #sampleTagLbl{ +min-width: 79px; +max-width: 79px; +min-height: 156px; +max-height: 156px; +font-size: 28px; +} +#LibraryLineGridViewerItemCont #subscriptionTagLbl,LibraryLineGridViewerItem #subscriptionTagLbl{ +min-width: 79px; +max-width: 79px; +min-height: 156px; +max-height: 156px; +font-size: 28px; +} +#LibraryLineGridViewerItemCont #downloadBtn,LibraryLineGridViewerItem #downloadBtn{ +min-width: 91px; +max-width: 91px; +min-height: 156px; +max-height: 156px; +font-size: 28px; +} +#LibraryLineGridViewerItemCont #selectBookLbl ,LibraryLineGridViewerItem #selectBookLbl{ +min-width: 126px; +max-width: 126px; +min-height: 156px; +max-height: 156px; +} +#LibraryReadingLineGridViewerCont #coverCont #topLeftLbl{ +min-width: 35px; +max-width: 35px; +min-height: 20px; +max-height: 20px; +} +#LibraryReadingLineGridViewerCont #coverCont #topCenterLbl{ +min-width: 247px; +max-width: 247px; +min-height: 20px; +max-height: 20px; +} +#LibraryReadingLineGridViewerCont #coverCont #topRightLbl{ +min-width: 34px; +max-width: 34px; +min-height: 20px; +max-height: 20px; +} +#LibraryReadingLineGridViewerCont #coverCont #centerLeftLbl{ +min-width: 35px; +max-width: 35px; +min-height: 369px; +max-height: 369px; +} +#LibraryReadingLineGridViewerCont #coverCont #coverLbl, #LibraryReadingLineGridViewerCont #coverCont #coverTagsCont{ +min-width: 243px; +max-width: 243px; +min-height: 369px; +max-height: 369px; +} +#LibraryReadingLineGridViewerCont #coverCont #authorLbl_2{ +min-width: 247px; +max-width: 247px; +font-size: 25px; +min-height: 35px; +max-height: 35px; +padding-top: 276px; +} +#LibraryReadingLineGridViewerCont #coverCont #titleLbl{ +min-width: 247px; +max-width: 247px; +min-height: 72px; +max-height: 72px; +padding-top: 223px; +font-size: 28px; +} +#LibraryReadingLineGridViewerCont #coverCont #newTagLbl{ +min-width: 247px; +max-width: 247px; +min-height: 383px; +max-height: 383px; +padding: 0px 0px - 4px 0px; +font-size: 27px; +} +#LibraryReadingLineGridViewerCont #coverCont #sampleTagLbl{ +min-width: 122px; +max-width: 122px; +min-height: 122px; +max-height: 122px; +margin: 0px 0px 0px 0px; +padding: 0px 0px 0px 0px; +font-size: 27px; +} +#LibraryReadingLineGridViewerCont #coverCont #subscriptionTagLbl{ +min-width: 122px; +max-width: 122px; +min-height: 122px; +max-height: 122px; +margin: 0px 0px 0px 0px; +padding: 0px 0px 0px 0px; +font-size: 27px; +} +#LibraryReadingLineGridViewerCont #coverCont #centerRightLbl{ +min-width: 34px; +max-width: 34px; +min-height: 369px; +max-height: 369px; +} +#LibraryReadingLineGridViewerCont #coverCont #bottomLeftLbl{ +min-width: 35px; +max-width: 35px; +min-height: 28px; +max-height: 28px; +} +#LibraryReadingLineGridViewerCont #coverCont #bottomCenterLbl{ +min-width: 247px; +max-width: 247px; +min-height: 28px; +max-height: 28px; +} +#LibraryReadingLineGridViewerCont #coverCont #bottomRightLbl{ +min-width: 27px; +max-width: 27px; +min-height: 28px; +max-height: 28px; +} +/*LibraryReadingIconGridViewer +-----------------------------*/ +#LibraryReadingIconGridViewer +{ +min-width: 1072px; +max-width: 1072px; +min-height: 1092px; +max-height: 1092px; +} +#LibraryReadingIconGridViewerCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 1000px; +max-height: 1000px; +} +#LibraryReadingIconGridViewerCont #currentBookData{ +min-width: 615px; +max-width: 615px; +} +#LibraryReadingIconGridViewerCont #currentBookCoverLbl{ +min-width: 247px; +max-width: 247px; +min-height: 369px; +max-height: 369px; +} +#LibraryReadingIconGridViewerCont #currentBookCoverCont #coverAuthorLbl{ +min-width: 247px; +max-width: 247px; +font-size: 25px; +min-height: 35px; +max-height: 35px; +padding-top: 276px; +} +#LibraryReadingIconGridViewerCont #currentBookCoverCont #coverTitleLbl{ +min-width: 253px; +max-width: 253px; +min-height: 72px; +max-height: 72px; +padding-top: 205px; +font-size: 28px; +} +#LibraryReadingIconGridViewerCont #currentBookCoverCont #newTagLbl{ +min-width: 247px; +max-width: 247px; +min-height: 372px; +max-height: 372px; +padding: 0px 0px - 4px 0px; +font-size: 27px; +} +#LibraryReadingIconGridViewerCont #currentBookCoverCont #sampleTagLbl{ +min-width: 122px; +max-width: 122px; +min-height: 122px; +max-height: 122px; +margin: 0px 0px 0px 0px; +padding: 0px 0px 0px 0px; +font-size: 27px; +} +#LibraryReadingIconGridViewerCont #currentBookCoverCont #subscriptionTagLbl{ +min-width: 122px; +max-width: 122px; +min-height: 122px; +max-height: 122px; +margin: 0px 0px 0px 0px; +padding: 0px 0px 0px 0px; +font-size: 27px; +} +#LibraryReadingIconGridViewerCont #currentBookTopLeft{ +min-width: 14px; +max-width: 14px; +min-height: 8px; +max-height: 8px; +} +#LibraryReadingIconGridViewerCont #currentBookTopCenter{ +min-width: 247px; +max-width: 247px; +min-height: 8px; +max-height: 8px; +} +#LibraryReadingIconGridViewerCont #currentBookTopRight{ +min-width: 34px; +max-width: 34px; +min-height: 8px; +max-height: 8px; +} +#LibraryReadingIconGridViewerCont #currentBookCenterLeft{ +min-width: 14px; +max-width: 14px; +min-height: 369px; +max-height: 369px; +} +#LibraryReadingIconGridViewerCont #currentBookCenterRight{ +min-width: 34px; +max-width: 34px; +min-height: 369px; +max-height: 369px; +} +#LibraryReadingIconGridViewerCont #currentBookBottomLeft{ +min-width: 14px; +max-width: 14px; +min-height: 24px; +max-height: 24px; +} +#LibraryReadingIconGridViewerCont #currentBookBottomCenter{ +min-width: 247px; +max-width: 247px; +min-height: 24px; +max-height: 24px; +} +#LibraryReadingIconGridViewerCont #currentBookBottoRight{ +min-width: 34px; +max-width: 34px; +min-height: 24px; +max-height: 24px; +} +#LibraryReadingLineGridViewerCont #currentBookData #dateAccessLbl, +#LibraryReadingLineGridViewerCont #currentBookData #lastAccessLbl, +#LibraryReadingIconGridViewerCont #currentBookData #dateAccessLbl, +#LibraryReadingIconGridViewerCont #currentBookData #lastAccessLbl{ +margin: 17px 8px 0px - 6px; +font-size: 31px; +} +#mainBookInfoCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 508px; +max-height: 508px; +} +#currentBookCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 482px; +max-height: 482px; +padding-top: 26px; +} +#readBookBtn{ +min-width: 1072px; +max-width: 1072px; +min-height: 479px; +max-height: 479px; +} +#currentBookData{ +min-width: 552px; +max-width: 552px; +} +#currentBookCont #readingLbl{ +margin: 45px 0px 20px 0px; +font-size: 44px; +} +#currentBookCont #bookTitleLbl{ +font-size: 54px; +} +#currentBookCont #authorLbl{ +margin-top: 18px; +font-size: 35px; +} +#currentBookCont #pagLbl,#currentBookCont #currentPagLbl,#currentBookCont #endBracketsLbl,#currentBookCont #separatorLbl,#currentBookCont #totalPagLbl{ +margin: 27px 0px 0px 0px; +font-size: 31px; +} +#currentBookCont #readLbl, #currentBookCont #readingPercentLbl, #currentBookCont #separatorReadLbl, #currentBookCont #percentLbl{ +margin: 4px 7px 0px 0px; +font-size: 31px; +font-weight:normal; + + +} +/*Viewer popups +-----------------------------------*/ +#popupCont{ +padding: 0px; +border-width: 17px; +border-radius: 17px; +} +#arrowCont, #arrowCont2{ +min-height: 34px; +max-height: 34px; +} +#topArrowLbl, #bottomArrowLbl{ +min-width: 57px; +max-width: 57px; +min-height: 35px; +max-height: 35px; +} +/*LibraryBooksFilterLayer +-------------------------------*/ +#LibraryBooksFilterLayer{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#HorizontalCont{ +min-height: 0px; +max-height: 1448px; +} +#LibraryBooksFilterLayerCont{ +min-width: 651px; +max-width: 651px; +min-height: 0px; +max-height: 1358px; +} +#LibraryBooksFilterLayer #spacerTop{ +min-height: 71px; +max-height: 71px; +} +#LibraryBooksFilterLayerCont #spacerLeft{ +min-width: 71px; +max-width: 71px; +} +#LibraryBooksFilterLayer QPushButton { +padding: 0px 0px 0px 27px; +border-bottom-width: 1px; +min-height: 127px; +max-height: 127px; +} +#LibraryBooksFilterLayer QPushButton#internalMemoryBtn, #LibraryBooksFilterLayer QPushButton#sdBtn{ +} +/*LibraryBooksSubFilterLayer +-------------------------------*/ +#LibraryBooksSubFilterLayer{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#HorizontalCont{ +min-height: 0px; +max-height: 1448px; +} +#LibraryBooksFilterLayerCont{ +min-width: 651px; +max-width: 651px; +min-height: 0px; +max-height: 1131px; +} +#LibraryBooksSubFilterLayer #spacerTop{ +min-height: 150px; +max-height: 150px; +} +#LibraryBooksSubFilterLayer #spacerLeft{ +min-width: 399px; +max-width: 399px; +} +#LibraryBooksSubFilterLayer QPushButton { +padding: 0px 0px 0px 27px; +border-bottom-width: 1px; +min-height: 99px; +max-height: 99px; +} +#LibraryBooksSubFilterLayer #spacingLayerLbl{ +min-height: 17px; +max-height: 17px; +} +#LibraryBooksSubFilterLayer QPushButton#allBooksBtn, #LibraryBooksSubFilterLayer QPushButton#activeBooksBtn, #LibraryBooksSubFilterLayer QPushButton#sampleBooksBtn, #LibraryBooksSubFilterLayer QPushButton#subscriptionBooksBtn{ +} +#LibraryBooksSubFilterLayer QPushButton#allBooksBtn{ +border-top-left-radius: 17px; +border-top-right-radius: 17px; +} +#LibraryBooksSubFilterLayer QPushButton#subscriptionBooksBtn{ +border-bottom-left-radius: 17px; +border-bottom-right-radius: 17px; +} +#LibraryBooksSubFilterLayer QPushButton#archivedBtn{ +border-top-left-radius: 17px; +border-top-right-radius: 17px; +} +#LibraryBooksSubFilterLayer #separatorLbl{ +min-height: 11px; +max-height: 11px; +} +#LibraryBooksSubFilterLayer QPushButton#archivedPremiumBtn{ +border-bottom-left-radius: 17px; +border-bottom-right-radius: 17px; +} +/*LibraryAllBooksSubFilterLayer +-------------------------------*/ +#LibraryAllBooksSubFilterLayer{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#HorizontalCont{ +min-height: 0px; +max-height: 1448px; +} +#LibraryAllBooksSubFilterLayer #LibraryAllBooksFilterLayerCont{ +min-width: 679px; +max-width: 679px; +min-height: 0px; +max-height: 1131px; +} +#LibraryAllBooksSubFilterLayerCont{ +min-width: 962px; +max-width: 962px; +min-height: 0px; +max-height: 1131px; +} +#LibraryAllBooksSubFilterLayer #spacerTop{ +min-height: 170px; +max-height: 170px; +} +#LibraryAllBooksSubFilterLayer #spacerLeft{ +min-width: 23px; +max-width: 23px; +} +#LibraryAllBooksSubFilterLayer QPushButton { +padding: 0px 0px 0px 27px; +border-bottom-width: 1px; +min-height: 109px; +max-height: 109px; +} +#LibraryAllBooksSubFilterLayer #spacingLayerLbl{ +min-height: 17px; +max-height: 17px; +} +#LibraryAllBooksSubFilterLayer QPushButton#allBooksBtn, #LibraryAllBooksSubFilterLayer QPushButton#allActiveBooksBtn, #LibraryAllBooksSubFilterLayer QPushButton#readBooksBtn{ +} +#LibraryAllBooksSubFilterLayer QPushButton#allBooksBtn{ +border-top-left-radius: 17px; +border-top-right-radius: 17px; +} +/*LibrarySortBooksByLayer +-------------------------------*/ +#LibrarySortBooksByLayer{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#HorizontalCont{ +min-height: 0px; +max-height: 1448px; +} +#LibrarySortBooksByLayer #LibrarySortBooksByLayerCont{ +min-width: 495px; +max-width: 495px; +min-height: 0px; +max-height: 1131px; +} +#LibrarySortBooksByLayer #spacerTop{ +min-height: 170px; +max-height: 170px; +} +#LibrarySortBooksByLayer #spacerLeft{ +min-width: 21px; +max-width: 21px; +} +#LibrarySortBooksByLayer QPushButton { +padding: 0px 0px 0px 27px; +border-bottom-width: 1px; +min-height: 109px; +max-height: 109px; +} +/*LibrarySortBrowserBooksByLayer +-------------------------------*/ +#LibrarySortBrowserBooksByLayer{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#HorizontalCont{ +min-height: 0px; +max-height: 1448px; +} +#LibrarySortBrowserBooksByLayer #LibrarySortBooksByLayerCont{ +min-width: 566px; +max-width: 566px; +min-height: 0px; +max-height: 1131px; +} +#LibrarySortBrowserBooksByLayer #spacerTop{ +min-height: 170px; +max-height: 170px; +} +#LibrarySortBrowserBooksByLayer #spacerLeft{ +min-width: 21px; +max-width: 21px; +} +#LibrarySortBrowserBooksByLayer QPushButton { +padding: 0px 0px 0px 27px; +border-bottom-width: 1px; +min-height: 109px; +max-height: 109px; +} +#LibrarySortBrowserBooksByLayer QPushButton#modDateSortBtn { +border:none; +} +/*BookSummaryPopup +---------------------------*/ +#headerPopup #closeBtn{ +min-width: 91px; +max-width: 91px; +min-height: 91px; +max-height: 91px; +} +#BookSummaryPopup{ +min-width: 977px; +max-width: 977px; +min-height: 1068px; +max-height: 1068px; +} +#BookSummaryPopup #headerPopup{ +margin: 0px 0px 0px 0px; +padding: 0px; +} +#BookSummaryPopup #headerPopup #closeBtn{ +min-width: 91px; +max-width: 91px; +min-height: 91px; +max-height: 91px; +} +#BookSummaryPopup #popupCont{ +padding: 0px 27px 0px 27px; +} +#BookSummaryPopup #synopsisLbl{ +margin: 0px 0px 0px 0px; +padding-left: 0px; +padding-right: 0px; +} +#SynopsisCont #synopsisLbl{ +margin: 21px 0px 0px 0px; +padding-left: 21px; +} +#BookSummaryPopup #summaryTextBrowser{ +margin-left: 0px; +margin-right: 0px; +padding-left: 0px; +padding-right: 0px; +} +#summaryTextBrowser{ +min-height: 424px; +max-height: 424px; +} +/*LibraryBookListActions +---------------------------*/ +#LibraryBookListActions{ +/*margin-right: 1px;*/ +min-width: 317px; +max-width: 317px; +min-height: 362px; +max-height: 362px; +} +#LibraryBookListActionsCont{ +border-width: 3px; +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +} +#LibraryBookListActions QPushButton{ +border-bottom-width: 1px; +max-height: 91px; +min-height: 91px; +padding: 0px 0px 0px 35px; +} +/*LibraryCollectionLayer +---------------------------*/ +#LibraryCollectionLayer{ +min-width:654px; +max-width:654px; +min-height: 707px; +max-height: 707px; +} +#CollectionLayerCont #VerticalPagerPopup, #CollectionLayerCont ViewerVerticalPagerPopup{ +min-width: 322px; +max-width: 322px; +min-height: 91px; +max-height: 91px; +} +#CollectionLayerCont #VerticalPagerPopup QPushButton, #CollectionLayerCont ViewerVerticalPagerPopup QPushButton{ +} +/*LibraryPageHandler +----------------------------*/ +#pageLibraryViewerCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 91px; +max-height: 91px; +} +#VerticalPagerHandler{ +min-width: 1072px; +max-width: 1072px; +margin: 0px 0px 0px 0px; +min-height: 87px; +max-height: 87px; +border-top: 1px solid #808080; +} +#VerticalPagerHandler #pageLibraryViewerCont{ +min-height: 91px; +max-height: 91px; +} +#VerticalPagerHandler #pageLibraryViewerCont #forwardButton{ +min-width: 163px; +max-width: 163px; +min-height: 91px; +max-height: 91px; +border-left-width: 1px; +} +#VerticalPagerHandler #pageLibraryViewerCont #backButton{ +min-width: 163px; +max-width: 163px; +min-height: 91px; +max-height: 91px; +border-right-width: 1px; +} +#pageLibraryViewerCont #pageLabel{ +margin: 0px 0px 0px 33px; +min-height: 91px; +max-height: 91px; +min-width: 170px; +} +#VerticalPagerHandler #pageLabel{ +/*margin-top: 3px;*/ +min-height: 91px; +max-height: 91px; +font-size: 34px; +} +QSlider#pagerSlider{ +min-height: 91px; +max-height: 91px; +min-width: 523px; +max-width: 523px; +} +QSlider#pagerSlider::groove:horizontal { +height: 8px; +border-radius: 7px; +} +QSlider#pagerSlider::sub-page:horizontal { +margin-left: 40px; +height: 8px; +border-radius: 7px; +} +QSlider#pagerSlider::add-page:horizontal { +height: 8px; +border-radius: 7px; +margin-right: 40px; +} +QSlider#pagerSlider::handle:horizontal { +width: 85px; +height: 35px; +margin-top: -18px; +margin-bottom: -18px; +border-radius: 7px; +} +QSlider#pagerSlider::handle:horizontal:hover { +border-radius: 7px; +} +QSlider#pagerSlider::sub-page:horizontal:disabled { +} +QSlider#pagerSlider::add-page:horizontal:disabled { +} +QSlider#pagerSlider::handle:horizontal:disabled { +border-radius: 7px; +} +/*LibraryActionsMenu +-----------------------*/ +#LibraryActionsMenu{ +min-width: 488px; +max-width: 488px; +min-height: 233px; +max-height: 233px; +} +#LibraryActionsMenu #horizontalWidget{} +#LibraryActionsMenu #popupCont{ +min-height: 95px; +max-height: 95px; +padding: 0px; +border-width: 21px; +border-radius: 21px; +} +#LibraryActionsMenu #popupCont QPushButton{ +margin: 0 1px; +padding: 0px 45px; +min-height: 88px; +max-height: 88px; +border-width: 1px; +font-size: 35px; +} +#LibraryActionsMenu #popupCont #copyActionBtn{} +#LibraryActionsMenu #popupCont #deleteActionBtn{ +border-width: 0px; +} +/*LibraryBookSummary +-----------------------*/ +#LibraryBookSummary #bookSummaryDataContainer #actionsContainer #moreActionsBtn, +#LibraryBookSummary #bookSummaryDataContainer #actionsContainer #addToCollectionBtn, +#LibraryBookSummary #bookSummaryDataContainer #actionsContainer #readSampleBtn{ +margin-top: 6px; +} +#bookSummaryActions{ +max-height: 356px; +min-height: 356px; +} +#LibraryBookSummary #bookActionsCont{ +margin: 0px 8px 0px 8px; +min-height: 110px; +max-height: 110px; +border-top-width: 3px; +border-bottom-width: 3px; +} +#LibraryBookSummary #bookActionsCont QPushButton{ +margin: 3px 7px; +padding: 57px 42px 7px 28px; +border-right-width: 1px; +border-left-width: 1px; +} +#LibraryBookSummary #bookActionsCont #bookActionBtn{ +} +#LibraryBookSummary #bookActionsCont #exportNotesBtn{ +} +#LibraryBookSummary #bookActionsCont #buyBookBtn{ +} +#LibraryBookSummary #bookActionsCont #copyToSDBtn{ +} +#LibraryBookSummary #bookActionsCont #archiveBtn{ +} +#bookSummaryDataContainer #priceCont{ +min-height: 42px; +max-height: 42px; +} +#LibraryBookSummary #bookSummaryActions #bookAuthorLbl{ +max-height: 57px; +min-height: 57px; +} +#LibraryBookSummary #bookSummaryDataContainer #spacerBottomLbl{ +max-height: 28px; +min-height: 28px; +} +#LibraryBookSummary #numberPagesCont{ +max-height: 49px; +min-height: 49px; +} +#LibraryBookSummary #moreActionsCont{ +max-height: 99px; +min-height: 99px; +} +#LibraryBookSummary #numberTotalPagesLbl{ +font-size: 31px; +} +#LibraryBookSummary #textTotalPagesLbl{ +font-size: 31px; +margin-left:- 6px; +margin-right: 10px; +} +#LibraryBookSummary #coverCont #authorLbl{ +min-width: 198px; +max-width: 198px; +font-size: 25px; +min-height: 35px; +max-height: 35px; +padding-top: 212px; +} +#LibraryBookSummary #coverCont #titleLbl{ +min-width: 198px; +max-width: 198px; +min-height: 72px; +max-height: 72px; +padding-top: 160px; +font-size: 28px; +} +/*LibraryLineGridCollections +-----------------------------------*/ +#LibraryLineGridCollections, #LineCollectionsCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 1095px; +max-height: 1095px; +} +#LibraryLineGridCollections #book1, #LibraryLineGridCollections #book2, #LibraryLineGridCollections #book3, #LibraryLineGridCollections #book4, +#LibraryLineGridCollections #book5, #LibraryLineGridCollections #book6, #LibraryLineGridCollections #book7, #LibraryLineGridCollections #book8, #LibraryLineGridCollections #book9{ +margin: 0px; +padding: 0px; +min-height: 116px; +min-height: 116px; +border-bottom-width: 3px; +} +/*LibraryLineGridCollectionsItem +-----------------------------------*/ +#LibraryLineGridCollectionsItem,#LineGridCollectionsItemCont, #goToBookBtn{ +min-width: 1072px; +max-width: 1072px; +min-height: 116px; +max-height: 116px; +} +#collectionCont{ +} +#collectionTitleLabel{ +padding-top: 7px; +margin: 0px 35px; +font-size: 40px; +min-height: 42px; +max-height: 42px; +} +#booksNumberLlb{ +font-size: 31px; +} +#booksNumberValueLbl{ +margin: 0px 0px 0px 34px; +padding: 0px 4px 0px 0px; +font-size: 31px; +} +#deleteCollectionBtn{ +margin: 18px 0px; +min-width: 144px; +max-width: 144px; +} +#editCollectionBtn{ +margin: 18px 0px; +min-width: 144px; +max-width: 144px; +border-left-width: 3px; +} + +/*LibraryEditCollection +-----------------------------------*/ +#LibraryEditCollection{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#LibraryEditCollection #headerCont{ +min-height: 96px; +max-height: 96px; +border-bottom-width: 4px; +} +#collectionActionTitle{ +padding: 0px 27px; +font-size: 37px; +} +#collectionContainer{ +margin: 0px 27px; +min-height: 919px; +max-height: 1047px; +border-width: 4px; +border-radius: 14px; +} +#LibraryEditCollection #booksContainer{ +min-height: 543px; +max-height: 1358px; +} +#LibraryEditCollection #booksContainer #book1, #LibraryEditCollection #booksContainer #book2, +#LibraryEditCollection #booksContainer #book3, #LibraryEditCollection #booksContainer #book4, +#LibraryEditCollection #booksContainer #book5, #LibraryEditCollection #booksContainer #book6, +#LibraryEditCollection #booksContainer #book7, #LibraryEditCollection #booksContainer #book8, +#LibraryEditCollection #booksContainer #book9, #LibraryEditCollection #booksContainer #book10, +#LibraryEditCollection #booksContainer #book11, #LibraryEditCollection #booksContainer #book12, +#LibraryEditCollection #booksContainer #book13, #LibraryEditCollection #booksContainer #book14, +#LibraryEditCollection #booksContainer #book15,#LibraryEditCollection #booksContainer #book16{ +margin: 0px 0px; +min-width: 434px; +max-width: 434px; +min-height: 127px; +max-height: 127px; +} +#LibraryEditCollection #booksContainer #bookCont1, #LibraryEditCollection #booksContainer #bookCont2, +#LibraryEditCollection #booksContainer #bookCont3, #LibraryEditCollection #booksContainer #bookCont4, +#LibraryEditCollection #booksContainer #bookCont5, #LibraryEditCollection #booksContainer #bookCont6, +#LibraryEditCollection #booksContainer #bookCont7, #LibraryEditCollection #booksContainer #bookCont8, +#LibraryEditCollection #booksContainer #bookCont9, #LibraryEditCollection #booksContainer #bookCont10, +#LibraryEditCollection #booksContainer #bookCont11, #LibraryEditCollection #booksContainer #bookCont12, +#LibraryEditCollection #booksContainer #bookCont13, #LibraryEditCollection #booksContainer #bookCont14, +#LibraryEditCollection #booksContainer #bookCont15,#LibraryEditCollection #booksContainer #bookCont16{ +min-height: 127px; +max-height: 127px; +} + +#LibraryEditCollection #editCollectionNameCont{ +min-height: 120px; +max-height: 120px; +} +#editCollectionNameCont #collectionNameLineEdit{ +padding: 0px 18px; +min-width: 786px; +max-width: 786px; +min-height: 72px; +max-height: 72px; +border-width: 3px; +border-top-left-radius: 37px; +border-bottom-left-radius: 37px; +} + +#editCollectionNameCont #clearInputBtn{ +padding: 0px; +min-width: 71px; +max-width: 71px; +min-height: 72px; +max-height: 72px; +border-width: 3px; +border-top-right-radius: 37px; +border-bottom-right-radius: 37px; +} +#collectionContainer #VerticalPager,#collectionContainer LibraryPageHandler{ +min-height: 91px; +max-height: 91px; +} +#collectionContainer #actionsCont{ +margin: 0px 54px; +min-height: 99px; +max-height: 99px; +border-bottom-width: 3px; +} +#collectionContainer #actionsCont QPushButton{ +padding: 0px 20px; +margin: 0px 18px 0px 0px; +min-height: 78px; +max-height: 78px; +border-width: 3px; +border-radius: 8px; +} +#collectionContainer #actionsCont QPushButton#unSelectAllBtn{ +margin-right: 54px; +} +#LibraryEditCollection #closeSearchBtn{ +margin: 0px 35px 0px 0px; +padding: 0px 72px 0px 18px; +min-height: 76px; +max-height: 76px; +border-width: 4px; +border-radius: 8px; +} +#LibraryEditCollection #bottomActionCont{ +min-height: 99px; +max-height: 99px; +border-top: 3px solid #808080; +} +#LibraryEditCollection #saveCollectionBnt{ +padding: 8px 64px; +min-height: 64px; +max-height: 64px; +font-size: 40px; +} +/* LibraryBookToCollectionItem +--------------------------*/ +#LibraryBookToCollectionItem, #BookToCollectionItemCont{ +min-width: 434px; +max-width: 434px; +min-height: 92px; +max-height: 92px; +} +#addBookCont{ +min-width: 434px; +max-width: 434px; +min-height: 92px; +max-height: 92px; +} +#addBookToCollectionBtn{ +min-width: 91px; +max-width: 91px; +min-height: 92px; +max-height: 92px; +} +#bookTitleLabel{ +margin-right: 99px; +min-height: 57px; +max-height: 57px; +} +#booksNumberLlb{ +margin-right: 99px; +} +#BookToCollectionItemCont #booksNumberLlb{ +/*font-size: 27px;*/ +} +/* VerticalPager +--------------------------*/ +#VerticalPager{ +margin: 0px 54px; +min-height: 91px; +max-height: 91px; +border-top-widht: 3px; +} +#pageLibraryViewerCont #upButton{ +min-width: 91px; +max-width: 91px; +min-height: 91px; +max-height: 91px; +} +#pageLibraryViewerCont #downButton{ +min-width: 91px; +max-width: 91px; +min-height: 91px; +max-height: 91px; +} +#VerticalPager #pageLabel{ +margin: 3px 0px 0px 18px; +min-height: 91px; +max-height: 91px; +} +#collectionContainer #pageLibraryViewerCont #VerticalPager #pageLabel{ +margin: 3px 18px 0px 18px; +} +/*LibraryImageFullScreen +--------------------------*/ + +#LibraryImageFullScreen{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#LibraryImageFullScreenCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#LibraryImageFullScreen #imageContent{ +min-width: 1086px; +max-width: 1086px; +min-height: 1267px; +max-height: 1267px; +} +#pageHandlerImage{ +min-height: 91px; +max-height: 91px; +border-top-width: 4px; +} +#LibraryImageFullScreenCont #closeBtn{ +min-width: 82px; +max-width: 82px; +min-height: 82px; +max-height: 82px; +border-radius: 11px; +border-width: 3px; +} +#btnImageBack{ +margin-top: 1px; +min-width: 163px; +max-width: 163px; +min-height: 91px; +max-height: 91px; +border-right-width: 1px; +} + +#btnImageNext{ +margin-top: 1px; +min-width: 163px; +max-width: 163px; +min-height: 91px; +max-height: 91px; +border-left-width: 1px; +} + +#pageHandlerImage #imageTitle{ +margin-top: 1px; +min-height: 45px; +max-height: 45px; +text-align:center; +font-size: 28px; +} + +#pageHandlerImage #pageLabel{ +margin-top: 1px; +min-height: 45px; +max-height: 45px; +text-align:center; +font-size: 25px; +} + diff --git a/bqLibrary/res/1448/list-btn.png b/bqLibrary/res/1448/list-btn.png new file mode 100755 index 0000000..69b1cdb Binary files /dev/null and b/bqLibrary/res/1448/list-btn.png differ diff --git a/bqLibrary/res/1448/new_list_notext.png b/bqLibrary/res/1448/new_list_notext.png new file mode 100755 index 0000000..2f6e154 Binary files /dev/null and b/bqLibrary/res/1448/new_list_notext.png differ diff --git a/bqLibrary/res/1448/new_tag.png b/bqLibrary/res/1448/new_tag.png new file mode 100644 index 0000000..9aca317 Binary files /dev/null and b/bqLibrary/res/1448/new_tag.png differ diff --git a/bqLibrary/res/1448/next-icon.png b/bqLibrary/res/1448/next-icon.png new file mode 100644 index 0000000..8aac03b Binary files /dev/null and b/bqLibrary/res/1448/next-icon.png differ diff --git a/bqLibrary/res/1448/no_cover.png b/bqLibrary/res/1448/no_cover.png new file mode 100644 index 0000000..95cf7b4 Binary files /dev/null and b/bqLibrary/res/1448/no_cover.png differ diff --git a/bqLibrary/res/1448/no_cover_chm.png b/bqLibrary/res/1448/no_cover_chm.png new file mode 100644 index 0000000..9b9e081 Binary files /dev/null and b/bqLibrary/res/1448/no_cover_chm.png differ diff --git a/bqLibrary/res/1448/no_cover_doc.png b/bqLibrary/res/1448/no_cover_doc.png new file mode 100644 index 0000000..becfa65 Binary files /dev/null and b/bqLibrary/res/1448/no_cover_doc.png differ diff --git a/bqLibrary/res/1448/no_cover_epub.png b/bqLibrary/res/1448/no_cover_epub.png new file mode 100644 index 0000000..fe23b43 Binary files /dev/null and b/bqLibrary/res/1448/no_cover_epub.png differ diff --git a/bqLibrary/res/1448/no_cover_fb2.png b/bqLibrary/res/1448/no_cover_fb2.png new file mode 100644 index 0000000..3ae86ca Binary files /dev/null and b/bqLibrary/res/1448/no_cover_fb2.png differ diff --git a/bqLibrary/res/1448/no_cover_html.png b/bqLibrary/res/1448/no_cover_html.png new file mode 100644 index 0000000..9e7acbf Binary files /dev/null and b/bqLibrary/res/1448/no_cover_html.png differ diff --git a/bqLibrary/res/1448/no_cover_mobi.png b/bqLibrary/res/1448/no_cover_mobi.png new file mode 100644 index 0000000..12f5c4c Binary files /dev/null and b/bqLibrary/res/1448/no_cover_mobi.png differ diff --git a/bqLibrary/res/1448/no_cover_pdf.png b/bqLibrary/res/1448/no_cover_pdf.png new file mode 100644 index 0000000..acca5c1 Binary files /dev/null and b/bqLibrary/res/1448/no_cover_pdf.png differ diff --git a/bqLibrary/res/1448/no_cover_rtf.png b/bqLibrary/res/1448/no_cover_rtf.png new file mode 100644 index 0000000..a05f553 Binary files /dev/null and b/bqLibrary/res/1448/no_cover_rtf.png differ diff --git a/bqLibrary/res/1448/no_cover_txt.png b/bqLibrary/res/1448/no_cover_txt.png new file mode 100644 index 0000000..5cdeaf1 Binary files /dev/null and b/bqLibrary/res/1448/no_cover_txt.png differ diff --git a/bqLibrary/res/1448/pdf_book_ico.png b/bqLibrary/res/1448/pdf_book_ico.png new file mode 100644 index 0000000..52af5ec Binary files /dev/null and b/bqLibrary/res/1448/pdf_book_ico.png differ diff --git a/bqLibrary/res/1448/pdf_file_ico.png b/bqLibrary/res/1448/pdf_file_ico.png new file mode 100644 index 0000000..5bc60cf Binary files /dev/null and b/bqLibrary/res/1448/pdf_file_ico.png differ diff --git a/bqLibrary/res/1448/pdf_list_big.png b/bqLibrary/res/1448/pdf_list_big.png new file mode 100644 index 0000000..5a00e69 Binary files /dev/null and b/bqLibrary/res/1448/pdf_list_big.png differ diff --git a/bqLibrary/res/1448/png_file_ico.png b/bqLibrary/res/1448/png_file_ico.png new file mode 100644 index 0000000..72f34c4 Binary files /dev/null and b/bqLibrary/res/1448/png_file_ico.png differ diff --git a/bqLibrary/res/1448/png_list_big.png b/bqLibrary/res/1448/png_list_big.png new file mode 100644 index 0000000..487a31c Binary files /dev/null and b/bqLibrary/res/1448/png_list_big.png differ diff --git a/bqLibrary/res/1448/prev-icon.png b/bqLibrary/res/1448/prev-icon.png new file mode 100644 index 0000000..f2de4a2 Binary files /dev/null and b/bqLibrary/res/1448/prev-icon.png differ diff --git a/bqLibrary/res/1448/purchase-icon.png b/bqLibrary/res/1448/purchase-icon.png new file mode 100644 index 0000000..b8ba029 Binary files /dev/null and b/bqLibrary/res/1448/purchase-icon.png differ diff --git a/bqLibrary/res/1448/qsg.png b/bqLibrary/res/1448/qsg.png new file mode 100755 index 0000000..8b33c73 Binary files /dev/null and b/bqLibrary/res/1448/qsg.png differ diff --git a/bqLibrary/res/1448/remove-icon.png b/bqLibrary/res/1448/remove-icon.png new file mode 100644 index 0000000..f15152e Binary files /dev/null and b/bqLibrary/res/1448/remove-icon.png differ diff --git a/bqLibrary/res/1448/sample_list_notext.png b/bqLibrary/res/1448/sample_list_notext.png new file mode 100755 index 0000000..2f6e154 Binary files /dev/null and b/bqLibrary/res/1448/sample_list_notext.png differ diff --git a/bqLibrary/res/1448/sample_tag_notext_sup.png b/bqLibrary/res/1448/sample_tag_notext_sup.png new file mode 100755 index 0000000..2ec89ee Binary files /dev/null and b/bqLibrary/res/1448/sample_tag_notext_sup.png differ diff --git a/bqLibrary/res/1448/sample_tag_notext_sup_big.png b/bqLibrary/res/1448/sample_tag_notext_sup_big.png new file mode 100755 index 0000000..4952f68 Binary files /dev/null and b/bqLibrary/res/1448/sample_tag_notext_sup_big.png differ diff --git a/bqLibrary/res/1448/save-icons-disabled.png b/bqLibrary/res/1448/save-icons-disabled.png new file mode 100644 index 0000000..9c6bb65 Binary files /dev/null and b/bqLibrary/res/1448/save-icons-disabled.png differ diff --git a/bqLibrary/res/1448/save-icons.png b/bqLibrary/res/1448/save-icons.png new file mode 100644 index 0000000..2e0fc1b Binary files /dev/null and b/bqLibrary/res/1448/save-icons.png differ diff --git a/bqLibrary/res/1448/sd-icon.png b/bqLibrary/res/1448/sd-icon.png new file mode 100644 index 0000000..13773f0 Binary files /dev/null and b/bqLibrary/res/1448/sd-icon.png differ diff --git a/bqLibrary/res/1448/search_ico.png b/bqLibrary/res/1448/search_ico.png new file mode 100755 index 0000000..d60553a Binary files /dev/null and b/bqLibrary/res/1448/search_ico.png differ diff --git a/bqLibrary/res/1448/search_library_btn.png b/bqLibrary/res/1448/search_library_btn.png new file mode 100755 index 0000000..f456e58 Binary files /dev/null and b/bqLibrary/res/1448/search_library_btn.png differ diff --git a/bqLibrary/res/1448/select_book.png b/bqLibrary/res/1448/select_book.png new file mode 100755 index 0000000..493a7a1 Binary files /dev/null and b/bqLibrary/res/1448/select_book.png differ diff --git a/bqLibrary/res/1448/slider_indicator.png b/bqLibrary/res/1448/slider_indicator.png new file mode 100644 index 0000000..6521178 Binary files /dev/null and b/bqLibrary/res/1448/slider_indicator.png differ diff --git a/bqLibrary/res/1448/spinner.png b/bqLibrary/res/1448/spinner.png new file mode 100755 index 0000000..8d1095b Binary files /dev/null and b/bqLibrary/res/1448/spinner.png differ diff --git a/bqLibrary/res/1448/store_btn.png b/bqLibrary/res/1448/store_btn.png new file mode 100755 index 0000000..acf1f98 Binary files /dev/null and b/bqLibrary/res/1448/store_btn.png differ diff --git a/bqLibrary/res/1448/synchronize_cloud.png b/bqLibrary/res/1448/synchronize_cloud.png new file mode 100755 index 0000000..ac59458 Binary files /dev/null and b/bqLibrary/res/1448/synchronize_cloud.png differ diff --git a/bqLibrary/res/1448/txt_book_ico.png b/bqLibrary/res/1448/txt_book_ico.png new file mode 100644 index 0000000..bbcc7e3 Binary files /dev/null and b/bqLibrary/res/1448/txt_book_ico.png differ diff --git a/bqLibrary/res/1448/txt_file_ico.png b/bqLibrary/res/1448/txt_file_ico.png new file mode 100644 index 0000000..1e7f586 Binary files /dev/null and b/bqLibrary/res/1448/txt_file_ico.png differ diff --git a/bqLibrary/res/1448/txt_list_big.png b/bqLibrary/res/1448/txt_list_big.png new file mode 100644 index 0000000..f78846b Binary files /dev/null and b/bqLibrary/res/1448/txt_list_big.png differ diff --git a/bqLibrary/res/1448/unckeck-group.png b/bqLibrary/res/1448/unckeck-group.png new file mode 100644 index 0000000..70cc717 Binary files /dev/null and b/bqLibrary/res/1448/unckeck-group.png differ diff --git a/bqLibrary/res/1448/unknow_file.png b/bqLibrary/res/1448/unknow_file.png new file mode 100755 index 0000000..50627f5 Binary files /dev/null and b/bqLibrary/res/1448/unknow_file.png differ diff --git a/bqLibrary/res/1448/unknow_file_ico.png b/bqLibrary/res/1448/unknow_file_ico.png new file mode 100644 index 0000000..62c6580 Binary files /dev/null and b/bqLibrary/res/1448/unknow_file_ico.png differ diff --git a/bqLibrary/res/1448/unknow_list_big.png b/bqLibrary/res/1448/unknow_list_big.png new file mode 100644 index 0000000..efe6cb7 Binary files /dev/null and b/bqLibrary/res/1448/unknow_list_big.png differ diff --git a/bqLibrary/res/1448/unknown_book_ico.png b/bqLibrary/res/1448/unknown_book_ico.png new file mode 100644 index 0000000..c144b56 Binary files /dev/null and b/bqLibrary/res/1448/unknown_book_ico.png differ diff --git a/bqLibrary/res/1448/up-small-btn.png b/bqLibrary/res/1448/up-small-btn.png new file mode 100644 index 0000000..8056c66 Binary files /dev/null and b/bqLibrary/res/1448/up-small-btn.png differ diff --git a/bqLibrary/res/1448/up_arrow.png b/bqLibrary/res/1448/up_arrow.png new file mode 100755 index 0000000..b4ecbfa Binary files /dev/null and b/bqLibrary/res/1448/up_arrow.png differ diff --git a/bqLibrary/res/1448/up_level.png b/bqLibrary/res/1448/up_level.png new file mode 100755 index 0000000..f6896c8 Binary files /dev/null and b/bqLibrary/res/1448/up_level.png differ diff --git a/bqLibrary/res/1448/up_level_list.png b/bqLibrary/res/1448/up_level_list.png new file mode 100755 index 0000000..6ec704b Binary files /dev/null and b/bqLibrary/res/1448/up_level_list.png differ diff --git a/bqLibrary/res/800/bg_library.png b/bqLibrary/res/800/bg_library.png index fa0d8d4..5fe06d7 100755 Binary files a/bqLibrary/res/800/bg_library.png and b/bqLibrary/res/800/bg_library.png differ diff --git a/bqLibrary/res/800/bg_library_01.png b/bqLibrary/res/800/bg_library_01.png deleted file mode 100755 index 4e8d9e5..0000000 Binary files a/bqLibrary/res/800/bg_library_01.png and /dev/null differ diff --git a/bqLibrary/res/800/bg_library_new.png b/bqLibrary/res/800/bg_library_new.png deleted file mode 100755 index 5fe06d7..0000000 Binary files a/bqLibrary/res/800/bg_library_new.png and /dev/null differ diff --git a/bqLibrary/res/800/library_styles.qss b/bqLibrary/res/800/library_styles.qss index 7439e8d..424339e 100644 --- a/bqLibrary/res/800/library_styles.qss +++ b/bqLibrary/res/800/library_styles.qss @@ -118,10 +118,9 @@ min-height:45px; max-height:45px; } #topActions{ -/*margin:0px 20px;*/ margin:0px 20px; -min-height:30px; -max-height:30px; +min-height:28px; +max-height:28px; } #searchCont #bookActionsSelectBtn{ padding:0px 20px 0px 0px; @@ -144,9 +143,9 @@ padding:0px 2px 0px 0px; font-size:19px; } #sortBooksCont #allCollectionsLbl{ -margin:0px 0px 0px 15px; +margin:0px 0px 0px 10px; padding:0px 2px 0px 0px; -font-size:19px; +font-size:18px; } #sortBooksCont #backToCollectionsBtn{ margin:0px 0px 0px 20px; @@ -203,7 +202,7 @@ min-height:45px; max-height:45px; } #sortByBtn{ -padding:0px 30px 0px 15px; +padding:0px 25px 0px 15px; margin:0px 22px 0px 0px; min-height:39px; max-height:39px; @@ -291,20 +290,30 @@ border-bottom-right-radius:5px; #LibraryIconGridViewer{ min-width:600px; max-width:600px; -min-height:619px; -max-height:619px; +min-height:614px; +max-height:614px; +} +#iconGridViewerCont{ +min-height:565px; +max-height:565px; } #iconGridViewerCont #book1, #iconGridViewerCont #book2, #iconGridViewerCont #book3, #iconGridViewerCont #book4, #iconGridViewerCont #book5, #iconGridViewerCont #book6{ min-width:190px; max-width:190px; min-height:240px; -min-height:240px; +max-height:240px; } + #iconGridViewerCont #book1Cont, #iconGridViewerCont #book2Cont, #iconGridViewerCont #book3Cont, #iconGridViewerCont #book4Cont, #iconGridViewerCont #book5Cont, #iconGridViewerCont #book6Cont{ min-width:190px; max-width:190px; min-height:240px; -min-height:240px; +max-height:240px; +margin-top: 18px; +margin-bottom:38px; +} +#iconGridViewerCont #book4Cont, #iconGridViewerCont #book5Cont, #iconGridViewerCont #book6Cont{ +margin-bottom:0px; } /*LibraryIconGridViewerItem ------------------------------------*/ @@ -541,14 +550,14 @@ max-height:230px; #LibraryLineGridViewer{ min-width:600px; max-width:600px; -min-height:619px; -max-height:619px; +min-height:614px; +max-height:614px; } #LibraryLineGridViewerCont{ min-width:600px; max-width:600px; -min-height:570px; -max-height:750px; +min-height:564px; +max-height:564px; } #LibraryLineGridViewerCont #book1, #LibraryLineGridViewerCont #book2, #LibraryLineGridViewerCont #book3, #LibraryLineGridViewerCont #book4, #LibraryLineGridViewerCont #book5, #LibraryLineGridViewerCont #book6, #LibraryLineGridViewerCont #book7{ margin:0px; @@ -760,12 +769,23 @@ font-size:20px; } /*LibraryReadingIconGridViewer -----------------------------*/ -#LibraryReadingIconGridViewer,#LibraryReadingIconGridViewerCont{ +#LibraryReadingIconGridViewer{ min-width:600px; max-width:600px; -min-height:619px; -max-height:619px; +min-height:617px; +max-height:617px; } +#LibraryReadingIconGridViewerCont{ +min-width:600px; +max-width:600px; +min-height:565px; +max-height:565px; +} +#LibraryReadingIconGridViewerCont #iconGridViewerCont{ +min-height:278px; +max-height:278px; +} + #LibraryReadingIconGridViewerCont #VerticalPagerHandler{ min-height:55px; min-height:55px; @@ -882,14 +902,14 @@ font-size:17px; #mainBookInfoCont{ min-width:600px; max-width:600px; -min-height:265px; -max-height:265px; +min-height:288px; +max-height:288px; } #currentBookCont{ min-width:600px; max-width:600px; -min-height:265px; -max-height:265px; +min-height:288px; +max-height:288px; } #readBookBtn{ min-width:600px; @@ -898,8 +918,8 @@ min-height:265px; max-height:265px; } #currentBookData{ -min-width:305px; -max-width:305px; +min-width:274px; +max-width:274px; } #currentBookCont #readingLbl{ margin:25px 0px 10px 0px; @@ -1218,53 +1238,52 @@ font-size:18px; #pageLibraryViewerCont{ min-width:600px; max-width:600px; -min-height:55px; -max-height:55px; +min-height:48px; +max-height:48px; } #VerticalPagerHandler{ min-width:600px; max-width:600px; -margin:7px 0px 0px 0px; -min-height:55px; -max-height:55px; +margin:0px 0px 0px 0px; +min-height:48px; +max-height:48px; border-top:1px solid #808080; } #VerticalPagerHandler #pageLibraryViewerCont{ -min-height:56px; -max-height:56px; +min-height:48px; +max-height:48px; } #VerticalPagerHandler #pageLibraryViewerCont #forwardButton{ margin-left:10px; min-width:90px; max-width:90px; -min-height:56px; -max-height:56px; +min-height:48px; +max-height:48px; border-left-width:1px; } #VerticalPagerHandler #pageLibraryViewerCont #backButton{ min-width:90px; max-width:90px; -min-height:56px; -max-height:56px; +min-height:48px; +max-height:48px; border-right-width:1px; } #pageLibraryViewerCont #pageLabel{ -margin:1px 0px 0px 14px; -min-height:56px; -max-height:56px; +margin:0px 0px 0px 14px; +min-height:48px; +max-height:48px; min-width:120px; max-width:120px; } #pageLibraryViewerCont #pageLabel{ -margin-top:1px; -min-height:56px; -max-height:56px; +min-height:48px; +max-height:48px; font-size:20px; } QSlider#pagerSlider{ margin-right:0px; -min-height:56px; -max-height:56px; +min-height:48px; +max-height:48px; min-width:275px; max-width:275px; } @@ -1700,7 +1719,8 @@ min-width:90px; max-width:90px; min-height:50px; max-height:50px; -border-right-width:1px;} +border-right-width:1px; +} #btnImageNext{ margin-top:1px; @@ -1708,19 +1728,22 @@ min-width:90px; max-width:90px; min-height:50px; max-height:50px; -border-left-width:1px;} +border-left-width:1px; +} #pageHandlerImage #imageTitle{ margin-top:1px; min-height:25px; max-height:25px; text-align:center; -font-size:16px;} +font-size:16px; +} #pageHandlerImage #pageLabel{ margin-top:1px; min-height:25px; max-height:25px; text-align:center; -font-size:14px;} +font-size:14px; +} diff --git a/bqLibrary/res/800/library_styles_new.qss b/bqLibrary/res/800/library_styles_new.qss deleted file mode 100644 index 36a9e5a..0000000 --- a/bqLibrary/res/800/library_styles_new.qss +++ /dev/null @@ -1,1015 +0,0 @@ -/************************************************************************* - -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 . - -*************************************************************************/ - -/* Library ---------------------------*/ -#Library{ -min-width:600px; -max-width:600px; -min-height:750px; -max-height:750px; -} -#Library #searchCont{ -margin:0px 20px; -min-height:50px; -max-height:50px; -border-width:1px; -} -#searchCont #sortBooksLbl{ -margin-left:20px; -font-size:19px; -font-weight:bold; -} -#Library #selectAllBooksBtn{ -margin-right:20px; -min-height:45px; -max-height:45px; -padding:0px 30px; -border-width:1px; -border-radius:5px; -} -#Library #editBooksBtn{ -margin-right:20px; -min-height:45px; -max-height:45px; -padding:0px 15px; -border-right-width:1px; -font-size:19px; -} -#Library #deleteBooksBtn{ -margin-right:20px; -min-height:45px; -max-height:45px; -padding:0px 15px; -font-size:19px; -} -#Library #sortBooksCont #archiveBooksBtn, #Library #sortBooksCont #closeEditBooksBtn{ -border-color:#808080; -background-color:#FFFFFF; -border-style:solid; -padding:0px 30px; -margin:0px 0px 0px 15px; -min-height:40px; -max-height:40px; -border-width:2px; -border-radius:5px; -} -#searchCont #librarySearchLineEdit{ -margin-left:20px; -padding-left:40px; -min-width:0px; -max-width:438px; -min-height:55px; -max-height:55px; -border-radius:0; -} -#Library #searchCont #clearSearchBtn{ -margin:0px; -min-width:46px; -max-width:46px; -min-height:55px; -max-height:55px; -border-width:0px; -} -#searchCont #closeSearchBtn{ -margin:0px 15px 0px 0px; -min-height:45px; -max-height:45px; -padding:0px 30px; -border-width:2px; -border-radius:5px; -} -#searchCont #synchronizeBtn{ -margin:0px 15px 0px 0px; -min-width:45px; -max-width:45px; -min-height:45px; -max-height:45px; -} -#searchCont #storeBtn{ -margin:0px 15px 0px 0px; -min-width:45px; -max-width:45px; -min-height:45px; -max-height:45px; -} -#searchCont #searchBtn{ -margin:0px 15px 0px 15px; -min-width:45px; -max-width:45px; -min-height:45px; -max-height:45px; -} -#topActions{ -/*margin:0px 20px;*/ -min-height:52px; -max-height:52px; -border-width:1px; -} -#searchCont #bookActionsSelectBtn{ -padding:0px 20px 0px 0px; -margin:0px 0px 0px 20px; -} -#sortBooksCont #showBooksSelectBtn{ -padding:0px 20px 0px 10px; -min-height:40px; -max-height:40px; -border-width:2px; -border-radius:5px; -border-radius:5px; -font-size:19px; -} -#sortBooksCont #selectBooksLbl{ -font-size:19px; -} -#topActions #showResultsLbl{ -margin:0px 0px 0px 20px; -} -#topActions #pathDotsLbl{ -padding:0px 4px 0px 15px; -} -#topActions #pathLbl{ -} -#breadCrumb{ -padding:0px 15px 0px 15px; -} -#booksContainer{ -min-height:570px; -max-height:750px; -} -#sortBooksCont{ -margin:0px 20px; -min-height:49px; -max-height:49px; -border-top-width:1px; -border-top-radius:18px; -} -#sortBooksCont #sortIconBtn{ -margin:0px 0px 0px 15px; -min-width:60px; -max-width:60px; -min-height:45px; -max-height:45px; -} -#sortBooksCont #sortListBtn{ -margin:0px 0px 0px 0px; -min-width:60px; -max-width:60px; -min-height:45px; -max-height:45px; -} -#sortByBtn{ -padding:0px 20px 0px 10px; -min-height:40px; -max-height:40px; -border-width:2px; -border-radius:5px; -border-radius:5px; -font-size:19px; -} -#memoryType{ -min-width:262px; -max-width:262px; -min-height:45px; -max-height:45px; -} -#memoryType #internalMemoryBtn{ -min-width:0px; -max-width:262px; -min-height:45px; -max-height:45px; -font-size:19px; -} -#memoryType #sdBtn{ -min-width:63px; -max-width:63px; -min-height:45px; -max-height:45px; -font-size:19px; -} -#sortBooksCont #recentSortBtn{ -padding:0px 30px; -min-height:40px; -max-height:40px; -border-width:2px; -border-top-left-radius:5px; -border-bottom-left-radius:5px; -} -#sortBooksCont #indexSortBtn{ -padding:0px 30px; -min-height:40px; -max-height:40px; -border-width:2px; -} -#sortBooksCont #titleSortBtn{ -padding:0px 30px; -min-height:40px; -max-height:40px; -border-width:2px; -} -#sortBooksCont #authorSortBtn{ -padding:0px 30px; -min-height:40px; -max-height:40px; -border-width:2px; -border-top-right-radius:5px; -border-bottom-right-radius:5px; -} -#sortBooksCont #fileNameBtn{ -padding:0px 20px; -min-height:40px; -max-height:40px; -border-width:2px; -border-top-left-radius:5px; -border-bottom-left-radius:5px; -} -#sortBooksCont #lastModifyBtn{ -margin:0px 20px 0px 0px; -padding:0px 20px; -min-height:40px; -max-height:40px; -border-width:2px; -border-top-right-radius:5px; -border-bottom-right-radius:5px; -} -/*LibraryIconGridViewer ---------------------------*/ -#LibraryIconGridViewer{ -min-width:600px; -max-width:600px; -min-height:570px; -max-height:570px; -} -#iconGridViewerCont #book1, #iconGridViewerCont #book2, #iconGridViewerCont #book3, #iconGridViewerCont #book4, #iconGridViewerCont #book5, #iconGridViewerCont #book6{ -min-width:190px; -max-width:190px; -min-height:240px; -min-height:240px; -} -#iconGridViewerCont #book1Cont, #iconGridViewerCont #book2Cont, #iconGridViewerCont #book3Cont, #iconGridViewerCont #book4Cont, #iconGridViewerCont #book5Cont, #iconGridViewerCont #book6Cont{ -min-width:190px; -max-width:190px; -min-height:240px; -min-height:240px; -} -/*LibraryIconGridViewerItem -------------------------------------*/ -#fileCont{ -min-width:190px; -max-width:190px; -} -#LibraryIconGridViewerItem { -min-width:190px; -max-width:190px; -min-height:240px; -max-height:240px; -} -#IconGridViewerItemCont { -min-width:190px; -max-width:190px; -min-height:228px; -max-height:228px; -} -#IconBookItemCont{ -min-width:190px; -max-width:190px; -min-height:240px; -max-height:240px; -} -#IconFileItemCont{ -min-width:190px; -max-width:190px; -min-height:240px; -max-height:240px; -} -#currentBookCoverLbl{ -min-width:140px; -max-width:140px; -min-height:210px; -max-height:210px; -} -#currentBookTopLeft{ -min-width:52px; -max-width:52px; -min-height:50px; -max-height:50px; -} -#currentBookTopCenter{ -min-width:140px; -max-width:140px; -min-height:50px; -max-height:50px; -} -#currentBookTopRight{ -min-width:40px; -max-width:40px; -min-height:50px; -max-height:50px; -} -#currentBookCenterLeft{ -min-width:52px; -max-width:52px; -min-height:210px; -max-height:210px; -} -#currentBookCenterRight{ -min-width:40px; -max-width:40px; -min-height:210px; -max-height:210px; -} -#currentBookBottomLeft{ -min-width:52px; -max-width:52px; -min-height:25px; -max-height:25px; -} -#currentBookBottomCenter{ -min-width:140px; -max-width:140px; -min-height:25px; -max-height:25px; -} -#currentBookBottomRight{ -min-width:40px; -max-width:40px; -min-height:25px; -max-height:25px; -} -#IconGridViewerItemCont #coverCont #topLeftLbl{ -min-width:20px; -max-width:20px; -min-height:5px; -max-height:5px; -} -#IconGridViewerItemCont #coverCont #topCenterLbl{ -min-width:140px; -max-width:140px; -min-height:5px; -max-height:5px; -} -#IconGridViewerItemCont #coverCont #topRightLbl{ -min-width:19px; -max-width:19px; -min-height:5px; -max-height:5px; -} -#IconGridViewerItemCont #coverCont #centerLeftLbl{ -min-width:20px; -max-width:20px; -min-height:210px; -max-height:210px; -} -#IconGridViewerItemCont #coverCont #cover, #IconGridViewerItemCont #coverCont #cover #coverLabel{ -min-width:140px; -max-width:140px; -min-height:210px; -max-height:210px; -} -#IconGridViewerItemCont #coverCont #centerRightLbl{ -min-width:19px; -max-width:19px; -min-height:210px; -max-height:210px; -} -#IconGridViewerItemCont #coverCont #bottomLeftLbl{ -min-width:20px; -max-width:20px; -min-height:7px; -max-height:7px; -} -#IconGridViewerItemCont #coverCont #bottomCenterLbl{ -min-width:140px; -max-width:140px; -min-height:7px; -max-height:7px; -} -#IconGridViewerItemCont #coverCont #bottomRightLbl{ -min-width:19px; -max-width:19px; -min-height:7px; -max-height:7px; -} -#coverFileLbl{ -min-width:185px; -max-width:185px; -min-height:190px; -max-height:190px; -} -#coverCont #titleLbl,#cover #titleLbl{ -min-width:140px; -max-width:140px; -min-height:40px; -max-height:40px; -padding-top:118px; -font-size:16px; -} -#coverCont #fileNameLbl,#cover #fileNameLbl{ -min-width:140px; -max-width:140px; -min-height:35px; -max-height:35px; -font-size:15px; -} -#coverCont #authorLbl,#cover #authorLbl{ -min-width:140px; -max-width:140px; -min-height:20px; -max-height:20px; -padding-top:158px; -font-size:15px; -} -#fileTitleLbl{ -font-size:15px; -} -#iconGridViewerCont #newTagLbl{ -min-width:180px; -max-width:180px; -min-height:229px; -max-height:229px; -padding:0px 0px 0px 0px; -font-size:16px; -} -#iconGridViewerCont #archiveTagLbl,#LibraryIconGridViewerItem #archiveTagLbl{ -min-width:180px; -max-width:180px; -min-height:229px; -max-height:229px; -padding:0px 0px 0px 0px; -} -#iconGridViewerCont #readingTagLbl{ -min-width:190px; -max-width:190px; -min-height:230px; -max-height:230px; -} -#iconGridViewerCont #sampleTagLbl{ -/*min-width:215px; -max-width:215px; -min-height:244px; -max-height:244px;*/ -min-width:72px; -max-width:72px; -min-height:72px; -max-height:72px; -margin:0px 0px 0px 0px; -padding:0px 0px 0px 0px; -font-size:16px; -} -#iconGridViewerCont #subscriptionTagLbl{ -/*min-width:215px; -max-width:215px; -min-height:244px; -max-height:244px;*/ -min-width:72px; -max-width:72px; -min-height:72px; -max-height:72px; -margin:0px 0px 0px 0px; -padding:0px 0px 0px 0px; -font-size:16px; -} -#iconGridViewerCont #selectBookLbl{ -min-width:190px; -max-width:190px; -min-height:230px; -max-height:230px; -} -/*LineGridViewer ---------------------------*/ -#LibraryLineGridViewer{ -min-width:600px; -max-width:600px; -min-height:570px; -max-height:750px; -} -#LibraryLineGridViewerCont{ -min-width:600px; -max-width:600px; -min-height:570px; -max-height:750px; -} -#LibraryLineGridViewerCont #book1, #LibraryLineGridViewerCont #book2, #LibraryLineGridViewerCont #book3, #LibraryLineGridViewerCont #book4, #LibraryLineGridViewerCont #book5, #LibraryLineGridViewerCont #book6, #LibraryLineGridViewerCont #book7{ -margin:0px; -padding:0px; -min-height:86px; -min-height:86px; -border-width:1px; -} - -/*LibraryLineGridViewerItem -------------------------*/ -#LibraryReadingLineGridViewer,#LibraryReadingLineGridViewerCont{ -min-width:600px; -max-width:600px; -min-height:565px; -min-height:565px; -} -#LibraryLineGridViewerItemCont,LibraryLineGridViewerItem{ -min-width:600px; -max-width:600px; -min-height:86px; -max-height:86px; -} -#LibraryReadingLineGridViewerCont #book1, #LibraryReadingLineGridViewerCont #book2, #LibraryReadingLineGridViewerCont #book3{ -margin:0px; -padding:0px; -min-height:86px; -min-height:86px; -border-width:1px; -} -#LibraryReadingLineGridViewerCont #VerticalPagerHandler{ -min-height:40px; -min-height:40px; -} -#LibraryReadingLineGridViewerCont #mainBookInfoCont{ -min-height:255px; -max-height:255px; -border-width:1px; -} -#LibraryLineGridViewerItemCont #typeCont,LibraryLineGridViewerItem #typeCont{ -min-width:80px; -max-width:80px; -} -#LibraryLineGridViewerItemCont #titleLbl,LibraryLineGridViewerItem #titleLbl{ -min-width:400px; -max-width:400px; -min-height:40px; -max-height:40px; -/*padding-top:118px;*/ -font-size:22px; -} -#LibraryLineGridViewerItemCont #authorLbl,LibraryLineGridViewerItem #authorLbl{ -min-width:400px; -max-width:400px; -min-height:20px; -max-height:20px; -/*padding-top:158px;*/ -font-size:19px; -} -#LibraryLineGridViewerItemCont #typeCont #iconTypeFileLbl,LibraryLineGridViewerItem #typeCont #iconTypeFileLbl{ -margin:10px 0px 0px 0px; -min-width:80px; -max-width:80px; -min-height:50px; -max-height:50px; -} -#LibraryLineGridViewerItemCont #typeCont #readingProgressLbl,LibraryLineGridViewerItem #typeCont #readingProgressLbl{ -font-size:17px; -} -#LibraryLineGridViewerItemCont #newTagLbl,LibraryLineGridViewerItem #newTagLbl{ -min-width:44px; -max-width:44px; -min-height:86px; -max-height:86px; -font-size:16px; -} -#LibraryLineGridViewerItemCont #archiveTagLbl,LibraryLineGridViewerItem #archiveTagLbl{ -min-width:44px; -max-width:44px; -min-height:86px; -max-height:86px; -font-size:14px; -} -#LibraryLineGridViewerItemCont #sampleTagLbl,LibraryLineGridViewerItem #sampleTagLbl{ -min-width:44px; -max-width:44px; -min-height:86px; -max-height:86px; -font-size:16px; -} -#LibraryLineGridViewerItemCont #subscriptionTagLbl,LibraryLineGridViewerItem #subscriptionTagLbl{ -min-width:44px; -max-width:44px; -min-height:86px; -max-height:86px; -font-size:16px; -} -#LibraryLineGridViewerItemCont #selectBookLbl ,LibraryLineGridViewerItem #selectBookLbl{ -min-width:70px; -max-width:70px; -min-height:86px; -max-height:86px; -} -#LibraryReadingLineGridViewerCont #coverCont #topLeftLbl{ -min-width:20px; -max-width:20px; -min-height:11px; -max-height:11px; -} -#LibraryReadingLineGridViewerCont #coverCont #topCenterLbl{ -min-width:140px; -max-width:140px; -min-height:11px; -max-height:11px; -} -#LibraryReadingLineGridViewerCont #coverCont #topRightLbl{ -min-width:19px; -max-width:19px; -min-height:11px; -max-height:11px; -} -#LibraryReadingLineGridViewerCont #coverCont #centerLeftLbl{ -min-width:20px; -max-width:20px; -min-height:210px; -max-height:210px; -} -#LibraryReadingLineGridViewerCont #coverCont #coverLbl,#LibraryReadingLineGridViewerCont #coverCont #coverTagsCont{ -min-width:140px; -max-width:140px; -min-height:210px; -max-height:210px; -} -#LibraryReadingLineGridViewerCont #coverCont #newTagLbl{ -min-width:140px; -max-width:140px; -min-height:220px; -max-height:220px; -padding:0px 0px -2px 4px; -font-size:16px; -} -#LibraryReadingLineGridViewerCont #coverCont #sampleTagLbl{ -min-width:72px; -max-width:72px; -min-height:72px; -max-height:72px; -margin:0px 0px 0px 0px; -padding:0px 0px 0px 0px; -font-size:15px; -} -#LibraryReadingLineGridViewerCont #coverCont #subscriptionTagLbl{ -min-width:72px; -max-width:72px; -min-height:72px; -max-height:72px; -margin:0px 0px 0px 0px; -padding:0px 0px 0px 0px; -font-size:15px; -} -#LibraryReadingLineGridViewerCont #coverCont #centerRightLbl{ -min-width:19px; -max-width:19px; -min-height:210px; -max-height:210px; -} -#LibraryReadingLineGridViewerCont #coverCont #bottomLeftLbl{ -min-width:20px; -max-width:20px; -min-height:16px; -max-height:16px; -} -#LibraryReadingLineGridViewerCont #coverCont #bottomCenterLbl{ -min-width:140px; -max-width:140px; -min-height:16px; -max-height:16px; -} -#LibraryReadingLineGridViewerCont #coverCont #bottomRightLbl{ -min-width:19px; -max-width:19px; -min-height:16px; -max-height:16px; -} -#LibraryReadingLineGridViewerCont LibraryLineGridViewerItem #titleLbl{ -font-size:22px; -} -#LibraryReadingLineGridViewerCont LibraryLineGridViewerItem #authorLbl{ -font-size:20px; -} -/*LibraryReadingIconGridViewer ------------------------------*/ -#LibraryReadingIconGridViewer,#LibraryReadingIconGridViewerCont{ -min-width:600px; -max-width:600px; -min-height:565px; -max-height:565px; -} -#LibraryReadingIconGridViewerCont #VerticalPagerHandler{ -min-height:40px; -min-height:40px; -} -#LibraryReadingIconGridViewerCont #currentBookData{ -min-width:340px; -max-width:340px; -} -#LibraryReadingIconGridViewerCont #currentBookCoverLbl{ -min-width:119px; -max-width:119px; -min-height:179px; -max-height:179px; -} -#LibraryReadingIconGridViewerCont #currentBookCoverCont #newTagLbl{ -min-width:119px; -max-width:119px; -min-height:190px; -max-height:190px; -padding:0px 0px -2px 4px; -font-size:16px; -} -#LibraryReadingIconGridViewerCont #currentBookCoverCont #sampleTagLbl{ -min-width:72px; -max-width:72px; -min-height:72px; -max-height:72px; -margin:0px 0px 0px 0px; -padding:0px 0px 0px 0px; -font-size:15px; -} -#LibraryReadingIconGridViewerCont #currentBookCoverCont #subscriptionTagLbl{ -min-width:72px; -max-width:72px; -min-height:72px; -max-height:72px; -margin:0px 0px 0px 0px; -padding:0px 0px 0px 0px; -font-size:15px; -} -#LibraryReadingIconGridViewerCont #currentBookTopLeft{ -min-width:20px; -max-width:20px; -min-height:38px; -max-height:38px; -} -#LibraryReadingIconGridViewerCont #currentBookTopCenter{ -min-width:119px; -max-width:119px; -min-height:38px; -max-height:38px; -} -#LibraryReadingIconGridViewerCont #currentBookTopRight{ -min-width:19px; -max-width:19px; -min-height:38px; -max-height:38px; -} -#LibraryReadingIconGridViewerCont #currentBookCenterLeft{ -min-width:20px; -max-width:20px; -min-height:179px; -max-height:179px; -} -#LibraryReadingIconGridViewerCont #currentBookCenterRight{ -min-width:19px; -max-width:19px; -min-height:179px; -max-height:179px; -} -#LibraryReadingIconGridViewerCont #currentBookBottomLeft{ -min-width:20px; -max-width:20px; -min-height:23px; -max-height:23px; -} -#LibraryReadingIconGridViewerCont #currentBookBottomCenter{ -min-width:119px; -max-width:119px; -min-height:23px; -max-height:23px; -} -#LibraryReadingIconGridViewerCont #currentBookBottoRight{ -min-width:19px; -max-width:19px; -min-height:23px; -max-height:23px; -} -#mainBookInfoCont{ -min-width:600px; -max-width:600px; -min-height:265px; -max-height:265px; -} -#currentBookCont{ -min-width:600px; -max-width:600px; -min-height:265px; -max-height:265px; -} -#readBookBtn{ -min-width:600px; -max-width:600px; -min-height:265px; -max-height:265px; -} -#currentBookData{ -min-width:305px; -max-width:305px; -} -#currentBookCont #readingLbl{ -margin:35px 0px 15px 0px; -font-size: 25px; -} -#currentBookCont #bookTitleLbl{ -font-size:28px; -} -#currentBookCont #authorLbl{ -font-size:22px; -} -#currentBookCont #pagLbl,#currentBookCont #currentPagLbl,#currentBookCont #endBracketsLbl,#currentBookCont #separatorLbl,#currentBookCont #totalPagLbl, #currentBookCont #percentLbl{ -margin:15px 0px 0px 0px; -font-size:17px; -} -#currentBookCont #readLbl, #currentBookCont #readingPercentLbl, #currentBookCont #separatorReadLbl{ -margin:15px 4px 0px 0px; -font-size:17px; -} -/*Viewer popups ------------------------------------*/ -#popupCont{ -padding:0px; -border-width:10px; -border-radius:10px; -} -#arrowCont, #arrowCont2{ -min-height:19px; -max-height:19px; -} -#topArrowLbl, #bottomArrowLbl{ -min-width:24px; -max-width:24px; -min-height:17px; -max-height:17px; -} -/*LibraryBooksFilterLayer --------------------------------*/ -#LibraryBooksFilterLayer{ -min-width:600px; -max-width:600px; -min-height:750px; -max-height:750px; -} -#HorizontalCont{ -min-height:350px; -max-height:350px; -} -#LibraryBooksFilterLayerCont{ -min-width:380px; -max-width:380px; -min-height:0px; -max-height:600px; -} -#LibraryBooksFilterLayerCont #popupCont{ -min-height:0px; -max-height:600px; -} -#LibraryBooksFilterLayer #spacerTop{ -min-height:80px; -max-height:80px; -} -#LibraryBooksFilterLayerCont #spacerLeft{ -min-width:50px; -max-width:50px; -} -#LibraryBooksFilterLayer QPushButton { -padding:0px 0px 0px 15px; -border-bottom-width:1px; -min-height:70px; -max-height:70px; -} -#LibraryBooksFilterLayer QPushButton#internalMemoryBtn, #LibraryBooksFilterLayer QPushButton#sdBtn{ -} -/*LibraryBooksFilterLayer --------------------------------*/ -#LibraryBooksToShowFilterLayer{ -min-width:600px; -max-width:600px; -min-height:750px; -max-height:750px; -} -#HorizontalCont{ -min-height:350px; -max-height:350px; -} -#LibraryBooksFilterLayerCont{ -min-width:380px; -max-width:380px; -min-height:0px; -max-height:800px; -} -#LibraryBooksToShowFilterLayer #spacerTop{ -min-height:80px; -max-height:80px; -} -#LibraryBooksFilterLayerCont #spacerLeft{ -min-width:50px; -max-width:50px; -} -#LibraryBooksToShowFilterLayer QPushButton { -padding:0px 0px 0px 15px; -border-bottom-width:1px; -min-height:70px; -max-height:70px; -} -#LibraryBooksToShowFilterLayer QPushButton#internalMemoryBtn, #LibraryBooksToShowFilterLayer QPushButton#sdBtn{ -} -/*BookSummaryPopup ----------------------------*/ -#headerPopup #closeBtn{ -min-width:40px; -max-width:40px; -min-height:40px; -max-height:40px; -} -#BookSummaryPopup{ -min-width:540px; -max-width:540px; -min-height:590px; -max-height:590px; -} -#BookSummaryPopup #headerPopup{ -margin:0px 0px 0px 0px; -padding:0px; -} -#BookSummaryPopup #headerPopup #closeBtn{ -min-width:45px; -max-width:45px; -min-height:45px; -max-height:45px; -} -#BookSummaryPopup #popupCont{ -padding:0px 15px 0px 15px; -} -#BookSummaryPopup #synopsisLbl{ -margin:0px 0px 0px 0px; -padding-left:0px; -padding-right:0px; -} -#BookSummaryPopup #summaryTextBrowser{ -min-height:190px; -max-height:190px; -margin-left:0px; -margin-right:0px; -padding-left:0px; -padding-right:0px; -} -/*LibraryBookListActions ----------------------------*/ -#LibraryBookListActions{ -margin-right:1px; -min-width:0px; -max-width:202px; -min-height:50px; -max-height:50px; -border-width:2px; -border-bottom-left-radius:8px; -border-bottom-right-radius:8px; -} -#LibraryBookListActions QPushButton{ -padding:0px 20px; -margin-right:1px; -border-width:1px; -} -/*LibraryPageHandler -----------------------------*/ -#pageLibraryViewerCont{ -min-width:600px; -max-width:600px; -min-height:50px; -max-height:50px; -} -#VerticalPagerHandler{ -margin-top:7px; -min-height:43px; -max-height:43px; -} -#VerticalPagerHandler #pageLibraryViewerCont{ -margin-top:1px; -min-height:50px; -max-height:50px; -} -#VerticalPagerHandler #pageLibraryViewerCont #forwardButton{ -margin-top:0px; -min-width:180px; -max-width:180px; -min-height:45px; -max-height:45px; -} -#VerticalPagerHandler #pageLibraryViewerCont #backButton{ -margin-top:0px; -min-width:180px; -max-width:180px; -min-height:45px; -max-height:45px; -} -#VerticalPagerHandler #pageLabel{ -margin-top:1px; -min-height:50px; -max-height:50px; -} diff --git a/bqLibrary/res/library_styles_generic.qss b/bqLibrary/res/library_styles_generic.qss index 13cdc29..d691ae3 100644 --- a/bqLibrary/res/library_styles_generic.qss +++ b/bqLibrary/res/library_styles_generic.qss @@ -22,7 +22,7 @@ along with the source code. If not, see . --------------------------*/ #Library{ /*background-color:#FFF;*/ -background:#FFF url(":/res/bg_library_new.png") repeat-x left top; +background:#FFF url(":/res/bg_library.png") repeat-x left top; } #Library #searchCont{ border-color:#808080; @@ -1021,11 +1021,7 @@ border-bottom-color:#909090; #collectionContainer #actionsCont QPushButton{ border-style:solid; border-color:#808080; -background: #E0E0E0 url(:res/check-group.png) no-repeat center left; -} -#collectionContainer #actionsCont QPushButton#unSelectAllBtn{ -margin-right:30px; -background-image:url(:/res/uncheck-group.png) ; +/*background: #E0E0E0 url(:res/check-group.png) no-repeat center left;*/ } #LibraryEditCollection #editCollectionNameCont{ } @@ -1033,8 +1029,8 @@ background-image:url(:/res/uncheck-group.png) ; border-style:solid; border-color:#808080; border-right:none; -border-top-right-radius:none; -border-bottom-right-radius:none; +border-top-right-radius:0px; +border-bottom-right-radius:0px; } #editCollectionNameCont #clearInputBtn{ border-style:solid; @@ -1042,12 +1038,6 @@ border-color:#808080; border-left:none; background: url(:res/clear_input.png) no-repeat center center; } -#LibraryEditCollection #closeSearchBtn{ -text-align:left; -border-color:#606060; -border-style:solid; -background: transparent url(:res/close_popup_ico.png) no-repeat center right; -} #LibraryEditCollection #bottomActionCont{ border-top-style:solid; border-top-color:#808080; @@ -1065,9 +1055,6 @@ background: transparent url(:/res/save-icons-disabled.png) no-repeat center left --------------------------*/ #LibraryBookToCollectionItem, #BookToCollectionItemCont{ } -#addBookToCollectionBtn{ -background: url(:/res/uncheck-group.png) no-repeat center right; -} #addBookToCollectionBtn:checked{ background: url(:res/check-group.png) no-repeat center right; } @@ -1150,27 +1137,14 @@ border-bottom-color:#909090; #collectionContainer #actionsCont QPushButton{ border-style:solid; border-color:#808080; -background: #E0E0E0 url(:res/check-group.png) no-repeat center left; +/*background: #E0E0E0 url(:res/check-group.png) no-repeat center left;*/ } #collectionContainer #actionsCont QPushButton#unSelectAllBtn{ margin-right:30px; -background-image:url(:/res/uncheck-group.png) ; +/*background-image:url(:/res/uncheck-group.png) ;*/ } #LibraryEditCollection #editCollectionNameCont{ } -#editCollectionNameCont #collectionNameLineEdit{ -border-style:solid; -border-color:#808080; -border-right:none; -border-top-right-radius:none; -border-bottom-right-radius:none; -} -#editCollectionNameCont #clearInputBtn{ -border-style:solid; -border-color:#808080; -border-left:none; -background: url(:res/clear_input.png) no-repeat center center; -} #LibraryEditCollection #closeSearchBtn{ text-align:left; border-color:#606060; diff --git a/bqLibrary/res/library_styles_generic_new.qss b/bqLibrary/res/library_styles_generic_new.qss index 9dbb4a6..840127e 100644 --- a/bqLibrary/res/library_styles_generic_new.qss +++ b/bqLibrary/res/library_styles_generic_new.qss @@ -22,7 +22,7 @@ along with the source code. If not, see . --------------------------*/ #Library{ /*background-color:#FFF;*/ -background:#FFF url(":/res/bg_library_new.png") repeat-x left top; +background:#FFF url(":/res/bg_library.png") repeat-x left top; } #Library #searchCont{ border-color:#808080; @@ -474,46 +474,48 @@ background-repeat:no-repeat; background-image:url(:/res/sample_tag_notext_sup.png); text-align:left; } + #LibraryReadingIconGridViewerCont #currentBookTopLeft{ -background-image: url(:/res/open_book_small_top_left.png) ; +background-image: url(:/res/book_front_top_left.png) ; background-position:bottom right; background-repeat:no-repeat; } #LibraryReadingIconGridViewerCont #currentBookTopCenter{ -background-image: url(:/res/open_book_small_top_center.png) ; +background-image: url(:/res/book_front_top_center.png) ; background-position:bottom left; background-repeat:no-repeat; } #LibraryReadingIconGridViewerCont #currentBookTopRight{ -background-image: url(:/res/open_book_small_top_right.png) ; +background-image: url(:/res/book_front_top_right.png) ; background-position:bottom left; background-repeat:no-repeat; } #LibraryReadingIconGridViewerCont #currentBookCenterLeft{ -background-image: url(:/res/open_book_small_center_left.png) ; +background-image: url(:/res/book_front_center_left.png) ; background-position:top right; background-repeat:no-repeat; } #LibraryReadingIconGridViewerCont #currentBookCenterRight{ -background-image: url(:/res/open_book_small_center_right.png) ; +background-image: url(:/res/book_front_center_right.png) ; background-position:top left; background-repeat:no-repeat; } #LibraryReadingIconGridViewerCont #currentBookBottomLeft{ -background-image: url(:/res/open_book_small_bottom_left.png) ; +background-image: url(:/res/book_front_bottom_left.png) ; background-position:top right; background-repeat:no-repeat; } #LibraryReadingIconGridViewerCont #currentBookBottomCenter{ -background-image: url(:/res/open_book_small_bottom_center.png) ; +background-image: url(:/res/book_front_bottom_center.png) ; background-position:top right; background-repeat:no-repeat; } #LibraryReadingIconGridViewerCont #currentBookBottoRight{ -background-image: url(:/res/open_book_small_bottom_right.png) ; +background-image: url(:/res/book_front_bottom_right.png) ; background-position:top left; background-repeat:no-repeat; } + #currentBookData{ } #currentBookCont #bookTitleLbl{ diff --git a/bqLibrary/src/Library.cpp b/bqLibrary/src/Library.cpp index c30006d..70f69bd 100644 --- a/bqLibrary/src/Library.cpp +++ b/bqLibrary/src/Library.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 @@ -67,6 +67,7 @@ along with the source code. If not, see . #define PRESSED "background-color:#303030;color:#FFFFFF" #define RELEASED "background-color:#FFFFFF; color:#000000;" +#define STRING_MAX_LENGTH 22 Library::Library( QWidget* parent ) : QBookForm(parent) @@ -3965,7 +3966,10 @@ void Library::handleDeleteCollection(const QString & collection) m_collection = collection; fillNewDataCallback = &Library::fillCollectionData; - QString deleteCollectionText = tr("Are you sure you want to delete %1 collection?\nThe books in the collection will not be deleted.").arg(collection); + QString collectionNameAux = collection; + collectionNameAux = bqUtils::truncateStringToLength(collectionNameAux, STRING_MAX_LENGTH); + QString deleteCollectionText = tr("Are you sure you want to delete %1 collection?\nThe books in the collection will not be deleted.").arg(collectionNameAux); + SelectionDialog* deleteCollection = new SelectionDialog (this, deleteCollectionText, tr("Remove")); deleteCollection->exec(); if(deleteCollection->result()) diff --git a/bqLibrary/src/LibraryBookSummary.cpp b/bqLibrary/src/LibraryBookSummary.cpp index 98c58f7..c22a75e 100644 --- a/bqLibrary/src/LibraryBookSummary.cpp +++ b/bqLibrary/src/LibraryBookSummary.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 @@ -44,6 +44,8 @@ along with the source code. If not, see . #define ICON_LIBRARY_STRING_MAX_LENGTH 10 #define PERCENT_STEP_VALUE 0.75 +#define FONT_SIZE_FHD "font-size:34px;" +#define LITTLE_FONT_SIZE_FHD "font-size:31px;" #define FONT_SIZE_HD "font-size:24px;" #define LITTLE_FONT_SIZE_HD "font-size:22px;" #define FONT_SIZE_SD "font-size:18px;" @@ -197,7 +199,7 @@ void LibraryBookSummary::setBook( const BookInfo* book, int currentBook, int tot bookTitleLbl->setText(bqUtils::truncateStringToLength(book->title, STRING_MAX_LENGTH)); // Author - if(book->author == "--") + if(book->author == "---") bookAuthorLbl->setText(tr("Autor Desconocido")); else bookAuthorLbl->setText(bqUtils::truncateStringToLength(book->author, STRING_MAX_LENGTH)); @@ -472,30 +474,51 @@ void LibraryBookSummary::setCollectionLayerBtnText(QHash colle { QHash::iterator it = collectionList.begin(); QString collectionName = it.key(); - if(QBook::getInstance()->getResolution() == QBook::RES758x1024) + switch(QBook::getInstance()->getResolution()) { - if(collectionName.size() >= 24) - addToCollectionBtn->setStyleSheet(LITTLE_FONT_SIZE_HD); - else - addToCollectionBtn->setStyleSheet(FONT_SIZE_HD); - } - else - { - if(collectionName.size() >= 24) - addToCollectionBtn->setStyleSheet(LITTLE_FONT_SIZE_SD); - else - addToCollectionBtn->setStyleSheet(FONT_SIZE_SD); + case QBook::RES1072x1448: + if(collectionName.size() >= 10) + addToCollectionBtn->setStyleSheet(LITTLE_FONT_SIZE_FHD); + else + addToCollectionBtn->setStyleSheet(FONT_SIZE_FHD); + break; + case QBook::RES758x1024: + if(collectionName.size() >= 24) + addToCollectionBtn->setStyleSheet(LITTLE_FONT_SIZE_HD); + else + addToCollectionBtn->setStyleSheet(FONT_SIZE_HD); + break; + case QBook::RES600x800: default: + if(collectionName.size() >= 24) + addToCollectionBtn->setStyleSheet(LITTLE_FONT_SIZE_SD); + else + addToCollectionBtn->setStyleSheet(FONT_SIZE_SD); + break; } addToCollectionBtn->setText(bqUtils::truncateStringToLength(tr("%1").arg(collectionName), COLLECTION_MAX_LENGTH)); } else { - if(QBook::getInstance()->getResolution() == QBook::RES758x1024) + switch(QBook::getInstance()->getResolution()) { - if(collectionList.size() >= 24) - addToCollectionBtn->setStyleSheet(LITTLE_FONT_SIZE_HD); - else - addToCollectionBtn->setStyleSheet(FONT_SIZE_HD); + case QBook::RES1072x1448: + if(collectionList.size() >= 10) + addToCollectionBtn->setStyleSheet(LITTLE_FONT_SIZE_FHD); + else + addToCollectionBtn->setStyleSheet(FONT_SIZE_FHD); + break; + case QBook::RES758x1024: + if(collectionList.size() >= 24) + addToCollectionBtn->setStyleSheet(LITTLE_FONT_SIZE_HD); + else + addToCollectionBtn->setStyleSheet(FONT_SIZE_HD); + break; + case QBook::RES600x800: default: + if(collectionList.size() >= 24) + addToCollectionBtn->setStyleSheet(LITTLE_FONT_SIZE_SD); + else + addToCollectionBtn->setStyleSheet(FONT_SIZE_SD); + break; } addToCollectionBtn->setText(tr("En %1 colecciones").arg(collectionList.size())); } diff --git a/bqLibrary/src/LibraryCollectionItem.cpp b/bqLibrary/src/LibraryCollectionItem.cpp index 796746e..82978af 100644 --- a/bqLibrary/src/LibraryCollectionItem.cpp +++ b/bqLibrary/src/LibraryCollectionItem.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 @@ -36,10 +36,18 @@ LibraryCollectionItem::LibraryCollectionItem(QWidget *parent) : GestureWidget(pa connect(this,SIGNAL(tap()),this,SLOT(processTap())); collectionTitleLbl->setText(""); m_checkWidth = 0; - if(QBook::getInstance()->getResolution() == QBook::RES758x1024) - m_checkWidth = 40; - else - m_checkWidth = 35; + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + m_checkWidth = 56; + break; + case QBook::RES758x1024: + m_checkWidth = 40; + break; + case QBook::RES600x800: default: + m_checkWidth = 35; + break; + } } LibraryCollectionItem::~LibraryCollectionItem(){ diff --git a/bqLibrary/src/LibraryGridViewerItem.cpp b/bqLibrary/src/LibraryGridViewerItem.cpp index 1263b62..d53d81f 100644 --- a/bqLibrary/src/LibraryGridViewerItem.cpp +++ b/bqLibrary/src/LibraryGridViewerItem.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 @@ -44,9 +44,20 @@ void LibraryGridViewerItem::processTap() void LibraryGridViewerItem::processLongpress () { qDebug() << Q_FUNC_INFO; - const BookInfo* bookInfo = QBookApp::instance()->getModel()->getBookInfo(m_path); - if(bookInfo) - emit itemLongPress(m_path); - else - emit fileLongPressed(m_path); + switch(m_iType) { + case ELGVIT_BOOK: + { + emit itemLongPress(m_path); + break; + } + case ELGVIT_FILE: + { + emit fileLongPressed(m_path); + break; + } + case ELGVIT_ARROW: + case ELGVIT_COLLECTION: + default: + break; + } } diff --git a/bqLibrary/src/LibraryIconGridViewerItem.cpp b/bqLibrary/src/LibraryIconGridViewerItem.cpp index e978fec..92cfccf 100644 --- a/bqLibrary/src/LibraryIconGridViewerItem.cpp +++ b/bqLibrary/src/LibraryIconGridViewerItem.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 @@ -63,6 +63,7 @@ void LibraryIconGridViewerItem::paintEvent(QPaintEvent*) void LibraryIconGridViewerItem::setBook( const BookInfo* book, Library::ELibraryFilterMode filter ) { + LibraryGridViewerItem::setBook(book, filter); m_path = book->path; if(book->isCorrupted()) @@ -94,7 +95,7 @@ void LibraryIconGridViewerItem::setBook( const BookInfo* book, Library::ELibrary titleLbl->show(); // Author - if(book->author == "--") + if(book->author == "---") authorLbl->setText(tr("Autor Desconocido")); else authorLbl->setText(bqUtils::truncateStringToLength(book->author, ICONITEM_STRING_MAX_LENGTH)); @@ -202,6 +203,7 @@ void LibraryIconGridViewerItem::setThumbnailElements(bool visible) void LibraryIconGridViewerItem::setFile( const QFileInfo* file ) { + LibraryGridViewerItem::setFile(file); qDebug() << Q_FUNC_INFO << file->baseName() << file->fileName(); m_path = file->filePath(); @@ -242,6 +244,7 @@ void LibraryIconGridViewerItem::setFile( const QFileInfo* file ) void LibraryIconGridViewerItem::setArrow( const QString& path ) { + LibraryGridViewerItem::setArrow(path); m_path = path; // Hide elements diff --git a/bqLibrary/src/LibraryLineGridCollectionsItem.cpp b/bqLibrary/src/LibraryLineGridCollectionsItem.cpp index e7ce15e..eb06396 100644 --- a/bqLibrary/src/LibraryLineGridCollectionsItem.cpp +++ b/bqLibrary/src/LibraryLineGridCollectionsItem.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 @@ -55,6 +55,7 @@ void LibraryLineGridCollectionsItem::paintEvent(QPaintEvent* ) void LibraryLineGridCollectionsItem::setCollection( const QString &collectionName, const int booksNumber ) { + LibraryGridViewerItem::setCollection(collectionName, booksNumber); qDebug() << Q_FUNC_INFO; m_path = collectionName; hide(); diff --git a/bqLibrary/src/LibraryLineGridViewerItem.cpp b/bqLibrary/src/LibraryLineGridViewerItem.cpp index 80ecd05..586c611 100644 --- a/bqLibrary/src/LibraryLineGridViewerItem.cpp +++ b/bqLibrary/src/LibraryLineGridViewerItem.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 @@ -63,6 +63,7 @@ void LibraryLineGridViewerItem::paintEvent(QPaintEvent* ) void LibraryLineGridViewerItem::setBook( const BookInfo* book, Library::ELibraryFilterMode filter ) { + LibraryGridViewerItem::setBook(book, filter); m_path = book->path; // Hide elements @@ -116,6 +117,7 @@ void LibraryLineGridViewerItem::setBook( const BookInfo* book, Library::ELibrary void LibraryLineGridViewerItem::setFile( const QFileInfo* file ) { + LibraryGridViewerItem::setFile(file); m_path = file->filePath(); // Hide elements @@ -156,6 +158,7 @@ void LibraryLineGridViewerItem::setFile( const QFileInfo* file ) void LibraryLineGridViewerItem::setArrow( const QString& path ) { + LibraryGridViewerItem::setArrow(path); m_path = path; authorLbl->hide(); diff --git a/bqLibrary/src/LibraryReadingIconGridViewer.cpp b/bqLibrary/src/LibraryReadingIconGridViewer.cpp index 8bf8d29..5ea6b62 100644 --- a/bqLibrary/src/LibraryReadingIconGridViewer.cpp +++ b/bqLibrary/src/LibraryReadingIconGridViewer.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 @@ -67,9 +67,9 @@ int LibraryReadingIconGridViewer::getItemsPerPage() void LibraryReadingIconGridViewer::getBookItems( LibraryGridViewerItem* books[] ) { - books[1] = book1; - books[2] = book2; - books[3] = book3; + books[1] = book4; + books[2] = book5; + books[3] = book6; } void LibraryReadingIconGridViewer::openMostRecent(){ @@ -142,7 +142,7 @@ void LibraryReadingIconGridViewer::paintBooks() bookTitleLbl->setText(bqUtils::truncateStringToLength(bookInfo->title, STRING_MAX_LENGTH)); // Author - if(bookInfo->author == "--") + if(bookInfo->author == "---") authorLbl->setText(tr("Autor Desconocido")); else authorLbl->setText(bqUtils::truncateStringToLength(bookInfo->author, STRING_MAX_LENGTH)); diff --git a/bqLibrary/src/LibraryReadingLineGridViewer.cpp b/bqLibrary/src/LibraryReadingLineGridViewer.cpp index ee4d8d2..61115ce 100644 --- a/bqLibrary/src/LibraryReadingLineGridViewer.cpp +++ b/bqLibrary/src/LibraryReadingLineGridViewer.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 @@ -143,7 +143,7 @@ void LibraryReadingLineGridViewer::paintBooks() bookTitleLbl->setText(bqUtils::truncateStringToLength(bookInfo->title, STRING_MAX_LENGTH)); // Author - if(bookInfo->author == "--") + if(bookInfo->author == "---") authorLbl->setText(tr("Autor Desconocido")); else authorLbl->setText(bqUtils::truncateStringToLength(bookInfo->author, STRING_MAX_LENGTH)); diff --git a/bqLibrary/tr/bqLibrary_ca.ts b/bqLibrary/tr/bqLibrary_ca.ts index 485990e..e5cd517 100755 --- a/bqLibrary/tr/bqLibrary_ca.ts +++ b/bqLibrary/tr/bqLibrary_ca.ts @@ -60,7 +60,7 @@ Añadir colección - Crear col·lecció + Crea col·lecció Libros descargados (18) @@ -89,7 +89,7 @@ Eliminar - Eliminar + Elimina @@ -456,7 +456,7 @@ Vols continuar? Copy - Copiar + Copia @@ -471,7 +471,7 @@ Vols continuar? Buscar - Cercar + Cerca @@ -491,7 +491,7 @@ Vols continuar? Copiar - Copiar + Copia @@ -567,11 +567,11 @@ Vols continuar? Copiar - Copiar + Copia Eliminar - Eliminar + Elimina @@ -635,7 +635,7 @@ Vols continuar? Copiar a SD - Copiar + Copia @@ -673,7 +673,7 @@ p, li { white-space: pre-wrap; } Copy - Copiar + Copia @@ -723,7 +723,7 @@ p, li { white-space: pre-wrap; } Delete - Eliminar + Elimina More Actions @@ -884,7 +884,7 @@ p, li { white-space: pre-wrap; } Añadir colección - Crear col·lecció + Crea col·lecció @@ -932,7 +932,7 @@ p, li { white-space: pre-wrap; } Crear Collecion - Crear col·lecció + Crea col·lecció @@ -1209,7 +1209,7 @@ p, li { white-space: pre-wrap; } Último acceso: - Últim accés: + Últim accés: diff --git a/bqLibrary/tr/bqLibrary_de.ts b/bqLibrary/tr/bqLibrary_de.ts index 73cbb2b..c8aaa53 100644 --- a/bqLibrary/tr/bqLibrary_de.ts +++ b/bqLibrary/tr/bqLibrary_de.ts @@ -1081,7 +1081,7 @@ p, li { white-space: pre-wrap; } Último acceso: - Letzter Zugriff: + Letzter Zugriff: diff --git a/bqLibrary/tr/bqLibrary_en.ts b/bqLibrary/tr/bqLibrary_en.ts index 1ed9530..d9f04f5 100755 --- a/bqLibrary/tr/bqLibrary_en.ts +++ b/bqLibrary/tr/bqLibrary_en.ts @@ -1213,7 +1213,7 @@ p, li { white-space: pre-wrap; } Último acceso: - Last access: + Last access: diff --git a/bqLibrary/tr/bqLibrary_es.ts b/bqLibrary/tr/bqLibrary_es.ts index 25e1eb2..2d98558 100755 --- a/bqLibrary/tr/bqLibrary_es.ts +++ b/bqLibrary/tr/bqLibrary_es.ts @@ -1209,7 +1209,7 @@ p, li { white-space: pre-wrap; } Último acceso: - Último acceso: + Último acceso: @@ -1292,7 +1292,7 @@ p, li { white-space: pre-wrap; } Ultimo acceso: - Último acceso: + Último acceso: diff --git a/bqLibrary/tr/bqLibrary_eu.ts b/bqLibrary/tr/bqLibrary_eu.ts index 24644aa..9c81121 100755 --- a/bqLibrary/tr/bqLibrary_eu.ts +++ b/bqLibrary/tr/bqLibrary_eu.ts @@ -992,7 +992,7 @@ p, li { white-space: pre-wrap; } Último acceso: - Azken irakurketa: + Azken irakurketa: Fecha de acceso diff --git a/bqLibrary/tr/bqLibrary_gl.ts b/bqLibrary/tr/bqLibrary_gl.ts index d0240e1..40c11b7 100644 --- a/bqLibrary/tr/bqLibrary_gl.ts +++ b/bqLibrary/tr/bqLibrary_gl.ts @@ -1137,7 +1137,7 @@ p, li { white-space: pre-wrap; } Último acceso: - Último acceso: + Último acceso: diff --git a/bqLibrary/tr/bqLibrary_it.ts b/bqLibrary/tr/bqLibrary_it.ts index 9032aa8..1732636 100644 --- a/bqLibrary/tr/bqLibrary_it.ts +++ b/bqLibrary/tr/bqLibrary_it.ts @@ -1076,7 +1076,7 @@ p, li { white-space: pre-wrap; } Último acceso: - Ultimo accesso: + Ultimo accesso: diff --git a/bqLibrary/tr/bqLibrary_pt.ts b/bqLibrary/tr/bqLibrary_pt.ts index 031872d..a7006c7 100755 --- a/bqLibrary/tr/bqLibrary_pt.ts +++ b/bqLibrary/tr/bqLibrary_pt.ts @@ -763,7 +763,7 @@ p, li { white-space: pre-wrap; } Mis libros - Meus livros + Os meus livros @@ -773,7 +773,7 @@ p, li { white-space: pre-wrap; } Mis colecciones - Minhas coleções + As minhas coleções @@ -1209,7 +1209,7 @@ p, li { white-space: pre-wrap; } Último acceso: - Último acesso: + Último acesso: diff --git a/bqLibrary/ui/Library-old.ui b/bqLibrary/ui/Library-old.ui index a893726..bffabda 100755 --- a/bqLibrary/ui/Library-old.ui +++ b/bqLibrary/ui/Library-old.ui @@ -6,8 +6,8 @@ 0 0 - 758 - 960 + 1072 + 1358 @@ -18,21 +18,21 @@ - 758 - 960 + 0 + 0 - 758 - 960 + 1072 + 1358 Form - + @@ -44,7 +44,7 @@ - + @@ -56,7 +56,7 @@ - Organizar "Libros descargados" + Organizar "Libros descargados" @@ -66,7 +66,7 @@ Qt::StrongFocus - + Enter text to search here... @@ -79,7 +79,7 @@ Qt::NoFocus - + @@ -89,7 +89,7 @@ Qt::NoFocus - + @@ -117,11 +117,11 @@ 16777215 - 68 + 96 - + 0 @@ -160,12 +160,12 @@ - 330 + 467 16777215 - + @@ -183,8 +183,8 @@ - 40 - 20 + 57 + 28 @@ -225,12 +225,12 @@ - 100000 - 813 + 141421 + 1150 - + @@ -249,8 +249,8 @@ - 20 - 40 + 28 + 57 @@ -266,7 +266,7 @@ 16777215 - 83 + 117 @@ -306,18 +306,18 @@ - 93 - 55 + 132 + 78 Qt::NoFocus - + - + true @@ -334,18 +334,18 @@ - 91 - 55 + 129 + 78 Qt::NoFocus - + - + true @@ -371,7 +371,7 @@ Qt::NoFocus - Título + Título true @@ -410,7 +410,7 @@ Qt::NoFocus - Fecha modificación + Fecha modificación true @@ -424,8 +424,8 @@ - 40 - 20 + 57 + 28 @@ -463,9 +463,6 @@ 1 - - - - - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/Library.ui b/bqLibrary/ui/Library.ui index a200128..3cc26bf 100755 --- a/bqLibrary/ui/Library.ui +++ b/bqLibrary/ui/Library.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -52,11 +52,11 @@ 16777215 - 51 + 72 - + @@ -87,7 +87,7 @@ Qt::StrongFocus - + Enter text to search here... @@ -100,7 +100,7 @@ Qt::NoFocus - + @@ -111,8 +111,8 @@ - 40 - 20 + 57 + 28 @@ -123,7 +123,7 @@ Qt::NoFocus - + @@ -133,7 +133,7 @@ Qt::NoFocus - + @@ -143,7 +143,7 @@ Qt::NoFocus - + @@ -171,7 +171,7 @@ 16777215 - 55 + 78 @@ -212,7 +212,7 @@ - Atrás + Atrás @@ -281,8 +281,8 @@ - 40 - 20 + 57 + 28 @@ -297,18 +297,18 @@ - 75 - 49 + 106 + 69 Qt::NoFocus - + - + true @@ -325,18 +325,18 @@ - 75 - 49 + 106 + 69 Qt::NoFocus - + - + true @@ -346,7 +346,7 @@ - Añadir colección + Añadir colección @@ -377,11 +377,11 @@ 16777215 - 30 + 42 - + 0 @@ -419,7 +419,7 @@ max-height:35px; - + @@ -430,8 +430,8 @@ max-height:35px; - 40 - 20 + 57 + 28 @@ -446,8 +446,8 @@ max-height:35px; - 20 - 40 + 28 + 57 @@ -468,12 +468,12 @@ max-height:35px; - 100000 - 750 + 141421 + 1061 - + @@ -501,10 +501,10 @@ max-height:35px; LibraryBreadCrumb QWidget -
LibraryBreadCrumb.h
+
LibraryBreadCrumb.h
1 - - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibraryActionsMenu.ui b/bqLibrary/ui/LibraryActionsMenu.ui index f660028..883406c 100755 --- a/bqLibrary/ui/LibraryActionsMenu.ui +++ b/bqLibrary/ui/LibraryActionsMenu.ui @@ -6,27 +6,27 @@ 0 0 - 260 - 129 + 368 + 182 - 260 - 129 + 0 + 0 - 260 - 129 + 368 + 182 Form - + @@ -45,8 +45,8 @@ - 40 - 20 + 57 + 28 @@ -54,7 +54,7 @@ - + 0 @@ -68,8 +68,8 @@ - 40 - 20 + 57 + 28 @@ -96,8 +96,8 @@ - 10000 - 52 + 14142 + 74 @@ -150,7 +150,7 @@ 1 - 20 + 28 @@ -163,7 +163,7 @@ 16777215 - 19 + 27 @@ -171,12 +171,12 @@ 50 0 - 24 - 17 + 34 + 24 - + 0 @@ -191,8 +191,8 @@ - 20 - 40 + 28 + 57 @@ -206,6 +206,6 @@
FastQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibraryAllBooksSubFilterLayer.ui b/bqLibrary/ui/LibraryAllBooksSubFilterLayer.ui index 0042606..d25e5ac 100755 --- a/bqLibrary/ui/LibraryAllBooksSubFilterLayer.ui +++ b/bqLibrary/ui/LibraryAllBooksSubFilterLayer.ui @@ -6,27 +6,27 @@ 0 0 - 600 - 750 + 849 + 1061 - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -38,7 +38,7 @@ - + @@ -53,7 +53,7 @@ 16777215 - 600 + 849 @@ -72,7 +72,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -99,7 +99,7 @@ 16777215 - 19 + 27 @@ -107,12 +107,12 @@ 30 2 - 24 - 17 + 34 + 24 - + 0 @@ -137,7 +137,7 @@ 16777215 - 620 + 877 @@ -227,8 +227,8 @@ - 20 - 40 + 28 + 57 @@ -243,8 +243,8 @@ - 40 - 20 + 57 + 28 @@ -259,14 +259,14 @@ - 20 - 40 + 28 + 57 - - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibraryBookListActions.ui b/bqLibrary/ui/LibraryBookListActions.ui index 8525ccf..2f95bd7 100755 --- a/bqLibrary/ui/LibraryBookListActions.ui +++ b/bqLibrary/ui/LibraryBookListActions.ui @@ -1,97 +1,97 @@ - - - LibraryBookListActions - - - - 0 - 0 - 203 - 154 - - - - - 0 - 0 - - - - - 203 - 154 - - - - Form - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - No leído - - - - - - - Leyendo - - - - - - - Leído - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 20 - 5 - - - - - - - - - + + + LibraryBookListActions + + + + 0 + 0 + 287 + 218 + + + + + 0 + 0 + + + + + 287 + 218 + + + + Form + + + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + No leído + + + + + + + Leyendo + + + + + + + Leído + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 28 + 7 + + + + + + + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibraryBookSummary.ui b/bqLibrary/ui/LibraryBookSummary.ui index 3c65ec9..2bb2879 100755 --- a/bqLibrary/ui/LibraryBookSummary.ui +++ b/bqLibrary/ui/LibraryBookSummary.ui @@ -6,15 +6,15 @@ 0 0 - 758 - 960 + 1072 + 1358 Form - + @@ -30,8 +30,8 @@ - 20 - 40 + 28 + 57 @@ -54,8 +54,8 @@ - 40 - 20 + 57 + 28 @@ -85,8 +85,8 @@ - 40 - 20 + 57 + 28 @@ -97,7 +97,7 @@ Qt::NoFocus - + @@ -121,7 +121,7 @@ 16777215 - 204 + 288 @@ -149,20 +149,20 @@ 0 - + Qt::Vertical - 20 - 40 + 28 + 57 - + @@ -177,14 +177,14 @@ - + 0 - + @@ -199,17 +199,17 @@ - + - + 0 - + @@ -218,39 +218,39 @@ - + 0 - + Qt::Vertical - 5 - 40 + 7 + 57 - + 0 0 - 140 - 210 + 198 + 297 - + Qt::AlignCenter @@ -261,12 +261,12 @@ 0 0 - 140 - 174 + 198 + 246 - + Qt::AlignCenter @@ -277,12 +277,12 @@ 0 0 - 140 - 197 + 198 + 279 - + Qt::AlignCenter @@ -290,7 +290,7 @@ - + @@ -305,14 +305,14 @@ - + 0 - + @@ -327,14 +327,14 @@ - + 0 - + @@ -343,14 +343,14 @@ - + 0 - + @@ -365,14 +365,14 @@ - + 0 - + @@ -387,27 +387,27 @@ - + 0 - + Qt::Vertical - 20 - 40 + 28 + 57 - + Qt::Vertical @@ -417,13 +417,13 @@ - 5 - 5 + 7 + 7 - + Qt::Vertical @@ -433,13 +433,13 @@ - 20 - 5 + 28 + 7 - + Qt::Vertical @@ -449,8 +449,8 @@ - 20 - 5 + 28 + 7 @@ -465,8 +465,8 @@ - 40 - 20 + 57 + 28 @@ -505,7 +505,7 @@ - Camilla Läckberg + Camilla Läckberg @@ -530,10 +530,10 @@ - + - 9,95€ + 9,95€ 0 @@ -547,8 +547,8 @@ - 40 - 20 + 57 + 28 @@ -565,8 +565,8 @@ - 20 - 5 + 28 + 7 @@ -595,7 +595,7 @@ - Total de páginas: + Total de páginas: @@ -616,8 +616,8 @@ - 40 - 20 + 57 + 28 @@ -628,7 +628,7 @@ Qt::NoFocus - Más acciones + Más acciones @@ -639,8 +639,8 @@ - 40 - 20 + 57 + 28 @@ -669,7 +669,7 @@ - + Colecciones @@ -683,8 +683,8 @@ - 40 - 20 + 57 + 28 @@ -695,7 +695,7 @@ - + @@ -798,8 +798,8 @@ - 40 - 20 + 57 + 28 @@ -844,11 +844,11 @@ 1 - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ssdsdsdsd</p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ssdsdsdsd</p></body></html> 1 @@ -868,7 +868,7 @@ p, li { white-space: pre-wrap; } 1 - + @@ -880,8 +880,8 @@ p, li { white-space: pre-wrap; } - 20 - 40 + 28 + 57 @@ -896,8 +896,8 @@ p, li { white-space: pre-wrap; } - 40 - 20 + 57 + 28 @@ -911,8 +911,8 @@ p, li { white-space: pre-wrap; } - 20 - 40 + 28 + 57 @@ -935,7 +935,7 @@ p, li { white-space: pre-wrap; } - + @@ -970,7 +970,7 @@ p, li { white-space: pre-wrap; } - + @@ -997,6 +997,6 @@ p, li { white-space: pre-wrap; } 1 - - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibraryBookToCollectionItem.ui b/bqLibrary/ui/LibraryBookToCollectionItem.ui index 88e1ab5..b19e5af 100644 --- a/bqLibrary/ui/LibraryBookToCollectionItem.ui +++ b/bqLibrary/ui/LibraryBookToCollectionItem.ui @@ -6,8 +6,8 @@ 0 0 - 240 - 182 + 339 + 257 @@ -20,15 +20,15 @@ Form - + 0 0 - 240 - 55 + 339 + 78 @@ -39,12 +39,12 @@ - 240 - 55 + 339 + 78 - + @@ -84,8 +84,8 @@ - 600 - 35 + 849 + 49 @@ -118,7 +118,7 @@ - 10000 + 14142 16777215 @@ -140,8 +140,8 @@ - 20 - 40 + 28 + 57 @@ -159,8 +159,8 @@ - 50 - 20 + 71 + 28 @@ -172,8 +172,8 @@ 0 0 - 160 - 80 + 226 + 113 @@ -190,8 +190,8 @@ - 40 - 20 + 57 + 28 @@ -206,12 +206,12 @@ - 50 - 59 + 71 + 83 - + true @@ -232,7 +232,7 @@ - + - - + + \ No newline at end of file diff --git a/bqLibrary/ui/LibraryBooksFilterLayer-old.ui b/bqLibrary/ui/LibraryBooksFilterLayer-old.ui index 85634a6..f829cb6 100755 --- a/bqLibrary/ui/LibraryBooksFilterLayer-old.ui +++ b/bqLibrary/ui/LibraryBooksFilterLayer-old.ui @@ -6,27 +6,27 @@ 0 0 - 758 - 960 + 1072 + 1358 - 758 - 960 + 0 + 0 - 758 - 960 + 1072 + 1358 Form - + @@ -38,7 +38,7 @@ - + @@ -60,14 +60,14 @@ - + - + @@ -81,7 +81,7 @@ 16777215 - 19 + 27 @@ -89,12 +89,12 @@ 30 2 - 24 - 17 + 34 + 24 - + 0 @@ -112,8 +112,8 @@ - 10000 - 10000 + 14142 + 14142 @@ -211,7 +211,7 @@ Qt::NoFocus - Explorar "Memoria Interna" + Explorar "Memoria Interna" true @@ -230,7 +230,7 @@ Qt::NoFocus - Explorar "Tarjeta SD" + Explorar "Tarjeta SD" true @@ -250,8 +250,8 @@ - 40 - 20 + 57 + 28 @@ -266,14 +266,14 @@ - 20 - 40 + 28 + 57 - - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibraryBooksFilterLayer.ui b/bqLibrary/ui/LibraryBooksFilterLayer.ui index 556a5e4..87f16fa 100755 --- a/bqLibrary/ui/LibraryBooksFilterLayer.ui +++ b/bqLibrary/ui/LibraryBooksFilterLayer.ui @@ -6,27 +6,27 @@ 0 0 - 600 - 750 + 849 + 1061 - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -38,7 +38,7 @@ - + @@ -53,7 +53,7 @@ 16777215 - 600 + 849 @@ -72,7 +72,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -99,7 +99,7 @@ 16777215 - 19 + 27 @@ -107,12 +107,12 @@ 30 2 - 24 - 17 + 34 + 24 - + 0 @@ -137,7 +137,7 @@ 16777215 - 620 + 877 @@ -224,8 +224,8 @@ - 20 - 40 + 28 + 57 @@ -240,8 +240,8 @@ - 40 - 20 + 57 + 28 @@ -256,14 +256,14 @@ - 20 - 40 + 28 + 57 - - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibraryBooksSubFilterLayer.ui b/bqLibrary/ui/LibraryBooksSubFilterLayer.ui index b6e9602..526effe 100755 --- a/bqLibrary/ui/LibraryBooksSubFilterLayer.ui +++ b/bqLibrary/ui/LibraryBooksSubFilterLayer.ui @@ -6,27 +6,27 @@ 0 0 - 600 - 750 + 849 + 1061 - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -38,7 +38,7 @@ - + @@ -53,7 +53,7 @@ 16777215 - 1024 + 1448 @@ -76,8 +76,8 @@ - 40 - 20 + 57 + 28 @@ -92,12 +92,12 @@ - 382 - 800 + 540 + 1131 - + @@ -111,7 +111,7 @@ 16777215 - 19 + 27 @@ -119,12 +119,12 @@ 40 2 - 24 - 17 + 34 + 24 - + 0 @@ -149,7 +149,7 @@ 16777215 - 1024 + 1448 @@ -256,14 +256,14 @@ - + - + @@ -303,8 +303,8 @@ - 20 - 40 + 28 + 57 @@ -315,7 +315,7 @@ - + @@ -329,16 +329,14 @@ - 20 - 40 + 28 + 57 - - - - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibraryBooksToShowFilterLayer-new.ui b/bqLibrary/ui/LibraryBooksToShowFilterLayer-new.ui index 71e8f25..92b4269 100755 --- a/bqLibrary/ui/LibraryBooksToShowFilterLayer-new.ui +++ b/bqLibrary/ui/LibraryBooksToShowFilterLayer-new.ui @@ -6,27 +6,27 @@ 0 0 - 600 - 750 + 849 + 1061 - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -38,7 +38,7 @@ - + @@ -60,14 +60,14 @@ - + - + @@ -81,7 +81,7 @@ 16777215 - 19 + 27 @@ -89,12 +89,12 @@ 30 2 - 24 - 17 + 34 + 24 - + 0 @@ -112,8 +112,8 @@ - 10000 - 620 + 14142 + 877 @@ -222,8 +222,8 @@ - 20 - 40 + 28 + 57 @@ -238,8 +238,8 @@ - 40 - 20 + 57 + 28 @@ -254,14 +254,14 @@ - 20 - 40 + 28 + 57 - - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibraryBreadCrumb.ui b/bqLibrary/ui/LibraryBreadCrumb.ui index 0c51a50..3ca46c6 100755 --- a/bqLibrary/ui/LibraryBreadCrumb.ui +++ b/bqLibrary/ui/LibraryBreadCrumb.ui @@ -6,14 +6,14 @@ 0 0 - 330 - 44 + 467 + 62 - 330 - 44 + 467 + 62 @@ -43,14 +43,14 @@ - 40 - 20 + 57 + 28 - - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibraryCollectionItem.ui b/bqLibrary/ui/LibraryCollectionItem.ui index 9fbee10..fe19393 100644 --- a/bqLibrary/ui/LibraryCollectionItem.ui +++ b/bqLibrary/ui/LibraryCollectionItem.ui @@ -6,8 +6,8 @@ 0 0 - 240 - 182 + 339 + 257 @@ -20,7 +20,7 @@ Form - + @@ -38,6 +38,6 @@ - - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibraryCollectionLayer.ui b/bqLibrary/ui/LibraryCollectionLayer.ui index 6fce880..288eaf9 100644 --- a/bqLibrary/ui/LibraryCollectionLayer.ui +++ b/bqLibrary/ui/LibraryCollectionLayer.ui @@ -6,20 +6,20 @@ 0 0 - 285 - 225 + 403 + 318 - 285 + 0 0 - 522 - 500 + 738 + 707 @@ -29,7 +29,7 @@ Form - + @@ -78,15 +78,15 @@ - 480 - 53 + 679 + 75 Qt::NoFocus - Añadir colección + Añadir colección true @@ -169,8 +169,8 @@ - 20 - 40 + 28 + 57 @@ -191,6 +191,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibraryEditCollection.ui b/bqLibrary/ui/LibraryEditCollection.ui index 076bfb1..b38899a 100644 --- a/bqLibrary/ui/LibraryEditCollection.ui +++ b/bqLibrary/ui/LibraryEditCollection.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -52,11 +52,11 @@ 16777215 - 55 + 78 - + @@ -68,7 +68,7 @@ - Editar ciencia ficción + Editar ciencia ficción @@ -79,8 +79,8 @@ - 40 - 20 + 57 + 28 @@ -109,7 +109,7 @@ 16777215 - 70 + 99 @@ -135,8 +135,8 @@ - 40 - 20 + 57 + 28 @@ -147,17 +147,17 @@ Qt::StrongFocus - + - Introduce el nombre de la colección + Introduce el nombre de la colección - + @@ -168,8 +168,8 @@ - 40 - 20 + 57 + 28 @@ -193,12 +193,12 @@ - 100000 - 539 + 141421 + 762 - + @@ -213,7 +213,16 @@ 0 - + + 0 + + + 0 + + + 20 + + 0 @@ -223,8 +232,8 @@ - 40 - 20 + 57 + 28 @@ -257,7 +266,7 @@ 16777215 - 750 + 1061 @@ -276,7 +285,7 @@ 0 - + @@ -286,12 +295,12 @@ 0 - + - + @@ -301,12 +310,12 @@ 0 - + - + @@ -316,12 +325,12 @@ 0 - + - + @@ -331,12 +340,12 @@ 0 - + - + @@ -346,12 +355,12 @@ 0 - + - + @@ -361,25 +370,25 @@ 0 - + - + Qt::Vertical - 20 - 40 + 28 + 57 - + @@ -389,12 +398,12 @@ 0 - + - + @@ -404,12 +413,12 @@ 0 - + - + @@ -437,7 +446,7 @@ - + @@ -456,8 +465,8 @@ - 240 - 55 + 339 + 78 @@ -465,20 +474,20 @@ - + Qt::Vertical - 20 - 40 + 28 + 57 - + @@ -488,12 +497,12 @@ 0 - + - + @@ -503,12 +512,12 @@ 0 - + - + @@ -518,12 +527,12 @@ 0 - + - + @@ -533,7 +542,7 @@ 0 - + @@ -548,15 +557,15 @@ - 20 - 40 + 28 + 57 - + @@ -569,8 +578,8 @@ - 20 - 81 + 28 + 115 @@ -591,8 +600,8 @@ - 40 - 20 + 57 + 28 @@ -600,7 +609,7 @@ - Guardar colección + Guardar colección @@ -611,8 +620,8 @@ - 40 - 20 + 57 + 28 @@ -646,6 +655,6 @@ 1 - - + + diff --git a/bqLibrary/ui/LibraryIconGridViewer.ui b/bqLibrary/ui/LibraryIconGridViewer.ui index dc1f3cc..f49db4c 100755 --- a/bqLibrary/ui/LibraryIconGridViewer.ui +++ b/bqLibrary/ui/LibraryIconGridViewer.ui @@ -6,20 +6,26 @@ 0 0 - 600 - 570 + 849 + 806 + + + 0 + 0 + + - 600 - 570 + 0 + 0 - 600 - 570 + 849 + 806 @@ -54,8 +60,8 @@ - 10000 - 10000 + 14142 + 14142 @@ -65,9 +71,9 @@ 0 - - - + + + 0 @@ -84,7 +90,7 @@ 0 - + 190 @@ -93,27 +99,24 @@ - 190 - 10000 - - - - - 0 - 0 + 269 + 141421 - + Qt::Horizontal + + QSizePolicy::Expanding + - 10 - 20 + 14 + 28 @@ -122,24 +125,8 @@ - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - + + 0 @@ -156,7 +143,7 @@ 0 - + 190 @@ -165,21 +152,21 @@ - 190 - 10000 + 269 + 14142 - + Qt::Horizontal - 10 - 20 + 14 + 28 @@ -187,9 +174,9 @@ - - - + + + 0 @@ -206,7 +193,7 @@ 0 - + 190 @@ -215,27 +202,21 @@ - 190 - 10000 - - - - - 0 - 0 + 269 + 14142 - + Qt::Horizontal - 10 - 20 + 14 + 28 @@ -243,9 +224,9 @@ - - - + + + 0 @@ -262,7 +243,7 @@ 0 - + 190 @@ -271,21 +252,27 @@ - 190 - 10000 + 269 + 14142 + + + + + 0 + 0 - + Qt::Horizontal - 10 - 20 + 14 + 28 @@ -293,9 +280,9 @@ - - - + + + 0 @@ -312,7 +299,7 @@ 0 - + 190 @@ -321,8 +308,8 @@ - 190 - 10000 + 269 + 14142 @@ -334,14 +321,14 @@ - + Qt::Horizontal - 10 - 20 + 14 + 28 @@ -349,9 +336,9 @@ - - - + + + 0 @@ -368,7 +355,7 @@ 0 - + 190 @@ -377,24 +364,27 @@ - 190 - 100000 + 269 + 14142 + + + + + 0 + 0 - + Qt::Horizontal - - QSizePolicy::Expanding - - 10 - 20 + 14 + 28 @@ -402,38 +392,9 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 8 - - - - @@ -445,7 +406,7 @@ 16777215 - 50 + 71 diff --git a/bqLibrary/ui/LibraryImageFullScreen.ui b/bqLibrary/ui/LibraryImageFullScreen.ui index 517ce7c..fd7b448 100644 --- a/bqLibrary/ui/LibraryImageFullScreen.ui +++ b/bqLibrary/ui/LibraryImageFullScreen.ui @@ -6,23 +6,23 @@ 0 0 - 758 - 1024 + 1072 + 1448 Form - + 0 0 - 661 - 651 + 935 + 921 @@ -32,7 +32,7 @@ - + @@ -59,8 +59,8 @@ - 40 - 20 + 57 + 28 @@ -68,7 +68,7 @@ - + @@ -81,8 +81,8 @@ - 20 - 40 + 28 + 57 @@ -105,7 +105,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -173,8 +173,8 @@ 0 0 - 758 - 1024 + 1072 + 1448 @@ -184,12 +184,12 @@ - + imageContent LibraryImageFullScreenCont - - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibraryLineGridCollections.ui b/bqLibrary/ui/LibraryLineGridCollections.ui index 38dfde1..97c73c0 100644 --- a/bqLibrary/ui/LibraryLineGridCollections.ui +++ b/bqLibrary/ui/LibraryLineGridCollections.ui @@ -6,23 +6,23 @@ 0 0 - 758 - 752 + 1072 + 1063 Form - + 0 0 - 758 - 752 + 1072 + 1063 @@ -33,8 +33,8 @@ - 758 - 752 + 1072 + 1063 @@ -64,7 +64,7 @@ 16777215 - 115 + 163 @@ -80,11 +80,11 @@ 16777215 - 115 + 163 - + @@ -99,7 +99,7 @@ 16777215 - 115 + 163 @@ -115,7 +115,7 @@ 16777215 - 115 + 163 @@ -131,7 +131,7 @@ 16777215 - 115 + 163 @@ -147,7 +147,7 @@ 16777215 - 115 + 163 @@ -163,7 +163,7 @@ 16777215 - 115 + 163 @@ -179,7 +179,7 @@ 16777215 - 115 + 163 @@ -194,8 +194,8 @@ - 20 - 40 + 28 + 57 @@ -210,8 +210,8 @@ - 758 - 75 + 1072 + 106 @@ -233,6 +233,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibraryLineGridCollectionsItem.ui b/bqLibrary/ui/LibraryLineGridCollectionsItem.ui index 89894f7..5de23a5 100644 --- a/bqLibrary/ui/LibraryLineGridCollectionsItem.ui +++ b/bqLibrary/ui/LibraryLineGridCollectionsItem.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 64 + 849 + 91 @@ -20,15 +20,15 @@ Form - + 0 0 - 600 - 64 + 849 + 91 @@ -39,12 +39,12 @@ - 600 - 64 + 849 + 91 - + @@ -81,8 +81,8 @@ - 600 - 1000 + 849 + 1414 @@ -140,7 +140,7 @@ - 10000 + 14142 16777215 @@ -162,8 +162,8 @@ - 40 - 20 + 57 + 28 @@ -178,8 +178,8 @@ - 20 - 40 + 28 + 57 @@ -203,7 +203,7 @@ - 83 + 117 16777215 @@ -211,7 +211,7 @@ Qt::NoFocus - + @@ -231,7 +231,7 @@ - 84 + 119 16777215 @@ -239,13 +239,13 @@ Qt::NoFocus - + - - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibraryLineGridViewer.ui b/bqLibrary/ui/LibraryLineGridViewer.ui index 0dc0461..2f20cdf 100755 --- a/bqLibrary/ui/LibraryLineGridViewer.ui +++ b/bqLibrary/ui/LibraryLineGridViewer.ui @@ -6,26 +6,26 @@ 0 0 - 600 - 570 + 849 + 806 - + 0 0 - 600 - 570 + 0 + 0 - 1024 - 570 + 1448 + 806 @@ -37,15 +37,43 @@ - - + + 0 - + 0 - + + + + + 0 + 50 + + + + + 16777215 + 71 + + + + + + + + + + true + + + + 0 + 0 + + 0 @@ -120,44 +148,12 @@ - 20 - 7 - - - - - - - - Qt::Vertical - - - - 20 - 40 + 28 + 10 - - - - - 0 - 50 - - - - - 16777215 - 50 - - - - - - - diff --git a/bqLibrary/ui/LibraryLineGridViewerItem.ui b/bqLibrary/ui/LibraryLineGridViewerItem.ui index 92b177f..2cd4e88 100755 --- a/bqLibrary/ui/LibraryLineGridViewerItem.ui +++ b/bqLibrary/ui/LibraryLineGridViewerItem.ui @@ -6,8 +6,8 @@ 0 0 - 783 - 110 + 1107 + 156 @@ -17,7 +17,7 @@ Form - + @@ -47,7 +47,7 @@ - + @@ -71,8 +71,8 @@ - 20 - 40 + 28 + 57 @@ -95,8 +95,8 @@ - 20 - 10 + 28 + 14 @@ -117,8 +117,8 @@ - 410 - 51 + 580 + 72 @@ -167,8 +167,8 @@ - 20 - 40 + 28 + 57 @@ -178,14 +178,14 @@ - + - Suscripción + Suscripción 0 @@ -219,8 +219,8 @@ - 56 - 110 + 79 + 156 @@ -237,7 +237,7 @@ - + @@ -251,8 +251,8 @@ - 20 - 20 + 28 + 28 @@ -274,6 +274,6 @@
DegreesLabel90.h
- - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibraryPageHandler.ui b/bqLibrary/ui/LibraryPageHandler.ui index 75c55cc..24c7566 100755 --- a/bqLibrary/ui/LibraryPageHandler.ui +++ b/bqLibrary/ui/LibraryPageHandler.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 50 + 849 + 71 @@ -24,8 +24,8 @@ 0 0 - 600 - 55 + 849 + 78 @@ -35,18 +35,9 @@ 4 - + 0 - - 7 - - - 0 - - - 5 - @@ -68,7 +59,7 @@ 0 - 20 + 28 @@ -113,7 +104,7 @@ 0 - 20 + 28 diff --git a/bqLibrary/ui/LibraryReadingIconGridViewer.ui b/bqLibrary/ui/LibraryReadingIconGridViewer.ui index 9b46572..8ada37a 100755 --- a/bqLibrary/ui/LibraryReadingIconGridViewer.ui +++ b/bqLibrary/ui/LibraryReadingIconGridViewer.ui @@ -6,20 +6,26 @@ 0 0 - 600 - 565 + 849 + 799 + + + 0 + 0 + + - 600 - 565 + 0 + 0 - 600 - 565 + 849 + 799 @@ -28,43 +34,64 @@ - - + + + 0 + + 0 0 - + + + + 0 + 0 + + - 600 - 565 + 849 + 799 - - + + + QFormLayout::AllNonFixedFieldsGrow + + + 0 + + 0 0 - + + + + 0 + 0 + + 600 265 - + 0 0 - 600 - 265 + 849 + 375 @@ -90,8 +117,8 @@ - 20 - 40 + 28 + 57 @@ -117,8 +144,8 @@ - 5 - 40 + 7 + 57 @@ -137,8 +164,8 @@ - 20 - 40 + 28 + 57 @@ -185,8 +212,8 @@ - 20 - 40 + 28 + 57 @@ -198,8 +225,8 @@ - 20 - 40 + 28 + 57 @@ -211,8 +238,8 @@ - 5 - 40 + 7 + 57 @@ -224,8 +251,8 @@ 0 0 - 119 - 179 + 168 + 253 @@ -240,8 +267,8 @@ 0 0 - 140 - 218 + 198 + 308 @@ -252,8 +279,8 @@ - 140 - 218 + 198 + 308 @@ -274,8 +301,8 @@ 0 0 - 70 - 70 + 99 + 99 @@ -286,8 +313,8 @@ - 70 - 70 + 99 + 99 @@ -305,8 +332,8 @@ 0 0 - 70 - 70 + 99 + 99 @@ -317,8 +344,8 @@ - 70 - 70 + 99 + 99 @@ -336,8 +363,8 @@ 0 0 - 179 - 222 + 253 + 314 @@ -358,8 +385,8 @@ 0 0 - 179 - 199 + 253 + 281 @@ -476,8 +503,8 @@ - 40 - 20 + 57 + 28 @@ -513,8 +540,8 @@ - 40 - 20 + 57 + 28 @@ -528,8 +555,8 @@ - 20 - 40 + 28 + 57 @@ -547,8 +574,8 @@ - 40 - 20 + 57 + 28 @@ -557,20 +584,7 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - - + @@ -586,8 +600,8 @@ - 10000 - 10000 + 14142 + 14142 @@ -598,7 +612,7 @@ 0 - + 0 @@ -616,7 +630,7 @@ 0 - + 190 @@ -625,8 +639,8 @@ - 190 - 100000 + 269 + 141421 @@ -641,8 +655,8 @@ - 10 - 20 + 14 + 28 @@ -650,9 +664,12 @@ - - - + + + + + 0 + 5 @@ -666,7 +683,7 @@ 0 - + 190 @@ -675,21 +692,21 @@ - 190 - 10000 + 269 + 14142 - + Qt::Horizontal - 10 - 20 + 14 + 28 @@ -697,12 +714,9 @@ - - - - - 0 - + + + 5 @@ -716,7 +730,7 @@ 0 - + 190 @@ -725,21 +739,21 @@ - 190 - 10000 + 269 + 14142 - + Qt::Horizontal - 10 - 20 + 14 + 28 @@ -750,37 +764,37 @@ - - - - - 0 - 47 - - - - - 16777215 - 50 - - - - - - - + + + + + 0 + 0 + + + + + 0 + 47 + + + + + 16777215 + 71 + + + + + + + - - LibraryPageHandler - QWidget -
LibraryPageHandler.h
- 1 - ElidedLabel QLabel @@ -792,9 +806,9 @@
DegreesLabel45.h
 - LongPressWidget + LibraryPageHandler QWidget -
LongPressWidget.h
+
LibraryPageHandler.h
1 @@ -803,6 +817,12 @@
LibraryIconGridViewerItem.h
1 + + LongPressWidget + QWidget +
LongPressWidget.h
+ 1 + diff --git a/bqLibrary/ui/LibraryReadingLineGridViewer.ui b/bqLibrary/ui/LibraryReadingLineGridViewer.ui index 850c36f..5fef0eb 100755 --- a/bqLibrary/ui/LibraryReadingLineGridViewer.ui +++ b/bqLibrary/ui/LibraryReadingLineGridViewer.ui @@ -6,27 +6,27 @@ 0 0 - 758 - 723 + 1072 + 1022 - 758 - 723 + 0 + 0 - 758 - 800 + 1072 + 1131 Form - + @@ -57,8 +57,8 @@ 0 0 - 758 - 339 + 1072 + 479 @@ -86,15 +86,15 @@ 0 - + 0 0 - 53 - 17 + 75 + 24 @@ -115,8 +115,8 @@ 0 0 - 92 - 17 + 130 + 24 @@ -134,8 +134,8 @@ 0 0 - 140 - 218 + 198 + 308 @@ -146,8 +146,8 @@ - 140 - 218 + 198 + 308 @@ -168,8 +168,8 @@ 0 0 - 173 - 85 + 245 + 120 @@ -180,8 +180,8 @@ - 173 - 85 + 245 + 120 @@ -199,12 +199,12 @@ 0 0 - 66 - 17 + 93 + 24 - + Qt::AlignCenter @@ -215,8 +215,8 @@ 0 0 - 173 - 85 + 245 + 120 @@ -227,12 +227,12 @@ - 173 - 85 + 245 + 120 - Suscripción + Suscripción Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft @@ -249,7 +249,7 @@ subscriptionTagLbl - + @@ -264,14 +264,14 @@ - + 0 - + @@ -280,14 +280,14 @@ - + 0 - + @@ -302,14 +302,14 @@ - + 0 - + @@ -318,14 +318,14 @@ - + 0 - + @@ -340,17 +340,17 @@ - + - + 0 - + @@ -365,27 +365,27 @@ - + 0 - + Qt::Horizontal - 40 - 20 + 57 + 28 - + @@ -400,14 +400,14 @@ - + 0 - + @@ -422,87 +422,87 @@ - + 0 - + Qt::Vertical - 20 - 40 + 28 + 57 - + Qt::Vertical - 20 - 40 + 28 + 57 - + Qt::Vertical - 20 - 40 + 28 + 57 - + Qt::Vertical - 20 - 40 + 28 + 57 - + Qt::Vertical - 20 - 40 + 28 + 57 - + Qt::Vertical - 20 - 40 + 28 + 57 @@ -566,7 +566,7 @@ - Juan Francisco Ferrándiz + Juan Francisco Ferrándiz true @@ -604,7 +604,7 @@ - Leído + Leído 0 @@ -618,8 +618,8 @@ - 40 - 20 + 57 + 28 @@ -658,8 +658,8 @@ - 40 - 20 + 57 + 28 @@ -673,8 +673,8 @@ - 20 - 40 + 28 + 57 @@ -692,8 +692,8 @@ - 40 - 20 + 57 + 28 @@ -703,13 +703,13 @@ - + - + - + @@ -718,8 +718,8 @@ - 20 - 40 + 28 + 57 @@ -735,11 +735,11 @@ 16777215 - 64 + 91 - + @@ -753,8 +753,8 @@ - 20 - 40 + 28 + 57 @@ -762,12 +762,6 @@ - - LibraryPageHandler - QWidget -
LibraryPageHandler.h
- 1 - ElidedLabel QLabel @@ -779,9 +773,9 @@
DegreesLabel45.h
 - LongPressWidget + LibraryPageHandler QWidget -
LongPressWidget.h
+
LibraryPageHandler.h
1 @@ -790,7 +784,13 @@
LibraryLineGridViewerItem.h
1 + + LongPressWidget + QWidget +
LongPressWidget.h
+ 1 + - - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibrarySortBooksByLayer.ui b/bqLibrary/ui/LibrarySortBooksByLayer.ui index 4e2bed8..2acf3b5 100755 --- a/bqLibrary/ui/LibrarySortBooksByLayer.ui +++ b/bqLibrary/ui/LibrarySortBooksByLayer.ui @@ -6,27 +6,27 @@ 0 0 - 600 - 750 + 849 + 1061 - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -38,7 +38,7 @@ - + @@ -53,7 +53,7 @@ 16777215 - 600 + 849 @@ -76,8 +76,8 @@ - 40 - 20 + 57 + 28 @@ -91,7 +91,7 @@ - + @@ -105,7 +105,7 @@ 16777215 - 19 + 27 @@ -113,12 +113,12 @@ 230 2 - 24 - 17 + 34 + 24 - + 0 @@ -143,11 +143,11 @@ 16777215 - 620 + 877 - + @@ -166,7 +166,7 @@ - + @@ -178,14 +178,14 @@ Qt::NoFocus - Título + Título true - + @@ -204,7 +204,7 @@ - + @@ -216,7 +216,7 @@ Qt::NoFocus - Índice colección + Índice colección true @@ -233,8 +233,8 @@ - 20 - 40 + 28 + 57 @@ -245,7 +245,7 @@ - + @@ -259,14 +259,14 @@ - 20 - 40 + 28 + 57 - - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibrarySortBrowserBooksByLayer.ui b/bqLibrary/ui/LibrarySortBrowserBooksByLayer.ui index 78f8f88..a675970 100755 --- a/bqLibrary/ui/LibrarySortBrowserBooksByLayer.ui +++ b/bqLibrary/ui/LibrarySortBrowserBooksByLayer.ui @@ -6,27 +6,27 @@ 0 0 - 600 - 750 + 849 + 1061 - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -38,7 +38,7 @@ - + @@ -53,7 +53,7 @@ 16777215 - 600 + 849 @@ -76,8 +76,8 @@ - 40 - 20 + 57 + 28 @@ -91,7 +91,7 @@ - + @@ -105,7 +105,7 @@ 16777215 - 19 + 27 @@ -113,12 +113,12 @@ 250 2 - 24 - 17 + 34 + 24 - + 0 @@ -143,7 +143,7 @@ 16777215 - 620 + 877 @@ -184,7 +184,7 @@ Qt::NoFocus - Fecha de modificación + Fecha de modificación true @@ -201,8 +201,8 @@ - 20 - 40 + 28 + 57 @@ -213,7 +213,7 @@ - + @@ -227,14 +227,14 @@ - 20 - 40 + 28 + 57 - - - + + + \ No newline at end of file diff --git a/bqLibrary/ui/LibraryVerticalPager.ui b/bqLibrary/ui/LibraryVerticalPager.ui index da16a80..5205cf0 100644 --- a/bqLibrary/ui/LibraryVerticalPager.ui +++ b/bqLibrary/ui/LibraryVerticalPager.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 50 + 849 + 71 @@ -17,19 +17,19 @@ Form - + 0 0 - 600 - 55 + 849 + 78 - + @@ -54,8 +54,8 @@ - 40 - 20 + 57 + 28 @@ -66,7 +66,7 @@ Qt::NoFocus - + @@ -89,7 +89,7 @@ Qt::NoFocus - + @@ -100,8 +100,8 @@ - 40 - 20 + 57 + 28 @@ -117,7 +117,7 @@ - + - - + + \ No newline at end of file diff --git a/bqSearch/Search1024.qrc~ b/bqSearch/Search1024.qrc~ deleted file mode 100755 index 46ec5f4..0000000 --- a/bqSearch/Search1024.qrc~ +++ /dev/null @@ -1,20 +0,0 @@ - - - res/search_styles_generic.qss - res/1024/search_styles.qss - res/1024/book_epub_list.png - res/1024/book_pdf_list.png - res/1024/corrupted_list.png - res/1024/doc_list.png - res/1024/folder_list.png - res/1024/gif_list.png - res/1024/jpg_list.png - res/1024/pdf_list.png - res/1024/png_list.png - res/1024/txt_list.png - res/1024/unknow_list.png - res/1024/book_txt_list.png - res/1024/book_unknow_list.png - res/1024/store_file.png - - diff --git a/bqSearch/Search1448.qrc b/bqSearch/Search1448.qrc new file mode 100755 index 0000000..f2be7fd --- /dev/null +++ b/bqSearch/Search1448.qrc @@ -0,0 +1,21 @@ + + + res/search_styles_generic.qss + res/1448/search_styles.qss + res/1448/book_epub_list.png + res/1448/book_pdf_list.png + res/1448/corrupted_list.png + res/1448/doc_list.png + res/1448/folder_list.png + res/1448/gif_list.png + res/1448/jpg_list.png + res/1448/pdf_list.png + res/1448/png_list.png + res/1448/txt_list.png + res/1448/unknow_list.png + res/1448/book_txt_list.png + res/1448/book_unknow_list.png + res/1448/store_file.png + res/1448/device_file.png + + diff --git a/bqSearch/bqSearch.pri b/bqSearch/bqSearch.pri index ba8a3c1..338048a 100755 --- a/bqSearch/bqSearch.pri +++ b/bqSearch/bqSearch.pri @@ -27,4 +27,4 @@ TRANSLATIONS = ./tr/bqSearch_es.ts \ ./tr/bqSearch_de.ts \ ./tr/bqSearch_it.ts -QRC_FILES += Search800.qrc Search1024.qrc +QRC_FILES += Search800.qrc Search1024.qrc Search1448.qrc diff --git a/bqSearch/res/1024/search_styles.qss b/bqSearch/res/1024/search_styles.qss index 5b208b6..a8af761 100644 --- a/bqSearch/res/1024/search_styles.qss +++ b/bqSearch/res/1024/search_styles.qss @@ -32,8 +32,8 @@ max-height:88px; border-width:3px; } #Search #searchLineEdit{ -min-width:599px; -max-width:599px; +min-width:550px; +max-width:550px; min-height:70px; max-height:70px; padding:0px 0px 0px 51px; diff --git a/bqSearch/res/1448/book_epub_list.png b/bqSearch/res/1448/book_epub_list.png new file mode 100644 index 0000000..95b07a5 Binary files /dev/null and b/bqSearch/res/1448/book_epub_list.png differ diff --git a/bqSearch/res/1448/book_pdf_list.png b/bqSearch/res/1448/book_pdf_list.png new file mode 100644 index 0000000..4120b84 Binary files /dev/null and b/bqSearch/res/1448/book_pdf_list.png differ diff --git a/bqSearch/res/1448/book_txt_list.png b/bqSearch/res/1448/book_txt_list.png new file mode 100644 index 0000000..c1d3827 Binary files /dev/null and b/bqSearch/res/1448/book_txt_list.png differ diff --git a/bqSearch/res/1448/book_unknow_list.png b/bqSearch/res/1448/book_unknow_list.png new file mode 100644 index 0000000..8f66ae1 Binary files /dev/null and b/bqSearch/res/1448/book_unknow_list.png differ diff --git a/bqSearch/res/1448/corrupted_list.png b/bqSearch/res/1448/corrupted_list.png new file mode 100644 index 0000000..b161e31 Binary files /dev/null and b/bqSearch/res/1448/corrupted_list.png differ diff --git a/bqSearch/res/1448/device_file.png b/bqSearch/res/1448/device_file.png new file mode 100755 index 0000000..e68c102 Binary files /dev/null and b/bqSearch/res/1448/device_file.png differ diff --git a/bqSearch/res/1448/doc_list.png b/bqSearch/res/1448/doc_list.png new file mode 100644 index 0000000..146c1af Binary files /dev/null and b/bqSearch/res/1448/doc_list.png differ diff --git a/bqSearch/res/1448/epub_list.png b/bqSearch/res/1448/epub_list.png new file mode 100644 index 0000000..5eb7d29 Binary files /dev/null and b/bqSearch/res/1448/epub_list.png differ diff --git a/bqSearch/res/1448/folder_list.png b/bqSearch/res/1448/folder_list.png new file mode 100644 index 0000000..48f4542 Binary files /dev/null and b/bqSearch/res/1448/folder_list.png differ diff --git a/bqSearch/res/1448/gif_list.png b/bqSearch/res/1448/gif_list.png new file mode 100644 index 0000000..6b44572 Binary files /dev/null and b/bqSearch/res/1448/gif_list.png differ diff --git a/bqSearch/res/1448/jpg_list.png b/bqSearch/res/1448/jpg_list.png new file mode 100644 index 0000000..187ce35 Binary files /dev/null and b/bqSearch/res/1448/jpg_list.png differ diff --git a/bqSearch/res/1448/pdf_list.png b/bqSearch/res/1448/pdf_list.png new file mode 100644 index 0000000..0694b45 Binary files /dev/null and b/bqSearch/res/1448/pdf_list.png differ diff --git a/bqSearch/res/1448/png_list.png b/bqSearch/res/1448/png_list.png new file mode 100644 index 0000000..980fecf Binary files /dev/null and b/bqSearch/res/1448/png_list.png differ diff --git a/bqSearch/res/1448/search_styles.qss b/bqSearch/res/1448/search_styles.qss new file mode 100644 index 0000000..112ef79 --- /dev/null +++ b/bqSearch/res/1448/search_styles.qss @@ -0,0 +1,122 @@ +/************************************************************************* + +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 . + +*************************************************************************/ + +/*Search +----------------------------*/ +#Search{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#Search #searchHeader{ +min-height: 124px; +max-height: 124px; +border-width: 4px; +} +#Search #searchLineEdit{ +min-width: 847px; +max-width: 847px; +min-height: 99px; +max-height: 99px; +padding: 0px 0px 0px 72px; +border-width: 0px; +} +#Search #clearSearchBtn{ +min-width: 99px; +max-width: 99px; +min-height: 99px; +max-height: 99px; +} +#SearchResultItem1, #SearchResultItem2, #SearchResultItem3, #SearchResultItem4, #SearchResultItem5, #SearchResultItem6, #SearchResultItem7, #SearchResultItem8, #SearchResultItem9{ +min-height: 109px; +max-height: 109px; +} +#SearchResultItemShop1, #SearchResultItemShop2, #SearchResultItemShop3, #SearchResultItemShop4, #SearchResultItemShop5, #SearchResultItemShop6, #SearchResultItemShop7, #SearchResultItemShop8, #SearchResultItemShop9{ +min-height: 109px; +max-height: 109px; +} +#resultNumberCont{ +min-height: 110px; +max-height: 110px; +border-width: 3px; +} +#resultNumberCont #showResultLbl{ +padding: 0px 7px 0px 35px; +} +#resultNumberCont #resultsNumberLbl{ +padding: 0px 7px 0px 0px; +} +#shopOnlineBtn{ +padding-left: 109px; +min-height: 109px; +max-height: 109px; +} +#deviceBooksBtn{ +padding-left: 109px; +min-height: 109px; +max-height: 109px; +} +/*SearchResultItem +----------------------------*/ +#SearchItemCont , SearchItem, #SearchItemShopCont, SearchItemShop{ +min-width: 1072px; +max-width: 1072px; +min-height: 109px; +max-height: 109px; +border-width: 3px; +} +#SearchItemCont #fileTypeLbl, SearchItem #fileTypeLbl, #SearchItemShopCont #fileTypeLbl, SearchItemShop #fileTypeLbl{ +margin: 21px 0px 0px 0px; +min-width: 109px; +max-width: 109px; +} +#SearchItemCont #searchTitle,SearchItem #searchTitle, #SearchItemShopCont #searchTitle,SearchItemShop #searchTitle{ +margin: 8px 0px 0px 0px; +} +#SearchItemCont #searchAuthor, SearchItem #searchAuthor, #SearchItemShopCont #searchAuthor, SearchItemShop #searchAuthor{ +} +/*VerticalPagerHandler +------------------------*/ +#verticalPagerHandler{ +min-width: 1072px; +max-width: 1072px; +min-height: 109px; +max-height: 109px; +border-top-width: 1px; +} +#verticalPagerHandler #downPageBtn{ +min-width: 91px; +max-width: 91px; +min-height: 91px; +max-height: 91px; +margin: 0px 0px 0px 54px; +} +#verticalPagerHandler #upPageBtn{ +min-width: 91px; +max-width: 91px; +min-height: 91px; +max-height: 91px; +margin: 0px 54px 0px 0px; +} +#pageLbl, #currentPageLbl, #ofLbl, #totalPagesLbl{ +padding: 0px 8px 0px 8px; +font-size: 31px; +} diff --git a/bqSearch/res/1448/store_file.png b/bqSearch/res/1448/store_file.png new file mode 100644 index 0000000..f2da4ca Binary files /dev/null and b/bqSearch/res/1448/store_file.png differ diff --git a/bqSearch/res/1448/txt_list.png b/bqSearch/res/1448/txt_list.png new file mode 100644 index 0000000..78ddef8 Binary files /dev/null and b/bqSearch/res/1448/txt_list.png differ diff --git a/bqSearch/res/1448/unknow_list.png b/bqSearch/res/1448/unknow_list.png new file mode 100644 index 0000000..e95b649 Binary files /dev/null and b/bqSearch/res/1448/unknow_list.png differ diff --git a/bqSearch/src/SearchItem.cpp b/bqSearch/src/SearchItem.cpp index 55185d0..e77ee2c 100644 --- a/bqSearch/src/SearchItem.cpp +++ b/bqSearch/src/SearchItem.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 @@ -87,7 +87,7 @@ void SearchItem::paintFile() if(bookItem) { searchTitle->setText(bookItem->title); - if(bookItem->author == "--") + if(bookItem->author == "---") searchAuthor->setText(tr("Autor Desconocido")); else searchAuthor->setText(bookItem->author); diff --git a/bqSearch/ui/Search.ui b/bqSearch/ui/Search.ui index 74ed256..e143943 100755 --- a/bqSearch/ui/Search.ui +++ b/bqSearch/ui/Search.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -24,8 +24,8 @@ - 600 - 750 + 849 + 1061 @@ -38,7 +38,7 @@ Form - + @@ -51,8 +51,8 @@ - 600 - 76 + 0 + 0 @@ -69,8 +69,8 @@ - 40 - 20 + 57 + 28 @@ -85,12 +85,12 @@ - 508 - 55 + 718 + 78 - + Enter text to search here... @@ -109,7 +109,7 @@ Qt::NoFocus - + @@ -120,8 +120,8 @@ - 40 - 20 + 57 + 28 @@ -182,8 +182,8 @@ - 40 - 20 + 57 + 28 @@ -192,31 +192,31 @@ - + - + - + - + - + - + - + - + - + @@ -226,31 +226,31 @@ - + - + - + - + - + - + - + - + - + @@ -259,14 +259,14 @@ - 20 - 40 + 28 + 57 - + @@ -300,8 +300,6 @@ 1 - - - - - + + + \ No newline at end of file diff --git a/bqSearch/ui/SearchItem.ui b/bqSearch/ui/SearchItem.ui index 1e92478..ea2fe3a 100755 --- a/bqSearch/ui/SearchItem.ui +++ b/bqSearch/ui/SearchItem.ui @@ -6,27 +6,27 @@ 0 0 - 600 - 60 + 849 + 85 - 600 - 60 + 0 + 0 - 600 - 60 + 849 + 85 Form - + @@ -47,7 +47,7 @@ - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -70,7 +70,7 @@ - 1000 + 1414 16777215 @@ -84,10 +84,10 @@ - + - Título del libro + Título del libro 0 @@ -97,7 +97,7 @@ - + autor @@ -120,8 +120,8 @@ - 20 - 40 + 28 + 57 @@ -138,9 +138,9 @@ ElidedLabel QLabel -
ElidedLabel.h
+
ElidedLabel.h
 - - - + + + \ No newline at end of file diff --git a/bqSearch/ui/SearchItemShop.ui b/bqSearch/ui/SearchItemShop.ui index ad7a097..5d16151 100755 --- a/bqSearch/ui/SearchItemShop.ui +++ b/bqSearch/ui/SearchItemShop.ui @@ -6,27 +6,27 @@ 0 0 - 600 - 60 + 849 + 85 - 600 - 60 + 0 + 0 - 600 - 60 + 849 + 85 Form - + @@ -47,7 +47,7 @@ - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -70,7 +70,7 @@ - 10000 + 14142 16777215 @@ -84,10 +84,10 @@ - + - Título del libro + Título del libro 0 @@ -97,7 +97,7 @@ - + autor @@ -120,8 +120,8 @@ - 20 - 40 + 28 + 57 @@ -134,9 +134,6 @@ - - - - - - + + + \ No newline at end of file diff --git a/bqSearch/ui/SearchPagerCont.ui b/bqSearch/ui/SearchPagerCont.ui index 7c500ee..b4b33c2 100755 --- a/bqSearch/ui/SearchPagerCont.ui +++ b/bqSearch/ui/SearchPagerCont.ui @@ -6,15 +6,15 @@ 0 0 - 560 - 61 + 792 + 86 Form - + @@ -30,8 +30,8 @@ - 40 - 20 + 57 + 28 @@ -42,7 +42,7 @@ Qt::NoFocus - + @@ -92,7 +92,7 @@ Qt::NoFocus - + @@ -103,8 +103,8 @@ - 40 - 20 + 57 + 28 @@ -112,8 +112,8 @@ - - + + - - + + \ No newline at end of file diff --git a/bqSetting/Settings1024.qrc b/bqSetting/Settings1024.qrc index ebfea4e..a95f4ef 100755 --- a/bqSetting/Settings1024.qrc +++ b/bqSetting/Settings1024.qrc @@ -2,19 +2,13 @@ res/1024/access_Btn.png res/1024/account_settings_btn.png - res/1024/account_settings_Ico.png res/1024/back_Btn.png res/1024/brightness_settings.png - res/1024/brightness_settings_Ico.png res/1024/browser-settings.png - res/1024/browser-settings_Ico.png res/1024/device_info.png - res/1024/device_info_Ico.png res/1024/device_settings.png - res/1024/device_settings_Ico.png res/1024/settings_styles.qss res/1024/wifi_settings.png - res/1024/wifi_settings_ico.png res/1024/bg_select_arrow.png res/1024/checked.png res/1024/spinner_ico.png @@ -57,7 +51,6 @@ res/1024/wifi_3_Ico.png res/1024/wifi_4_Ico.png res/1024/wifi_no_Ico.png - res/1024/save.png res/1024/save-grey.png res/1024/wifi_refresh.png res/1024/pageTurn_settings.png diff --git a/bqSetting/Settings1024.qrc~ b/bqSetting/Settings1024.qrc~ deleted file mode 100755 index ebf0ab3..0000000 --- a/bqSetting/Settings1024.qrc~ +++ /dev/null @@ -1,64 +0,0 @@ - - - res/1024/access_Btn.png - res/1024/account_settings_btn.png - res/1024/account_settings_Ico.png - res/1024/back_Btn.png - res/1024/brightness_settings.png - res/1024/brightness_settings_Ico.png - res/1024/browser-settings.png - res/1024/browser-settings_Ico.png - res/1024/device_info.png - res/1024/device_info_Ico.png - res/1024/device_settings.png - res/1024/device_settings_Ico.png - res/1024/settings_styles.qss - res/1024/wifi_settings.png - res/1024/wifi_settings_ico.png - res/1024/bg_select_arrow.png - res/1024/checked.png - res/1024/spinner_ico.png - res/1024/uncheked.png - res/1024/sleeptime_settings.png - res/1024/reader_settings.png - res/1024/dictionaries_settings.png - res/1024/down_pager_ico.png - res/1024/up_pager_ico.png - res/1024/check_ico.png - res/1024/previous_disabled_btn.png - res/1024/next_disabled_btn.png - res/1024/next_btn.png - res/1024/previous_btn.png - res/1024/bg_next_previous.png - res/1024/favourite_ico.png - res/1024/zoom_out_ico.png - res/1024/zoom_in_disabled_ico.png - res/1024/home_browser.png - res/1024/updatedevice_settings.png - res/1024/defaultvalues_settings.png - res/1024/techinfo_settings.png - res/1024/lock_wifi.png - res/1024/language_settings.png - res/1024/general_terms_settings.png - res/1024/adobedrm_settings.png - res/1024/myaccount_settings.png - res/1024/clear_input.png - res/1024/zoom_in_ico.png - res/1024/zoom_out_disabled_ico.png - res/1024/add_favourite_ico.png - res/1024/datetime_settings.png - res/settings_styles_generic.qss - res/1024/reader_buttons_functions_1.png - res/1024/reader_buttons_functions_2.png - res/1024/check_no_margin_ico.png - res/1024/wifi_0_Ico.png - res/1024/wifi_1_Ico.png - res/1024/wifi_2_Ico.png - res/1024/wifi_3_Ico.png - res/1024/wifi_4_Ico.png - res/1024/wifi_no_Ico.png - res/1024/save.png - res/1024/save-grey.png - res/1024/wifi_refresh.png - - diff --git a/bqSetting/Settings1448.qrc b/bqSetting/Settings1448.qrc new file mode 100755 index 0000000..3d0576f --- /dev/null +++ b/bqSetting/Settings1448.qrc @@ -0,0 +1,63 @@ + + + res/1448/account_settings_btn.png + res/1448/back_Btn.png + res/1448/brightness_settings.png + res/1448/browser-settings.png + res/1448/device_info.png + res/1448/device_settings.png + res/1448/settings_styles.qss + res/1448/wifi_settings.png + res/1448/bg_select_arrow.png + res/1448/checked.png + res/1448/spinner_ico.png + res/1448/uncheked.png + res/1448/sleeptime_settings.png + res/1448/reader_settings.png + res/1448/dictionaries_settings.png + res/1448/down_pager_ico.png + res/1448/up_pager_ico.png + res/1448/check_ico.png + res/1448/previous_disabled_btn.png + res/1448/next_disabled_btn.png + res/1448/next_btn.png + res/1448/previous_btn.png + res/1448/bg_next_previous.png + res/1448/updatedevice_settings.png + res/1448/defaultvalues_settings.png + res/1448/techinfo_settings.png + res/1448/lock_wifi.png + res/1448/language_settings.png + res/1448/general_terms_settings.png + res/1448/adobedrm_settings.png + res/1448/myaccount_settings.png + res/1448/clear_input.png + res/1448/datetime_settings.png + res/settings_styles_generic.qss + res/1448/reader_buttons_functions_1.png + res/1448/reader_buttons_functions_2.png + res/1448/check_no_margin_ico.png + res/1448/wifi_0_Ico.png + res/1448/wifi_1_Ico.png + res/1448/wifi_2_Ico.png + res/1448/wifi_3_Ico.png + res/1448/wifi_4_Ico.png + res/1448/wifi_no_Ico.png + res/1448/save-grey.png + res/1448/wifi_refresh.png + res/1448/pageTurn_settings.png + res/1448/progressBar_settings.png + res/1448/screensaver_settings_btn.png + res/1448/progress_off.png + res/1448/progress_on.png + res/1448/progress_off_disabled.png + res/1448/progress_on_disabled.png + res/1448/arrow.png + res/1448/savebattery_settings.png + res/1448/shutdowntime_settings.png + res/1448/activate_settings.png + res/1448/arrow-btn.png + res/1448/warning.png + res/1448/about_us_settings.png + + diff --git a/bqSetting/Settings800.qrc b/bqSetting/Settings800.qrc index c4957ed..82c348a 100755 --- a/bqSetting/Settings800.qrc +++ b/bqSetting/Settings800.qrc @@ -2,19 +2,12 @@ res/800/access_Btn.png res/800/account_settings_btn.png - res/800/account_settings_Ico.png res/800/back_Btn.png res/800/brightness_settings.png - res/800/brightness_settings_Ico.png res/800/browser-settings.png - res/800/browser-settings_Ico.png res/800/device_info.png - res/800/device_info_Ico.png res/800/device_settings.png - res/800/device_settings_Ico.png - res/800/settings_styles.qss res/800/wifi_settings.png - res/800/wifi_settings_ico.png res/800/bg_select_arrow.png res/800/checked.png res/800/spinner_ico.png @@ -57,7 +50,6 @@ res/800/wifi_3_Ico.png res/800/wifi_4_Ico.png res/800/wifi_no_Ico.png - res/800/save.png res/800/save-grey.png res/800/wifi_refresh.png res/800/reload_wifi.png @@ -79,5 +71,6 @@ res/800/about_us_settings.png res/800/checked-small-disabled.png res/800/unchecked-small-disabled.png + res/800/settings_styles.qss diff --git a/bqSetting/bqSetting.pri b/bqSetting/bqSetting.pri index 450ae90..3e7796d 100755 --- a/bqSetting/bqSetting.pri +++ b/bqSetting/bqSetting.pri @@ -140,10 +140,11 @@ TRANSLATIONS = ./tr/bqSetting_es.ts \ DEPENDPATH+= ../bq/inc -QRC_FILES += Settings800.qrc Settings1024.qrc +QRC_FILES += Settings800.qrc Settings1024.qrc Settings1448.qrc OTHER_FILES += \ bqSetting/res/800/settings_styles.qss \ bqSetting/res/1024/settings_styles.qss \ + bqSetting/res/1448/settings_styles.qss \ bqSetting/res/settings_styles_generic.qss diff --git a/bqSetting/res/1024/account_settings_Ico.png b/bqSetting/res/1024/account_settings_Ico.png deleted file mode 100755 index f22fcf7..0000000 Binary files a/bqSetting/res/1024/account_settings_Ico.png and /dev/null differ diff --git a/bqSetting/res/1024/back_Btn - copia.png b/bqSetting/res/1024/back_Btn - copia.png deleted file mode 100755 index 2bfad62..0000000 Binary files a/bqSetting/res/1024/back_Btn - copia.png and /dev/null differ diff --git a/bqSetting/res/1024/brightness_settings_Ico.png b/bqSetting/res/1024/brightness_settings_Ico.png deleted file mode 100755 index b362a5e..0000000 Binary files a/bqSetting/res/1024/brightness_settings_Ico.png and /dev/null differ diff --git a/bqSetting/res/1024/browser-settings_Ico.png b/bqSetting/res/1024/browser-settings_Ico.png deleted file mode 100755 index 28abd64..0000000 Binary files a/bqSetting/res/1024/browser-settings_Ico.png and /dev/null differ diff --git a/bqSetting/res/1024/device_info_Ico.png b/bqSetting/res/1024/device_info_Ico.png deleted file mode 100755 index da4a78e..0000000 Binary files a/bqSetting/res/1024/device_info_Ico.png and /dev/null differ diff --git a/bqSetting/res/1024/device_settings_Ico.png b/bqSetting/res/1024/device_settings_Ico.png deleted file mode 100755 index 0696a51..0000000 Binary files a/bqSetting/res/1024/device_settings_Ico.png and /dev/null differ diff --git a/bqSetting/res/1024/library_sync.png b/bqSetting/res/1024/library_sync.png deleted file mode 100755 index c9d4e9f..0000000 Binary files a/bqSetting/res/1024/library_sync.png and /dev/null differ diff --git a/bqSetting/res/1024/save.png b/bqSetting/res/1024/save.png deleted file mode 100755 index eae09c4..0000000 Binary files a/bqSetting/res/1024/save.png and /dev/null differ diff --git a/bqSetting/res/1024/settings_styles.qss b/bqSetting/res/1024/settings_styles.qss index b8d1393..cef3e73 100644 --- a/bqSetting/res/1024/settings_styles.qss +++ b/bqSetting/res/1024/settings_styles.qss @@ -662,10 +662,7 @@ max-width:190px; } #versionLutLbl, #modelLbl, #mdeviceIDLbl, #edpTypeLbl,#edpTemperatureLbl, #internalMemLbl, #auxLbl, #diccioLbl, #bateryLbl, #tconLbl, #softwareLbl, #MACadressLbl, #externalMemLbl, #panelTypeLbl{ } -#SettingsTechnicalInfo #settingsMenuListCont QWidget #internalVersionValLbl{ -margin-left:0px; -font-size:20px; -} + /*Settingspx;DictionarieslInfo ------------------------------------------*/ #SettingsDictionariesInfo{ diff --git a/bqSetting/res/1024/wifi_settings_ico.png b/bqSetting/res/1024/wifi_settings_ico.png deleted file mode 100755 index 3be4478..0000000 Binary files a/bqSetting/res/1024/wifi_settings_ico.png and /dev/null differ diff --git a/bqSetting/res/1448/about_us_settings.png b/bqSetting/res/1448/about_us_settings.png new file mode 100644 index 0000000..93d1f17 Binary files /dev/null and b/bqSetting/res/1448/about_us_settings.png differ diff --git a/bqSetting/res/1448/account_settings_btn.png b/bqSetting/res/1448/account_settings_btn.png new file mode 100644 index 0000000..98255b3 Binary files /dev/null and b/bqSetting/res/1448/account_settings_btn.png differ diff --git a/bqSetting/res/1448/activate_settings.png b/bqSetting/res/1448/activate_settings.png new file mode 100644 index 0000000..e4c811f Binary files /dev/null and b/bqSetting/res/1448/activate_settings.png differ diff --git a/bqSetting/res/1448/adobedrm_settings.png b/bqSetting/res/1448/adobedrm_settings.png new file mode 100644 index 0000000..4735f72 Binary files /dev/null and b/bqSetting/res/1448/adobedrm_settings.png differ diff --git a/bqSetting/res/1448/arrow-btn.png b/bqSetting/res/1448/arrow-btn.png new file mode 100755 index 0000000..a141115 Binary files /dev/null and b/bqSetting/res/1448/arrow-btn.png differ diff --git a/bqSetting/res/1448/arrow.png b/bqSetting/res/1448/arrow.png new file mode 100644 index 0000000..149873a Binary files /dev/null and b/bqSetting/res/1448/arrow.png differ diff --git a/bqSetting/res/1448/back_Btn.png b/bqSetting/res/1448/back_Btn.png new file mode 100644 index 0000000..9154b8c Binary files /dev/null and b/bqSetting/res/1448/back_Btn.png differ diff --git a/bqSetting/res/1448/bg_next_previous.png b/bqSetting/res/1448/bg_next_previous.png new file mode 100644 index 0000000..66cc4c7 Binary files /dev/null and b/bqSetting/res/1448/bg_next_previous.png differ diff --git a/bqSetting/res/1448/bg_select_arrow.png b/bqSetting/res/1448/bg_select_arrow.png new file mode 100755 index 0000000..ab37b11 Binary files /dev/null and b/bqSetting/res/1448/bg_select_arrow.png differ diff --git a/bqSetting/res/1448/brightness_max.png b/bqSetting/res/1448/brightness_max.png new file mode 100755 index 0000000..ae61a6f Binary files /dev/null and b/bqSetting/res/1448/brightness_max.png differ diff --git a/bqSetting/res/1448/brightness_min.png b/bqSetting/res/1448/brightness_min.png new file mode 100755 index 0000000..e01c562 Binary files /dev/null and b/bqSetting/res/1448/brightness_min.png differ diff --git a/bqSetting/res/1448/brightness_settings.png b/bqSetting/res/1448/brightness_settings.png new file mode 100644 index 0000000..998aa67 Binary files /dev/null and b/bqSetting/res/1448/brightness_settings.png differ diff --git a/bqSetting/res/1448/browser-settings.png b/bqSetting/res/1448/browser-settings.png new file mode 100644 index 0000000..fbecc67 Binary files /dev/null and b/bqSetting/res/1448/browser-settings.png differ diff --git a/bqSetting/res/1448/check_ico.png b/bqSetting/res/1448/check_ico.png new file mode 100755 index 0000000..df3daab Binary files /dev/null and b/bqSetting/res/1448/check_ico.png differ diff --git a/bqSetting/res/1448/check_no_margin_ico.png b/bqSetting/res/1448/check_no_margin_ico.png new file mode 100755 index 0000000..45f4654 Binary files /dev/null and b/bqSetting/res/1448/check_no_margin_ico.png differ diff --git a/bqSetting/res/1448/checkbox_checked.png b/bqSetting/res/1448/checkbox_checked.png new file mode 100644 index 0000000..80e7267 Binary files /dev/null and b/bqSetting/res/1448/checkbox_checked.png differ diff --git a/bqSetting/res/1448/checked.png b/bqSetting/res/1448/checked.png new file mode 100644 index 0000000..80e7267 Binary files /dev/null and b/bqSetting/res/1448/checked.png differ diff --git a/bqSetting/res/1448/clear_input.png b/bqSetting/res/1448/clear_input.png new file mode 100755 index 0000000..d31bbde Binary files /dev/null and b/bqSetting/res/1448/clear_input.png differ diff --git a/bqSetting/res/1448/close_popup_ico.png b/bqSetting/res/1448/close_popup_ico.png new file mode 100755 index 0000000..c40d76d Binary files /dev/null and b/bqSetting/res/1448/close_popup_ico.png differ diff --git a/bqSetting/res/1448/datetime_settings.png b/bqSetting/res/1448/datetime_settings.png new file mode 100644 index 0000000..41d4edf Binary files /dev/null and b/bqSetting/res/1448/datetime_settings.png differ diff --git a/bqSetting/res/1448/defaultvalues_settings.png b/bqSetting/res/1448/defaultvalues_settings.png new file mode 100644 index 0000000..990f3f3 Binary files /dev/null and b/bqSetting/res/1448/defaultvalues_settings.png differ diff --git a/bqSetting/res/1448/device_info.png b/bqSetting/res/1448/device_info.png new file mode 100644 index 0000000..df77f9b Binary files /dev/null and b/bqSetting/res/1448/device_info.png differ diff --git a/bqSetting/res/1448/device_settings.png b/bqSetting/res/1448/device_settings.png new file mode 100644 index 0000000..682cf47 Binary files /dev/null and b/bqSetting/res/1448/device_settings.png differ diff --git a/bqSetting/res/1448/dictionaries_settings.png b/bqSetting/res/1448/dictionaries_settings.png new file mode 100644 index 0000000..6d8f472 Binary files /dev/null and b/bqSetting/res/1448/dictionaries_settings.png differ diff --git a/bqSetting/res/1448/down_pager_ico.png b/bqSetting/res/1448/down_pager_ico.png new file mode 100644 index 0000000..488febe Binary files /dev/null and b/bqSetting/res/1448/down_pager_ico.png differ diff --git a/bqSetting/res/1448/general_terms_settings.png b/bqSetting/res/1448/general_terms_settings.png new file mode 100644 index 0000000..2ac074a Binary files /dev/null and b/bqSetting/res/1448/general_terms_settings.png differ diff --git a/bqSetting/res/1448/language_settings.png b/bqSetting/res/1448/language_settings.png new file mode 100644 index 0000000..9fe173b Binary files /dev/null and b/bqSetting/res/1448/language_settings.png differ diff --git a/bqSetting/res/1448/lock_wifi.png b/bqSetting/res/1448/lock_wifi.png new file mode 100755 index 0000000..041deca Binary files /dev/null and b/bqSetting/res/1448/lock_wifi.png differ diff --git a/bqSetting/res/1448/myaccount_settings.png b/bqSetting/res/1448/myaccount_settings.png new file mode 100644 index 0000000..d070d60 Binary files /dev/null and b/bqSetting/res/1448/myaccount_settings.png differ diff --git a/bqSetting/res/1448/next_btn.png b/bqSetting/res/1448/next_btn.png new file mode 100644 index 0000000..927e6c9 Binary files /dev/null and b/bqSetting/res/1448/next_btn.png differ diff --git a/bqSetting/res/1448/next_disabled_btn.png b/bqSetting/res/1448/next_disabled_btn.png new file mode 100644 index 0000000..f68f28a Binary files /dev/null and b/bqSetting/res/1448/next_disabled_btn.png differ diff --git a/bqSetting/res/1448/off_btn.png b/bqSetting/res/1448/off_btn.png new file mode 100755 index 0000000..6f2a436 Binary files /dev/null and b/bqSetting/res/1448/off_btn.png differ diff --git a/bqSetting/res/1448/on_btn.png b/bqSetting/res/1448/on_btn.png new file mode 100755 index 0000000..4e33e66 Binary files /dev/null and b/bqSetting/res/1448/on_btn.png differ diff --git a/bqSetting/res/1448/pageTurn_settings.png b/bqSetting/res/1448/pageTurn_settings.png new file mode 100644 index 0000000..640af4b Binary files /dev/null and b/bqSetting/res/1448/pageTurn_settings.png differ diff --git a/bqSetting/res/1448/previous_btn.png b/bqSetting/res/1448/previous_btn.png new file mode 100644 index 0000000..8a01556 Binary files /dev/null and b/bqSetting/res/1448/previous_btn.png differ diff --git a/bqSetting/res/1448/previous_disabled_btn.png b/bqSetting/res/1448/previous_disabled_btn.png new file mode 100644 index 0000000..bd1fbb0 Binary files /dev/null and b/bqSetting/res/1448/previous_disabled_btn.png differ diff --git a/bqSetting/res/1448/progressBar_settings.png b/bqSetting/res/1448/progressBar_settings.png new file mode 100644 index 0000000..43ae0dd Binary files /dev/null and b/bqSetting/res/1448/progressBar_settings.png differ diff --git a/bqSetting/res/1448/progress_off.png b/bqSetting/res/1448/progress_off.png new file mode 100755 index 0000000..36bf7bc Binary files /dev/null and b/bqSetting/res/1448/progress_off.png differ diff --git a/bqSetting/res/1448/progress_off_disabled.png b/bqSetting/res/1448/progress_off_disabled.png new file mode 100755 index 0000000..3b8bdaa Binary files /dev/null and b/bqSetting/res/1448/progress_off_disabled.png differ diff --git a/bqSetting/res/1448/progress_on.png b/bqSetting/res/1448/progress_on.png new file mode 100755 index 0000000..520b08e Binary files /dev/null and b/bqSetting/res/1448/progress_on.png differ diff --git a/bqSetting/res/1448/progress_on_disabled.png b/bqSetting/res/1448/progress_on_disabled.png new file mode 100755 index 0000000..5ce72b3 Binary files /dev/null and b/bqSetting/res/1448/progress_on_disabled.png differ diff --git a/bqSetting/res/1448/reader_buttons_functions_1.png b/bqSetting/res/1448/reader_buttons_functions_1.png new file mode 100644 index 0000000..52499a1 Binary files /dev/null and b/bqSetting/res/1448/reader_buttons_functions_1.png differ diff --git a/bqSetting/res/1448/reader_buttons_functions_2.png b/bqSetting/res/1448/reader_buttons_functions_2.png new file mode 100644 index 0000000..1722509 Binary files /dev/null and b/bqSetting/res/1448/reader_buttons_functions_2.png differ diff --git a/bqSetting/res/1448/reader_settings.png b/bqSetting/res/1448/reader_settings.png new file mode 100644 index 0000000..0552d0a Binary files /dev/null and b/bqSetting/res/1448/reader_settings.png differ diff --git a/bqSetting/res/1448/save-grey.png b/bqSetting/res/1448/save-grey.png new file mode 100755 index 0000000..213c855 Binary files /dev/null and b/bqSetting/res/1448/save-grey.png differ diff --git a/bqSetting/res/1448/savebattery_settings.png b/bqSetting/res/1448/savebattery_settings.png new file mode 100644 index 0000000..ed6d13b Binary files /dev/null and b/bqSetting/res/1448/savebattery_settings.png differ diff --git a/bqSetting/res/1448/screensaver_settings_btn.png b/bqSetting/res/1448/screensaver_settings_btn.png new file mode 100644 index 0000000..04ec40d Binary files /dev/null and b/bqSetting/res/1448/screensaver_settings_btn.png differ diff --git a/bqSetting/res/1448/settings_styles.qss b/bqSetting/res/1448/settings_styles.qss new file mode 100644 index 0000000..830985f --- /dev/null +++ b/bqSetting/res/1448/settings_styles.qss @@ -0,0 +1,1997 @@ +/************************************************************************* + +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 . + +*************************************************************************/ + +/* Settings +--------------------------*/ +QCheckBox{ +min-height: 91px; +max-height: 91px; +min-width: 91px; +max-width: 91px; +} +#overlayCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#settingsMarginTop{ +min-height: 72px; +max-height: 72px; +} +#SettingsMenuCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#settingsMenuListCont { +margin: 3px 34px; +border-width: 3px; +border-radius: 14px; +} +#settingsMenuListCont QWidget{ +min-height: 109px; +max-height: 109px; +} +#settingsMenuListCont #Item1,#settingsMenuListCont #Item2, #settingsMenuListCont #Item3, #settingsMenuListCont #Item4, #settingsMenuListCont #Item5, #settingsMenuListCont #Item6{ +margin: 0px 40px; +min-width: 993px; +max-width: 993px; +min-height: 143px; +max-height: 143px; +border-bottom-width: 3px; +} +#settingsMenuListCont QWidget#Item1{ +margin: 1px 40px; +border-top-left-radius: 14px; +border-top-right-radius: 14px; +} +#settingsMenuListCont QWidget{ +} +#settingsMenuListCont QPushButton{ +min-height: 143px; +max-height: 143px; +margin: 3px 37px; +padding: 0px 0px 0px 144px; +border-bottom-width: 3px; +} +#settingsMenuListCont #generalTermsResult{ +margin: 0px 42px; +min-width: 940px; +max-width: 940px; +min-height: 990px; +max-height: 990px; +} +#settingsCont{ +margin: 0px 40px; +border-width: 3px; +border-radius: 14px; +} +#verticalTopSection{ +min-height: 64px; +max-height: 64px; +} +#settingsSectionHeaderCenter{ +} +#settingsSectionHeader{ +min-width: 1072px; +max-width: 1072px; +min-height: 91px; +max-height: 91px; +} +#settingsSectionHeader #sectionTitleLbl{ +margin: 0px 0px 0px 35px; +font-size: 35px; +} +#settingsSectionHeader #backBtn{ +margin: 0px 0px 0px 35px; +padding: 0px 0px 0px 35px; +min-width: 150px; +max-width: 150px; +min-height: 69px; +max-height: 69px; +font-size: 33px; +} +/*SettingsPagerCont +------------------------*/ +#SettingsPagerCont,#settingsPagerCont, #verticalPage{ +margin: 0px 40px 4px 40px; +min-height: 109px; +max-height: 109px; +/*border-top-width: 1px;*/ +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +} +#verticalPage{ +margin: 1px 37px 6px 37px; +min-height: 106px; +max-height: 106px; +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +} +#SettingsPagerCont #downPageBtn,#settingsPagerCont #downPageBtn, #verticalPage #downPageBtn{ +min-width: 82px; +max-width: 82px; +min-height: 82px; +max-height: 82px; +margin: 0px 0px 0px 54px; +} +#SettingsPagerCont #upPageBtn,#settingsPagerCont #upPageBtn, #verticalPage #upPageBtn{ +min-width: 82px; +max-width: 82px; +min-height: 82px; +max-height: 82px; +margin: 0px 45px 0px 0px; +} +#pageLbl, #currentPageLbl, #ofLbl, #totalPagesLbl{ +padding: 0px 0px 0px 8px; +font-size: 31px; +} +/*WaitingOverlay +----------------------*/ +#spinnerCont{ +min-width: 851px; +max-width: 851px; +min-height: 362px; +max-height: 362px; +border-radius: 14px; +} +#spinnerCont #waittingDevicesLbl{ +margin: 54px 117px 0px 117px; +} +#spinnerCont #spinerLbl{ +} +/*Settings Main Menu +----------------------*/ +#Settings{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#userDataBtn{ +border-top-left-radius: 14px; +border-top-right-radius: 14px; +} +#settingsMenuListCont QPushButton#webBrowserBtn{ +} +#wifiConnexionBtn{ +} +#deviceOptionsBtn{ +} +#deviceInfoBtn{ +} +#lightSettingsBtn{ +} +#aboutUsBtn{ +} +#settingsMenuListCont QPushButton#aboutUsBtn{ +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +} +#activateDeviceBtn{ +min-height: 143px; +max-height: 143px; +margin: 3px 37px; +padding: 0px 0px 0px 144px; +border-width: 3px; +border-radius: 14px; +border-radius: 14px; +} +/*SettingsMyAccountMenu +--------------------------------------------*/ +#SettingsMyAccountMenu{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsMyAccountMenuCont{ +min-width: 1014px; +max-width: 1014px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsMyAccountMenu #settingsMenuListCont{ +margin: 3px 34px; +} +#SettingsMyAccountMenu #settingsMenuListCont QPushButton{ +margin: 3px 37px; +} +#myAccountBtn{ +border-top-left-radius: 14px; +border-top-right-radius: 14px; +} +#adobeDrmBtn{ +} +#generalTermsBtn{ +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +} +/*SettingsDeviceOptionsMenu +--------------------------------------------*/ +#SettingsDeviceOptionsMenu{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#settingsMenuListCont #languageBtn{ +} +#settingsMenuListCont #dateTimeBtn{ +} +#settingsMenuListCont #dictionariesBtn{ +} +#settingsMenuListCont #readerBtn{ +} +#settingsMenuListCont #energySavingBtn{ +} +/*SettingsAdobeDrmUnLinkDevice +--------------------------------*/ +#SettingsAdobeDrmUnLinkDevice{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#settingsCont #adobeDrmInfoLbl{ +margin: 72px 0px 0px 0px; +padding: 0px 109px; +} +#settingsCont #accountEmailLbl{ +} +#settingsCont #overrideDeviceBtn{ +padding: 0px; +margin: 0px 109px; +min-height: 127px; +max-height: 127px; +font-size: 42px; +border-width: 3px; +border-radius: 14px; +} +#licenseAdobeBtn{ +border-radius: 10px 10px 10px 10px; +border-width: 3px; +font-size: 37px; +font-weight:normal; +margin: 10px 109px 119px; +padding: 28px; +} +/*SettingsUnLinkStoreDevice +-------------------------------*/ +#SettingsUnLinkStoreDevice{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#settingsCont #adobeDrmInfoLbl{ +margin: 72px 0px 0px 0px; +padding: 0px 109px; +} +#settingsCont #accountEmailLbl{ +padding: 27px 0px 0px 0px; +font-size: 37px; +} +#settingsCont #subscriptionTextLbl{ +padding: 0px 0px 13px 0px; +} +#settingsCont #subscriptionValueLbl{ +padding: 0px 0px 27px 0px; +} + +#SettingsUnLinkStoreDevice #overrideDeviceBtn{ +margin: 0px 40px; +padding: 8px 54px; +min-height: 99px; +max-height: 99px; +font-size: 40px; +border-top-width: 3px; +} +#stoteWebUrlLbl{ +padding: 0px 109px; +} +#changeAccountLbl{ +margin: 54px 0px 72px 0px; +padding: 0px 109px; +} +#SettingsUnLinkStoreDevice QLabel{ +min-height: 0px; +max-height: 1414px; +} +#userLbl{ +padding: 0px 28px; +margin: 14px 42px 0px 42px; +font-weight:bold; +font-size: 40px; +} +#nameAccountLbl, #subscriptionLbl{ +padding: 21px 35px 0px 35px; +margin: 0px 42px; +border-top-width: 1px; +font-size: 40px; +} +#userValueLbl, #accountEmailLbl{ +padding: 0px 0px 0px 35px; +margin: 7px 14px 21px 42px; +font-size: 37px; +} +#statusLbl{ +padding: 0px 0px 0px 35px; +margin: 14px 0px 14px 42px; +font-size: 37px; +} +#notelbl{ +padding: 0px 0px 0px 0px; +margin: 4px 0px 21px 0px; +font-size: 34px; +} +#lastSyncLbl{ +padding: 0px 0px 0px 35px; +margin: 0px 21px 21px 42px; +font-size: 37px; +} +#statusValLbl{ +margin: 14px 21px 14px 0px; +font-size: 37px; +} +#lastSyncValLbl{ +margin: 0px 21px 21px 0px; +font-size: 37px; +} +#updateAccountLbl{ +margin: 35px 28px 0px 28px; +} +#warningMsgLbl{ +margin: 28px 72px 21px 91px; +padding: 0px 40px 0px 91px; +font-size: 31px; +} +#statusLastSync{ +margin: 0px 72px 0px 91px; +font-size: 25px; +} +/* SettingsAdobeDrmLinkDevice +-----------------------------------*/ +#SettingsAdobeDrmLinkDevice{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#idAdobeLineEdit, #passAdobeLineEdit{ +margin: 11px 109px; +} +#adobeDrmLinkInfoLbl{ +margin: 72px 0px 0px 0px; +padding: 0px 109px; +} +#createAdobeDrmIdLbl{ +margin: 17px 0px 0px 0px; +padding: 0px 109px 35px 109px; +} +/*SettingsDeviceInfo +----------------------------*/ +#SettingsDeviceInfo{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#batteryInfoCont{ +margin: 0px 42px; +min-height: 143px; +max-height: 143px; +border-bottom-width: 3px; +border-top-left-radius: 14px; +border-top-right-radius: 14px; +} +#freeSpaceCont, #privateFreeSpaceCont{ +margin: 0px 42px; +min-height: 143px; +max-height: 143px; +border-bottom-width: 3px; +} +#sdCardCont{ +margin: 0px 42px; +min-height: 144px; +max-height: 144px; +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +} +#batteryTitleLbl, #freeSpaceTitleLbl, #sdFreeSpaceTitleLbl, #privateFreeSpaceTitleLbl{ +margin: 0px 0px 0px 72px; +} +#batteryInfoCont #batteryProgressBar{ +margin: 0px 72px 27px 0px; +min-width: 416px; +max-width: 416px; +} +#batteryProgressBar, #totalSpaceLbl, #sdTotalSpaceLbl, #batteryPercentValueLbl, #privateFreeTotalSpaceLbl, #privateFreeSpaceLbl{ +margin: 0px 72px 0px 0px; +} + +#settingsMenuListCont #basicInfoBtn{ +margin: 0px 37px; +} +#settingsMenuListCont #restoreDefaulValuesBtn{ +} +#settingsMenuListCont #updateDeviceBtn{ +margin: 0px 37px; +} +/* SettingsRestoreDefaultValues +---------------------------------*/ +#SettingsRestoreDefaultValues{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#restoreDefaultValuesInfoLbl{ +margin: 72px 0px 35px 0px; +padding: 0px 109px; +} +#restoreDefaultValuesQuestionLbl{ +padding: 0px 109px; +} +/*SettingsUpdateDevice +------------------------*/ +#SettingsUpdateDevice{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#howUpdateDeviceLbl{ +margin: 35px 0px 35px 0px; +padding: 0px 109px; +} +#welcomeToUpdateYourDeviceLbl{ +margin: 72px 0px 35px 0px; +padding: 0px 109px; +} +#manualUpdateBtn{ +margin: 35px 109px 35px 109px; +min-height: 126px; +max-height: 126px; +border-width: 3px; +border-radius: 14px; +} +#automaticUpdateBtn{ +margin: 35px 109px 35px 109px; +min-height: 126px; +max-height: 126px; +border-width: 3px; +border-radius: 14px; +} +/*SettingsUpdateDeviceManual +----------------------------*/ +#SettingsUpdateDeviceManual{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#updateManualBtn{ +margin: 35px 109px 35px 109px; +min-height: 126px; +max-height: 126px; +border-width: 3px; +border-radius: 14px; +} +#updateLbl{ +margin: 72px 0px 35px 0px; +padding: 0px 109px; +} +/*SettingsUpdateDeviceAuto +----------------------------*/ +#SettingsUpdateDeviceAuto{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsUpdateDeviceAuto SettingsPagerCont,#SettingsUpdateDeviceAuto #settingsPagerCont, #SettingsUpdateDeviceAuto #verticalPage{ +margin: 0px 28px 3px 28px; +min-height: 85px; +max-height: 85px; +border-width: 3px; +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +} +#SettingsUpdateDeviceAuto #updateNumberLbl{ +/*border-width: 1px;*/ +} +#SettingsUpdateDeviceAuto #releaseNotesText{ +margin: 0px 28px 0px 28px; +border-width: 3px; +border-top-left-radius: 14px; +border-top-right-radius: 14px; +} +#updateAutoBtn{ +margin: 35px 28px 35px 28px; +min-height: 126px; +max-height: 126px; +border-width: 3px; +border-radius: 14px; +} +#updateNumberLbl{ +margin: 17px 0px 35px 0px; +padding: 0px 109px; +} +#updateAutoLbl{ +margin: 72px 0px 35px 0px; +padding: 0px 109px; +} +/*SettingsBrowser +----------------------------*/ +#SettingsBrowser{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#navBarBrowser{ +min-height: 107px; +max-height: 107px; +border-width: 3px; +} +#urlLineEdit{ +min-width: 761px; +max-width: 761px; +min-height: 69px; +max-height: 69px; +border-bottom-width: 3px; +} +#homeBtn{ +margin: 0px 0px 0px 35px; +min-width: 74px; +max-width: 74px; +min-height: 74px; +max-height: 74px; +} +#reloadPageBtn{ +margin: 0px 35px 0px 0px; +min-width: 74px; +max-width: 74px; +min-height: 74px; +max-height: 74px; +} +#QbookWebView{ +} +#bottomBrowser{ +min-height: 89px; +max-height: 89px; +border-width: 3px; +} + #pagerBrowserCont{ +min-width: 120px; +max-width: 120px; +min-height: 64px; +max-height: 64px; +} +#previousPageBtn{ +} + #nextPageBtn{ +} +#spacerBrowserBottomLeft{ +min-width: 35px; +max-width: 35px; +} +#zoomInBtn{ +margin: 0px 0px 0px 91px; +min-width: 64px; +max-width: 64px; +min-height: 64px; +max-height: 64px; +} +#zoomOutBtn{ +margin: 0px 0px 0px 91px; +min-width: 64px; +max-width: 64px; +min-height: 64px; +max-height: 64px; +} +#favouriteBtn{ +margin: 0px 0px 0px 127px; +min-width: 64px; +max-width: 64px; +min-height: 64px; +max-height: 64px; +} +#addFavouriteBtn{ +margin: 0px 35px 0px 0px; +min-width: 64px; +max-width: 64px; +min-height: 64px; +max-height: 64px; +} + +/* SettingsTechnicalInfo +-------------------------*/ +#SettingsTechnicalInfo{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsTechnicalInfo #listView{ +margin: 35px 72px; +} +#SettingsTechnicalInfo #settingsMenuListCont QWidget{ +margin: 0px 42px; +border-width: 3px; +} +#SettingsTechnicalInfo #settingsMenuListCont #widgetCont{ +margin: 0px 42px; +border-width: 0px; +} +#SettingsTechnicalInfo #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{ +} + +/*Settingspx;DictionarieslInfo +------------------------------------------*/ +#SettingsDictionariesInfo{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsDictionariesInfo #listView{ +margin: 35px 72px; +min-height: 990px; +max-height: 990px; +} +/*SettingsGeneralTermslInfo +------------------------------------------*/ +#SettingsGeneralTermsInfo{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsGeneralTermsInfo #listView{ +margin: 35px 72px; +} +#SettingsGeneralTermsInfo #settingsPagerCont{ +margin: 0px 0px 0px 0px; +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +} +/*SettingsGeneralTermsInfoAdobe +------------------------------------------*/ +#SettingsGeneralTermsInfoAdobe{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsGeneralTermsInfoAdobe #listView{ +margin: 35px 72px; +} +#SettingsGeneralTermsInfoAdobe #settingsPagerCont{ +margin: 0px 0px 0px 0px; +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +} +/*SettingsLanguageMenu +---------------------*/ +#SettingsLanguageMenu{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsLanguageMenu #espanolBtn{ +border-top-left-radius: 14px; +border-top-right-radius: 14px; +} +#SettingsLanguageMenu #settingsMenuListCont QPushButton{ +padding: 0px 0px 0px 45px; +} +#SettingsLanguageMenu #settingsMenuListCont QPushButton:checked { +} +#SettingsLanguageMenu #settingsMenuListCont QPushButton{ +min-height: 99px; +max-height: 99px; +} + +/*SettingsBrightness +-------------------------*/ +#SettingsBrightness{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsBrightness #screenLightCont{ +margin: 0px 35px 0px 35px; +min-height: 127px; +max-height: 127px; +border-bottom-width: 3px; +} +#SettingsBrightness #screenLightLbl{ +margin: 0px 0px 0px 72px; +} +#SettingsBrightness #brightnessLbl{ +margin: 0px 0px 0px 72px; +} +#SettingsBrightness #brightnessCont{ +margin: 0px 35px; +border-width: 4px; +min-height: 276px; +max-height: 276px; +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +} +#SettingsBrightness #brightnessCont #brightnessLbl{ +margin-right: 141px; +} +#SettingsBrightness #brightnessCont #brightnessSliderCont{ +margin: 0px 40px; +min-height: 141px; +max-height: 141px; +} +#SettingsBrightness #brightnessSliderCont #brightnessSlider{ +margin: 21px 0px 35px 0px; +min-width: 707px; +max-width: 707px; +} +#SettingsBrightness #screenLightCont #screenLightStatusBtn{ +} +#SettingsBrightness #brightnessSliderCont #brightnessMaxLbl{ +min-width: 54px; +max-width: 54px; +min-height: 82px; +max-height: 82px; +margin: 0px 17px 0px 21px; +} +#SettingsBrightness #brightnessSliderCont #brightnessMinLbl{ +min-width: 54px; +max-width: 54px; +min-height: 82px; +max-height: 82px; +margin: 0px 7px 0px 17px; +} +#SettingsBrightness #settingsMenuListCont #brightnessSliderCont #brightnessMaxBtn{ +min-width: 54px; +max-width: 54px; +min-height: 141px; +max-height: 141px; +margin: 0px 0px 0px 6px; +border-bottom-width: 0px; +padding: 0px; +} +#SettingsBrightness #settingsMenuListCont #brightnessSliderCont #brightnessSumBtn, +#SettingsBrightness #settingsMenuListCont #brightnessSliderCont #brightnessRestBtn{ +border-bottom-width: 0px; +font-size: 42px; +margin: 0px; +max-height: 141px; +max-width: 82px; +min-height: 141px; +min-width: 82px; +padding: 0px; +} +#SettingsBrightness #settingsMenuListCont #brightnessSliderCont #brightnessMinBtn{ +min-width: 54px; +max-width: 54px; +min-height: 141px; +max-height: 141px; +margin: 0px 6px 0px 0px; +border-bottom-width: 0px; +padding: 0px; +} +/*SettingsDevelopmentOptions +---------------------------------*/ +#SettingsDevelopmentOptions{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsDevelopmentOptions #enableTelnetCont{ +margin: 0px 35px; +min-height: 127px; +max-height: 127px; +} +#SettingsDevelopmentOptions #enableTelnetLbl{ +margin: 0px 0px 0px 72px; +} +#SettingsDevelopmentOptions #enableUsbNetCont{ +margin: 0px 35px; +min-height: 127px; +max-height: 127px; +border-bottom-width: 3px; +} +#SettingsDevelopmentOptions #enableUsbNetLbl{ +margin: 0px 0px 0px 72px; +} +#SettingsDevelopmentOptions #enableTelnetBtn{ +min-width: 92px; +max-width: 92px; +min-height: 0px; +max-height: 141px; +} +#SettingsDevelopmentOptions #enableUsbNetBtn{ +min-width: 92px; +max-width: 92px; +min-height: 0px; +max-height: 141px; +} +/* SettingsDictionariesMenu +---------------------------------*/ +#SettingsDictionariesMenu{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} + +#seeDictionariesInfoBtn,#activateExtraDictionaries{ +margin: 7px 35px 7px 35px; +min-height: 109px; +max-height: 109px; +border-width: 3px; +border-radius: 14px; +} + +/*SettingsDictionariesMenuItem +------------------------*/ +#SettingsDictionariesMenuItem{ +min-width: 987px; +max-width: 987px; +min-height: 141px; +max-height: 141px; +} +#dictionaryNameLbl{ +padding: 0px 0px 0px 81px; +} +#checkDictionaryLbl{ +min-width: 127px; +max-width: 127px; +} +/*SettingsDateTimeMenu +-------------------------*/ +#SettingsDateTimeMenu{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsDateTimeMenu #settingsMenuListCont{ +min-height: 1117px; +max-height: 1117px; +} +#SettingsDateTimeMenu #dateTimeLbl{ +padding: 35px 0px 7px 0px; +min-height: 64px; +max-height: 64px; +font-size: 40px; +} +#SettingsDateTimeMenu #dateTimeValueLbl{ +padding: 0px 0px 35px 0px; +min-height: 57px; +max-height: 57px; +font-size: 42px; +} +#SettingsDateTimeMenuItem{ +margin: 0px 42px; +} +#SettingsDateTimeMenu #timeZoneLbl{ +margin: 0px 42px; +padding: 17px 0px; +min-height: 64px; +max-height: 64px; +border-width: 3px; +} +#SettingsDateTimeMenu SettingsDateTimeMenuItem{ +min-width: 990px; +max-width: 990px; +min-height: 141px; +max-height: 141px; +} +/*TimeZomeItem +------------------------*/ +#SettingsDateTimeMenuItemCont{ +min-width: 1117px; +max-width: 1117px; +min-height: 141px; +max-height: 141px; +} +#DateTimeMenuItemCont{ +min-height: 141px; +max-height: 141px; +} +#DateTimeMenuItemCont #timeZoneCountriesLbl{ +padding: 0px 0px 14px 82px; +margin: 0px; +} +#DateTimeMenuItemCont #gtmLbl{ +padding: 0px 0px 0px 82px; +margin: 0px; +} +#checkTimezoneLbl{ +min-width: 127px; +max-width: 127px; +} +/*SettingsSleepTimeMenu +----------------------*/ +#SettingsSleepTimeMenu{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#sleepTimeLbl{ +padding: 0px 91px 31px 91px; +} +#SettingsSleepTimeMenu #settingsMenuListCont QPushButton{ +padding: 0 0 0 55px; +} +#SettingsSleepTimeMenu QPushButton#minutes2Btn{ +border-top-left-radius: 14px; +border-top-right-radius: 14px; +} +#SettingsSleepTimeMenu QPushButton#minutes20Btn{ +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +} +/*SettingsReaderMenu +-------------------------*/ +#SettingsReaderMenu{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#settingsMenuListCont #pageTurningBtn{ +} +#settingsMenuListCont #progressBarBtn{ +} +/*SettingsReaderProgressBar +-------------------------*/ +#SettingsReaderProgressBar{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsReaderProgressBar #settingsMenuListCont QWidget{ +min-height: 0px; +max-height: 1414px; +} +#widget #tit_label{ +padding: 0px 112px 35px 112px; +} +#SettingsReaderProgressBar QCheckBox{ +margin: 7px 0px 0px 0px; +} + +#SettingsReaderProgressBar #viewerHeaderActionsCont QPushButton, +#SettingsReaderProgressBar #viewerBottomActionsCont QPushButton{ +padding-left: 17px; +border-width: 3px; +border-radius: 8px; +font-size: 30px; +} + +#SettingsReaderProgressBar #viewerBottomActionsCont #progressBarCont{ +margin: 14px 54px 14px 54px; +border-width: 3px; +border-radius: 8px; +} +#SettingsReaderProgressBar #viewerBottomActionsCont #progressBarCont QLabel{ +margin: 31px 68px 14px 68px; +min-height: 33px; +max-height: 33px; +font-size: 30px; +} +#SettingsReaderProgressBar #viewerBottomActionsCont #progressBarCont QPushButton{ +border-width: 3px; +border-radius: 0px; +} +#SettingsReaderProgressBar QPushButton:checked{ +} +#viewerHeaderCont{ +min-width: 745px; +max-width: 745px; +min-height: 64px; +max-height: 64px; +border-width: 3px; +} +#viewerHeaderCont QLabel{ +padding: 18px 18px 0px 18px; +font-size: 21px; +} +#viewerHeaderCont QLabel#bookTitleLbl{ +} +#viewerHeaderActionsCont{ +min-height: 123px; +max-height: 123px; +margin: 0px 35px; +border-width: 4px; +} +#viewerHeaderActionsCont #withBookTitleBtn{ +margin: 0px 18px 0px 57px; +min-height: 91px; +max-height: 91px; +min-width: 399px; +max-width: 399px; +} +#viewerHeaderActionsCont #withDateTimeBtn{ +margin: 0px 57px 0px 64px; +min-height: 91px; +max-height: 91px; +min-width: 195px; +max-width: 195px; +} +#SettingsReaderProgressBar #viewerTextLbl{ +margin: 0px 163px; +padding: 8px 14px; +font-size: 25px; +border-right-width: 3px; +border-left-width: 3px; +} +#viewerBottomActionsCont{ +min-height: 318px; +max-height: 318px; +margin: 0px 35px; +border-width: 4px; +} +#viewerBottomActionsCont QPushButton{ +margin-right: 18px; +} +#viewerBottomActionsCont #progressBarCont QPushButton{ +min-height: 85px; +max-height: 85px; +} +#readingActions{ +min-height: 109px; +max-height: 109px; +} +#readingActions QPushButton{ +margin-top: 14px; +} +#viewerBottomActionsCont #readingActions #withProgressBtn{ +margin: 14px 18px 0px 54px; +} +#viewerBottomActionsCont #readingActions #withProgressBtn_2{ +margin: 14px 54px 0px 0px; +} +#viewerBottomActionsCont #withBackBtn{ +margin: 0px 16px 0px 54px; +min-width: 260px; +max-width: 260px; +} +#viewerBottomActionsCont QLabel{ +margin: 0px 54px 0px 54px; +} +#viewerBottomActionsCont #chapterProgressBtn{ +margin: 0px 54px 0px 54px; +} +#viewerBottomActionsCont #withProgressBarBtn{ +margin: 21px 54px 0px 54px; +} +#viewerBottom{ +min-width: 745px; +max-width: 745px; +min-height: 71px; +max-height: 71px; +border-width: 3px; +} +#viewerBottom QLabel{ +padding: 4px 18px 0px 18px; +font-size: 21px; +} +#viewerBottom QLabel#percentLbl{ +padding-right: 0px; +} + #viewerBottom QLabel#readedLbl{ +padding: 4px 18px 0px 8px; +} +#viewerBottom #previousActionLbl{ +margin: 0px 18px; +min-width: 64px; +max-width: 64px; +min-height: 64px; +max-height: 64px; +} +#readingInfoCont{ +margin: 8px 0px; +} +#viewerBottomCont #readingProgress{ +margin: 0px 8px; +min-height: 8px; +max-height: 8px; +border-radius: 6px; +} + +#viewerBottomCont #readingProgress{ +margin: 0px 8px; +min-height: 8px; +max-height: 8px; +min-width: 728px; +max-width: 728px; +border-radius: 6px; +} +#viewerBottomCont #readingProgressFigureImage{ +min-height: 11px; +max-height: 11px; +} +#viewerBottomCont #readingProgressFigureImage QLabel{ +min-height: 8px; +max-height: 8px; +min-width: 3px; +max-width: 3px; +} +#topLeftLbl{ +min-height: 64px; +max-height: 64px; +} +#topRightLbl{ +min-height: 64px; +max-height: 64px; +} +#bottomLeftLbl{ +min-height: 64px; +max-height: 64px; +} +#bottomRightLbl{ +min-height: 64px; +max-height: 64px; +} +/*SettingsPageScreenSaver +-------------------------*/ +#SettingsPageScreenSaver{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsPageScreenSaver #enableScreenSaverCont{ +margin: 0px 40px; +border-width: 3px; +border-radius: 14px; +} +#SettingsPageScreenSaver #enableScreenSaverCont QPushButton{ +min-height: 144px; +max-height: 144px; +margin: 4px 0; +padding: 0px 0px 0px 42px; +border-bottom-width: 3px; +} +#SettingsPageScreenSaver #enableScreenSaverCont QPushButton#imageRecentBookBtn{ +border-bottom-width: 0px; +} +#SettingsPageScreenSaver #enableScreenSaverCont QPushButton#screenSaverDefaultBtn{ +} +#SettingsPageScreenSaver #enableScreenSaverCont QPushButton#storedImagesBtn{ +} +#screenSaverTextLbl{ +padding: 0px 91px 31px 91px; +} + +/*SettingsReaderPageTurning +-------------------------*/ +#SettingsReaderPageTurning{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsReaderPageTurning #settingsMenuListCont QWidget{ +min-height: 0px; +max-height: 1414px; +} +#SettingsReaderPageTurning #settingsMenuListCont, #settingsPageReaderRightCont, #settingsPageReaderLeftCont{ +min-height: 523px; +max-height: 523px; +} +#settingsPageReaderRightCont{ +min-height: 523px; +max-height: 523px; +} +#SettingsReaderPageTurning #readerLbl{ +padding: 0px 91px 72px 91px; +} +#leftRightCheck{ +font-size: 30px; +min-height: 71px; +max-height: 71px; +} +#rightNextPageLbl{ +padding-top: 0px; +font-size: 31px; +min-height: 71px; +max-height: 71px; +text-transform:uppercase; +} +#nextPageLbl{ +padding: 0px 0px 0px 7px; +font-size: 31px; +} +#leftNextPageLbl{ +padding: 0px 0px 7px 0px; +font-size: 31px; +} +#previousPageLbl{ +padding: 0px 0px 7px 7px; +font-size: 31px; +} +#readerImage1Lbl{ +margin: 21px 0px 0px 0px; +min-height: 240px; +max-height: 240px; +} +#upDownCheck{ +font-size: 31px; +min-height: 71px; +max-height: 71px; +} +#upPreviuosPageLbl{ +padding-top: 0px; +font-size: 31px; +} +#previousPage2Lbl{ +padding: 0px 0px 0px 7px; +font-size: 31px; +} +#downNextPageLbl{ +padding: 0px 0px 7px 0px; +font-size: 31px; +} +#nextPage2Lbl{ +padding: 0px 0px 7px 7px; +font-size: 31px; +} +#readerImage2Lbl{ +margin: 21px 27px 0px 0px; +min-height: 240px; +max-height: 240px; +} +#SettingsReaderPageTurning QCheckBox{ +margin: 7px 0px 0px 0px; +} +#SettingsReaderPageTurning QCheckBox::indicator { +} +#SettingsReaderPageTurning QCheckBox::indicator:unchecked { +} +#SettingsReaderPageTurning QCheckBox::indicator:unchecked:pressed { +} +#SettingsReaderPageTurning QCheckBox::indicator:unchecked:pressed { +} +#SettingsReaderPageTurning QCheckBox::indicator:checked { +} +#SettingsReaderPageTurning QCheckBox::indicator:checked:pressed { +} +#SettingsReaderPageTurning QCheckBox::indicator:checked:pressed { +} +#SettingsReaderPageTurning QCheckBox::indicator:indeterminate:pressed { +} +#SettingsReaderPageTurning QCheckBox::indicator:indeterminate:pressed { +} +#SettingsReaderPageTurning #settingsMenuListCont #leftRightLbl{ +margin-top: 0px; +min-height: 321px; +max-height: 321px; +} +#SettingsReaderPageTurning #settingsMenuListCont #upDownLbl{ +margin-top: 0px; +min-height: 321px; +max-height: 321px; +} +#progressModeCont QPushButton{ +padding: 0px 27px; +/*min-width: 721px; +max-width: 721px;*/ +min-height: 109px; +max-height: 109px; +} +#SettingsReaderPageTurning #widget #tit_label{ +padding: 35px 0px; +} +#progressModeCont{ +margin: 0px 37px; +border-width: 3px; +border-radius: 14px; +} +#progressModeCont #withPageCont, #withBackCont, #progressModeCont #withProgressBtn{ +border-bottom-width: 3px; +} +#progressModeCont QPushButton#withProgressBtn{ +} +#SettingsReaderPageTurning #refreshStepLbl{ +margin: 35px 0px; +} +#refreshStepsCont QPushButton{ +margin: 28px 17px; +min-height: 85px; +max-height: 85px; +min-width: 99px; +max-width: 99px; +font-size: 35px; +border-width: 3px; +border-radius: 11px; +} +#refreshStepsCont{ +margin: 0px 42px; +border-width: 3px; +border-radius: 14px; +} +/*SettingsQuickSettingsPopup +------------------------*/ +#SettingsQuickSettingsPopup{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#QuickSettingsCont{ +min-width: 1025px; +max-width: 1025px; +min-height: 571px; +max-height: 571px; +margin-bottom: 181px; +border-width: 3px; +border-radius: 14px; +} +#headerPopupCont{ +margin: 0px 35px; +min-height: 81px; +max-height: 81px; +border-width: 3px; +} +#titlePopupLbl{ +padding: 0px 0px 0px 17px; +font-size: 33px; +} +#QuickSettingsCont #titlePopupLbl{ +font-size: 35px; +} +#closePopupBtn{ +margin: 0px 0px 0px 0px; +min-width: 82px; +max-width: 82px; +min-height: 82px; +max-height: 82px; +} +#SettingsQuickSettingsPopup #contentPopup{ +min-width: 957px; +max-width: 957px; +min-height: 421px; +max-height: 421px; +margin: 35px 0px 0px 0px; +border-width: 3px; +border-radius: 14px; +} +#contentPopup{ +min-width: 751px; +max-width: 751px; +min-height: 379px; +max-height: 379px; +margin: 35px 0px 0px 0px; +border-width: 3px; +border-radius: 14px; +} +#SettingsQuickSettingsPopup #wifiCont{ +max-height: 92px; +min-height: 92px; +} +#contentPopup #screenLightCont,#contentPopup #wifiCont{ +border-width: 3px; +border-top:none; +border-left:none; +border-right:none; +} +#contentPopup #wifiStatusBtn, #contentPopup #screenLightStatusBtn{ +padding: 0px 17px 0px 0px; +min-width: 184px; +max-width: 184px; +min-height: 64px; +max-height: 64px; +} +#contentPopup #wifiLbl, #contentPopup #brightnessLbl,#contentPopup #screenLightLbl{ +padding: 0px 0px 0px 17px; +} +#contentPopup #brightnessCont{ +padding: 0px 0px 28px 0px; +border-width: 3px; +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +max-height: 141px; +min-height: 141px; +} +#contentPopup #brightnessLbl{ +padding: 28px 0px 0px 17px; +border-width: 3px; +} +#contentPopup #brightnessMaxLbl,#contentPopup #brightnessMaxBtn{ +min-width: 57px; +max-width: 57px; +min-height: 156px; +max-height: 156px; +margin: 0px 0px 0px 3px; +} +#contentPopup #brightnessSumBtn,#contentPopup #brightnessRestBtn{ +min-width: 59px; +max-width: 59px; +min-height: 156px; +max-height: 156px; +margin:0; +} +#contentPopup #brightnessMinLbl,#contentPopup #brightnessMinBtn{ +min-width: 64px; +max-width: 64px; +min-height: 156px; +max-height: 156px; +margin: 0px 7px 0px 0px; +} +#contentPopup #brightnessSlider{ +margin: 35px 6px 33px 6px; +} +#SettingsQuickSettingsPopup #intensityLightCont QWidget{ +margin: 8px 0px 0px 0px; +} +#intensityLightCont QWidget{ +margin: 0px; +padding: 0px; +border-width: 0px; +} +/*WIFI +--------------------------------------------*/ +#settingsMenuListCont { +margin: 0px 35px; +border-width: 4px; +border-radius: 14px; +} +#settingsSectionHeader{ +min-width: 1072px; +max-width: 1072px; +min-height: 92px; +max-height: 92px; +} +#settingsSectionHeader #sectionTitleLbl{ +margin: 0px 0px 0px 35px; +font-size: 35px; +} +#settingsSectionHeader #backBtn{ +margin: 0px 0px 0px 35px; +padding: 0px 0px 0px 35px; +min-width: 150px; +max-width: 150px; +min-height: 92px; +max-height: 92px; +font-size: 33px; +} +/*SettingsWiFiList +-------------------------*/ +#SettingsWiFiList{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +/*border: 7px solid #333;*/ +} +#SettingsWiFiList #settingsMenuListCont #Item1, #SettingsWiFiList #settingsMenuListCont #Item2, #SettingsWiFiList #settingsMenuListCont #Item3, #SettingsWiFiList #settingsMenuListCont #Item4, #SettingsWiFiList #settingsMenuListCont #Item5, #SettingsWiFiList #settingsMenuListCont #Item6{ +min-height: 116px; +max-height: 116px; +padding: 0px 0px 0px 0px; +margin: 0px 37px; +border-bottom-width: 3px; +} +#SettingsWiFiList #settingsMenuListCont #switchWifiCont{ +min-height: 127px; +max-height: 127px; +} +#SettingsWiFiList #settingsMenuListCont #statusWifiConexionCont{ +min-height: 88px; +max-height: 88px; +} +#SettingsWiFiList #settingsMenuListCont QPushButton#wifiStatusBtn{ +margin: 0px 65px 0px 0px; +min-width: 184px; +max-width: 184px; +min-height: 99px; +max-height: 99px; +} +#SettingsWiFiList #settingsMenuListCont #settingsPagerCont{ +margin: 0px 40px 3px 40px; +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +} + +#wifiActionsCont #updateWifiListBtn{ +margin: 0px 49px 0px 0px; +min-width: 99px; +max-width: 99px; +min-height: 109px; +max-height: 109px; +} +#SettingsWiFiList #statusWifiConexionCont{ +margin: 0px 0px 0px 72px; +} +#spinnerSpacer{ +margin: 8px 0px 0px 0px; +min-width: 72px; +max-width: 72px; +} +#SettingsWiFiList #spinnerWifiLbl{ +min-width: 81px; +max-width: 81px; +min-height: 72px; +max-height: 72px; +} +#SettingsWiFiList #wifiConnectMsgLbl{ +padding: 0px 0px 21px 14px; + +font-size: 31px; +} +#SettingsWiFiList #wifiNameLbl{ +padding: 0px 0px 35px 7px; +font-size: 30px; +} +#SettingsWiFiList #wifiSignalLbl{ +padding: 0px 0px 0px 17px; +min-width: 81px; +max-width: 81px; +} +#SettingsWiFiList #wifiActionsCont{ +min-height: 107px; +max-height: 107px; +margin: 0px 40px; +border-width: 3px; +} + +#SettingsWiFiList #wifiNetworksLbl{ +padding: 0px 141px 0px 72px; +} +#SettingsWiFiList #wifiLbl{ +padding: 0px 0px 0px 72px; +} +#SettingsWiFiList #settingsMenuListCont QPushButton#addNetworksBtn{ +min-height: 71px; +max-height: 71px; +margin: 0px 4px 0px 0px; +padding: 0px 35px; +border-width: 3px; +border-radius: 11px; +} +/*SettingsWiFiListItem +-----------------*/ +SettingsWiFiListItem #wifiCont{ +padding: 0px 58px 0px 0px; +min-width: 72px; +max-width: 72px; +} +#noSignalWifi{ +min-width: 72px; +max-width: 72px; +min-height: 117px; +max-height: 117px; +} +#signalWifi_1{ +min-width: 72px; +max-width: 72px; +min-height: 117px; +max-height: 117px; +} +#signalWifi_2{ +min-width: 72px; +max-width: 72px; +min-height: 117px; +max-height: 117px; +} +#signalWifi_3{ +min-width: 72px; +max-width: 72px; +min-height: 117px; +max-height: 117px; +} +#signalWifi_4{ +min-width: 72px; +max-width: 72px; +min-height: 117px; +max-height: 117px; +} +#lockWifiLbl{ +min-width: 64px; +max-width: 64px; +} +#wifiNameItemLbl{ +padding: 0px 0px 0px 72px; +} +#wifiConnect{ +min-width: 81px; +max-width: 81px; +} +#wifiRemember{ +min-width: 81px; +max-width: 81px; +} +/*SettingsConfigureNetwork +--------------------------*/ +#SettingsConfigureNetwork{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsConfigureNetwork QLabel#networkNameTextLbl{ +margin: 21px 0px 8px 58px; +} +#SettingsConfigureNetwork QLabel#networkNameLbl{ +margin: 37px 28px 28px 28px; +} +#SettingsConfigureNetwork #settingsMenuListCont QLabel{ +margin: 17px 14px 11px 58px; +min-height: 42px; +max-height: 42px; +} +#SettingsConfigureNetwork #settingsMenuListCont QLabel#configureLbl{ +margin: 0px 58px 11px 58px; +min-height: 42px; +max-height: 42px; +} +#SettingsConfigureNetwork #settingsMenuListCont QLineEdit{ +margin: 0px 58px 0px 0px; +min-height: 72px; +max-height: 72px; +min-width: 546px; +max-width: 546px; +} +#SettingsConfigureNetwork #settingsMenuListCont QPushButton{ +margin: 0px 58px 0px 0px; +} +#SettingsConfigureNetwork #settingsMenuListCont #dnsListLineEdit{ +/*margin-bottom: 27px;*/ +} +#SettingsConfigureNetwork #confTypeCmb, #SettingsConfigureNetwork #confTypeBtn{ +margin: 7px 0px 0px 0px; +min-height: 79px; +max-height: 79px; +max-width: 283px; +min-width: 283px; +padding: 0px 28px; +font-size: 38px; +border-width: 3px; +border-radius: 14px; +} +#SettingsConfigureNetwork #saveBtn{ +padding: 0px 35px; +min-height: 91px; +max-height: 91px; +border-radius: 8px; +border-width: 3px; +} +#SettingsConfigureNetwork #cancelBtn{ +margin-right: 35px; +padding: 0px 35px; +min-height: 91px; +max-height: 91px; +border-radius: 8px; +border-width: 3px; +} + +/*SettingConfigureNetworkListActions +-------------------------------------*/ + +#SettingConfigureNetworkListActions{ +min-height: 362px; +max-height: 362px; +min-width: 345px; +max-width: 345px; +} +#SettingConfigureNetworkListActionsCont{ +border-width: 3px; +border-bottom-left-radius: 7px; +border-bottom-right-radius: 7px; +/*min-width: 345px; +max-width: 345px;*/ +} +#SettingConfigureNetworkListActions QPushButton{ +padding: 0px 0px 0px 35px; +min-height: 91px; +max-height: 91px; +border-bottom-width: 1px; +} +/*SettingsAddNetwork +----------------------------------*/ +#SettingsAddNetwork{ +min-width: 1086px; +max-width: 1086px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsAddNetwork #settingsMenuListCont QLabel{ +margin: 20px 72px 8px 72px; +} +#SettingsAddNetwork #settingsMenuListCont QLineEdit, #SettingsAddNetwork #settingsMenuListCont QPushButton, #SettingsAddNetwork #settingsMenuListCont QComboBox{ +margin: 0px 72px; +margin: 0px 72px; +min-height: 72px; +max-height: 72px; +} +#SettingsAddNetwork #settingsMenuListCont QCheckBox{ +margin: 27px 72px 144px 72px; +} +#SettingsAddNetwork #connectBtn{ +padding: 0px 35px; +min-height: 71px; +max-height: 71px; +border-radius: 8px; +border-width: 3px; +} +#SettingsAddNetwork #addvancedSettingsBtn{ +padding: 0px 35px; +min-height: 71px; +max-height: 71px; +border-radius: 8px; +border-width: 3px; +} +#settingsMenuListCont QPushButton#securityBtn{ +padding: 0px 0px 0px 35px; +min-height: 95px; +max-height: 95px; +border-radius: 14px; +border-width: 3px; +} +#settingsMenuListCont #securityBtnComboBox{ +padding: 0px 0px 0px 35px; +min-height: 95px; +max-height: 95px; +border-radius: 14px; +border-width: 3px; +} + +/*WifiSecurityLayer +--------------------------*/ +#WifiSecurityLayer{ +min-width: 976px; +max-width: 976px; +} +#WifiSecurityLayerCont{ +min-width: 973px; +max-width: 973px; +border-width: 3px; +border-radius: 14px; +} +#WifiSecurityLayerCont QPushButton{ +padding: 0px 35px; +min-height: 98px; +max-height: 98px; +border-bottom-width: 3px; +} +/*SettingsNetworkWifiInfo +------------------------------------*/ +#SettingsNetworkWifilInfo{ +min-width: 1086px; +max-width: 1086px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsNetworkWifilInfo #settingsMenuListCont { +border-width: 7px; +} +#SettingsNetworkWifilInfo #settingsMenuListCont QWidget{ +border-bottom-width: 3px; +margin: 0px 35px; +} +#SettingsNetworkWifilInfo #settingsMenuListCont QLabel{ +margin: 0px 72px 0px 72px; +} +#SettingsNetworkWifilInfo #securityLbl, #SettingsNetworkWifilInfo #signalLbl, #SettingsNetworkWifilInfo #ipAddressLbl, #SettingsNetworkWifilInfo #subnetMaskLbl ,#SettingsNetworkWifilInfo #routerLbl, #SettingsNetworkWifilInfo #dnsLbl, #SettingsNetworkWifilInfo #proxyLbl{ +} +#deleteNetworkBtn{ +margin: 0px 35px 28px 35px; +padding: 0px 35px; +min-height: 71px; +max-height: 71px; +border-radius: 8px; +border-width: 3px; +} +#disconnectNetworkBtn{ +margin: 0px 0px 28px 0px; +padding: 0px 35px; +min-height: 71px; +max-height: 71px; +border-radius: 8px; +border-width: 3px; +} +#editWifiDataBtn{ +margin: 0px 0px 28px 0px; +padding: 0px 35px; +min-height: 71px; +max-height: 71px; +border-radius: 8px; +border-width: 3px; +} +/*SettingsWiFiPasswordMenu +--------------------------*/ +#SettingsWiFiPasswordMenu{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#connectingWifiCont{ +min-width: 849px; +max-width: 849px; +min-height: 639px; +max-height: 639px; +border-width: 3px; +border-radius: 14px; +} +#connectingWifiCont #hiddenPassword{ +margin: 8px 0px 35px 20px; +min-width: 990px; +max-width: 990px; +} +#connectingWifiCont #connectWifiHeader{ +margin: 0px 21px 8px 21px; +padding: 0px 0px 0px 0px; +min-height: 91px; +max-height: 91px; +font-size: 38px; +border-width: 3px; +} +#connectingWifiCont #connectTitleLbl{ +padding: 0px 0px 0px 21px; +} +#connectingWifiCont #wifiNameLbl{ +margin: 0px 35px 0px 28px; +font-size: 38px; +} +#connectingWifiCont #passwordLbl{ +margin: 0px 0px 0px 33px; +} +#connectingWifiCont #passwordLineEdit{ +margin: 0px 21px 0px 0px; +min-width: 700px; +max-width: 700px; +} +#connectingWifiCont #acceptBtn{ +margin: 0px 0px 21px 0px; +padding: 0px 35px; +min-height: 72px; +max-height: 72px; +border-radius: 8px; +border-width: 3px; +} +#connectingWifiCont #cancelBtn{ +margin: 0px 35px 21px 35px; +padding: 0px 35px; +min-height: 71px; +max-height: 71px; +border-radius: 8px; +border-width: 3px; +} +/*SettingsWiFiDetail +---------------------------*/ +#SettingsWiFiDetail{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsWiFiDetail #settingsMenuListCont QWidget{ +min-height: 0px; +max-height: 1414px; +} +#SettingsWiFiDetail #ButtonsContEdit QPushButton{ +padding: 0px 28px; +margin: 0px 28px 28px 0px; +min-height: 89px; +max-height: 89px; +border-radius: 8px; +border-width: 3px; +} +#ButtonsContEdit QPushButton#disconnectBtn{ +margin: 0px 35px 28px 0px; +} +#SettingsWiFiDetail #settingsMenuListCont QLabel{ +border-width: 3px; +font-size: 34px; +} +#wifiStatusTit, #subnetMask, #signal, #security, #router, #ipAddress, #dns, #Proxy{ +font-weight:bold; +padding: 35px 0px 35px 45px; +margin: 0px 0px 0px 35px; +} +#wifiNameLabel, #subnetEdit, #signal_data, #security_data, #routerEdit, #ipAddressEdit, #dnsEdit, #Proxy_data{ +padding: 35px 45px 35px 0px; +margin: 0px 35px 0px 0px; +} + +/*SettingsSwitchOffTimeMenu +----------------------*/ +#SettingsSwitchOffTimeMenu{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#switchOffLbl{ +padding: 0px 91px 31px 91px; +} + +#SettingsSwitchOffTimeMenu QPushButton{ +padding: 0px 0px 0px 45px; +} +#SettingsSwitchOffTimeMenu QPushButton#hours2Btn{ +border-top-left-radius: 14px; +border-top-right-radius: 14px; +} +#SettingsSwitchOffTimeMenu QPushButton#week1Btn{ +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +} +/*SettingsEnergySaving +-------------------------*/ +#SettingsEnergySaving{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#settingsMenuListCont #sleepTimeBtn{ +} +#settingsMenuListCont #switchOffBtn{ +} +/*SettingsAboutUs +------------------------------------------*/ +#SettingsAboutUs{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#SettingsAboutUs #listView{ +margin: 35px 72px; +} +#SettingsAboutUs #settingsMenuListCont QLabel{ +margin: 0px 72px; +min-height: 0px; +max-height: 14142px; +font-size: 31px; +} +#SettingsAboutUs #settingsMenuListCont #versionTitleLbl{ +margin-top: 25px; +margin-bottom: 25px; +font-size: 38px; +} +#SettingsAboutUs #settingsMenuListCont #creditsLbl{ +margin-top: 25px; +font-size: 35px; +} +#SettingsAboutUs #settingsMenuListCont #developersLbl, #SettingsAboutUs #settingsMenuListCont #graphicDesignLbl, #SettingsAboutUs #settingsMenuListCont #frontDeveloperLbl, #SettingsAboutUs #settingsMenuListCont #uxLbl, #SettingsAboutUs #settingsMenuListCont #qaLbl, #SettingsAboutUs #settingsMenuListCont #productManagerLbl{ +margin-top: 21px; +margin-bottom: 0px; +font-size: 35px; +} diff --git a/bqSetting/res/1448/shutdowntime_settings.png b/bqSetting/res/1448/shutdowntime_settings.png new file mode 100644 index 0000000..5c6411c Binary files /dev/null and b/bqSetting/res/1448/shutdowntime_settings.png differ diff --git a/bqSetting/res/1448/sleeptime_settings.png b/bqSetting/res/1448/sleeptime_settings.png new file mode 100644 index 0000000..51ec683 Binary files /dev/null and b/bqSetting/res/1448/sleeptime_settings.png differ diff --git a/bqSetting/res/1448/spinner_ico.png b/bqSetting/res/1448/spinner_ico.png new file mode 100755 index 0000000..d3f35f6 Binary files /dev/null and b/bqSetting/res/1448/spinner_ico.png differ diff --git a/bqSetting/res/1448/techinfo_settings.png b/bqSetting/res/1448/techinfo_settings.png new file mode 100644 index 0000000..f852a56 Binary files /dev/null and b/bqSetting/res/1448/techinfo_settings.png differ diff --git a/bqSetting/res/1448/uncheked.png b/bqSetting/res/1448/uncheked.png new file mode 100644 index 0000000..abf8c5e Binary files /dev/null and b/bqSetting/res/1448/uncheked.png differ diff --git a/bqSetting/res/1448/up_pager_ico.png b/bqSetting/res/1448/up_pager_ico.png new file mode 100644 index 0000000..873273b Binary files /dev/null and b/bqSetting/res/1448/up_pager_ico.png differ diff --git a/bqSetting/res/1448/updatedevice_settings.png b/bqSetting/res/1448/updatedevice_settings.png new file mode 100644 index 0000000..9379e11 Binary files /dev/null and b/bqSetting/res/1448/updatedevice_settings.png differ diff --git a/bqSetting/res/1448/warning.png b/bqSetting/res/1448/warning.png new file mode 100755 index 0000000..42185a1 Binary files /dev/null and b/bqSetting/res/1448/warning.png differ diff --git a/bqSetting/res/1448/wifi_0_Ico.png b/bqSetting/res/1448/wifi_0_Ico.png new file mode 100644 index 0000000..144e107 Binary files /dev/null and b/bqSetting/res/1448/wifi_0_Ico.png differ diff --git a/bqSetting/res/1448/wifi_1_Ico.png b/bqSetting/res/1448/wifi_1_Ico.png new file mode 100644 index 0000000..0ed3533 Binary files /dev/null and b/bqSetting/res/1448/wifi_1_Ico.png differ diff --git a/bqSetting/res/1448/wifi_2_Ico.png b/bqSetting/res/1448/wifi_2_Ico.png new file mode 100644 index 0000000..93f1375 Binary files /dev/null and b/bqSetting/res/1448/wifi_2_Ico.png differ diff --git a/bqSetting/res/1448/wifi_3_Ico.png b/bqSetting/res/1448/wifi_3_Ico.png new file mode 100644 index 0000000..e67a3a4 Binary files /dev/null and b/bqSetting/res/1448/wifi_3_Ico.png differ diff --git a/bqSetting/res/1448/wifi_4_Ico.png b/bqSetting/res/1448/wifi_4_Ico.png new file mode 100644 index 0000000..b4eee92 Binary files /dev/null and b/bqSetting/res/1448/wifi_4_Ico.png differ diff --git a/bqSetting/res/1448/wifi_no_Ico.png b/bqSetting/res/1448/wifi_no_Ico.png new file mode 100644 index 0000000..b3a3693 Binary files /dev/null and b/bqSetting/res/1448/wifi_no_Ico.png differ diff --git a/bqSetting/res/1448/wifi_refresh.png b/bqSetting/res/1448/wifi_refresh.png new file mode 100644 index 0000000..14da01e Binary files /dev/null and b/bqSetting/res/1448/wifi_refresh.png differ diff --git a/bqSetting/res/1448/wifi_settings.png b/bqSetting/res/1448/wifi_settings.png new file mode 100644 index 0000000..b16c025 Binary files /dev/null and b/bqSetting/res/1448/wifi_settings.png differ diff --git a/bqSetting/res/800/account_settings_Ico.png b/bqSetting/res/800/account_settings_Ico.png deleted file mode 100755 index f22fcf7..0000000 Binary files a/bqSetting/res/800/account_settings_Ico.png and /dev/null differ diff --git a/bqSetting/res/800/back_Btn - copia.png b/bqSetting/res/800/back_Btn - copia.png deleted file mode 100755 index 2bfad62..0000000 Binary files a/bqSetting/res/800/back_Btn - copia.png and /dev/null differ diff --git a/bqSetting/res/800/brightness_settings_Ico.png b/bqSetting/res/800/brightness_settings_Ico.png deleted file mode 100755 index b362a5e..0000000 Binary files a/bqSetting/res/800/brightness_settings_Ico.png and /dev/null differ diff --git a/bqSetting/res/800/browser-settings_Ico.png b/bqSetting/res/800/browser-settings_Ico.png deleted file mode 100755 index 28abd64..0000000 Binary files a/bqSetting/res/800/browser-settings_Ico.png and /dev/null differ diff --git a/bqSetting/res/800/device_info_Ico.png b/bqSetting/res/800/device_info_Ico.png deleted file mode 100755 index da4a78e..0000000 Binary files a/bqSetting/res/800/device_info_Ico.png and /dev/null differ diff --git a/bqSetting/res/800/device_settings_Ico.png b/bqSetting/res/800/device_settings_Ico.png deleted file mode 100755 index 0696a51..0000000 Binary files a/bqSetting/res/800/device_settings_Ico.png and /dev/null differ diff --git a/bqSetting/res/800/library_sync.png b/bqSetting/res/800/library_sync.png deleted file mode 100755 index 7cf83aa..0000000 Binary files a/bqSetting/res/800/library_sync.png and /dev/null differ diff --git a/bqSetting/res/800/save.png b/bqSetting/res/800/save.png deleted file mode 100755 index eae09c4..0000000 Binary files a/bqSetting/res/800/save.png and /dev/null differ diff --git a/bqSetting/res/800/settings_styles.qss b/bqSetting/res/800/settings_styles.qss index 9f8ebd2..132ec8c 100644 --- a/bqSetting/res/800/settings_styles.qss +++ b/bqSetting/res/800/settings_styles.qss @@ -662,16 +662,7 @@ font-size:19px; min-width:160px; max-width:160px; } -#internalVersionLbl{ -padding:0px 0px 0px 10px; -margin:0px 10px 0px 0px; -max-width:130px; -} -#SettingsTechnicalInfo #settingsMenuListCont QWidget #internalVersionValLbl{ -margin:0px 24px 0px 0px; -padding:0px 10px 0px 0px; -font-size:16px; -} + /*SettingsDictionariesInfo ------------------------------------------*/ #SettingsDictionariesInfo{ @@ -1945,16 +1936,16 @@ margin:0px 40px; font-size:17px; } #SettingsAboutUs #settingsMenuListCont #versionTitleLbl{ -margin-top:15px; -margin-bottom:15px; +margin-top:12px; +margin-bottom:12px; font-size:20px; } #SettingsAboutUs #settingsMenuListCont #creditsLbl{ -margin-top:15px; +margin-top:12px; font-size:18px; } #SettingsAboutUs #settingsMenuListCont #developersLbl, #SettingsAboutUs #settingsMenuListCont #graphicDesignLbl, #SettingsAboutUs #settingsMenuListCont #frontDeveloperLbl, #SettingsAboutUs #settingsMenuListCont #uxLbl, #SettingsAboutUs #settingsMenuListCont #qaLbl, #SettingsAboutUs #settingsMenuListCont #productManagerLbl{ -margin-top:15px; +margin-top:12px; margin-bottom:0px; font-size:18px; } diff --git a/bqSetting/res/800/wifi_settings_ico.png b/bqSetting/res/800/wifi_settings_ico.png deleted file mode 100755 index 3be4478..0000000 Binary files a/bqSetting/res/800/wifi_settings_ico.png and /dev/null differ diff --git a/bqSetting/src/SettingsGeneralTermsInfo.cpp b/bqSetting/src/SettingsGeneralTermsInfo.cpp index 6290cfe..08213aa 100644 --- a/bqSetting/src/SettingsGeneralTermsInfo.cpp +++ b/bqSetting/src/SettingsGeneralTermsInfo.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 @@ -45,12 +45,22 @@ SettingsGeneralTermsInfo::~SettingsGeneralTermsInfo(){ } void SettingsGeneralTermsInfo::fillInfo(){ - - if(QBook::getResolution() == QBook::RES758x1024){ - QString text = generalTermsResult->toHtml(); - text = text.replace(QRegExp("font-size\\s*:[\\w'-,\\s\"]*;"), QString("font-size:13pt;")); - generalTermsResult->setHtml(text); + QString text = generalTermsResult->toHtml(); + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + text = text.replace(QRegExp("font-size\\s*:[\\w'-,\\s\"]*;"), QString("font-size:6pt;")); + generalTermsResult->setHtml(text); + break; + case QBook::RES758x1024: + text = text.replace(QRegExp("font-size\\s*:[\\w'-,\\s\"]*;"), QString("font-size:13pt;")); + generalTermsResult->setHtml(text); + break; + case QBook::RES600x800: default: + //Do nothing + break; } + //Define a single step as the 75% of the normal height in the widget. vbar->setSingleStep(generalTermsResult->height()*PERCENT_STEP_VALUE); setupPagination(); diff --git a/bqSetting/src/SettingsGeneralTermsInfoAdobe.cpp b/bqSetting/src/SettingsGeneralTermsInfoAdobe.cpp index f88f6a0..c1b0e88 100644 --- a/bqSetting/src/SettingsGeneralTermsInfoAdobe.cpp +++ b/bqSetting/src/SettingsGeneralTermsInfoAdobe.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 @@ -45,11 +45,20 @@ SettingsGeneralTermsInfoAdobe::~SettingsGeneralTermsInfoAdobe(){ } void SettingsGeneralTermsInfoAdobe::fillInfo(){ - - if(QBook::getResolution() == QBook::RES758x1024){ - QString text = generalTermsResult->toHtml(); - text = text.replace(QRegExp("font-size\\s*:[\\w'-,\\s\"]*;"), QString("font-size:13pt;")); - generalTermsResult->setHtml(text); + QString text = generalTermsResult->toHtml(); + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + text = text.replace(QRegExp("font-size\\s*:[\\w'-,\\s\"]*;"), QString("font-size:18pt;")); + generalTermsResult->setHtml(text); + break; + case QBook::RES758x1024: + text = text.replace(QRegExp("font-size\\s*:[\\w'-,\\s\"]*;"), QString("font-size:13pt;")); + generalTermsResult->setHtml(text); + break; + case QBook::RES600x800: default: + //Do nothing + break; } //Define a single step as the 75% of the normal height in the widget. vbar->setSingleStep(generalTermsResult->height()*PERCENT_STEP_VALUE); diff --git a/bqSetting/src/SettingsReaderProgressBar.cpp b/bqSetting/src/SettingsReaderProgressBar.cpp index 85cb671..010c9d5 100644 --- a/bqSetting/src/SettingsReaderProgressBar.cpp +++ b/bqSetting/src/SettingsReaderProgressBar.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 @@ -25,6 +25,7 @@ along with the source code. If not, see . #include "SettingsReaderProgressBar.h" #include "QBook.h" +#define WIDTH_LINE_FHD 3 #define WIDTH_LINE_HD 2 #define WIDTH_LINE_SD 1 @@ -33,10 +34,18 @@ SettingsReaderProgressBar::SettingsReaderProgressBar(QWidget *parent) : FullScr setupUi(this); readingProgress->setStyleSheet("background:transparent;"); - if(QBook::getResolution() == QBook::RES600x800) - m_chapterLineWidth = WIDTH_LINE_SD; - else - m_chapterLineWidth = WIDTH_LINE_HD; + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + m_chapterLineWidth = WIDTH_LINE_FHD; + break; + case QBook::RES758x1024: + m_chapterLineWidth = WIDTH_LINE_HD; + break; + case QBook::RES600x800: default: + m_chapterLineWidth = WIDTH_LINE_SD; + break; + } /* Please, keep the same order than interface */ diff --git a/bqSetting/tr/bqSetting_ca.ts b/bqSetting/tr/bqSetting_ca.ts index 25a9141..6aed2a2 100755 --- a/bqSetting/tr/bqSetting_ca.ts +++ b/bqSetting/tr/bqSetting_ca.ts @@ -115,22 +115,22 @@ Ajustes Luz - Ajusts Llum + Configuració de lluminositat Navegador Web - Navegador Web + Navegador web Acerca de - Referent a + Quant a Activar Dispositivo - Activar dispositiu + Activa el dispositiu @@ -153,7 +153,7 @@ Acerca de - Referent a + Quant a @@ -163,7 +163,7 @@ Esta versión de firmware ha sido desarrollada integramente en España por Mundo Reader S.L. con un quipo de jóvenes profesionales, ingenieros informáticos de telecomunicación, diseñadores gráficos ... y publicada bajo licencia GPL (https://bitbucket.org/mundoreader/cervantes). - Aquesta versió de firmware ha estat desenvolupada íntegrament a Espanya per Mundo Reader S.L. per un equip de joves professionals, enginyers informàtics, de telecomunicació, dissenyadors gràfics... i publicada sota llicència GPL (https://bitbucket.org/mundoreader/cervantes). + Aquesta versió de firmware ha estat desenvolupada íntegrament a Espanya per Mundo Reader S.L. per un equip de joves professionals, enginyers informàtics, de telecomunicació, dissenyadors gràfics... i publicada sota llicència GPL (https://github.com/bq/cervantes). @@ -177,7 +177,7 @@ - Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger. + Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger, Santiago Mayoral, Guillem Barnolas, Hristo Gyulev. @@ -187,7 +187,7 @@ - Nieves Herreros, Sandra Salvador. + Nieves Herreros, Sandra Salvador, Ana Sánchez, Jaime Mena. @@ -383,12 +383,12 @@ AJUSTES LUZ - AJUSTS LLUM + CONFIGURACIÓ DE LLUMINOSITAT Luz de pantalla - Llum de pantalla + Lluminositat de la pantalla @@ -475,7 +475,7 @@ Cancelar - Cancel·lar + Cancel·la @@ -841,17 +841,17 @@ Restaurar valores de fábrica - Restaurar ajusts de fàbrica + Restaura a la configuració de fàbrica Actualizar dispositivo - Actualitzar dispositiu + Actualitza el dispositiu Do you want to restore device? This will delete all your personal account data - Desitja restaurar el dispositiu als valors de fàbrica? Això eliminarà totes les dades personals del seu compte. + Confirmes que vols restaurar el disposisiu als valors predeterminats de fàbrica? Això eliminarà totes les dades personals del seu compte. @@ -904,7 +904,7 @@ Salvapantallas - Salvapantalles + Protector de pantalla Tiempo de reposo @@ -988,7 +988,7 @@ Tecnologia Dixio - © 2011 Semantix Ver información de los diccionarios - Veure informació dels diccionaris + Mostra la informació dels diccionaris @@ -1131,37 +1131,37 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">The precise terms and conditions for copying, distribution and modification follow.</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a name="terms"></a><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">T</span><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">ERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">0.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The &quot;Program&quot;, below, refers to any such program or work, and a &quot;work based on the Program&quot; means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term &quot;modification&quot;.) Each licensee is addressed as &quot;you&quot;.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">0.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The &quot;Program&quot;, below, refers to any such program or work, and a &quot;work based on the Program&quot; means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term &quot;modification&quot;.) Each licensee is addressed as &quot;you&quot;.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">1.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">1.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">2.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">a)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">b)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.</span></p> -<p style=" margin-top:0px; margin-bottom:8px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">c)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">2.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">a)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">b)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.</span></p> +<p style=" margin-top:0px; margin-bottom:8px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">c)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">3.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">a)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">b)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,</span></p> -<p style=" margin-top:0px; margin-bottom:8px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">c)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">3.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">a)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">b)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,</span></p> +<p style=" margin-top:0px; margin-bottom:8px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">c)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">4.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">5.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">6.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">7.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">4.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">5.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">6.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">7.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">8.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">9.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">8.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">9.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and &quot;any later version&quot;, you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">10.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">10.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">NO WARRANTY</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">11.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">12.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">11.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">12.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</span></p> <p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">END OF TERMS AND CONDITIONS</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a name="howto"></a><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">H</span><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">ow to Apply These Terms to Your New Programs</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.</span></p> @@ -1297,17 +1297,17 @@ p, li { white-space: pre-wrap; } Salvapantallas - Salvapantalles + Protector de pantalla Selecciona que mostrar en su salvapantallas - Selecciona quina imatge mostrar com a salvapantalles + Selecciona quina imatge mostrar com a protector de pantalla Salvapantallas por defecto - Salvapantalles per defecte + Protector de pantalla per defecte @@ -1368,7 +1368,7 @@ p, li { white-space: pre-wrap; } Luz de pantalla - Llum de pantalla + Lluminositat de la pantalla @@ -1476,12 +1476,12 @@ p, li { white-space: pre-wrap; } Enable swipe - Habilitar pas de pàgina por lliscament (Swipe) + Habilita pas de pàgina por lliscament (Swipe) Número de pasos de página para hacer refresco - Seleccionar la freqüència de refrescament en el pas de pàgina + Seleccionar la freqüència d'actualització en passar de pàgina @@ -1539,7 +1539,7 @@ p, li { white-space: pre-wrap; } Selecciona las áreas que deseas mostrar en tu dispositivo en modo lectura - Selecciona les àrees que desitges mostrar al teu dispositiu en mode lectura + Selecciona quines àrees vols que es mostrin al teu dispositiu en mode lectura @@ -1569,12 +1569,12 @@ p, li { white-space: pre-wrap; } Mostrar barra de progreso de lectura - Mostrar barra de progrés de lectura + Mostra la barra de progrés de lectura Mostrar marcas de capítulo - Mostrar marques de capítol + Mostra les marques de capítol @@ -2172,7 +2172,7 @@ Hasta el XX/XX/XXXX disfrutarás de un período de cortesía para que termines d Actualizar dispositivo - Actualitzar dispositiu + Actualitza el dispositiu @@ -2374,7 +2374,7 @@ Restarting to apply changes Connect - Connectar + Connecta @@ -2432,7 +2432,7 @@ Restarting to apply changes Añadir red - Afegir xarxa + Afegeix una xarxa @@ -2464,7 +2464,7 @@ Restarting to apply changes Add network - Afegir xarxa + Afegeix una xarxa @@ -2523,7 +2523,7 @@ Restarting to apply changes Back - Tornar + Torna @@ -2579,22 +2579,22 @@ Restarting to apply changes Ocultar contraseña - Amagar contrasenya + Amaga la contrasenya Aceptar - Acceptar + Accepta Cancelar - Cancel·lar + Cancel·la Connect - Connectar + Connecta diff --git a/bqSetting/tr/bqSetting_de.ts b/bqSetting/tr/bqSetting_de.ts index d953864..e8d4b28 100644 --- a/bqSetting/tr/bqSetting_de.ts +++ b/bqSetting/tr/bqSetting_de.ts @@ -99,7 +99,7 @@ Esta versión de firmware ha sido desarrollada integramente en España por Mundo Reader S.L. con un quipo de jóvenes profesionales, ingenieros informáticos de telecomunicación, diseñadores gráficos ... y publicada bajo licencia GPL (https://bitbucket.org/mundoreader/cervantes). - Diese Firmware-Version wurde vollständig in Spanien von einem jungen professionellen Team aus IT-Experten, Telekommunikationsingenieuren und Grafikdesignern der Firma Mundo Reader S.L. entwickelt und unter GPL-Lizenz veröffentlicht (https://bitbucket.org/mundoreader/cervantes). + Diese Firmware-Version wurde vollständig in Spanien von einem jungen professionellen Team aus IT-Experten, Telekommunikationsingenieuren und Grafikdesignern der Firma Mundo Reader S.L. entwickelt und unter GPL-Lizenz veröffentlicht (https://github.com/bq/cervantes). @@ -113,8 +113,8 @@ - Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger. - Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger. + Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger, Santiago Mayoral, Guillem Barnolas, Hristo Gyulev. + Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger, Santiago Mayoral, Guillem Barnolas, Hristo Gyulev. @@ -123,8 +123,8 @@ - Nieves Herreros, Sandra Salvador. - Nieves Herreros, Sandra Salvador. + Nieves Herreros, Sandra Salvador, Ana Sánchez, Jaime Mena. + Nieves Herreros, Sandra Salvador, Ana Sánchez, Jaime Mena. diff --git a/bqSetting/tr/bqSetting_en.ts b/bqSetting/tr/bqSetting_en.ts index 4eb5262..cdae619 100755 --- a/bqSetting/tr/bqSetting_en.ts +++ b/bqSetting/tr/bqSetting_en.ts @@ -167,7 +167,7 @@ Esta versión de firmware ha sido desarrollada integramente en España por Mundo Reader S.L. con un quipo de jóvenes profesionales, ingenieros informáticos de telecomunicación, diseñadores gráficos ... y publicada bajo licencia GPL (https://bitbucket.org/mundoreader/cervantes). - This firmware version has been designed by Mundo Reader S.L. entirely in Spain, by a team of young professional computer engineers, telecoms engineers, graphic designers... and published under a GPL (https://bitbucket.org/mundoreader/cervantes). + This firmware version has been designed by Mundo Reader S.L. entirely in Spain, by a team of young professional computer engineers, telecoms engineers, graphic designers... and published under a GPL (https://github.com/bq/cervantes). @@ -181,7 +181,7 @@ - Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger. + Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger, Santiago Mayoral, Guillem Barnolas, Hristo Gyulev. @@ -191,7 +191,7 @@ - Nieves Herreros, Sandra Salvador. + Nieves Herreros, Sandra Salvador, Ana Sánchez, Jaime Mena. diff --git a/bqSetting/tr/bqSetting_es.ts b/bqSetting/tr/bqSetting_es.ts index 44f683d..ec8f700 100755 --- a/bqSetting/tr/bqSetting_es.ts +++ b/bqSetting/tr/bqSetting_es.ts @@ -991,7 +991,7 @@ Esta versión de firmware ha sido desarrollada integramente en España por Mundo Reader S.L. con un quipo de jóvenes profesionales, ingenieros informáticos de telecomunicación, diseñadores gráficos ... y publicada bajo licencia GPL (https://bitbucket.org/mundoreader/cervantes). - Esta versión de firmware ha sido desarrollada íntegramente en España por Mundo Reader S.L. con un equipo de jóvenes profesionales, ingenieros informáticos, de telecomunicación, diseñadores gráficos ... y publicada bajo licencia GPL (https://bitbucket.org/mundoreader/cervantes). + Esta versión de firmware ha sido desarrollada íntegramente en España por Mundo Reader S.L. con un equipo de jóvenes profesionales, ingenieros informáticos, de telecomunicación, diseñadores gráficos ... y publicada bajo licencia GPL (https://github.com/bq/cervantes). @@ -1005,7 +1005,7 @@ - Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger. + Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger, Santiago Mayoral, Guillem Barnolas, Hristo Gyulev. @@ -1015,7 +1015,7 @@ - Nieves Herreros, Sandra Salvador. + Nieves Herreros, Sandra Salvador, Ana Sánchez, Jaime Mena. diff --git a/bqSetting/tr/bqSetting_eu.ts b/bqSetting/tr/bqSetting_eu.ts index 3812596..0bde851 100755 --- a/bqSetting/tr/bqSetting_eu.ts +++ b/bqSetting/tr/bqSetting_eu.ts @@ -167,7 +167,7 @@ Esta versión de firmware ha sido desarrollada integramente en España por Mundo Reader S.L. con un quipo de jóvenes profesionales, ingenieros informáticos de telecomunicación, diseñadores gráficos ... y publicada bajo licencia GPL (https://bitbucket.org/mundoreader/cervantes). - Firmware bertsio oso hau Mundo Reader S.L-k diseinatu du Espainian, gazte profesional talde batekin,telekomunikazioko ingeniari informatikoak, diseinatzaile grafikoak… eta GPL lizentzia pean publikatua (https://bitbucket.org/mundoreader/cervantes). + Firmware bertsio oso hau Mundo Reader S.L-k diseinatu du Espainian, gazte profesional talde batekin,telekomunikazioko ingeniari informatikoak, diseinatzaile grafikoak… eta GPL lizentzia pean publikatua (https://github.com/bq/cervantes). @@ -181,7 +181,7 @@ - Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger. + Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger, Santiago Mayoral, Guillem Barnolas, Hristo Gyulev. @@ -191,7 +191,7 @@ - Nieves Herreros, Sandra Salvador. + Nieves Herreros, Sandra Salvador, Ana Sánchez, Jaime Mena. diff --git a/bqSetting/tr/bqSetting_fr.ts b/bqSetting/tr/bqSetting_fr.ts index fee8a54..5b48fb9 100644 --- a/bqSetting/tr/bqSetting_fr.ts +++ b/bqSetting/tr/bqSetting_fr.ts @@ -97,7 +97,7 @@ Esta versión de firmware ha sido desarrollada integramente en España por Mundo Reader S.L. con un quipo de jóvenes profesionales, ingenieros informáticos de telecomunicación, diseñadores gráficos ... y publicada bajo licencia GPL (https://bitbucket.org/mundoreader/cervantes). - Cette version de micrologiciel a été développée intégralement en Espagne par Mundo Reader S.L. grâce à une équipe de jeunes professionnels, d'ingénieurs informatiques des télécommunications, d'infographistes... et publiée sous une licence GNU (https://bitbucket.org/mundoreader/cervantes). + Cette version de micrologiciel a été développée intégralement en Espagne par Mundo Reader S.L. grâce à une équipe de jeunes professionnels, d'ingénieurs informatiques des télécommunications, d'infographistes... et publiée sous une licence GNU (https://github.com/bq/cervantes). @@ -111,8 +111,8 @@ - Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger. - Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger. + Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger, Santiago Mayoral, Guillem Barnolas, Hristo Gyulev. + Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger, Santiago Mayoral, Guillem Barnolas, Hristo Gyulev. @@ -121,8 +121,8 @@ - Nieves Herreros, Sandra Salvador. - Nieves Herreros, Sandra Salvador. + Nieves Herreros, Sandra Salvador, Ana Sánchez, Jaime Mena. + Nieves Herreros, Sandra Salvador, Ana Sánchez, Jaime Mena. @@ -269,7 +269,7 @@ Este dispositivo está enlazado con las cuenta de Adobe DRM: - Cet appareil est associé aux comptes d'Adobe DRM : + Cet appareil est associé aux comptes d'Adobe DRM : diff --git a/bqSetting/tr/bqSetting_gl.ts b/bqSetting/tr/bqSetting_gl.ts index aae3fc8..17475d8 100644 --- a/bqSetting/tr/bqSetting_gl.ts +++ b/bqSetting/tr/bqSetting_gl.ts @@ -97,7 +97,7 @@ Esta versión de firmware ha sido desarrollada integramente en España por Mundo Reader S.L. con un quipo de jóvenes profesionales, ingenieros informáticos de telecomunicación, diseñadores gráficos ... y publicada bajo licencia GPL (https://bitbucket.org/mundoreader/cervantes). - Esta versión de firmware foi desenvolta íntegramente en España por Mundo Reader S.L. cun equipo de xoves profesionais, enxeñeiros informáticos, de telecomunicación, deseñadores gráficos... e publicada baixo licencia GPL (https://bitbucket.org/mundoreader/cervantes). + Esta versión de firmware foi desenvolta íntegramente en España por Mundo Reader S.L. cun equipo de xoves profesionais, enxeñeiros informáticos, de telecomunicación, deseñadores gráficos... e publicada baixo licencia GPL (https://github.com/bq/cervantes). @@ -111,7 +111,7 @@ - Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger. + Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger, Santiago Mayoral, Guillem Barnolas, Hristo Gyulev. @@ -121,7 +121,7 @@ - Nieves Herreros, Sandra Salvador. + Nieves Herreros, Sandra Salvador, Ana Sánchez, Jaime Mena. diff --git a/bqSetting/tr/bqSetting_it.ts b/bqSetting/tr/bqSetting_it.ts index 2fc29f9..ec77cf4 100644 --- a/bqSetting/tr/bqSetting_it.ts +++ b/bqSetting/tr/bqSetting_it.ts @@ -97,7 +97,7 @@ Esta versión de firmware ha sido desarrollada integramente en España por Mundo Reader S.L. con un quipo de jóvenes profesionales, ingenieros informáticos de telecomunicación, diseñadores gráficos ... y publicada bajo licencia GPL (https://bitbucket.org/mundoreader/cervantes). - Questa versione del firmware è stata sviluppata interamente in Spagna da Mundo Reader S.L. con un team di giovani professionisti, ingegneri informatici e delle telecomunicazioni, disegnatori grafici, etc. e pubblicata con licenza GPL (https://bitbucket.org/mundoreader/cervantes). + Questa versione del firmware è stata sviluppata interamente in Spagna da Mundo Reader S.L. con un team di giovani professionisti, ingegneri informatici e delle telecomunicazioni, disegnatori grafici, etc. e pubblicata con licenza GPL (https://github.com/bq/cervantes). @@ -111,7 +111,7 @@ - Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger. + Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger, Santiago Mayoral, Guillem Barnolas, Hristo Gyulev. @@ -121,7 +121,7 @@ - Nieves Herreros, Sandra Salvador. + Nieves Herreros, Sandra Salvador, Ana Sánchez, Jaime Mena. diff --git a/bqSetting/tr/bqSetting_pt.ts b/bqSetting/tr/bqSetting_pt.ts index ece9beb..3318f13 100755 --- a/bqSetting/tr/bqSetting_pt.ts +++ b/bqSetting/tr/bqSetting_pt.ts @@ -167,7 +167,7 @@ Esta versión de firmware ha sido desarrollada integramente en España por Mundo Reader S.L. con un quipo de jóvenes profesionales, ingenieros informáticos de telecomunicación, diseñadores gráficos ... y publicada bajo licencia GPL (https://bitbucket.org/mundoreader/cervantes). - Esta versão de firmware foi integralmente desenvolvida em Espanha pela Mundo Reader S.L.,com uma equipa de jovens profissionais, engenheiros informáticos, de telecomunicações, desenhadores gráfico... e publicada sob licença GPL (https://bitbucket.org/mundoreader/cervantes). + Esta versão de firmware foi integralmente desenvolvida em Espanha pela Mundo Reader S.L.,com uma equipa de jovens profissionais, engenheiros informáticos, de telecomunicações, desenhadores gráfico... e publicada sob licença GPL (https://github.com/bq/cervantes). @@ -181,7 +181,7 @@ - Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger. + Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger, Santiago Mayoral, Guillem Barnolas, Hristo Gyulev. @@ -191,7 +191,7 @@ - Nieves Herreros, Sandra Salvador. + Nieves Herreros, Sandra Salvador, Ana Sánchez, Jaime Mena. @@ -883,7 +883,7 @@ Idioma - Língua + Idioma diff --git a/bqSetting/ui/SettingConfigureNetworkListActions.ui b/bqSetting/ui/SettingConfigureNetworkListActions.ui index 3ab5bb4..285eff7 100755 --- a/bqSetting/ui/SettingConfigureNetworkListActions.ui +++ b/bqSetting/ui/SettingConfigureNetworkListActions.ui @@ -1,99 +1,99 @@ - - - SettingConfigureNetworkListActions - - - - 0 - 0 - 260 - 128 - - - - - 260 - 128 - - - - Form - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - - - DHCP - - - - - - - - 0 - 0 - - - - Manual - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 20 - 5 - - - - - - - - - + + + SettingConfigureNetworkListActions + + + + 0 + 0 + 368 + 181 + + + + + 368 + 181 + + + + Form + + + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + + + DHCP + + + + + + + + 0 + 0 + + + + Manual + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 28 + 7 + + + + + + + + + \ No newline at end of file diff --git a/bqSetting/ui/Settings.ui b/bqSetting/ui/Settings.ui index 6cc6058..3e3364e 100755 --- a/bqSetting/ui/Settings.ui +++ b/bqSetting/ui/Settings.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -20,7 +20,7 @@ Form - + @@ -42,7 +42,7 @@ - + @@ -112,7 +112,7 @@ Qt::NoFocus - Información del dispositivo + Información del dispositivo @@ -168,7 +168,7 @@ Qt::NoFocus - Conexión Wi-Fi + Conexión Wi-Fi @@ -260,8 +260,8 @@ - 20 - 25 + 28 + 35 @@ -280,8 +280,8 @@ - 20 - 40 + 28 + 57 @@ -295,8 +295,6 @@
SilentQPushButton.h
- - - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsAboutUs.ui b/bqSetting/ui/SettingsAboutUs.ui index ae29e63..1568c08 100644 --- a/bqSetting/ui/SettingsAboutUs.ui +++ b/bqSetting/ui/SettingsAboutUs.ui @@ -6,8 +6,8 @@ 0 0 - 758 - 960 + 1072 + 1358 @@ -18,14 +18,14 @@ - 758 - 960 + 0 + 0 - 758 - 960 + 1072 + 1358 @@ -71,7 +71,7 @@ 16777215 - 10000 + 14142 @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -172,7 +172,7 @@ - Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger. + Adán Muñoz, Miguel Rodríguez, Pablo Núñez, Mikel Fernández, Iván Álvarez, Fernando Herrera, Eduardo Paz, Heiko Stübner, Nuria Fernández, Vicente Monge, Matthias Brugger, Santiago Mayoral, Guillem Barnolas, Hristo Gyulev. true @@ -195,7 +195,7 @@ - Nieves Herreros, Sandra Salvador. + Nieves Herreros, Sandra Salvador, Ana Sánchez, Jaime Mena. 0 @@ -304,8 +304,8 @@ - 20 - 40 + 28 + 57 @@ -323,8 +323,8 @@ - 20 - 40 + 28 + 57 diff --git a/bqSetting/ui/SettingsAddNetwork.ui b/bqSetting/ui/SettingsAddNetwork.ui index 338e6a6..6c06072 100755 --- a/bqSetting/ui/SettingsAddNetwork.ui +++ b/bqSetting/ui/SettingsAddNetwork.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,11 +71,11 @@ 16777215 - 10000 + 14142 - Añadir red + Añadir red @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -114,7 +114,7 @@ - + @@ -131,17 +131,17 @@ - + - Dirección IP + Dirección IP - + @@ -163,17 +163,17 @@ - Contraseña + Contraseña - + - Ocultar contraseña + Ocultar contraseña @@ -201,8 +201,8 @@ - 20 - 20 + 28 + 28 @@ -210,7 +210,7 @@ - Configuración avanzada + Configuración avanzada @@ -221,8 +221,8 @@ - 40 - 20 + 57 + 28 @@ -244,8 +244,8 @@ - 20 - 20 + 28 + 28 @@ -259,8 +259,8 @@ - 20 - 40 + 28 + 57 @@ -275,8 +275,8 @@ - 20 - 40 + 28 + 57 @@ -290,6 +290,6 @@
SilentQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsAdobeDrmLinkDevice.ui b/bqSetting/ui/SettingsAdobeDrmLinkDevice.ui index 53323bb..d9b195c 100755 --- a/bqSetting/ui/SettingsAdobeDrmLinkDevice.ui +++ b/bqSetting/ui/SettingsAdobeDrmLinkDevice.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -65,7 +65,7 @@ Qt::NoFocus - Atrás + Atrás @@ -80,7 +80,7 @@ 16777215 - 10000 + 14142 @@ -95,8 +95,8 @@ - 40 - 20 + 57 + 28 @@ -123,7 +123,7 @@ - + @@ -150,7 +150,7 @@ - Para enlazar tu dispositivo a Adobe DRM introduce tu Adobe ID y tu contraseña. + Para enlazar tu dispositivo a Adobe DRM introduce tu Adobe ID y tu contraseña. Qt::AlignHCenter|Qt::AlignTop @@ -174,11 +174,11 @@ 16777215 - 1000 + 1414 - Si aún no dispones de un Adobe ID, puedes crear uno en adobe.com + Si aún no dispones de un Adobe ID, puedes crear uno en adobe.com Qt::AlignHCenter|Qt::AlignTop @@ -201,10 +201,10 @@ - + - Introduce tu contraseña + Introduce tu contraseña @@ -215,8 +215,8 @@ - 20 - 40 + 28 + 57 @@ -241,8 +241,8 @@ - 20 - 40 + 28 + 57 @@ -256,6 +256,6 @@
MyQLineEdit.h
- - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsAdobeDrmUnLinkDevice.ui b/bqSetting/ui/SettingsAdobeDrmUnLinkDevice.ui index 3e9b3e0..890f737 100755 --- a/bqSetting/ui/SettingsAdobeDrmUnLinkDevice.ui +++ b/bqSetting/ui/SettingsAdobeDrmUnLinkDevice.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -65,7 +65,7 @@ Qt::NoFocus - Atrás + Atrás @@ -80,7 +80,7 @@ 16777215 - 10000 + 14142 @@ -95,8 +95,8 @@ - 40 - 20 + 57 + 28 @@ -123,7 +123,7 @@ - + @@ -150,7 +150,7 @@ - Este dispositivo está enlazado con las cuenta de Adobe DRM: + Este dispositivo está enlazado con las cuenta de Adobe DRM: Qt::AlignHCenter|Qt::AlignTop @@ -174,7 +174,7 @@ 16777215 - 82 + 116 @@ -202,14 +202,14 @@ 16777215 - 72 + 102 Qt::NoFocus - + Desautorizar dispositivo @@ -223,8 +223,8 @@ - 20 - 40 + 28 + 57 @@ -249,8 +249,8 @@ - 20 - 40 + 28 + 57 @@ -264,6 +264,6 @@
SilentQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsBrightness.ui b/bqSetting/ui/SettingsBrightness.ui index 18bd89b..11dd9a1 100755 --- a/bqSetting/ui/SettingsBrightness.ui +++ b/bqSetting/ui/SettingsBrightness.ui @@ -6,8 +6,8 @@ 0 0 - 758 - 960 + 1072 + 1358 @@ -18,14 +18,14 @@ - 758 - 960 + 0 + 0 - 758 - 960 + 1072 + 1358 @@ -35,7 +35,7 @@ Form - + @@ -59,7 +59,7 @@ Qt::NoFocus - Atrás + Atrás @@ -74,7 +74,7 @@ 16777215 - 10000 + 14142 @@ -89,8 +89,8 @@ - 40 - 20 + 57 + 28 @@ -129,7 +129,7 @@ - + @@ -149,7 +149,7 @@ 16777215 - 92 + 130 @@ -176,8 +176,8 @@ - 40 - 20 + 57 + 28 @@ -188,7 +188,7 @@ Qt::NoFocus - + @@ -202,8 +202,8 @@ - 2 - 20 + 3 + 28 @@ -216,7 +216,7 @@ 16777215 - 245 + 346 @@ -237,7 +237,7 @@ 16777215 - 77 + 109 @@ -265,7 +265,7 @@ 16777215 - 100 + 141 @@ -285,8 +285,8 @@ - 28 - 20 + 40 + 28 @@ -307,8 +307,8 @@ - 38 - 58 + 54 + 82 @@ -335,15 +335,15 @@ - 38 - 58 + 54 + 82 Qt::NoFocus - + @@ -390,8 +390,8 @@ - 20 - 45 + 28 + 64 @@ -427,8 +427,8 @@ - 20 - 45 + 28 + 64 @@ -464,8 +464,8 @@ - 20 - 45 + 28 + 64 @@ -501,8 +501,8 @@ - 20 - 45 + 28 + 64 @@ -538,8 +538,8 @@ - 20 - 45 + 28 + 64 @@ -575,8 +575,8 @@ - 20 - 45 + 28 + 64 @@ -612,8 +612,8 @@ - 20 - 45 + 28 + 64 @@ -649,8 +649,8 @@ - 20 - 45 + 28 + 64 @@ -686,8 +686,8 @@ - 20 - 45 + 28 + 64 @@ -723,8 +723,8 @@ - 20 - 45 + 28 + 64 @@ -760,8 +760,8 @@ - 20 - 45 + 28 + 64 @@ -797,8 +797,8 @@ - 20 - 45 + 28 + 64 @@ -834,8 +834,8 @@ - 20 - 45 + 28 + 64 @@ -871,8 +871,8 @@ - 20 - 45 + 28 + 64 @@ -908,8 +908,8 @@ - 20 - 45 + 28 + 64 @@ -945,8 +945,8 @@ - 20 - 45 + 28 + 64 @@ -982,8 +982,8 @@ - 20 - 45 + 28 + 64 @@ -1019,8 +1019,8 @@ - 20 - 45 + 28 + 64 @@ -1056,8 +1056,8 @@ - 20 - 45 + 28 + 64 @@ -1093,8 +1093,8 @@ - 20 - 45 + 28 + 64 @@ -1130,8 +1130,8 @@ - 20 - 45 + 28 + 64 @@ -1161,8 +1161,8 @@ - 20 - 45 + 28 + 64 @@ -1192,8 +1192,8 @@ - 20 - 45 + 28 + 64 @@ -1223,8 +1223,8 @@ - 20 - 45 + 28 + 64 @@ -1254,8 +1254,8 @@ - 20 - 45 + 28 + 64 @@ -1282,15 +1282,15 @@ - 38 - 58 + 54 + 82 Qt::NoFocus - + @@ -1310,8 +1310,8 @@ - 38 - 58 + 54 + 82 @@ -1332,8 +1332,8 @@ - 28 - 20 + 40 + 28 @@ -1354,8 +1354,8 @@ - 20 - 40 + 28 + 57 @@ -1391,6 +1391,6 @@
LongPressedQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsBrowser.ui b/bqSetting/ui/SettingsBrowser.ui index 2ab94c3..d13cbf8 100755 --- a/bqSetting/ui/SettingsBrowser.ui +++ b/bqSetting/ui/SettingsBrowser.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - + @@ -67,14 +67,14 @@ - 40 - 20 + 57 + 28 - + @@ -83,8 +83,8 @@ - 40 - 20 + 57 + 28 @@ -92,7 +92,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -131,8 +131,8 @@ - 20 - 20 + 28 + 28 @@ -155,7 +155,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -178,21 +178,21 @@ - + - + - + @@ -203,8 +203,8 @@ - 40 - 20 + 57 + 28 @@ -212,7 +212,7 @@ - + @@ -229,8 +229,6 @@ 1 - - - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsConfigureNetwork.ui b/bqSetting/ui/SettingsConfigureNetwork.ui index bc3064e..4c40d39 100755 --- a/bqSetting/ui/SettingsConfigureNetwork.ui +++ b/bqSetting/ui/SettingsConfigureNetwork.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,11 +71,11 @@ 16777215 - 10000 + 14142 - Configuración IP estática + Configuración IP estática @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -130,8 +130,8 @@ - 40 - 20 + 57 + 28 @@ -147,7 +147,7 @@ - + @@ -190,11 +190,11 @@ 16777215 - 38 + 54 - Configuración + Configuración @@ -212,8 +212,8 @@ - 40 - 20 + 57 + 28 @@ -262,7 +262,7 @@ - Dirección IP + Dirección IP @@ -273,8 +273,8 @@ - 40 - 20 + 57 + 28 @@ -282,7 +282,7 @@ - + @@ -331,7 +331,7 @@ - Máscara de red + Máscara de red @@ -342,14 +342,14 @@ - 40 - 20 + 57 + 28 - + @@ -407,14 +407,14 @@ - 40 - 20 + 57 + 28 - + @@ -466,8 +466,8 @@ - 40 - 20 + 57 + 28 @@ -482,12 +482,12 @@ - 351 - 44 + 496 + 62 - + @@ -518,8 +518,8 @@ - 20 - 20 + 28 + 28 @@ -540,23 +540,23 @@ - 200 - 52 + 283 + 74 Qt::NoFocus - + Guardar - 112 - 60 + 158 + 85 @@ -583,23 +583,23 @@ - 200 - 52 + 283 + 74 Qt::NoFocus - + Cancelar - 112 - 60 + 158 + 85 @@ -619,8 +619,8 @@ - 20 - 40 + 28 + 57 @@ -635,8 +635,8 @@ - 20 - 40 + 28 + 57 @@ -655,6 +655,6 @@
MyQLineEdit.h
- - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsDateTimeMenu.ui b/bqSetting/ui/SettingsDateTimeMenu.ui index 83d1ee1..f970a41 100755 --- a/bqSetting/ui/SettingsDateTimeMenu.ui +++ b/bqSetting/ui/SettingsDateTimeMenu.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,7 +71,7 @@ 16777215 - 10000 + 14142 @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -114,7 +114,7 @@ - + @@ -211,8 +211,8 @@ - 608 - 81 + 860 + 115 @@ -232,15 +232,15 @@ - 20 - 40 + 28 + 57 - + @@ -253,8 +253,8 @@ - 20 - 40 + 28 + 57 @@ -269,8 +269,8 @@ - 20 - 40 + 28 + 57 @@ -296,6 +296,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsDateTimeMenuItem.ui b/bqSetting/ui/SettingsDateTimeMenuItem.ui index fa98a73..2829272 100755 --- a/bqSetting/ui/SettingsDateTimeMenuItem.ui +++ b/bqSetting/ui/SettingsDateTimeMenuItem.ui @@ -6,15 +6,15 @@ 0 0 - 594 - 74 + 840 + 105 Form - + @@ -49,7 +49,7 @@ 16777215 - 70 + 99 @@ -103,10 +103,10 @@ - + - + @@ -120,8 +120,8 @@ - 15 - 20 + 21 + 28 @@ -131,6 +131,6 @@ - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsDevelopmentOptions.ui b/bqSetting/ui/SettingsDevelopmentOptions.ui index 47abaaa..b32c95f 100755 --- a/bqSetting/ui/SettingsDevelopmentOptions.ui +++ b/bqSetting/ui/SettingsDevelopmentOptions.ui @@ -6,8 +6,8 @@ 0 0 - 758 - 960 + 1072 + 1358 @@ -18,21 +18,21 @@ - 758 - 960 + 0 + 0 - 758 - 960 + 1072 + 1358 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,7 +71,7 @@ 16777215 - 10000 + 14142 @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -126,7 +126,7 @@ - + @@ -146,7 +146,7 @@ 16777215 - 92 + 130 @@ -191,8 +191,8 @@ - 40 - 20 + 57 + 28 @@ -212,7 +212,7 @@ - + @@ -230,7 +230,7 @@ 16777215 - 90 + 127 @@ -275,8 +275,8 @@ - 40 - 20 + 57 + 28 @@ -296,7 +296,7 @@ - + @@ -313,8 +313,8 @@ - 20 - 40 + 28 + 57 @@ -328,11 +328,6 @@
SilentQPushButton.h
- - - - - - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsDeviceInfo.ui b/bqSetting/ui/SettingsDeviceInfo.ui index 750d9f3..f6a0dc7 100755 --- a/bqSetting/ui/SettingsDeviceInfo.ui +++ b/bqSetting/ui/SettingsDeviceInfo.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,11 +71,11 @@ 16777215 - 10000 + 14142 - Información del dispositivo + Información del dispositivo @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -117,7 +117,7 @@ - + @@ -129,7 +129,7 @@ - Batería + Batería @@ -140,8 +140,8 @@ - 40 - 20 + 57 + 28 @@ -171,7 +171,7 @@ 25 - + @@ -204,8 +204,8 @@ - 40 - 20 + 57 + 28 @@ -246,7 +246,7 @@ - Partición privada + Partición privada @@ -257,8 +257,8 @@ - 40 - 20 + 57 + 28 @@ -310,8 +310,8 @@ - 40 - 20 + 57 + 28 @@ -353,8 +353,8 @@ - 20 - 40 + 28 + 57 @@ -368,7 +368,7 @@ - + @@ -394,21 +394,21 @@ 16777215 - 85 + 120 Qt::NoFocus - Información básica + Información básica - Restaurar valores de fábrica + Restaurar valores de fábrica @@ -429,7 +429,7 @@ 16777215 - 82 + 116 @@ -450,8 +450,8 @@ - 20 - 40 + 28 + 57 @@ -465,6 +465,6 @@
SilentQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsDeviceOptionsMenu.ui b/bqSetting/ui/SettingsDeviceOptionsMenu.ui index d61ef24..0663980 100755 --- a/bqSetting/ui/SettingsDeviceOptionsMenu.ui +++ b/bqSetting/ui/SettingsDeviceOptionsMenu.ui @@ -6,8 +6,8 @@ 0 0 - 758 - 960 + 1072 + 1358 @@ -18,21 +18,21 @@ - 758 - 960 + 0 + 0 - 758 - 960 + 1072 + 1358 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,7 +71,7 @@ 16777215 - 10000 + 14142 @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -114,7 +114,7 @@ - + @@ -149,7 +149,7 @@ 16777215 - 109 + 154 @@ -177,7 +177,7 @@ 16777215 - 109 + 154 @@ -205,7 +205,7 @@ 16777215 - 109 + 154 @@ -226,7 +226,7 @@ - Ahorro de energía + Ahorro de energía @@ -247,8 +247,8 @@ - 20 - 40 + 28 + 57 @@ -262,8 +262,6 @@
SilentQPushButton.h
- - - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsDictionariesInfo.ui b/bqSetting/ui/SettingsDictionariesInfo.ui index 6db4b89..6c58faf 100755 --- a/bqSetting/ui/SettingsDictionariesInfo.ui +++ b/bqSetting/ui/SettingsDictionariesInfo.ui @@ -6,8 +6,8 @@ 0 0 - 758 - 960 + 1072 + 1358 @@ -18,21 +18,21 @@ - 758 - 960 + 0 + 0 - 758 - 960 + 1072 + 1358 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,11 +71,11 @@ 16777215 - 10000 + 14142 - Información de los diccionarios + Información de los diccionarios @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -114,7 +114,7 @@ - + @@ -142,19 +142,19 @@ - 1000 - 754 + 1414 + 1066 true - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> Qt::NoTextInteraction @@ -163,7 +163,7 @@ p, li { white-space: pre-wrap; } - + @@ -179,8 +179,8 @@ p, li { white-space: pre-wrap; } - 20 - 40 + 28 + 57 @@ -196,7 +196,7 @@ p, li { white-space: pre-wrap; } bqQTextBrowser QTextBrowser -
bqQTextBrowser.h
+
bqQTextBrowser.h
 SettingsPagerCont @@ -205,6 +205,6 @@ p, li { white-space: pre-wrap; } 1 - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsDictionariesMenu.ui b/bqSetting/ui/SettingsDictionariesMenu.ui index a776d7c..28d1947 100755 --- a/bqSetting/ui/SettingsDictionariesMenu.ui +++ b/bqSetting/ui/SettingsDictionariesMenu.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,7 +71,7 @@ 16777215 - 10000 + 14142 @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -114,7 +114,7 @@ - + @@ -124,23 +124,23 @@ 0 - + - + - + - + - + - + @@ -153,8 +153,8 @@ - 20 - 40 + 28 + 57 @@ -169,7 +169,7 @@ - Ver información de los diccionarios + Ver información de los diccionarios @@ -183,8 +183,8 @@ - 20 - 34 + 28 + 48 @@ -210,6 +210,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsDictionariesMenuItem.ui b/bqSetting/ui/SettingsDictionariesMenuItem.ui index 941ef16..682b2f6 100755 --- a/bqSetting/ui/SettingsDictionariesMenuItem.ui +++ b/bqSetting/ui/SettingsDictionariesMenuItem.ui @@ -6,15 +6,15 @@ 0 0 - 600 - 80 + 849 + 113 Form - + @@ -26,19 +26,19 @@ - Definición Español + Definición Español - + - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsEnergySaving.ui b/bqSetting/ui/SettingsEnergySaving.ui index 72a971e..0b30b84 100755 --- a/bqSetting/ui/SettingsEnergySaving.ui +++ b/bqSetting/ui/SettingsEnergySaving.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,11 +71,11 @@ 16777215 - 10000 + 14142 - Ahorro de energía + Ahorro de energía @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -120,7 +120,7 @@ - + @@ -155,7 +155,7 @@ 16777215 - 87 + 123 @@ -183,7 +183,7 @@ 16777215 - 84 + 119 @@ -204,8 +204,8 @@ - 20 - 40 + 28 + 57 @@ -219,8 +219,6 @@
SilentQPushButton.h
- - - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsGeneralTermsInfo.ui b/bqSetting/ui/SettingsGeneralTermsInfo.ui index a61b9f1..498957b 100755 --- a/bqSetting/ui/SettingsGeneralTermsInfo.ui +++ b/bqSetting/ui/SettingsGeneralTermsInfo.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,11 +71,11 @@ 16777215 - 10000 + 14142 - Términos legales + Términos legales @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -114,7 +114,7 @@ - + @@ -133,84 +133,84 @@ - 562 - 1000000 + 795 + 1414214 true - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a name="SEC1"></a><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">G</span><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">NU GENERAL PUBLIC LICENSE</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Version 2, June 1991</span></p> -<p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">Copyright (C) 1989, 1991 Free Software Foundation, Inc. </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier'; font-size:9pt; color:#000000;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">Everyone is permitted to copy and distribute verbatim copies</span></p> -<p style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">of this license document, but changing it is not allowed.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a name="preamble"></a><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">P</span><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">reamble</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">The precise terms and conditions for copying, distribution and modification follow.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a name="terms"></a><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">T</span><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">ERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">0.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The &quot;Program&quot;, below, refers to any such program or work, and a &quot;work based on the Program&quot; means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term &quot;modification&quot;.) Each licensee is addressed as &quot;you&quot;.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">1.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">2.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">a)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">b)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.</span></p> -<p style=" margin-top:0px; margin-bottom:8px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">c)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">3.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">a)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">b)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,</span></p> -<p style=" margin-top:0px; margin-bottom:8px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">c)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">4.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">5.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">6.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">7.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">8.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">9.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and &quot;any later version&quot;, you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">10.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">NO WARRANTY</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">11.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">12.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</span></p> -<p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">END OF TERMS AND CONDITIONS</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a name="howto"></a><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">H</span><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">ow to Apply These Terms to Your New Programs</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the &quot;copyright&quot; line and a pointer to where the full notice is found.</span></p> -<p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; font-style:italic; color:#000000;">one line to give the program's name and an idea of what it does.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">Copyright (C) </span><span style=" font-family:'Courier New,courier'; font-size:9pt; font-style:italic; color:#000000;">yyyy</span><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;"> </span><span style=" font-family:'Courier New,courier'; font-size:9pt; font-style:italic; color:#000000;">name of author</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier'; font-size:9pt; font-style:italic; color:#000000;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">This program is free software; you can redistribute it and/or</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">modify it under the terms of the GNU General Public License</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">as published by the Free Software Foundation; either version 2</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">of the License, or (at your option) any later version.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier'; font-size:9pt; color:#000000;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">This program is distributed in the hope that it will be useful,</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">but WITHOUT ANY WARRANTY; without even the implied warranty of</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">GNU General Public License for more details.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier'; font-size:9pt; color:#000000;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">\</p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a name="SEC1"></a><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">G</span><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">NU GENERAL PUBLIC LICENSE</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Version 2, June 1991</span></p> +<p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">Copyright (C) 1989, 1991 Free Software Foundation, Inc. </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier'; font-size:9pt; color:#000000;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">Everyone is permitted to copy and distribute verbatim copies</span></p> +<p style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">of this license document, but changing it is not allowed.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a name="preamble"></a><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">P</span><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">reamble</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">The precise terms and conditions for copying, distribution and modification follow.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a name="terms"></a><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">T</span><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">ERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">0.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The &quot;Program&quot;, below, refers to any such program or work, and a &quot;work based on the Program&quot; means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term &quot;modification&quot;.) Each licensee is addressed as &quot;you&quot;.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">1.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">2.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">a)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">b)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.</span></p> +<p style=" margin-top:0px; margin-bottom:8px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">c)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">3.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">a)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">b)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,</span></p> +<p style=" margin-top:0px; margin-bottom:8px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">c)</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">4.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">5.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">6.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">7.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">8.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">9.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and &quot;any later version&quot;, you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">10.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">NO WARRANTY</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">11.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">12.</span><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;"> IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</span></p> +<p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">END OF TERMS AND CONDITIONS</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a name="howto"></a><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">H</span><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">ow to Apply These Terms to Your New Programs</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the &quot;copyright&quot; line and a pointer to where the full notice is found.</span></p> +<p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; font-style:italic; color:#000000;">one line to give the program's name and an idea of what it does.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">Copyright (C) </span><span style=" font-family:'Courier New,courier'; font-size:9pt; font-style:italic; color:#000000;">yyyy</span><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;"> </span><span style=" font-family:'Courier New,courier'; font-size:9pt; font-style:italic; color:#000000;">name of author</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier'; font-size:9pt; font-style:italic; color:#000000;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">This program is free software; you can redistribute it and/or</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">modify it under the terms of the GNU General Public License</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">as published by the Free Software Foundation; either version 2</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">of the License, or (at your option) any later version.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier'; font-size:9pt; color:#000000;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">This program is distributed in the hope that it will be useful,</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">but WITHOUT ANY WARRANTY; without even the implied warranty of</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">GNU General Public License for more details.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier'; font-size:9pt; color:#000000;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">\</p></body></html> Qt::NoTextInteraction @@ -218,7 +218,7 @@ p, li { white-space: pre-wrap; } - + @@ -233,8 +233,8 @@ p, li { white-space: pre-wrap; } - 20 - 40 + 28 + 57 @@ -242,16 +242,16 @@ p, li { white-space: pre-wrap; } - - bqQTextBrowser - QTextBrowser -
bqQTextBrowser.h
- SilentQPushButton QPushButton
SilentQPushButton.h
 + + bqQTextBrowser + QTextBrowser +
bqQTextBrowser.h
+ SettingsPagerCont QWidget @@ -259,6 +259,6 @@ p, li { white-space: pre-wrap; } 1 - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsGeneralTermsInfoAdobe.ui b/bqSetting/ui/SettingsGeneralTermsInfoAdobe.ui index 0dc56aa..de989af 100755 --- a/bqSetting/ui/SettingsGeneralTermsInfoAdobe.ui +++ b/bqSetting/ui/SettingsGeneralTermsInfoAdobe.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,7 +71,7 @@ 16777215 - 10000 + 14142 @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -114,7 +114,7 @@ - + @@ -133,35 +133,35 @@ - 562 - 1000000 + 795 + 1414214 true - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a name="SEC1"></a><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">G</span><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">ADOBE LICENSE</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</span></p> -<p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">Lorem ipsum dolor sit amet, consectetur adipiscing elit. </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier'; font-size:9pt; color:#000000;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</span></p> -<p style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">Nullam adipiscing fringilla lacus, in laoreet nibh cursus ac.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a name="preamble"></a><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">P</span><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">reamble</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam adipiscing fringilla lacus, in laoreet nibh cursus ac. Vestibulum suscipit, odio vel tempor sollicitudin, sapien mi malesuada urna, nec porta lorem leo nec eros. Vivamus tristique porta orci a faucibus. Nam vitae nunc erat. Quisque euismod turpis in nisl mollis viverra. In elementum luctus enim sit amet porta. Duis mi quam, interdum at lacinia ut, aliquet id arcu. Donec tincidunt nulla id odio porta in adipiscing nisl posuere. Donec sed eros nunc, et semper nibh. Suspendisse condimentum, ante in ullamcorper auctor, risus odio accumsan tellus, at tempus libero elit et odio. </span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Proin suscipit, ipsum vitae viverra fringilla, purus ante placerat elit, quis vestibulum urna erat in purus. Suspendisse egestas molestie turpis, at interdum tellus scelerisque sit amet. Donec nec turpis sed nisi aliquet ultrices. Donec feugiat nunc eget libero condimentum sit amet ullamcorper enim vulputate. Sed gravida blandit sem at faucibus. Curabitur fermentum tortor est. Nunc quis tellus a nibh cursus pharetra. Morbi non ullamcorper turpis. Nunc a eros dapibus diam lobortis aliquam eu quis ligula. In eu leo sapien, vitae malesuada massa. </span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Fusce ante magna, imperdiet commodo ultricies a, dictum ut elit. Maecenas pretium pretium purus tristique hendrerit. Donec et vulputate purus. Integer lorem odio, euismod eget egestas non, pretium molestie ipsum. Phasellus aliquam, lectus fermentum laoreet dictum, arcu massa pellentesque arcu, a lobortis mi velit nec urna. Pellentesque rutrum ultricies eros at eleifend. Nam id lectus ac ante condimentum rutrum non vitae arcu. </span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Morbi aliquam, ipsum sed luctus rutrum, orci erat varius mi, ut laoreet mauris ipsum eu ipsum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. In vulputate, tellus vitae sagittis dapibus, dui felis blandit turpis, at sagittis nunc orci sollicitudin libero. Praesent et dapibus nulla. Vestibulum sodales nibh facilisis risus congue sed euismod nunc pulvinar. Nunc nec ipsum venenatis quam commodo interdum pellentesque ut leo. Suspendisse hendrerit mattis urna quis ornare. Cras eleifend, magna scelerisque pharetra consectetur, eros ligula placerat urna, vel gravida tellus mi blandit dolor. </span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Cras vestibulum tellus at arcu lobortis lacinia. Maecenas erat nulla, lacinia ut ullamcorper id, dapibus id dui. Pellentesque sapien dolor, tristique a faucibus eget, tincidunt in nibh. Mauris interdum feugiat pellentesque. Pellentesque semper laoreet neque sed venenatis. Integer vel felis commodo mauris vehicula imperdiet euismod at tortor. Morbi urna velit, dapibus sed egestas quis, elementum sodales magna. Integer eget nisi ac quam vehicula gravida. Quisque nec lacus neque, aliquam scelerisque est. Sed commodo varius tristique. Nulla facilisi. Nulla accumsan semper tincidunt. </span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Mauris mi nisl, luctus vitae dignissim a, tempor sed arcu. Praesent vestibulum consequat elit, sit amet tincidunt magna gravida vel. Morbi neque orci, sagittis ac suscipit interdum, molestie a libero. Morbi scelerisque, orci eleifend lobortis vulputate, libero erat sagittis orci, eget venenatis lorem mauris quis eros. Curabitur consectetur eleifend lobortis. Praesent elementum mauris non ligula lacinia sodales. Suspendisse aliquam porta volutpat. Nulla id ornare quam. Nunc ultricies bibendum ipsum, vitae fermentum purus bibendum nec. Praesent eget dui ac augue accumsan lobortis. Suspendisse in tortor eu dui dignissim sollicitudin sodales ac mi. Suspendisse potenti. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce non magna nisl. </span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier'; font-size:9pt; color:#000000;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">\</p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a name="SEC1"></a><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">G</span><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">ADOBE LICENSE</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</span></p> +<p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">Lorem ipsum dolor sit amet, consectetur adipiscing elit. </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier'; font-size:9pt; color:#000000;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</span></p> +<p style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:9pt; color:#000000;">Nullam adipiscing fringilla lacus, in laoreet nibh cursus ac.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a name="preamble"></a><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">P</span><span style=" font-family:'Times New Roman'; font-size:9pt; font-weight:600; color:#000000;">reamble</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam adipiscing fringilla lacus, in laoreet nibh cursus ac. Vestibulum suscipit, odio vel tempor sollicitudin, sapien mi malesuada urna, nec porta lorem leo nec eros. Vivamus tristique porta orci a faucibus. Nam vitae nunc erat. Quisque euismod turpis in nisl mollis viverra. In elementum luctus enim sit amet porta. Duis mi quam, interdum at lacinia ut, aliquet id arcu. Donec tincidunt nulla id odio porta in adipiscing nisl posuere. Donec sed eros nunc, et semper nibh. Suspendisse condimentum, ante in ullamcorper auctor, risus odio accumsan tellus, at tempus libero elit et odio. </span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Proin suscipit, ipsum vitae viverra fringilla, purus ante placerat elit, quis vestibulum urna erat in purus. Suspendisse egestas molestie turpis, at interdum tellus scelerisque sit amet. Donec nec turpis sed nisi aliquet ultrices. Donec feugiat nunc eget libero condimentum sit amet ullamcorper enim vulputate. Sed gravida blandit sem at faucibus. Curabitur fermentum tortor est. Nunc quis tellus a nibh cursus pharetra. Morbi non ullamcorper turpis. Nunc a eros dapibus diam lobortis aliquam eu quis ligula. In eu leo sapien, vitae malesuada massa. </span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Fusce ante magna, imperdiet commodo ultricies a, dictum ut elit. Maecenas pretium pretium purus tristique hendrerit. Donec et vulputate purus. Integer lorem odio, euismod eget egestas non, pretium molestie ipsum. Phasellus aliquam, lectus fermentum laoreet dictum, arcu massa pellentesque arcu, a lobortis mi velit nec urna. Pellentesque rutrum ultricies eros at eleifend. Nam id lectus ac ante condimentum rutrum non vitae arcu. </span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Morbi aliquam, ipsum sed luctus rutrum, orci erat varius mi, ut laoreet mauris ipsum eu ipsum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. In vulputate, tellus vitae sagittis dapibus, dui felis blandit turpis, at sagittis nunc orci sollicitudin libero. Praesent et dapibus nulla. Vestibulum sodales nibh facilisis risus congue sed euismod nunc pulvinar. Nunc nec ipsum venenatis quam commodo interdum pellentesque ut leo. Suspendisse hendrerit mattis urna quis ornare. Cras eleifend, magna scelerisque pharetra consectetur, eros ligula placerat urna, vel gravida tellus mi blandit dolor. </span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Cras vestibulum tellus at arcu lobortis lacinia. Maecenas erat nulla, lacinia ut ullamcorper id, dapibus id dui. Pellentesque sapien dolor, tristique a faucibus eget, tincidunt in nibh. Mauris interdum feugiat pellentesque. Pellentesque semper laoreet neque sed venenatis. Integer vel felis commodo mauris vehicula imperdiet euismod at tortor. Morbi urna velit, dapibus sed egestas quis, elementum sodales magna. Integer eget nisi ac quam vehicula gravida. Quisque nec lacus neque, aliquam scelerisque est. Sed commodo varius tristique. Nulla facilisi. Nulla accumsan semper tincidunt. </span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:9pt; color:#000000;">Mauris mi nisl, luctus vitae dignissim a, tempor sed arcu. Praesent vestibulum consequat elit, sit amet tincidunt magna gravida vel. Morbi neque orci, sagittis ac suscipit interdum, molestie a libero. Morbi scelerisque, orci eleifend lobortis vulputate, libero erat sagittis orci, eget venenatis lorem mauris quis eros. Curabitur consectetur eleifend lobortis. Praesent elementum mauris non ligula lacinia sodales. Suspendisse aliquam porta volutpat. Nulla id ornare quam. Nunc ultricies bibendum ipsum, vitae fermentum purus bibendum nec. Praesent eget dui ac augue accumsan lobortis. Suspendisse in tortor eu dui dignissim sollicitudin sodales ac mi. Suspendisse potenti. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce non magna nisl. </span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier'; font-size:9pt; color:#000000;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">\</p></body></html> Qt::NoTextInteraction @@ -169,7 +169,7 @@ p, li { white-space: pre-wrap; } - + @@ -184,8 +184,8 @@ p, li { white-space: pre-wrap; } - 20 - 40 + 28 + 57 @@ -193,16 +193,16 @@ p, li { white-space: pre-wrap; } - - bqQTextBrowser - QTextBrowser -
bqQTextBrowser.h
- SilentQPushButton QPushButton
SilentQPushButton.h
 + + bqQTextBrowser + QTextBrowser +
bqQTextBrowser.h
+ SettingsPagerCont QWidget @@ -210,6 +210,6 @@ p, li { white-space: pre-wrap; } 1 - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsLanguageMenu.ui b/bqSetting/ui/SettingsLanguageMenu.ui index fce99b4..757509b 100755 --- a/bqSetting/ui/SettingsLanguageMenu.ui +++ b/bqSetting/ui/SettingsLanguageMenu.ui @@ -6,8 +6,8 @@ 0 0 - 758 - 960 + 1072 + 1358 @@ -18,21 +18,21 @@ - 758 - 960 + 0 + 0 - 758 - 960 + 1072 + 1358 Form - + @@ -65,7 +65,7 @@ Qt::NoFocus - Atrás + Atrás @@ -80,7 +80,7 @@ 16777215 - 10000 + 14142 @@ -95,8 +95,8 @@ - 40 - 20 + 57 + 28 @@ -123,7 +123,7 @@ - + @@ -143,14 +143,14 @@ 16777215 - 74 + 105 Qt::NoFocus - Español + Español @@ -171,14 +171,14 @@ 16777215 - 78 + 110 Qt::NoFocus - Català + Català @@ -199,7 +199,7 @@ 16777215 - 78 + 110 @@ -227,7 +227,7 @@ 16777215 - 78 + 110 @@ -249,7 +249,7 @@ 16777215 - 78 + 110 @@ -268,11 +268,11 @@ 16777215 - 78 + 110 - Français + Français @@ -287,7 +287,7 @@ 16777215 - 78 + 110 @@ -306,11 +306,11 @@ 16777215 - 74 + 105 - Português + Português @@ -325,7 +325,7 @@ 16777215 - 78 + 110 @@ -343,8 +343,8 @@ - 20 - 40 + 28 + 57 @@ -358,6 +358,6 @@
SilentQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsMyAccountMenu.ui b/bqSetting/ui/SettingsMyAccountMenu.ui index a5aa2d8..5fd0cfe 100755 --- a/bqSetting/ui/SettingsMyAccountMenu.ui +++ b/bqSetting/ui/SettingsMyAccountMenu.ui @@ -6,8 +6,8 @@ 0 0 - 603 - 799 + 853 + 1130 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 758 - 1024 + 1072 + 1448 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,7 +71,7 @@ 16777215 - 10000 + 14142 @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -114,7 +114,7 @@ - + @@ -140,7 +140,7 @@ 16777215 - 83 + 117 @@ -168,7 +168,7 @@ 16777215 - 85 + 120 @@ -196,7 +196,7 @@ 16777215 - 82 + 116 @@ -217,8 +217,8 @@ - 20 - 40 + 28 + 57 @@ -232,6 +232,6 @@
SilentQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsNetworkWifiInfo.ui b/bqSetting/ui/SettingsNetworkWifiInfo.ui index 3db6a82..320ccbb 100755 --- a/bqSetting/ui/SettingsNetworkWifiInfo.ui +++ b/bqSetting/ui/SettingsNetworkWifiInfo.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -51,8 +51,8 @@ - 600 - 60 + 849 + 85 @@ -68,7 +68,7 @@ Qt::NoFocus - Atrás + Atrás @@ -83,11 +83,11 @@ 16777215 - 10000 + 14142 - Información de red + Información de red @@ -98,8 +98,8 @@ - 40 - 20 + 57 + 28 @@ -126,7 +126,7 @@ - + @@ -188,8 +188,8 @@ - 40 - 20 + 57 + 28 @@ -252,7 +252,7 @@ - Calidad de señal: + Calidad de señal: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -269,8 +269,8 @@ - 40 - 20 + 57 + 28 @@ -333,7 +333,7 @@ - + IP Address: @@ -353,8 +353,8 @@ - 40 - 20 + 57 + 28 @@ -434,8 +434,8 @@ - 40 - 20 + 57 + 28 @@ -515,8 +515,8 @@ - 40 - 20 + 57 + 28 @@ -596,8 +596,8 @@ - 40 - 20 + 57 + 28 @@ -683,8 +683,8 @@ - 40 - 20 + 57 + 28 @@ -721,8 +721,8 @@ - 20 - 40 + 28 + 57 @@ -742,8 +742,8 @@ - 40 - 20 + 57 + 28 @@ -779,8 +779,8 @@ - 40 - 20 + 57 + 28 @@ -797,8 +797,8 @@ - 20 - 40 + 28 + 57 @@ -812,6 +812,6 @@
SilentQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsPageScreenSaver.ui b/bqSetting/ui/SettingsPageScreenSaver.ui index ff1e72a..79f55d6 100755 --- a/bqSetting/ui/SettingsPageScreenSaver.ui +++ b/bqSetting/ui/SettingsPageScreenSaver.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -44,7 +44,7 @@ - + @@ -59,7 +59,7 @@ Qt::NoFocus - Atrás + Atrás @@ -74,7 +74,7 @@ 16777215 - 10000 + 14142 @@ -89,8 +89,8 @@ - 40 - 20 + 57 + 28 @@ -156,7 +156,7 @@ 16777215 - 83 + 117 @@ -187,14 +187,14 @@ 16777215 - 83 + 117 Qt::NoFocus - Imagenes almacenadas en "screensaver-images" + Imagenes almacenadas en "screensaver-images" true @@ -218,14 +218,14 @@ 16777215 - 83 + 117 Qt::NoFocus - Portada del libro más reciente + Portada del libro más reciente true @@ -242,8 +242,8 @@ - 20 - 40 + 28 + 57 @@ -257,6 +257,6 @@
SilentQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsPagerCont.ui b/bqSetting/ui/SettingsPagerCont.ui index f3ceb6e..becb427 100755 --- a/bqSetting/ui/SettingsPagerCont.ui +++ b/bqSetting/ui/SettingsPagerCont.ui @@ -6,15 +6,15 @@ 0 0 - 560 - 62 + 792 + 88 Form - + @@ -30,8 +30,8 @@ - 40 - 20 + 57 + 28 @@ -48,7 +48,7 @@ Qt::NoFocus - + @@ -128,7 +128,7 @@ Qt::NoFocus - + @@ -139,8 +139,8 @@ - 40 - 20 + 57 + 28 @@ -154,6 +154,6 @@
SilentQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsQuickSettingsPopup.ui b/bqSetting/ui/SettingsQuickSettingsPopup.ui index 4351207..ec72dfb 100755 --- a/bqSetting/ui/SettingsQuickSettingsPopup.ui +++ b/bqSetting/ui/SettingsQuickSettingsPopup.ui @@ -1,1220 +1,1220 @@ - - - SettingsQuickSettingsPopup - - - - 0 - 0 - 758 - 960 - - - - - 0 - 0 - - - - - 758 - 960 - - - - - 758 - 960 - - - - Qt::StrongFocus - - - Form - - - - - - - 0 - - - - - - 0 - 0 - - - - - - - - 0 - - - 2 - - - 0 - - - 2 - - - 0 - - - - - - 0 - - - 0 - - - - - Ajustes rápidos - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::NoFocus - - - - - - - - - - - - - - - - - - - 0 - - - 0 - - - 20 - - - 0 - - - 0 - - - - - - - - - 0 - - - 0 - - - 10 - - - 0 - - - 0 - - - - - Wi-Fi - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::NoFocus - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 2 - 20 - - - - - - - - - - - - 0 - - - 0 - - - - - Luz de pantalla - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::NoFocus - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 2 - 20 - - - - - - - - - - - Intensidad de la luz - - - - - - - - 0 - - - 0 - - - 0 - - - 5 - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 5 - 20 - - - - - - - - Qt::NoFocus - - - - - - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 45 - - - - - - - - - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - - - - - - - - Qt::NoFocus - - - + - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 5 - 20 - - - - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - SilentQPushButton - QPushButton -
SilentQPushButton.h
- - - SwipeableQPushButton - QPushButton -
SwipeableQPushButton.h
- - - BrightnessSliderItem - QWidget -
BrightnessSliderItem.h
- 1 - - - BrightnessSlider - QWidget -
BrightnessSlider.h
- 1 - - - LongPressedQPushButton - QPushButton -
LongPressedQPushButton.h
- - - - - + + + SettingsQuickSettingsPopup + + + + 0 + 0 + 1072 + 1358 + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 1072 + 1358 + + + + Qt::StrongFocus + + + Form + + + + + + + 0 + + + + + + 0 + 0 + + + + + + + + 0 + + + 2 + + + 0 + + + 2 + + + 0 + + + + + + 0 + + + 0 + + + + + Ajustes rápidos + + + + + + + Qt::Horizontal + + + + 57 + 28 + + + + + + + + Qt::NoFocus + + + + + + + + + + + + + + + + + + + 0 + + + 0 + + + 20 + + + 0 + + + 0 + + + + + + + + + 0 + + + 0 + + + 10 + + + 0 + + + 0 + + + + + Wi-Fi + + + + + + + Qt::Horizontal + + + + 57 + 28 + + + + + + + + Qt::NoFocus + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 28 + + + + + + + + + + + + 0 + + + 0 + + + + + Luz de pantalla + + + + + + + Qt::Horizontal + + + + 57 + 28 + + + + + + + + Qt::NoFocus + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 28 + + + + + + + + + + + Intensidad de la luz + + + + + + + + 0 + + + 0 + + + 0 + + + 5 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 7 + 28 + + + + + + + + Qt::NoFocus + + + - + + + + + + + + 0 + 0 + + + + Qt::NoFocus + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 28 + 64 + + + + + + + + + + + + + + + 0 + 0 + + + + Qt::NoFocus + + + + + + + + + + Qt::NoFocus + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 7 + 28 + + + + + + + + + + + + + + + + Qt::Vertical + + + + 28 + 57 + + + + + + + + + + + + SilentQPushButton + QPushButton +
SilentQPushButton.h
+ + + SwipeableQPushButton + QPushButton +
SwipeableQPushButton.h
+ + + BrightnessSliderItem + QWidget +
BrightnessSliderItem.h
+ 1 + + + BrightnessSlider + QWidget +
BrightnessSlider.h
+ 1 + + + LongPressedQPushButton + QPushButton +
LongPressedQPushButton.h
+ + + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsReaderMenu.ui b/bqSetting/ui/SettingsReaderMenu.ui index d5e51be..6a00205 100755 --- a/bqSetting/ui/SettingsReaderMenu.ui +++ b/bqSetting/ui/SettingsReaderMenu.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,7 +71,7 @@ 16777215 - 10000 + 14142 @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -120,7 +120,7 @@ - + @@ -155,7 +155,7 @@ 16777215 - 87 + 123 @@ -183,7 +183,7 @@ 16777215 - 84 + 119 @@ -204,8 +204,8 @@ - 20 - 40 + 28 + 57 @@ -219,8 +219,6 @@
SilentQPushButton.h
- - - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsReaderPageTurning.ui b/bqSetting/ui/SettingsReaderPageTurning.ui index 4c87f10..6cf81ca 100755 --- a/bqSetting/ui/SettingsReaderPageTurning.ui +++ b/bqSetting/ui/SettingsReaderPageTurning.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -44,7 +44,7 @@ - + @@ -59,7 +59,7 @@ Qt::NoFocus - Atrás + Atrás @@ -74,11 +74,11 @@ 16777215 - 10000 + 14142 - Paso de página + Paso de página @@ -89,8 +89,8 @@ - 40 - 20 + 57 + 28 @@ -111,7 +111,7 @@ - Selecciona el área de paso de página de la pantalla de tu dispositivo en modo lectura + Selecciona el área de paso de página de la pantalla de tu dispositivo en modo lectura Qt::AlignCenter @@ -133,7 +133,7 @@ - + @@ -156,7 +156,7 @@ 16777215 - 1000 + 1414 @@ -191,8 +191,8 @@ - 40 - 20 + 57 + 28 @@ -213,12 +213,12 @@ - 50 - 1020 + 71 + 1442 - + @@ -229,8 +229,8 @@ - 40 - 20 + 57 + 28 @@ -260,8 +260,8 @@ - 40 - 20 + 57 + 28 @@ -279,7 +279,7 @@ - Página siguiente + Página siguiente 0 @@ -293,8 +293,8 @@ - 40 - 20 + 57 + 28 @@ -313,13 +313,13 @@ 16777215 - 1000 + 1414 0 - 39 + 55 @@ -336,8 +336,8 @@ - 40 - 20 + 57 + 28 @@ -353,7 +353,7 @@ 16777215 - 1005 + 1421 @@ -375,11 +375,11 @@ 16777215 - 1005 + 1421 - Página atrás + Página atrás 0 @@ -393,8 +393,8 @@ - 40 - 20 + 57 + 28 @@ -413,11 +413,11 @@ 16777215 - 175 + 247 - + @@ -458,8 +458,8 @@ - 40 - 20 + 57 + 28 @@ -480,8 +480,8 @@ - 50 - 1020 + 71 + 1442 @@ -491,7 +491,7 @@ Qt::LeftToRight - + @@ -502,8 +502,8 @@ - 40 - 20 + 57 + 28 @@ -533,8 +533,8 @@ - 40 - 20 + 57 + 28 @@ -550,7 +550,7 @@ 16777215 - 1005 + 1421 @@ -572,11 +572,11 @@ 16777215 - 1005 + 1421 - Página atrás + Página atrás 0 @@ -590,8 +590,8 @@ - 40 - 20 + 57 + 28 @@ -610,13 +610,13 @@ 16777215 - 1000 + 1414 0 - 100 + 141 @@ -633,8 +633,8 @@ - 40 - 20 + 57 + 28 @@ -650,7 +650,7 @@ 16777215 - 1005 + 1421 @@ -672,11 +672,11 @@ 16777215 - 1005 + 1421 - Página siguiente + Página siguiente 0 @@ -690,8 +690,8 @@ - 40 - 20 + 57 + 28 @@ -710,11 +710,11 @@ 16777215 - 175 + 247 - + @@ -794,7 +794,7 @@ - + @@ -808,7 +808,7 @@ 16777215 - 10000 + 14142 @@ -843,8 +843,8 @@ - 100000 - 64 + 141421 + 91 @@ -866,7 +866,7 @@ 16777215 - 1000 + 1414 @@ -894,7 +894,7 @@ - Número de pasos de página para hacer refresco + Número de pasos de página para hacer refresco Qt::AlignCenter @@ -923,8 +923,8 @@ - 40 - 20 + 57 + 28 @@ -1009,8 +1009,8 @@ - 40 - 20 + 57 + 28 @@ -1025,8 +1025,8 @@ - 20 - 40 + 28 + 57 @@ -1040,6 +1040,6 @@
SilentQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsReaderProgressBar.ui b/bqSetting/ui/SettingsReaderProgressBar.ui index 1025eb2..7737288 100755 --- a/bqSetting/ui/SettingsReaderProgressBar.ui +++ b/bqSetting/ui/SettingsReaderProgressBar.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -44,7 +44,7 @@ - + @@ -59,7 +59,7 @@ Qt::NoFocus - Atrás + Atrás @@ -74,11 +74,11 @@ 16777215 - 10000 + 14142 - Configuración del visor + Configuración del visor @@ -89,8 +89,8 @@ - 40 - 20 + 57 + 28 @@ -144,7 +144,7 @@ - Selecciona las áreas que deseas mostrar en tu dispositivo en modo lectura + Selecciona las áreas que deseas mostrar en tu dispositivo en modo lectura Qt::AlignCenter @@ -187,7 +187,7 @@ - + @@ -201,8 +201,8 @@ - 414 - 39 + 585 + 55 @@ -221,7 +221,7 @@ - Este es el título del libro + Este es el título del libro @@ -232,8 +232,8 @@ - 40 - 20 + 57 + 28 @@ -269,7 +269,7 @@ - + @@ -310,15 +310,15 @@ - 272 - 60 + 385 + 85 Qt::NoFocus - Título del libro + Título del libro true @@ -332,8 +332,8 @@ - 40 - 20 + 57 + 28 @@ -396,7 +396,7 @@ 16777215 - 60 + 85 @@ -431,8 +431,8 @@ - 1000 - 100 + 1414 + 141 @@ -466,16 +466,16 @@ de lectura - 100000 - 78 + 141421 + 110 Qt::NoFocus - Páginas leídas / -Páginas totales + Páginas leídas / +Páginas totales true @@ -498,16 +498,16 @@ Páginas totales - 1000 - 100 + 1414 + 141 Qt::NoFocus - Págs. para -fin de capítulo + Págs. para +fin de capítulo true @@ -555,7 +555,7 @@ fin de capítulo 16777215 - 45 + 64 @@ -586,11 +586,11 @@ fin de capítulo 16777215 - 45 + 64 - Mostrar marcas de capítulo + Mostrar marcas de capítulo true @@ -604,8 +604,8 @@ fin de capítulo - 20 - 40 + 28 + 57 @@ -640,7 +640,7 @@ fin de capítulo - + @@ -702,7 +702,7 @@ fin de capítulo - leído + leído true @@ -719,8 +719,8 @@ fin de capítulo - 40 - 20 + 57 + 28 @@ -741,7 +741,7 @@ fin de capítulo - 12 págs. fin de capítulo + 12 págs. fin de capítulo false @@ -761,15 +761,15 @@ fin de capítulo 0 0 - 95 - 25 + 134 + 35 24 - + @@ -777,12 +777,12 @@ fin de capítulo 20 30 - 21 - 17 + 30 + 24 - + @@ -790,12 +790,12 @@ fin de capítulo 40 30 - 21 - 17 + 30 + 24 - + @@ -803,12 +803,12 @@ fin de capítulo 70 30 - 21 - 17 + 30 + 24 - + @@ -816,12 +816,12 @@ fin de capítulo 110 30 - 21 - 17 + 30 + 24 - + @@ -829,12 +829,12 @@ fin de capítulo 140 30 - 21 - 17 + 30 + 24 - + @@ -842,12 +842,12 @@ fin de capítulo 170 30 - 16 - 17 + 23 + 24 - + @@ -855,12 +855,12 @@ fin de capítulo 200 30 - 16 - 17 + 23 + 24 - + @@ -868,12 +868,12 @@ fin de capítulo 230 20 - 16 - 17 + 23 + 24 - + @@ -881,12 +881,12 @@ fin de capítulo 270 20 - 21 - 20 + 30 + 28 - + @@ -894,12 +894,12 @@ fin de capítulo 220 30 - 21 - 17 + 30 + 24 - + @@ -919,7 +919,7 @@ fin de capítulo - + @@ -933,8 +933,8 @@ fin de capítulo - 20 - 40 + 28 + 57 @@ -948,6 +948,6 @@ fin de capítulo
SilentQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsSleepTimeMenu.ui b/bqSetting/ui/SettingsSleepTimeMenu.ui index 4821f16..11e4b3a 100755 --- a/bqSetting/ui/SettingsSleepTimeMenu.ui +++ b/bqSetting/ui/SettingsSleepTimeMenu.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,7 +71,7 @@ 16777215 - 10000 + 14142 @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -108,7 +108,7 @@ - Selecciona el tiempo que transcurrirá hasta que tu dispositivo entre automáticamente en reposo + Selecciona el tiempo que transcurrirá hasta que tu dispositivo entre automáticamente en reposo Qt::AlignCenter @@ -130,7 +130,7 @@ - + @@ -156,7 +156,7 @@ 16777215 - 83 + 117 @@ -184,7 +184,7 @@ 16777215 - 85 + 120 @@ -212,7 +212,7 @@ 16777215 - 85 + 120 @@ -240,14 +240,14 @@ - 20 - 40 + 28 + 57 - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsSwitchOffTimeMenu.ui b/bqSetting/ui/SettingsSwitchOffTimeMenu.ui index 80a2f60..8fcaa43 100755 --- a/bqSetting/ui/SettingsSwitchOffTimeMenu.ui +++ b/bqSetting/ui/SettingsSwitchOffTimeMenu.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,7 +71,7 @@ 16777215 - 10000 + 14142 @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -108,7 +108,7 @@ - Selecciona el tiempo que transcurrirá hasta que tu dispositivo quede apagado + Selecciona el tiempo que transcurrirá hasta que tu dispositivo quede apagado Qt::AlignCenter @@ -130,7 +130,7 @@ - + @@ -156,7 +156,7 @@ 16777215 - 83 + 117 @@ -184,7 +184,7 @@ 16777215 - 85 + 120 @@ -212,7 +212,7 @@ 16777215 - 85 + 120 @@ -234,14 +234,14 @@ 16777215 - 85 + 120 Qt::NoFocus - 1 día + 1 día @@ -256,14 +256,14 @@ 16777215 - 85 + 120 Qt::NoFocus - 3 días + 3 días @@ -278,7 +278,7 @@ 16777215 - 85 + 120 @@ -299,14 +299,14 @@ - 20 - 40 + 28 + 57 - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsTechnicalInfo.ui b/bqSetting/ui/SettingsTechnicalInfo.ui index 0d2c5fc..21f0294 100755 --- a/bqSetting/ui/SettingsTechnicalInfo.ui +++ b/bqSetting/ui/SettingsTechnicalInfo.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,11 +71,11 @@ 16777215 - 10000 + 14142 - Información básica + Información básica @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -114,7 +114,7 @@ - + @@ -151,8 +151,8 @@ - 228 - 60 + 322 + 85 @@ -173,8 +173,8 @@ - 10000 - 60 + 14142 + 85 @@ -207,8 +207,8 @@ - 228 - 60 + 322 + 85 @@ -229,8 +229,8 @@ - 10000 - 60 + 14142 + 85 @@ -263,12 +263,12 @@ - 228 - 60 + 322 + 85 - Direción MAC: + Direción MAC: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -285,8 +285,8 @@ - 10000 - 60 + 14142 + 85 @@ -319,8 +319,8 @@ - 228 - 60 + 322 + 85 @@ -341,8 +341,8 @@ - 10000 - 60 + 14142 + 85 @@ -375,8 +375,8 @@ - 228 - 60 + 322 + 85 @@ -397,8 +397,8 @@ - 10000 - 60 + 14142 + 85 @@ -423,16 +423,22 @@ + + + 0 + 0 + + - 228 + 184 60 - 198 - 60 + 260 + 85 @@ -447,14 +453,14 @@ - 300 + 250 60 - 10000 - 60 + 14142 + 85 @@ -487,8 +493,8 @@ - 228 - 60 + 322 + 85 @@ -509,8 +515,8 @@ - 10000 - 60 + 14142 + 85 @@ -543,8 +549,8 @@ - 228 - 60 + 322 + 85 @@ -571,8 +577,8 @@ - 10000 - 60 + 14142 + 85 @@ -605,12 +611,12 @@ - 228 - 60 + 322 + 85 - Nivel de batería: + Nivel de batería: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -627,8 +633,8 @@ - 10000 - 60 + 14142 + 85 @@ -655,8 +661,8 @@ - 20 - 40 + 28 + 57 @@ -670,6 +676,6 @@
SilentQPushButton.h
- - + + diff --git a/bqSetting/ui/SettingsUnLinkStoreDevice.ui b/bqSetting/ui/SettingsUnLinkStoreDevice.ui index c2d4f3d..3dcaf94 100755 --- a/bqSetting/ui/SettingsUnLinkStoreDevice.ui +++ b/bqSetting/ui/SettingsUnLinkStoreDevice.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,7 +71,7 @@ 16777215 - 1000 + 1414 @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -114,7 +114,7 @@ - + @@ -149,7 +149,7 @@ 16777215 - 1010 + 1428 @@ -180,7 +180,7 @@ 16777215 - 1030 + 1457 @@ -214,7 +214,7 @@ 16777215 - 1016 + 1437 @@ -248,7 +248,7 @@ 16777215 - 1030 + 1457 @@ -274,7 +274,7 @@ - Suscripción a Nubico Premium + Suscripción a Nubico Premium true @@ -341,8 +341,8 @@ - 40 - 20 + 57 + 28 @@ -366,7 +366,7 @@ - Última sincronización de datos: + Última sincronización de datos: false @@ -402,8 +402,8 @@ - 40 - 20 + 57 + 28 @@ -421,11 +421,11 @@ 16777215 - 10000 + 14142 - * Estado vigente en la última sincronización + * Estado vigente en la última sincronización Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -447,8 +447,8 @@ - Debido a un error en el pago de tu cuota mensual, tu suscripción se encuentra temporalmente inhabilitada. Accede www.nubico.es y renueva tu suscripción desde “Historial de pagos” de tu cuenta. -Hasta el XX/XX/XXXX disfrutarás de un período de cortesía para que termines de leer los eBooks activos en tu dispositivo, no pudiendo añadir nuevos eBooks a tu biblioteca. + Debido a un error en el pago de tu cuota mensual, tu suscripción se encuentra temporalmente inhabilitada. Accede www.nubico.es y renueva tu suscripción desde “Historial de pagos” de tu cuenta. +Hasta el XX/XX/XXXX disfrutarás de un período de cortesía para que termines de leer los eBooks activos en tu dispositivo, no pudiendo añadir nuevos eBooks a tu biblioteca. Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -468,8 +468,8 @@ Hasta el XX/XX/XXXX disfrutarás de un período de cortesía para que termines d - 20 - 40 + 28 + 57 @@ -490,15 +490,15 @@ Hasta el XX/XX/XXXX disfrutarás de un período de cortesía para que termines d - 10000 - 77 + 14142 + 109 Qt::NoFocus - + Desconectar cuenta @@ -534,8 +534,8 @@ Hasta el XX/XX/XXXX disfrutarás de un período de cortesía para que termines d - 20 - 40 + 28 + 57 @@ -549,8 +549,6 @@ Hasta el XX/XX/XXXX disfrutarás de un período de cortesía para que termines d
SilentQPushButton.h
- - - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsUpdateDeviceAuto.ui b/bqSetting/ui/SettingsUpdateDeviceAuto.ui index 421fab9..45cadd9 100755 --- a/bqSetting/ui/SettingsUpdateDeviceAuto.ui +++ b/bqSetting/ui/SettingsUpdateDeviceAuto.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,7 +71,7 @@ 16777215 - 10000 + 14142 @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -116,7 +116,7 @@ 16777215 - 100000 + 141421 @@ -135,7 +135,7 @@ - Se ha encontrado una actualización: + Se ha encontrado una actualización: Qt::AlignCenter @@ -180,7 +180,7 @@ - + @@ -209,7 +209,7 @@ 16777215 - 112 + 158 @@ -230,7 +230,7 @@ - 20 + 28 1 @@ -249,8 +249,8 @@ - 20 - 40 + 28 + 57 @@ -275,6 +275,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsWiFiDetail.ui b/bqSetting/ui/SettingsWiFiDetail.ui index f89170c..eca6a46 100755 --- a/bqSetting/ui/SettingsWiFiDetail.ui +++ b/bqSetting/ui/SettingsWiFiDetail.ui @@ -6,15 +6,15 @@ 0 0 - 600 - 750 + 849 + 1061 Form - + @@ -33,8 +33,8 @@ - 100000 - 100000 + 141421 + 141421 @@ -59,7 +59,7 @@ Qt::NoFocus - Atrás + Atrás @@ -74,11 +74,11 @@ 16777215 - 10000 + 14142 - Información de red + Información de red @@ -89,8 +89,8 @@ - 40 - 20 + 57 + 28 @@ -120,7 +120,7 @@ 0 - + @@ -142,7 +142,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -186,7 +186,7 @@ - + @@ -201,14 +201,14 @@ - Calidad de señal: + Calidad de señal: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - + @@ -230,7 +230,7 @@ - + @@ -252,7 +252,7 @@ - + @@ -274,7 +274,7 @@ - + @@ -296,7 +296,7 @@ - + @@ -318,7 +318,7 @@ - + @@ -340,7 +340,7 @@ - + @@ -362,7 +362,7 @@ - + @@ -384,7 +384,7 @@ - + @@ -406,7 +406,7 @@ - + @@ -428,7 +428,7 @@ - + @@ -444,7 +444,7 @@ - + @@ -477,7 +477,7 @@ 0 - 20 + 28 @@ -498,8 +498,8 @@ - 40 - 20 + 57 + 28 @@ -525,7 +525,7 @@ - + Edit @@ -553,7 +553,7 @@ - + Forget @@ -581,7 +581,7 @@ - + Disconnect @@ -598,8 +598,8 @@ - 20 - 40 + 28 + 57 @@ -618,6 +618,6 @@
FastQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsWiFiList.ui b/bqSetting/ui/SettingsWiFiList.ui index 5b8b859..3d5e7fa 100755 --- a/bqSetting/ui/SettingsWiFiList.ui +++ b/bqSetting/ui/SettingsWiFiList.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -56,7 +56,7 @@ Qt::NoFocus - Atrás + Atrás @@ -71,11 +71,11 @@ 16777215 - 10000 + 14142 - Conexión WiFi + Conexión WiFi @@ -86,8 +86,8 @@ - 40 - 20 + 57 + 28 @@ -114,7 +114,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -168,8 +168,8 @@ - 40 - 20 + 57 + 28 @@ -177,7 +177,7 @@ - + @@ -203,8 +203,8 @@ - 40 - 20 + 57 + 28 @@ -218,7 +218,7 @@ - + @@ -238,7 +238,7 @@ - "nombre de la red" + "nombre de la red" 0 @@ -252,8 +252,8 @@ - 40 - 20 + 57 + 28 @@ -264,7 +264,7 @@ - + @@ -311,7 +311,7 @@ - Añadir red + Añadir red @@ -322,8 +322,8 @@ - 40 - 20 + 57 + 28 @@ -331,7 +331,7 @@ - + @@ -339,22 +339,22 @@ - + - + - + - + - + - + @@ -363,8 +363,8 @@ - 20 - 40 + 28 + 57 @@ -372,7 +372,7 @@ - + @@ -397,8 +397,8 @@ - 20 - 40 + 28 + 57 @@ -411,17 +411,17 @@ QPushButton
SilentQPushButton.h
- - SwipeableQPushButton - QPushButton -
SwipeableQPushButton.h
- SettingsPagerCont QWidget
SettingsPagerCont.h
1 + + SwipeableQPushButton + QPushButton +
SwipeableQPushButton.h
+ SettingsWiFiListItem QWidget @@ -429,6 +429,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/SettingsWiFiPasswordMenu.ui b/bqSetting/ui/SettingsWiFiPasswordMenu.ui index ed48b6a..ac72a8a 100755 --- a/bqSetting/ui/SettingsWiFiPasswordMenu.ui +++ b/bqSetting/ui/SettingsWiFiPasswordMenu.ui @@ -6,15 +6,15 @@ 0 0 - 600 - 800 + 849 + 1131 Form - + @@ -33,8 +33,8 @@ - 20 - 80 + 28 + 113 @@ -73,7 +73,7 @@ - Contraseña de red + Contraseña de red 0 @@ -98,7 +98,7 @@ 2 - + @@ -108,7 +108,7 @@ Qt::NoFocus - Ocultar contraseña + Ocultar contraseña @@ -119,8 +119,8 @@ - 20 - 40 + 28 + 57 @@ -137,8 +137,8 @@ - 40 - 20 + 57 + 28 @@ -171,8 +171,8 @@ - 20 - 40 + 28 + 57 @@ -191,6 +191,6 @@
MyQLineEdit.h
- - - + + + \ No newline at end of file diff --git a/bqSetting/ui/WifiSecurityLayer.ui b/bqSetting/ui/WifiSecurityLayer.ui index 749b2ff..4da19b1 100755 --- a/bqSetting/ui/WifiSecurityLayer.ui +++ b/bqSetting/ui/WifiSecurityLayer.ui @@ -6,8 +6,8 @@ 0 0 - 540 - 576 + 764 + 815 @@ -20,7 +20,7 @@ Form - + @@ -93,14 +93,14 @@ - 20 - 40 + 28 + 57 - - - + + + \ No newline at end of file diff --git a/bqSetting/ui/waitingOverlay.ui b/bqSetting/ui/waitingOverlay.ui index d5fb1a7..4adc72a 100755 --- a/bqSetting/ui/waitingOverlay.ui +++ b/bqSetting/ui/waitingOverlay.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,29 +18,29 @@ - 600 - 750 + 0 + 0 - 758 - 1024 + 1072 + 1448 Form - + 0 0 - 600 - 750 + 849 + 1061 @@ -60,8 +60,8 @@ - 470 - 200 + 665 + 283 @@ -84,7 +84,7 @@ - + @@ -94,8 +94,6 @@ - - - - - + + + \ No newline at end of file diff --git a/bqStore/Store1024.qrc b/bqStore/Store1024.qrc index 80f1d4f..af74719 100755 --- a/bqStore/Store1024.qrc +++ b/bqStore/Store1024.qrc @@ -1,64 +1,64 @@ - res/1024/battery_0_Ico.png - res/1024/battery_1_Ico.png - res/1024/battery_2_Ico.png - res/1024/battery_3_Ico.png - res/1024/battery_plug_Ico.png - res/1024/battery_warning_Ico.png - res/1024/light_off_Ico.png - res/1024/light_on_Ico.png - res/1024/usb_Ico.png - res/1024/wifi_0_Ico.png - res/1024/wifi_1_Ico.png - res/1024/wifi_2_Ico.png - res/1024/wifi_3_Ico.png - res/1024/wifi_4_Ico.png - res/1024/read_Btn.png - res/1024/bg_header.png - res/1024/spinner_Ico.png - res/1024/brightness_max.png - res/1024/brightness_min.png - res/1024/off_btn.png - res/1024/on_btn.png - res/1024/progress_Indicator.png - res/1024/bgSynopsisPopup.png - res/1024/arrow_for_buttons.png - res/1024/spinner.png - res/1024/down_pager_btn.png - res/1024/up_pager_btn.png - res/1024/up_pager_disabled_btn.png - res/1024/down_pager_disabled_btn.png - res/1024/bg_clear_search.png - res/1024/bg_search_input.png - res/1024/store_file.png - res/1024/jpg_list.png - res/1024/gif_list.png - res/1024/png_list.png - res/1024/txt_list.png - res/1024/doc_list.png - res/1024/unknow_list.png - res/1024/pdf_list.png - res/1024/folder_list.png - res/1024/corrupted_list.png - res/1024/img_list.png - res/1024/book_pdf_list.png - res/1024/book_epub_list.png - res/1024/power_off.png - res/1024/sleep.png - res/1024/wifi_connecting_Ico.png - res/1024/wifi_off_Ico.png - res/1024/wifi_no_connected.png - res/1024/close_popup_ico.png - res/1024/bg_transparent.png - res/1024/ic-deleteOne.png - res/1024/ic-keyboard_enter.png - res/1024/ic-nextChar.png - res/1024/ic-shift_over.png - res/1024/ic-previousChar.png + res/1448/battery_0_Ico.png + res/1448/battery_1_Ico.png + res/1448/battery_2_Ico.png + res/1448/battery_3_Ico.png + res/1448/battery_plug_Ico.png + res/1448/battery_warning_Ico.png + res/1448/light_off_Ico.png + res/1448/light_on_Ico.png + res/1448/usb_Ico.png + res/1448/wifi_0_Ico.png + res/1448/wifi_1_Ico.png + res/1448/wifi_2_Ico.png + res/1448/wifi_3_Ico.png + res/1448/wifi_4_Ico.png + res/1448/read_Btn.png + res/1448/bg_header.png + res/1448/spinner_Ico.png + res/1448/brightness_max.png + res/1448/brightness_min.png + res/1448/off_btn.png + res/1448/on_btn.png + res/1448/progress_Indicator.png + res/1448/bgSynopsisPopup.png + res/1448/arrow_for_buttons.png + res/1448/spinner.png + res/1448/down_pager_btn.png + res/1448/up_pager_btn.png + res/1448/up_pager_disabled_btn.png + res/1448/down_pager_disabled_btn.png + res/1448/bg_clear_search.png + res/1448/bg_search_input.png + res/1448/store_file.png + res/1448/jpg_list.png + res/1448/gif_list.png + res/1448/png_list.png + res/1448/txt_list.png + res/1448/doc_list.png + res/1448/unknow_list.png + res/1448/pdf_list.png + res/1448/folder_list.png + res/1448/corrupted_list.png + res/1448/img_list.png + res/1448/book_pdf_list.png + res/1448/book_epub_list.png + res/1448/power_off.png + res/1448/sleep.png + res/1448/wifi_connecting_Ico.png + res/1448/wifi_off_Ico.png + res/1448/wifi_no_connected.png + res/1448/close_popup_ico.png + res/1448/bg_transparent.png + res/1448/ic-deleteOne.png + res/1448/ic-keyboard_enter.png + res/1448/ic-nextChar.png + res/1448/ic-shift_over.png + res/1448/ic-previousChar.png res/ui_styles_generic.qss - res/1024/ui_styles.qss - res/1024/checkbox_checked.png - res/1024/uncheked.png + res/1448/ui_styles.qss + res/1448/checkbox_checked.png + res/1448/uncheked.png diff --git a/bqStore/Store1448.qrc b/bqStore/Store1448.qrc new file mode 100755 index 0000000..80f1d4f --- /dev/null +++ b/bqStore/Store1448.qrc @@ -0,0 +1,64 @@ + + + res/1024/battery_0_Ico.png + res/1024/battery_1_Ico.png + res/1024/battery_2_Ico.png + res/1024/battery_3_Ico.png + res/1024/battery_plug_Ico.png + res/1024/battery_warning_Ico.png + res/1024/light_off_Ico.png + res/1024/light_on_Ico.png + res/1024/usb_Ico.png + res/1024/wifi_0_Ico.png + res/1024/wifi_1_Ico.png + res/1024/wifi_2_Ico.png + res/1024/wifi_3_Ico.png + res/1024/wifi_4_Ico.png + res/1024/read_Btn.png + res/1024/bg_header.png + res/1024/spinner_Ico.png + res/1024/brightness_max.png + res/1024/brightness_min.png + res/1024/off_btn.png + res/1024/on_btn.png + res/1024/progress_Indicator.png + res/1024/bgSynopsisPopup.png + res/1024/arrow_for_buttons.png + res/1024/spinner.png + res/1024/down_pager_btn.png + res/1024/up_pager_btn.png + res/1024/up_pager_disabled_btn.png + res/1024/down_pager_disabled_btn.png + res/1024/bg_clear_search.png + res/1024/bg_search_input.png + res/1024/store_file.png + res/1024/jpg_list.png + res/1024/gif_list.png + res/1024/png_list.png + res/1024/txt_list.png + res/1024/doc_list.png + res/1024/unknow_list.png + res/1024/pdf_list.png + res/1024/folder_list.png + res/1024/corrupted_list.png + res/1024/img_list.png + res/1024/book_pdf_list.png + res/1024/book_epub_list.png + res/1024/power_off.png + res/1024/sleep.png + res/1024/wifi_connecting_Ico.png + res/1024/wifi_off_Ico.png + res/1024/wifi_no_connected.png + res/1024/close_popup_ico.png + res/1024/bg_transparent.png + res/1024/ic-deleteOne.png + res/1024/ic-keyboard_enter.png + res/1024/ic-nextChar.png + res/1024/ic-shift_over.png + res/1024/ic-previousChar.png + res/ui_styles_generic.qss + res/1024/ui_styles.qss + res/1024/checkbox_checked.png + res/1024/uncheked.png + + diff --git a/bqStore/res/1448/store_styles.qss b/bqStore/res/1448/store_styles.qss new file mode 100644 index 0000000..98ba1c6 --- /dev/null +++ b/bqStore/res/1448/store_styles.qss @@ -0,0 +1,794 @@ +/************************************************************************* + +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 . + +*************************************************************************/ + +/* Library +--------------------------*/ +#Library{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#Library #searchCont{ +margin: 0px 35px; +min-height: 109px; +max-height: 109px; +border-width: 1px; +} +#searchCont #sortBooksLbl{ +margin-left: 35px; +font-size: 34px; +font-weight:bold; +} +#Library #selectAllBooksBtn{ +margin-right: 35px; +min-height: 82px; +max-height: 82px; +padding: 0px 54px; +border-width: 1px; +border-radius: 8px; +} +#Library #editBooksBtn{ +margin-right: 35px; +min-height: 82px; +max-height: 82px; +padding: 0px 54px; +border-width: 1px; +border-radius: 8px; +} +#Library #sortBooksCont #archiveBooksBtn, #Library #sortBooksCont #deleteBooksBtn, #Library #sortBooksCont #closeEditBooksBtn{ +border-color:#808080; +background-color:#FFFFFF; +border-style:solid; +padding: 0px 54px; +margin: 0px 0px 0px 28px; +min-height: 82px; +max-height: 82px; +border-width: 3px; +border-radius: 8px; +} +#searchCont #librarySearchLineEdit{ +margin-left: 35px; +padding-left: 82px; +min-width: 0px; +max-width: 933px; +min-height: 99px; +max-height: 99px; +border-radius:0; +} +#Library #searchCont #clearSearchBtn{ +margin: 0px; +min-width: 83px; +max-width: 83px; +min-height: 99px; +max-height: 99px; +border-width: 0px; +} +#searchCont #closeSearchBtn{ +margin: 0px 35px; +min-height: 82px; +max-height: 82px; +padding: 0px 54px; +border-width: 3px; +border-radius: 8px; +} +#searchCont #synchronizeBtn{ +margin: 0px 35px 0px 28px; +min-width: 82px; +max-width: 82px; +min-height: 82px; +max-height: 82px; +} +#topActions{ +/*margin: 0px 28px;*/ +min-height: 95px; +max-height: 95px; +border-width: 1px; +} +#topActions #bookActionsSelectBtn{ +padding: 0px 35px 0px 0px; +margin: 0px 0px 0px 35px; +} +#topActions #showResultsLbl{ +margin: 0px 0px 0px 35px; +} +#topActions #pathDotsLbl{ +padding: 0px 7px 0px 28px; +} +#topActions #pathLbl{ +} +#breadCrumb{ +padding: 0px 28px 0px 28px; +} +#booksContainer{ +min-height: 1032px; +max-height: 1150px; +} +#sortBooksCont{ +margin: 0px 35px; +min-height: 116px; +max-height: 116px; +border-top-width: 1px; +border-top-radius: 33px; +} +#sortBooksCont #sortIconBtn{ +margin: 0px 0px 0px 35px; +min-width: 91px; +max-width: 91px; +min-height: 72px; +max-height: 72px; +border-width: 3px; +border-top-left-radius: 8px; +border-bottom-left-radius: 8px; +} +#sortBooksCont #sortListBtn{ +margin: 0px 35px 0px 0px; +min-width: 91px; +max-width: 91px; +min-height: 72px; +max-height: 72px; +border-width: 3px; +border-top-right-radius: 8px; +border-bottom-right-radius: 8px; +} +#sortBooksCont #recentSortBtn{ +padding: 0px 54px; +min-height: 72px; +max-height: 72px; +border-width: 3px; +border-top-left-radius: 8px; +border-bottom-left-radius: 8px; +} +#sortBooksCont #titleSortBtn{ +padding: 0px 54px; +min-height: 72px; +max-height: 72px; +border-width: 3px; +} +#sortBooksCont #authorSortBtn{ +padding: 0px 54px; +min-height: 72px; +max-height: 72px; +border-width: 3px; +border-top-right-radius: 8px; +border-bottom-right-radius: 8px; +} +#sortBooksCont #fileNameBtn{ +padding: 0px 54px; +min-height: 72px; +max-height: 72px; +border-width: 3px; +border-top-left-radius: 8px; +border-bottom-left-radius: 8px; +} +#sortBooksCont #lastModifyBtn{ +padding: 0px 54px; +min-height: 72px; +max-height: 72px; +border-width: 3px; +border-top-right-radius: 8px; +border-bottom-right-radius: 8px; +} +/*LibraryIconGridViewer +--------------------------*/ +#LibraryIconGridViewer{ +min-width: 1072px; +max-width: 1072px; +min-height: 1032px; +max-height: 1032px; +} +#iconGridViewerCont #book1, #iconGridViewerCont #book2, #iconGridViewerCont #book3, #iconGridViewerCont #book4, #iconGridViewerCont #book5, #iconGridViewerCont #book6{ +min-width: 344px; +max-width: 344px; +min-height: 434px; +min-height: 434px; +} +/*LibraryIconGridViewerItem +------------------------------------*/ +#fileCont{ +min-width: 344px; +max-width: 344px; +} +#LibraryIconGridViewerItem { +min-width: 344px; +max-width: 344px; +min-height: 434px; +max-height: 434px; +} +#IconGridViewerItemCont { +min-width: 344px; +max-width: 344px; +min-height: 412px; +max-height: 412px; +} +#IconBookItemCont{ +min-width: 344px; +max-width: 344px; +min-height: 434px; +max-height: 434px; +} +#IconFileItemCont{ +min-width: 344px; +max-width: 344px; +min-height: 434px; +max-height: 434px; +} +#currentBookCoverLbl{ +min-width: 243px; +max-width: 243px; +min-height: 368px; +max-height: 368px; +} +#currentBookTopLeft{ +min-width: 93px; +max-width: 93px; +min-height: 91px; +max-height: 91px; +} +#currentBookTopCenter{ +min-width: 243px; +max-width: 243px; +min-height: 91px; +max-height: 91px; +} +#currentBookTopRight{ +min-width: 72px; +max-width: 72px; +min-height: 91px; +max-height: 91px; +} +#currentBookCenterLeft{ +min-width: 93px; +max-width: 93px; +min-height: 368px; +max-height: 368px; +} +#currentBookCenterRight{ +min-width: 72px; +max-width: 72px; +min-height: 368px; +max-height: 368px; +} +#currentBookBottomLeft{ +min-width: 93px; +max-width: 93px; +min-height: 45px; +max-height: 45px; +} +#currentBookBottomCenter{ +min-width: 243px; +max-width: 243px; +min-height: 45px; +max-height: 45px; +} +#currentBookBottomRight{ +min-width: 72px; +max-width: 72px; +min-height: 45px; +max-height: 45px; +} +#IconGridViewerItemCont #coverCont #topLeftLbl{ +min-width: 35px; +max-width: 35px; +min-height: 8px; +max-height: 8px; +} +#IconGridViewerItemCont #coverCont #topCenterLbl{ +min-width: 243px; +max-width: 243px; +min-height: 8px; +max-height: 8px; +} +#IconGridViewerItemCont #coverCont #topRightLbl{ +min-width: 34px; +max-width: 34px; +min-height: 8px; +max-height: 8px; +} +#IconGridViewerItemCont #coverCont #centerLeftLbl{ +min-width: 35px; +max-width: 35px; +min-height: 368px; +max-height: 368px; +} +#IconGridViewerItemCont #coverCont #cover, #IconGridViewerItemCont #coverCont #cover #coverLabel{ +min-width: 243px; +max-width: 243px; +min-height: 368px; +max-height: 368px; +} +#IconGridViewerItemCont #coverCont #centerRightLbl{ +min-width: 34px; +max-width: 34px; +min-height: 368px; +max-height: 368px; +} +#IconGridViewerItemCont #coverCont #bottomLeftLbl{ +min-width: 35px; +max-width: 35px; +min-height: 24px; +max-height: 24px; +} +#IconGridViewerItemCont #coverCont #bottomCenterLbl{ +min-width: 243px; +max-width: 243px; +min-height: 24px; +max-height: 24px; +} +#IconGridViewerItemCont #coverCont #bottomRightLbl{ +min-width: 34px; +max-width: 34px; +min-height: 24px; +max-height: 24px; +} +#coverFileLbl{ +min-width: 335px; +max-width: 335px; +min-height: 344px; +max-height: 344px; +} +#coverCont #titleLbl,#cover #titleLbl{ +min-width: 253px; +max-width: 253px; +padding: 218px 0px 0px 0px; +font-size: 31px; +} +#coverCont #fileNameLbl,#cover #fileNameLbl{ +min-width: 253px; +max-width: 253px; +min-height: 64px; +max-height: 64px; +font-size: 30px; +} +#coverCont #authorLbl,#cover #authorLbl{ +min-width: 253px; +max-width: 253px; +font-size: 30px; +} +#fileTitleLbl{ +font-size: 30px; +} +#iconGridViewerCont #newTagLbl{ +min-width: 325px; +max-width: 325px; +min-height: 324px; +max-height: 324px; +padding: 0px 0px 0px 0px; +font-size: 27px; +} +#iconGridViewerCont #archiveTagLbl,#LibraryIconGridViewerItem #archiveTagLbl{ +min-width: 325px; +max-width: 325px; +min-height: 324px; +max-height: 324px; +padding: 0px 0px 0px 0px; +font-size: 27px; +} +#iconGridViewerCont #readingTagLbl{ +min-width: 269px; +max-width: 269px; +min-height: 414px; +max-height: 414px; +} +#iconGridViewerCont #sampleTagLbl, +#iconGridViewerCont #subscriptionTagLbl{ +min-width: 389px; +max-width: 389px; +min-height: 441px; +max-height: 441px; +margin: 0px 0px 0px 0px; +font-size: 28px; +} +#iconGridViewerCont #selectBookLbl{ +min-width: 344px; +max-width: 344px; +min-height: 416px; +max-height: 416px; +} +/*IconGridViewer +--------------------------*/ +#LibraryLineGridViewer{ +min-width: 1072px; +max-width: 1072px; +min-height: 1032px; +max-height: 1150px; +} +#LibraryLineGridViewer #book1, #LibraryLineGridViewer #book2, #LibraryLineGridViewer #book3, #LibraryLineGridViewer #book4, #LibraryLineGridViewer #book5, #LibraryLineGridViewer #book6, #book7{ +margin: 0px; +padding: 0px; +min-height: 156px; +min-height: 156px; +border-width: 1px; +} +/*LibraryLineGridViewerItem +------------------------*/ +#LibraryReadingLineGridViewer,#LibraryReadingLineGridViewerCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 1022px; +min-height: 1022px; +} +#LibraryLineGridViewerItemCont,LibraryLineGridViewerItem{ +min-width: 1072px; +max-width: 1072px; +min-height: 156px; +max-height: 156px; +} +#LibraryReadingLineGridViewerCont #book1, #LibraryReadingLineGridViewerCont #book2, #LibraryReadingLineGridViewerCont #book3{ +margin: 0px; +padding: 0px; +min-height: 156px; +max-height: 156px; +border-width: 1px; +} +#LibraryReadingLineGridViewerCont #VerticalPagerHandler{ +min-height: 72px; +min-height: 72px; +} +#LibraryReadingLineGridViewerCont #mainBookInfoCont{ +min-height: 461px; +max-height: 461px; +border-width: 1px; +} +#LibraryLineGridViewerItemCont #typeCont,LibraryLineGridViewerItem #typeCont{ +min-width: 144px; +max-width: 144px; +} +#LibraryLineGridViewerItemCont #titleLbl,LibraryLineGridViewerItem #titleLbl{ +margin: 0px 0px 0px 0px; +padding: 0px 0px 0px 0px; +min-height: 45px; +max-height: 45px; +min-width: 578px; +max-width: 905px; +} +#LibraryLineGridViewerItemCont #authorLbl,LibraryLineGridViewerItem #authorLbl{ +margin: 0px 0px 21px 0px; +font-size: 31px; +min-width: 578px; +max-width: 905px; +} +#LibraryLineGridViewerItemCont #typeCont #iconTypeFileLbl,LibraryLineGridViewerItem #typeCont #iconTypeFileLbl{ +margin: 21px 0px 0px 0px; +min-width: 144px; +max-width: 144px; +min-height: 91px; +max-height: 91px; +} +#LibraryLineGridViewerItemCont #typeCont #readingProgressLbl,LibraryLineGridViewerItem #typeCont #readingProgressLbl{ +font-size: 31px; +} +#LibraryLineGridViewerItemCont #newTagLbl,LibraryLineGridViewerItem #newTagLbl{ +min-width: 79px; +max-width: 79px; +min-height: 156px; +max-height: 156px; +font-size: 28px; +} +#LibraryLineGridViewerItemCont #archiveTagLbl,LibraryLineGridViewerItem #archiveTagLbl{ +min-width: 79px; +max-width: 79px; +min-height: 156px; +max-height: 156px; +font-size: 25px; +} +#LibraryLineGridViewerItemCont #sampleTagLbl, #LibraryLineGridViewerItem #sampleTagLbl, +#LibraryLineGridViewerItemCont #subscriptionTagLbl, #LibraryLineGridViewerItem #subscriptionTagLbl{ +min-width: 79px; +max-width: 79px; +min-height: 156px; +max-height: 156px; +font-size: 28px; +} +#LibraryLineGridViewerItemCont #selectBookLbl ,LibraryLineGridViewerItem #selectBookLbl{ +min-width: 126px; +max-width: 126px; +min-height: 156px; +max-height: 156px; +} +#LibraryReadingLineGridViewerCont #coverCont #topLeftLbl{ +min-width: 35px; +max-width: 35px; +min-height: 20px; +max-height: 20px; +} +#LibraryReadingLineGridViewerCont #coverCont #topCenterLbl{ +min-width: 243px; +max-width: 243px; +min-height: 20px; +max-height: 20px; +} +#LibraryReadingLineGridViewerCont #coverCont #topRightLbl{ +min-width: 34px; +max-width: 34px; +min-height: 20px; +max-height: 20px; +} +#LibraryReadingLineGridViewerCont #coverCont #centerLeftLbl{ +min-width: 35px; +max-width: 35px; +min-height: 368px; +max-height: 368px; +} +#LibraryReadingLineGridViewerCont #coverCont #coverLbl{ +min-width: 243px; +max-width: 243px; +min-height: 368px; +max-height: 368px; +} +#LibraryReadingLineGridViewerCont #coverCont #centerRightLbl{ +min-width: 34px; +max-width: 34px; +min-height: 368px; +max-height: 368px; +} +#LibraryReadingLineGridViewerCont #coverCont #bottomLeftLbl{ +min-width: 35px; +max-width: 35px; +min-height: 28px; +max-height: 28px; +} +#LibraryReadingLineGridViewerCont #coverCont #bottomCenterLbl{ +min-width: 243px; +max-width: 243px; +min-height: 28px; +max-height: 28px; +} +#LibraryReadingLineGridViewerCont #coverCont #bottomRightLbl{ +min-width: 27px; +max-width: 27px; +min-height: 28px; +max-height: 28px; +} +/*LibraryReadingIconGridViewer +-----------------------------*/ +#LibraryReadingIconGridViewer,#LibraryReadingIconGridViewerCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 1022px; +max-height: 1022px; +} +#LibraryReadingIconGridViewerCont #VerticalPagerHandler{ +min-height: 72px; +min-height: 72px; +} +#LibraryReadingIconGridViewerCont #currentBookData{ +min-width: 615px; +max-width: 615px; +} +#LibraryReadingIconGridViewerCont #currentBookCoverLbl{ +min-width: 215px; +max-width: 215px; +min-height: 324px; +max-height: 324px; +} +#LibraryReadingIconGridViewerCont #currentBookTopLeft{ +min-width: 35px; +max-width: 35px; +min-height: 68px; +max-height: 68px; +} +#LibraryReadingIconGridViewerCont #currentBookTopCenter{ +min-width: 215px; +max-width: 215px; +min-height: 68px; +max-height: 68px; +} +#LibraryReadingIconGridViewerCont #currentBookTopRight{ +min-width: 34px; +max-width: 34px; +min-height: 68px; +max-height: 68px; +} +#LibraryReadingIconGridViewerCont #currentBookCenterLeft{ +min-width: 35px; +max-width: 35px; +min-height: 324px; +max-height: 324px; +} +#LibraryReadingIconGridViewerCont #currentBookCenterRight{ +min-width: 34px; +max-width: 34px; +min-height: 324px; +max-height: 324px; +} +#LibraryReadingIconGridViewerCont #currentBookBottomLeft{ +min-width: 35px; +max-width: 35px; +min-height: 41px; +max-height: 41px; +} +#LibraryReadingIconGridViewerCont #currentBookBottomCenter{ +min-width: 215px; +max-width: 215px; +min-height: 41px; +max-height: 41px; +} +#LibraryReadingIconGridViewerCont #currentBookBottoRight{ +min-width: 34px; +max-width: 34px; +min-height: 41px; +max-height: 41px; +} +#mainBookInfoCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 479px; +max-height: 479px; +} +#currentBookCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 479px; +max-height: 479px; +} +#readBookBtn{ +min-width: 1072px; +max-width: 1072px; +min-height: 479px; +max-height: 479px; +} +#currentBookData{ +min-width: 552px; +max-width: 552px; +} +#currentBookCont #readingLbl{ +margin: 64px 0px 27px 0px; +font-size: 45px; +} +#currentBookCont #bookTitleLbl{ +font-size: 51px; +} +#currentBookCont #authorLbl{ +font-size: 40px; +} +#currentBookCont #pagLbl,#currentBookCont #currentPagLbl,#currentBookCont #endBracketsLbl,#currentBookCont #separatorLbl,#currentBookCont #totalPagLbl, #currentBookCont #percentLbl{ +margin: 27px 0px 0px 0px; +font-size: 31px; +} +#currentBookCont #readLbl, #currentBookCont #readingPercentLbl, #currentBookCont #separatorReadLbl{ +margin: 27px 7px 0px 0px; +font-size: 31px; +} +/*Viewer popups +-----------------------------------*/ +#popupCont{ +padding: 0px; +border-width: 17px; +border-radius: 17px; +} +#arrowCont, #arrowCont2{ +min-height: 34px; +max-height: 34px; +} +#topArrowLbl, #bottomArrowLbl{ +min-width: 42px; +max-width: 42px; +min-height: 31px; +max-height: 31px; +} +/*LibraryBooksFilterLayer +-------------------------------*/ +#LibraryBooksFilterLayer{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#LibraryBooksFilterLayerCont{ +min-width: 651px; +max-width: 651px; +min-height: 597px; +max-height: 597px; +} +#LibraryBooksFilterLayerCont #spacerTop{ +min-height: 283px; +max-height: 283px; +} +#LibraryBooksFilterLayerCont #spacerLeft{ +min-width: 71px; +max-width: 71px; +} +#LibraryBooksFilterLayer QPushButton { +padding: 0px 0px 0px 27px; +border-bottom-width: 1px; +} +#LibraryBooksFilterLayer QPushButton#internalMemoryBtn, #LibraryBooksFilterLayer QPushButton#sdBtn{ +} +/*BookSummaryPopup +---------------------------*/ +#headerPopup #closeBtn{ +min-width: 72px; +max-width: 72px; +min-height: 72px; +max-height: 72px; +} +#BookSummaryPopup{ +min-width: 977px; +max-width: 977px; +min-height: 1068px; +max-height: 1068px; +} +#BookSummaryPopup #headerPopup{ +margin: 0px 0px 0px 0px; +padding: 0px; +} +#BookSummaryPopup #headerPopup #closeBtn{ +min-width: 82px; +max-width: 82px; +min-height: 82px; +max-height: 82px; +} +#BookSummaryPopup #popupCont{ +padding: 0px 27px 0px 27px; +} +#BookSummaryPopup #synopsisLbl{ +margin: 0px 0px 0px 0px; +padding-left: 0px; +padding-right: 0px; +} +#BookSummaryPopup #summaryTextBrowser{ +min-height: 344px; +max-height: 344px; +margin-left: 0px; +margin-right: 0px; +padding-left: 0px; +padding-right: 0px; +} +/*LibraryBookListActions +---------------------------*/ +#LibraryBookListActions{ +margin-right: 1px; +min-width: 0px; +max-width: 365px; +min-height: 91px; +max-height: 91px; +border-width: 3px; +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +} +#LibraryBookListActions QPushButton{ +margin-right: 1px; +border-width: 1px; +} +/*LibraryPageHandler +----------------------------*/ +#pageLibraryViewerCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 91px; +max-height: 91px; +} +#VerticalPagerHandler{ +min-height: 91px; +max-height: 91px; +} +#pageLibraryViewerCont #forwardButton{ +min-width: 163px; +max-width: 163px; +min-height: 91px; +max-height: 91px; +} +#pageLibraryViewerCont #backButton{ +min-width: 163px; +max-width: 163px; +min-height: 91px; +max-height: 91px; +} diff --git a/bqStore/ui/Store.ui b/bqStore/ui/Store.ui index 166306a..187ebec 100755 --- a/bqStore/ui/Store.ui +++ b/bqStore/ui/Store.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -44,7 +44,7 @@ - + @@ -56,7 +56,7 @@ - Organizar "Libros descargados" + Organizar "Libros descargados" @@ -66,7 +66,7 @@ Qt::StrongFocus - + Enter text to search here... @@ -79,7 +79,7 @@ Qt::NoFocus - + @@ -89,7 +89,7 @@ Qt::NoFocus - + @@ -117,11 +117,11 @@ 16777215 - 53 + 75 - + 0 @@ -160,12 +160,12 @@ - 330 + 467 16777215 - + @@ -183,8 +183,8 @@ - 40 - 20 + 57 + 28 @@ -225,12 +225,12 @@ - 100000 - 605 + 141421 + 856 - + @@ -249,8 +249,8 @@ - 20 - 40 + 28 + 57 @@ -266,7 +266,7 @@ 16777215 - 65 + 92 @@ -306,18 +306,18 @@ - 74 - 44 + 105 + 62 Qt::NoFocus - + - + true @@ -334,18 +334,18 @@ - 72 - 44 + 102 + 62 Qt::NoFocus - + - + true @@ -371,7 +371,7 @@ Qt::NoFocus - Título + Título true @@ -410,7 +410,7 @@ Qt::NoFocus - Fecha modificación + Fecha modificación true @@ -424,8 +424,8 @@ - 40 - 20 + 57 + 28 @@ -446,16 +446,16 @@ - - MyQLineEdit - QLineEdit -
MyQLineEdit.h
- SilentQPushButton QPushButton
SilentQPushButton.h
 + + MyQLineEdit + QLineEdit +
MyQLineEdit.h
+ LibraryBreadCrumb QWidget @@ -463,6 +463,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqStore/ui/StoreBookSummary.ui b/bqStore/ui/StoreBookSummary.ui index 68783ee..71d3f9c 100755 --- a/bqStore/ui/StoreBookSummary.ui +++ b/bqStore/ui/StoreBookSummary.ui @@ -6,15 +6,15 @@ 0 0 - 600 - 750 + 849 + 1061 Form - + @@ -39,8 +39,8 @@ - 40 - 20 + 57 + 28 @@ -51,7 +51,7 @@ Qt::NoFocus - + @@ -91,20 +91,20 @@ 0 - + Qt::Vertical - 20 - 40 + 28 + 57 - + @@ -119,14 +119,14 @@ - + 0 - + @@ -141,17 +141,17 @@ - + - + 0 - + @@ -160,39 +160,39 @@ - + 0 - + Qt::Vertical - 20 - 40 + 28 + 57 - + 0 0 - 115 - 175 + 163 + 247 - + @@ -200,12 +200,12 @@ 0 110 - 141 - 31 + 199 + 44 - + Qt::AlignCenter @@ -216,12 +216,12 @@ 0 140 - 141 - 21 + 199 + 30 - + Qt::AlignCenter @@ -229,7 +229,7 @@ - + @@ -244,14 +244,14 @@ - + 0 - + @@ -266,14 +266,14 @@ - + 0 - + @@ -282,14 +282,14 @@ - + 0 - + @@ -304,14 +304,14 @@ - + 0 - + @@ -326,27 +326,27 @@ - + 0 - + Qt::Vertical - 20 - 40 + 28 + 57 - + Qt::Vertical @@ -356,13 +356,13 @@ - 20 - 5 + 28 + 7 - + Qt::Vertical @@ -372,13 +372,13 @@ - 20 - 5 + 28 + 7 - + Qt::Vertical @@ -388,8 +388,8 @@ - 20 - 5 + 28 + 7 @@ -404,8 +404,8 @@ - 40 - 20 + 57 + 28 @@ -429,7 +429,7 @@ - Camilla Läckberg + Camilla Läckberg @@ -445,10 +445,10 @@ - + - 9,95€ + 9,95€ 0 @@ -462,8 +462,8 @@ - 40 - 20 + 57 + 28 @@ -496,7 +496,7 @@ Qt::NoFocus - Más acciones + Más acciones @@ -517,8 +517,8 @@ - 40 - 20 + 57 + 28 @@ -533,8 +533,8 @@ - 20 - 40 + 28 + 57 @@ -591,11 +591,11 @@ 1 - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ssdsdsdsd</p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ssdsdsdsd</p></body></html> 1 @@ -615,8 +615,8 @@ p, li { white-space: pre-wrap; } - 20 - 40 + 28 + 57 @@ -631,7 +631,7 @@ p, li { white-space: pre-wrap; } 1 - + @@ -656,6 +656,6 @@ p, li { white-space: pre-wrap; }
bqQTextBrowser.h
- - - + + + \ No newline at end of file diff --git a/bqStore/ui/StoreBooksFilterLayer.ui b/bqStore/ui/StoreBooksFilterLayer.ui index 00a9727..16a1fea 100755 --- a/bqStore/ui/StoreBooksFilterLayer.ui +++ b/bqStore/ui/StoreBooksFilterLayer.ui @@ -6,27 +6,27 @@ 0 0 - 758 - 960 + 1072 + 1358 - 758 - 960 + 0 + 0 - 758 - 960 + 1072 + 1358 Form - + @@ -38,7 +38,7 @@ - + @@ -54,14 +54,14 @@ - + - + @@ -75,7 +75,7 @@ 16777215 - 19 + 27 @@ -83,12 +83,12 @@ 30 2 - 24 - 17 + 34 + 24 - + 0 @@ -106,8 +106,8 @@ - 10000 - 10000 + 14142 + 14142 @@ -120,7 +120,7 @@ - Los más destacado + Los más destacado @@ -174,7 +174,7 @@ - eBooks más vendidos (15) + eBooks más vendidos (15) @@ -197,7 +197,7 @@ Qt::NoFocus - Colección Breve (89) + Colección Breve (89) true @@ -210,7 +210,7 @@ - Temáticas + Temáticas @@ -226,7 +226,7 @@ Qt::NoFocus - Vert todas las temáticas + Vert todas las temáticas true @@ -246,8 +246,8 @@ - 40 - 20 + 57 + 28 @@ -262,14 +262,14 @@ - 20 - 40 + 28 + 57 - - - + + + \ No newline at end of file diff --git a/bqStore/ui/StoreBrowser.ui b/bqStore/ui/StoreBrowser.ui index e23109f..63a38c4 100755 --- a/bqStore/ui/StoreBrowser.ui +++ b/bqStore/ui/StoreBrowser.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -18,21 +18,21 @@ - 600 - 750 + 0 + 0 - 600 - 750 + 849 + 1061 Form - + @@ -44,7 +44,7 @@ - + @@ -56,14 +56,14 @@ - + - EBooks más vendidos + EBooks más vendidos @@ -74,8 +74,8 @@ - 40 - 20 + 57 + 28 @@ -86,7 +86,7 @@ Qt::StrongFocus - + Search @@ -99,7 +99,7 @@ Qt::NoFocus - + @@ -118,7 +118,7 @@ - Atrás + Atrás @@ -136,8 +136,8 @@ - 40 - 20 + 57 + 28 @@ -156,11 +156,11 @@ 16777215 - 55 + 78 - + 0 @@ -186,8 +186,8 @@ - 40 - 20 + 57 + 28 @@ -204,14 +204,14 @@ Qt::NoFocus - Fecha de publicación + Fecha de publicación - + @@ -221,7 +221,7 @@ Qt::NoFocus - + @@ -235,8 +235,8 @@ - 20 - 40 + 28 + 57 @@ -257,12 +257,12 @@ - 100000 - 700 + 141421 + 990 - + @@ -283,10 +283,6 @@
MyQLineEdit.h
- - - - - - - + + + \ No newline at end of file diff --git a/bqStore/ui/StoreIconGridViewer.ui b/bqStore/ui/StoreIconGridViewer.ui index 9dcfb38..9f1824c 100755 --- a/bqStore/ui/StoreIconGridViewer.ui +++ b/bqStore/ui/StoreIconGridViewer.ui @@ -6,20 +6,20 @@ 0 0 - 600 - 649 + 849 + 918 - 600 - 595 + 0 + 0 - 635 - 649 + 898 + 918 @@ -29,7 +29,7 @@ Form - + @@ -54,8 +54,8 @@ - 10000 - 10000 + 14142 + 14142 @@ -65,7 +65,7 @@ 0 - + @@ -90,8 +90,8 @@ - 10 - 20 + 14 + 28 @@ -116,7 +116,7 @@ - 4,99 € + 4,99 € @@ -132,8 +132,8 @@ - 190 - 10000 + 269 + 14142 @@ -150,7 +150,7 @@ - + @@ -175,8 +175,8 @@ - 10 - 20 + 14 + 28 @@ -201,7 +201,7 @@ - 4,99 € + 4,99 € @@ -217,8 +217,8 @@ - 190 - 10000 + 269 + 14142 @@ -235,7 +235,7 @@ - + @@ -260,8 +260,8 @@ - 10 - 20 + 14 + 28 @@ -286,7 +286,7 @@ - 4,99 € + 4,99 € @@ -302,8 +302,8 @@ - 190 - 10000 + 269 + 14142 @@ -314,20 +314,20 @@ - + Qt::Vertical - 20 - 40 + 28 + 57 - + @@ -365,7 +365,7 @@ - 4,99 € + 4,99 € @@ -381,8 +381,8 @@ - 190 - 100000 + 269 + 141421 @@ -400,8 +400,8 @@ - 10 - 20 + 14 + 28 @@ -409,7 +409,7 @@ - + @@ -434,8 +434,8 @@ - 10 - 20 + 14 + 28 @@ -460,7 +460,7 @@ - 4,99 € + 4,99 € @@ -476,8 +476,8 @@ - 190 - 10000 + 269 + 14142 @@ -494,7 +494,7 @@ - + @@ -519,8 +519,8 @@ - 10 - 20 + 14 + 28 @@ -545,7 +545,7 @@ - 4,99 € + 4,99 € @@ -561,8 +561,8 @@ - 190 - 10000 + 269 + 14142 @@ -573,7 +573,7 @@ - + Qt::Vertical @@ -583,7 +583,7 @@ - 20 + 28 1 @@ -603,11 +603,11 @@ 16777215 - 50 + 71 - + @@ -627,6 +627,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqStore/ui/StoreIconGridViewerItem.ui b/bqStore/ui/StoreIconGridViewerItem.ui index c152b63..220f81d 100755 --- a/bqStore/ui/StoreIconGridViewerItem.ui +++ b/bqStore/ui/StoreIconGridViewerItem.ui @@ -6,8 +6,8 @@ 0 0 - 190 - 240 + 269 + 339 @@ -17,15 +17,15 @@ Form - + 0 0 - 180 - 219 + 255 + 310 @@ -36,8 +36,8 @@ - 16777215 - 16777215 + 23726565 + 23726565 @@ -58,8 +58,8 @@ 0 0 - 190 - 228 + 269 + 322 @@ -78,7 +78,7 @@ 0 - + @@ -93,11 +93,11 @@ - + - + @@ -112,11 +112,11 @@ - + - + @@ -131,14 +131,14 @@ - + - + - + @@ -153,11 +153,11 @@ - + - + @@ -166,36 +166,36 @@ - + - + Qt::Horizontal - 40 - 20 + 57 + 28 - + 0 0 - 140 - 210 + 198 + 297 - + Qt::AlignCenter @@ -206,12 +206,12 @@ 0 145 - 140 - 21 + 198 + 30 - + Qt::AlignHCenter|Qt::AlignTop @@ -228,12 +228,12 @@ 0 0 - 140 - 35 + 198 + 49 - + Qt::AlignHCenter|Qt::AlignTop @@ -250,12 +250,12 @@ 0 130 - 140 - 17 + 198 + 24 - + Qt::AlignCenter @@ -263,7 +263,7 @@ - + @@ -278,11 +278,11 @@ - + - + @@ -297,11 +297,11 @@ - + - + @@ -310,45 +310,45 @@ - + - + Qt::Vertical - 20 - 40 + 28 + 57 - + Qt::Vertical - 20 - 40 + 28 + 57 - + Qt::Vertical - 20 - 40 + 28 + 57 @@ -369,7 +369,7 @@ - + - - + + \ No newline at end of file diff --git a/bqUi/Ui1448.qrc b/bqUi/Ui1448.qrc new file mode 100755 index 0000000..ab64955 --- /dev/null +++ b/bqUi/Ui1448.qrc @@ -0,0 +1,69 @@ + + + res/1448/battery_7.png + res/1448/battery_6.png + res/1448/battery_5.png + res/1448/battery_4.png + res/1448/battery_3.png + res/1448/battery_2.png + res/1448/battery_1.png + res/1448/battery_plug_Ico.png + res/1448/battery_warning_Ico.png + res/1448/light_off_Ico.png + res/1448/light_on_Ico.png + res/1448/usb_Ico.png + res/1448/wifi_0_Ico.png + res/1448/wifi_1_Ico.png + res/1448/wifi_2_Ico.png + res/1448/wifi_3_Ico.png + res/1448/wifi_4_Ico.png + res/1448/read_Btn.png + res/1448/bg_header.png + res/1448/spinner_Ico.png + res/1448/brightness_max.png + res/1448/brightness_min.png + res/1448/off_btn.png + res/1448/on_btn.png + res/1448/bgSynopsisPopup.png + res/1448/arrow_for_buttons.png + res/1448/spinner.png + res/1448/bg_clear_search.png + res/1448/bg_search_input.png + res/1448/store_file.png + res/1448/jpg_list.png + res/1448/gif_list.png + res/1448/png_list.png + res/1448/txt_list.png + res/1448/doc_list.png + res/1448/unknow_list.png + res/1448/pdf_list.png + res/1448/folder_list.png + res/1448/corrupted_list.png + res/1448/img_list.png + res/1448/book_pdf_list.png + res/1448/book_epub_list.png + res/1448/power_off.png + res/1448/sleep.png + res/1448/wifi_connecting_Ico.png + res/1448/wifi_off_Ico.png + res/1448/wifi_no_connected.png + res/1448/close_popup_ico.png + res/1448/bg_transparent.png + res/1448/ic-deleteOne.png + res/1448/ic-keyboard_enter.png + res/1448/ic-nextChar.png + res/1448/ic-shift_over.png + res/1448/ic-previousChar.png + res/ui_styles_generic.qss + res/1448/ui_styles.qss + res/1448/checkbox_checked.png + res/1448/uncheked.png + res/1448/working-1.png + res/1448/working-2.png + res/1448/working-3.png + res/1448/working-4.png + res/1448/sync_spinner_btn.png + res/1448/spacer.png + res/1448/check-collection.png + + diff --git a/bqUi/bqUi.pri b/bqUi/bqUi.pri index f71dba8..896f0ce 100755 --- a/bqUi/bqUi.pri +++ b/bqUi/bqUi.pri @@ -90,9 +90,10 @@ FORMS += ./ui/HorizontalPagination.ui \ -QRC_FILES += Ui800.qrc Ui1024.qrc +QRC_FILES += Ui800.qrc Ui1024.qrc Ui1448.qrc OTHER_FILES += \ bqUi/res/ui_styles_generic.qss \ bqUi/res/1024/ui_styles.qss \ - bqUi/res/800/ui_styles.qss + bqUi/res/800/ui_styles.qss \ + bqUi/res/1448/ui_styles.qss diff --git a/bqUi/inc/KeyboardButton.h b/bqUi/inc/KeyboardButton.h index fd63432..279d0f7 100644 --- a/bqUi/inc/KeyboardButton.h +++ b/bqUi/inc/KeyboardButton.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 @@ -55,6 +55,9 @@ class KeyboardButton : public QLabel bool isDehighlightDisabled() { return b_disableDehighlight; } void setDehighlightDisabled(bool disable) { b_disableDehighlight = disable; } +private: + void resetButtonStyle(bool inverted = false); + public slots: void pressBtn(); void releaseBtn(); diff --git a/bqUi/inc/MouseFilter.h b/bqUi/inc/MouseFilter.h index 26a2c2a..ae44af1 100644 --- a/bqUi/inc/MouseFilter.h +++ b/bqUi/inc/MouseFilter.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 @@ -30,6 +30,7 @@ along with the source code. If not, see . #define LONG_PRESS_INTERVAL 300 #define SWIPE_MIN_LENGTH 32 // Set by tuning #define SWIPE_MIN_LENGTH_HD 40 // Set by tuning +#define SWIPE_MIN_LENGTH_FHD 75 // TODO CERVANTES3 #define SWIPE_MAX_TIME 600 class QObject; diff --git a/bqUi/res/1448/arrow_for_buttons.png b/bqUi/res/1448/arrow_for_buttons.png new file mode 100755 index 0000000..a0fed6e Binary files /dev/null and b/bqUi/res/1448/arrow_for_buttons.png differ diff --git a/bqUi/res/1448/battery_1.png b/bqUi/res/1448/battery_1.png new file mode 100644 index 0000000..0592fc6 Binary files /dev/null and b/bqUi/res/1448/battery_1.png differ diff --git a/bqUi/res/1448/battery_2.png b/bqUi/res/1448/battery_2.png new file mode 100644 index 0000000..256092c Binary files /dev/null and b/bqUi/res/1448/battery_2.png differ diff --git a/bqUi/res/1448/battery_3.png b/bqUi/res/1448/battery_3.png new file mode 100644 index 0000000..e563b12 Binary files /dev/null and b/bqUi/res/1448/battery_3.png differ diff --git a/bqUi/res/1448/battery_4.png b/bqUi/res/1448/battery_4.png new file mode 100644 index 0000000..52749a5 Binary files /dev/null and b/bqUi/res/1448/battery_4.png differ diff --git a/bqUi/res/1448/battery_5.png b/bqUi/res/1448/battery_5.png new file mode 100644 index 0000000..8d9d492 Binary files /dev/null and b/bqUi/res/1448/battery_5.png differ diff --git a/bqUi/res/1448/battery_6.png b/bqUi/res/1448/battery_6.png new file mode 100644 index 0000000..01a8925 Binary files /dev/null and b/bqUi/res/1448/battery_6.png differ diff --git a/bqUi/res/1448/battery_7.png b/bqUi/res/1448/battery_7.png new file mode 100644 index 0000000..760c070 Binary files /dev/null and b/bqUi/res/1448/battery_7.png differ diff --git a/bqUi/res/1448/battery_plug_Ico.png b/bqUi/res/1448/battery_plug_Ico.png new file mode 100644 index 0000000..79f522e Binary files /dev/null and b/bqUi/res/1448/battery_plug_Ico.png differ diff --git a/bqUi/res/1448/battery_warning_Ico.png b/bqUi/res/1448/battery_warning_Ico.png new file mode 100644 index 0000000..df03afb Binary files /dev/null and b/bqUi/res/1448/battery_warning_Ico.png differ diff --git a/bqUi/res/1448/bgSynopsisPopup.png b/bqUi/res/1448/bgSynopsisPopup.png new file mode 100644 index 0000000..9c26c6d Binary files /dev/null and b/bqUi/res/1448/bgSynopsisPopup.png differ diff --git a/bqUi/res/1448/bg_clear_search.png b/bqUi/res/1448/bg_clear_search.png new file mode 100644 index 0000000..0ef597b Binary files /dev/null and b/bqUi/res/1448/bg_clear_search.png differ diff --git a/bqUi/res/1448/bg_header.png b/bqUi/res/1448/bg_header.png new file mode 100755 index 0000000..04cc1a4 Binary files /dev/null and b/bqUi/res/1448/bg_header.png differ diff --git a/bqUi/res/1448/bg_search_input.png b/bqUi/res/1448/bg_search_input.png new file mode 100644 index 0000000..6b1dfef Binary files /dev/null and b/bqUi/res/1448/bg_search_input.png differ diff --git a/bqUi/res/1448/bg_transparent.png b/bqUi/res/1448/bg_transparent.png new file mode 100755 index 0000000..2e07538 Binary files /dev/null and b/bqUi/res/1448/bg_transparent.png differ diff --git a/bqUi/res/1448/book_epub_list.png b/bqUi/res/1448/book_epub_list.png new file mode 100755 index 0000000..7bdb7de Binary files /dev/null and b/bqUi/res/1448/book_epub_list.png differ diff --git a/bqUi/res/1448/book_front_bottom_center.png b/bqUi/res/1448/book_front_bottom_center.png new file mode 100755 index 0000000..9a92a25 Binary files /dev/null and b/bqUi/res/1448/book_front_bottom_center.png differ diff --git a/bqUi/res/1448/book_front_bottom_left.png b/bqUi/res/1448/book_front_bottom_left.png new file mode 100755 index 0000000..92af27e Binary files /dev/null and b/bqUi/res/1448/book_front_bottom_left.png differ diff --git a/bqUi/res/1448/book_front_bottom_right.png b/bqUi/res/1448/book_front_bottom_right.png new file mode 100755 index 0000000..52fae74 Binary files /dev/null and b/bqUi/res/1448/book_front_bottom_right.png differ diff --git a/bqUi/res/1448/book_front_center_left.png b/bqUi/res/1448/book_front_center_left.png new file mode 100755 index 0000000..bc09be5 Binary files /dev/null and b/bqUi/res/1448/book_front_center_left.png differ diff --git a/bqUi/res/1448/book_front_center_right.png b/bqUi/res/1448/book_front_center_right.png new file mode 100755 index 0000000..9d993d1 Binary files /dev/null and b/bqUi/res/1448/book_front_center_right.png differ diff --git a/bqUi/res/1448/book_front_cover.png b/bqUi/res/1448/book_front_cover.png new file mode 100755 index 0000000..c4019a5 Binary files /dev/null and b/bqUi/res/1448/book_front_cover.png differ diff --git a/bqUi/res/1448/book_front_cover_shadow.png b/bqUi/res/1448/book_front_cover_shadow.png new file mode 100755 index 0000000..3323f6a Binary files /dev/null and b/bqUi/res/1448/book_front_cover_shadow.png differ diff --git a/bqUi/res/1448/book_front_top_center.png b/bqUi/res/1448/book_front_top_center.png new file mode 100755 index 0000000..07f3264 Binary files /dev/null and b/bqUi/res/1448/book_front_top_center.png differ diff --git a/bqUi/res/1448/book_front_top_left.png b/bqUi/res/1448/book_front_top_left.png new file mode 100755 index 0000000..35226a6 Binary files /dev/null and b/bqUi/res/1448/book_front_top_left.png differ diff --git a/bqUi/res/1448/book_front_top_right.png b/bqUi/res/1448/book_front_top_right.png new file mode 100755 index 0000000..55a993e Binary files /dev/null and b/bqUi/res/1448/book_front_top_right.png differ diff --git a/bqUi/res/1448/book_pdf_list.png b/bqUi/res/1448/book_pdf_list.png new file mode 100755 index 0000000..3ff4d01 Binary files /dev/null and b/bqUi/res/1448/book_pdf_list.png differ diff --git a/bqUi/res/1448/book_txt_list.png b/bqUi/res/1448/book_txt_list.png new file mode 100755 index 0000000..0e0e6da Binary files /dev/null and b/bqUi/res/1448/book_txt_list.png differ diff --git a/bqUi/res/1448/book_unknow_list.png b/bqUi/res/1448/book_unknow_list.png new file mode 100755 index 0000000..05374d9 Binary files /dev/null and b/bqUi/res/1448/book_unknow_list.png differ diff --git a/bqUi/res/1448/brightness_max.png b/bqUi/res/1448/brightness_max.png new file mode 100755 index 0000000..ae61a6f Binary files /dev/null and b/bqUi/res/1448/brightness_max.png differ diff --git a/bqUi/res/1448/brightness_min.png b/bqUi/res/1448/brightness_min.png new file mode 100755 index 0000000..e01c562 Binary files /dev/null and b/bqUi/res/1448/brightness_min.png differ diff --git a/bqUi/res/1448/check-collection.png b/bqUi/res/1448/check-collection.png new file mode 100644 index 0000000..b572ba9 Binary files /dev/null and b/bqUi/res/1448/check-collection.png differ diff --git a/bqUi/res/1448/checkbox_checked.png b/bqUi/res/1448/checkbox_checked.png new file mode 100644 index 0000000..80e7267 Binary files /dev/null and b/bqUi/res/1448/checkbox_checked.png differ diff --git a/bqUi/res/1448/close_popup.png b/bqUi/res/1448/close_popup.png new file mode 100755 index 0000000..1284c71 Binary files /dev/null and b/bqUi/res/1448/close_popup.png differ diff --git a/bqUi/res/1448/close_popup_ico.png b/bqUi/res/1448/close_popup_ico.png new file mode 100755 index 0000000..a961e9a Binary files /dev/null and b/bqUi/res/1448/close_popup_ico.png differ diff --git a/bqUi/res/1448/corrupted_list.png b/bqUi/res/1448/corrupted_list.png new file mode 100755 index 0000000..efacfa0 Binary files /dev/null and b/bqUi/res/1448/corrupted_list.png differ diff --git a/bqUi/res/1448/doc_list.png b/bqUi/res/1448/doc_list.png new file mode 100755 index 0000000..a10fbdd Binary files /dev/null and b/bqUi/res/1448/doc_list.png differ diff --git a/bqUi/res/1448/epub_list.png b/bqUi/res/1448/epub_list.png new file mode 100755 index 0000000..da579f7 Binary files /dev/null and b/bqUi/res/1448/epub_list.png differ diff --git a/bqUi/res/1448/folder_list.png b/bqUi/res/1448/folder_list.png new file mode 100755 index 0000000..ab1bace Binary files /dev/null and b/bqUi/res/1448/folder_list.png differ diff --git a/bqUi/res/1448/gif_list.png b/bqUi/res/1448/gif_list.png new file mode 100755 index 0000000..532a5f9 Binary files /dev/null and b/bqUi/res/1448/gif_list.png differ diff --git a/bqUi/res/1448/ic-deleteOne.png b/bqUi/res/1448/ic-deleteOne.png new file mode 100644 index 0000000..f7b22ad Binary files /dev/null and b/bqUi/res/1448/ic-deleteOne.png differ diff --git a/bqUi/res/1448/ic-keyboard_enter.png b/bqUi/res/1448/ic-keyboard_enter.png new file mode 100644 index 0000000..05771f6 Binary files /dev/null and b/bqUi/res/1448/ic-keyboard_enter.png differ diff --git a/bqUi/res/1448/ic-nextChar.png b/bqUi/res/1448/ic-nextChar.png new file mode 100644 index 0000000..701e190 Binary files /dev/null and b/bqUi/res/1448/ic-nextChar.png differ diff --git a/bqUi/res/1448/ic-previousChar.png b/bqUi/res/1448/ic-previousChar.png new file mode 100644 index 0000000..e7e8fbe Binary files /dev/null and b/bqUi/res/1448/ic-previousChar.png differ diff --git a/bqUi/res/1448/ic-shift_over.png b/bqUi/res/1448/ic-shift_over.png new file mode 100644 index 0000000..ac57189 Binary files /dev/null and b/bqUi/res/1448/ic-shift_over.png differ diff --git a/bqUi/res/1448/img_list.png b/bqUi/res/1448/img_list.png new file mode 100755 index 0000000..307d888 Binary files /dev/null and b/bqUi/res/1448/img_list.png differ diff --git a/bqUi/res/1448/jpg_list.png b/bqUi/res/1448/jpg_list.png new file mode 100755 index 0000000..0f35228 Binary files /dev/null and b/bqUi/res/1448/jpg_list.png differ diff --git a/bqUi/res/1448/light_off_Ico.png b/bqUi/res/1448/light_off_Ico.png new file mode 100644 index 0000000..e2d5711 Binary files /dev/null and b/bqUi/res/1448/light_off_Ico.png differ diff --git a/bqUi/res/1448/light_on_Ico.png b/bqUi/res/1448/light_on_Ico.png new file mode 100644 index 0000000..486632b Binary files /dev/null and b/bqUi/res/1448/light_on_Ico.png differ diff --git a/bqUi/res/1448/off_btn.png b/bqUi/res/1448/off_btn.png new file mode 100755 index 0000000..6f2a436 Binary files /dev/null and b/bqUi/res/1448/off_btn.png differ diff --git a/bqUi/res/1448/on_btn.png b/bqUi/res/1448/on_btn.png new file mode 100755 index 0000000..4e33e66 Binary files /dev/null and b/bqUi/res/1448/on_btn.png differ diff --git a/bqUi/res/1448/pdf_list.png b/bqUi/res/1448/pdf_list.png new file mode 100755 index 0000000..60a3df4 Binary files /dev/null and b/bqUi/res/1448/pdf_list.png differ diff --git a/bqUi/res/1448/png_list.png b/bqUi/res/1448/png_list.png new file mode 100755 index 0000000..e63522f Binary files /dev/null and b/bqUi/res/1448/png_list.png differ diff --git a/bqUi/res/1448/power_off.png b/bqUi/res/1448/power_off.png new file mode 100755 index 0000000..5aa4155 Binary files /dev/null and b/bqUi/res/1448/power_off.png differ diff --git a/bqUi/res/1448/read_Btn.png b/bqUi/res/1448/read_Btn.png new file mode 100644 index 0000000..0521d07 Binary files /dev/null and b/bqUi/res/1448/read_Btn.png differ diff --git a/bqUi/res/1448/sleep.png b/bqUi/res/1448/sleep.png new file mode 100755 index 0000000..c4db91f Binary files /dev/null and b/bqUi/res/1448/sleep.png differ diff --git a/bqUi/res/1448/spacer.png b/bqUi/res/1448/spacer.png new file mode 100644 index 0000000..38ef092 Binary files /dev/null and b/bqUi/res/1448/spacer.png differ diff --git a/bqUi/res/1448/spinner.png b/bqUi/res/1448/spinner.png new file mode 100755 index 0000000..8d1095b Binary files /dev/null and b/bqUi/res/1448/spinner.png differ diff --git a/bqUi/res/1448/spinner_Ico.png b/bqUi/res/1448/spinner_Ico.png new file mode 100644 index 0000000..ffa6706 Binary files /dev/null and b/bqUi/res/1448/spinner_Ico.png differ diff --git a/bqUi/res/1448/store_file.png b/bqUi/res/1448/store_file.png new file mode 100755 index 0000000..f72442c Binary files /dev/null and b/bqUi/res/1448/store_file.png differ diff --git a/bqUi/res/1448/sync_spinner_btn.png b/bqUi/res/1448/sync_spinner_btn.png new file mode 100644 index 0000000..b70a6db Binary files /dev/null and b/bqUi/res/1448/sync_spinner_btn.png differ diff --git a/bqUi/res/1448/txt_list.png b/bqUi/res/1448/txt_list.png new file mode 100755 index 0000000..a050efc Binary files /dev/null and b/bqUi/res/1448/txt_list.png differ diff --git a/bqUi/res/1448/ui_styles.qss b/bqUi/res/1448/ui_styles.qss new file mode 100644 index 0000000..c838f8f --- /dev/null +++ b/bqUi/res/1448/ui_styles.qss @@ -0,0 +1,233 @@ +/************************************************************************* + +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 . + +*************************************************************************/ + +/*Keyboard +-------------------------------------*/ +BaseKeyboard, #BaseKeyboard{ +min-width: 1072px; +max-width: 1072px; +min-height: 543px; +max-height: 543px; +} +#Keyboard { +min-width: 1072px; +max-width: 1072px; +min-height: 543px; +max-height: 543px; +/*min-height: 741px; +max-height: 741px;*/ +} +#keyboardCont { +min-width: 1072px; +max-width: 1072px; +min-height: 543px; +max-height: 543px; +border-top-width: 3px; +border-bottom-width: 3px; +} +#keyboardCont KeyboardButton{ +min-width: 91px; +max-width: 91px; +min-height: 91px; +max-height: 91px; +height: 91px; +width: 91px; +font-size: 41px; +border-width: 3px; +border-radius: 11px; +} +#keyboardCont #verticalFrame{ +min-width: 1052px; +max-width: 1052px; +min-height: 543px; +max-height: 543px; +} +#keyboardCont #newLineBtn{ +min-width: 91px; +max-width: 91px; +} +#keyboardCont KeyboardButton#enter{ +min-width: 192px; +max-width: 192px; +border-width: 3px; +} +#keyboardCont #cancelKeyboardBtn{ +min-width: 187px; +max-width: 187px; +font-size: 41px; +border-width: 3px; +} + +#keyboardCont KeyboardButton#deleteChar{ +min-width: 91px; +max-width: 91px; +} + +#keyboardCont KeyboardButton#numeric{ +min-width: 117px; +max-width: 117px; +} +#keyboardCont KeyboardButton#space{ +min-width: 300px; +max-width: 300px; +} +#keyboardCont KeyboardButton#specialChar{ +min-width: 195px; +max-width: 195px; +font-size: 41px; +} +#keyboardCont KeyboardButton#next, #keyboardCont KeyboardButton#cursorRight{ +border-width: 3px; +} +#keyboardCont KeyboardButton#previous, #keyboardCont KeyboardButton#cursorLeft{ +border-width: 3px; +} + +#keyboardCont KeyboardButton#shift{ +min-width: 91px; +max-width: 91px; +min-height: 91px; +max-height: 91px; +border-width: 3px; +} + +/* KeyboardLayer +---------------------------------*/ + +#keyboardLayerCont{ +border-width: 3px; +border-radius: 7px; +min-height: 91px; +max-height: 325px; +} +#buttonGrid KeyboardButton, #buttonGrid KeyboardButton{ +min-width: 86px; +max-width: 86px; +min-height: 86px; +max-height: 86px; +height: 86px; +width: 86px; +font-size: 41px; +border-width: 3px; +border-radius: 11px; +margin-bottom: 0px; +margin-right: 11px; +} +#closeFrame{ +min-width: 82px; +max-width: 82px; +min-height: 81px; +max-height: 81px; +} +#LayerCloseBtn{ +margin: 0px 0px 35px 0px; +min-width: 82px; +max-width: 82px; +min-height: 81px; +max-height: 81px; +} + +/*StatusBar +-------------------------*/ +#StatusBar{ +min-width: 1072px; +max-width: 1072px; +min-height: 90px; +max-height: 90px; +} +#StatusBarCenterCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 90px; +max-height: 90px; +} +#StatusBarCont{ +min-width: 1000px; +max-width: 1000px; +min-height: 90px; +max-height: 90px; +} +#StatusBarCont #currentSectionLbl{ +padding: 0px 0px 0px 0px; +min-height: 90px; +max-height: 90px; +font-size: 37px; +min-width: 375px; +max-width: 707px; +} +#StatusBarCont #currentReadBtn{ +min-width: 92px; +max-width: 92px; +min-height: 90px; +max-height: 90px; +} +#StatusBarCont #lightBtn{ +padding: 0px 14px 0px 0px; +min-width: 45px; +max-width: 45px; +min-height: 90px; +max-height: 90px; +} +#StatusBarCont #batteryLbl{ +padding: 0px 14px 0px 0px; +min-width: 57px; +max-width: 57px; +min-height: 90px; +max-height: 90px; +} +#StatusBarCont #timeLbl{ +margin: 11px 0px; +padding: 0px 14px 0px 0px; +min-height: 52px; +max-height: 52px; +font-size: 33px; +} +#StatusBarCont #usbConnectedLbl{ +padding: 0px 21px 0px 0px; +min-width: 35px; +max-width: 35px; +min-height: 90px; +max-height: 90px; +} +#StatusBarCont #syncSpinnerLbl{ +padding: 0px 21px 0px 0px; +min-width: 42px; +max-width: 42px; +min-height: 90px; +max-height: 90px; +} +#StatusBarCont #wifiBtn{ +padding: 0px 21px 0px 0px; +min-width: 57px; +max-width: 57px; +min-height: 90px; +max-height: 90px; +} +#StatusBarCont #spinnerLbl{ +padding: 0px 17px 0px 0px; +min-width: 64px; +max-width: 64px; +min-height: 90px; +max-height: 90px; +} +#SeparateVertical { +min-height: 424px; +max-height: 424px; +} diff --git a/bqUi/res/1448/uncheked.png b/bqUi/res/1448/uncheked.png new file mode 100644 index 0000000..abf8c5e Binary files /dev/null and b/bqUi/res/1448/uncheked.png differ diff --git a/bqUi/res/1448/unknow_list.png b/bqUi/res/1448/unknow_list.png new file mode 100755 index 0000000..f7a4b0d Binary files /dev/null and b/bqUi/res/1448/unknow_list.png differ diff --git a/bqUi/res/1448/usb_Ico.png b/bqUi/res/1448/usb_Ico.png new file mode 100644 index 0000000..9c9b547 Binary files /dev/null and b/bqUi/res/1448/usb_Ico.png differ diff --git a/bqUi/res/1448/wifi_0_Ico.png b/bqUi/res/1448/wifi_0_Ico.png new file mode 100644 index 0000000..144e107 Binary files /dev/null and b/bqUi/res/1448/wifi_0_Ico.png differ diff --git a/bqUi/res/1448/wifi_1_Ico.png b/bqUi/res/1448/wifi_1_Ico.png new file mode 100644 index 0000000..0ed3533 Binary files /dev/null and b/bqUi/res/1448/wifi_1_Ico.png differ diff --git a/bqUi/res/1448/wifi_2_Ico.png b/bqUi/res/1448/wifi_2_Ico.png new file mode 100644 index 0000000..93f1375 Binary files /dev/null and b/bqUi/res/1448/wifi_2_Ico.png differ diff --git a/bqUi/res/1448/wifi_3_Ico.png b/bqUi/res/1448/wifi_3_Ico.png new file mode 100644 index 0000000..e67a3a4 Binary files /dev/null and b/bqUi/res/1448/wifi_3_Ico.png differ diff --git a/bqUi/res/1448/wifi_4_Ico.png b/bqUi/res/1448/wifi_4_Ico.png new file mode 100644 index 0000000..b4eee92 Binary files /dev/null and b/bqUi/res/1448/wifi_4_Ico.png differ diff --git a/bqUi/res/1448/wifi_connecting_Ico.png b/bqUi/res/1448/wifi_connecting_Ico.png new file mode 100644 index 0000000..d52ca12 Binary files /dev/null and b/bqUi/res/1448/wifi_connecting_Ico.png differ diff --git a/bqUi/res/1448/wifi_no_connected.png b/bqUi/res/1448/wifi_no_connected.png new file mode 100644 index 0000000..09118a1 Binary files /dev/null and b/bqUi/res/1448/wifi_no_connected.png differ diff --git a/bqUi/res/1448/wifi_off_Ico.png b/bqUi/res/1448/wifi_off_Ico.png new file mode 100644 index 0000000..b3a3693 Binary files /dev/null and b/bqUi/res/1448/wifi_off_Ico.png differ diff --git a/bqUi/res/1448/working-1.png b/bqUi/res/1448/working-1.png new file mode 100644 index 0000000..f5f023a Binary files /dev/null and b/bqUi/res/1448/working-1.png differ diff --git a/bqUi/res/1448/working-2.png b/bqUi/res/1448/working-2.png new file mode 100644 index 0000000..3814b37 Binary files /dev/null and b/bqUi/res/1448/working-2.png differ diff --git a/bqUi/res/1448/working-3.png b/bqUi/res/1448/working-3.png new file mode 100644 index 0000000..1ad0f16 Binary files /dev/null and b/bqUi/res/1448/working-3.png differ diff --git a/bqUi/res/1448/working-4.png b/bqUi/res/1448/working-4.png new file mode 100644 index 0000000..fbbe33f Binary files /dev/null and b/bqUi/res/1448/working-4.png differ diff --git a/bqUi/res/ui_styles_generic.qss b/bqUi/res/ui_styles_generic.qss index c69e25f..c21b3ff 100644 --- a/bqUi/res/ui_styles_generic.qss +++ b/bqUi/res/ui_styles_generic.qss @@ -142,9 +142,10 @@ background-image: url(:/res/close_popup_ico.png); -------------------------*/ #StatusBar { background-color:#FFFFFF; +border-bottom: 2px solid #9F9F9F; } #StatusBarCenterCont { -background:#F2F2F2 url(:res/bg_header.png) repeat-x bottom left; +/*background:#F2F2F2 url(:res/bg_header.png) repeat-x bottom left;*/ } #StatusBarCont #currentSectionLbl{ font-weight:bold; diff --git a/bqUi/src/KeyboardButton.cpp b/bqUi/src/KeyboardButton.cpp index 40164f3..ca87aad 100644 --- a/bqUi/src/KeyboardButton.cpp +++ b/bqUi/src/KeyboardButton.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 @@ -71,6 +71,28 @@ KeyboardButton::~KeyboardButton() m_ui_kbdLayer = NULL; } +void KeyboardButton::resetButtonStyle(bool inverted) +{ + /* Reset the style for the button,as the layer overwrites our hardcoded blit */ + + QString color = "color:#000000;background-color:#FFFFFF;"; + if(inverted || !hasPressStyle()) + color = "color:#FFFFFF;background-color:#000000;"; + + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + setStyleSheet("font-size:41px;border:3px solid #000000;border-radius: 11px;" + color); + break; + case QBook::RES758x1024: + setStyleSheet("font-size:29px;border:2px solid #000000;border-radius: 8px;" + color); + break; + case QBook::RES600x800: default: + setStyleSheet("font-size:25px;border:2px solid #000000;border-radius: 5px;" + color); + break; + } +} + void KeyboardButton::pressBtn() { qDebug() << "--->" << Q_FUNC_INFO << text(); @@ -100,6 +122,8 @@ void KeyboardButton::dehighlightButton() { qDebug() << "--->" << Q_FUNC_INFO << text(); + resetButtonStyle(); + if (!isVisible()) return; @@ -211,8 +235,7 @@ void KeyboardButton::showLayer() QPoint posInLayer = m_kbdLayer->mapFrom(parentWidget(),QPoint(xPositionInParent,y())); m_ui_kbdLayer->arrow_bottom->move(posInLayer.x(),posInLayer.y()); - /* set the style for the button,as the layer overwrites our hardcoded blit */ - setStyleSheet("font-size:25px;color:#FFFFFF;background-color:#000000;border:2px solid #000000;border-radius: 5px;"); + resetButtonStyle(true); /* Unlock the queue and flush the updates to the screen */ Screen::getInstance()->flushUpdates(); @@ -293,14 +316,8 @@ void KeyboardButton::hideLayer() Screen::getInstance()->setMode(Screen::MODE_SAFE, true, FLAG_FULLSCREEN_UPDATE, Q_FUNC_INFO); m_kbdLayer->hide(); - /* reset the button style */ - QString fontSize; - if(QBook::getResolution() == QBook::RES758x1024) - fontSize = "30px"; - else - fontSize = "25px"; + resetButtonStyle(); - setStyleSheet("font-size:" + fontSize + ";color:#000000;background-color:#FFFFFF;border:2px solid #000000;border-radius: 5px;"); Screen::getInstance()->flushUpdates(); } } diff --git a/bqUi/src/MouseFilter.cpp b/bqUi/src/MouseFilter.cpp index d625e34..3808703 100644 --- a/bqUi/src/MouseFilter.cpp +++ b/bqUi/src/MouseFilter.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 @@ -48,13 +48,16 @@ MouseFilter::MouseFilter(QObject *parent): m_LongpressTimer.setInterval(LONG_PRESS_INTERVAL); - switch(QBook::getResolution()){ + switch(QBook::getInstance()->getResolution()){ case QBook::RES600x800: i_swipe_min_length = SWIPE_MIN_LENGTH; break; case QBook::RES758x1024: i_swipe_min_length = SWIPE_MIN_LENGTH_HD; break; + case QBook::RES1072x1448: + i_swipe_min_length = SWIPE_MIN_LENGTH_FHD; + break; default: i_swipe_min_length = SWIPE_MIN_LENGTH; } @@ -175,6 +178,13 @@ void MouseFilter::processLongpress() { qDebug() << "--->" << Q_FUNC_INFO << "LONGPRESS START" << m_currentPoint; + //Don't allow long press on footer + if(m_pCurrentObj->objectName()=="pageWindow") + { + qDebug() << "--->" << Q_FUNC_INFO << "Don't allow long press on footer"; + return; + } + m_LongpressTimer.stop(); b_isLongPressing = true; diff --git a/bqUi/src/StatusBar.cpp b/bqUi/src/StatusBar.cpp index 7564600..9afbde6 100644 --- a/bqUi/src/StatusBar.cpp +++ b/bqUi/src/StatusBar.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 @@ -340,10 +340,6 @@ void StatusBar::updateTime() void StatusBar::updateTimeUI (const QString& timeStr) { -#ifdef Q_WS_QWS - qDebug() << Q_FUNC_INFO; -#endif - timeLbl->setText(timeStr); } diff --git a/bqUi/src/SwipeableQPushButton.cpp b/bqUi/src/SwipeableQPushButton.cpp index 64fcad5..160fb09 100644 --- a/bqUi/src/SwipeableQPushButton.cpp +++ b/bqUi/src/SwipeableQPushButton.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 @@ -29,6 +29,7 @@ along with the source code. If not, see . #define MIN_MOVE_SD 25 #define MIN_MOVE_HD 33 +#define MIN_MOVE_FHD 46 SwipeableQPushButton::SwipeableQPushButton (QWidget* parent) : QPushButton(parent){ qDebug() << Q_FUNC_INFO; @@ -49,10 +50,19 @@ void SwipeableQPushButton::mousePressEvent(QMouseEvent * event){ void SwipeableQPushButton::mouseMoveEvent(QMouseEvent * event){ qDebug() << Q_FUNC_INFO << isChecked(); int minMove; - if(QBook::getInstance()->getResolution() == QBook::RES758x1024) - minMove = MIN_MOVE_HD; - else - minMove = MIN_MOVE_SD; + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + minMove = MIN_MOVE_FHD; + break; + case QBook::RES758x1024: + minMove = MIN_MOVE_HD; + break; + case QBook::RES600x800: default: + minMove = MIN_MOVE_SD; + break; + } + if(event->pos().x() > last_pos + minMove && !isChecked()) { event->accept(); emit clicked(); @@ -66,10 +76,19 @@ void SwipeableQPushButton::mouseMoveEvent(QMouseEvent * event){ void SwipeableQPushButton::mouseReleaseEvent(QMouseEvent * event){ qDebug() << Q_FUNC_INFO; int minMove; - if(QBook::getInstance()->getResolution() == QBook::RES758x1024) - minMove = MIN_MOVE_HD; - else - minMove = MIN_MOVE_SD; + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + minMove = MIN_MOVE_FHD; + break; + case QBook::RES758x1024: + minMove = MIN_MOVE_HD; + break; + case QBook::RES600x800: default: + minMove = MIN_MOVE_SD; + break; + } + if(event->pos().x() < last_pos + minMove && event->pos().x() > last_pos - minMove ) { event->accept(); emit clicked(); diff --git a/bqUi/tr/bqUi_ca.ts b/bqUi/tr/bqUi_ca.ts index 0d1223e..db83f5f 100755 --- a/bqUi/tr/bqUi_ca.ts +++ b/bqUi/tr/bqUi_ca.ts @@ -60,7 +60,7 @@ Què vols fer? Buscar - Cercar + Cerca @@ -132,7 +132,7 @@ Què vols fer? Buscar - Cercar + Cerca @@ -155,7 +155,7 @@ Què vols fer? Cancel - Cancel·lar + Cancel·la @@ -180,7 +180,7 @@ Què vols fer? Cancelar - Cancel·lar + Cancel·la diff --git a/bqUi/ui/ConfirmDialog.ui b/bqUi/ui/ConfirmDialog.ui index a7071fd..65bae5d 100755 --- a/bqUi/ui/ConfirmDialog.ui +++ b/bqUi/ui/ConfirmDialog.ui @@ -6,15 +6,15 @@ 0 0 - 474 - 224 + 670 + 317 Dialog - + @@ -26,7 +26,7 @@ - + @@ -55,7 +55,7 @@ - + Restore factory default settings? Restore factory default settings? Restore factory default settings? @@ -98,8 +98,8 @@ - 40 - 20 + 57 + 28 @@ -120,23 +120,23 @@ - 164 - 49 + 232 + 69 Qt::NoFocus - + Aceptar - 112 - 60 + 158 + 85 @@ -154,8 +154,8 @@ - 40 - 20 + 57 + 28 @@ -175,6 +175,6 @@
SilentQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqUi/ui/CorruptedDialog.ui b/bqUi/ui/CorruptedDialog.ui index f85e968..8ef3036 100755 --- a/bqUi/ui/CorruptedDialog.ui +++ b/bqUi/ui/CorruptedDialog.ui @@ -6,15 +6,15 @@ 0 0 - 554 - 224 + 783 + 317 Dialog - + @@ -33,7 +33,7 @@ - 550 + 778 16777215 @@ -81,7 +81,7 @@ What do you want to do? 16777215 - 70 + 99 @@ -95,8 +95,8 @@ What do you want to do? - 99999 - 99999 + 141420 + 141420 @@ -131,8 +131,8 @@ What do you want to do? - 504 - 49 + 713 + 69 @@ -149,15 +149,15 @@ What do you want to do? false - + Reset memory - 112 - 60 + 158 + 85 @@ -175,8 +175,8 @@ What do you want to do? - 9999999 - 9999999 + 14142134 + 14142134 @@ -211,23 +211,23 @@ What do you want to do? - 154 - 49 + 218 + 69 Qt::NoFocus - + Try to use - 112 - 60 + 158 + 85 @@ -245,8 +245,8 @@ What do you want to do? - 999999 - 9999999 + 1414212 + 14142134 @@ -281,23 +281,23 @@ What do you want to do? - 154 - 49 + 218 + 69 Qt::NoFocus - + Do not use - 112 - 60 + 158 + 85 @@ -326,6 +326,6 @@ What do you want to do?
FastQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqUi/ui/ElfHorizontalPagination.ui b/bqUi/ui/ElfHorizontalPagination.ui index 8f5110e..fb3c778 100755 --- a/bqUi/ui/ElfHorizontalPagination.ui +++ b/bqUi/ui/ElfHorizontalPagination.ui @@ -6,23 +6,23 @@ 0 0 - 570 - 51 + 806 + 72 Form - + 0 0 - 570 - 50 + 806 + 71 @@ -55,8 +55,8 @@ - 40 - 20 + 57 + 28 @@ -71,8 +71,8 @@ - 20 - 20 + 28 + 28 @@ -94,8 +94,8 @@ - 5 - 20 + 7 + 28 @@ -117,8 +117,8 @@ - 5 - 20 + 7 + 28 @@ -140,8 +140,8 @@ - 5 - 20 + 7 + 28 @@ -163,8 +163,8 @@ - 20 - 20 + 28 + 28 @@ -172,14 +172,14 @@ - + - + @@ -198,6 +198,6 @@
SilentQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqUi/ui/ElfPowerOffDialog.ui b/bqUi/ui/ElfPowerOffDialog.ui index 2120c30..3aaaa35 100755 --- a/bqUi/ui/ElfPowerOffDialog.ui +++ b/bqUi/ui/ElfPowerOffDialog.ui @@ -1,632 +1,632 @@ - - - ElfPowerOffDialog - - - - 0 - 0 - 420 - 220 - - - - Form - - - - - - - - 0 - 0 - 420 - 220 - - - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - - - - - 0 - 0 - 421 - 257 - - - - - 6 - - - 1 - - - 2 - - - 2 - - - - - - 0 - 60 - - - - - 16777215 - 60 - - - - - 0 - - - 0 - - - 5 - - - 15 - - - 5 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 101 - 40 - - - - - 101 - 40 - - - - Qt::NoFocus - - - - - - Close - - - - 112 - 60 - - - - true - - - - - - - - - - - 0 - - - 15 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 10 - - - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Qt::NoFocus - - - - - - - - - - 112 - 60 - - - - false - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - - - - Shutdown - - - Qt::AlignCenter - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 10 - - - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Qt::NoFocus - - - false - - - - - - - - - - 112 - 60 - - - - false - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - Sleep - - - Qt::AlignCenter - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - FastQPushButton - QPushButton -
FastQPushButton.h
- - - - - - - + + + ElfPowerOffDialog + + + + 0 + 0 + 594 + 311 + + + + Form + + + + + + + + 0 + 0 + 594 + 311 + + + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + + + + + 0 + 0 + 595 + 363 + + + + + 6 + + + 1 + + + 2 + + + 2 + + + + + + 0 + 60 + + + + + 16777215 + 85 + + + + + 0 + + + 0 + + + 5 + + + 15 + + + 5 + + + + + Qt::Horizontal + + + + 57 + 28 + + + + + + + + + 0 + 0 + + + + + 101 + 40 + + + + + 143 + 57 + + + + Qt::NoFocus + + + + + + Close + + + + 158 + 85 + + + + true + + + + + + + + + + + 0 + + + 15 + + + + + Qt::Horizontal + + + + 57 + 28 + + + + + + + + 10 + + + + + 0 + + + + + Qt::Horizontal + + + + 57 + 28 + + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + 141 + 16777215 + + + + Qt::NoFocus + + + + + + + + + + 158 + 85 + + + + false + + + true + + + + + + + Qt::Horizontal + + + + 57 + 28 + + + + + + + + + + + 0 + 30 + + + + + 16777215 + 42 + + + + + + + Shutdown + + + Qt::AlignCenter + + + + + + + Qt::Vertical + + + + 28 + 57 + + + + + + + + + + Qt::Horizontal + + + + 57 + 28 + + + + + + + + 10 + + + + + 0 + + + + + Qt::Horizontal + + + + 57 + 28 + + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + 141 + 16777215 + + + + Qt::NoFocus + + + false + + + + + + + + + + 158 + 85 + + + + false + + + true + + + + + + + Qt::Horizontal + + + + 57 + 28 + + + + + + + + + + + 0 + 30 + + + + + 16777215 + 42 + + + + Sleep + + + Qt::AlignCenter + + + + + + + Qt::Vertical + + + + 28 + 57 + + + + + + + + + + Qt::Horizontal + + + + 57 + 28 + + + + + + + + + + + Qt::Vertical + + + + 28 + 57 + + + + + + + + + + + FastQPushButton + QPushButton +
FastQPushButton.h
+ + + + + + + \ No newline at end of file diff --git a/bqUi/ui/HorizontalPagination.ui b/bqUi/ui/HorizontalPagination.ui index 119cc39..9e85aa5 100755 --- a/bqUi/ui/HorizontalPagination.ui +++ b/bqUi/ui/HorizontalPagination.ui @@ -6,23 +6,23 @@ 0 0 - 600 - 50 + 849 + 71 Form - + 0 0 - 600 - 50 + 849 + 71 @@ -45,8 +45,8 @@ - 40 - 20 + 57 + 28 @@ -54,7 +54,7 @@ - + @@ -68,8 +68,8 @@ - 20 - 20 + 28 + 28 @@ -112,8 +112,8 @@ - 20 - 20 + 28 + 28 @@ -121,7 +121,7 @@ - + @@ -132,8 +132,8 @@ - 40 - 20 + 57 + 28 @@ -141,6 +141,6 @@ - - - + + + \ No newline at end of file diff --git a/bqUi/ui/InfoDialog.ui b/bqUi/ui/InfoDialog.ui index 4e524a3..04cde08 100755 --- a/bqUi/ui/InfoDialog.ui +++ b/bqUi/ui/InfoDialog.ui @@ -6,15 +6,15 @@ 0 0 - 758 - 960 + 1072 + 1358 Dialog - + @@ -34,7 +34,7 @@ - + @@ -53,12 +53,12 @@ - 606 - 281 + 857 + 397 - + @@ -87,7 +87,7 @@ - + Restore factory default settings? Restore factory default settings? Restore factory default settings? @@ -108,7 +108,7 @@ - + @@ -125,14 +125,14 @@ - 20 - 40 + 28 + 57 - - - + + + \ No newline at end of file diff --git a/bqUi/ui/Keyboard.ui b/bqUi/ui/Keyboard.ui index dfbd0f9..8c1c77d 100755 --- a/bqUi/ui/Keyboard.ui +++ b/bqUi/ui/Keyboard.ui @@ -6,27 +6,27 @@ 0 0 - 758 - 300 + 1072 + 424 - 600 - 300 + 0 + 0 - 758 - 384 + 1072 + 543 Form - + @@ -45,8 +45,8 @@ - 758 - 384 + 1072 + 543 @@ -60,8 +60,8 @@ 10 0 - 581 - 300 + 822 + 424 @@ -72,8 +72,8 @@ - 581 - 300 + 822 + 424 @@ -104,8 +104,8 @@ - 40 - 20 + 57 + 28 @@ -120,8 +120,8 @@ - 50 - 50 + 71 + 71 @@ -142,8 +142,8 @@ - 50 - 50 + 71 + 71 @@ -164,8 +164,8 @@ - 50 - 50 + 71 + 71 @@ -186,8 +186,8 @@ - 50 - 50 + 71 + 71 @@ -208,8 +208,8 @@ - 50 - 50 + 71 + 71 @@ -230,8 +230,8 @@ - 50 - 50 + 71 + 71 @@ -252,8 +252,8 @@ - 50 - 50 + 71 + 71 @@ -274,8 +274,8 @@ - 50 - 50 + 71 + 71 @@ -296,8 +296,8 @@ - 50 - 50 + 71 + 71 @@ -318,8 +318,8 @@ - 50 - 50 + 71 + 71 @@ -337,8 +337,8 @@ - 40 - 20 + 57 + 28 @@ -357,8 +357,8 @@ - 40 - 20 + 57 + 28 @@ -373,8 +373,8 @@ - 50 - 50 + 71 + 71 @@ -395,8 +395,8 @@ - 50 - 50 + 71 + 71 @@ -417,8 +417,8 @@ - 50 - 50 + 71 + 71 @@ -439,8 +439,8 @@ - 50 - 50 + 71 + 71 @@ -461,8 +461,8 @@ - 50 - 50 + 71 + 71 @@ -483,8 +483,8 @@ - 50 - 50 + 71 + 71 @@ -505,8 +505,8 @@ - 50 - 50 + 71 + 71 @@ -527,8 +527,8 @@ - 50 - 50 + 71 + 71 @@ -549,8 +549,8 @@ - 50 - 50 + 71 + 71 @@ -571,8 +571,8 @@ - 50 - 50 + 71 + 71 @@ -590,8 +590,8 @@ - 40 - 20 + 57 + 28 @@ -610,8 +610,8 @@ - 40 - 20 + 57 + 28 @@ -626,8 +626,8 @@ - 50 - 50 + 71 + 71 @@ -648,8 +648,8 @@ - 50 - 50 + 71 + 71 @@ -670,8 +670,8 @@ - 50 - 50 + 71 + 71 @@ -692,8 +692,8 @@ - 50 - 50 + 71 + 71 @@ -714,8 +714,8 @@ - 50 - 50 + 71 + 71 @@ -736,8 +736,8 @@ - 50 - 50 + 71 + 71 @@ -758,8 +758,8 @@ - 50 - 50 + 71 + 71 @@ -780,8 +780,8 @@ - 50 - 50 + 71 + 71 @@ -802,8 +802,8 @@ - 50 - 50 + 71 + 71 @@ -824,12 +824,12 @@ - 50 - 50 + 71 + 71 - + Qt::AlignCenter @@ -846,8 +846,8 @@ - 40 - 20 + 57 + 28 @@ -866,8 +866,8 @@ - 40 - 20 + 57 + 28 @@ -882,12 +882,12 @@ - 50 - 50 + 71 + 71 - + Qt::AlignCenter @@ -904,8 +904,8 @@ - 50 - 50 + 71 + 71 @@ -926,8 +926,8 @@ - 50 - 50 + 71 + 71 @@ -948,8 +948,8 @@ - 50 - 50 + 71 + 71 @@ -970,8 +970,8 @@ - 50 - 50 + 71 + 71 @@ -992,8 +992,8 @@ - 50 - 50 + 71 + 71 @@ -1014,8 +1014,8 @@ - 50 - 50 + 71 + 71 @@ -1036,8 +1036,8 @@ - 50 - 50 + 71 + 71 @@ -1058,8 +1058,8 @@ - 50 - 50 + 71 + 71 @@ -1080,12 +1080,12 @@ - 50 - 50 + 71 + 71 - + Qt::AlignCenter @@ -1099,8 +1099,8 @@ - 40 - 20 + 57 + 28 @@ -1122,8 +1122,8 @@ - 40 - 20 + 57 + 28 @@ -1138,8 +1138,8 @@ - 50 - 50 + 71 + 71 @@ -1160,12 +1160,12 @@ - 200 - 50 + 283 + 71 - + Qt::AlignCenter @@ -1182,8 +1182,8 @@ - 40 - 20 + 57 + 28 @@ -1198,12 +1198,12 @@ - 50 - 50 + 71 + 71 - + Qt::AlignCenter @@ -1220,12 +1220,12 @@ - 50 - 50 + 71 + 71 - + Qt::AlignCenter @@ -1242,8 +1242,8 @@ - 50 - 50 + 71 + 71 @@ -1264,8 +1264,8 @@ - 50 - 50 + 71 + 71 @@ -1289,8 +1289,8 @@ - 40 - 20 + 57 + 28 @@ -1310,6 +1310,6 @@
KeyboardButton.h
- - - + + + \ No newline at end of file diff --git a/bqUi/ui/KeyboardLayer.ui b/bqUi/ui/KeyboardLayer.ui index 44abee7..51c468e 100755 --- a/bqUi/ui/KeyboardLayer.ui +++ b/bqUi/ui/KeyboardLayer.ui @@ -6,8 +6,8 @@ 0 0 - 434 - 137 + 614 + 194 @@ -26,7 +26,7 @@ Form - + @@ -47,7 +47,7 @@ - + @@ -114,8 +114,8 @@ - 50 - 50 + 71 + 71 @@ -136,8 +136,8 @@ - 50 - 50 + 71 + 71 @@ -158,8 +158,8 @@ - 50 - 50 + 71 + 71 @@ -180,8 +180,8 @@ - 50 - 50 + 71 + 71 @@ -202,8 +202,8 @@ - 50 - 50 + 71 + 71 @@ -224,8 +224,8 @@ - 50 - 50 + 71 + 71 @@ -246,8 +246,8 @@ - 50 - 50 + 71 + 71 @@ -278,7 +278,7 @@ 16777215 - 100 + 141 @@ -301,8 +301,8 @@ - 50 - 50 + 71 + 71 @@ -323,8 +323,8 @@ - 50 - 50 + 71 + 71 @@ -345,8 +345,8 @@ - 50 - 50 + 71 + 71 @@ -367,8 +367,8 @@ - 50 - 50 + 71 + 71 @@ -389,8 +389,8 @@ - 50 - 50 + 71 + 71 @@ -411,8 +411,8 @@ - 50 - 50 + 71 + 71 @@ -433,8 +433,8 @@ - 50 - 50 + 71 + 71 @@ -461,7 +461,7 @@ - 45 + 64 16777215 @@ -473,21 +473,21 @@ 5 0 - 40 - 65 + 57 + 92 - 40 - 65 + 57 + 92 Qt::NoFocus - + @@ -505,12 +505,12 @@ - 20 - 14 + 28 + 20 - + @@ -524,8 +524,8 @@ - - + + - - + + \ No newline at end of file diff --git a/bqUi/ui/KeyboardLayer2.ui b/bqUi/ui/KeyboardLayer2.ui index a08af50..ee8a596 100755 --- a/bqUi/ui/KeyboardLayer2.ui +++ b/bqUi/ui/KeyboardLayer2.ui @@ -6,8 +6,8 @@ 0 0 - 498 - 168 + 704 + 238 @@ -50,7 +50,7 @@ 0 - + @@ -60,8 +60,8 @@ - 50 - 50 + 71 + 71 @@ -72,7 +72,7 @@ - + @@ -82,8 +82,8 @@ - 50 - 50 + 71 + 71 @@ -94,7 +94,7 @@ - + @@ -104,8 +104,8 @@ - 50 - 50 + 71 + 71 @@ -116,7 +116,7 @@ - + @@ -126,8 +126,8 @@ - 50 - 50 + 71 + 71 @@ -138,7 +138,7 @@ - + @@ -148,8 +148,8 @@ - 50 - 50 + 71 + 71 @@ -160,7 +160,7 @@ - + @@ -170,8 +170,8 @@ - 50 - 50 + 71 + 71 @@ -182,7 +182,7 @@ - + @@ -192,8 +192,8 @@ - 50 - 50 + 71 + 71 @@ -204,7 +204,7 @@ - + @@ -214,8 +214,8 @@ - 50 - 50 + 71 + 71 @@ -226,7 +226,7 @@ - + @@ -236,8 +236,8 @@ - 50 - 50 + 71 + 71 @@ -248,7 +248,7 @@ - + @@ -258,8 +258,8 @@ - 50 - 50 + 71 + 71 @@ -270,7 +270,7 @@ - + @@ -280,8 +280,8 @@ - 50 - 50 + 71 + 71 @@ -292,7 +292,7 @@ - + @@ -302,8 +302,8 @@ - 50 - 50 + 71 + 71 @@ -314,7 +314,7 @@ - + @@ -324,8 +324,8 @@ - 50 - 50 + 71 + 71 @@ -336,7 +336,7 @@ - + @@ -346,8 +346,8 @@ - 50 - 50 + 71 + 71 @@ -371,8 +371,8 @@ - 45 - 16777215 + 64 + 23726565 @@ -383,14 +383,14 @@ 0 0 - 40 - 60 + 57 + 85 - 40 - 60 + 57 + 85 @@ -415,12 +415,12 @@ - 20 - 14 + 28 + 20 - + @@ -433,6 +433,6 @@
KeyboardButton.h
- - - + + + \ No newline at end of file diff --git a/bqUi/ui/ProgressDialog.ui b/bqUi/ui/ProgressDialog.ui index 440e9cd..27488ce 100755 --- a/bqUi/ui/ProgressDialog.ui +++ b/bqUi/ui/ProgressDialog.ui @@ -6,15 +6,15 @@ 0 0 - 600 - 800 + 849 + 1131 Dialog - + true @@ -43,7 +43,7 @@ - + @@ -61,8 +61,8 @@ - 40 - 20 + 57 + 28 @@ -85,7 +85,7 @@ - + Restore factory default settings? Restore factory defa ult settings? Restore factory default settings? @@ -121,7 +121,7 @@ 16777215 - 60 + 85 @@ -138,8 +138,8 @@ - 5 - 20 + 7 + 28 @@ -167,8 +167,8 @@ - 5 - 20 + 7 + 28 @@ -183,8 +183,8 @@ - 20 - 40 + 28 + 57 @@ -204,8 +204,8 @@ - 40 - 20 + 57 + 28 @@ -233,8 +233,8 @@ - 164 - 49 + 232 + 69 @@ -249,8 +249,8 @@ - 40 - 20 + 57 + 28 @@ -264,8 +264,8 @@ - 20 - 40 + 28 + 57 @@ -280,8 +280,8 @@ - 40 - 20 + 57 + 28 @@ -295,8 +295,8 @@ - 20 - 40 + 28 + 57 @@ -313,6 +313,6 @@
FastQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqUi/ui/SelectionDialog.ui b/bqUi/ui/SelectionDialog.ui index ad14fda..e7f92e9 100755 --- a/bqUi/ui/SelectionDialog.ui +++ b/bqUi/ui/SelectionDialog.ui @@ -6,8 +6,8 @@ 0 0 - 474 - 224 + 670 + 317 @@ -17,7 +17,7 @@ Dialog - + @@ -29,7 +29,7 @@ - + @@ -58,7 +58,7 @@ - + Restore factory default settings? Restore factory default settings? @@ -101,8 +101,8 @@ - 40 - 20 + 57 + 28 @@ -123,23 +123,23 @@ - 164 - 49 + 232 + 69 Qt::NoFocus - + Aceptar - 112 - 60 + 158 + 85 @@ -166,23 +166,23 @@ - 164 - 49 + 232 + 69 Qt::NoFocus - + Cancelar - 112 - 60 + 158 + 85 @@ -200,8 +200,8 @@ - 40 - 20 + 57 + 28 @@ -221,6 +221,6 @@
SilentQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqUi/ui/StatusBar.ui b/bqUi/ui/StatusBar.ui index 531043a..4a9bcba 100755 --- a/bqUi/ui/StatusBar.ui +++ b/bqUi/ui/StatusBar.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 50 + 849 + 71 @@ -24,15 +24,15 @@ - 600 - 50 + 849 + 71 Form - + @@ -68,7 +68,7 @@ - + @@ -98,8 +98,8 @@ - 11 - 20 + 16 + 28 @@ -107,7 +107,7 @@ - + @@ -117,7 +117,7 @@ Qt::NoFocus - + false @@ -130,7 +130,7 @@ Qt::NoFocus - + @@ -144,12 +144,12 @@ - 25 - 50 + 35 + 71 - + @@ -162,7 +162,7 @@ - + @@ -177,7 +177,7 @@ 16777215 - 53 + 75 @@ -201,18 +201,18 @@ - 54 - 52 + 76 + 74 Qt::NoFocus - + - + @@ -224,7 +224,7 @@ - + ElidedLabel @@ -232,6 +232,6 @@
ElidedLabel.h
 - - - + + + \ No newline at end of file diff --git a/bqUi/ui/VerticalPagerHandler.ui b/bqUi/ui/VerticalPagerHandler.ui index b77378e..d6cbe85 100755 --- a/bqUi/ui/VerticalPagerHandler.ui +++ b/bqUi/ui/VerticalPagerHandler.ui @@ -6,15 +6,15 @@ 0 0 - 600 - 40 + 849 + 57 Form - + @@ -30,8 +30,8 @@ - 40 - 20 + 57 + 28 @@ -39,14 +39,14 @@ - + - Pág. + Pág. Qt::AlignCenter @@ -98,7 +98,7 @@ - + @@ -109,8 +109,8 @@ - 40 - 20 + 57 + 28 @@ -118,7 +118,7 @@ - + - - + + \ No newline at end of file diff --git a/bqUi/ui/bqVerticalPageHandler.ui b/bqUi/ui/bqVerticalPageHandler.ui index ae919a5..5a8c089 100755 --- a/bqUi/ui/bqVerticalPageHandler.ui +++ b/bqUi/ui/bqVerticalPageHandler.ui @@ -6,23 +6,23 @@ 0 0 - 570 - 50 + 806 + 71 Form - + 0 0 - 570 - 50 + 806 + 71 @@ -48,8 +48,8 @@ - 300 - 20 + 424 + 28 @@ -63,7 +63,7 @@ - + @@ -77,8 +77,8 @@ - 40 - 20 + 57 + 28 @@ -121,8 +121,8 @@ - 40 - 20 + 57 + 28 @@ -136,7 +136,7 @@ - + @@ -147,8 +147,8 @@ - 300 - 20 + 424 + 28 @@ -163,6 +163,6 @@
SilentQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqViewer/Viewer1448.qrc b/bqViewer/Viewer1448.qrc new file mode 100755 index 0000000..b64e3f1 --- /dev/null +++ b/bqViewer/Viewer1448.qrc @@ -0,0 +1,100 @@ + + + res/1448/appearance.png + res/1448/arrow_bottom.png + res/1448/arrow_top.png + res/1448/bookmark.png + res/1448/bookmark_ico.png + res/1448/check.png + res/1448/clear.png + res/1448/close.png + res/1448/content.png + res/1448/current_line_spacing_1.png + res/1448/current_line_spacing_2.png + res/1448/current_line_spacing_3.png + res/1448/current_margin_1.png + res/1448/current_margin_2.png + res/1448/current_margin_3.png + res/1448/datasheet.png + res/1448/goto.png + res/1448/highlighted_ico.png + res/1448/line_spacing_1.png + res/1448/line_spacing_2.png + res/1448/line_spacing_3.png + res/1448/margin_1.png + res/1448/margin_2.png + res/1448/margin_3.png + res/1448/note_ico.png + res/1448/search.png + res/viewer_styles_generic.qss + res/1448/clear_char_cont.png + res/1448/goto_cont.png + res/1448/number_cont.png + res/1448/beginning_page_cont.png + res/1448/end_page_cont.png + res/1448/tab_arrow.png + res/1448/contents_tabs.png + res/1448/notes_tabs.png + res/1448/only_text.png + res/1448/with_images.png + res/1448/current_only_text.png + res/1448/current_show_images.png + res/1448/bg_input.png + res/1448/viewer_styles.qss + res/1448/page_back_btn.png + res/1448/buy_book.png + res/1448/arrow_margin.png + res/1448/current_justify_text_1.png + res/1448/current_justify_text_2.png + res/1448/current_justify_text_3.png + res/1448/justify_text_1.png + res/1448/justify_text_2.png + res/1448/justify_text_3.png + res/1448/up_pager_btn.png + res/1448/down_pager_disabled_btn.png + res/1448/up_pager_disabled_btn.png + res/1448/down_pager_btn.png + res/1448/off_btn.png + res/1448/on_btn.png + res/1448/justify_text_opacity_3.png + res/1448/line_spacing_opacity_1.png + res/1448/line_spacing_opacity_2.png + res/1448/line_spacing_opacity_3.png + res/1448/margin_opacity_1.png + res/1448/margin_opacity_2.png + res/1448/margin_opacity_3.png + res/1448/justify_text_opacity_2.png + res/1448/justify_text_opacity_1.png + res/1448/select_text_bottom.png + res/1448/select_text_top.png + res/1448/close-pdf-ico.png + res/1448/move-all-dir-pdf-ico.png + res/1448/move-hor-dir-pdf-ico.png + res/1448/move-ver-dir-pdf-ico.png + res/1448/pdf-ico.png + res/1448/rotate-pdf-ico.png + res/1448/zoom-out-pdf-ico.png + res/1448/zoom-pdf-ico.png + res/1448/rotate-pdf-ico-landscape.png + res/1448/zoom-pdf-ico-landscape.png + res/1448/zoom-out-pdf-ico-landscape.png + res/1448/pdf-ico-landscape.png + res/1448/move-ver-dir-pdf-ico-landscape.png + res/1448/move-hor-dir-pdf-ico-landscape.png + res/1448/move-all-dir-pdf-ico-landscape.png + res/1448/close-pdf-ico-landscape.png + res/1448/buy_book_landscape.png + res/1448/bookmark_landscape.png + res/1448/page_back_btn_landscape.png + res/1448/empty.png + res/1448/viewer_conf_btn.png + res/1448/back-def.png + res/1448/pre_landscape_btn.png + res/1448/nex_landscape_btn.png + res/1448/wikipedia.png + res/1448/plus-ico.png + res/1448/wikipedia-btn.png + res/1448/chapter-progressbar.png + res/1448/wikipedia-adaptative.png + + diff --git a/bqViewer/bqViewer.pri b/bqViewer/bqViewer.pri index 6466df9..023d1f5 100755 --- a/bqViewer/bqViewer.pri +++ b/bqViewer/bqViewer.pri @@ -125,7 +125,7 @@ FORMS += ./ui/Viewer.ui \ ./ui/ViewerCollectionLayer.ui \ ./ui/ViewerCollectionItem.ui -QRC_FILES += Viewer800.qrc Viewer1024.qrc +QRC_FILES += Viewer800.qrc Viewer1024.qrc Viewer1448.qrc TRANSLATIONS = tr/bqViewer_es.ts \ @@ -149,4 +149,5 @@ LIBS += -lbz2 -ldl -lz -lssl -lpng -lrtmp -lzip -lpng12 -llzma -lp11-kit -lfreet OTHER_FILES += \ bqViewer/res/800/viewer_styles.qss \ bqViewer/res/1024/viewer_styles.qss \ + bqViewer/res/1448/viewer_styles.qss \ bqViewer/res/viewer_styles_generic.qss diff --git a/bqViewer/inc/Viewer.h b/bqViewer/inc/Viewer.h index 4cfa913..7dd5913 100644 --- a/bqViewer/inc/Viewer.h +++ b/bqViewer/inc/Viewer.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 @@ -64,6 +64,7 @@ class QDateTime; #define SCROLL_AREA_WIDTH 120 #define SCROLL_AREA_WIDTH_HD 153 +#define SCROLL_AREA_WIDTH_FHD 216 enum HighlightPopupType { INIT_SINGLE_WORD_POPUP, diff --git a/bqViewer/res/1448/appearance.png b/bqViewer/res/1448/appearance.png new file mode 100644 index 0000000..87478ff Binary files /dev/null and b/bqViewer/res/1448/appearance.png differ diff --git a/bqViewer/res/1448/arrow_bottom.png b/bqViewer/res/1448/arrow_bottom.png new file mode 100755 index 0000000..3881ead Binary files /dev/null and b/bqViewer/res/1448/arrow_bottom.png differ diff --git a/bqViewer/res/1448/arrow_margin.png b/bqViewer/res/1448/arrow_margin.png new file mode 100644 index 0000000..4a22df0 Binary files /dev/null and b/bqViewer/res/1448/arrow_margin.png differ diff --git a/bqViewer/res/1448/arrow_top.png b/bqViewer/res/1448/arrow_top.png new file mode 100755 index 0000000..f2f53c0 Binary files /dev/null and b/bqViewer/res/1448/arrow_top.png differ diff --git a/bqViewer/res/1448/back-def.png b/bqViewer/res/1448/back-def.png new file mode 100755 index 0000000..abaaff0 Binary files /dev/null and b/bqViewer/res/1448/back-def.png differ diff --git a/bqViewer/res/1448/beginning_page_cont.png b/bqViewer/res/1448/beginning_page_cont.png new file mode 100644 index 0000000..f26e56f Binary files /dev/null and b/bqViewer/res/1448/beginning_page_cont.png differ diff --git a/bqViewer/res/1448/bg_input.png b/bqViewer/res/1448/bg_input.png new file mode 100755 index 0000000..82a606e Binary files /dev/null and b/bqViewer/res/1448/bg_input.png differ diff --git a/bqViewer/res/1448/bookmark.png b/bqViewer/res/1448/bookmark.png new file mode 100755 index 0000000..33ff2a2 Binary files /dev/null and b/bqViewer/res/1448/bookmark.png differ diff --git a/bqViewer/res/1448/bookmark_ico.png b/bqViewer/res/1448/bookmark_ico.png new file mode 100644 index 0000000..2d900d2 Binary files /dev/null and b/bqViewer/res/1448/bookmark_ico.png differ diff --git a/bqViewer/res/1448/bookmark_landscape.png b/bqViewer/res/1448/bookmark_landscape.png new file mode 100644 index 0000000..c0d0c96 Binary files /dev/null and b/bqViewer/res/1448/bookmark_landscape.png differ diff --git a/bqViewer/res/1448/buy_book.png b/bqViewer/res/1448/buy_book.png new file mode 100644 index 0000000..9a14637 Binary files /dev/null and b/bqViewer/res/1448/buy_book.png differ diff --git a/bqViewer/res/1448/buy_book_landscape.png b/bqViewer/res/1448/buy_book_landscape.png new file mode 100644 index 0000000..f3c9b03 Binary files /dev/null and b/bqViewer/res/1448/buy_book_landscape.png differ diff --git a/bqViewer/res/1448/chapter-progressbar.png b/bqViewer/res/1448/chapter-progressbar.png new file mode 100644 index 0000000..8e7dea7 Binary files /dev/null and b/bqViewer/res/1448/chapter-progressbar.png differ diff --git a/bqViewer/res/1448/check.png b/bqViewer/res/1448/check.png new file mode 100755 index 0000000..696221d Binary files /dev/null and b/bqViewer/res/1448/check.png differ diff --git a/bqViewer/res/1448/clear.png b/bqViewer/res/1448/clear.png new file mode 100644 index 0000000..da9705a Binary files /dev/null and b/bqViewer/res/1448/clear.png differ diff --git a/bqViewer/res/1448/clear_char_cont.png b/bqViewer/res/1448/clear_char_cont.png new file mode 100644 index 0000000..99f721b Binary files /dev/null and b/bqViewer/res/1448/clear_char_cont.png differ diff --git a/bqViewer/res/1448/close-pdf-ico-landscape.png b/bqViewer/res/1448/close-pdf-ico-landscape.png new file mode 100644 index 0000000..fba2f5a Binary files /dev/null and b/bqViewer/res/1448/close-pdf-ico-landscape.png differ diff --git a/bqViewer/res/1448/close-pdf-ico.png b/bqViewer/res/1448/close-pdf-ico.png new file mode 100644 index 0000000..1e9a970 Binary files /dev/null and b/bqViewer/res/1448/close-pdf-ico.png differ diff --git a/bqViewer/res/1448/close.png b/bqViewer/res/1448/close.png new file mode 100755 index 0000000..c40d76d Binary files /dev/null and b/bqViewer/res/1448/close.png differ diff --git a/bqViewer/res/1448/content.png b/bqViewer/res/1448/content.png new file mode 100644 index 0000000..e15a7b9 Binary files /dev/null and b/bqViewer/res/1448/content.png differ diff --git a/bqViewer/res/1448/contents_tabs.png b/bqViewer/res/1448/contents_tabs.png new file mode 100644 index 0000000..87386f0 Binary files /dev/null and b/bqViewer/res/1448/contents_tabs.png differ diff --git a/bqViewer/res/1448/current_justify_text_1.png b/bqViewer/res/1448/current_justify_text_1.png new file mode 100644 index 0000000..46e3331 Binary files /dev/null and b/bqViewer/res/1448/current_justify_text_1.png differ diff --git a/bqViewer/res/1448/current_justify_text_2.png b/bqViewer/res/1448/current_justify_text_2.png new file mode 100644 index 0000000..e30e6d1 Binary files /dev/null and b/bqViewer/res/1448/current_justify_text_2.png differ diff --git a/bqViewer/res/1448/current_justify_text_3.png b/bqViewer/res/1448/current_justify_text_3.png new file mode 100644 index 0000000..0ae131b Binary files /dev/null and b/bqViewer/res/1448/current_justify_text_3.png differ diff --git a/bqViewer/res/1448/current_line_spacing_1.png b/bqViewer/res/1448/current_line_spacing_1.png new file mode 100644 index 0000000..1375866 Binary files /dev/null and b/bqViewer/res/1448/current_line_spacing_1.png differ diff --git a/bqViewer/res/1448/current_line_spacing_2.png b/bqViewer/res/1448/current_line_spacing_2.png new file mode 100644 index 0000000..d53ccc7 Binary files /dev/null and b/bqViewer/res/1448/current_line_spacing_2.png differ diff --git a/bqViewer/res/1448/current_line_spacing_3.png b/bqViewer/res/1448/current_line_spacing_3.png new file mode 100644 index 0000000..8793ac9 Binary files /dev/null and b/bqViewer/res/1448/current_line_spacing_3.png differ diff --git a/bqViewer/res/1448/current_margin_1.png b/bqViewer/res/1448/current_margin_1.png new file mode 100644 index 0000000..35697d6 Binary files /dev/null and b/bqViewer/res/1448/current_margin_1.png differ diff --git a/bqViewer/res/1448/current_margin_2.png b/bqViewer/res/1448/current_margin_2.png new file mode 100644 index 0000000..265b0bd Binary files /dev/null and b/bqViewer/res/1448/current_margin_2.png differ diff --git a/bqViewer/res/1448/current_margin_3.png b/bqViewer/res/1448/current_margin_3.png new file mode 100644 index 0000000..0014740 Binary files /dev/null and b/bqViewer/res/1448/current_margin_3.png differ diff --git a/bqViewer/res/1448/current_only_text.png b/bqViewer/res/1448/current_only_text.png new file mode 100644 index 0000000..70522ac Binary files /dev/null and b/bqViewer/res/1448/current_only_text.png differ diff --git a/bqViewer/res/1448/current_show_images.png b/bqViewer/res/1448/current_show_images.png new file mode 100644 index 0000000..53c7390 Binary files /dev/null and b/bqViewer/res/1448/current_show_images.png differ diff --git a/bqViewer/res/1448/datasheet.png b/bqViewer/res/1448/datasheet.png new file mode 100644 index 0000000..dfd1268 Binary files /dev/null and b/bqViewer/res/1448/datasheet.png differ diff --git a/bqViewer/res/1448/down_pager_btn.png b/bqViewer/res/1448/down_pager_btn.png new file mode 100755 index 0000000..3f0987d Binary files /dev/null and b/bqViewer/res/1448/down_pager_btn.png differ diff --git a/bqViewer/res/1448/down_pager_disabled_btn.png b/bqViewer/res/1448/down_pager_disabled_btn.png new file mode 100755 index 0000000..23e1b37 Binary files /dev/null and b/bqViewer/res/1448/down_pager_disabled_btn.png differ diff --git a/bqViewer/res/1448/empty.png b/bqViewer/res/1448/empty.png new file mode 100644 index 0000000..ed09d0a Binary files /dev/null and b/bqViewer/res/1448/empty.png differ diff --git a/bqViewer/res/1448/end_page_cont.png b/bqViewer/res/1448/end_page_cont.png new file mode 100644 index 0000000..44b2191 Binary files /dev/null and b/bqViewer/res/1448/end_page_cont.png differ diff --git a/bqViewer/res/1448/goto.png b/bqViewer/res/1448/goto.png new file mode 100644 index 0000000..808d63a Binary files /dev/null and b/bqViewer/res/1448/goto.png differ diff --git a/bqViewer/res/1448/goto_cont.png b/bqViewer/res/1448/goto_cont.png new file mode 100644 index 0000000..168d109 Binary files /dev/null and b/bqViewer/res/1448/goto_cont.png differ diff --git a/bqViewer/res/1448/highlighted_ico.png b/bqViewer/res/1448/highlighted_ico.png new file mode 100644 index 0000000..c6623cf Binary files /dev/null and b/bqViewer/res/1448/highlighted_ico.png differ diff --git a/bqViewer/res/1448/justify_text_1.png b/bqViewer/res/1448/justify_text_1.png new file mode 100644 index 0000000..02929d8 Binary files /dev/null and b/bqViewer/res/1448/justify_text_1.png differ diff --git a/bqViewer/res/1448/justify_text_2.png b/bqViewer/res/1448/justify_text_2.png new file mode 100644 index 0000000..089115e Binary files /dev/null and b/bqViewer/res/1448/justify_text_2.png differ diff --git a/bqViewer/res/1448/justify_text_3.png b/bqViewer/res/1448/justify_text_3.png new file mode 100644 index 0000000..9c4891a Binary files /dev/null and b/bqViewer/res/1448/justify_text_3.png differ diff --git a/bqViewer/res/1448/justify_text_opacity_1.png b/bqViewer/res/1448/justify_text_opacity_1.png new file mode 100644 index 0000000..c255693 Binary files /dev/null and b/bqViewer/res/1448/justify_text_opacity_1.png differ diff --git a/bqViewer/res/1448/justify_text_opacity_2.png b/bqViewer/res/1448/justify_text_opacity_2.png new file mode 100644 index 0000000..652556e Binary files /dev/null and b/bqViewer/res/1448/justify_text_opacity_2.png differ diff --git a/bqViewer/res/1448/justify_text_opacity_3.png b/bqViewer/res/1448/justify_text_opacity_3.png new file mode 100644 index 0000000..b47a888 Binary files /dev/null and b/bqViewer/res/1448/justify_text_opacity_3.png differ diff --git a/bqViewer/res/1448/line_spacing_1.png b/bqViewer/res/1448/line_spacing_1.png new file mode 100644 index 0000000..13ac825 Binary files /dev/null and b/bqViewer/res/1448/line_spacing_1.png differ diff --git a/bqViewer/res/1448/line_spacing_2.png b/bqViewer/res/1448/line_spacing_2.png new file mode 100644 index 0000000..12577ce Binary files /dev/null and b/bqViewer/res/1448/line_spacing_2.png differ diff --git a/bqViewer/res/1448/line_spacing_3.png b/bqViewer/res/1448/line_spacing_3.png new file mode 100644 index 0000000..f2f6152 Binary files /dev/null and b/bqViewer/res/1448/line_spacing_3.png differ diff --git a/bqViewer/res/1448/line_spacing_opacity_1.png b/bqViewer/res/1448/line_spacing_opacity_1.png new file mode 100644 index 0000000..a4f89ea Binary files /dev/null and b/bqViewer/res/1448/line_spacing_opacity_1.png differ diff --git a/bqViewer/res/1448/line_spacing_opacity_2.png b/bqViewer/res/1448/line_spacing_opacity_2.png new file mode 100644 index 0000000..9522c87 Binary files /dev/null and b/bqViewer/res/1448/line_spacing_opacity_2.png differ diff --git a/bqViewer/res/1448/line_spacing_opacity_3.png b/bqViewer/res/1448/line_spacing_opacity_3.png new file mode 100644 index 0000000..2373e73 Binary files /dev/null and b/bqViewer/res/1448/line_spacing_opacity_3.png differ diff --git a/bqViewer/res/1448/margin_1.png b/bqViewer/res/1448/margin_1.png new file mode 100644 index 0000000..5a733c0 Binary files /dev/null and b/bqViewer/res/1448/margin_1.png differ diff --git a/bqViewer/res/1448/margin_2.png b/bqViewer/res/1448/margin_2.png new file mode 100644 index 0000000..5db4833 Binary files /dev/null and b/bqViewer/res/1448/margin_2.png differ diff --git a/bqViewer/res/1448/margin_3.png b/bqViewer/res/1448/margin_3.png new file mode 100644 index 0000000..92a8d88 Binary files /dev/null and b/bqViewer/res/1448/margin_3.png differ diff --git a/bqViewer/res/1448/margin_opacity_1.png b/bqViewer/res/1448/margin_opacity_1.png new file mode 100644 index 0000000..69840d4 Binary files /dev/null and b/bqViewer/res/1448/margin_opacity_1.png differ diff --git a/bqViewer/res/1448/margin_opacity_2.png b/bqViewer/res/1448/margin_opacity_2.png new file mode 100644 index 0000000..e38dafe Binary files /dev/null and b/bqViewer/res/1448/margin_opacity_2.png differ diff --git a/bqViewer/res/1448/margin_opacity_3.png b/bqViewer/res/1448/margin_opacity_3.png new file mode 100644 index 0000000..f5c1265 Binary files /dev/null and b/bqViewer/res/1448/margin_opacity_3.png differ diff --git a/bqViewer/res/1448/move-all-dir-pdf-ico-landscape.png b/bqViewer/res/1448/move-all-dir-pdf-ico-landscape.png new file mode 100644 index 0000000..2577d23 Binary files /dev/null and b/bqViewer/res/1448/move-all-dir-pdf-ico-landscape.png differ diff --git a/bqViewer/res/1448/move-all-dir-pdf-ico.png b/bqViewer/res/1448/move-all-dir-pdf-ico.png new file mode 100644 index 0000000..29cd5c3 Binary files /dev/null and b/bqViewer/res/1448/move-all-dir-pdf-ico.png differ diff --git a/bqViewer/res/1448/move-hor-dir-pdf-ico-landscape.png b/bqViewer/res/1448/move-hor-dir-pdf-ico-landscape.png new file mode 100644 index 0000000..49da290 Binary files /dev/null and b/bqViewer/res/1448/move-hor-dir-pdf-ico-landscape.png differ diff --git a/bqViewer/res/1448/move-hor-dir-pdf-ico.png b/bqViewer/res/1448/move-hor-dir-pdf-ico.png new file mode 100644 index 0000000..0f850f0 Binary files /dev/null and b/bqViewer/res/1448/move-hor-dir-pdf-ico.png differ diff --git a/bqViewer/res/1448/move-ver-dir-pdf-ico-landscape.png b/bqViewer/res/1448/move-ver-dir-pdf-ico-landscape.png new file mode 100644 index 0000000..6f99866 Binary files /dev/null and b/bqViewer/res/1448/move-ver-dir-pdf-ico-landscape.png differ diff --git a/bqViewer/res/1448/move-ver-dir-pdf-ico.png b/bqViewer/res/1448/move-ver-dir-pdf-ico.png new file mode 100644 index 0000000..e8011b4 Binary files /dev/null and b/bqViewer/res/1448/move-ver-dir-pdf-ico.png differ diff --git a/bqViewer/res/1448/nex_landscape_btn.png b/bqViewer/res/1448/nex_landscape_btn.png new file mode 100644 index 0000000..2864124 Binary files /dev/null and b/bqViewer/res/1448/nex_landscape_btn.png differ diff --git a/bqViewer/res/1448/next_landscape_btn.png b/bqViewer/res/1448/next_landscape_btn.png new file mode 100644 index 0000000..2864124 Binary files /dev/null and b/bqViewer/res/1448/next_landscape_btn.png differ diff --git a/bqViewer/res/1448/note_ico.png b/bqViewer/res/1448/note_ico.png new file mode 100644 index 0000000..18b2b92 Binary files /dev/null and b/bqViewer/res/1448/note_ico.png differ diff --git a/bqViewer/res/1448/notes_tabs.png b/bqViewer/res/1448/notes_tabs.png new file mode 100644 index 0000000..fc0fac6 Binary files /dev/null and b/bqViewer/res/1448/notes_tabs.png differ diff --git a/bqViewer/res/1448/number_cont.png b/bqViewer/res/1448/number_cont.png new file mode 100644 index 0000000..e201f30 Binary files /dev/null and b/bqViewer/res/1448/number_cont.png differ diff --git a/bqViewer/res/1448/off_btn.png b/bqViewer/res/1448/off_btn.png new file mode 100755 index 0000000..6f2a436 Binary files /dev/null and b/bqViewer/res/1448/off_btn.png differ diff --git a/bqViewer/res/1448/on_btn.png b/bqViewer/res/1448/on_btn.png new file mode 100755 index 0000000..4e33e66 Binary files /dev/null and b/bqViewer/res/1448/on_btn.png differ diff --git a/bqViewer/res/1448/only_text.png b/bqViewer/res/1448/only_text.png new file mode 100644 index 0000000..75a1c97 Binary files /dev/null and b/bqViewer/res/1448/only_text.png differ diff --git a/bqViewer/res/1448/page_back_btn.png b/bqViewer/res/1448/page_back_btn.png new file mode 100644 index 0000000..73d0b7c Binary files /dev/null and b/bqViewer/res/1448/page_back_btn.png differ diff --git a/bqViewer/res/1448/page_back_btn_landscape.png b/bqViewer/res/1448/page_back_btn_landscape.png new file mode 100644 index 0000000..3f00c12 Binary files /dev/null and b/bqViewer/res/1448/page_back_btn_landscape.png differ diff --git a/bqViewer/res/1448/pdf-ico-landscape.png b/bqViewer/res/1448/pdf-ico-landscape.png new file mode 100644 index 0000000..6596ce7 Binary files /dev/null and b/bqViewer/res/1448/pdf-ico-landscape.png differ diff --git a/bqViewer/res/1448/pdf-ico.png b/bqViewer/res/1448/pdf-ico.png new file mode 100644 index 0000000..4e42c73 Binary files /dev/null and b/bqViewer/res/1448/pdf-ico.png differ diff --git a/bqViewer/res/1448/plus-ico.png b/bqViewer/res/1448/plus-ico.png new file mode 100644 index 0000000..52d70f5 Binary files /dev/null and b/bqViewer/res/1448/plus-ico.png differ diff --git a/bqViewer/res/1448/pre_landscape_btn.png b/bqViewer/res/1448/pre_landscape_btn.png new file mode 100644 index 0000000..464b3ab Binary files /dev/null and b/bqViewer/res/1448/pre_landscape_btn.png differ diff --git a/bqViewer/res/1448/rotate-pdf-ico-landscape.png b/bqViewer/res/1448/rotate-pdf-ico-landscape.png new file mode 100644 index 0000000..dd82073 Binary files /dev/null and b/bqViewer/res/1448/rotate-pdf-ico-landscape.png differ diff --git a/bqViewer/res/1448/rotate-pdf-ico.png b/bqViewer/res/1448/rotate-pdf-ico.png new file mode 100644 index 0000000..d8111e8 Binary files /dev/null and b/bqViewer/res/1448/rotate-pdf-ico.png differ diff --git a/bqViewer/res/1448/search.png b/bqViewer/res/1448/search.png new file mode 100644 index 0000000..39ada44 Binary files /dev/null and b/bqViewer/res/1448/search.png differ diff --git a/bqViewer/res/1448/select_text_bottom.png b/bqViewer/res/1448/select_text_bottom.png new file mode 100644 index 0000000..b825c5a Binary files /dev/null and b/bqViewer/res/1448/select_text_bottom.png differ diff --git a/bqViewer/res/1448/select_text_top.png b/bqViewer/res/1448/select_text_top.png new file mode 100644 index 0000000..39fe954 Binary files /dev/null and b/bqViewer/res/1448/select_text_top.png differ diff --git a/bqViewer/res/1448/tab_arrow.png b/bqViewer/res/1448/tab_arrow.png new file mode 100644 index 0000000..814427a Binary files /dev/null and b/bqViewer/res/1448/tab_arrow.png differ diff --git a/bqViewer/res/1448/up_pager_btn.png b/bqViewer/res/1448/up_pager_btn.png new file mode 100755 index 0000000..aff394e Binary files /dev/null and b/bqViewer/res/1448/up_pager_btn.png differ diff --git a/bqViewer/res/1448/up_pager_disabled_btn.png b/bqViewer/res/1448/up_pager_disabled_btn.png new file mode 100755 index 0000000..880e3fc Binary files /dev/null and b/bqViewer/res/1448/up_pager_disabled_btn.png differ diff --git a/bqViewer/res/1448/viewer_conf_btn.png b/bqViewer/res/1448/viewer_conf_btn.png new file mode 100644 index 0000000..09a5598 Binary files /dev/null and b/bqViewer/res/1448/viewer_conf_btn.png differ diff --git a/bqViewer/res/1448/viewer_styles.qss b/bqViewer/res/1448/viewer_styles.qss new file mode 100644 index 0000000..29165ad --- /dev/null +++ b/bqViewer/res/1448/viewer_styles.qss @@ -0,0 +1,2192 @@ +/************************************************************************* + +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 . + +*************************************************************************/ + +/*Viewer +-------------------*/ +#Viewer{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#ViewerCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#bookMarkCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 113px; +max-height: 113px; +} +#bookMarkCont #bookmark, #bookmarkImg, #leftSpacerViewer{ +min-width: 113px; +max-width: 113px; +min-height: 113px; +max-height: 113px; +} +#textBody{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#noteLbl{ +min-width: 33px; +max-width: 33px; +min-height: 33px; +max-height: 33px; +} +#highlightedLbl{ +min-width: 57px; +max-width: 57px; +min-height: 44px; +max-height: 44px; +} +#pageWindow{ +min-height: 99px; +max-height: 99px; +} +#buySampleCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 91px; +max-height: 91px; +} +#buySampleBtn{ +min-width: 246px; +max-width: 246px; +min-height: 91px; +max-height: 91px; +line-height: 91px; +font-size: 31px; +} +#titleLbl{ +font-size: 30px; +} +#dateTimeLbl{ +font-size: 30px; +} +#buySampleCont #dateTimeLbl{ +padding-right: 35px; +} +#buySampleCont #titleLbl{ +padding-left: 35px; +} +#viewerHeader{ +min-width: 1072px; +max-width: 1072px; +min-height: 91px; +max-height: 91px; +} +#viewerHeader #dateTimeLbl{ +padding: 0px 64px 0px 0px; +} +#viewerHeader #titleLbl{ +padding: 0px 0px 0px 54px; +} +/*Landscape*/ +#ViewerContLandscape{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#pageWindowLandscape{ +min-height: 99px; +max-height: 99px; +min-height: 1448px; +max-height: 1448px; +} +#bookMarkContLandscape{ +min-width: 109px; +max-width: 109px; +min-height: 1448px; +max-height: 1448px; +} +#buySampleLandscapeBtn{ +min-width: 91px; +max-width: 91px; +min-height: 246px; +max-height: 246px; +line-height: 91px; +font-size: 31px; +} +#bookMarkContLandscape #bookmarkLandscape, #bookmarkImg,#leftSpacerViewerLandscape{ +min-width: 109px; +max-width: 109px; +min-height: 113px; +max-height: 113px; +} +#dateTimeLandscapeLbl{ +font-size: 30px; +min-height: 85px; +max-height: 85px; +} +#viewerHeaderLandscape{ +min-width: 109px; +max-width: 109px; +min-height: 1448px; +max-height: 1448px; +} +#viewerHeaderLandscape #dateTimeLandscapeLbl{ +padding: 64px 0px 0px 0px; +border: 4px solid #333; +min-height: 91px; +max-height: 91px; +} +#miniatureCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#miniatureCont #miniature, #miniatureCont MiniatureView{ +min-width: 226px; +max-width: 226px; +min-height: 362px; +max-height: 362px; +border-width: 3px; +} +#miniatureLeftSpacer{ +min-width: 141px; +max-width: 141px; +} +#miniatureTopSpacer{ +min-height: 141px; +max-height: 141px; +} +#miniatureLandscapeCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#miniatureLandscapeCont #miniatureLandscape, #miniatureLandscapeCont MiniatureViewLandscape{ +min-width: 362px; +max-width: 362px; +min-height: 226px; +max-height: 226px; +border-width: 3px; +} +#miniatureLandscapeLeftSpacer{ +min-width: 141px; +max-width: 141px; +} +#miniatureLandscapeBottomSpacer{ +min-height: 141px; +max-height: 141px; +} +/*ViewerFloatingNote +-------------------------------*/ +#ViewerFloatingNote{ +} +#noteImg{ +min-width: 49px; +max-width: 49px; +min-height: 33px; +max-height: 33px; +} +/*ViewerPageHandler +-------------------------------*/ +#ViewerPageHandler,ViewerPageHandler, #pageWindow{ +min-width: 1072px; +max-width: 1072px; +min-height: 99px; +max-height: 99px; +} +#ViewerPageHandler #pageText, ViewerPageHandler #pageText, #pageWindow #pageText{ +margin: 0px 226px 0px 148px; +min-width: 339px; +max-width: 339px; +font-size: 30px; +} +#pageSpacerLbl{ +min-width: 580px; +} +#readingPercentLbl{ +margin: 0px 0px 0px 0px; +font-size: 30px; +} +#pageBackCont{ +margin: 0px 54px 0px 0px; +min-width: 91px; +max-width: 91px; +} +#pageBackBtn{ +min-width: 91px; +max-width: 91px; +min-height: 99px; +max-height: 99px; +} +#pagerViewerSpacerLeft{ +min-width: 10px; +max-width: 10px; +} +#pagerViewerSpacerRight{ +min-width: 21px; +max-width: 21px; +} +#ViewerPageHandler #pagerInfoCont,ViewerPageHandler #pagerInfoCont, #pageWindow #pagerInfoCont{ +} +#readingProgress{ +margin-top: 0px; +min-height: 7px; +max-height: 7px; +border-radius: 6px; +} +#toFinishChapLbl{ +} +#toFinishChapLbl, #readedLbl, #pagToFinishLbl{ +font-size: 30px; +} +#ViewerPageHandler #verticalWidget #horizontalWidget #readedLbl{ +min-width: 170px; +max-width: 170px; +} +#spacerNoPercentLbl{ +min-width: 85px; +max-width: 85px; +} +#spacerNoPercentNoBakcLbl{ +min-width: 106px; +max-width: 106px; +} +/*ViewerMenu +------------------------*/ +#ViewerMenu{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#viewerMenuCont { +padding: 0px 21px; +min-height: 206px; +max-height: 206px; +border-top-width: 3px; +} +#viewerMenuCont QPushButton{ +padding: 0px 0px 28px 0px; +font-size: 34px; +} +#viewerMenuCont #contentsBtn{ +} +#viewerMenuCont #summaryBtn{ +} +#viewerMenuCont #gotoPageBtn{ +} +#viewerMenuCont #appaeranceBtn{ +} +#viewerMenuCont #searchBtn{ +} +#expandingViewerPopup{ +/*min-height: 99px; +max-height: 99px;*/ +} +#ViewerMenu #SpacerTopMenuLbl{ +min-height: 89px; +max-height: 89px; +} +#ViewerMenu #chapterCont{ +min-height: 91px; +max-height: 91px; +border-top-width: 3px; +} +#ViewerMenu #chapterCont QLabel{ +margin-left: 28px; +} +#ViewerMenu #chapterCont #chapterNameLbl{ +font-size: 35px; +font-weight:bold; +} +#ViewerMenu #chapterCont #chapterPageLbl{ +font-size: 34px; +} +#ViewerMenu #chapterCont #chapterTitleLbl{ +font-size: 35px; +font-weight:bold; +} +#ViewerMenu #chapterCont #chapterAuthorLbl{ +font-size: 34px; +} +#viewerConfBtn{ +min-width: 91px; +max-width: 91px; +border-left-width: 3px; +} +/* Viewer Popups +------------------*/ +#headerPopup{ +margin: 7px 0px 18px 0px; +padding: 0px 0px 18px 0px; +border-width: 3px; +min-height: 89px; +max-height: 89px; +} +#headerPopup #closeBtn{ +min-height: 105px; +max-height: 105px; +min-width: 105px; +max-width: 105px; +} +#headerPopup #label{ +margin: 7px 0px 0px 0px; +} +#popupCont{ +padding: 0px 28px 0px 28px; +border-width: 18px; +border-radius: 18px; +} +#arrowCont, #arrowCont2{ +min-height: 34px; +max-height: 34px; +} +#topArrowLbl, #bottomArrowLbl{ +min-width: 57px; +max-width: 57px; +min-height: 38px; +max-height: 38px; +} +/*ViewerVerticalPagerPopup +-----------------------------*/ +#ViewerVerticalPagerPopup, ViewerVerticalPagerPopup, #VerticalPagerPopup{ +min-width: 977px; +max-width: 977px; +min-height: 109px; +max-height: 109px; +} +#ViewerBookSummaryCont ViewerVerticalPagerPopup, #ViewerBookSummaryCont #VerticalPagerPopup{ +min-width: 942px; +max-width: 942px; +min-height: 109px; +max-height: 109px; +} +#ViewerVerticalPagerPopup #currentPageLbl,#ViewerVerticalPagerPopup #totalPagesLbl,#ViewerVerticalPagerPopup #ofTextLbl,#ViewerVerticalPagerPopup #pagTextLbl{ +padding: 0px 3px 0px 0px; +font-size: 31px; +} +ViewerVerticalPagerPopup #currentPageLbl,ViewerVerticalPagerPopup #totalPagesLbl,ViewerVerticalPagerPopup #ofTextLbl,ViewerVerticalPagerPopup #pagTextLbl{ +padding: 0px 3px 0px 0px; +font-size: 31px; +} +#ViewerVerticalPagerPopup QPushButton, ViewerVerticalPagerPopup QPushButton{ +min-width: 177px; +max-width: 177px; +min-height: 85px; +max-height: 85px; +} +#ViewerVerticalPagerPopup #downPageBtn{ +min-width: 106px; +max-width: 106px; +min-height: 85px; +max-height: 85px; +margin: 0px 0px 0px 54px; +} +#ViewerVerticalPagerPopup #upPageBtn{ +min-width: 106px; +max-width: 106px; +min-height: 85px; +max-height: 85px; +margin: 0px 54px 0px 0px; +} +/*ViewerTextActionsPopup +-----------------*/ +#ViewerTextActionsPopup{ +min-width: 851px; +max-width: 851px; +min-height: 703px; +max-height: 703px; +} +#ViewerTextActionsPopup #popupCont{ +} +#ViewerTextActionsPopup #headerPopup{ +padding: 0px 0px 0px 0px; +margin-bottom: 0px; +min-height: 82px; +max-height: 82px; +} +#ViewerTextActionsPopup #headerPopup #closeBtn{ +min-width: 82px; +max-width: 82px; +min-height: 72px; +max-height: 72px; +} +#ViewerTextActionsPopup #definitionTextBrowser { +margin: 0px 0px 17px 0px; +border-width: 1px; +border-radius: 14px; +} +#actionsCont QPushButton{ +margin: 17px 0px; +min-height: 72px; +max-height: 72px; +border-width: 1px; +border-radius: 8px; +} +#seeCompleteDefinition{ +margin-bottom: 17px; +min-height: 72px; +max-height: 72px; +border-width: 1px; +border-radius: 8px; +} +#definitionOptionsCont #wikipediaBtn, #ViewerTextActionsPopup #wikipediaPopupBtn{ +margin-bottom: 17px; +min-height: 72px; +max-height: 72px; +border-width: 1px; +border-radius: 8px; +} +/*ViewerTextActionsPopup +-----------------*/ +#ViewerNoteActionsPopup{ +min-width: 983px; +max-width: 983px; +min-height: 687px; +max-height: 687px; +} +#ViewerNoteActionsPopup #headerPopup{ +} +#ViewerTextActionsPopup #popupCont{ +} +#ViewerNoteActionsPopup #actionsCont{ +margin-top: 28px; +min-height: 82px; +max-height: 82px; +border-width: 3px; +border-radius: 8px; +} +#ViewerNoteActionsPopup #popupCont #actionsCont QPushButton{ +margin-top: 28px; +min-height: 82px; +max-height: 82px; +border-width: 3px; +border-radius: 0px; +font-size: 34px; +} +#ViewerNoteActionsPopup #popupCont #actionsCont QPushButton#definitionBtn{ +margin-left: 3px; +border-top-left-radius: 8px; +border-bottom-left-radius: 8px; +} +#ViewerNoteActionsPopup #popupCont #actionsCont QPushButton#deleteNoteBtn{ +margin-right: 3px; +border-top-right-radius: 8px; +border-bottom-right-radius: 8px; +} +#ViewerNoteActionsPopup #headerPopup{ +padding: 0px 0px 0px 0px; +margin-bottom: 0px; +min-height: 82px; +max-height: 82px; +} +#ViewerNoteActionsPopup #headerPopup #closeBtn{ +min-width: 82px; +max-width: 82px; +min-height: 72px; +max-height: 72px; +} +#ViewerNoteActionsPopup #noteTextBrowser { +margin: 21px 0px; +border-width: 3px; +border-radius: 14px; +font-size: 35px; +} +/*ViewerEditNotePopup +----------------*/ +#ViewerEditNotePopup { +min-width: 1072px; +max-width: 1072px; +min-height: 1072px; +max-height: 1072px; +} +#ViewerEditNotePopup #popupCont{ +margin: 0px 21px; +min-height: 672px; +max-height: 672px; +} +#noteTextBrowser{ +margin: 8px 0px; +border-width: 1px; +border-radius: 14px; +} +#noteTextEdit{ +border-width: 1px; +border-radius: 8px; +} +#ViewerEditNotePopup #actionsCont{ +min-height: 64px; +max-height: 64px; +} +#ViewerEditNotePopup #editNoteBtn{ +margin: 0px 21px; +padding: 0px 35px; +min-height: 64px; +max-height: 64px; +border-width: 3px; +border-radius: 11px; +} +/*ViewerDictionaryDefinitionPopup +--------------------------------*/ +#ViewerDictionaryDefinitionPopup{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#ViewerDictionaryDefinitionPopupCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 1407px; +max-height: 1407px; +} +#changeDictionaryBtn{ +min-width: 523px; +max-width: 523px; +padding: 0px 35px 0px 28px; +margin-bottom: 28px; +min-height: 82px; +max-height: 82px; +border-radius: 7px; +border-width: 3px; +} +#ViewerDictionaryDefinitionPopup #popupCont{ +margin: 0px 35px; +padding: 0px 0px 0px 0px; +} +#dictionaryDefinitionTextBrowser{ +margin: 0px 21px; +padding: 0px; +} +#ViewerDictionaryDefinitionPopupCont #arrowTabsCont #notesTabArrowLbl{ +min-width: 651px; +max-width: 651px; +} +#ViewerDictionaryDefinitionPopup #ViewerVerticalPagerPopup, #ViewerDictionaryDefinitionPopup ViewerVerticalPagerPopup{ +min-width: 697px; +max-width: 697px; +min-height: 91px; +max-height: 91px; +} +#VerticalPagerWikiCont{ +min-height: 91px; +max-height: 91px; +} +#backSearchBtn{ +margin: 0px 54px 28px 0px; +min-width: 113px; +max-width: 113px; +min-height: 82px; +max-height: 82px; +} +#backSearchSpaceLbl{ +margin: 0px 54px 28px 0px; +min-width: 113px; +max-width: 113px; +} +#ViewerDictionaryDefinitionPopup #dictionaryBtn{ +min-height: 0px; +max-height: 219px; +font-size: 35px; +border-right-width: 3px; +} +#ViewerDictionaryDefinitionPopup #wikipediaBtn{ +min-height: 0px; +max-height: 219px; +font-size: 35px; +border-right-width: 3px; +} +#ViewerDictionaryDefinitionPopup #headerPopup{ +margin: 0px 0px 0px 0px; +padding: 0px 0px 0px 0px; +} +#ViewerDictionaryDefinitionPopup #arrowTabsCont #contentsTabArrowLbl{ +min-width: 354px; +max-width: 354px; +} +#ViewerDictionaryDefinitionPopup #arrowTabsCont { +margin:0; +} +#wikipediaWebBtn{ +min-height: 91px; +max-height: 91px; +min-width: 82px; +max-width: 82px; +} +#wikipediaWebSpacerLbl{ +min-width: 82px; +max-width: 82px; +} + +/*ViewerWikipediaDefinitionPopup +--------------------------------*/ +#ViewerWikipediaDefinitionPopup{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#ViewerWikipediaDefinitionPopupCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 1301px; +max-height: 1301px; +} +#ViewerWikipediaDefinitionPopup #popupCont{ +margin: 0px 35px; +padding-bottom: 0px; +} +#searchTermLbl{ +margin: 14px 0px; +font-size: 42px; +} +#wikipediaDefinitionTextBrowser{ +margin: 0px; +padding: 0px; +} +#ViewerWikipediaDefinitionPopup #ViewerVerticalPagerPopup, #ViewerWikipediaDefinitionPopup ViewerVerticalPagerPopup{ +min-width: 923px; +max-width: 923px; +min-height: 91px; +max-height: 91px; +} +#ViewerDictionaryDefinitionPopup #dictionaryBtn{ +min-height: 0px; +max-height: 219px; +font-size: 35px; +border-right-width: 3px; +} +#ViewerWikipediaDefinitionPopup #wikipediaBtn{ +min-height: 0px; +max-height: 219px; +font-size: 35px; +border-right-width: 3px; +} +#ViewerWikipediaDefinitionPopup #headerPopup{ +margin: 0px 0px 0px 0px; +padding: 0px 0px 0px 0px; +} +#ViewerWikipediaDefinitionPopup #arrowTabsCont #contentsTabArrowLbl{ +min-width: 707px; +max-width: 707px; +} +#ViewerWikipediaDefinitionPopup #arrowTabsCont { +margin:0; +} +/*DictionaryLayer +-------------------------*/ +#DictionaryLayer{ +min-width: 590px; +max-width: 590px; +min-height: 571px; +max-height: 571px; +} +#DictionaryLayerCont { +border-width: 4px; +border-radius: 8px; +} +#DictionaryLayer QPushButton { +padding-left: 28px; +min-height: 91px; +max-height: 91px; +border-bottom-width: 3px; +} +#DictionaryLayer QPushButton:checked{ +border-left-width: 4px; +border-right-width: 4px; +} +#DictionaryLayer QPushButton#dictBtn0:checked{ +margin-top: 4px; +} +#DictionaryLayer QPushButton:disabled { +} + +#DictionaryLayer #VerticalPagerPopup, #DictionaryLayer ViewerVerticalPagerPopup{ +min-width: 590px; +max-width: 590px; +min-height: 91px; +max-height: 91px; +} +/* +#DictionaryLayer #VerticalPagerPopup #currentPageLbl,#DictionaryLayer #VerticalPagerPopup #totalPagesLbl,#DictionaryLayer #VerticalPagerPopup #ofTextLbl,#DictionaryLayer #VerticalPagerPopup #pagTextLbl{ +padding: 0px 3px 0px 0px; +font-size: 31px; +} +#DictionaryLayer ViewerVerticalPagerPopup #currentPageLbl, #DictionaryLayer ViewerVerticalPagerPopup #totalPagesLbl,#DictionaryLayer ViewerVerticalPagerPopup #ofTextLbl,#DictionaryLayer ViewerVerticalPagerPopup #pagTextLbl{ +padding: 0px 3px 0px 0px; +font-size: 31px; +} +#DictionaryLayer #VerticalPagerPopup QPushButton, #DictionaryLayer ViewerVerticalPagerPopup QPushButton{ +min-width: 144px; +max-width: 144px; +}*/ +/*ViewerSearchWordPopup ViewerSearchPopup +--------------------------*/ +#ViewerSearchWordPopup{ +min-width: 665px; +max-width: 665px; +min-height: 1103px; +max-height: 1103px; +padding: 8px 28px 21px 28px; +border-width: 14px; +border-radius: 14px; +} +#ViewerSearchPopup{ +min-width: 1072px; +max-width: 1072px; +min-height: 1267px; +max-height: 1267px; +} +#ViewerSearchPopup #bottomArrowLbl{ +min-width: 969px; +max-width: 969px; +} +#ViewerSearchPopup #popupCont{ +min-width: 868px; +max-width: 868px; +min-height: 1011px; +max-height: 1011px; +} +#ViewerSearchWordPopup #headerPopup{ +margin: 28px 35px 21px 35px; +min-height: 218px; +max-height: 218px; +} +#ViewerSearchPopup #headerPopup #closeBtn{ +margin:- 7px - 21px 0px 0px; +min-width: 113px; +max-width: 113px; +min-height: 85px; +max-height: 85px; +background-position:center; +} +#ViewerSearchPopup #headerPopup{ +margin: 28px 35px 8px 35px; +min-height: 208px; +max-height: 208px; +} +#ViewerSearchPopup #resultsNumLbl{ +padding: 21px 0px 0px 0px ; +font-size: 33px; +} +#ViewerSearchPopup #searchLineEdit{ +margin: 0px 0px 0px 64px; +padding-left: 82px; +min-width: 561px; +max-width: 561px; +min-height: 99px; +max-height: 99px; +} +#clearSearchBtn{ +margin: 0px; +min-width: 99px; +max-width: 99px; +min-height: 99px; +max-height: 99px; +border-width: 0px; +} +#SearchResultItem1, #SearchResultItem2, #SearchResultItem3, #SearchResultItem4, #SearchResultItem5, #SearchResultItem6{ +margin: 0px 35px; +min-height: 132px; +max-height: 132px; +border-width: 3px; +} +#processSearchCont{ +} +#processSearchCont #processLbl{ +font-size: 42px; +min-height: 89px; +max-height: 89px; +} +#processSearchCont #spinnerLbl{ +padding: 0px 17px 0px 0px; +min-height: 89px; +max-height: 89px; +} + +/*ViewerSearchResultItem +-------------------*/ +#ViewerSearchResultItem { +min-width: 977px; +max-width: 977px; +min-height: 132px; +max-height: 132px; +} +#ViewerSearchResultItem QLabel{ +padding: 0px 28px; +} +#ViewerSearchResultItem QLabel#searchResultPageLbl, #ViewerSearchPopup QLabel#searchResultPageLbl{ +padding: 0px 35px; +} +#ViewerSearchResultItem QLabel#searchResultTextLbl, #ViewerSearchPopup QLabel#searchResultTextLbl{ +padding: 0px 35px; +} +/*ViewerAppearancePopupOld +-------------------------*/ +#ViewerAppearancePopupOld{ +min-width: 1072px; +max-width: 1072px; +min-height: 1267px; +max-height: 1267px; +} +#ViewerAppearancePopupOld #bottomArrowLbl{ +min-width: 774px; +max-width: 774px; +} +#ViewerAppearancePopupOld #popupCont{ +padding: 0px 28px 21px 28px; +min-width: 868px; +max-width: 868px; +min-height: 141px; +max-height: 933px; +} +#marginSpacingCont QLabel{ +margin: 0px 0px 0px 21px; +} +#fontsCont{ +border-width: 3px; +border-radius: 8px; +} +#fontsCont QPushButton{ +min-width: 434px; +max-width: 434px; +min-height: 105px; +max-height: 105px; +font-size: 38px; +border-width: 3px; +} +#fontsCont QPushButton#cuprumBtn{ +border:none; +} +#appearanceCont{ +margin: 28px 0px 0px 0px; +} +#appearanceCont #marginsLbl,#appearanceCont #modeLbl{ +margin: 21px 0px 8px 0px; +} +#modeCont #onlyTextModeBtn{ +margin: 0px 21px 0px 0px; +min-width: 95px; +max-width: 95px; +min-height: 106px; +max-height: 106px; +} +#modeCont #withImageModeBtn{ +margin: 0px 21px 0px 0px; +min-width: 95px; +max-width: 95px; +min-height: 106px; +max-height: 106px; +} +#appearanceCont #spacingLbl{ +margin: 0px 0px 8px 0px; +} +#publisherConfBtn{ +margin: 0px 1px 21px 0px; +padding: 0px 0px 0px 28px; +min-height: 86px; +max-height: 86px; +border-width: 1px; +border-radius: 8px; +} +#ViewerAppearancePopupOld #justifyLbl{ +margin: 17px 0px 7px; +} +#ViewerAppearancePopupOld #justifyBtn{ +margin: 21px 0px 0px 0px; +min-height: 57px; +max-height: 57px; +min-width: 188px; +max-width: 188px; +} +#ViewerAppearancePopupOld #justifyBtn:checked{ +} +#ViewerAppearancePopupOld #justifySpacer { +} +/*ViewerGotoPopup +-------------------------*/ +#ViewerGotoPopup{ +min-width: 1072px; +max-width: 1072px; +min-height: 1267px; +max-height: 1267px; +} +#ViewerGotoPopup #bottomArrowLbl{ +min-width: 564px; +max-width: 564px; +} +#ViewerGotoPopup #popupCont{ +min-width: 798px; +max-width: 798px; +min-height: 833px; +max-height: 833px; +} +#numericKeyboardCont QPushButton{ +min-width: 218px; +max-width: 218px; +min-height: 109px; +max-height: 109px; +font-size: 45px; +} +#ViewerGotoPopup #numberPageEdit{ +margin: 0px 10px; +padding: 0px 45px; +min-width: 543px; +max-width: 543px; +border-left:none; +border-right:none; +} +#numericKeyboardCont QPushButton#deleteCharBtn{ +} +#numericKeyboardCont QPushButton#goToBtn{ +} +#bookLimitsCont QPushButton#beginningBtn{ +margin: 0px 64px 21px 0px; +min-width: 321px; +max-width: 321px; +min-height: 109px; +max-height: 109px; +font-size: 41px; +} +#bookLimitsCont QPushButton#endBtn{ +margin-bottom: 21px; +min-width: 257px; +max-width: 257px; +min-height: 109px; +max-height: 109px; +font-size: 41px; +} +#ViewerGotoPopup #searchLineEdit{ +margin: 21px 0px; +min-width: 597px; +max-width: 597px; +} +/*ViewerBookSummary +---------------------------*/ +#ViewerBookSummary{ +min-width: 1072px; +max-width: 1072px; +min-height: 1267px; +max-height: 1267px; +} +#ViewerBookSummary #bookActionsCont{ +margin: 0px 0px 0px 0px; +min-height: 110px; +max-height: 110px; +border-top-width: 3px; +border-bottom-width: 3px; +} +#ViewerBookSummary #bookActionsCont QPushButton{ +margin: 3px 7px; +padding: 57px 42px 7px 28px; +border-right-width: 1px; +border-left-width: 1px; +} +#ViewerBookSummary #bookActionsCont #bookActionBtn{ +} +#ViewerBookSummary #bookActionsCont #exportNotesBtn{ +} +#ViewerBookSummary #bookActionsCont #buyBookBtn{ +} +#ViewerBookSummary #bookActionsCont #copyToSDBtn{ +} +#ViewerBookSummary #bookActionsCont #archiveBtn{ +} +#ViewerBookSummary #bottomArrowLbl{ +min-width: 311px; +max-width: 311px; +} +#ViewerBookSummary #headerPopup #closeBtn{ +min-width: 113px; +max-width: 113px; +margin-right:- 21px; +background-position:center; +} +#ViewerBookSummaryCont{ +} +#ViewerBookSummaryCont #popupCont{ +padding: 0px 0px 0px 0px; +min-width: 977px; +max-width: 977px; +min-height: 1082px; +max-height: 1082px; +} +#ViewerBookSummary #headerPopup{ +margin: 0px 0px 0px 0px; +padding: 0px; +min-height: 82px; +max-height: 1267px; +} +#ViewerBookSummary #bookTitleLbl{ +font-size: 38px; +} +#ViewerBookSummary #bookSummaryDataContainer #bookPriceLbl { +font-size: 28px; +} +#ViewerBookSummary #bookSummaryDataContainer #bookAuthorLbl{ +font-size: 34px; +} +#ViewerBookSummary #actionsContainer #moreActionsBtn{ +margin: 4px 1px 0px 0px; +min-height: 75px; +max-height: 75px; +} +#ViewerBookSummary #actionsContainer #addToCollectionBtn{ +margin: 4px 0px 0px 0px; +min-height: 75px; +max-height: 75px; +} +#ViewerBookSummary #synopsisLbl{ +margin: 7px 0px 0px 0px; +padding-left: 28px; +} +#ViewerBookSummary #summaryTextBrowser{ +min-height: 330px; +max-height: 330px; +margin-left: 28px; +margin-right: 28px; +padding-left: 0px; +padding-right: 0px; +} +#ViewerBookSummary #bookSummaryActions #topLeftLbl{ +min-width: 7px; +max-width: 7px; +min-height: 21px; +max-height: 21px; +} +#ViewerBookSummary #bookSummaryActions #centerLeftLbl{ +min-width: 7px; +max-width: 7px; +min-height: 297px; +max-height: 297px; +} +#ViewerBookSummary #bookSummaryActions #bottomLeftLbl{ +min-width: 7px; +max-width: 7px; +min-height: 35px; +max-height: 35px; +} +#ViewerBookSummary #bookAuthorLbl{ +max-height: 45px; +max-height: 45px; +} +#ViewerBookSummary #numberPagesCont{ +max-height: 99px; +min-height: 99px; +} +#textTotalPagesLbl{ +font-size: 31px; +margin-left:- 6px; +margin-right: 10px; +} +#ViewerBookSummary #numberTotalPagesLbl{ +font-size: 31px; +} +#bookSummaryActions #coverLbl{ +min-width: 198px; +max-width: 198px; +min-height: 297px; +max-height: 297px; +} +#ViewerBookSummaryCont #coverCont #authorLbl{ +min-width: 198px; +max-width: 198px; +font-size: 25px; +min-height: 35px; +max-height: 35px; +padding-top: 212px; +text-align:center; +} +#ViewerBookSummaryCont #coverCont #titleLbl{ +min-width: 198px; +max-width: 198px; +min-height: 72px; +max-height: 72px; +padding-top: 160px; +font-size: 28px; +text-align:center; +} +#ViewerBookSummaryCont #coverCont #centerLeftLbl{ +min-width: 35px; +max-width: 35px; +} +/*ViewerCollectionLayer +-------------------------*/ +#ViewerCollectionLayer { +min-width:654px; +max-width:654px; +min-height: 707px; +max-height: 707px; +} +#CollectionLayerCont #VerticalPagerPopup, #CollectionLayerCont ViewerVerticalPagerPopup{ +min-width: 325px; +max-width: 325px; +min-height: 91px; +max-height: 91px; +} +#CollectionLayerCont #ViewerVerticalPagerPopup QPushButton, #CollectionLayerCont ViewerVerticalPagerPopup QPushButton{ +min-width: 91px; +max-width: 91px; +} +/*ViewerContentsPopup +--------------------------------*/ +#ViewerContentsPopup { +min-width: 1072px; +max-width: 1072px; +min-height: 1267px; +max-height: 1267px; +} +#ViewerContentsPopup #bottomArrowLbl{ +min-width: 158px; +max-width: 158px; +} +#ViewerContentsPopup #popupCont{ +min-width: 868px; +max-width: 868px; +min-height: 977px; +max-height: 977px; +} +#ViewerContentsPopup #headerPopup{ +margin: 21px 21px 0px 21px; +padding: 0px; +min-height: 82px; +max-height: 82px; +border:none; +} +#ViewerContentsPopup #headerPopup #closeBtn{ +min-height: 82px; +max-height: 82px; +} +#ViewerContentsPopup #contentsTabBtn{ +margin-left: 21px; +padding-left: 117px; +min-width: 339px; +max-width: 339px; +min-height: 82px; +max-height: 82px; +font-size: 35px; +} +#ViewerContentsPopup #notesTabBtn{ +margin-left: 21px; +min-width: 229px; +max-width: 229px; +min-height: 82px; +max-height: 82px; +padding-left: 99px; +font-size: 35px; +border-right-width: 3px; +} +#arrowTabsCont{ +margin: 0px 21px; +border-top-width: 3px; +} +#arrowTabsCont #contentsTabArrowLbl{ +margin-left: 21px; +min-width: 494px; +max-width: 494px; +min-height: 28px; +max-height: 28px; +} +#arrowTabsCont #notesTabArrowLbl{ +min-width: 686px; +max-width: 686px; +min-height: 35px; +max-height: 35px; +} +#ViewerContentsPopup #Content{ +min-height: 795px; +max-height: 795px; +} +/*ViewerContentsList +--------------*/ +#ViewerContentsList{ +margin: 0px 35px; +min-width: 887px; +max-width: 887px; +min-height: 786px; +max-height: 786px; +border-width: 3px; +border-radius: 8px; +} +#ViewerContentsList ViewerContentsItem{ +min-width: 888px; +max-width: 888px; +min-height: 85px; +max-height: 85px; +border-width: 3px; +} +#ViewerContentsList ViewerContentsItem QLabel#chapterLbl{ +margin: 0px 0px 0px 72px; +max-width: 724px; +} +#ViewerContentsList ViewerContentsItem QLabel#spacerContentLbl{ +min-width: 72px; +max-width: 72px; +} +#ViewerContentsList #BookIndexItem1{ +margin-top: 3px; +} +/*ViewerContentsItem +--------------*/ +#ViewerContentsItemCont{ +margin-left: 37px; +min-width: 885px; +max-width: 885px; +min-height: 83px; +max-height: 83px; +border-width: 3px; +} +ViewerContentsItem{ +min-width: 820px; +max-width: 820px; +margin: 0px 35px; +min-height: 85px; +max-height: 85px; +border-width: 3px; +} +ViewerContentsItem #contentLbl{ +padding: 0px 28px; +} +ViewerContentsItem #notesNumberLbl{ +margin-right: 7px; +min-width: 45px; +max-width: 45px; +padding-right: 35px; +font-size: 33px; +} +ViewerContentsItem #hightlightedNumberLbl{ +margin-right: 7px; +min-width: 45px; +max-width: 45px; +padding-right: 49px; +font-size: 33px; +} +ViewerContentsItem #bookmarksNumberLbl{ +margin-right: 21px; +min-width: 28px; +max-width: 28px; +padding-right: 35px; +font-size: 33px; +} +#ViewerContentsList ViewerContentsItem{ +} +#ViewerContentsList ViewerContentsItem:checked{ +border-width: 3px; +} +#ViewerContentsList ViewerContentsItem#BookIndexItem1:checked{ +border-radius-top-left: 10px; +border-radius-top-right: 10px; +} +#ViewerContentsList ViewerContentsItem#BookIndexItem9:checked{ +border-radius-bottom-left: 10px; +border-radius-bottom-right: 10px; +} +#ViewerContentsList ViewerContentsItem:unchecked{ +} +#ViewerContentsList ViewerContentsItem#BookIndexItem1:unchecked{ +} +#ViewerContentsList ViewerContentsItem#BookIndexItem9:unchecked{ +} +/*ViewerAnnotationsList +----------------------*/ +#ViewerAnnotationsList{ +margin: 0px 35px; +min-width: 887px; +max-width: 887px; +min-height: 851px; +max-height: 851px; +} +#annotationActions { +margin: 0px 33px 14px 35px; +border-width: 3px; +border-radius: 8px; +min-height: 102px; +max-height: 102px; +} +#annotationActions QPushButton { +margin: 0px 0px 35px 0px; +padding: 0px 8px; +min-height: 102px; +max-height: 102px; +border-width: 3px; +} +#annotationActions QPushButton#allAnnotationsBtn { +margin: 0px 0px 35px 38px; +border-top-left-radius: 8px; +border-bottom-left-radius: 8px; +} +#annotationActions QPushButton#bookmarksAnnotationsBtn { +margin: 0px 34px 35px 0px; +border-top-right-radius: 8px; +border-bottom-right-radius: 8px; +} +#annotationsCont{ +margin: 0px 35px; +border-width: 3px; +border-radius: 8px; +} +#annotationsCont #Annotation1, #annotationsCont #Annotation2,#annotationsCont #Annotation3,#annotationsCont #Annotation4{ +min-height: 163px; +max-height: 163px; +} +/*ViewerAnnotationItem +-----------------------*/ +#ViewerAnnotationItemCont,ViewerAnnotationItem{ +min-width: 887px; +max-width: 887px; +margin: 0px 35px; +min-height: 163px; +max-height: 163px; +border-width: 3px; +} +#ViewerAnnotationItemCont #typeAnnotationLbl, ViewerAnnotationItem #typeAnnotationLbl{ +margin: 21px 0px 0px 54px; +min-width: 72px; +max-width: 72px; +} +ViewerAnnotationItem #annotationPageLbl{ +margin: 14px 8px 7px 8px; +font-size: 34px; +} +ViewerAnnotationItem #annotationDateLbl{ +margin: 14px 54px 7px 54px; +font-size: 34px; +} +ViewerAnnotationItem #annotationTextLbl{ +margin: 0px 45px 0px 21px; +font-size: 38px; +} + +ViewerAnnotationItem #noteTextLbl{ +margin: 0px 45px 7px 21px; +font-size: 34px; +} +/*ViewerTextActionsMenu +-----------------------------*/ +#ViewerTextActionsMenu{ +min-width: 1044px; +max-width: 1044px; +min-height: 233px; +max-height: 233px; +} +#ViewerTextActionsMenu #popupCont{ +min-height: 127px; +max-height: 127px; +padding: 0px; +border-width: 21px; +border-radius: 21px; +} +#ViewerTextActionsMenu #popupCont QPushButton{ +margin: 0px 0px 0px 21px; +padding: 0px 14px; +min-height: 91px; +max-height: 91px; +border-width: 1px; +border-radius: 8px; +font-size: 33px; +background-size: 100% 100%; +} +#ViewerTextActionsMenu #popupCont QPushButton#wikipediaMenuBtn{ +margin: 0px 21px 0px 21px; +} +#ViewerBookListActions{ +min-width: 317px; +max-width: 317px; +min-height: 356px; +max-height: 356px; +} +#ViewerBookListActionsCont{ +border-width: 3px; +border-bottom-left-radius: 7px; +border-bottom-right-radius: 7px; +/*min-width: 345px; +max-width: 345px;*/ +} +#ViewerBookListActions QPushButton{ +padding: 0px 0px 0px 14px; +min-height: 91px; +max-height: 91px; +border-bottom-width: 1px; +} +#ViewerBookListActions QPushButton#deleteBookBtn{ +} +/*LibraryActionsMenu +-----------------------------*/ +#LibraryActionsMenu{ +min-width: 1014px; +max-width: 1014px; +min-height: 233px; +max-height: 233px; +} +#LibraryActionsMenu #popupCont{ +min-height: 127px; +max-height: 127px; +padding: 0px; +border-width: 21px; +border-radius: 21px; +} +#LibraryActionsMenu #popupCont QPushButton{ +padding: 0px 21px; +min-height: 91px; +max-height: 91px; +border-width: 1px; +font-size: 35px; +} +#LibraryActionsMenu #popupCont QPushButton#deleteActionBtn{ +} +/*ViewerSearchContextMenu +----------------------------------*/ +#ViewerSearchContextMenu{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#SearchContextMenuCont{ +min-width: 1032px; +max-width: 1032px; +min-height: 99px; +max-height: 99px; +border-width: 3px; +border-radius: 14px; +} +#listBtn{ +padding: 0px 28px; +min-height: 82px; +max-height: 82px; +border-width: 3px; +border-radius: 14px; +font-size: 33px; +} +#ViewerSearchContextMenu #headerSearch{ +min-height: 82px; +max-height: 82px; +} +#ViewerSearchContextMenu #closeBtn{ +margin: 0px 11px 0px 11px; +min-height: 82px; +max-height: 82px; +min-width: 91px; +max-width: 91px; +} +#SearchContextMenuCont #resultIndexLbl{ +padding: 0px 0px 0px 8px; +font-size: 31px; +} +#SearchContextMenuCont #ofLbl{ +padding: 0px 0px 0px 0px; +font-size: 31px; +} +#SearchContextMenuCont #resultLbl{ +font-size: 31px; +} +#SearchContextMenuCont #numResultsLbl{ +padding: 0px 21px 0px 0px; +font-size: 31px; +} +#SearchContextMenuCont #previousBtn{ +min-width: 98px; +max-width: 98px; +min-height: 82px; +max-height: 82px; +border-width: 3px; +border-top-left-radius: 14px; +border-bottom-left-radius: 14px; +} +#SearchContextMenuCont #nextBtn{ +min-width: 98px; +max-width: 98px; +min-height: 82px; +max-height: 82px; +border-width: 3px; +border-top-right-radius: 14px; +border-bottom-right-radius: 14px; +} +/*ViewerSearchContextMenuLandscape +----------------------------------*/ +#ViewerSearchContextMenuLandscape{ +min-width: 1072px; +max-width: 1072px; +min-height: 1442px; +max-height: 1442px; +} +#ViewerSearchContextMenuLandscape #SearchContextMenuCont{ +margin-top: 7px; +min-height: 1420px; +max-height: 1420px; +min-width: 99px; +max-width: 99px; +border-width: 3px; +border-radius: 14px; +} +#ViewerSearchContextMenuLandscape #ViewerSearchCenterCont{ +min-width: 113px; +max-width: 113px; +} +#ViewerSearchContextMenuLandscape #listBtn{ +margin: 17px 6px 17px; +padding: 28px 0px; +min-width: 82px; +max-width: 82px; +border-width: 3px; +border-radius: 14px; +font-size: 33px; +min-height: 141px; +max-height: 141px; +} +#ViewerSearchContextMenuLandscape #headerSearch{ +min-width: 82px; +max-width: 82px; +} +#ViewerSearchContextMenuLandscape #closeBtn{ +margin: 0px 0px 11px 11px; +min-width: 82px; +max-width: 82px; +min-height: 91px; +max-height: 91px; +} +#ViewerSearchContextMenuLandscape #SearchContextMenuCont #resultCountLbl{ +font-size: 31px; +min-height: 448px; +max-height: 448px; +} +#ViewerSearchContextMenuLandscape #SearchContextMenuCont #previousBtn{ +margin-top: 17px; +margin-left: 6px; +min-height: 98px; +max-height: 98px; +min-width: 82px; +max-width: 82px; +border-width: 3px; +border-top-left-radius: 14px; +border-top-right-radius: 14px; +border-bottom-left-radius: 0px; +border-bottom-right-radius: 0px; +} +#ViewerSearchContextMenuLandscape #SearchContextMenuCont #nextBtn{ +margin-left: 6px; +min-height: 98px; +max-height: 98px; +min-width: 82px; +max-width: 82px; +border-width: 3px; +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +border-top-left-radius: 0px; +border-top-right-radius: 0px; +} + +/*ViewerAppearancePopup +-------------------------*/ +#ViewerAppearancePopup{ +min-width: 1072px; +max-width: 1072px; +min-height: 1267px; +max-height: 1267px; +} +#ViewerAppearancePopup #bottomArrowLbl{ +min-width: 774px; +max-width: 774px; +} +#ViewerAppearancePopup #popupCont{ +padding: 0px 27px 17px 27px; +min-width: 868px; +max-width: 868px; +min-height: 942px; +max-height: 942px; +} +#ViewerAppearancePopup #headerCont{ +border-width: 3px; +margin: 0px 54px 14px; +max-height: 86px; +min-height: 86px; +padding-bottom: 8px; +} +#ViewerAppearancePopup #headerCont #closeBtn{ +margin-right: 72px; +min-height: 82px; +max-height: 82px; +min-width: 82px; +max-width: 82px; +} +#ViewerAppearancePopup #headerCont #textAjustLbl{ +font-size: 37px; +margin-left: 54px; +} +#ViewerAppearancePopup #editorialCont{ +border-radius: 8px; +border-width: 3px; +max-height: 93px; +min-height: 93px; +margin: 0px 54px 0px; +} +#ViewerAppearancePopup #editorialCont #editorialBtn{ +min-width: 188px; +max-width: 188px; +min-height: 57px; +max-height: 57px; +padding: 0px 72px 0px 0px; +} +#ViewerAppearancePopup #editorialCont #editorialLbl{ +font-size: 33px; +padding-left: 72px; +} +#ViewerAppearancePopup #sizeCont{ +margin:0 91px 34px; +} +#SpaceLeft{ +max-width: 21px; +min-width: 21px; +} +#SpaceRight{ +max-width: 18px; +min-width: 18px; +} +#spaceBetLbl{ +max-height: 14px; +min-height: 14px; +} +#spaceBetLbl1{ +max-height: 14px; +min-height: 14px; +} +#ViewerAppearancePopup #sizeCont QPushButton{ +border-radius: 8px; +border-width: 3px; +margin: 0px 0px 0px 4px; +max-height: 93px; +min-height: 93px; +max-width: 85px; +min-width: 85px; +} +#ViewerAppearancePopup #sizeCont #size1{ +font-size: 28px; +} +#ViewerAppearancePopup #sizeCont #size2{ +font-size: 35px; +} +#ViewerAppearancePopup #sizeCont #size3{ +font-size: 42px; +} +#ViewerAppearancePopup #sizeCont #size4{ +font-size: 49px; +} +#ViewerAppearancePopup #sizeCont #size5{ +font-size: 57px; +} +#ViewerAppearancePopup #sizeCont #size6{ +font-size: 64px; +} +#ViewerAppearancePopup #sizeCont #size7{ +font-size: 71px; +} +#ViewerAppearancePopup #sizeCont #size8{ +font-size: 78px; +} +#ViewerAppearancePopup #bodyCont{ +padding: 18px 54px 0px 0px; +} +#ViewerAppearancePopup #fontTypeCont{ +border-radius: 8px; +border-width: 3px; +max-width: 362px; +min-width: 362px; +} +#ViewerAppearancePopup #fontTypeCont #fontTypeLbl{ +border-bottom-width: 3px; +font-size: 28px; +padding-bottom: 4px; +padding-top: 8px; +margin: 0px 18px 8px; +} +#ViewerAppearancePopup #fontTypeCont QPushButton{ +font-size: 33px; +max-height: 65px; +min-height: 65px; +margin: 0px 18px 8px; +padding-left: 18px; +padding-top: 7px; +} +#ViewerAppearancePopup #spacerLeftBodyCont{ +max-width: 54px; +min-width: 54px; +} +#ViewerAppearancePopup #horizontalSpacerLbl{ +max-width: 18px; +min-width: 18px; +} +#ViewerAppearancePopup #stylesTextCont{ +} +#ViewerAppearancePopup #stylesTextCont #justifyCont{ +border-radius: 8px; +border-width: 3px; +max-width: 461px; +min-width: 461px; +} +#ViewerAppearancePopup #stylesTextCont #justifyCont #justifyLbl{ +border-bottom-width: 3px; +font-size: 28px; +margin: 0px 18px; +padding-bottom: 4px; +padding-top: 4px; +} +#ViewerAppearancePopup #stylesTextCont #justifyCont QPushButton{ +margin: 6px 18px 7px 18px; +max-width: 93px; +min-width: 93px; +max-height: 105px; +min-height: 105px; +} +#ViewerAppearancePopup #stylesTextCont #marginCont{ +border-radius: 8px; +border-width: 3px; +max-width: 461px; +min-width: 461px; +} +#ViewerAppearancePopup #stylesTextCont #marginCont #marginsLbl{ +border-bottom-width: 3px; +font-size: 28px; +margin: 0px 18px; +padding-bottom: 4px; +padding-top: 4px; +} +#ViewerAppearancePopup #stylesTextCont #marginCont QPushButton{ +margin: 6px 18px 7px 18px; +max-width: 93px; +min-width: 93px; +max-height: 105px; +min-height: 105px; +} +#ViewerAppearancePopup #stylesTextCont #spacingCont{ +border-radius: 8px; +border-width: 3px; +max-width: 461px; +min-width: 461px; +} +#ViewerAppearancePopup #stylesTextCont #spacingCont #spacingLbl{ +border-bottom-width: 3px; +font-size: 28px; +margin: 0px 18px; +padding-bottom: 4px; +padding-top: 4px; +} +#ViewerAppearancePopup #stylesTextCont #spacingCont QPushButton{ +margin: 6px 18px 7px 18px; +max-width: 93px; +min-width: 93px; +max-height: 105px; +min-height: 105px; +} +#ViewerAppearancePopup #stylesTextCont #seeImagesCont{ +border-radius: 8px; +border-width: 3px; +max-width: 461px; +min-width: 461px; +} +#ViewerAppearancePopup #stylesTextCont #seeImagesCont #seeImagesLbl { +font-size: 28px; +padding-left: 8px; +} +#ViewerAppearancePopup #stylesTextCont #seeImagesCont #seeImagesBtn{ +padding: 0px 18px 0px 0px; +min-width: 188px; +max-width: 188px; +min-height: 57px; +max-height: 57px; +} +#separator1Lbl, +#separator2Lbl, +#separator3Lbl{ +max-height: 16px; +min-height: 16px; +} +/*ViewerAnnotationActions +-----------------------*/ +#ViewerAnnotationActions{ +min-width: 1072px; +max-width: 1072px; +min-height: 233px; +max-height: 233px; +} +#ViewerAnnotationActions #horizontalWidget{} +#ViewerAnnotationActions #popupCont{ +min-width: 0px; +max-width: 1072px; +min-height: 95px; +max-height: 95px; +padding: 0px; +border-width: 21px; +border-radius: 21px; +} +#ViewerAnnotationActions #popupCont QPushButton{ +margin: 0 1px; +padding: 0px 31px; +min-width: 156px; +max-width: 156px; +min-height: 88px; +max-height: 88px; +border-width: 1px; +font-size: 35px; +} +#ViewerAnnotationActions #popupCont #copyActionBtn{} +#ViewerAnnotationActions #popupCont #gotoActionBtn{ +border-width: 0px; +} +/* ViewerDelimiter +------------------------*/ +#ViewerDelimiter{ +min-width: 85px; +max-width: 85px; +} +#ViewerDelimiter #delimiter{ +min-width: 4px; +max-width: 4px; +} +#ViewerDelimiter #teardrop{ +min-height: 85px; +max-height: 85px; +} +#ViewerDelimiter #teardropTop{ +min-height: 85px; +max-height: 85px; +} +/* ViewerPdfPageHandler +-----------------------*/ +#pdfToolsWindow{ +min-width: 1072px; +max-width: 1072px; +min-height: 91px; +max-height: 91px; +} +#ViewerPdfPageHandlerCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 91px; +max-height: 91px; +border-top-width: 3px; +} +#ViewerPdfPageHandlerCont QPushButton{ +min-width: 127px; +max-width: 127px; +} +#ViewerPdfPageHandlerCont #zoomMinusBtn{ +min-width: 0px; +max-width: 283px; +border-right-width: 3px; +} +#ViewerPdfPageHandlerCont #zoomPlusBtn{ +min-width: 0px; +max-width: 283px; +border-right-width: 3px; +} +#ViewerPdfPageHandlerCont #closeBtn{ +border-left-width: 3px; +} +#ViewerPdfPageHandlerCont #heightAdjustBtn{ +} +#ViewerPdfPageHandlerCont #landscapeModeBtn{ +} +#ViewerPdfPageHandlerCont #rotateBtn{ +} +#ViewerPdfPageHandlerCont #widthAdjustBtn{ +} +/* ViewerPdfPageHandlerLandscape +-----------------------*/ +#ViewerPdfPageHandlerLandscape{ +min-width: 91px; +max-width: 91px; +min-height: 1448px; +max-height: 1448px; +} +#pdfToolsWindowLandscape,pdfToolsWindow{ +min-width: 91px; +max-width: 91px; +min-height: 1448px; +max-height: 1448px; +} +#ViewerPdfPageHandlerLandscapeCont{ +min-width: 88px; +max-width: 88px; +min-height: 1448px; +max-height: 1448px; +border-right-width: 3px; +} +#ViewerPdfPageHandlerLandscapeCont QPushButton{ +min-height: 127px; +max-height: 127px; +} +#ViewerPdfPageHandlerLandscapeCont #zoomMinusBtn{ +min-height: 0px; +max-height: 424px; +border-bottom-width: 3px; +} +#ViewerPdfPageHandlerLandscapeCont #zoomPlusBtn{ +min-height: 0px; +max-height: 424px; +border-bottom-width: 3px; +} +#ViewerPdfPageHandlerLandscapeCont #closeBtn{ +border-top-width: 3px; +} +#ViewerPdfPageHandlerLandscapeCont #heightAdjustBtn{ +} +#ViewerPdfPageHandlerLandscapeCont #landscapeModeBtn{ +} +#ViewerPdfPageHandlerLandscapeCont #rotateBtn{ +} +#ViewerPdfPageHandlerLandscapeCont #widthAdjustBtn{ +} + +/*MiniatureView +--------------------------*/ +#miniature{ +min-width: 226px; +max-width: 226px; +min-height: 362px; +max-height: 362px; +border-width: 3px; +} +#MiniatureView{ +min-width: 226px; +max-width: 226px; +min-height: 362px; +max-height: 362px; +border-width: 3px; +} +#MiniatureView #frame, #miniature #frame, #miniatureCont #miniature #frame, #miniatureCont MiniatureView #frame{ +border-width: 3px; +} +#screenshotCont{ +min-width: 226px; +max-width: 226px; +min-height: 365px; +max-height: 365px; +} +#screenshotLbl{ +/*min-width: 198px; +max-width: 198px; +min-height: 267px; +max-height: 267px;*/ +border-width: 3px; +} +#pageCont #pageLbl, #zoomCont #zoomLbl{ +padding: 0px 4px 0px 14px; +} +#zoomLbl, #zoomValueLbl{ +font-size: 27px; +} +#pageValueLbl{ +font-size: 27px; +} +/*#screenshotLblCont{ +min-width: 226px; +max-width: 226px; +min-height: 267px; +max-height: 267px; +}*/ +#miniatureTopSpacer{ +min-width: 226px; +max-width: 226px; +min-height: 267px; +max-height: 267px; +} +#miniatureRightSpacer{ +min-width: 267px; +max-width: 267px; +min-height: 226px; +max-height: 226px; +} + +/*ViewerPageHandlerLandscapee +-------------------------------*/ +#ViewerPageHandleLandscape,ViewerPageHandleLandscape, #pageWindowLandscape, #ViewerPageHandlerLandscapeCont{ +min-width: 99px; +max-width: 99px; +min-height: 1448px; +max-height: 1448px; +} +#pageTextLandscape{ +margin: 0px 99px 0px 0px; +min-width: 283px; +max-width: 283px; +font-size: 30px; +} +#pageSpacerLbllandscapeCont{ +min-width: 580px; +} +#verticalSliderContent #horizontalWidget{ +min-width: 42px; +max-width: 42px; +} +#verticalSliderContent #horizontalWidget QLabel{ +} +#ViewerPageHandlerLandscapeCont #pageBackCont{ +margin: 54px 0px 0px 0px; +min-height: 91px; +max-height: 91px; +} +#ViewerPageHandlerLandscapeCont #pdfMenuBtn, #ViewerContLandscape #pdfMenuBtn{ +min-height: 95px; +max-height: 95px; +min-width: 99px; +max-width: 99px; +} +#ViewerPageHandlerLandscapeCont #pageBackBtn, #ViewerContLandscape #pageBackBtn{ +min-height: 91px; +max-height: 91px; +min-width: 99px; +max-width: 99px; +} +#ViewerPageHandlerLandscapeCont #pagerViewerSpacerLeft{ +min-height: 21px; +max-height: 21px; +} +#ViewerPageHandlerLandscapeCont #pagerViewerSpacerRight{ +min-height: 21px; +max-height: 21px; +} +#ViewerPageHandlerLandscapeCont #pagerInfoCont{ +} +#verticalSliderContent #readingProgress{ +min-width: 7px; +max-width: 7px; +min-height: 7px; +max-height: 1448px; +border-width: 1px; +border-radius: 7px; +} +#verticalSliderContent QSlider{ +border-width: 1px; +border-style: solid; +border-color: #404040; +} +#ViewerPageHandlerLandscapeCont #readingProgress:chunk{ +} +#ViewerPageHandlerLandscapeCont #toFinishChapLbl{ +} +#ViewerPageHandlerLandscapeCont #toFinishChapLbl, +#ViewerPageHandlerLandscapeCont #readedLbl, +#ViewerPageHandlerLandscapeCont #pagToFinishLbl, +#ViewerPageHandlerLandscapeCont #titleLandscapeLbl, +#ViewerPageHandlerLandscapeCont #readingPercentLbl{ +font-size: 30px; +} +#ViewerPageHandlerLandscapeCont #titleLandscapeLbl{ +min-height: 404px; +max-height: 404px; +} +#ViewerPageHandlerLandscapeCont #noTitleLandscapeLbl{ +min-height: 416px; +max-height: 416px; +} +#ViewerPageHandlerLandscapeCont #readingPercentLbl{ +margin: 0px 0px 0px 0px; +min-height: 199px; +max-height: 199px; +} +#ViewerPageHandlerLandscapeCont #noReadingPercentLbl{ +margin: 0px 0px 0px 0px; +min-height: 199px; +max-height: 199px; +} +#ViewerPageHandlerLandscapeCont #pageText{ +min-height: 181px; +max-height: 181px; +font-size: 30px; +} +#ViewerPageHandlerLandscapeCont #noPageText{ +min-height: 181px; +max-height: 181px; +} +#ViewerPageHandlerLandscapeCont #pagToFinishLbl{ +min-height: 328px; +max-height: 328px; +} +#ViewerPageHandlerLandscapeCont #noPagToFinishLbl{ +min-height: 328px; +max-height: 328px; +} +#ViewerPageHandlerLandscapeCont QLabel{ +border: 3px solid #000; +min-width: 0px; +max-width: 177px; +} +#ViewerPageHandlerLandscapeCont #marginText{ +min-height: 11px; +max-height: 11px; +} +#ViewerPageHandlerLandscapeCont #titleLeftMargin{ +min-height: 11px; +max-height: 11px; +} + +/*MiniatureViewLandscape +--------------------------*/ +#MiniatureViewLandscape,MiniatureViewLandscape{ +min-height: 226px; +max-height: 226px; +min-width: 362px; +max-width: 362px; +border-width: 3px; +} +#MiniatureViewLandscape #frame,MiniatureViewLandscape #frame{ +border-width: 3px; +} +#screenshotLandscapeCont{ +min-height: 226px; +max-height: 226px; +min-width: 362px; +max-width: 362px; +} +#screenshotLbl{ +border-width: 3px; +} +#screenshotLandscapeCont #pageCont #pageLbl, #screenshotLandscapeCont #zoomCont #zoomLbl{ +padding: 4px 0px 14px 0px; +min-width:0; +max-width: 57px; +} +#screenshotLandscapeCont #pageLbl{ +min-height: 49px; +max-height: 49px; +font-size: 27px; +} +#screenshotLandscapeCont #pageValueLbl{ +} +#screenshotLandscapeCont #zoomLbl, #screenshotLandscapeCont #zoomValueLbl, #screenshotLandscapeCont #pageValueLbl{ +min-width:0; +max-width: 57px; +font-size: 27px; +} +#screenshotLandscapeCont #zoomLbl{ +min-height: 71px; +max-height: 71px; +} +#pageLandscapeSpacer{ +min-height: 14px; +max-height: 14px; +} +#zoomLandscapeSpacer{ +min-height: 14px; +max-height: 14px; +} diff --git a/bqViewer/res/1448/wikipedia-adaptative.png b/bqViewer/res/1448/wikipedia-adaptative.png new file mode 100644 index 0000000..4546579 Binary files /dev/null and b/bqViewer/res/1448/wikipedia-adaptative.png differ diff --git a/bqViewer/res/1448/wikipedia-btn.png b/bqViewer/res/1448/wikipedia-btn.png new file mode 100644 index 0000000..ae47fd4 Binary files /dev/null and b/bqViewer/res/1448/wikipedia-btn.png differ diff --git a/bqViewer/res/1448/wikipedia.png b/bqViewer/res/1448/wikipedia.png new file mode 100644 index 0000000..113003e Binary files /dev/null and b/bqViewer/res/1448/wikipedia.png differ diff --git a/bqViewer/res/1448/with_images.png b/bqViewer/res/1448/with_images.png new file mode 100644 index 0000000..d0614bb Binary files /dev/null and b/bqViewer/res/1448/with_images.png differ diff --git a/bqViewer/res/1448/zoom-out-pdf-ico-landscape.png b/bqViewer/res/1448/zoom-out-pdf-ico-landscape.png new file mode 100644 index 0000000..8088853 Binary files /dev/null and b/bqViewer/res/1448/zoom-out-pdf-ico-landscape.png differ diff --git a/bqViewer/res/1448/zoom-out-pdf-ico.png b/bqViewer/res/1448/zoom-out-pdf-ico.png new file mode 100644 index 0000000..af16f49 Binary files /dev/null and b/bqViewer/res/1448/zoom-out-pdf-ico.png differ diff --git a/bqViewer/res/1448/zoom-pdf-ico-landscape.png b/bqViewer/res/1448/zoom-pdf-ico-landscape.png new file mode 100644 index 0000000..f279bad Binary files /dev/null and b/bqViewer/res/1448/zoom-pdf-ico-landscape.png differ diff --git a/bqViewer/res/1448/zoom-pdf-ico.png b/bqViewer/res/1448/zoom-pdf-ico.png new file mode 100644 index 0000000..b85307d Binary files /dev/null and b/bqViewer/res/1448/zoom-pdf-ico.png differ diff --git a/bqViewer/res/1star.png b/bqViewer/res/1star.png deleted file mode 100755 index 3ad5c62..0000000 Binary files a/bqViewer/res/1star.png and /dev/null differ diff --git a/bqViewer/res/2star.png b/bqViewer/res/2star.png deleted file mode 100755 index 8082fa5..0000000 Binary files a/bqViewer/res/2star.png and /dev/null differ diff --git a/bqViewer/res/3star.png b/bqViewer/res/3star.png deleted file mode 100755 index 5d62f7f..0000000 Binary files a/bqViewer/res/3star.png and /dev/null differ diff --git a/bqViewer/res/4star.png b/bqViewer/res/4star.png deleted file mode 100755 index 044a0f2..0000000 Binary files a/bqViewer/res/4star.png and /dev/null differ diff --git a/bqViewer/res/5star.png b/bqViewer/res/5star.png deleted file mode 100755 index 3eada31..0000000 Binary files a/bqViewer/res/5star.png and /dev/null differ diff --git a/bqViewer/res/average_rating_00.png b/bqViewer/res/average_rating_00.png deleted file mode 100755 index 0b3fddd..0000000 Binary files a/bqViewer/res/average_rating_00.png and /dev/null differ diff --git a/bqViewer/res/average_rating_05.png b/bqViewer/res/average_rating_05.png deleted file mode 100755 index f3d0dba..0000000 Binary files a/bqViewer/res/average_rating_05.png and /dev/null differ diff --git a/bqViewer/res/average_rating_10.png b/bqViewer/res/average_rating_10.png deleted file mode 100755 index 9a28d13..0000000 Binary files a/bqViewer/res/average_rating_10.png and /dev/null differ diff --git a/bqViewer/res/average_rating_15.png b/bqViewer/res/average_rating_15.png deleted file mode 100755 index 0070d62..0000000 Binary files a/bqViewer/res/average_rating_15.png and /dev/null differ diff --git a/bqViewer/res/average_rating_20.png b/bqViewer/res/average_rating_20.png deleted file mode 100755 index 4ece862..0000000 Binary files a/bqViewer/res/average_rating_20.png and /dev/null differ diff --git a/bqViewer/res/average_rating_25.png b/bqViewer/res/average_rating_25.png deleted file mode 100755 index def8f36..0000000 Binary files a/bqViewer/res/average_rating_25.png and /dev/null differ diff --git a/bqViewer/res/average_rating_30.png b/bqViewer/res/average_rating_30.png deleted file mode 100755 index 13728a2..0000000 Binary files a/bqViewer/res/average_rating_30.png and /dev/null differ diff --git a/bqViewer/res/average_rating_35.png b/bqViewer/res/average_rating_35.png deleted file mode 100755 index 29bf06c..0000000 Binary files a/bqViewer/res/average_rating_35.png and /dev/null differ diff --git a/bqViewer/res/average_rating_40.png b/bqViewer/res/average_rating_40.png deleted file mode 100755 index 0a4c2d7..0000000 Binary files a/bqViewer/res/average_rating_40.png and /dev/null differ diff --git a/bqViewer/res/average_rating_45.png b/bqViewer/res/average_rating_45.png deleted file mode 100755 index a3dbd0e..0000000 Binary files a/bqViewer/res/average_rating_45.png and /dev/null differ diff --git a/bqViewer/res/average_rating_50.png b/bqViewer/res/average_rating_50.png deleted file mode 100755 index 12be357..0000000 Binary files a/bqViewer/res/average_rating_50.png and /dev/null differ diff --git a/bqViewer/res/average_rating_big_00.png b/bqViewer/res/average_rating_big_00.png deleted file mode 100755 index a256dd5..0000000 Binary files a/bqViewer/res/average_rating_big_00.png and /dev/null differ diff --git a/bqViewer/res/average_rating_big_05.png b/bqViewer/res/average_rating_big_05.png deleted file mode 100755 index ce95d67..0000000 Binary files a/bqViewer/res/average_rating_big_05.png and /dev/null differ diff --git a/bqViewer/res/average_rating_big_10.png b/bqViewer/res/average_rating_big_10.png deleted file mode 100755 index 035f505..0000000 Binary files a/bqViewer/res/average_rating_big_10.png and /dev/null differ diff --git a/bqViewer/res/average_rating_big_15.png b/bqViewer/res/average_rating_big_15.png deleted file mode 100755 index 2421caf..0000000 Binary files a/bqViewer/res/average_rating_big_15.png and /dev/null differ diff --git a/bqViewer/res/average_rating_big_20.png b/bqViewer/res/average_rating_big_20.png deleted file mode 100755 index ec56610..0000000 Binary files a/bqViewer/res/average_rating_big_20.png and /dev/null differ diff --git a/bqViewer/res/average_rating_big_25.png b/bqViewer/res/average_rating_big_25.png deleted file mode 100755 index 5346fb2..0000000 Binary files a/bqViewer/res/average_rating_big_25.png and /dev/null differ diff --git a/bqViewer/res/average_rating_big_30.png b/bqViewer/res/average_rating_big_30.png deleted file mode 100755 index c657179..0000000 Binary files a/bqViewer/res/average_rating_big_30.png and /dev/null differ diff --git a/bqViewer/res/average_rating_big_35.png b/bqViewer/res/average_rating_big_35.png deleted file mode 100755 index 57b05e7..0000000 Binary files a/bqViewer/res/average_rating_big_35.png and /dev/null differ diff --git a/bqViewer/res/average_rating_big_40.png b/bqViewer/res/average_rating_big_40.png deleted file mode 100755 index 9a26b63..0000000 Binary files a/bqViewer/res/average_rating_big_40.png and /dev/null differ diff --git a/bqViewer/res/average_rating_big_45.png b/bqViewer/res/average_rating_big_45.png deleted file mode 100755 index d2e84b7..0000000 Binary files a/bqViewer/res/average_rating_big_45.png and /dev/null differ diff --git a/bqViewer/res/average_rating_big_50.png b/bqViewer/res/average_rating_big_50.png deleted file mode 100755 index 0a33ae4..0000000 Binary files a/bqViewer/res/average_rating_big_50.png and /dev/null differ diff --git a/bqViewer/res/back.png b/bqViewer/res/back.png deleted file mode 100755 index 6496cfc..0000000 Binary files a/bqViewer/res/back.png and /dev/null differ diff --git a/bqViewer/res/back_menu.png b/bqViewer/res/back_menu.png deleted file mode 100755 index 4cddf16..0000000 Binary files a/bqViewer/res/back_menu.png and /dev/null differ diff --git a/bqViewer/res/back_menu_over.png b/bqViewer/res/back_menu_over.png deleted file mode 100755 index 5abebdf..0000000 Binary files a/bqViewer/res/back_menu_over.png and /dev/null differ diff --git a/bqViewer/res/back_pressed.png b/bqViewer/res/back_pressed.png deleted file mode 100755 index c58f3d6..0000000 Binary files a/bqViewer/res/back_pressed.png and /dev/null differ diff --git a/bqViewer/res/battery-1.png b/bqViewer/res/battery-1.png deleted file mode 100755 index 3e4cbd2..0000000 Binary files a/bqViewer/res/battery-1.png and /dev/null differ diff --git a/bqViewer/res/battery-2.png b/bqViewer/res/battery-2.png deleted file mode 100755 index fe588b5..0000000 Binary files a/bqViewer/res/battery-2.png and /dev/null differ diff --git a/bqViewer/res/battery-empty.png b/bqViewer/res/battery-empty.png deleted file mode 100755 index e5a15b1..0000000 Binary files a/bqViewer/res/battery-empty.png and /dev/null differ diff --git a/bqViewer/res/battery.png b/bqViewer/res/battery.png deleted file mode 100755 index a1f0d91..0000000 Binary files a/bqViewer/res/battery.png and /dev/null differ diff --git a/bqViewer/res/bg_filter_bottom.png b/bqViewer/res/bg_filter_bottom.png deleted file mode 100755 index 3a9137b..0000000 Binary files a/bqViewer/res/bg_filter_bottom.png and /dev/null differ diff --git a/bqViewer/res/bg_filter_top.png b/bqViewer/res/bg_filter_top.png deleted file mode 100755 index bfc8274..0000000 Binary files a/bqViewer/res/bg_filter_top.png and /dev/null differ diff --git a/bqViewer/res/bg_tab_container.png b/bqViewer/res/bg_tab_container.png deleted file mode 100755 index 43e2766..0000000 Binary files a/bqViewer/res/bg_tab_container.png and /dev/null differ diff --git a/bqViewer/res/big_star_black.png b/bqViewer/res/big_star_black.png deleted file mode 100755 index bbd7cff..0000000 Binary files a/bqViewer/res/big_star_black.png and /dev/null differ diff --git a/bqViewer/res/big_star_black_white.png b/bqViewer/res/big_star_black_white.png deleted file mode 100755 index e413b20..0000000 Binary files a/bqViewer/res/big_star_black_white.png and /dev/null differ diff --git a/bqViewer/res/big_star_white.png b/bqViewer/res/big_star_white.png deleted file mode 100755 index e875f90..0000000 Binary files a/bqViewer/res/big_star_white.png and /dev/null differ diff --git a/bqViewer/res/bin_ico.png b/bqViewer/res/bin_ico.png deleted file mode 100755 index 29eb0d4..0000000 Binary files a/bqViewer/res/bin_ico.png and /dev/null differ diff --git a/bqViewer/res/bookmark.png b/bqViewer/res/bookmark.png deleted file mode 100755 index 4928e61..0000000 Binary files a/bqViewer/res/bookmark.png and /dev/null differ diff --git a/bqViewer/res/bookmark_menu.png b/bqViewer/res/bookmark_menu.png deleted file mode 100755 index 0a0a8ec..0000000 Binary files a/bqViewer/res/bookmark_menu.png and /dev/null differ diff --git a/bqViewer/res/bookmark_mynote.png b/bqViewer/res/bookmark_mynote.png deleted file mode 100755 index 8de4270..0000000 Binary files a/bqViewer/res/bookmark_mynote.png and /dev/null differ diff --git a/bqViewer/res/bq_back.png b/bqViewer/res/bq_back.png deleted file mode 100755 index c008a6b..0000000 Binary files a/bqViewer/res/bq_back.png and /dev/null differ diff --git a/bqViewer/res/bq_back_pressed.png b/bqViewer/res/bq_back_pressed.png deleted file mode 100755 index bf12384..0000000 Binary files a/bqViewer/res/bq_back_pressed.png and /dev/null differ diff --git a/bqViewer/res/bq_index_menu.png b/bqViewer/res/bq_index_menu.png deleted file mode 100755 index 165197a..0000000 Binary files a/bqViewer/res/bq_index_menu.png and /dev/null differ diff --git a/bqViewer/res/bq_index_menu_over.png b/bqViewer/res/bq_index_menu_over.png deleted file mode 100755 index f27c934..0000000 Binary files a/bqViewer/res/bq_index_menu_over.png and /dev/null differ diff --git a/bqViewer/res/bq_no_reflow.png b/bqViewer/res/bq_no_reflow.png deleted file mode 100755 index 372ca77..0000000 Binary files a/bqViewer/res/bq_no_reflow.png and /dev/null differ diff --git a/bqViewer/res/bq_no_reflow_pressed.png b/bqViewer/res/bq_no_reflow_pressed.png deleted file mode 100755 index 7ff9865..0000000 Binary files a/bqViewer/res/bq_no_reflow_pressed.png and /dev/null differ diff --git a/bqViewer/res/bq_reflow.png b/bqViewer/res/bq_reflow.png deleted file mode 100755 index fa400ac..0000000 Binary files a/bqViewer/res/bq_reflow.png and /dev/null differ diff --git a/bqViewer/res/bq_reflow_pressed.png b/bqViewer/res/bq_reflow_pressed.png deleted file mode 100755 index e0601aa..0000000 Binary files a/bqViewer/res/bq_reflow_pressed.png and /dev/null differ diff --git a/bqViewer/res/casadellibro.png b/bqViewer/res/casadellibro.png deleted file mode 100755 index 2cdb179..0000000 Binary files a/bqViewer/res/casadellibro.png and /dev/null differ diff --git a/bqViewer/res/charge_battery.png b/bqViewer/res/charge_battery.png deleted file mode 100755 index d2565da..0000000 Binary files a/bqViewer/res/charge_battery.png and /dev/null differ diff --git a/bqViewer/res/check.png b/bqViewer/res/check.png deleted file mode 100755 index d07d04b..0000000 Binary files a/bqViewer/res/check.png and /dev/null differ diff --git a/bqViewer/res/checked.png b/bqViewer/res/checked.png deleted file mode 100755 index e1eac31..0000000 Binary files a/bqViewer/res/checked.png and /dev/null differ diff --git a/bqViewer/res/clear.png b/bqViewer/res/clear.png deleted file mode 100755 index 0f316ad..0000000 Binary files a/bqViewer/res/clear.png and /dev/null differ diff --git a/bqViewer/res/close.png b/bqViewer/res/close.png deleted file mode 100755 index ba2777b..0000000 Binary files a/bqViewer/res/close.png and /dev/null differ diff --git a/bqViewer/res/close_popup.png b/bqViewer/res/close_popup.png deleted file mode 100755 index e20c72f..0000000 Binary files a/bqViewer/res/close_popup.png and /dev/null differ diff --git a/bqViewer/res/close_popup_over.png b/bqViewer/res/close_popup_over.png deleted file mode 100755 index db96b7b..0000000 Binary files a/bqViewer/res/close_popup_over.png and /dev/null differ diff --git a/bqViewer/res/close_search.png b/bqViewer/res/close_search.png deleted file mode 100755 index 3df75e1..0000000 Binary files a/bqViewer/res/close_search.png and /dev/null differ diff --git a/bqViewer/res/deleteOne.png b/bqViewer/res/deleteOne.png deleted file mode 100755 index 28319bf..0000000 Binary files a/bqViewer/res/deleteOne.png and /dev/null differ diff --git a/bqViewer/res/deleteOne_over.png b/bqViewer/res/deleteOne_over.png deleted file mode 100755 index 5b89f44..0000000 Binary files a/bqViewer/res/deleteOne_over.png and /dev/null differ diff --git a/bqViewer/res/down.png b/bqViewer/res/down.png deleted file mode 100755 index 140f69f..0000000 Binary files a/bqViewer/res/down.png and /dev/null differ diff --git a/bqViewer/res/down_disabled.png b/bqViewer/res/down_disabled.png deleted file mode 100755 index 4d0c529..0000000 Binary files a/bqViewer/res/down_disabled.png and /dev/null differ diff --git a/bqViewer/res/down_over.png b/bqViewer/res/down_over.png deleted file mode 100755 index 49c1f90..0000000 Binary files a/bqViewer/res/down_over.png and /dev/null differ diff --git a/bqViewer/res/edit.png b/bqViewer/res/edit.png deleted file mode 100755 index 5b252be..0000000 Binary files a/bqViewer/res/edit.png and /dev/null differ diff --git a/bqViewer/res/elf_checked.png b/bqViewer/res/elf_checked.png deleted file mode 100755 index 1566b3d..0000000 Binary files a/bqViewer/res/elf_checked.png and /dev/null differ diff --git a/bqViewer/res/elf_combo_arrow.png b/bqViewer/res/elf_combo_arrow.png deleted file mode 100755 index 0555f16..0000000 Binary files a/bqViewer/res/elf_combo_arrow.png and /dev/null differ diff --git a/bqViewer/res/elf_contents_arrow.png b/bqViewer/res/elf_contents_arrow.png deleted file mode 100755 index c544b29..0000000 Binary files a/bqViewer/res/elf_contents_arrow.png and /dev/null differ diff --git a/bqViewer/res/elf_contents_arrow_pressed.png b/bqViewer/res/elf_contents_arrow_pressed.png deleted file mode 100755 index 40e4cf3..0000000 Binary files a/bqViewer/res/elf_contents_arrow_pressed.png and /dev/null differ diff --git a/bqViewer/res/elf_goto.png b/bqViewer/res/elf_goto.png deleted file mode 100755 index 69c3298..0000000 Binary files a/bqViewer/res/elf_goto.png and /dev/null differ diff --git a/bqViewer/res/elf_hightlighted_ico.png b/bqViewer/res/elf_hightlighted_ico.png deleted file mode 100755 index aa38379..0000000 Binary files a/bqViewer/res/elf_hightlighted_ico.png and /dev/null differ diff --git a/bqViewer/res/elf_no_cover.png b/bqViewer/res/elf_no_cover.png deleted file mode 100755 index 358d8c9..0000000 Binary files a/bqViewer/res/elf_no_cover.png and /dev/null differ diff --git a/bqViewer/res/elf_note_ico.png b/bqViewer/res/elf_note_ico.png deleted file mode 100755 index a83554d..0000000 Binary files a/bqViewer/res/elf_note_ico.png and /dev/null differ diff --git a/bqViewer/res/elf_search.png b/bqViewer/res/elf_search.png deleted file mode 100755 index c209d3e..0000000 Binary files a/bqViewer/res/elf_search.png and /dev/null differ diff --git a/bqViewer/res/elf_search_menu.png b/bqViewer/res/elf_search_menu.png deleted file mode 100755 index 014a49a..0000000 Binary files a/bqViewer/res/elf_search_menu.png and /dev/null differ diff --git a/bqViewer/res/elf_search_menu_over.png b/bqViewer/res/elf_search_menu_over.png deleted file mode 100755 index d1b0397..0000000 Binary files a/bqViewer/res/elf_search_menu_over.png and /dev/null differ diff --git a/bqViewer/res/elf_summary_menu.png b/bqViewer/res/elf_summary_menu.png deleted file mode 100755 index 5d3e4a9..0000000 Binary files a/bqViewer/res/elf_summary_menu.png and /dev/null differ diff --git a/bqViewer/res/elf_summary_menu_over.png b/bqViewer/res/elf_summary_menu_over.png deleted file mode 100755 index 40a0ad4..0000000 Binary files a/bqViewer/res/elf_summary_menu_over.png and /dev/null differ diff --git a/bqViewer/res/empty_battery.png b/bqViewer/res/empty_battery.png deleted file mode 100755 index 358d9e9..0000000 Binary files a/bqViewer/res/empty_battery.png and /dev/null differ diff --git a/bqViewer/res/facebook.png b/bqViewer/res/facebook.png deleted file mode 100755 index 3a8eef5..0000000 Binary files a/bqViewer/res/facebook.png and /dev/null differ diff --git a/bqViewer/res/five_starts.png b/bqViewer/res/five_starts.png deleted file mode 100755 index 681dffa..0000000 Binary files a/bqViewer/res/five_starts.png and /dev/null differ diff --git a/bqViewer/res/font_selected_down.png b/bqViewer/res/font_selected_down.png deleted file mode 100755 index 12a96c7..0000000 Binary files a/bqViewer/res/font_selected_down.png and /dev/null differ diff --git a/bqViewer/res/font_selected_left.png b/bqViewer/res/font_selected_left.png deleted file mode 100755 index c49398c..0000000 Binary files a/bqViewer/res/font_selected_left.png and /dev/null differ diff --git a/bqViewer/res/font_selected_right.png b/bqViewer/res/font_selected_right.png deleted file mode 100755 index 6862904..0000000 Binary files a/bqViewer/res/font_selected_right.png and /dev/null differ diff --git a/bqViewer/res/font_selected_up.png b/bqViewer/res/font_selected_up.png deleted file mode 100755 index 0254492..0000000 Binary files a/bqViewer/res/font_selected_up.png and /dev/null differ diff --git a/bqViewer/res/fonts_menu.png b/bqViewer/res/fonts_menu.png deleted file mode 100755 index ba15e46..0000000 Binary files a/bqViewer/res/fonts_menu.png and /dev/null differ diff --git a/bqViewer/res/fonts_menu_over.png b/bqViewer/res/fonts_menu_over.png deleted file mode 100755 index 4325925..0000000 Binary files a/bqViewer/res/fonts_menu_over.png and /dev/null differ diff --git a/bqViewer/res/fontsize_menu.png b/bqViewer/res/fontsize_menu.png deleted file mode 100755 index 3ffcc23..0000000 Binary files a/bqViewer/res/fontsize_menu.png and /dev/null differ diff --git a/bqViewer/res/fontsize_menu_over.png b/bqViewer/res/fontsize_menu_over.png deleted file mode 100755 index a01093c..0000000 Binary files a/bqViewer/res/fontsize_menu_over.png and /dev/null differ diff --git a/bqViewer/res/full_signal.png b/bqViewer/res/full_signal.png deleted file mode 100755 index dcc06e8..0000000 Binary files a/bqViewer/res/full_signal.png and /dev/null differ diff --git a/bqViewer/res/goto.png b/bqViewer/res/goto.png deleted file mode 100755 index 080809e..0000000 Binary files a/bqViewer/res/goto.png and /dev/null differ diff --git a/bqViewer/res/goto_deleteone.png b/bqViewer/res/goto_deleteone.png deleted file mode 100755 index 5b4beaf..0000000 Binary files a/bqViewer/res/goto_deleteone.png and /dev/null differ diff --git a/bqViewer/res/goto_deleteone_pressed.png b/bqViewer/res/goto_deleteone_pressed.png deleted file mode 100755 index 606a748..0000000 Binary files a/bqViewer/res/goto_deleteone_pressed.png and /dev/null differ diff --git a/bqViewer/res/goto_menu.png b/bqViewer/res/goto_menu.png deleted file mode 100755 index 062ccd7..0000000 Binary files a/bqViewer/res/goto_menu.png and /dev/null differ diff --git a/bqViewer/res/goto_menu_over.png b/bqViewer/res/goto_menu_over.png deleted file mode 100755 index f2ef74d..0000000 Binary files a/bqViewer/res/goto_menu_over.png and /dev/null differ diff --git a/bqViewer/res/goto_over.png b/bqViewer/res/goto_over.png deleted file mode 100755 index 98d7e6d..0000000 Binary files a/bqViewer/res/goto_over.png and /dev/null differ diff --git a/bqViewer/res/highLighted_mynote.png b/bqViewer/res/highLighted_mynote.png deleted file mode 100755 index 839ebb3..0000000 Binary files a/bqViewer/res/highLighted_mynote.png and /dev/null differ diff --git a/bqViewer/res/hightlighted_menu.png b/bqViewer/res/hightlighted_menu.png deleted file mode 100755 index 5b252be..0000000 Binary files a/bqViewer/res/hightlighted_menu.png and /dev/null differ diff --git a/bqViewer/res/home_ico.png b/bqViewer/res/home_ico.png deleted file mode 100755 index 4cd3517..0000000 Binary files a/bqViewer/res/home_ico.png and /dev/null differ diff --git a/bqViewer/res/home_main_menu.png b/bqViewer/res/home_main_menu.png deleted file mode 100755 index 428b4fd..0000000 Binary files a/bqViewer/res/home_main_menu.png and /dev/null differ diff --git a/bqViewer/res/horizontal.png b/bqViewer/res/horizontal.png deleted file mode 100755 index bb1b197..0000000 Binary files a/bqViewer/res/horizontal.png and /dev/null differ diff --git a/bqViewer/res/index_menu.png b/bqViewer/res/index_menu.png deleted file mode 100755 index d63716f..0000000 Binary files a/bqViewer/res/index_menu.png and /dev/null differ diff --git a/bqViewer/res/index_menu_over.png b/bqViewer/res/index_menu_over.png deleted file mode 100755 index 1933ad4..0000000 Binary files a/bqViewer/res/index_menu_over.png and /dev/null differ diff --git a/bqViewer/res/info.png b/bqViewer/res/info.png deleted file mode 100755 index 3f956aa..0000000 Binary files a/bqViewer/res/info.png and /dev/null differ diff --git a/bqViewer/res/info_menu.png b/bqViewer/res/info_menu.png deleted file mode 100755 index 96cfe09..0000000 Binary files a/bqViewer/res/info_menu.png and /dev/null differ diff --git a/bqViewer/res/info_menu_over.png b/bqViewer/res/info_menu_over.png deleted file mode 100755 index 8b22fcd..0000000 Binary files a/bqViewer/res/info_menu_over.png and /dev/null differ diff --git a/bqViewer/res/internet_main_menu.png b/bqViewer/res/internet_main_menu.png deleted file mode 100755 index fe19c6b..0000000 Binary files a/bqViewer/res/internet_main_menu.png and /dev/null differ diff --git a/bqViewer/res/keyboard_enter.png b/bqViewer/res/keyboard_enter.png deleted file mode 100755 index acd7cae..0000000 Binary files a/bqViewer/res/keyboard_enter.png and /dev/null differ diff --git a/bqViewer/res/keyword_deleteone.png b/bqViewer/res/keyword_deleteone.png deleted file mode 100755 index 8ee933f..0000000 Binary files a/bqViewer/res/keyword_deleteone.png and /dev/null differ diff --git a/bqViewer/res/keyword_deleteone_goto.png b/bqViewer/res/keyword_deleteone_goto.png deleted file mode 100755 index 8ee933f..0000000 Binary files a/bqViewer/res/keyword_deleteone_goto.png and /dev/null differ diff --git a/bqViewer/res/keyword_deleteone_over.png b/bqViewer/res/keyword_deleteone_over.png deleted file mode 100755 index 40da2b9..0000000 Binary files a/bqViewer/res/keyword_deleteone_over.png and /dev/null differ diff --git a/bqViewer/res/keyword_next.png b/bqViewer/res/keyword_next.png deleted file mode 100755 index 5e208e7..0000000 Binary files a/bqViewer/res/keyword_next.png and /dev/null differ diff --git a/bqViewer/res/keyword_previous.png b/bqViewer/res/keyword_previous.png deleted file mode 100755 index 87c23ca..0000000 Binary files a/bqViewer/res/keyword_previous.png and /dev/null differ diff --git a/bqViewer/res/left.png b/bqViewer/res/left.png deleted file mode 100755 index 18bd7d1..0000000 Binary files a/bqViewer/res/left.png and /dev/null differ diff --git a/bqViewer/res/left_disabled.png b/bqViewer/res/left_disabled.png deleted file mode 100755 index 8025ff6..0000000 Binary files a/bqViewer/res/left_disabled.png and /dev/null differ diff --git a/bqViewer/res/library.png b/bqViewer/res/library.png deleted file mode 100755 index f668d3f..0000000 Binary files a/bqViewer/res/library.png and /dev/null differ diff --git a/bqViewer/res/library_ico.png b/bqViewer/res/library_ico.png deleted file mode 100755 index fceec59..0000000 Binary files a/bqViewer/res/library_ico.png and /dev/null differ diff --git a/bqViewer/res/library_main_menu.png b/bqViewer/res/library_main_menu.png deleted file mode 100755 index 1b21d10..0000000 Binary files a/bqViewer/res/library_main_menu.png and /dev/null differ diff --git a/bqViewer/res/library_menu.png b/bqViewer/res/library_menu.png deleted file mode 100755 index f668d3f..0000000 Binary files a/bqViewer/res/library_menu.png and /dev/null differ diff --git a/bqViewer/res/librodearena.png b/bqViewer/res/librodearena.png deleted file mode 100755 index 408b816..0000000 Binary files a/bqViewer/res/librodearena.png and /dev/null differ diff --git a/bqViewer/res/list_ico.png b/bqViewer/res/list_ico.png deleted file mode 100755 index 1a02c3c..0000000 Binary files a/bqViewer/res/list_ico.png and /dev/null differ diff --git a/bqViewer/res/literature.png b/bqViewer/res/literature.png deleted file mode 100755 index 6f0a56a..0000000 Binary files a/bqViewer/res/literature.png and /dev/null differ diff --git a/bqViewer/res/loading.png b/bqViewer/res/loading.png deleted file mode 100755 index a956ade..0000000 Binary files a/bqViewer/res/loading.png and /dev/null differ diff --git a/bqViewer/res/margin-medium-disabled.png b/bqViewer/res/margin-medium-disabled.png deleted file mode 100755 index b370958..0000000 Binary files a/bqViewer/res/margin-medium-disabled.png and /dev/null differ diff --git a/bqViewer/res/margin-medium.png b/bqViewer/res/margin-medium.png deleted file mode 100755 index 6877c3b..0000000 Binary files a/bqViewer/res/margin-medium.png and /dev/null differ diff --git a/bqViewer/res/margin-none-disabled.png b/bqViewer/res/margin-none-disabled.png deleted file mode 100755 index fb83891..0000000 Binary files a/bqViewer/res/margin-none-disabled.png and /dev/null differ diff --git a/bqViewer/res/margin-none.png b/bqViewer/res/margin-none.png deleted file mode 100755 index 7740e19..0000000 Binary files a/bqViewer/res/margin-none.png and /dev/null differ diff --git a/bqViewer/res/margin-top-disabled.png b/bqViewer/res/margin-top-disabled.png deleted file mode 100755 index 0d2d963..0000000 Binary files a/bqViewer/res/margin-top-disabled.png and /dev/null differ diff --git a/bqViewer/res/margin-top.png b/bqViewer/res/margin-top.png deleted file mode 100755 index d818a3a..0000000 Binary files a/bqViewer/res/margin-top.png and /dev/null differ diff --git a/bqViewer/res/medium_star.png b/bqViewer/res/medium_star.png deleted file mode 100755 index ada50fa..0000000 Binary files a/bqViewer/res/medium_star.png and /dev/null differ diff --git a/bqViewer/res/menu_arrow_bottom.png b/bqViewer/res/menu_arrow_bottom.png deleted file mode 100755 index 899fb76..0000000 Binary files a/bqViewer/res/menu_arrow_bottom.png and /dev/null differ diff --git a/bqViewer/res/menu_arrow_left.png b/bqViewer/res/menu_arrow_left.png deleted file mode 100755 index 37cf32b..0000000 Binary files a/bqViewer/res/menu_arrow_left.png and /dev/null differ diff --git a/bqViewer/res/menu_arrow_right.png b/bqViewer/res/menu_arrow_right.png deleted file mode 100755 index fc0e4bd..0000000 Binary files a/bqViewer/res/menu_arrow_right.png and /dev/null differ diff --git a/bqViewer/res/menu_arrow_top.png b/bqViewer/res/menu_arrow_top.png deleted file mode 100755 index daeff91..0000000 Binary files a/bqViewer/res/menu_arrow_top.png and /dev/null differ diff --git a/bqViewer/res/more_menu.png b/bqViewer/res/more_menu.png deleted file mode 100755 index 3e431e5..0000000 Binary files a/bqViewer/res/more_menu.png and /dev/null differ diff --git a/bqViewer/res/more_menu_over.png b/bqViewer/res/more_menu_over.png deleted file mode 100755 index 6ddc37a..0000000 Binary files a/bqViewer/res/more_menu_over.png and /dev/null differ diff --git a/bqViewer/res/music_main_menu.png b/bqViewer/res/music_main_menu.png deleted file mode 100755 index dd43a1c..0000000 Binary files a/bqViewer/res/music_main_menu.png and /dev/null differ diff --git a/bqViewer/res/mynotes_menu.png b/bqViewer/res/mynotes_menu.png deleted file mode 100755 index 9c0c223..0000000 Binary files a/bqViewer/res/mynotes_menu.png and /dev/null differ diff --git a/bqViewer/res/mynotes_menu_over.png b/bqViewer/res/mynotes_menu_over.png deleted file mode 100755 index 789ae66..0000000 Binary files a/bqViewer/res/mynotes_menu_over.png and /dev/null differ diff --git a/bqViewer/res/new-mark.png b/bqViewer/res/new-mark.png deleted file mode 100755 index 0e0f639..0000000 Binary files a/bqViewer/res/new-mark.png and /dev/null differ diff --git a/bqViewer/res/next_arrow.png b/bqViewer/res/next_arrow.png deleted file mode 100755 index a72546a..0000000 Binary files a/bqViewer/res/next_arrow.png and /dev/null differ diff --git a/bqViewer/res/no-downloaded.png b/bqViewer/res/no-downloaded.png deleted file mode 100755 index 841805e..0000000 Binary files a/bqViewer/res/no-downloaded.png and /dev/null differ diff --git a/bqViewer/res/noReflow.png b/bqViewer/res/noReflow.png deleted file mode 100755 index a1ab4d2..0000000 Binary files a/bqViewer/res/noReflow.png and /dev/null differ diff --git a/bqViewer/res/noReflow_over.png b/bqViewer/res/noReflow_over.png deleted file mode 100755 index 4ff2c1b..0000000 Binary files a/bqViewer/res/noReflow_over.png and /dev/null differ diff --git a/bqViewer/res/no_photo.png b/bqViewer/res/no_photo.png deleted file mode 100755 index da52bea..0000000 Binary files a/bqViewer/res/no_photo.png and /dev/null differ diff --git a/bqViewer/res/no_reflow_menu.png b/bqViewer/res/no_reflow_menu.png deleted file mode 100755 index 23e8f5d..0000000 Binary files a/bqViewer/res/no_reflow_menu.png and /dev/null differ diff --git a/bqViewer/res/no_reflow_menu_pressed.png b/bqViewer/res/no_reflow_menu_pressed.png deleted file mode 100755 index 17f29e0..0000000 Binary files a/bqViewer/res/no_reflow_menu_pressed.png and /dev/null differ diff --git a/bqViewer/res/note.png b/bqViewer/res/note.png deleted file mode 100755 index 2f169c4..0000000 Binary files a/bqViewer/res/note.png and /dev/null differ diff --git a/bqViewer/res/note_ico.png b/bqViewer/res/note_ico.png deleted file mode 100755 index df9069a..0000000 Binary files a/bqViewer/res/note_ico.png and /dev/null differ diff --git a/bqViewer/res/note_mynote.png b/bqViewer/res/note_mynote.png deleted file mode 100755 index c6facdc..0000000 Binary files a/bqViewer/res/note_mynote.png and /dev/null differ diff --git a/bqViewer/res/person.png b/bqViewer/res/person.png deleted file mode 100755 index 256eb8f..0000000 Binary files a/bqViewer/res/person.png and /dev/null differ diff --git a/bqViewer/res/photo_small.png b/bqViewer/res/photo_small.png deleted file mode 100755 index a11db41..0000000 Binary files a/bqViewer/res/photo_small.png and /dev/null differ diff --git a/bqViewer/res/previous_arrow.png b/bqViewer/res/previous_arrow.png deleted file mode 100755 index 1fe61e0..0000000 Binary files a/bqViewer/res/previous_arrow.png and /dev/null differ diff --git a/bqViewer/res/read.jpg b/bqViewer/res/read.jpg deleted file mode 100755 index 07eeae6..0000000 Binary files a/bqViewer/res/read.jpg and /dev/null differ diff --git a/bqViewer/res/read.png b/bqViewer/res/read.png deleted file mode 100755 index 70e0f19..0000000 Binary files a/bqViewer/res/read.png and /dev/null differ diff --git a/bqViewer/res/read_over.png b/bqViewer/res/read_over.png deleted file mode 100755 index 9c31dac..0000000 Binary files a/bqViewer/res/read_over.png and /dev/null differ diff --git a/bqViewer/res/reading-mark.png b/bqViewer/res/reading-mark.png deleted file mode 100755 index 8dfe294..0000000 Binary files a/bqViewer/res/reading-mark.png and /dev/null differ diff --git a/bqViewer/res/reflow.png b/bqViewer/res/reflow.png deleted file mode 100755 index 00f7ce2..0000000 Binary files a/bqViewer/res/reflow.png and /dev/null differ diff --git a/bqViewer/res/reflow_menu.png b/bqViewer/res/reflow_menu.png deleted file mode 100755 index 70d48e0..0000000 Binary files a/bqViewer/res/reflow_menu.png and /dev/null differ diff --git a/bqViewer/res/reflow_menu_pressed.png b/bqViewer/res/reflow_menu_pressed.png deleted file mode 100755 index ca551b5..0000000 Binary files a/bqViewer/res/reflow_menu_pressed.png and /dev/null differ diff --git a/bqViewer/res/reflow_over.png b/bqViewer/res/reflow_over.png deleted file mode 100755 index eaeebdd..0000000 Binary files a/bqViewer/res/reflow_over.png and /dev/null differ diff --git a/bqViewer/res/reload_ico.png b/bqViewer/res/reload_ico.png deleted file mode 100755 index 4af5925..0000000 Binary files a/bqViewer/res/reload_ico.png and /dev/null differ diff --git a/bqViewer/res/right.png b/bqViewer/res/right.png deleted file mode 100755 index c33937c..0000000 Binary files a/bqViewer/res/right.png and /dev/null differ diff --git a/bqViewer/res/rotate_menu.png b/bqViewer/res/rotate_menu.png deleted file mode 100755 index 842de92..0000000 Binary files a/bqViewer/res/rotate_menu.png and /dev/null differ diff --git a/bqViewer/res/search-left-cont-hover.jpg b/bqViewer/res/search-left-cont-hover.jpg deleted file mode 100755 index 85335bc..0000000 Binary files a/bqViewer/res/search-left-cont-hover.jpg and /dev/null differ diff --git a/bqViewer/res/search-left-cont.jpg b/bqViewer/res/search-left-cont.jpg deleted file mode 100755 index d65d7a4..0000000 Binary files a/bqViewer/res/search-left-cont.jpg and /dev/null differ diff --git a/bqViewer/res/search-right-cont-hover.jpg b/bqViewer/res/search-right-cont-hover.jpg deleted file mode 100755 index 06eef41..0000000 Binary files a/bqViewer/res/search-right-cont-hover.jpg and /dev/null differ diff --git a/bqViewer/res/search-right-cont.jpg b/bqViewer/res/search-right-cont.jpg deleted file mode 100755 index 1b8d391..0000000 Binary files a/bqViewer/res/search-right-cont.jpg and /dev/null differ diff --git a/bqViewer/res/search.png b/bqViewer/res/search.png deleted file mode 100755 index 0786abd..0000000 Binary files a/bqViewer/res/search.png and /dev/null differ diff --git a/bqViewer/res/search_grey.png b/bqViewer/res/search_grey.png deleted file mode 100755 index 69ab276..0000000 Binary files a/bqViewer/res/search_grey.png and /dev/null differ diff --git a/bqViewer/res/search_menu.png b/bqViewer/res/search_menu.png deleted file mode 100755 index e8be486..0000000 Binary files a/bqViewer/res/search_menu.png and /dev/null differ diff --git a/bqViewer/res/search_menu_over.png b/bqViewer/res/search_menu_over.png deleted file mode 100755 index b57e6ac..0000000 Binary files a/bqViewer/res/search_menu_over.png and /dev/null differ diff --git a/bqViewer/res/setting_menu.png b/bqViewer/res/setting_menu.png deleted file mode 100755 index 238f7ba..0000000 Binary files a/bqViewer/res/setting_menu.png and /dev/null differ diff --git a/bqViewer/res/settings_main_menu.png b/bqViewer/res/settings_main_menu.png deleted file mode 100755 index a320cdf..0000000 Binary files a/bqViewer/res/settings_main_menu.png and /dev/null differ diff --git a/bqViewer/res/settings_menu.png b/bqViewer/res/settings_menu.png deleted file mode 100755 index 223224b..0000000 Binary files a/bqViewer/res/settings_menu.png and /dev/null differ diff --git a/bqViewer/res/share_menu.png b/bqViewer/res/share_menu.png deleted file mode 100755 index 8536839..0000000 Binary files a/bqViewer/res/share_menu.png and /dev/null differ diff --git a/bqViewer/res/share_menu_over.png b/bqViewer/res/share_menu_over.png deleted file mode 100755 index a2045ca..0000000 Binary files a/bqViewer/res/share_menu_over.png and /dev/null differ diff --git a/bqViewer/res/shift.png b/bqViewer/res/shift.png deleted file mode 100755 index 248a0c4..0000000 Binary files a/bqViewer/res/shift.png and /dev/null differ diff --git a/bqViewer/res/shop_ico.png b/bqViewer/res/shop_ico.png deleted file mode 100755 index 2f40ce6..0000000 Binary files a/bqViewer/res/shop_ico.png and /dev/null differ diff --git a/bqViewer/res/shop_main_menu.png b/bqViewer/res/shop_main_menu.png deleted file mode 100755 index f7690d6..0000000 Binary files a/bqViewer/res/shop_main_menu.png and /dev/null differ diff --git a/bqViewer/res/short_ico.png b/bqViewer/res/short_ico.png deleted file mode 100755 index f507119..0000000 Binary files a/bqViewer/res/short_ico.png and /dev/null differ diff --git a/bqViewer/res/small_star_black.png b/bqViewer/res/small_star_black.png deleted file mode 100755 index 81a5ccd..0000000 Binary files a/bqViewer/res/small_star_black.png and /dev/null differ diff --git a/bqViewer/res/social.png b/bqViewer/res/social.png deleted file mode 100755 index 5c24d52..0000000 Binary files a/bqViewer/res/social.png and /dev/null differ diff --git a/bqViewer/res/social_menu.png b/bqViewer/res/social_menu.png deleted file mode 100755 index 5c24d52..0000000 Binary files a/bqViewer/res/social_menu.png and /dev/null differ diff --git a/bqViewer/res/spacing-medium-disabled.png b/bqViewer/res/spacing-medium-disabled.png deleted file mode 100755 index 1e7954b..0000000 Binary files a/bqViewer/res/spacing-medium-disabled.png and /dev/null differ diff --git a/bqViewer/res/spacing-medium.png b/bqViewer/res/spacing-medium.png deleted file mode 100755 index 3c442a1..0000000 Binary files a/bqViewer/res/spacing-medium.png and /dev/null differ diff --git a/bqViewer/res/spacing-none-disabled.png b/bqViewer/res/spacing-none-disabled.png deleted file mode 100755 index 3ff24e4..0000000 Binary files a/bqViewer/res/spacing-none-disabled.png and /dev/null differ diff --git a/bqViewer/res/spacing-none.png b/bqViewer/res/spacing-none.png deleted file mode 100755 index 603720d..0000000 Binary files a/bqViewer/res/spacing-none.png and /dev/null differ diff --git a/bqViewer/res/spacing-top-disabled.png b/bqViewer/res/spacing-top-disabled.png deleted file mode 100755 index 65d5ec1..0000000 Binary files a/bqViewer/res/spacing-top-disabled.png and /dev/null differ diff --git a/bqViewer/res/spacing-top.png b/bqViewer/res/spacing-top.png deleted file mode 100755 index 9d72488..0000000 Binary files a/bqViewer/res/spacing-top.png and /dev/null differ diff --git a/bqViewer/res/star.png b/bqViewer/res/star.png deleted file mode 100755 index b7e885f..0000000 Binary files a/bqViewer/res/star.png and /dev/null differ diff --git a/bqViewer/res/star_black.png b/bqViewer/res/star_black.png deleted file mode 100755 index 06aa33f..0000000 Binary files a/bqViewer/res/star_black.png and /dev/null differ diff --git a/bqViewer/res/star_white.png b/bqViewer/res/star_white.png deleted file mode 100755 index 75167f5..0000000 Binary files a/bqViewer/res/star_white.png and /dev/null differ diff --git a/bqViewer/res/start_black .png b/bqViewer/res/start_black .png deleted file mode 100755 index 06aa33f..0000000 Binary files a/bqViewer/res/start_black .png and /dev/null differ diff --git a/bqViewer/res/system.png b/bqViewer/res/system.png deleted file mode 100755 index 30a17dd..0000000 Binary files a/bqViewer/res/system.png and /dev/null differ diff --git a/bqViewer/res/twitter.png b/bqViewer/res/twitter.png deleted file mode 100755 index 6115321..0000000 Binary files a/bqViewer/res/twitter.png and /dev/null differ diff --git a/bqViewer/res/unchecked.png b/bqViewer/res/unchecked.png deleted file mode 100755 index 9b8e43e..0000000 Binary files a/bqViewer/res/unchecked.png and /dev/null differ diff --git a/bqViewer/res/up-down.png b/bqViewer/res/up-down.png deleted file mode 100755 index f507119..0000000 Binary files a/bqViewer/res/up-down.png and /dev/null differ diff --git a/bqViewer/res/up.png b/bqViewer/res/up.png deleted file mode 100755 index 7d61ff1..0000000 Binary files a/bqViewer/res/up.png and /dev/null differ diff --git a/bqViewer/res/up_disabled.png b/bqViewer/res/up_disabled.png deleted file mode 100755 index 1c00206..0000000 Binary files a/bqViewer/res/up_disabled.png and /dev/null differ diff --git a/bqViewer/res/up_over.png b/bqViewer/res/up_over.png deleted file mode 100755 index dc33789..0000000 Binary files a/bqViewer/res/up_over.png and /dev/null differ diff --git a/bqViewer/res/wifi-1.png b/bqViewer/res/wifi-1.png deleted file mode 100755 index 7a4b85c..0000000 Binary files a/bqViewer/res/wifi-1.png and /dev/null differ diff --git a/bqViewer/res/wifi-2.png b/bqViewer/res/wifi-2.png deleted file mode 100755 index 5689625..0000000 Binary files a/bqViewer/res/wifi-2.png and /dev/null differ diff --git a/bqViewer/res/wifi-3.png b/bqViewer/res/wifi-3.png deleted file mode 100755 index a7f38ce..0000000 Binary files a/bqViewer/res/wifi-3.png and /dev/null differ diff --git a/bqViewer/res/wifi-full.png b/bqViewer/res/wifi-full.png deleted file mode 100755 index 8b7602e..0000000 Binary files a/bqViewer/res/wifi-full.png and /dev/null differ diff --git a/bqViewer/src/Dictionary.cpp b/bqViewer/src/Dictionary.cpp index 041add4..bb746d7 100644 --- a/bqViewer/src/Dictionary.cpp +++ b/bqViewer/src/Dictionary.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 @@ -18,378 +18,392 @@ along with the source code. If not, see . *************************************************************************/ -#include "Dictionary.h" - -#include "QBookApp.h" -#include "QBook.h" -#include "Storage.h" -#include "semantix_dixio.h" -#include "json.h" -#include "Storage.h" -#include "bqDeviceServices.h" - -#include -#include -#include -#include -#include -#include -#include - -#define SEMANTIX_LIB_PATH "/usr/lib/libsemantix_dixio.so" -#define EMPTY_DICTIO_RESULT 1234 // TODO: requested new version to Semantix to avoid this check. This is the size of an "empty" html return - -// Singleton instance -Dictionary* Dictionary::m_spInstance = NULL; - -void Dictionary::staticInit() -{ - if(!m_spInstance) - m_spInstance = new Dictionary(); -} - -void Dictionary::staticDone() -{ - if(m_spInstance) - { - delete m_spInstance; - m_spInstance = NULL; - } -} - -void Dictionary::loadSemantixLib( const QString& sofile ) -{ - qDebug() << Q_FUNC_INFO; - char *error; - - handle = dlopen(sofile.toUtf8().constData(), RTLD_NOW); - if (!handle) { - qDebug() << "QBookDic::loadSemantixLib: cannot open semantix library: " << dlerror(); - return; - } - - dlerror(); - - *(void **) (&initialize) = dlsym(handle, "_ZN8Semantix10initializeESsSs"); - if ((error = dlerror()) != NULL) { - qDebug() << "Cannot load Semantix::initialize: " << error; - return; - } - - *(void **) (&getDictionaries) = dlsym(handle, "_ZN8Semantix15getDictionariesEv"); - if ((error = dlerror()) != NULL) { - qDebug() << "Cannot load Semantix::getDictionaries: " << error; - return; - } - - *(void **) (&finalize) = dlsym(handle, "_ZN8Semantix8finalizeEv"); - if ((error = dlerror()) != NULL) { - qDebug() << "Cannot load Semantix::finalize: " << error; - return; - } - - *(void **) (&getVersion) = dlsym(handle, "_ZN8Semantix10getVersionEv"); - if ((error = dlerror()) != NULL) { - qDebug() << "Cannot load Semantix::getVersion: " << error; - return; - } - - *(void **) (&getWorkingDictionariesEx) = dlsym(handle, "_ZN8Semantix24getWorkingDictionariesExEv"); - if ((error = dlerror()) != NULL) { - qDebug() << "Cannot load Semantix::getWorkingDictionaries: " << error; - return; - } - - *(void **) (&getActivationData) = dlsym(handle, "_ZN8Semantix17getActivationDataESsSsRSsS0_"); - if ((error = dlerror()) != NULL) { - qDebug() << "Cannot load Semantix::getActivationData: " << error; - return; - } - - *(void **) (&setActivationData) = dlsym(handle, "_ZN8Semantix17setActivationDataESsSs"); - if ((error = dlerror()) != NULL) { - qDebug() << "Cannot load Semantix::setActivationData: " << error; - return; - } - -// Dixio lib for x86 does not contains Semantix::searchHtml, so we finish here - #ifndef Q_WS_QWS - qDebug() << "QBookDic::loadSemantixLib: symbols loaded correctly"; - initialized = true; - return; - #endif - - - *(void **) (&searchHtml) = dlsym(handle, "_ZN8Semantix10searchHtmlESsSsSsiSsii"); - if ((error = dlerror()) != NULL) { - qDebug() << "Cannot load Semantix::searchHtml: " << error; - return; - } - - qDebug() << "QBookDic::loadSemantixLib: symbols loaded correctly"; - initialized = true; -} - -Dictionary::Dictionary() { - - loadSemantixLib(SEMANTIX_LIB_PATH); - - if (!initialized) - return; - QString dictPath = Storage::getInstance()->getDataPartition()->getMountPoint() + QDir::separator() + "dictionaries" + QDir::separator(); - - QDir dirPrivateDictionaries(Storage::getInstance()->getPrivatePartition()->getMountPoint() + QDir::separator()); - if(!dirPrivateDictionaries.exists( "dictionaries/")) - dirPrivateDictionaries.mkdir( "dictionaries"); - - QString dictPrivatePath = dirPrivateDictionaries.absolutePath() + QDir::separator() + "dictionaries" + QDir::separator(); - QString repositories = dictPath + QString(":") + dictPrivatePath; - qDebug() << Q_FUNC_INFO << "repositories " << repositories; - initialize(dictPath.toUtf8().constData(),repositories.toUtf8().constData()); - qDebug() << Q_FUNC_INFO << "Dictionaires lib initialized. Version: " << QString::fromUtf8(getVersion().c_str()); -} - -Dictionary::~Dictionary() -{ - qDebug() << Q_FUNC_INFO; - if (!initialized) - return; - finalize(); - dlclose(handle); -} - -QString Dictionary::translate(const QString& original, const QString& context) -{ - - if (!initialized) - return tr("Couldn't find any result for the given word"); - #ifndef Q_WS_QWS - return tr("x86 dixio lib cannot translate words"); - #endif - - if(m_dixioKey.isEmpty()) - m_dixioKey = Dictionary::instance()->getDixioKey(); - - string key = m_dixioKey.toUtf8().constData();; - string dictCode = getDictCode(); - - string originalWord = original.toUtf8().constData(); - string contextStr = context.toUtf8().constData(); - - qDebug() << Q_FUNC_INFO << "key: " << key.c_str() << ", dictCode: " << dictCode.c_str() << ", originalWord: " << originalWord.c_str() << ", contextStr: " << contextStr.c_str(); - - #ifdef Q_WS_QWS - string translatedWord = searchHtml(key, originalWord, contextStr, 3,dictCode,1,1); - #else - string translatedWord = QString("").toUtf8().constData(); - #endif - - qDebug() << Q_FUNC_INFO << "Translated word:" << QString::fromUtf8(translatedWord.c_str()) << " size:" <isActivated() && !QBookApp::instance()->isLinked()){ - return "
" - "

" - + tr("Please, remember to activate the device to use") - + "

"; - } - - // TODO: requested new version to Semantix that returns empty string to avoid this check - if(translatedWord.empty() || translatedWord.size() <= EMPTY_DICTIO_RESULT ) - return "" - "
" - "

" - + tr("%1").arg(original) - + "

" - + "

" - + tr("Couldn't find any result for the given word") - + "

"; - else - return QString::fromUtf8(translatedWord.c_str()); -} - -string -Dictionary::getDictCode() const -{ - QString dictSettingsCode = QBook::settings().value("setting/dictionary", "").toString(); - - if(dictSettingsCode.isEmpty() || dictSettingsCode == "0") - return ""; - - return dictSettingsCode.toStdString(); -} - -QString Dictionary::getCurrentDictCode() const -{ - QString dictSettingsCode = QBook::settings().value("setting/dictionary", "").toString(); - - if(dictSettingsCode.isEmpty() || dictSettingsCode == "0") - return ""; - - return dictSettingsCode; -} - -QByteArray Dictionary::getJsonDictionaries() const -{ - qDebug() << Q_FUNC_INFO; - - if (!initialized) - return tr("You need to link the device to see available dictionaries").toAscii(); - - //QByteArray dictsJson = "{\"dictionaries\":[{\"id\":\"000200\",\"commercialName\":\"Definiciones Inglés\",\"shortName\":\"wordne\"},{\"id\":\"000300\",\"commercialName\":\"Semantix Inglés-Español\",\"shortName\":\"semEnEs\"},{\"id\":\"000400\",\"commercialName\":\"Semantix Español-Inglés\",\"shortName\":\"semEsEn\"},{\"id\":\"001000\",\"commercialName\":\"Definiciones Español\",\"shortName\":\"clave\"},{\"id\":\"001300\",\"commercialName\":\"Semantix Inglés básico\",\"shortName\":\"simple\"}]}"; - //return dictsJson; - - return QString::fromStdString(getWorkingDictionariesEx()).toAscii(); -} - -QByteArray Dictionary::getJsonAvailableDicts() const -{ - qDebug() << Q_FUNC_INFO; - - if (!initialized) - return tr("You need to link the device to see available dictionaries").toAscii(); - - bqDeviceServices* services = QBookApp::instance()->getDeviceServices(); - QByteArray availableDictsJson = services->getDictionaries().toAscii(); - qDebug() << Q_FUNC_INFO << "availableDictsJson: " << availableDictsJson; - return availableDictsJson; -} - -QMap Dictionary::parseCurrentDictionaries( const QString& json ) -{ - qDebug() << Q_FUNC_INFO << json; - QMap dictionaryList; - - bool parseOk; - QVariantMap result = Json::parse(json, parseOk).toMap(); - - if(!parseOk) - return dictionaryList; - - QList dictionaries = result["dictionaries"].toList(); - - if(!dictionaries.size()) - return dictionaryList; - - QList::const_iterator it = dictionaries.constBegin(); - QList::const_iterator itEnd = dictionaries.constEnd(); - - //Automatic dictionary: - DictionaryParams automatic; - automatic.id = "0"; - automatic.commercialName = QString(tr("Automatic")); - automatic.activationState = true; - dictionaryList.insert(automatic.commercialName, automatic); - - for(; it != itEnd; ++it) - { - DictionaryParams dictionary; - dictionary.id = it->toMap()["id"].toString(); - dictionary.commercialName = rename(dictionary.id); - dictionary.shortName = it->toMap()["shortName"].toString(); - dictionary.downloadUrl = it->toMap()["url"].toString(); - dictionary.activationState = true; - - if(!dictionary.commercialName.isEmpty()) //Not included simple english words dictionary. - dictionaryList.insert(dictionary.commercialName, dictionary); - } - - qDebug() << Q_FUNC_INFO << "size: " << dictionaryList.size(); - return dictionaryList; -} - -QMap Dictionary::parseAvailableDictionaries(const QString& json, QString& dixioToken) -{ - qDebug() << Q_FUNC_INFO << json; - QMap dictionaryList; - - bool parseOk; - QVariantMap result = Json::parse(json, parseOk).toMap(); - - if(!parseOk) - return dictionaryList; - - dixioToken = result["tokenDixio"].toString(); - QVariantMap dictionaries = result["dictionaries"].toMap(); - if(!dictionaries.size()) - return dictionaryList; - - QMap::iterator i; - - for (i = dictionaries.begin(); i != dictionaries.end(); ++i) - { - QVariantMap dictionaryMap = i.value().toMap(); - DictionaryParams dictionary; - dictionary.id = dictionaryMap["id"].toString(); - dictionary.commercialName = dictionaryMap["commercialName"].toString(); - dictionary.shortName = dictionaryMap["shortName"].toString(); - dictionary.downloadUrl = dictionaryMap["url"].toString(); - dictionary.dixFileSize = dictionaryMap["url_size"].toInt(); - dictionary.downloadUrlComp = dictionaryMap["url_comp"].toString(); - dictionary.compFileSize = dictionaryMap["url_comp_size"].toInt(); - dictionary.downloadFileName = dictionaryMap["downloadFileName"].toString(); - dictionary.downloadFileNameComp = dictionaryMap["downloadFileName_comp"].toString(); - dictionary.activationState = true; - dictionaryList.insert(dictionary.commercialName, dictionary); - } - - return dictionaryList; -} - -bool Dictionary::getActivation(QString dixioKey, QString& _callUrl, QString& _postParameters) -{ - qDebug() << Q_FUNC_INFO << "dixioKey: " << dixioKey; - String key = dixioKey.toStdString(); - String callUrl = _callUrl.toStdString(); - String postParameters = _postParameters.toStdString(); - - getActivationData(key, "", callUrl, postParameters); - _postParameters = QString::fromStdString(postParameters); - _callUrl = QString::fromStdString(callUrl); - - return _callUrl.size() && _postParameters.size(); -} - -String Dictionary::setActivation(QString key, QString activationResponse) -{ - return setActivationData(key.toStdString(), activationResponse.toStdString()); -} - -QString Dictionary::getDixioKey() -{ - QString path = Storage::getInstance()->getDataPartition()->getMountPoint() + QDir::separator() + "dixioKey"; - QString dixioKey = ""; - QFile file(path); - - if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { - qDebug() << Q_FUNC_INFO << "Cannot open dixioKey file"; - }else{ - QTextStream in(&file); - dixioKey = in.readAll(); - file.close(); - } - - return dixioKey; -} - -QString Dictionary::rename( QString& codigo ) -{ - qDebug() << Q_FUNC_INFO << "codigo:" << codigo; - - if(codigo == "000200" || codigo == "138") - return QString("English definitions"); - else if(codigo == "001000" || codigo == "354") - return QString("Definiciones Espa%1ol").arg(QChar(241)); - else if(codigo == "000300" || codigo == "111") - return QString("Semantix Ingl%1s - Espa%2ol").arg(QChar(233)).arg(QChar(241)); - else if(codigo == "000400" || codigo == "112") - return QString("Spanish - English by Semantix"); - else if(codigo == "224") - return QString("Definicions Catal%1").arg(QChar(225)); - else return ""; -} - -void Dictionary::renewDixioKey() -{ - qDebug() << Q_FUNC_INFO; - m_dixioKey.clear(); -} +#include "Dictionary.h" + +#include "QBookApp.h" +#include "QBook.h" +#include "Storage.h" +#include "semantix_dixio.h" +#include "json.h" +#include "Storage.h" +#include "bqDeviceServices.h" + +#include +#include +#include +#include +#include +#include +#include + +#define SEMANTIX_LIB_PATH "/usr/lib/libsemantix_dixio.so" +#define EMPTY_DICTIO_RESULT 1234 // TODO: requested new version to Semantix to avoid this check. This is the size of an "empty" html return + +// Singleton instance +Dictionary* Dictionary::m_spInstance = NULL; + +void Dictionary::staticInit() +{ + if(!m_spInstance) + m_spInstance = new Dictionary(); +} + +void Dictionary::staticDone() +{ + if(m_spInstance) + { + delete m_spInstance; + m_spInstance = NULL; + } +} + +void Dictionary::loadSemantixLib( const QString& sofile ) +{ + qDebug() << Q_FUNC_INFO; + char *error; + + handle = dlopen(sofile.toUtf8().constData(), RTLD_NOW); + if (!handle) { + qDebug() << "QBookDic::loadSemantixLib: cannot open semantix library: " << dlerror(); + return; + } + + dlerror(); + + *(void **) (&initialize) = dlsym(handle, "_ZN8Semantix10initializeESsSs"); + if ((error = dlerror()) != NULL) { + qDebug() << "Cannot load Semantix::initialize: " << error; + return; + } + + *(void **) (&getDictionaries) = dlsym(handle, "_ZN8Semantix15getDictionariesEv"); + if ((error = dlerror()) != NULL) { + qDebug() << "Cannot load Semantix::getDictionaries: " << error; + return; + } + + *(void **) (&finalize) = dlsym(handle, "_ZN8Semantix8finalizeEv"); + if ((error = dlerror()) != NULL) { + qDebug() << "Cannot load Semantix::finalize: " << error; + return; + } + + *(void **) (&getVersion) = dlsym(handle, "_ZN8Semantix10getVersionEv"); + if ((error = dlerror()) != NULL) { + qDebug() << "Cannot load Semantix::getVersion: " << error; + return; + } + + *(void **) (&getWorkingDictionariesEx) = dlsym(handle, "_ZN8Semantix24getWorkingDictionariesExEv"); + if ((error = dlerror()) != NULL) { + qDebug() << "Cannot load Semantix::getWorkingDictionaries: " << error; + return; + } + + *(void **) (&getActivationData) = dlsym(handle, "_ZN8Semantix17getActivationDataESsSsRSsS0_"); + if ((error = dlerror()) != NULL) { + qDebug() << "Cannot load Semantix::getActivationData: " << error; + return; + } + + *(void **) (&setActivationData) = dlsym(handle, "_ZN8Semantix17setActivationDataESsSs"); + if ((error = dlerror()) != NULL) { + qDebug() << "Cannot load Semantix::setActivationData: " << error; + return; + } + +// Dixio lib for x86 does not contains Semantix::searchHtml, so we finish here + #ifndef Q_WS_QWS + qDebug() << "QBookDic::loadSemantixLib: symbols loaded correctly"; + initialized = true; + return; + #endif + + + *(void **) (&searchHtml) = dlsym(handle, "_ZN8Semantix10searchHtmlESsSsSsiSsii"); + if ((error = dlerror()) != NULL) { + qDebug() << "Cannot load Semantix::searchHtml: " << error; + return; + } + + qDebug() << "QBookDic::loadSemantixLib: symbols loaded correctly"; + initialized = true; +} + +Dictionary::Dictionary() { + + loadSemantixLib(SEMANTIX_LIB_PATH); + + if (!initialized) + return; + QString dictPath = Storage::getInstance()->getDataPartition()->getMountPoint() + QDir::separator() + "dictionaries" + QDir::separator(); + + QDir dirPrivateDictionaries(Storage::getInstance()->getPrivatePartition()->getMountPoint() + QDir::separator()); + if(!dirPrivateDictionaries.exists( "dictionaries/")) + dirPrivateDictionaries.mkdir( "dictionaries"); + + QString dictPrivatePath = dirPrivateDictionaries.absolutePath() + QDir::separator() + "dictionaries" + QDir::separator(); + QString repositories = dictPath + QString(":") + dictPrivatePath; + qDebug() << Q_FUNC_INFO << "repositories " << repositories; + initialize(dictPath.toUtf8().constData(),repositories.toUtf8().constData()); + qDebug() << Q_FUNC_INFO << "Dictionaires lib initialized. Version: " << QString::fromUtf8(getVersion().c_str()); +} + +Dictionary::~Dictionary() +{ + qDebug() << Q_FUNC_INFO; + if (!initialized) + return; + finalize(); + dlclose(handle); +} + +QString Dictionary::translate(const QString& original, const QString& context) +{ + + if (!initialized) + return tr("Couldn't find any result for the given word"); + #ifndef Q_WS_QWS + return tr("x86 dixio lib cannot translate words"); + #endif + + if(m_dixioKey.isEmpty()) + m_dixioKey = Dictionary::instance()->getDixioKey(); + + string key = m_dixioKey.toUtf8().constData();; + string dictCode = getDictCode(); + + string originalWord = original.toUtf8().constData(); + string contextStr = context.toUtf8().constData(); + + qDebug() << Q_FUNC_INFO << "key: " << key.c_str() << ", dictCode: " << dictCode.c_str() << ", originalWord: " << originalWord.c_str() << ", contextStr: " << contextStr.c_str(); + + #ifdef Q_WS_QWS + string translatedWord = searchHtml(key, originalWord, contextStr, 3,dictCode,1,1); + #else + string translatedWord = QString("").toUtf8().constData(); + #endif + + qDebug() << Q_FUNC_INFO << "Translated word:" << QString::fromUtf8(translatedWord.c_str()) << " size:" <getResolution()) + { + case QBook::RES1072x1448: + fontSize = "8pt"; + break; + case QBook::RES758x1024: + fontSize = "24pt"; + break; + case QBook::RES600x800: default: + fontSize = "24pt"; + break; + } + + if(!QBookApp::instance()->isActivated() && !QBookApp::instance()->isLinked()){ + return "
" + "

" + + tr("Please, remember to activate the device to use") + + "

"; + } + + // TODO: requested new version to Semantix that returns empty string to avoid this check + if(translatedWord.empty() || translatedWord.size() <= EMPTY_DICTIO_RESULT ) + return "" + "
" + "

" + + tr("%1").arg(original) + + "

" + + "

" + + tr("Couldn't find any result for the given word") + + "

"; + else + return QString::fromUtf8(translatedWord.c_str()); +} + +string +Dictionary::getDictCode() const +{ + QString dictSettingsCode = QBook::settings().value("setting/dictionary", "").toString(); + + if(dictSettingsCode.isEmpty() || dictSettingsCode == "0") + return ""; + + return dictSettingsCode.toStdString(); +} + +QString Dictionary::getCurrentDictCode() const +{ + QString dictSettingsCode = QBook::settings().value("setting/dictionary", "").toString(); + + if(dictSettingsCode.isEmpty() || dictSettingsCode == "0") + return ""; + + return dictSettingsCode; +} + +QByteArray Dictionary::getJsonDictionaries() const +{ + qDebug() << Q_FUNC_INFO; + + if (!initialized) + return tr("You need to link the device to see available dictionaries").toAscii(); + + //QByteArray dictsJson = "{\"dictionaries\":[{\"id\":\"000200\",\"commercialName\":\"Definiciones Inglés\",\"shortName\":\"wordne\"},{\"id\":\"000300\",\"commercialName\":\"Semantix Inglés-Español\",\"shortName\":\"semEnEs\"},{\"id\":\"000400\",\"commercialName\":\"Semantix Español-Inglés\",\"shortName\":\"semEsEn\"},{\"id\":\"001000\",\"commercialName\":\"Definiciones Español\",\"shortName\":\"clave\"},{\"id\":\"001300\",\"commercialName\":\"Semantix Inglés básico\",\"shortName\":\"simple\"}]}"; + //return dictsJson; + + return QString::fromStdString(getWorkingDictionariesEx()).toAscii(); +} + +QByteArray Dictionary::getJsonAvailableDicts() const +{ + qDebug() << Q_FUNC_INFO; + + if (!initialized) + return tr("You need to link the device to see available dictionaries").toAscii(); + + bqDeviceServices* services = QBookApp::instance()->getDeviceServices(); + QByteArray availableDictsJson = services->getDictionaries().toAscii(); + qDebug() << Q_FUNC_INFO << "availableDictsJson: " << availableDictsJson; + return availableDictsJson; +} + +QMap Dictionary::parseCurrentDictionaries( const QString& json ) +{ + qDebug() << Q_FUNC_INFO << json; + QMap dictionaryList; + + bool parseOk; + QVariantMap result = Json::parse(json, parseOk).toMap(); + + if(!parseOk) + return dictionaryList; + + QList dictionaries = result["dictionaries"].toList(); + + if(!dictionaries.size()) + return dictionaryList; + + QList::const_iterator it = dictionaries.constBegin(); + QList::const_iterator itEnd = dictionaries.constEnd(); + + //Automatic dictionary: + DictionaryParams automatic; + automatic.id = "0"; + automatic.commercialName = QString(tr("Automatic")); + automatic.activationState = true; + dictionaryList.insert(automatic.commercialName, automatic); + + for(; it != itEnd; ++it) + { + DictionaryParams dictionary; + dictionary.id = it->toMap()["id"].toString(); + dictionary.commercialName = rename(dictionary.id); + dictionary.shortName = it->toMap()["shortName"].toString(); + dictionary.downloadUrl = it->toMap()["url"].toString(); + dictionary.activationState = true; + + if(!dictionary.commercialName.isEmpty()) //Not included simple english words dictionary. + dictionaryList.insert(dictionary.commercialName, dictionary); + } + + qDebug() << Q_FUNC_INFO << "size: " << dictionaryList.size(); + return dictionaryList; +} + +QMap Dictionary::parseAvailableDictionaries(const QString& json, QString& dixioToken) +{ + qDebug() << Q_FUNC_INFO << json; + QMap dictionaryList; + + bool parseOk; + QVariantMap result = Json::parse(json, parseOk).toMap(); + + if(!parseOk) + return dictionaryList; + + dixioToken = result["tokenDixio"].toString(); + QVariantMap dictionaries = result["dictionaries"].toMap(); + if(!dictionaries.size()) + return dictionaryList; + + QMap::iterator i; + + for (i = dictionaries.begin(); i != dictionaries.end(); ++i) + { + QVariantMap dictionaryMap = i.value().toMap(); + DictionaryParams dictionary; + dictionary.id = dictionaryMap["id"].toString(); + dictionary.commercialName = dictionaryMap["commercialName"].toString(); + dictionary.shortName = dictionaryMap["shortName"].toString(); + dictionary.downloadUrl = dictionaryMap["url"].toString(); + dictionary.dixFileSize = dictionaryMap["url_size"].toInt(); + dictionary.downloadUrlComp = dictionaryMap["url_comp"].toString(); + dictionary.compFileSize = dictionaryMap["url_comp_size"].toInt(); + dictionary.downloadFileName = dictionaryMap["downloadFileName"].toString(); + dictionary.downloadFileNameComp = dictionaryMap["downloadFileName_comp"].toString(); + dictionary.activationState = true; + dictionaryList.insert(dictionary.commercialName, dictionary); + } + + return dictionaryList; +} + +bool Dictionary::getActivation(QString dixioKey, QString& _callUrl, QString& _postParameters) +{ + qDebug() << Q_FUNC_INFO << "dixioKey: " << dixioKey; + String key = dixioKey.toStdString(); + String callUrl = _callUrl.toStdString(); + String postParameters = _postParameters.toStdString(); + + getActivationData(key, "", callUrl, postParameters); + _postParameters = QString::fromStdString(postParameters); + _callUrl = QString::fromStdString(callUrl); + + return _callUrl.size() && _postParameters.size(); +} + +String Dictionary::setActivation(QString key, QString activationResponse) +{ + return setActivationData(key.toStdString(), activationResponse.toStdString()); +} + +QString Dictionary::getDixioKey() +{ + QString path = Storage::getInstance()->getDataPartition()->getMountPoint() + QDir::separator() + "dixioKey"; + QString dixioKey = ""; + QFile file(path); + + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { + qDebug() << Q_FUNC_INFO << "Cannot open dixioKey file"; + }else{ + QTextStream in(&file); + dixioKey = in.readAll(); + file.close(); + } + + return dixioKey; +} + +QString Dictionary::rename( QString& codigo ) +{ + qDebug() << Q_FUNC_INFO << "codigo:" << codigo; + + if(codigo == "000200" || codigo == "138") + return QString("English definitions"); + else if(codigo == "001000" || codigo == "354") + return QString("Definiciones Espa%1ol").arg(QChar(241)); + else if(codigo == "000300" || codigo == "111") + return QString("Semantix Ingl%1s - Espa%2ol").arg(QChar(233)).arg(QChar(241)); + else if(codigo == "000400" || codigo == "112") + return QString("Spanish - English by Semantix"); + else if(codigo == "224") + return QString("Definicions Catal%1").arg(QChar(225)); + else return ""; +} + +void Dictionary::renewDixioKey() +{ + qDebug() << Q_FUNC_INFO; + m_dixioKey.clear(); +} diff --git a/bqViewer/src/MiniatureView.cpp b/bqViewer/src/MiniatureView.cpp index 9688e48..a2bf436 100644 --- a/bqViewer/src/MiniatureView.cpp +++ b/bqViewer/src/MiniatureView.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 @@ -41,8 +41,12 @@ MiniatureView::MiniatureView(QWidget *parent) : setupUi(this); /// Values from viewer_styles.qss -> #miniatureTopSpacer - if (QBook::getResolution() == QBook::RES600x800) WIDGET_ASPECT_RATIO = 125.0 / 148.0; - else WIDGET_ASPECT_RATIO = 160.0 / 189.0; + if (QBook::getInstance()->getResolution() == QBook::RES1072x1448) + WIDGET_ASPECT_RATIO = 226.0 / 267.0; + else if (QBook::getInstance()->getResolution() == QBook::RES600x800) + WIDGET_ASPECT_RATIO = 125.0 / 148.0; + else + WIDGET_ASPECT_RATIO = 160.0 / 189.0; } MiniatureView::~MiniatureView() diff --git a/bqViewer/src/MiniatureViewLandscape.cpp b/bqViewer/src/MiniatureViewLandscape.cpp index 9129731..d273842 100644 --- a/bqViewer/src/MiniatureViewLandscape.cpp +++ b/bqViewer/src/MiniatureViewLandscape.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 @@ -40,7 +40,9 @@ MiniatureViewLandscape::MiniatureViewLandscape(QWidget *parent) : setupUi(this); /// Values from viewer_styles.qss -> #miniatureRightSpacer - if (QBook::getResolution() == QBook::RES600x800) WIDGET_ASPECT_RATIO = 148.0 / 125.0; + if (QBook::getInstance()->getResolution() == QBook::RES1072x1448) + WIDGET_ASPECT_RATIO = 226.0 / 267.0; + else if (QBook::getInstance()->getResolution() == QBook::RES600x800) WIDGET_ASPECT_RATIO = 148.0 / 125.0; else WIDGET_ASPECT_RATIO = 189.0 / 160.0; } diff --git a/bqViewer/src/Viewer.cpp b/bqViewer/src/Viewer.cpp index a4fc23d..d8780b0 100644 --- a/bqViewer/src/Viewer.cpp +++ b/bqViewer/src/Viewer.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 @@ -231,18 +231,20 @@ Viewer::Viewer(QWidget* parent) m_viewerStepsManager = new ViewerStepsManager(); - switch(QBook::getResolution()){ - case QBook::RES600x800: - i_minPxSwipeLenght = SWIPE_MIN_LENGTH; - i_scrollAreaWidth = SCROLL_AREA_WIDTH; - break; - case QBook::RES758x1024: - i_minPxSwipeLenght = SWIPE_MIN_LENGTH_HD; - i_scrollAreaWidth = SCROLL_AREA_WIDTH_HD; - break; - default: - i_minPxSwipeLenght = SWIPE_MIN_LENGTH; - i_scrollAreaWidth = SCROLL_AREA_WIDTH; + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + i_minPxSwipeLenght = SWIPE_MIN_LENGTH_FHD; + i_scrollAreaWidth = SCROLL_AREA_WIDTH_FHD; + break; + case QBook::RES758x1024: + i_minPxSwipeLenght = SWIPE_MIN_LENGTH_HD; + i_scrollAreaWidth = SCROLL_AREA_WIDTH_HD; + break; + case QBook::RES600x800: default: + i_minPxSwipeLenght = SWIPE_MIN_LENGTH; + i_scrollAreaWidth = SCROLL_AREA_WIDTH; + break; } bookmark->updateDisplay(false); @@ -879,6 +881,10 @@ void Viewer::loadDocument() qDebug() << Q_FUNC_INFO << "setUrl finished. time=" << time.elapsed(); time.restart(); + // Error checking from handleErrors + if(m_loadDocumentError != QDocView::EDVLE_NONE) + i_loadState = QDocView::LOAD_FAILED; + if(i_loadState == QDocView::LOAD_FAILED) { qDebug() << Q_FUNC_INFO << "Error settingUrl"; @@ -1938,7 +1944,9 @@ int Viewer::getFileExtension(const QString& path) else if (path.endsWith(".txt", Qt::CaseInsensitive)) return EXT_TXT; else if (path.endsWith(".rtf", Qt::CaseInsensitive)) return EXT_RTF; //else if (path.endsWith(".chm", Qt::CaseInsensitive)) return EXT_CHM; - //else if (path.endsWith(".html", Qt::CaseInsensitive)) return EXT_HTML; + else if (path.endsWith(".html", Qt::CaseInsensitive)) return EXT_HTML; + else if (path.endsWith(".htm", Qt::CaseInsensitive)) return EXT_HTML; + //else if (path.endsWith(".tcr", Qt::CaseInsensitive)) return EXT_TCR; //else if (path.endsWith(".pdb", Qt::CaseInsensitive)) return EXT_PDB; //else if (path.endsWith(".zip", Qt::CaseInsensitive)) return EXT_ZIP; @@ -1983,7 +1991,7 @@ Viewer::SupportedExt Viewer::isCR3SupportedFile(const QString& path) case EXT_TXT: case EXT_RTF: //case EXT_CHM: - //case EXT_HTML: + case EXT_HTML: //case EXT_TCR: //case EXT_PDB: //case EXT_ZIP: @@ -2011,7 +2019,7 @@ bool Viewer::isUsingCR3(SupportedExt extension) case EXT_TXT: case EXT_RTF: //case EXT_CHM: - //case EXT_HTML: + case EXT_HTML: //case EXT_TCR: //case EXT_PDB: //case EXT_ZIP: @@ -2658,10 +2666,20 @@ void Viewer::setMargin( int topPercentage, int rightPercentage, int bottomPercen double bm ; - if(QBook::getResolution() == QBook::RES758x1024)/* WorkAround to fix problem scaling images heighter than 1000px*/ - bm = (h * bottomPercentage) / 100.0; // -15; - else - bm = (h * bottomPercentage) / 100.0; + //TODO: check this piece of code + /* WorkAround to fix problem scaling images higher than 1000px*/ + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + bm = (h * bottomPercentage) / 100.0; // -15; + break; + case QBook::RES758x1024: + bm = (h * bottomPercentage) / 100.0; // -15; + break; + case QBook::RES600x800: default: + bm = (h * bottomPercentage) / 100.0; + break; + } double lm = (w * leftPercentage) / 100.0; diff --git a/bqViewer/src/ViewerAppearancePopup.cpp b/bqViewer/src/ViewerAppearancePopup.cpp index 264c4af..af8ade9 100644 --- a/bqViewer/src/ViewerAppearancePopup.cpp +++ b/bqViewer/src/ViewerAppearancePopup.cpp @@ -780,7 +780,7 @@ void ViewerAppearancePopup::setupUiButtons() sizeCont->setEnabled(true); fontTypeCont->setEnabled(true); marginCont->setEnabled(true); - spacingCont->setEnabled(true); + spacingCont->setEnabled(ext != Viewer::EXT_HTML); justifyCont->setEnabled(false); g_MarginButtons->setExclusive(true); diff --git a/bqViewer/src/ViewerBookSummary.cpp b/bqViewer/src/ViewerBookSummary.cpp index ad1072f..c8c3c50 100644 --- a/bqViewer/src/ViewerBookSummary.cpp +++ b/bqViewer/src/ViewerBookSummary.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 @@ -52,6 +52,8 @@ along with the source code. If not, see . #define USERGUIDEPATH "/app/share/userGuides/" +#define FONT_SIZE_FHD "font-size:34px;" +#define LITTLE_FONT_SIZE_FHD "font-size:31px;" #define FONT_SIZE_HD "font-size:24px;" #define LITTLE_FONT_SIZE_HD "font-size:22px;" #define FONT_SIZE_SD "font-size:18px;" @@ -165,7 +167,7 @@ void ViewerBookSummary::setBook(const BookInfo* book) bookTitleLbl->setText(bqUtils::truncateStringToLength(m_book->title, BOOKSUMMARY_TITLE_MAX_LENGTH_SAMPLE)); // Author - if(m_book->author == "--") + if(m_book->author == "---") bookAuthorLbl->setText(tr("Autor Desconocido")); else bookAuthorLbl->setText(bqUtils::truncateStringToLength(m_book->author, BOOKSUMMARY_AUTHOR_MAX_LENGTH)); @@ -610,31 +612,52 @@ void ViewerBookSummary::setCollectionLayerBtnText(QHash collect { QHash::iterator it = collectionList.begin(); QString collectionName = it.key(); - if(QBook::getInstance()->getResolution() == QBook::RES758x1024) + switch(QBook::getInstance()->getResolution()) { - if(collectionName.size() >= 22) - addToCollectionBtn->setStyleSheet(LITTLE_FONT_SIZE_HD); - else - addToCollectionBtn->setStyleSheet(FONT_SIZE_HD); - } - else - { - if(collectionName.size() >= 22) - addToCollectionBtn->setStyleSheet(LITTLE_FONT_SIZE_SD); - else - addToCollectionBtn->setStyleSheet(FONT_SIZE_SD); + case QBook::RES1072x1448: + if(collectionName.size() >= 10) + addToCollectionBtn->setStyleSheet(LITTLE_FONT_SIZE_FHD); + else + addToCollectionBtn->setStyleSheet(FONT_SIZE_FHD); + break; + case QBook::RES758x1024: + if(collectionName.size() >= 22) + addToCollectionBtn->setStyleSheet(LITTLE_FONT_SIZE_HD); + else + addToCollectionBtn->setStyleSheet(FONT_SIZE_HD); + break; + case QBook::RES600x800: default: + if(collectionName.size() >= 22) + addToCollectionBtn->setStyleSheet(LITTLE_FONT_SIZE_SD); + else + addToCollectionBtn->setStyleSheet(FONT_SIZE_SD); + break; } addToCollectionBtn->setText(bqUtils::truncateStringToLength(tr("%1").arg(collectionName), COLLECTION_MAX_LENGTH)); } else { - if(QBook::getInstance()->getResolution() == QBook::RES758x1024) + switch(QBook::getInstance()->getResolution()) { - if(collectionList.size() >= 22) - addToCollectionBtn->setStyleSheet(LITTLE_FONT_SIZE_HD); - else - addToCollectionBtn->setStyleSheet(FONT_SIZE_HD); + case QBook::RES1072x1448: + if(collectionList.size() >= 10) + addToCollectionBtn->setStyleSheet(LITTLE_FONT_SIZE_FHD); + else + addToCollectionBtn->setStyleSheet(FONT_SIZE_FHD); + break; + case QBook::RES758x1024: + if(collectionList.size() >= 22) + addToCollectionBtn->setStyleSheet(LITTLE_FONT_SIZE_HD); + else + addToCollectionBtn->setStyleSheet(FONT_SIZE_HD); + break; + case QBook::RES600x800: default: + if(collectionList.size() >= 22) + addToCollectionBtn->setStyleSheet(LITTLE_FONT_SIZE_SD); + else + addToCollectionBtn->setStyleSheet(FONT_SIZE_SD); + break; } addToCollectionBtn->setText(tr("En %1 colecciones").arg(collectionList.size())); } diff --git a/bqViewer/src/ViewerCollectionItem.cpp b/bqViewer/src/ViewerCollectionItem.cpp index acb2617..1b59563 100644 --- a/bqViewer/src/ViewerCollectionItem.cpp +++ b/bqViewer/src/ViewerCollectionItem.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 @@ -36,10 +36,18 @@ ViewerCollectionItem::ViewerCollectionItem(QWidget *parent) : GestureWidget(pare connect(this,SIGNAL(tap()),this,SLOT(processTap())); collectionTitleLbl->setText(""); m_checkWidth = 0; - if(QBook::getInstance()->getResolution() == QBook::RES758x1024) - m_checkWidth = 40; - else - m_checkWidth = 35; + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + m_checkWidth = 56; + break; + case QBook::RES758x1024: + m_checkWidth = 40; + break; + case QBook::RES600x800: default: + m_checkWidth = 35; + break; + } } ViewerCollectionItem::~ViewerCollectionItem(){ diff --git a/bqViewer/src/ViewerContentsList.cpp b/bqViewer/src/ViewerContentsList.cpp index a6cadcc..1076728 100644 --- a/bqViewer/src/ViewerContentsList.cpp +++ b/bqViewer/src/ViewerContentsList.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 @@ -29,6 +29,7 @@ along with the source code. If not, see . #include #define CHECKED "background-color: #DADADA" +#define CHECKED9_FHD "background-color: #DADADA; border-radius-bottom: 8px;" #define CHECKED9_HD "background-color: #DADADA; border-radius-bottom: 6px;" #define CHECKED9_SD "background-color: #DADADA; border-radius-bottom: 5px;" @@ -157,7 +158,9 @@ void ViewerContentsList::paint( int currentPage) if(location->preview == m_currentChapter && location->page == m_pageStart){ if(i == 8){ - if(QBook::getResolution()==QBook::RES600x800) + if(QBook::getInstance()->getResolution()==QBook::RES1072x1448) + m_bookIndexList.at(i)->setStyleSheet(CHECKED9_FHD); + else if(QBook::getInstance()->getResolution()==QBook::RES600x800) m_bookIndexList.at(i)->setStyleSheet(CHECKED9_SD); else m_bookIndexList.at(i)->setStyleSheet(CHECKED9_HD); diff --git a/bqViewer/src/ViewerDictionary.cpp b/bqViewer/src/ViewerDictionary.cpp index b66163c..e39e04b 100644 --- a/bqViewer/src/ViewerDictionary.cpp +++ b/bqViewer/src/ViewerDictionary.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 @@ -92,8 +92,18 @@ ViewerDictionary::ViewerDictionary(Viewer *parentViewer) : VerticalPagerPopup->hideLabel(); - if(QBook::getResolution() == QBook::RES758x1024) m_searchTitleMaxWidth = 416; - else m_searchTitleMaxWidth = 360; + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + m_searchTitleMaxWidth = 588; + break; + case QBook::RES758x1024: + m_searchTitleMaxWidth = 416; + break; + case QBook::RES600x800: default: + m_searchTitleMaxWidth = 360; + break; + } hide(); } diff --git a/bqViewer/src/ViewerPageHandler.cpp b/bqViewer/src/ViewerPageHandler.cpp index 4cd519e..c9fa0cd 100644 --- a/bqViewer/src/ViewerPageHandler.cpp +++ b/bqViewer/src/ViewerPageHandler.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 @@ -30,6 +30,7 @@ along with the source code. If not, see . #include "QBook.h" +//TODO CERVANTES3 #define WIDTH_LINE_HD 2 #define WIDTH_LINE_SD 1 @@ -54,7 +55,9 @@ ViewerPageHandler::ViewerPageHandler(QWidget *parent) : readingProgress->setMaximum(100); readingProgress->setStyleSheet("background:transparent;"); - if(QBook::getResolution() == QBook::RES600x800) + if(QBook::getInstance()->getResolution() == QBook::RES1072x1448) + m_chapterLineWidth = WIDTH_LINE_HD; + else if(QBook::getInstance()->getResolution() == QBook::RES600x800) m_chapterLineWidth = WIDTH_LINE_SD; else m_chapterLineWidth = WIDTH_LINE_HD; diff --git a/bqViewer/src/ViewerPageHandlerLandscape.cpp b/bqViewer/src/ViewerPageHandlerLandscape.cpp index 54bc665..0ad9031 100644 --- a/bqViewer/src/ViewerPageHandlerLandscape.cpp +++ b/bqViewer/src/ViewerPageHandlerLandscape.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 @@ -55,7 +55,9 @@ ViewerPageHandlerLandscape::ViewerPageHandlerLandscape(QWidget *parent) : readingProgress->setMaximum(100); readingProgress->setStyleSheet("background:transparent;"); - if(QBook::getResolution() == QBook::RES600x800) + if(QBook::getInstance()->getResolution() == QBook::RES1072x1448) + m_chapterLineWidth = WIDTH_LINE_HD; + else if(QBook::getInstance()->getResolution() == QBook::RES600x800) m_chapterLineWidth = WIDTH_LINE_SD; else m_chapterLineWidth = WIDTH_LINE_HD; diff --git a/bqViewer/src/ViewerTextActionsPopup.cpp b/bqViewer/src/ViewerTextActionsPopup.cpp index f9c9178..c47f201 100644 --- a/bqViewer/src/ViewerTextActionsPopup.cpp +++ b/bqViewer/src/ViewerTextActionsPopup.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 @@ -48,10 +48,19 @@ ViewerTextActionsPopup::ViewerTextActionsPopup(QWidget *parent) : QWidget(parent definitionTextBrowser->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); vbar = definitionTextBrowser->verticalScrollBar(); definitionTextBrowser->setTappable(true); - if(QBook::getResolution() == QBook::RES758x1024) - vbar->setSingleStep(190); - else - vbar->setSingleStep(160); + + switch(QBook::getInstance()->getResolution()) + { + case QBook::RES1072x1448: + vbar->setSingleStep(268); + break; + case QBook::RES758x1024: + vbar->setSingleStep(190); + break; + case QBook::RES600x800: default: + vbar->setSingleStep(160); + break; + } } ViewerTextActionsPopup::~ViewerTextActionsPopup() diff --git a/bqViewer/tr/bqViewer_ca.ts b/bqViewer/tr/bqViewer_ca.ts index d74c1f2..c9dbcb6 100755 --- a/bqViewer/tr/bqViewer_ca.ts +++ b/bqViewer/tr/bqViewer_ca.ts @@ -98,7 +98,7 @@ LibraryBookSummary Delete - Eliminar + Elimina More Actions @@ -254,7 +254,7 @@ Ir - Anar + Vés @@ -346,7 +346,7 @@ Ajustes de Texto - Ajusts de text + Configuració de text @@ -396,12 +396,12 @@ Justificar texto - Justificar text + Alineació del text Usar configuración de la editorial - Utilitzar configuració de l'editorial + Utilitza la configuració de l'editorial @@ -432,7 +432,7 @@ Copiar a la SD - Copiar + Copia Archivar @@ -440,7 +440,7 @@ Eliminar - Eliminar + Elimina Exportar notas @@ -503,7 +503,7 @@ Copiar a SD - Copiar + Copia @@ -613,7 +613,7 @@ p, li { white-space: pre-wrap; } Copy file - Copiar + Copia @@ -656,7 +656,7 @@ Vols continuar? Copy - Copiar + Copia @@ -762,7 +762,7 @@ Vols continuar? Remove - Eliminar + Elimina @@ -788,7 +788,7 @@ Vols continuar? Añadir colección - Crear col·lecció + Crea col·lecció @@ -953,7 +953,7 @@ p, li { white-space: pre-wrap; } Create note - Afegir nota + Afegeix nota @@ -977,7 +977,7 @@ p, li { white-space: pre-wrap; } Ir a página - Anar a pàgina + Vés a la pàgina @@ -1012,7 +1012,7 @@ p, li { white-space: pre-wrap; } Ir - Anar + Vés @@ -1075,7 +1075,7 @@ p, li { white-space: pre-wrap; } Ir a página - Anar a pàgina + Vés a la pàgina @@ -1085,7 +1085,7 @@ p, li { white-space: pre-wrap; } Buscar - Cercar + Cerca @@ -1118,7 +1118,7 @@ p, li { white-space: pre-wrap; } Buscar - Cercar + Cerca @@ -1305,7 +1305,7 @@ p, li { white-space: pre-wrap; } Buscar - Cercar + Cerca @@ -1348,7 +1348,7 @@ p, li { white-space: pre-wrap; } Crear nota - Afegir nota + Afegeix nota @@ -1358,7 +1358,7 @@ p, li { white-space: pre-wrap; } Subrayar - Subratllar + Subratlla @@ -1368,12 +1368,12 @@ p, li { white-space: pre-wrap; } Buscar - Cercar + Cerca Añadir nota - Afegir nota + Afegeix nota @@ -1386,17 +1386,17 @@ p, li { white-space: pre-wrap; } Crear Nota - Afegir nota + Afegeix nota Resaltar - Subratllar + Subratlla Buscar - Cercar + Cerca @@ -1410,12 +1410,12 @@ p, li { white-space: pre-wrap; } Create note - Afegir nota + Afegeix nota Highlight - Subratllar + Subratlla diff --git a/bqViewer/tr/bqViewer_pt.ts b/bqViewer/tr/bqViewer_pt.ts index 4f7a4f5..2af9851 100755 --- a/bqViewer/tr/bqViewer_pt.ts +++ b/bqViewer/tr/bqViewer_pt.ts @@ -1079,7 +1079,7 @@ p, li { white-space: pre-wrap; } Apariencia - Aparência + Aspeto diff --git a/bqViewer/ui/Bookmark.ui b/bqViewer/ui/Bookmark.ui index 4a919b4..48af238 100755 --- a/bqViewer/ui/Bookmark.ui +++ b/bqViewer/ui/Bookmark.ui @@ -6,14 +6,14 @@ 0 0 - 94 - 56 + 133 + 79 - 94 - 100 + 133 + 141 @@ -34,20 +34,20 @@ height:41px; 10 0 - 31 - 41 + 44 + 58 - + - + - + - - + + \ No newline at end of file diff --git a/bqViewer/ui/BookmarkLandscape.ui b/bqViewer/ui/BookmarkLandscape.ui index e69e7c8..e76b8ea 100755 --- a/bqViewer/ui/BookmarkLandscape.ui +++ b/bqViewer/ui/BookmarkLandscape.ui @@ -6,14 +6,14 @@ 0 0 - 94 - 56 + 133 + 79 - 94 - 100 + 133 + 141 @@ -34,18 +34,18 @@ height:41px; 10 0 - 31 - 41 + 44 + 58 - + - + - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/DictionaryLayer.ui b/bqViewer/ui/DictionaryLayer.ui index 83ca167..e6d0776 100755 --- a/bqViewer/ui/DictionaryLayer.ui +++ b/bqViewer/ui/DictionaryLayer.ui @@ -6,20 +6,20 @@ 0 0 - 285 - 225 + 403 + 318 - 285 - 225 + 0 + 0 - 285 - 225 + 403 + 318 @@ -29,7 +29,7 @@ Form - + @@ -58,14 +58,14 @@ 16777215 - 53 + 75 Qt::NoFocus - Definiciones español + Definiciones español true @@ -83,14 +83,14 @@ 16777215 - 53 + 75 Qt::NoFocus - Definiciones inglés + Definiciones inglés true @@ -108,14 +108,14 @@ 16777215 - 53 + 75 Qt::NoFocus - Español / Inglés + Español / Inglés true @@ -138,15 +138,15 @@ - 480 - 53 + 679 + 75 Qt::NoFocus - Ingles / Español + Ingles / Español true @@ -169,15 +169,15 @@ - 480 - 53 + 679 + 75 Qt::NoFocus - Ingles / Español + Ingles / Español true @@ -191,8 +191,8 @@ - 20 - 40 + 28 + 57 @@ -228,6 +228,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/MiniatureView.ui b/bqViewer/ui/MiniatureView.ui index 782cd26..2f36a66 100644 --- a/bqViewer/ui/MiniatureView.ui +++ b/bqViewer/ui/MiniatureView.ui @@ -6,23 +6,23 @@ 0 0 - 127 - 202 + 180 + 286 Form - + 0 0 - 125 - 200 + 177 + 283 @@ -44,7 +44,7 @@ - + @@ -96,8 +96,8 @@ - 40 - 20 + 57 + 28 @@ -153,8 +153,8 @@ - 40 - 20 + 57 + 28 @@ -169,8 +169,8 @@ 20 20 - 80 - 80 + 113 + 113 @@ -179,18 +179,18 @@ 120 10 - 66 - 17 + 93 + 24 - + screenshotCont screenshotLbl frame - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/MiniatureViewLandscape.ui b/bqViewer/ui/MiniatureViewLandscape.ui index 985d932..7dd99d6 100644 --- a/bqViewer/ui/MiniatureViewLandscape.ui +++ b/bqViewer/ui/MiniatureViewLandscape.ui @@ -6,23 +6,23 @@ 0 0 - 224 - 260 + 317 + 368 Form - + 0 0 - 160 - 206 + 226 + 291 @@ -53,7 +53,7 @@ - + @@ -105,8 +105,8 @@ - 20 - 2 + 28 + 3 @@ -126,7 +126,7 @@ - + @@ -178,8 +178,8 @@ - 20 - 2 + 28 + 3 @@ -190,7 +190,7 @@ - + @@ -201,8 +201,8 @@ 150 20 - 80 - 80 + 113 + 113 @@ -217,12 +217,12 @@ 160 220 - 66 - 17 + 93 + 24 - + screenshotLandscapeCont @@ -236,6 +236,6 @@
DegreesLabel270.h
- - - + + + \ No newline at end of file diff --git a/bqViewer/ui/Social.ui b/bqViewer/ui/Social.ui index 65ae758..7243ba3 100755 --- a/bqViewer/ui/Social.ui +++ b/bqViewer/ui/Social.ui @@ -6,20 +6,20 @@ 0 0 - 94 - 50 + 133 + 71 0 - 50 + 0 - 94 - 50 + 133 + 71 @@ -29,19 +29,19 @@ Form - + 0 10 - 41 - 41 + 58 + 58 - + 10 @@ -51,6 +51,6 @@ - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/Viewer.ui b/bqViewer/ui/Viewer.ui index 38ca913..a3d0b12 100755 --- a/bqViewer/ui/Viewer.ui +++ b/bqViewer/ui/Viewer.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 800 + 849 + 1131 @@ -18,23 +18,23 @@ - 600 - 800 + 0 + 0 Form - + 0 0 - 600 - 800 + 849 + 1131 @@ -54,14 +54,14 @@ - 20 - 5 + 28 + 7 - + @@ -73,8 +73,8 @@ - 600 - 55 + 849 + 78 @@ -88,8 +88,8 @@ 0 0 - 600 - 750 + 849 + 1061 @@ -98,8 +98,8 @@ 0 0 - 600 - 800 + 849 + 1131 @@ -116,8 +116,8 @@ - 600 - 800 + 849 + 1131 @@ -132,8 +132,8 @@ 0 0 - 600 - 50 + 849 + 71 @@ -166,8 +166,8 @@ - 40 - 20 + 57 + 28 @@ -195,8 +195,8 @@ 0 0 - 600 - 55 + 849 + 78 @@ -209,7 +209,7 @@ - + @@ -220,8 +220,8 @@ - 40 - 20 + 57 + 28 @@ -248,8 +248,8 @@ - 20 - 40 + 28 + 57 @@ -263,8 +263,8 @@ - 40 - 20 + 57 + 28 @@ -272,7 +272,7 @@ - + @@ -283,8 +283,8 @@ 0 0 - 600 - 800 + 849 + 1131 @@ -304,7 +304,7 @@ 0 - + @@ -316,8 +316,8 @@ - 55 - 800 + 78 + 1131 @@ -329,8 +329,8 @@ - 40 - 20 + 57 + 28 @@ -348,8 +348,8 @@ 0 0 - 55 - 800 + 78 + 1131 @@ -366,8 +366,8 @@ - 20 - 40 + 28 + 57 @@ -375,7 +375,7 @@ - + @@ -390,8 +390,8 @@ 0 0 - 600 - 800 + 849 + 1131 @@ -404,7 +404,7 @@ - + @@ -424,8 +424,8 @@ - 40 - 20 + 57 + 28 @@ -443,7 +443,7 @@ - + @@ -457,8 +457,8 @@ - 20 - 40 + 28 + 57 @@ -470,8 +470,8 @@ 0 0 - 600 - 800 + 849 + 1131 @@ -488,8 +488,8 @@ - 40 - 20 + 57 + 28 @@ -510,19 +510,19 @@ - 20 - 40 + 28 + 57 - + - + @@ -539,15 +539,15 @@ - 80 - 50 + 113 + 71 - + - + @@ -612,6 +612,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerAnnotationActions.ui b/bqViewer/ui/ViewerAnnotationActions.ui index f2e9240..e210ab5 100755 --- a/bqViewer/ui/ViewerAnnotationActions.ui +++ b/bqViewer/ui/ViewerAnnotationActions.ui @@ -6,27 +6,27 @@ 0 0 - 540 - 129 + 764 + 182 - 540 - 129 + 0 + 0 - 540 - 129 + 764 + 182 Form - + @@ -48,8 +48,8 @@ - 40 - 20 + 57 + 28 @@ -57,7 +57,7 @@ - + 0 @@ -71,8 +71,8 @@ - 40 - 20 + 57 + 28 @@ -99,8 +99,8 @@ - 10000 - 72 + 14142 + 102 @@ -166,7 +166,7 @@ 1 - 20 + 28 @@ -179,7 +179,7 @@ 16777215 - 19 + 27 @@ -187,12 +187,12 @@ 50 0 - 24 - 17 + 34 + 24 - + 0 @@ -207,8 +207,8 @@ - 20 - 40 + 28 + 57 @@ -222,6 +222,6 @@
FastQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerAnnotationItem.ui b/bqViewer/ui/ViewerAnnotationItem.ui index 8c059d2..8a364b2 100755 --- a/bqViewer/ui/ViewerAnnotationItem.ui +++ b/bqViewer/ui/ViewerAnnotationItem.ui @@ -6,15 +6,15 @@ 0 0 - 539 - 100 + 762 + 141 Form - + @@ -31,7 +31,7 @@ - + @@ -71,8 +71,8 @@ - 40 - 20 + 57 + 28 @@ -119,8 +119,8 @@ - 20 - 40 + 28 + 57 @@ -132,7 +132,7 @@ - + - - + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerAnnotationsList.ui b/bqViewer/ui/ViewerAnnotationsList.ui index d29f1eb..5b9c0da 100755 --- a/bqViewer/ui/ViewerAnnotationsList.ui +++ b/bqViewer/ui/ViewerAnnotationsList.ui @@ -6,27 +6,27 @@ 0 0 - 530 - 470 + 750 + 665 - 530 - 470 + 0 + 0 - 530 - 470 + 750 + 665 Form - + @@ -148,16 +148,16 @@ 0 - + - + - + - + @@ -169,8 +169,8 @@ - 20 - 40 + 28 + 57 @@ -185,6 +185,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerAppearancePopup.ui b/bqViewer/ui/ViewerAppearancePopup.ui index 5e7e51f..90d1435 100755 --- a/bqViewer/ui/ViewerAppearancePopup.ui +++ b/bqViewer/ui/ViewerAppearancePopup.ui @@ -6,27 +6,27 @@ 0 0 - 600 - 700 + 849 + 990 - 600 - 700 + 0 + 0 - 600 - 700 + 849 + 990 Form - + @@ -53,8 +53,8 @@ - 20 - 40 + 28 + 57 @@ -111,8 +111,8 @@ - 40 - 20 + 57 + 28 @@ -129,7 +129,7 @@ Qt::NoFocus - + @@ -153,7 +153,7 @@ 16777215 - 53 + 75 @@ -172,7 +172,7 @@ - Usar configuración de la editorial + Usar configuración de la editorial @@ -183,8 +183,8 @@ - 40 - 20 + 57 + 28 @@ -195,7 +195,7 @@ Qt::NoFocus - + @@ -213,7 +213,7 @@ - + @@ -237,7 +237,7 @@ - + @@ -444,7 +444,7 @@ - + @@ -462,7 +462,7 @@ - + @@ -486,7 +486,7 @@ - + @@ -532,7 +532,7 @@ 16777215 - 46 + 65 @@ -563,7 +563,7 @@ 16777215 - 46 + 65 @@ -594,7 +594,7 @@ 16777215 - 46 + 65 @@ -625,7 +625,7 @@ 16777215 - 46 + 65 @@ -656,7 +656,7 @@ 16777215 - 46 + 65 @@ -687,7 +687,7 @@ 16777215 - 46 + 65 @@ -718,7 +718,7 @@ 16777215 - 46 + 65 @@ -738,7 +738,7 @@ - + @@ -775,7 +775,7 @@ - Márgenes + Márgenes Qt::AlignCenter @@ -803,7 +803,7 @@ Qt::NoFocus - + true @@ -816,7 +816,7 @@ Qt::NoFocus - + true @@ -829,7 +829,7 @@ Qt::NoFocus - + true @@ -845,7 +845,7 @@ - + @@ -883,7 +883,7 @@ Qt::NoFocus - + true @@ -896,7 +896,7 @@ Qt::NoFocus - + true @@ -909,7 +909,7 @@ Qt::NoFocus - + true @@ -925,7 +925,7 @@ - + @@ -969,7 +969,7 @@ Qt::NoFocus - + true @@ -982,7 +982,7 @@ Qt::NoFocus - + true @@ -995,7 +995,7 @@ Qt::NoFocus - + true @@ -1011,7 +1011,7 @@ - + @@ -1042,7 +1042,7 @@ - Mostrar imágenes + Mostrar imágenes @@ -1053,8 +1053,8 @@ - 40 - 20 + 57 + 28 @@ -1065,7 +1065,7 @@ Qt::NoFocus - + @@ -1078,7 +1078,7 @@ - + @@ -1092,8 +1092,8 @@ - 20 - 40 + 28 + 57 @@ -1108,7 +1108,7 @@ 16777215 - 19 + 27 @@ -1116,12 +1116,12 @@ 0 0 - 427 - 17 + 604 + 24 - + 0 @@ -1150,6 +1150,6 @@
SwipeableQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerBookListActions.ui b/bqViewer/ui/ViewerBookListActions.ui index 1063bc1..98ddc50 100755 --- a/bqViewer/ui/ViewerBookListActions.ui +++ b/bqViewer/ui/ViewerBookListActions.ui @@ -1,91 +1,91 @@ - - - ViewerBookListActions - - - - 0 - 0 - 194 - 128 - - - - - 194 - 128 - - - - Form - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - - - Leído - - - - - - - No leído - - - - - - - Leyendo - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 20 - 5 - - - - - - - - - + + + ViewerBookListActions + + + + 0 + 0 + 274 + 181 + + + + + 274 + 181 + + + + Form + + + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + + + Leído + + + + + + + No leído + + + + + + + Leyendo + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 28 + 7 + + + + + + + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerBookSummary.ui b/bqViewer/ui/ViewerBookSummary.ui index 80555a5..1a0acf1 100755 --- a/bqViewer/ui/ViewerBookSummary.ui +++ b/bqViewer/ui/ViewerBookSummary.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 700 + 849 + 990 @@ -26,7 +26,7 @@ Form - + @@ -42,8 +42,8 @@ - 40 - 20 + 57 + 28 @@ -64,8 +64,8 @@ - 20 - 40 + 28 + 57 @@ -106,7 +106,7 @@ - + @@ -122,8 +122,8 @@ - 40 - 20 + 57 + 28 @@ -149,7 +149,7 @@ - + @@ -180,7 +180,7 @@ 0 - + @@ -189,40 +189,40 @@ - + 0 - + Qt::Vertical - 5 - 40 + 7 + 57 - + Qt::Vertical - 20 - 40 + 28 + 57 - + @@ -237,14 +237,14 @@ - + 0 - + Qt::Vertical @@ -254,13 +254,13 @@ - 5 - 5 + 7 + 7 - + @@ -275,27 +275,27 @@ - + 0 - + Qt::Vertical - 20 - 40 + 28 + 57 - + @@ -310,17 +310,17 @@ - + - + 0 - + @@ -335,14 +335,14 @@ - + 0 - + @@ -351,14 +351,14 @@ - + 0 - + Qt::Vertical @@ -368,25 +368,25 @@ - 20 - 5 + 28 + 7 - + 0 0 - 140 - 210 + 198 + 297 - + Qt::AlignCenter @@ -397,12 +397,12 @@ 0 0 - 140 - 175 + 198 + 247 - + Qt::AlignCenter @@ -413,12 +413,12 @@ 0 0 - 140 - 164 + 198 + 232 - + Qt::AlignCenter @@ -426,7 +426,7 @@ - + @@ -441,14 +441,14 @@ - + 0 - + @@ -463,14 +463,14 @@ - + 0 - + Qt::Vertical @@ -480,8 +480,8 @@ - 20 - 5 + 28 + 7 @@ -496,8 +496,8 @@ - 40 - 20 + 57 + 28 @@ -536,7 +536,7 @@ - Camilla Läckberg + Camilla Läckberg @@ -559,10 +559,10 @@ - + - 9,95€ + 9,95€ 0 @@ -576,8 +576,8 @@ - 40 - 20 + 57 + 28 @@ -606,7 +606,7 @@ - Total de páginas: + Total de páginas: @@ -627,8 +627,8 @@ - 40 - 20 + 57 + 28 @@ -639,7 +639,7 @@ Qt::NoFocus - Más acciones + Más acciones @@ -650,8 +650,8 @@ - 40 - 20 + 57 + 28 @@ -691,8 +691,8 @@ - 40 - 20 + 57 + 28 @@ -711,11 +711,11 @@ 16777215 - 4 + 6 - + @@ -726,8 +726,8 @@ - 20 - 40 + 28 + 57 @@ -831,8 +831,8 @@ - 40 - 20 + 57 + 28 @@ -856,17 +856,17 @@ - + 1 - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:22px;"><br /></p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:22px;"><br /></p></body></html> 1 @@ -902,12 +902,12 @@ p, li { white-space: pre-wrap; } 0 0 - 220 - 27 + 311 + 38 - + 0 @@ -935,8 +935,8 @@ p, li { white-space: pre-wrap; } - 40 - 20 + 57 + 28 @@ -961,6 +961,6 @@ p, li { white-space: pre-wrap; } 1 - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerCollectionItem.ui b/bqViewer/ui/ViewerCollectionItem.ui index def1f30..41819a8 100644 --- a/bqViewer/ui/ViewerCollectionItem.ui +++ b/bqViewer/ui/ViewerCollectionItem.ui @@ -6,8 +6,8 @@ 0 0 - 240 - 182 + 339 + 257 @@ -20,7 +20,7 @@ Form - + @@ -38,6 +38,6 @@ - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerCollectionLayer.ui b/bqViewer/ui/ViewerCollectionLayer.ui index d8595c9..e85390b 100644 --- a/bqViewer/ui/ViewerCollectionLayer.ui +++ b/bqViewer/ui/ViewerCollectionLayer.ui @@ -6,20 +6,20 @@ 0 0 - 285 - 309 + 403 + 437 - 285 + 0 0 - 285 - 500 + 403 + 707 @@ -29,7 +29,7 @@ Form - + @@ -78,15 +78,15 @@ - 480 - 53 + 679 + 75 Qt::NoFocus - Añadir colección + Añadir colección true @@ -95,22 +95,22 @@ - + - + - + - + @@ -141,8 +141,8 @@ - 20 - 40 + 28 + 57 @@ -163,6 +163,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerContentsItem.ui b/bqViewer/ui/ViewerContentsItem.ui index 9ea72ae..90d1c29 100755 --- a/bqViewer/ui/ViewerContentsItem.ui +++ b/bqViewer/ui/ViewerContentsItem.ui @@ -6,15 +6,15 @@ 0 0 - 540 - 51 + 764 + 72 Form - + @@ -49,8 +49,8 @@ - 40 - 20 + 57 + 28 @@ -88,7 +88,7 @@ - + @@ -102,14 +102,14 @@ - 40 - 20 + 57 + 28 - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerContentsList.ui b/bqViewer/ui/ViewerContentsList.ui index 4dabdbc..4c150a6 100755 --- a/bqViewer/ui/ViewerContentsList.ui +++ b/bqViewer/ui/ViewerContentsList.ui @@ -6,27 +6,27 @@ 0 0 - 542 - 452 + 767 + 639 - 542 - 452 + 0 + 0 - 542 - 452 + 767 + 639 Form - + @@ -36,31 +36,31 @@ 0 - + - + - + - + - + - + - + - + - + @@ -69,8 +69,8 @@ - 20 - 40 + 28 + 57 @@ -85,6 +85,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerContentsPopup.ui b/bqViewer/ui/ViewerContentsPopup.ui index aacee22..b2fa904 100755 --- a/bqViewer/ui/ViewerContentsPopup.ui +++ b/bqViewer/ui/ViewerContentsPopup.ui @@ -6,27 +6,27 @@ 0 0 - 600 - 800 + 849 + 1131 - 600 - 800 + 0 + 0 - 600 - 800 + 849 + 1131 Form - + @@ -42,8 +42,8 @@ - 20 - 40 + 28 + 57 @@ -82,7 +82,7 @@ 16777215 - 55 + 78 @@ -104,7 +104,7 @@ Qt::NoFocus - + Tabla de contenidos @@ -145,7 +145,7 @@ Qt::NoFocus - + @@ -164,7 +164,7 @@ - + 0 @@ -174,7 +174,7 @@ - + 0 @@ -188,8 +188,8 @@ - 40 - 20 + 57 + 28 @@ -246,8 +246,8 @@ - 20 - 40 + 28 + 57 @@ -267,7 +267,7 @@ 16777215 - 19 + 27 @@ -275,12 +275,12 @@ 0 0 - 24 - 17 + 34 + 24 - + 0 @@ -313,6 +313,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerDelimiter.ui b/bqViewer/ui/ViewerDelimiter.ui index 497bd46..96ffc57 100644 --- a/bqViewer/ui/ViewerDelimiter.ui +++ b/bqViewer/ui/ViewerDelimiter.ui @@ -6,8 +6,8 @@ 0 0 - 60 - 231 + 85 + 327 @@ -20,7 +20,7 @@ Form - + @@ -39,7 +39,7 @@ - 60 + 85 16777215 @@ -75,15 +75,15 @@ - 3 + 4 16777215 - + - + @@ -100,19 +100,19 @@ - 60 - 60 + 85 + 85 - + - + - - + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerDictionaryDefinitionPopup.ui b/bqViewer/ui/ViewerDictionaryDefinitionPopup.ui index 2b7ae89..b3fee7c 100755 --- a/bqViewer/ui/ViewerDictionaryDefinitionPopup.ui +++ b/bqViewer/ui/ViewerDictionaryDefinitionPopup.ui @@ -6,27 +6,27 @@ 0 0 - 600 - 800 + 849 + 1131 - 600 - 800 + 0 + 0 - 600 - 800 + 849 + 1131 Form - + @@ -42,8 +42,8 @@ - 20 - 40 + 28 + 57 @@ -73,8 +73,8 @@ - 10000 - 10000 + 14142 + 14142 @@ -95,7 +95,7 @@ 16777215 - 47 + 66 @@ -130,7 +130,7 @@ - + @@ -146,7 +146,7 @@ Qt::NoFocus - + @@ -174,7 +174,7 @@ - + 0 @@ -184,7 +184,7 @@ - + 0 @@ -198,8 +198,8 @@ - 40 - 20 + 57 + 28 @@ -230,7 +230,7 @@ - + @@ -241,8 +241,8 @@ - 40 - 20 + 57 + 28 @@ -267,8 +267,8 @@ - 40 - 20 + 57 + 28 @@ -276,7 +276,7 @@ - + @@ -314,7 +314,7 @@ - + @@ -325,8 +325,8 @@ - 40 - 20 + 57 + 28 @@ -359,8 +359,8 @@ - 40 - 20 + 57 + 28 @@ -374,7 +374,7 @@ - + @@ -389,7 +389,7 @@ 16777215 - 19 + 27 @@ -397,12 +397,12 @@ 50 2 - 24 - 17 + 34 + 24 - + 0 @@ -420,8 +420,8 @@ - 20 - 40 + 28 + 57 @@ -429,18 +429,18 @@ + + bqQTextBrowser + QTextBrowser +
bqQTextBrowser.h
+ ViewerVerticalPagerPopup QWidget
ViewerVerticalPagerPopup.h
1 - - bqQTextBrowser - QTextBrowser -
bqQTextBrowser.h
- - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerEditNotePopup.ui b/bqViewer/ui/ViewerEditNotePopup.ui index a134df3..447533d 100755 --- a/bqViewer/ui/ViewerEditNotePopup.ui +++ b/bqViewer/ui/ViewerEditNotePopup.ui @@ -6,27 +6,27 @@ 0 0 - 600 - 550 + 849 + 778 - 600 - 550 + 0 + 0 - 600 - 550 + 849 + 778 Form - + @@ -45,8 +45,8 @@ - 10000 - 442 + 14142 + 625 @@ -67,7 +67,7 @@ 16777215 - 77 + 109 @@ -91,8 +91,8 @@ - 40 - 20 + 57 + 28 @@ -103,7 +103,7 @@ Qt::NoFocus - + @@ -119,11 +119,11 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> @@ -151,6 +151,6 @@ p, li { white-space: pre-wrap; }
MyQTextEdit.h
- - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerFloatingNote.ui b/bqViewer/ui/ViewerFloatingNote.ui index 6a1abf2..34a69ee 100755 --- a/bqViewer/ui/ViewerFloatingNote.ui +++ b/bqViewer/ui/ViewerFloatingNote.ui @@ -6,8 +6,8 @@ 0 0 - 94 - 50 + 133 + 71 @@ -18,14 +18,14 @@ - 50 - 50 + 0 + 0 - 94 - 50 + 133 + 71 @@ -46,8 +46,8 @@ height:41px; 62 0 - 27 - 32 + 38 + 45 @@ -58,21 +58,21 @@ height:41px; - 27 + 38 16777215 - 27 + 38 0 - + - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerGotoPopup.ui b/bqViewer/ui/ViewerGotoPopup.ui index 4a9f0fc..3d720da 100755 --- a/bqViewer/ui/ViewerGotoPopup.ui +++ b/bqViewer/ui/ViewerGotoPopup.ui @@ -6,27 +6,27 @@ 0 0 - 480 - 480 + 679 + 679 - 480 - 480 + 0 + 0 - 480 - 480 + 679 + 679 Form - + @@ -42,8 +42,8 @@ - 20 - 40 + 28 + 57 @@ -66,8 +66,8 @@ - 10000 - 10000 + 14142 + 14142 @@ -88,7 +88,7 @@ 16777215 - 50 + 71 @@ -101,7 +101,7 @@ - Ir a página + Ir a página @@ -112,8 +112,8 @@ - 40 - 20 + 57 + 28 @@ -127,7 +127,7 @@ - + @@ -149,7 +149,7 @@ 0 - + @@ -162,110 +162,110 @@ 0 - + 8 - + - + - + Qt::Horizontal - 40 - 20 + 57 + 28 - + 4 - + 3 - + Qt::Horizontal - 40 - 20 + 57 + 28 - + 6 - + 1 - + 5 - + Ir - + 0 - + 7 - + 9 - + 2 @@ -282,8 +282,8 @@ - 20 - 40 + 28 + 57 @@ -304,8 +304,8 @@ - 40 - 20 + 57 + 28 @@ -331,8 +331,8 @@ - 40 - 20 + 57 + 28 @@ -350,7 +350,7 @@ 16777215 - 19 + 27 @@ -358,12 +358,12 @@ 0 0 - 24 - 17 + 34 + 24 - + 0 @@ -395,6 +395,6 @@
MyQLineEdit.h
- - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerMenu.ui b/bqViewer/ui/ViewerMenu.ui index 2941ffc..5f2c225 100755 --- a/bqViewer/ui/ViewerMenu.ui +++ b/bqViewer/ui/ViewerMenu.ui @@ -6,15 +6,15 @@ 0 0 - 600 - 747 + 849 + 1056 Form - + @@ -26,7 +26,7 @@ - + @@ -37,8 +37,8 @@ - 20 - 40 + 28 + 57 @@ -64,7 +64,7 @@ - Capítulo 1 + Capítulo 1 @@ -82,8 +82,8 @@ - 40 - 20 + 57 + 28 @@ -97,7 +97,7 @@ - + @@ -118,7 +118,7 @@ 16777215 - 114 + 161 @@ -172,7 +172,7 @@ Qt::NoFocus - Ir a página + Ir a página @@ -213,6 +213,6 @@ - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerNoteActionsPopup.ui b/bqViewer/ui/ViewerNoteActionsPopup.ui index f96590b..8f1fcb9 100755 --- a/bqViewer/ui/ViewerNoteActionsPopup.ui +++ b/bqViewer/ui/ViewerNoteActionsPopup.ui @@ -6,27 +6,27 @@ 0 0 - 540 - 380 + 764 + 537 - 540 - 380 + 0 + 0 - 540 - 380 + 764 + 537 Form - + @@ -40,7 +40,7 @@ 16777215 - 19 + 27 @@ -48,12 +48,12 @@ 50 2 - 24 - 17 + 34 + 24 - + 0 @@ -71,8 +71,8 @@ - 10000 - 10000 + 14142 + 14142 @@ -93,7 +93,7 @@ 16777215 - 52 + 74 @@ -117,8 +117,8 @@ - 40 - 20 + 57 + 28 @@ -129,7 +129,7 @@ Qt::NoFocus - + @@ -147,7 +147,7 @@ 16777215 - 62 + 88 @@ -206,7 +206,7 @@ 16777215 - 60 + 85 @@ -265,12 +265,12 @@ 160 0 - 24 - 17 + 34 + 24 - + @@ -281,9 +281,9 @@ bqQTextBrowser QTextBrowser -
bqQTextBrowser.h
+
bqQTextBrowser.h
 - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerPageHandler.ui b/bqViewer/ui/ViewerPageHandler.ui index ce6941c..14acdb2 100755 --- a/bqViewer/ui/ViewerPageHandler.ui +++ b/bqViewer/ui/ViewerPageHandler.ui @@ -6,15 +6,15 @@ 0 0 - 600 - 60 + 849 + 85 Form - + @@ -35,14 +35,14 @@ - + - + @@ -71,8 +71,8 @@ - 20 - 40 + 28 + 57 @@ -93,21 +93,21 @@ - leído + leído - + - + @@ -146,8 +146,8 @@ - 40 - 20 + 57 + 28 @@ -162,7 +162,7 @@ - págs. fin cap. + págs. fin cap. @@ -190,7 +190,7 @@ 24 - + @@ -204,8 +204,8 @@ - 20 - 40 + 28 + 57 @@ -222,21 +222,21 @@ - + - + - + - - + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerPageHandlerLandscape.ui b/bqViewer/ui/ViewerPageHandlerLandscape.ui index 9cc3228..51bf0e9 100644 --- a/bqViewer/ui/ViewerPageHandlerLandscape.ui +++ b/bqViewer/ui/ViewerPageHandlerLandscape.ui @@ -6,33 +6,33 @@ 0 0 - 94 - 691 + 133 + 977 - 94 - 1024 + 133 + 1448 Form - + 0 0 - 55 - 600 + 78 + 849 - + @@ -44,7 +44,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -126,8 +126,8 @@ - 5 - 20 + 7 + 28 @@ -175,7 +175,7 @@ - + @@ -195,21 +195,21 @@ - + - + - + @@ -229,7 +229,7 @@ - + @@ -240,8 +240,8 @@ - 20 - 40 + 28 + 57 @@ -256,7 +256,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -301,7 +301,7 @@ - + @@ -321,6 +321,6 @@
DegreesLabel270.h
- - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerPdfPageHandler.ui b/bqViewer/ui/ViewerPdfPageHandler.ui index b1dff62..4e50585 100644 --- a/bqViewer/ui/ViewerPdfPageHandler.ui +++ b/bqViewer/ui/ViewerPdfPageHandler.ui @@ -6,23 +6,23 @@ 0 0 - 600 - 55 + 849 + 78 Form - + 0 0 - 600 - 51 + 849 + 72 @@ -44,7 +44,7 @@ Qt::NoFocus - + @@ -60,7 +60,7 @@ Qt::NoFocus - + @@ -76,7 +76,7 @@ Qt::NoFocus - + @@ -92,7 +92,7 @@ Qt::NoFocus - + @@ -108,7 +108,7 @@ Qt::NoFocus - + @@ -124,7 +124,7 @@ Qt::NoFocus - + @@ -140,7 +140,7 @@ Qt::NoFocus - + @@ -155,7 +155,7 @@ - + - - + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerPdfPageHandlerLandscape.ui b/bqViewer/ui/ViewerPdfPageHandlerLandscape.ui index 7605978..64522cb 100644 --- a/bqViewer/ui/ViewerPdfPageHandlerLandscape.ui +++ b/bqViewer/ui/ViewerPdfPageHandlerLandscape.ui @@ -6,23 +6,23 @@ 0 0 - 94 - 600 + 133 + 849 Form - + 0 0 - 66 - 600 + 93 + 849 @@ -44,7 +44,7 @@ Qt::NoFocus - + @@ -60,7 +60,7 @@ Qt::NoFocus - + @@ -76,7 +76,7 @@ Qt::NoFocus - + @@ -92,7 +92,7 @@ Qt::NoFocus - + @@ -108,7 +108,7 @@ Qt::NoFocus - + @@ -124,7 +124,7 @@ Qt::NoFocus - + @@ -140,7 +140,7 @@ Qt::NoFocus - + @@ -148,7 +148,7 @@ - + - - + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerSearchContextMenu.ui b/bqViewer/ui/ViewerSearchContextMenu.ui index 51faa6d..4f437ee 100755 --- a/bqViewer/ui/ViewerSearchContextMenu.ui +++ b/bqViewer/ui/ViewerSearchContextMenu.ui @@ -6,20 +6,20 @@ 0 0 - 758 - 1224 + 1072 + 1731 - 758 - 1224 + 0 + 0 - 758 - 1224 + 1072 + 1731 @@ -29,10 +29,10 @@ Form - + - + @@ -48,8 +48,8 @@ - 20 - 40 + 28 + 57 @@ -100,15 +100,15 @@ - 300 - 58 + 424 + 82 Qt::NoFocus - + Listado @@ -122,8 +122,8 @@ - 40 - 20 + 57 + 28 @@ -138,7 +138,7 @@ - + 7 @@ -148,7 +148,7 @@ - + of @@ -158,7 +158,7 @@ - + 100 @@ -172,8 +172,8 @@ - 40 - 20 + 57 + 28 @@ -182,15 +182,15 @@ - 69 - 58 + 98 + 82 Qt::NoFocus - + @@ -198,22 +198,22 @@ - 69 - 58 + 98 + 82 Qt::NoFocus - + - + @@ -225,6 +225,6 @@ - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerSearchContextMenuLandscape.ui b/bqViewer/ui/ViewerSearchContextMenuLandscape.ui index cdab59e..5ed51bc 100644 --- a/bqViewer/ui/ViewerSearchContextMenuLandscape.ui +++ b/bqViewer/ui/ViewerSearchContextMenuLandscape.ui @@ -6,20 +6,20 @@ 0 0 - 600 - 800 + 849 + 1131 - 600 - 800 + 0 + 0 - 600 - 800 + 849 + 1131 @@ -29,10 +29,10 @@ Form - + - + @@ -69,8 +69,8 @@ - 1000000 - 100000 + 1414214 + 141421 @@ -99,15 +99,15 @@ - 54 - 144 + 76 + 204 Qt::NoFocus - + Listado @@ -124,8 +124,8 @@ - 20 - 40 + 28 + 57 @@ -147,8 +147,8 @@ - 20 - 40 + 28 + 57 @@ -157,15 +157,15 @@ - 54 - 68 + 76 + 96 Qt::NoFocus - + @@ -173,22 +173,22 @@ - 54 - 56 + 76 + 79 Qt::NoFocus - + - + @@ -205,8 +205,8 @@ - 40 - 20 + 57 + 28 @@ -225,6 +225,6 @@
DegreesPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerSearchPopup.ui b/bqViewer/ui/ViewerSearchPopup.ui index f4bf978..108cfd5 100755 --- a/bqViewer/ui/ViewerSearchPopup.ui +++ b/bqViewer/ui/ViewerSearchPopup.ui @@ -6,27 +6,27 @@ 0 0 - 600 - 800 + 849 + 1131 - 600 - 800 + 0 + 0 - 600 - 800 + 849 + 1131 Form - + @@ -42,8 +42,8 @@ - 20 - 40 + 28 + 57 @@ -66,8 +66,8 @@ - 530 - 607 + 750 + 858 @@ -88,7 +88,7 @@ 16777215 - 147 + 208 @@ -110,8 +110,8 @@ - 40 - 20 + 57 + 28 @@ -119,7 +119,7 @@ - + @@ -137,8 +137,8 @@ - 40 - 20 + 57 + 28 @@ -153,7 +153,7 @@ - + @@ -164,8 +164,8 @@ - 80 - 20 + 113 + 28 @@ -189,19 +189,19 @@ - + - + - + - + - + @@ -219,8 +219,8 @@ - 20 - 40 + 28 + 57 @@ -245,8 +245,8 @@ - 20 - 40 + 28 + 57 @@ -279,7 +279,7 @@ 16777215 - 19 + 27 @@ -287,12 +287,12 @@ 0 0 - 545 - 17 + 771 + 24 - + 0 @@ -331,6 +331,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerSearchResultItem.ui b/bqViewer/ui/ViewerSearchResultItem.ui index 4962a13..dabcc76 100755 --- a/bqViewer/ui/ViewerSearchResultItem.ui +++ b/bqViewer/ui/ViewerSearchResultItem.ui @@ -6,15 +6,15 @@ 0 0 - 540 - 80 + 764 + 113 Form - + @@ -36,6 +36,6 @@ - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerSearchWordPopup.ui b/bqViewer/ui/ViewerSearchWordPopup.ui index 79c13d9..26530fb 100755 --- a/bqViewer/ui/ViewerSearchWordPopup.ui +++ b/bqViewer/ui/ViewerSearchWordPopup.ui @@ -6,27 +6,27 @@ 0 0 - 520 - 687 + 735 + 972 - 520 - 687 + 0 + 0 - 520 - 687 + 735 + 972 Form - + @@ -55,7 +55,7 @@ 16777215 - 149 + 211 @@ -77,8 +77,8 @@ - 40 - 20 + 57 + 28 @@ -86,7 +86,7 @@ - + @@ -98,7 +98,7 @@ 0 - + @@ -107,8 +107,8 @@ - 40 - 20 + 57 + 28 @@ -119,22 +119,22 @@ - + - + - + - + - + - + @@ -165,8 +165,8 @@ - 20 - 40 + 28 + 57 @@ -185,8 +185,6 @@ - - - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerTextActionsMenu.ui b/bqViewer/ui/ViewerTextActionsMenu.ui index c25f4c2..4f89cc3 100755 --- a/bqViewer/ui/ViewerTextActionsMenu.ui +++ b/bqViewer/ui/ViewerTextActionsMenu.ui @@ -6,27 +6,27 @@ 0 0 - 560 - 119 + 792 + 168 - 560 - 119 + 0 + 0 - 560 - 119 + 792 + 168 Form - + @@ -42,12 +42,12 @@ 40 3 - 24 - 17 + 34 + 24 - + 0 @@ -74,8 +74,8 @@ - 10000 - 80 + 14142 + 113 @@ -174,7 +174,7 @@ - + @@ -189,7 +189,7 @@ 16777215 - 19 + 27 @@ -197,12 +197,12 @@ 50 0 - 24 - 17 + 34 + 24 - + 0 @@ -217,16 +217,14 @@ - 20 - 40 + 28 + 57 - - - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerTextActionsPopup.ui b/bqViewer/ui/ViewerTextActionsPopup.ui index b71dbdc..3276415 100755 --- a/bqViewer/ui/ViewerTextActionsPopup.ui +++ b/bqViewer/ui/ViewerTextActionsPopup.ui @@ -6,27 +6,27 @@ 0 0 - 470 - 400 + 665 + 566 - 470 - 400 + 0 + 0 - 470 - 400 + 665 + 566 Form - + @@ -40,7 +40,7 @@ 16777215 - 19 + 27 @@ -48,12 +48,12 @@ 50 2 - 24 - 17 + 34 + 24 - + 0 @@ -71,8 +71,8 @@ - 10000 - 10000 + 14142 + 14142 @@ -152,7 +152,7 @@ - + @@ -174,12 +174,12 @@ 160 0 - 24 - 17 + 34 + 24 - + @@ -193,6 +193,6 @@
bqQTextBrowser.h
- - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerVerticalPagerPopup.ui b/bqViewer/ui/ViewerVerticalPagerPopup.ui index b709bf1..6f50f71 100755 --- a/bqViewer/ui/ViewerVerticalPagerPopup.ui +++ b/bqViewer/ui/ViewerVerticalPagerPopup.ui @@ -6,15 +6,15 @@ 0 0 - 520 - 60 + 735 + 85 Form - + @@ -30,8 +30,8 @@ - 40 - 20 + 57 + 28 @@ -39,14 +39,14 @@ - + - Pág. 2 of 3 + Pág. 2 of 3 0 @@ -56,7 +56,7 @@ - + @@ -67,8 +67,8 @@ - 40 - 20 + 57 + 28 @@ -82,6 +82,6 @@
SilentQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqViewer/ui/ViewerWikipediaDefinitionPopup.ui b/bqViewer/ui/ViewerWikipediaDefinitionPopup.ui index ff6452d..212a98b 100644 --- a/bqViewer/ui/ViewerWikipediaDefinitionPopup.ui +++ b/bqViewer/ui/ViewerWikipediaDefinitionPopup.ui @@ -6,27 +6,27 @@ 0 0 - 758 - 1024 + 1072 + 1448 - 758 - 1024 + 0 + 0 - 758 - 1024 + 1072 + 1448 Form - + @@ -42,8 +42,8 @@ - 20 - 40 + 28 + 57 @@ -67,8 +67,8 @@ - 10000 - 10000 + 14142 + 14142 @@ -89,7 +89,7 @@ 16777215 - 98 + 139 @@ -121,7 +121,7 @@ - + @@ -137,7 +137,7 @@ Qt::NoFocus - + @@ -156,7 +156,7 @@ - + 0 @@ -166,7 +166,7 @@ - + 0 @@ -180,8 +180,8 @@ - 40 - 20 + 57 + 28 @@ -216,7 +216,7 @@ 16777215 - 24 + 34 @@ -224,12 +224,12 @@ 50 2 - 40 - 27 + 57 + 38 - + 0 @@ -247,8 +247,8 @@ - 20 - 40 + 28 + 57 @@ -268,8 +268,6 @@ 1 - - - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/old/BookSummary.ui b/bqViewer/ui/old/BookSummary.ui index 8422d9f..c6cdf33 100755 --- a/bqViewer/ui/old/BookSummary.ui +++ b/bqViewer/ui/old/BookSummary.ui @@ -14,7 +14,7 @@ Form - + @@ -47,7 +47,7 @@ Qt::NoFocus - + @@ -86,7 +86,7 @@ 0 - + @@ -95,14 +95,14 @@ - + 0 - + @@ -111,14 +111,14 @@ - + 0 - + @@ -128,19 +128,19 @@ - 16 - 9 + 11 + 6 - + 0 - + @@ -150,19 +150,19 @@ - 20 - 9 + 14 + 6 - + 0 - + @@ -172,22 +172,22 @@ - 15 - 13 + 11 + 9 - + - + 0 - + Qt::Vertical @@ -200,7 +200,7 @@ - + Qt::Vertical @@ -213,7 +213,7 @@ - + @@ -223,19 +223,19 @@ - 20 - 175 + 14 + 124 - + 0 - + @@ -244,14 +244,14 @@ - + 0 - + Qt::Vertical @@ -264,7 +264,7 @@ - + @@ -274,19 +274,19 @@ - 20 - 13 + 14 + 9 - + 0 - + @@ -296,19 +296,19 @@ - 16 - 175 + 11 + 124 - + 0 - + Qt::Vertical @@ -324,7 +324,7 @@ - + Qt::Vertical @@ -340,7 +340,7 @@ - + Qt::Vertical @@ -391,7 +391,7 @@ - Camilla Läckberg + Camilla Läckberg @@ -407,10 +407,10 @@ - + - 9,95€ + 9,95€ 0 @@ -458,7 +458,7 @@ Qt::NoFocus - Más acciones + Más acciones @@ -536,19 +536,19 @@ - 555 - 355 + 392 + 251 1 - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ssdsdsdsd</p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ssdsdsdsd</p></body></html> 1 @@ -566,7 +566,7 @@ p, li { white-space: pre-wrap; } 0 - + @@ -601,7 +601,7 @@ p, li { white-space: pre-wrap; } - + 0 @@ -611,6 +611,6 @@ p, li { white-space: pre-wrap; } - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/old/BooksFilterLayer.ui b/bqViewer/ui/old/BooksFilterLayer.ui index b9256d8..f21cefd 100755 --- a/bqViewer/ui/old/BooksFilterLayer.ui +++ b/bqViewer/ui/old/BooksFilterLayer.ui @@ -12,8 +12,8 @@ - 360 - 330 + 0 + 0 @@ -26,7 +26,7 @@ Form - + @@ -53,7 +53,7 @@ - + 0 @@ -143,7 +143,7 @@ - Explorar "Memoria Interna" + Explorar "Memoria Interna" @@ -156,7 +156,7 @@ - Explorar "Tarjeta SD" + Explorar "Tarjeta SD" @@ -165,8 +165,6 @@ - - - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/old/DictionariesLayer.ui b/bqViewer/ui/old/DictionariesLayer.ui index b9256d8..9664857 100755 --- a/bqViewer/ui/old/DictionariesLayer.ui +++ b/bqViewer/ui/old/DictionariesLayer.ui @@ -12,8 +12,8 @@ - 360 - 330 + 255 + 233 @@ -26,7 +26,7 @@ Form - + @@ -53,7 +53,7 @@ - + 0 @@ -143,7 +143,7 @@ - Explorar "Memoria Interna" + Explorar "Memoria Interna" @@ -156,7 +156,7 @@ - Explorar "Tarjeta SD" + Explorar "Tarjeta SD" @@ -166,7 +166,7 @@ - + - - + + \ No newline at end of file diff --git a/bqViewer/ui/old/ElfBookmark.ui b/bqViewer/ui/old/ElfBookmark.ui index e9ee7ea..aa57c3f 100755 --- a/bqViewer/ui/old/ElfBookmark.ui +++ b/bqViewer/ui/old/ElfBookmark.ui @@ -39,15 +39,15 @@ height:41px; - + - + - + - - + + \ No newline at end of file diff --git a/bqViewer/ui/old/ElfPageHandler.ui b/bqViewer/ui/old/ElfPageHandler.ui index c8a80bc..8b7c68b 100755 --- a/bqViewer/ui/old/ElfPageHandler.ui +++ b/bqViewer/ui/old/ElfPageHandler.ui @@ -76,7 +76,7 @@ - 200 + 141 0 @@ -122,13 +122,13 @@ 24 - + - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/old/ElfSearch.ui b/bqViewer/ui/old/ElfSearch.ui index 08f3720..b95c112 100755 --- a/bqViewer/ui/old/ElfSearch.ui +++ b/bqViewer/ui/old/ElfSearch.ui @@ -12,8 +12,8 @@ - 600 - 750 + 0 + 0 @@ -26,7 +26,7 @@ Form - + @@ -45,8 +45,8 @@ - 600 - 745 + 424 + 527 @@ -56,7 +56,7 @@ - + QFrame::StyledPanel @@ -88,7 +88,7 @@ 0 - 55 + 39 @@ -98,7 +98,7 @@ - + @@ -107,7 +107,7 @@ 0 - 640 + 453 @@ -128,7 +128,7 @@ 0 - 45 + 32 @@ -183,7 +183,7 @@ - "touch" + "touch" @@ -252,7 +252,7 @@ 0 - 53 + 37 @@ -280,6 +280,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/old/Highlight.ui b/bqViewer/ui/old/Highlight.ui index 6ac8084..14c2f99 100755 --- a/bqViewer/ui/old/Highlight.ui +++ b/bqViewer/ui/old/Highlight.ui @@ -39,15 +39,15 @@ height:41px; - + - + - + - - + + \ No newline at end of file diff --git a/bqViewer/ui/old/Note.ui b/bqViewer/ui/old/Note.ui index 5672704..dd1d100 100755 --- a/bqViewer/ui/old/Note.ui +++ b/bqViewer/ui/old/Note.ui @@ -12,8 +12,8 @@ - 50 - 50 + 0 + 0 @@ -46,8 +46,8 @@ height:41px; - 50 - 50 + 35 + 35 @@ -67,7 +67,7 @@ height:41px; - 27 + 19 0 @@ -84,7 +84,7 @@ height:41px; - + @@ -101,6 +101,6 @@ height:41px; - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/old/SearchContextMenu.ui b/bqViewer/ui/old/SearchContextMenu.ui index 388b267..6d0c71c 100755 --- a/bqViewer/ui/old/SearchContextMenu.ui +++ b/bqViewer/ui/old/SearchContextMenu.ui @@ -12,8 +12,8 @@ - 575 - 60 + 407 + 42 @@ -29,10 +29,10 @@ Form - + - + @@ -107,7 +107,7 @@ - + 7 @@ -117,7 +117,7 @@ - + of @@ -127,7 +127,7 @@ - + 100 @@ -146,7 +146,7 @@ Qt::NoFocus - + @@ -162,7 +162,7 @@ Qt::NoFocus - + @@ -226,7 +226,7 @@ - + - - + + \ No newline at end of file diff --git a/bqViewer/ui/old/SearchForm.ui b/bqViewer/ui/old/SearchForm.ui index 2d3407d..dce47c6 100755 --- a/bqViewer/ui/old/SearchForm.ui +++ b/bqViewer/ui/old/SearchForm.ui @@ -23,7 +23,7 @@ Form - + @@ -38,10 +38,10 @@ Qt::NoFocus - + - + @@ -78,8 +78,8 @@ - 150 - 50 + 106 + 35 @@ -110,8 +110,8 @@ - 419 - 34 + 296 + 24 @@ -121,7 +121,7 @@ - + Enter text to search here... @@ -203,8 +203,8 @@ - 84 - 35 + 59 + 25 @@ -217,7 +217,7 @@ Qt::NoFocus - + Search @@ -239,6 +239,6 @@
MyQLineEdit.h
- - - + + + \ No newline at end of file diff --git a/bqViewer/ui/old/bqContentsItem.ui b/bqViewer/ui/old/bqContentsItem.ui index a27c488..89a1eae 100755 --- a/bqViewer/ui/old/bqContentsItem.ui +++ b/bqViewer/ui/old/bqContentsItem.ui @@ -12,8 +12,8 @@ - 570 - 55 + 0 + 0 @@ -29,7 +29,7 @@ Form - + @@ -42,8 +42,8 @@ - 572 - 54 + 404 + 38 @@ -100,7 +100,7 @@ 0 - 45 + 32 @@ -138,7 +138,7 @@ - + Chapter 2. Page 10 @@ -158,6 +158,6 @@ - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/old/bqSearch.ui b/bqViewer/ui/old/bqSearch.ui index 1e4544b..52da8e0 100755 --- a/bqViewer/ui/old/bqSearch.ui +++ b/bqViewer/ui/old/bqSearch.ui @@ -12,8 +12,8 @@ - 600 - 745 + 0 + 0 @@ -46,8 +46,8 @@ height:41px; - 600 - 745 + 424 + 527 @@ -57,7 +57,7 @@ height:41px; - + QFrame::StyledPanel @@ -77,7 +77,7 @@ height:41px; 0 - 55 + 39 @@ -87,7 +87,7 @@ height:41px; - + @@ -102,7 +102,7 @@ height:41px; 0 - 45 + 32 @@ -157,7 +157,7 @@ height:41px; - "touch" + "touch" @@ -188,7 +188,7 @@ height:41px; 0 - 588 + 416 @@ -249,7 +249,7 @@ height:41px; 0 - 55 + 39 @@ -275,8 +275,6 @@ height:41px; 1 - - - - - + + + \ No newline at end of file diff --git a/bqViewer/ui/old/bqSearchForm.ui b/bqViewer/ui/old/bqSearchForm.ui index 4e1ba70..72e0831 100755 --- a/bqViewer/ui/old/bqSearchForm.ui +++ b/bqViewer/ui/old/bqSearchForm.ui @@ -12,8 +12,8 @@ - 570 - 55 + 0 + 0 @@ -29,7 +29,7 @@ Form - + @@ -44,10 +44,10 @@ Qt::NoFocus - + - + @@ -62,7 +62,7 @@ 0 - 55 + 39 @@ -91,8 +91,8 @@ - 99 - 50 + 70 + 35 @@ -105,10 +105,10 @@ Qt::NoFocus - + - Atrás + Atrás @@ -116,8 +116,8 @@ - 448 - 37 + 317 + 26 @@ -127,7 +127,7 @@ - + Enter text to search... @@ -140,17 +140,17 @@ clearSearchLine - - FastQPushButton - QPushButton -
FastQPushButton.h
- MyQLineEdit QLineEdit
MyQLineEdit.h
 + + FastQPushButton + QPushButton +
FastQPushButton.h
+ - - - + + + \ No newline at end of file diff --git a/bqWebStore/WebStore1448.qrc b/bqWebStore/WebStore1448.qrc new file mode 100755 index 0000000..4a36663 --- /dev/null +++ b/bqWebStore/WebStore1448.qrc @@ -0,0 +1,6 @@ + + + res/1448/bqwebstore_styles.qss + res/bqwebstore_styles_generic.qss + + diff --git a/bqWebStore/bqWebStore.pri b/bqWebStore/bqWebStore.pri index 9882734..2bcfe62 100755 --- a/bqWebStore/bqWebStore.pri +++ b/bqWebStore/bqWebStore.pri @@ -13,4 +13,4 @@ TRANSLATIONS = tr/WebStore_es.ts \ tr/WebStore_de.ts \ tr/WebStore_it.ts -QRC_FILES += WebStore800.qrc WebStore1024.qrc +QRC_FILES += WebStore800.qrc WebStore1024.qrc WebStore1448.qrc diff --git a/bqBrowser/res/elf_web_styles.qss b/bqWebStore/res/1448/bqwebstore_styles.qss similarity index 81% rename from bqBrowser/res/elf_web_styles.qss rename to bqWebStore/res/1448/bqwebstore_styles.qss index 310e0f7..ab34b32 100644 --- a/bqBrowser/res/elf_web_styles.qss +++ b/bqWebStore/res/1448/bqwebstore_styles.qss @@ -18,3 +18,11 @@ along with the source code. If not, see . *************************************************************************/ +/*WebStore +----------------------------*/ +#WebStore, #webStore, WebStore, webStore,#webview, BrowserCommonWebView{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} diff --git a/bqWizard/Wizard1024.qrc~ b/bqWizard/Wizard1024.qrc~ deleted file mode 100755 index dea2f48..0000000 --- a/bqWizard/Wizard1024.qrc~ +++ /dev/null @@ -1,9 +0,0 @@ - - - res/1024/bg_wizard.png - res/1024/check_ico.png - res/1024/ok_wizard.png - res/wizard_styles_generic.qss - res/1024/wizard_styles.qss - - diff --git a/bqWizard/Wizard1448.qrc b/bqWizard/Wizard1448.qrc new file mode 100755 index 0000000..f4e3ff2 --- /dev/null +++ b/bqWizard/Wizard1448.qrc @@ -0,0 +1,10 @@ + + + res/1448/bg_wizard.png + res/1448/check_ico.png + res/1448/ok_wizard.png + res/wizard_styles_generic.qss + res/1448/wizard_styles.qss + res/1448/activate-device.png + + diff --git a/bqWizard/bqWizard.pri b/bqWizard/bqWizard.pri index 077b42d..7ce607f 100755 --- a/bqWizard/bqWizard.pri +++ b/bqWizard/bqWizard.pri @@ -37,11 +37,12 @@ FORMS += ./ui/WizardWelcome.ui \ ./ui/WizardPagerCont.ui -QRC_FILES += Wizard800.qrc Wizard1024.qrc +QRC_FILES += Wizard800.qrc Wizard1024.qrc Wizard1448.qrc OTHER_FILES += \ bqWizard/res/wizard_styles_generic.qss \ bqWizard/res/800/wizard_styles.qss \ - bqWizard/res/1024/wizard_styles.qss + bqWizard/res/1024/wizard_styles.qss \ + bqWizard/res/1448/wizard_styles.qss diff --git a/bqWizard/res/1448/activate-device.png b/bqWizard/res/1448/activate-device.png new file mode 100755 index 0000000..84f5596 Binary files /dev/null and b/bqWizard/res/1448/activate-device.png differ diff --git a/bqWizard/res/1448/bg_wizard.png b/bqWizard/res/1448/bg_wizard.png new file mode 100755 index 0000000..84a5bb1 Binary files /dev/null and b/bqWizard/res/1448/bg_wizard.png differ diff --git a/bqWizard/res/1448/check_ico.png b/bqWizard/res/1448/check_ico.png new file mode 100755 index 0000000..9b9d6d5 Binary files /dev/null and b/bqWizard/res/1448/check_ico.png differ diff --git a/bqWizard/res/1448/ok_wizard.png b/bqWizard/res/1448/ok_wizard.png new file mode 100755 index 0000000..8416197 Binary files /dev/null and b/bqWizard/res/1448/ok_wizard.png differ diff --git a/bqWizard/res/1448/wizard_styles.qss b/bqWizard/res/1448/wizard_styles.qss new file mode 100644 index 0000000..8d8c823 --- /dev/null +++ b/bqWizard/res/1448/wizard_styles.qss @@ -0,0 +1,262 @@ +/************************************************************************* + +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 . + +*************************************************************************/ + +/* Wizard +--------------------------------------------------*/ +#WizardFooterButtons { +min-height: 195px; +max-height: 195px; +} +#actionButtonsWizardCont QPushButton, #WizardFooterButtons QPushButton{ +min-width: 0px; +max-width: 494px; +min-height: 109px; +max-height: 109px; +font-size: 33px; +border-radius: 7px; +border-width: 3px; +margin: 0px 17px; +} + +/*SelectLanguage +-------------------*/ +#WizardLanguage{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#LanguageMenuListCont { +margin: 0px 35px; +border-width: 3px; +border-radius: 14px; +} +#LanguageMenuListCont QPushButton{ +min-height: 106px; +max-height: 106px; +margin: 1px 35px; +padding: 0px 0px 0px 54px; +margin: 0px 42px; +font-size: 42px; +border-bottom-width: 1px; +} +#languageHeaderCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 96px; +max-height: 96px; +} +#languageHeaderCont #langTitleLbl{ +margin: 0px 0px 0px 35px; +font-size: 35px; +} +#wizardLanguageMarginTop{ +min-height: 72px; +max-height: 72px; +} +#WizardLanguage #stepInfoLabel{ +margin: 42px 0px; +font-size: 38px +} +/*WizardWelcome +----------------------*/ +#WizardWelcome{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#wizardWelcomeCont { +margin: 11px 42px 21px 42px; +border-width: 3px; +border-radius: 14px; +} +#welcomeHeaderCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 96px; +max-height: 96px; +} +#activateIconLbl{ +margin: 57px 0px 28px 0px; +} +#welcomeHeaderCont #welcomeTitleLbl{ +margin: 0px 0px 0px 35px; +font-size: 35px; +} +#activateIconLbl{ +min-height: 255px; +max-height: 255px; +} +#WizardFooterButtons QPushButton{ +} +#WizardWelcome #logo{ +min-width: 144px; +max-width: 144px; +min-height: 144px; +max-height: 144px; +} +#WizardFooterButtons #nextStepBtn{ +} +#WizardWelcome #skipBtn{ +border-radius: 7px; +border-width: 3px; +} +#WizardWelcome #welcomeLbl{ +margin: 325px 0px 35px 0px; +font-size: 72px; +} +#WizardWelcome #enyoyLbl, #WizardWelcome #isTouchLbl{ +padding: 40px 91px; +font-size: 40px; +} +#WizardWelcome #intro1Lbl{ +padding: 14px 91px; +font-size: 40px; +} +#WizardWelcome #intro2Lbl{ +padding: 14px 91px 0px 91px; +font-size: 40px; +} +#WizardWelcome #intro3Lbl{ +padding: 0px 91px 14px 91px; +font-size: 40px; +} +#WizardWelcome #introLbl{ +padding: 45px 91px; +font-size: 34px; +} +/*WizardFinish +-------------------------------*/ +#WizardFinish{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#WizardFinish #proccessOkLbl{ +min-height: 272px; +max-height: 272px; +} +#WizardFinish #finishOkLbl{ +margin: 181px 0px 35px 0px; +font-size: 45px; +font-weight:bold; +} +#WizardFinish #linkLbl{ +font-size: 35px; +} +/*WizardDateTime +-------------------*/ +#WizardDateTime{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#DateTimeMenuListCont { +margin: 0px 35px; +border-width: 3px; +border-radius: 14px; +} +#DateTimeMenuListCont QWidget{ +min-height: 144px; +max-height: 144px; +margin: 1px 35px; +padding: 0px 0px 0px 54px; +margin: 0px 42px; +border-bottom-width: 1px; +} +#dateTimeHeaderCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 96px; +max-height: 96px; +} +#dateTimeHeaderCont #dateTimeTitleLbl{ +margin: 0px 0px 0px 35px; +font-size: 35px; +} +#WizardDateTime #stepInfoLabel{ +margin: 81px 0px 42px 0px; +font-size: 38px; +} +#WizardDateTime #autoTimeLabel{ +margin: 10px 14px 81px; +font-size: 28px; +} +/*TimeZomeItem +------------------------*/ +#WizardDateTimeMenuItem{ +min-width: 1117px; +max-width: 1117px; +min-height: 141px; +max-height: 141px; +} +#DateTimeMenuItemCont{ +min-height: 141px; +max-height: 141px; +} +#DateTimeMenuItemCont #timeZoneCountriesLbl{ +padding: 17px 0px 14px 82px; +margin: 0px; +font-size: 42px; +} +#DateTimeMenuItemCont #gtmLbl{ +padding: 0px 0px 0px 82px; +margin: 0px; +font-size: 42px; +} +#checkTimezoneLbl{ +min-width: 127px; +max-width: 127px; +} +/*WizardPagerCont +------------------------*/ +#WizardPagerCont,#wizardPagerCont{ +margin: 0px 40px 4px 40px; +min-height: 109px; +max-height: 109px; +/*border-top-width: 1px;*/ +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +} +#DateTimeMenuListCont #WizardPagerCont QLabel,#DateTimeMenuListCont #wizardPagerCont QLabel{ +margin: 0px; +padding: 0px 4px 0px 4px; +} +#WizardPagerCont #downPageBtn,#wizardPagerCont #downPageBtn{ +min-width: 82px; +max-width: 82px; +min-height: 82px; +max-height: 82px; +margin: 0px 0px 0px 54px; +} +#WizardPagerCont #upPageBtn,#wizardPagerCont #upPageBtn{ +min-width: 82px; +max-width: 82px; +min-height: 82px; +max-height: 82px; +margin: 0px 45px 0px 0px; +} +#pageLbl, #currentPageLbl, #ofLbl, #totalPagesLbl{ +padding: 0px 0px 0px 8px; +font-size: 31px; +} diff --git a/bqWizard/tr/bqWizard_ca.ts b/bqWizard/tr/bqWizard_ca.ts index bb73f5e..059c39c 100755 --- a/bqWizard/tr/bqWizard_ca.ts +++ b/bqWizard/tr/bqWizard_ca.ts @@ -306,7 +306,7 @@ p, li { white-space: pre-wrap; } Activar dispositivo - Activar dispositiu + Activa el dispositiu @@ -318,12 +318,12 @@ p, li { white-space: pre-wrap; } Si dispones de acceso a una red Wi-Fi haz clic en el botón “SIGUIENTE”, en caso contrario pulsa “MÁS TARDE”. -Si disposes d'accés a una xarxa Wi-Fi fes clic al botó “SEGÜENT”, en cas contrari prem “MÉS TARD”. +Si pots accedir a una xarxa Wi-Fi, fes clic al botó "SEGÜENT". En cas contrari, prem "MÉS TARD". Podrás realizar el proceso de activación en cualquier otro momento desde el menú Ajustes, seleccionando la opción “Activar dispositivo”. - Podràs realitzar el procés d'activació en qualsevol altre moment des del menú Ajusts, seleccionant l'opció “Activar dispositiu”. + Podrà realitzar el procés d'activació en qualsevol altre moment des del menú "Configuració", "Activa el dispositiu" diff --git a/bqWizard/tr/bqWizard_pt.ts b/bqWizard/tr/bqWizard_pt.ts index 47bc757..f876a65 100755 --- a/bqWizard/tr/bqWizard_pt.ts +++ b/bqWizard/tr/bqWizard_pt.ts @@ -261,7 +261,7 @@ p, li { white-space: pre-wrap; } Idioma / Language - Língua + Idioma diff --git a/bqWizard/ui/WizardDateTime.ui b/bqWizard/ui/WizardDateTime.ui index f0db36a..416c004 100755 --- a/bqWizard/ui/WizardDateTime.ui +++ b/bqWizard/ui/WizardDateTime.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 800 + 849 + 1131 @@ -18,14 +18,14 @@ - 600 - 800 + 0 + 0 - 600 - 800 + 849 + 1131 @@ -35,7 +35,7 @@ Form - + @@ -60,8 +60,8 @@ - 500 - 35 + 707 + 49 @@ -201,8 +201,8 @@ - 10000 - 81 + 14142 + 115 @@ -217,7 +217,7 @@ - + @@ -230,8 +230,8 @@ - 20 - 287 + 28 + 406 @@ -252,6 +252,6 @@ 1 - - - + + + \ No newline at end of file diff --git a/bqWizard/ui/WizardDateTimeItem.ui b/bqWizard/ui/WizardDateTimeItem.ui index c027b99..28aabde 100755 --- a/bqWizard/ui/WizardDateTimeItem.ui +++ b/bqWizard/ui/WizardDateTimeItem.ui @@ -6,15 +6,15 @@ 0 0 - 594 - 74 + 840 + 105 Form - + @@ -49,7 +49,7 @@ 16777215 - 70 + 99 @@ -103,10 +103,10 @@ - + - + @@ -120,8 +120,8 @@ - 15 - 20 + 21 + 28 @@ -131,6 +131,6 @@ - - - + + + \ No newline at end of file diff --git a/bqWizard/ui/WizardFinish.ui b/bqWizard/ui/WizardFinish.ui index d425b7e..c01ec4f 100755 --- a/bqWizard/ui/WizardFinish.ui +++ b/bqWizard/ui/WizardFinish.ui @@ -6,8 +6,8 @@ 0 0 - 758 - 1024 + 1072 + 1448 @@ -24,15 +24,15 @@ - 758 - 1024 + 1072 + 1448 Form - + @@ -70,11 +70,11 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;"></p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;"></p></body></html> Qt::AlignCenter @@ -84,7 +84,7 @@ p, li { white-space: pre-wrap; } - + @@ -95,8 +95,8 @@ p, li { white-space: pre-wrap; } - 20 - 511 + 28 + 723 @@ -126,7 +126,7 @@ p, li { white-space: pre-wrap; } - + - - + + \ No newline at end of file diff --git a/bqWizard/ui/WizardGeneralTerms.ui b/bqWizard/ui/WizardGeneralTerms.ui index 430747a..4c239c1 100755 --- a/bqWizard/ui/WizardGeneralTerms.ui +++ b/bqWizard/ui/WizardGeneralTerms.ui @@ -6,35 +6,35 @@ 0 0 - 600 - 800 + 849 + 1131 - 600 - 800 + 0 + 0 - 600 - 800 + 849 + 1131 Form - + 0 0 - 600 - 800 + 849 + 1131 @@ -45,8 +45,8 @@ - 600 - 800 + 849 + 1131 @@ -87,8 +87,8 @@ - 500 - 35 + 707 + 49 @@ -132,19 +132,19 @@ 16777215 - 510 + 721 - + 0 0 - 580 - 510 + 820 + 721 @@ -155,21 +155,21 @@ - 580 - 510 + 820 + 721 - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p align="justify" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:18pt; font-weight:600;">1 Política de privacidad Fnac.es</span></p> -<p align="justify" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">En cumplimiento de lo establecido en el Reglamento de desarrollo de la Ley Orgánica de Protección de Datos 15/1999 de 13 de diciembre, aprobado por Real Decreto 1720/2007 de 21 de diciembre, en la Ley 34/2002, de 11 de julio, de Servicios de la sociedad de la información y comercio electrónico y demás disposiciones dictadas en su desarrollo, de 13 de Diciembre, de Protección de Datos de Carácter Personal, Fnac.es te informa de la existencia de un fichero de datos de carácter personal creado por y bajo la responsabilidad de Fnac.es con los datos obtenidos en el website www.fnac.es. La finalidad de dicho fichero es gestionar tu relación contractual con nosotros, así como la realización de actividades promocionales y publicitarias propias o de terceros mediante cualquier medio, incluyendo el envío de mensajes comerciales a través de SMS, email, y correo postal etc., que puedan ser de tu interés, a partir del estudio y segmentación los datos recabados durante la navegación por el website, de los datos proporcionados mediante la cumplimentación de cualquier formulario, así como los derivados de la relación comercial o entrega de los productos comprados. Si no deseas recibir publicidad, sólo tienes que entrar en tu cuenta y desactivar el envío de Newsletter e informaciones.</span></p> -<p align="justify" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">En cumplimiento de lo dispuesto en la Ley Orgánica 15/1999 de 13 de Diciembre, los clientes y usuarios de www.fnac.es pueden, en todo momento, ejercitar los derechos de acceso, rectificación, cancelación y oposición sobre sus datos personales comunicándolo por escrito a: Fnac.es ESPAÑA. Departamento de Atención al Cliente, C/ Mariano Benlliure s/n – 28529 Rivas de Vaciamadrid (Madrid) o bien mediante el envío de un correo electrónico a la dirección clientes@fnac.es, donde se indicará el nombre y apellidos, usuario e email con el que se dio de alta, y adjuntando en ambos casos fotocopia del DNI del usuario. En el caso que los datos suministrados estén asociados a una compra, la legislación española nos obliga a mantenerlos al menos durante cinco años por lo que no se podrán borrar ni rectificar aunque el cliente así lo solicite.</span></p> -<p align="justify" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">Fnac.es se compromete en la utilización de los datos incluidos en el fichero, a respetar su confidencialidad y a utilizarlos de acuerdo con la finalidad del fichero, así como a dar cumplimiento a su obligación de guardarlos y adaptar todas las medidas para evitar la alteración, pérdida, tratamiento o acceso no autorizado, de acuerdo con lo establecimiento en el Reglamento de Medidas de Seguridad de los ficheros automatizados que contengan datos de carácter personal, aprobando por el Real Decreto 994/1999, de 11 de julio. Nuestro servidor seguro garantiza la privacidad de los datos que nos transmites. Dicha privacidad se consigue mediante el protocolo SSL, encriptando los datos enviados mediante el sistema de cifrado RSA, de forma que nadie pueda apropiarse de ellos ya que no dispone de la clave necesaria. Puedes comprobar que tu navegador es seguro si aparece el símbolo del candado y también se puede apreciar que la URL varía ligeramente: ya no empieza con http sino con https.</span></p> -<p align="justify" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">Fnac.es forma parte de la Asociación Española de Comercio Electrónico (AECEM) (www.aecem.org) y ha aceptado su Código Ético, en lo que se refiere al tratamiento de los datos de carácter personal. Asimismo, Fnac.es se encuentra adherida a Confianza Online, sistema de resolución de las posibles controversias que se puedan dar entre consumidores y empresas en el ámbito del Comercio Electrónico y la Publicidad Interactiva.</span></p> -<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;"><br /></p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p align="justify" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:18pt; font-weight:600;">1 Política de privacidad Fnac.es</span></p> +<p align="justify" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">En cumplimiento de lo establecido en el Reglamento de desarrollo de la Ley Orgánica de Protección de Datos 15/1999 de 13 de diciembre, aprobado por Real Decreto 1720/2007 de 21 de diciembre, en la Ley 34/2002, de 11 de julio, de Servicios de la sociedad de la información y comercio electrónico y demás disposiciones dictadas en su desarrollo, de 13 de Diciembre, de Protección de Datos de Carácter Personal, Fnac.es te informa de la existencia de un fichero de datos de carácter personal creado por y bajo la responsabilidad de Fnac.es con los datos obtenidos en el website www.fnac.es. La finalidad de dicho fichero es gestionar tu relación contractual con nosotros, así como la realización de actividades promocionales y publicitarias propias o de terceros mediante cualquier medio, incluyendo el envío de mensajes comerciales a través de SMS, email, y correo postal etc., que puedan ser de tu interés, a partir del estudio y segmentación los datos recabados durante la navegación por el website, de los datos proporcionados mediante la cumplimentación de cualquier formulario, así como los derivados de la relación comercial o entrega de los productos comprados. Si no deseas recibir publicidad, sólo tienes que entrar en tu cuenta y desactivar el envío de Newsletter e informaciones.</span></p> +<p align="justify" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">En cumplimiento de lo dispuesto en la Ley Orgánica 15/1999 de 13 de Diciembre, los clientes y usuarios de www.fnac.es pueden, en todo momento, ejercitar los derechos de acceso, rectificación, cancelación y oposición sobre sus datos personales comunicándolo por escrito a: Fnac.es ESPAÑA. Departamento de Atención al Cliente, C/ Mariano Benlliure s/n – 28529 Rivas de Vaciamadrid (Madrid) o bien mediante el envío de un correo electrónico a la dirección clientes@fnac.es, donde se indicará el nombre y apellidos, usuario e email con el que se dio de alta, y adjuntando en ambos casos fotocopia del DNI del usuario. En el caso que los datos suministrados estén asociados a una compra, la legislación española nos obliga a mantenerlos al menos durante cinco años por lo que no se podrán borrar ni rectificar aunque el cliente así lo solicite.</span></p> +<p align="justify" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">Fnac.es se compromete en la utilización de los datos incluidos en el fichero, a respetar su confidencialidad y a utilizarlos de acuerdo con la finalidad del fichero, así como a dar cumplimiento a su obligación de guardarlos y adaptar todas las medidas para evitar la alteración, pérdida, tratamiento o acceso no autorizado, de acuerdo con lo establecimiento en el Reglamento de Medidas de Seguridad de los ficheros automatizados que contengan datos de carácter personal, aprobando por el Real Decreto 994/1999, de 11 de julio. Nuestro servidor seguro garantiza la privacidad de los datos que nos transmites. Dicha privacidad se consigue mediante el protocolo SSL, encriptando los datos enviados mediante el sistema de cifrado RSA, de forma que nadie pueda apropiarse de ellos ya que no dispone de la clave necesaria. Puedes comprobar que tu navegador es seguro si aparece el símbolo del candado y también se puede apreciar que la URL varía ligeramente: ya no empieza con http sino con https.</span></p> +<p align="justify" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">Fnac.es forma parte de la Asociación Española de Comercio Electrónico (AECEM) (www.aecem.org) y ha aceptado su Código Ético, en lo que se refiere al tratamiento de los datos de carácter personal. Asimismo, Fnac.es se encuentra adherida a Confianza Online, sistema de resolución de las posibles controversias que se puedan dar entre consumidores y empresas en el ámbito del Comercio Electrónico y la Publicidad Interactiva.</span></p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;"><br /></p></body></html> @@ -184,8 +184,8 @@ p, li { white-space: pre-wrap; } - 20 - 40 + 28 + 57 @@ -215,8 +215,8 @@ p, li { white-space: pre-wrap; } - 40 - 20 + 57 + 28 @@ -234,8 +234,6 @@ p, li { white-space: pre-wrap; } - - - - - + + + \ No newline at end of file diff --git a/bqWizard/ui/WizardLanguage.ui b/bqWizard/ui/WizardLanguage.ui index c8d9135..f46e93f 100755 --- a/bqWizard/ui/WizardLanguage.ui +++ b/bqWizard/ui/WizardLanguage.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 800 + 849 + 1131 @@ -18,14 +18,14 @@ - 600 - 800 + 0 + 0 - 600 - 800 + 849 + 1131 @@ -35,7 +35,7 @@ Form - + @@ -75,15 +75,15 @@ - 60 - 50 + 85 + 71 - + - + @@ -103,8 +103,8 @@ - 10000 - 35 + 14142 + 49 @@ -125,8 +125,8 @@ - 60 - 20 + 85 + 28 @@ -134,16 +134,16 @@ - - - - QFrame::StyledPanel - - - QFrame::Raised - - - + + + + QFrame::StyledPanel + + + QFrame::Raised + + + @@ -174,7 +174,7 @@ Qt::NoFocus - Español + Español @@ -196,7 +196,7 @@ Qt::NoFocus - Català + Català @@ -306,7 +306,7 @@ Qt::NoFocus - Français + Français @@ -328,7 +328,7 @@ Qt::NoFocus - Português + Português @@ -364,14 +364,14 @@ - 20 - 287 + 28 + 406 - - - + + + \ No newline at end of file diff --git a/bqWizard/ui/WizardPagerCont.ui b/bqWizard/ui/WizardPagerCont.ui index bdea145..04d4461 100755 --- a/bqWizard/ui/WizardPagerCont.ui +++ b/bqWizard/ui/WizardPagerCont.ui @@ -6,15 +6,15 @@ 0 0 - 560 - 62 + 792 + 88 Form - + @@ -30,8 +30,8 @@ - 40 - 20 + 57 + 28 @@ -45,7 +45,7 @@ - + @@ -61,7 +61,7 @@ Qt::NoFocus - + @@ -141,7 +141,7 @@ Qt::NoFocus - + @@ -154,7 +154,7 @@ - + @@ -165,8 +165,8 @@ - 40 - 20 + 57 + 28 @@ -180,6 +180,6 @@
SilentQPushButton.h
- - - + + + \ No newline at end of file diff --git a/bqWizard/ui/WizardWelcome.ui b/bqWizard/ui/WizardWelcome.ui index 1c6b7d2..72de909 100755 --- a/bqWizard/ui/WizardWelcome.ui +++ b/bqWizard/ui/WizardWelcome.ui @@ -6,27 +6,27 @@ 0 0 - 600 - 800 + 849 + 1131 - 600 - 800 + 0 + 0 - 600 - 800 + 849 + 1131 Form - + @@ -51,8 +51,8 @@ - 500 - 35 + 707 + 49 @@ -69,7 +69,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -113,7 +113,7 @@ 0 - El proceso de activación de tu dispositivo es necesario para poder habilitar algunos de los servicios de tu eReader (diccionarios, actualización automática “on the air”, tienda de libros...). Este proceso requiere de conexión a Internet mediante Wi-Fi. + El proceso de activación de tu dispositivo es necesario para poder habilitar algunos de los servicios de tu eReader (diccionarios, actualización automática “on the air”, tienda de libros...). Este proceso requiere de conexión a Internet mediante Wi-Fi. true @@ -133,7 +133,7 @@ -Si dispones de acceso a una red Wi-Fi haz clic en el botón “SIGUIENTE”, en caso contrario pulsa “MÁS TARDE”. +Si dispones de acceso a una red Wi-Fi haz clic en el botón “SIGUIENTE”, en caso contrario pulsa “MÁS TARDE”. true @@ -146,7 +146,7 @@ Si dispones de acceso a una red Wi-Fi haz clic en el botón “SIGUIENTE”, en - Podrás realizar el proceso de activación en cualquier otro momento desde el menú Ajustes, seleccionando la opción “Activar dispositivo”. + Podrás realizar el proceso de activación en cualquier otro momento desde el menú Ajustes, seleccionando la opción “Activar dispositivo”. true @@ -163,8 +163,8 @@ Si dispones de acceso a una red Wi-Fi haz clic en el botón “SIGUIENTE”, en - 20 - 40 + 28 + 57 @@ -199,7 +199,7 @@ Si dispones de acceso a una red Wi-Fi haz clic en el botón “SIGUIENTE”, en - Más tarde + Más tarde @@ -213,8 +213,8 @@ Si dispones de acceso a una red Wi-Fi haz clic en el botón “SIGUIENTE”, en - 40 - 20 + 57 + 28 @@ -235,8 +235,8 @@ Si dispones de acceso a una red Wi-Fi haz clic en el botón “SIGUIENTE”, en - 291 - 60 + 412 + 85 @@ -246,7 +246,7 @@ Si dispones de acceso a una red Wi-Fi haz clic en el botón “SIGUIENTE”, en Qt::LeftToRight - + Siguiente @@ -258,8 +258,6 @@ Si dispones de acceso a una red Wi-Fi haz clic en el botón “SIGUIENTE”, en - - - - - + + + \ No newline at end of file diff --git a/build.sh b/build.sh index c98aecc..f3d9e64 100755 --- a/build.sh +++ b/build.sh @@ -46,7 +46,7 @@ done # generate git version strings GIT_REV=`git rev-parse HEAD | cut -c1-6` -GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` +GIT_BRANCH=`git branch | sed -n -e 's/^\* \(.*\)/\1/p'` BUILD_DATE=`eval date +%Y%m%d_%H%M` export PRIVATE=$PRIVATE # set environment @@ -202,9 +202,9 @@ cd .. if [ "$OPT_HACKERS" == "no" ]; then if [ -f $PRIVATE/bqClientServices/bqClientServices.pro ]; then # Libreria bqClientServices - cd $PRIVATE/bqClientServices + cd $PRIVATE/bqClientServices - # generate git version strings for services + # generate git version strings for services GIT_VER_SERVICES=`git rev-parse HEAD | cut -c1-6` qmake || exit $? @@ -243,7 +243,7 @@ fi if [ ! -f gitversion.h ]; then echo "Creating new gitversion.h" - echo "#define GIT_VERSION \""$GIT_REV"_"$GIT_BRANCH"_"$BUILD_DATE"\"" >> gitversion.h + echo "#define GIT_VERSION \""$GIT_REV"_"$BUILD_DATE"\"" >> gitversion.h echo "#define ROOTFS_VERSION \"$ROOTFS_VERSION\"" >> gitversion.h echo "#define GIT_SERVICES_VERSION \"$GIT_VER_SERVICES\"" >> gitversion.h fi diff --git a/integrate.sh b/integrate.sh deleted file mode 100755 index d2284d1..0000000 --- a/integrate.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -echo Branch:$1 -echo User:$2 - -hg pull -b $1 $2 -hg up -C $1 -hg merge default -hg ci -m merge -hg up default -hg merge $1 -hg st -hg diff - -echo -n "Do you want to continue and merge? (y/N): " -read answer -if [ X$answer != "Xy" ]; then - echo "Aborting" - exit 1 -fi -echo -n "Enter commit message:" -read answer - -hg ci -v -m "$1: $answer" -hg up $1 -hg ci -v --close-branch -m closed -hg up default -hg push -b default -b $1 --new-branch diff --git a/metadata-extractor/src/MetaDataExtractor.cpp b/metadata-extractor/src/MetaDataExtractor.cpp index 33297bc..04850da 100644 --- a/metadata-extractor/src/MetaDataExtractor.cpp +++ b/metadata-extractor/src/MetaDataExtractor.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 @@ -81,6 +81,7 @@ bool MetaDataExtractor::getMetaData( const QString& filename, QString& title, QS || info.suffix().toLower() == "chm" || info.suffix().toLower() == "txt" || info.suffix().toLower() == "rtf" + || info.suffix().toLower() == "htm" || info.suffix().toLower() == "html") { title = QFileInfo(filename).baseName(); diff --git a/model/src/BookInfo.cpp b/model/src/BookInfo.cpp index 265a11f..79fa3e7 100644 --- a/model/src/BookInfo.cpp +++ b/model/src/BookInfo.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 @@ -680,7 +680,9 @@ bool BookInfo::isBook( const QString& path ) || suffix == "doc" || suffix == "mobi" || suffix == "txt" - || suffix == "rtf"); + || suffix == "rtf" + || suffix == "htm" + || suffix == "html"); } void BookInfo::setMarktoRemove(BookLocation* location){ diff --git a/model/src/ModelBackendOneFile.cpp b/model/src/ModelBackendOneFile.cpp index 89f92a0..50c12ff 100644 --- a/model/src/ModelBackendOneFile.cpp +++ b/model/src/ModelBackendOneFile.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 @@ -509,7 +509,7 @@ BookInfo* ModelBackendOneFile::loadBook (QXmlStreamReader& xml) } //Change the empty string for author to prevent extract the metadata again. - else if(info->author == "--") + else if(info->author == "---") info->author = QString("---"); return info; @@ -1024,6 +1024,10 @@ void ModelBackendOneFile::writeXmlFile( const BookInfo* bookInfo, const QString& xml.writeEndElement(); xml.writeEndDocument(); file.close(); + ::sync(); + BookInfo* notes = loadDefaultInfo(path); + add(notes); + delete notes; } void ModelBackendOneFile::writeHTMLFile( const BookInfo* bookInfo, const QString& destination) @@ -1041,10 +1045,7 @@ void ModelBackendOneFile::writeHTMLFile( const BookInfo* bookInfo, const QString QList::const_iterator it = locations->constBegin(); QList::const_iterator itEnd = locations->constEnd(); - html.append(""); - html.append(""); - html.append(""); - html.append(""); + html.append(""); while( it != itEnd ) { @@ -1055,10 +1056,13 @@ void ModelBackendOneFile::writeHTMLFile( const BookInfo* bookInfo, const QString ++it; } - html.append(""); - html.append(""); + html.append(""); file.write(html.toAscii().data()); file.close(); + ::sync(); + BookInfo* notes = loadDefaultInfo(path); + add(notes); + delete notes; } diff --git a/reqreview.sh b/reqreview.sh deleted file mode 100755 index 33de83e..0000000 --- a/reqreview.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -e - -if [ $# -ne 5 ] -then - echo "usage: ./reqreview " - exit 0 -fi - -hg diff -r $1 > diff.txt -/usr/local/bin/post-review --server=http://reviews/ --diff-file=diff.txt --summary="$2" --description="$3" --target-people=$4 -d --repository-url=/home/mr-dev/source --bugs-closed=$5 -p -rm diff.txt diff --git a/res/1448/common_styles.qss b/res/1448/common_styles.qss new file mode 100644 index 0000000..3874a5b --- /dev/null +++ b/res/1448/common_styles.qss @@ -0,0 +1,807 @@ +/************************************************************************* + +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 . + +*************************************************************************/ + +/* iCervantes +---------------------------------*/ +*{ +font-size: 37px; +} +QWidget#bqViewerCont { +} +QPushButton{ +outline: 0px; +font-size: 35px; +} +QHBoxLayout, QVBoxLayout{ +margin: 0px; +padding: 0px; +} +QFrame { +} +QLabel { +} +QLineEdit{ +min-height: 99px; +max-height: 99px; +padding: 0px 28px; +font-size: 35px; +border-width: 3px; +border-radius: 14px; +} +QTextEdit{ +padding: 35px; +} +QRadioButton,QCheckBox{ +} +QRadioButton::indicator,QCheckBox::indicator { +min-height: 106px; +max-height: 106px; +min-width: 99px; +max-width: 99px; +} +QCheckBox::indicator { +min-height: 106px; +max-height: 106px; +min-width: 99px; +max-width: 99px; +} +QCheckBox::indicator:unchecked { +min-height: 92px; +max-height: 92px; +min-width: 88px; +max-width: 88px; +width: 88px; +height: 92px; +} +QCheckBox::indicator:unchecked:pressed { +} +QCheckBox::indicator:unchecked:pressed { +} +QCheckBox::indicator:checked { +min-height: 92px; +max-height: 92px; +min-width: 88px; +max-width: 88px; +width: 88px; +height: 92px; +} +QCheckBox::indicator:checked:pressed { +} +QCheckBox::indicator:checked:pressed { +} +QCheckBox::indicator:indeterminate:pressed { +} +QCheckBox::indicator:indeterminate:pressed { +} +#checkBtn{ +width: 85px; +height: 85px; +border-width: 1px; +border-radius: 8px; +} +QComboBox{ +padding: 0px 28px; +min-height: 57px; +max-height: 57px; +border-width: 1px; +border-radius: 8px; +} +QComboBox::drop-down{ +min-width: 45px; +max-width: 45px; +} +QComboBox QAbstractItemView{ +border-width: 1px; +} + +/*Progress Bar +---------------------*/ +QProgressBar{ +min-height: 17px; +max-height: 17px; +border-width: 1px; +border-radius: 7px; +} +QProgressBar:chunk{ +} +QSlider{ +} +QSlider::groove:horizontal { +/*border-width: 1px; +border-radius: 7px;*/ +height: 21px; +} +QSlider::sub-page:horizontal { +margin-left: 21px; +border-width: 1px; +height: 21px; +border-top-left-radius: 7px; +border-bottom-left-radius: 7px; +} +QSlider::add-page:horizontal { +margin-right: 21px; +border-width: 1px; +height: 21px; +border-top-right-radius: 7px; +border-bottom-right-radius: 7px; +} +QSlider::handle:vertical { +background-color:#000; +min-width: 91px; +max-width: 91px; +min-height: 93px; +max-height: 93px; +width: 93px; +height: 93px; +} +QSlider::handle:horizontal { +min-width: 91px; +max-width: 91px; +min-height: 91px; +max-height: 91px; +width: 91px; +height: 91px; +margin-top: - 35px; +margin-bottom: - 31px; +} +QSlider::handle:horizontal:hover { +} +QSlider::sub-page:horizontal:disabled { +} +QSlider::add-page:horizontal:disabled { +} +QSlider::handle:horizontal:disabled { +} + +#content, #content2{ +} +/*VerticalPagerHandler +------------------------*/ +#VerticalPagerHandler{ +min-width: 1014px; +max-width: 1014px; +margin: 0px 35px; +min-height: 72px; +max-height: 72px; +border-top-width: 1px; +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +} +#VerticalPagerHandler #downPageBtn{ +min-width: 82px; +max-width: 82px; +min-height: 82px; +max-height: 82px; +margin: 0px 0px 0px 54px; +} +#VerticalPagerHandler #upPageBtn{ +min-width: 82px; +max-width: 82px; +min-height: 82px; +max-height: 82px; +margin: 0px 54px 0px 0px; +} +#pageLbl, #currentPageLbl, #ofLbl, #totalPagesLbl{ +padding: 0px 8px 0px 8px; +font-size: 31px; +} +#closePopupBtn{ +margin: 0px 0px 0px 0px; +min-width: 91px; +max-width: 91px; +min-height: 91px; +max-height: 91px; +} +/*Dialogs +-------------------------*/ +#footerPopup{ +min-height: 144px; +max-height: 144px; +} +/*ConfirmDialog +--------------------*/ +#ConfirmDialog{ +min-width: 851px; +max-width: 851px; +min-height: 441px; +max-height: 441px; +border-radius: 14px; +} +#ConfirmDialog #bg{ +border-width: 3px; +border-radius: 14px; +} +#ConfirmDialog QLabel{ +padding: 0px 35px; +} +#ConfirmDialog #ok{ +padding: 0px 35px; +min-width: 218px; +max-width: 218px; +min-height: 82px; +max-height: 82px; +border-width: 3px; +border-radius: 14px; +} +/*SelectionDialog +--------------------*/ +#SelectionDialog{ +min-width: 851px; +max-width: 851px; +min-height: 399px; +max-height: 399px; +} +#SelectionDialog #bg{ +border-width: 3px; +border-radius: 14px; +} +#SelectionDialog QLabel{ +padding: 0px 35px; +} +#SelectionDialog #cancelBtn{ +padding: 0px 35px; +min-width: 170px; +max-width: 170px; +min-height: 82px; +max-height: 82px; +border-width: 3px; +border-radius: 11px; +} +#SelectionDialog #okBtn{ +padding: 0px 28px; +min-width: 218px; +max-width: 218px; +min-height: 82px; +max-height: 82px; +border-width: 3px; +border-radius: 14px; +} +/*CorruptedDialog +--------------------*/ +#CorruptedDialog{ +min-width: 996px; +max-width: 996px; +min-height: 399px; +max-height: 399px; +border-width: 3px; +border-radius: 14px; +} +#corruptedPopup_Cont{ +padding: 0px 17px; +min-width: 959px; +max-width: 959px; +} +#corruptedPopup_Cont QLabel{ +padding: 0px 17px; +} +#corruptedPopup_Cont #horizontalFrame{ +min-height: 127px; +max-height: 127px; +} +#corruptedPopup_Cont #formatBtn{ +margin: 0px 8px; +padding: 0px 17px; +min-width: 0px; +max-width: 851px; +min-height: 82px; +max-height: 82px; +border-width: 3px; +font-size: 31px; +border-radius: 14px; +} +#corruptedPopup_Cont #mountBtn,#CorruptedDialog #noMountBtn{ +margin: 0px 8px; +padding: 0px 17px; +min-width: 218px; +max-width: 218px; +min-height: 82px; +max-height: 82px; +border-width: 3px; +font-size: 31px; +border-radius: 14px; +} +/*InfoDialog +------------------------*/ +#InfoDialog{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#InfoDialogCont #bgdialog{ +min-width: 851px; +max-width: 851px; +min-height: 392px; +max-height: 392px; +border-width: 3px; +border-radius: 14px; +} +#InfoDialog #bgdialog QLabel{ +padding: 0px 35px; +} +#InfoDialog #bgdialog #spinerLbl{ +min-height: 190px; +max-height: 190px; +} +/*ProgressDialog +------------------------*/ +#ProgressDialog{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#ProgressDialogCont{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#ProgressDialogCont #bg{ +min-width: 851px; +max-width: 851px; +min-height: 392px; +max-height: 392px; +border-width: 3px; +border-radius: 14px; +} +#ProgressDialog #bg QLabel{ +margin: 45px 0px 0px 0px; +padding: 0px 35px; +} +#ProgressDialog #progressCont{ +min-height: 110px; +max-height: 110px; +} +#ProgressDialog #hideBtn{ +padding: 0px 28px; +min-width: 218px; +max-width: 218px; +min-height: 82px; +max-height: 82px; +border-width: 3px; +border-radius: 14px; +} +#ProgressDialog #cancelBtn{ +padding: 0px 35px; +min-width: 218px; +max-width: 218px; +min-height: 82px; +max-height: 82px; +border-width: 3px; +border-radius: 14px; +} +/* Overlay +---------------------*/ +#shadow, #ElfAppMenu, #whiteShadow{ +} +#whiteCont{ +} + +/*LibraryBookSummary +------------------*/ +#LibraryBookSummary{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#LibraryBookSummaryCont{ +min-width: 1003px; +max-width: 1003px; +min-height: 1213px; +max-height: 1213px; +border-width: 6px; +border-radius: 24px; +} +#bookSummaryActions #HeaderCont{ +min-height: 82px; +max-height: 82px; +} +#bookSummaryActions #currentBookLbl{ +} +#bookSummaryActions #coverCont{ +} +#bookSummaryActions #coverCont #authorLbl{ +min-width: 198px; +max-width: 198px; +font-size: 25px; +min-height: 35px; +max-height: 35px; +padding-top: 243px; +} +#bookSummaryActions #coverCont #titleLbl{ +min-width: 198px; +max-width: 198px; +min-height: 72px; +max-height: 72px; +padding-top: 174px; +font-size: 28px; +} +#bookSummaryActions #topLeftLbl{ +min-width: 31px; +max-width: 31px; +min-height: 21px; +max-height: 21px; +} +#bookSummaryActions #topCenterLbl{ +min-width: 198px; +max-width: 198px; +min-height: 21px; +max-height: 21px; +} +#bookSummaryActions #topRightLbl{ +min-width: 35px; +max-width: 35px; +min-height: 21px; +max-height: 21px; +} +#bookSummaryActions #centerLeftLbl{ +min-width: 31px; +max-width: 31px; +min-height: 297px; +max-height: 297px; +} +#bookSummaryActions #cover, #bookSummaryActions #coverLbl, #LibraryBookSummary #coverLbl{ +min-width: 198px; +max-width: 198px; +min-height: 297px; +max-height: 297px; +} +#bookSummaryActions #centerRightLbl{ +min-width: 35px; +max-width: 35px; +min-height: 297px; +max-height: 297px; +} +#bookSummaryActions #bottomLeftLbl{ +min-width: 31px; +max-width: 31px; +min-height: 35px; +max-height: 35px; +} +#bookSummaryActions #bottomCenterLbl{ +min-width: 198px; +max-width: 198px; +min-height: 35px; +max-height: 35px; +} +#bookSummaryActions #bottomRightLbl{ +min-width: 35px; +max-width: 35px; +min-height: 35px; +max-height: 35px; +} +#LibraryBookSummary #PaginationCont{ +min-height: 91px; +max-height: 91px; +} +#bookTitleLbl{ +font-size: 41px; +} +#bookSummaryDataContainer #bookAuthorLbl{ +font-size: 37px; +} +#bookSummaryDataContainer #bookPriceLbl { +font-size: 28px; +margin-left: 28px; +} +#bookSummaryDataContainer #formatLbl{ +font-size: 28px; +} +#priceCont{ +min-height: 54px; +max-height: 54px; +padding: 0px; +} +#SynopsisCont{ +min-height: 91px; +max-height: 91px; +} +#synopsisLbl{ +margin: 0px 35px; +border-width: 1px; +} +#actionsContainer #buyBookBtn{ +margin: 8px 28px 0px 0px; +padding: 0px 28px; +min-height: 82px; +max-height: 82px; +border-width: 3px; +border-radius: 8px; +} +#moreActionsCont{ +margin: 0px; +min-width: 686px; +max-width: 686px; +} +#moreActionsBtn{ +padding: 0px 0px 0px 14px; +min-width: 297px; +max-width: 297px; +min-height: 71px; +max-height: 71px; +font-size: 34px; +border-width: 3px; +border-radius: 8px; +} +#actionsContainer #addToCollectionBtn{ +margin: 6px 0px 0px 0px; +padding: 0px 0px 0px 14px; +min-width: 636px; +max-width: 636px; +min-height: 71px; +max-height: 71px; +font-size: 34px; +border-width: 3px; +border-radius: 8px; +} +#actionsContainer #bookActionBtn{ +margin: 6px 1px 0px 0px; +padding: 0px 35px 0px 35px; +min-width: 255px; +max-width: 410px; +min-height: 82px; +max-height: 82px; +font-size: 38px; +border-width: 3px; +border-radius: 8px; +} +#actionsContainer #readSampleBtn{ +margin: 6px 0px 0px 0px; +padding: 0px 28px; +min-height: 82px; +max-height: 82px; +border-width: 3px; +border-radius: 8px; +font-size: 38px; +} +#actionsContainer #bookStatusBtn{ +margin: 6px 1px 0px 0px; +padding: 0px 35px 0px 35px; +min-width: 255px; +max-width: 410px; +min-height: 82px; +max-height: 82px; +font-size: 38px; +border-width: 3px; +border-radius: 8px; +} +#summaryTextBrowser{ +font-size: 31px; +} +#LibraryBookSummaryCont LibraryPageHandler, #ViewerBookSummaryCont ViewerVerticalPagerPopup{ +min-width: 905px; +max-width: 905px; +min-height: 64px; +max-height: 64px; +} +#actionsContainer { +margin-left: 54px; +min-width: 658px; +max-width: 658px; +} +/*LibraryCollectionLayer ViewerCollectionLayer +---------------------------*/ +#CollectionLayerCont { +border-width: 3px; +border-bottom-left-radius: 8px; +border-bottom-right-radius: 8px; +border-top-left-radius: 0px; +border-top-right-radius: 0px; +} +#CollectionLayerCont #collectionItem0,#CollectionLayerCont #collectionItem1, #CollectionLayerCont #collectionItem2, #CollectionLayerCont #collectionItem3,#CollectionLayerCont #collectionItem4{ +min-height: 91px; +max-height: 91px; +border-width: 3px; +} +#CollectionLayerCont #collectionTitleLbl { +padding: 0px 62px 0px 14px; +min-height: 91px; +max-height: 91px; +border-width: 3px; +} +#CollectionLayerCont #collectionTitleLbl:checked{ +border-left-width: 3px; +border-right-width: 3px; +} +#CollectionLayerCont QPushButton#addNewCollection{ +padding-left: 0px; +padding-right: 0px; +min-height: 91px; +max-height: 91px; +border-bottom-width: 4px; +margin: 0px 3px 0 3px; +} +#CollectionLayerCont #collectionTitleLbl:disabled { +} +#CollectionLayerCont #VerticalPagerPopup, #CollectionLayerCont ViewerVerticalPagerPopup{ +} +/*SettingsQuickSettingsPopup +------------------------*/ +#SettingsQuickSettingsPopup{ +min-width: 1072px; +max-width: 1072px; +min-height: 1448px; +max-height: 1448px; +} +#QuickSettingsCont{ +min-width: 827px; +max-width: 827px; +min-height: 543px; +max-height: 543px; +margin-bottom: 181px; +border-width: 3px; +border-radius: 14px; +} +#headerPopupCont{ +margin: 0px 35px; +min-height: 82px; +max-height: 82px; +border-width: 1px; +} +#titlePopupLbl{ +padding: 0px 0px 0px 17px; +font-size: 33px; +} +#contentPopup{ +min-width: 751px; +max-width: 751px; +min-height: 380px; +max-height: 380px; +margin: 35px 0px 0px 0px; +border-width: 1px; +border-radius: 14px; +} +#contentPopup #screenLightCont,#contentPopup #wifiCont{ +border-width: 1px; +border-top:none; +border-left:none; +border-right:none; +} +#contentPopup #wifiStatusBtn, #contentPopup #screenLightStatusBtn{ +padding: 0px 17px 0px 0px; +min-width: 184px; +max-width: 184px; +min-height: 57px; +max-height: 57px; +} +#contentPopup #wifiLbl, #contentPopup #brightnessLbl,#contentPopup #screenLightLbl{ +padding: 0px 0px 0px 17px; +} +#contentPopup #brightnessCont{ +border-width: 1px; +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +} +#contentPopup #brightnessLbl{ +padding: 28px 0px 0px 17px; +border-width: 1px; +} +#contentPopup #brightnessMaxLbl{ +min-width: 54px; +max-width: 54px; +min-height: 54px; +max-height: 54px; +margin: 0px 17px 0px 0px; +} +#contentPopup #brightnessMinLbl{ +min-width: 54px; +max-width: 54px; +min-height: 54px; +max-height: 54px; +margin: 0px 0px 0px 17px; +} +#contentPopup #brightnessSlider{ +margin: 35px 0px 35px 0px; +/*min-width: 431px; +max-width: 431px;*/ +} +/*Search +----------------------------*/ +#Search{ +min-width: 1072px; +max-width: 1072px; +min-height: 1358px; +max-height: 1358px; +} +#Search #searchHeader{ +min-height: 127px; +max-height: 127px; +border-width: 1px; +} +#Search #searchLineEdit{ +min-width: 865px; +max-width: 865px; +min-height: 99px; +max-height: 99px; +padding: 0px 0px 0px 72px; +border-width: 0px; +} +#Search #clearSearchBtn{ +min-width: 83px; +max-width: 83px; +min-height: 99px; +max-height: 99px; +} +#SearchResultItem1, #SearchResultItem2, #SearchResultItem3, #SearchResultItem4, #SearchResultItem5, #SearchResultItem6, #SearchResultItem7, #SearchResultItem8, #SearchResultItem9{ +min-height: 109px; +max-height: 109px; +} +#resultNumberCont{ +min-height: 109px; +max-height: 109px; +border-width: 1px; +} +#resultNumberCont #showResultLbl{ +padding: 0px 7px 0px 35px; +} +#resultNumberCont #resultsNumberLbl{ +padding: 0px 7px 0px 0px; +} +/*SearchResultItem +----------------------------*/ +#SearchItem { +min-width: 1072px; +max-width: 1072px; +min-height: 83px; +max-height: 83px; +border-width: 1px; +} +#SearchItem #fileTypeLbl{ +margin: 17px 0px 0px 0px; +min-width: 82px; +max-width: 82px; +} +#SearchItem #searchTitle{ +margin: 8px 0px 0px 0px; +} +#SearchItem #searchAuthor{ +} +/*VerticalPagerHandler +------------------------*/ +#SearchPagerCont{ +min-width: 1018px; +max-width: 1018px; +margin: 0px 35px; +min-height: 71px; +max-height: 71px; +border-top-width: 1px; +border-bottom-left-radius: 14px; +border-bottom-right-radius: 14px; +} +#SearchPagerCont #downPageBtn{ +min-width: 71px; +max-width: 71px; +min-height: 71px; +max-height: 71px; +margin: 0px 0px 0px 49px; +} +#SearchPagerCont #upPageBtn{ +min-width: 71px; +max-width: 71px; +min-height: 71px; +max-height: 71px; +margin: 0px 49px 0px 0px; +} +#pageLbl, #currentPageLbl, #ofLbl, #totalPagesLbl{ +padding: 0px 8px 0px 8px; +font-size: 30px; +} diff --git a/res/1448/starting.png b/res/1448/starting.png new file mode 100644 index 0000000..5182701 Binary files /dev/null and b/res/1448/starting.png differ diff --git a/res/1448/startingSD.png b/res/1448/startingSD.png new file mode 100644 index 0000000..f6c3593 Binary files /dev/null and b/res/1448/startingSD.png differ diff --git a/res/common1448.qrc b/res/common1448.qrc new file mode 100755 index 0000000..4e6618f --- /dev/null +++ b/res/common1448.qrc @@ -0,0 +1,8 @@ + + + common_styles_generic.qss + 1448/common_styles.qss + 1448/starting.png + 1448/startingSD.png + + diff --git a/version.h b/version.h index 0c7cf7a..4e08cae 100644 --- a/version.h +++ b/version.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 @@ -18,4 +18,4 @@ along with the source code. If not, see . *************************************************************************/ -static const char *QBOOKAPP_VERSION = "bqOS-5.2.2"; +static const char *QBOOKAPP_VERSION = "bqOS-6.0.1";