Changed the comics view transition for a simple plain view. In a future the views swaping should be fixed using double buffering.

YACReaderLibrary/comics_view_transition.cpp

@@ -11,42 +11,14 @@
 #include "yacreader_global_gui.h"
 
 ComicsViewTransition::ComicsViewTransition(QWidget *parent) :
-    QWidget(parent),movie(0)
+    QWidget(parent)
 {
-   QVBoxLayout * layout = new QVBoxLayout;
-
-   settings = new QSettings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat);
-   settings->beginGroup("libraryConfig");
-
-   movieLabel = new QLabel("Placeholder");
-   movieLabel->setAlignment(Qt::AlignCenter);
-   QLabel * textLabel = new QLabel("Switching comics view");
-   textLabel->setAlignment(Qt::AlignCenter);
-
 #ifdef Q_OS_MAC
-    textLabel->setStyleSheet("QLabel {color:#888888; font-size:24px;font-family:Arial;font-weight:bold;}");
     setStyleSheet("QWidget {background:#FFFFFF}");
 #else
-   textLabel->setStyleSheet("QLabel {color:#CCCCCC; font-size:24px;font-family:Arial;font-weight:bold;}");
    setStyleSheet("QWidget {background:#2A2A2A}");
 #endif
 
-   //movieLabel->setFixedSize(450,350);
-
-   layout->addSpacing(100);
-   layout->addWidget(movieLabel);
-   layout->addSpacing(20);
-   layout->addWidget(textLabel);
-   layout->addStretch();
-   layout->setMargin(0);
-   layout->setSpacing(0);
-
-   setContentsMargins(0,0,0,0);
-
-   //QSizePolicy sp();
-   setSizePolicy(QSizePolicy ::Expanding , QSizePolicy ::Expanding );
-   //movieLabel->setSizePolicy(QSizePolicy ::Expanding , QSizePolicy ::Expanding );
-   setLayout(layout);
 }
 
 QSize ComicsViewTransition::sizeHint()
@@ -54,25 +26,6 @@ QSize ComicsViewTransition::sizeHint()
     return QSize(450,350);
 }
 
