Remove unused resources

YACReader/YACReader.pro

@@ -102,7 +102,6 @@ HEADERS +=  ../common/comic.h \
             ../common/qnaturalsorting.h \
             ../common/yacreader_global.h \
             ../common/yacreader_global_gui.h \
-            ../common/onstart_flow_selection_dialog.h \
             ../common/comic_db.h \
             ../common/folder.h \
             ../common/library_item.h \
@@ -140,7 +139,6 @@ SOURCES +=  ../common/comic.cpp \
             ../common/custom_widgets.cpp \
             ../common/check_new_version.cpp \
             ../common/qnaturalsorting.cpp \
-            ../common/onstart_flow_selection_dialog.cpp \
             ../common/comic_db.cpp \
             ../common/folder.cpp \
             ../common/library_item.cpp \

YACReader/viewer.cpp

@@ -12,7 +12,6 @@
 #include "render.h"
 #include "goto_dialog.h"
 #include "translator.h"
-#include "onstart_flow_selection_dialog.h"
 #include "page_label_widget.h"
 #include "notifications_label_widget.h"
 #include "comic_db.h"
@@ -365,8 +364,6 @@ void Viewer::updateContentSize()
         // apply scaling
         content->resize(pagefit);
 
-        QLOG_INFO() << "Device pixel ratio used while rendering: " << devicePixelRatioF();
-
         // TODO: updtateContentSize should only scale the pixmap once
         if (devicePixelRatioF() > 1) // only in HDPI displays
         {

YACReader/yacreader_images.qrc

@@ -1,6 +1,6 @@
 <RCC>
   <qresource>
-    <file>../images/icon.png</file>
+    <file>../images/icon-new.svg</file>
     <file>../images/goto.png</file>
     <file>../images/find_folder.png</file>
     <file>../images/flow1.png</file>
@@ -9,7 +9,6 @@
     <file>../images/flow4.png</file>
     <file>../images/flow5.png</file>
     <file>../images/notCover.png</file>
-    <file>../images/shortcuts.png</file>
     <file>../images/close.png</file>
     <file>../images/up.png</file>
     <file>../images/down.png</file>
@@ -17,41 +16,7 @@
     <file>../images/imgGoToSlide.png</file>
     <file>../images/imgCenterSlidePressed.png</file>
     <file>../images/imgGoToSlidePressed.png</file>
-
-    <file>../images/helpImages/open.png</file>
-    <file>../images/helpImages/openFolder.png</file>
-    <file>../images/helpImages/next.png</file>
-    <file>../images/helpImages/prev.png</file>
-    <file>../images/helpImages/icon.png</file>
-    <file>../images/helpImages/zoom.png</file>
-    <file>../images/helpImages/fit.png</file>
-    <file>../images/helpImages/goto.png</file>
-    <file>../images/helpImages/help.png</file>
-    <file>../images/helpImages/center.png</file>
-    <file>../images/helpImages/options.png</file>
-    <file>../images/helpImages/comicFolder.png</file>
-    <file>../images/helpImages/save.png</file>
-    <file>../images/helpImages/rotateL.png</file>
-    <file>../images/helpImages/rotateR.png</file>
-    <file>../images/helpImages/flow1.png</file>
-    <file>../images/helpImages/flow2.png</file>
-    <file>../images/helpImages/flow3.png</file>
-    <file>../images/helpImages/bookmark.png</file>
-    <file>../images/helpImages/setBookmark.png</file>
-    <file>../images/helpImages/notCover.png</file>
-    <file>../images/helpImages/previousComic.png</file>
-    <file>../images/helpImages/nextComic.png</file>
-    <file>../images/helpImages/deleteLibrary.png</file>
-    <file>../images/helpImages/properties.png</file>
-    <file>../images/helpImages/doublePage.png</file>
-    <file>../images/helpImages/keyboard.png</file>
-    <file>../images/helpImages/mouse.png</file>
-    <file>../images/helpImages/speaker.png</file>
     <file>../images/defaultCover.png</file>
-    <file>../images/onStartFlowSelection.png</file>
-    <file>../images/onStartFlowSelection_es.png</file>
-    <file>../images/useNewFlowButton.png</file>
-    <file>../images/useOldFlowButton.png</file>
     <file>../images/fromTo.png</file>
     <file>../images/dropDownArrow.png</file>
     <file>../images/translatorSearch.png</file>

YACReaderLibrary/YACReaderLibrary.pro

@@ -116,7 +116,6 @@ HEADERS += comic_flow.h \
   ../common/qnaturalsorting.h \
   ../common/yacreader_global.h \
   ../common/yacreader_global_gui.h \
-  ../common/onstart_flow_selection_dialog.h \
   ../common/pdf_comic.h \
   no_libraries_widget.h \
   import_widget.h \
@@ -196,7 +195,6 @@ SOURCES += comic_flow.cpp \
     ../common/pictureflow.cpp \
     ../common/custom_widgets.cpp \
     ../common/qnaturalsorting.cpp \
-    ../common/onstart_flow_selection_dialog.cpp \
     no_libraries_widget.cpp \
     import_widget.cpp \
     trayicon_controller.cpp \

YACReaderLibrary/images.qrc

@@ -10,7 +10,6 @@
         <file>../images/comic_vine/rowDown.png</file>
         <file>../images/comic_vine/rowUp.png</file>
         <file>../images/comic_vine/upArrow.png</file>
-        <file>../images/comicFolder.png</file>
         <file>../images/comics_view_toolbar/asignNumber.png</file>
         <file>../images/comics_view_toolbar/asignNumber@2x.png</file>
         <file>../images/comics_view_toolbar/big_size_grid_zoom.png</file>
@@ -41,8 +40,6 @@
         <file>../images/comics_view_toolbar/setManga@2x.png</file>
         <file>../images/comics_view_toolbar/setNormal.png</file>
         <file>../images/comics_view_toolbar/setNormal@2x.png</file>
-        <file>../images/coversPackage.png</file>
-        <file>../images/db.png</file>
         <file>../images/defaultCover.png</file>
         <file>../images/edit.png</file>
         <file>../images/empty_current_readings.png</file>
@@ -60,14 +57,13 @@
         <file>../images/flow5.png</file>
         <file>../images/glowLine.png</file>
         <file>../images/hiddenCovers.png</file>
-        <file>../images/icon.png</file>
+        <file>../images/icon-new.svg</file>
         <file>../images/iconLibrary.png</file>
         <file>../images/importBottomCoversDecoration.png</file>
         <file>../images/importComicsInfo.png</file>
         <file>../images/importingIcon.png</file>
         <file>../images/importLibrary.png</file>
         <file>../images/importTopCoversDecoration.png</file>
-        <file>../images/iphoneConfig.png</file>
         <file>../images/main_toolbar/divider.png</file>
         <file>../images/menus_icons/editIcon.png</file>
         <file>../images/menus_icons/editIcon@2x.png</file>
@@ -90,15 +86,12 @@
         <file>../images/noLibrariesIcon.png</file>
         <file>../images/noLibrariesLine.png</file>
         <file>../images/notCover.png</file>
-        <file>../images/onStartFlowSelection.png</file>
-        <file>../images/onStartFlowSelection_es.png</file>
         <file>../images/openLibrary.png</file>
         <file>../images/previousCoverPage.png</file>
         <file>../images/readingRibbon.png</file>
         <file>../images/readRibbon.png</file>
         <file>../images/searching_icon.png</file>
         <file>../images/serverConfigBackground.png</file>
-        <file>../images/setRead.png</file>
         <file>../images/shortcuts_group_comics.png</file>
         <file>../images/shortcuts_group_folders.png</file>
         <file>../images/shortcuts_group_general.png</file>
@@ -120,8 +113,6 @@
         <file>../images/sidebar/libraryOptions.png</file>
         <file>../images/sidebar/libraryOptions@2x.png</file>
         <file>../images/updatingIcon.png</file>
-        <file>../images/useNewFlowButton.png</file>
-        <file>../images/useOldFlowButton.png</file>
         <file>../images/custom_dialog/custom_close_button.svg</file>
         <file>../images/whats_new/whatsnew_header.svg</file>
     </qresource>

YACReaderLibrary/library_window.cpp

@@ -23,7 +23,6 @@
 
 #include "data_base_management.h"
 #include "yacreader_global.h"
-#include "onstart_flow_selection_dialog.h"
 #include "no_libraries_widget.h"
 #include "import_widget.h"
 

common/onstart_flow_selection_dialog.cpp

@@ -1,52 +0,0 @@
-#include "onstart_flow_selection_dialog.h"
-
-#include <QPushButton>
-#include <QHBoxLayout>
-#include <qlocale.h>
-
-OnStartFlowSelectionDialog::OnStartFlowSelectionDialog(QWidget *parent)
-    : QDialog(parent)
-{
-    setModal(true);
-    QPushButton *acceptHW = new QPushButton(this);
-    connect(acceptHW, &QAbstractButton::clicked, this, &QDialog::accept);
-    QPushButton *rejectHW = new QPushButton(this); // and use SW flow
-    connect(rejectHW, &QAbstractButton::clicked, this, &QDialog::reject);
-
-    acceptHW->setGeometry(90, 165, 110, 118);
-    acceptHW->setFlat(true);
-    acceptHW->setAutoFillBackground(true);
-    rejectHW->setGeometry(464, 165, 110, 118);
-    rejectHW->setFlat(true);
-    rejectHW->setAutoFillBackground(true);
-
-    QPalette paletteHW;
-    QLocale locale = this->locale();
-    QLocale::Language language = locale.language();
-
-    /*if(language == QLocale::Spanish)
-                paletteHW.setBrush(acceptHW->backgroundRole(), QBrush(QImage(":/images/useNewFlowButton_es.png")));
-        else
-                paletteHW.setBrush(acceptHW->backgroundRole(), QBrush(QImage(":/images/useNewFlowButton.png")));*/
-
-    paletteHW.setBrush(acceptHW->backgroundRole(), QBrush(QImage(":/images/nonexxx.png")));
-    acceptHW->setPalette(paletteHW);
-    QPalette paletteSW;
-    paletteSW.setBrush(rejectHW->backgroundRole(), QBrush(QImage(":/images/nonexxx.png")));
-    rejectHW->setPalette(paletteSW);
-    // QHBoxLayout * layout = new QHBoxLayout;
-    // layout->addWidget(acceptHW);
-    // layout->addWidget(rejectHW);
-
-    QPalette palette;
-    if (language == QLocale::Spanish)
-        palette.setBrush(this->backgroundRole(), QBrush(QImage(":/images/onStartFlowSelection_es.png")));
-    else
-        palette.setBrush(this->backgroundRole(), QBrush(QImage(":/images/onStartFlowSelection.png")));
-
-    setPalette(palette);
-
-    // setLayout(layout);
-
-    resize(664, 371);
-}

common/onstart_flow_selection_dialog.h

@@ -1,13 +0,0 @@
-#ifndef ONSTART_FLOW_SELECTION_DIALOG_H
-#define ONSTART_FLOW_SELECTION_DIALOG_H
-
-#include <QDialog>
-
-class OnStartFlowSelectionDialog : public QDialog
-{
-    Q_OBJECT
-public:
-    OnStartFlowSelectionDialog(QWidget *parent = 0);
-};
-
-#endif

files/about.html

@@ -20,7 +20,7 @@
   </style>
 </head>
 <body>
-<p><img src=":/images/icon.png" /> </p>
+<p><img src=":/images/icon-new.svg" /> </p>
 
 <h1>General Information</h1>
 <p>
@@ -43,9 +43,12 @@ Published under <a href="http://www.gnu.org/copyleft/gpl.html">GPL v3</a> licens
 <h1>Donations</h1>
 <p>YACReader is free and open source</p>
 <p>
-If you like YACReader, please, consider to make a donation <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=5TAMNQCDDMVP8&lc=ES&item_name=YACReader&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted"> Donate! </a>
+If you like YACReader, please, consider to make a donation, it helps keeping the project alive. <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=5TAMNQCDDMVP8&lc=ES&item_name=YACReader&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted"> Donate! </a>
 </p>
 
+<p>
+You can also become a patron in <a href="https://www.patreon.com/yacreader">Patreon</a>.
+</p>
 
 <h1>Go social</h1>
 <p>
@@ -54,37 +57,11 @@ Find other users and help at:
 <li><a href="http://www.facebook.com/YACReader">Facebook</a></li>
 <li><a href="Twitter - http://twitter.com/yacreader ">Twitter</a></li>
 <li><a href="http://www.youtube.com/user/yacreader">YouTube</a> </li>
-<li><a href="https://plus.google.com/104961844694882715084/posts">Google+</a></li>
+<li><a href="https://www.instagram.com/yacreader/">Instagram</a></li>
+<li><a href="https://www.patreon.com/yacreader">Patreon</a></li>
 </ul>
 </p>
 
-<h1>Contributors</h1>
-<h2>Translators</h2>
-<ul>
-	<li><a rel="nofollow" title="Márcio Moraes - translation to brazilian portuguese" href="https://plus.google.com/108918730441325446079/posts">Márcio Moraes: Portuguese (Brazilian) translator</a></li>
-	<li>laitqwerty and NickSenna: Russian translators</li>
-	<li>Cédric Delarbre aka Real: French translator</li>
-	<li>Johan Derycker: Duch translator</li>
-	<li><a href="http://turkishcomics.blogspot.pt/p/yacreader-tr.html">Turkish Translate Team</a> (Mehmet Açıkgöz, Uğur Yakışık, Alperen Çatak): turkish translators</li>
-        <li>Gerhard Joeken: German translator</li>
-</ul>
-<h2>Packages</h2>
-<ul>
-	<li>alperenelhan : Arch Linux binaries</li>
-	<li>Felix Kauselmann : Arch Linux binaries (7.x)</li>
-	<li>Alexander Alemayhu : involved in Linux packaging</li>
-	<li>Yoann Gauthier : man pages for Linux</li>
-	<li>Robbie Holmes (<a href="http://about.me/robbiethegeek">robbiethegeek</a>) : brew cask install</li>
-</ul>
-
-<h2>Developers</h2>
-<ul>
-	<li> Felix Kauselmann : Linux/Unix build system and other improvements. </li>
-</ul>
-
-<p>Thank you to Elia Gregorio Méndez for developing the websites</p>
-
-
 <h1>Third-party software and resources</h1>
 <p>
 Compressed files are loaded using <a href="http://www.7-zip.org/">7zip</a> (Windows version) and <a href="http://p7zip.sourceforge.net/">p7zip</a> (Linux/MacOS X versions)
@@ -96,7 +73,7 @@ Server info QR codes are generated using <a href="http://fukuchi.org/works/qrenc
 SW flow effect uses a modified version of <a href="http://code.google.com/p/pictureflow/">PictureFlow</a>.
 </p>
 <p>
-Some icons were desinged by <a href="http://mattahan.deviantart.com/">Mattahan</a>.
+Server uses <a href="http://stefanfrings.de/qtwebapp/index-en.html">QtWebApp</a>.
 </p>
 </body>
 </html>

files/about_es_ES.html

@@ -20,7 +20,7 @@
   </style>
 </head>
 <body>
-<p><img src=":/images/icon.png" /> </p>
+<p><img src=":/images/icon-new.svg" /> </p>
 
 <h1>Información general</h1>
 <p>
@@ -46,6 +46,10 @@ Publicado bajo licencia <a href="http://www.gnu.org/copyleft/gpl.html">GPL v3</a
 Si te gusta YACReader, por favor, considera realizar una donación <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=5TAMNQCDDMVP8&lc=ES&item_name=YACReader&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted"> ¡Dona! </a>
 </p>
 
+<p>
+También te puedes convertir en un mecenas en <a href="https://www.patreon.com/yacreader">Patreon</a>.
+</p>
+
 
 <h1>Social</h1>
 <p>
@@ -54,37 +58,12 @@ Encuentra otros usuarios y ayuda en:
 <li><a href="http://www.facebook.com/YACReader">Facebook</a></li>
 <li><a href="Twitter - http://twitter.com/yacreader ">Twitter</a></li>
 <li><a href="http://www.youtube.com/user/yacreader">YouTube</a> </li>
-<li><a href="https://plus.google.com/104961844694882715084/posts">Google+</a></li>
+<li><a href="https://www.instagram.com/yacreader/">Instagram</a></li>
+<li><a href="https://www.patreon.com/yacreader">Patreon</a></li>
 </ul>
 </p>
 
-<h1>Contribuidores</h1>
+<h1>Software de terceros y otros recursos</h1>
-<h2>Traductores</h2>
-<ul>
-	<li><a rel="nofollow" title="Márcio Moraes - translation to brazilian portuguese" href="https://plus.google.com/108918730441325446079/posts">Márcio Moraes: Portuguese (Brazilian) translator</a></li>
-	<li>laitqwerty and NickSenna: Russian translators</li>
-	<li>Cédric Delarbre aka Real: French translator</li>
-	<li>Johan Derycker: Duch translator</li>
-	<li><a href="http://turkishcomics.blogspot.pt/p/yacreader-tr.html">Turkish Translate Team</a> (Mehmet Açıkgöz, Uğur Yakışık, Alperen Çatak): turkish translators</li>
-        <li>Gerhard Joeken: German translator</li>
-</ul>
-<h2>Paquetes</h2>
-<ul>
-	<li>alperenelhan : Arch Linux binaries</li>
-	<li>Felix Kauselmann : Arch Linux binaries (7.x)</li>
-	<li>Alexander Alemayhu : involved in Linux packaging</li>
-	<li>Yoann Gauthier : man pages for Linux</li>
-	<li>Robbie Holmes (<a href="http://about.me/robbiethegeek">robbiethegeek</a>) : brew cask install</li>
-</ul>
-
-<h2>Developers</h2>
-<ul>
-	<li> Felix Kauselmann : Linux/Unix build system and other improvements. </li>
-</ul>
-
-<p>Gracias a Elia Gregorio Méndez por desarrollar los sitios web</p>
-
-<h1>Software de terceros y recursos</h1>
 <p>
 Los archivos comprimidos se cargan usando <a href="http://www.7-zip.org/">7zip</a> (Windows) y <a href="http://p7zip.sourceforge.net/">p7zip</a> (Linux/MacOS X)
 </p>
@@ -95,7 +74,7 @@ Los códigos QR con la información del servidor se generan con <a href="http://
 SW flow usa una versión modificada de <a href="http://code.google.com/p/pictureflow/">PictureFlow</a>.
 </p>
 <p>
-Algunos iconos han sido diseñados por <a href="http://mattahan.deviantart.com/">Mattahan</a>.
+El servidor usa <a href="http://stefanfrings.de/qtwebapp/index-en.html">QtWebApp</a>.
 </p>
 </body>
 </html>

images/icon-new.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 108 108"><defs><style>.cls-1{fill:none;}.cls-2{isolation:isolate;}.cls-3{clip-path:url(#clip-path);}.cls-4{fill:url(#linear-gradient);}.cls-5,.cls-6{mix-blend-mode:multiply;opacity:0.08;}.cls-6{fill:url(#linear-gradient-2);}.cls-7{fill:#fff;}</style><clipPath id="clip-path"><circle class="cls-1" cx="54" cy="54" r="54"/></clipPath><linearGradient id="linear-gradient" x1="54" x2="54" y2="108" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f7d114"/><stop offset="1" stop-color="#f5c200"/></linearGradient><linearGradient id="linear-gradient-2" x1="160.26" y1="162.68" x2="70.63" y2="66.7" gradientUnits="userSpaceOnUse"><stop offset="0.32" stop-color="#fff"/><stop offset="0.79" stop-color="#fff"/><stop offset="1"/></linearGradient></defs><g class="cls-2"><g id="mask"><g class="cls-3"><rect class="cls-4" width="108" height="108"/><polyline class="cls-5" points="46.99 85.28 27.15 68.8 68.84 27.84 84.31 56.79"/><polyline class="cls-6" points="44.99 88.01 126.03 164.59 163 129.04 81.67 29.67 58.01 78.82 44.99 88.1"/><path class="cls-7" d="M44.1,87.58a28.07,28.07,0,0,0,3.71-4.42c1.37-2.1,2.8-4.19,3.06-6.81a6.62,6.62,0,0,0-.49-2.92c-.15-.42-.46-.44-.82-.48-3.74-.33-7.5-.62-11.23-1-2.93-.33-5.93-.57-8.62-1.9A16.1,16.1,0,0,1,20.6,58a30.93,30.93,0,0,1,1-16,20.25,20.25,0,0,1,5.58-8.28,38.23,38.23,0,0,1,9.55-6.45,50.5,50.5,0,0,1,13.11-4,58.22,58.22,0,0,1,12-1,32.21,32.21,0,0,1,16.23,4.57,20,20,0,0,1,8.8,12.87,28.07,28.07,0,0,1-1.48,18C81.74,66,75.39,71.26,66.29,72.9a2,2,0,0,0-1.35.79A50.59,50.59,0,0,1,55.71,83a36.69,36.69,0,0,1-7.16,4.13A6.74,6.74,0,0,1,44.1,87.58Z"/><rect class="cls-1" width="108.01" height="108.01"/></g></g></g></svg>