From 3a2c90794d05cbbc3d3ae09f5d119daec67fdf72 Mon Sep 17 00:00:00 2001
From: Nicolas Mailloux <nicolecrivain@gmail.com>
Date: Mon, 21 Jun 2021 07:19:14 -0400
Subject: [PATCH] Replace some labels with icons

---
 eink.qrc           |   1 +
 reader.cpp         |  16 ++++++++++++----
 reader.ui          |   3 +++
 resources/info.png | Bin 0 -> 3563 bytes
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 resources/info.png

diff --git a/eink.qrc b/eink.qrc
index be6cef4..d279313 100644
--- a/eink.qrc
+++ b/eink.qrc
@@ -43,5 +43,6 @@
         <file>resources/settings-inverted.png</file>
         <file>resources/kobox-icon.png</file>
         <file>resources/X11.png</file>
+        <file>resources/info.png</file>
     </qresource>
 </RCC>
diff --git a/reader.cpp b/reader.cpp
index f8619b8..56db373 100644
--- a/reader.cpp
+++ b/reader.cpp
@@ -29,7 +29,6 @@ reader::reader(QWidget *parent) :
     if(global::reader::bookIsEpub == true) {
         is_epub = true;
     }
-    mupdf::epubPageNumber = 22;
     wordwidgetLock = false;
 
     ui->setupUi(this);
@@ -72,6 +71,10 @@ reader::reader(QWidget *parent) :
     ui->brightnessDecBtn->setIcon(QIcon(":/resources/minus.png"));
     ui->brightnessIncBtn->setText("");
     ui->brightnessIncBtn->setIcon(QIcon(":/resources/plus.png"));
+    ui->homeBtn->setText("");
+    ui->homeBtn->setIcon(QIcon(":/resources/home.png"));
+    ui->aboutBtn->setText("");
+    ui->aboutBtn->setIcon(QIcon(":/resources/info.png"));
 
     // Style misc.
     ui->bookInfoLabel->setStyleSheet("font-style: italic");
@@ -88,7 +91,7 @@ reader::reader(QWidget *parent) :
     // Font
     string_checkconfig(".config/04-book/font");
     if(checkconfig_str_val == "") {
-        ui->fontChooser->setCurrentText(checkconfig_str_val);
+        ui->fontChooser->setCurrentText("Source Serif Pro");
         ui->text->setFont(QFont("Source Serif Pro"));
     }
     else {
@@ -403,6 +406,13 @@ reader::reader(QWidget *parent) :
         QString infoLabelContent = bookCreator;
         infoLabelContent.append(" ― ");
         infoLabelContent.append(bookTitle);
+        int infoLabelLength = infoLabelContent.length();
+        if(infoLabelLength <= 50) {
+            ui->bookInfoLabel->setWordWrap(false);
+        }
+        else {
+            ui->bookInfoLabel->setWordWrap(true);
+        }
         ui->bookInfoLabel->setText(infoLabelContent);
     }
     else {
@@ -609,7 +619,6 @@ int reader::setup_book(QString book, int i, bool run_parser) {
         QTextStream in(&epubPage);
         epubPageContent = in.readAll();
         epubPage.close();
-        qDebug() << epubPageContent;
     }
     return 0;
 }
@@ -706,7 +715,6 @@ void reader::on_nextBtn_clicked()
     }
     else {
         mupdf::epubPageNumber = mupdf::epubPageNumber + 1;
-        qDebug() << mupdf::epubPageNumber;
         setup_book(book_file, mupdf::epubPageNumber, true);
         ui->text->setText("");
         ui->text->setText(epubPageContent);
diff --git a/reader.ui b/reader.ui
index 9c696ff..e04b548 100644
--- a/reader.ui
+++ b/reader.ui
@@ -391,6 +391,9 @@
                          <property name="alignment">
                           <set>Qt::AlignCenter</set>
                          </property>
+                         <property name="wordWrap">
+                          <bool>false</bool>
+                         </property>
                         </widget>
                        </item>
                       </layout>
diff --git a/resources/info.png b/resources/info.png
new file mode 100644
index 0000000000000000000000000000000000000000..42a0774a036e3545a19ebd97103f98093b890a5b
GIT binary patch
literal 3563
zcma)8d011|5}%ueY)AqGq!LU(v;m?5MGJ+J2&jOlxD{~?il7B$v90g~a)Ag6$nvxW
ziA!*Sx}XSF5!#x#QgPv{ZS_@@AXu@j5Rpox0p0|cXZyWB8a}>zXXf{t<;<LO?zZqb
zGe@z<umNCHNN~`601CcRfN6%0zLXyZ0EjK?0t3TC0s}>f$q6y*;@1F(OVUd|489-}
zTw1yGtNjx#J`z7DuJ|C5XOr}UE59P(OPeL1x}WU}T>E|T!Fq4@aXLe4d(>jmjfM~E
z*;zWqR+VbU{`{SWa|c_TE@yXSeBIbzznNk9ZB1pl!)o$K<ctq?@oLZ7I2!UMnX5-f
z1&xpSwQhe|)+0khZqbQNNqZlrci*)9sCNQ2jq=p|)~NiHJt-gG`rfC<dgkJg`CD&p
zn>ngM^mN?qHKlFdqaB_<ySB9?<fi4!ty@;vH?O}IniJ|5B3Q6+d+%Umsm+b0yMIjn
zd`i!EEA6hvHP2dB<)d`AtzlYHq8Fab^psp&_hYa}N#&q2SJCn`zw_VUeMQVDOkJoB
zNH*#e`o^Vo?jGF}wphs?<*!$mQ?<+0^Xi`TtiHQpH)O`@LgQYzeJUT=(YIt)z5|hd
zS99spSv&g4W(U#0!C5(-!9@8`0Ffd+kZ_e4JR`e#<nGdq!YZyTry=wnFmg4)CAGKx
z?%%t2|L(ci^1(q6`y_9>_lNWW_Qh<~teHVDZ2D7wQ?&y%ti<5Rjo8B5rhg(ptV%&8
z<CBot(-{xVY&e#_1<NBs0633Af~GA@`T0rfygB1Mc(iaq(y$v>n&wzS+jg?C@qVLb
z(&>&Pk6CGHNdIR)4X@cswzPCJO|PX_bl)J-?4~s}?f~IbUSGGXCYMe7=1)!<2~j=%
zRH2<r*Vv)SrPBPn{q#{#QRK@LWbh32Tx}+!qNveQkjxvXchgpwp~YGdgMw5`pwP${
zEI}bcJ8il?`%fD|xYEBqPFoSA&-NWHm_d`)Z`L{nb!Bh16ZoM}l%$goS;E$4@3kU>
zcCdhIhQclH#VDk2r_xcl>mAI@&<t*;Ds_z34sUN1(hI5CdPeJGZwU(b3IlOWTc3Ih
zP*`3Rn2DBtZypNY6lIer40_X;88S2ZGs_`Tpt;P+fK>Sfd=Jyaj584bA!pApP<sjc
z0v)51Hr2MB+r*A{%@P)mz7wvLir%j&VJc*w$*qxK)R;LL2%oI&fd*<VO_if(bh4&~
z>8VXN@jLa5;)!>h+qt5ZHPg-uWtZg}l~Qu|Ne`w1B3Ccq8Nu^PjL1lI7H*drs7+&4
zm{_rNDj*?S;*SK2$P^?<YP-%0AvIdNMM{R9U&T?tS>+bnA*f~LOOR}ByBNu0$#Env
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
Zd{#PKuf7o!Hdk+AgiN0kbUZ+w^<TlGvdI7d

literal 0
HcmV?d00001