From df9682835caa4e81e6482a0cd5a03613fbda80eb Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Tue, 10 Dec 2013 13:29:38 +0100
Subject: [PATCH] Many changes, reworked some things.

---
 CMakeLists.txt                                |   2 ++
 .../icons/mini-kfaenza/qtassistant.png        | Bin 0 -> 4540 bytes
 src/core/databasefactory.cpp                  |  16 ++++++++++++--
 src/core/defs.h.in                            |   5 +----
 src/gui/feedmessageviewer.cpp                 |   3 +++
 src/gui/formmain.cpp                          |   3 +++
 src/gui/formmain.h                            |   2 +-
 src/gui/messagebox.cpp                        |   9 ++++++++
 src/gui/messagebox.h                          |  20 ++++++++++++++++++
 src/gui/messagesview.cpp                      |   4 ++++
 src/gui/messagesview.h                        |   1 +
 src/gui/tabwidget.cpp                         |   6 ++++++
 src/gui/tabwidget.h                           |   3 +++
 13 files changed, 67 insertions(+), 7 deletions(-)
 create mode 100644 resources/graphics/icons/mini-kfaenza/qtassistant.png
 create mode 100644 src/gui/messagebox.cpp
 create mode 100644 src/gui/messagebox.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 808101a86..4c535dfa2 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -245,6 +245,7 @@ set(APP_SOURCES
   src/gui/feedsview.cpp
   src/gui/messagesview.cpp
   src/gui/statusbar.cpp
+  src/gui/messagebox.cpp
 
   # CORE sources.
   src/core/debugging.cpp
@@ -297,6 +298,7 @@ set(APP_HEADERS
   src/gui/feedsview.h
   src/gui/messagesview.h
   src/gui/statusbar.h
+  src/gui/messagebox.h
 
   # CORE headers.
   src/core/settings.h
diff --git a/resources/graphics/icons/mini-kfaenza/qtassistant.png b/resources/graphics/icons/mini-kfaenza/qtassistant.png
new file mode 100644
index 0000000000000000000000000000000000000000..cffbf476991ce025f2c8382c5404437797070752
GIT binary patch
literal 4540
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
a5c+?>#cnk|$(wlq0000<MNUMnLSTaVxUoL~

literal 0
HcmV?d00001

diff --git a/src/core/databasefactory.cpp b/src/core/databasefactory.cpp
index 55569c651..66259ef07 100644
--- a/src/core/databasefactory.cpp
+++ b/src/core/databasefactory.cpp
@@ -127,8 +127,20 @@ QSqlDatabase DatabaseFactory::addConnection(const QString &connection_name) {
     return initialize(connection_name);
   }
   else {
-    return QSqlDatabase::addDatabase(DATABASE_DRIVER,
-                                     connection_name);
+    QSqlDatabase database = QSqlDatabase::addDatabase(DATABASE_DRIVER,
+                                                      connection_name);
+    QDir db_path(getDatabasePath());
+    QFile db_file(db_path.absoluteFilePath(APP_DB_FILE));
+
+    // Setup database file path.
+    database.setDatabaseName(db_file.fileName());
+
+    if (!database.open()) {
+      qFatal("Database was NOT opened. Delivered error message: '%s'",
+             qPrintable(database.lastError().text()));
+    }
+
+    return database;
   }
 }
 
diff --git a/src/core/defs.h.in b/src/core/defs.h.in
index 0cfc4c450..decdacfb8 100755
--- a/src/core/defs.h.in
+++ b/src/core/defs.h.in
@@ -5,7 +5,7 @@
 
 #if QT_VERSION >= 0x050000
 #include <qwebkitglobal.h>
-#elif QT_VERSION >= 0x040600
+#else
 #include <qwebkitversion.h>
 #endif
 
@@ -19,10 +19,7 @@
 #define APP_AUTHORS         "@APP_AUTHOR@"
 #define APP_URL             "@APP_URL@"
 #define APP_VERSION         "@APP_VERSION@"
-
-#if QT_VERSION >= 0x040600
 #define APP_USERAGENT       QString("@APP_NAME@/@APP_VERSION@ (@APP_URL@) on @CMAKE_SYSTEM@; Webkit/") + qWebKitVersion()
-#endif
 
 #define TEXT_TITLE_LIMIT    30
 #define MAX_ZOOM_FACTOR     10.0
diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index 1805159f9..6da8bbb34 100644
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -34,6 +34,9 @@ void FeedMessageViewer::createConnections() {
           m_messagesBrowser, SLOT(clear()));
   connect(m_messagesView, SIGNAL(currentMessageChanged(Message)),
           m_messagesBrowser, SLOT(navigateToMessage(Message)));
+  connect(m_messagesView, SIGNAL(openMessageNewTabRequested(Message)),
+          FormMain::getInstance()->m_ui->m_tabWidget,
+          SLOT(addBrowserWithMessage(Message)));
 
   // Toolbar forwardings.
   connect(FormMain::getInstance()->m_ui->m_actionSwitchImportanceOfSelectedMessages,
diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp
index fec611fae..ea2c31e48 100755
--- a/src/gui/formmain.cpp
+++ b/src/gui/formmain.cpp
@@ -1,4 +1,5 @@
 #include <QCloseEvent>
+#include <QMessageBox>
 
 #include "gui/formmain.h"
 #include "gui/formabout.h"
@@ -146,6 +147,8 @@ void FormMain::display() {
 }
 
 void FormMain::onCommitData(QSessionManager &manager) { 
+  Q_UNUSED(manager);
+
   qDebug("OS asked application to commit its data.");
 }
 
diff --git a/src/gui/formmain.h b/src/gui/formmain.h
index bde361439..cd7a35526 100644
--- a/src/gui/formmain.h
+++ b/src/gui/formmain.h
@@ -76,7 +76,7 @@ class FormMain : public QMainWindow {
     // Displays various dialogs.
     void showSettings();
     void showAbout();
-    
+
   private:
     Ui::FormMain *m_ui;
     QMenu *m_trayMenu;
diff --git a/src/gui/messagebox.cpp b/src/gui/messagebox.cpp
new file mode 100644
index 000000000..8ce123064
--- /dev/null
+++ b/src/gui/messagebox.cpp
@@ -0,0 +1,9 @@
+#include "gui/messagebox.h"
+
+
+MessageBox::MessageBox(QWidget *parent) : QMessageBox(parent) {
+}
+
+MessageBox::~MessageBox() {
+  qDebug("Destroying MessageBox instance.");
+}
diff --git a/src/gui/messagebox.h b/src/gui/messagebox.h
new file mode 100644
index 000000000..f67de23d6
--- /dev/null
+++ b/src/gui/messagebox.h
@@ -0,0 +1,20 @@
+#ifndef MESSAGEBOX_H
+#define MESSAGEBOX_H
+
+#include <QMessageBox>
+
+
+class MessageBox : public QMessageBox {
+    Q_OBJECT
+
+  public:
+    explicit MessageBox(QWidget *parent = 0);
+    virtual ~MessageBox();
+
+  signals:
+
+  public slots:
+
+};
+
+#endif // MESSAGEBOX_H
diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index cd66f6a49..917b08f54 100644
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -183,6 +183,10 @@ void MessagesView::openSelectedSourceMessagesInternally() {
 
 void MessagesView::openSelectedMessagesInternally() {
   // TODO: otevre vybrane nactene zpravy v internich tabech
+
+  foreach (const QModelIndex &index, selectionModel()->selectedRows()) {
+    emit openMessageNewTabRequested(m_sourceModel->messageAt(m_proxyModel->mapToSource(index).row()));
+  }
 }
 
 void MessagesView::markSelectedMessagesRead() {
diff --git a/src/gui/messagesview.h b/src/gui/messagesview.h
index 146670b6d..380c4cca1 100755
--- a/src/gui/messagesview.h
+++ b/src/gui/messagesview.h
@@ -51,6 +51,7 @@ class MessagesView : public QTreeView {
                           const QItemSelection &deselected);
 
   signals:
+    void openMessageNewTabRequested(const Message &message);
     void currentMessageChanged(const Message &message);
     void currentMessageRemoved();
 
diff --git a/src/gui/tabwidget.cpp b/src/gui/tabwidget.cpp
index 17a3dcd4c..036678cdc 100644
--- a/src/gui/tabwidget.cpp
+++ b/src/gui/tabwidget.cpp
@@ -174,6 +174,12 @@ int TabWidget::insertTab(int index, QWidget *widget, const QString &label,
   return tab_index;
 }
 
+int TabWidget::addBrowserWithMessage(const Message &message)  {
+  int new_index = addBrowser(false, false);
+  static_cast<WebBrowser*>(widget(new_index))->navigateToMessage(message);
+  return new_index;
+}
+
 int TabWidget::addEmptyBrowser() {
   return addBrowser(false, true);
 }
diff --git a/src/gui/tabwidget.h b/src/gui/tabwidget.h
index de14f4b29..784cfd8eb 100644
--- a/src/gui/tabwidget.h
+++ b/src/gui/tabwidget.h
@@ -9,6 +9,7 @@
 
 
 class CornerButton;
+class Message;
 
 class TabWidget : public QTabWidget {
     Q_OBJECT
@@ -72,6 +73,8 @@ class TabWidget : public QTabWidget {
     // Closes all "closable" tabs except the active tab.
     void closeAllTabsExceptCurrent();
 
+    int addBrowserWithMessage(const Message &message);
+
     // Adds new WebBrowser tab to global TabWidget.
     int addEmptyBrowser();