Fix author name in library and book info dialogs.

[dorian] / infodialog.cpp

diff --git a/infodialog.cpp b/infodialog.cpp
index 202d906..621eaaa 100644 (file)
--- a/infodialog.cpp
+++ b/infodialog.cpp
@@ -3,67 +3,69 @@
 #include "infodialog.h"
 #include "book.h"
 #include "library.h"
+#include "trace.h"
 
-InfoDialog::InfoDialog(Book *b, QWidget *parent): Dialog(parent), book(b)
+InfoDialog::InfoDialog(Book *b, QWidget *parent, bool showButtons):
+        Dyalog(parent, showButtons), book(b)
 {
-    setWindowTitle(tr("Book Details"));
+    TRACE;
+
+    setWindowTitle(tr("Book details"));
 
     if (book) {
         QLabel *title = new QLabel(book->title, this);
+        title->setWordWrap(true);
         addWidget(title);
         if (book->subject != "") {
             QLabel *subject = new QLabel(book->subject, this);
+            subject->setWordWrap(true);
             addWidget(subject);
         }
         if (book->creators.size()) {
             QLabel *creators = new QLabel(this);
-            QString c = "By " + book->creators[0];
-            for (int i = 1; i < book->creators.size(); i++) {
-                c += ", " + book->creators[i];
-            }
-            creators->setText(c);
+            creators->setWordWrap(true);
+            creators->setText(book->creators.join(", "));
             addWidget(creators);
         }
         QLabel *path = new QLabel("File: " + book->path(), this);
+        path->setWordWrap(true);
         addWidget(path);
         if (book->publisher != "") {
             QLabel *publisher =
                     new QLabel("Published by " + book->publisher, this);
+            publisher->setWordWrap(true);
             addWidget(publisher);
         }
         if (book->source != "") {
             QLabel *source = new QLabel("Source: " + book->source, this);
+            source->setWordWrap(true);
             addWidget(source);
         }
         if (book->rights != "") {
             QLabel *rights = new QLabel(book->rights, this);
+            rights->setWordWrap(true);
             addWidget(rights);
         }
         addStretch();
     }
 
-    QPushButton *read = new QPushButton(tr("Read"), this);
-    QPushButton *remove = new QPushButton(tr("Delete"), this);
-    connect(read, SIGNAL(clicked()), this, SLOT(onReadBook()));
-    connect(remove, SIGNAL(clicked()), this, SLOT(onRemoveBook()));
-    addButton(read, QDialogButtonBox::ActionRole);
-    addButton(remove, QDialogButtonBox::ActionRole);
+    addButton(tr("Read"), this, SLOT(onReadBook()),
+              QDialogButtonBox::ActionRole);
+    addButton(tr("Delete"), this, SLOT(onRemoveBook()),
+              QDialogButtonBox::DestructiveRole);
 }
 
 void InfoDialog::onReadBook()
 {
-    Library::instance()->setNowReading(Library::instance()->find(book));
-    close();
+    done(InfoDialog::Read);
 }
 
 void InfoDialog::onRemoveBook()
 {
     if (QMessageBox::Yes ==
-        QMessageBox::question(this,
-                              tr("Delete book"),
-                              "Delete book \"" + book->name() + "\"?",
-                              QMessageBox::Yes | QMessageBox::No)) {
-        Library::instance()->remove(Library::instance()->find(book));
-        close();
+        QMessageBox::question(this, tr("Delete book"),
+            tr("Delete book \"%1\" from library?").arg(book->shortName()),
+            QMessageBox::Yes | QMessageBox::No)) {
+        done(InfoDialog::Delete);
     }
 }