diff --git a/README.txt b/README.txt index b9d66e4a..06304225 100644 --- a/README.txt +++ b/README.txt @@ -1,22 +1,22 @@ -LICENSE -******* -This software has been developed by Luis Ángel San Martín Rodríguez (luisangelsm@gmail.com) under GPL v3 license -(for more details read COPYING.txt). - -CONTACT -******* -Project home page : www.yacreader.com -e-mail: - info@yacreader.com - support@yacreader.com -Social: - Facebook - http://www.facebook.com/YACReader - Twitter - https://twitter.com/yacreader - YouTube - https://www.youtube.com/user/yacreader - -If you need help or have any suggestion, please, send me an e-mail. - -DONATIONS -********* -YACReader is free but it needs money to still be alive, so please, +LICENSE +******* +This software has been developed by Luis Ángel San Martín Rodríguez (luisangelsm@gmail.com) under GPL v3 license +(for more details read COPYING.txt). + +CONTACT +******* +Project home page : www.yacreader.com +e-mail: + info@yacreader.com + support@yacreader.com +Social: + Facebook - http://www.facebook.com/YACReader + Twitter - https://twitter.com/yacreader + YouTube - https://www.youtube.com/user/yacreader + +If you need help or have any suggestion, please, send me an e-mail. + +DONATIONS +********* +YACReader is free but it needs money to still be alive, so please, if you like YACReader, visit the home page and make a donation. \ No newline at end of file diff --git a/YACReader/icon.rc b/YACReader/icon.rc index 86e8e9b3..1bc463a9 100644 --- a/YACReader/icon.rc +++ b/YACReader/icon.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "icon.ico" +IDI_ICON1 ICON DISCARDABLE "icon.ico" diff --git a/YACReader/yacreader_files.qrc b/YACReader/yacreader_files.qrc index 68d07c60..b7540312 100644 --- a/YACReader/yacreader_files.qrc +++ b/YACReader/yacreader_files.qrc @@ -1,12 +1,12 @@ - - - ../files/about.html - ../files/helpYACReader.html - ../files/shortcuts.html - - - - ../files/about_es_ES.html - ../files/helpYACReader_es_ES.html - - + + + ../files/about.html + ../files/helpYACReader.html + ../files/shortcuts.html + + + + ../files/about_es_ES.html + ../files/helpYACReader_es_ES.html + + diff --git a/YACReader/yacreader_images.qrc b/YACReader/yacreader_images.qrc index 6eaed151..2e1e5f6a 100644 --- a/YACReader/yacreader_images.qrc +++ b/YACReader/yacreader_images.qrc @@ -1,70 +1,70 @@ - - - ../images/icon.png - ../images/goto.png - ../images/find_folder.png - ../images/flow1.png - ../images/flow2.png - ../images/flow3.png - ../images/flow4.png - ../images/flow5.png - ../images/notCover.png - ../images/shortcuts.png - ../images/close.png - ../images/up.png - ../images/down.png - ../images/imgCenterSlide.png - ../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 - ../images/speaker.png - ../images/clear_shortcut.png - ../images/accept_shortcut.png - ../images/shortcuts_group_comics.png - ../images/shortcuts_group_folders.png - ../images/shortcuts_group_general.png - ../images/shortcuts_group_libraries.png - ../images/shortcuts_group_mglass.png - ../images/shortcuts_group_page.png - ../images/shortcuts_group_reading.png - ../images/shortcuts_group_visualization.png - - + + + ../images/icon.png + ../images/goto.png + ../images/find_folder.png + ../images/flow1.png + ../images/flow2.png + ../images/flow3.png + ../images/flow4.png + ../images/flow5.png + ../images/notCover.png + ../images/shortcuts.png + ../images/close.png + ../images/up.png + ../images/down.png + ../images/imgCenterSlide.png + ../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 + ../images/speaker.png + ../images/clear_shortcut.png + ../images/accept_shortcut.png + ../images/shortcuts_group_comics.png + ../images/shortcuts_group_folders.png + ../images/shortcuts_group_general.png + ../images/shortcuts_group_libraries.png + ../images/shortcuts_group_mglass.png + ../images/shortcuts_group_page.png + ../images/shortcuts_group_reading.png + ../images/shortcuts_group_visualization.png + + diff --git a/YACReader/yacreader_images_osx.qrc b/YACReader/yacreader_images_osx.qrc index 97b6454c..64c97517 100644 --- a/YACReader/yacreader_images_osx.qrc +++ b/YACReader/yacreader_images_osx.qrc @@ -1,61 +1,61 @@ - - -../images/viewer_toolbar/bookmark_osx.png -../images/viewer_toolbar/bookmark_osx@2x.png -../images/viewer_toolbar/close_osx.png -../images/viewer_toolbar/close_osx@2x.png -../images/viewer_toolbar/doubleMangaPage_osx.png -../images/viewer_toolbar/doubleMangaPage_osx@2x.png -../images/viewer_toolbar/doublePage_osx.png -../images/viewer_toolbar/doublePage_osx@2x.png -../images/viewer_toolbar/fitToPage_osx.png -../images/viewer_toolbar/fitToPage_osx@2x.png -../images/viewer_toolbar/flow_osx.png -../images/viewer_toolbar/flow_osx@2x.png -../images/viewer_toolbar/full_osx.png -../images/viewer_toolbar/full_osx@2x.png -../images/viewer_toolbar/goto_osx.png -../images/viewer_toolbar/goto_osx@2x.png -../images/viewer_toolbar/help_osx.png -../images/viewer_toolbar/help_osx@2x.png -../images/viewer_toolbar/info_osx.png -../images/viewer_toolbar/info_osx@2x.png -../images/viewer_toolbar/magnifyingGlass_osx.png -../images/viewer_toolbar/magnifyingGlass_osx@2x.png -../images/viewer_toolbar/next_osx.png -../images/viewer_toolbar/next_osx@2x.png -../images/viewer_toolbar/open_osx.png -../images/viewer_toolbar/open_osx@2x.png -../images/viewer_toolbar/openFolder_osx.png -../images/viewer_toolbar/openFolder_osx@2x.png -../images/viewer_toolbar/openNext_osx.png -../images/viewer_toolbar/openNext_osx@2x.png -../images/viewer_toolbar/openPrevious_osx.png -../images/viewer_toolbar/openPrevious_osx@2x.png -../images/viewer_toolbar/options_osx.png -../images/viewer_toolbar/options_osx@2x.png -../images/viewer_toolbar/previous_osx.png -../images/viewer_toolbar/previous_osx@2x.png -../images/viewer_toolbar/rotateL_osx.png -../images/viewer_toolbar/rotateL_osx@2x.png -../images/viewer_toolbar/rotateR_osx.png -../images/viewer_toolbar/rotateR_osx@2x.png -../images/viewer_toolbar/save_osx.png -../images/viewer_toolbar/save_osx@2x.png -../images/viewer_toolbar/shortcuts_osx.png -../images/viewer_toolbar/shortcuts_osx@2x.png -../images/viewer_toolbar/showBookmarks_osx.png -../images/viewer_toolbar/showBookmarks_osx@2x.png -../images/viewer_toolbar/toHeight_osx.png -../images/viewer_toolbar/toHeight_osx@2x.png -../images/viewer_toolbar/toWidth_osx.png -../images/viewer_toolbar/toWidth_osx@2x.png -../images/viewer_toolbar/toWidthSlider_osx.png -../images/viewer_toolbar/toWidthSlider_osx@2x.png -../images/viewer_toolbar/translator_osx.png -../images/viewer_toolbar/translator_osx@2x.png -../images/viewer_toolbar/zoom_osx.png -../images/viewer_toolbar/zoom_osx@2x.png - - - + + +../images/viewer_toolbar/bookmark_osx.png +../images/viewer_toolbar/bookmark_osx@2x.png +../images/viewer_toolbar/close_osx.png +../images/viewer_toolbar/close_osx@2x.png +../images/viewer_toolbar/doubleMangaPage_osx.png +../images/viewer_toolbar/doubleMangaPage_osx@2x.png +../images/viewer_toolbar/doublePage_osx.png +../images/viewer_toolbar/doublePage_osx@2x.png +../images/viewer_toolbar/fitToPage_osx.png +../images/viewer_toolbar/fitToPage_osx@2x.png +../images/viewer_toolbar/flow_osx.png +../images/viewer_toolbar/flow_osx@2x.png +../images/viewer_toolbar/full_osx.png +../images/viewer_toolbar/full_osx@2x.png +../images/viewer_toolbar/goto_osx.png +../images/viewer_toolbar/goto_osx@2x.png +../images/viewer_toolbar/help_osx.png +../images/viewer_toolbar/help_osx@2x.png +../images/viewer_toolbar/info_osx.png +../images/viewer_toolbar/info_osx@2x.png +../images/viewer_toolbar/magnifyingGlass_osx.png +../images/viewer_toolbar/magnifyingGlass_osx@2x.png +../images/viewer_toolbar/next_osx.png +../images/viewer_toolbar/next_osx@2x.png +../images/viewer_toolbar/open_osx.png +../images/viewer_toolbar/open_osx@2x.png +../images/viewer_toolbar/openFolder_osx.png +../images/viewer_toolbar/openFolder_osx@2x.png +../images/viewer_toolbar/openNext_osx.png +../images/viewer_toolbar/openNext_osx@2x.png +../images/viewer_toolbar/openPrevious_osx.png +../images/viewer_toolbar/openPrevious_osx@2x.png +../images/viewer_toolbar/options_osx.png +../images/viewer_toolbar/options_osx@2x.png +../images/viewer_toolbar/previous_osx.png +../images/viewer_toolbar/previous_osx@2x.png +../images/viewer_toolbar/rotateL_osx.png +../images/viewer_toolbar/rotateL_osx@2x.png +../images/viewer_toolbar/rotateR_osx.png +../images/viewer_toolbar/rotateR_osx@2x.png +../images/viewer_toolbar/save_osx.png +../images/viewer_toolbar/save_osx@2x.png +../images/viewer_toolbar/shortcuts_osx.png +../images/viewer_toolbar/shortcuts_osx@2x.png +../images/viewer_toolbar/showBookmarks_osx.png +../images/viewer_toolbar/showBookmarks_osx@2x.png +../images/viewer_toolbar/toHeight_osx.png +../images/viewer_toolbar/toHeight_osx@2x.png +../images/viewer_toolbar/toWidth_osx.png +../images/viewer_toolbar/toWidth_osx@2x.png +../images/viewer_toolbar/toWidthSlider_osx.png +../images/viewer_toolbar/toWidthSlider_osx@2x.png +../images/viewer_toolbar/translator_osx.png +../images/viewer_toolbar/translator_osx@2x.png +../images/viewer_toolbar/zoom_osx.png +../images/viewer_toolbar/zoom_osx@2x.png + + + diff --git a/YACReader/yacreader_images_win.qrc b/YACReader/yacreader_images_win.qrc index 7a25e11e..c98b2d86 100644 --- a/YACReader/yacreader_images_win.qrc +++ b/YACReader/yacreader_images_win.qrc @@ -1,31 +1,31 @@ - - - ../images/viewer_toolbar/bookmark.png - ../images/viewer_toolbar/close.png - ../images/viewer_toolbar/doublePage.png - ../images/viewer_toolbar/doubleMangaPage.png - ../images/viewer_toolbar/fitToPage.png - ../images/viewer_toolbar/flow.png - ../images/viewer_toolbar/full.png - ../images/viewer_toolbar/goto.png - ../images/viewer_toolbar/help.png - ../images/viewer_toolbar/info.png - ../images/viewer_toolbar/magnifyingGlass.png - ../images/viewer_toolbar/next.png - ../images/viewer_toolbar/open.png - ../images/viewer_toolbar/openFolder.png - ../images/viewer_toolbar/openNext.png - ../images/viewer_toolbar/openPrevious.png - ../images/viewer_toolbar/options.png - ../images/viewer_toolbar/previous.png - ../images/viewer_toolbar/rotateL.png - ../images/viewer_toolbar/rotateR.png - ../images/viewer_toolbar/save.png - ../images/viewer_toolbar/shortcuts.png - ../images/viewer_toolbar/showBookmarks.png - ../images/viewer_toolbar/toHeight.png - ../images/viewer_toolbar/toWidth.png - ../images/viewer_toolbar/translator.png - ../images/viewer_toolbar/zoom.png - - + + + ../images/viewer_toolbar/bookmark.png + ../images/viewer_toolbar/close.png + ../images/viewer_toolbar/doublePage.png + ../images/viewer_toolbar/doubleMangaPage.png + ../images/viewer_toolbar/fitToPage.png + ../images/viewer_toolbar/flow.png + ../images/viewer_toolbar/full.png + ../images/viewer_toolbar/goto.png + ../images/viewer_toolbar/help.png + ../images/viewer_toolbar/info.png + ../images/viewer_toolbar/magnifyingGlass.png + ../images/viewer_toolbar/next.png + ../images/viewer_toolbar/open.png + ../images/viewer_toolbar/openFolder.png + ../images/viewer_toolbar/openNext.png + ../images/viewer_toolbar/openPrevious.png + ../images/viewer_toolbar/options.png + ../images/viewer_toolbar/previous.png + ../images/viewer_toolbar/rotateL.png + ../images/viewer_toolbar/rotateR.png + ../images/viewer_toolbar/save.png + ../images/viewer_toolbar/shortcuts.png + ../images/viewer_toolbar/showBookmarks.png + ../images/viewer_toolbar/toHeight.png + ../images/viewer_toolbar/toWidth.png + ../images/viewer_toolbar/translator.png + ../images/viewer_toolbar/zoom.png + + diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index 203107c0..51a86e45 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -1,321 +1,321 @@ -TEMPLATE = app -TARGET = YACReaderLibrary - -QMAKE_TARGET_BUNDLE_PREFIX = "com.yacreader" - -DEPENDPATH += . -INCLUDEPATH += . \ - ../common \ - ./server \ - ./db \ - ../custom_widgets \ - ./comic_vine \ - ./comic_vine/model - -DEFINES += SERVER_RELEASE NOMINMAX YACREADER_LIBRARY -QMAKE_MAC_SDK = macosx10.12 - -# load default build flags -include (../config.pri) -include (../dependencies/pdf_backend.pri) - -unix:haiku { - DEFINES += _BSD_SOURCE - LIBS += -lnetwork -lbsd -} - -INCLUDEPATH += ../common/gl - -# there are two builds for Windows, Desktop OpenGL based and ANGLE OpenGL ES based -win32 { - CONFIG(force_angle) { - message("using ANGLE") - LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -lglu32 -luser32 - # linking extra libs are necesary for a successful compilation, a better approach should be - # to remove any OpenGL (desktop) dependencies - # the OpenGL stuff should be migrated to OpenGL ES - DEFINES += FORCE_ANGLE - } else { - LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -lglu32 -luser32 - } - - QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL - QMAKE_LFLAGS_RELEASE += /LTCG - CONFIG -= embed_manifest_exe -} - -CONFIG(force_angle) { - contains(QMAKE_TARGET.arch, x86_64) { - Release:DESTDIR = ../release64_angle - Debug:DESTDIR = ../debug64_angle - } else { - Release:DESTDIR = ../release_angle - Debug:DESTDIR = ../debug_angle - } -} else { - contains(QMAKE_TARGET.arch, x86_64) { - Release:DESTDIR = ../release64 - Debug:DESTDIR = ../debug64 - } else { - Release:DESTDIR = ../release - Debug:DESTDIR = ../debug - } -} - -unix:!macx:!CONFIG(no_opengl) { - LIBS += -lGLU -} - -macx { - LIBS += -framework Foundation -framework ApplicationServices -framework AppKit - CONFIG += objective_c - QT += macextras gui-private -} - -unix:!macx { - CONFIG += c++11 -} - -#CONFIG += release -CONFIG -= flat -QT += sql network widgets script -!CONFIG(no_opengl) { - QT += opengl -} - -# Input -HEADERS += comic_flow.h \ - create_library_dialog.h \ - library_creator.h \ - library_window.h \ - add_library_dialog.h \ - rename_library_dialog.h \ - properties_dialog.h \ - options_dialog.h \ - export_library_dialog.h \ - import_library_dialog.h \ - package_manager.h \ - bundle_creator.h \ - export_comics_info_dialog.h \ - import_comics_info_dialog.h \ - server_config_dialog.h \ - comic_flow_widget.h \ - db_helper.h \ - ./db/data_base_management.h \ - ./db/folder_item.h \ - ./db/folder_model.h \ - ./db/comic_model.h \ - ./db/comic_item.h \ - ../common/comic_db.h \ - ../common/folder.h \ - ../common/library_item.h \ - ../common/comic.h \ - ../common/bookmarks.h \ - ../common/pictureflow.h \ - ../common/custom_widgets.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 \ - yacreader_local_server.h \ - yacreader_main_toolbar.h \ - comics_remover.h \ - ../common/http_worker.h \ - yacreader_libraries.h \ - ../common/exit_check.h \ - comics_view.h \ - classic_comics_view.h \ - empty_folder_widget.h \ - no_search_results_widget.h \ - comic_files_manager.h \ - db/reading_list_model.h \ - db/reading_list_item.h \ - yacreader_folders_view.h \ - yacreader_reading_lists_view.h \ - add_label_dialog.h \ - yacreader_history_controller.h \ - yacreader_navigation_controller.h \ - empty_label_widget.h \ - empty_container_info.h \ - empty_special_list.h \ - empty_reading_list_widget.h \ - ../common/scroll_management.h \ - ../common/opengl_checker.h \ - yacreader_comics_views_manager.h \ - info_comics_view.h \ - yacreader_comics_selection_helper.h \ - yacreader_comic_info_helper.h \ - db/reading_list.h \ - current_comic_view_helper.h - -!CONFIG(no_opengl) { - HEADERS += ../common/gl/yacreader_flow_gl.h -} - -SOURCES += comic_flow.cpp \ - create_library_dialog.cpp \ - library_creator.cpp \ - library_window.cpp \ - main.cpp \ - add_library_dialog.cpp \ - rename_library_dialog.cpp \ - properties_dialog.cpp \ - options_dialog.cpp \ - export_library_dialog.cpp \ - import_library_dialog.cpp \ - package_manager.cpp \ - bundle_creator.cpp \ - export_comics_info_dialog.cpp \ - import_comics_info_dialog.cpp \ - server_config_dialog.cpp \ - comic_flow_widget.cpp \ - db_helper.cpp \ - ./db/data_base_management.cpp \ - ./db/folder_item.cpp \ - ./db/folder_model.cpp \ - ./db/comic_model.cpp \ - ./db/comic_item.cpp \ - ../common/comic_db.cpp \ - ../common/folder.cpp \ - ../common/library_item.cpp \ - ../common/comic.cpp \ - ../common/bookmarks.cpp \ - ../common/pictureflow.cpp \ - ../common/custom_widgets.cpp \ - ../common/qnaturalsorting.cpp \ - ../common/onstart_flow_selection_dialog.cpp \ - no_libraries_widget.cpp \ - import_widget.cpp \ - yacreader_local_server.cpp \ - yacreader_main_toolbar.cpp \ - comics_remover.cpp \ - ../common/http_worker.cpp \ - ../common/yacreader_global.cpp \ - ../common/yacreader_global_gui.cpp \ - yacreader_libraries.cpp \ - ../common/exit_check.cpp \ - comics_view.cpp \ - classic_comics_view.cpp \ - empty_folder_widget.cpp \ - no_search_results_widget.cpp \ - comic_files_manager.cpp \ - db/reading_list_model.cpp \ - db/reading_list_item.cpp \ - yacreader_folders_view.cpp \ - yacreader_reading_lists_view.cpp \ - add_label_dialog.cpp \ - yacreader_history_controller.cpp \ - yacreader_navigation_controller.cpp \ - empty_label_widget.cpp \ - empty_container_info.cpp \ - empty_special_list.cpp \ - empty_reading_list_widget.cpp \ - ../common/scroll_management.cpp \ - ../common/opengl_checker.cpp \ - yacreader_comics_views_manager.cpp \ - info_comics_view.cpp \ - yacreader_comics_selection_helper.cpp \ - yacreader_comic_info_helper.cpp\ - db/reading_list.cpp \ - current_comic_view_helper.cpp - -!CONFIG(no_opengl) { - SOURCES += ../common/gl/yacreader_flow_gl.cpp -} - -include(./server/server.pri) -include(../custom_widgets/custom_widgets_yacreaderlibrary.pri) - -CONFIG(7zip){ -include(../compressed_archive/wrapper.pri) -} else:CONFIG(unarr) { -include(../compressed_archive/unarr/unarr-wrapper.pri) -} else { - error(No compression backend specified. Did you mess with the build system?) -} - -include(./comic_vine/comic_vine.pri) -include(../QsLog/QsLog.pri) -include(../shortcuts_management/shortcuts_management.pri) - -RESOURCES += images.qrc files.qrc -win32:RESOURCES += images_win.qrc -unix:!macx:RESOURCES += images_win.qrc -macx:RESOURCES += images_osx.qrc - -RC_FILE = icon.rc - -macx { - ICON = YACReaderLibrary.icns -} - -TRANSLATIONS = yacreaderlibrary_es.ts \ - yacreaderlibrary_ru.ts \ - yacreaderlibrary_pt.ts \ - yacreaderlibrary_fr.ts \ - yacreaderlibrary_nl.ts \ - yacreaderlibrary_tr.ts \ - yacreaderlibrary_de.ts \ - yacreaderlibrary_source.ts - -#QML/GridView -QT += quick qml - -HEADERS += grid_comics_view.h \ - comics_view_transition.h - -SOURCES += grid_comics_view.cpp \ - comics_view_transition.cpp - -RESOURCES += qml.qrc -win32:RESOURCES += qml_win.qrc -unix:!macx:RESOURCES += qml_win.qrc -macx:RESOURCES += qml_osx.qrc - -unix:!macx { -#set install prefix if it's empty -isEmpty(PREFIX) { - PREFIX = /usr -} -isEmpty(BINDIR) { - BINDIR = $$PREFIX/bin -} -isEmpty(LIBDIR) { - LIBDIR = $$PREFIX/lib -} -isEmpty(DATADIR) { - DATADIR = $$PREFIX/share -} - -DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" - -DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\"" - -#MAKE INSTALL -INSTALLS += bin icon desktop server translation manpage - -bin.path = $$BINDIR -isEmpty(DESTDIR) { - bin.files = YACReaderLibrary -} else { - bin.files = $$DESTDIR/YACReaderLibrary -} - -server.path = $$DATADIR/yacreader -server.files = ../release/server - -icon.path = $$DATADIR/icons/hicolor/scalable/apps -icon.files = ../YACReaderLibrary.svg - -desktop.path = $$DATADIR/applications -desktop.files = ../YACReaderLibrary.desktop - -translation.path = $$DATADIR/yacreader/languages -translation.files = ../release/languages/yacreaderlibrary_* - -manpage.path = $$DATADIR/man/man1 -manpage.files = ../YACReaderLibrary.1 -} +TEMPLATE = app +TARGET = YACReaderLibrary + +QMAKE_TARGET_BUNDLE_PREFIX = "com.yacreader" + +DEPENDPATH += . +INCLUDEPATH += . \ + ../common \ + ./server \ + ./db \ + ../custom_widgets \ + ./comic_vine \ + ./comic_vine/model + +DEFINES += SERVER_RELEASE NOMINMAX YACREADER_LIBRARY +QMAKE_MAC_SDK = macosx10.12 + +# load default build flags +include (../config.pri) +include (../dependencies/pdf_backend.pri) + +unix:haiku { + DEFINES += _BSD_SOURCE + LIBS += -lnetwork -lbsd +} + +INCLUDEPATH += ../common/gl + +# there are two builds for Windows, Desktop OpenGL based and ANGLE OpenGL ES based +win32 { + CONFIG(force_angle) { + message("using ANGLE") + LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -lglu32 -luser32 + # linking extra libs are necesary for a successful compilation, a better approach should be + # to remove any OpenGL (desktop) dependencies + # the OpenGL stuff should be migrated to OpenGL ES + DEFINES += FORCE_ANGLE + } else { + LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -lglu32 -luser32 + } + + QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL + QMAKE_LFLAGS_RELEASE += /LTCG + CONFIG -= embed_manifest_exe +} + +CONFIG(force_angle) { + contains(QMAKE_TARGET.arch, x86_64) { + Release:DESTDIR = ../release64_angle + Debug:DESTDIR = ../debug64_angle + } else { + Release:DESTDIR = ../release_angle + Debug:DESTDIR = ../debug_angle + } +} else { + contains(QMAKE_TARGET.arch, x86_64) { + Release:DESTDIR = ../release64 + Debug:DESTDIR = ../debug64 + } else { + Release:DESTDIR = ../release + Debug:DESTDIR = ../debug + } +} + +unix:!macx:!CONFIG(no_opengl) { + LIBS += -lGLU +} + +macx { + LIBS += -framework Foundation -framework ApplicationServices -framework AppKit + CONFIG += objective_c + QT += macextras gui-private +} + +unix:!macx { + CONFIG += c++11 +} + +#CONFIG += release +CONFIG -= flat +QT += sql network widgets script +!CONFIG(no_opengl) { + QT += opengl +} + +# Input +HEADERS += comic_flow.h \ + create_library_dialog.h \ + library_creator.h \ + library_window.h \ + add_library_dialog.h \ + rename_library_dialog.h \ + properties_dialog.h \ + options_dialog.h \ + export_library_dialog.h \ + import_library_dialog.h \ + package_manager.h \ + bundle_creator.h \ + export_comics_info_dialog.h \ + import_comics_info_dialog.h \ + server_config_dialog.h \ + comic_flow_widget.h \ + db_helper.h \ + ./db/data_base_management.h \ + ./db/folder_item.h \ + ./db/folder_model.h \ + ./db/comic_model.h \ + ./db/comic_item.h \ + ../common/comic_db.h \ + ../common/folder.h \ + ../common/library_item.h \ + ../common/comic.h \ + ../common/bookmarks.h \ + ../common/pictureflow.h \ + ../common/custom_widgets.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 \ + yacreader_local_server.h \ + yacreader_main_toolbar.h \ + comics_remover.h \ + ../common/http_worker.h \ + yacreader_libraries.h \ + ../common/exit_check.h \ + comics_view.h \ + classic_comics_view.h \ + empty_folder_widget.h \ + no_search_results_widget.h \ + comic_files_manager.h \ + db/reading_list_model.h \ + db/reading_list_item.h \ + yacreader_folders_view.h \ + yacreader_reading_lists_view.h \ + add_label_dialog.h \ + yacreader_history_controller.h \ + yacreader_navigation_controller.h \ + empty_label_widget.h \ + empty_container_info.h \ + empty_special_list.h \ + empty_reading_list_widget.h \ + ../common/scroll_management.h \ + ../common/opengl_checker.h \ + yacreader_comics_views_manager.h \ + info_comics_view.h \ + yacreader_comics_selection_helper.h \ + yacreader_comic_info_helper.h \ + db/reading_list.h \ + current_comic_view_helper.h + +!CONFIG(no_opengl) { + HEADERS += ../common/gl/yacreader_flow_gl.h +} + +SOURCES += comic_flow.cpp \ + create_library_dialog.cpp \ + library_creator.cpp \ + library_window.cpp \ + main.cpp \ + add_library_dialog.cpp \ + rename_library_dialog.cpp \ + properties_dialog.cpp \ + options_dialog.cpp \ + export_library_dialog.cpp \ + import_library_dialog.cpp \ + package_manager.cpp \ + bundle_creator.cpp \ + export_comics_info_dialog.cpp \ + import_comics_info_dialog.cpp \ + server_config_dialog.cpp \ + comic_flow_widget.cpp \ + db_helper.cpp \ + ./db/data_base_management.cpp \ + ./db/folder_item.cpp \ + ./db/folder_model.cpp \ + ./db/comic_model.cpp \ + ./db/comic_item.cpp \ + ../common/comic_db.cpp \ + ../common/folder.cpp \ + ../common/library_item.cpp \ + ../common/comic.cpp \ + ../common/bookmarks.cpp \ + ../common/pictureflow.cpp \ + ../common/custom_widgets.cpp \ + ../common/qnaturalsorting.cpp \ + ../common/onstart_flow_selection_dialog.cpp \ + no_libraries_widget.cpp \ + import_widget.cpp \ + yacreader_local_server.cpp \ + yacreader_main_toolbar.cpp \ + comics_remover.cpp \ + ../common/http_worker.cpp \ + ../common/yacreader_global.cpp \ + ../common/yacreader_global_gui.cpp \ + yacreader_libraries.cpp \ + ../common/exit_check.cpp \ + comics_view.cpp \ + classic_comics_view.cpp \ + empty_folder_widget.cpp \ + no_search_results_widget.cpp \ + comic_files_manager.cpp \ + db/reading_list_model.cpp \ + db/reading_list_item.cpp \ + yacreader_folders_view.cpp \ + yacreader_reading_lists_view.cpp \ + add_label_dialog.cpp \ + yacreader_history_controller.cpp \ + yacreader_navigation_controller.cpp \ + empty_label_widget.cpp \ + empty_container_info.cpp \ + empty_special_list.cpp \ + empty_reading_list_widget.cpp \ + ../common/scroll_management.cpp \ + ../common/opengl_checker.cpp \ + yacreader_comics_views_manager.cpp \ + info_comics_view.cpp \ + yacreader_comics_selection_helper.cpp \ + yacreader_comic_info_helper.cpp\ + db/reading_list.cpp \ + current_comic_view_helper.cpp + +!CONFIG(no_opengl) { + SOURCES += ../common/gl/yacreader_flow_gl.cpp +} + +include(./server/server.pri) +include(../custom_widgets/custom_widgets_yacreaderlibrary.pri) + +CONFIG(7zip){ +include(../compressed_archive/wrapper.pri) +} else:CONFIG(unarr) { +include(../compressed_archive/unarr/unarr-wrapper.pri) +} else { + error(No compression backend specified. Did you mess with the build system?) +} + +include(./comic_vine/comic_vine.pri) +include(../QsLog/QsLog.pri) +include(../shortcuts_management/shortcuts_management.pri) + +RESOURCES += images.qrc files.qrc +win32:RESOURCES += images_win.qrc +unix:!macx:RESOURCES += images_win.qrc +macx:RESOURCES += images_osx.qrc + +RC_FILE = icon.rc + +macx { + ICON = YACReaderLibrary.icns +} + +TRANSLATIONS = yacreaderlibrary_es.ts \ + yacreaderlibrary_ru.ts \ + yacreaderlibrary_pt.ts \ + yacreaderlibrary_fr.ts \ + yacreaderlibrary_nl.ts \ + yacreaderlibrary_tr.ts \ + yacreaderlibrary_de.ts \ + yacreaderlibrary_source.ts + +#QML/GridView +QT += quick qml + +HEADERS += grid_comics_view.h \ + comics_view_transition.h + +SOURCES += grid_comics_view.cpp \ + comics_view_transition.cpp + +RESOURCES += qml.qrc +win32:RESOURCES += qml_win.qrc +unix:!macx:RESOURCES += qml_win.qrc +macx:RESOURCES += qml_osx.qrc + +unix:!macx { +#set install prefix if it's empty +isEmpty(PREFIX) { + PREFIX = /usr +} +isEmpty(BINDIR) { + BINDIR = $$PREFIX/bin +} +isEmpty(LIBDIR) { + LIBDIR = $$PREFIX/lib +} +isEmpty(DATADIR) { + DATADIR = $$PREFIX/share +} + +DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" + +DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\"" + +#MAKE INSTALL +INSTALLS += bin icon desktop server translation manpage + +bin.path = $$BINDIR +isEmpty(DESTDIR) { + bin.files = YACReaderLibrary +} else { + bin.files = $$DESTDIR/YACReaderLibrary +} + +server.path = $$DATADIR/yacreader +server.files = ../release/server + +icon.path = $$DATADIR/icons/hicolor/scalable/apps +icon.files = ../YACReaderLibrary.svg + +desktop.path = $$DATADIR/applications +desktop.files = ../YACReaderLibrary.desktop + +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/comic_vine.pri b/YACReaderLibrary/comic_vine/comic_vine.pri index c7977e66..85232a53 100644 --- a/YACReaderLibrary/comic_vine/comic_vine.pri +++ b/YACReaderLibrary/comic_vine/comic_vine.pri @@ -1,48 +1,48 @@ - -HEADERS += \ - comic_vine/comic_vine_dialog.h \ - comic_vine/comic_vine_client.h \ - comic_vine/scraper_lineedit.h \ - comic_vine/title_header.h \ - comic_vine/series_question.h \ - comic_vine/search_single_comic.h \ - comic_vine/search_volume.h \ - comic_vine/select_comic.h \ - comic_vine/select_volume.h \ - comic_vine/model/volumes_model.h \ - comic_vine/model/comics_model.h \ - comic_vine/model/json_model.h \ - comic_vine/model/response_parser.h \ - comic_vine/scraper_tableview.h \ - comic_vine/sort_volume_comics.h \ - comic_vine/model/local_comic_list_model.h \ - comic_vine/model/volume_comics_model.h \ - comic_vine/scraper_scroll_label.h \ - comic_vine/scraper_results_paginator.h \ - comic_vine/scraper_selector.h \ - comic_vine/api_key_dialog.h \ - $$PWD/comic_vine_all_volume_comics_retriever.h - -SOURCES += \ - comic_vine/comic_vine_dialog.cpp \ - comic_vine/comic_vine_client.cpp \ - comic_vine/scraper_lineedit.cpp \ - comic_vine/title_header.cpp \ - comic_vine/series_question.cpp \ - comic_vine/search_single_comic.cpp \ - comic_vine/search_volume.cpp \ - comic_vine/select_comic.cpp \ - comic_vine/select_volume.cpp \ - comic_vine/model/volumes_model.cpp \ - comic_vine/model/comics_model.cpp \ - comic_vine/model/json_model.cpp \ - comic_vine/model/response_parser.cpp \ - comic_vine/scraper_tableview.cpp \ - comic_vine/sort_volume_comics.cpp \ - comic_vine/model/local_comic_list_model.cpp \ - comic_vine/model/volume_comics_model.cpp \ - comic_vine/scraper_scroll_label.cpp \ - comic_vine/scraper_results_paginator.cpp \ - comic_vine/scraper_selector.cpp \ - comic_vine/api_key_dialog.cpp \ - $$PWD/comic_vine_all_volume_comics_retriever.cpp + +HEADERS += \ + comic_vine/comic_vine_dialog.h \ + comic_vine/comic_vine_client.h \ + comic_vine/scraper_lineedit.h \ + comic_vine/title_header.h \ + comic_vine/series_question.h \ + comic_vine/search_single_comic.h \ + comic_vine/search_volume.h \ + comic_vine/select_comic.h \ + comic_vine/select_volume.h \ + comic_vine/model/volumes_model.h \ + comic_vine/model/comics_model.h \ + comic_vine/model/json_model.h \ + comic_vine/model/response_parser.h \ + comic_vine/scraper_tableview.h \ + comic_vine/sort_volume_comics.h \ + comic_vine/model/local_comic_list_model.h \ + comic_vine/model/volume_comics_model.h \ + comic_vine/scraper_scroll_label.h \ + comic_vine/scraper_results_paginator.h \ + comic_vine/scraper_selector.h \ + comic_vine/api_key_dialog.h \ + $$PWD/comic_vine_all_volume_comics_retriever.h + +SOURCES += \ + comic_vine/comic_vine_dialog.cpp \ + comic_vine/comic_vine_client.cpp \ + comic_vine/scraper_lineedit.cpp \ + comic_vine/title_header.cpp \ + comic_vine/series_question.cpp \ + comic_vine/search_single_comic.cpp \ + comic_vine/search_volume.cpp \ + comic_vine/select_comic.cpp \ + comic_vine/select_volume.cpp \ + comic_vine/model/volumes_model.cpp \ + comic_vine/model/comics_model.cpp \ + comic_vine/model/json_model.cpp \ + comic_vine/model/response_parser.cpp \ + comic_vine/scraper_tableview.cpp \ + comic_vine/sort_volume_comics.cpp \ + comic_vine/model/local_comic_list_model.cpp \ + comic_vine/model/volume_comics_model.cpp \ + comic_vine/scraper_scroll_label.cpp \ + comic_vine/scraper_results_paginator.cpp \ + comic_vine/scraper_selector.cpp \ + comic_vine/api_key_dialog.cpp \ + $$PWD/comic_vine_all_volume_comics_retriever.cpp diff --git a/YACReaderLibrary/files.qrc b/YACReaderLibrary/files.qrc index d436db6d..7a37b2ec 100644 --- a/YACReaderLibrary/files.qrc +++ b/YACReaderLibrary/files.qrc @@ -1,12 +1,12 @@ - - - ../files/about.html - ../files/helpYACReaderLibrary.html - - - - ../files/about_es_ES.html - ../files/helpYACReaderLibrary_es_ES.html - - - + + + ../files/about.html + ../files/helpYACReaderLibrary.html + + + + ../files/about_es_ES.html + ../files/helpYACReaderLibrary_es_ES.html + + + diff --git a/YACReaderLibrary/server/lib/httpserver/httpserver.pri b/YACReaderLibrary/server/lib/httpserver/httpserver.pri index fb78772e..9bfabd24 100644 --- a/YACReaderLibrary/server/lib/httpserver/httpserver.pri +++ b/YACReaderLibrary/server/lib/httpserver/httpserver.pri @@ -1,33 +1,33 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD - -QT += network - -# Enable very detailed debug messages when compiling the debug version -CONFIG(debug, debug|release) { - DEFINES += SUPERVERBOSE -} - -HEADERS += $$PWD/httpglobal.h \ - $$PWD/httplistener.h \ - $$PWD/httpconnectionhandler.h \ - $$PWD/httpconnectionhandlerpool.h \ - $$PWD/httprequest.h \ - $$PWD/httpresponse.h \ - $$PWD/httpcookie.h \ - $$PWD/httprequesthandler.h \ - $$PWD/httpsession.h \ - $$PWD/httpsessionstore.h \ - $$PWD/staticfilecontroller.h - -SOURCES += $$PWD/httpglobal.cpp \ - $$PWD/httplistener.cpp \ - $$PWD/httpconnectionhandler.cpp \ - $$PWD/httpconnectionhandlerpool.cpp \ - $$PWD/httprequest.cpp \ - $$PWD/httpresponse.cpp \ - $$PWD/httpcookie.cpp \ - $$PWD/httprequesthandler.cpp \ - $$PWD/httpsession.cpp \ - $$PWD/httpsessionstore.cpp \ - $$PWD/staticfilecontroller.cpp +INCLUDEPATH += $$PWD +DEPENDPATH += $$PWD + +QT += network + +# Enable very detailed debug messages when compiling the debug version +CONFIG(debug, debug|release) { + DEFINES += SUPERVERBOSE +} + +HEADERS += $$PWD/httpglobal.h \ + $$PWD/httplistener.h \ + $$PWD/httpconnectionhandler.h \ + $$PWD/httpconnectionhandlerpool.h \ + $$PWD/httprequest.h \ + $$PWD/httpresponse.h \ + $$PWD/httpcookie.h \ + $$PWD/httprequesthandler.h \ + $$PWD/httpsession.h \ + $$PWD/httpsessionstore.h \ + $$PWD/staticfilecontroller.h + +SOURCES += $$PWD/httpglobal.cpp \ + $$PWD/httplistener.cpp \ + $$PWD/httpconnectionhandler.cpp \ + $$PWD/httpconnectionhandlerpool.cpp \ + $$PWD/httprequest.cpp \ + $$PWD/httpresponse.cpp \ + $$PWD/httpcookie.cpp \ + $$PWD/httprequesthandler.cpp \ + $$PWD/httpsession.cpp \ + $$PWD/httpsessionstore.cpp \ + $$PWD/staticfilecontroller.cpp diff --git a/YACReaderLibrary/server/lib/logging/logging.pri b/YACReaderLibrary/server/lib/logging/logging.pri index 13c296c7..f62338d6 100644 --- a/YACReaderLibrary/server/lib/logging/logging.pri +++ b/YACReaderLibrary/server/lib/logging/logging.pri @@ -1,6 +1,6 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD - -HEADERS += $$PWD/logglobal.h $$PWD/logmessage.h $$PWD/logger.h $$PWD/filelogger.h $$PWD/dualfilelogger.h - -SOURCES += $$PWD/logmessage.cpp $$PWD/logger.cpp $$PWD/filelogger.cpp $$PWD/dualfilelogger.cpp +INCLUDEPATH += $$PWD +DEPENDPATH += $$PWD + +HEADERS += $$PWD/logglobal.h $$PWD/logmessage.h $$PWD/logger.h $$PWD/filelogger.h $$PWD/dualfilelogger.h + +SOURCES += $$PWD/logmessage.cpp $$PWD/logger.cpp $$PWD/filelogger.cpp $$PWD/dualfilelogger.cpp diff --git a/YACReaderLibrary/server/lib/templateengine/templateengine.pri b/YACReaderLibrary/server/lib/templateengine/templateengine.pri index 53608ae4..722c17fc 100644 --- a/YACReaderLibrary/server/lib/templateengine/templateengine.pri +++ b/YACReaderLibrary/server/lib/templateengine/templateengine.pri @@ -1,11 +1,11 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD - -HEADERS += $$PWD/templateglobal.h -HEADERS += $$PWD/template.h -HEADERS += $$PWD/templateloader.h -HEADERS += $$PWD/templatecache.h - -SOURCES += $$PWD/template.cpp -SOURCES += $$PWD/templateloader.cpp -SOURCES += $$PWD/templatecache.cpp +INCLUDEPATH += $$PWD +DEPENDPATH += $$PWD + +HEADERS += $$PWD/templateglobal.h +HEADERS += $$PWD/template.h +HEADERS += $$PWD/templateloader.h +HEADERS += $$PWD/templatecache.h + +SOURCES += $$PWD/template.cpp +SOURCES += $$PWD/templateloader.cpp +SOURCES += $$PWD/templatecache.cpp diff --git a/YACReaderLibrary/server/server.pri b/YACReaderLibrary/server/server.pri index 40b1c62f..f2850fba 100644 --- a/YACReaderLibrary/server/server.pri +++ b/YACReaderLibrary/server/server.pri @@ -1,98 +1,98 @@ -INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/controllers -INCLUDEPATH += $$PWD/controllers/v1 -INCLUDEPATH += $$PWD/controllers/v2 -DEPENDPATH += $$PWD -DEPENDPATH += $$PWD/controllers -DEPENDPATH += $$PWD/controllers/v1 -DEPENDPATH += $$PWD/controllers/v2 - - -HEADERS += \ - $$PWD/static.h \ - $$PWD/startup.h \ - $$PWD/requestmapper.h \ - $$PWD/yacreader_http_session.h \ - $$PWD/yacreader_http_session_store.h \ - $$PWD/yacreader_server_data_helper.h \ - $$PWD/controllers/versioncontroller.h \ - #v1 - $$PWD/controllers/v1/comiccontroller.h \ - $$PWD/controllers/v1/errorcontroller.h \ - $$PWD/controllers/v1/foldercontroller.h \ - $$PWD/controllers/v1/folderinfocontroller.h \ - $$PWD/controllers/v1/librariescontroller.h \ - $$PWD/controllers/v1/pagecontroller.h \ - $$PWD/controllers/v1/covercontroller.h \ - $$PWD/controllers/v1/updatecomiccontroller.h \ - $$PWD/controllers/v1/comicdownloadinfocontroller.h \ - $$PWD/controllers/v1/synccontroller.h \ - #v2 - $$PWD/controllers/v2/comiccontroller_v2.h \ - $$PWD/controllers/v2/errorcontroller_v2.h \ - $$PWD/controllers/v2/folderinfocontroller_v2.h \ - $$PWD/controllers/v2/librariescontroller_v2.h \ - $$PWD/controllers/v2/pagecontroller_v2.h \ - $$PWD/controllers/v2/covercontroller_v2.h \ - $$PWD/controllers/v2/updatecomiccontroller_v2.h \ - $$PWD/controllers/v2/comicdownloadinfocontroller_v2.h \ - $$PWD/controllers/v2/synccontroller_v2.h \ - $$PWD/controllers/v2/foldercontentcontroller_v2.h \ - $$PWD/controllers/v2/tagscontroller_v2.h \ - $$PWD/controllers/v2/tagcontentcontroller_v2.h \ - $$PWD/controllers/v2/favoritescontroller_v2.h \ - $$PWD/controllers/v2/readingcomicscontroller_v2.h \ - $$PWD/controllers/v2/readinglistscontroller_v2.h \ - $$PWD/controllers/v2/readinglistcontentcontroller_v2.h \ - $$PWD/controllers/v2/comicfullinfocontroller_v2.h \ - $$PWD/controllers/v2/readinglistinfocontroller_v2.h \ - $$PWD/controllers/v2/taginfocontroller_v2.h - - -SOURCES += \ - $$PWD/static.cpp \ - $$PWD/startup.cpp \ - $$PWD/requestmapper.cpp \ - $$PWD/yacreader_http_session.cpp \ - $$PWD/yacreader_http_session_store.cpp \ - $$PWD/yacreader_server_data_helper.cpp \ - $$PWD/controllers/versioncontroller.cpp \ - #v1 - $$PWD/controllers/v1/comiccontroller.cpp \ - $$PWD/controllers/v1/errorcontroller.cpp \ - $$PWD/controllers/v1/foldercontroller.cpp \ - $$PWD/controllers/v1/folderinfocontroller.cpp \ - $$PWD/controllers/v1/librariescontroller.cpp \ - $$PWD/controllers/v1/pagecontroller.cpp \ - $$PWD/controllers/v1/covercontroller.cpp \ - $$PWD/controllers/v1/updatecomiccontroller.cpp \ - $$PWD/controllers/v1/comicdownloadinfocontroller.cpp \ - $$PWD/controllers/v1/synccontroller.cpp \ - #v2 - $$PWD/controllers/v2/comiccontroller_v2.cpp \ - $$PWD/controllers/v2/errorcontroller_v2.cpp \ - $$PWD/controllers/v2/folderinfocontroller_v2.cpp \ - $$PWD/controllers/v2/librariescontroller_v2.cpp \ - $$PWD/controllers/v2/pagecontroller_v2.cpp \ - $$PWD/controllers/v2/covercontroller_v2.cpp \ - $$PWD/controllers/v2/updatecomiccontroller_v2.cpp \ - $$PWD/controllers/v2/comicdownloadinfocontroller_v2.cpp \ - $$PWD/controllers/v2/synccontroller_v2.cpp \ - $$PWD/controllers/v2/foldercontentcontroller_v2.cpp \ - $$PWD/controllers/v2/tagscontroller_v2.cpp \ - $$PWD/controllers/v2/tagcontentcontroller_v2.cpp \ - $$PWD/controllers/v2/favoritescontroller_v2.cpp \ - $$PWD/controllers/v2/readingcomicscontroller_v2.cpp \ - $$PWD/controllers/v2/readinglistscontroller_v2.cpp \ - $$PWD/controllers/v2/readinglistcontentcontroller_v2.cpp \ - $$PWD/controllers/v2/comicfullinfocontroller_v2.cpp \ - $$PWD/controllers/v2/readinglistinfocontroller_v2.cpp \ - $$PWD/controllers/v2/taginfocontroller_v2.cpp - - -#include(lib/logging/logging.pri) -include(lib/httpserver/httpserver.pri) -include(lib/templateengine/templateengine.pri) - - -DEFINES += SERVER_VERSION_NUMBER=\\\"2.0\\\" +INCLUDEPATH += $$PWD +INCLUDEPATH += $$PWD/controllers +INCLUDEPATH += $$PWD/controllers/v1 +INCLUDEPATH += $$PWD/controllers/v2 +DEPENDPATH += $$PWD +DEPENDPATH += $$PWD/controllers +DEPENDPATH += $$PWD/controllers/v1 +DEPENDPATH += $$PWD/controllers/v2 + + +HEADERS += \ + $$PWD/static.h \ + $$PWD/startup.h \ + $$PWD/requestmapper.h \ + $$PWD/yacreader_http_session.h \ + $$PWD/yacreader_http_session_store.h \ + $$PWD/yacreader_server_data_helper.h \ + $$PWD/controllers/versioncontroller.h \ + #v1 + $$PWD/controllers/v1/comiccontroller.h \ + $$PWD/controllers/v1/errorcontroller.h \ + $$PWD/controllers/v1/foldercontroller.h \ + $$PWD/controllers/v1/folderinfocontroller.h \ + $$PWD/controllers/v1/librariescontroller.h \ + $$PWD/controllers/v1/pagecontroller.h \ + $$PWD/controllers/v1/covercontroller.h \ + $$PWD/controllers/v1/updatecomiccontroller.h \ + $$PWD/controllers/v1/comicdownloadinfocontroller.h \ + $$PWD/controllers/v1/synccontroller.h \ + #v2 + $$PWD/controllers/v2/comiccontroller_v2.h \ + $$PWD/controllers/v2/errorcontroller_v2.h \ + $$PWD/controllers/v2/folderinfocontroller_v2.h \ + $$PWD/controllers/v2/librariescontroller_v2.h \ + $$PWD/controllers/v2/pagecontroller_v2.h \ + $$PWD/controllers/v2/covercontroller_v2.h \ + $$PWD/controllers/v2/updatecomiccontroller_v2.h \ + $$PWD/controllers/v2/comicdownloadinfocontroller_v2.h \ + $$PWD/controllers/v2/synccontroller_v2.h \ + $$PWD/controllers/v2/foldercontentcontroller_v2.h \ + $$PWD/controllers/v2/tagscontroller_v2.h \ + $$PWD/controllers/v2/tagcontentcontroller_v2.h \ + $$PWD/controllers/v2/favoritescontroller_v2.h \ + $$PWD/controllers/v2/readingcomicscontroller_v2.h \ + $$PWD/controllers/v2/readinglistscontroller_v2.h \ + $$PWD/controllers/v2/readinglistcontentcontroller_v2.h \ + $$PWD/controllers/v2/comicfullinfocontroller_v2.h \ + $$PWD/controllers/v2/readinglistinfocontroller_v2.h \ + $$PWD/controllers/v2/taginfocontroller_v2.h + + +SOURCES += \ + $$PWD/static.cpp \ + $$PWD/startup.cpp \ + $$PWD/requestmapper.cpp \ + $$PWD/yacreader_http_session.cpp \ + $$PWD/yacreader_http_session_store.cpp \ + $$PWD/yacreader_server_data_helper.cpp \ + $$PWD/controllers/versioncontroller.cpp \ + #v1 + $$PWD/controllers/v1/comiccontroller.cpp \ + $$PWD/controllers/v1/errorcontroller.cpp \ + $$PWD/controllers/v1/foldercontroller.cpp \ + $$PWD/controllers/v1/folderinfocontroller.cpp \ + $$PWD/controllers/v1/librariescontroller.cpp \ + $$PWD/controllers/v1/pagecontroller.cpp \ + $$PWD/controllers/v1/covercontroller.cpp \ + $$PWD/controllers/v1/updatecomiccontroller.cpp \ + $$PWD/controllers/v1/comicdownloadinfocontroller.cpp \ + $$PWD/controllers/v1/synccontroller.cpp \ + #v2 + $$PWD/controllers/v2/comiccontroller_v2.cpp \ + $$PWD/controllers/v2/errorcontroller_v2.cpp \ + $$PWD/controllers/v2/folderinfocontroller_v2.cpp \ + $$PWD/controllers/v2/librariescontroller_v2.cpp \ + $$PWD/controllers/v2/pagecontroller_v2.cpp \ + $$PWD/controllers/v2/covercontroller_v2.cpp \ + $$PWD/controllers/v2/updatecomiccontroller_v2.cpp \ + $$PWD/controllers/v2/comicdownloadinfocontroller_v2.cpp \ + $$PWD/controllers/v2/synccontroller_v2.cpp \ + $$PWD/controllers/v2/foldercontentcontroller_v2.cpp \ + $$PWD/controllers/v2/tagscontroller_v2.cpp \ + $$PWD/controllers/v2/tagcontentcontroller_v2.cpp \ + $$PWD/controllers/v2/favoritescontroller_v2.cpp \ + $$PWD/controllers/v2/readingcomicscontroller_v2.cpp \ + $$PWD/controllers/v2/readinglistscontroller_v2.cpp \ + $$PWD/controllers/v2/readinglistcontentcontroller_v2.cpp \ + $$PWD/controllers/v2/comicfullinfocontroller_v2.cpp \ + $$PWD/controllers/v2/readinglistinfocontroller_v2.cpp \ + $$PWD/controllers/v2/taginfocontroller_v2.cpp + + +#include(lib/logging/logging.pri) +include(lib/httpserver/httpserver.pri) +include(lib/templateengine/templateengine.pri) + + +DEFINES += SERVER_VERSION_NUMBER=\\\"2.0\\\" diff --git a/compressed_archive/README_7zip.txt b/compressed_archive/README_7zip.txt index 92c75ebe..63114741 100644 --- a/compressed_archive/README_7zip.txt +++ b/compressed_archive/README_7zip.txt @@ -1,19 +1,19 @@ -If you are trying to compile YACReader with a 7zip decompression backend, -you need to download de source code of 7zip (Windows) or p7zip (Linux/MacOSX). - -Please extract it and rename the folder to lib7zip (Windows) or libp7zip (Linux/MacOSX), -then copy it to $YACREADER_SRC/compressed_archive/ (this folder). - -YACReader is compiled using 7zip/p7zip 9.20.1 and will not work with newer versions. - -On Linux/Unix this means your YACReader installation will stop working if you -update your installation of p7zip to a newer version. If you wish to keep using -p7zip with YACReader, you can copy 7z.so and Codecs/Rar29.so from p7zip 9.20.1 -to "/usr/lib/yacreader/". YACReader will then detect these files and use -them instead of the system provided p7zip files which allows you to keep both -YACReader and an up to date p7zip installation. - -Please keep in mind this is only a workaround that is provided for backwards -compatibility and not intended as a long time solution. -It is recommended that you switch to unarr as a decompression backend instead -(see README.txt in compressed_archive/unarr). +If you are trying to compile YACReader with a 7zip decompression backend, +you need to download de source code of 7zip (Windows) or p7zip (Linux/MacOSX). + +Please extract it and rename the folder to lib7zip (Windows) or libp7zip (Linux/MacOSX), +then copy it to $YACREADER_SRC/compressed_archive/ (this folder). + +YACReader is compiled using 7zip/p7zip 9.20.1 and will not work with newer versions. + +On Linux/Unix this means your YACReader installation will stop working if you +update your installation of p7zip to a newer version. If you wish to keep using +p7zip with YACReader, you can copy 7z.so and Codecs/Rar29.so from p7zip 9.20.1 +to "/usr/lib/yacreader/". YACReader will then detect these files and use +them instead of the system provided p7zip files which allows you to keep both +YACReader and an up to date p7zip installation. + +Please keep in mind this is only a workaround that is provided for backwards +compatibility and not intended as a long time solution. +It is recommended that you switch to unarr as a decompression backend instead +(see README.txt in compressed_archive/unarr). diff --git a/compressed_archive/wrapper.pri b/compressed_archive/wrapper.pri index 9ae4b25b..fde3b240 100644 --- a/compressed_archive/wrapper.pri +++ b/compressed_archive/wrapper.pri @@ -1,127 +1,127 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD - -win32 { -!exists (../compressed_archive/lib7zip) { - error(You\'ll need 7zip source code to compile YACReader. \ - Please check the compressed_archive folder for further instructions.) -} -} - -unix { -exists (../compressed_archive/libp7zip) { - message(Found p7zip source code...) - system(patch -N -p0 -i libp7zip.patch) -} else { - error(You\'ll need 7zip source code to compile YACReader. \ - Please check the compressed_archive folder for further instructions.) -} -} - -CONFIG += precompile_header - -win32 {PRECOMPILED_HEADER = $$PWD/StdAfx.h} -!win32 {PRECOMPILED_HEADER = $$PWD/libp7zip/CPP/myWindows/StdAfx.h} - -win32 { -INCLUDEPATH += $$PWD/lib7zip/CPP/ - -DEFINES += _UNICODE _WIN32 - -SOURCES += $$PWD/compressed_archive.cpp \ - $$PWD/lib7zip/CPP/Windows/FileIO.cpp \ - $$PWD/lib7zip/CPP/Windows/PropVariant.cpp \ - $$PWD/lib7zip/CPP/Windows/PropVariantConversions.cpp \ - $$PWD/lib7zip/CPP/Common/IntToString.cpp \ - $$PWD/lib7zip/CPP/Common/MyString.cpp \ - $$PWD/lib7zip/CPP/Common/MyVector.cpp \ - $$PWD/lib7zip/CPP/Common/StringConvert.cpp \ - $$PWD/lib7zip/CPP/Common/Wildcard.cpp \ - $$PWD/lib7zip/CPP/7zip/Common/FileStreams.cpp \ - $$PWD/lib7zip/CPP/7zip/Common/StreamUtils.cpp \ - $$PWD/lib7zip/C/Alloc.c \ - $$PWD/lib7zip/CPP/7zip/Common/StreamObjects.cpp - -HEADERS += $$PWD/compressed_archive.h \ - $$PWD/extract_delegate.h \ - $$PWD/7z_includes.h \ - $$PWD/open_callbacks.h \ - $$PWD/extract_callbacks.h\ - $$PWD/lib7zip/CPP/Windows/FileIO.h \ - $$PWD/lib7zip/CPP/Windows/PropVariant.h \ - $$PWD/lib7zip/CPP/Windows/PropVariantConversions.h \ - $$PWD/lib7zip/CPP/Common/IntToString.h \ - $$PWD/lib7zip/CPP/Common/MyString.h \ - $$PWD/lib7zip/CPP/Common/MyVector.h \ - $$PWD/lib7zip/CPP/Common/StringConvert.h \ - $$PWD/lib7zip/CPP/Common/Wildcard.h \ - $$PWD/lib7zip/CPP/7zip/Common/FileStreams.h \ - $$PWD/lib7zip/CPP/7zip/IStream.h \ - $$PWD/lib7zip/CPP/7zip/Common/StreamUtils.h \ - $$PWD/lib7zip/C/Alloc.h \ - $$PWD/lib7zip/CPP/7zip/Common/StreamObjects.h -} - -macx{ -LIBS += -framework IOKit -framework CoreFoundation - -DEFINES += UNICODE _UNICODE _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE \ - NDEBUG _REENTRANT ENV_UNIX \ - _7ZIP_LARGE_PAGES ENV_MACOSX _TCHAR_DEFINED -} - -unix:!macx{ -DEFINES += _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE \ - NDEBUG _REENTRANT ENV_UNIX \ - _7ZIP_LARGE_PAGES - } - -!win32 { -INCLUDEPATH += $$PWD/libp7zip/CPP/ \ - $$PWD/libp7zip/CPP/myWindows/ \ - $$PWD/libp7zip/CPP/include_windows/ - -SOURCES += $$PWD/compressed_archive.cpp \ - $$PWD/libp7zip/CPP/Windows/FileIO.cpp \ - $$PWD/libp7zip/CPP/Windows/FileFind.cpp \ - $$PWD/libp7zip/CPP/Windows/PropVariant.cpp \ - $$PWD/libp7zip/CPP/Windows/PropVariantConversions.cpp \ - $$PWD/libp7zip/CPP/Common/IntToString.cpp \ - $$PWD/libp7zip/CPP/Common/MyString.cpp \ - $$PWD/libp7zip/CPP/Common/MyVector.cpp \ - $$PWD/libp7zip/CPP/Common/StringConvert.cpp \ - $$PWD/libp7zip/CPP/Common/Wildcard.cpp \ - $$PWD/libp7zip/CPP/7zip/Common/FileStreams.cpp \ - $$PWD/libp7zip/CPP/7zip/Common/StreamUtils.cpp \ - $$PWD/libp7zip/C/Alloc.c \ - $$PWD/libp7zip/CPP/7zip/Common/StreamObjects.cpp \ - $$PWD/libp7zip/CPP/myWindows/wine_date_and_time.cpp \ - $$PWD/libp7zip/CPP/Common/MyWindows.cpp - -HEADERS += $$PWD/compressed_archive.h \ - $$PWD/7z_includes.h \ - $$PWD/open_callbacks.h \ - $$PWD/extract_callbacks.h\ - $$PWD/libp7zip/CPP/include_windows/windows.h \ - $$PWD/libp7zip/CPP/include_windows/tchar.h \ - $$PWD/libp7zip/CPP/include_windows/basetyps.h \ - $$PWD/libp7zip/CPP/Windows/FileFind.h \ - $$PWD/libp7zip/CPP/Windows/FileIO.h \ - $$PWD/libp7zip/CPP/Windows/PropVariant.h \ - $$PWD/libp7zip/CPP/Windows/PropVariantConversions.h \ - $$PWD/libp7zip/CPP/Common/IntToString.h \ - $$PWD/libp7zip/CPP/Common/MyString.h \ - $$PWD/libp7zip/CPP/Common/MyVector.h \ - $$PWD/libp7zip/CPP/Common/StringConvert.h \ - $$PWD/libp7zip/CPP/Common/Wildcard.h \ - $$PWD/libp7zip/CPP/7zip/Common/FileStreams.h \ - $$PWD/libp7zip/CPP/7zip/IStream.h \ - $$PWD/libp7zip/CPP/7zip/Common/StreamUtils.h \ - $$PWD/libp7zip/C/Alloc.h \ - $$PWD/libp7zip/CPP/7zip/Common/StreamObjects.h \ - $$PWD/libp7zip/CPP/Common/MyWindows.h \ - $$PWD/libp7zip/CPP/7zip/ICoder.h \ -} - - - +INCLUDEPATH += $$PWD +DEPENDPATH += $$PWD + +win32 { +!exists (../compressed_archive/lib7zip) { + error(You\'ll need 7zip source code to compile YACReader. \ + Please check the compressed_archive folder for further instructions.) +} +} + +unix { +exists (../compressed_archive/libp7zip) { + message(Found p7zip source code...) + system(patch -N -p0 -i libp7zip.patch) +} else { + error(You\'ll need 7zip source code to compile YACReader. \ + Please check the compressed_archive folder for further instructions.) +} +} + +CONFIG += precompile_header + +win32 {PRECOMPILED_HEADER = $$PWD/StdAfx.h} +!win32 {PRECOMPILED_HEADER = $$PWD/libp7zip/CPP/myWindows/StdAfx.h} + +win32 { +INCLUDEPATH += $$PWD/lib7zip/CPP/ + +DEFINES += _UNICODE _WIN32 + +SOURCES += $$PWD/compressed_archive.cpp \ + $$PWD/lib7zip/CPP/Windows/FileIO.cpp \ + $$PWD/lib7zip/CPP/Windows/PropVariant.cpp \ + $$PWD/lib7zip/CPP/Windows/PropVariantConversions.cpp \ + $$PWD/lib7zip/CPP/Common/IntToString.cpp \ + $$PWD/lib7zip/CPP/Common/MyString.cpp \ + $$PWD/lib7zip/CPP/Common/MyVector.cpp \ + $$PWD/lib7zip/CPP/Common/StringConvert.cpp \ + $$PWD/lib7zip/CPP/Common/Wildcard.cpp \ + $$PWD/lib7zip/CPP/7zip/Common/FileStreams.cpp \ + $$PWD/lib7zip/CPP/7zip/Common/StreamUtils.cpp \ + $$PWD/lib7zip/C/Alloc.c \ + $$PWD/lib7zip/CPP/7zip/Common/StreamObjects.cpp + +HEADERS += $$PWD/compressed_archive.h \ + $$PWD/extract_delegate.h \ + $$PWD/7z_includes.h \ + $$PWD/open_callbacks.h \ + $$PWD/extract_callbacks.h\ + $$PWD/lib7zip/CPP/Windows/FileIO.h \ + $$PWD/lib7zip/CPP/Windows/PropVariant.h \ + $$PWD/lib7zip/CPP/Windows/PropVariantConversions.h \ + $$PWD/lib7zip/CPP/Common/IntToString.h \ + $$PWD/lib7zip/CPP/Common/MyString.h \ + $$PWD/lib7zip/CPP/Common/MyVector.h \ + $$PWD/lib7zip/CPP/Common/StringConvert.h \ + $$PWD/lib7zip/CPP/Common/Wildcard.h \ + $$PWD/lib7zip/CPP/7zip/Common/FileStreams.h \ + $$PWD/lib7zip/CPP/7zip/IStream.h \ + $$PWD/lib7zip/CPP/7zip/Common/StreamUtils.h \ + $$PWD/lib7zip/C/Alloc.h \ + $$PWD/lib7zip/CPP/7zip/Common/StreamObjects.h +} + +macx{ +LIBS += -framework IOKit -framework CoreFoundation + +DEFINES += UNICODE _UNICODE _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE \ + NDEBUG _REENTRANT ENV_UNIX \ + _7ZIP_LARGE_PAGES ENV_MACOSX _TCHAR_DEFINED +} + +unix:!macx{ +DEFINES += _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE \ + NDEBUG _REENTRANT ENV_UNIX \ + _7ZIP_LARGE_PAGES + } + +!win32 { +INCLUDEPATH += $$PWD/libp7zip/CPP/ \ + $$PWD/libp7zip/CPP/myWindows/ \ + $$PWD/libp7zip/CPP/include_windows/ + +SOURCES += $$PWD/compressed_archive.cpp \ + $$PWD/libp7zip/CPP/Windows/FileIO.cpp \ + $$PWD/libp7zip/CPP/Windows/FileFind.cpp \ + $$PWD/libp7zip/CPP/Windows/PropVariant.cpp \ + $$PWD/libp7zip/CPP/Windows/PropVariantConversions.cpp \ + $$PWD/libp7zip/CPP/Common/IntToString.cpp \ + $$PWD/libp7zip/CPP/Common/MyString.cpp \ + $$PWD/libp7zip/CPP/Common/MyVector.cpp \ + $$PWD/libp7zip/CPP/Common/StringConvert.cpp \ + $$PWD/libp7zip/CPP/Common/Wildcard.cpp \ + $$PWD/libp7zip/CPP/7zip/Common/FileStreams.cpp \ + $$PWD/libp7zip/CPP/7zip/Common/StreamUtils.cpp \ + $$PWD/libp7zip/C/Alloc.c \ + $$PWD/libp7zip/CPP/7zip/Common/StreamObjects.cpp \ + $$PWD/libp7zip/CPP/myWindows/wine_date_and_time.cpp \ + $$PWD/libp7zip/CPP/Common/MyWindows.cpp + +HEADERS += $$PWD/compressed_archive.h \ + $$PWD/7z_includes.h \ + $$PWD/open_callbacks.h \ + $$PWD/extract_callbacks.h\ + $$PWD/libp7zip/CPP/include_windows/windows.h \ + $$PWD/libp7zip/CPP/include_windows/tchar.h \ + $$PWD/libp7zip/CPP/include_windows/basetyps.h \ + $$PWD/libp7zip/CPP/Windows/FileFind.h \ + $$PWD/libp7zip/CPP/Windows/FileIO.h \ + $$PWD/libp7zip/CPP/Windows/PropVariant.h \ + $$PWD/libp7zip/CPP/Windows/PropVariantConversions.h \ + $$PWD/libp7zip/CPP/Common/IntToString.h \ + $$PWD/libp7zip/CPP/Common/MyString.h \ + $$PWD/libp7zip/CPP/Common/MyVector.h \ + $$PWD/libp7zip/CPP/Common/StringConvert.h \ + $$PWD/libp7zip/CPP/Common/Wildcard.h \ + $$PWD/libp7zip/CPP/7zip/Common/FileStreams.h \ + $$PWD/libp7zip/CPP/7zip/IStream.h \ + $$PWD/libp7zip/CPP/7zip/Common/StreamUtils.h \ + $$PWD/libp7zip/C/Alloc.h \ + $$PWD/libp7zip/CPP/7zip/Common/StreamObjects.h \ + $$PWD/libp7zip/CPP/Common/MyWindows.h \ + $$PWD/libp7zip/CPP/7zip/ICoder.h \ +} + + + diff --git a/custom_widgets/custom_widgets_yacreader.pri b/custom_widgets/custom_widgets_yacreader.pri index fcadc933..44af8da3 100644 --- a/custom_widgets/custom_widgets_yacreader.pri +++ b/custom_widgets/custom_widgets_yacreader.pri @@ -1,38 +1,38 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD - -HEADERS += $$PWD/help_about_dialog.h \ - $$PWD/yacreader_field_edit.h \ - $$PWD/yacreader_field_plain_text_edit.h \ - $$PWD/yacreader_flow.h \ - $$PWD/yacreader_flow_config_widget.h \ - $$PWD/yacreader_options_dialog.h \ - $$PWD/yacreader_spin_slider_widget.h \ - $$PWD/yacreader_tool_bar_stretch.h \ - $$PWD/yacreader_busy_widget.h -!CONFIG(no_opengl) { - HEADERS += $$PWD/yacreader_gl_flow_config_widget.h -} - -macx{ -HEADERS += $$PWD/yacreader_macosx_toolbar.h -} - - - -SOURCES += $$PWD/help_about_dialog.cpp \ - $$PWD/yacreader_field_edit.cpp \ - $$PWD/yacreader_field_plain_text_edit.cpp \ - $$PWD/yacreader_flow.cpp \ - $$PWD/yacreader_flow_config_widget.cpp \ - $$PWD/yacreader_options_dialog.cpp \ - $$PWD/yacreader_spin_slider_widget.cpp \ - $$PWD/yacreader_tool_bar_stretch.cpp \ - $$PWD/yacreader_busy_widget.cpp -!CONFIG(no_opengl) { - SOURCES += $$PWD/yacreader_gl_flow_config_widget.cpp -} -macx{ -OBJECTIVE_SOURCES += $$PWD/yacreader_macosx_toolbar.mm -} - +INCLUDEPATH += $$PWD +DEPENDPATH += $$PWD + +HEADERS += $$PWD/help_about_dialog.h \ + $$PWD/yacreader_field_edit.h \ + $$PWD/yacreader_field_plain_text_edit.h \ + $$PWD/yacreader_flow.h \ + $$PWD/yacreader_flow_config_widget.h \ + $$PWD/yacreader_options_dialog.h \ + $$PWD/yacreader_spin_slider_widget.h \ + $$PWD/yacreader_tool_bar_stretch.h \ + $$PWD/yacreader_busy_widget.h +!CONFIG(no_opengl) { + HEADERS += $$PWD/yacreader_gl_flow_config_widget.h +} + +macx{ +HEADERS += $$PWD/yacreader_macosx_toolbar.h +} + + + +SOURCES += $$PWD/help_about_dialog.cpp \ + $$PWD/yacreader_field_edit.cpp \ + $$PWD/yacreader_field_plain_text_edit.cpp \ + $$PWD/yacreader_flow.cpp \ + $$PWD/yacreader_flow_config_widget.cpp \ + $$PWD/yacreader_options_dialog.cpp \ + $$PWD/yacreader_spin_slider_widget.cpp \ + $$PWD/yacreader_tool_bar_stretch.cpp \ + $$PWD/yacreader_busy_widget.cpp +!CONFIG(no_opengl) { + SOURCES += $$PWD/yacreader_gl_flow_config_widget.cpp +} +macx{ +OBJECTIVE_SOURCES += $$PWD/yacreader_macosx_toolbar.mm +} + diff --git a/files/about.html b/files/about.html index 07d1b1fd..c1269a6c 100644 --- a/files/about.html +++ b/files/about.html @@ -1,102 +1,102 @@ - - - - - -

