Add "About" icon for Mac. Adjust "About" window layout. Add "Search" button to library.

diff --git a/dorian.qrc b/dorian.qrc
index e6e0429..fb41696 100644 (file)
--- a/dorian.qrc
+++ b/dorian.qrc
@@ -42,5 +42,7 @@
         <file>icons/mac/info.png</file>
         <file>icons/mac/library.png</file>
         <file>books/2BR02B.epub</file>
+        <file>icons/search.png</file>
+        <file>icons/mac/about.png</file>
     </qresource>
 </RCC>

diff --git a/icons/mac/about.png b/icons/mac/about.png
new file mode 100755 (executable)
index 0000000..8f96ffc
Binary files /dev/null and b/icons/mac/about.png differ

diff --git a/icons/search.png b/icons/search.png
new file mode 100644 (file)
index 0000000..e1cf574
Binary files /dev/null and b/icons/search.png differ

diff --git a/librarydialog.cpp b/librarydialog.cpp
index c08c4ae..378f48e 100644 (file)
--- a/librarydialog.cpp
+++ b/librarydialog.cpp
@@ -34,6 +34,7 @@ LibraryDialog::LibraryDialog(QWidget *parent): ListWindow(parent)
     addAction(tr("Add book"), this, SLOT(onAdd()), ":/icons/add.png");
     addAction(tr("Add books from folder"), this, SLOT(onAddFolder()),
               ":/icons/folder.png");
+    addAction(tr("Search the Web"), this, SLOT(onSearch()), ":/icons/search.png");
 
     // Create and add list view
     list = new ListView(this);

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 9c47468..5d2389f 100755 (executable)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -434,7 +434,7 @@ void MainWindow::resizeEvent(QResizeEvent *e)
 
 void MainWindow::about()
 {
-    Dyalog *aboutDialog = new Dyalog(this);
+    Dyalog *aboutDialog = new Dyalog(this, false);
     aboutDialog->setWindowTitle(tr("About Dorian"));
     QLabel *label = new QLabel(aboutDialog);
     label->setTextFormat(Qt::RichText);

diff --git a/pkg/changelog b/pkg/changelog
index f891689..9efba85 100644 (file)
--- a/pkg/changelog
+++ b/pkg/changelog
@@ -1,17 +1,23 @@
+dorian (0.3.1-1) unstable; urgency=low
+
+  *
+
+ -- Akos Polster <akos@pipacs.com>  Sat, 10 Oct 2010 02:00:00 +0200
+
 dorian (0.3.0-1) unstable; urgency=low
 
   * Keep library data in database
   * Upgrade from old data format if needed
   * Show progress during library load and upgrade
 
- -- Akos Polster <akos@pipacs.com>  Thu,  8 Oct 2010 02:00:00 +0200
+ -- Akos Polster <akos@pipacs.com>  Fri,  8 Oct 2010 02:00:00 +0200
 
 dorian (0.2.2-1) unstable; urgency=low
 
   * Speed up book parsing
   * Improve default book
 
- -- Akos Polster <akos@pipacs.com>  Thu,  3 Oct 2010 02:00:00 +0200
+ -- Akos Polster <akos@pipacs.com>  Sun,  3 Oct 2010 02:00:00 +0200
 
 dorian (0.2.1-1) unstable; urgency=low
 

diff --git a/pkg/version.txt b/pkg/version.txt
index 4535e9e..9efae28 100644 (file)
--- a/pkg/version.txt
+++ b/pkg/version.txt
@@ -1 +1 @@
-"0.3.0"
+"0.3.1"