Merge pull request #125 from blchinezu/dev

Up version: 0.0.6-17-40

builds/current.version

@@ -1 +1 @@
-0.0.6-17-39
+0.0.6-17-40

cr3gui/po/cr3_de.po

@@ -2,14 +2,15 @@
 # This file is put in the public domain.
 #
 # Translators:
+# Eleni Stefanidou <[email protected]>, 2015
 # Zorro66, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: coolreader-pocketbook\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2015-08-20 13:28+0300\n"
-"PO-Revision-Date: 2015-08-19 20:03+0000\n"
-"Last-Translator: Zorro66\n"
+"PO-Revision-Date: 2015-08-22 20:09+0000\n"
+"Last-Translator: Eleni Stefanidou <[email protected]>\n"
 "Language-Team: German (http://www.transifex.com/coolreader-pocketbook/"
 "coolreader-pocketbook/language/de/)\n"
 "Language: de\n"
@@ -52,7 +53,7 @@ msgstr "1..8"
 
 #: ../src/mainwnd.cpp:806
 msgid "No manual currently available for this language, sorry!"
-msgstr "Zu Zeit ist für diese Sprache keine Anleitung verfügbar."
+msgstr "Zur Zeit ist für diese Sprache keine Anleitung verfügbar."
 
 #: ../src/mainwnd.cpp:817 ../src/mainwnd.cpp:927
 msgid "Help"
@@ -864,7 +865,7 @@ msgstr "20%"
 
 #: ../src/settings.cpp:1256
 msgid "Always use fast updates"
-msgstr "Immer schnelle Aktualsisierung"
+msgstr "Immer schnelle Aktualisierung"
 
 #: ../src/settings.cpp:1257
 msgid "Don't use fast updates"
@@ -1201,7 +1202,7 @@ msgstr "Schrift Gamma"
 
 #: ../src/settings.cpp:1530
 msgid "Document embedded fonts"
-msgstr "Ins Dokument eingebttete Schrift"
+msgstr "Ins Dokument eingebettete Schrift"
 
 #: ../src/settings.cpp:1533
 msgid "Fallback font face"
@@ -1217,7 +1218,7 @@ msgstr "[Silbentrennung aus]"
 
 #: ../src/settings.cpp:1552
 msgid "[Algorythmic Hyphenation]"
-msgstr "[Algorythmische Silbentrennung]"
+msgstr "[Algorithmische Silbentrennung]"
 
 #: ../src/settings.cpp:1554
 msgid "Hyphenation"
@@ -1253,11 +1254,11 @@ msgstr "Maximale Vergrößerung für Blockbild "
 
 #: ../src/settings.cpp:1594
 msgid "Inline image scaling mode"
-msgstr "Skalierungsmodus für eingebunde Bilder"
+msgstr "Skalierungsmodus für eingebundene Bilder"
 
 #: ../src/settings.cpp:1597
 msgid "Inline image max zoom"
-msgstr "Maximale Vergrößerung für eingebunde Bilder"
+msgstr "Maximale Vergrößerung für eingebundene Bilder"
 
 #: ../src/settings.cpp:1606
 msgid "Page settings"
@@ -1337,7 +1338,7 @@ msgstr "Fußnoten am Seitenende"
 
 #: ../src/settings.cpp:1684
 msgid "Display settings"
-msgstr "Bildschirm Einstellungen"
+msgstr "Bildschirmeinstellungen"
 
 #: ../src/settings.cpp:1693
 msgid "Landscape pages"
@@ -1413,15 +1414,15 @@ msgstr "Breite der mittleren Tap-Zone"
 
 #: ../src/settings.cpp:1793
 msgid "Page Turn Swipes"
-msgstr "Bättern Wischen"
+msgstr "Blättern Wischen"
 
 #: ../src/settings.cpp:1796
 msgid "Front Light Swipes"
 msgstr "Beleuchtung Wischen"
 
 #: ../src/settings.cpp:1799
 msgid "Pinch zoom"
-msgstr ""
+msgstr "Pinch Zoom"
 
 #: ../src/settings.cpp:1816
 msgid "Style settings"
