From 4db439511b0b503aad3241f4cdee7a468ad7c285 Mon Sep 17 00:00:00 2001 From: Felix Kauselmann <2039670+selmf@users.noreply.github.com> Date: Tue, 17 Feb 2015 15:00:42 +0100 Subject: [PATCH] initial no_opengl support for YACReaderLibrary --- YACReaderLibrary/YACReaderLibrary.pro | 4 ++-- YACReaderLibrary/classic_comics_view.cpp | 6 ++++-- YACReaderLibrary/comic_flow_widget.cpp | 6 +++--- YACReaderLibrary/comic_flow_widget.h | 6 ++++-- YACReaderLibrary/import_widget.cpp | 3 ++- YACReaderLibrary/library_window.cpp | 6 ++++-- YACReaderLibrary/options_dialog.cpp | 15 ++++++++++++--- custom_widgets/custom_widgets_yacreader.pri | 4 ++-- .../custom_widgets_yacreaderlibrary.pri | 4 ++-- 9 files changed, 35 insertions(+), 19 deletions(-) diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index b276c9a6..38f54dc4 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -106,7 +106,7 @@ HEADERS += comic_flow.h \ ../common/pictureflow.h \ ../common/custom_widgets.h \ ../common/qnaturalsorting.h \ - ../common/yacreader_flow_gl.h \ + #../common/yacreader_flow_gl.h \ ../common/yacreader_global.h \ ../common/onstart_flow_selection_dialog.h \ no_libraries_widget.h \ @@ -167,7 +167,7 @@ SOURCES += comic_flow.cpp \ ../common/pictureflow.cpp \ ../common/custom_widgets.cpp \ ../common/qnaturalsorting.cpp \ - ../common/yacreader_flow_gl.cpp \ + #../common/yacreader_flow_gl.cpp \ ../common/onstart_flow_selection_dialog.cpp \ no_libraries_widget.cpp \ import_widget.cpp \ diff --git a/YACReaderLibrary/classic_comics_view.cpp b/YACReaderLibrary/classic_comics_view.cpp index 0677bc73..a94f67f9 100644 --- a/YACReaderLibrary/classic_comics_view.cpp +++ b/YACReaderLibrary/classic_comics_view.cpp @@ -16,12 +16,14 @@ ClassicComicsView::ClassicComicsView(QWidget *parent) settings->beginGroup("libraryConfig"); //FLOW----------------------------------------------------------------------- //--------------------------------------------------------------------------- - +#ifndef NO_OPENGL if((settings->value(USE_OPEN_GL).toBool() == true)) comicFlow = new ComicFlowWidgetGL(0); else comicFlow = new ComicFlowWidgetSW(0); - +#else + comicFlow = new ComicFlowWidgetSW(0); +#endif comicFlow->updateConfig(settings); comicFlow->setFocusPolicy(Qt::StrongFocus); comicFlow->setShowMarks(true); diff --git a/YACReaderLibrary/comic_flow_widget.cpp b/YACReaderLibrary/comic_flow_widget.cpp index 2fce350c..e4326abc 100644 --- a/YACReaderLibrary/comic_flow_widget.cpp +++ b/YACReaderLibrary/comic_flow_widget.cpp @@ -1,5 +1,5 @@ #include "comic_flow_widget.h" - +#include ComicFlowWidget::ComicFlowWidget(QWidget * parent) :QWidget(parent) { @@ -145,7 +145,7 @@ void ComicFlowWidgetSW::resortCovers(QList newOrder) flow->resortCovers(newOrder); } - +#ifndef NO_OPENGL ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// ///OpenGL ComicFlow @@ -341,7 +341,7 @@ void ComicFlowWidgetGL::resortCovers(QList newOrder) { flow->resortCovers(newOrder); } - +#endif //void ComicFlowWidgetGL::setCF_RX(int value){ flow->setCF_RX(value);} //void ComicFlowWidgetGL::setCF_RY(int value){ flow->setCF_RY(value);} //void ComicFlowWidgetGL::setCF_RZ(int value){ flow->setCF_RZ(value);} diff --git a/YACReaderLibrary/comic_flow_widget.h b/YACReaderLibrary/comic_flow_widget.h index 90eaccba..10f68486 100644 --- a/YACReaderLibrary/comic_flow_widget.h +++ b/YACReaderLibrary/comic_flow_widget.h @@ -6,8 +6,9 @@ #include "pictureflow.h" #include "comic_flow.h" +#ifndef NO_OPENGL #include "yacreader_flow_gl.h" - +#endif class ComicFlowWidget : public QWidget { Q_OBJECT @@ -75,6 +76,7 @@ protected: QSize slideSizeF; }; +#ifndef NO_OPENGL class ComicFlowWidgetGL : public ComicFlowWidget { Q_OBJECT @@ -127,5 +129,5 @@ protected: QSize minimumSizeHint() const; QSize sizeHint() const; }; - +#endif #endif diff --git a/YACReaderLibrary/import_widget.cpp b/YACReaderLibrary/import_widget.cpp index d9a8d74a..eb22ebcf 100644 --- a/YACReaderLibrary/import_widget.cpp +++ b/YACReaderLibrary/import_widget.cpp @@ -10,7 +10,8 @@ #include #include #include -#include +//TODO: is QGLWidget needed here??? +//#include #include #include #include diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index 5ac62d96..63d0a54c 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -15,7 +15,9 @@ #include #include #include +#ifndef NO_OPENGL #include +#endif #include #include @@ -182,14 +184,14 @@ void LibraryWindow::doLayout() libraryToolBar = new YACReaderMainToolBar(this); #endif - +#ifndef NO_OPENGL //FLOW----------------------------------------------------------------------- //--------------------------------------------------------------------------- if(QGLFormat::hasOpenGL() && !settings->contains(USE_OPEN_GL)) { settings->setValue(USE_OPEN_GL,2); } - +#endif //FOLDERS FILTER------------------------------------------------------------- //--------------------------------------------------------------------------- #ifndef Q_OS_MAC diff --git a/YACReaderLibrary/options_dialog.cpp b/YACReaderLibrary/options_dialog.cpp index f0165e31..6073347f 100644 --- a/YACReaderLibrary/options_dialog.cpp +++ b/YACReaderLibrary/options_dialog.cpp @@ -1,8 +1,10 @@ #include "options_dialog.h" +#ifndef NO_OPENGL #include "yacreader_flow_gl.h" -#include "yacreader_flow_config_widget.h" #include "yacreader_gl_flow_config_widget.h" +#endif +#include "yacreader_flow_config_widget.h" #include "api_key_dialog.h" #include @@ -15,6 +17,8 @@ #include #include #include +#include + FlowType flowType = Strip; @@ -28,20 +32,25 @@ OptionsDialog::OptionsDialog(QWidget * parent) QVBoxLayout * flowLayout = new QVBoxLayout; QVBoxLayout * generalLayout = new QVBoxLayout(); - QHBoxLayout * switchFlowType = new QHBoxLayout; + QHBoxLayout * switchFlowType = new QHBoxLayout(); switchFlowType->addStretch(); +#ifndef NO_OPENGL switchFlowType->addWidget(useGL); - +#endif QHBoxLayout * buttons = new QHBoxLayout(); buttons->addStretch(); buttons->addWidget(accept); buttons->addWidget(cancel); flowLayout->addWidget(sw); +#ifndef NO_OPENGL flowLayout->addWidget(gl); +#endif flowLayout->addLayout(switchFlowType); +#ifndef NO_OPENGL sw->hide(); +#endif QVBoxLayout * apiKeyLayout = new QVBoxLayout(); QPushButton * apiKeyButton = new QPushButton(tr("Edit Comic Vine API key")); diff --git a/custom_widgets/custom_widgets_yacreader.pri b/custom_widgets/custom_widgets_yacreader.pri index 8878e64f..405776d1 100644 --- a/custom_widgets/custom_widgets_yacreader.pri +++ b/custom_widgets/custom_widgets_yacreader.pri @@ -6,7 +6,7 @@ HEADERS += $$PWD/help_about_dialog.h \ $$PWD/yacreader_field_plain_text_edit.h \ $$PWD/yacreader_flow.h \ $$PWD/yacreader_flow_config_widget.h \ - $$PWD/yacreader_gl_flow_config_widget.h \ + #$$PWD/yacreader_gl_flow_config_widget.h \ $$PWD/yacreader_options_dialog.h \ $$PWD/yacreader_spin_slider_widget.h \ $$PWD/yacreader_tool_bar_stretch.h \ @@ -23,7 +23,7 @@ SOURCES += $$PWD/help_about_dialog.cpp \ $$PWD/yacreader_field_plain_text_edit.cpp \ $$PWD/yacreader_flow.cpp \ $$PWD/yacreader_flow_config_widget.cpp \ - $$PWD/yacreader_gl_flow_config_widget.cpp \ + #$$PWD/yacreader_gl_flow_config_widget.cpp \ $$PWD/yacreader_options_dialog.cpp \ $$PWD/yacreader_spin_slider_widget.cpp \ $$PWD/yacreader_tool_bar_stretch.cpp \ diff --git a/custom_widgets/custom_widgets_yacreaderlibrary.pri b/custom_widgets/custom_widgets_yacreaderlibrary.pri index 40308ef6..0385f1c9 100644 --- a/custom_widgets/custom_widgets_yacreaderlibrary.pri +++ b/custom_widgets/custom_widgets_yacreaderlibrary.pri @@ -6,7 +6,7 @@ HEADERS += $$PWD/help_about_dialog.h \ $$PWD/yacreader_field_plain_text_edit.h \ $$PWD/yacreader_flow.h \ $$PWD/yacreader_flow_config_widget.h \ - $$PWD/yacreader_gl_flow_config_widget.h \ + #$$PWD/yacreader_gl_flow_config_widget.h \ $$PWD/yacreader_options_dialog.h \ $$PWD/yacreader_search_line_edit.h \ $$PWD/yacreader_spin_slider_widget.h \ @@ -29,7 +29,7 @@ SOURCES += $$PWD/help_about_dialog.cpp \ $$PWD/yacreader_field_plain_text_edit.cpp \ $$PWD/yacreader_flow.cpp \ $$PWD/yacreader_flow_config_widget.cpp \ - $$PWD/yacreader_gl_flow_config_widget.cpp \ + #$$PWD/yacreader_gl_flow_config_widget.cpp \ $$PWD/yacreader_options_dialog.cpp \ $$PWD/yacreader_search_line_edit.cpp \ $$PWD/yacreader_spin_slider_widget.cpp \