- -

General Information

-

-YACReader - Yet Another Comic Reader - version %1
-by Luis Ãngel San Martín Rodríguez -

Contact

- -

Web site

-web site: http://www.yacreader.com -

License

-Published under GPL v3 license. - -

- -

Donations

-

YACReader is free and open source

-

-If you like YACReader, please, consider to make a donation Donate! -

- - -

Go social

-

-Find other users and help at: -

-

- -

Contributors

-

Translators

- -

Packages

- - -

Developers

- - -

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) -

-

-Server info QR codes are generated using qrencode and qrencode-win32 -

-

-SW flow effect uses a modified version of PictureFlow. -

-

-Some icons were desinged by Mattahan. -

- - + + + + + +

+ +

General Information

+

+YACReader - Yet Another Comic Reader - version %1
+by Luis Ãngel San Martín Rodríguez +

Contact

+ +

Web site

+web site: http://www.yacreader.com +

License

+Published under GPL v3 license. + +

+ +

Donations

+

YACReader is free and open source

+

+If you like YACReader, please, consider to make a donation Donate! +

+ + +

Go social

+

+Find other users and help at: +

+

+ +

Contributors

+

Translators

+ +

Packages

+ + +

Developers

+ + +

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) +

+

+Server info QR codes are generated using qrencode and qrencode-win32 +

