Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks

Conflicts:
	trunk/src/base/base.pro
	trunk/src/base/gui/MainWindow.cpp
	trunk/src/base/gui/MainWindow.h

diff --git a/trunk/src/base/backbone/Bookmarks.cpp b/trunk/src/base/backbone/Bookmarks.cpp
index c23aff7..2f20ea9 100644 (file)
--- a/trunk/src/base/backbone/Bookmarks.cpp
+++ b/trunk/src/base/backbone/Bookmarks.cpp
@@ -9,11 +9,15 @@ Bookmarks::Bookmarks() {
 }
 
 
+QSqlDatabase Bookmarks::getDbCnx(QString dbName) {
+    QSqlDatabase db =QSqlDatabase::addDatabase("QSQLITE",
+            QString("%2").arg((int)QThread::currentThreadId()));
+    db.setDatabaseName(dbName);
+    return db;
+}
 
 bool Bookmarks::checkAndCreateDb() {
-    QSqlDatabase db =QSqlDatabase::addDatabase("QSQLITE", 
-            QString((int)QThread::currentThreadId()));
-    db.setDatabaseName(dbName);
+    QSqlDatabase db = getDbCnx(dbName);
     if(!db.isOpen() && !db.open()) {
         qDebug() << "Database error: " << db.lastError().text() << endl;
         return false;
@@ -28,9 +32,7 @@ bool Bookmarks::checkAndCreateDb() {
 
 
 void Bookmarks::clear() {
-    QSqlDatabase db =QSqlDatabase::addDatabase("QSQLITE", 
-            QString((int)QThread::currentThreadId()));
-    db.setDatabaseName(dbName);
+    QSqlDatabase db = getDbCnx(dbName);
     if(!db.isOpen() && !db.open()) {
         qDebug() << "Database error: " << db.lastError().text() << endl;
         return ;
@@ -44,9 +46,7 @@ void Bookmarks::clear() {
 
 
 void Bookmarks::add(Translation* translation) {
-    QSqlDatabase db =QSqlDatabase::addDatabase("QSQLITE", 
-            QString((int)QThread::currentThreadId()));
-    db.setDatabaseName(dbName);
+    QSqlDatabase db = getDbCnx(dbName);
     if(!db.isOpen() && !db.open()) {
         qDebug() << "Database error: " << db.lastError().text() << endl;
         return ;
@@ -62,10 +62,7 @@ void Bookmarks::add(Translation* translation) {
 
 
 void Bookmarks::remove(Translation* translation) {
-    QSqlDatabase db =QSqlDatabase::addDatabase("QSQLITE", 
-            QString((int)QThread::currentThreadId()));
-
-    db.setDatabaseName(dbName);
+    QSqlDatabase db = getDbCnx(dbName);
     if(!db.isOpen() && !db.open()) {
         qDebug() << "Database error: " << db.lastError().text() << endl;
         return ;
@@ -81,9 +78,7 @@ void Bookmarks::remove(Translation* translation) {
 
 QList<Translation*> Bookmarks::list() {
     QList<Translation*> res;
-    QSqlDatabase db =QSqlDatabase::addDatabase("QSQLITE", 
-            QString((int)QThread::currentThreadId()));
-    db.setDatabaseName(dbName);
+    QSqlDatabase db = getDbCnx(dbName);
     if(!db.isOpen() && !db.open()) {
         qDebug() << "Database error: " << db.lastError().text() << endl;
         return res;
@@ -107,10 +102,7 @@ QList<Translation*> Bookmarks::searchWordList(QString word) {
     word = removeAccents(word);
 
     QList<Translation*> tr;
-    QSqlDatabase db =QSqlDatabase::addDatabase("QSQLITE", 
-            QString((int)QThread::currentThreadId()));
-    db.setDatabaseName(dbName);
-    qDebug()<<dbName;
+    QSqlDatabase db = getDbCnx(dbName);
     if(!db.isOpen() && !db.open()) {
         qDebug() << "Database error: " << db.lastError().text() << endl;
         return tr;
@@ -122,7 +114,6 @@ QList<Translation*> Bookmarks::searchWordList(QString word) {
     QSet<QString> res;
     while(cur.next())
         res.insert(cur.value(0).toString());
-    qDebug() << "searchWordList " << res.size();
     foreach(QString str, res.toList())
         tr.append(new BookmarkTranslation(str, this, dbName));
     db.close();
@@ -132,25 +123,19 @@ QList<Translation*> Bookmarks::searchWordList(QString word) {
 
 
 QStringList Bookmarks::search(QString word, QString dbName) {
-    qDebug() << "bookmarks::search  " << word << " |" << dbName;
     QStringList result;
-    QSqlDatabase db =QSqlDatabase::addDatabase("QSQLITE", 
-            QString((int)QThread::currentThreadId()));
-    db.setDatabaseName(dbName);
+    QSqlDatabase db = getDbCnx(dbName);
     if(!db.isOpen() && !db.open()) {
         qDebug() << "Database error: " << db.lastError().text() << endl;
         return result;
     }
-    qDebug() << "bookmarks::search " << word;
     QSqlQuery cur(db);
-    qDebug() << "bookmarks::search " << word;
     cur.prepare("select translation from bookmarks where key=?");
     cur.addBindValue(word);
     cur.exec();
     while(cur.next())
         result << cur.value(0).toString();
 
-    qDebug() << result.size() << " " << result;
     db.close();
     return result;
 }
@@ -176,9 +161,7 @@ QString Bookmarks::removeAccents(QString string) {
 
 
 bool Bookmarks::inBookmarks(QString word) {
-    QSqlDatabase db =QSqlDatabase::addDatabase("QSQLITE", 
-            QString((int)QThread::currentThreadId()));
-    db.setDatabaseName(dbName);
+    QSqlDatabase db = getDbCnx(dbName);
     if(!db.isOpen() && !db.open()) {
         qDebug() << "Database error: " << db.lastError().text() << endl;
         return false;

diff --git a/trunk/src/base/backbone/Bookmarks.h b/trunk/src/base/backbone/Bookmarks.h
index 07950fb..3726415 100644 (file)
--- a/trunk/src/base/backbone/Bookmarks.h
+++ b/trunk/src/base/backbone/Bookmarks.h
@@ -100,6 +100,7 @@ private:
 
     bool checkAndCreateDb();
     QString removeAccents(QString);
+    QSqlDatabase getDbCnx(QString dbName);
 
 };
 

diff --git a/trunk/src/base/base.pro b/trunk/src/base/base.pro
index 8d9d258..590366f 100644 (file)
--- a/trunk/src/base/base.pro
+++ b/trunk/src/base/base.pro
@@ -1,28 +1,17 @@
-#-------------------------------------------------
-#
+# -------------------------------------------------
 # Project created by QtCreator 2010-08-03T08:54:27
-#
-#-------------------------------------------------
-
-QT       += core gui sql
-
-maemo5 {
-    QT += maemo5
-}
-
+# -------------------------------------------------
+QT += core \
+    gui \
+    sql
+maemo5:QT += maemo5
 TARGET = mdictionary
 TEMPLATE = app
-
 MDICT_BINDIR = $$[MDICT_BINDIR]
-
-isEmpty(MDICT_BINDIR) {
-  MDICT_BINDIR = .
-}
-
+isEmpty(MDICT_BINDIR):MDICT_BINDIR = .
 DESTDIR = $${MDICT_BINDIR}
-
-SOURCES += gui/main.cpp\
-        gui/MainWindow.cpp \
+SOURCES += gui/main.cpp \
+    gui/MainWindow.cpp \
     gui/SearchBarWidget.cpp \
     gui/WordListWidget.cpp \
     gui/TranslationWidget.cpp \
@@ -37,9 +26,11 @@ SOURCES += gui/main.cpp\
     backbone/Bookmarks.cpp \
     gui/SettingsWidget.cpp \
     gui/BookmarksWidget.cpp \
-    gui/WelcomeScreenWidget.cpp
+    gui/WelcomeScreenWidget.cpp \ 
+    gui/AboutWidget.cpp
 
 HEADERS  += gui/MainWindow.h \
+    gui/AboutWidget.h \
     gui/SearchBarWidget.h \
     gui/WordListWidget.h \
     gui/TranslationWidget.h \
@@ -63,6 +54,7 @@ HEADERS  += gui/MainWindow.h \
     gui/WelcomeScreenWidget.h
 
 FORMS    += gui/MainWindow.ui
+RESOURCES += gui/gui.qrc
 
 unix {
   #VARIABLES
@@ -94,7 +86,30 @@ maemo5 {
 }
   desktop.files += ../../../data/other/$${TARGET}.desktop
   icon64.files += ../../../data/icons/64x64/$${TARGET}.png
+unix { 
+    # VARIABLES
+    isEmpty(PREFIX):PREFIX = /usr
+    BINDIR = $$PREFIX/bin
+    DATADIR = $$PREFIX/share
+    DEFINES += DATADIR=\\\"$$DATADIR\\\" \
+        PKGDATADIR=\\\"$$PKGDATADIR\\\"
+    
+    # MAKE INSTALL
+    INSTALLS += target \
+        desktop \
+        icon64 \
+        configs
+    configs.path = ~/.mdictionary
+    configs.files += ../../../data/mdictionary.defaults
+    target.path = $$BINDIR
+    maemo5 { 
+        desktop.path = $$DATADIR/applications/hildon
+        icon64.path = $$DATADIR/icons/hicolor/64x64/hildon
+    }
+    !maemo5 { 
+        desktop.path = $$DATADIR/applications
+        icon64.path = $$DATADIR/icons
+    }
+    desktop.files += ../../../data/other/$${TARGET}.desktop
+    icon64.files += ../../../data/icons/64x64/$${TARGET}.png
 }
-
-RESOURCES += \
-    gui/gui.qrc

diff --git a/trunk/src/base/gui/MainWindow.cpp b/trunk/src/base/gui/MainWindow.cpp
index a13f93c..c04dec4 100644 (file)
--- a/trunk/src/base/gui/MainWindow.cpp
+++ b/trunk/src/base/gui/MainWindow.cpp
@@ -104,14 +104,19 @@ void MainWindow::initializeUI() {
     bookmarksWidget->hide();
 
     menu = new QMenu(this);
+    
+    aboutWidget = new AboutWidget(this);
+    aboutWidget->hide();
+
+
+
     #ifdef Q_WS_MAEMO_5
         menuWidget = new MenuWidget(this);
         menuWidget->addSubMenu(tr("Settings"), settingsWidget);
         menuWidget->addSubMenu(tr("Dictionaries"), dictManagerWidget);
         menuWidget->addSubMenu(tr("Bookmarks"), bookmarksWidget);
-        menuWidget->addSubMenu(tr("About"), new QPushButton("About"));
-        menu->addAction(menuWidget);
-        ui->menuBar->addMenu(menu);
+        menuWidget->addSubMenu(tr("About"), aboutWidget);
+        ui->menuBar->addAction(menuWidget);
     #else
         dictionariesAction = ui->menuBar->addAction(tr("Dictionaries"));
         connect(dictionariesAction, SIGNAL(triggered()),
@@ -124,6 +129,10 @@ void MainWindow::initializeUI() {
         bookmarksAction = ui->menuBar->addAction(tr("Bookmarks"));
         connect(bookmarksAction, SIGNAL(triggered()),
                 bookmarksWidget, SLOT(show()));
+        
+       aboutAction = ui->menuBar->addAction(tr("About"));
+        connect(aboutAction, SIGNAL(triggered()),
+                aboutWidget, SLOT(show()));
     #endif
 
 }

diff --git a/trunk/src/base/gui/MainWindow.h b/trunk/src/base/gui/MainWindow.h
index 879b4f3..449ac13 100644 (file)
--- a/trunk/src/base/gui/MainWindow.h
+++ b/trunk/src/base/gui/MainWindow.h
@@ -38,6 +38,7 @@
 #include "HistoryListDialog.h"
 #include "BookmarksWidget.h"
 #include "WelcomeScreenWidget.h"
+#include "AboutWidget.h"
 
 namespace Ui {
     class MainWindow;
@@ -199,13 +200,14 @@ private:
     SettingsWidget* settingsWidget;
     BookmarksWidget* bookmarksWidget;
     QWidget* welcomeScreenWidget;
+    AboutWidget* aboutWidget;
 
     #ifndef Q_WS_MAEMO_5
         QSplitter* splitter;
         QAction* dictionariesAction;
         QAction* bookmarksAction;
         QAction* settingsAction;
-        //QAction* aboutAction;
+        QAction* aboutAction;
     #endif
 
     bool _exactSearch;

diff --git a/trunk/src/base/gui/gui.qrc b/trunk/src/base/gui/gui.qrc
index 0bd0ca2..dc740a5 100644 (file)
--- a/trunk/src/base/gui/gui.qrc
+++ b/trunk/src/base/gui/gui.qrc
@@ -2,5 +2,6 @@
     <qresource prefix="/icons">
         <file>staroff.png</file>
         <file>staron.png</file>
+        <file>mdictionary.png</file>
     </qresource>
 </RCC>