Nothing, really.

diff --git a/main.cpp b/main.cpp
index 306ea83..1676a8e 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -41,7 +41,6 @@ int main(int argc, char *argv[])
 
     {
         MainWindow w;
-        w.show();
         ret = a.exec();
     }
 

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 33a730a..bfb9007 100755 (executable)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -59,7 +59,7 @@ MainWindow::MainWindow(QWidget *parent):
     layout->addWidget(view);
 
     // Progress
-    progress = new Progress(central);
+    progress = new Progress(this);
 
     // Settings dialog
     settings = new QDialog(this);

diff --git a/model/extractzip.cpp b/model/extractzip.cpp
index 98272bc..b9bdc82 100644 (file)
--- a/model/extractzip.cpp
+++ b/model/extractzip.cpp
@@ -51,11 +51,12 @@ int doExtractCurrentFile(unzFile uf, const QStringList &excludedExtensions)
         QString name(fileNameInZip);
         for (int i = 0; i < excludedExtensions.length(); i++) {
             if (name.endsWith(excludedExtensions[i], Qt::CaseInsensitive)) {
-                qDebug() << "Skipping" << name;
+                qDebug() << "extractCurrentFile: Skipping" << name;
                 free(buf);
                 return UNZ_OK;
             }
         }
+        qDebug() << "extractCurrentFile: Extracting" << name;
 
         const char *writeFileName;
         int skip = 0;

diff --git a/model/ncxhandler.h b/model/ncxhandler.h
index 1585942..6121992 100644 (file)
--- a/model/ncxhandler.h
+++ b/model/ncxhandler.h
@@ -29,7 +29,6 @@ public:
             contentItem.size = 0;
             book.content[id] = contentItem;
             book.chapters.append(id);
-            qDebug() << "" << id << "name" << name << "href" << href;
             foreach (TreeItem *child, children) {
                 child->addToBook(book);
             }
@@ -62,10 +61,9 @@ public:
             }
         } else if (name == "navPoint") {
             if (currentItem) {
-                qDebug() << "NcxHandler::endElement  " << currentItem->id;
                 currentItem = currentItem->parent;
                 if (currentItem == 0) {
-                    qDebug() << " Root item reached, dumping tree";
+                    // Root navigation point reached, dump TOC tree
                     rootItem->addToBook(book);
                     delete rootItem;
                     rootItem = 0;
@@ -82,7 +80,6 @@ public:
         currentText = "";
         if (name == "navPoint") {
             TreeItem *item = new TreeItem(attrs.value("id"), currentItem);
-            qDebug() << "NcxHandler::startElement" << attrs.value("id");
             if (!rootItem) {
                 rootItem = item;
             }

diff --git a/model/opshandler.h b/model/opshandler.h
index 8440afb..f764860 100644 (file)
--- a/model/opshandler.h
+++ b/model/opshandler.h
@@ -47,11 +47,7 @@ public:
             QString key = attrs.value("id");
             book.content[key] = item;
             partCount++;
-            qDebug() << "OpsHandler::startElement: name" << item.name << "href"
-                    << attrs.value("href") << "id" << key;
         } else if (name == "itemref") {
-            qDebug() << "OpsHandler::startElement: parts[" << book.parts.size()
-                    << "]" << attrs.value("idref");
             book.parts.append(attrs.value("idref"));
         }
         return true;

diff --git a/widgets/progressdialog.cpp b/widgets/progressdialog.cpp
index 492d5da..7d19f39 100644 (file)
--- a/widgets/progressdialog.cpp
+++ b/widgets/progressdialog.cpp
@@ -23,3 +23,9 @@ void ProgressDialog::showWait()
     setValue(0);
     show();
 }
+
+void ProgressDialog::show()
+{
+    TRACE;
+    QProgressDialog::show();
+}

diff --git a/widgets/progressdialog.h b/widgets/progressdialog.h
index 6303468..d38c7ff 100644 (file)
--- a/widgets/progressdialog.h
+++ b/widgets/progressdialog.h
@@ -12,8 +12,12 @@ class ProgressDialog: public QProgressDialog
 public:
     explicit ProgressDialog(const QString &label, QWidget *parent = 0);
 
+public slots:
     /** Show wait animation instead of progress bar. */
     void showWait();
+
+    /** Show dialog, adjust position if needed. */
+    void show();
 };
 
 #endif // PROGRESSDIALOG_H