+

+SW flow effect uses a modified version of PictureFlow. +

+

+Some icons were desinged by Mattahan. +

+ + diff --git a/files/about_es_ES.html b/files/about_es_ES.html index 3a6f5e7d..d97dd7e1 100644 --- a/files/about_es_ES.html +++ b/files/about_es_ES.html @@ -1,101 +1,101 @@ - - - - - -

- -

Información general

-

-YACReader - Yet Another Comic Reader - versión %1
-por Luis Ãngel San Martín Rodríguez -

Contacto

- -

Sitio web

-sitio web: http://www.yacreader.com -

Licencia

-Publicado bajo licencia GPL v3. - -

- -

Donaciones

-

YACReader es gratis y open source

-

-Si te gusta YACReader, por favor, considera realizar una donación ¡Dona! -

- - -

Social

-

-Encuentra otros usuarios y ayuda en: -

-

- -

Contribuidores

-

Traductores

- -

Paquetes

- - -

Developers

- - -

Gracias a Elia Gregorio Méndez por desarrollar los sitios web

- -

Software de terceros y recursos

-

-Los archivos comprimidos se cargan usando 7zip (Windows) y p7zip (Linux/MacOS X) -

-

-Los códigos QR con la información del servidor se generan con qrencode y qrencode-win32 -

