diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro index ecad0461..fc9c83d9 100644 --- a/YACReader/YACReader.pro +++ b/YACReader/YACReader.pro @@ -105,7 +105,6 @@ HEADERS += ../common/comic.h \ ../common/qnaturalsorting.h \ ../common/yacreader_global.h \ ../common/yacreader_global_gui.h \ - ../common/onstart_flow_selection_dialog.h \ ../common/comic_db.h \ ../common/folder.h \ ../common/library_item.h \ @@ -143,7 +142,6 @@ SOURCES += ../common/comic.cpp \ ../common/custom_widgets.cpp \ ../common/check_new_version.cpp \ ../common/qnaturalsorting.cpp \ - ../common/onstart_flow_selection_dialog.cpp \ ../common/comic_db.cpp \ ../common/folder.cpp \ ../common/library_item.cpp \ diff --git a/YACReader/viewer.cpp b/YACReader/viewer.cpp index c5e54f35..379781d3 100644 --- a/YACReader/viewer.cpp +++ b/YACReader/viewer.cpp @@ -12,7 +12,6 @@ #include "render.h" #include "goto_dialog.h" #include "translator.h" -#include "onstart_flow_selection_dialog.h" #include "page_label_widget.h" #include "notifications_label_widget.h" #include "comic_db.h" diff --git a/YACReader/yacreader_images.qrc b/YACReader/yacreader_images.qrc index 2e1e5f6a..12dac30a 100644 --- a/YACReader/yacreader_images.qrc +++ b/YACReader/yacreader_images.qrc @@ -48,8 +48,6 @@ ../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 diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index 8b3f56e6..4d8d588a 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -111,7 +111,6 @@ HEADERS += comic_flow.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 \ @@ -185,7 +184,6 @@ SOURCES += comic_flow.cpp \ ../common/pictureflow.cpp \ ../common/custom_widgets.cpp \ ../common/qnaturalsorting.cpp \ - ../common/onstart_flow_selection_dialog.cpp \ no_libraries_widget.cpp \ import_widget.cpp \ trayicon_controller.cpp \ diff --git a/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc index 07aa91bc..48a034b1 100644 --- a/YACReaderLibrary/images.qrc +++ b/YACReaderLibrary/images.qrc @@ -87,8 +87,6 @@ ../images/noLibrariesIcon.png ../images/noLibrariesLine.png ../images/notCover.png - ../images/onStartFlowSelection.png - ../images/onStartFlowSelection_es.png ../images/openLibrary.png ../images/previousCoverPage.png ../images/readingRibbon.png diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index 35e7962c..45a40b89 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -24,7 +24,6 @@ #include "data_base_management.h" #include "yacreader_global.h" -#include "onstart_flow_selection_dialog.h" #include "no_libraries_widget.h" #include "import_widget.h" diff --git a/common/onstart_flow_selection_dialog.cpp b/common/onstart_flow_selection_dialog.cpp deleted file mode 100644 index 76868e62..00000000 --- a/common/onstart_flow_selection_dialog.cpp +++ /dev/null @@ -1,52 +0,0 @@ -#include "onstart_flow_selection_dialog.h" - -#include -#include -#include - -OnStartFlowSelectionDialog::OnStartFlowSelectionDialog(QWidget *parent) - : QDialog(parent) -{ - setModal(true); - QPushButton *acceptHW = new QPushButton(this); - connect(acceptHW, SIGNAL(clicked()), this, SLOT(accept())); - QPushButton *rejectHW = new QPushButton(this); //and use SW flow - connect(rejectHW, SIGNAL(clicked()), this, SLOT(reject())); - - acceptHW->setGeometry(90, 165, 110, 118); - acceptHW->setFlat(true); - acceptHW->setAutoFillBackground(true); - rejectHW->setGeometry(464, 165, 110, 118); - rejectHW->setFlat(true); - rejectHW->setAutoFillBackground(true); - - QPalette paletteHW; - QLocale locale = this->locale(); - QLocale::Language language = locale.language(); - - /*if(language == QLocale::Spanish) - paletteHW.setBrush(acceptHW->backgroundRole(), QBrush(QImage(":/images/useNewFlowButton_es.png"))); - else - paletteHW.setBrush(acceptHW->backgroundRole(), QBrush(QImage(":/images/useNewFlowButton.png")));*/ - - paletteHW.setBrush(acceptHW->backgroundRole(), QBrush(QImage(":/images/nonexxx.png"))); - acceptHW->setPalette(paletteHW); - QPalette paletteSW; - paletteSW.setBrush(rejectHW->backgroundRole(), QBrush(QImage(":/images/nonexxx.png"))); - rejectHW->setPalette(paletteSW); - //QHBoxLayout * layout = new QHBoxLayout; - //layout->addWidget(acceptHW); - //layout->addWidget(rejectHW); - - QPalette palette; - if (language == QLocale::Spanish) - palette.setBrush(this->backgroundRole(), QBrush(QImage(":/images/onStartFlowSelection_es.png"))); - else - palette.setBrush(this->backgroundRole(), QBrush(QImage(":/images/onStartFlowSelection.png"))); - - setPalette(palette); - - //setLayout(layout); - - resize(664, 371); -} diff --git a/common/onstart_flow_selection_dialog.h b/common/onstart_flow_selection_dialog.h deleted file mode 100644 index 8d70a45b..00000000 --- a/common/onstart_flow_selection_dialog.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef ONSTART_FLOW_SELECTION_DIALOG_H -#define ONSTART_FLOW_SELECTION_DIALOG_H - -#include - -class OnStartFlowSelectionDialog : public QDialog -{ - Q_OBJECT -public: - OnStartFlowSelectionDialog(QWidget *parent = 0); -}; - -#endif \ No newline at end of file diff --git a/images/useNewFlowButton.png b/images/useNewFlowButton.png deleted file mode 100644 index bd224861..00000000 Binary files a/images/useNewFlowButton.png and /dev/null differ diff --git a/images/useOldFlowButton.png b/images/useOldFlowButton.png deleted file mode 100644 index ee6ac75e..00000000 Binary files a/images/useOldFlowButton.png and /dev/null differ