mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-18 13:04:28 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged in Anon789/yacreader-4/Anon789/yacreader_ruts-correcting-errors-in-wor-1519495902252 (pull request #66)

Browse Source 
yacreader_ru.ts

Approved-by: Luis ?ngel San Mart?n <luisangelsm@gmail.com>
This commit is contained in:
Luis Ángel San Martín
2018-03-03 14:53:02 +00:00
parent 7860a9b51f 218742aafb
commit 2f6c968302
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
YACReader/options_dialog.cpp
View File

@ -11,6 +11,7 @@
#include <QPushButton>
#include <QLabel>
#include <QColorDialog>
#include <QCheckBox>
#include "yacreader_spin_slider_widget.h"
#include "yacreader_flow_config_widget.h"

2
YACReaderLibrary/comic_vine/api_key_dialog.cpp
View File

@ -63,6 +63,6 @@ void ApiKeyDialog::enableAccept(const QString &text)
void ApiKeyDialog::saveApiKey()
{
settings->setValue(COMIC_VINE_API_KEY,edit->text());
settings->setValue(COMIC_VINE_API_KEY,edit->text().trimmed());
accept();
}

3
YACReaderLibrary/options_dialog.cpp
View File

@ -7,8 +7,9 @@
#include "yacreader_flow_config_widget.h"
#include "api_key_dialog.h"
#ifndef NO_OPENGL
FlowType flowType = Strip;
#endif
OptionsDialog::OptionsDialog(QWidget * parent)
:YACReaderOptionsDialog(parent)

8
compressed_archive/unarr/unarr-wrapper.pri
View File

@ -6,19 +6,17 @@ HEADERS += $$PWD/extract_delegate.h \
SOURCES += $$PWD/compressed_archive.cpp
unix:!macx {
!contains(QT_CONFIG, no-pkg-config):packagesExist(libunarr) {
unix:!macx:!contains(QT_CONFIG, no-pkg-config):packagesExist(libunarr) {
message(Using system provided unarr installation found by pkg-config.)
CONFIG += link_pkgconfig
PKGCONFIG += libunarr
DEFINES += use_unarr
}
else:exists(/usr/include/unarr.h):exists(/usr/lib/libunarr.so) {
else:unix:!macx:exists(/usr/include/unarr.h) {
message(Using system provided unarr installation.)
LIBS += -lunarr
DEFINES += use_unarr
}
}
}
else:macx:exists(../../dependencies/unarr/macx/libunarr.a) {
message(Found prebuilt unarr library in dependencies directory.)

2
config.pri
View File

@ -27,7 +27,7 @@ lessThan(QT_VER_MIN, 3) {
isEmpty(QMAKE_TARGET.arch) {
QMAKE_TARGET.arch = $$QMAKE_HOST.arch
}
contains(QMAKE_TARGET.arch, arm.*) {
contains(QMAKE_TARGET.arch, arm.*)|contains(QMAKE_TARGET.arch, aarch.*) {
message("Building for ARM architecture. Disabling OpenGL coverflow ...")
CONFIG += no_opengl
}

8
dependencies/pdf_backend.pri vendored
View File

@ -22,10 +22,10 @@ CONFIG(pdfium) {
message(Using system provided installation of libpdfium found by pkg-config.)
CONFIG += link_pkgconfig
PKGCONFIG += libpdfium
} else:exists(/usr/include/pdfium):exists(/usr/lib/libpdfium.so) {
} else:exists(/usr/include/pdfium) {
message(Using libpdfium found at /usr/lib/pdfium)
INCLUDEPATH += /usr/include/pdfium
LIBS += -L/usr/lib/pdfium -lpdfium
LIBS += -lpdfium
} else {
error(Could not find libpdfium.)
}
@ -58,10 +58,10 @@ CONFIG(poppler) {
message("Using system provided installation of poppler-qt5 found by pkg-config.")
CONFIG += link_pkgconfig
PKGCONFIG += poppler-qt5
} else:!macx:exists(/usr/include/poppler/qt5):exists(/usr/lib/libpoppler-qt5) {
} else:!macx:exists(/usr/include/poppler/qt5) {
message("Using system provided installation of poppler-qt5.")
INCLUDEPATH += /usr/include/poppler/qt5
LIBS += -L/usr/lib -lpoppler-qt5
LIBS += -lpoppler-qt5
} else {
error("Could not find poppler-qt5")
}