@@ -1453,7 +1454,7 @@ msgstr ""
 
 #: ../src/viewdlg.cpp:159
 msgid "No dictionaries found"
-msgstr "Kein Wörterbuch gefiunden"
+msgstr "Kein Wörterbuch gefunden"
 
 #: ../src/viewdlg.cpp:160
 msgid "Place dictionaries to directory 'dict' of SD card."
@@ -1555,11 +1556,11 @@ msgstr "Seitenweise vorwärts"
 
 #: ../src/viewdlg.cpp:530
 msgid "Forward in move history"
-msgstr "Forward in move history"
+msgstr "Vorwärts im Seitenverlauf"
 
 #: ../src/viewdlg.cpp:531
 msgid "Back in move history"
-msgstr "Back in move history"
+msgstr "Zurück im Seitenverlauf"
 
 #: ../src/viewdlg.cpp:532
 msgid "Next link"
@@ -1591,7 +1592,7 @@ msgstr "Heraus zoomen"
 
 #: ../src/viewdlg.cpp:540
 msgid "Toggle bold text"
-msgstr "Textdicke umschalten"
+msgstr "Textbreite umschalten"
 
 #: ../src/viewdlg.cpp:541
 msgid "Toggle text format"
@@ -1643,7 +1644,7 @@ msgstr "Zurück scrollen"
 
 #: ../src/viewdlg.cpp:555
 msgid "Close book"
-msgstr "Buch schlließen"
+msgstr "Buch schließen"
 
 #: ../src/viewdlg.cpp:556
 msgid "Main menu"
@@ -1683,11 +1684,11 @@ msgstr "Gehe zu Lesezeichen..."
 
 #: ../src/viewdlg.cpp:570
 msgid "Recent books list"
-msgstr "Liste der kürzlich geöffneten Bücher"
+msgstr "Liste der zuletzt geöffneten Bücher"
 
 #: ../src/viewdlg.cpp:571
 msgid "Open recent book by number"
-msgstr "URL der Dokmentenquelle"
+msgstr "Öffne zuletzt geöffnetes Buch nach Nummer"
 
 #: ../src/viewdlg.cpp:572
 msgid "Switch to recent book"
@@ -1731,7 +1732,7 @@ msgstr "Display invertieren"
 
 #: ../src/viewdlg.cpp:588
 msgid "Full screen update"
-msgstr "Vollständige Bildschirmaktualsierung"
+msgstr "Vollständige Bildschirmaktualisierung"
 
 #: ../src/viewdlg.cpp:589
 msgid "Toggle status bar"
@@ -1848,7 +1849,7 @@ msgstr "Lade herunter..."
 
 #: ../src/ota_update.cpp:235
 msgid "Couldn't remove existing package!"
-msgstr "Kann vorhandenes Packet nicht entfernen!"
+msgstr "Kann vorhandenes Paket nicht entfernen!"
 
 #: ../src/ota_update.cpp:272
 msgid "Couldn't connect to the network!"

cr3gui/po/cr3_fr.po

@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: coolreader-pocketbook\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2015-08-20 13:28+0300\n"
-"PO-Revision-Date: 2015-08-19 18:48+0000\n"
+"PO-Revision-Date: 2015-08-23 07:46+0000\n"
 "Last-Translator: Druss Lahache <[email protected]>\n"
 "Language-Team: French (http://www.transifex.com/coolreader-pocketbook/"
 "coolreader-pocketbook/language/fr/)\n"
@@ -1371,7 +1371,7 @@ msgstr "Mode de mise à jour turbo"
 
 #: ../src/settings.cpp:1725
 msgid "Gray buffer depth(need restart)"
-msgstr "Profondeur de gris du tampon"
+msgstr "Profondeur du gris (nécessite un redémarrage)"
 
 #: ../src/settings.cpp:1732
 msgid "Skin"
@@ -1423,7 +1423,7 @@ msgstr "Réglage de l'éclairage par balayage"
 
 #: ../src/settings.cpp:1799
 msgid "Pinch zoom"
-msgstr ""
+msgstr "Pincer pour zoomer"
 
 #: ../src/settings.cpp:1816
 msgid "Style settings"

