diff --git a/YACReader.1 b/YACReader.1
new file mode 100644
index 00000000..e0132fec
--- /dev/null
+++ b/YACReader.1
@@ -0,0 +1,44 @@
+.\" Manpage for YACReader.
+.\" Contact yoann.gauthier9@gmail.com to correct errors or typos.
+.TH man 8 "5 July 2014" "1.0" "YACReader man page"
+.SH NAME
+YACReader \- launch YACReader application.
+.SH SYNOPSIS
+.B
+YACReader
+pathfile
+[\fIcomicId\fR]
+[\fIlibraryId\fR]
+.SH DESCRIPTION
+YACReader is a free cross-platform comic reader with support for multiple comic files and image formats.
+.SH OPTIONS
+pathfile
+: Path to be opened by YACReader.
+.TP
+\fIcomicId\fR : Comic identifier.
+.TP
+\fIlibraryId\fR : Library identifier.
+.SH FEATURES
+- rar, zip, cbr, cbz, tar, pdf, 7z and cb7 comics support with compatibility for jpeg, gif, png, tiff and bmp images.
+.TP
+- Fast and easy to use.
+.TP
+- Use your keyboard or mouse for easy navigation.
+.TP
+- Fully customizable magnifying glass.
+.TP
+- Image rotation, double page mode, full size view, fullscreen mode, customizable background color and more.
+.TP
+- Bookmarks and resume reading.
+.TP
+- Find any page easily and quickly with "go to flow", a customizable eye candy effect for browsing comic pages.
+.SH CONTACTS
+To report bug or contact developpers, send a mail to :
+.RS 3
+.TP
+\fBinfo@yacreader.com\fR : for general information or suggestions about YACReader.
+.TP
+\fBsupport@yacreader.com\fR : for problems with YACReader or bugs detected.
+.RE
+.SH AUTHOR
+Luis Ángel San Martín Rodríguez (luisangelsm@gmail.com)
\ No newline at end of file
diff --git a/YACReader.desktop b/YACReader.desktop
index 20c5f201..32d5caf3 100644
--- a/YACReader.desktop
+++ b/YACReader.desktop
@@ -1,12 +1,13 @@
[Desktop Entry]
Name=YACReader
GenericName=Yet Another Comic Reader
-Comment=Yet Another Comic Reader
+Comment=A comic reader with support for .cb*, .pdf and whole directories.
Exec=YACReader %f
-Icon=/usr/share/YACReader/icon.png
+Icon=/usr/share/yacreader/icon.png
Terminal=false
Type=Application
StartupNotify=true
Categories=Graphics;Viewer;
MimeType=application/x-cbz;application/x-cbr;application/x-cbt;application/x-cb7;application/x-pdf;application/x-zip;application/x-rar;application/x-7z;inode/directory;
+Keywords=comic;viewer;pdf;reader;
X-Desktop-File-Install-Version=0.22
diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro
index cc4b1387..45fe72c9 100644
--- a/YACReader/YACReader.pro
+++ b/YACReader/YACReader.pro
@@ -70,10 +70,9 @@ DATADIR = $$PREFIX/share
DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\""
-
#MAKE INSTALL
-INSTALLS += bin docs icon desktop translation
+INSTALLS += bin docs icon desktop translation #manpage
bin.path = $$BINDIR
isEmpty(DESTDIR) {
@@ -82,18 +81,27 @@ isEmpty(DESTDIR) {
bin.files = $$DESTDIR/YACReader
}
-docs.path = $$DATADIR/doc/YACReader
-docs.files = ../*.txt
+docs.path = $$DATADIR/doc/yacreader
-icon.path = $$DATADIR/YACReader
+#rename docs for better packageability
+docs.extra = cp ../CHANGELOG.txt ../changelog; cp ../README.txt ../README
+docs.files = ../README ../changelog
+
+icon.path = $$DATADIR/yacreader
icon.files = ../images/icon.png
desktop.path = $$DATADIR/applications
-desktop.extra = desktop-file-edit --set-icon=$$DATADIR/YACReader/icon.png $$PWD/../YACReader.desktop
+desktop.extra = desktop-file-edit --set-icon=$$DATADIR/yacreader/icon.png $$PWD/../YACReader.desktop
desktop.files = ../YACReader.desktop
#TODO: icons should be located at /usr/share/icons and have the same basename as their application
-translation.path = $$DATADIR/YACReader/languages
+translation.path = $$DATADIR/yacreader/languages
translation.files = ../release/languages/yacreader_*
+
+manpage.path = $$DATADIR/man/man1
+manpage.files = ../YACReader.1
+
+#remove leftover doc files when 'make clean' is invoked
+QMAKE_CLEAN += "../changelog" "../README"
}
diff --git a/YACReader/main.cpp b/YACReader/main.cpp
index 70028440..5e4a75d6 100644
--- a/YACReader/main.cpp
+++ b/YACReader/main.cpp
@@ -129,7 +129,7 @@ int main(int argc, char * argv[])
QTranslator translator;
QString sufix = QLocale::system().name();
#if defined Q_OS_UNIX && !defined Q_OS_MAC
- translator.load(QString(DATADIR)+"/YACReader/languages/yacreader_"+sufix);
+ translator.load(QString(DATADIR)+"/yacreader/languages/yacreader_"+sufix);
#else
translator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix);
#endif
diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp
index ad2a2dd9..d8bd1db5 100644
--- a/YACReader/main_window_viewer.cpp
+++ b/YACReader/main_window_viewer.cpp
@@ -1117,7 +1117,7 @@ void MainWindowViewer::changeFit()
void MainWindowViewer::newVersion()
{
QMessageBox msgBox;
- msgBox.setText(tr("There is a new version avaliable"));
+ msgBox.setText(tr("There is a new version available"));
msgBox.setInformativeText(tr("Do you want to download the new version?"));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::Ignore | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::Yes);
diff --git a/YACReader/yacreader_de.ts b/YACReader/yacreader_de.ts
index d50023ea..16d8d4b0 100644
--- a/YACReader/yacreader_de.ts
+++ b/YACReader/yacreader_de.ts
@@ -393,7 +393,7 @@
- There is a new version avaliable
+ There is a new version availableNeue Version verfügbar
diff --git a/YACReader/yacreader_es.ts b/YACReader/yacreader_es.ts
index 6ed1f601..6036ddeb 100644
--- a/YACReader/yacreader_es.ts
+++ b/YACReader/yacreader_es.ts
@@ -404,7 +404,7 @@
- There is a new version avaliable
+ There is a new version availableHay una nueva versión disponible
diff --git a/YACReader/yacreader_fr.ts b/YACReader/yacreader_fr.ts
index 695bd65b..6d9646dc 100644
--- a/YACReader/yacreader_fr.ts
+++ b/YACReader/yacreader_fr.ts
@@ -393,7 +393,7 @@
- There is a new version avaliable
+ There is a new version availableUne nouvelle version est disponible
diff --git a/YACReader/yacreader_nl.ts b/YACReader/yacreader_nl.ts
index b50e094e..246fbe31 100644
--- a/YACReader/yacreader_nl.ts
+++ b/YACReader/yacreader_nl.ts
@@ -393,7 +393,7 @@
- There is a new version avaliable
+ There is a new version availableEr is een nieuwe versie beschikbaar
diff --git a/YACReader/yacreader_pt.ts b/YACReader/yacreader_pt.ts
index ac2d9c10..d2543af9 100644
--- a/YACReader/yacreader_pt.ts
+++ b/YACReader/yacreader_pt.ts
@@ -403,7 +403,7 @@
- There is a new version avaliable
+ There is a new version availableHá uma nova versão disponível
diff --git a/YACReader/yacreader_ru.ts b/YACReader/yacreader_ru.ts
index 4618cc1b..67e44ab4 100644
--- a/YACReader/yacreader_ru.ts
+++ b/YACReader/yacreader_ru.ts
@@ -393,7 +393,7 @@
- There is a new version avaliable
+ There is a new version availableДоступно новое обновление
diff --git a/YACReader/yacreader_source.ts b/YACReader/yacreader_source.ts
index f29f9fa2..87f1ba74 100644
--- a/YACReader/yacreader_source.ts
+++ b/YACReader/yacreader_source.ts
@@ -393,7 +393,7 @@
- There is a new version avaliable
+ There is a new version available
diff --git a/YACReader/yacreader_tr.ts b/YACReader/yacreader_tr.ts
index 56fb2aac..8e7a0412 100644
--- a/YACReader/yacreader_tr.ts
+++ b/YACReader/yacreader_tr.ts
@@ -306,7 +306,7 @@
Sıradaki çizgi romanı aç
- There is a new version avaliable
+ There is a new version availableYeni versiyon mevcut
diff --git a/YACReaderLibrary.1 b/YACReaderLibrary.1
new file mode 100644
index 00000000..d3c69520
--- /dev/null
+++ b/YACReaderLibrary.1
@@ -0,0 +1,36 @@
+.\" Manpage for YACReaderLibrary.
+.\" Contact yoann.gauthier9@gmail.com to correct errors or typos.
+.TH man 8 "5 July 2014" "1.0" "YACReaderLibrary man page"
+.SH NAME
+YACReaderLibrary \- launch YACReaderLibrary application.
+.SH SYNOPSIS
+.B
+YACReaderLibrary
+.SH DESCRIPTION
+YACReaderLibrary an application for browsing and managing your comic collections with various smooth transition effects
+.SH OPTIONS
+No command line parameters.
+.SH FEATURES
+- Create, manage and browse your comics collections using beautiful, customizable and smooth "comic flow" transitions.
+.TP
+- Comic Vine support.
+.TP
+- Easily organization of your comics in libraries.
+.TP
+- Find your comics quickly using the built-in search engine.
+.TP
+- Open your comics with YACReader from YACReaderLibrary.
+.TP
+- Enjoy your comics covers with the fullscreen mode.
+.TP
+- Mark your comics as read/unread and track your reading progress.
+.SH CONTACTS
+To report bug or contact developpers, send a mail to :
+.RS 3
+.TP
+\fBinfo@yacreader.com\fR : for general information or suggestions about YACReader.
+.TP
+\fBsupport@yacreader.com\fR : for problems with YACReader or bugs detected.
+.RE
+.SH AUTHOR
+Luis Ángel San Martín Rodríguez (luisangelsm@gmail.com)
\ No newline at end of file
diff --git a/YACReaderLibrary.desktop b/YACReaderLibrary.desktop
index 76ee3432..75f7a4a3 100644
--- a/YACReaderLibrary.desktop
+++ b/YACReaderLibrary.desktop
@@ -1,12 +1,13 @@
[Desktop Entry]
Name=YACReader Library
-GenericName=Yet Another Comic Reader
-Comment=Yet Another Comic Reader
+GenericName=Yet Another Comic Reader - Library
+Comment=A comic library management application with server mode.
Exec=YACReaderLibrary %f
-Icon=/usr/share/YACReader/iconLibrary.png
+Icon=/usr/share/yacreader/iconLibrary.png
Terminal=false
Type=Application
StartupNotify=true
Categories=Graphics;Viewer;
MimeType=
+Keywords=comic;library;server;
X-Desktop-File-Install-Version=0.22
diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro
index 96eab0ff..c23cf6db 100644
--- a/YACReaderLibrary/YACReaderLibrary.pro
+++ b/YACReaderLibrary/YACReaderLibrary.pro
@@ -249,7 +249,7 @@ DATADIR = $$PREFIX/share
DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\""
#MAKE INSTALL
-INSTALLS += bin icon desktop server translation
+INSTALLS += bin icon desktop server translation #manpage
bin.path = $$BINDIR
isEmpty(DESTDIR) {
@@ -258,17 +258,20 @@ isEmpty(DESTDIR) {
bin.files = $$DESTDIR/YACReaderLibrary
}
-server.path = $$DATADIR/YACReader
+server.path = $$DATADIR/yacreader
server.files = ../release/server
-icon.path = $$DATADIR/YACReader
+icon.path = $$DATADIR/yacreader
icon.files = ../images/iconLibrary.png ../images/db.png ../images/coversPackage.png
desktop.path = $$DATADIR/applications
-desktop.extra = desktop-file-edit --set-icon=$$DATADIR/YACReader/iconLibrary.png $$PWD/../YACReaderLibrary.desktop
+desktop.extra = desktop-file-edit --set-icon=$$DATADIR/yacreader/iconLibrary.png $$PWD/../YACReaderLibrary.desktop
desktop.files = ../YACReaderLibrary.desktop
#TODO: icons should be located at /usr/share/icons and have the same basename as their application
-translation.path = $$DATADIR/YACReader/languages
+translation.path = $$DATADIR/yacreader/languages
translation.files = ../release/languages/yacreaderlibrary_*
+
+manpage.path = $$DATADIR/man/man1
+manpage.files = ../YACReaderLibrary.1
}
diff --git a/YACReaderLibrary/comic_vine/search_single_comic.cpp b/YACReaderLibrary/comic_vine/search_single_comic.cpp
index 431b048a..0e4f479d 100644
--- a/YACReaderLibrary/comic_vine/search_single_comic.cpp
+++ b/YACReaderLibrary/comic_vine/search_single_comic.cpp
@@ -10,8 +10,8 @@ SearchSingleComic::SearchSingleComic(QWidget * parent)
:QWidget(parent)
{
- //QLabel * label = new QLabel(tr("Please provide some aditional information. At least one field is needed."));
- QLabel * label = new QLabel(tr("Please provide some aditional information."));
+ //QLabel * label = new QLabel(tr("Please provide some additional information. At least one field is needed."));
+ QLabel * label = new QLabel(tr("Please provide some additional information."));
label->setStyleSheet("QLabel {color:white; font-size:12px;font-family:Arial;}");
//titleEdit = new ScraperLineEdit(tr("Title:"));
diff --git a/YACReaderLibrary/comic_vine/search_volume.cpp b/YACReaderLibrary/comic_vine/search_volume.cpp
index cb779b6f..8351f685 100644
--- a/YACReaderLibrary/comic_vine/search_volume.cpp
+++ b/YACReaderLibrary/comic_vine/search_volume.cpp
@@ -8,7 +8,7 @@
SearchVolume::SearchVolume(QWidget * parent)
:QWidget(parent)
{
- QLabel * label = new QLabel(tr("Please provide some aditional information."));
+ QLabel * label = new QLabel(tr("Please provide some additional information."));
label->setStyleSheet("QLabel {color:white; font-size:12px;font-family:Arial;}");
volumeEdit = new ScraperLineEdit(tr("Series:"));
diff --git a/YACReaderLibrary/library_creator.cpp b/YACReaderLibrary/library_creator.cpp
index 505e83ea..23f8ed63 100644
--- a/YACReaderLibrary/library_creator.cpp
+++ b/YACReaderLibrary/library_creator.cpp
@@ -403,7 +403,7 @@ void LibraryCreator::update(QDir dirS)
}
i++;
}
- else //nameD no longer avaliable on Source folder...
+ else //nameD no longer available on Source folder...
{
if(nameS!="/.yacreaderlibrary")
{
diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index 2d87488b..62c3a9f0 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -1062,7 +1062,7 @@ void LibraryWindow::loadLibrary(const QString & name)
comicsView->setModel(NULL);
foldersView->setModel(NULL);
disableAllActions();//TODO comprobar que se deben deshabilitar
- //ser posible renombrar y borrar estas bibliotecas
+ //ser possible renombrar y borrar estas bibliotecas
renameLibraryAction->setEnabled(true);
removeLibraryAction->setEnabled(true);
}
@@ -1114,7 +1114,7 @@ void LibraryWindow::loadLibrary(const QString & name)
comicsView->setModel(NULL);
foldersView->setModel(NULL);
disableAllActions();//TODO comprobar que se deben deshabilitar
- //ser posible renombrar y borrar estas bibliotecas
+ //ser possible renombrar y borrar estas bibliotecas
renameLibraryAction->setEnabled(true);
removeLibraryAction->setEnabled(true);
}
@@ -1133,7 +1133,7 @@ void LibraryWindow::loadLibrary(const QString & name)
{
deleteCurrentLibrary();
}
- //ser posible renombrar y borrar estas bibliotecas
+ //ser possible renombrar y borrar estas bibliotecas
renameLibraryAction->setEnabled(true);
removeLibraryAction->setEnabled(true);
@@ -1145,7 +1145,7 @@ void LibraryWindow::loadLibrary(const QString & name)
{
QSqlDatabase db = DataBaseManagement::loadDatabase(path);
manageOpeningLibraryError(db.lastError().databaseText() + "-" + db.lastError().driverText());
- //ser posible renombrar y borrar estas bibliotecas
+ //ser possible renombrar y borrar estas bibliotecas
renameLibraryAction->setEnabled(true);
removeLibraryAction->setEnabled(true);
}
@@ -1161,7 +1161,7 @@ void LibraryWindow::loadLibrary(const QString & name)
createLibraryDialog->setDataAndStart(currentLibrary,path);
//create(path,path+"/.yacreaderlibrary",currentLibrary);
}
- //ser posible renombrar y borrar estas bibliotecas
+ //ser possible renombrar y borrar estas bibliotecas
renameLibraryAction->setEnabled(true);
removeLibraryAction->setEnabled(true);
}
@@ -1425,7 +1425,7 @@ void LibraryWindow::deleteCurrentLibrary()
QDir d(path);
delTree(d);
d.rmdir(path);
- if(libraries.isEmpty())//no more libraries avaliable.
+ if(libraries.isEmpty())//no more libraries available.
{
comicsView->setModel(NULL);
foldersView->setModel(NULL);
@@ -1447,7 +1447,7 @@ void LibraryWindow::removeLibrary()
libraries.remove(currentLibrary);
selectedLibrary->removeItem(selectedLibrary->currentIndex());
//selectedLibrary->setCurrentIndex(0);
- if(libraries.isEmpty())//no more libraries avaliable.
+ if(libraries.isEmpty())//no more libraries available.
{
comicsView->setModel(NULL);
foldersView->setModel(NULL);
diff --git a/YACReaderLibrary/main.cpp b/YACReaderLibrary/main.cpp
index d329aa13..37a4f539 100644
--- a/YACReaderLibrary/main.cpp
+++ b/YACReaderLibrary/main.cpp
@@ -182,7 +182,7 @@ int main( int argc, char ** argv )
QTranslator translator;
QString sufix = QLocale::system().name();
#if defined Q_OS_UNIX && !defined Q_OS_MAC
- translator.load(QString(DATADIR) +"/YACReader/languages/yacreaderlibrary_"+sufix);
+ translator.load(QString(DATADIR)+"/yacreader/languages/yacreaderlibrary_"+sufix);
#else
translator.load(QCoreApplication::applicationDirPath()+"/languages/yacreaderlibrary_"+sufix);
#endif
@@ -190,7 +190,7 @@ int main( int argc, char ** argv )
QTranslator viewerTranslator;
#if defined Q_OS_UNIX && !defined Q_OS_MAC
- viewerTranslator.load(QString(DATADIR)+"/YACReader/languages/yacreader_"+sufix);
+ viewerTranslator.load(QString(DATADIR)+"/yacreader/languages/yacreader_"+sufix);
#else
viewerTranslator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix);
#endif
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/staticfilecontroller.cpp b/YACReaderLibrary/server/lib/bfHttpServer/staticfilecontroller.cpp
index e2272717..b2515e3c 100644
--- a/YACReaderLibrary/server/lib/bfHttpServer/staticfilecontroller.cpp
+++ b/YACReaderLibrary/server/lib/bfHttpServer/staticfilecontroller.cpp
@@ -11,6 +11,7 @@
#include "static.h"
#include
+
StaticFileController::StaticFileController(QSettings* settings, QObject* parent)
:HttpRequestHandler(parent)
{
@@ -25,8 +26,8 @@ StaticFileController::StaticFileController(QSettings* settings, QObject* parent)
#endif
{
#if defined Q_OS_UNIX && ! defined Q_OS_MAC
- QFileInfo configFile(QString(DATADIR)+"/YACReader");
- docroot=QFileInfo(QString(DATADIR)+"/YACReader",docroot).absoluteFilePath();
+ QFileInfo configFile(QString(DATADIR)+"/yacreader");
+ docroot=QFileInfo(QString(DATADIR)+"/yacreader",docroot).absoluteFilePath();
#else
QFileInfo configFile(QApplication::applicationDirPath());
docroot=QFileInfo(QApplication::applicationDirPath(),docroot).absoluteFilePath();
diff --git a/YACReaderLibrary/server/lib/bfTemplateEngine/templateloader.cpp b/YACReaderLibrary/server/lib/bfTemplateEngine/templateloader.cpp
index 5cb416e4..ea3a2dd8 100644
--- a/YACReaderLibrary/server/lib/bfTemplateEngine/templateloader.cpp
+++ b/YACReaderLibrary/server/lib/bfTemplateEngine/templateloader.cpp
@@ -23,8 +23,8 @@ TemplateLoader::TemplateLoader(QSettings* settings, QObject* parent)
#endif
{
#if defined Q_OS_UNIX && !defined Q_OS_MAC
- QFileInfo configFile(QString(DATADIR)+"/YACReader");
- templatePath=QFileInfo(QString(DATADIR)+"/YACReader",templatePath).absoluteFilePath();
+ QFileInfo configFile(QString(DATADIR)+"/yacreader");
+ templatePath=QFileInfo(QString(DATADIR)+"/yacreader",templatePath).absoluteFilePath();
#else
QFileInfo configFile(QApplication::applicationDirPath());
templatePath=QFileInfo(QApplication::applicationDirPath(),templatePath).absoluteFilePath();
diff --git a/YACReaderLibrary/server/requestmapper.cpp b/YACReaderLibrary/server/requestmapper.cpp
index df080918..21e3083b 100644
--- a/YACReaderLibrary/server/requestmapper.cpp
+++ b/YACReaderLibrary/server/requestmapper.cpp
@@ -124,9 +124,7 @@ void RequestMapper::service(HttpRequest& request, HttpResponse& response) {
HttpSession session=Static::sessionStore->getSession(request,response,false);
if(!session.isNull() && session.contains("ySession"))
{
- //
-
- if(library.indexIn(path)!=-1 && DBHelper::getLibraries().contains(library.cap(1).toInt()) )
+ if(library.indexIn(path)!=-1 && DBHelper::getLibraries().contains(library.cap(1).toInt()) )
{
//listar el contenido del folder
if(folder.exactMatch(path))
diff --git a/YACReaderLibrary/server/static.cpp b/YACReaderLibrary/server/static.cpp
index 38133b66..49e0060e 100644
--- a/YACReaderLibrary/server/static.cpp
+++ b/YACReaderLibrary/server/static.cpp
@@ -27,7 +27,7 @@ QString Static::getConfigDir() {
}
// Search config file
#if defined Q_OS_UNIX && !defined Q_OS_MAC
- QString binDir=(QString(DATADIR) + "/YACReader");
+ QString binDir=(QString(DATADIR)+"/yacreader");
#else
QString binDir=QCoreApplication::applicationDirPath();
#endif
diff --git a/YACReaderLibrary/yacreaderlibrary_es.ts b/YACReaderLibrary/yacreaderlibrary_es.ts
index a52704cb..1d994ae9 100644
--- a/YACReaderLibrary/yacreaderlibrary_es.ts
+++ b/YACReaderLibrary/yacreaderlibrary_es.ts
@@ -1020,7 +1020,7 @@
SearchSingleComic
- Please provide some aditional information.
+ Please provide some additional information.Por favor, proporciona alguna información adicional.
@@ -1033,7 +1033,7 @@
SearchVolume
- Please provide some aditional information.
+ Please provide some additional information.Por favor, proporciona alguna informacion adicional.
diff --git a/YACReaderLibrary/yacreaderlibrary_fr.ts b/YACReaderLibrary/yacreaderlibrary_fr.ts
index 7f053f36..60a00ec2 100644
--- a/YACReaderLibrary/yacreaderlibrary_fr.ts
+++ b/YACReaderLibrary/yacreaderlibrary_fr.ts
@@ -1017,7 +1017,7 @@
SearchSingleComic
- Please provide some aditional information.
+ Please provide some additional information.
@@ -1030,7 +1030,7 @@
SearchVolume
- Please provide some aditional information.
+ Please provide some additional information.
diff --git a/YACReaderLibrary/yacreaderlibrary_nl.ts b/YACReaderLibrary/yacreaderlibrary_nl.ts
index 5f72d43e..9bd4189b 100644
--- a/YACReaderLibrary/yacreaderlibrary_nl.ts
+++ b/YACReaderLibrary/yacreaderlibrary_nl.ts
@@ -1017,7 +1017,7 @@
SearchSingleComic
- Please provide some aditional information.
+ Please provide some additional information.
@@ -1030,7 +1030,7 @@
SearchVolume
- Please provide some aditional information.
+ Please provide some additional information.
diff --git a/YACReaderLibrary/yacreaderlibrary_pt.ts b/YACReaderLibrary/yacreaderlibrary_pt.ts
index 17f33837..6be9cf09 100644
--- a/YACReaderLibrary/yacreaderlibrary_pt.ts
+++ b/YACReaderLibrary/yacreaderlibrary_pt.ts
@@ -1019,7 +1019,7 @@
SearchSingleComic
- Please provide some aditional information.
+ Please provide some additional information.
@@ -1032,7 +1032,7 @@
SearchVolume
- Please provide some aditional information.
+ Please provide some additional information.
diff --git a/YACReaderLibrary/yacreaderlibrary_ru.ts b/YACReaderLibrary/yacreaderlibrary_ru.ts
index ded5afcd..fde5a9f6 100644
--- a/YACReaderLibrary/yacreaderlibrary_ru.ts
+++ b/YACReaderLibrary/yacreaderlibrary_ru.ts
@@ -1019,7 +1019,7 @@
SearchSingleComic
- Please provide some aditional information.
+ Please provide some additional information.
@@ -1032,7 +1032,7 @@
SearchVolume
- Please provide some aditional information.
+ Please provide some additional information.
diff --git a/YACReaderLibrary/yacreaderlibrary_source.ts b/YACReaderLibrary/yacreaderlibrary_source.ts
index d04e34fd..d6a95767 100644
--- a/YACReaderLibrary/yacreaderlibrary_source.ts
+++ b/YACReaderLibrary/yacreaderlibrary_source.ts
@@ -1017,7 +1017,7 @@
SearchSingleComic
- Please provide some aditional information.
+ Please provide some additional information.
@@ -1030,7 +1030,7 @@
SearchVolume
- Please provide some aditional information.
+ Please provide some additional information.
diff --git a/YACReaderLibrary/yacreaderlibrary_tr.ts b/YACReaderLibrary/yacreaderlibrary_tr.ts
index 6cbbbfbe..06761ae6 100644
--- a/YACReaderLibrary/yacreaderlibrary_tr.ts
+++ b/YACReaderLibrary/yacreaderlibrary_tr.ts
@@ -884,7 +884,7 @@
SearchSingleComic
- Please provide some aditional information.
+ Please provide some additional information.
@@ -895,7 +895,7 @@
SearchVolume
- Please provide some aditional information.
+ Please provide some additional information.
diff --git a/compileX11.sh b/compileX11.sh
deleted file mode 100755
index fe10596e..00000000
--- a/compileX11.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/bash
-
-cd ./compressed_archive
-if [ ! -d "libp7zip" ]; then
-echo "You need p7zip source code to compile YACReader. \
-Please check the compressed_archive folder for further instructions."
-exit
-fi
-patch -p0 -i libp7zip.patch
-cd ..
-
-echo "Compiling YACReader"
-cd ./YACReader
-qmake "CONFIG+=release"
-make
-cd ..
-
-echo "Compiling YACReaderLibrary"
-cd ./YACReaderLibrary
-qmake "CONFIG+=release"
-make
-cd ..
-
-echo "Copying to destination folder"
-dest='YACReader-'$1'-X11-'$2'-qt5'
-mkdir "$dest"
-cp ./YACReader/YACReader "./${dest}/YACReader"
-cp ./YACReaderLibrary/YACReaderLibrary "./${dest}/YACReaderLibrary"
-cp ./COPYING.txt "./${dest}/"
-cp ./README.txt "./${dest}/"
-cp ./INSTALL.txt "./${dest}/"
-cp ./images/icon.png "./${dest}/"
-cp ./images/iconLibrary.png "./${dest}/"
-cp ./images/db.png "./${dest}/"
-cp ./images/coversPackage.png "./${dest}/"
-cp -R ./utils "./${dest}/"
-cp -R ./release/server "./${dest}/"
-cp -R ./release/languages "./${dest}/"
-
-echo "Creating package"
-tar -czf "${dest}".tar.gz "${dest}"
-
-echo "Done!"
diff --git a/files/helpYACReader.html b/files/helpYACReader.html
index 1a103f96..09919e39 100644
--- a/files/helpYACReader.html
+++ b/files/helpYACReader.html
@@ -32,7 +32,7 @@
comic reading using keyboard and mouse
fast open and comic navigation
fullscreen mode
-
configurable magnifying glass for improved reading, since 0.2.0 version is avaliable in windowed mode
+
configurable magnifying glass for improved reading, since 0.2.0 version is available in windowed mode
fit width (also adjust to an specific width) and fit height modes.
configurable CoverFlow like effect for "go to page" function.
image rotation for comfortable reading even in tablet PCs
@@ -97,7 +97,7 @@
Configuration dialog
"My comics path" : set your favourite comic path. Open comic dialog will open that path by default.
-
"Go to flow size" : move the slider to set your prefered go to flow size
+
"Go to flow size" : move the slider to set your preferred go to flow size
"How to show pages in GoToFlow" : since version 0.2.0, you can choose between three diferent styles:
Cover Flow : the classic style
@@ -105,7 +105,7 @@
Overlapped Strip : a strip of pages with overlap effect
-
"Page width stretch" : move the slider to set your prefered page width stretch. This takes effect in "fit to width" reading mode.
+
"Page width stretch" : move the slider to set your preferred page width stretch. This takes effect in "fit to width" reading mode.
@@ -126,7 +126,7 @@
automatically, moreover, you can go to next or previous page using 'RIGTH' and 'LEFT'.
- Jumping between pages is posible using "Go To..." dialog ('G' key) or "Go To Flow" widget ('S' key).
+ Jumping between pages is possible using "Go To..." dialog ('G' key) or "Go To Flow" widget ('S' key).
You don't have to wait until all pages are loaded to use these functions, because pages are shown as soon
as they are ready.
On the left, there is a treeview with the folders existing in your library,
- you can select any folder, it is posible to expand or collapse it by double clicking on a folder. Also, you can expand or collapse all folders using '+' and '-' buttons. Root folder
+ you can select any folder, it is possible to expand or collapse it by double clicking on a folder. Also, you can expand or collapse all folders using '+' and '-' buttons. Root folder
can be selected clicking on "Select root node" button.
On the top right, there is the covers view. This view shows the comics on the selected folder. You can browse them using left and right cursors (pressing CTRL allows you to fast fordward/backward), or clicking on the right/left of the central cover.
On the bottom right, there is the list view. This view shows the comics on the selected folder as a list. You can select any comic clicking on it.
diff --git a/mktarball.sh b/mktarball.sh
new file mode 100755
index 00000000..47e1227a
--- /dev/null
+++ b/mktarball.sh
@@ -0,0 +1,22 @@
+#! /bin/bash
+#Script to create a source tarball for YACReader distribution and packaging
+#This should be run from YACReaders top source directory
+
+YACVERSION=7.2.0
+if [ -f Makefile ]
+then
+ make distclean
+fi
+if [ ! -f "yacreader-${YACVERSION}-src.tar.xz" ]
+then
+ echo "Building source tarball"
+else
+ echo "Updating source tarball"
+ rm yacreader-${YACVERSION}-src.tar* #delete old tarball, since tar can't update compressed archives
+fi
+#Use tar's --exclude feature to make sure we get a pristine tar for distribution.
+#Exclude all version control system related files and rename the top directory in the tarball using --transform.
+tar cfJ yacreader-${YACVERSION}-src.tar.xz --exclude '*.rej' --exclude '*.orig' --exclude '*.gch' --exclude 'dependencies' --exclude '*.o' \
+--exclude 'yacreader*tar*' --exclude '.hg*' --exclude 'lib7zip' --exclude 'libp7zip' --exclude-vcs ./* --transform s/./yacreader-${YACVERSION}/
+#Calculate checksum to enable packagers to verify whether they are using the original tarball.
+md5sum yacreader-${YACVERSION}-src.tar.xz > yacreader-${YACVERSION}-src.tar.xz.md5sum
\ No newline at end of file