-

-SW flow usa una versión modificada de PictureFlow. -

-

-Algunos iconos han sido diseñados por Mattahan. -

- - + + + + + +

+ +

Información general

+

+YACReader - Yet Another Comic Reader - versión %1
+por Luis Ãngel San Martín Rodríguez +

Contacto

+ +

Sitio web

+sitio web: http://www.yacreader.com +

Licencia

+Publicado bajo licencia GPL v3. + +

+ +

Donaciones

+

YACReader es gratis y open source

+

+Si te gusta YACReader, por favor, considera realizar una donación ¡Dona! +

+ + +

Social

+

+Encuentra otros usuarios y ayuda en: +

+

+ +

Contribuidores

+

Traductores

+ +

Paquetes

+ + +

Developers

+ + +

Gracias a Elia Gregorio Méndez por desarrollar los sitios web

+ +

Software de terceros y recursos

+

+Los archivos comprimidos se cargan usando 7zip (Windows) y p7zip (Linux/MacOS X) +

+

+Los códigos QR con la información del servidor se generan con qrencode y qrencode-win32 +

+

+SW flow usa una versión modificada de PictureFlow. +

+

+Algunos iconos han sido diseñados por Mattahan. +

+ + diff --git a/files/helpYACReader.html b/files/helpYACReader.html index 09919e39..474afb94 100644 --- a/files/helpYACReader.html +++ b/files/helpYACReader.html @@ -1,145 +1,145 @@ - - - - - -

Quick start guide

-

This guide is outdated, get more help on http://www.yacreader.com

-

Features

-

- YACReader is a fast and simple comic reader with the following features: -

-

-

Functions and sortcuts

-

- General functions: -

-

-

- "Go to flow" functions: -

-

-

- Magnifying glass functions: -

-

-

- Configuration dialog -