A?adido di?logo de selecci?n del flow (en el primer arranque).

A?adida la comprobaci?n de que OpenGL est? disponible en el sistema.
This commit is contained in:
Luis Ángel San Martín
2012-10-11 22:39:16 +02:00
parent b4669c5b8b
commit 46a769e53e
12 changed files with 103 additions and 11 deletions

View File

@ -45,7 +45,8 @@ HEADERS += comic_flow.h \
../common/custom_widgets.h \
../common/qnaturalsorting.h \
../common/yacreader_flow_gl.h \
../common/yacreader_global.h
../common/yacreader_global.h \
../common/onstart_flow_selection_dialog.h
SOURCES += comic_flow.cpp \
create_library_dialog.cpp \
@ -77,7 +78,8 @@ 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
include(./server/server.pri)

View File

@ -41,5 +41,8 @@
<file>../images/server.png</file>
<file>../images/iphoneConfig.png</file>
<file>../images/qrMessage.png</file>
<file>../images/onStartFlowSelection.png</file>
<file>../images/useNewFlowButton.png</file>
<file>../images/useOldFlowButton.png</file>
</qresource>
</RCC>

View File

@ -19,6 +19,7 @@
#include "data_base_management.h"
#include "yacreader_global.h"
#include "onstart_flow_selection_dialog.h"
//
@ -38,8 +39,8 @@ void LibraryWindow::setupUI()
settings->beginGroup("libraryConfig");
doModels();
doDialogs();
doLayout();
doDialogs();
createActions();
createToolBars();
createMenus();
@ -54,7 +55,21 @@ void LibraryWindow::doLayout()
QSplitter * sHorizontal = new QSplitter(Qt::Horizontal); //spliter principal
//TODO: flowType is a global variable
//CONFIG COMIC_FLOW--------------------------------------------------------
if(settings->contains(USE_OPEN_GL) && settings->value(USE_OPEN_GL).toBool() == true)
if(QGLFormat::hasOpenGL() && !settings->contains(USE_OPEN_GL))
{
OnStartFlowSelectionDialog * flowSelDialog = new OnStartFlowSelectionDialog();
flowSelDialog->exec();
if(flowSelDialog->result() == QDialog::Accepted)
settings->setValue(USE_OPEN_GL,2);
else
settings->setValue(USE_OPEN_GL,0);
delete flowSelDialog;
}
if(QGLFormat::hasOpenGL() && (settings->value(USE_OPEN_GL).toBool() == true))
comicFlow = new ComicFlowWidgetGL(0);
else
comicFlow = new ComicFlowWidgetSW(0);