Speed up paging through the book. Clean up code for saving/restoring

[dorian] / mainwindow.h

diff --git a/mainwindow.h b/mainwindow.h
index 4ac7f3f..9bfbab4 100755 (executable)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -1,7 +1,8 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QtGui>
+#include <QModelIndex>
+#include <QEvent>
 
 #include "adopterwindow.h"
 
@@ -12,6 +13,7 @@ class BookView;
 class Book;
 class FullScreenWindow;
 class Progress;
+class ProgressDialog;
 class TranslucentButton;
 
 class MainWindow: public AdopterWindow
@@ -20,7 +22,7 @@ class MainWindow: public AdopterWindow
 
 public:
     MainWindow(QWidget *parent = 0);
-    ~MainWindow();
+    void initialize();
 
 public slots:
     void showLibrary();
@@ -34,23 +36,25 @@ public slots:
     void onSettingsChanged(const QString &key);
     void onPartLoadStart();
     void onPartLoadEnd(int index);
-    void onAddBookmark();
+    void onAddBookmark(const QString &note);
     void onGoToBookmark(int index);
     void showChapters();
     void onGoToChapter(int index);
     void about();
     void goToNextPage();
     void goToPreviousPage();
+    void onBeginUpgrade(int total);
+    void onUpgrading(const QString &book);
+    void onEndUpgrade();
+    void onBeginLoad(int total);
+    void onLoading(const QString &book);
+    void onEndLoad();
 
 protected:
-    void closeEvent(QCloseEvent *event);
     void timerEvent(QTimerEvent *event);
-    void resizeEvent(QResizeEvent *event);
 
 private:
     void setCurrentBook(const QModelIndex &current);
-    QAction *addToolBarAction(const QObject *receiver, const char *member,
-                              const QString &name);
     BookView *view;
     QAction *settingsAction;
     QAction *libraryAction;
@@ -60,18 +64,16 @@ private:
     QAction *fullScreenAction;
     QAction *forwardAction;
     QAction *backwardAction;
-    QAction *previousAction;
-    QAction *nextAction;
     QAction *chaptersAction;
-    QToolBar *toolBar;
     QDialog *settings;
     DevTools *devTools;
     QModelIndex mCurrent;
     FullScreenWindow *fullScreenWindow;
     int preventBlankingTimer;
-    Progress *progress;
-    TranslucentButton *previousButton;
-    TranslucentButton *nextButton;
+    Progress *prog;
+    TranslucentButton *prev;
+    TranslucentButton *next;
+    ProgressDialog *libraryProgress;
 };
 
 #endif // MAINWINDOW_H