Notes in bookmarks.

diff --git a/bookmarkinfodialog.cpp b/bookmarkinfodialog.cpp
index 7e9da91..b104821 100644 (file)
--- a/bookmarkinfodialog.cpp
+++ b/bookmarkinfodialog.cpp
@@ -14,13 +14,14 @@ BookmarkInfoDialog::BookmarkInfoDialog(Book *b, int i, QWidget *parent):
     QString label("At ");
     label += QString::number((int)(100 * book->
         getProgress(bookmark.part, bookmark.pos))) + "%";
+    if (!bookmark.note.isEmpty()) {
+        label += ": " + bookmark.note;
+    }
+    label += "\n";
     int chapterIndex = book->chapterFromPart(bookmark.part);
     if (chapterIndex != -1) {
         QString chapterId = book->chapters[chapterIndex];
-        label += ", in\"" + book->content[chapterId].name + "\"";
-    }
-    if (!bookmark.note.isEmpty()) {
-        label += "\n" + bookmark.note;
+        label += "In\"" + book->content[chapterId].name + "\"";
     }
     QLabel *info = new QLabel(label, this);
     addWidget(info);

diff --git a/bookmarksdialog.cpp b/bookmarksdialog.cpp
index 6e22e93..9902643 100644 (file)
--- a/bookmarksdialog.cpp
+++ b/bookmarksdialog.cpp
@@ -25,13 +25,14 @@ BookmarksDialog::BookmarksDialog(Book *book_, QWidget *parent):
         QString label("At ");
         label += QString::number((int)(100 * book_->
             getProgress(bookmark.part, bookmark.pos))) + "%";
+        if (!bookmark.note.isEmpty()) {
+            label += ": " + bookmark.note;
+        }
+        label += "\n";
         int chapterIndex = book_->chapterFromPart(bookmark.part);
         if (chapterIndex != -1) {
             QString chapterId = book_->chapters[chapterIndex];
-            label += ", in \"" + book_->content[chapterId].name + "\"";
-        }
-        if (!bookmark.note.isEmpty()) {
-            label += "\n" + bookmark.note;
+            label += "In \"" + book_->content[chapterId].name + "\"";
         }
         data.append(label);
     }

diff --git a/pkg/changelog b/pkg/changelog
index 58df6ef..03afeeb 100644 (file)
--- a/pkg/changelog
+++ b/pkg/changelog
@@ -4,6 +4,7 @@ dorian (0.3.1-1) unstable; urgency=low
   * Fix book view kinetic scrolling on Symbian
   * Failed attempt to add kinetic scrolling to lists on Symbian
   * Fix database creation on Symbian
+  * Bookmarks to have notes
 
  -- Akos Polster <akos@pipacs.com>  Sat, 10 Oct 2010 02:00:00 +0200