cr3gui/src/cr3pocketbook.cpp

@@ -1298,6 +1298,7 @@ class CRPocketBookQuickMenuWindow : public CRPocketBookInkViewWindow
         }
 
         // Draw current position text
+        SetFont(GetFont(), 0x00000000);
         lString16 progress = lString16::itoa(curPage) + lString16(" / ") + lString16::itoa(pageCount);
         textW = StringWidth( UnicodeToUtf8(progress).c_str() );
         if( textW < 1 )
@@ -2004,6 +2005,7 @@ class CRPocketBookDocView : public V3DocViewWin {
 
                 if( newFontSize != currentFontSize ) {
                     main_win->getDocView()->setFontSize(newFontSize);
+
                     main_win->saveSettings(lString16::empty_str);
                 }
                 else {
@@ -4490,7 +4492,7 @@ int InitDoc(const char *exename, char *fileName)
         };
         lString16 ini;
         CRPropRef props = LVCreatePropsContainer();
-        int bpp = 2;
+        int bpp = 0;
 
         int fb2Pos = filename16.pos(lString16(L".fb2"));
         if (fb2Pos < 0)
@@ -4511,11 +4513,19 @@ int InitDoc(const char *exename, char *fileName)
                 }
             }
         }
-        bpp = GetHardwareDepth();
-        if (bpp != 1 && bpp != 2 && bpp != 4 && bpp != 8 && bpp != 16) {
-            bpp = props->getIntDef(PROP_POCKETBOOK_GRAYBUFFER_BPP, 4);
-            if (bpp != 1 && bpp != 2 && bpp != 4 && bpp != 8 && bpp != 16)
+        int bppOption = props->getIntDef(PROP_POCKETBOOK_GRAYBUFFER_BPP, 0);
+        if( bppOption == 0 || (bppOption != 2 && bppOption != 3 && bppOption != 4 && bppOption != 8) ) {
+            bpp = GetHardwareDepth();
+        }
+        if (bpp != 2 && bpp != 3 && bpp != 4 && bpp != 8) {
+            bpp = bppOption;
+            if (bpp != 2 && bpp != 3 && bpp != 4 && bpp != 8) {
+                #ifdef POCKETBOOK_PRO
+                bpp = 4;
+                #else
                 bpp = 2;
+                #endif
+            }
         }
         CRLog::debug("settings at %s", UnicodeToUtf8(ini).c_str() );
         CRLog::trace("creating window manager...");
@@ -5244,6 +5254,8 @@ void drawTemporaryZoom() {
 
     FillArea(ScreenWidth()/2/2-1, 0, ScreenWidth()/2+2, 51, 0x00000000);
     FillArea(ScreenWidth()/2/2, 0, ScreenWidth()/2, 50, 0x00FFFFFF);
+
+    SetFont(GetFont(), 0x00000000);
     DrawString(ScreenWidth()/2-30, 10, UnicodeToUtf8(lString16::itoa(zoom)).c_str());
     PartialUpdateBW(ScreenWidth()/2/2-1, 0, ScreenWidth()/2+2, 51);
 

cr3gui/src/cr3pocketbook.h

@@ -78,8 +78,8 @@ enum CRPbCommands {
 
 #define PB_CR3_CACHE_SIZE (0x100000 * 64)
 
-#define CR_PB_VERSION "0.0.6-17-39"
-#define CR_PB_BUILD_DATE "2015-08-21"
+#define CR_PB_VERSION "0.0.6-17-40"
+#define CR_PB_BUILD_DATE "2015-08-24"
 
 #define PB_ROTATE_MODE_360 0
 #define PB_ROTATE_MODE_180 1

cr3gui/src/settings.cpp

@@ -1363,6 +1363,7 @@ CRSettingsMenu::CRSettingsMenu( CRGUIWindowManager * wm, CRPropRef newProps, int
         {NULL, NULL}
     };
     item_def_t gray_buffer_bpp[] = {
+        {_("Auto"), "0"},
         {_("2 BPP"), "2"},
         {_("3 BPP"), "3"},
         {_("4 BPP"), "4"},