-void ComicsViewTransition::startMovie()
-{
-    if(movie)
-        delete movie;
-
-    if(settings->value(COMICS_VIEW_STATUS) == YACReader::Flow)
-        movie = new QMovie(":/images/flow_to_grid.gif");
-    else
-        movie = new QMovie(":/images/grid_to_flow.gif");
-
-    connect(movie,SIGNAL(finished()),this,SIGNAL(transitionFinished()));
-    //connect(movie,SIGNAL(finished()),movie,SLOT(deleteLater());
-    movie->setSpeed(200);
-    movie->jumpToFrame(0);
-    movieLabel->setMovie(movie);
-
-    QTimer::singleShot(100,movie,SLOT(start()));
-}
-
 void ComicsViewTransition::paintEvent(QPaintEvent *)
 {
     QPainter painter (this);

YACReaderLibrary/comics_view_transition.h

@@ -3,10 +3,6 @@
 
 #include <QWidget>
 
-class QMovie;
-class QSettings;
-class QLabel;
-
 class ComicsViewTransition : public QWidget
 {
     Q_OBJECT
@@ -14,17 +10,7 @@ public:
     explicit ComicsViewTransition(QWidget *parent = 0);
     QSize sizeHint();
 
-signals:
-    void transitionFinished();
-
-public slots:
-    void startMovie();
-
 protected:
-    QMovie * movie;
-    QSettings * settings;
-    QLabel * movieLabel;
-
     void paintEvent(QPaintEvent *);
 };
 

YACReaderLibrary/images_osx.qrc

@@ -15,13 +15,10 @@
         <file alias="images/main_toolbar/flow@2x.png">../images/main_toolbar/flow_osx@2x.png</file>
         <file alias="images/main_toolbar/grid.png">../images/main_toolbar/grid_osx.png</file>
         <file alias="images/main_toolbar/grid@2x.png">../images/main_toolbar/grid_osx@2x.png</file>
-        <file alias="images/flow_to_grid.gif">../images/flow_to_grid_osx.gif</file>
-        <file alias="images/grid_to_flow.gif">../images/grid_to_flow_osx.gif</file>
         <file alias="images/empty_folder.png">../images/empty_folder_osx.png</file>
         <file alias="images/empty_search.png">../images/empty_search_osx.png</file>
         <file>../images/iconSearch.png</file>
         <file>../images/clearSearch.png</file>
-        <!--reading lists-->
         <file alias="images/lists/default_0.png">../images/lists/default_0_osx.png</file>
         <file alias="images/lists/default_1.png">../images/lists/default_1_osx.png</file>
         <file alias="images/lists/label_blue.png">../images/lists/label_blue_osx.png</file>
@@ -38,7 +35,6 @@
         <file alias="images/lists/label_yellow.png">../images/lists/label_yellow_osx.png</file>
         <file alias="images/lists/list.png">../images/lists/list_osx.png</file>
         <file alias="images/empty_reading_list.png">../images/empty_reading_list_osx.png</file>
-        <!--reading lists @2x-->
         <file alias="images/lists/default_0@2x.png">../images/lists/default_0_osx@2x.png</file>
         <file alias="images/lists/default_1@2x.png">../images/lists/default_1_osx@2x.png</file>
         <file alias="images/lists/label_blue@2x.png">../images/lists/label_blue_osx@2x.png</file>
@@ -54,7 +50,6 @@
         <file alias="images/lists/label_white@2x.png">../images/lists/label_white_osx@2x.png</file>
         <file alias="images/lists/label_yellow@2x.png">../images/lists/label_yellow_osx@2x.png</file>
         <file alias="images/lists/list@2x.png">../images/lists/list_osx@2x.png</file>
-        <!--sidebar-->
         <file alias="images/sidebar/libraryIcon.png">../images/sidebar/libraryIcon_osx.png</file>
         <file alias="images/sidebar/setRoot.png">../images/sidebar/setRoot_osx.png</file>
         <file alias="images/sidebar/expand.png">../images/sidebar/expand_osx.png</file>
@@ -65,8 +60,6 @@
         <file alias="images/sidebar/delete_sidebar.png">../images/sidebar/delete_sidebar_osx.png</file>
         <file alias="images/sidebar/addLabelIcon.png">../images/sidebar/addLabelIcon_osx.png</file>
         <file alias="images/sidebar/renameListIcon.png">../images/sidebar/renameListIcon_osx.png</file>
-        <!--sidebar @2x-->
-        <!-- <file alias="images/sidebar/libraryIcon@2x.png">../images/sidebar/libraryIcon_osx@2x.png</file> -->
         <file alias="images/sidebar/setRoot@2x.png">../images/sidebar/setRoot_osx@2x.png</file>
         <file alias="images/sidebar/expand@2x.png">../images/sidebar/expand_osx@2x.png</file>
         <file alias="images/sidebar/colapse@2x.png">../images/sidebar/colapse_osx@2x.png</file>

YACReaderLibrary/images_win.qrc

@@ -17,8 +17,6 @@
         <file>../images/main_toolbar/flow.png</file>
         <file>../images/main_toolbar/grid.png</file>
         <file>../images/main_toolbar/info.png</file>
-        <file>../images/flow_to_grid.gif</file>
-        <file>../images/grid_to_flow.gif</file>
         <file>../images/empty_folder.png</file>
         <file>../images/empty_search.png</file>
         <file>../images/sidebar/addNew_sidebar.png</file>
@@ -27,7 +25,6 @@
         <file alias="images/clearSearch.png">../images/clearSearchNew.png</file>
         <file>../images/sidebar/addLabelIcon.png</file>
         <file>../images/sidebar/renameListIcon.png</file>
-        <!--reading lists-->
         <file>../images/lists/default_0.png</file>
         <file>../images/lists/default_1.png</file>
         <file>../images/lists/label_blue.png</file>

YACReaderLibrary/yacreader_comics_views_manager.cpp

@@ -58,7 +58,6 @@ YACReaderComicsViewsManager::YACReaderComicsViewsManager(QSettings *settings, Li
     comicsViewStack->setCurrentWidget(comicsView);
 
     //connections
-    connect(comicsViewTransition,SIGNAL(transitionFinished()),this,SLOT(showComicsView()));
 
     connect(emptyFolderWidget, SIGNAL(copyComicsToCurrentFolder(QList<QPair<QString, QString> >)), libraryWindow, SLOT(copyAndImportComicsToCurrentFolder(QList<QPair<QString, QString> >)));
     connect(emptyFolderWidget, SIGNAL(moveComicsToCurrentFolder(QList<QPair<QString, QString> >)), libraryWindow, SLOT(moveAndImportComicsToCurrentFolder(QList<QPair<QString, QString> >)));
@@ -104,7 +103,7 @@ void YACReaderComicsViewsManager::toggleComicsView()
 {
     if(comicsViewStack->currentWidget()==comicsView) {
         QTimer::singleShot(0,this,SLOT(showComicsViewTransition()));
-        QTimer::singleShot(32,this,SLOT(toggleComicsView_delayed()));
+        QTimer::singleShot(100,this,SLOT(toggleComicsView_delayed()));
     } else
         toggleComicsView_delayed();
 }
@@ -167,7 +166,6 @@ void YACReaderComicsViewsManager::switchToComicsView(ComicsView * from, ComicsVi
 void YACReaderComicsViewsManager::showComicsViewTransition()
 {
     comicsViewStack->setCurrentWidget(comicsViewTransition);
-    comicsViewTransition->startMovie();
 }
 
 void YACReaderComicsViewsManager::toggleComicsView_delayed()
@@ -219,4 +217,6 @@ void YACReaderComicsViewsManager::toggleComicsView_delayed()
     }
 
     libraryWindow->settings->setValue(COMICS_VIEW_STATUS, comicsViewStatus);
+
+    showComicsView();
 }