From 77c96de0ea83449c80d18963988a09d67120f421 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
Date: Sat, 15 Jan 2022 15:51:59 +0100
Subject: [PATCH] Remove unused resources
---
YACReader/YACReader.pro | 2 -
YACReader/viewer.cpp | 3 --
YACReader/yacreader_images.qrc | 37 +---------------
YACReaderLibrary/YACReaderLibrary.pro | 2 -
YACReaderLibrary/images.qrc | 11 +----
YACReaderLibrary/library_window.cpp | 1 -
common/onstart_flow_selection_dialog.cpp | 52 -----------------------
common/onstart_flow_selection_dialog.h | 13 ------
files/about.html | 39 ++++-------------
files/about_es_ES.html | 39 ++++-------------
images/adjustToFullSize.png | Bin 21893 -> 0 bytes
images/alwaysOnTop.png | Bin 28230 -> 0 bytes
images/bookmark.png | Bin 24352 -> 0 bytes
images/center.png | Bin 17966 -> 0 bytes
images/comicFolder.png | Bin 26436 -> 0 bytes
images/coversPackage.png | Bin 29501 -> 0 bytes
images/db.png | Bin 16617 -> 0 bytes
images/deleteLibrary.png | Bin 21641 -> 0 bytes
images/dictionary.png | Bin 23238 -> 0 bytes
images/doublePage.png | Bin 35580 -> 0 bytes
images/fit.png | Bin 6359 -> 0 bytes
images/help.png | Bin 16817 -> 0 bytes
images/helpImages/bookmark.png | Bin 1801 -> 0 bytes
images/helpImages/center.png | Bin 1645 -> 0 bytes
images/helpImages/colapse.png | Bin 1379 -> 0 bytes
images/helpImages/comicFolder.png | Bin 1826 -> 0 bytes
images/helpImages/coversPackage.png | Bin 1670 -> 0 bytes
images/helpImages/deleteLibrary.png | Bin 1601 -> 0 bytes
images/helpImages/doublePage.png | Bin 1761 -> 0 bytes
images/helpImages/edit.png | Bin 1399 -> 0 bytes
images/helpImages/expand.png | Bin 1543 -> 0 bytes
images/helpImages/exportLibrary.png | Bin 1633 -> 0 bytes
images/helpImages/fit.png | Bin 1574 -> 0 bytes
images/helpImages/flow1.png | Bin 766 -> 0 bytes
images/helpImages/flow2.png | Bin 1039 -> 0 bytes
images/helpImages/flow3.png | Bin 1038 -> 0 bytes
images/helpImages/folder.png | Bin 1758 -> 0 bytes
images/helpImages/goto.png | Bin 1369 -> 0 bytes
images/helpImages/help.png | Bin 1615 -> 0 bytes
images/helpImages/icon.png | Bin 1654 -> 0 bytes
images/helpImages/importLibrary.png | Bin 1631 -> 0 bytes
images/helpImages/keyboard.png | Bin 1502 -> 0 bytes
images/helpImages/mouse.png | Bin 1550 -> 0 bytes
images/helpImages/new.png | Bin 1685 -> 0 bytes
images/helpImages/next.png | Bin 1665 -> 0 bytes
images/helpImages/nextComic.png | Bin 1574 -> 0 bytes
images/helpImages/notCover.png | Bin 583 -> 0 bytes
images/helpImages/open.png | Bin 1790 -> 0 bytes
images/helpImages/openFolder.png | Bin 1896 -> 0 bytes
images/helpImages/openLibrary.png | Bin 1829 -> 0 bytes
images/helpImages/options.png | Bin 1573 -> 0 bytes
images/helpImages/prev.png | Bin 1694 -> 0 bytes
images/helpImages/previousComic.png | Bin 1585 -> 0 bytes
images/helpImages/properties.png | Bin 1721 -> 0 bytes
images/helpImages/removeLibrary.png | Bin 1612 -> 0 bytes
images/helpImages/rotateL.png | Bin 1757 -> 0 bytes
images/helpImages/rotateR.png | Bin 1755 -> 0 bytes
images/helpImages/save.png | Bin 1642 -> 0 bytes
images/helpImages/setBookmark.png | Bin 1532 -> 0 bytes
images/helpImages/setRoot.png | Bin 1810 -> 0 bytes
images/helpImages/shortcuts.png | Bin 1703 -> 0 bytes
images/helpImages/speaker.png | Bin 658 -> 0 bytes
images/helpImages/updateLibrary.png | Bin 1589 -> 0 bytes
images/helpImages/zoom.png | Bin 1618 -> 0 bytes
images/icon-new.svg | 1 +
images/importCover.png | Bin 25015 -> 0 bytes
images/iphoneConfig.png | Bin 16872 -> 0 bytes
images/next.png | Bin 21672 -> 0 bytes
images/nextComic.png | Bin 23796 -> 0 bytes
images/onStartFlowSelection.png | Bin 22053 -> 0 bytes
images/onStartFlowSelection_es.png | Bin 22971 -> 0 bytes
images/openFolder.png | Bin 30976 -> 0 bytes
images/options.png | Bin 20699 -> 0 bytes
images/prev.png | Bin 24468 -> 0 bytes
images/previousComic.png | Bin 23714 -> 0 bytes
images/properties.png | Bin 21282 -> 0 bytes
images/qrMessage.png | Bin 2781 -> 0 bytes
images/removeLibrary.png | Bin 19700 -> 0 bytes
images/rotateL.png | Bin 27714 -> 0 bytes
images/rotateR.png | Bin 27567 -> 0 bytes
images/save.png | Bin 23937 -> 0 bytes
images/server.png | Bin 14333 -> 0 bytes
images/setBookmark.png | Bin 17421 -> 0 bytes
images/setRead.png | Bin 18976 -> 0 bytes
images/shortcuts.png | Bin 16124 -> 0 bytes
images/updateLibrary.png | Bin 20542 -> 0 bytes
images/useNewFlowButton.png | Bin 4174 -> 0 bytes
images/useOldFlowButton.png | Bin 3998 -> 0 bytes
images/zoom.png | Bin 17891 -> 0 bytes
89 files changed, 20 insertions(+), 180 deletions(-)
delete mode 100644 common/onstart_flow_selection_dialog.cpp
delete mode 100644 common/onstart_flow_selection_dialog.h
delete mode 100644 images/adjustToFullSize.png
delete mode 100644 images/alwaysOnTop.png
delete mode 100644 images/bookmark.png
delete mode 100644 images/center.png
delete mode 100644 images/comicFolder.png
delete mode 100644 images/coversPackage.png
delete mode 100644 images/db.png
delete mode 100644 images/deleteLibrary.png
delete mode 100644 images/dictionary.png
delete mode 100644 images/doublePage.png
delete mode 100644 images/fit.png
delete mode 100644 images/help.png
delete mode 100644 images/helpImages/bookmark.png
delete mode 100644 images/helpImages/center.png
delete mode 100644 images/helpImages/colapse.png
delete mode 100644 images/helpImages/comicFolder.png
delete mode 100644 images/helpImages/coversPackage.png
delete mode 100644 images/helpImages/deleteLibrary.png
delete mode 100644 images/helpImages/doublePage.png
delete mode 100644 images/helpImages/edit.png
delete mode 100644 images/helpImages/expand.png
delete mode 100644 images/helpImages/exportLibrary.png
delete mode 100644 images/helpImages/fit.png
delete mode 100644 images/helpImages/flow1.png
delete mode 100644 images/helpImages/flow2.png
delete mode 100644 images/helpImages/flow3.png
delete mode 100644 images/helpImages/folder.png
delete mode 100644 images/helpImages/goto.png
delete mode 100644 images/helpImages/help.png
delete mode 100644 images/helpImages/icon.png
delete mode 100644 images/helpImages/importLibrary.png
delete mode 100644 images/helpImages/keyboard.png
delete mode 100644 images/helpImages/mouse.png
delete mode 100644 images/helpImages/new.png
delete mode 100644 images/helpImages/next.png
delete mode 100644 images/helpImages/nextComic.png
delete mode 100644 images/helpImages/notCover.png
delete mode 100644 images/helpImages/open.png
delete mode 100644 images/helpImages/openFolder.png
delete mode 100644 images/helpImages/openLibrary.png
delete mode 100644 images/helpImages/options.png
delete mode 100644 images/helpImages/prev.png
delete mode 100644 images/helpImages/previousComic.png
delete mode 100644 images/helpImages/properties.png
delete mode 100644 images/helpImages/removeLibrary.png
delete mode 100644 images/helpImages/rotateL.png
delete mode 100644 images/helpImages/rotateR.png
delete mode 100644 images/helpImages/save.png
delete mode 100644 images/helpImages/setBookmark.png
delete mode 100644 images/helpImages/setRoot.png
delete mode 100644 images/helpImages/shortcuts.png
delete mode 100644 images/helpImages/speaker.png
delete mode 100644 images/helpImages/updateLibrary.png
delete mode 100644 images/helpImages/zoom.png
create mode 100644 images/icon-new.svg
delete mode 100644 images/importCover.png
delete mode 100644 images/iphoneConfig.png
delete mode 100644 images/next.png
delete mode 100644 images/nextComic.png
delete mode 100644 images/onStartFlowSelection.png
delete mode 100644 images/onStartFlowSelection_es.png
delete mode 100644 images/openFolder.png
delete mode 100644 images/options.png
delete mode 100644 images/prev.png
delete mode 100644 images/previousComic.png
delete mode 100644 images/properties.png
delete mode 100644 images/qrMessage.png
delete mode 100644 images/removeLibrary.png
delete mode 100644 images/rotateL.png
delete mode 100644 images/rotateR.png
delete mode 100644 images/save.png
delete mode 100644 images/server.png
delete mode 100644 images/setBookmark.png
delete mode 100644 images/setRead.png
delete mode 100644 images/shortcuts.png
delete mode 100644 images/updateLibrary.png
delete mode 100644 images/useNewFlowButton.png
delete mode 100644 images/useOldFlowButton.png
delete mode 100644 images/zoom.png
diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro
index d1996afd..5b57b03f 100644
--- a/YACReader/YACReader.pro
+++ b/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 \
diff --git a/YACReader/viewer.cpp b/YACReader/viewer.cpp
index 79a833d0..9db26b13 100644
--- a/YACReader/viewer.cpp
+++ b/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
{
diff --git a/YACReader/yacreader_images.qrc b/YACReader/yacreader_images.qrc
index 5488564b..7eaf093c 100644
--- a/YACReader/yacreader_images.qrc
+++ b/YACReader/yacreader_images.qrc
@@ -1,6 +1,6 @@
- ../images/icon.png
+ ../images/icon-new.svg
../images/goto.png
../images/find_folder.png
../images/flow1.png
@@ -9,7 +9,6 @@
../images/flow4.png
../images/flow5.png
../images/notCover.png
- ../images/shortcuts.png
../images/close.png
../images/up.png
../images/down.png
@@ -17,41 +16,7 @@
../images/imgGoToSlide.png
../images/imgCenterSlidePressed.png
../images/imgGoToSlidePressed.png
-
- ../images/helpImages/open.png
- ../images/helpImages/openFolder.png
- ../images/helpImages/next.png
- ../images/helpImages/prev.png
- ../images/helpImages/icon.png
- ../images/helpImages/zoom.png
- ../images/helpImages/fit.png
- ../images/helpImages/goto.png
- ../images/helpImages/help.png
- ../images/helpImages/center.png
- ../images/helpImages/options.png
- ../images/helpImages/comicFolder.png
- ../images/helpImages/save.png
- ../images/helpImages/rotateL.png
- ../images/helpImages/rotateR.png
- ../images/helpImages/flow1.png
- ../images/helpImages/flow2.png
- ../images/helpImages/flow3.png
- ../images/helpImages/bookmark.png
- ../images/helpImages/setBookmark.png
- ../images/helpImages/notCover.png
- ../images/helpImages/previousComic.png
- ../images/helpImages/nextComic.png
- ../images/helpImages/deleteLibrary.png
- ../images/helpImages/properties.png
- ../images/helpImages/doublePage.png
- ../images/helpImages/keyboard.png
- ../images/helpImages/mouse.png
- ../images/helpImages/speaker.png
../images/defaultCover.png
- ../images/onStartFlowSelection.png
- ../images/onStartFlowSelection_es.png
- ../images/useNewFlowButton.png
- ../images/useOldFlowButton.png
../images/fromTo.png
../images/dropDownArrow.png
../images/translatorSearch.png
diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro
index ad2dacf8..c212ae12 100644
--- a/YACReaderLibrary/YACReaderLibrary.pro
+++ b/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 \
diff --git a/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc
index 56759398..c9cf0200 100644
--- a/YACReaderLibrary/images.qrc
+++ b/YACReaderLibrary/images.qrc
@@ -10,7 +10,6 @@
../images/comic_vine/rowDown.png
../images/comic_vine/rowUp.png
../images/comic_vine/upArrow.png
- ../images/comicFolder.png
../images/comics_view_toolbar/asignNumber.png
../images/comics_view_toolbar/asignNumber@2x.png
../images/comics_view_toolbar/big_size_grid_zoom.png
@@ -41,8 +40,6 @@
../images/comics_view_toolbar/setManga@2x.png
../images/comics_view_toolbar/setNormal.png
../images/comics_view_toolbar/setNormal@2x.png
- ../images/coversPackage.png
- ../images/db.png
../images/defaultCover.png
../images/edit.png
../images/empty_current_readings.png
@@ -60,14 +57,13 @@
../images/flow5.png
../images/glowLine.png
../images/hiddenCovers.png
- ../images/icon.png
+ ../images/icon-new.svg
../images/iconLibrary.png
../images/importBottomCoversDecoration.png
../images/importComicsInfo.png
../images/importingIcon.png
../images/importLibrary.png
../images/importTopCoversDecoration.png
- ../images/iphoneConfig.png
../images/main_toolbar/divider.png
../images/menus_icons/editIcon.png
../images/menus_icons/editIcon@2x.png
@@ -90,15 +86,12 @@
../images/noLibrariesIcon.png
../images/noLibrariesLine.png
../images/notCover.png
- ../images/onStartFlowSelection.png
- ../images/onStartFlowSelection_es.png
../images/openLibrary.png
../images/previousCoverPage.png
../images/readingRibbon.png
../images/readRibbon.png
../images/searching_icon.png
../images/serverConfigBackground.png
- ../images/setRead.png
../images/shortcuts_group_comics.png
../images/shortcuts_group_folders.png
../images/shortcuts_group_general.png
@@ -120,8 +113,6 @@
../images/sidebar/libraryOptions.png
../images/sidebar/libraryOptions@2x.png
../images/updatingIcon.png
- ../images/useNewFlowButton.png
- ../images/useOldFlowButton.png
../images/custom_dialog/custom_close_button.svg
../images/whats_new/whatsnew_header.svg
diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index 8bb81af8..7c5d5b74 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/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"
diff --git a/common/onstart_flow_selection_dialog.cpp b/common/onstart_flow_selection_dialog.cpp
deleted file mode 100644
index 1d1d7f7c..00000000
--- a/common/onstart_flow_selection_dialog.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "onstart_flow_selection_dialog.h"
-
-#include
-#include
-#include
-
-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);
-}
diff --git a/common/onstart_flow_selection_dialog.h b/common/onstart_flow_selection_dialog.h
deleted file mode 100644
index 8d70a45b..00000000
--- a/common/onstart_flow_selection_dialog.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef ONSTART_FLOW_SELECTION_DIALOG_H
-#define ONSTART_FLOW_SELECTION_DIALOG_H
-
-#include
-
-class OnStartFlowSelectionDialog : public QDialog
-{
- Q_OBJECT
-public:
- OnStartFlowSelectionDialog(QWidget *parent = 0);
-};
-
-#endif
\ No newline at end of file
diff --git a/files/about.html b/files/about.html
index 2144bf40..994a1819 100644
--- a/files/about.html
+++ b/files/about.html
@@ -20,7 +20,7 @@
-
+
General Information
@@ -43,9 +43,12 @@ Published under GPL v3 licens
Donations
YACReader is free and open source
-If you like YACReader, please, consider to make a donation Donate!
+If you like YACReader, please, consider to make a donation, it helps keeping the project alive. Donate!
+
+You can also become a patron in Patreon.
+
Go social
@@ -54,37 +57,11 @@ Find other users and help at:
Facebook
Twitter
YouTube
-Google+
+Instagram
+Patreon
-Contributors
-Translators
-
-Packages
-
- - alperenelhan : Arch Linux binaries
- - Felix Kauselmann : Arch Linux binaries (7.x)
- - Alexander Alemayhu : involved in Linux packaging
- - Yoann Gauthier : man pages for Linux
- - Robbie Holmes (robbiethegeek) : brew cask install
-
-
-Developers
-
- - Felix Kauselmann : Linux/Unix build system and other improvements.
-
-
-Thank you to Elia Gregorio Méndez for developing the websites
-
-
Third-party software and resources
Compressed files are loaded using 7zip (Windows version) and p7zip (Linux/MacOS X versions)
@@ -96,7 +73,7 @@ Server info QR codes are generated using PictureFlow.
-Some icons were desinged by Mattahan.
+Server uses QtWebApp.